Use CIO Engine, Fix JS Testing

gmitch215 · Dec 21, 2024 · 443f533 · 443f533
1 parent 9a12609
commit 443f533
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 34 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -16,7 +16,7 @@ plugins {
     signing
 }
 
-val v = "0.1.2"
+val v = "0.1.3"
 
 group = "xyz.gmitch215"
 version = "${if (project.hasProperty("snapshot")) "$v-SNAPSHOT" else v}${project.findProperty("suffix")?.toString()?.run { "-${this}" } ?: ""}"
@@ -40,29 +40,42 @@ kotlin {
 
     jvm()
     js {
-        nodejs {
+        browser {
             testTask {
-                enabled = false
+                useMocha {
+                    timeout = "10m"
+                }
             }
         }
-        browser {
+        nodejs {
             testTask {
-                enabled = false
+                useMocha {
+                    timeout = "10m"
+                }
             }
+
+            useCommonJs()
         }
 
+        binaries.executable()
         generateTypeScriptDefinitions()
     }
     wasmJs {
         browser {
             testTask {
-                enabled = false
+                useMocha {
+                    timeout = "10m"
+                }
             }
         }
         nodejs {
             testTask {
-                enabled = false
+                useMocha {
+                    timeout = "10m"
+                }
             }
+
+            useCommonJs()
         }
 
         binaries.executable()
@@ -121,13 +134,15 @@ kotlin {
             implementation("io.ktor:ktor-client-winhttp:$ktorVersion")
         }
 
-        appleMain.dependencies {
-            implementation("io.ktor:ktor-client-darwin:$ktorVersion")
-        }
+        val posixMain by creating {
+            dependsOn(commonMain.get())
 
-        linuxMain.dependencies {
-            implementation("io.ktor:ktor-client-curl:3.0.2")
+            dependencies {
+                implementation("io.ktor:ktor-client-cio:$ktorVersion")
+                implementation("io.ktor:ktor-network-tls:$ktorVersion")
+            }
         }
+        listOf(appleMain, linuxMain).forEach { it.get().dependsOn(posixMain) }
 
         jsMain.dependencies {
             implementation("io.ktor:ktor-client-js:$ktorVersion")

diff --git a/src/appleMain/kotlin/xyz/gmitch215/tabroom/util/http.apple.kt b/src/appleMain/kotlin/xyz/gmitch215/tabroom/util/http.apple.kt
diff --git a/.../xyz/gmitch215/tabroom/util/http.linux.kt → .../xyz/gmitch215/tabroom/util/http.posix.kt b/.../xyz/gmitch215/tabroom/util/http.linux.kt → .../xyz/gmitch215/tabroom/util/http.posix.kt
@@ -1,11 +1,16 @@
 package xyz.gmitch215.tabroom.util
 
 import io.ktor.client.engine.*
-import io.ktor.client.engine.curl.*
+import io.ktor.client.engine.cio.*
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.IO
 
-internal actual val engine: HttpClientEngine = Curl.create {
+internal actual val engine: HttpClientEngine = CIO.create {
     pipelining = true
     dispatcher = Dispatchers.IO.limitedParallelism(PARALLEL_COUNT)
+
+    endpoint {
+        connectTimeout = 10000
+        requestTimeout = 10000
+    }
 }