Fix js test

Author: ForteScarlet

simbot-component-qq-guild-internal-ed25519/build.gradle.kts

@@ -68,6 +68,7 @@ kotlin {
 
         commonTest.dependencies {
             implementation(kotlin("test"))
+            implementation(libs.kotlinx.coroutines.test)
         }
 
         jvmMain.dependencies {

simbot-component-qq-guild-internal-ed25519/src/commonMain/kotlin/love/forte/simbot/qguild/ed25519/Ed25519s.kt

@@ -38,7 +38,9 @@ public interface Ed25519KeyPairGenerator {
 /**
  * 根据当前平台情况和classpath环境选择一个合适的 [Ed25519KeyPairGenerator] 实例。
  *
- * 在非 JVM 平台中，会使用 [libsodium bindings](https://github.com/ionspin/kotlin-multiplatform-libsodium),
+ * 在非 JVM 平台中，会使用 [libsodium bindings](https://github.com/ionspin/kotlin-multiplatform-libsodium)。
+ * 由于 libsodium bindings 初始化可能需要挂起，因此 [ed25519KeyPairGenerator] 在首次执行时也可能是挂起的。
+ *
  * 在 JVM 中，会优先检测是否存在 [BouncyCastle](https://www.bouncycastle.org/) 依赖中所需使用的类,
  * 例如:
  *
@@ -55,7 +57,7 @@ public interface Ed25519KeyPairGenerator {
  *
  */
 @InternalEd25519Api
-public expect fun ed25519KeyPairGenerator(): Ed25519KeyPairGenerator
+public expect suspend fun ed25519KeyPairGenerator(): Ed25519KeyPairGenerator
 
 @InternalEd25519Api
 public interface Ed25519KeyPair {

simbot-component-qq-guild-internal-ed25519/src/commonTest/kotlin/love/forte/simbot/qguild/ed25519/Ed25519CommonTests.kt

@@ -1,5 +1,6 @@
 package love.forte.simbot.qguild.ed25519
 
+import kotlinx.coroutines.test.runTest
 import love.forte.simbot.qguild.ed25519.annotations.InternalEd25519Api
 import kotlin.test.Test
 import kotlin.test.assertContentEquals
@@ -33,7 +34,7 @@ class Ed25519CommonTests {
     }
 
     @Test
-    fun testCommonKeyPairGeneration() {
+    fun testCommonKeyPairGeneration() = runTest {
         val (pri, pub) = ed25519KeyPairGenerator().generate(SEED.encodeToByteArray())
         val publicKeyBytes = pub.bytes
         val privateKeyCombined = pri.bytes
@@ -56,5 +57,3 @@ class Ed25519CommonTests {
         )
     }
 }
-
-internal fun a() {}

simbot-component-qq-guild-internal-ed25519/src/jsMain/kotlin/love/forte/simbot/qguild/ed25519/Ed25519s.js.kt

@@ -26,5 +26,7 @@ import love.forte.simbot.qguild.ed25519.annotations.InternalEd25519Api
  *
  */
 @InternalEd25519Api
-public actual fun ed25519KeyPairGenerator(): Ed25519KeyPairGenerator = LibsodiumEd25519KeyPairGenerator
-
+public actual suspend fun ed25519KeyPairGenerator(): Ed25519KeyPairGenerator {
+    initialLibsodiumIfNecessary()
+    return LibsodiumEd25519KeyPairGenerator
+}

simbot-component-qq-guild-internal-ed25519/src/jsMain/kotlin/love/forte/simbot/qguild/ed25519/LibsodiumEd25519s.js.kt

@@ -24,10 +24,6 @@ import love.forte.simbot.qguild.ed25519.annotations.InternalEd25519Api
 
 @InternalEd25519Api
 public object LibsodiumEd25519KeyPairGenerator : Ed25519KeyPairGenerator {
-    init {
-        initialLibsodium
-    }
-
     override fun generate(seed: ByteArray): Ed25519KeyPair {
         return LibsodiumEd25519KeyPair(seed)
     }
@@ -79,28 +75,10 @@ public class LibsodiumEd25519PublicKey(private val key: UByteArray) : Ed25519Pub
     }
 }
 
-
-/**
- * Initialed libsodium by lazy.
- */
-private val initialLibsodium: Unit by lazy(
-    mode = LazyThreadSafetyMode.SYNCHRONIZED
-) {
+internal suspend fun initialLibsodiumIfNecessary() {
     if (!LibsodiumInitializer.isInitialized()) {
         ed25519sLogger.info("LibsodiumInitializer is not initialed yet, initializing...")
-        var done = false
-
-        LibsodiumInitializer.initializeWithCallback {
-            ed25519sLogger.info("LibsodiumInitializer initialized in callback")
-            done = true
-        }
-
-        while (!done) {
-            // loop
-        }
-
+        LibsodiumInitializer.initialize()
         ed25519sLogger.info("LibsodiumInitializer initialized")
     }
-
-    Unit
 }

simbot-component-qq-guild-internal-ed25519/src/jvmMain/kotlin/love/forte/simbot/qguild/ed25519/Ed25519s.jvm.kt

@@ -36,7 +36,7 @@ import love.forte.simbot.qguild.ed25519.annotations.InternalEd25519Api
  *
  */
 @InternalEd25519Api
-public actual fun ed25519KeyPairGenerator(): Ed25519KeyPairGenerator {
+public actual suspend fun ed25519KeyPairGenerator(): Ed25519KeyPairGenerator {
     return if (bouncyCastleAccessible) {
         BouncyCastleEd25519KeyPairGenerator
     } else {

simbot-component-qq-guild-internal-ed25519/src/nativeMain/kotlin/love/forte/simbot/qguild/ed25519/Ed25519s.native.kt

@@ -26,4 +26,7 @@ import love.forte.simbot.qguild.ed25519.annotations.InternalEd25519Api
  *
  */
 @InternalEd25519Api
-public actual fun ed25519KeyPairGenerator(): Ed25519KeyPairGenerator = LibsodiumEd25519KeyPairGenerator
+public actual suspend fun ed25519KeyPairGenerator(): Ed25519KeyPairGenerator {
+    initialLibsodiumIfNecessary()
+    return LibsodiumEd25519KeyPairGenerator
+}

simbot-component-qq-guild-internal-ed25519/src/nativeMain/kotlin/love/forte/simbot/qguild/ed25519/LibsodiumEd25519s.native.kt

@@ -19,16 +19,12 @@ package love.forte.simbot.qguild.ed25519
 
 import com.ionspin.kotlin.crypto.LibsodiumInitializer
 import com.ionspin.kotlin.crypto.signature.InvalidSignatureException
-import kotlinx.coroutines.runBlocking
+import kotlinx.coroutines.CompletableDeferred
 import love.forte.simbot.qguild.ed25519.annotations.InternalEd25519Api
 
 
 @InternalEd25519Api
 public object LibsodiumEd25519KeyPairGenerator : Ed25519KeyPairGenerator {
-    init {
-        initialLibsodium
-    }
-
     override fun generate(seed: ByteArray): Ed25519KeyPair {
         return LibsodiumEd25519KeyPair(seed)
     }
@@ -81,6 +77,13 @@ public class LibsodiumEd25519PublicKey(private val key: UByteArray) : Ed25519Pub
 }
 
 
+internal suspend fun initialLibsodiumIfNecessary() {
+    initialLibsodium // Init by lazy
+    return initialDeferred.await()
+}
+
+private val initialDeferred = CompletableDeferred(Unit)
+
 /**
  * Initialed libsodium by lazy.
  */
@@ -90,10 +93,10 @@ private val initialLibsodium: Unit by lazy(
     if (!LibsodiumInitializer.isInitialized()) {
         ed25519sLogger.info("LibsodiumInitializer is not initialed yet, initializing...")
 
-        runBlocking { LibsodiumInitializer.initialize() }
-
-        ed25519sLogger.info("LibsodiumInitializer initialized")
+        LibsodiumInitializer.initializeWithCallback {
+            initialDeferred.complete(Unit)
+            ed25519sLogger.info("LibsodiumInitializer initialized")
+        }
     }
-
     Unit
 }

simbot-component-qq-guild-internal-ed25519/src/non-jvmMain/kotlin/love/forte/simbot/qguild/ed25519/Ed25519s.non-jvm.kt

@@ -49,10 +49,8 @@ import love.forte.simbot.qguild.api.app.AppAccessToken
 import love.forte.simbot.qguild.api.app.GetAppAccessTokenApi
 import love.forte.simbot.qguild.api.requestData
 import love.forte.simbot.qguild.api.user.GetBotInfoApi
-import love.forte.simbot.qguild.ed25519.Ed25519KeyPair
-import love.forte.simbot.qguild.ed25519.Signature
+import love.forte.simbot.qguild.ed25519.*
 import love.forte.simbot.qguild.ed25519.annotations.InternalEd25519Api
-import love.forte.simbot.qguild.ed25519.paddingEd25519Seed
 import love.forte.simbot.qguild.event.*
 import love.forte.simbot.qguild.model.User
 import love.forte.simbot.qguild.stdlib.*
@@ -109,15 +107,23 @@ internal class BotImpl(
         }
     }
 
-    private val ed25519KeyPair: Ed25519KeyPair by lazy {
-        genEd25519Keypair(ticket.secret.paddingEd25519Seed().toByteArray())
+    private lateinit var _ed25519PrivateKey: Ed25519PrivateKey
+    private lateinit var _ed25519PublicKey: Ed25519PublicKey
+
+    private val ed25519KeyPair: Deferred<Ed25519KeyPair> = async(start = CoroutineStart.LAZY) {
+        genEd25519Keypair(ticket.secret.paddingEd25519Seed().toByteArray()).also { (pri, pub) ->
+            _ed25519PrivateKey = pri
+            _ed25519PublicKey = pub
+        }
     }
 
-    private val ed25519PrivateKey
-        get() = ed25519KeyPair.privateKey
+    private suspend fun ed25519PrivateKey() =
+        if (::_ed25519PrivateKey.isInitialized) _ed25519PrivateKey
+        else ed25519KeyPair.await().privateKey
 
-    private val ed25519PublicKey
-        get() = ed25519KeyPair.publicKey
+    private suspend fun ed25519PublicKey() =
+        if (::_ed25519PublicKey.isInitialized) _ed25519PublicKey
+        else ed25519KeyPair.await().publicKey
 
     internal val eventDecoder = Signal.Dispatch.dispatchJson {
         isLenient = true
@@ -424,7 +430,7 @@ internal class BotImpl(
         //  13	回调地址验证	Receive	开放平台对机器人服务端进行验证
         logger.debug("Emit raw event with payload: {}", payload)
 
-        fun verifyIfNecessary() {
+        suspend fun verifyIfNecessary() {
             val (signature, signatureTimestamp) = options?.ed25519SignatureVerification ?: return
             logger.debug("`ed25519SignatureVerification` exists, verity the payload")
 
@@ -446,18 +452,16 @@ internal class BotImpl(
 
             val msg = "$signatureTimestamp$payload"
 
-            check(ed25519PublicKey.verify(signature = Signature(signatureBytes), data = msg.toByteArray())) {
+            check(ed25519PublicKey().verify(signature = Signature(signatureBytes), data = msg.toByteArray())) {
                 "Ed25519 verify failed"
             }
         }
 
-        fun signatureIfNecessary(verify: Signal.CallbackVerify): EmitResult {
+        suspend fun signatureIfNecessary(verify: Signal.CallbackVerify): EmitResult {
             val (plainToken, eventTs) = verify.data
             val msg = "$eventTs$plainToken"
 
-            val signature = ed25519PrivateKey.sign(msg.toByteArray())
-
-            signature.data
+            val signature = ed25519PrivateKey().sign(msg.toByteArray())
 
             val verified = Signal.CallbackVerify.Verified(
                 plainToken,

simbot-component-qq-guild-internal-ed25519/src/non-jvmMain/kotlin/love/forte/simbot/qguild/ed25519/LibsodiumEd25519s.kt

@@ -22,6 +22,6 @@ import love.forte.simbot.qguild.ed25519.annotations.InternalEd25519Api
 import love.forte.simbot.qguild.ed25519.ed25519KeyPairGenerator
 
 @OptIn(InternalEd25519Api::class)
-internal fun genEd25519Keypair(seed: ByteArray): Ed25519KeyPair {
+internal suspend fun genEd25519Keypair(seed: ByteArray): Ed25519KeyPair {
     return ed25519KeyPairGenerator().generate(seed)
 }