X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=lmno.js;h=9998c734a2dc63b8f0f0943a928a1d76c73e4102;hb=8adcf9df208ac8d303706f89d359f69bbdc0a7a2;hp=abb1f2057c2582aad12d87e05ac732113583e0bb;hpb=a5dd0c5e612311132f053b71f32a1fe94e5819d3;p=empires-server

diff --git a/lmno.js b/lmno.js
index abb1f20..9998c73 100644
--- a/lmno.js
+++ b/lmno.js
@@ -47,32 +47,32 @@ nunjucks.configure("templates", {
 });
 
 /* Load each of our game mini-apps. */
-var empires = require("./empires");
-var tictactoe = require("./tictactoe");
+const engines = {
+  empires: require("./empires"),
+  tictactoe: require("./tictactoe")
+};
 
 class LMNO {
   constructor() {
-    this.ids = {};
+    this.games = {};
   }
 
   generate_id() {
     return Array(4).fill(null).map(() => LMNO.letters.charAt(Math.floor(Math.random() * LMNO.letters.length))).join('');
   }
 
-  create_game(engine) {
+  create_game(engine_name) {
     do {
       var id = this.generate_id();
-    } while (id in this.ids);
+    } while (id in this.games);
 
-    const game = new empires.Game();
+    const engine = engines[engine_name];
 
-    this.ids[id] = {
-	id: id,
-	engine: engine,
-	game: game
-    };
+    const game = new engine.Game(id);
 
-    return id;
+    this.games[id] = game;
+
+    return game;
   }
 }
 
@@ -108,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.
@@ -128,12 +128,12 @@ app.get('/[a-zA-Z0-9]{4}', (request, response) => {
     return;
   }
 
-  const game = lmno.ids[game_id];
+  const game = lmno.games[game_id];
   if (game === undefined) {
       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. */
@@ -142,23 +142,28 @@ app.use('/:engine([^/]+)/:game_id([a-zA-Z0-9]{4})', (request, response, next) =>
   const game_id = request.params.game_id;
   const canon_id = lmno_canonize(game_id);
 
-  /* Redirect user to page with the canonical ID in it. */
-  if (game_id !== canon_id) {
-    const new_url = request.originalUrl.replace(`/${engine}/${game_id}`,
-                                                `/${engine}/${canon_id}`);
+  /* Redirect user to page with the canonical ID in it, also ensuring
+   * that the game ID is _always_ followed by a slash. */
+  const has_slash = new RegExp(`^/${engine}/${game_id}/`);
+  if (game_id !== canon_id ||
+      ! has_slash.test(request.originalUrl))
+  {
+    const old_path = new RegExp(`/${engine}/${game_id}/?`);
+    const new_path = `/${engine}/${canon_id}/`;
+    const new_url = request.originalUrl.replace(old_path, new_path);
     response.redirect(301, new_url);
     return;
   }
 
   /* See if there is any game with this ID. */
-  const game = lmno.ids[game_id];
+  const game = lmno.games[game_id];
   if (game === undefined) {
     response.sendStatus(404);
     return;
   }
 
   /* Stash the game onto the request to be used by the game-specific code. */
-  request.game = game.game;
+  request.game = game;
   next();
 });
 
@@ -229,19 +234,33 @@ app.get('/admin/', auth_admin, (request, response) => {
   let active = [];
   let idle = [];
 
-  for (let id in lmno.ids) {
-    if (lmno.ids[id].game.clients.length)
-      active.push(lmno.ids[id]);
+  for (let id in lmno.games) {
+    if (lmno.games[id].clients.length)
+      active.push(lmno.games[id]);
     else
-      idle.push(lmno.ids[id]);
+      idle.push(lmno.games[id]);
   }
   response.render('admin.html', { test: "foobar", games: { active: active, idle: idle}});
 });
 
 
 /* Mount sub apps. only _after_ we have done all the middleware we need. */
-app.use('/empires/[a-zA-Z0-9]{4}/', empires.app);
-app.use('/tictactoe/[a-zA-Z0-9]{4}/', tictactoe.app);
+for (let key in engines) {
+  const engine = engines[key];
+
+  /* Add routes that are common to all games. */
+  engine.router.get('/', (request, response) => {
+    const game = request.game;
+
+    if (! request.session.nickname)
+      response.render('choose-nickname.html', { game_name: game.meta.name });
+    else
+      response.render(`${game.meta.identifier}-game.html`);
+  });
+
+  /* And mount the whole router at the path for the game. */
+  app.use(`/${engine.Game.meta.identifier}/[a-zA-Z0-9]{4}/`, engine.router);
+}
 
 app.listen(4000, function () {
   console.log('LMNO server listening on localhost:4000');