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

Drop bad servers on failure, fix #589

Browse Source
This commit is contained in:
Him188 2020-09-11 23:39:19 +08:00
parent c4b76db4a1
commit 4b25900ab8
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/BotImpl.kt
View File

@ -89,7 +89,9 @@ internal abstract class BotImpl<N : BotNetworkHandler> constructor(
// normally closed // normally closed
return@subscribeAlways return@subscribeAlways
} }
bot.logger.info { "Connection dropped by server or lost, retrying login" } bot.logger.info { "Connection lost, retrying login" }
bot.asQQAndroidBot().client.serverList.removeAt(0)
var failed = false var failed = false
val time = measureTime { val time = measureTime {

10
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/QQAndroidClient.kt
View File

@ -46,14 +46,14 @@ private fun generateGuid(androidId: ByteArray, macAddress: ByteArray): ByteArray
internal fun getRandomByteArray(length: Int): ByteArray = ByteArray(length) { Random.nextInt(0, 255).toByte() } internal fun getRandomByteArray(length: Int): ByteArray = ByteArray(length) { Random.nextInt(0, 255).toByte() }
internal object DefaultServerList : Set<Pair<String, Int>> by setOf( internal object DefaultServerList : Set<Pair<String, Int>> by setOf(
"msfwifi.3g.qq.com" to 8080,
"42.81.169.46" to 8080, "42.81.169.46" to 8080,
"42.81.172.81" to 80, "42.81.172.81" to 80,
"114.221.148.59" to 14000, "114.221.148.59" to 14000,
"42.81.172.147" to 443, "42.81.172.147" to 443,
"125.94.60.146" to 80, "125.94.60.146" to 80,
"114.221.144.215" to 80, "114.221.144.215" to 80,
"42.81.172.22" to 80 "42.81.172.22" to 80,
"msfwifi.3g.qq.com" to 8080,
) )
/* /*
@ -130,7 +130,7 @@ internal open class QQAndroidClient(
internal suspend inline fun useNextServers(crossinline block: suspend (host: String, port: Int) -> Unit) { internal suspend inline fun useNextServers(crossinline block: suspend (host: String, port: Int) -> Unit) {
if (bot.client.serverList.isEmpty()) { if (bot.client.serverList.isEmpty()) {
throw NoServerAvailableException(null) bot.client.serverList.addAll(DefaultServerList)
} }
retryCatching(bot.client.serverList.size, except = LoginFailedException::class) { retryCatching(bot.client.serverList.size, except = LoginFailedException::class) {
val pair = bot.client.serverList[0] val pair = bot.client.serverList[0]
@ -159,8 +159,8 @@ internal open class QQAndroidClient(
var openAppId: Long = 715019303L var openAppId: Long = 715019303L
val apkVersionName: ByteArray get() = "8.2.7".toByteArray() val apkVersionName: ByteArray get() = "8.4.8".toByteArray()
val buildVer: String get() = "8.2.7.4410" // 8.2.0.1296 val buildVer: String get() = "8.4.8.4810" // 8.2.0.1296 // 8.4.8.4810 // 8.2.7.4410
private val messageSequenceId: AtomicInt = atomic(22911) private val messageSequenceId: AtomicInt = atomic(22911)
internal fun atomicNextMessageSequenceId(): Int = messageSequenceId.getAndAdd(2) internal fun atomicNextMessageSequenceId(): Int = messageSequenceId.getAndAdd(2)