Linting and refactor

.eslintrc.json

@@ -298,12 +298,16 @@
         "sort-keys": "off",
         "sort-vars": "off",
         "space-before-blocks": "error",
-        "space-before-function-paren": "off",
+        "space-before-function-paren": ["error", {
+            "anonymous": "always",
+            "named": "never",
+            "asyncArrow": "always"
+        }],
         "space-in-parens": [
             "error",
             "never"
         ],
-        "space-infix-ops": "off",
+        "space-infix-ops": ["error", { "int32Hint": false }],
         "space-unary-ops": "error",
         "spaced-comment": "off",
         "strict": [

Makefile

@@ -1,6 +1,10 @@
 # -*- Makefile -*-
 
-PORT = 3000
+ESLINT?=eslint
+
+ifeq (, $(shell which $(firstword ${ESLINT})))
+	ESLINT?=npx eslint
+endif
 
 help:
 	@echo make lang: build translation files
@@ -11,11 +15,7 @@ lang:
 	cd l10n; make
 
 eslint:
-	-npx eslint server/trivabble-server.js
+	-${ESLINT} **/*.js
-	-npx eslint public/alert.js
-	-npx eslint public/config.js
-	-npx eslint public/l10n.js
-	-npx eslint public/trivabble.js
 
 start-dev-server:
 	cd server && make start-dev-server

l10n/makejs.js

@@ -1,16 +1,21 @@
 #!/usr/bin/env node
+/*eslint strict: [2, "global"]*/
+/*eslint no-sync: ["error", { allowAtRootLevel: true }]*/
 
-var ROOT = "../public/l10n/";
+"use strict";
+
+const ROOT = "../public/l10n/";
 
 /*  Builds translation files. */
 
-var fs = require('fs');
+const fs = require("fs");
 
-var langs = fs.readdirSync("po");
+let po;
-var po, i, len;
+let i;
+let len;
 
 function skipLine() {
-   while (i < len && po[i] !== '\n') {
+    while (i < len && po[i] !== "\n") {
         ++i;
     }
     ++i;
@@ -28,16 +33,18 @@ function parseString() {
         return "";
     }
     ++i;
-   var deb = i, end;
+    const deb = i;
+
     while (i < len) {
         if (po[i] === "\\") {
             ++i;
         } else if (po[i] === '"') {
-         var str1 = po.substring(deb, i++);
+            const str1 = po.substring(deb, i++);
-         var end = i;
+            const end = i;
             skipSpaces();
-         var ndeb = i;
+            const ndeb = i;
-         var str2 = parseString();
+            const str2 = parseString();
+
             if (i === ndeb) { // we did not parse anything
                 i = end;
                 return str1;
@@ -50,52 +57,58 @@ function parseString() {
     throw new Error("not ended string at character " + deb);
 }
 
-for (var l in langs) {
+let msgid;
-   var lang = langs[l];
+let msgstr;
-   var jsFile = fs.openSync(ROOT + "js/" + lang + ".js", "w");
-   fs.writeSync(jsFile, "(function(){var ");
-   var poFiles = fs.readdirSync("po/" + lang);
-   for (var p in poFiles) {
-      var poFile = poFiles[p];
 
-      var translationFunction = fs.readFileSync("pot/" + poFile + 't', {encoding:'utf-8'})
+for (const lang of fs.readdirSync("po")) {
-                               .match(/\#TranslationFunction[\s]+([\S]+)/)[1];
+    const jsFile = fs.openSync(ROOT + "js/" + lang + ".js", "w");
+    fs.writeSync(jsFile, "(function(){var ");
+    let translationFunction = "translationFunction";
+
+    for (const poFile of fs.readdirSync("po/" + lang)) {
+        translationFunction = fs.readFileSync("pot/" + poFile + "t", {encoding: "utf-8"})
+            .match(/#TranslationFunction[\s]+(?<functionName>[\S]+)/u).groups.functionName;
 
         fs.writeSync(jsFile, "_=" + translationFunction + ".l10n;");
 
-      po = fs.readFileSync("po/" + lang + '/' + poFile, {encoding:'utf-8'});
+        po = fs.readFileSync("po/" + lang + "/" + poFile, {encoding: "utf-8"});
 
-      i = 0; len = po.length;
+        i = 0;
+        len = po.length;
         while (i < len) {
             skipSpaces();
 
-         if (po[i] === '#') {
-            skipLine();
-            continue;
-         }
-
             if (po.substr(i, 5) === "msgid") {
                 if (po[i + 5].trim() && po[i + 5] !== '"') {
                     skipLine(); // don't understand this line
-               continue;
+                } else {
-            }
                     i += 5;
                     skipSpaces();
                     msgid = parseString();
+                }
             } else if (po.substr(i, 6) === "msgstr") {
                 if (po[i + 6].trim() && po[i + 6] !== '"') {
                     skipLine(); // don't understand this line
-               continue;
+                } else {
-            }
                     i += 6;
                     msgstr = parseString();
-            fs.writeSync(jsFile, '_("' + lang + '","' + msgid.replace(/\n/g,"") + '","' + msgstr.replace(/\n/g,"") + '");');
+                    fs.writeSync(
+                        jsFile,
+                        '_("' + lang + '","' + msgid.replace(/\n/gu, "") + '","' + msgstr.replace(/\n/gu, "") + '");'
+                    );
                 }
+            }
+
+            // if po[i] === "#", ignore
             skipLine();
         }
     }
 
-   fs.writeSync(jsFile, "if(" + translationFunction + ".applyL10n){" + translationFunction + ".applyL10n();}})();");
+    fs.writeSync(
+        jsFile,
+        "if(" + translationFunction + ".applyL10n){" + translationFunction + ".applyL10n();}})();"
+    );
+
     fs.close(jsFile, function (e) {
         if (e) {
             console.error(e);

public/alert.js

@@ -14,7 +14,9 @@
     let alertInput;
     let divAlertContent;
 
-    const _ = (window.libD && libD.l10n) ? libD.l10n() : function (s) {return s;};
+    const _ = (window.libD && libD.l10n) ? libD.l10n() : function (s) {
+        return s;
+    };
 
     function promptOK() {
         divAlert.style.display = "none";

public/index.html

@@ -38,7 +38,7 @@
                     </select>
                 </label>
             </div>
-            <div id="board-lang-selection">
+            <div id="board-lang-selection" style="display:none">
                 <label>
                     <span data-l10n="text-content">Board language: </span>
                     <select id="board-lang">

public/l10n.js

@@ -20,7 +20,7 @@ window.libD = {
             }
 
             t[lang][orig] = translated;
-        };
+        }
 
         return f;
     },

public/touch2click.js

@@ -1,30 +1,44 @@
 //thx http://stackoverflow.com/questions/1517924/javascript-mapping-touch-events-to-mouse-events#1781750
+/*global jQuery*/
 
 function touchHandler(event) {
-    var nn = event.target.nodeName.toLowerCase();
+    "use strict";
+
+    const nn = event.target.nodeName.toLowerCase();
 
     if (nn === "input" || nn === "select" || nn === "button" || nn === "textarea") {
         return;
     }
 
-    var touches = event.changedTouches,
+    const touches = event.changedTouches;
-        first   = touches ? touches[0] : event,
+    const first   = touches ? touches[0] : event;
-        type    = "";
+    let type      = "";
 
     switch (event.type) {
-    case "touchstart": type = "mousedown"; break;
+        case "touchstart":
-    case "touchmove":  type = "mousemove"; break;
+            type = "mousedown";
-    case "touchend":   type = "mouseup";   break;
+            break;
-    case "tap":        type = "click";     break;
+        case "touchmove":
-    case "dbltap":     type = "dblclick";  break;
+            type = "mousemove";
-    default: return;
+            break;
+        case "touchend":
+            type = "mouseup";
+            break;
+        case "tap":
+            type = "click";
+            break;
+        case "dbltap":
+            type = "dblclick";
+            break;
+        default:
+            return;
     }
 
     //initMouseEvent(type, canBubble, cancelable, view, clickCount,
     //              screenX, screenY, clientX, clientY, ctrlKey,
     //              altKey, shiftKey, metaKey, button, relatedTarget);
 
-     var simulatedEvent = document.createEvent("MouseEvent");
+    const simulatedEvent = document.createEvent("MouseEvent");
     simulatedEvent.initMouseEvent(type, true, true, window, 1,
         first.screenX, first.screenY,
         first.clientX, first.clientY, false,
@@ -33,26 +47,24 @@ function touchHandler(event) {
     event.preventDefault();
 }
 
-document.addEventListener('touchend', (function(speed, distance) {
+document.addEventListener("touchend", (function (speed, distance) {
-/*
+    // Copyright (c)2012 Stephen M. McKamey.
- * Copyright (c)2012 Stephen M. McKamey.
+    // Licensed under The MIT License.
- * Licensed under The MIT License.
+    // src: https://raw.github.com/mckamey/doubleTap.js/master/doubleTap.js
- * src: https://raw.github.com/mckamey/doubleTap.js/master/doubleTap.js
- */
 
     "use strict";
 
     // default dblclick speed to half sec (default for Windows & Mac OS X)
-    speed = Math.abs(+speed) || 500;//ms
+    speed = Math.abs(Number(speed)) || 500;//ms
     // default dblclick distance to within 40x40 pixel area
-    distance = Math.abs(+distance) || 40;//px
+    distance = Math.abs(Number(distance)) || 40;//px
 
     // Date.now() polyfill
-    var now = Date.now || function() {
+    const now = Date.now || function () {
-        return +new Date();
+        return Number(new Date());
     };
 
-    var cancelEvent = function(e) {
+    function cancelEvent(e) {
         e = (e || window.event);
 
         if (e) {
@@ -69,24 +81,24 @@ document.addEventListener('touchend', (function(speed, distance) {
             }
         }
         return false;
-    };
+    }
 
-    var taps = 0,
+    let taps = 0;
-        last = 0,
+    let last = 0;
     // NaN will always test false
-        x = NaN,
+    let x = NaN;
-        y = NaN;
+    let y = NaN;
 
     return function (e) {
         e = (e || window.event);
 
-        var time   = now(),
+        const time   = now();
-            touch  = e.changedTouches ? e.changedTouches[0] : e,
+        const touch  = e.changedTouches ? e.changedTouches[0] : e;
-            nextX  = +touch.clientX,
+        const nextX  = Number(touch.clientX);
-            nextY  = +touch.clientY,
+        const nextY  = Number(touch.clientY);
-            target = e.target || e.srcElement,
+        const target = e.target || e.srcElement;
-            e2,
+        let e2;
-            parent;
+        let parent;
 
         if ((last + speed) > time &&
             Math.abs(nextX - x) < distance &&
@@ -106,9 +118,9 @@ document.addEventListener('touchend', (function(speed, distance) {
 
         // fire tap event
         if (document.createEvent) {
-            e2 = document.createEvent('MouseEvents');
+            e2 = document.createEvent("MouseEvents");
             e2.initMouseEvent(
-                'tap',
+                "tap",
                 true,             // click bubbles
                 true,             // click cancelable
                 e.view,              // copy view
@@ -145,18 +157,18 @@ document.addEventListener('touchend', (function(speed, distance) {
                 // DOM Level 0, IE
                 parent.ontap(e);
 
-            } else if (typeof jQuery !== 'undefined') {
+            } else if (typeof jQuery !== "undefined") {
                 // cop out and patch IE6-8 with jQuery
-                jQuery(this).trigger('tap', e);
+                jQuery(this).trigger("tap", e); /* eslint-disable-line no-invalid-this */
             }
         }
 
         if (taps === 2) {
             // fire dbltap event only for 2nd click
             if (document.createEvent) {
-                e2 = document.createEvent('MouseEvents');
+                e2 = document.createEvent("MouseEvents");
                 e2.initMouseEvent(
-                    'dbltap',
+                    "dbltap",
                     true,             // dblclick bubbles
                     true,             // dblclick cancelable
                     e.view,              // copy view
@@ -193,9 +205,9 @@ document.addEventListener('touchend', (function(speed, distance) {
                     // DOM Level 0, IE
                     parent.ondbltap(e);
 
-                } else if (typeof jQuery !== 'undefined') {
+                } else if (typeof jQuery !== "undefined") {
                     // cop out and patch IE6-8 with jQuery
-                    jQuery(this).trigger('dbltap', e);
+                    jQuery(this).trigger("dbltap", e); /* eslint-disable-line no-invalid-this */
                 }
             }
         }

public/trivabble.js

@@ -56,9 +56,9 @@
     let board;
     let rack;
     const boardCells = [];
-    let langName;
     let scoreOf;
     let bag;
+    let boardLangSelect;
 
     const playerLetters = [];
     let currentPlayer = "";
@@ -689,58 +689,15 @@
         refreshCurrentPlayer();
     }
 
-    function handleReceivedData(data) {
+    function setPlayers(players) {
-        if (Array.isArray(data)) {
-            data.forEach(handleReceivedData);
-            return;
-        }
-
-        if (data.id) {
-            const pos = waitingMsgs.indexOf(data.id);
-            if (pos !== -1) {
-                waitingMsgs.splice(pos, 1);
-            }
-        }
-
-        if (data.version) {
-            serverVersion = data.version;
-        }
-
-        if (data.pleaseRestart) {
-            forceReload(_("Sorry to disturb you, but we need to reload the game so you can continue playing. You will not lose anything except the messages in the chat. Are you ready?"));
-        }
-
-        if (data.error) {
-            fatalError(new Error("Error from the server: " + data.error + " - " + data.reason));
-        }
-
-        if (data.stopping) {
-            stopConnection();
-
-            retryPolling(
-                (typeof data.stopping === "number" && data.stopping > 0)
-                    ? data.stopping
-                    : 0
-            );
-        }
-
-        if (data.msg) {
-            handleChatMessage(data.msg);
-        }
-
-        if (typeof data.currentPlayer === "string") {
-            setCurrentPlayer(data.currentPlayer);
-        }
-
-        if (data.players) {
         if (participantPlaceholder) {
             participantPlaceholder.parentNode.removeChild(participantPlaceholder);
             participantPlaceholder = null;
         }
 
-            for (let i = 0; i < data.players.length; i++) {
+        for (let i = 0; i < players.length; i++) {
-                const player = data.players[i];
+            const player = players[i];
-                const playerName = data.players[i].player;
+            const playerName = players[i].player;
 
             if (!tablePlayers[playerName]) {
                 let before = null;
@@ -856,51 +813,7 @@
         refreshCurrentPlayer();
     }
 
-        if (data.playerName) {
+    function applyAction(data) {
-            set("playerName", data.playerName);
-        }
-
-        if (data.gameNumber) {
-            set("gameNumber", data.gameNumber);
-        }
-
-        if (data.boardLang) {
-            set("boardLang", data.boardLang);
-        }
-
-        if (data.langName) {
-            langName = data.langName;
-            createLangBoardSelect(langName);
-        }
-
-        if (data.letterValues) {
-            scoreOf = data.letterValues;
-        }
-
-        if (data.board) {
-            setBoard(data.board);
-        }
-
-        if (typeof data.remainingLetters === "number") {
-            remainingLetters = data.remainingLetters;
-            document.getElementById("remaining-letters").textContent = data.remainingLetters;
-            if (data.remainingLetters === 0) {
-                helpBag.style.display = "none";
-                helpClear.style.display = "";
-            } else {
-                helpBag.style.display = "";
-                helpClear.style.display = "none";
-            }
-        }
-
-        if (data.rack) {
-            setRack(data.rack);
-        }
-
-        if (!data.action) {
-            return;
-        }
-
         switch (data.action) {
             case "pushBag": //TODO
                 break;
@@ -937,6 +850,99 @@
         }
     }
 
+    function handleReceivedData(data) {
+        if (Array.isArray(data)) {
+            data.forEach(handleReceivedData);
+            return;
+        }
+
+        if (data.id) {
+            const pos = waitingMsgs.indexOf(data.id);
+            if (pos !== -1) {
+                waitingMsgs.splice(pos, 1);
+            }
+        }
+
+        if (data.version) {
+            serverVersion = data.version;
+        }
+
+        if (data.pleaseRestart) {
+            forceReload(_("Sorry to disturb you, but we need to reload the game so you can continue playing. You will not lose anything except the messages in the chat. Are you ready?"));
+        }
+
+        if (data.error) {
+            fatalError(new Error("Error from the server: " + data.error + " - " + data.reason));
+        }
+
+        if (data.stopping) {
+            stopConnection();
+
+            retryPolling(
+                (typeof data.stopping === "number" && data.stopping > 0)
+                    ? data.stopping
+                    : 0
+            );
+        }
+
+        if (data.msg) {
+            handleChatMessage(data.msg);
+        }
+
+        if (typeof data.currentPlayer === "string") {
+            setCurrentPlayer(data.currentPlayer);
+        }
+
+        if (data.players) {
+            setPlayers(data.players);
+        }
+
+        if (data.playerName) {
+            set("playerName", data.playerName);
+        }
+
+        if (data.gameNumber) {
+            set("gameNumber", data.gameNumber);
+        }
+
+        if (data.availableBoardLangs) {
+            setAvailableBoardLangs(data.availableBoardLangs);
+        }
+
+        if (data.boardLang) {
+            set("boardLang", data.boardLang);
+            (boardLangSelect || {}).value = data.boardLang;
+        }
+
+        if (data.letterValues) {
+            scoreOf = data.letterValues;
+        }
+
+        if (data.board) {
+            setBoard(data.board);
+        }
+
+        if (typeof data.remainingLetters === "number") {
+            remainingLetters = data.remainingLetters;
+            document.getElementById("remaining-letters").textContent = data.remainingLetters;
+            if (data.remainingLetters === 0) {
+                helpBag.style.display = "none";
+                helpClear.style.display = "";
+            } else {
+                helpBag.style.display = "";
+                helpClear.style.display = "none";
+            }
+        }
+
+        if (data.rack) {
+            setRack(data.rack);
+        }
+
+        if (data.action) {
+            applyAction(data);
+        }
+    }
+
     function retryPolling(delay) {
         if (needsRestart) {
             return;
@@ -1339,20 +1345,20 @@
         );
     }
 
-    function changeBoardLang(lang) {
+    function onChangeBoardLang() {
+        const code = document.getElementById("board-lang").value;
+        const lang = document.getElementById("board-lang").textContent;
+
         myConfirm(
-            format(_("Are you sure you want to change board to '{0}'? This will put all the tiles back in the bag and start another game."), _(langName[lang])),
+            format(_("Are you sure you want to change board to '{0}'? This will put all the tiles back in the bag and start another game."), _(lang)),
             function () {
-                sendCmds([{cmd: "changeBoard", lang: lang}]);
+                sendCmds([{cmd: "changeBoard", lang: code}]);
             },
             function () {
                 document.getElementById("board-lang").value = localStorage.trivabbleBoardLang;
             }
         );
     }
-    function onChangeBoardLang() {
-        changeBoardLang(document.getElementById("board-lang").value);
-    }
 
     function clearRack() {
         myConfirm(
@@ -1523,22 +1529,32 @@
         trivabble.run();
     };
 
-    function createLangBoardSelect(langName) {
+    function setAvailableBoardLangs(availableBoardLangs) {
-
+        if (!boardLangSelect) {
-        const select = document.getElementById("board-lang");
+            const boardLangSelection = document.getElementById("board-lang-selection");
-
+            boardLangSelect = boardLangSelection.querySelector("select");
-        for (let i = select.options.length - 1; i >=0; i--) {
+            boardLangSelection.style.display = "";
-            select.remove(i);
         }
 
-        for (const key in langName) {/* eslint-disable-line guard-for-in */
+        boardLangSelect.textContent = "";
-            select.add(new Option(_(langName[key]), key));
+
+        for (const key of Object.keys(availableBoardLangs)) {
+            boardLangSelect.add(new Option(_(availableBoardLangs[key]), key));
         }
 
-        Array.prototype.sort.call(select.options,
+        Array.prototype.sort.call(boardLangSelect.options, function (a, b) {
-            function(a, b) {return (a.textContent > b.textContent) ? 1 : ((b.textContent > a.textContent) ? -1 : 0);});
+            return (
+                (a.textContent > b.textContent)
+                    ? 1
+                    : (
+                        (b.textContent > a.textContent)
+                            ? -1
+                            : 0
+                    )
+            );
+        });
 
-        select.value = localStorage.trivabbleBoardLang;
+        boardLangSelect.value = localStorage.trivabbleBoardLang;
     }
 
     function langSelectionChange(e) {

server/trivabble-server.js

@@ -31,6 +31,7 @@ const port = parseInt(process.env.TRIVABBLE_PORT || "3000");
 const SAVE_TIMEOUT = 5000;
 const KEEP_ALIVE = 30000;
 const GAMES_BACKUP = process.env.TRIVABBLE_GAMES_BACKUP || "games.backup.json";
+const DEFAULT_BOARD_LANG = process.env.TRIVABBLE_DEFAULT_BOARD_LANG || "fr";
 
 const VERSION = 202005070100;
 
@@ -48,9 +49,9 @@ if (DEV_ENABLE_SERVING_FILES) {
 const debuglog = DEBUG_LOG ? console.log.bind(console) : () => null;
 
 const http   = require("http");
+const path   = require("path");
 const fs     = require("fs");
 const crypto = require("crypto");
-const path = require("path");
 
 const REQUEST_TYPE_LONG_POLLING = 1;
 const REQUEST_TYPE_SSE          = 2;
@@ -59,16 +60,14 @@ const REQUEST_TYPE_WEBSOCKET    = 3;
 /* eslint no-sync: ["error", { allowAtRootLevel: true }] */
 
 /* Manage multi language board */
-const boardPieces = {};
+const boardTilesPerLang = {};
-const langName = {};
+const availableBoardLangs = {};
-const langFiles = fs.readdirSync(path.join(__dirname, "lang"));
+
-for (let i = 0; i < langFiles.length; i++) {
+for (const lang of fs.readdirSync(path.join(__dirname, "lang"))) {
-    console.log(path.join(__dirname, "lang", langFiles[i]));
+    const data = require(path.join(__dirname, "lang", lang)); // eslint-disable-line global-require
-    const data = require(path.join(__dirname, "lang", langFiles[i])); /* eslint-disable-line global-require */
+    boardTilesPerLang[data.code] = data;
-    boardPieces[data.code] = data;
+    availableBoardLangs[data.code] = data.name;
-    langName[data.code] = data.name;
 }
-const defaultLang = "fr";
 
 const games = {};
 
@@ -214,10 +213,9 @@ function newBoard() {
 
 Game.prototype.init = function (lang) {
     this.board = newBoard();
-    this.lang = lang || defaultLang;
+    this.lang = lang || DEFAULT_BOARD_LANG;
-    this.langName = langName;
+    this.bag = boardTilesPerLang[this.lang].bag.slice();
-    this.bag = boardPieces[this.lang].bag.slice();
+    this.letterValues = boardTilesPerLang[this.lang].letterValues;
-    this.letterValues = boardPieces[this.lang].letterValues;
     this.racks = {};
     this.scores = {};
     this.lastUpdated = new Date();
@@ -230,7 +228,6 @@ Game.prototype.toJSON = function () {
     return {
         board:            this.board,
         lang:             this.lang,
-        langName:         this.langName,
         bag:              this.bag,
         letterValues:     this.letterValues,
         racks:            this.racks,
@@ -243,10 +240,9 @@ Game.prototype.toJSON = function () {
 Game.fromJSON = function (obj) {
     const game = new Game();
     game.board            = obj.board  || newBoard();
-    game.lang             = obj.lang   || defaultLang;
+    game.lang             = obj.lang   || DEFAULT_BOARD_LANG;
-    game.langName         = obj.langName;
+    game.bag              = boardTilesPerLang[game.lang].bag.slice();
-    game.bag              = boardPieces[game.lang].bag.slice();
+    game.letterValues     = boardTilesPerLang[game.lang].letterValues;
-    game.letterValues     = boardPieces[game.lang].letterValues;
     game.racks            = obj.racks  || {};
     game.scores           = obj.scores || {};
     game.lastUpdated      = obj.lastUpdated ? new Date(obj.lastUpdated) : new Date();
@@ -293,8 +289,7 @@ Game.prototype.playerJoined = function (playerName) {
 
     const players = [];
 
-    for (let player in this.racks) {
+    for (let player of Object.keys(this.racks)) {
-        if (Object.prototype.hasOwnProperty.call(this.racks, player)) {
         player = player.slice(1); // '#'
         players.push({
             player: player,
@@ -302,7 +297,6 @@ Game.prototype.playerJoined = function (playerName) {
             rackCount: countTiles(this.getPlayerRack(player))
         });
     }
-    }
 
     this.pendingEvents.push({players: players});
 };
@@ -481,7 +475,7 @@ function handleCommand(cmdNumber, message, response) {
                 gameNumber: gameNumber,
                 playerName: playerName,
                 boardLang: game.lang,
-                langName: langName,
+                availableBoardLangs: availableBoardLangs,
                 currentPlayer: game.currentPlayer,
                 rack: game.getPlayerRack(playerName),
                 board: game.board,
@@ -672,7 +666,7 @@ function handleCommand(cmdNumber, message, response) {
         }
 
         case "changeBoard": {
-            game.lang = cmd.lang || defaultLang;
+            game.lang = cmd.lang || DEFAULT_BOARD_LANG;
             game.reset();
             reply(message, response, cmdNumber, {error: 0, boardLang: game.lang, letterValues: game.letterValues});
             break;
@@ -711,7 +705,7 @@ function handleCommands(message, responseAndType) {
                 currentPlayer:       game.currentPlayer,
                 gameNumber:          gameNumber,
                 boardLang:           game.lang,
-                langName:         langName,
+                availableBoardLangs: availableBoardLangs,
                 letterValues:        game.letterValues,
                 rack:                game.getPlayerRack(message.playerName),
                 board:               game.board,
@@ -949,9 +943,10 @@ function handleRequest(request, response) {
 
             debuglog("Serving " + request.url);
 
-            fs.exists("../public/" + request.url, function (exists) {
+            const requestedPath = path.join(__dirname, "..", "public", request.url);
+            fs.exists(requestedPath, function (exists) {
                 if (exists) {
-                    fs.readFile("../public/" + request.url, function(err, contents) {
+                    fs.readFile(requestedPath, function (err, contents) {
                         if (err) {
                             response.statusCode = 500;
                             response.setHeader("Content-Type", "text/plain; charset=utf-8");
@@ -1025,12 +1020,10 @@ fs.readFile(GAMES_BACKUP, function (err, data) {
         } else {
             const backup = JSON.parse(data);
 
-            for (const gameNumber in backup) {
+            for (const gameNumber of Object.keys(backup)) {
-                if (Object.prototype.hasOwnProperty.call(backup, gameNumber)) {
                 games[gameNumber] = Game.fromJSON(backup[gameNumber]);
             }
         }
-        }
     } catch (e) {
         console.error("WARNING: Could not restore previous backup of the games: file is broken:");
         console.error("WARNING: ", e);