fix(whisper): Stopping reconnection when the meeting has ended.

jitsi · Oct 31, 2024 · 76bbca7 · 76bbca7
1 parent b754996
commit 76bbca7
Showing 1 changed file with 18 additions and 6 deletions.
diff --git a/src/main/java/org/jitsi/jigasi/transcription/WhisperWebsocket.java b/src/main/java/org/jitsi/jigasi/transcription/WhisperWebsocket.java
@@ -184,7 +184,8 @@ private void connectInternal()
         long waitTime = 1000L;
         boolean isConnected = false;
         wsSession = null;
-        while (attempt < maxRetryAttempts && !isConnected)
+        // avoid executing if meeting ended (we are not running) while we were reconnecting
+        while (attempt < maxRetryAttempts && !(reconnecting && !isRunning()) && !isConnected)
         {
             try
             {
@@ -231,7 +232,7 @@ private void connectInternal()
 
     private synchronized void reconnect()
     {
-        if (reconnecting)
+        if (reconnecting && !isRunning())
         {
             return;
         }
@@ -250,7 +251,7 @@ private synchronized void reconnect()
     @OnWebSocketClose
     public void onClose(int statusCode, String reason)
     {
-        if (!this.participants.isEmpty())
+        if (isRunning())
         {
             // let's try to reconnect
             if (!wsSession.isOpen())
@@ -261,7 +262,7 @@ public void onClose(int statusCode, String reason)
             }
         }
 
-        if (participants != null && !participants.isEmpty())
+        if (isRunning())
         {
             logger.error("Websocket closed: " + statusCode + " reason:" + reason);
         }
@@ -366,7 +367,7 @@ public void onMessage(String msg)
     @OnWebSocketError
     public void onError(Throwable cause)
     {
-        if (!ended() && participants != null && !participants.isEmpty())
+        if (!ended() && isRunning())
         {
             Statistics.incrementTotalTranscriberSendErrors();
             logger.error("Error while streaming audio data to transcription service.", cause);
@@ -414,7 +415,7 @@ public void disconnectParticipant(String participantId, Consumer<Boolean> callba
 
     private void disconnectParticipantInternal(String participantId, Consumer<Boolean> callback)
     {
-        if (ended() && (participants == null || participants.isEmpty()))
+        if (ended() && !isRunning())
         {
             callback.accept(true);
             return;
@@ -514,4 +515,15 @@ public boolean ended()
     {
         return wsSession == null;
     }
+
+    /**
+     * We consider this websocket transcription running when there are participants.
+     * While reconnecting we still have participants. After disconnectParticipantInternal where we clean
+     * all participants and close the socket we are no longer running, and we should not try to reconnect.
+     * @return true if operational.
+     */
+    private boolean isRunning()
+    {
+        return participants != null && !participants.isEmpty();
+    }
 }