X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=empires.js;h=f95bba9f48da600bb68ae46aec66e436ff4fed6b;hb=ea14cbbefb26afd558aff8329d92f1a7b9442bac;hp=c2ba106a641fc2359ddcb37e51afa34bce415b9b;hpb=20ab7f84abd07b744d0c73f0dd54879ff884e534;p=empires-server

diff --git a/empires.js b/empires.js
index c2ba106..f95bba9 100644
--- a/empires.js
+++ b/empires.js
@@ -1,6 +1,9 @@
 const express = require("express");
+const Game = require("./game.js");
 
-const app = express.Router();
+const engine_name = "empires";
+
+const router = express.Router();
 
 const GameState = {
   JOIN:    1,
@@ -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)
@@ -238,61 +213,48 @@ class Game {
 
     this.broadcast_state_change();
   }
-}
 
-function handle_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);
-
-  /* Now that a client has connected, first we need to stream all of
-   * the existing spectators and players (if any). */
-  if (game._spectators.length > 0) {
-    const spectators_json = JSON.stringify(game.spectators);
-    const spectators_data = `event: spectators\ndata: ${spectators_json}\n\n`;
-    response.write(spectators_data);
-  }
+  handle_events(request, response) {
 
-  if (game._players.length > 0) {
-    const players_json = JSON.stringify(game.players);
-    const players_data = `event: players\ndata: ${players_json}\n\n`;
-    response.write(players_data);
-  }
+    super.handle_events(request, response);
 
-  /* And we need to inform the client of the current game state.
-   *
-   * In fact, we need to cycle through each state transition from the
-   * beginning so the client can see each.
-   */
-  var old_state = null;
-  for (var state = GameState.JOIN; state <= game.state; state++) {
-    var event_data = game.game_state_event_data(old_state, state);
-    response.write("event: game-state\n" + "data: " + event_data + "\n\n");
-    old_state = state;
-  }
+    /* Now that a client has connected, first we need to stream all of
+     * the existing spectators and players (if any). */
+    if (this._spectators.length > 0) {
+      const spectators_json = JSON.stringify(this.spectators);
+      const spectators_data = `event: spectators\ndata: ${spectators_json}\n\n`;
+      response.write(spectators_data);
+    }
 
-  /* Add this new client to our list of clients. */
-  const id = game.add_client(response);
+    if (this._players.length > 0) {
+      const players_json = JSON.stringify(this.players);
+      const players_data = `event: players\ndata: ${players_json}\n\n`;
+      response.write(players_data);
+    }
+
+    /* And we need to inform the client of the current game state.
+     *
+     * In fact, we need to cycle through each state transition from the
+     * beginning so the client can see each.
+     */
+    var old_state = null;
+    for (var state = GameState.JOIN; state <= this.state; state++) {
+      var event_data = this.game_state_event_data(old_state, state);
+      response.write("event: game-state\n" + "data: " + event_data + "\n\n");
+      old_state = state;
+    }
+  }
 
-  /* And queue up cleanup to be triggered on client close. */
-  request.on('close', () => {
-    game.remove_client(id);
-  });
 }
 
-app.get('/', (request, response) => {
+router.get('/', (request, response) => {
   if (! request.session.nickname)
     response.render('choose-nickname.html', { game_name: "Empires" });
   else
     response.render('empires-game.html');
 });
 
-app.post('/spectator', (request, response) => {
+router.post('/spectator', (request, response) => {
   const game = request.game;
   var name = request.session.nickname;
 
@@ -304,13 +266,13 @@ app.post('/spectator', (request, response) => {
   response.send(JSON.stringify(id));
 });
 
-app.delete('/spectator/:id', (request, response) => {
+router.delete('/spectator/:id', (request, response) => {
   const game = request.game;
   game.remove_spectator(parseInt(request.params.id));
   response.send();
 });
 
-app.post('/register', (request, response) => {
+router.post('/register', (request, response) => {
   const game = request.game;
   var name = request.session.nickname;;
 
@@ -322,70 +284,73 @@ app.post('/register', (request, response) => {
   response.send();
 });
 
-app.post('/deregister/:id', (request, response) => {
+router.post('/deregister/:id', (request, response) => {
   const game = request.game;
   game.remove_player(parseInt(request.params.id));
   response.send();
 });
 
-app.post('/reveal', (request, response) => {
+router.post('/reveal', (request, response) => {
   const game = request.game;
   game.reveal();
   response.send();
 });
 
-app.post('/start', (request, response) => {
+router.post('/start', (request, response) => {
   const game = request.game;
   game.start();
   response.send();
 });
 
-app.post('/reset', (request, response) => {
+router.post('/reset', (request, response) => {
   const game = request.game;
   game.reset();
   response.send();
 });
 
-app.post('/capture/:captor/:captee', (request, response) => {
+router.post('/capture/:captor/:captee', (request, response) => {
   const game = request.game;
   game.capture(parseInt(request.params.captor), parseInt(request.params.captee));
   response.send();
 });
 
-app.post('/liberate/:id', (request, response) => {
+router.post('/liberate/:id', (request, response) => {
   const game = request.game;
   game.liberate(parseInt(request.params.id));
   response.send();
 });
 
-app.post('/restart', (request, response) => {
+router.post('/restart', (request, response) => {
   const game = request.game;
   game.restart(parseInt(request.params.id));
     response.send();
 });
 
-app.get('/characters', (request, response) => {
+router.get('/characters', (request, response) => {
   const game = request.game;
   response.send(game.characters);
 });
 
-app.get('/empires', (request, response) => {
+router.get('/empires', (request, response) => {
   const game = request.game;
   response.send(game.empires);
 });
 
-app.get('/spectators', (request, response) => {
+router.get('/spectators', (request, response) => {
   const game = request.game;
   response.send(game.spectators);
 });
 
-app.get('/players', (request, response) => {
+router.get('/players', (request, response) => {
   const game = request.game;
   response.send(game.players);
 });
 
-app.get('/events', handle_events);
+router.get('/events', (request, response) => {
+  const game = request.game;
+  game.handle_events(request, response);
+});
 
-exports.app = app;
-exports.name = "empires";
-exports.Game = Game;
+exports.router = router;
+exports.name = engine_name;
+exports.Game = Empires;