Generalize the handling of the /move request

[empires-server] / tictactoe.js

diff --git a/tictactoe.js b/tictactoe.js
index 8efc70f8e791fe20d1aa68233667516a52ed5af0..2a8dd06f9d580398e483e7a554883beee54bcc4e 100644 (file)
--- a/tictactoe.js
+++ b/tictactoe.js
@@ -6,64 +6,31 @@ const router = express.Router();
 class TicTacToe extends Game {
   constructor(id) {
     super(id);
-    this.moves = [];
-    this.board = Array(9).fill("");
-    this.next_player = "X";
+    this.state = {
+      moves: [],
+      board: Array(9).fill(""),
+      next_player: "X",
+    };
   }
 
   /* Returns Boolean indicating whether move was legal and added. */
   add_move(square) {
     /* Cannot move to an occupied square. */
-    if (this.board[square])
+    if (this.state.board[square])
       return false;
 
-    this.board[square] = this.next_player;
-    this.moves.push(square);
+    this.state.board[square] = this.state.next_player;
+    this.state.moves.push(square);
 
-    if (this.next_player === "X")
-      this.next_player = "O";
+    if (this.state.next_player === "X")
+      this.state.next_player = "O";
     else
-      this.next_player = "X";
+      this.state.next_player = "X";
 
     return true;
   }
-
-  broadcast_move(square) {
-    this.broadcast_event("move", square);
-  }
-
-  handle_events(request, response) {
-    super.handle_events(request, response);
-
-    /* When a new client joins, replay all previous moves to it. */
-    for (let move of this.moves) {
-      response.write(`event: move\ndata: ${move}\n\n`);
-    }
-  }
 }
 
-router.post('/move', (request, response) => {
-  const game = request.game;
-  const square = request.body.square;
-
-  const legal = game.add_move(square);
-
-  /* Inform this client whether the move was legal. */
-  response.send(JSON.stringify(legal));
-
-  /* And only if legal, inform all clients. */
-  if (! legal)
-    return;
-
-  game.broadcast_move(square);
-});
-
-router.get('/events', (request, response) => {
-  const game = request.game;
-
-  game.handle_events(request, response);
-});
-
 exports.router = router;
 exports.Game = TicTacToe;