fix: mutex

cssxsh · Sep 21, 2021 · 2021cd5 · 2021cd5
1 parent 60bbeaf
commit 2021cd5
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/src/main/kotlin/xyz/cssxsh/bilibili/BiliClient.kt b/src/main/kotlin/xyz/cssxsh/bilibili/BiliClient.kt
@@ -70,11 +70,10 @@ open class BiliClient(private val timeout: Long = 15_000L) : Closeable {
 
     protected open val mutex = BiliApiMutex(10 * 1000L)
 
-    suspend fun <T> useHttpClient(block: suspend (HttpClient) -> T): T = supervisorScope {
+    suspend fun <T> useHttpClient(block: suspend (HttpClient, BiliApiMutex) -> T): T = supervisorScope {
         while (isActive) {
             runCatching {
-                mutex.wait()
-                block(clients[index])
+                block(clients[index], mutex)
             }.onFailure {
                 if (isActive && ignore(it)) {
                     index = (index + 1) % clients.size

diff --git a/src/main/kotlin/xyz/cssxsh/bilibili/api/Api.kt b/src/main/kotlin/xyz/cssxsh/bilibili/api/Api.kt
@@ -56,7 +56,8 @@ const val SUIT_ITEMS = "https://api.bilibili.com/x/garb/mall/item/suit/v2"
 internal suspend inline fun <reified T> BiliClient.json(
     url: String,
     crossinline block: HttpRequestBuilder.() -> Unit
-): T = useHttpClient { client ->
+): T = useHttpClient { client, mutex ->
+    mutex.wait()
     with(client.get<TempData>(url, block)) {
         val temp = data ?: result
         BiliClient.Json.decodeFromJsonElement(requireNotNull(temp) { message })

diff --git a/src/main/kotlin/xyz/cssxsh/mirai/plugin/BiliBuilder.kt b/src/main/kotlin/xyz/cssxsh/mirai/plugin/BiliBuilder.kt
@@ -174,8 +174,8 @@ internal val MediaReplier: MessageReplier = replier@{ result ->
 }
 
 private suspend fun Url.location(): String? {
-    return client.useHttpClient {
-        it.config {
+    return client.useHttpClient { http, _ ->
+        http.config {
             followRedirects = false
             expectSuccess = false
         }.head<HttpMessage>(this@location)

diff --git a/src/main/kotlin/xyz/cssxsh/mirai/plugin/BiliUtils.kt b/src/main/kotlin/xyz/cssxsh/mirai/plugin/BiliUtils.kt
@@ -127,7 +127,7 @@ private suspend fun Url.cache(type: CacheType, path: String, contact: Contact) =
     type.directory.resolve(path).apply {
         if (exists().not()) {
             parentFile.mkdirs()
-            writeBytes(client.useHttpClient { it.get(this@cache) })
+            writeBytes(client.useHttpClient { http, _ -> http.get(this@cache) })
         } else {
             setLastModified(System.currentTimeMillis())
         }