check if connected again

MrXiaoM · Dec 4, 2023 · c43b151 · c43b151
1 parent 7039b75
commit c43b151
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 12 deletions.
diff --git a/docs/README.md b/docs/README.md
@@ -121,11 +121,11 @@ java -cp "$CLASSPATH:./libs/*" net.mamoe.mirai.console.terminal.MiraiConsoleTerm
 
 # JVM 参数
 
-| 参数                        | 说明                                        |
-|---------------------------|-------------------------------------------|
-| `-Doverflow.config=路径`    | 修改配置文件(overflow.json)的路径                  |
-| `-Doverflow.not-exit`     | 设置无法连接到 Onebot 时不结束进程                     |
-| `-Doverflow.timeout=超时时间` | 设置主动发送 action 的请求超时时间(毫秒)，默认为10000毫秒(10秒) |
+| 参数                         | 说明                                        |
+|----------------------------|-------------------------------------------|
+| `-Doverflow.config=路径`     | 修改配置文件(overflow.json)的路径                  |
+| `-Doverflow.not-exit=true` | 设置无法连接到 Onebot 时不结束进程                     |
+| `-Doverflow.timeout=超时时间`  | 设置主动发送 action 的请求超时时间(毫秒)，默认为10000毫秒(10秒) |
 
 # 长期支持
 

diff --git a/overflow-core/src/main/kotlin/top/mrxiaom/overflow/internal/Overflow.kt b/overflow-core/src/main/kotlin/top/mrxiaom/overflow/internal/Overflow.kt
@@ -104,6 +104,10 @@ class Overflow : IMirai, CoroutineScope, LowLevelApiAccessor, OverflowAPI {
 
         @JvmStatic
         val version = "${BuildConstants.VERSION}-${BuildConstants.COMMIT_HASH.chunked(6)[0]}"
+
+        private val isNotExit by lazy {
+            !System.getProperty("overflow.not-exit").isNullOrBlank()
+        }
     }
 
     init {
@@ -150,9 +154,7 @@ class Overflow : IMirai, CoroutineScope, LowLevelApiAccessor, OverflowAPI {
             if (ws == null) {
                 if (printInfo) {
                     logger.error("未连接到 Onebot")
-                    if (System.getProperty("overflow.not-exit").isNullOrBlank()) {
-                        exitProcess(1)
-                    }
+                    if (!isNotExit) exitProcess(1)
                 }
                 return false
             }
@@ -163,17 +165,23 @@ class Overflow : IMirai, CoroutineScope, LowLevelApiAccessor, OverflowAPI {
             if (ws == null) {
                 if (printInfo) {
                     logger.error("未连接到 Onebot")
-                    if (System.getProperty("overflow.not-exit").isNullOrBlank()) {
-                        exitProcess(1)
-                    }
+                    if (!isNotExit) exitProcess(1)
+
                 }
                 return false
             }
             dispatchers = ws.createEventBus()
             botImpl = ws.createBot().also { BotFactoryImpl.internalBot = it }
         }
         val versionInfo = botImpl.getVersionInfo()
-        OnebotMessages.appName = versionInfo.optJSONObject("data").get("app_name").asString.trim().lowercase()
+        OnebotMessages.appName = (versionInfo.optJSONObject("data").get("app_name")?.asString ?: "onebot").trim().lowercase()
+        if (!botImpl.channel.isOpen) {
+            if (printInfo) {
+                logger.error("未连接到 Onebot")
+                if (!isNotExit) exitProcess(1)
+            }
+            return false
+        }
         if (printInfo) {
             logger.info("服务端版本信息\n${versionInfo.toPrettyString()}")
         }