From bf753bb5dddc867ae26d61bcd8b944901df5c658 Mon Sep 17 00:00:00 2001
From: Marco Beretta <81851188+berry-13@users.noreply.github.com>
Date: Sat, 5 Apr 2025 12:30:11 +0200
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat:=20improve=20WebRTC=20connecti?=
 =?UTF-8?q?on=20state=20handling=20and=20enhance=20WebSocket=20connection?=
 =?UTF-8?q?=20logic?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../services/Files/Audio/WebRTCHandler.js      |  7 +++----
 client/src/hooks/useWebSocket.ts               | 18 ++++++++++++++----
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/api/server/services/Files/Audio/WebRTCHandler.js b/api/server/services/Files/Audio/WebRTCHandler.js
index cc46998e03..5899e2f16e 100644
--- a/api/server/services/Files/Audio/WebRTCHandler.js
+++ b/api/server/services/Files/Audio/WebRTCHandler.js
@@ -69,9 +69,8 @@ class WebRTCConnection {
 
       const state = this.peerConnection.connectionState;
       logger.info(`Connection state changed to ${state}`);
-      this.state = state;
 
-      if (state === 'failed' || state === 'closed') {
+      if (state === 'failed' || state === 'closed' || state === 'disconnected') {
         this.cleanup();
       }
     };
@@ -148,8 +147,8 @@ class AudioHandler {
       rtcConnection.addIceCandidate(candidate);
     });
 
-    socket.on('vad-status', (status) => {
-      logger.debug(`VAD status from ${socket.id}: ${JSON.stringify(status)}`);
+    socket.on('vad-status', (speaking) => {
+      logger.debug(`VAD status from ${socket.id}: ${JSON.stringify(speaking)}`);
     });
 
     socket.on('disconnect', () => {
diff --git a/client/src/hooks/useWebSocket.ts b/client/src/hooks/useWebSocket.ts
index 37dc86a7c4..e6dc160ff4 100644
--- a/client/src/hooks/useWebSocket.ts
+++ b/client/src/hooks/useWebSocket.ts
@@ -18,11 +18,14 @@ class WebSocketManager extends EventEmitter {
   private reconnectAttempts = 0;
   private readonly MAX_RECONNECT_ATTEMPTS = 5;
   private isConnected = false;
+  private isConnecting = false;
 
   connect(url: string) {
-    if (this.socket && this.socket.connected) {
+    if (this.isConnecting || (this.socket && this.socket.connected)) {
       return;
     }
+
+    this.isConnecting = true;
     this.socket = io(url, {
       transports: ['websocket'],
       reconnectionAttempts: this.MAX_RECONNECT_ATTEMPTS,
@@ -33,11 +36,13 @@ class WebSocketManager extends EventEmitter {
 
   private setupEventHandlers() {
     if (!this.socket) {
+      this.isConnecting = false;
       return;
     }
 
     this.socket.on('connect', () => {
       this.isConnected = true;
+      this.isConnecting = false;
       this.reconnectAttempts = 0;
       this.emit('connectionChange', true);
     });
@@ -51,6 +56,7 @@ class WebSocketManager extends EventEmitter {
       this.reconnectAttempts++;
       this.emit('connectionChange', false);
       if (this.reconnectAttempts >= this.MAX_RECONNECT_ATTEMPTS) {
+        this.isConnecting = false;
         this.emit('error', 'Failed to connect after maximum attempts');
         this.disconnect();
       }
@@ -80,6 +86,7 @@ class WebSocketManager extends EventEmitter {
       this.socket = null;
     }
     this.isConnected = false;
+    this.isConnecting = false;
   }
 
   sendMessage(type: string, payload?: MessagePayload) {
@@ -91,7 +98,7 @@ class WebSocketManager extends EventEmitter {
   }
 
   getConnectionState() {
-    return this.isConnected;
+    return { isConnected: this.isConnected, isConnecting: this.isConnecting };
   }
 }
 
@@ -103,8 +110,11 @@ const useWebSocket = () => {
   const eventHandlersRef = useRef<Record<string, EventHandler>>({});
 
   useEffect(() => {
-    if (wsConfig?.url && !webSocketManager.getConnectionState()) {
-      webSocketManager.connect(wsConfig.url);
+    if (wsConfig?.url) {
+      const state = webSocketManager.getConnectionState();
+      if (!state.isConnected && !state.isConnecting) {
+        webSocketManager.connect(wsConfig.url);
+      }
 
       const handleConnectionChange = (connected: boolean) => setIsConnected(connected);
       webSocketManager.on('connectionChange', handleConnectionChange);