fix(android-native): eliminate default ktor tls fallbacks

fy0 · fy0 · commit 393dc2280a2f · 2026-04-16T02:48:41.000+08:00
diff --git a/acidify-core/src/androidNativeArm64Main/kotlin/org/ntqqrev/acidify/internal/util/HttpClientUtils.androidNativeArm64.kt b/acidify-core/src/androidNativeArm64Main/kotlin/org/ntqqrev/acidify/internal/util/HttpClientUtils.androidNativeArm64.kt
@@ -1,6 +1,8 @@
 package org.ntqqrev.acidify.internal.util
 
 import io.ktor.client.HttpClient
-import io.ktor.client.engine.cio.CIO
+import io.ktor.client.HttpClientConfig
+import org.ntqqrev.androidhttps.createAndroidNativePlatformHttpClient
 
-internal actual fun createPlatformHttpClient(): HttpClient = HttpClient(CIO)
+internal actual fun createPlatformHttpClient(block: HttpClientConfig<*>.() -> Unit): HttpClient =
+    createAndroidNativePlatformHttpClient(block)
diff --git a/acidify-core/src/appleMain/kotlin/org/ntqqrev/acidify/internal/util/HttpClientUtils.apple.kt b/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)
diff --git a/acidify-core/src/commonMain/kotlin/org/ntqqrev/acidify/AbstractBot.kt b/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)
         )
     }
