Heartbeat timeout retry

d9c89590 · Him188 · b7baae57 · d9c89590
Commit d9c89590 authored Jan 03, 2020 by Him188
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 4 deletions

mirai-core-timpc/src/commonMain/kotlin/net.mamoe.mirai.timpc/network/TIMPCBotNetworkHandler.kt ...n/net.mamoe.mirai.timpc/network/TIMPCBotNetworkHandler.kt +11 -4

No files found.
--- a/mirai-core-timpc/src/commonMain/kotlin/net.mamoe.mirai.timpc/network/TIMPCBotNetworkHandler.kt
+++ b/mirai-core-timpc/src/commonMain/kotlin/net.mamoe.mirai.timpc/network/TIMPCBotNetworkHandler.kt
@@ -473,10 +473,17 @@ internal class TIMPCBotNetworkHandler internal constructor(coroutineContext: Cor
                                        HeartbeatPacket(bot.qqAccount, sessionKey).sendAndExpect<HeartbeatPacketResponse>()
                                    } == null) {
-                                    bot.logger.warning("Heartbeat timed out")
-                                    delay(configuration.firstReconnectDelayMillis)
+                                    // retry one time
-                                    bot.tryReinitializeNetworkHandler(HeartbeatTimeoutException())
+                                    if (withTimeoutOrNull(configuration.heartbeatTimeoutMillis) {
-                                    return@launch
+                                            HeartbeatPacket(bot.qqAccount, sessionKey).sendAndExpect<HeartbeatPacketResponse>()
+                                        } == null) {
+                                        bot.logger.warning("Heartbeat timed out")
+                                        delay(configuration.firstReconnectDelayMillis)
+                                        bot.tryReinitializeNetworkHandler(HeartbeatTimeoutException())
+                                        return@launch
+                                    }
                                }
                            }
                        }