Put add_client/remove_client and the various broadcast functions into Game

[empires-server] / empires.js

diff --git a/empires.js b/empires.js
index 7907ce0c80a7711d4c92044f7391298156c2a664..46c57c5d414c977bf83abecf2f20b1334b44b4df 100644 (file)
--- a/empires.js
+++ b/empires.js
@@ -1,4 +1,7 @@
 const express = require("express");
+const Game = require("./game.js");
+
+const engine_name = "empires";
 
 const router = express.Router();
 
@@ -30,15 +33,14 @@ function shuffle(a) {
   }
 }
 
-class Game {
+class Empires extends Game {
   constructor() {
+    super(engine_name);
     this._spectators = [];
     this.next_spectator_id = 1;
     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. */
@@ -183,33 +185,6 @@ class 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)
@@ -387,5 +362,5 @@ router.get('/players', (request, response) => {
 router.get('/events', handle_events);
 
 exports.router = router;
-exports.name = "empires";
-exports.Game = Game;
+exports.name = engine_name;
+exports.Game = Empires;