github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-01-24 06:50:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix resource download:

Browse Source 
- fix download/upload logging
- add retry fro single server download
This commit is contained in:
Karlatemp 2021-02-02 20:12:37 +08:00 committed by Him188
parent dd08c8815b
commit d7272e7e9a
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mirai-core/src/commonMain/kotlin/MiraiImpl.kt
View File

@ -971,15 +971,16 @@ internal open class MiraiImpl : IMirai, LowLevelApiAccessor {
val http = Mirai.Http
val origin = resp.origin
val data = if (origin.msgExternInfo?.channelType == 2) {
val data: ByteArray = if (origin.msgExternInfo?.channelType == 2) {
tryDownload(
bot = bot,
host = "https://ssl.htdata.qq.com",
port = 0,
port = 443,
times = 3,
resourceKind = ResourceKind.LONG_MESSAGE,
channelKind = ChannelKind.HTTP
) { host, port ->
http.get<ByteArray>("$host:$port${origin.thumbDownPara}")
) { host, _ ->
http.get("$host${origin.thumbDownPara}")
}
} else tryServersDownload(
bot = bot,

16
mirai-core/src/commonMain/kotlin/network/highway/Highway.kt
View File

@ -159,21 +159,23 @@ internal suspend inline fun <reified R> tryServersDownload(
5000,
onFail = { throw IllegalStateException("cannot download $resourceKind, failed on all servers.", it) }
) { ip, port ->
tryUploadImplEach(bot, channelKind, resourceKind, ip, port, implOnEachServer)
tryDownloadImplEach(bot, channelKind, resourceKind, ip, port, implOnEachServer)
}
internal suspend inline fun <reified R> tryDownload(
bot: QQAndroidBot,
host: String,
port: Int,
times: Int = 1,
resourceKind: ResourceKind,
channelKind: ChannelKind,
crossinline implOnEachServer: suspend (ip: String, port: Int) -> R
) = runCatching {
tryUploadImplEach(bot, channelKind, resourceKind, host, port, implOnEachServer)
}.getOrElse { throw IllegalStateException("cannot upload $resourceKind, failed on all servers.", it) }
) = retryCatching(times) {
tryDownloadImplEach(bot, channelKind, resourceKind, host, port, implOnEachServer)
}.getOrElse { throw IllegalStateException("Cannot download $resourceKind", it) }
private suspend inline fun <reified R> tryUploadImplEach(
private suspend inline fun <reified R> tryDownloadImplEach(
bot: QQAndroidBot,
channelKind: ChannelKind,
resourceKind: ResourceKind,
@ -182,7 +184,7 @@ private suspend inline fun <reified R> tryUploadImplEach(
crossinline implOnEachServer: suspend (ip: String, port: Int) -> R
): R {
bot.network.logger.verbose {
"[${channelKind}] Downloading $resourceKind to ${host}:$port"
"[${channelKind}] Downloading $resourceKind from ${host}:$port"
}
var resp: R? = null
@ -190,7 +192,7 @@ private suspend inline fun <reified R> tryUploadImplEach(
resp = implOnEachServer(host, port)
}.onFailure {
bot.network.logger.verbose {
"[${channelKind}] Downloading $resourceKind to ${host}:$port failed: $it"
"[${channelKind}] Downloading $resourceKind from ${host}:$port failed: $it"
}
throw it
}