fix: route android native common clients through platform http

Author: fy0

acidify-core/src/androidNativeArm64Main/kotlin/org/ntqqrev/acidify/internal/util/HttpClientUtils.androidNativeArm64.kt

@@ -1,11 +1,13 @@
 package org.ntqqrev.acidify.internal.util
 
 import io.ktor.client.HttpClient
+import io.ktor.client.HttpClientConfig
 import io.ktor.client.engine.curl.Curl
 import io.ktor.client.engine.curl.defaultAndroidNativeCurlCaInfoPathOrNull
 
-internal actual fun createPlatformHttpClient(): HttpClient = HttpClient(Curl) {
+internal actual fun createPlatformHttpClient(block: HttpClientConfig<*>.() -> Unit): HttpClient = HttpClient(Curl) {
     engine {
         caInfo = defaultAndroidNativeCurlCaInfoPathOrNull()
     }
+    block()
 }

acidify-core/src/appleMain/kotlin/org/ntqqrev/acidify/internal/util/HttpClientUtils.apple.kt

@@ -1,6 +1,7 @@
 package org.ntqqrev.acidify.internal.util
 
 import io.ktor.client.HttpClient
+import io.ktor.client.HttpClientConfig
 import io.ktor.client.engine.darwin.Darwin
 
-internal actual fun createPlatformHttpClient(): HttpClient = HttpClient(Darwin)
+internal actual fun createPlatformHttpClient(block: HttpClientConfig<*>.() -> Unit): HttpClient = HttpClient(Darwin, block)

acidify-core/src/commonMain/kotlin/org/ntqqrev/acidify/AbstractBot.kt

@@ -21,6 +21,7 @@ import org.ntqqrev.acidify.event.AcidifyEvent
 import org.ntqqrev.acidify.event.internal.KickSignal
 import org.ntqqrev.acidify.event.internal.MsgPushSignal
 import org.ntqqrev.acidify.internal.AbstractClient
+import org.ntqqrev.acidify.internal.util.createPlatformHttpClient
 import org.ntqqrev.acidify.logging.LogHandler
 import org.ntqqrev.acidify.logging.LogLevel
 import org.ntqqrev.acidify.logging.Logger
@@ -78,7 +79,7 @@ sealed class AbstractBot(
     }
 
 
-    internal val httpClient = HttpClient {
+    internal val httpClient = createPlatformHttpClient {
         install(ContentNegotiation) {
             json(Json { ignoreUnknownKeys = true })
         }
@@ -159,4 +160,4 @@ sealed class AbstractBot(
             ssoSecureInfo = client.getSsoSecureInfo(cmd, sequence, payload)
         )
     }
-}
+}

acidify-core/src/commonMain/kotlin/org/ntqqrev/acidify/common/LagrangeUrlSignProvider.kt

@@ -12,6 +12,7 @@ import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json
 import org.ntqqrev.acidify.exception.UrlSignException
