Correct ProtoBuf package

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/protobuf/ProtoBuf.kt → mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/io/ProtoBuf.kt

-package net.mamoe.mirai.qqandroid.network.protocol.protobuf
+package net.mamoe.mirai.qqandroid.io
 
 /**
  * 仅有标示作用

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/io/serialization/Jce.kt

@@ -8,7 +8,7 @@ import kotlinx.serialization.modules.EmptyModule
 import kotlinx.serialization.modules.SerialModule
 import net.mamoe.mirai.qqandroid.io.JceStruct
 import net.mamoe.mirai.qqandroid.network.protocol.packet.withUse
-import net.mamoe.mirai.qqandroid.network.protocol.protobuf.ProtoBuf
+import net.mamoe.mirai.qqandroid.io.ProtoBuf
 import net.mamoe.mirai.utils.io.readIoBuffer
 import net.mamoe.mirai.utils.io.readString
 import net.mamoe.mirai.utils.io.toIoBuffer

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

@@ -5,11 +5,11 @@ import kotlinx.io.pool.useInstance
 import net.mamoe.mirai.data.Packet
 import net.mamoe.mirai.qqandroid.QQAndroidBot
 import net.mamoe.mirai.qqandroid.io.serialization.loadAs
-import net.mamoe.mirai.qqandroid.network.protocol.jce.RequestPacket
 import net.mamoe.mirai.qqandroid.network.protocol.packet.chat.receive.MessageSvc
 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.StatSvc
+import net.mamoe.mirai.qqandroid.network.protocol.packet.login.data.RequestPacket
 import net.mamoe.mirai.utils.DefaultLogger
 import net.mamoe.mirai.utils.MiraiLogger
 import net.mamoe.mirai.utils.cryptor.adjustToPublicKey

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

@@ -2,7 +2,7 @@ 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.protobuf.ProtoBuf
+import net.mamoe.mirai.qqandroid.io.ProtoBuf
 
 @Serializable
 internal class Cmd0x352Packet(

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

@@ -3,7 +3,7 @@ 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
-import net.mamoe.mirai.qqandroid.network.protocol.protobuf.ProtoBuf
+import net.mamoe.mirai.qqandroid.io.ProtoBuf
 import net.mamoe.mirai.utils.currentTimeSeconds
 
 interface ImgReq : ProtoBuf

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
-import net.mamoe.mirai.qqandroid.network.protocol.protobuf.ProtoBuf
-
-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 = ""
-    ) : ProtoBuf
-
-    @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()
-    ) : ProtoBuf
-
-    @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
-    ) : ProtoBuf
-
-    @Serializable
-    data class Msg(
-        val s: String
-    ) : ProtoBuf
-}
\ No newline at end of file

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

@@ -2,8 +2,8 @@ package net.mamoe.mirai.qqandroid.network.protocol.packet.chat.data
 
 import kotlinx.serialization.SerialId
 import kotlinx.serialization.Serializable
+import net.mamoe.mirai.qqandroid.io.ProtoBuf
 import net.mamoe.mirai.qqandroid.network.protocol.packet.EMPTY_BYTE_ARRAY
-import net.mamoe.mirai.qqandroid.network.protocol.protobuf.ProtoBuf
 
 /**
  * msf.msgcomm.msg_comm
@@ -60,7 +60,7 @@ class MsgComm : ProtoBuf {
         @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(4) val groupCard: String = "",
         @SerialId(5) val groupRank: ByteArray = EMPTY_BYTE_ARRAY,
         @SerialId(6) val groupLevel: Int = 0,
         @SerialId(7) val groupCardType: Int = 0,
@@ -69,9 +69,9 @@ class MsgComm : ProtoBuf {
 
     @Serializable
     class Msg(
-        @SerialId(1) val msgHead: MsgHead? = null,
+        @SerialId(1) val msgHead: MsgHead,
         @SerialId(2) val contentHead: ContentHead? = null,
-        @SerialId(3) val msgBody: ImMsgBody.MsgBody? = null,
+        @SerialId(3) val msgBody: ImMsgBody.MsgBody,
         @SerialId(4) val appshareInfo: AppShareInfo? = null
     ) : ProtoBuf
 

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

@@ -2,14 +2,14 @@ package net.mamoe.mirai.qqandroid.network.protocol.packet.chat.data
 
 import kotlinx.serialization.SerialId
 import kotlinx.serialization.Serializable
+import net.mamoe.mirai.qqandroid.io.ProtoBuf
 import net.mamoe.mirai.qqandroid.network.protocol.packet.EMPTY_BYTE_ARRAY
-import net.mamoe.mirai.qqandroid.network.protocol.protobuf.ProtoBuf
 
 @Serializable
 class MsgOnlinePush {
     @Serializable
-    data class PbPushMsg(
-        @SerialId(1) val msg: MsgComm.Msg? = null,
+    class PbPushMsg(
+        @SerialId(1) val msg: MsgComm.Msg,
         @SerialId(2) val svrip: Int = 0,
         @SerialId(3) val pushToken: ByteArray = EMPTY_BYTE_ARRAY,
         @SerialId(4) val pingFlag: Int = 0,

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/receive/MessageSvc.PushNotify.kt

@@ -2,19 +2,15 @@ package net.mamoe.mirai.qqandroid.network.protocol.packet.chat.receive
 
 import kotlinx.io.core.ByteReadPacket
 import kotlinx.io.core.discardExact
-import kotlinx.serialization.SerialId
-import kotlinx.serialization.Serializable
 import net.mamoe.mirai.qqandroid.QQAndroidBot
-import net.mamoe.mirai.qqandroid.io.JceStruct
 import net.mamoe.mirai.qqandroid.io.serialization.loadAs
 import net.mamoe.mirai.qqandroid.io.serialization.readRemainingAsJceStruct
-import net.mamoe.mirai.qqandroid.network.protocol.jce.RequestDataVersion2
-import net.mamoe.mirai.qqandroid.network.protocol.jce.RequestPacket
+import net.mamoe.mirai.qqandroid.network.protocol.packet.login.data.RequestDataVersion2
+import net.mamoe.mirai.qqandroid.network.protocol.packet.login.data.RequestPacket
 import net.mamoe.mirai.qqandroid.network.protocol.packet.PacketFactory
 import net.mamoe.mirai.qqandroid.network.protocol.packet.chat.data.RequestPushNotify
 import net.mamoe.mirai.utils.cryptor.contentToString
 import net.mamoe.mirai.utils.firstValue
-import net.mamoe.mirai.utils.io.debugPrint
 import net.mamoe.mirai.utils.io.toReadPacket
 
 class MessageSvc {

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

@@ -17,7 +17,6 @@ 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.ImMsgBody
 import net.mamoe.mirai.qqandroid.network.protocol.packet.chat.data.MsgOnlinePush
-import net.mamoe.mirai.utils.io.encodeToString
 
 internal class ImageIdQQA(
     override val value: String,
@@ -35,25 +34,25 @@ internal class OnlinePush {
             // 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)
             val pbPushMsg = ProtoBuf.load(MsgOnlinePush.PbPushMsg.serializer(), readBytes())
-            val message = MessageChain(initialCapacity = pbPushMsg.msg!!.msgBody!!.richText!!.elems!!.size)
+            val message = MessageChain(initialCapacity = pbPushMsg.msg.msgBody.richText.elems.size)
 
             var extraInfo: ImMsgBody.ExtraInfo? = null
 
-            pbPushMsg.msg.msgBody!!.richText!!.elems!!.forEach {
+            pbPushMsg.msg.msgBody.richText.elems.forEach {
                 when {
                     it.customFace != null -> message.add(Image(ImageIdQQA(it.customFace.filePath, it.customFace.origUrl)))
-                    it.text != null -> message.add(it.text.str.encodeToString().toMessage())
+                    it.text != null -> message.add(it.text.str.toMessage())
                     it.extraInfo != null -> extraInfo = it.extraInfo
                 }
             }
 
-            val group = bot.getGroup(pbPushMsg.msg.msgHead!!.groupInfo!!.groupCode)
+            val group = bot.getGroup(pbPushMsg.msg.msgHead.groupInfo!!.groupCode)
 
             val flags = extraInfo?.flags ?: 0
             return GroupMessage(
                 bot = bot,
                 group = group,
-                senderName = pbPushMsg.msg.msgHead.groupInfo!!.groupCard.encodeToString(),
+                senderName = pbPushMsg.msg.msgHead.groupInfo.groupCard,
                 sender = group.getMember(pbPushMsg.msg.msgHead.fromUin),
                 message = message,
                 permission = when {

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

+package net.mamoe.mirai.qqandroid.network.protocol.packet.chat.send
+
+import net.mamoe.mirai.message.data.At
+import net.mamoe.mirai.message.data.Image
+import net.mamoe.mirai.message.data.MessageChain
+import net.mamoe.mirai.message.data.PlainText
+import net.mamoe.mirai.qqandroid.network.protocol.packet.chat.data.ImMsgBody
+import net.mamoe.mirai.qqandroid.network.protocol.packet.chat.data.MsgSvc
+
+
+internal fun MessageChain.constructPbSendMsgReq(): MsgSvc.PbSendMsgReq {
+    val request = MsgSvc.PbSendMsgReq()
+
+    this.forEach {
+        when (it) {
+            is PlainText -> {
+                request.msgBody.richText.elems.add(ImMsgBody.Elem(text = ImMsgBody.Text(str = it.stringValue)))
+            }
+            is At -> {
+
+            }
+        }
+    }
+
+
+    return request
+}
\ No newline at end of file

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

@@ -22,11 +22,10 @@ import net.mamoe.mirai.utils.io.discardExact
  */
 @UseExperimental(ExperimentalUnsignedTypes::class)
 internal object LoginPacket : PacketFactory<LoginPacket.LoginPacketResponse>("wtlogin.login") {
+    private const val appId = 16L
+    private const val subAppId = 537062845L
 
     object SubCommand2 {
-        private const val appId = 16L
-        private const val subAppId = 537062845L
-
         @UseExperimental(MiraiInternalAPI::class)
         operator fun invoke(
             client: QQAndroidClient,
@@ -47,9 +46,6 @@ internal object LoginPacket : PacketFactory<LoginPacket.LoginPacketResponse>("wt
     }
 
     object SubCommand7 {
-        private const val appId = 16L
-        private const val subAppId = 537062845L
-
         @UseExperimental(MiraiInternalAPI::class)
         operator fun invoke(
             client: QQAndroidClient,
@@ -74,9 +70,6 @@ internal object LoginPacket : PacketFactory<LoginPacket.LoginPacketResponse>("wt
     }
 
     object SubCommand9 {
-        private const val appId = 16L
-        private const val subAppId = 537062845L
-
         @UseExperimental(MiraiInternalAPI::class)
         operator fun invoke(
             client: QQAndroidClient

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

@@ -7,10 +7,10 @@ import net.mamoe.mirai.qqandroid.QQAndroidBot
 import net.mamoe.mirai.qqandroid.io.serialization.toByteArray
 import net.mamoe.mirai.qqandroid.io.serialization.writeJceStruct
 import net.mamoe.mirai.qqandroid.network.QQAndroidClient
-import net.mamoe.mirai.qqandroid.network.protocol.jce.RequestDataStructSvcReqRegister
-import net.mamoe.mirai.qqandroid.network.protocol.jce.RequestDataVersion3
-import net.mamoe.mirai.qqandroid.network.protocol.jce.RequestPacket
-import net.mamoe.mirai.qqandroid.network.protocol.jce.SvcReqRegister
+import net.mamoe.mirai.qqandroid.network.protocol.packet.login.data.RequestDataStructSvcReqRegister
+import net.mamoe.mirai.qqandroid.network.protocol.packet.login.data.RequestDataVersion3
+import net.mamoe.mirai.qqandroid.network.protocol.packet.login.data.RequestPacket
+import net.mamoe.mirai.qqandroid.network.protocol.packet.login.data.SvcReqRegister
 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

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/jce/RequestPacket.kt → mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/login/data/RequestPacket.kt

-package net.mamoe.mirai.qqandroid.network.protocol.jce
+package net.mamoe.mirai.qqandroid.network.protocol.packet.login.data
 
-import kotlinx.serialization.Polymorphic
 import kotlinx.serialization.SerialId
 import kotlinx.serialization.Serializable
-import kotlinx.serialization.UseSerializers
 import net.mamoe.mirai.qqandroid.io.JceStruct
 import net.mamoe.mirai.qqandroid.network.protocol.packet.EMPTY_BYTE_ARRAY
 

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/jce/SvcReqRegister.kt → mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/login/data/SvcReqRegister.kt

-package net.mamoe.mirai.qqandroid.network.protocol.jce
+package net.mamoe.mirai.qqandroid.network.protocol.packet.login.data
 
 import kotlinx.serialization.Polymorphic
 import kotlinx.serialization.SerialId

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/oidb/oidb0x769/Oidb0x769.kt

@@ -2,7 +2,7 @@ package net.mamoe.mirai.qqandroid.network.protocol.packet.oidb.oidb0x769
 
 import kotlinx.serialization.SerialId
 import kotlinx.serialization.Serializable
-import net.mamoe.mirai.qqandroid.network.protocol.protobuf.ProtoBuf
+import net.mamoe.mirai.qqandroid.io.ProtoBuf
 
 class Oidb0x769 {
     @Serializable