X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=lmno.js;h=175fe6300472cd914c562d7271131d8024cf6281;hb=212b5a93209741c091d2f504f3d2edac8ae98262;hp=8a3210e5229c14cd750d5bbd4408c2536eab6c59;hpb=c60da21a61ee8b98550618aa197aefb3cf69a725;p=empires-server

diff --git a/lmno.js b/lmno.js
index 8a3210e..175fe63 100644
--- a/lmno.js
+++ b/lmno.js
@@ -47,8 +47,10 @@ 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() {
@@ -59,17 +61,19 @@ class LMNO {
     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);
 
-    const game = new empires.Game();
+    const engine = engines[engine_name];
+
+    const game = new engine.Game();
 
     this.ids[id] = {
-	id: id,
-	engine: engine,
-	game: game
+      id: id,
+      engine: engine.name,
+      game: game
     };
 
     return id;
@@ -151,7 +155,6 @@ 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;
   }
@@ -246,8 +249,10 @@ app.get('/admin/', auth_admin, (request, response) => {
 
 
 /* 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];
+  app.use(`/${engine.name}/[a-zA-Z0-9]{4}/`, engine.router);
+}
 
 app.listen(4000, function () {
   console.log('LMNO server listening on localhost:4000');