InfernalGames/tankz
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[server] update proto

Browse Source
This commit is contained in:
shmyga
2018-02-28 22:25:29 +03:00
parent 34e5ac2b9e
commit 634f5ad2d0
7 changed files with 238 additions and 272 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/common/haxe/ru/m/connect/PacketQueue.hx
View File

@@ -8,7 +8,8 @@ import protohx.Message;
class PacketQueue<P:Message> {
private var packetClass:Class<P>;
public var packetClass(default, null):Class<P>;
private var bytesBuff:Bytes;
private var msgs:List<P>;

40
src/common/haxe/ru/m/connect/WebSocketTools.hx
View File

@@ -1,31 +1,27 @@
package ru.m.connect;
import haxe.io.Bytes;
import haxe.io.BytesOutput;
import ru.m.connect.IConnection;
import protohx.Message;
class WebSocketTools {
public static function packet2string(packet:Message, builder:IPacketBuilder):String {
var meta = builder.packetMeta(packet);
var b = new BytesOutput();
packet.writeTo(b);
var data = b.getBytes();
var res = new BytesOutput();
res.writeByte(meta.family);
res.writeByte(meta.id);
//res.writeUInt16(data.length);
res.write(data);
return Base64.encodeBase64(res.getBytes());
}
public static function packet2string(packet:Message):String {
var b = new BytesOutput();
packet.writeTo(b);
var data = b.getBytes();
var res = new BytesOutput();
//res.writeUInt16(data.length);
res.write(data);
return Base64.encodeBase64(res.getBytes());
}
public static function string2packet(data:String, builder:IPacketBuilder):Message {
var bytes = Base64.decodeBase64(data);
var family = bytes.get(0);
var id = bytes.get(1);
var packet = builder.buildPacket({family:family, id:id});
packet.mergeFrom(bytes.sub(2, bytes.length - 2));
return packet;
}
public static function string2packet<P:Message>(data:String, packetClass:Class<P>):P {
var bytes = Base64.decodeBase64(data);
var family = bytes.get(0);
var id = bytes.get(1);
var packet:P = Type.createInstance(packetClass, []);
packet.mergeFrom(bytes.sub(2, bytes.length - 2));
return packet;
}
}

50
src/common/haxe/ru/m/connect/neko/NekoConnection.hx
View File

@@ -2,37 +2,33 @@ package ru.m.connect.neko;
import haxe.io.BytesOutput;
import protohx.Message;
import haxe.io.Bytes;
import sys.net.Socket;
import ru.m.connect.IConnection;
class NekoConnection extends BaseConnection {
public var socket(default, null):Socket;
class NekoConnection<O:Message, I:Message> extends BaseConnection<O, I> {
public function new(socket:Socket) {
super();
this.socket = socket;
socket.setFastSend(true);
socket.output.bigEndian = false;
socket.input.bigEndian = false;
}
public var socket(default, null):Socket;
override public function send(packet:Message):Void {
super.send(packet);
try {
var meta = builder.packetMeta(packet);
var b = new BytesOutput();
packet.writeTo(b);
var bytes = b.getBytes();
socket.output.writeByte(meta.family);
socket.output.writeByte(meta.id);
socket.output.writeUInt16(bytes.length);
socket.output.write(bytes);
socket.output.flush();
} catch (e:Dynamic) {
trace("Error send packet: " + Type.getClassName(Type.getClass(packet)));
trace(e);
public function new(socket:Socket, i:Class<I>) {
super(i);
this.socket = socket;
socket.setFastSend(true);
socket.output.bigEndian = false;
socket.input.bigEndian = false;
}
override public function send(packet:O):Void {
super.send(packet);
try {
var b = new BytesOutput();
packet.writeTo(b);
var bytes = b.getBytes();
socket.output.writeUInt16(bytes.length);
socket.output.write(bytes);
socket.output.flush();
} catch (e:Dynamic) {
trace("Error send packet: " + Type.getClassName(Type.getClass(packet)));
trace(e);
}
}
}
}

345
src/common/haxe/ru/m/connect/neko/NekoWebConnection.hx
View File

@@ -5,197 +5,180 @@ import haxe.crypto.Sha1;
import protohx.Message;
import haxe.io.Bytes;
import sys.net.Socket;
import ru.m.connect.IConnection;
class NekoWebConnection extends NekoConnection {
private var opened:Bool;
public function new(socket:Socket) {
super(socket);
opened = false;
}
override public function send(packet:Message):Void {
#if proto_debug L.d("Send", Type.getClassName(Type.getClass(packet)).split(".").pop()); #end
try {
var data = WebSocketTools.packet2string(packet, builder);
writeData(data, socket);
} catch (e:Dynamic) {
trace(e);
}
}
override public function pushData(bytes:Bytes):Void {
if (!opened) {
var str:String = bytes.getString(0, bytes.length);
if (StringTools.startsWith(str, "GET")) {
var r = ~/Sec-WebSocket-Key:\s*([A-z0-9=+\/]+)/;
r.match(str);
opened = true;
sendServerHandShake(socket, r.matched(1));
}
} else {
var data = parseData(bytes);
if (data != null) {
var packet = WebSocketTools.string2packet(data, builder);
receive(packet);
}
}
}
private function encodeBase64(content:String):String {
var suffix = switch (content.length % 3)
{
case 2: "=";
case 1: "==";
default: "";
};
return BaseCode.encode(content, "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/") + suffix;
}
class NekoWebConnection<O:Message, I:Message> extends NekoConnection<O, I> {
private function hex2data(hex:String):String {
var data = "";
for (i in 0...Std.int(hex.length / 2)) {
data += String.fromCharCode(Std.parseInt("0x" + hex.substr(i * 2, 2)));
}
return data;
}
private var opened:Bool;
private function sendServerHandShake(socket:sys.net.Socket, inpKey:String) {
var outKey = encodeBase64(hex2data(Sha1.encode(StringTools.trim(inpKey) + "258EAFA5-E914-47DA-95CA-C5AB0DC85B11")));
var s = "HTTP/1.1 101 Switching Protocols\r\n"
+ "Upgrade: websocket\r\n"
+ "Connection: Upgrade\r\n"
+ "Sec-WebSocket-Accept: " + outKey + "\r\n"
+ "\r\n";
socket.output.writeString(s);
}
private function writeData(data:String, socket:sys.net.Socket, isServer = true):Void {
socket.output.writeByte(0x81);
var len = 0;
if (data.length < 126) len = data.length;
else if (data.length < 65536) len = 126;
else len = 127;
socket.output.writeByte(len | (!isServer ? 0x80 : 0x00));
if (data.length >= 126)
{
if (data.length < 65536)
{
socket.output.writeByte((data.length >> 8) & 0xFF);
socket.output.writeByte(data.length & 0xFF);
}
else
{
socket.output.writeByte((data.length >> 24) & 0xFF);
socket.output.writeByte((data.length >> 16) & 0xFF);
socket.output.writeByte((data.length >> 8) & 0xFF);
socket.output.writeByte(data.length & 0xFF);
}
public function new(socket:Socket, i:Class<I>) {
super(socket, i);
opened = false;
}
if (isServer)
{
socket.output.writeString(data);
}
else
{
var mask = [ Std.random(256), Std.random(256), Std.random(256), Std.random(256) ];
socket.output.writeByte(mask[0]);
socket.output.writeByte(mask[1]);
socket.output.writeByte(mask[2]);
socket.output.writeByte(mask[3]);
var maskedData = new StringBuf();
for (i in 0...data.length)
{
maskedData.addChar(data.charCodeAt(i) ^ mask[i % 4]);
}
socket.output.writeString(maskedData.toString());
}
}
private function parseData(bytes:Bytes):String {
var p = 0;
var opcode = bytes.get(p++);
if (opcode == 0x00)
{
var s = "";
var b : Int;
while ((b = bytes.get(p++)) != 0xFF)
{
s += String.fromCharCode(b);
}
return s;
}
if (opcode == 0x81) // 0x81 = fin & text
{
var len = bytes.get(p++);
if (len & 0x80 != 0) // mask
{
len &= 0x7F;
if (len == 126)
{
var b2 = bytes.get(p++);
var b3 = bytes.get(p++);
len = (b2 << 8) + b3;
}
else
if (len == 127)
{
var b2 = bytes.get(p++);
var b3 = bytes.get(p++);
var b4 = bytes.get(p++);
var b5 = bytes.get(p++);
len = (b2 << 24) + (b3 << 16) + (b4 << 8) + b5;
}
//Lib.println("len = " + len);
// direct array init not work corectly!
var mask = [];
mask.push(bytes.get(p++));
mask.push(bytes.get(p++));
mask.push(bytes.get(p++));
mask.push(bytes.get(p++));
//Lib.println("mask = " + mask);
var data = new StringBuf();
for (i in 0...len)
{
data.addChar(bytes.get(p++) ^ mask[i % 4]);
}
//Lib.println("readed = " + data.toString());
return data.toString();
}
else
{
throw "Expected masked data.";
override public function send(packet:O):Void {
#if proto_debug L.d("Send", Type.getClassName(Type.getClass(packet)).split(".").pop()); #end
try {
var data = WebSocketTools.packet2string(packet);
writeData(data, socket);
} catch (e:Dynamic) {
trace(e);
}
}
if (opcode == 136) {
//socket.close();
opened = false;
return null;
override public function pushData(bytes:Bytes):Void {
if (!opened) {
var str:String = bytes.getString(0, bytes.length);
if (StringTools.startsWith(str, "GET")) {
var r = ~/Sec-WebSocket-Key:\s*([A-z0-9=+\/]+)/;
r.match(str);
opened = true;
sendServerHandShake(socket, r.matched(1));
}
} else {
var data = parseData(bytes);
if (data != null) {
var packet:I = WebSocketTools.string2packet(data, queue.packetClass);
packetHandler.emit(packet);
}
}
}
else
{
throw "Unsupported websocket opcode: " + opcode;
private function encodeBase64(content:String):String {
var suffix = switch (content.length % 3)
{
case 2: "=";
case 1: "==";
default: "";
};
return BaseCode.encode(content, "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/") + suffix;
}
private function hex2data(hex:String):String {
var data = "";
for (i in 0...Std.int(hex.length / 2)) {
data += String.fromCharCode(Std.parseInt("0x" + hex.substr(i * 2, 2)));
}
return data;
}
private function sendServerHandShake(socket:sys.net.Socket, inpKey:String) {
var outKey = encodeBase64(hex2data(Sha1.encode(StringTools.trim(inpKey) + "258EAFA5-E914-47DA-95CA-C5AB0DC85B11")));
var s = "HTTP/1.1 101 Switching Protocols\r\n"
+ "Upgrade: websocket\r\n"
+ "Connection: Upgrade\r\n"
+ "Sec-WebSocket-Accept: " + outKey + "\r\n"
+ "\r\n";
socket.output.writeString(s);
}
private function writeData(data:String, socket:sys.net.Socket, isServer = true):Void {
socket.output.writeByte(0x81);
var len = 0;
if (data.length < 126) len = data.length;
else if (data.length < 65536) len = 126;
else len = 127;
socket.output.writeByte(len | (!isServer ? 0x80 : 0x00));
if (data.length >= 126) {
if (data.length < 65536) {
socket.output.writeByte((data.length >> 8) & 0xFF);
socket.output.writeByte(data.length & 0xFF);
}
else {
socket.output.writeByte((data.length >> 24) & 0xFF);
socket.output.writeByte((data.length >> 16) & 0xFF);
socket.output.writeByte((data.length >> 8) & 0xFF);
socket.output.writeByte(data.length & 0xFF);
}
}
if (isServer) {
socket.output.writeString(data);
}
else {
var mask = [ Std.random(256), Std.random(256), Std.random(256), Std.random(256) ];
socket.output.writeByte(mask[0]);
socket.output.writeByte(mask[1]);
socket.output.writeByte(mask[2]);
socket.output.writeByte(mask[3]);
var maskedData = new StringBuf();
for (i in 0...data.length) {
maskedData.addChar(data.charCodeAt(i) ^ mask[i % 4]);
}
socket.output.writeString(maskedData.toString());
}
}
private function parseData(bytes:Bytes):String {
var p = 0;
var opcode = bytes.get(p++);
if (opcode == 0x00) {
var s = "";
var b:Int;
while ((b = bytes.get(p++)) != 0xFF) {
s += String.fromCharCode(b);
}
return s;
}
// 0x81 = fin & text
if (opcode == 0x81) {
var len = bytes.get(p++);
// mask
if (len & 0x80 != 0) {
len &= 0x7F;
if (len == 126) {
var b2 = bytes.get(p++);
var b3 = bytes.get(p++);
len = (b2 << 8) + b3;
}
else if (len == 127) {
var b2 = bytes.get(p++);
var b3 = bytes.get(p++);
var b4 = bytes.get(p++);
var b5 = bytes.get(p++);
len = (b2 << 24) + (b3 << 16) + (b4 << 8) + b5;
}
//Lib.println("len = " + len);
// direct array init not work corectly!
var mask = [];
mask.push(bytes.get(p++));
mask.push(bytes.get(p++));
mask.push(bytes.get(p++));
mask.push(bytes.get(p++));
//Lib.println("mask = " + mask);
var data = new StringBuf();
for (i in 0...len) {
data.addChar(bytes.get(p++) ^ mask[i % 4]);
}
//Lib.println("readed = " + data.toString());
return data.toString();
} else {
throw "Expected masked data.";
}
}
if (opcode == 136) {
//socket.close();
opened = false;
return null;
} else {
throw "Unsupported websocket opcode: " + opcode;
}
return null;
}
return null;
}
}