From: Carl Worth <cworth@cworth.org>
Date: Sat, 30 May 2020 03:22:17 +0000 (-0700)
Subject: Put add_client/remove_client and the various broadcast functions into Game
X-Git-Url: https://git.cworth.org/git?p=empires-server;a=commitdiff_plain;h=76e5097689002f03c721c388e2ca71c52abf3354

Put add_client/remove_client and the various broadcast functions into Game

This eliminates the duplication of these functions that we previously
had in both the Empires and TicTacToe classes.
---

diff --git a/empires.js b/empires.js
index 749f26e..46c57c5 100644
--- a/empires.js
+++ b/empires.js
@@ -41,8 +41,6 @@ class Empires extends Game {
     this._players = [];
     this.next_player_id = 1;
     this.characters_to_reveal = null;
-    this.clients = [];
-    this.next_client_id = 1;
     this.state = GameState.JOIN;
 
     /* Send a comment to every connected client every 15 seconds. */
@@ -187,33 +185,6 @@ class Empires extends Game {
     return this._players.map(player => ({id: player.id, name: player.name }));
   }
 
-  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`);
-  }
-
   game_state_event_data(old_state, new_state) {
     var old_state_name;
     if (old_state)
diff --git a/game.js b/game.js
index 028c039..f99ff23 100644
--- a/game.js
+++ b/game.js
@@ -2,7 +2,37 @@
 class Game {
   constructor(name) {
     this.name = name;
+    this.clients = [];
+    this.next_client_id = 1;
   }
+
+  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`);
+  }
+
 }
 
 module.exports = Game;
diff --git a/tictactoe.js b/tictactoe.js
index 5b8729e..4e76638 100644
--- a/tictactoe.js
+++ b/tictactoe.js
@@ -10,8 +10,6 @@ class TicTacToe extends Game {
     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. */
@@ -26,33 +24,6 @@ class TicTacToe extends Game {
     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);
   }