feat(client):优化客户端连接与心跳检测机制- 在BaseClient初始化时更新最后一次心跳时间

- 将ClientManager中的HeartbeatTimeOut改为常量- 调整心跳检测间隔从15秒到20秒
- 增加对hashKey为空的连接拒绝处理- 延长握手超时检测时间至15秒- 优化WebSocket错误处理逻辑- 简化handleTextMessage中的body获取逻辑

Author: HuoHuas001

src/main/kotlin/WebsocketServer.kt

@@ -82,7 +82,7 @@ object WebsocketServer {
 
         // 添加10秒握手超时检测
         coroutineScope.launch {
-            delay(10000)
+            delay(15*1000)
             try {
                 val serverPackage = ClientManager.getServerPackageBySession(session)
                 val botClient = ClientManager.getBotClient()
@@ -116,6 +116,7 @@ object WebsocketServer {
     }
 
     fun handleError(session: WebSocketSession, error: Exception) {
+        coroutineScope.launch { session.close(CloseReason(CloseReason.Codes.INTERNAL_ERROR, "Error Message.")) }
         logger.error("[Websocket] 处理消息时发生错误", error)
     }
 
@@ -194,18 +195,11 @@ object WebsocketServer {
         }
     }
 
-    private fun checkPackLegal(data: JSONObject){
-
-    }
-
     fun handleTextMessage(session: ClientSession, payload: String) {
         try {
             val data = JSONObject.parseObject(payload)
             val header = data.getJSONObject("header")
-            var body = data.getJSONObject("body")
-            if(body ==  null){
-                body = JSONObject()
-            }
+            val body = data.getJSONObject("body")?: JSONObject()
             val msgType = header.getString("type")
             val packId = header.getString("id")
 

src/main/kotlin/client/BaseClient.kt

@@ -26,6 +26,8 @@ abstract class BaseClient(session: ClientSession, clientType: ClientType) {
     init {
         mClientType = clientType
         mSession = session
+        //连接进入时更新最后一次心跳时间
+        updateLastHeartbeatTime()
     }
 
     /**

src/main/kotlin/events/server/EventHandler/Server_handle_BindConfirm.kt

@@ -24,7 +24,9 @@ object Server_handle_BindConfirm: BaseEvent() {
                 }
                 try {
                     val config: JSONObject = getServerConfig(serverId, isMoreGroup)
-                    if(mClient ==  null) return@Consumer
+                    if(mClient ==  null) {
+                        return@Consumer
+                    }
                     if (mClient!!.sendMessage(ServerSendEvent.ServerSendConfig, config, mPackId)) {
                         val bindServerPack = JSONObject()
                         bindServerPack["group"] = groupOpenid

src/main/kotlin/events/server/EventHandler/Server_handle_ShakeHand.kt

@@ -62,11 +62,11 @@ object Server_handle_ShakeHand: BaseEvent() {
 
     fun runShake(session: ClientSession): Boolean {
         val serverId: String? = mBody.getString("serverId")
-        val hashKey: String = mBody.getString("hashKey")
+        val hashKey: String? = mBody.getString("hashKey")
 
-        val platform: String = mBody.getString("platform")
-        val name: String = mBody.getString("name")
-        val version: String = mBody.getString("version")
+        val platform: String = mBody.getString("platform")?: "Unknown"
+        val name: String = mBody.getString("name")?: "Unknown"
+        val version: String = mBody.getString("version")?: "0.0.0"
 
         val serverClient = ServerClient(session)
 
@@ -76,6 +76,12 @@ object Server_handle_ShakeHand: BaseEvent() {
             return false
         }
 
+        if (hashKey == null || hashKey.isEmpty()) {
+            //拒绝连接
+            serverClient.shutdown(CloseReason.Codes.VIOLATED_POLICY, "hashKey为空.")
+            return false
+        }
+
         serverClient.mServerId = serverId
         serverClient.mHashKey = hashKey
         serverClient.platform = platform

src/main/kotlin/tools/manager/ClientManager.kt

@@ -22,7 +22,7 @@ object ClientManager {
     //等待BotClient连接队列
     private val waitingBotClientList: MutableMap<String, ServerClient> = ConcurrentHashMap<String, ServerClient>()
     //心跳超时时间
-    private val HeartbeatTimeOut: Long = 60*1000
+    private const val HeartbeatTimeOut: Long = 60*1000
 
     private var mBotClient: BotClient? = null
     //心跳检测协程
@@ -32,7 +32,7 @@ object ClientManager {
         // 每隔5秒检查一次心跳，替代原来的 scheduler.scheduleAtFixedRate
         coroutineScope.launch {
             while (isActive) {
-                delay(15*1000) // 5秒延迟
+                delay(20*1000)
                 checkHeartbeats()
             }
         }
@@ -216,6 +216,4 @@ object ClientManager {
             false
         }
     }
-
-
 }