X-Git-Url: https://git.cworth.org/git?p=empires-server;a=blobdiff_plain;f=lmno.js;h=54baea91f8d5688a74071fa45d19a12cd13ae091;hp=db0d35b9cc3a55fef821f1b1d2f75a5c9aee868d;hb=HEAD;hpb=9d73dc393cf84f6473304528f09e7b8696ed6510

diff --git a/lmno.js b/lmno.js
index db0d35b..54baea9 100644
--- a/lmno.js
+++ b/lmno.js
@@ -32,6 +32,15 @@ The "node lmno-passwd.js" command can help generate password hashes.`);
 }
 
 const app = express();
+
+/* This 'trust proxy' option, (and, really? a space in an option
+ * name?!)  means that express will grab hostname and IP values from
+ * the X-Forwarded-* header fields. We need that so that our games
+ * will display a proper hostname of https://lmno.games/WXYZ instead
+ * of http://localhost/QFBL which will obviously not be a helpful
+ * thing to share around.
+ */
+app.set('trust proxy', true);
 app.use(cors());
 app.use(body_parser.urlencoded({ extended: false }));
 app.use(body_parser.json());
@@ -41,11 +50,32 @@ app.use(session({
   saveUninitialized: false
 }));
 
-nunjucks.configure("templates", {
+const njx = nunjucks.configure("templates", {
   autoescape: true,
   express: app
 });
 
+njx.addFilter('active', function(list) {
+  if (list)
+    return list.filter(e => e.active === true);
+  else
+    return [];
+});
+
+njx.addFilter('idle', function(list) {
+  if (list)
+    return list.filter(e => e.active === false);
+  else
+    return [];
+});
+
+njx.addFilter('map_prop', function(list, prop) {
+  if (list)
+    return list.map(e => e[prop]);
+  else
+    return [];
+});
+
 /* Load each of our game mini-apps.
  *
  * Each "engine" we load here must have a property .Game on the
@@ -81,7 +111,9 @@ nunjucks.configure("templates", {
  */
 const engines = {
   empires: require("./empires").Game,
-  tictactoe: require("./tictactoe").Game
+  tictactoe: require("./tictactoe").Game,
+  scribe: require("./scribe").Game,
+  empathy: require("./empathy").Game
 };
 
 class LMNO {
@@ -90,13 +122,16 @@ class LMNO {
   }
 
   generate_id() {
-    return Array(4).fill(null).map(() => LMNO.letters.charAt(Math.floor(Math.random() * LMNO.letters.length))).join('');
+    /* Note: The copy from Array(4) to [...Array(4)] is necessary so
+     * that map() will actually work, (which it doesn't on an array
+     * from Array(N) which is in this strange state of having "empty"
+     * items rather than "undefined" as we get after [...Array(4)] */
+    return [...Array(4)].map(() => LMNO.letters.charAt(Math.floor(Math.random() * LMNO.letters.length))).join('');
   }
 
-  create_game(engine_name) {
-    do {
-      var id = this.generate_id();
-    } while (id in this.games);
+  create_game_with_id(engine_name, id) {
+    if (this.games[id])
+      return null;
 
     const engine = engines[engine_name];
 
@@ -106,6 +141,14 @@ class LMNO {
 
     return game;
   }
+
+  create_game(engine_name) {
+    do {
+      var id = this.generate_id();
+    } while (id in this.games);
+
+    return this.create_game_with_id(engine_name, id);
+  }
 }
 
 /* Some letters we don't use in our IDs:
@@ -113,13 +156,20 @@ class LMNO {
  * 1. Vowels (AEIOU) to avoid accidentally spelling an unfortunate word
  * 2. Lowercase letters (replace with corresponding capital on input)
  * 3. N (replace with M on input)
- * 4. P (replace with B on input)
- * 5. S (replace with F on input)
+ * 4. B (replace with P on input)
+ * 5. F,X (replace with S on input)
  */
-LMNO.letters = "BCDFGHJKLMQRTVWXYZ";
+LMNO.letters = "CCDDDGGGHHJKLLLLMMMMPPPPQRRRSSSTTTVVWWYYZ";
 
 const lmno = new LMNO();
 
+/* Pre-allocate an empires game with ID QRST.
+ * This is for convenience in the development of the flempires
+ * client which would like to have stable API endpoints across
+ * server restarts.
+ */
+lmno.create_game_with_id("empires", "QRST");
+
 /* Force a game ID into a canonical form as described above. */
 function lmno_canonize(id) {
   /* Capitalize */
@@ -127,8 +177,9 @@ function lmno_canonize(id) {
 
   /* Replace unused letters with nearest phonetic match. */
   id = id.replace(/N/g, 'M');
-  id = id.replace(/P/g, 'B');
-  id = id.replace(/S/g, 'F');
+  id = id.replace(/B/g, 'P');
+  id = id.replace(/F/g, 'S');
+  id = id.replace(/X/g, 'S');
 
   /* Replace unused numbers nearest visual match. */
   id = id.replace(/0/g, 'O');
@@ -251,7 +302,7 @@ app.post('/login', async (request, response) => {
   return;
 });
 
-/* API to set uer profile information */
+/* API to set user profile information */
 app.put('/profile', (request, response) => {
   const nickname = request.body.nickname;
   if (nickname) {
@@ -267,12 +318,12 @@ app.get('/admin/', auth_admin, (request, response) => {
   let idle = [];
 
   for (let id in lmno.games) {
-    if (lmno.games[id].players.length)
+    if (lmno.games[id].players.filter(p => p.active).length > 0)
       active.push(lmno.games[id]);
     else
       idle.push(lmno.games[id]);
   }
-  response.render('admin.html', { test: "foobar", games: { active: active, idle: idle}});
+  response.render('admin.html', { games: { active: active, idle: idle}});
 });
 
 
@@ -285,10 +336,14 @@ for (let key in engines) {
   router.get('/', (request, response) => {
     const game = request.game;
 
-    if (! request.session.nickname)
-      response.render('choose-nickname.html', { game_name: game.meta.name });
-    else
+    if (! request.session.nickname) {
+      response.render('choose-nickname.html', {
+        game_name: game.meta.name,
+        options: game.meta.options
+      });
+    } else {
       response.render(`${game.meta.identifier}-game.html`);
+    }
   });
 
   router.put('/player', (request, response) => {