Some changes from main

app/login.js

@@ -53,7 +53,7 @@ function writeUser(user, hash) {
 
 async function signup(user, pass) {
     if (user.length < 2 || user.length > 20)
-        return {"code": 400, "error": "Username should be 2-16 characters"};
+        return {"code": 400, "error": "Username should be 2-20 characters"};
     if (pass.length < 8 || pass.length > 32)
         return {"code": 400, "error": "Password should be 8-32 characters"};
     if (userExists(user))

app/semipublic/game.html

@@ -16,6 +16,11 @@
     <script src="/socket.io/socket.io.js"></script>
     <script src="/game_render.js"></script>
     <script>
+
+        function hideJoinButton() {
+            document.querySelector("#join-game").style.display = "none";
+        }
+
         const socket = io({
             query: {
                 gameId: window.location.href.split("/").filter(e => e.length > 0).pop()
@@ -28,12 +33,18 @@
                 BOARD1 = new SudokuBoard("board-container", updateToServer);
             BOARD1.updateBoard(args.boardDisplay, args.boardLock, args.boardColors);
             displayPlayerScores(args.playerScores);
+            hideJoinButton();
         });
 
         socket.on("game stop", () => {
             window.location.href = "/";
         });
 
+        document.querySelector("#join-game").onclick = () => {
+            socket.emit("join game");
+            hideJoinButton();
+        }
+
         function updateToServer(x, y, num) {
             socket.emit("cell input", { "x": x, "y": y, "num": num });
         }

app/semipublic/signup.html

@@ -6,7 +6,7 @@
         <a href="/"><- Back</a><br>
         <a href="/login">Login</a>
         <h1>Create Account</h1>
-        <label for="username">Username (2-16 characters):</label>
+        <label for="username">Username (2-20 characters):</label>
         <input type="text" id="username" name="username" /><br><br>
         <label for="password">Password (8-32 characters):</label>
         <input type="password" id="password" name="password"/><br><br>

app/server.js

@@ -61,15 +61,19 @@ class Game {
         this.sendBoard();
     }
 
-    sendBoard() {
-        // do not send board state if game is not in progress
-        if (this.state === ROOM_PLAYING) {
-            this.sendAll("board state", {
+    packageBoardState() {
+        return {
             boardDisplay: this.boardDisplay,
             boardLock: this.boardLock,
             boardColors: this.boardColors,
             playerScores: this.playerScores
-            });
+        };
+    }
+
+    sendBoard() {
+        // do not send board state if game is not in progress
+        if (this.state === ROOM_PLAYING) {
+            this.sendAll("board state", this.packageBoardState());
         }
     }
 
@@ -94,10 +98,6 @@ class Game {
         return true;
     }
 
-    validateCell(args) {
-        return this.boardSolution[args.y][args.x] === args.num;
-    }
-
     userJoin(clientId, user) {
         if (this.state === ROOM_OPEN && this.playerUsers.length < 2) {
             this.playerUsers.push(user);
@@ -131,15 +131,13 @@ class Game {
 
     userLeave(client, user) {
         this.usersToClients.delete(user);
-        if (this.playerUsers.includes(user)) {
-            this.kill();
-        } else if (this.connectedClients.includes(client)) {
+        if (this.connectedClients.includes(client)) {
             this.connectedClients.splice(this.connectedClients.indexOf(client), 1);
         }
     }
 
-    sendAll(name, message = null) {
-        for (let clientId of this.connectedClients) {
+    send(name, clients, message = null) {
+        for (let clientId of clients) {
             io.in(clientId).fetchSockets().then(sockets => {
                 sockets.forEach(socket => {
                     socket.emit(name, message)
@@ -148,6 +146,10 @@ class Game {
         }
     }
 
+    sendAll(name, message = null) {
+        this.send(name, this.connectedClients, message);
+    }
+
     constructor(id, difficulty) {
         this.id = id;
         this.difficulty = difficulty;
@@ -156,9 +158,9 @@ class Game {
         this.boardLock = [];
         this.boardColors = [];
         this.connectedClients = [];
-        this.usersToClients = new Map();
         this.playerUsers = [];
         this.playerScores = {};
+        this.usersToClients = new Map();
         this.state = ROOM_OPEN;
     }
 }
@@ -284,6 +286,10 @@ io.on("connection", (socket) => {
     game.clientJoin(socketId);
     console.log(`Client connected: ${socketId} to game ${gameId}`);
 
+    if (game.playerUsers.includes(user)) {
+        socket.emit("board state", game.packageBoardState());
+    }
+
     socket.on("cell input", args => {
         if (game.playerUsers.includes(user)) {
             game.input(socketId, user, args.x, args.y, args.num);