Reconnect websocket with exponential backof if connection is lost

diff --git a/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java b/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java
index 668c0b13204bd3f536dfb6afcc6fbecb12bc806a..0deafc833db86b12a06d2dad4ab0400463bdb357 100644 (file)
--- a/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java
+++ b/lib/src/main/java/org/asamk/signal/manager/ManagerImpl.java
@@ -887,6 +887,8 @@ public class ManagerImpl implements Manager {
         signalWebSocket.connect();
 
         hasCaughtUpWithOldMessages = false;
         signalWebSocket.connect();
 
         hasCaughtUpWithOldMessages = false;

+        var backOffCounter = 0;
+        final var MAX_BACKOFF_COUNTER = 9;

 
         while (!Thread.interrupted()) {
             SignalServiceEnvelope envelope;
 
         while (!Thread.interrupted()) {
             SignalServiceEnvelope envelope;


@@ -901,6 +903,8 @@ public class ManagerImpl implements Manager {
                     // store message on disk, before acknowledging receipt to the server
                     cachedMessage[0] = account.getMessageCache().cacheMessage(envelope1, recipientId);
                 });
                     // store message on disk, before acknowledging receipt to the server
                     cachedMessage[0] = account.getMessageCache().cacheMessage(envelope1, recipientId);
                 });

+                backOffCounter = 0;
+

                 if (result.isPresent()) {
                     envelope = result.get();
                     logger.debug("New message received from server");
                 if (result.isPresent()) {
                     envelope = result.get();
                     logger.debug("New message received from server");


@@ -924,11 +928,24 @@ public class ManagerImpl implements Manager {
                 } else {
                     throw e;
                 }
                 } else {
                     throw e;
                 }

-            } catch (WebSocketUnavailableException e) {
-                logger.debug("Pipe unexpectedly unavailable, connecting");
-                signalWebSocket.connect();
-                continue;
+            } catch (IOException e) {
+                logger.debug("Pipe unexpectedly unavailable: {}", e.getMessage());
+                if (e instanceof WebSocketUnavailableException || "Connection closed!".equals(e.getMessage())) {
+                    final var sleepMilliseconds = 100 * (long) Math.pow(2, backOffCounter);
+                    backOffCounter = Math.min(backOffCounter + 1, MAX_BACKOFF_COUNTER);
+                    logger.warn("Connection closed unexpectedly, reconnecting in {} ms", sleepMilliseconds);
+                    try {
+                        Thread.sleep(sleepMilliseconds);
+                    } catch (InterruptedException interruptedException) {
+                        return;
+                    }
+                    hasCaughtUpWithOldMessages = false;
+                    signalWebSocket.connect();
+                    continue;
+                }
+                throw e;

             } catch (TimeoutException e) {
             } catch (TimeoutException e) {

+                backOffCounter = 0;

                 if (returnOnTimeout) return;
                 continue;
             }
                 if (returnOnTimeout) return;
                 continue;
             }