Merge pull request #836 from simple-robot/more-wasm-support

更多模块支持wasmJs平台: 所有与Ktor无关的多平台模块均支持wasmJs平台目标

Author: ForteScarlet

buildSrc/src/main/kotlin/JsConfig.kt

@@ -71,15 +71,17 @@ fun Project.configJsTestTasks() {
     }
 }
 
-@Suppress("UNUSED_PARAMETER")
 inline fun KotlinWasmJsTargetDsl.configWasmJs(
     nodeJs: Boolean = true,
     browser: Boolean = true,
     block: () -> Unit = {}
 ) {
+    if (nodeJs) {
+        nodejs()
+    }
     // if (nodeJs && isLinux) {
-        // win in candy node `21.0.0-v8-canary202309143a48826a08` is not supported
-        // nodejs()
+    // // win in candy node `21.0.0-v8-canary202309143a48826a08` is not supported
+    // nodejs()
     // }
 
     if (browser) {

simbot-api/build.gradle.kts

@@ -26,6 +26,7 @@ import love.forte.gradle.common.kotlin.multiplatform.applyTier1
 import love.forte.gradle.common.kotlin.multiplatform.applyTier2
 import love.forte.gradle.common.kotlin.multiplatform.applyTier3
 import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi
+import org.jetbrains.kotlin.gradle.targets.js.dsl.ExperimentalWasmDsl
 
 plugins {
     kotlin("multiplatform")
@@ -58,9 +59,11 @@ kotlin {
     applyTier3()
 
     // wasm?
-//    @Suppress("OPT_IN_USAGE")
-//    wasmJs()
-//    @Suppress("OPT_IN_USAGE")
+    @OptIn(ExperimentalWasmDsl::class)
+    wasmJs {
+        configWasmJs()
+    }
+
 //    wasmWasi()
 
     compilerOptions {
@@ -69,20 +72,13 @@ kotlin {
         )
     }
 
-    // withKotlinTargets { target ->
-    // targets.findByName(target.name)?.compilations?.all {
-    //     // 'expect'/'actual' classes (including interfaces, objects, annotations, enums, and 'actual' typealiases) are in Beta. You can use -Xexpect-actual-classes flag to suppress this warning. Also see: https://youtrack.jetbrains.com/issue/KT-61573
-    //     kotlinOptions.freeCompilerArgs += "-Xexpect-actual-classes"
-    // }
-    // }
-
     sourceSets {
         commonMain {
             dependencies {
                 // jvm compile only
-                compileOnly(libs.jetbrains.annotations)
-                compileOnly(project(":simbot-commons:simbot-common-annotations"))
-                compileOnly(libs.kotlinx.serialization.json)
+                api(libs.jetbrains.annotations)
+                api(project(":simbot-commons:simbot-common-annotations"))
+                api(libs.kotlinx.serialization.json)
                 api(project(":simbot-commons:simbot-common-suspend-runner"))
                 api(project(":simbot-commons:simbot-common-core"))
                 api(project(":simbot-commons:simbot-common-collection"))
@@ -105,6 +101,10 @@ kotlin {
 
         jvmMain {
             dependencies {
+                compileOnly(libs.jetbrains.annotations)
+                compileOnly(libs.kotlinx.serialization.json)
+                compileOnly(project(":simbot-commons:simbot-common-annotations"))
+
                 compileOnly(libs.kotlinx.coroutines.reactive)
                 compileOnly(libs.kotlinx.coroutines.reactor)
                 compileOnly(libs.kotlinx.coroutines.rx2)
@@ -126,20 +126,6 @@ kotlin {
             }
         }
 
-        nativeMain.dependencies {
-            api(libs.kotlinx.serialization.json)
-            api(libs.jetbrains.annotations)
-            api(project(":simbot-commons:simbot-common-annotations"))
-
-        }
-
-        jsMain.dependencies {
-            api(libs.kotlinx.serialization.json)
-            api(project(":simbot-commons:simbot-common-annotations"))
-            api(libs.jetbrains.annotations)
-
-        }
-
         jsTest.dependencies {
             implementation(libs.ktor.client.js)
             implementation(libs.ktor.client.core)
@@ -165,7 +151,6 @@ kotlin {
             // implementation(libs.ktor.client.winhttp)
         }
 
-
     }
 }
 

simbot-api/src/jsTest/kotlin/MessagesTests.js.kt

@@ -4,7 +4,7 @@
  *     Project    https://github.com/simple-robot/simpler-robot
  *     Email      [email protected]
  *
- *     This file is part of the Simple Robot Library.
+ *     This file is part of the Simple Robot Library (Alias: simple-robot, simbot, etc.).
  *
  *     This program is free software: you can redistribute it and/or modify
  *     it under the terms of the GNU Lesser General Public License as published by
@@ -24,4 +24,5 @@
 import love.forte.simbot.message.MessagesBuilder
 
 internal actual fun MessagesBuilder.addIntoMessages() {
+    // nothing.
 }

simbot-api/src/wasmJsMain/kotlin/love/forte/simbot/bot/configuration/DispatcherConfiguration.wasmjs.kt

@@ -0,0 +1,46 @@
+/*
+ *     Copyright (c) 2024. ForteScarlet.
+ *
+ *     Project    https://github.com/simple-robot/simpler-robot
+ *     Email      [email protected]
+ *
+ *     This file is part of the Simple Robot Library (Alias: simple-robot, simbot, etc.).
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU Lesser General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     Lesser GNU General Public License for more details.
+ *
+ *     You should have received a copy of the Lesser GNU General Public License
+ *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+package love.forte.simbot.bot.configuration
+
+import kotlinx.coroutines.CoroutineDispatcher
+
+/**
+ * 获取 `IO` 调度器，始终返回 `null`。
+ */
+internal actual fun ioDispatcher(): CoroutineDispatcher? = null
+
+/**
+ * 获取自定义调度器。不支持或无法构建时返回 `null`。
+ */
+internal actual fun customDispatcher(
+    coreThreads: Int?,
+    maxThreads: Int?,
+    keepAliveMillis: Long?,
+    name: String?
+): CoroutineDispatcher? = null
+
+/**
+ * 当平台为 Java21+ 的 JVM平台时得到虚拟线程调度器，否则得到 `null`。
+ */
+internal actual fun virtualDispatcher(): CoroutineDispatcher? = null

simbot-api/src/wasmJsMain/kotlin/love/forte/simbot/component/ComponentFactoryProvider.wasmJs.kt

@@ -0,0 +1,32 @@
+/*
+ *     Copyright (c) 2024. ForteScarlet.
+ *
+ *     Project    https://github.com/simple-robot/simpler-robot
+ *     Email      [email protected]
+ *
+ *     This file is part of the Simple Robot Library (Alias: simple-robot, simbot, etc.).
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU Lesser General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     Lesser GNU General Public License for more details.
+ *
+ *     You should have received a copy of the Lesser GNU General Public License
+ *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+package love.forte.simbot.component
+
+import love.forte.simbot.common.services.Services
+
+/**
+ * 获取通过 [addComponentFactoryProvider] 添加的内容的副本序列。
+ */
+public actual fun loadComponentProviders(): Sequence<ComponentFactoryProvider<*>> =
+    Services.loadProviders<ComponentFactoryProvider<*>>().map { it() }

simbot-api/src/wasmJsMain/kotlin/love/forte/simbot/event/EventResult.wasmJs.kt

@@ -0,0 +1,50 @@
+/*
+ *     Copyright (c) 2024. ForteScarlet.
+ *
+ *     Project    https://github.com/simple-robot/simpler-robot
+ *     Email      [email protected]
+ *
+ *     This file is part of the Simple Robot Library (Alias: simple-robot, simbot, etc.).
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU Lesser General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     Lesser GNU General Public License for more details.
+ *
+ *     You should have received a copy of the Lesser GNU General Public License
+ *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+package love.forte.simbot.event
+
+import kotlinx.coroutines.Deferred
+import kotlinx.coroutines.await
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.toList
+import kotlin.js.Promise
+
+/**
+ * 收集 [StandardEventResult.CollectableReactivelyResult.content] 的结果并返回。
+ * 如果结果不可收集或不支持收集，则得到原值。
+ *
+ * native 平台下支持 Kotlin Coroutines 本身的可挂起类型 [Deferred] 和 [Flow] 和 [Promise]。
+ * 可收集类型参考 [StandardEventResult.CollectableReactivelyResult.content] 说明。
+ *
+ * @see StandardEventResult.CollectableReactivelyResult.content
+ * @return The collected result.
+ */
+public actual suspend fun StandardEventResult.CollectableReactivelyResult.collectCollectableReactively(): Any? {
+    return when (val c = content) {
+        null -> null
+        is Deferred<*> -> c.await()
+        is Flow<*> -> c.toList()
+        is Promise<*> -> c.await()
+        else -> content
+    }
+}

simbot-api/src/wasmJsMain/kotlin/love/forte/simbot/message/Messages.wasmJs.kt

@@ -0,0 +1,33 @@
+/*
+ *     Copyright (c) 2024. ForteScarlet.
+ *
+ *     Project    https://github.com/simple-robot/simpler-robot
+ *     Email      [email protected]
+ *
+ *     This file is part of the Simple Robot Library (Alias: simple-robot, simbot, etc.).
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU Lesser General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     Lesser GNU General Public License for more details.
+ *
+ *     You should have received a copy of the Lesser GNU General Public License
+ *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+package love.forte.simbot.message
+
+import kotlinx.serialization.modules.PolymorphicModuleBuilder
+
+/**
+ * 整合平台特别实现的序列化信息。
+ */
+internal actual fun PolymorphicModuleBuilder<Message.Element>.resolvePlatformStandardSerializers() {
+    // nothing.
+}

simbot-api/src/wasmJsMain/kotlin/love/forte/simbot/message/StandardMessages.wasmjs.kt

@@ -0,0 +1,33 @@
+/*
+ *     Copyright (c) 2024. ForteScarlet.
+ *
+ *     Project    https://github.com/simple-robot/simpler-robot
+ *     Email      [email protected]
+ *
+ *     This file is part of the Simple Robot Library (Alias: simple-robot, simbot, etc.).
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU Lesser General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     Lesser GNU General Public License for more details.
+ *
+ *     You should have received a copy of the Lesser GNU General Public License
+ *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+package love.forte.simbot.message
+
+import love.forte.simbot.resource.Resource
+
+/**
+ * 将 [Resource] 转化为 [OfflineResourceImage]。
+ *
+ */
+public actual fun Resource.toOfflineResourceImage(): OfflineResourceImage =
+    SimpleOfflineResourceImage(this)

simbot-api/src/wasmJsMain/kotlin/love/forte/simbot/plugin/PluginFactoryProvider.wasmjs.kt

@@ -0,0 +1,33 @@
+/*
+ *     Copyright (c) 2024. ForteScarlet.
+ *
+ *     Project    https://github.com/simple-robot/simpler-robot
+ *     Email      [email protected]
+ *
+ *     This file is part of the Simple Robot Library (Alias: simple-robot, simbot, etc.).
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU Lesser General Public License as published by
+ *     the Free Software Foundation, either version 3 of the License, or
+ *     (at your option) any later version.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     Lesser GNU General Public License for more details.
+ *
+ *     You should have received a copy of the Lesser GNU General Public License
+ *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
+
+package love.forte.simbot.plugin
+
+import love.forte.simbot.common.services.Services
+import love.forte.simbot.component.addComponentFactoryProvider
+
+/**
+ * 加载所有通过 [addComponentFactoryProvider] 添加的函数构建出来的 [PluginFactoryProvider] 实例。
+ */
+public actual fun loadPluginProviders(): Sequence<PluginFactoryProvider<*>> =
+    Services.loadProviders<PluginFactoryProvider<*>>().map { it() }