Give the "/events" route a common implementation

[empires-server] / tictactoe.js

diff --git a/tictactoe.js b/tictactoe.js
index 5b8729e48568ff114bc3acc9884495ff61081062..89ad5d2b4685224ed4766447cea4eef9f4c437bb 100644 (file)
--- a/tictactoe.js
+++ b/tictactoe.js
@@ -1,56 +1,33 @@
 const express = require("express");
 const Game = require("./game.js");
 
-const engine_name = "tictactoe";
-
 const router = express.Router();
 
 class TicTacToe extends Game {
-  constructor() {
-    super(engine_name);
-    this.moves = [];
-    this.board = Array(9).fill(null);
-    this.clients = [];
-    this.next_client_id = 1;
+  constructor(id) {
+    super(id);
+    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);
-
-    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`);
+    return true;
   }
 
   broadcast_move(square) {
@@ -58,15 +35,6 @@ class TicTacToe extends Game {
   }
 }
 
-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;
@@ -83,26 +51,10 @@ router.post('/move', (request, response) => {
   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);
-
-  /* And queue up cleanup to be triggered on client close. */
-  request.on('close', () => {
-    game.remove_client(id);
-  });
-});
-
 exports.router = router;
-exports.name = engine_name;
 exports.Game = TicTacToe;
+
+TicTacToe.meta = {
+  name: "Tic Tac Toe",
+  identifier: "tictactoe"
+};