feat(app): add network game mode

gulpfile.js

@@ -4,11 +4,8 @@ const Config = require("./config.json");
 const packageInfo = require("./package.json");
 const { System, Sdk, Haxe, Project } = require("gulp-haxetool");
 const dateformat = require("dateformat");
-const argv = require("yargs").argv;
 const publish = require("./tasks/gulp-publish");
 
-Project.useRuffle();
-
 if (packageInfo.haxe) {
   Haxe.VERSION = packageInfo.haxe;
 }
@@ -66,9 +63,6 @@ const config = new Project.Config({
   flags: ["proto_debug"],
 });
 
-const host = argv.host || "localhost";
-const port = argv.port || 5000;
-
 const app = new Project(
   Project.BuildSystem.OPENFL,
   [
@@ -93,10 +87,6 @@ const app = new Project(
       width: 1280,
       height: 768,
     },
-    macros: [
-      `CompilationOption.set('host','${host}')`,
-      `CompilationOption.set('port',${port})`,
-    ],
     flags: ["app"],
   }),
 ).bind(module, gulp);

package.json

@@ -9,7 +9,7 @@
     "gulp-add": "0.0.2",
     "gulp-clean": "^0.4.0",
     "gulp-cli": "^2.2.0",
-    "gulp-haxetool": "^0.2.1",
+    "gulp-haxetool": "^0.1.9",
     "yargs": "^13.2.4"
   },
   "haxeDependencies": {

src/app/haxe/ru/m/puzzlez/net/Network.hx

@@ -15,6 +15,7 @@ import ru.m.puzzlez.proto.pack.GameActionRequest;
 import ru.m.puzzlez.proto.pack.GameCreateRequest;
 import ru.m.puzzlez.proto.pack.GameJoinRequest;
 import ru.m.puzzlez.proto.pack.GameLeaveRequest;
+import ru.m.puzzlez.proto.pack.GameListRequest;
 import ru.m.puzzlez.proto.pack.GameListResponse;
 import ru.m.puzzlez.proto.pack.NotificationResponse;
 import ru.m.puzzlez.proto.pack.Request;

src/app/haxe/ru/m/puzzlez/net/NetworkManager.hx

@@ -1,65 +0,0 @@
-package ru.m.puzzlez.net;
-
-import hw.connect.IConnection;
-import hw.signal.Signal;
-import promhx.Deferred;
-import promhx.Promise;
-
-enum NetworkState {
-  CONNECT;
-  ACTIVE;
-  DISCONNECT;
-  ERROR(error:Dynamic);
-}
-
-class ReconnectTimer {
-  private var interval:Float;
-  private var lastConnected:Float;
-  private var lastActivity:Float;
-  private var lastError:Float;
-  private var next:Float;
-
-  public function new(interval:Float) {
-    this.interval = interval;
-  }
-
-  public function connect():Promise<Void> {
-    d = new Deferred();
-    d.resolve();
-    return d.promise();
-  }
-
-  public function onActivity() {}
-
-  public function onError() {}
-}
-
-class NetworkManager {
-  public var state(default, null):Signal<NetworkState>;
-
-  private var reconnectTimer:ReconnectTimer;
-
-  public function new(connection:IConnection<Dynamic, Dynamic>) {
-    this.reconnectTimer = new ReconnectTimer(5.0);
-    connection.handler.connect(onConnectionChange);
-  }
-
-  public function reconnect() {
-    return this.reconnectTimer.connect().then(() => {
-      state.emit(CONNECT);
-      connection.connect();
-    });
-  }
-
-  private function onConnectionChange(event:ConnectionEvent):Void {
-    switch event {
-      case CONNECTED:
-        state.emit(ACTIVE);
-      case DISCONNECTED:
-        state.emit(DISCONNECT);
-      case ERROR(error):
-        state.emit(ERROR(error));
-        this.reconnect();
-    }
-  }
-}

src/app/haxe/ru/m/puzzlez/source/NginxImageSource.hx

@@ -25,7 +25,6 @@ class NginxImageSource implements ImageSource {
   public var id(default, never):String = "nginx";
 
   private var baseUrl:String;
-  private var cache:Map<String, Promise<NginxResponse>> = new Map();
 
   public function new(baseUrl:String) {
     this.baseUrl = baseUrl;
@@ -37,35 +36,31 @@ class NginxImageSource implements ImageSource {
 
   public function getPage(page:Page):Promise<DataPage<ImageId>> {
     var category = page.filter.get("category");
-    var url = category != null ? this.baseUrl + category + "/" : this.baseUrl;
-    if (!this.cache.exists(url)) {
-      this.cache.set(url, new JsonLoader<NginxResponse>().GET(url));
-    }
-    return this.cache.get(url).then((response:NginxResponse) -> {
-      var data:Array<ImageId> = [];
-      for (item in response) {
-        if (item.type == NginxResponseItemType.FILE) {
-          var itemId = category != null ? category + "@" + item.name : item.name;
-          data.push(new ImageId().setSource(id).setId(itemId));
+    return new JsonLoader<NginxResponse>().GET(category != null ? this.baseUrl + category + "/" : this.baseUrl)
+      .then((response:NginxResponse) -> {
+        var data:Array<ImageId> = [];
+        for (item in response) {
+          if (item.type == NginxResponseItemType.FILE) {
+            var itemId = category != null ? category + "@" + item.name : item.name;
+            data.push(new ImageId().setSource(id).setId(itemId));
+          }
         }
-      }
-      data = data.slice(page.index * page.count, (page.index + 1) * page.count);
-      return {
-        page: page,
-        data: data,
-        total: response.length,
-      }
-    });
+        return {
+          page: page,
+          data: data,
+          total: response.length,
+        }
+      });
   }
 
   public function load(id:String, thumb:Bool = false):Promise<ImageValue> {
     var url = this.baseUrl + StringTools.replace(id, "@", "/");
-    // TODO: default size by screen width?
-    var width = thumb ? 360 : 1920;
-    var parts = url.split(".");
-    var index = parts.length - 2;
-    parts[index] = parts[index] + '-w${width}';
-    url = parts.join(".");
+    if (thumb) {
+      var parts = url.split(".");
+      var index = parts.length - 2;
+      parts[index] = parts[index] + "-thumbnail";
+      url = parts.join(".");
+    }
     return Promise.promise(ImageValue.URL(url));
   }