empires: Add an initial "choose nickname" step before joining a game

[empires-server] / empires.js

diff --git a/empires.js b/empires.js
index b744f0faa2e0cc68a8d90963055e1a64a8b7b3ab..a8c177109a08f409969be419951e97da59d2a96f 100644 (file)
--- a/empires.js
+++ b/empires.js
@@ -1,9 +1,18 @@
 const express = require("express");
 const cors = require("cors");
 const body_parser = require("body-parser");
+const path = require("path");
+const nunjucks = require("nunjucks");
 
 const app = express();
 app.use(cors());
+app.use(body_parser.urlencoded({ extended: false }));
+app.use(body_parser.json());
+
+nunjucks.configure("templates", {
+  autoescape: true,
+  express: app
+});
 
 const GameState = {
   JOIN:    1,
@@ -207,12 +216,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",
@@ -250,60 +255,77 @@ function handle_events(request, response) {
   });
 }
 
+app.get('/', (request, response) => {
+  if (! request.session.nickname)
+    response.render('choose-nickname.html');
+  else
+    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;