X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=lmno.js;h=d01b3e9478543b20c9a51196677a30a02c30edef;hb=33aee0d9000e189396a7268bff8068615c650b38;hp=18e60efd947349be35218a643ac6ba7a9756971d;hpb=92382a8dd4bfc9c83b7cf5fa1c0981b01096efd0;p=empires-server

diff --git a/lmno.js b/lmno.js
index 18e60ef..d01b3e9 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,8 @@ nunjucks.configure("templates", {
  */
 const engines = {
   empires: require("./empires").Game,
-  tictactoe: require("./tictactoe").Game
+  tictactoe: require("./tictactoe").Game,
+  scribe: require("./scribe").Game
 };
 
 class LMNO {
@@ -267,7 +277,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 +295,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) => {
@@ -305,11 +319,16 @@ for (let key in engines) {
 
   /* Further, add some routes conditionally depending on whether the
    * engine provides specific, necessary methods for the routes. */
-  if (engine.prototype.add_move) {
+
+  /* Note: We have to use hasOwnProperty here since the base Game
+   * class has a geeric add_move function, and we don't want that to
+   * have any influence on our decision. Only if the child has
+   * overridden that do we want to create a "/move" route. */
+  if (engine.prototype.hasOwnProperty("add_move")) {
     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) {
@@ -319,6 +338,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);