Improve watch reconnect, backoff and log disconnect error

minekube · Feb 26, 2023 · 619fb8e · 619fb8e
1 parent e18d7b3
commit 619fb8e
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 2 deletions.
diff --git a/core/src/main/java/com/minekube/connect/register/WatcherRegister.java b/core/src/main/java/com/minekube/connect/register/WatcherRegister.java
@@ -145,9 +145,10 @@ private class WatcherImpl implements Watcher {
 
         @Override
         public void onOpen() {
-            // Reset the retry backoff after a successful connection
-            resetBackOff();
             logger.translatedInfo("connect.watch.started");
+
+            // Reset the retry backoff after the connection is healthy for some seconds
+            startResetBackOffTimer();
         }
 
         @Override
@@ -194,7 +195,39 @@ public void onError(Throwable t) {
                                     : " (cause: " + t.getCause().toString() + ")"
                     )
             );
+            cancelResetBackOffTimer();
             retry();
         }
+
+        @Override
+        public void onCompleted() {
+            cancelResetBackOffTimer();
+            retry();
+        }
+
+        private Timer resetBackOffTimer;
+
+        void startResetBackOffTimer() {
+            if (resetBackOffTimer != null) {
+                resetBackOffTimer.cancel();
+            }
+            resetBackOffTimer = new Timer();
+            resetBackOffTimer.schedule(new TimerTask() {
+                @Override
+                public void run() {
+                    if (started.get()) {
+                        resetBackOff();
+                    }
+                }
+            }, Duration.ofSeconds(10).toMillis());
+        }
+
+        void cancelResetBackOffTimer() {
+            if (resetBackOffTimer != null) {
+                resetBackOffTimer.cancel();
+                resetBackOffTimer = null;
+            }
+        }
+
     }
 }
diff --git a/core/src/main/java/com/minekube/connect/watch/WatchClient.java b/core/src/main/java/com/minekube/connect/watch/WatchClient.java
@@ -71,6 +71,10 @@ public WebSocket watch(Watcher watcher) {
         return httpClient.newWebSocket(req, new WebSocketListener() {
             @Override
             public void onClosed(@NotNull WebSocket webSocket, int code, @NotNull String reason) {
+                if (code != 1000) {
+                    watcher.onError(new RuntimeException("Watch closed with code " + code + ": " + reason));
+                    return;
+                }
                 watcher.onCompleted();
             }