From 730d85b3f8abf984c22ff38c2956dbf57b4a9ae0 Mon Sep 17 00:00:00 2001
From: Yuto Nishida <yuto@berkeley.edu>
Date: Sun, 7 Dec 2025 23:11:58 -0800
Subject: [PATCH] [2nub] Remove socket.emit('error') to prevent frontend crash

---
 experimental/2nub/src/server/gameState.ts | 6 +++---
 experimental/2nub/src/server/websocket.ts | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/experimental/2nub/src/server/gameState.ts b/experimental/2nub/src/server/gameState.ts
index d03c5a3..e6af946 100644
--- a/experimental/2nub/src/server/gameState.ts
+++ b/experimental/2nub/src/server/gameState.ts
@@ -274,8 +274,6 @@ class GameStateManager {
       });
     }
 
-    await standardDelay();
-
     // Transition to in-game state
 
     if (game.state.ruleset.special.maybeAllTanners.enabled) {
@@ -340,7 +338,9 @@ class GameStateManager {
     return game;
   }
 
-  maybeConfirmPlayerRoleAssignment(gameId: string, playerId: string): GameState | null {
+  async maybeConfirmPlayerRoleAssignment(gameId: string, playerId: string): Promise<GameState | null> {
+    await standardDelay();
+
     const game = this.games.get(gameId);
     if (!game) return null;
 
diff --git a/experimental/2nub/src/server/websocket.ts b/experimental/2nub/src/server/websocket.ts
index ab03fcf..8bce859 100644
--- a/experimental/2nub/src/server/websocket.ts
+++ b/experimental/2nub/src/server/websocket.ts
@@ -94,7 +94,7 @@ export function setupSocketIO(io: Server<ClientToServerEvents, ServerToClientEve
       }
     });
 
-    socket.on('confirmRoleAssignment', (data) => {
+    socket.on('confirmRoleAssignment', async (data) => {
       const { gameId, playerId } = data;
       console.log(`Player ${playerId} confirming role assignment for game ${gameId} on socket ${socket.id}`);
 
@@ -106,7 +106,7 @@ export function setupSocketIO(io: Server<ClientToServerEvents, ServerToClientEve
       }
 
       // Update the player's confirmation status via game state manager
-      const updatedGameState = gameStateManager.maybeConfirmPlayerRoleAssignment(gameId, playerId);
+      const updatedGameState = await gameStateManager.maybeConfirmPlayerRoleAssignment(gameId, playerId);
       
       if (updatedGameState) {
         // Broadcast updated game state to all players in the room
@@ -114,7 +114,7 @@ export function setupSocketIO(io: Server<ClientToServerEvents, ServerToClientEve
         console.log(`Player ${playerId} confirmed role assignment for game ${gameId}`);
       } else {
         console.error(`Failed to confirm role assignment for player ${playerId} in game ${gameId}`);
-        socket.emit('error', { error: 'Failed to confirm role assignment' });
+        //socket.emit('error', { error: 'Failed to confirm role assignment' });
       }
     });
 
-- 
2.54.0