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

Console Update

Browse Source
This commit is contained in:
jiahua.liu 2020-01-25 21:40:34 +08:00
parent d8feefcc57
commit eabffb46c4
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/login/LoginPacket.kt
View File

@ -1,6 +1,7 @@
package net.mamoe.mirai.qqandroid.network.protocol.packet.login
import io.ktor.util.InternalAPI
import kotlinx.io.core.*
import net.mamoe.mirai.data.Packet
import net.mamoe.mirai.qqandroid.QQAndroidBot
@ -189,6 +190,7 @@ internal object LoginPacket : PacketFactory<LoginPacket.LoginPacketResponse>("wt
}
}
@InternalAPI
@UseExperimental(MiraiDebugAPI::class)
override suspend fun ByteReadPacket.decode(bot: QQAndroidBot): LoginPacketResponse = this.debugPrint("login解析").run {
// 00 09 sub cmd
@ -227,6 +229,7 @@ internal object LoginPacket : PacketFactory<LoginPacket.LoginPacketResponse>("wt
} ?: error("Cannot find error message")
}
@InternalAPI
@UseExperimental(MiraiDebugAPI::class)
private suspend fun onSolveLoginCaptcha(tlvMap: Map<Int, ByteArray>, bot: QQAndroidBot): LoginPacketResponse.Captcha {
val client = bot.client
@ -237,11 +240,17 @@ internal object LoginPacket : PacketFactory<LoginPacket.LoginPacketResponse>("wt
"36" -> {
//图片验证
DebugLogger.debug("是一个图片验证码")
val imageData = tlvMap[0x165]
bot.configuration.captchaSolver.invoke(
bot,
(tlvMap[0x105] ?: error("Captcha Image Data Not Found")).toIoBuffer()
)
val imageData = tlvMap[0x105]!!.toReadPacket()
println(tlvMap[0x105]!!.toUHexString())
val signInfoLength = imageData.readShort()
val picLength = imageData.readShort()
val sign = imageData.readBytes(signInfoLength.toInt())
val tv104 = tlvMap[0x104]!!
val ssoSign =
bot.configuration.captchaSolver.invoke(
bot,
imageData.readRemainingBytes().toIoBuffer()
)
}
else -> {
error("UNKNOWN CAPTCHA QUESTION: $question")