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

[common] binary message in ws connection

Browse Source
This commit is contained in:
shmyga
2019-05-23 11:43:35 +03:00
parent 4b426183e8
commit 864d5f3335
9 changed files with 60 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/common/haxe/ru/m/connect/PacketUtil.hx Normal file
View File

@@ -0,0 +1,20 @@
package ru.m.connect;
import haxe.io.Bytes;
import haxe.io.BytesOutput;
import protohx.Message;
class PacketUtil {
public static function fromBytes<P:Message>(bytes:Bytes, factory:Class<P>):P {
var packet:P = Type.createInstance(factory, []);
packet.mergeFrom(bytes);
return packet;
}
public static function toBytes<P:Message>(packet:P):Bytes {
var out = new BytesOutput();
packet.writeTo(out);
return out.getBytes();
}
}

8
src/common/haxe/ru/m/connect/desktop/DesktopConnection.hx
View File

@@ -1,7 +1,6 @@
package ru.m.connect.desktop;
import cpp.vm.Thread;
import haxe.io.BytesOutput;
import haxe.Timer;
import promhx.Deferred;
import promhx.Promise;
@@ -58,8 +57,7 @@ class DesktopConnection<O:Message, I:Message> extends BaseConnection<O, I> {
socket.waitForRead();
var size = socket.input.readUInt16();
var data = socket.input.read(size);
var packet:I = Type.createInstance(queue.packetClass, []);
packet.mergeFrom(data);
var packet:I = PacketUtil.fromBytes(data, queue.packetClass);
receiveHandler.emit(packet);
}
} catch (error:Dynamic) {
@@ -68,9 +66,7 @@ class DesktopConnection<O:Message, I:Message> extends BaseConnection<O, I> {
}
private function _send(packet:O):Void {
var out = new BytesOutput();
packet.writeTo(out);
var bytes = out.getBytes();
var bytes = PacketUtil.toBytes(packet);
socket.output.writeUInt16(bytes.length);
socket.output.write(bytes);
socket.output.flush();

1
src/common/haxe/ru/m/connect/fake/FakeConnection.hx
View File

@@ -4,7 +4,6 @@ import ru.m.connect.IConnection.ConnectionEvent;
import promhx.Promise;
import protohx.Message;
class FakeConnection<O:Message, I:Message> extends BaseConnection<O, I> {
override public function connect():Promise<IConnection<O, I>> {

15
src/common/haxe/ru/m/connect/flash/FlashConnection.hx
View File

@@ -8,7 +8,6 @@ import flash.events.SecurityErrorEvent;
import flash.net.Socket;
import flash.utils.Endian;
import haxe.io.Bytes;
import haxe.io.BytesOutput;
import promhx.Deferred;
import promhx.Promise;
import protohx.Message;
@@ -76,21 +75,19 @@ class FlashConnection<O:Message, I:Message> extends BaseConnection<O, I> {
private function onSocketData(_):Void {
try {
var b = new flash.utils.ByteArray();
socket.readBytes(b);
var bs = Bytes.ofData(cast b);
pushData(bs);
var data = new flash.utils.ByteArray();
socket.readBytes(data);
var bytes = Bytes.ofData(data);
pushData(bytes);
} catch (error:Dynamic) {
handler.emit(ConnectionEvent.ERROR(error));
}
}
private function _send(packet:O):Void {
var out = new BytesOutput();
packet.writeTo(out);
var bytes = out.getBytes();
var bytes = PacketUtil.toBytes(packet);
socket.writeShort(bytes.length);
socket.writeBytes(cast bytes.getData());
socket.writeBytes(bytes.getData());
socket.flush();
}
}

12
src/common/haxe/ru/m/connect/js/JsConnection.hx
View File

@@ -1,11 +1,12 @@
package ru.m.connect.js;
import haxe.io.Bytes;
import js.Browser;
import js.html.BinaryType;
import js.html.WebSocket;
import promhx.Deferred;
import promhx.Promise;
import protohx.Message;
import ru.m.Base64;
import ru.m.connect.IConnection;
class JsConnection<O:Message, I:Message> extends BaseConnection<O, I> {
@@ -32,8 +33,8 @@ class JsConnection<O:Message, I:Message> extends BaseConnection<O, I> {
override public function connect():Promise<IConnection<O, I>> {
var self = this;
var decodeBytes = Base64.decodeBase64;
socket = buildSocket(host, port);
socket.binaryType = BinaryType.ARRAYBUFFER;
socket.onopen = this.onConnect;
socket.onclose = this.onClose;
socket.onerror = this.onError;
@@ -67,8 +68,8 @@ class JsConnection<O:Message, I:Message> extends BaseConnection<O, I> {
private function onSocketData(event:Dynamic):Void {
try {
var data:String = event.data;
var packet:I = WebSocketTools.string2packet(data, queue.packetClass);
var bytes = Bytes.ofData(event.data);
var packet:I = PacketUtil.fromBytes(bytes, queue.packetClass);
receive(packet);
} catch (error:Dynamic) {
handler.emit(ConnectionEvent.ERROR(event));
@@ -77,6 +78,7 @@ class JsConnection<O:Message, I:Message> extends BaseConnection<O, I> {
override public function send(packet:O):Void {
super.send(packet);
socket.send(WebSocketTools.packet2string(packet));
var bytes = PacketUtil.toBytes(packet);
socket.send(bytes.getData());
}
}

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

@@ -1,6 +1,5 @@
package ru.m.connect.neko;
import haxe.io.BytesOutput;
import protohx.Message;
import sys.net.Socket;
@@ -19,9 +18,7 @@ class NekoConnection<O:Message, I:Message> extends BaseConnection<O, I> {
private function _send(packet:O):Void {
try {
var b = new BytesOutput();
packet.writeTo(b);
var bytes = b.getBytes();
var bytes = PacketUtil.toBytes(packet);
socket.output.writeUInt16(bytes.length);
socket.output.write(bytes);
socket.output.flush();

42
src/common/haxe/ru/m/connect/neko/NekoWebConnection.hx → src/common/haxe/ru/m/connect/neko/NekoWSConnection.hx
View File

@@ -3,10 +3,11 @@ package ru.m.connect.neko;
import haxe.crypto.BaseCode;
import haxe.crypto.Sha1;
import haxe.io.Bytes;
import haxe.io.BytesBuffer;
import protohx.Message;
import sys.net.Socket;
class NekoWebConnection<O:Message, I:Message> extends NekoConnection<O, I> {
class NekoWSConnection<O:Message, I:Message> extends NekoConnection<O, I> {
private var opened:Bool;
@@ -16,12 +17,8 @@ class NekoWebConnection<O:Message, I:Message> extends NekoConnection<O, I> {
}
override private function _send(packet:O):Void {
try {
var data = WebSocketTools.packet2string(packet);
var data = PacketUtil.toBytes(packet);
writeData(data, socket);
} catch (error:Dynamic) {
L.e('Proto', 'Error send packet: ${packet}', error);
}
}
override public function pushData(bytes:Bytes):Void {
@@ -36,13 +33,12 @@ class NekoWebConnection<O:Message, I:Message> extends NekoConnection<O, I> {
} else {
var data = parseData(bytes);
if (data != null) {
var packet:I = WebSocketTools.string2packet(data, queue.packetClass);
var packet:I = PacketUtil.fromBytes(data, queue.packetClass);
receive(packet);
}
}
}
private function encodeBase64(content:String):String {
var suffix = switch (content.length % 3)
{
@@ -73,8 +69,8 @@ class NekoWebConnection<O:Message, I:Message> extends NekoConnection<O, I> {
socket.output.writeString(s);
}
private function writeData(data:String, socket:sys.net.Socket, isServer = true):Void {
socket.output.writeByte(0x81);
private function writeData(data:Bytes, socket:sys.net.Socket, isServer = true):Void {
socket.output.writeByte(130);
var len = 0;
if (data.length < 126) len = data.length;
@@ -97,7 +93,7 @@ class NekoWebConnection<O:Message, I:Message> extends NekoConnection<O, I> {
}
if (isServer) {
socket.output.writeString(data);
socket.output.writeBytes(data, 0, data.length);
}
else {
var mask = [ Std.random(256), Std.random(256), Std.random(256), Std.random(256) ];
@@ -105,29 +101,29 @@ class NekoWebConnection<O:Message, I:Message> extends NekoConnection<O, I> {
socket.output.writeByte(mask[1]);
socket.output.writeByte(mask[2]);
socket.output.writeByte(mask[3]);
var maskedData = new StringBuf();
var maskedData = new BytesBuffer();
for (i in 0...data.length) {
maskedData.addChar(data.charCodeAt(i) ^ mask[i % 4]);
maskedData.addByte(data.get(i) ^ mask[i % 4]);
}
socket.output.writeString(maskedData.toString());
socket.output.writeBytes(maskedData.getBytes(), 0, maskedData.length);
}
}
private function parseData(bytes:Bytes):String {
private function parseData(bytes:Bytes):Bytes {
var p = 0;
var opcode = bytes.get(p++);
if (opcode == 0x00) {
var s = "";
var data = new BytesBuffer();
var b:Int;
while ((b = bytes.get(p++)) != 0xFF) {
s += String.fromCharCode(b);
data.addByte(b);
}
return s;
return data.getBytes();
}
// 0x81 = fin & text
if (opcode == 0x81) {
// 130 = binary data
if (opcode == 130) {
var len = bytes.get(p++);
// mask
@@ -158,13 +154,13 @@ class NekoWebConnection<O:Message, I:Message> extends NekoConnection<O, I> {
//Lib.println("mask = " + mask);
var data = new StringBuf();
var data = new BytesBuffer();
for (i in 0...len) {
data.addChar(bytes.get(p++) ^ mask[i % 4]);
data.addByte(bytes.get(p++) ^ mask[i % 4]);
}
//Lib.println("readed = " + data.toString());
return data.toString();
return data.getBytes();
} else {
throw "Expected masked data.";
}

4
src/server/haxe/ru/m/tankz/server/session/ProtoSession.hx
View File

@@ -1,10 +1,10 @@
package ru.m.tankz.server.session;
import ru.m.connect.neko.NekoWebConnection;
import haxe.io.Bytes;
import protohx.Message;
import ru.m.connect.IConnection;
import ru.m.connect.neko.NekoConnection;
import ru.m.connect.neko.NekoWSConnection;
import sys.net.Socket;
class ProtoSession<O:Message, I:Message> implements ISession {
@@ -37,7 +37,7 @@ class ProtoSession<O:Message, I:Message> implements ISession {
return null;
}
if (StringTools.startsWith(str, "GET")) {
connection = new NekoWebConnection<O, I>(socket, request);
connection = new NekoWSConnection<O, I>(socket, request);
} else {
connection = new NekoConnection<O, I>(socket, request);
}

4
src/server/haxe/ru/m/tankz/server/session/_Session.hx
View File

@@ -7,7 +7,7 @@ import com.hurlant.crypto.prng.Random;
import haxe.io.Bytes;
import ru.m.connect.IConnection;
import ru.m.connect.neko.NekoConnection;
import ru.m.connect.neko.NekoWebConnection;
import ru.m.connect.neko.NekoWSConnection;
import ru.m.tankz.proto.core.UserProto;
import ru.m.tankz.proto.pack.CreateGameRequest;
import ru.m.tankz.proto.pack.CreateGameResponse;
@@ -72,7 +72,7 @@ class _Session {
return;
}
if (StringTools.startsWith(str, "GET")) {
connection = new NekoWebConnection<Response, Request>(socket, Request);
connection = new NekoWSConnection<Response, Request>(socket, Request);
} else {
connection = new NekoConnection<Response, Request>(socket, Request);
}