From 75a4d1cbc0996f742e76266e4bacfea39c7ae377 Mon Sep 17 00:00:00 2001
From: sebseb7 <sebgreenbus@gmail.com>
Date: Sun, 18 Jan 2026 21:06:58 -0500
Subject: [PATCH] feat: Enhance WebSocket connection reliability with
 client-side retry/timeout and faster pings, and disable dashboard caching.

---
 server.js        |  2 +-
 status_server.js | 48 +++++++++++++++++++++++++++++++++++++++++++++---
 2 files changed, 46 insertions(+), 4 deletions(-)
diff --git a/server.js b/server.js
index cc21a49..c6f46e2 100644
--- a/server.js
+++ b/server.js
@@ -198,7 +198,7 @@ const interval = setInterval(() => {
         ws.isAlive = false;
         ws.ping();
     });
-}, 30000);
+}, 10000);
 
 wss.on('close', () => {
     clearInterval(interval);
diff --git a/status_server.js b/status_server.js
index 978bbde..477e7ef 100644
--- a/status_server.js
+++ b/status_server.js
@@ -515,23 +515,60 @@ const dashboardHTML = `<!DOCTYPE html>
     <script>
         let devices = {};
         let ws;
+        let retryCount = 0;
+        let connectionTimeout;
         
         function connectWebSocket() {
-            ws = new WebSocket('ws://' + window.location.host);
+            retryCount++;
+            console.log('WebSocket: Connecting... (attempt ' + retryCount + ')');
+            document.getElementById('connection-status').textContent = 'Connecting... (attempt ' + retryCount + ')';
+            
+            // Clear any existing connection
+            if (ws) {
+                ws.onclose = null;
+                ws.onerror = null;
+                ws.onopen = null;
+                try { ws.close(); } catch(e) {}
+            }
+            
+            try {
+                ws = new WebSocket('ws://' + window.location.host);
+            } catch (err) {
+                console.error('WebSocket: Failed to create', err);
+                setTimeout(connectWebSocket, 2000);
+                return;
+            }
+            
+            // Connection timeout - abort if no response in 3 seconds
+            connectionTimeout = setTimeout(() => {
+                console.log('WebSocket: Connection timeout, retrying...');
+                if (ws.readyState === WebSocket.CONNECTING) {
+                    ws.close();
+                }
+            }, 3000);
             
             ws.onopen = () => {
+                clearTimeout(connectionTimeout);
+                console.log('WebSocket: Connected');
+                retryCount = 0;
                 document.getElementById('ws-dot').classList.add('connected');
                 document.getElementById('connection-status').textContent = 'Connected';
                 document.getElementById('connection-status').classList.add('connected');
             };
             
-            ws.onclose = () => {
+            ws.onclose = (e) => {
+                clearTimeout(connectionTimeout);
+                console.log('WebSocket: Closed', e.code, e.reason);
                 document.getElementById('ws-dot').classList.remove('connected');
                 document.getElementById('connection-status').textContent = 'Disconnected - Reconnecting...';
                 document.getElementById('connection-status').classList.remove('connected');
                 setTimeout(connectWebSocket, 2000);
             };
             
+            ws.onerror = (e) => {
+                console.error('WebSocket: Error', e);
+            };
+            
             ws.onmessage = (event) => {
                 const data = JSON.parse(event.data);
                 
@@ -841,7 +878,12 @@ const server = http.createServer(async (req, res) => {
 
     // Serve dashboard
     if (url.pathname === '/' || url.pathname === '/index.html') {
-        res.writeHead(200, { 'Content-Type': 'text/html' });
+        res.writeHead(200, {
+            'Content-Type': 'text/html',
+            'Cache-Control': 'no-cache, no-store, must-revalidate',
+            'Pragma': 'no-cache',
+            'Expires': '0'
+        });
         res.end(dashboardHTML);
         return;
     }
