tictactoe: Move all state-related properties into a new "state" property

[empires-server] / lmno.js

diff --git a/lmno.js b/lmno.js
index 7fe42659c28d8dde86a9c734fdb83659c0923086..9998c734a2dc63b8f0f0943a928a1d76c73e4102 100644 (file)
--- a/lmno.js
+++ b/lmno.js
@@ -68,15 +68,11 @@ class LMNO {
 
     const engine = engines[engine_name];
 
-    const game = new engine.Game();
+    const game = new engine.Game(id);
 
-    this.games[id] = {
-      id: id,
-      engine: engine.name,
-      game: game
-    };
+    this.games[id] = game;
 
-    return id;
+    return game;
   }
 }
 
@@ -112,8 +108,8 @@ function lmno_canonize(id) {
 
 app.post('/new/:game_engine', (request, response) =>  {
   const game_engine = request.params.game_engine;
-  const game_id = lmno.create_game(game_engine);
-  response.send(JSON.stringify(game_id));
+  const game = lmno.create_game(game_engine);
+  response.send(JSON.stringify(game.id));
 });
 
 /* Redirect any requests to a game ID at the top-level.
@@ -137,7 +133,7 @@ app.get('/[a-zA-Z0-9]{4}', (request, response) => {
       response.sendStatus(404);
       return;
   }
-  response.redirect(301, `/${game.engine}/${game.id}/`);
+  response.redirect(301, `/${game.meta.identifier}/${game.id}/`);
 });
 
 /* LMNO middleware to lookup the game. */
@@ -167,7 +163,7 @@ app.use('/:engine([^/]+)/:game_id([a-zA-Z0-9]{4})', (request, response, next) =>
   }
 
   /* Stash the game onto the request to be used by the game-specific code. */
-  request.game = game.game;
+  request.game = game;
   next();
 });
 
@@ -239,7 +235,7 @@ app.get('/admin/', auth_admin, (request, response) => {
   let idle = [];
 
   for (let id in lmno.games) {
-    if (lmno.games[id].game.clients.length)
+    if (lmno.games[id].clients.length)
       active.push(lmno.games[id]);
     else
       idle.push(lmno.games[id]);
@@ -263,7 +259,7 @@ for (let key in engines) {
   });
 
   /* And mount the whole router at the path for the game. */
-  app.use(`/${engine.name}/[a-zA-Z0-9]{4}/`, engine.router);
+  app.use(`/${engine.Game.meta.identifier}/[a-zA-Z0-9]{4}/`, engine.router);
 }
 
 app.listen(4000, function () {