From 35c6033ae5f34c6361eab83d3d732e62a976f259 Mon Sep 17 00:00:00 2001 From: James Ketrenos Date: Tue, 1 Mar 2022 13:19:23 -0800 Subject: [PATCH] Use "loadGame" instead of "createGame" on ws connection Signed-off-by: James Ketrenos --- server/routes/games.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/server/routes/games.js b/server/routes/games.js index f9797ff..287d079 100755 --- a/server/routes/games.js +++ b/server/routes/games.js @@ -2498,19 +2498,19 @@ const ping = (session) => { session.keepAlive = setTimeout(() => { ping(session); }, 2500); } -router.ws("/ws/:id", (ws, req) => { +router.ws("/ws/:id", async (ws, req) => { const { id } = req.params; console.log(`WebSocket connect from game ${id}`); - let game; - if (!(id in games)) { - game = createGame(id); - } else { - game = games[id]; + const game = await loadGame(id); + if (!game) { + console.error(`Unable to load/create new game for WS request.`); + return; } const session = getSession(game, req.session); + if (session) { console.log(`WebSocket connected for ${session.name ? session.name : "Unnamed"}`); session.ws = ws;