+import org.ntqqrev.acidify.internal.util.createPlatformHttpClient
 
 /**
  * 通过 HTTP 接口进行签名的 [SignProvider] 实现，用于对接 Lagrange V2 Sign API。
@@ -45,7 +46,7 @@ class LagrangeUrlSignProvider(
     private var jwtToken: String? = jwtToken?.takeUnless { it.isBlank() }
     private var refreshJob: Job? = null
 
-    private val client = HttpClient {
+    private val client = createPlatformHttpClient {
         install(ContentNegotiation) {
             json(jsonModule)
         }

acidify-core/src/commonMain/kotlin/org/ntqqrev/acidify/common/UrlSignProvider.kt

@@ -10,6 +10,7 @@ import io.ktor.serialization.kotlinx.json.json
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json
 import org.ntqqrev.acidify.exception.UrlSignException
+import org.ntqqrev.acidify.internal.util.createPlatformHttpClient
 
 /**
  * 通过 HTTP 接口进行签名的 [SignProvider] 实现
@@ -22,7 +23,7 @@ class UrlSignProvider(val url: String, val httpProxy: String? = null) : SignProv
         ignoreUnknownKeys = true
     }
 
-    private val client = HttpClient {
+    private val client = createPlatformHttpClient {
         install(ContentNegotiation) {
             json(jsonModule)
         }
@@ -87,4 +88,4 @@ private data class UrlSignValue(
     val sign: String,
     val token: String,
     val extra: String
-)
+)

acidify-core/src/commonMain/kotlin/org/ntqqrev/acidify/common/android/AndroidLegacyUrlSignProvider.kt

@@ -17,6 +17,7 @@ import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonElement
 import org.ntqqrev.acidify.common.SignResult
 import org.ntqqrev.acidify.exception.UrlSignException
+import org.ntqqrev.acidify.internal.util.createPlatformHttpClient
 import org.ntqqrev.acidify.internal.util.platformCurlTextRequestOrNull
 
 class AndroidLegacyUrlSignProvider(
@@ -30,7 +31,7 @@ class AndroidLegacyUrlSignProvider(
     private val base = Url(url)
     private val jsonModule = Json { ignoreUnknownKeys = true }
 
-    private val client = HttpClient {
+    private val client = createPlatformHttpClient {
         if (!(base.user.isNullOrEmpty() || base.password.isNullOrEmpty())) {
             install(Auth) {
                 basic {

acidify-core/src/commonMain/kotlin/org/ntqqrev/acidify/common/android/AndroidUrlSignProvider.kt

@@ -15,6 +15,7 @@ import kotlinx.serialization.encodeToString
 import kotlinx.serialization.json.Json
 import org.ntqqrev.acidify.common.SignResult
 import org.ntqqrev.acidify.exception.UrlSignException
+import org.ntqqrev.acidify.internal.util.createPlatformHttpClient
 import org.ntqqrev.acidify.internal.util.platformCurlTextRequestOrNull
 
 /**
@@ -26,7 +27,7 @@ class AndroidUrlSignProvider(val url: String, val httpProxy: String? = null) : A
     val base = Url(url)
     private val jsonModule = Json { ignoreUnknownKeys = true }
 
-    private val client = HttpClient {
+    private val client = createPlatformHttpClient {
         install(ContentNegotiation) {
             json(jsonModule)
         }

acidify-core/src/commonMain/kotlin/org/ntqqrev/acidify/internal/context/TicketContext.kt

@@ -12,6 +12,7 @@ import org.ntqqrev.acidify.internal.LagrangeClient
 import org.ntqqrev.acidify.internal.service.system.AndroidFetchClientKey
 import org.ntqqrev.acidify.internal.service.system.FetchClientKey
 import org.ntqqrev.acidify.internal.service.system.FetchPSKey
+import org.ntqqrev.acidify.internal.util.createPlatformHttpClient
 import org.ntqqrev.acidify.internal.util.platformCurlTextRequestOrNull
 import kotlin.time.Clock
 
@@ -38,7 +39,7 @@ internal class TicketContext(client: AbstractClient) : AbstractContext(client) {
     private val currentSKey = KeyWithLifetime.dummy()
     private val psKeyCache = mutableMapOf<String, KeyWithLifetime>()
     private val psKeyQueryMutex = Mutex()
-    private val httpClient = HttpClient {
+    private val httpClient = createPlatformHttpClient {
         install(HttpCookies)
         followRedirects = false
     }

acidify-core/src/commonMain/kotlin/org/ntqqrev/acidify/internal/util/HttpClientUtils.kt

@@ -1,5 +1,6 @@
 package org.ntqqrev.acidify.internal.util
 
 import io.ktor.client.HttpClient
+import io.ktor.client.HttpClientConfig
 
-internal expect fun createPlatformHttpClient(): HttpClient
+internal expect fun createPlatformHttpClient(block: HttpClientConfig<*>.() -> Unit = {}): HttpClient

acidify-core/src/jsMain/kotlin/org/ntqqrev/acidify/internal/util/HttpClientUtils.js.kt

@@ -1,5 +1,6 @@
 package org.ntqqrev.acidify.internal.util
 
 import io.ktor.client.HttpClient
+import io.ktor.client.HttpClientConfig
 
-internal actual fun createPlatformHttpClient(): HttpClient = HttpClient()
+internal actual fun createPlatformHttpClient(block: HttpClientConfig<*>.() -> Unit): HttpClient = HttpClient(block)