Merge pull request #2872 from c3d1c06c-bf26-477e-b0eb-c50ef4477ba6/master

The Problem:

The current code creates a new WebSocket connection in the reconnection callback but stores it in a local variable (newWs), leaving the global ws variable pointing to the closed connection.

This causes the polling fallback to continue running even after a successful WebSocket reconnection, resulting in duplicate metric updates.

The Solution:

By directly assigning to the global ws variable, the fix ensures that:

- The polling check at line 367 (if (!ws || ws.readyState !== WebSocket.OPEN)) works correctly
- Only one update mechanism (WebSocket or polling) runs at a time
- The dashboard doesn't receive duplicate updates.

Author: jedisct1

dnscrypt-proxy/static/js/monitoring.js

@@ -286,23 +286,23 @@ function connectWebSocket() {
         console.log('WebSocket URL:', wsUrl);
 
         // Create WebSocket connection
-        var ws = new WebSocket(wsUrl);
+        var newWs = new WebSocket(wsUrl);
 
         // Connection opened
-        ws.onopen = function() {
+        newWs.onopen = function() {
             console.log('WebSocket connected successfully');
             wsReconnectAttempts = 0; // Reset reconnect attempts on successful connection
 
             // Send a ping to verify connection
             try {
-                ws.send(JSON.stringify({type: 'ping'}));
+                newWs.send(JSON.stringify({type: 'ping'}));
             } catch (e) {
                 console.error('Error sending ping:', e);
             }
         };
 
         // Listen for messages
-        ws.onmessage = function(event) {
+        newWs.onmessage = function(event) {
             try {
                 if (!event) {
                     console.warn('Received invalid WebSocket event');
@@ -323,12 +323,12 @@ function connectWebSocket() {
         };
 
         // Handle errors
-        ws.onerror = function(error) {
+        newWs.onerror = function(error) {
             console.error('WebSocket error occurred:', error);
         };
 
         // Connection closed
-        ws.onclose = function(event) {
+        newWs.onclose = function(event) {
             console.log('WebSocket disconnected, code:', event.code, 'reason:', event.reason || 'No reason provided');
 
             // Try to reconnect with exponential backoff
@@ -338,10 +338,8 @@ function connectWebSocket() {
                 console.log('Attempting to reconnect in ' + delay + 'ms (attempt ' + wsReconnectAttempts + '/' + maxReconnectAttempts + ')');
 
                 setTimeout(function() {
-                    var newWs = connectWebSocket();
-                    if (newWs) {
-                        // We can't update the global ws variable from here
-                        // Instead, we'll rely on the polling fallback
+                    ws = connectWebSocket();
+                    if (ws) {
                         console.log('New WebSocket connection established');
                     }
                 }, delay);
@@ -350,7 +348,7 @@ function connectWebSocket() {
             }
         };
 
-        return ws;
+        return newWs;
     } catch (error) {
         console.error('Failed to create WebSocket connection:', error);
         return null;
@@ -459,4 +457,4 @@ setTimeout(function() {
             loadingIndicator.style.display = 'none';
         }, 5000);
     }
-}, 20000);
+}, 20000);