Shamrock: 尝试修复重复Client连接 #187

xposed/src/main/java/moe/fuqiuluo/shamrock/remote/service/WebSocketClientService.kt

@@ -18,6 +18,11 @@ internal class WebSocketClientService(
 ) : WebSocketClientServlet(address, heartbeatInterval, wsHeaders) {
     private val eventJobList = mutableSetOf<Job>()
 
+    init {
+        startHeartbeatTimer()
+        initTransmitter()
+    }
+
     override fun submitFlowJob(job: Job) {
         eventJobList.add(job)
     }

xposed/src/main/java/moe/fuqiuluo/shamrock/remote/service/api/WebSocketClientServlet.kt

@@ -35,24 +35,22 @@ import java.net.URI
 import kotlin.concurrent.timer
 
 internal abstract class WebSocketClientServlet(
-    url: String,
+    private val url: String,
     private val heartbeatInterval: Long,
     private val wsHeaders: Map<String, String>
 ) : BaseTransmitServlet, WebSocketClient(URI(url), wsHeaders) {
+    init {
+        if (connectedClients.containsKey(url)) {
+            throw RuntimeException("WebSocketClient已存在: $url")
+        }
+    }
+
     private val sendLock = Mutex()
 
     override fun allowTransmit(): Boolean {
         return ShamrockConfig.openWebSocketClient()
     }
 
-    override fun onOpen(handshakedata: ServerHandshake?) {
-        LogCenter.log("WebSocketClient onOpen: ${handshakedata?.httpStatus}, ${handshakedata?.httpStatusMessage}")
-
-        startHeartbeatTimer()
-        pushMetaLifecycle()
-        initTransmitter()
-    }
-
     override fun onMessage(message: String) {
         GlobalScope.launch {
             handleMessage(message)
@@ -84,6 +82,16 @@ internal abstract class WebSocketClientServlet(
         respond?.let { send(it) }
     }
 
+    override fun onOpen(handshakedata: ServerHandshake?) {
+        LogCenter.log("WebSocketClient onOpen: ${handshakedata?.httpStatus}, ${handshakedata?.httpStatusMessage}")
+
+        connectedClients[url] = this
+
+        //startHeartbeatTimer()
+        pushMetaLifecycle()
+        //initTransmitter()
+    }
+
     override fun onClose(code: Int, reason: String?, remote: Boolean) {
         if (code == 403) {
             if (wsHeaders.containsKey("authorization")) {
@@ -95,11 +103,13 @@ internal abstract class WebSocketClientServlet(
         }
         LogCenter.log("WebSocketClient onClose: $code, $reason, $remote")
         cancelFlowJobs()
+        connectedClients.remove(url)
     }
 
     override fun onError(ex: Exception?) {
         LogCenter.log("WebSocketClient onError: ${ex?.message}")
         cancelFlowJobs()
+        connectedClients.remove(url)
     }
 
     protected suspend inline fun <reified T> pushTo(body: T) {
@@ -113,14 +123,14 @@ internal abstract class WebSocketClientServlet(
         }
     }
 
-    private fun startHeartbeatTimer() {
+    fun startHeartbeatTimer() {
         if (heartbeatInterval <= 0) {
             LogCenter.log("被动WebSocket心跳间隔为0，不启动心跳", Level.WARN)
             return
         }
         timer(
             name = "heartbeat",
-            initialDelay = 0,
+            initialDelay = heartbeatInterval,
             period = heartbeatInterval,
         ) {
             if (isClosed || isClosing || !isOpen) {
@@ -143,7 +153,7 @@ internal abstract class WebSocketClientServlet(
                             status = "正常",
                             good = true
                         ),
-                        interval = 1000L * 15
+                        interval = heartbeatInterval
                     )
                 )
             )
@@ -169,4 +179,8 @@ internal abstract class WebSocketClientServlet(
             )
         }
     }
+
+    companion object {
+        private val connectedClients = mutableMapOf<String, WebSocketClientServlet>()
+    }
 }

xposed/src/main/java/moe/fuqiuluo/shamrock/xposed/actions/InitRemoteService.kt

@@ -115,8 +115,12 @@ internal class InitRemoteService : IAction {
                     LogCenter.log("被动WebSocket地址不合法: $url", Level.ERROR)
                 }
             } catch (e: Throwable) {
+                if (e is RuntimeException) {
+                    LogCenter.log(e.message ?: e.stackTraceToString(), Level.ERROR)
+                } else {
                     LogCenter.log(e.stackTraceToString(), Level.ERROR)
                 }
             }
         }
     }
+}