Merge pull request #35 from kitakkun/feature/automatic_reconnect

Automatically reconnect after being disconnected from the server
kitakkun · Apr 23, 2024 · 7eba5d1 · 7eba5d1
2 parents 3287bc8 + 513ea1f
commit 7eba5d1
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/...in/com/github/kitakkun/backintime/runtime/connector/BackInTimeWebSocketClientConnector.kt b/...in/com/github/kitakkun/backintime/runtime/connector/BackInTimeWebSocketClientConnector.kt
@@ -12,7 +12,7 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asSharedFlow
 import kotlinx.coroutines.launch
 
-class BackInTimeWebSocketClientConnector(host: String, port: Int) : BackInTimeConnector {
+class BackInTimeWebSocketClientConnector(host: String, port: Int, private val automaticReconnect: Boolean = true) : BackInTimeConnector {
     private val coroutineScope = CoroutineScope(Dispatchers.IO)
     private val client: BackInTimeWebSocketClient = BackInTimeWebSocketClient(host = host, port = port)
     override val connected: Boolean get() = client.isConnected
@@ -27,6 +27,12 @@ class BackInTimeWebSocketClientConnector(host: String, port: Int) : BackInTimeCo
                 delay(3000L)
             }
             mutableIsConnectedFlow.value = true
+            // reconnect after disconnection
+            if (automaticReconnect) {
+                client.closeReason().await()
+                mutableIsConnectedFlow.value = false
+                connect()
+            }
         }
     }
 

diff --git a/...nMain/kotlin/com/github/kitakkun/backintime/websocket/client/BackInTimeWebSocketClient.kt b/...nMain/kotlin/com/github/kitakkun/backintime/websocket/client/BackInTimeWebSocketClient.kt
@@ -41,12 +41,17 @@ class BackInTimeWebSocketClient(
     suspend fun connect(): Result<Unit> {
         return try {
             session = client.webSocketSession(host = host, port = port, path = "/backintime")
+            session?.closeReason?.invokeOnCompletion {
+                session = null
+            }
             Result.success(Unit)
         } catch (e: Throwable) {
             Result.failure(e)
         }
     }
 
+    fun closeReason() = session?.closeReason ?: error("Not connected")
+
     fun receiveEventAsFlow() = session?.incoming?.receiveAsFlow()
         ?.filterIsInstance<Frame.Text>()
         ?.map {