try fix not reconnect when code is NORMAL(1000)

MrXiaoM · Aug 14, 2024 · e2ed65e · e2ed65e
1 parent b2f92a1
commit e2ed65e
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/onebot/src/main/kotlin/client/connection/WSClient.kt b/onebot/src/main/kotlin/client/connection/WSClient.kt
@@ -28,6 +28,7 @@ class WSClient(
     header: Map<String, String> = mapOf(),
 ) : WebSocketClient(uri, header), IAdapter {
     private var retryCount = 0
+    private var scheduleClose = false
     @OptIn(InternalCoroutinesApi::class)
     private val connectDef = CompletableDeferred<Boolean>(config.parentJob).apply {
         invokeOnCompletion(
@@ -48,6 +49,16 @@ class WSClient(
         logger.info("▌ 已连接到服务器 ┈━═☆")
     }
 
+    override fun connect() {
+        scheduleClose = false
+        super.connect()
+    }
+
+    override fun close() {
+        scheduleClose = true
+        super.close()
+    }
+
     override fun onMessage(message: String) = onReceiveMessage(message)
 
     override fun onClose(code: Int, reason: String, remote: Boolean) {
@@ -59,7 +70,7 @@ class WSClient(
         unlockMutex()
 
         // 自动重连
-        if (code != CloseFrame.NORMAL) retry()
+        if (!scheduleClose) retry()
     }
 
     private fun retry() {