Standardize transmission of game "state" when a client joins

[empires-server] / tictactoe.js

diff --git a/tictactoe.js b/tictactoe.js
index 1f559bde50c1a91be83cd2847d6d6cefe990650b..9140b89da9bad2d2b69e2aca9e3f53ff1c2372f9 100644 (file)
--- a/tictactoe.js
+++ b/tictactoe.js
@@ -6,18 +6,26 @@ const router = express.Router();
 class TicTacToe extends Game {
   constructor(id) {
     super(id);
-    this.moves = [];
-    this.board = Array(9).fill(null);
+    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] = 'X';
-    this.moves.push(square);
+    this.state.board[square] = this.state.next_player;
+    this.state.moves.push(square);
+
+    if (this.state.next_player === "X")
+      this.state.next_player = "O";
+    else
+      this.state.next_player = "X";
 
     return true;
   }
@@ -25,15 +33,6 @@ class TicTacToe extends Game {
   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) => {