Add message string to the return value of add_move

[empires-server] / tictactoe.js

diff --git a/tictactoe.js b/tictactoe.js
index a38cea0e807f02d4e1aea2448263c7a2ebdbae1e..da55c9f48e42c663f3e4016acaf6f4f083f15061 100644 (file)
--- a/tictactoe.js
+++ b/tictactoe.js
@@ -1,104 +1,39 @@
 const express = require("express");
-
-const router = express.Router();
-
-class TicTacToe {
-  constructor() {
-    this.moves = [];
-    this.board = Array(9).fill(null);
-    this.clients = [];
-    this.next_client_id = 1;
+const Game = require("./game.js");
+
+class TicTacToe extends Game {
+  constructor(id) {
+    super(id);
+    this.state = {
+      moves: [],
+      board: Array(9).fill(""),
+      next_player: "X",
+    };
   }
 
-  /* Returns Boolean indicating whether move was legal and added. */
+  /* Returns true if move was legal and added, false otherwise. */
   add_move(square) {
     /* Cannot move to an occupied square. */
-    if (this.board[square])
-      return false;
-
-    this.board[square] = 'X';
-    this.moves.push(square);
+    if (this.state.board[square])
+      return { legal: false, message: "Square is already occupied" };
 
-    return true;
-  }
-
-  add_client(response) {
-    const id = this.next_client_id;
-    this.clients.push({id: id,
-                       response: response});
-    this.next_client_id++;
+    this.state.board[square] = this.state.next_player;
+    this.state.moves.push(square);
 
-    return id;
-  }
+    if (this.state.next_player === "X")
+      this.state.next_player = "O";
+    else
+      this.state.next_player = "X";
 
-  remove_client(id) {
-    this.clients = this.clients.filter(client => client.id !== id);
-  }
-
-  /* Send a string to all clients */
-  broadcast_string(str) {
-    this.clients.forEach(client => client.response.write(str + '\n'));
-  }
-
-  /* Send an event to all clients.
-   *
-   * An event has both a declared type and a separate data block.
-   * It also ends with two newlines (to mark the end of the event).
-   */
-  broadcast_event(type, data) {
-    this.broadcast_string(`event: ${type}\ndata: ${data}\n`);
-  }
-
-  broadcast_move(square) {
-    this.broadcast_event("move", square);
+    return { legal: true };
   }
 }
 
-router.get('/', (request, response) => {
-  const game = request.game;
-
-  if (! request.session.nickname)
-    response.render('choose-nickname.html', { game_name: "Tic Tac Toe" });
-  else
-    response.render('tictactoe-game.html');
-});
-
-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;
-
-  /* These headers will keep the connection open so we can stream events. */
-  const headers = {
-    "Content-type": "text/event-stream",
-    "Connection": "keep-alive",
-    "Cache-Control": "no-cache"
-  };
-  response.writeHead(200, headers);
-
-  /* Add this new client to our list of clients. */
-  const id = game.add_client(response);
+TicTacToe.router = express.Router();
 
-  /* And queue up cleanup to be triggered on client close. */
-  request.on('close', () => {
-    game.remove_client(id);
-  });
-});
+TicTacToe.meta = {
+  name: "Tic Tac Toe",
+  identifier: "tictactoe"
+};
 
-exports.router = router;
-exports.name = "tictactoe";
 exports.Game = TicTacToe;