From d23544f2f10f03f3bacadc704840ae9d03227245 Mon Sep 17 00:00:00 2001 From: kuku Date: Fri, 6 Sep 2024 15:04:59 +0800 Subject: [PATCH 1/2] catch exception in websocket --- .../component/onebot/v11/core/bot/internal/OneBotBotImpl.kt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/simbot-component-onebot-v11/simbot-component-onebot-v11-core/src/commonMain/kotlin/love/forte/simbot/component/onebot/v11/core/bot/internal/OneBotBotImpl.kt b/simbot-component-onebot-v11/simbot-component-onebot-v11-core/src/commonMain/kotlin/love/forte/simbot/component/onebot/v11/core/bot/internal/OneBotBotImpl.kt index bd24bcb..d5cb4d2 100644 --- a/simbot-component-onebot-v11/simbot-component-onebot-v11-core/src/commonMain/kotlin/love/forte/simbot/component/onebot/v11/core/bot/internal/OneBotBotImpl.kt +++ b/simbot-component-onebot-v11/simbot-component-onebot-v11-core/src/commonMain/kotlin/love/forte/simbot/component/onebot/v11/core/bot/internal/OneBotBotImpl.kt @@ -426,7 +426,9 @@ internal class OneBotBotImpl( } // 等待关闭完成 - val reason = currentSession.closeReason.await() + val reason = kotlin.runCatching { + currentSession.closeReason.await() + }.getOrNull() logger.debug("Session {} done. The reason: {}", currentSession, reason) } From 3d09ef7df2490c0e378e1bd439e275904346c79d Mon Sep 17 00:00:00 2001 From: kuku Date: Fri, 6 Sep 2024 15:21:39 +0800 Subject: [PATCH 2/2] logger --- .../component/onebot/v11/core/bot/internal/OneBotBotImpl.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/simbot-component-onebot-v11/simbot-component-onebot-v11-core/src/commonMain/kotlin/love/forte/simbot/component/onebot/v11/core/bot/internal/OneBotBotImpl.kt b/simbot-component-onebot-v11/simbot-component-onebot-v11-core/src/commonMain/kotlin/love/forte/simbot/component/onebot/v11/core/bot/internal/OneBotBotImpl.kt index d5cb4d2..25ca077 100644 --- a/simbot-component-onebot-v11/simbot-component-onebot-v11-core/src/commonMain/kotlin/love/forte/simbot/component/onebot/v11/core/bot/internal/OneBotBotImpl.kt +++ b/simbot-component-onebot-v11/simbot-component-onebot-v11-core/src/commonMain/kotlin/love/forte/simbot/component/onebot/v11/core/bot/internal/OneBotBotImpl.kt @@ -428,7 +428,10 @@ internal class OneBotBotImpl( // 等待关闭完成 val reason = kotlin.runCatching { currentSession.closeReason.await() - }.getOrNull() + }.getOrElse { e -> + logger.debug("Failed to get close reason for session: {}", e.message, e) + null + } logger.debug("Session {} done. The reason: {}", currentSession, reason) }