Proto classes

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/PacketFactory.kt

@@ -6,6 +6,7 @@ import net.mamoe.mirai.data.Packet
 import net.mamoe.mirai.qqandroid.QQAndroidBot
 import net.mamoe.mirai.qqandroid.network.io.JceInput
 import net.mamoe.mirai.qqandroid.network.protocol.jce.RequestPacket
+import net.mamoe.mirai.qqandroid.network.protocol.packet.chat.receive.OnlinePush
 import net.mamoe.mirai.qqandroid.network.protocol.packet.login.LoginPacket
 import net.mamoe.mirai.qqandroid.network.protocol.packet.login.SvcReqRegisterPacket
 import net.mamoe.mirai.utils.DefaultLogger
@@ -49,7 +50,8 @@ internal val PacketLogger: MiraiLogger = DefaultLogger("Packet")
 @UseExperimental(ExperimentalUnsignedTypes::class)
 internal object KnownPacketFactories : List<PacketFactory<*>> by mutableListOf(
     LoginPacket,
-    SvcReqRegisterPacket
+    SvcReqRegisterPacket,
+    OnlinePush.PbPushGroupMsg
 ) {
 
     fun findPacketFactory(commandName: String): PacketFactory<*>? = this.firstOrNull { it.commandName == commandName }
@@ -117,7 +119,14 @@ internal object KnownPacketFactories : List<PacketFactory<*>> by mutableListOf(
                     }
 
                     when (flag2) {
-                        1 -> it.data.parseUniResponse(bot, it.packetFactory, it.sequenceId, consumer)
+                        1 ->//it.data.parseUniResponse(bot, it.packetFactory, it.sequenceId, consumer)
+                        {
+                            consumer(
+                                it.packetFactory.run { decode(bot, it.data) },
+                                it.packetFactory.commandName,
+                                it.sequenceId
+                            )
+                        }
                         2 -> it.data.parseOicqResponse(bot, it.packetFactory, it.sequenceId, consumer)
                         else -> error("unknown flag2: $flag2. Body to be parsed for inner packet=${it.data.readBytes().toUHexString()}")
                     }

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/MessagePacket.kt

-package net.mamoe.mirai.qqandroid.network.protocol.packet.chat
-

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/image/Cmd0x352Packet.kt → mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/data/Cmd0x352Packet.kt

-package net.mamoe.mirai.qqandroid.network.protocol.packet.chat.image
+package net.mamoe.mirai.qqandroid.network.protocol.packet.chat.data
 
 import kotlinx.serialization.SerialId
 import kotlinx.serialization.Serializable

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/image/ImageRequest.kt → mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/data/ImageRequest.kt

-package net.mamoe.mirai.qqandroid.network.protocol.packet.chat.image
+package net.mamoe.mirai.qqandroid.network.protocol.packet.chat.data
 
 import kotlinx.serialization.SerialId
 import kotlinx.serialization.Serializable

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/data/MessageCommon.kt

+@file:Suppress("ArrayInDataClass")
+
+package net.mamoe.mirai.qqandroid.network.protocol.packet.chat.data
+
+import kotlinx.serialization.SerialId
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.protobuf.ProtoNumberType
+import kotlinx.serialization.protobuf.ProtoType
+import net.mamoe.mirai.qqandroid.network.protocol.packet.EMPTY_BYTE_ARRAY
+
+class MessageCommon {
+
+    /**
+     * 1 -> varint
+     * 2 -> delimi
+     * 3 -> varint
+     * 4 -> varint
+     * 5 -> varint
+     * 6 -> varint
+     * 7 -> delimi
+     * 8 -> delimi
+     * 9 -> delimi
+     * 10 -> delimi
+     * 11 -> delimi
+     */
+    @Serializable
+    data class PluginInfo(
+        @SerialId(1) val resId: Int = 0,
+        @SerialId(2) val packageName: String = "",
+        @SerialId(3) val newVer: Int = 0,
+        @SerialId(4) val resType: Int = 0,
+        @SerialId(5) val lanType: Int = 0,
+        @SerialId(6) val priority: Int = 0,
+        @SerialId(7) val resName: String = "",
+        @SerialId(8) val resDesc: String = "",
+        @SerialId(9) val resUrlBig: String = "",
+        @SerialId(10) val resUrlSmall: String = "",
+        @SerialId(11) val resConf: String = ""
+    )
+
+    @Serializable
+    data class AppShareInfo(
+        @ProtoType(ProtoNumberType.FIXED)    @SerialId(1) val id: Int = 0,
+        @SerialId(2) val cookie: ByteArray = EMPTY_BYTE_ARRAY,
+        @SerialId(3) val resource: PluginInfo = PluginInfo()
+    )
+
+    @Serializable
+    data class ContentHead(
+        @SerialId(1) val pkgNum: Int = 0,
+        @SerialId(2) val pkgIndex: Int = 0,
+           @SerialId(3) val divSeq: Int = 0,
+        @SerialId(4) val autoReply: Int = 0
+    )
+
+    @Serializable
+    data class Msg(
+        val s: String
+    )
+}
\ No newline at end of file

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/data/MsgCommon.kt

+package net.mamoe.mirai.qqandroid.network.protocol.packet.chat.data
+
+import kotlinx.serialization.SerialId
+import kotlinx.serialization.Serializable
+import net.mamoe.mirai.qqandroid.network.protocol.packet.EMPTY_BYTE_ARRAY
+
+/**
+ * msf.msgcomm.msg_comm
+ */
+@Serializable
+class MsgComm {
+    @Serializable
+    class AppShareInfo(
+        @SerialId(1) val appshareId: Int = 0,
+        @SerialId(2) val appshareCookie: ByteArray = EMPTY_BYTE_ARRAY,
+        @SerialId(3) val appshareResource: PluginInfo? = null
+    )
+
+    @Serializable
+    class C2CTmpMsgHead(
+        @SerialId(1) val c2cType: Int = 0,
+        @SerialId(2) val serviceType: Int = 0,
+        @SerialId(3) val groupUin: Long = 0L,
+        @SerialId(4) val groupCode: Long = 0L,
+        @SerialId(5) val sig: ByteArray = EMPTY_BYTE_ARRAY,
+        @SerialId(6) val sigType: Int = 0,
+        @SerialId(7) val fromPhone: String = "",
+        @SerialId(8) val toPhone: String = "",
+        @SerialId(9) val lockDisplay: Int = 0,
+        @SerialId(10) val directionFlag: Int = 0,
+        @SerialId(11) val reserved: ByteArray = EMPTY_BYTE_ARRAY
+    )
+
+    @Serializable
+    class ContentHead(
+        @SerialId(1) val pkgNum: Int = 0,
+        @SerialId(2) val pkgIndex: Int = 0,
+        @SerialId(3) val divSeq: Int = 0,
+        @SerialId(4) val autoReply: Int = 0
+    )
+
+    @Serializable
+    class DiscussInfo(
+        @SerialId(1) val discussUin: Long = 0L,
+        @SerialId(2) val discussType: Int = 0,
+        @SerialId(3) val discussInfoSeq: Long = 0L,
+        @SerialId(4) val discussRemark: ByteArray = EMPTY_BYTE_ARRAY,
+        @SerialId(5) val discussName: ByteArray = EMPTY_BYTE_ARRAY
+    )
+
+    @Serializable
+    class ExtGroupKeyInfo(
+        @SerialId(1) val curMaxSeq: Int = 0,
+        @SerialId(2) val curTime: Long = 0L
+    )
+
+    @Serializable
+    class GroupInfo(
+        @SerialId(1) val groupCode: Long = 0L,
+        @SerialId(2) val groupType: Int = 0,
+        @SerialId(3) val groupInfoSeq: Long = 0L,
+        @SerialId(4) val groupCard: ByteArray = EMPTY_BYTE_ARRAY,
+        @SerialId(5) val groupRank: ByteArray = EMPTY_BYTE_ARRAY,
+        @SerialId(6) val groupLevel: Int = 0,
+        @SerialId(7) val groupCardType: Int = 0,
+        @SerialId(8) val groupName: ByteArray = EMPTY_BYTE_ARRAY
+    )
+
+    @Serializable
+    class Msg(
+        @SerialId(1) val msgHead: MsgHead? = null,
+        @SerialId(2) val contentHead: ContentHead? = null,
+        @SerialId(3) val msgBody: ImMsgBody.MsgBody? = null,
+        @SerialId(4) val appshareInfo: AppShareInfo? = null
+    )
+
+    @Serializable
+    class MsgHead(
+        @SerialId(1) val fromUin: Long = 0L,
+        @SerialId(2) val toUin: Long = 0L,
+        @SerialId(3) val msgType: Int = 0,
+        @SerialId(4) val c2cCmd: Int = 0,
+        @SerialId(5) val msgSeq: Int = 0,
+        @SerialId(6) val msgTime: Int = 0,
+        @SerialId(7) val msgUid: Long = 0L,
+        @SerialId(8) val c2cTmpMsgHead: C2CTmpMsgHead? = null,
+        @SerialId(9) val groupInfo: GroupInfo? = null,
+        @SerialId(10) val fromAppid: Int = 0,
+        @SerialId(11) val fromInstid: Int = 0,
+        @SerialId(12) val userActive: Int = 0,
+        @SerialId(13) val discussInfo: DiscussInfo? = null,
+        @SerialId(14) val fromNick: String = "",
+        @SerialId(15) val authUin: Long = 0L,
+        @SerialId(16) val authNick: String = "",
+        @SerialId(17) val msgFlag: Int = 0,
+        @SerialId(18) val authRemark: String = "",
+        @SerialId(19) val groupName: String = "",
+        @SerialId(20) val mutiltransHead: MutilTransHead? = null,
+        @SerialId(21) val msgInstCtrl: ImMsgHead.InstCtrl? = null,
+        @SerialId(22) val publicAccountGroupSendFlag: Int = 0,
+        @SerialId(23) val wseqInC2cMsghead: Int = 0,
+        @SerialId(24) val cpid: Long = 0L,
+        @SerialId(25) val extGroupKeyInfo: ExtGroupKeyInfo? = null,
+        @SerialId(26) val multiCompatibleText: String = "",
+        @SerialId(27) val authSex: Int = 0,
+        @SerialId(28) val isSrcMsg: Boolean = false
+    )
+
+    @Serializable
+    class MsgType0x210(
+        @SerialId(1) val subMsgType: Int = 0,
+        @SerialId(2) val msgContent: ByteArray = EMPTY_BYTE_ARRAY
+    )
+
+    @Serializable
+    class MutilTransHead(
+        @SerialId(1) val status: Int = 0,
+        @SerialId(2) val msgId: Int = 0
+    )
+
+    @Serializable
+    class PluginInfo(
+        @SerialId(1) val resId: Int = 0,
+        @SerialId(2) val pkgName: String = "",
+        @SerialId(3) val newVer: Int = 0,
+        @SerialId(4) val resType: Int = 0,
+        @SerialId(5) val lanType: Int = 0,
+        @SerialId(6) val priority: Int = 0,
+        @SerialId(7) val resName: String = "",
+        @SerialId(8) val resDesc: String = "",
+        @SerialId(9) val resUrlBig: String = "",
+        @SerialId(10) val resUrlSmall: String = "",
+        @SerialId(11) val resConf: String = ""
+    )
+
+    @Serializable
+    class Uin2Nick(
+        @SerialId(1) val uin: Long = 0L,
+        @SerialId(2) val nick: String = ""
+    )
+
+    @Serializable
+    class UinPairMsg(
+        @SerialId(1) val lastReadTime: Int = 0,
+        @SerialId(2) val peerUin: Long = 0L,
+        @SerialId(3) val msgCompleted: Int = 0,
+        @SerialId(4) val msg: List<Msg>? = null,
+        @SerialId(5) val unreadMsgNum: Int = 0,
+        @SerialId(8) val c2cType: Int = 0,
+        @SerialId(9) val serviceType: Int = 0,
+        @SerialId(10) val pbReserve: ByteArray = EMPTY_BYTE_ARRAY
+    )
+}
\ No newline at end of file

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/data/OnlinePush.kt

+package net.mamoe.mirai.qqandroid.network.protocol.packet.chat.data
+
+import kotlinx.serialization.SerialId
+import kotlinx.serialization.Serializable
+import net.mamoe.mirai.qqandroid.network.protocol.packet.EMPTY_BYTE_ARRAY
+
+@Serializable
+class MsgOnlinePush {
+    @Serializable
+    data class PbPushMsg(
+        @SerialId(1) val msg: MsgComm.Msg? = null,
+        @SerialId(2) val svrip: Int = 0,
+        @SerialId(3) val pushToken: ByteArray = EMPTY_BYTE_ARRAY,
+        @SerialId(4) val pingFlag: Int = 0,
+        @SerialId(9) val generalFlag: Int = 0
+    )
+}
\ No newline at end of file

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/groupimage/GroupImageRequest.kt

-package net.mamoe.mirai.qqandroid.network.protocol.packet.chat.groupimage
-

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/image/GroupImageRequest.kt

+package net.mamoe.mirai.qqandroid.network.protocol.packet.chat.image
+

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/image/ImageDownPacket.kt

@@ -9,6 +9,8 @@ import net.mamoe.mirai.qqandroid.network.QQAndroidClient
 import net.mamoe.mirai.qqandroid.network.protocol.packet.OutgoingPacket
 import net.mamoe.mirai.qqandroid.network.protocol.packet.PacketFactory
 import net.mamoe.mirai.qqandroid.network.protocol.packet.buildLoginOutgoingPacket
+import net.mamoe.mirai.qqandroid.network.protocol.packet.chat.data.Cmd0x352Packet
+import net.mamoe.mirai.qqandroid.network.protocol.packet.chat.data.GetImgUrlReq
 import net.mamoe.mirai.qqandroid.network.protocol.packet.writeSsoPacket
 
 internal object ImageDownPacket : PacketFactory<ImageDownPacket.ImageDownPacketResponse>("LongConn.OffPicDown") {

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/image/ImageUpPacket.kt

@@ -10,6 +10,8 @@ import net.mamoe.mirai.qqandroid.network.protocol.packet.*
 import net.mamoe.mirai.qqandroid.network.protocol.packet.OutgoingPacket
 import net.mamoe.mirai.qqandroid.network.protocol.packet.PacketFactory
 import net.mamoe.mirai.qqandroid.network.protocol.packet.buildLoginOutgoingPacket
+import net.mamoe.mirai.qqandroid.network.protocol.packet.chat.data.Cmd0x352Packet
+import net.mamoe.mirai.qqandroid.network.protocol.packet.chat.data.UploadImgReq
 
 internal object ImageUpPacket : PacketFactory<ImageUpPacket.ImageUpPacketResponse>("LongConn.OffPicUp") {
 

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/receive/OnlinePush.PbPushGroupMsg.kt

 package net.mamoe.mirai.qqandroid.network.protocol.packet.chat.receive
 
 import kotlinx.io.core.ByteReadPacket
+import kotlinx.io.core.discardExact
+import kotlinx.io.core.readBytes
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.protobuf.ProtoBuf
 import net.mamoe.mirai.message.GroupMessage
 import net.mamoe.mirai.qqandroid.QQAndroidBot
 import net.mamoe.mirai.qqandroid.network.protocol.packet.PacketFactory
+import net.mamoe.mirai.qqandroid.network.protocol.packet.chat.data.MessageCommon
+import net.mamoe.mirai.qqandroid.network.protocol.packet.chat.data.MsgOnlinePush
 
 internal class OnlinePush {
     internal object PbPushGroupMsg : PacketFactory<GroupMessage>("OnlinePush.PbPushGroupMsg") {
         override suspend fun ByteReadPacket.decode(bot: QQAndroidBot): GroupMessage {
+            // 00 00 02 E4 0A D5 05 0A 4F 08 A2 FF 8C F0 03 10 DD F1 92 B7 07 18 52 20 00 28 BC 3D 30 8C 82 AB F1 05 38 D2 80 E0 8C 80 80 80 80 02 4A 21 08 E7 C1 AD B8 02 10 01 18 BA 05 22 09 48 69 6D 31 38 38 6D 6F 65 30 06 38 02 42 05 4D 69 72 61 69 50 01 58 01 60 00 88 01 08 12 06 08 01 10 00 18 00 1A F9 04 0A F6 04 0A 26 08 00 10 87 82 AB F1 05 18 B7 B4 BF 30 20 00 28 0C 30 00 38 86 01 40 22 4A 0C E5 BE AE E8 BD AF E9 9B 85 E9 BB 91 12 E6 03 42 E3 03 12 2A 7B 34 45 31 38 35 38 32 32 2D 30 45 37 42 2D 46 38 30 46 2D 43 35 42 31 2D 33 34 34 38 38 33 37 34 44 33 39 43 7D 2E 6A 70 67 22 00 2A 04 03 00 00 00 32 60 15 36 20 39 36 6B 45 31 41 38 35 32 32 39 64 63 36 39 38 34 37 39 37 37 62 20 20 20 20 20 20 35 30 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 20 7B 34 45 31 38 35 38 32 32 2D 30 45 37 42 2D 46 38 30 46 2D 43 35 42 31 2D 33 34 34 38 38 33 37 34 44 33 39 43 7D 2E 6A 70 67 31 32 31 32 41 38 C6 BB 8A A9 08 40 FB AE 9E C2 09 48 50 50 41 5A 00 60 01 6A 10 4E 18 58 22 0E 7B F8 0F C5 B1 34 48 83 74 D3 9C 72 59 2F 67 63 68 61 74 70 69 63 5F 6E 65 77 2F 31 30 34 30 34 30 30 32 39 30 2F 36 35 35 30 35 37 31 32 37 2D 32 32 33 33 36 33 38 33 34 32 2D 34 45 31 38 35 38 32 32 30 45 37 42 46 38 30 46 43 35 42 31 33 34 34 38 38 33 37 34 44 33 39 43 2F 31 39 38 3F 74 65 72 6D 3D 32 82 01 57 2F 67 63 68 61 74 70 69 63 5F 6E 65 77 2F 31 30 34 30 34 30 30 32 39 30 2F 36 35 35 30 35 37 31 32 37 2D 32 32 33 33 36 33 38 33 34 32 2D 34 45 31 38 35 38 32 32 30 45 37 42 46 38 30 46 43 35 42 31 33 34 34 38 38 33 37 34 44 33 39 43 2F 30 3F 74 65 72 6D 3D 32 B0 01 4D B8 01 2E C8 01 FF 05 D8 01 4D E0 01 2E FA 01 59 2F 67 63 68 61 74 70 69 63 5F 6E 65 77 2F 31 30 34 30 34 30 30 32 39 30 2F 36 35 35 30 35 37 31 32 37 2D 32 32 33 33 36 33 38 33 34 32 2D 34 45 31 38 35 38 32 32 30 45 37 42 46 38 30 46 43 35 42 31 33 34 34 38 38 33 37 34 44 33 39 43 2F 34 30 30 3F 74 65 72 6D 3D 32 80 02 4D 88 02 2E 12 45 AA 02 42 50 03 60 00 68 00 9A 01 39 08 09 20 BF 50 80 01 01 C8 01 00 F0 01 00 F8 01 00 90 02 00 98 03 00 A0 03 20 B0 03 00 C0 03 00 D0 03 00 E8 03 00 8A 04 04 08 02 08 01 90 04 80 80 80 10 B8 04 00 C0 04 00 12 06 4A 04 08 00 40 01 12 14 82 01 11 0A 09 48 69 6D 31 38 38 6D 6F 65 18 06 20 08 28 03 10 8A CA 9D A1 07 1A 00
+            discardExact(4)
+            println(ProtoBuf.load(MsgOnlinePush.PbPushMsg.serializer(), readBytes()))
             TODO()
         }
+
+        /**
+         * 1 -> delimi
+         * 2 -> varint
+         * 3 -> delimi
+         * 4 -> varint
+         * 9 -> varint
+         */
+        @Serializable
+        private class PbPushMsg(
+            val msg: MessageCommon.Msg
+        )
     }
 }
\ No newline at end of file

mirai-core-qqandroid/src/jvmTest/kotlin/test/dumpProtobufId.kts

@@ -5,6 +5,8 @@ package test
 import net.mamoe.mirai.utils.cryptor.protoFieldNumber
 import net.mamoe.mirai.utils.cryptor.protoType
 
-intArrayOf(8, 18, 26, 34, 80).forEach {
+intArrayOf(
+    8, 16, 24, 32, 40, 48, 56, 64, 74, 82
+).forEach {
     println(protoFieldNumber(it.toUInt()).toString() + " -> " + protoType(it.toUInt()))
 }
\ No newline at end of file