chore: use ktor cio client engine everywhere execpt on jvm & dep updates

sureshg · sureshg · commit fd33bc0bbe8c · 2025-02-12T22:40:52.000-08:00
diff --git a/backend/jvm/build.gradle.kts b/backend/jvm/build.gradle.kts
@@ -215,7 +215,7 @@ dependencies {
   implementation(libs.jte.runtime)
   // compileOnly(libs.jte.kotlin)
   implementation(libs.kotlinx.html)
-  implementation(kotlinw("css"))
+  implementation(libs.kotlin.wrappers.css)
   implementation(libs.ktor.server.html)
 
   // OpenTelemetry
diff --git a/gradle/build-logic/src/main/kotlin/common/Multiplatform.kt b/gradle/build-logic/src/main/kotlin/common/Multiplatform.kt
@@ -48,6 +48,7 @@ fun KotlinMultiplatformExtension.commonTarget(project: Project) =
             api(libs.kotlin.bignum)
             api(libs.kotlin.bignum.serialization)
             api(libs.ktor.client.core)
+            api(libs.ktor.client.cio)
             api(libs.ktor.client.content.negotiation)
             api(libs.ktor.client.encoding)
             api(libs.ktor.client.logging)
@@ -189,9 +190,8 @@ fun KotlinMultiplatformExtension.jsTarget(project: Project) =
       sourceSets {
         jsMain {
           dependencies {
-            api(libs.ktor.client.js)
-            api(kotlinw("browser"))
-            api(kotlinw("css"))
+            api(libs.kotlin.wrappers.browser)
+            api(libs.kotlin.wrappers.css)
             // api(npm("@js-joda/timezone", libs.versions.npm.jsjoda.tz.get()))
             // ksp(project(":meta:ksp:processor"))
           }
@@ -247,7 +247,6 @@ fun KotlinMultiplatformExtension.wasmJsTarget(project: Project) =
           dependencies {
             // kotlinx-browser is only supported for WasmJs.
             api(libs.kotlinx.browser)
-            api(libs.ktor.client.js)
             // api(npm("@js-joda/timezone", libs.versions.npm.jsjoda.tz.get()))
           }
         }
@@ -301,14 +300,7 @@ fun KotlinMultiplatformExtension.nativeTargets(
           mingwX64 { configureAll() }
         }
 
-        sourceSets {
-          nativeMain {
-            dependencies {
-              api(libs.ktor.client.cio)
-              // api(libs.arrow.suspendapp.ktor)
-            }
-          }
-        }
+        sourceSets { nativeMain { dependencies { api(libs.ktor.client.curl) } } }
       }
     }
 
diff --git a/gradle/build-logic/src/main/kotlin/common/ProjectExtns.kt b/gradle/build-logic/src/main/kotlin/common/ProjectExtns.kt
@@ -337,14 +337,6 @@ val Project.jvmRunArgs
     jvmArgs?.split(",") ?: jvmArguments(appRun = true)
   }
 
-/**
- * Returns the dependency string for the specified Kotlin wrapper.
- *
- * @param target The target wrapper to retrieve the dependency string for.
- * @return The dependency string for the specified Kotlin wrapper.
- */
-fun kotlinw(target: String) = "org.jetbrains.kotlin-wrappers:kotlin-$target"
-
 // https://kotlinlang.org/docs/multiplatform-set-up-targets.html#distinguish-several-targets-for-one-platform
 val mppTargetAttr = Attribute.of("mpp.target.name", String::class.java)
 
