Put add_client/remove_client and the various broadcast functions into Game

[empires-server] / lmno.js

diff --git a/lmno.js b/lmno.js
index 86306516878b1f68fd6d980ad9ea4e912692d053..175fe6300472cd914c562d7271131d8024cf6281 100644 (file)
--- a/lmno.js
+++ b/lmno.js
@@ -47,7 +47,10 @@ nunjucks.configure("templates", {
 });
 
 /* Load each of our game mini-apps. */
-var empires = require("./empires");
+const engines = {
+  empires: require("./empires"),
+  tictactoe: require("./tictactoe")
+};
 
 class LMNO {
   constructor() {
@@ -55,20 +58,22 @@ class LMNO {
   }
 
   generate_id() {
-    return [null,null,null,null].map(() => LMNO.letters.charAt(Math.floor(Math.random() * LMNO.letters.length))).join('');
+    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;
@@ -136,14 +141,20 @@ app.get('/[a-zA-Z0-9]{4}', (request, response) => {
 });
 
 /* LMNO middleware to lookup the game. */
-app.use('/empires/:game_id([a-zA-Z0-9]{4})', (request, response, next) => {
+app.use('/:engine([^/]+)/:game_id([a-zA-Z0-9]{4})', (request, response, next) => {
+  const engine = request.params.engine;
   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("/empires/" + game_id,
-                                                "/empires/" + 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;
   }
@@ -180,6 +191,7 @@ function auth_admin(request, response, next) {
 
 app.get('/logout', (request, response) => {
   request.session.user = undefined;
+  request.session.destroy();
 
   response.send("You are now logged out.");
 });
@@ -211,6 +223,16 @@ app.post('/login', async (request, response) => {
   return;
 });
 
+/* API to set uer profile information */
+app.put('/profile', (request, response) => {
+  const nickname = request.body.nickname;
+  if (nickname) {
+    request.session.nickname = nickname;
+    request.session.save();
+  }
+  response.send();
+});
+
 /* An admin page (only available to admin users, of course) */
 app.get('/admin/', auth_admin, (request, response) => {
   let active = [];
@@ -227,7 +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);
+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');