[client] fixes

src/common/haxe/ru/m/connect/fake/FakeConnection.hx

@@ -1,7 +1,19 @@
 package ru.m.connect.fake;
 
+import ru.m.connect.IConnection.ConnectionEvent;
+import promhx.Promise;
+import protohx.Message;
 
-class FakeConnection extends BaseConnection {
-    override public function connect():Void {}
-    override public function disconnect():Void {}
+
+class FakeConnection<O:Message, I:Message> extends BaseConnection<O, I> {
+
+    override public function connect():Promise<IConnection<O, I>> {
+        handler.emit(ConnectionEvent.CONNECTED);
+        var promise:Promise<IConnection<O, I>> = cast Promise.promise(this);
+        return promise;
+    }
+
+    override public function disconnect():Void {
+        handler.emit(ConnectionEvent.DISCONNECTED);
+    }
 }

src/common/haxe/ru/m/connect/js/JsConnection.hx

@@ -1,82 +1,83 @@
 package ru.m.connect.js;
 
-import ru.m.Base64;
-import ru.m.connect.IConnection.IConnectionHandler;
+import promhx.Promise;
 import protohx.Message;
-import haxe.io.Bytes;
+import ru.m.Base64;
+import ru.m.connect.IConnection.ConnectionEvent;
+
 
 typedef WebSocket = {
-  var onopen:Dynamic->Void;
-  var onclose:Dynamic->Void;
-  var onmessage:Dynamic->Void;
-  var onerror:Dynamic->Void;
-  function send(message:String):Void;
-  function emit(a:String, b:String):Void;
-  function close():Void;
+    var onopen:Dynamic -> Void;
+    var onclose:Dynamic -> Void;
+    var onmessage:Dynamic -> Void;
+    var onerror:Dynamic -> Void;
+    function send(message:String):Void;
+    function emit(a:String, b:String):Void;
+    function close():Void;
 }
 
-class JsConnection extends BaseConnection {
+class JsConnection<O:Message, I:Message> extends BaseConnection<O, I> {
 
-  private var host:String;
-  private var port:Int;
-  private var socket:WebSocket;
+    private var host:String;
+    private var port:Int;
+    private var socket:WebSocket;
 
-  public function new(host:String, port:Int) {
-    super();
-    this.host = host;
-    this.port = port;
-    connected = false;
-  }
-
-  private function buildSocket(host:String, port:Int):WebSocket {
-    return untyped __js__("new WebSocket('ws://'+host+':'+port);");
-  }
-
-  override public function connect():Void {
-    var self = this;
-    var decodeBytes = Base64.decodeBase64;
-    socket = buildSocket(host, port);
-    socket.onopen = this.onConnect;
-    socket.onclose = this.onClose;
-    socket.onerror = this.onError;
-    socket.onmessage = this.onSocketData;
-  }
-
-  override public function disconnect():Void {
-    socket.close();
-    connected = false;
-    handler.dispatch(function(h) h.onDisconnected());
-  }
-
-  private function onError(event:Dynamic):Void {
-    socket.close();
-    connected = false;
-    handler.dispatch(function(h) h.onError(event));
-  }
-
-  private function onConnect(_):Void {
-    connected = true;
-    handler.dispatch(function(h) h.onConnected());
-  }
-
-  private function onClose(_):Void {
-    socket.close();
-    connected = false;
-    handler.dispatch(function(h) h.onDisconnected());
-  }
-
-  private function onSocketData(event:Dynamic):Void {
-    try {
-      var data:String = event.data;
-      var packet = WebSocketTools.string2packet(data, builder);
-      receive(packet);
-    } catch (error:Dynamic) {
-      handler.dispatch(function(h) h.onError(error));
+    public function new(host:String, port:Int, i:Class<I>) {
+        super(i);
+        this.host = host;
+        this.port = port;
+        connected = false;
     }
-  }
 
-  override public function send(packet:Message):Void {
-    super.send(packet);
-    socket.send(WebSocketTools.packet2string(packet, builder));
-  }
+    private function buildSocket(host:String, port:Int):WebSocket {
+        return untyped __js__("new WebSocket('ws://'+host+':'+port);");
+    }
+
+    override public function connect():Promise<IConnection<O, I>>  {
+        var self = this;
+        var decodeBytes = Base64.decodeBase64;
+        socket = buildSocket(host, port);
+        socket.onopen = this.onConnect;
+        socket.onclose = this.onClose;
+        socket.onerror = this.onError;
+        socket.onmessage = this.onSocketData;
+        return connectDeferred.promise();
+    }
+
+    override public function disconnect():Void {
+        socket.close();
+        connected = false;
+    }
+
+    private function onError(event:Dynamic):Void {
+        socket.close();
+        connected = false;
+        handler.emit(ConnectionEvent.ERROR(event));
+    }
+
+    private function onConnect(_):Void {
+        connected = true;
+        handler.emit(ConnectionEvent.CONNECTED);
+    }
+
+    private function onClose(_):Void {
+        socket.close();
+        connected = false;
+        handler.emit(ConnectionEvent.DISCONNECTED);
+    }
+
+    private function onSocketData(event:Dynamic):Void {
+        try {
+            var data:String = event.data;
+            var packet:I = WebSocketTools.string2packet(data, queue.packetClass);
+            receive(packet);
+        } catch (error:Dynamic) {
+            handler.emit(ConnectionEvent.ERROR(event));
+        }
+    }
+
+    override public function send(packet:O):Void {
+        super.send(packet);
+        socket.send(WebSocketTools.packet2string(packet));
+    }
 }

src/common/haxe/ru/m/tankz/game/Game.hx

@@ -224,10 +224,9 @@ class Game {
     }
 
     public function next():Option<GameState> {
-        var level = state.level + 1;
         state.level++;
-        if (level >= config.game.levels) level = 0;
-        return Option.Some({type: state.type, presetId: preset.id, level: level});
+        if (state.level >= config.game.levels) state.level = 0;
+        return Option.Some({type: state.type, presetId: preset.id, level: state.level});
     }
 
     public function dispose():Void {