diff --git a/gradle/kotlin-js-store/package-lock.json b/gradle/kotlin-js-store/package-lock.json
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -391,6 +391,7 @@ ktor-serialization-xml               = { module = "io.ktor:ktor-serialization-ko
 ktor-client-core                     = { module = "io.ktor:ktor-client-core"                                   , version.ref = "ktor"}
 ktor-client-cio                      = { module = "io.ktor:ktor-client-cio"                                    , version.ref = "ktor"}
 ktor-client-java                     = { module = "io.ktor:ktor-client-java"                                   , version.ref = "ktor"}
+ktor-client-curl                     = { module = "io.ktor:ktor-client-curl"                                   , version.ref = "ktor"}
 ktor-client-js                       = { module = "io.ktor:ktor-client-js"                                     , version.ref = "ktor"}
 ktor-client-okhttp                   = { module = "io.ktor:ktor-client-okhttp"                                 , version.ref = "ktor"}
 ktor-client-jetty                    = { module = "io.ktor:ktor-client-jetty"                                  , version.ref = "ktor"}
@@ -559,6 +560,8 @@ java-keychain                        = { module = "pt.davidafsilva.apple:jkeycha
 webjars-xterm                        = { module = "org.webjars.npm:xterm"                                      , version.ref = "webjars-xterm" }
 
 kotlin-wrappers-bom                  = { module = "org.jetbrains.kotlin-wrappers:kotlin-wrappers-bom"          , version.ref = "kotlin-wrappers" }
+kotlin-wrappers-browser              = { module = "org.jetbrains.kotlin-wrappers:kotlin-browser"               , version.ref = "kotlin-wrappers" }
+kotlin-wrappers-css                  = { module = "org.jetbrains.kotlin-wrappers:kotlin-css"                   , version.ref = "kotlin-wrappers" }
 multiplatform-settings-core          = { module = "com.russhwolf:multiplatform-settings"                       , version.ref = "kmp-settings" }
 multiplatform-settings-coroutines    = { module = "com.russhwolf:multiplatform-settings-coroutines"            , version.ref = "kmp-settings" }
 multiplatform-settings-no-arg        = { module = "com.russhwolf:multiplatform-settings-no-arg"                , version.ref = "kmp-settings" }
diff --git a/shared/src/commonMain/kotlin/dev/suresh/http/HttpClient.kt b/shared/src/commonMain/kotlin/dev/suresh/http/HttpClient.kt
@@ -33,7 +33,11 @@ val json by lazy {
   }
 }
 
-/** Multiplatform HTTP client factory function. */
+/**
+ * Multiplatform HTTP client engine configuration
+ *
+ * See [doc](https://ktor.io/docs/client-engines.html#mpp-config) for more details.
+ */
 expect fun httpClient(
     name: String = "Api Client",
     timeout: Timeout = Timeout.DEFAULT,
@@ -81,7 +85,10 @@ expect fun httpClient(
         sanitizeHeader { header -> header == HttpHeaders.Authorization }
       }
 
-      engine { pipelining = true }
+      engine {
+        pipelining = true
+        // proxy  = ProxyBuilder.http()
+      }
 
       followRedirects = true
 
diff --git a/shared/src/jsMain/kotlin/dev/suresh/http/HttpClient.js.kt b/shared/src/jsMain/kotlin/dev/suresh/http/HttpClient.js.kt
@@ -2,12 +2,25 @@ package dev.suresh.http
 
 import io.github.oshai.kotlinlogging.KLogger
 import io.ktor.client.*
-import io.ktor.client.engine.js.*
+import io.ktor.client.engine.cio.*
 
 actual fun httpClient(
     name: String,
     timeout: Timeout,
     retry: Retry,
     httpLogger: KLogger,
     config: HttpClientConfig<*>.() -> Unit
-) = HttpClient(Js) { config(this) }
+) =
+    HttpClient(CIO) {
+      config(this)
+      engine {
+        maxConnectionsCount = 1000
+        endpoint {
+          maxConnectionsPerRoute = 100
+          pipelineMaxSize = 20
+          keepAliveTime = 5000
+          connectTimeout = 5000
+          connectAttempts = 5
+        }
+      }
+    }
diff --git a/shared/src/jvmMain/kotlin/dev/suresh/http/HttpClient.jvm.kt b/shared/src/jvmMain/kotlin/dev/suresh/http/HttpClient.jvm.kt
@@ -30,3 +30,25 @@ actual fun httpClient(
       config(this)
       engine { config { sslContext(customSSLFactory.sslContext) } }
     }
+
+// val cioHttpClient = HttpClient(CIO) {
+//     config(this)
+//
+//     engine {
+//         maxConnectionsCount = 1000
+//         endpoint {
+//             maxConnectionsPerRoute = 100
+//             pipelineMaxSize = 20
+//             keepAliveTime = 5000
+//             connectTimeout = 5000
+//             connectAttempts = 5
+//         }
+//         https {
+//             serverName = "suresh.dev"
+//             cipherSuites = CIOCipherSuites.SupportedSuites
+//             trustManager = myCustomTrustManager
+//             random = mySecureRandom
+//             addKeyStore(myKeyStore, myKeyStorePassword)
+//         }
+//     }
+// }
diff --git a/shared/src/nativeMain/kotlin/dev/suresh/http/HttpClient.native.kt b/shared/src/nativeMain/kotlin/dev/suresh/http/HttpClient.native.kt
@@ -2,12 +2,16 @@ package dev.suresh.http
 
 import io.github.oshai.kotlinlogging.KLogger
 import io.ktor.client.*
-import io.ktor.client.engine.cio.*
+import io.ktor.client.engine.curl.*
 
 actual fun httpClient(
     name: String,
     timeout: Timeout,
     retry: Retry,
     httpLogger: KLogger,
     config: HttpClientConfig<*>.() -> Unit
-) = HttpClient(CIO) { config(this) }
+) =
+    HttpClient(Curl) {
+      config(this)
+      engine { sslVerify = true }
+    }
diff --git a/shared/src/wasmJsMain/kotlin/dev/suresh/http/HttpClient.wasmJs.kt b/shared/src/wasmJsMain/kotlin/dev/suresh/http/HttpClient.wasmJs.kt
@@ -2,12 +2,25 @@ package dev.suresh.http
 
 import io.github.oshai.kotlinlogging.KLogger
 import io.ktor.client.*
-import io.ktor.client.engine.js.*
+import io.ktor.client.engine.cio.*
 
 actual fun httpClient(
     name: String,
     timeout: Timeout,
     retry: Retry,
     httpLogger: KLogger,
     config: HttpClientConfig<*>.() -> Unit,
-) = HttpClient(Js) { config(this) }
+) =
+    HttpClient(CIO) {
+      config(this)
+      engine {
+        maxConnectionsCount = 1000
+        endpoint {
+          maxConnectionsPerRoute = 100
+          pipelineMaxSize = 20
+          keepAliveTime = 5000
+          connectTimeout = 5000
+          connectAttempts = 5
+        }
+      }
+    }
