fix: improve game cleanup process and enhance username validation in matchmaking

Author: gitcommitankit

backend/game/game.go

@@ -225,6 +225,13 @@ func (g *Game) BroadcastGameOver() {
 
 	// Emit Kafka event
 	analytics.EmitGameEnd(g.ID, winnerStr, duration)
+
+	// Clean up game after a short delay to allow clients to receive game over message
+	go func() {
+		time.Sleep(5 * time.Second)
+		GameManagerInstance.RemoveGame(g.ID)
+		log.Printf("Game %s cleaned up from active games", g.ID)
+	}()
 }
 
 func (g *Game) TriggerBotMove() {

backend/handlers/ws_handler.go

@@ -59,14 +59,26 @@ func WSHandler(w http.ResponseWriter, r *http.Request) {
 				username = "Anonymous"
 			}
 
+			// Check if username is already in matchmaking queue
 			if game.GlobalMatchmaker.IsPlayerInQueue(username) {
-				conn.WriteJSON(game.Message{Type: game.MsgError, Payload: "Username already taken"})
+				conn.WriteJSON(game.Message{Type: game.MsgError, Payload: "Username already in matchmaking queue"})
 				continue
 			}
 
+			// Check if current player is already in an active game
+			if currentPlayer != nil {
+				playerGame := game.GameManagerInstance.GetGameByPlayerID(currentPlayer.ID)
+				if playerGame != nil && playerGame.State == "active" {
+					conn.WriteJSON(game.Message{Type: game.MsgError, Payload: "You are already in an active game"})
+					continue
+				}
+			}
+
+			// Check if username exists in an active game
 			existingPlayer, existingGame := game.GameManagerInstance.GetPlayerByUsername(username)
 			if existingPlayer != nil && existingGame != nil {
 				if !existingPlayer.IsConnected {
+					// Player disconnected, allow reconnection
 					log.Printf("User %s reconnecting to game %s", username, existingGame.ID)
 					reconnectedPlayer, success := existingGame.HandleReconnect(existingPlayer.ID, conn)
 					if success {
@@ -76,7 +88,8 @@ func WSHandler(w http.ResponseWriter, r *http.Request) {
 					}
 					continue
 				} else {
-					conn.WriteJSON(game.Message{Type: game.MsgError, Payload: "Username already taken"})
+					// Player is connected in another session
+					conn.WriteJSON(game.Message{Type: game.MsgError, Payload: "Username already in use"})
 					continue
 				}
 			}

frontend/components/join-game-form.tsx

@@ -117,10 +117,18 @@ export function JoinGameForm({
             type="submit"
             className="w-full"
             disabled={
-              !username.trim() || !isConnected || isWaiting || !!validationError || hasActiveGame
+              !username.trim() ||
+              !isConnected ||
+              isWaiting ||
+              !!validationError ||
+              hasActiveGame
             }
           >
-            {isWaiting ? 'Searching...' : hasActiveGame ? 'Already in Game' : 'Find Match'}
+            {isWaiting
+              ? 'Searching...'
+              : hasActiveGame
+                ? 'Already in Game'
+                : 'Find Match'}
           </Button>
         </form>
       </CardContent>