snakeia-server 1.2.0 → 1.2.1

package/.drone.yml

@@ -16,4 +16,4 @@ steps:
       from_secret: REGISTRY_PASSWORD
     tags:
       - latest
-      - 1.2.0
+      - 1.2.1

package/GameEngineMultithreading.js

@@ -115,7 +115,7 @@ if(!isMainThread) {
       if(!game) {
         try {
           game = new GameEngine(grid, snakes, data.speed, data.enablePause, data.enableRetry, data.progressiveSpeed, data.aiStuckLimit, data.disableStuckAIDetection, data.aiUltraModelSettings);
-          await game.init();
+          await initGame();
         } catch(e) {
           console.error(e);
           
@@ -124,18 +124,6 @@ if(!isMainThread) {
             errorOccurred: true
           });
         }
-  
-        parentPort.postMessage({
-          type: "init",
-          "snakes": copySnakes(game.snakes),
-          "grid": copyGrid(game.grid),
-          "enablePause": game.enablePause,
-          "enableRetry": game.enableRetry,
-          "progressiveSpeed": game.progressiveSpeed,
-          "offsetFrame": game.speed * GameConstants.Setting.TIME_MULTIPLIER,
-          "errorOccurred": game.errorOccurred,
-          "engineLoading": game.engineLoading
-        });
     
         game.onReset(() => {
           parentPort.postMessage({
@@ -318,7 +306,7 @@ if(!isMainThread) {
         game.countBeforePlay = 3;
 
         try {
-          await game.init();
+          await initGame();
         } catch(e) {
           console.error(e);
 
@@ -400,4 +388,20 @@ if(!isMainThread) {
       }
     }
   });
+}
+
+async function initGame() {
+  await game.init();
+
+  parentPort.postMessage({
+    type: "init",
+    "snakes": copySnakes(game.snakes),
+    "grid": copyGrid(game.grid),
+    "enablePause": game.enablePause,
+    "enableRetry": game.enableRetry,
+    "progressiveSpeed": game.progressiveSpeed,
+    "offsetFrame": game.speed * GameConstants.Setting.TIME_MULTIPLIER,
+    "errorOccurred": game.errorOccurred,
+    "engineLoading": game.engineLoading
+  });
 }

package/GameEngineMultithreadingController.js

@@ -35,101 +35,24 @@ class GameEngineMultithreadingController extends GameEngine {
   }
 
   async init() {
-    return new Promise(resolve => {
-      if(!this.eventsInit) {
-        this.worker.on("message", (data) => {
-          const type = data.type;
-          const dataKeys = Object.keys(data);
-
-          if(dataKeys.length > 1) {
-            let grid = this.grid;
-            let snakes = this.snakes;
-
-            if(data.grid) {
-              grid = Object.assign(new Grid(), data.grid);
-              data.grid = grid;
-            }
-            
-            if(data.snakes) {
-              for(let i = 0; i < data.snakes.length; i++) {
-                data.snakes[i].grid = grid;
-                data.snakes[i] = Object.assign(new Snake(), data.snakes[i]);
-
-                for(let j = 0; j < data.snakes[i].queue.length; j++) {
-                  data.snakes[i].queue[j] = Object.assign(new Position(), data.snakes[i].queue[j]);
-                }
-              }
-
-              snakes = data.snakes;
-            }
-
-            this.snakes = snakes;
-            this.grid = grid;
-
-            for(let i = 0; i < dataKeys.length; i++) {
-              if(dataKeys[i] != "snakes" && dataKeys[i] != "grid") {
-                this[dataKeys[i]] = data[dataKeys[i]];
-              }
-            }
-          }
+    if(!this.eventsInit) {
+      this.initEventHandlers();
+    }
 
-          switch(type) {
-            case "init":
-              this.workerReady = true;
-              this.passQueuedMessages();
-              resolve();
-              break;
-            case "reset":
-              this.reactor.dispatchEvent("onReset");
-              break;
-            case "start":
-              this.reactor.dispatchEvent("onStart");
-              break;
-            case "pause":
-              this.reactor.dispatchEvent("onPause");
-              break;
-            case "continue":
-              this.reactor.dispatchEvent("onContinue");
-              break;
-            case "stop":
-              this.reactor.dispatchEvent("onStop");
-              break;
-            case "exit":
-              this.reactor.dispatchEvent("onExit");
-              break;
-            case "kill":
-              this.reactor.dispatchEvent("onKill");
-              break;
-            case "scoreIncreased":
-              this.reactor.dispatchEvent("onScoreIncreased");
-              break;
-            case "update":
-              this.reactor.dispatchEvent("onUpdate");
-              break;
-            case "updateCounter":
-              this.reactor.dispatchEvent("onUpdateCounter");
-              break;
-          }
-        });
-        
-        this.worker.on("error", (error) => {
-          if(logger) logger.error("Error in GameEngineMultithreading", error);
-          this.errorOccurred = true;
-          this.reactor.dispatchEvent("onStop");
-        });
-        
-        this.worker.on("exit", () => {
-          this.gameFinished = true;
-          this.reactor.dispatchEvent("onStop");
-        });
+    if(this.grid) {
+      this.grid.rngGrid = null;
+      this.grid.rngGame = null;
+    }
 
-        this.eventsInit = true;
-      }
+    return new Promise(resolve => {
+      const handleMessage = (data) => {
+        if(data.type === "init") {
+          this.worker.off("message", handleMessage);
+          resolve();
+        }
+      };
 
-      if(this.grid) {
-        this.grid.rngGrid = null;
-        this.grid.rngGame = null;
-      }
+      this.worker.on("message", handleMessage);
 
       this.worker.postMessage({
         type: "init",
@@ -146,6 +69,95 @@ class GameEngineMultithreadingController extends GameEngine {
     });
   }
 
+  initEventHandlers() {
+    this.worker.on("message", data => {
+      const type = data.type;
+      const dataKeys = Object.keys(data);
+
+      if (dataKeys.length > 1) {
+        let grid = this.grid;
+        let snakes = this.snakes;
+
+        if (data.grid) {
+          grid = Object.assign(new Grid(), data.grid);
+          data.grid = grid;
+        }
+
+        if (data.snakes) {
+          for (let i = 0; i < data.snakes.length; i++) {
+            data.snakes[i].grid = grid;
+            data.snakes[i] = Object.assign(new Snake(), data.snakes[i]);
+
+            for (let j = 0; j < data.snakes[i].queue.length; j++) {
+              data.snakes[i].queue[j] = Object.assign(new Position(), data.snakes[i].queue[j]);
+            }
+          }
+
+          snakes = data.snakes;
+        }
+
+        this.snakes = snakes;
+        this.grid = grid;
+
+        for (let i = 0; i < dataKeys.length; i++) {
+          if (dataKeys[i] != "snakes" && dataKeys[i] != "grid") {
+            this[dataKeys[i]] = data[dataKeys[i]];
+          }
+        }
+      }
+
+      switch (type) {
+        case "init":
+          this.workerReady = true;
+          this.passQueuedMessages();
+          break;
+        case "reset":
+          this.reactor.dispatchEvent("onReset");
+          break;
+        case "start":
+          this.reactor.dispatchEvent("onStart");
+          break;
+        case "pause":
+          this.reactor.dispatchEvent("onPause");
+          break;
+        case "continue":
+          this.reactor.dispatchEvent("onContinue");
+          break;
+        case "stop":
+          this.reactor.dispatchEvent("onStop");
+          break;
+        case "exit":
+          this.reactor.dispatchEvent("onExit");
+          break;
+        case "kill":
+          this.reactor.dispatchEvent("onKill");
+          break;
+        case "scoreIncreased":
+          this.reactor.dispatchEvent("onScoreIncreased");
+          break;
+        case "update":
+          this.reactor.dispatchEvent("onUpdate");
+          break;
+        case "updateCounter":
+          this.reactor.dispatchEvent("onUpdateCounter");
+          break;
+      }
+    });
+
+    this.worker.on("error", (error) => {
+      if (logger) logger.error("Error in GameEngineMultithreading", error);
+      this.errorOccurred = true;
+      this.reactor.dispatchEvent("onStop");
+    });
+
+    this.worker.on("exit", () => {
+      this.gameFinished = true;
+      this.reactor.dispatchEvent("onStop");
+    });
+
+    this.eventsInit = true;
+  }
+
   reset() {
     this.passMessage({ type: "reset" });
   }

package/README.md

@@ -8,7 +8,7 @@ A server for my [SnakeIA](https://github.com/Eliastik/snakeia) game, written in
 
 ## About this server
 
-* Version 1.2.0 (10/5/2025)
+* Version 1.2.1 (10/7/2025)
 * Made in France by Eliastik - [eliastiksofts.com](http://eliastiksofts.com) - Contact : [eliastiksofts.com/contact](http://eliastiksofts.com/contact)
 * License: GNU GPLv3 (see LICENCE.txt file)
 
@@ -74,7 +74,7 @@ You can create another configuration file in the **config** directory named **lo
 ````
 {
     "ServerConfig": {
-        "version": "1.2.0", // The server version
+        "version": "1.2.1", // The server version
         "port": 3000, // The port where the server runs
         "proxyMode": false, // Sets this value to true if your server is behind a proxy - defaults to false
         "numberOfProxies": 1, // Sets the number of reverse proxies in front of the server. Default to 1. See: https://expressjs.com/en/guide/behind-proxies.html / https://express-rate-limit.mintlify.app/guides/troubleshooting-proxy-issues
@@ -88,7 +88,7 @@ You can create another configuration file in the **config** directory named **lo
         "enableAI": false, // Disable or enable AIs
         "aiUltraAPIURL": "https://www.eliastiksofts.com/snakeia/models/", // URL to the API listing the Ultra AI models. The game engine will use this API to load the default model
         "aiUltraModelID": null, // ID of the model (as returned by the API at the URL above) to load for the Ultra AI. Can be left empty; in that case, the default model provided by the API will be loaded
-        "aiUltraCustomModelURL": null, // A URL pointing to a custom AI model to load. Must be a TensorFlow.js model trained for the Ultra AI. If there's an issue, game initialization will fail when Ultra AIs are present in the match
+        "aiUltraCustomModelURL": null, // A URL pointing to a custom AI model to load. Must be a TensorFlow.js model trained for the Ultra AI. If there's an issue, game initialization will fail when Ultra AIs are present in the game
         "playerWaitTime": 45000, // The time while waiting for players to join a room (ms)
         "enableMaxTimeGame": true, // Enable time limit for each game
         "maxTimeGame": 300000, // The time limit for each game (ms)
@@ -123,7 +123,10 @@ You can create another configuration file in the **config** directory named **lo
 
 ## Changelog
 
-* Version 1.2.0 (10/5/2025) :
+* Version 1.2.1 (10/7/2025):
+    - Fixed a bug where the game could get stuck on the "Loading..." screen when restarting.
+
+* Version 1.2.0 (10/5/2025):
     - Adaptation to version 3.0.0 of SnakeIA and implementation of Ultra AI
     - Bug fixes
     - Updated dependencies
@@ -203,7 +206,7 @@ Un serveur pour mon jeu [SnakeIA](https://github.com/Eliastik/snakeia), écrit e
 
 ## À propos de ce serveur
 
-* Version 1.2.0 (05/10/2025)
+* Version 1.2.1 (07/10/2025)
 * Made in France by Eliastik - [eliastiksofts.com](http://eliastiksofts.com) - Contact : [eliastiksofts.com/contact](http://eliastiksofts.com/contact)
 * Licence : GNU GPLv3 (voir le fichier LICENCE.txt)
 
@@ -269,7 +272,7 @@ Vous pouvez créer un fichier de configuration **local.json** dans le dossier **
 ````
 {
     "ServerConfig": {
-        "version": "1.2.0", // La version du serveur
+        "version": "1.2.1", // La version du serveur
         "port": 3000, // Le port sur lequel lancer le server
         "proxyMode": false, // Mettez à true si votre serveur est derrière un proxy - par défaut false
         "numberOfProxies": 1, // Configure le nombre de proxies devant votre serveur. Par défaut 1. Voir : https://expressjs.com/en/guide/behind-proxies.html / https://express-rate-limit.mintlify.app/guides/troubleshooting-proxy-issues
@@ -318,6 +321,9 @@ Vous pouvez créer un fichier de configuration **local.json** dans le dossier **
 
 ## Journal des changements
 
+* Version 1.2.1 (07/10/2025):
+    - Correction d'un bug où le jeu restait bloqué sur le message "Chargement..." lorsque la partie était recommencée
+
 * Version 1.2.0 (05/10/2025) :
     - Adaptation à la version 3.0.0 de SnakeIA et à la mise en place de l'IA Ultra
     - Correction de bugs

package/config/default.json

@@ -1,6 +1,6 @@
 {
     "ServerConfig": {
-        "version": "1.2.0",
+        "version": "1.2.1",
         "port": 3000,
         "proxyMode": false,
         "numberOfProxies": 1,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "snakeia-server",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "Server for multiplaying in SnakeIA (https://github.com/Eliastik/snakeia)",
   "main": "server.js",
   "scripts": {