更新 yutori, ktor

优化代码

Author: Yurn

adapter/src/commonMain/kotlin/cn/yurin/yutorix/module/satori/adapter/ActionService.kt

@@ -89,25 +89,23 @@ class SatoriActionService(
                         userId?.let { append("Satori-User-ID", userId) }
                     }
                     setBody(
-                        content.entries
-                            .filter { it.value != null }
-                            .joinToString(",", "{", "}") { (key, value) ->
-                                buildString {
-                                    append("\"$key\":")
-                                    append(
-                                        when (value) {
-                                            is String -> "\"${value.replace("\"", "\\\"")}\""
-                                            is List<*> ->
-                                                "\"${
-                                                    (value as List<MessageElement>).serialize()
-                                                        .replace("\n", "\\n").replace("\"", "\\\"")
-                                                }\""
-
-                                            else -> value.toString()
-                                        },
-                                    )
-                                }
-                            },
+                        content.entries.filter { it.value != null }.joinToString(",", "{", "}") { (key, value) ->
+                            buildString {
+                                append("\"$key\":")
+                                append(
+                                    when (value) {
+                                        is String -> "\"${value.replace("\"", "\\\"")}\""
+                                        is List<*> ->
+                                            "\"${
+                                                (value as List<MessageElement>).serialize().replace("\n", "\\n")
+                                                    .replace("\"", "\\\"")
+                                            }\""
+
+                                        else -> value.toString()
+                                    },
+                                )
+                            }
+                        },
                     )
                     Logger.d(yutori.name) {
                         """
@@ -179,9 +177,7 @@ class SatoriActionService(
                     when (method) {
                         "get" ->
                             Result.success(
-                                Json
-                                    .decodeFromString<SerializableGuildMember>(body)
-                                    .toUniverse(null, yutori) as T,
+                                Json.decodeFromString<SerializableGuildMember>(body).toUniverse(null, yutori) as T,
                             )
 
                         "list" ->
@@ -217,9 +213,7 @@ class SatoriActionService(
 
                         "create" ->
                             Result.success(
-                                Json
-                                    .decodeFromString<SerializableGuildRole>(body)
-                                    .toUniverse(null, yutori) as T,
+                                Json.decodeFromString<SerializableGuildRole>(body).toUniverse(null, yutori) as T,
                             )
 
                         "update" -> Result.success(Unit as T)
@@ -241,9 +235,7 @@ class SatoriActionService(
                     when (method) {
                         "create" ->
                             Result.success(
-                                Json
-                                    .decodeFromString<List<SerializableMessage>>(body)
-                                    .map { it.toUniverse(null, yutori) } as T,
+                                Json.decodeFromString<List<SerializableMessage>>(body).map { it.toUniverse(null, yutori) } as T,
                             )
 
                         "get" ->
@@ -366,4 +358,4 @@ class SatoriActionService(
             Logger.d(yutori.name) { "Satori Action Response: $response" }
             Result.success(response.body())
         }
-}
+}

adapter/src/commonMain/kotlin/cn/yurin/yutorix/module/satori/adapter/Adapter.kt

@@ -2,11 +2,7 @@
 
 package cn.yurin.yutorix.module.satori.adapter
 
-import cn.yurin.yutori.Adapter
-import cn.yurin.yutori.BuilderMarker
-import cn.yurin.yutori.Login
-import cn.yurin.yutori.Reinstallable
-import cn.yurin.yutori.Yutori
+import cn.yurin.yutori.*
 import cn.yurin.yutorix.module.satori.SatoriAdapterProperties
 import co.touchlab.kermit.Logger
 import kotlinx.atomicfu.atomic
@@ -19,44 +15,31 @@ fun Adapter.Companion.satori(
     path: String = "",
     token: String? = null,
     version: String = "v1",
-) = SatoriAdapter(alias, host, port, path, token, version)
+    onStart: suspend WebSocketEventService.() -> Unit = { },
+    onConnect: suspend WebSocketEventService.(List<Login>) -> Unit = { },
+    onClose: suspend () -> Unit = { },
+    onError: suspend () -> Unit = { },
+) = SatoriAdapter(alias, host, port, path, token, version, onStart, onConnect, onClose, onError)
 
-@BuilderMarker
 class SatoriAdapter(
     alias: String?,
     val host: String,
     val port: Int,
     val path: String,
     val token: String?,
     val version: String,
+    val onStart: suspend WebSocketEventService.() -> Unit,
+    val onConnect: suspend WebSocketEventService.(List<Login>) -> Unit,
+    val onClose: suspend () -> Unit,
+    val onError: suspend () -> Unit,
 ) : Adapter(alias),
     Reinstallable {
-    var onStart: suspend WebSocketEventService.() -> Unit = { }
-    var onConnect: suspend WebSocketEventService.(List<Login>) -> Unit = { }
-    var onClose: suspend () -> Unit = { }
-    var onError: suspend () -> Unit = { }
     private var connecting by atomic(false)
     private var service: WebSocketEventService? by atomic(null)
 
-    fun onStart(block: suspend WebSocketEventService.() -> Unit) {
-        onStart = block
-    }
-
-    fun onConnect(block: suspend WebSocketEventService.(List<Login>) -> Unit) {
-        onConnect = block
-    }
-
-    fun onClose(block: suspend () -> Unit) {
-        onClose = block
-    }
-
-    fun onError(block: suspend () -> Unit) {
-        onError = block
-    }
-
-    override fun install(yutori: Yutori) {}
+    override fun install(builder: YutoriBuilder) {}
 
-    override fun uninstall(yutori: Yutori) {}
+    override fun uninstall(builder: YutoriBuilder) {}
 
     override suspend fun start(yutori: Yutori) {
         val properties = SatoriAdapterProperties(host, port, path, token, version)
@@ -89,4 +72,4 @@ class SatoriAdapter(
         service?.disconnect()
         service = null
     }
-}
+}

adapter/src/commonMain/kotlin/cn/yurin/yutorix/module/satori/adapter/EventService.kt

@@ -215,7 +215,7 @@ class WebSocketEventService(
                 }
 
             val context = AdapterContext(actions, event, yutori)
-            yutori.adapter.container(context)
+            yutori.adapterConfig.container(context)
         } catch (e: Exception) {
             Logger.w(name, e) { "处理事件时出错: $event" }
         }
@@ -224,4 +224,4 @@ class WebSocketEventService(
     override fun disconnect() {
         job?.cancel("Event service disconnect")
     }
-}
+}

core/src/commonMain/kotlin/cn/yurin/yutorix/module/satori/Serializer.kt

@@ -34,8 +34,7 @@ object DynamicLookupSerializer : KSerializer<Any> {
         encoder: Encoder,
         value: Any,
     ) {
-        val actualSerializer =
-            encoder.serializersModule.getContextual(value::class) ?: value::class.serializer()
+        val actualSerializer = encoder.serializersModule.getContextual(value::class) ?: value::class.serializer()
         @Suppress("UNCHECKED_CAST")
         encoder.encodeSerializableValue(
             actualSerializer as KSerializer<Any>,
@@ -46,4 +45,4 @@ object DynamicLookupSerializer : KSerializer<Any> {
     override fun deserialize(decoder: Decoder): Any {
         error("Unsupported")
     }
-}
+}

gradle/libs.versions.toml

@@ -2,9 +2,9 @@
 kotlin = "2.0.21"
 agp = "8.6.1"
 atomicfu = "0.25.0"
-ktor = "3.0.0-rc-1"
+ktor = "3.0.1"
 ksoup = "0.1.9"
-yutori = "72549b81b4ef8f59103125cd8ffe9baf2a211b39"
+yutori = "10b1b97900331bc8fea475fa9f68627a5540b9ca"
 
 [libraries]
 ktor-serialization-kotlinx-json = { module = "io.ktor:ktor-serialization-kotlinx-json", version.ref = "ktor" }

server/src/commonMain/kotlin/cn/yurin/yutorix/module/satori/server/Server.kt

@@ -2,12 +2,7 @@
 
 package cn.yurin.yutorix.module.satori.server
 
-import cn.yurin.yutori.BuilderMarker
-import cn.yurin.yutori.Event
-import cn.yurin.yutori.Reinstallable
-import cn.yurin.yutori.Server
-import cn.yurin.yutori.SigningEvent
-import cn.yurin.yutori.Yutori
+import cn.yurin.yutori.*
 import cn.yurin.yutorix.module.satori.SatoriServerProperties
 import kotlinx.atomicfu.atomic
 
@@ -20,7 +15,6 @@ fun Server.Companion.satori(
     version: String = "v1",
 ) = SatoriServer(alias, listen, port, path, token, version)
 
-@BuilderMarker
 class SatoriServer(
     alias: String?,
     val listen: String,
@@ -33,9 +27,9 @@ class SatoriServer(
     private var connecting by atomic(false)
     private var service: SatoriServerService? by atomic(null)
 
-    override fun install(yutori: Yutori) {}
+    override fun install(builder: YutoriBuilder) {}
 
-    override fun uninstall(yutori: Yutori) {}
+    override fun uninstall(builder: YutoriBuilder) {}
 
     override suspend fun start(yutori: Yutori) {
         val properties = SatoriServerProperties(listen, port, path, token, version)
@@ -51,4 +45,4 @@ class SatoriServer(
     }
 
     override suspend fun pushEvent(event: Event<SigningEvent>) = service!!.pushEvent(event)
-}
+}

server/src/commonMain/kotlin/cn/yurin/yutorix/module/satori/server/ServerService.kt

@@ -1,3 +1,5 @@
+@file:Suppress("MemberVisibilityCanBePrivate")
+
 package cn.yurin.yutorix.module.satori.server
 
 import cn.yurin.yutori.Event
@@ -227,7 +229,7 @@ class SatoriServerService(
                                         Response { call.respond(it) },
                                         yutori,
                                     )
-                                yutori.server.container(context)
+                                yutori.serverConfig.container(context)
                             }
                         }
                     }.start(wait = true)
@@ -251,4 +253,4 @@ class SatoriServerService(
     override fun stop() {
         job?.cancel("Server service stop")
     }
-}
+}