Small changes

public/gameClient.js

@@ -152,7 +152,7 @@ socket.addEventListener("message", (event) => {
       messages.appendChild(messageElement);
       setTimeout(() => {
         //Redirect back to lobby after 10 seconds
-        window.location.href = msg.url;
+        window.location = window.location;
       }, 10000);
     }
   } catch (e) {

src/game/game.js

@@ -332,7 +332,12 @@ module.exports = {
         let x = head.x + j - Math.floor(width / 2);
         let y = head.y + i - Math.floor(height / 2);
 
-		  if (x < 0 || x >= updatedBoard[0].length || y < 0 || y >= updatedBoard.length) {
+        if (
+          x < 0 ||
+          x >= updatedBoard[0].length ||
+          y < 0 ||
+          y >= updatedBoard.length
+        ) {
           row.push(cellTypes.BORDER);
         } else {
           row.push(updatedBoard[y][x]);
@@ -345,7 +350,7 @@ module.exports = {
     return {
       view: playerView,
       headPosition: { x: head.x, y: head.y },
-		bodySize: bodySize + 1 // Include head in body size
+      bodySize: bodySize + 1, // Include head in body size
     };
-	}
+  },
 };

src/models/WebSocketModel.js

@@ -42,17 +42,17 @@ class WebSocketModel {
       }
 
       const alivePlayers = this.games[game].players.filter(
-        (player) => !player.spectating
+        (player) => !player.spectating,
       );
 
       if (alivePlayers.length === 1) {
-        const winner = alivePlayers[0].pid;;
+        const winner = alivePlayers[0].pid;
 
         for (let conn of this.games[game].players) {
           conn.connection.send(
             JSON.stringify({
               type: "restart",
-              pid: winner
+              pid: winner,
             }),
           );
         }
@@ -80,7 +80,7 @@ class WebSocketModel {
             type: "gameBoard",
             data: playerView.view,
             headPosition: playerView.headPosition,
-			bodySize: playerView.bodySize
+            bodySize: playerView.bodySize,
           }),
         );
       }
@@ -90,7 +90,7 @@ class WebSocketModel {
     this.connections = [];
     this.games = {};
     this.sockserver = new WebSocketServer({ port: 3001 });
-    this.createGame("game1", "public");
+    this.createGame("game1", "public", 25);
     this.createGame("game2", "public");
     this.createGame("game3", "public");
     this.onConnection();
@@ -108,9 +108,9 @@ class WebSocketModel {
     return publicGames;
   }
 
-  createGame(gameId, gameType) {
+  createGame(gameId, gameType, size = 100) {
     this.games[gameId] = {
-      gameBoard: gameModule.createGameBoard(100, 100),
+      gameBoard: gameModule.createGameBoard(size, size),
       players: [],
       type: gameType,
       started: false,
@@ -123,9 +123,7 @@ class WebSocketModel {
 
   resetGame(gameId) {
     this.games[gameId].gameBoard = gameModule.createGameBoard(100, 100);
-    this.games[gameId].players.forEach((player) => {
-      player.spectating = false;
-    });
+    this.games[gameId].players = [];
     this.games[gameId].started = false;
     this.games[gameId].readyPlayers = 0;
     this.games[gameId].borderCounter = 0;
@@ -172,6 +170,23 @@ class WebSocketModel {
     }
   }
 
+  arbitrateConnections(gameId) {
+    console.log(
+      "this.games[gameId].players.length: ",
+      this.games[gameId].players.length,
+    );
+    for (let i = 0; i < this.games[gameId].players.length; i++) {
+      if (this.games[gameId].players[i].connection === undefined) {
+        delete this.games[gameId].players[i];
+        console.log("Client has disconnected!");
+      }
+    }
+    console.log(
+      "this.games[gameId].players.length: ",
+      this.games[gameId].players.length,
+    );
+  }
+
   onConnection() {
     this.sockserver.on("connection", (connection) => {
       console.log("New client connected!");
@@ -180,6 +195,8 @@ class WebSocketModel {
 
       let roomId = connection.protocol;
 
+      //this.arbitrateConnections(roomId);
+
       if (
         !this.games[roomId].started &&
         this.games[roomId].players.length < 10
@@ -269,7 +286,7 @@ class WebSocketModel {
             for (let conn of this.games[roomId].players) {
               if (conn.connection !== connection)
                 conn.connection.send(
-                  JSON.stringify({ type: "playerReady", data: message.data }),
+                  JSON.stringify({ type: "playerReady", pid: message.pid }),
                 );
             }
             this.games[roomId].readyPlayers++;