X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=lmno.js;h=abb1f2057c2582aad12d87e05ac732113583e0bb;hb=a5dd0c5e612311132f053b71f32a1fe94e5819d3;hp=abcdba2ef220bd6aff8375bb3190d0cfbc87c727;hpb=733fd82de5d0448649f769af5850ad6cc528f0d5;p=empires-server diff --git a/lmno.js b/lmno.js index abcdba2..abb1f20 100644 --- a/lmno.js +++ b/lmno.js @@ -4,6 +4,7 @@ const body_parser = require("body-parser"); const session = require("express-session"); const bcrypt = require("bcrypt"); const path = require("path"); +const nunjucks = require("nunjucks"); try { var lmno_config = require("./lmno-config.json"); @@ -40,8 +41,14 @@ app.use(session({ saveUninitialized: false })); +nunjucks.configure("templates", { + autoescape: true, + express: app +}); + /* Load each of our game mini-apps. */ var empires = require("./empires"); +var tictactoe = require("./tictactoe"); class LMNO { constructor() { @@ -49,7 +56,7 @@ class LMNO { } generate_id() { - return [null,null,null,null].map(() => LMNO.letters.charAt(Math.floor(Math.random() * LMNO.letters.length))).join(''); + return Array(4).fill(null).map(() => LMNO.letters.charAt(Math.floor(Math.random() * LMNO.letters.length))).join(''); } create_game(engine) { @@ -130,14 +137,15 @@ app.get('/[a-zA-Z0-9]{4}', (request, response) => { }); /* LMNO middleware to lookup the game. */ -app.use('/empires/:game_id([a-zA-Z0-9]{4})', (request, response, next) => { +app.use('/:engine([^/]+)/:game_id([a-zA-Z0-9]{4})', (request, response, next) => { + const engine = request.params.engine; const game_id = request.params.game_id; const canon_id = lmno_canonize(game_id); /* Redirect user to page with the canonical ID in it. */ if (game_id !== canon_id) { - const new_url = request.originalUrl.replace("/empires/" + game_id, - "/empires/" + canon_id); + const new_url = request.originalUrl.replace(`/${engine}/${game_id}`, + `/${engine}/${canon_id}`); response.redirect(301, new_url); return; } @@ -174,6 +182,7 @@ function auth_admin(request, response, next) { app.get('/logout', (request, response) => { request.session.user = undefined; + request.session.destroy(); response.send("You are now logged out."); }); @@ -184,7 +193,7 @@ app.get('/login', (request, response) => { return; } - response.sendFile(path.join(__dirname, './login.html')); + response.render('login.html'); }); app.post('/login', async (request, response) => { @@ -205,24 +214,34 @@ app.post('/login', async (request, response) => { return; }); -/* A stats page (only available to admin users) */ -app.get('/stats/', auth_admin, (request, response) => { - let active = 0; - let idle = 0; +/* API to set uer profile information */ +app.put('/profile', (request, response) => { + const nickname = request.body.nickname; + if (nickname) { + request.session.nickname = nickname; + request.session.save(); + } + response.send(); +}); + +/* An admin page (only available to admin users, of course) */ +app.get('/admin/', auth_admin, (request, response) => { + let active = []; + let idle = []; for (let id in lmno.ids) { if (lmno.ids[id].game.clients.length) - active++; - else - idle++; + active.push(lmno.ids[id]); + else + idle.push(lmno.ids[id]); } - response.send(`Active games: ${active}.
-Idle games: ${idle}`); + response.render('admin.html', { test: "foobar", games: { active: active, idle: idle}}); }); /* Mount sub apps. only _after_ we have done all the middleware we need. */ app.use('/empires/[a-zA-Z0-9]{4}/', empires.app); +app.use('/tictactoe/[a-zA-Z0-9]{4}/', tictactoe.app); app.listen(4000, function () { console.log('LMNO server listening on localhost:4000');