Fix console stopping, fix #221

- Make StopCommand async
- Close terminal reader only

backend/mirai-console/src/command/BuiltInCommands.kt

@@ -102,29 +102,31 @@ public object BuiltInCommands {
 
         @Handler
         public suspend fun CommandSender.handle() {
-            kotlin.runCatching {
+            GlobalScope.launch {
-                closingLock.withLock {
+                kotlin.runCatching {
-                    sendMessage("Stopping mirai-console")
+                    closingLock.withLock {
-                    kotlin.runCatching {
+                        if (!MiraiConsole.isActive) return@withLock
-                        runIgnoreException<CancellationException> { MiraiConsole.job.cancelAndJoin() }
+                        sendMessage("Stopping mirai-console")
-                    }.fold(
+                        kotlin.runCatching {
-                        onSuccess = {
+                            MiraiConsole.job.cancelAndJoin()
-                            runIgnoreException<EventCancelledException> { sendMessage("mirai-console stopped successfully.") }
+                        }.fold(
-                        },
+                            onSuccess = {
-                        onFailure = {
+                                runIgnoreException<EventCancelledException> { sendMessage("mirai-console stopped successfully.") }
-                            if (it is CancellationException) return@fold
+                            },
-                            @OptIn(ConsoleInternalApi::class)
+                            onFailure = {
-                            MiraiConsole.mainLogger.error("Exception in stop", it)
+                                @OptIn(ConsoleInternalApi::class)
-                            runIgnoreException<EventCancelledException> {
+                                MiraiConsole.mainLogger.error("Exception in stop", it)
-                                sendMessage(
+                                runIgnoreException<EventCancelledException> {
-                                    it.localizedMessage ?: it.message ?: it.toString()
+                                    sendMessage(
-                                )
+                                        it.localizedMessage ?: it.message ?: it.toString()
+                                    )
+                                }
                             }
-                        }
+                        )
-                    )
+                    }
-                }
+                }.exceptionOrNull()?.let(MiraiConsole.mainLogger::error)
-            }.exceptionOrNull()?.let(MiraiConsole.mainLogger::error)
+                exitProcess(0)
-            exitProcess(0)
+            }
         }
     }
 

backend/mirai-console/src/util/SemVersion.kt

@@ -94,9 +94,7 @@ internal constructor(
         private val impl = SemVersionInternal.parseRangeRequirement(rule)
 
         /** 在 [version] 满足此要求时返回 true */
-        public fun test(version: SemVersion): Boolean {
+        public fun test(version: SemVersion): Boolean = impl.test(version)
-            return impl.test(version)
-        }
 
         public object RequirementAsStringSerializer : KSerializer<Requirement> by String.serializer().map(
             serializer = { it.rule },

frontend/mirai-console-terminal/src/ConsoleThread.kt

@@ -9,10 +9,7 @@
 
 package net.mamoe.mirai.console.terminal
 
-import kotlinx.coroutines.CancellationException
+import kotlinx.coroutines.*
-import kotlinx.coroutines.CoroutineName
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
 import net.mamoe.mirai.console.MiraiConsole
 import net.mamoe.mirai.console.command.*
 import net.mamoe.mirai.console.command.descriptor.ExperimentalCommandDescriptors
@@ -30,12 +27,13 @@ internal fun startupConsoleThread() {
     if (terminal is NoConsole) return
 
     MiraiConsole.launch(CoroutineName("Input Cancelling Daemon")) {
-        while (true) {
+        while (isActive) {
             delay(2000)
         }
     }.invokeOnCompletion {
         runCatching<Unit> {
-            terminal.close()
+            // 应该仅关闭用户输入
+            terminal.reader().shutdown()
             ConsoleInputImpl.thread.shutdownNow()
             runCatching {
                 ConsoleInputImpl.executingCoroutine?.cancel(EndOfFileException())