From 34eccda23361db4db7efd520c92d97f2dee00d79 Mon Sep 17 00:00:00 2001 From: WhiteChi Date: Tue, 19 Dec 2023 01:21:08 +0800 Subject: [PATCH] =?UTF-8?q?`Shamrock`:=20M=C3=A4=C3=A4ritetty=20tunnus=20e?= =?UTF-8?q?i=20vaadi=20suuraakkosia?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/moe/fuqiuluo/shamrock/remote/plugin/Auth.kt | 2 +- .../moe/fuqiuluo/shamrock/remote/service/WebSocketService.kt | 2 +- .../shamrock/remote/service/api/WebSocketClientServlet.kt | 5 ++++- .../shamrock/remote/service/api/WebSocketTransmitServlet.kt | 2 ++ 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/plugin/Auth.kt b/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/plugin/Auth.kt index 2f72a70..e0f396a 100644 --- a/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/plugin/Auth.kt +++ b/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/plugin/Auth.kt @@ -15,7 +15,7 @@ private suspend fun ApplicationCall.checkToken() { ?: fetchOrNull("ticket") ?: fetchOrNull("access_token") ?: throw ErrorTokenException - if (accessToken.startsWith("Bearer ")) { + if (accessToken.startsWith("Bearer ", ignoreCase = true)) { accessToken = accessToken.substring(7) } if (token != accessToken) { diff --git a/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/service/WebSocketService.kt b/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/service/WebSocketService.kt index b0ccdf4..6a0ad7b 100644 --- a/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/service/WebSocketService.kt +++ b/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/service/WebSocketService.kt @@ -66,7 +66,7 @@ internal class WebSocketService( .ifNullOrEmpty(handshake.getFieldValue("ticket")) .ifNullOrEmpty(handshake.getFieldValue("Authorization")) ?: throw ErrorTokenException - if (accessToken.startsWith("Bearer ")) { + if (accessToken.startsWith("Bearer ", ignoreCase = true)) { accessToken = accessToken.substring(7) } val tokenList = token.split(",", "|", "，") diff --git a/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/service/api/WebSocketClientServlet.kt b/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/service/api/WebSocketClientServlet.kt index b71d9cb..af8fcb1 100644 --- a/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/service/api/WebSocketClientServlet.kt +++ b/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/service/api/WebSocketClientServlet.kt @@ -106,7 +106,10 @@ internal abstract class WebSocketClientServlet( } private fun startHeartbeatTimer() { - if (heartbeatInterval <= 0) return + if (heartbeatInterval <= 0) { + LogCenter.log("被动WebSocket心跳间隔为0，不启动心跳", Level.WARN) + return + } timer( name = "heartbeat", initialDelay = 0, diff --git a/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/service/api/WebSocketTransmitServlet.kt b/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/service/api/WebSocketTransmitServlet.kt index 0ede721..6afde78 100644 --- a/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/service/api/WebSocketTransmitServlet.kt +++ b/xposed/src/main/java/moe/fuqiuluo/shamrock/remote/service/api/WebSocketTransmitServlet.kt @@ -78,6 +78,8 @@ internal abstract class WebSocketTransmitServlet( ) ) } + } else { + LogCenter.log("主动WebSocket心跳间隔为0，不启动心跳", Level.WARN) } }