Skip to content

M
Mirai
Commit 9353a5af authored by Him188's avatar Him188
Browse files
Options

QQA Debugging update

parent 1de776f0
Hide whitespace changes
Inline Side-by-side
Showing with 152 additions and 89 deletions
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/io/JceInput.kt
View file @ 9353a5af
...@@ -29,6 +29,22 @@ class JceInput( ...@@ -29,6 +29,22 @@ class JceInput(
return JceHead(tag = tag, type = type) return JceHead(tag = tag, type = type)
} }
fun read(default: Byte, tag: Int): Byte = readByteOrNull(tag) ?: default
fun read(default: Short, tag: Int): Short = readShortOrNull(tag) ?: default
fun read(default: Int, tag: Int): Int = readIntOrNull(tag) ?: default
fun read(default: Long, tag: Int): Long = readLongOrNull(tag) ?: default
fun read(default: Float, tag: Int): Float = readFloatOrNull(tag) ?: default
fun read(default: Double, tag: Int): Double = readDoubleOrNull(tag) ?: default
fun read(default: Boolean, tag: Int): Boolean = readBooleanOrNull(tag) ?: default
fun read(default: ByteArray, tag: Int): ByteArray = readByteArrayOrNull(tag) ?: default
fun read(default: ShortArray, tag: Int): ShortArray = readShortArrayOrNull(tag) ?: default
fun read(default: IntArray, tag: Int): IntArray = readIntArrayOrNull(tag) ?: default
fun read(default: LongArray, tag: Int): LongArray = readLongArrayOrNull(tag) ?: default
fun read(default: FloatArray, tag: Int): FloatArray = readFloatArrayOrNull(tag) ?: default
fun read(default: DoubleArray, tag: Int): DoubleArray = readDoubleArrayOrNull(tag) ?: default
fun read(default: BooleanArray, tag: Int): BooleanArray = readBooleanArrayOrNull(tag) ?: default
fun readBoolean(tag: Int): Boolean = readBooleanOrNull(tag) ?: error("cannot find tag $tag") fun readBoolean(tag: Int): Boolean = readBooleanOrNull(tag) ?: error("cannot find tag $tag")
fun readByte(tag: Int): Byte = readByteOrNull(tag) ?: error("cannot find tag $tag") fun readByte(tag: Int): Byte = readByteOrNull(tag) ?: error("cannot find tag $tag")
fun readShort(tag: Int): Short = readShortOrNull(tag) ?: error("cannot find tag $tag") fun readShort(tag: Int): Short = readShortOrNull(tag) ?: error("cannot find tag $tag")
...@@ -176,7 +192,7 @@ class JceInput( ...@@ -176,7 +192,7 @@ class JceInput(
} }
} }
fun <T : Map<K, V>, K, V> readMapOrNull(defaultKey: K, defaultValue: V, tag: Int): Map<K, V>? = skipToTagOrNull(tag) { fun <K, V> readMapOrNull(defaultKey: K, defaultValue: V, tag: Int): Map<K, V>? = skipToTagOrNull(tag) {
check(it.type.toInt() == 8) { "type mismatch" } check(it.type.toInt() == 8) { "type mismatch" }
val size = readInt(0) val size = readInt(0)
val map = HashMap<K, V>(size) val map = HashMap<K, V>(size)
...@@ -186,6 +202,16 @@ class JceInput( ...@@ -186,6 +202,16 @@ class JceInput(
return map return map
} }
inline fun <reified K, reified V> readMapOrNull(tag: Int): Map<K, V>? = skipToTagOrNull(tag) {
check(it.type.toInt() == 8) { "type mismatch" }
val size = readInt(0)
val map = HashMap<K, V>(size)
repeat(size) {
map[readSimpleObject(0)] = readSimpleObject(0)
}
return map
}
fun <T> readListOrNull(defaultElement: T, tag: Int): List<T>? = skipToTagOrNull(tag) { head -> fun <T> readListOrNull(defaultElement: T, tag: Int): List<T>? = skipToTagOrNull(tag) { head ->
check(head.type.toInt() == 9) { "type mismatch" } check(head.type.toInt() == 9) { "type mismatch" }
val size = readInt(0) val size = readInt(0)
......
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/io/JceOutput.kt
View file @ 9353a5af
...@@ -2,21 +2,31 @@ package net.mamoe.mirai.qqandroid.network.io ...@@ -2,21 +2,31 @@ package net.mamoe.mirai.qqandroid.network.io
import kotlinx.io.charsets.Charset import kotlinx.io.charsets.Charset
import kotlinx.io.core.* import kotlinx.io.core.*
import kotlinx.io.pool.useInstance
import net.mamoe.mirai.utils.io.ByteArrayPool
import net.mamoe.mirai.utils.io.readRemainingBytes
import kotlin.reflect.KClass import kotlin.reflect.KClass
private val CharsetGBK = Charset.forName("GBK") @PublishedApi
internal val CharsetGBK = Charset.forName("GBK")
fun buildJcePacket(stringCharset: Charset = CharsetGBK, block: JceOutput.() -> Unit): ByteReadPacket { inline fun buildJcePacket(stringCharset: Charset = CharsetGBK, block: JceOutput.() -> Unit): ByteReadPacket {
return JceOutput(stringCharset).apply(block).build() return JceOutput(stringCharset).apply(block).build()
} }
fun BytePacketBuilder.writeJcePacket(stringCharset: Charset = CharsetGBK, block: JceOutput.() -> Unit) { inline fun BytePacketBuilder.writeJcePacket(stringCharset: Charset = CharsetGBK, block: JceOutput.() -> Unit) {
return this.writePacket(buildJcePacket(stringCharset, block)) return this.writePacket(buildJcePacket(stringCharset, block))
} }
fun jceStruct(tag: Int, struct: JceStruct): ByteArray{
return buildJcePacket {
writeJceStruct(struct, tag)
}.readBytes()
}
fun <K, V> jceMap(tag: Int, vararg entries: Pair<K, V>): ByteArray {
return buildJcePacket {
writeMap(mapOf(*entries), tag)
}.readBytes()
}
/** /**
* *
* From: com.qq.taf.jce.JceOutputStream * From: com.qq.taf.jce.JceOutputStream
......
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/jce/RequestPacket.kt
View file @ 9353a5af
...@@ -6,21 +6,55 @@ import net.mamoe.mirai.qqandroid.network.io.JceStruct ...@@ -6,21 +6,55 @@ import net.mamoe.mirai.qqandroid.network.io.JceStruct
private val EMPTY_MAP = mapOf<String, String>() private val EMPTY_MAP = mapOf<String, String>()
class RequestPacket( class RequestPacket() : JceStruct() {
val sBuffer: ByteArray, lateinit var sBuffer: ByteArray
val cPacketType: Byte = 0, var cPacketType: Byte = 0
val iMessageType: Int = 0, var iMessageType: Int = 0
val iRequestId: Int = 0, var iRequestId: Int = 0
val iTimeout: Int = 3000, var iTimeout: Int = 3000
val iVersion: Short = 3, var iVersion: Short = 3
val context: Map<String, String> = EMPTY_MAP, var context: Map<String, String> = EMPTY_MAP
val sFuncName: String = "", var sFuncName: String = ""
val sServantName: String = "", var sServantName: String = ""
val status: Map<String, String> = EMPTY_MAP var status: Map<String, String> = EMPTY_MAP
) : JceStruct() {
constructor(
sBuffer: ByteArray,
cPacketType: Byte = 0,
iMessageType: Int = 0,
iRequestId: Int = 0,
iTimeout: Int = 3000,
iVersion: Short = 3,
context: Map<String, String> = EMPTY_MAP,
sFuncName: String = "",
sServantName: String = "",
status: Map<String, String> = EMPTY_MAP
) : this() {
this.sBuffer = sBuffer
this.cPacketType = cPacketType
this.iMessageType = iMessageType
this.iRequestId = iRequestId
this.iTimeout = iTimeout
this.iVersion = iVersion
this.context = context
this.sFuncName = sFuncName
this.sServantName = sServantName
this.status = status
}
companion object : Factory<RequestPacket> { companion object : Factory<RequestPacket> {
override fun newInstanceFrom(input: JceInput): RequestPacket { override fun newInstanceFrom(input: JceInput): RequestPacket {
TODO("not implemented") val iVersion = input.readShort(1)
val cPacketType = input.readByte(2)
val iMessageType = input.readInt(3)
val iRequestId = input.readInt(4)
val sServantName = input.readString(5)
val sFuncName = input.readString(6)
val sBuffer = input.readByteArray(7)
val iTimeout = input.readInt(8)
val context = input.readMap("", "", 9)
val status = input.readMap("", "", 10)
return RequestPacket(sBuffer, cPacketType, iMessageType, iRequestId, iTimeout, iVersion, context, sFuncName, sServantName, status)
} }
} }
......
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/jce/uni.kt
View file @ 9353a5af
...@@ -5,8 +5,8 @@ import net.mamoe.mirai.qqandroid.network.io.JceOutput ...@@ -5,8 +5,8 @@ import net.mamoe.mirai.qqandroid.network.io.JceOutput
import net.mamoe.mirai.qqandroid.network.io.buildJcePacket import net.mamoe.mirai.qqandroid.network.io.buildJcePacket
import net.mamoe.mirai.qqandroid.network.io.writeJcePacket import net.mamoe.mirai.qqandroid.network.io.writeJcePacket
fun BytePacketBuilder.writeUniRequestPacket(requestPacket: RequestPacket) { inline fun BytePacketBuilder.writeUniRequestPacket(requestPacket: RequestPacket.() -> Unit) {
writeJcePacket { writeJcePacket {
requestPacket.writeTo(this) RequestPacket().apply(requestPacket).writeTo(this)
} }
} }
\ No newline at end of file
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/PacketFactory.kt
View file @ 9353a5af
...@@ -81,6 +81,8 @@ internal object KnownPacketFactories : List<PacketFactory<*>> by mutableListOf( ...@@ -81,6 +81,8 @@ internal object KnownPacketFactories : List<PacketFactory<*>> by mutableListOf(
} }
else -> error("Illegal flag2. Expected 0x02, got $flag2") else -> error("Illegal flag2. Expected 0x02, got $flag2")
} }
// 00 00 00 60 00 00 00 0B 02 00 00 00 00 0E 31 39 39 34 37 30 31 30 32 31 CE 35 53 19 84 A8 1A B8 5B 48 E3 7C D0 A6 BA 58 6A EB CE 50 B9 A0 98 D5 B9 D0 1C 72 E2 86 24 FC 55 44 6C 6E E3 F9 15 6C EC 6C 6B 94 40 F7 B4 45 CF B4 D0 79 84 FE 30 EA 98 84 44 84 02 32 70 DD D7 07 07 72 DE 87 59 AC
0x0B ->
else -> error("Illegal flag1. Expected 0x0A or 0x0B, got $flag1") else -> error("Illegal flag1. Expected 0x0A or 0x0B, got $flag1")
} }
} }
......
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/login/SvcReqRegisterPacket.kt
View file @ 9353a5af
package net.mamoe.mirai.qqandroid.network.protocol.packet.login package net.mamoe.mirai.qqandroid.network.protocol.packet.login
import kotlinx.io.core.ByteReadPacket import kotlinx.io.core.ByteReadPacket
import kotlinx.io.core.readBytes
import kotlinx.serialization.protobuf.ProtoBuf import kotlinx.serialization.protobuf.ProtoBuf
import net.mamoe.mirai.data.Packet import net.mamoe.mirai.data.Packet
import net.mamoe.mirai.qqandroid.QQAndroidBot import net.mamoe.mirai.qqandroid.QQAndroidBot
import net.mamoe.mirai.qqandroid.network.QQAndroidClient import net.mamoe.mirai.qqandroid.network.QQAndroidClient
import net.mamoe.mirai.qqandroid.network.io.buildJcePacket import net.mamoe.mirai.qqandroid.network.io.jceMap
import net.mamoe.mirai.qqandroid.network.protocol.jce.RequestPacket import net.mamoe.mirai.qqandroid.network.io.jceStruct
import net.mamoe.mirai.qqandroid.network.protocol.jce.SvcReqRegister import net.mamoe.mirai.qqandroid.network.protocol.jce.SvcReqRegister
import net.mamoe.mirai.qqandroid.network.protocol.jce.writeUniRequestPacket import net.mamoe.mirai.qqandroid.network.protocol.jce.writeUniRequestPacket
import net.mamoe.mirai.qqandroid.network.protocol.packet.OutgoingPacket import net.mamoe.mirai.qqandroid.network.protocol.packet.OutgoingPacket
...@@ -38,73 +37,63 @@ internal object SvcReqRegisterPacket : PacketFactory<SvcReqRegisterPacket.Respon ...@@ -38,73 +37,63 @@ internal object SvcReqRegisterPacket : PacketFactory<SvcReqRegisterPacket.Respon
operator fun invoke( operator fun invoke(
client: QQAndroidClient, client: QQAndroidClient,
regPushReason: RegPushReason = RegPushReason.setOnlineStatus regPushReason: RegPushReason = RegPushReason.setOnlineStatus
): OutgoingPacket = buildOutgingPacket(client, key = client.wLoginSigInfo.wtSessionTicketKey) { ): OutgoingPacket = buildOutgingPacket(client, key = client.wLoginSigInfo.d2Key) {
writeUniRequestPacket( writeUniRequestPacket {
RequestPacket( sServantName = "PushService"
sServantName = "PushService", sFuncName = "SvcReqRegister"
sFuncName = "SvcReqRegister", sBuffer = jceMap(
sBuffer = buildJcePacket { 0,
writeMap( "SvcReqRegister" to jceStruct(
mapOf( 0,
"SvcReqRegister" to buildJcePacket { SvcReqRegister(
writeJceStruct( cConnType = 0,
SvcReqRegister( lBid = 1 or 2 or 4,
cConnType = 0, lUin = client.uin,
lBid = 1 or 2 or 4, iStatus = client.onlineStatus.id,
lUin = client.uin, bKikPC = 0, // 是否把 PC 踢下线
iStatus = client.onlineStatus.id, bKikWeak = 0,
bKikPC = 0, // 是否把 PC 踢下线 timeStamp = currentTimeSeconds, // millis or seconds??
bKikWeak = 0, iLargeSeq = 0,
timeStamp = currentTimeSeconds, // millis or seconds?? bRegType =
iLargeSeq = 0, (if (regPushReason == RegPushReason.appRegister ||
bRegType = regPushReason == RegPushReason.fillRegProxy ||
if (regPushReason == RegPushReason.appRegister || regPushReason == RegPushReason.createDefaultRegInfo ||
regPushReason == RegPushReason.fillRegProxy || regPushReason == RegPushReason.setOnlineStatus
regPushReason == RegPushReason.createDefaultRegInfo || ) 0 else 1).toByte(),
regPushReason == RegPushReason.setOnlineStatus bIsSetStatus = if (regPushReason == RegPushReason.setOnlineStatus) 1 else 0,
) { iOSVersion = client.device.version.sdk.toLong(),
0 cNetType = if (client.networkType == NetworkType.WIFI) 1 else 0,
} else { vecGuid = client.device.guid,
1 strDevName = client.device.model.encodeToString(),
}.toByte(), strDevType = client.device.model.encodeToString(),
bIsSetStatus = if (regPushReason == RegPushReason.setOnlineStatus) 1 else 0, strOSVer = client.device.version.release.encodeToString(),
iOSVersion = client.device.version.sdk.toLong(),
cNetType = if (client.networkType == NetworkType.WIFI) 1 else 0,
vecGuid = client.device.guid,
strDevName = client.device.model.encodeToString(),
strDevType = client.device.model.encodeToString(),
strOSVer = client.device.version.release.encodeToString(),
// register 时还需要 // register 时还需要
/* /*
var44.uNewSSOIp = field_127445; var44.uNewSSOIp = field_127445;
var44.uOldSSOIp = field_127444; var44.uOldSSOIp = field_127444;
var44.strVendorName = ROMUtil.getRomName(); var44.strVendorName = ROMUtil.getRomName();
var44.strVendorOSName = ROMUtil.getRomVersion(20); var44.strVendorOSName = ROMUtil.getRomVersion(20);
*/ */
bytes_0x769_reqbody = ProtoBuf.dump( bytes_0x769_reqbody = ProtoBuf.dump(
Oidb0x769.RequestBody.serializer(), Oidb0x769.RequestBody( Oidb0x769.RequestBody.serializer(), Oidb0x769.RequestBody(
rpt_config_list = listOf( rpt_config_list = listOf(
Oidb0x769.ConfigSeq( Oidb0x769.ConfigSeq(
type = 46, type = 46,
version = 4 version = 4
), ),
Oidb0x769.ConfigSeq( Oidb0x769.ConfigSeq(
type = 283, type = 283,
version = 0 version = 0
) )
)
)
),
bSetMute = 0
), 0
) )
}.readBytes() )
), 0 ),
bSetMute = 0
) )
}.readBytes() )
) )
) }
} }
override suspend fun ByteReadPacket.decode(bot: QQAndroidBot): Response { override suspend fun ByteReadPacket.decode(bot: QQAndroidBot): Response {
......
mirai-core-qqandroid/src/jvmMain/kotlin/net/mamoe/mirai/qqandroid/utils/SystemDeviceInfo.kt
View file @ 9353a5af
...@@ -27,7 +27,9 @@ actual class SystemDeviceInfo actual constructor(context: Context) : DeviceInfo( ...@@ -27,7 +27,9 @@ actual class SystemDeviceInfo actual constructor(context: Context) : DeviceInfo(
override val imsiMd5: ByteArray override val imsiMd5: ByteArray
get() = ubyteArrayOf(0xD4u, 0x1Du, 0x8Cu, 0xD9u, 0x8Fu, 0x00u, 0xB2u, 0x04u, 0xE9u, 0x80u, 0x09u, 0x98u, 0xECu, 0xF8u, 0x42u, 0x7Eu).toByteArray() get() = ubyteArrayOf(0xD4u, 0x1Du, 0x8Cu, 0xD9u, 0x8Fu, 0x00u, 0xB2u, 0x04u, 0xE9u, 0x80u, 0x09u, 0x98u, 0xECu, 0xF8u, 0x42u, 0x7Eu).toByteArray()
override val imei: String get() = "858414369211993" override val imei: String get() = "858414369211993"
override val ipAddress: ByteArray get() = localIpAddress().split(".").map { it.toByte() }.takeIf { it.size == 4 }?.toByteArray() ?: byteArrayOf() @UseExperimental(ExperimentalUnsignedTypes::class)
override val ipAddress: ByteArray
get() = localIpAddress().split(".").map { it.toUByte().toByte() }.takeIf { it.size == 4 }?.toByteArray() ?: byteArrayOf()
override val androidId: ByteArray get() = "QSR1.190920.001".toByteArray() override val androidId: ByteArray get() = "QSR1.190920.001".toByteArray()
override val apn: ByteArray get() = "wifi".toByteArray() override val apn: ByteArray get() = "wifi".toByteArray()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment