X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=lmno.js;h=c2942a419446562c0da4a0b11ec23318828ef002;hb=7cfa4c75739452a6022e2266cc4d6444ef79f4a5;hp=baa96f82a5469d66ccd51916005182e4361e0c74;hpb=041cdbd90052345df5a05779ada61aec53e403d4;p=empires-server

diff --git a/lmno.js b/lmno.js
index baa96f8..c2942a4 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());
@@ -81,7 +90,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,7 +101,11 @@ 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) {
@@ -113,10 +128,10 @@ 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();
 
@@ -127,8 +142,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');
@@ -267,7 +283,7 @@ app.get('/admin/', auth_admin, (request, response) => {
   let idle = [];
 
   for (let id in lmno.games) {
-    if (lmno.games[id].clients.length)
+    if (lmno.games[id].players.length)
       active.push(lmno.games[id]);
     else
       idle.push(lmno.games[id]);
@@ -285,10 +301,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) => {
@@ -314,7 +334,7 @@ for (let key in engines) {
     router.post('/move', (request, response) => {
       const game = request.game;
       const move = request.body.move;
-      const player = game.players[request.session.id];
+      const player = game.players_by_session[request.session.id];
 
       /* Reject move if there is no player for this session. */
       if (! player) {
@@ -324,6 +344,9 @@ for (let key in engines) {
 
       const result = game.add_move(player, move);
 
+      /* Take care of any generic post-move work. */
+      game.post_move(player, result);
+
       /* Feed move response back to the client. */
       response.json(result);