Skip to content

Commit c151d96

Browse files
committed
Replace remaining raw HttpClient call sites
1 parent 3a74616 commit c151d96

4 files changed

Lines changed: 8 additions & 4 deletions

File tree

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import org.ntqqrev.acidify.event.AcidifyEvent
2121
import org.ntqqrev.acidify.event.internal.KickTransformer
2222
import org.ntqqrev.acidify.event.internal.MsgPushTransformer
2323
import org.ntqqrev.acidify.internal.AbstractClient
24+
import org.ntqqrev.acidify.internal.util.createPlatformHttpClient
2425
import org.ntqqrev.acidify.logging.LogHandler
2526
import org.ntqqrev.acidify.logging.LogLevel
2627
import org.ntqqrev.acidify.logging.Logger
@@ -78,7 +79,7 @@ sealed class AbstractBot(
7879
}
7980

8081

81-
internal val httpClient = HttpClient {
82+
internal val httpClient = createPlatformHttpClient {
8283
install(ContentNegotiation) {
8384
json(Json { ignoreUnknownKeys = true })
8485
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,13 @@ import org.ntqqrev.acidify.internal.proto.message.media.FlashTransferSha1StateV
1414
import org.ntqqrev.acidify.internal.proto.message.media.FlashTransferUploadBody
1515
import org.ntqqrev.acidify.internal.proto.message.media.FlashTransferUploadReq
1616
import org.ntqqrev.acidify.internal.proto.message.media.FlashTransferUploadResp
17+
import org.ntqqrev.acidify.internal.util.createPlatformHttpClient
1718
import org.ntqqrev.acidify.internal.util.pbDecode
1819
import org.ntqqrev.acidify.internal.util.pbEncode
1920
import org.ntqqrev.acidify.internal.util.sha1
2021

2122
internal class FlashTransferContext(client: AbstractClient) : AbstractContext(client) {
22-
private val httpClient = HttpClient()
23+
private val httpClient = createPlatformHttpClient()
2324
private val url = "https://multimedia.qfile.qq.com/sliceupload"
2425

2526
companion object {

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import org.ntqqrev.acidify.common.MediaSource
1212
import org.ntqqrev.acidify.internal.AbstractClient
1313
import org.ntqqrev.acidify.internal.proto.message.media.*
1414
import org.ntqqrev.acidify.internal.service.system.FetchHighwayInfo
15+
import org.ntqqrev.acidify.internal.util.createPlatformHttpClient
1516
import org.ntqqrev.acidify.internal.util.md5
1617
import org.ntqqrev.acidify.internal.util.pbDecode
1718
import org.ntqqrev.acidify.internal.util.pbEncode
@@ -23,7 +24,7 @@ internal class HighwayContext(client: AbstractClient) : AbstractContext(client)
2324
private var highwayHost: String = ""
2425
private var highwayPort: Int = 0
2526
private var sigSession: ByteArray = ByteArray(0)
26-
private val httpClient = HttpClient()
27+
private val httpClient = createPlatformHttpClient()
2728

2829
companion object {
2930
const val MAX_BLOCK_SIZE = 1024 * 1024 // 1MB

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import org.ntqqrev.acidify.internal.service.system.AndroidFetchClientKey
1313
import org.ntqqrev.acidify.internal.service.system.FetchClientKey
1414
import org.ntqqrev.acidify.internal.service.system.FetchPSKey
1515
import org.ntqqrev.acidify.internal.util.RetryPolicy
16+
import org.ntqqrev.acidify.internal.util.createPlatformHttpClient
1617
import org.ntqqrev.acidify.internal.util.withRetry
1718
import kotlin.time.Clock
1819

@@ -39,7 +40,7 @@ internal class TicketContext(client: AbstractClient) : AbstractContext(client) {
3940
private val currentSKey = KeyWithLifetime.dummy()
4041
private val psKeyCache = mutableMapOf<String, KeyWithLifetime>()
4142
private val psKeyQueryMutex = Mutex()
42-
private val httpClient = HttpClient {
43+
private val httpClient = createPlatformHttpClient {
4344
install(HttpCookies)
4445
followRedirects = false
4546
}

0 commit comments

Comments
 (0)