fix: implement runBlocking for all targets; use a better way for base64 decoding in PlayerInfoImpl

Author: Aliorpse

mcutils-msmp/src/commonMain/kotlin/tech/aliorpse/mcutils/api/MsmpModule.kt

@@ -16,7 +16,6 @@ import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.takeWhile
 import kotlinx.coroutines.launch
-import kotlinx.coroutines.runBlocking
 import kotlinx.coroutines.withTimeout
 import kotlinx.serialization.KSerializer
 import kotlinx.serialization.json.Json
@@ -29,6 +28,7 @@ import tech.aliorpse.mcutils.entity.MsmpEvent
 import tech.aliorpse.mcutils.internal.MsmpConnection
 import tech.aliorpse.mcutils.internal.MsmpLifecycleManager
 import tech.aliorpse.mcutils.internal.util.SpinLockedMutableMap
+import tech.aliorpse.mcutils.internal.util.runBlocking
 import kotlin.concurrent.atomics.ExperimentalAtomicApi
 
 @Suppress("MagicNumber")

mcutils-player/src/commonMain/kotlin/tech/aliorpse/mcutils/internal/impl/PlayerInfoImpl.kt

@@ -3,7 +3,6 @@ package tech.aliorpse.mcutils.internal.impl
 import io.ktor.client.call.body
 import io.ktor.client.request.get
 import io.ktor.client.statement.bodyAsText
-import io.ktor.util.decodeBase64Bytes
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.jsonObject
 import kotlinx.serialization.json.jsonPrimitive
@@ -13,6 +12,7 @@ import tech.aliorpse.mcutils.internal.entity.DecodedTextures
 import tech.aliorpse.mcutils.internal.entity.PlayerProfileResponse
 import tech.aliorpse.mcutils.internal.util.HttpClientProvider.httpClient
 import tech.aliorpse.mcutils.internal.util.withDispatchersIO
+import kotlin.io.encoding.Base64
 
 internal object PlayerInfoImpl {
     const val UUID_LENGTH = 32
@@ -35,7 +35,7 @@ internal object PlayerInfoImpl {
             httpClient.get("$MOJANG_SESSION_BASE/session/minecraft/profile/$id").body()
 
         val decoded = json.decodeFromString<DecodedTextures>(
-            rawProfile.properties.first().value.decodeBase64Bytes().decodeToString()
+            Base64.decode(rawProfile.properties.first().value).decodeToString()
         )
 
         PlayerProfile(

…e/mcutils/internal/util/DispatchersIO.kt …/mcutils/internal/util/CoroutinesUtil.ktmcutils-util/src/commonMain/kotlin/tech/aliorpse/mcutils/internal/util/DispatchersIO.kt renamed to mcutils-util/src/commonMain/kotlin/tech/aliorpse/mcutils/internal/util/CoroutinesUtil.kt mcutils-util/src/commonMain/kotlin/tech/aliorpse/mcutils/internal/util/DispatchersIO.kt renamed to mcutils-util/src/commonMain/kotlin/tech/aliorpse/mcutils/internal/util/CoroutinesUtil.kt

@@ -1,11 +1,14 @@
 package tech.aliorpse.mcutils.internal.util
 
 import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.currentCoroutineContext
 import kotlinx.coroutines.withContext
 
 public expect val DispatchersIO: CoroutineDispatcher
 
+public expect fun <T> runBlocking(block: suspend CoroutineScope.() -> T): T
+
 public suspend fun <T> withDispatchersIO(block: suspend () -> T): T {
     val currentContext = currentCoroutineContext()
     return if (DispatchersIO.isDispatchNeeded(currentContext)) {

mcutils-util/src/jsMain/kotlin/tech/aliorpse/mcutils/internal/util/CoroutinesUtil.js.kt

@@ -0,0 +1,14 @@
+package tech.aliorpse.mcutils.internal.util
+
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.DelicateCoroutinesApi
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.async
+
+public actual val DispatchersIO: CoroutineDispatcher = Dispatchers.Unconfined
+
+@OptIn(DelicateCoroutinesApi::class)
+public actual fun <T> runBlocking(block: suspend CoroutineScope.() -> T): T =
+    GlobalScope.async { block(this) }.asDynamic()

mcutils-util/src/jsMain/kotlin/tech/aliorpse/mcutils/internal/util/DispatchersIO.js.kt

@@ -1,6 +1,10 @@
 package tech.aliorpse.mcutils.internal.util
 
 import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.runBlocking
 
 public actual val DispatchersIO: CoroutineDispatcher = Dispatchers.IO
+
+public actual fun <T> runBlocking(block: suspend CoroutineScope.() -> T): T = runBlocking(block = block)

…utils/internal/util/DispatchersIO.jvm.kt …tils/internal/util/CoroutinesUtil.jvm.ktmcutils-util/src/jvmMain/kotlin/tech/aliorpse/mcutils/internal/util/DispatchersIO.jvm.kt renamed to mcutils-util/src/jvmMain/kotlin/tech/aliorpse/mcutils/internal/util/CoroutinesUtil.jvm.kt mcutils-util/src/jvmMain/kotlin/tech/aliorpse/mcutils/internal/util/DispatchersIO.jvm.kt renamed to mcutils-util/src/jvmMain/kotlin/tech/aliorpse/mcutils/internal/util/CoroutinesUtil.jvm.kt

@@ -1,7 +1,11 @@
 package tech.aliorpse.mcutils.internal.util
 
 import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.IO
+import kotlinx.coroutines.runBlocking
 
 public actual val DispatchersIO: CoroutineDispatcher = Dispatchers.IO
+
+public actual fun <T> runBlocking(block: suspend CoroutineScope.() -> T): T = runBlocking(block = block)

…ls/internal/util/DispatchersIO.native.kt …s/internal/util/CoroutinesUtil.native.ktmcutils-util/src/nativeMain/kotlin/tech/aliorpse/mcutils/internal/util/DispatchersIO.native.kt renamed to mcutils-util/src/nativeMain/kotlin/tech/aliorpse/mcutils/internal/util/CoroutinesUtil.native.kt mcutils-util/src/nativeMain/kotlin/tech/aliorpse/mcutils/internal/util/DispatchersIO.native.kt renamed to mcutils-util/src/nativeMain/kotlin/tech/aliorpse/mcutils/internal/util/CoroutinesUtil.native.kt

@@ -0,0 +1,15 @@
+package tech.aliorpse.mcutils.internal.util
+
+import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.DelicateCoroutinesApi
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.async
+
+public actual val DispatchersIO: CoroutineDispatcher = Dispatchers.Unconfined
+
+@OptIn(DelicateCoroutinesApi::class, ExperimentalCoroutinesApi::class)
+public actual fun <T> runBlocking(block: suspend CoroutineScope.() -> T): T =
+    GlobalScope.async { block(this) }.getCompleted()