Try continue when request invalid.

Karlatemp · Oct 28, 2020 · b2e1591 · b2e1591
1 parent a63b60d
commit b2e1591
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+# 2.0.0-dev-3
+
+- 更新到 `MiraiConsole 1.0-RC`
+- 在解析请求错误时尝试不直接断开连接
+
 # 2.0.0-dev-2
 修复 [#2](https://github.com/Karlatemp/mirai-websocket-api/issues/2)
 

diff --git a/build.gradle b/build.gradle
@@ -35,12 +35,13 @@ static ktor(id) {
 dependencies {
     // https://mvnrepository.com/artifact/com.google.guava/guava
     compile group: 'com.google.guava', name: 'guava', version: '29.0-jre'
+    def miraiConsoleVersion = project.property('mirai.console.version')
 
-    compileOnly("net.mamoe:mirai-core:1.3.1")
-    compileOnly("net.mamoe:mirai-console:1.0-RC-dev-28")
-    testCompile("net.mamoe:mirai-core:1.3.1")
-    testCompile("net.mamoe:mirai-console:1.0-RC-dev-28")
-    testCompile("net.mamoe:mirai-console-terminal:1.0-RC-dev-28")
+    compileOnly("net.mamoe:mirai-core:1.3.2")
+    compileOnly("net.mamoe:mirai-console:$miraiConsoleVersion")
+    testCompile("net.mamoe:mirai-core:1.3.2")
+    testCompile("net.mamoe:mirai-console:$miraiConsoleVersion")
+    testCompile("net.mamoe:mirai-console-terminal:$miraiConsoleVersion")
 
     def autoService = '1.0-rc7'
     kapt "com.google.auto.service:auto-service:$autoService"

diff --git a/gradle.properties b/gradle.properties
@@ -6,5 +6,6 @@
 # mirai-websocket-api/gradle.properties
 #
 kotlin.code.style=official
-wsapi.version=2.0.0-dev-2
+wsapi.version=2.0.0-dev-3
+mirai.console.version=1.0-RC
 
diff --git a/src/main/kotlin/io/github/karlatemp/miraiwebsocketapi/MiraiWebsocketApi.kt b/src/main/kotlin/io/github/karlatemp/miraiwebsocketapi/MiraiWebsocketApi.kt
@@ -22,9 +22,7 @@ import io.ktor.server.engine.*
 import io.ktor.util.*
 import io.ktor.websocket.*
 import kotlinx.serialization.SerializationStrategy
-import kotlinx.serialization.json.JsonObject
-import kotlinx.serialization.json.buildJsonObject
-import kotlinx.serialization.json.put
+import kotlinx.serialization.json.*
 import net.mamoe.mirai.Bot
 import net.mamoe.mirai.console.plugin.jvm.JvmPlugin
 import net.mamoe.mirai.console.plugin.jvm.JvmPluginDescriptionBuilder
@@ -177,11 +175,13 @@ fun Application.web() {
                 rep(OutgoingSerializer, ActionResult(this?.requestId, true, null, null, ext))
 
             suspend fun Request?.repOk() = repOk(null)
+            suspend fun repResult(result: ActionResult) = rep(
+                OutgoingSerializer, result
+            )
 
             suspend fun Request?.repErr(
                 error: String, full: String
-            ) = rep(
-                OutgoingSerializer,
+            ) = repResult(
                 ActionResult(this?.requestId, false, error, full, null)
             )
 
@@ -218,12 +218,32 @@ fun Application.web() {
 
                 for (frame in incoming) {
                     if (frame is Frame.Text) {
-                        val request = kotlin.runCatching {
-                            json.decodeFromString(Request.RequestSerializer, frame.readText())
-                        }.getOrElse { exception ->
-                            null.repErr(exception)
-                            return@webSocket
+                        val requestContent = frame.readText()
+                        val requestBox = kotlin.runCatching {
+                            json.decodeFromString(Request.RequestSerializer, requestContent)
+                        }
+                        if (requestBox.isFailure) {
+                            val json = kotlin.runCatching {
+                                json.decodeFromString(JsonObject.serializer(), requestContent)
+                            }.getOrNull()
+                            val error = requestBox.exceptionOrNull()!!
+                            if (json == null) {
+                                null.repErr(error)
+                                return@webSocket
+                            } else {
+                                repResult(
+                                    ActionResult(
+                                        (json["requestId"] as? JsonPrimitive)?.content,
+                                        false,
+                                        error.toString(),
+                                        error.stackTraceToString(),
+                                        null
+                                    )
+                                )
+                                continue
+                            }
                         }
+                        val request = requestBox.getOrThrow()
                         val action = request.action
 
                         try {