CU-868fdadum PR#166 fix

Author: ucswift

src/services/__tests__/signalr.service.enhanced.test.ts

@@ -1,4 +1,4 @@
-import { HubConnection, HubConnectionBuilder, LogLevel } from '@microsoft/signalr';
+import { HubConnection, HubConnectionBuilder, HubConnectionState, LogLevel } from '@microsoft/signalr';
 
 import { logger } from '@/lib/logging';
 
@@ -72,6 +72,7 @@ describe('SignalRService - Enhanced Features', () => {
       onclose: jest.fn(),
       onreconnecting: jest.fn(),
       onreconnected: jest.fn(),
+      state: HubConnectionState.Disconnected,
     } as any;
 
     // Mock HubConnectionBuilder
@@ -268,25 +269,26 @@ describe('SignalRService - Enhanced Features', () => {
 
       jest.useFakeTimers();
 
-      // Mock the connections map to indicate connection exists
-      const connectionsMap = (service as any).connections;
-      const originalHas = connectionsMap.has;
-      connectionsMap.has = jest.fn().mockReturnValue(true);
+      // Mock connection state to be Connected
+      Object.defineProperty(mockConnection, 'state', {
+        value: HubConnectionState.Connected,
+        writable: true,
+      });
 
-      // Trigger connection close
+      // Clear previous logs to isolate subsequent logging
+      jest.clearAllMocks();
+      
+      // Trigger connection close to schedule a reconnect
       onCloseCallback();
 
-      // Fast forward time
+      // Fast forward time to trigger the scheduled reconnect
       jest.advanceTimersByTime(5000);
 
       // Should log skip message
       expect(mockLogger.debug).toHaveBeenCalledWith({
         message: `Hub ${mockConfig.name} is already connected, skipping reconnection attempt`,
       });
 
-      // Restore original method
-      connectionsMap.has = originalHas;
-      
       jest.useRealTimers();
     });
 

src/services/signalr.service.ts

@@ -1,4 +1,4 @@
-import { type HubConnection, HubConnectionBuilder, LogLevel } from '@microsoft/signalr';
+import { type HubConnection, HubConnectionBuilder, HubConnectionState, LogLevel } from '@microsoft/signalr';
 
 import { Env } from '@/lib/env';
 import { logger } from '@/lib/logging';
@@ -337,16 +337,20 @@ class SignalRService {
               return;
             }
 
-            // Check if connection was re-established during the delay
-            if (this.connections.has(hubName)) {
+            // If a live connection exists, skip; if it's stale/closed, drop it
+            const existingConn = this.connections.get(hubName);
+            if (existingConn && existingConn.state === HubConnectionState.Connected) {
               logger.debug({
                 message: `Hub ${hubName} is already connected, skipping reconnection attempt`,
               });
               return;
             }
 
-            // Set reconnecting flag to indicate this hub is in the process of reconnecting
+            // Mark reconnecting and remove stale entry (if any) to allow a fresh connect
             this.reconnectingHubs.add(hubName);
+            if (existingConn) {
+              this.connections.delete(hubName);
+            }
 
             try {
               // Refresh authentication token before reconnecting