fix: WebSocket reconnect resilience + admin wake lock (#646, #647)

#647: Admin page now keeps screen awake during all active game phases,
with visibilitychange handler and wake lock on page reload/reconnect.

#646: Fix cascade of issues causing mobile players to get locked out:
- Reconnect loop now stays on session-based reconnect while cookie exists
- Session cookie no longer cleared on transient SESSION_NOT_FOUND
- Wake lock activated from join_ack (not just PLAYING phase)
- Faster reconnect backoff (500ms for first 3 attempts, then linear)
- Server-side add_player() checks actual WS status to resolve race
  condition where reload + async disconnect = NAME_TAKEN

Closes #646, closes #647

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: 2 people

custom_components/beatify/game/player_registry.py

@@ -88,6 +88,16 @@ def add_player(
                     existing_player.connected = True
                     _LOGGER.info("Player reconnected: %s", existing_name)
                     return True, None
+                # #646: Check if the old WS is actually dead (race condition
+                # where _handle_disconnect hasn't run yet after browser reload)
+                if existing_player.ws is None or existing_player.ws.closed:
+                    _LOGGER.info(
+                        "Player %s: stale connected flag, old WS closed — allowing rejoin",
+                        existing_name,
+                    )
+                    existing_player.ws = ws
+                    existing_player.connected = True
+                    return True, None
                 return False, ERR_NAME_TAKEN
 
         # Check player limit

custom_components/beatify/manifest.json

@@ -12,5 +12,5 @@
   "documentation": "https://github.com/mholzi/beatify",
   "iot_class": "local_push",
   "issue_tracker": "https://github.com/mholzi/beatify/issues",
-  "version": "3.0.4"
+  "version": "3.0.5"
 }

custom_components/beatify/www/js/admin.js

@@ -55,6 +55,13 @@ function _releaseWakeLock() {
     }
 }
 
+// #647: Re-acquire wake lock when admin tab becomes visible during an active game
+document.addEventListener('visibilitychange', function() {
+    if (document.visibilityState === 'visible' && currentGame && currentGame.phase !== 'END') {
+        _requestWakeLock();
+    }
+});
+
 // Module-level state
 let selectedPlaylists = [];
 let playlistData = [];
@@ -233,6 +240,7 @@ async function loadStatus() {
         // Check for active game and show appropriate view
         if (status.active_game && status.active_game.phase === 'LOBBY') {
             currentGame = status.active_game;
+            _requestWakeLock(); // #647: keep screen on when reconnecting to active game
             showLobbyView(status.active_game);
             // Issue #477: Reconnect admin WS if we have a token
             if (!adminWs || adminWs.readyState !== WebSocket.OPEN) {
@@ -2901,6 +2909,13 @@ function handleAdminWsMessage(data) {
 function handleAdminStateUpdate(data) {
     currentGame = data;
 
+    // #647: Wake lock for all active game phases
+    if (['LOBBY', 'PLAYING', 'REVEAL', 'PAUSED'].includes(data.phase)) {
+        _requestWakeLock();
+    } else {
+        _releaseWakeLock();
+    }
+
     // Hide all phase sections first
     var sections = ['setup-container', 'lobby-section', 'existing-game-section',
                     'admin-playing-section', 'admin-reveal-section', 'admin-end-section'];

custom_components/beatify/www/js/admin.min.js

@@ -164,7 +164,9 @@ function getStoredLanguage() {
 // ============================================
 
 function getReconnectDelay() {
-    return Math.min(1000 * Math.pow(2, state.reconnectAttempts), MAX_RECONNECT_DELAY_MS);
+    // #646: First 3 attempts are fast (500ms), then linear ramp to cap
+    if (state.reconnectAttempts <= 3) return 500;
+    return Math.min(1000 * (state.reconnectAttempts - 2), MAX_RECONNECT_DELAY_MS);
 }
 
 function showConnectionIndicator() {
@@ -339,7 +341,12 @@ function connectWithSession() {
 
             var delay = getReconnectDelay();
             console.log('WebSocket closed. Reconnecting in ' + delay + 'ms... (attempt ' + state.reconnectAttempts + ')');
-            setTimeout(function() { connectWebSocket(state.playerName); }, delay);
+            // #646: Keep using session reconnect while cookie exists
+            if (getSessionCookie()) {
+                setTimeout(connectWithSession, delay);
+            } else {
+                setTimeout(function() { connectWebSocket(state.playerName); }, delay);
+            }
         } else if (state.reconnectAttempts >= MAX_RECONNECT_ATTEMPTS) {
             state.isReconnecting = false;
             hideReconnectingOverlay();
@@ -545,6 +552,8 @@ function handleServerMessage(data) {
             clearStoredPlayerName();
         }
     } else if (data.type === 'join_ack') {
+        // #646: Request wake lock early — not just during PLAYING
+        requestWakeLock();
         if (data.session_id) {
             setSessionCookie(data.session_id);
         }
@@ -593,6 +602,11 @@ function handleServerMessage(data) {
             return;
         }
         if (data.code === 'SESSION_NOT_FOUND') {
+            // #646: Don't clear session cookie during reconnect — may be transient
+            if (state.isReconnecting) {
+                console.warn('SESSION_NOT_FOUND during reconnect, will retry with session');
+                return;
+            }
             clearSessionCookie();
             state.intentionalLeave = true;
             if (state.ws) {
@@ -935,8 +949,8 @@ if ('serviceWorker' in navigator) {
 // reconnect if the socket is dead — without waiting for the onclose backoff timer.
 document.addEventListener('visibilitychange', function() {
     if (document.visibilityState === 'visible') {
-        // #622: Re-acquire wake lock when tab becomes visible during an active game
-        if (state.currentRoundNumber > 0) {
+        // #646: Re-acquire wake lock when tab becomes visible during any active session
+        if (state.playerName) {
             requestWakeLock();
         }
         var ws = state.ws;