use readable close frame code

MrXiaoM · Jan 18, 2024 · 0684f42 · 0684f42
1 parent 1f4d550
commit 0684f42
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 2 deletions.
diff --git a/onebot/src/main/kotlin/cn/evolvefield/onebot/client/connection/ConnectFactory.kt b/onebot/src/main/kotlin/cn/evolvefield/onebot/client/connection/ConnectFactory.kt
@@ -84,4 +84,34 @@ class ConnectFactory private constructor(
             return ConnectFactory(config, logger)
         }
     }
+}
+enum class CloseCode(val code: Int) {
+    NORMAL(1000),
+    GOING_AWAY(1001),
+    PROTOCOL_ERROR(1002),
+    REFUSE(1003),
+    NO_CODE(1005),
+    ABNORMAL_CLOSE(1006),
+    NO_UTF8(1007),
+    POLICY_VALIDATION(1008),
+    TOO_BIG(1009),
+    EXTENSION(1010),
+    UNEXPECTED_CONDITION(1011),
+    SERVICE_RESTART(1012),
+    TRY_AGAIN_LATER(1013),
+    BAD_GATEWAY(1014),
+    TLS_ERROR(1015),
+    NEVER_CONNECTED(-1),
+    BUGGY_CLOSE(-2),
+    FLASH_POLICY(-3);
+
+    override fun toString(): String {
+        return name.uppercase()
+    }
+
+    companion object {
+        fun valueOf(code: Int): CloseCode? {
+            return values().firstOrNull { it.code == code }
+        }
+    }
 }
diff --git a/onebot/src/main/kotlin/cn/evolvefield/onebot/client/connection/WSClient.kt b/onebot/src/main/kotlin/cn/evolvefield/onebot/client/connection/WSClient.kt
@@ -73,7 +73,11 @@ class WSClient(
     }
 
     override fun onClose(code: Int, reason: String, remote: Boolean) {
-        logger.info("▌ 服务器连接因 {} 已关闭 ({})", reason, code)
+        logger.info(
+            "▌ 服务器连接因 {} 已关闭 (关闭码: {})",
+            reason.ifEmpty { "未知原因" },
+            CloseCode.valueOf(code) ?: code
+        )
         runCatching {
             if (mutex.isLocked) mutex.unlock()
             if (ActionSendUtils.mutex.isLocked) ActionSendUtils.mutex.unlock()

diff --git a/onebot/src/main/kotlin/cn/evolvefield/onebot/client/connection/WSServer.kt b/onebot/src/main/kotlin/cn/evolvefield/onebot/client/connection/WSServer.kt
@@ -97,7 +97,11 @@ class WSServer(
     }
 
     override fun onClose(conn: WebSocket, code: Int, reason: String, remote: Boolean) {
-        logger.info("▌ 反向 WebSocket 客户端连接因 {} 已关闭 ({})", reason, code)
+        logger.info(
+            "▌ 反向 WebSocket 客户端连接因 {} 已关闭 (关闭码: {})",
+            reason.ifEmpty { "未知原因" },
+            CloseCode.valueOf(code) ?: code
+        )
         runCatching {
             if (mutex.isLocked) mutex.unlock()
             if (ActionSendUtils.mutex.isLocked) ActionSendUtils.mutex.unlock()