X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=empires.js;h=69fc7c233a64c146b40cff97bb6826cb3e01be29;hb=0cd4f406b4ace0bc16d84adf4573f3a0d8084ad5;hp=b0fc79ea2fb664c52246549f6c720a81b2f93391;hpb=a44b9dd5ed5bc7a221655bddbf07dcb498cac90d;p=lmno-server

diff --git a/empires.js b/empires.js
index b0fc79e..69fc7c2 100644
--- a/empires.js
+++ b/empires.js
@@ -1,9 +1,12 @@
 const express = require("express");
 const cors = require("cors");
 const body_parser = require("body-parser");
+const path = require("path");
 
 const app = express();
 app.use(cors());
+app.use(body_parser.urlencoded({ extended: false }));
+app.use(body_parser.json());
 
 const GameState = {
   JOIN:    1,
@@ -79,6 +82,12 @@ class Game {
   }
 
   reveal_next() {
+    /* Don't try to reveal anything if we aren't in the reveal state. */
+    if (this.state != GameState.REVEAL) {
+      clearInterval(this.reveal_interval);
+      return;
+    }
+
     if (this.reveal_index >= this.characters_to_reveal.length) {
       clearInterval(this.reveal_interval);
       this.broadcast_event("character-reveal", '{"character":""}');
@@ -201,12 +210,8 @@ class Game {
   }
 }
 
-const game = new Game();
-
-app.use(body_parser.urlencoded({ extended: false }));
-app.use(body_parser.json());
-
 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",
@@ -245,63 +250,73 @@ function handle_events(request, response) {
 }
 
 app.get('/', (request, response) => {
-  response.send('Hello World!');
+  response.sendFile(path.join(__dirname, './game.html'));
 });
 
 app.post('/register', (request, response) => {
+  const game = request.game;
   game.add_player(request.body.name, request.body.character);
   response.send();
 });
 
 app.post('/deregister/:id', (request, response) => {
+  const game = request.game;
   game.remove_player(parseInt(request.params.id));
   response.send();
 });
 
 app.post('/reveal', (request, response) => {
+  const game = request.game;
   game.reveal();
   response.send();
 });
 
 app.post('/start', (request, response) => {
+  const game = request.game;
   game.start();
   response.send();
 });
 
 app.post('/reset', (request, response) => {
+  const game = request.game;
   game.reset();
   response.send();
 });
 
 app.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) => {
+  const game = request.game;
   game.liberate(parseInt(request.params.id));
   response.send();
 });
 
 app.post('/restart', (request, response) => {
+  const game = request.game;
   game.restart(parseInt(request.params.id));
     response.send();
 });
 
 app.get('/characters', (request, response) => {
+  const game = request.game;
   response.send(game.characters);
 });
 
 app.get('/empires', (request, response) => {
+  const game = request.game;
   response.send(game.empires);
 });
 
 app.get('/players', (request, response) => {
+  const game = request.game;
   response.send(game.players);
 });
 
 app.get('/events', handle_events);
 
-app.listen(3000, function () {
-  console.log('Empires server listening on localhost:3000');
-});
+exports.app = app;
+exports.Game = Game;