Put add_client/remove_client and the various broadcast functions into Game

[empires-server] / tictactoe.js

diff --git a/tictactoe.js b/tictactoe.js
index a38cea0e807f02d4e1aea2448263c7a2ebdbae1e..4e76638a7cd3290df810eee00cd677c3af1ec0f8 100644 (file)
--- a/tictactoe.js
+++ b/tictactoe.js
@@ -1,13 +1,15 @@
 const express = require("express");
+const Game = require("./game.js");
+
+const engine_name = "tictactoe";
 
 const router = express.Router();
 
-class TicTacToe {
+class TicTacToe extends Game {
   constructor() {
+    super(engine_name);
     this.moves = [];
     this.board = Array(9).fill(null);
-    this.clients = [];
-    this.next_client_id = 1;
   }
 
   /* Returns Boolean indicating whether move was legal and added. */
@@ -22,33 +24,6 @@ class TicTacToe {
     return true;
   }
 
-  add_client(response) {
-    const id = this.next_client_id;
-    this.clients.push({id: id,
-                       response: response});
-    this.next_client_id++;
-
-    return id;
-  }
-
-  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);
   }
@@ -100,5 +75,5 @@ router.get('/events', (request, response) => {
 });
 
 exports.router = router;
-exports.name = "tictactoe";
+exports.name = engine_name;
 exports.Game = TicTacToe;