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

Add timeout

Browse Source
This commit is contained in:
Him188 2019-11-26 12:09:50 +08:00
parent 9bb11dba0e
commit 23057b1124
1 changed files with 10 additions and 2 deletions

12
mirai-core/src/commonMain/kotlin/net.mamoe.mirai/network/protocol/tim/TIMBotNetworkHandler.kt
View File

@ -25,6 +25,7 @@ import net.mamoe.mirai.utils.OnlineStatus
import net.mamoe.mirai.utils.io.* import net.mamoe.mirai.utils.io.*
import kotlin.coroutines.CoroutineContext import kotlin.coroutines.CoroutineContext
import kotlin.properties.Delegates import kotlin.properties.Delegates
import kotlin.random.Random
/** /**
* 包处理协程调度器. * 包处理协程调度器.
@ -69,10 +70,12 @@ internal class TIMBotNetworkHandler internal constructor(coroutineContext: Corou
override suspend fun login(configuration: BotConfiguration): LoginResult { override suspend fun login(configuration: BotConfiguration): LoginResult {
userContext = coroutineContext userContext = coroutineContext
return withContext(this.coroutineContext) { return withContext(this.coroutineContext) {
TIMProtocol.SERVER_IP.forEach { ip -> TIMProtocol.SERVER_IP.sortedBy { Random.nextInt() }.forEach { ip ->
bot.logger.info("Connecting server $ip") bot.logger.info("Connecting server $ip")
try { try {
socket = BotSocketAdapter(ip, configuration) withTimeout(3000) {
socket = BotSocketAdapter(ip, configuration)
}
} catch (e: Exception) { } catch (e: Exception) {
return@withContext LoginResult.NETWORK_UNAVAILABLE return@withContext LoginResult.NETWORK_UNAVAILABLE
} }
@ -447,6 +450,11 @@ internal class TIMBotNetworkHandler internal constructor(coroutineContext: Corou
this.token00BA = packet.token00BA this.token00BA = packet.token00BA
if (packet.transmissionCompleted) { if (packet.transmissionCompleted) {
if (configuration.failOnCaptcha) {
loginResult.complete(LoginResult.CAPTCHA)
close()
return
}
val code = configuration.captchaSolver(bot, captchaCache!!) val code = configuration.captchaSolver(bot, captchaCache!!)
this.captchaCache = null this.captchaCache = null