X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=lmno.js;h=6c85ce878eb9fccb9ca7437b3d481ad3f03cfc84;hb=acbdb40a24a67c2461ed61ca410af5926c4db28b;hp=d818cd12fb16de02af766b02b995d5eac3f43886;hpb=ab53a3a530ad30db6cf52b8507fa1cbddb28eecf;p=empires-server

diff --git a/lmno.js b/lmno.js
index d818cd1..6c85ce8 100644
--- a/lmno.js
+++ b/lmno.js
@@ -54,7 +54,7 @@ const engines = {
 
 class LMNO {
   constructor() {
-    this.ids = {};
+    this.games = {};
   }
 
   generate_id() {
@@ -64,13 +64,13 @@ class LMNO {
   create_game(engine_name) {
     do {
       var id = this.generate_id();
-    } while (id in this.ids);
+    } while (id in this.games);
 
     const engine = engines[engine_name];
 
     const game = new engine.Game();
 
-    this.ids[id] = {
+    this.games[id] = {
       id: id,
       engine: engine.name,
       game: game
@@ -132,7 +132,7 @@ 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;
@@ -155,13 +155,12 @@ app.use('/:engine([^/]+)/:game_id([a-zA-Z0-9]{4})', (request, response, next) =>
     const old_path = new RegExp(`/${engine}/${game_id}/?`);
     const new_path = `/${engine}/${canon_id}/`;
     const new_url = request.originalUrl.replace(old_path, new_path);
-    console.log("Redirecting from " + request.originalUrl + " to " + new_url);
     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;
@@ -239,11 +238,11 @@ 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].game.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}});
 });
@@ -252,7 +251,7 @@ app.get('/admin/', auth_admin, (request, response) => {
 /* Mount sub apps. only _after_ we have done all the middleware we need. */
 for (let key in engines) {
   const engine = engines[key];
-  app.use(`/${engine.name}/[a-zA-Z0-9]{4}/`, engine.app);
+  app.use(`/${engine.name}/[a-zA-Z0-9]{4}/`, engine.router);
 }
 
 app.listen(4000, function () {