Merge pull request #231 from krasnyt/fix/reconnect-on-pong-timeout

fix(websocket): auto-restart after abnormal local close (pong timeout)

Author: jimirocks

src/main/java/cz/smarteon/loxone/LoxoneWebsocketClient.java

@@ -133,7 +133,11 @@ public void onClose(int code, String reason, boolean remote) {
                 keepAliveFuture.cancel(true);
             }
             ws.connectionClosed(code, remote);
-            if (remote && code != CloseFrame.NEVER_CONNECTED) {
+            // Reconnect not only on remote close, but also on an abnormal *local* close (code 1006),
+            // which is how Java-WebSocket reports a lost connection (e.g. the miniserver stops
+            // answering pings/pongs). A deliberate LoxoneWebSocket.close() produces a NORMAL (1000)
+            // local close, so it is intentionally excluded and won't trigger a restart.
+            if (code != CloseFrame.NEVER_CONNECTED && (remote || code == CloseFrame.ABNORMAL_CLOSE)) {
                 ws.autoRestart();
             }
         }

src/test/kotlin/LoxoneWebsocketClientTest.kt

@@ -1,10 +1,10 @@
 package cz.smarteon.loxone
 
 import io.mockk.mockk
+import io.mockk.verify
+import org.java_websocket.framing.CloseFrame
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
-import org.junit.jupiter.params.ParameterizedTest
-import org.junit.jupiter.params.provider.ValueSource
 import strikt.api.expectCatching
 import strikt.assertions.isSuccess
 import java.net.URI
@@ -27,13 +27,27 @@ class LoxoneWebsocketClientTest {
         }.isSuccess()
     }
 
-    @ParameterizedTest
-    @ValueSource(booleans = [true, false])
-    fun `should handle onClose`(remote: Boolean) {
-        client.onClose(1000, "some reason", remote)
+    @Test
+    fun `should auto-restart on remote close`() {
+        client.onClose(CloseFrame.NORMAL, "normally closed", true)
+
+        verify { webSocket.connectionClosed(CloseFrame.NORMAL, true) }
+        verify { webSocket.autoRestart() }
+    }
+
+    @Test
+    fun `should auto-restart on abnormal local close (lost connection or pong timeout)`() {
+        client.onClose(CloseFrame.ABNORMAL_CLOSE, "no pong in time", false)
+
+        verify { webSocket.connectionClosed(CloseFrame.ABNORMAL_CLOSE, false) }
+        verify { webSocket.autoRestart() }
+    }
+
+    @Test
+    fun `should not auto-restart on deliberate local close`() {
+        client.onClose(CloseFrame.NORMAL, "closed by client", false)
 
-        expectCatching { webSocket.wsClosed() }.isSuccess()
-        expectCatching { webSocket.connectionClosed(1000, remote) }.isSuccess()
-        if (remote) expectCatching { webSocket.autoRestart() }.isSuccess()
+        verify { webSocket.connectionClosed(CloseFrame.NORMAL, false) }
+        verify(exactly = 0) { webSocket.autoRestart() }
     }
 }