-}
+}
diff --git a/acidify-core/src/commonMain/kotlin/org/ntqqrev/acidify/common/LagrangeUrlSignProvider.kt b/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
 import org.ntqqrev.acidify.internal.util.platformCurlTextRequestOrNull
 
 /**
@@ -46,7 +47,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)
         }
diff --git a/acidify-core/src/commonMain/kotlin/org/ntqqrev/acidify/common/UrlSignProvider.kt b/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
 import org.ntqqrev.acidify.internal.util.platformCurlTextRequestOrNull
 
 /**
@@ -23,7 +24,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)
         }
diff --git a/acidify-core/src/commonMain/kotlin/org/ntqqrev/acidify/common/android/AndroidLegacyUrlSignProvider.kt b/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 {
diff --git a/acidify-core/src/commonMain/kotlin/org/ntqqrev/acidify/common/android/AndroidUrlSignProvider.kt b/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)
         }
diff --git a/acidify-core/src/commonMain/kotlin/org/ntqqrev/acidify/internal/context/TicketContext.kt b/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
     }
diff --git a/acidify-core/src/commonMain/kotlin/org/ntqqrev/acidify/internal/util/HttpClientUtils.kt b/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
diff --git a/acidify-core/src/jsMain/kotlin/org/ntqqrev/acidify/internal/util/HttpClientUtils.js.kt b/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)
diff --git a/acidify-core/src/jvmMain/kotlin/org/ntqqrev/acidify/internal/util/HttpClientUtils.jvm.kt b/acidify-core/src/jvmMain/kotlin/org/ntqqrev/acidify/internal/util/HttpClientUtils.jvm.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.java.Java
 
-internal actual fun createPlatformHttpClient(): HttpClient = HttpClient(Java)
+internal actual fun createPlatformHttpClient(block: HttpClientConfig<*>.() -> Unit): HttpClient = HttpClient(Java, block)
diff --git a/acidify-core/src/linuxMain/kotlin/org/ntqqrev/acidify/internal/util/HttpClientUtils.linux.kt b/acidify-core/src/linuxMain/kotlin/org/ntqqrev/acidify/internal/util/HttpClientUtils.linux.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.curl.Curl
 
-internal actual fun createPlatformHttpClient(): HttpClient = HttpClient(Curl)
+internal actual fun createPlatformHttpClient(block: HttpClientConfig<*>.() -> Unit): HttpClient = HttpClient(Curl, block)
diff --git a/acidify-core/src/mingwMain/kotlin/org/ntqqrev/acidify/internal/util/HttpClientUtils.mingw.kt b/acidify-core/src/mingwMain/kotlin/org/ntqqrev/acidify/internal/util/HttpClientUtils.mingw.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.winhttp.WinHttp
 
-internal actual fun createPlatformHttpClient(): HttpClient = HttpClient(WinHttp)
+internal actual fun createPlatformHttpClient(block: HttpClientConfig<*>.() -> Unit): HttpClient = HttpClient(WinHttp, block)
diff --git a/android-https-native/build.gradle.kts b/android-https-native/build.gradle.kts
@@ -245,6 +245,7 @@ kotlin {
     sourceSets {
         findByName("androidNativeArm64Main")?.dependencies {
             implementation(libs.ktor.client.core)
+            implementation(libs.ktor.client.mock)
         }
     }
 
diff --git a/android-https-native/src/androidNativeArm64Main/kotlin/org/ntqqrev/androidhttps/AndroidNativeHttps.kt b/android-https-native/src/androidNativeArm64Main/kotlin/org/ntqqrev/androidhttps/AndroidNativeHttps.kt
@@ -9,6 +9,14 @@ import platform.posix.F_OK
 import platform.posix.access
 import platform.posix.readlink
 
+data class AndroidNativeBinaryResponse(
+    val statusCode: Int,
+    val headers: Map<String, List<String>>,
+    val body: ByteArray,
+) {
+    fun header(name: String): String? = headers[name.lowercase()]?.lastOrNull()
+}
+
 data class AndroidNativeTextResponse(
     val statusCode: Int,
     val headers: Map<String, List<String>>,
@@ -33,14 +41,42 @@ fun executeTextRequest(
     maxRedirects: Int = 5,
     timeoutMillis: Int = 30_000,
     caBundlePath: String? = defaultCaBundlePathOrNull(),
-): AndroidNativeTextResponse {
+): AndroidNativeTextResponse = executeBinaryRequest(
+    method = method,
+    url = url,
+    headers = headers,
+    body = body?.encodeToByteArray(),
+    contentType = contentType,
+    followRedirects = followRedirects,
+    maxRedirects = maxRedirects,
+    timeoutMillis = timeoutMillis,
+    caBundlePath = caBundlePath,
+).let {
+    AndroidNativeTextResponse(
+        statusCode = it.statusCode,
+        headers = it.headers,
+        body = it.body.decodeToString(),
+    )
+}
+
+fun executeBinaryRequest(
+    method: String,
+    url: String,
+    headers: Map<String, String> = emptyMap(),
+    body: ByteArray? = null,
+    contentType: String? = null,
+    followRedirects: Boolean = true,
+    maxRedirects: Int = 5,
+    timeoutMillis: Int = 30_000,
+    caBundlePath: String? = defaultCaBundlePathOrNull(),
+): AndroidNativeBinaryResponse {
     var currentMethod = method.uppercase()
     var currentUrl = url
     var currentBody = body
     var currentContentType = contentType
 
     repeat(maxRedirects + 1) { redirectCount ->
-        val response = executeTextRequestOnce(
+        val response = executeBinaryRequestOnce(
             method = currentMethod,
             url = currentUrl,
             headers = headers,
@@ -67,23 +103,22 @@ fun executeTextRequest(
     throw IllegalStateException("Unreachable redirect state for $url")
 }
 
-private fun executeTextRequestOnce(
+private fun executeBinaryRequestOnce(
     method: String,
     url: String,
     headers: Map<String, String>,
-    body: String?,
+    body: ByteArray?,
     contentType: String?,
     timeoutMillis: Int,
     caBundlePath: String?,
-): AndroidNativeTextResponse = memScoped {
+): AndroidNativeBinaryResponse = memScoped {
     val headerEntries = headers.entries.toList()
     val nativeHeaders = if (headerEntries.isEmpty()) null else allocArray<acidify_http_header>(headerEntries.size)
     headerEntries.forEachIndexed { index, entry ->
         nativeHeaders!![index].name = entry.key.cstr.getPointer(this)
         nativeHeaders[index].value = entry.value.cstr.getPointer(this)
     }
 
-    val bodyBytes = body?.encodeToByteArray()
     val request = alloc<acidify_http_request>().apply {
         this.method = method.cstr.getPointer(this@memScoped)
         this.url = url.cstr.getPointer(this@memScoped)
@@ -106,7 +141,7 @@ private fun executeTextRequestOnce(
     }
 
     try {
-        val payload = bodyBytes?.takeIf { it.isNotEmpty() }
+        val payload = body?.takeIf { it.isNotEmpty() }
         payload?.usePinned {
             request.body = it.addressOf(0).reinterpret()
             request.body_len = payload.size.convert()
@@ -137,7 +172,7 @@ private fun executeOrThrow(
     }
 }
 
-private fun parseRawHttpResponse(rawBytes: ByteArray): AndroidNativeTextResponse {
+private fun parseRawHttpResponse(rawBytes: ByteArray): AndroidNativeBinaryResponse {
     val headerEnd = rawBytes.indexOfSequence(byteArrayOf('\r'.code.toByte(), '\n'.code.toByte(), '\r'.code.toByte(), '\n'.code.toByte()))
     require(headerEnd >= 0) { "Malformed HTTP response: missing header separator" }
     val headerText = rawBytes.copyOfRange(0, headerEnd).decodeToString()
@@ -166,10 +201,10 @@ private fun parseRawHttpResponse(rawBytes: ByteArray): AndroidNativeTextResponse
         else -> rawBody
     }
 
-    return AndroidNativeTextResponse(
+    return AndroidNativeBinaryResponse(
         statusCode = statusCode,
         headers = headers,
-        body = body.decodeToString(),
+        body = body,
     )
 }
 
diff --git a/android-https-native/src/androidNativeArm64Main/kotlin/org/ntqqrev/androidhttps/AndroidNativePlatformHttpClient.kt b/android-https-native/src/androidNativeArm64Main/kotlin/org/ntqqrev/androidhttps/AndroidNativePlatformHttpClient.kt
@@ -0,0 +1,61 @@
+package org.ntqqrev.androidhttps
+
+import io.ktor.client.HttpClient
+import io.ktor.client.HttpClientConfig
+import io.ktor.client.engine.mock.MockEngine
+import io.ktor.client.engine.mock.respond
+import io.ktor.http.HeadersBuilder
+import io.ktor.http.HttpHeaders
+import io.ktor.http.HttpStatusCode
+import io.ktor.http.content.OutgoingContent
+import io.ktor.http.content.UnsupportedContentTypeException
+import io.ktor.utils.io.ByteReadChannel
+import io.ktor.utils.io.core.readByteArray
+import io.ktor.utils.io.readRemaining
+import io.ktor.utils.io.writer
+import kotlinx.coroutines.DelicateCoroutinesApi
+import kotlinx.coroutines.GlobalScope
+import kotlin.coroutines.coroutineContext
+
+fun createAndroidNativePlatformHttpClient(block: HttpClientConfig<*>.() -> Unit = {}): HttpClient = HttpClient(MockEngine) {
+    block(this)
+    engine {
+        addHandler { request ->
+            val response = executeBinaryRequest(
+                method = request.method.value,
+                url = request.url.toString(),
+                headers = request.headers.entries().associate { (name, values) -> name to values.joinToString(",") },
+                body = request.body.toByteChannel().readRemaining().readByteArray().takeIf { it.isNotEmpty() },
+                contentType = request.headers[HttpHeaders.ContentType],
+                followRedirects = false,
+            )
+
+            val responseHeaders = HeadersBuilder().apply {
+                response.headers.forEach { (name, values) ->
+                    values.forEach { value -> append(name, value) }
+                }
+            }.build()
+
+            respond(
+                content = ByteReadChannel(response.body),
+                status = HttpStatusCode.fromValue(response.statusCode),
+                headers = responseHeaders,
+            )
+        }
+    }
+}
+
+@OptIn(DelicateCoroutinesApi::class)
+private suspend fun OutgoingContent.toByteChannel(): ByteReadChannel = when (this) {
+    is OutgoingContent.ByteArrayContent -> {
+        val bytes = bytes()
+        ByteReadChannel(bytes, 0, bytes.size)
+    }
+    is OutgoingContent.WriteChannelContent -> GlobalScope.writer(coroutineContext) {
+        writeTo(channel)
+    }.channel
+    is OutgoingContent.ReadChannelContent -> readFrom()
+    is OutgoingContent.NoContent -> ByteReadChannel.Empty
+    is OutgoingContent.ContentWrapper -> delegate().toByteChannel()
+    is OutgoingContent.ProtocolUpgrade -> throw UnsupportedContentTypeException(this)
+}
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -43,6 +43,7 @@ ktor-client-winhttp = { module = "io.ktor:ktor-client-winhttp", version.ref = "k
 ktor-client-darwin = { module = "io.ktor:ktor-client-darwin", version.ref = "ktor" }
 ktor-client-curl = { module = "io.ktor:ktor-client-curl", version.ref = "ktor" }
 ktor-client-cio = { module = "io.ktor:ktor-client-cio", version.ref = "ktor" }
+ktor-client-mock = { module = "io.ktor:ktor-client-mock", version.ref = "ktor" }
 
 ktor-network = { module = "io.ktor:ktor-network", version.ref = "ktor" }
 
diff --git a/yogurt/src/androidNativeArm64Main/kotlin/org/ntqqrev/yogurt/util/HttpClientUtils.androidNativeArm64.kt b/yogurt/src/androidNativeArm64Main/kotlin/org/ntqqrev/yogurt/util/HttpClientUtils.androidNativeArm64.kt
@@ -1,6 +1,6 @@
 package org.ntqqrev.yogurt.util
 
 import io.ktor.client.HttpClient
-import io.ktor.client.engine.cio.CIO
+import org.ntqqrev.androidhttps.createAndroidNativePlatformHttpClient
 
-internal actual fun createPlatformHttpClient(): HttpClient = HttpClient(CIO)
+internal actual fun createPlatformHttpClient(): HttpClient = createAndroidNativePlatformHttpClient()

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,7 @@ import org.ntqqrev.acidify.event.AcidifyEvent`
`21`	`21`	`import org.ntqqrev.acidify.event.internal.KickSignal`
`22`	`22`	`import org.ntqqrev.acidify.event.internal.MsgPushSignal`
`23`	`23`	`import org.ntqqrev.acidify.internal.AbstractClient`
	`24`	`+import org.ntqqrev.acidify.internal.util.createPlatformHttpClient`
`24`	`25`	`import org.ntqqrev.acidify.logging.LogHandler`
`25`	`26`	`import org.ntqqrev.acidify.logging.LogLevel`
`26`	`27`	`import org.ntqqrev.acidify.logging.Logger`
`@@ -78,7 +79,7 @@ sealed class AbstractBot(`
`78`	`79`	`}`
`79`	`80`
`80`	`81`
`81`		`- internal val httpClient = HttpClient {`
	`82`	`+ internal val httpClient = createPlatformHttpClient {`
`82`	`83`	`install(ContentNegotiation) {`
`83`	`84`	`json(Json { ignoreUnknownKeys = true })`
`84`	`85`	`}`
`@@ -159,4 +160,4 @@ sealed class AbstractBot(`
`159`	`160`	`ssoSecureInfo = client.getSsoSecureInfo(cmd, sequence, payload)`
`160`	`161`	`)`
`161`	`162`	`}`
`162`		`-}`
	`163`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@ import io.ktor.serialization.kotlinx.json.json`
`10`	`10`	`import kotlinx.serialization.Serializable`
`11`	`11`	`import kotlinx.serialization.json.Json`
`12`	`12`	`import org.ntqqrev.acidify.exception.UrlSignException`
	`13`	`+import org.ntqqrev.acidify.internal.util.createPlatformHttpClient`
`13`	`14`	`import org.ntqqrev.acidify.internal.util.platformCurlTextRequestOrNull`
`14`	`15`
`15`	`16`	`/**`
`@@ -23,7 +24,7 @@ class UrlSignProvider(val url: String, val httpProxy: String? = null) : SignProv`
`23`	`24`	`ignoreUnknownKeys = true`
`24`	`25`	`}`
`25`	`26`
`26`		`- private val client = HttpClient {`
	`27`	`+ private val client = createPlatformHttpClient {`
`27`	`28`	`install(ContentNegotiation) {`
`28`	`29`	`json(jsonModule)`
`29`	`30`	`}`