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

Fix potential SvcReqMSFLoginNotify (OtherClient online) decode failure

Browse Source
This commit is contained in:
Him188 2021-01-14 18:11:53 +08:00
parent 3b6b7ad377
commit 1e55d15047
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mirai-core/src/commonMain/kotlin/network/protocol/packet/login/StatSvc.kt
View File

@ -11,6 +11,7 @@ package net.mamoe.mirai.internal.network.protocol.packet.login
import kotlinx.coroutines.CancellationException import kotlinx.coroutines.CancellationException
import kotlinx.coroutines.cancel import kotlinx.coroutines.cancel
import kotlinx.coroutines.delay
import kotlinx.coroutines.sync.withLock import kotlinx.coroutines.sync.withLock
import kotlinx.io.core.ByteReadPacket import kotlinx.io.core.ByteReadPacket
import kotlinx.serialization.protobuf.ProtoBuf import kotlinx.serialization.protobuf.ProtoBuf
@ -255,7 +256,10 @@ internal class StatSvc {
if (bot.otherClients.any { it.appId == appId }) return null if (bot.otherClients.any { it.appId == appId }) return null
val info = Mirai.getOnlineOtherClientsList(bot).find { it.appId == appId } val info = Mirai.getOnlineOtherClientsList(bot).find { it.appId == appId }
?: throw contextualBugReportException( ?: kotlin.run {
delay(1000) // sometimes server sync slow
Mirai.getOnlineOtherClientsList(bot).find { it.appId == appId }
} ?: throw contextualBugReportException(
"SvcReqMSFLoginNotify (OtherClient online)", "SvcReqMSFLoginNotify (OtherClient online)",
notify._miraiContentToString(), notify._miraiContentToString(),
additional = "Failed to find corresponding instanceInfo." additional = "Failed to find corresponding instanceInfo."