From 930fc129396f54bd8ca15e3bc56b2b3714f387ae Mon Sep 17 00:00:00 2001
From: =?utf8?q?Rapha=C3=ABl=20Jakse?= <raphael.trivabble@jakse.fr>
Date: Wed, 7 Oct 2020 21:30:04 +0200
Subject: [PATCH] fix first WebSocket connection

---
 server/trivabble-server.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/server/trivabble-server.js b/server/trivabble-server.js
index 54666ce..b90b559 100644
--- a/server/trivabble-server.js
+++ b/server/trivabble-server.js
@@ -446,9 +446,12 @@ function countTiles(rack) {
     return count;
 }
 
-function joinGame(gameNumber) {
+function joinGame(gameNumber, message) {
     if (!gameNumber) {
         gameNumber = newGameId();
+        if (message) {
+            message.gameNumber = gameNumber;
+        }
     }
 
     const game = games[gameNumber] || (games[gameNumber] = new Game());
@@ -719,7 +722,7 @@ function handleCommand(cmdNumber, message, response) {
 
 function handleCommands(message, responseAndType) {
     if (!message.cmds || !message.cmds.length) {
-        const {gameNumber, game} = joinGame(message.gameNumber);
+        const {gameNumber, game} = joinGame(message.gameNumber, message);
 
         writeMessage(responseAndType,
             JSON.stringify({
-- 
2.30.2