Merge pull request #52 from simple-robot/dev/public-some-message-api

优化部分公开的内部消息解析API，并增加JVM平台对应的桥接API
simple-robot · Jun 20, 2024 · 4392fc9 · 4392fc9
2 parents 6e5e03a + 0208e66
commit 4392fc9
Show file tree

Hide file tree

Showing 3 changed files with 85 additions and 0 deletions.
diff --git a/...mmonMain/kotlin/love/forte/simbot/component/onebot/v11/message/MessageElementResolvers.kt b/...mmonMain/kotlin/love/forte/simbot/component/onebot/v11/message/MessageElementResolvers.kt
@@ -32,6 +32,7 @@ import love.forte.simbot.resource.toStringResource
 import kotlin.coroutines.Continuation
 import kotlin.coroutines.resume
 import kotlin.jvm.JvmName
+import kotlin.jvm.JvmSynthetic
 
 /**
  * 将事件中接收到的 [OneBotMessageSegment] 解析为 [Message.Element]。
@@ -57,6 +58,7 @@ public fun OneBotMessageSegment.resolveToMessageElement(): Message.Element {
  * @see resolveToOneBotSegment
  */
 @InternalOneBotAPI
+@JvmSynthetic
 public suspend fun Message.resolveToOneBotSegmentList(): List<OneBotMessageSegment> {
     return when (this) {
         is Message.Element -> resolveToOneBotSegment()
@@ -71,6 +73,7 @@ public suspend fun Message.resolveToOneBotSegmentList(): List<OneBotMessageSegme
  * 将一个 [Message.Element] 转化为用于API请求的 [OneBotMessageSegment]。
  */
 @InternalOneBotAPI
+@JvmSynthetic
 public suspend fun Message.Element.resolveToOneBotSegment(): OneBotMessageSegment? {
     return when (this) {
         // OB组件的 segment 类型，直接使用

diff --git a/...omponent-onebot-v11/simbot-component-onebot-v11-message/src/jvmMain/java/module-info.java b/...omponent-onebot-v11/simbot-component-onebot-v11-message/src/jvmMain/java/module-info.java
@@ -4,6 +4,8 @@
     requires simbot.component.onebot.common;
     requires static simbot.common.annotations;
     requires transitive kotlinx.serialization.core;
+    requires simbot.common.suspendrunner;
+    requires kotlinx.coroutines.core;
 
     exports love.forte.simbot.component.onebot.v11.message;
     exports love.forte.simbot.component.onebot.v11.message.segment;

diff --git a/...Main/kotlin/love/forte/simbot/component/onebot/v11/message/MessageElementResolvers.jvm.kt b/...Main/kotlin/love/forte/simbot/component/onebot/v11/message/MessageElementResolvers.jvm.kt
@@ -17,20 +17,100 @@
 
 package love.forte.simbot.component.onebot.v11.message
 
+import kotlinx.coroutines.DelicateCoroutinesApi
+import kotlinx.coroutines.GlobalScope
+import love.forte.simbot.annotations.Api4J
+import love.forte.simbot.annotations.InternalSimbotAPI
+import love.forte.simbot.component.onebot.common.annotations.InternalOneBotAPI
 import love.forte.simbot.component.onebot.v11.message.segment.OneBotImage
 import love.forte.simbot.component.onebot.v11.message.segment.OneBotMessageSegment
 import love.forte.simbot.message.JvmOfflineImageValueResolver
+import love.forte.simbot.message.Message
 import love.forte.simbot.message.OfflineImage
 import love.forte.simbot.message.OfflineImageValueResolver
 import love.forte.simbot.resource.Resource
 import love.forte.simbot.resource.URIResource
 import love.forte.simbot.resource.toResource
+import love.forte.simbot.suspendrunner.reserve.SuspendReserve
+import love.forte.simbot.suspendrunner.reserve.suspendReserve
+import love.forte.simbot.suspendrunner.runInAsync
+import love.forte.simbot.suspendrunner.runInNoScopeBlocking
 import java.io.File
 import java.net.URI
 import java.nio.file.Path
+import java.util.concurrent.CompletableFuture
 import kotlin.coroutines.Continuation
+import kotlin.coroutines.EmptyCoroutineContext
 import kotlin.coroutines.resume
 
+/**
+ * 将 [Message] 解析为一用于API请求的 [OneBotMessageSegment] 列表。
+ *
+ * @see resolveToOneBotSegmentList
+ */
+@InternalOneBotAPI
+@Api4J
+public fun Message.resolveToOneBotSegmentListBlocking(): List<OneBotMessageSegment> =
+    runInNoScopeBlocking { resolveToOneBotSegmentList() }
+
+/**
+ * 将 [Message] 解析为一用于API请求的 [OneBotMessageSegment] 列表。
+ *
+ * @see resolveToOneBotSegmentList
+ */
+@OptIn(InternalSimbotAPI::class)
+@InternalOneBotAPI
+@Api4J
+public fun Message.resolveToOneBotSegmentListAsync(): CompletableFuture<out List<OneBotMessageSegment>> =
+    runInAsync { resolveToOneBotSegmentList() }
+
+/**
+ * 将 [Message] 解析为一用于API请求的 [OneBotMessageSegment] 列表。
+ *
+ * @see resolveToOneBotSegmentList
+ */
+@OptIn(InternalSimbotAPI::class, DelicateCoroutinesApi::class)
+@InternalOneBotAPI
+@Api4J
+public fun Message.resolveToOneBotSegmentListReserve(): SuspendReserve<List<OneBotMessageSegment>> =
+    suspendReserve(
+        GlobalScope,
+        EmptyCoroutineContext
+    ) { resolveToOneBotSegmentList() }
+
+/**
+ * 将一个 [Message.Element] 转化为用于API请求的 [OneBotMessageSegment]。
+ * @see resolveToOneBotSegment
+ */
+@InternalOneBotAPI
+@Api4J
+public fun Message.Element.resolveToOneBotSegmentBlocking(): OneBotMessageSegment? =
+    runInNoScopeBlocking { resolveToOneBotSegment() }
+
+/**
+ * 将一个 [Message.Element] 转化为用于API请求的 [OneBotMessageSegment]。
+ * @see resolveToOneBotSegment
+ */
+@OptIn(InternalSimbotAPI::class)
+@InternalOneBotAPI
+@Api4J
+public fun Message.Element.resolveToOneBotSegmentAsync(): CompletableFuture<out OneBotMessageSegment?> =
+    runInAsync { resolveToOneBotSegment() }
+
+/**
+ * 将一个 [Message.Element] 转化为用于API请求的 [OneBotMessageSegment]。
+ * @see resolveToOneBotSegment
+ */
+@OptIn(DelicateCoroutinesApi::class, InternalSimbotAPI::class)
+@InternalOneBotAPI
+@Api4J
+public fun Message.Element.resolveToOneBotSegmentReserve(): SuspendReserve<OneBotMessageSegment?> =
+    suspendReserve(
+        GlobalScope,
+        EmptyCoroutineContext
+    ) { resolveToOneBotSegment() }
+
+
 internal actual fun offlineImageResolver(): OfflineImageValueResolver<Continuation<OneBotMessageSegment?>> =
     object : JvmOfflineImageValueResolver<Continuation<OneBotMessageSegment?>>() {
         override fun resolveUnknownInternal(image: OfflineImage, context: Continuation<OneBotMessageSegment?>) {