X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=lmno.js;h=b85041ec74d13be48abcbca9a5f7e3e8b900ba4e;hb=c381788fa303d9ca392fc4b7b25c4d55344717da;hp=a22f9588537b2cae1e75adbbeb94a88e68420e0a;hpb=c88f2e245843fb925a1da1474ffc56aa1c03b36f;p=empires-server

diff --git a/lmno.js b/lmno.js
index a22f958..b85041e 100644
--- a/lmno.js
+++ b/lmno.js
@@ -69,6 +69,8 @@ nunjucks.configure("templates", {
  *
  *                 /        Serves <identifier>-game.html template
  *
+ *                 /player  Allows client to set name or team
+ *
  *                 /events  Serves a stream of events. Game can override
  *                          the handle_events method, call super() first,
  *                          and then have code to add custom events.
@@ -78,8 +80,8 @@ nunjucks.configure("templates", {
  *                          add_move method.
  */
 const engines = {
-  empires: require("./empires"),
-  tictactoe: require("./tictactoe")
+  empires: require("./empires").Game,
+  tictactoe: require("./tictactoe").Game
 };
 
 class LMNO {
@@ -98,7 +100,7 @@ class LMNO {
 
     const engine = engines[engine_name];
 
-    const game = new engine.Game(id);
+    const game = new engine(id);
 
     this.games[id] = game;
 
@@ -277,7 +279,7 @@ app.get('/admin/', auth_admin, (request, response) => {
 /* Mount sub apps. only _after_ we have done all the middleware we need. */
 for (let key in engines) {
   const engine = engines[key];
-  const router = engine.Game.router;
+  const router = engine.router;
 
   /* Add routes that are common to all games. */
   router.get('/', (request, response) => {
@@ -289,6 +291,12 @@ for (let key in engines) {
       response.render(`${game.meta.identifier}-game.html`);
   });
 
+  router.put('/player', (request, response) => {
+    const game = request.game;
+
+    game.handle_player(request, response);
+  });
+
   router.get('/events', (request, response) => {
     const game = request.game;
 
@@ -297,18 +305,33 @@ for (let key in engines) {
 
   /* Further, add some routes conditionally depending on whether the
    * engine provides specific, necessary methods for the routes. */
-  if (engine.Game.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_by_session[request.session.id];
+
+      /* Reject move if there is no player for this session. */
+      if (! player) {
+        response.json({legal: false, message: "No valid player from session"});
+        return;
+      }
+
+      const result = game.add_move(player, move);
 
-      const legal = game.add_move(move);
+      /* Take care of any generic post-move work. */
+      game.post_move(player, result);
 
-      /* Inform this client whether the move was legal. */
-      response.send(JSON.stringify(legal));
+      /* Feed move response back to the client. */
+      response.json(result);
 
       /* And only if legal, inform all clients. */
-      if (! legal)
+      if (! result.legal)
         return;
 
       game.broadcast_move(move);
@@ -316,7 +339,7 @@ for (let key in engines) {
   }
 
   /* And mount the whole router at the path for the game. */
-  app.use(`/${engine.Game.meta.identifier}/[a-zA-Z0-9]{4}/`, router);
+  app.use(`/${engine.meta.identifier}/[a-zA-Z0-9]{4}/`, router);
 }
 
 app.listen(4000, function () {