Skip to content

M
Mirai
Commit 4ac84cf1 authored by Him188's avatar Him188
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents a68dec97 933eb1c2
Show whitespace changes
Inline Side-by-side
Showing with 863 additions and 17 deletions
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/data/MsgSvc.kt 0 → 100644
View file @ 4ac84cf1
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
@Serializable
class MsgSvc : ProtoBuf {
@Serializable
class Grp(
@SerialId(1) val groupCode: Long = 0L
) : ProtoBuf
@Serializable
class PbGetMsgResp(
@SerialId(1) val result: Int = 0,
@SerialId(2) val errmsg: String = "",
@SerialId(3) val syncCookie: ByteArray = EMPTY_BYTE_ARRAY,
@SerialId(4) val syncFlag: Int /* enum */ = 0,
@SerialId(5) val uinPairMsgs: List<MsgComm.UinPairMsg>? = null,
@SerialId(6) val bindUin: Long = 0L,
@SerialId(7) val msgRspType: Int = 0,
@SerialId(8) val pubaccountCookie: ByteArray = EMPTY_BYTE_ARRAY,
@SerialId(9) val isPartialSync: Boolean = false,
@SerialId(10) val msgCtrlBuf: ByteArray = EMPTY_BYTE_ARRAY
) : ProtoBuf
@Serializable
class PbGroupMsgWithDrawReq(
@SerialId(1) val subCmd: Int = 0,
@SerialId(2) val groupType: Int = 0,
@SerialId(3) val groupCode: Long = 0L,
@SerialId(4) val msgList: List<MsgSvc.PbGroupMsgWithDrawReq.MessageInfo>? = null,
@SerialId(5) val userdef: ByteArray = EMPTY_BYTE_ARRAY
) : ProtoBuf {
@Serializable
class MessageInfo(
@SerialId(1) val msgSeq: Int = 0,
@SerialId(2) val msgRandom: Int = 0,
@SerialId(3) val msgType: Int = 0
)
}
@Serializable
class PbGroupReadedReportReq(
@SerialId(1) val groupCode: Long = 0L,
@SerialId(2) val lastReadSeq: Long = 0L
) : ProtoBuf
@Serializable
class BusinessWPATmp(
@SerialId(1) val toUin: Long = 0L,
@SerialId(2) val sig: ByteArray = EMPTY_BYTE_ARRAY,
@SerialId(3) val sigt: ByteArray = EMPTY_BYTE_ARRAY
) : ProtoBuf
@Serializable
class C2C(
@SerialId(1) val toUin: Long = 0L
) : ProtoBuf
@Serializable
class PbGetGroupMsgReq(
@SerialId(1) val groupCode: Long = 0L,
@SerialId(2) val beginSeq: Long = 0L,
@SerialId(3) val endSeq: Long = 0L,
@SerialId(4) val filter: Int /* enum */ = 0,
@SerialId(5) val memberSeq: Long = 0L,
@SerialId(6) val publicGroup: Boolean = false,
@SerialId(7) val shieldFlag: Int = 0,
@SerialId(8) val saveTrafficFlag: Int = 0
) : ProtoBuf
@Serializable
class PbBindUinMsgReadedConfirmReq(
@SerialId(1) val syncCookie: ByteArray = EMPTY_BYTE_ARRAY,
@SerialId(2) val bindUin: Long = 0L
) : ProtoBuf
@Serializable
class AccostTmp(
@SerialId(1) val toUin: Long = 0L,
@SerialId(2) val sig: ByteArray = EMPTY_BYTE_ARRAY,
@SerialId(3) val reply: Boolean = false
) : ProtoBuf
@Serializable
class PbDiscussReadedReportResp(
@SerialId(1) val result: Int = 0,
@SerialId(2) val errmsg: String = "",
@SerialId(3) val confUin: Long = 0L,
@SerialId(4) val memberSeq: Long = 0L,
@SerialId(5) val confSeq: Long = 0L
) : ProtoBuf
@Serializable
class NearByAssistantTmp(
@SerialId(1) val toUin: Long = 0L,
@SerialId(2) val sig: ByteArray = EMPTY_BYTE_ARRAY,
@SerialId(3) val reply: Boolean = false
) : ProtoBuf
@Serializable
class MsgSendInfo(
@SerialId(1) val receiver: Int = 0
) : ProtoBuf
@Serializable
class PubGroupTmp(
@SerialId(1) val toUin: Long = 0L,
@SerialId(2) val sig: ByteArray = EMPTY_BYTE_ARRAY,
@SerialId(3) val groupUin: Long = 0L
) : ProtoBuf
@Serializable
class AddressListTmp(
@SerialId(1) val fromPhone: String = "",
@SerialId(2) val toPhone: String = "",
@SerialId(3) val toUin: Long = 0L,
@SerialId(4) val sig: ByteArray = EMPTY_BYTE_ARRAY,
@SerialId(5) val fromContactSize: Int = 0
) : ProtoBuf
@Serializable
class DisTmp(
@SerialId(1) val disUin: Long = 0L,
@SerialId(2) val toUin: Long = 0L
)
@Serializable
class PbMsgWithDrawResp(
@SerialId(1) val c2cWithDraw: List<MsgSvc.PbC2CMsgWithDrawResp>? = null,
@SerialId(2) val groupWithDraw: List<MsgSvc.PbGroupMsgWithDrawResp>? = null
) : ProtoBuf
@Serializable
class AuthTmp(
@SerialId(1) val toUin: Long = 0L,
@SerialId(2) val sig: ByteArray = EMPTY_BYTE_ARRAY
) : ProtoBuf
@Serializable
class PbMsgWithDrawReq(
@SerialId(1) val c2cWithDraw: List<MsgSvc.PbC2CMsgWithDrawReq>? = null,
@SerialId(2) val groupWithDraw: List<MsgSvc.PbGroupMsgWithDrawReq>? = null
) : ProtoBuf
@Serializable
class PbGetMsgReq(
@SerialId(1) val syncFlag: Int /* enum */ = 0,
@SerialId(2) val syncCookie: ByteArray = EMPTY_BYTE_ARRAY,
@SerialId(3) val rambleFlag: Int = 1,
@SerialId(4) val latestRambleNumber: Int = 20,
@SerialId(5) val otherRambleNumber: Int = 3,
@SerialId(6) val onlineSyncFlag: Int = 1,
@SerialId(7) val contextFlag: Int = 0,
@SerialId(8) val whisperSessionId: Int = 0,
@SerialId(9) val msgReqType: Int = 0,
@SerialId(10) val pubaccountCookie: ByteArray = EMPTY_BYTE_ARRAY,
@SerialId(11) val msgCtrlBuf: ByteArray = EMPTY_BYTE_ARRAY,
@SerialId(12) val serverBuf: ByteArray = EMPTY_BYTE_ARRAY
) : ProtoBuf
@Serializable
class PbGetOneDayRoamMsgReq(
@SerialId(1) val peerUin: Long = 0L,
@SerialId(2) val lastMsgtime: Long = 0L,
@SerialId(3) val random: Long = 0L,
@SerialId(4) val readCnt: Int = 0
) : ProtoBuf
@Serializable
class GrpTmp(
@SerialId(1) val groupUin: Long = 0L,
@SerialId(2) val toUin: Long = 0L
) : ProtoBuf
@Serializable
class PbGetDiscussMsgResp(
@SerialId(1) val result: Int = 0,
@SerialId(2) val errmsg: String = "",
@SerialId(3) val discussUin: Long = 0L,
@SerialId(4) val returnEndSeq: Long = 0L,
@SerialId(5) val returnBeginSeq: Long = 0L,
@SerialId(6) val msg: List<MsgComm.Msg>? = null,
@SerialId(7) val lastGetTime: Long = 0L,
@SerialId(8) val discussInfoSeq: Long = 0L
) : ProtoBuf
@Serializable
class CommTmp(
@SerialId(1) val toUin: Long = 0L,
@SerialId(2) val c2cType: Int = 0,
@SerialId(3) val svrType: Int = 0,
@SerialId(4) val sig: ByteArray = EMPTY_BYTE_ARRAY,
@SerialId(5) val reserved: ByteArray = EMPTY_BYTE_ARRAY
) : ProtoBuf
@Serializable
class PbGroupMsgWithDrawResp(
@SerialId(1) val result: Int = 0,
@SerialId(2) val errmsg: String = "",
@SerialId(3) val subCmd: Int = 0,
@SerialId(4) val groupType: Int = 0,
@SerialId(5) val groupCode: Long = 0L,
@SerialId(6) val failedMsgList: List<MsgSvc.PbGroupMsgWithDrawResp.MessageResult>? = null,
@SerialId(7) val userdef: ByteArray = EMPTY_BYTE_ARRAY
) : ProtoBuf {
@Serializable
class MessageResult(
@SerialId(1) val result: Int = 0,
@SerialId(2) val msgSeq: Int = 0,
@SerialId(3) val msgTime: Int = 0,
@SerialId(4) val msgRandom: Int = 0,
@SerialId(5) val errMsg: ByteArray = EMPTY_BYTE_ARRAY,
@SerialId(6) val msgType: Int = 0
) : ProtoBuf
}
@Serializable
class PbC2CReadedReportResp(
@SerialId(1) val result: Int = 0,
@SerialId(2) val errmsg: String = "",
@SerialId(3) val syncCookie: ByteArray = EMPTY_BYTE_ARRAY
) : ProtoBuf
@Serializable
class PbC2CUnReadMsgNumReq : ProtoBuf
@Serializable
class PbC2CMsgWithDrawReq(
@SerialId(1) val msgInfo: List<MsgSvc.PbC2CMsgWithDrawReq.MsgInfo>? = null,
@SerialId(2) val longMessageFlag: Int = 0,
@SerialId(3) val reserved: ByteArray = EMPTY_BYTE_ARRAY,
@SerialId(4) val subCmd: Int = 0
) : ProtoBuf {
@Serializable
class MsgInfo(
@SerialId(1) val fromUin: Long = 0L,
@SerialId(2) val toUin: Long = 0L,
@SerialId(3) val msgSeq: Int = 0,
@SerialId(4) val msgUid: Long = 0L,
@SerialId(5) val msgTime: Long = 0L,
@SerialId(6) val msgRandom: Int = 0,
@SerialId(7) val pkgNum: Int = 0,
@SerialId(8) val pkgIndex: Int = 0,
@SerialId(9) val divSeq: Int = 0,
@SerialId(10) val msgType: Int = 0,
@SerialId(20) val routingHead: MsgSvc.RoutingHead? = null
)
}
@Serializable
class PbDelRoamMsgResp(
@SerialId(1) val result: Int = 0,
@SerialId(2) val errmsg: String = ""
) : ProtoBuf
@Serializable
class Dis(
@SerialId(1) val disUin: Long = 0L
) : ProtoBuf
@Serializable
class TransSvrInfo(
@SerialId(1) val subType: Int = 0,
@SerialId(2) val int32RetCode: Int = 0,
@SerialId(3) val errMsg: ByteArray = EMPTY_BYTE_ARRAY,
@SerialId(4) val transInfo: ByteArray = EMPTY_BYTE_ARRAY
) : ProtoBuf
@Serializable
class PbPullGroupMsgSeqResp(
@SerialId(1) val result: Int = 0,
@SerialId(2) val errmsg: String = "",
@SerialId(3) val groupInfoResp: List<MsgSvc.PbPullGroupMsgSeqResp.GroupInfoResp>? = null
) : ProtoBuf {
@Serializable
class GroupInfoResp(
@SerialId(1) val groupCode: Long = 0L,
@SerialId(2) val memberSeq: Long = 0L,
@SerialId(3) val groupSeq: Long = 0L
)
}
@Serializable
class PbSendMsgReq(
@SerialId(1) val routingHead: MsgSvc.RoutingHead? = null,
@SerialId(2) val contentHead: MsgComm.ContentHead? = null,
@SerialId(3) val msgBody: ImMsgBody.MsgBody? = null,
@SerialId(4) val msgSeq: Int = 0,
@SerialId(5) val msgRand: Int = 0,
@SerialId(6) val syncCookie: ByteArray = EMPTY_BYTE_ARRAY,
@SerialId(7) val appShare: MsgComm.AppShareInfo? = null,
@SerialId(8) val msgVia: Int = 0,
@SerialId(9) val dataStatist: Int = 0,
@SerialId(10) val multiMsgAssist: MsgSvc.MultiMsgAssist? = null,
@SerialId(11) val inputNotifyInfo: MsgSvc.PbInputNotifyInfo? = null,
@SerialId(12) val msgCtrl: MsgCtrl.MsgCtrl? = null,
@SerialId(13) val receiptReq: ImReceipt.ReceiptReq? = null,
@SerialId(14) val multiSendSeq: Int = 0
) : ProtoBuf
@Serializable
class TransMsg(
@SerialId(1) val toUin: Long = 0L,
@SerialId(2) val c2cCmd: Int = 0
) : ProtoBuf
@Serializable
class PbDeleteMsgResp(
@SerialId(1) val result: Int = 0,
@SerialId(2) val errmsg: String = ""
) : ProtoBuf
@Serializable
class PbSearchRoamMsgInCloudResp(
@SerialId(1) val msg: List<MsgComm.Msg>? = null,
@SerialId(2) val serializeRspbody: ByteArray = EMPTY_BYTE_ARRAY
) : ProtoBuf
@Serializable
class PbInputNotifyInfo(
@SerialId(1) val toUin: Long = 0L,
@SerialId(2) val ime: Int = 0,
@SerialId(3) val notifyFlag: Int = 0,
@SerialId(4) val pbReserve: ByteArray = EMPTY_BYTE_ARRAY,
@SerialId(5) val iosPushWording: ByteArray = EMPTY_BYTE_ARRAY
) : ProtoBuf
@Serializable
class PbUnReadMsgSeqResp(
@SerialId(1) val c2cUnreadInfo: MsgSvc.PbC2CUnReadMsgNumResp? = null,
@SerialId(2) val binduinUnreadInfo: List<MsgSvc.PbBindUinUnReadMsgNumResp>? = null,
@SerialId(3) val groupUnreadInfo: MsgSvc.PbPullGroupMsgSeqResp? = null,
@SerialId(4) val discussUnreadInfo: MsgSvc.PbPullDiscussMsgSeqResp? = null,
@SerialId(5) val thirdqqUnreadInfo: MsgSvc.PbThirdQQUnReadMsgNumResp? = null
) : ProtoBuf
@Serializable
class PbDeleteMsgReq(
@SerialId(1) val msgItems: List<MsgSvc.PbDeleteMsgReq.MsgItem>? = null
) : ProtoBuf {
@Serializable
class MsgItem(
@SerialId(1) val fromUin: Long = 0L,
@SerialId(2) val toUin: Long = 0L,
@SerialId(3) val msgType: Int = 0,
@SerialId(4) val msgSeq: Int = 0,
@SerialId(5) val msgUid: Long = 0L,
@SerialId(7) val sig: ByteArray = EMPTY_BYTE_ARRAY
) : ProtoBuf
}
@Serializable
class MultiMsgAssist(
@SerialId(1) val repeatedRouting: List<MsgSvc.RoutingHead>? = null,
@SerialId(2) val msgUse: Int /* enum */ = 1,
@SerialId(3) val tempId: Long = 0L,
@SerialId(4) val vedioLen: Long = 0L,
@SerialId(5) val redbagId: ByteArray = EMPTY_BYTE_ARRAY,
@SerialId(6) val redbagAmount: Long = 0L,
@SerialId(7) val hasReadbag: Int = 0,
@SerialId(8) val hasVedio: Int = 0
) : ProtoBuf
@Serializable
class PbMsgReadedReportReq(
@SerialId(1) val grpReadReport: List<MsgSvc.PbGroupReadedReportReq>? = null,
@SerialId(2) val disReadReport: List<MsgSvc.PbDiscussReadedReportReq>? = null,
@SerialId(3) val c2cReadReport: MsgSvc.PbC2CReadedReportReq? = null,
@SerialId(4) val bindUinReadReport: MsgSvc.PbBindUinMsgReadedConfirmReq? = null
) : ProtoBuf
@Serializable
class PbGetOneDayRoamMsgResp(
@SerialId(1) val result: Int = 0,
@SerialId(2) val errmsg: String = "",
@SerialId(3) val peerUin: Long = 0L,
@SerialId(4) val lastMsgtime: Long = 0L,
@SerialId(5) val random: Long = 0L,
@SerialId(6) val msg: List<MsgComm.Msg>? = null,
@SerialId(7) val iscomplete: Int = 0
) : ProtoBuf
@Serializable
class PbBindUinGetMsgReq(
@SerialId(1) val bindUin: Long = 0L,
@SerialId(2) val bindUinSig: ByteArray = EMPTY_BYTE_ARRAY,
@SerialId(3) val syncFlag: Int /* enum */ = 0,
@SerialId(4) val syncCookie: ByteArray = EMPTY_BYTE_ARRAY
) : ProtoBuf
@Serializable
class NearByDatingTmp(
@SerialId(1) val toUin: Long = 0L,
@SerialId(2) val sig: ByteArray = EMPTY_BYTE_ARRAY,
@SerialId(3) val reply: Boolean = false
) : ProtoBuf
@Serializable
class BsnsTmp(
@SerialId(1) val toUin: Long = 0L,
@SerialId(2) val sig: ByteArray = EMPTY_BYTE_ARRAY
) : ProtoBuf
@Serializable
class RoutingHead(
@SerialId(1) val c2c: MsgSvc.C2C? = null,
@SerialId(2) val grp: MsgSvc.Grp? = null,
@SerialId(3) val grpTmp: MsgSvc.GrpTmp? = null,
@SerialId(4) val dis: MsgSvc.Dis? = null,
@SerialId(5) val disTmp: MsgSvc.DisTmp? = null,
@SerialId(6) val wpaTmp: MsgSvc.WPATmp? = null,
@SerialId(7) val secretFile: MsgSvc.SecretFileHead? = null,
@SerialId(8) val publicPlat: MsgSvc.PublicPlat? = null,
@SerialId(9) val transMsg: MsgSvc.TransMsg? = null,
@SerialId(10) val addressList: MsgSvc.AddressListTmp? = null,
@SerialId(11) val richStatusTmp: MsgSvc.RichStatusTmp? = null,
@SerialId(12) val transCmd: MsgSvc.TransCmd? = null,
@SerialId(13) val accostTmp: MsgSvc.AccostTmp? = null,
@SerialId(14) val pubGroupTmp: MsgSvc.PubGroupTmp? = null,
@SerialId(15) val trans0x211: MsgSvc.Trans0x211? = null,
@SerialId(16) val businessWpaTmp: MsgSvc.BusinessWPATmp? = null,
@SerialId(17) val authTmp: MsgSvc.AuthTmp? = null,
@SerialId(18) val bsnsTmp: MsgSvc.BsnsTmp? = null,
@SerialId(19) val qqQuerybusinessTmp: MsgSvc.QQQueryBusinessTmp? = null,
@SerialId(20) val nearbyDatingTmp: MsgSvc.NearByDatingTmp? = null,
@SerialId(21) val nearbyAssistantTmp: MsgSvc.NearByAssistantTmp? = null,
@SerialId(22) val commTmp: MsgSvc.CommTmp? = null
) : ProtoBuf
@Serializable
class TransResp(
@SerialId(1) val result: Int = 0,
@SerialId(2) val errmsg: String = "",
@SerialId(3) val respTag: Int = 0,
@SerialId(4) val respBuff: ByteArray = EMPTY_BYTE_ARRAY
) : ProtoBuf
@Serializable
class PbSendMsgResp(
@SerialId(1) val result: Int = 0,
@SerialId(2) val errmsg: String = "",
@SerialId(3) val sendTime: Int = 0,
@SerialId(4) val svrbusyWaitTime: Int = 0,
@SerialId(5) val msgSendInfo: MsgSvc.MsgSendInfo? = null,
@SerialId(6) val errtype: Int = 0,
@SerialId(7) val transSvrInfo: MsgSvc.TransSvrInfo? = null,
@SerialId(8) val receiptResp: ImReceipt.ReceiptResp? = null,
@SerialId(9) val textAnalysisResult: Int = 0
) : ProtoBuf
@Serializable
class PbBindUinUnReadMsgNumResp(
@SerialId(1) val result: Int = 0,
@SerialId(2) val errmsg: String = "",
@SerialId(3) val bindUin: Long = 0L,
@SerialId(4) val msgNum: Int = 0
) : ProtoBuf
@Serializable
class PbGetDiscussMsgReq(
@SerialId(1) val discussUin: Long = 0L,
@SerialId(2) val endSeq: Long = 0L,
@SerialId(3) val beginSeq: Long = 0L,
@SerialId(4) val lastGetTime: Long = 0L,
@SerialId(5) val discussInfoSeq: Long = 0L,
@SerialId(6) val filter: Int /* enum */ = 0,
@SerialId(7) val memberSeq: Long = 0L
) : ProtoBuf
@Serializable
class PbC2CMsgWithDrawResp(
@SerialId(1) val result: Int = 0,
@SerialId(2) val errmsg: String = "",
@SerialId(3) val msgStatus: List<MsgSvc.PbC2CMsgWithDrawResp.MsgStatus>? = null,
@SerialId(4) val subCmd: Int = 0
) : ProtoBuf {
@Serializable
class MsgStatus(
@SerialId(1) val msgInfo: MsgSvc.PbC2CMsgWithDrawReq.MsgInfo? = null,
@SerialId(2) val status: Int = 0
) : ProtoBuf
}
@Serializable
class SecretFileHead(
@SerialId(1) val secretFileMsg: SubMsgType0xc1.MsgBody? = null,
@SerialId(2) val secretFileStatus: SubMsgType0x1a.MsgBody? = null
)
@Serializable
class PbGetRoamMsgReq(
@SerialId(1) val peerUin: Long = 0L,
@SerialId(2) val lastMsgtime: Long = 0L,
@SerialId(3) val random: Long = 0L,
@SerialId(4) val readCnt: Int = 0,
@SerialId(5) val checkPwd: Int = 0,
@SerialId(6) val sig: ByteArray = EMPTY_BYTE_ARRAY,
@SerialId(7) val pwd: ByteArray = EMPTY_BYTE_ARRAY,
@SerialId(8) val subcmd: Int = 0,
@SerialId(9) val beginMsgtime: Long = 0L,
@SerialId(10) val reqType: Int = 0
) : ProtoBuf
@Serializable
class TransCmd(
@SerialId(1) val toUin: Long = 0L,
@SerialId(2) val msgType: Int = 0
) : ProtoBuf
@Serializable
class PbMsgReadedReportResp(
@SerialId(1) val grpReadReport: List<MsgSvc.PbGroupReadedReportResp>? = null,
@SerialId(2) val disReadReport: List<MsgSvc.PbDiscussReadedReportResp>? = null,
@SerialId(3) val c2cReadReport: MsgSvc.PbC2CReadedReportResp? = null,
@SerialId(4) val bindUinReadReport: MsgSvc.PbBindUinMsgReadedConfirmResp? = null
) : ProtoBuf
@Serializable
class PbThirdQQUnReadMsgNumResp(
@SerialId(1) val result: Int = 0,
@SerialId(2) val errmsg: String = "",
@SerialId(3) val thirdqqRespInfo: List<MsgSvc.PbThirdQQUnReadMsgNumResp.ThirdQQRespInfo>? = null,
@SerialId(4) val interval: Int = 0
) : ProtoBuf {
@Serializable
class ThirdQQRespInfo(
@SerialId(1) val thirdUin: Long = 0L,
@SerialId(2) val thirdUinCookie: ByteArray = EMPTY_BYTE_ARRAY,
@SerialId(3) val msgNum: Int = 0,
@SerialId(4) val msgFlag: Int = 0,
@SerialId(5) val redbagTime: Int = 0,
@SerialId(6) val status: Int = 0,
@SerialId(7) val lastMsgTime: Int = 0
) : ProtoBuf
}
@Serializable
class RichStatusTmp(
@SerialId(1) val toUin: Long = 0L,
@SerialId(2) val sig: ByteArray = EMPTY_BYTE_ARRAY
) : ProtoBuf
@Serializable
class QQQueryBusinessTmp(
@SerialId(1) val toUin: Long = 0L,
@SerialId(2) val sig: ByteArray = EMPTY_BYTE_ARRAY
) : ProtoBuf
@Serializable
class PbDelRoamMsgReq(
@SerialId(1) val c2cMsg: MsgSvc.PbDelRoamMsgReq.C2CMsg? = null,
@SerialId(2) val grpMsg: MsgSvc.PbDelRoamMsgReq.GrpMsg? = null,
@SerialId(3) val disMsg: MsgSvc.PbDelRoamMsgReq.DisMsg? = null
) : ProtoBuf {
@Serializable
class GrpMsg(
@SerialId(1) val groupCode: Long = 0L,
@SerialId(2) val msgSeq: Long = 0L
) : ProtoBuf
@Serializable
class C2CMsg(
@SerialId(1) val fromUin: Long = 0L,
@SerialId(2) val peerUin: Long = 0L,
@SerialId(3) val msgTime: Int = 0,
@SerialId(4) val msgRandom: Int = 0,
@SerialId(5) val msgSeq: Int = 0
) : ProtoBuf
@Serializable
class DisMsg(
@SerialId(1) val discussUin: Long = 0L,
@SerialId(2) val msgSeq: Long = 0L
) : ProtoBuf
}
@Serializable
class PbUnReadMsgSeqReq(
@SerialId(1) val c2cUnreadInfo: MsgSvc.PbC2CUnReadMsgNumReq? = null,
@SerialId(2) val binduinUnreadInfo: List<MsgSvc.PbBindUinUnReadMsgNumReq>? = null,
@SerialId(3) val groupUnreadInfo: MsgSvc.PbPullGroupMsgSeqReq? = null,
@SerialId(4) val discussUnreadInfo: MsgSvc.PbPullDiscussMsgSeqReq? = null,
@SerialId(5) val thirdqqUnreadInfo: MsgSvc.PbThirdQQUnReadMsgNumReq? = null
) : ProtoBuf
@Serializable
class PbPullDiscussMsgSeqResp(
@SerialId(1) val result: Int = 0,
@SerialId(2) val errmsg: String = "",
@SerialId(3) val discussInfoResp: List<MsgSvc.PbPullDiscussMsgSeqResp.DiscussInfoResp>? = null
) : ProtoBuf {
@Serializable
class DiscussInfoResp(
@SerialId(1) val confUin: Long = 0L,
@SerialId(2) val memberSeq: Long = 0L,
@SerialId(3) val confSeq: Long = 0L
) : ProtoBuf
}
@Serializable
class PbPullDiscussMsgSeqReq(
@SerialId(1) val discussInfoReq: List<MsgSvc.PbPullDiscussMsgSeqReq.DiscussInfoReq>? = null
) : ProtoBuf {
@Serializable
class DiscussInfoReq(
@SerialId(1) val confUin: Long = 0L,
@SerialId(2) val lastSeq: Long = 0L
) : ProtoBuf
}
@Serializable
class WPATmp(
@SerialId(1) val toUin: Long = 0L,
@SerialId(2) val sig: ByteArray = EMPTY_BYTE_ARRAY
) : ProtoBuf
@Serializable
class PublicPlat(
@SerialId(1) val toUin: Long = 0L,
@SerialId(2) val sig: ByteArray = EMPTY_BYTE_ARRAY
) : ProtoBuf
@Serializable
class PbBindUinMsgReadedConfirmResp(
@SerialId(1) val result: Int = 0,
@SerialId(2) val errmsg: String = "",
@SerialId(3) val syncCookie: ByteArray = EMPTY_BYTE_ARRAY,
@SerialId(4) val bindUin: Long = 0L
) : ProtoBuf
@Serializable
class PbGetRoamMsgResp(
@SerialId(1) val result: Int = 0,
@SerialId(2) val errmsg: String = "",
@SerialId(3) val peerUin: Long = 0L,
@SerialId(4) val lastMsgtime: Long = 0L,
@SerialId(5) val random: Long = 0L,
@SerialId(6) val msg: List<MsgComm.Msg>? = null,
@SerialId(7) val sig: ByteArray = EMPTY_BYTE_ARRAY
) : ProtoBuf
@Serializable
class PbDiscussReadedReportReq(
@SerialId(1) val confUin: Long = 0L,
@SerialId(2) val lastReadSeq: Long = 0L
) : ProtoBuf
@Serializable
class PbC2CReadedReportReq(
@SerialId(1) val syncCookie: ByteArray = EMPTY_BYTE_ARRAY,
@SerialId(2) val pairInfo: List<MsgSvc.PbC2CReadedReportReq.UinPairReadInfo>? = null
) : ProtoBuf {
@Serializable
class UinPairReadInfo(
@SerialId(1) val peerUin: Long = 0L,
@SerialId(2) val lastReadTime: Int = 0,
@SerialId(3) val crmSig: ByteArray = EMPTY_BYTE_ARRAY
) : ProtoBuf
}
@Serializable
class Trans0x211(
@SerialId(1) val toUin: Long = 0L,
@SerialId(2) val ccCmd: Int = 0,
@SerialId(3) val instCtrl: ImMsgHead.InstCtrl? = null,
@SerialId(4) val sig: ByteArray = EMPTY_BYTE_ARRAY,
@SerialId(5) val c2cType: Int = 0,
@SerialId(6) val serviceType: Int = 0
) : ProtoBuf
@Serializable
class PbSearchRoamMsgInCloudReq(
@SerialId(1) val serializeReqbody: ByteArray = EMPTY_BYTE_ARRAY
) : ProtoBuf
@Serializable
class PbBindUinUnReadMsgNumReq(
@SerialId(1) val bindUin: Long = 0L,
@SerialId(2) val syncCookie: ByteArray = EMPTY_BYTE_ARRAY
) : ProtoBuf
@Serializable
class PbC2CUnReadMsgNumResp(
@SerialId(1) val result: Int = 0,
@SerialId(2) val errmsg: String = "",
@SerialId(3) val msgNum: Int = 0
) : ProtoBuf
@Serializable
class PbPullGroupMsgSeqReq(
@SerialId(1) val groupInfoReq: List<MsgSvc.PbPullGroupMsgSeqReq.GroupInfoReq>? = null
) : ProtoBuf {
@Serializable
class GroupInfoReq(
@SerialId(1) val groupCode: Long = 0L,
@SerialId(2) val lastSeq: Long = 0L
) : ProtoBuf
}
@Serializable
class TransReq(
@SerialId(1) val command: Int = 0,
@SerialId(2) val reqTag: Int = 0,
@SerialId(3) val reqBuff: ByteArray = EMPTY_BYTE_ARRAY
) : ProtoBuf
@Serializable
class PbGroupReadedReportResp(
@SerialId(1) val result: Int = 0,
@SerialId(2) val errmsg: String = "",
@SerialId(3) val groupCode: Long = 0L,
@SerialId(4) val memberSeq: Long = 0L,
@SerialId(5) val groupMsgSeq: Long = 0L
) : ProtoBuf
@Serializable
class PbGetGroupMsgResp(
@SerialId(1) val result: Int = 0,
@SerialId(2) val errmsg: String = "",
@SerialId(3) val groupCode: Long = 0L,
@SerialId(4) val returnBeginSeq: Long = 0L,
@SerialId(5) val returnEndSeq: Long = 0L,
@SerialId(6) val msg: List<MsgComm.Msg>? = null
) : ProtoBuf
@Serializable
class PbThirdQQUnReadMsgNumReq(
@SerialId(1) val thirdqqReqInfo: List<MsgSvc.PbThirdQQUnReadMsgNumReq.ThirdQQReqInfo>? = null,
@SerialId(2) val source: Int = 0
) : ProtoBuf {
@Serializable
class ThirdQQReqInfo(
@SerialId(1) val thirdUin: Long = 0L,
@SerialId(2) val thirdUinSig: ByteArray = EMPTY_BYTE_ARRAY,
@SerialId(3) val thirdUinCookie: ByteArray = EMPTY_BYTE_ARRAY
) : ProtoBuf
}
}
@Serializable
class MsgCtrl {
@Serializable
class MsgCtrl(
@SerialId(1) val msgFlag: Int = 0,
@SerialId(2) val resvResvInfo: ResvResvInfo? = null
) : ProtoBuf
@Serializable
class ResvResvInfo(
@SerialId(1) val flag: Int = 0,
@SerialId(2) val reserv1: ByteArray = EMPTY_BYTE_ARRAY,
@SerialId(3) val reserv2: Long = 0L,
@SerialId(4) val reserv3: Long = 0L,
@SerialId(5) val createTime: Int = 0,
@SerialId(6) val picHeight: Int = 0,
@SerialId(7) val picWidth: Int = 0,
@SerialId(8) val resvFlag: Int = 0
) : ProtoBuf
}
@Serializable
class SubMsgType0xc1 {
@Serializable
class NotOnlineImage(
@SerialId(1) val filePath: ByteArray = EMPTY_BYTE_ARRAY,
@SerialId(2) val fileLen: Int = 0,
@SerialId(3) val downloadPath: ByteArray = EMPTY_BYTE_ARRAY,
@SerialId(4) val oldVerSendFile: ByteArray = EMPTY_BYTE_ARRAY,
@SerialId(5) val imgType: Int = 0,
@SerialId(6) val previewsImage: ByteArray = EMPTY_BYTE_ARRAY,
@SerialId(7) val picMd5: ByteArray = EMPTY_BYTE_ARRAY,
@SerialId(8) val picHeight: Int = 0,
@SerialId(9) val picWidth: Int = 0,
@SerialId(10) val resId: ByteArray = EMPTY_BYTE_ARRAY,
@SerialId(11) val flag: ByteArray = EMPTY_BYTE_ARRAY,
@SerialId(12) val downloadUrl: String = "",
@SerialId(13) val original: Int = 0
) : ProtoBuf
@Serializable
class MsgBody(
@SerialId(1) val fileKey: ByteArray = EMPTY_BYTE_ARRAY,
@SerialId(2) val fromUin: Long = 0L,
@SerialId(3) val toUin: Long = 0L,
@SerialId(4) val status: Int = 0,
@SerialId(5) val ttl: Int = 0,
@SerialId(6) val type: Int = 0,
@SerialId(7) val encryptPreheadLength: Int = 0,
@SerialId(8) val encryptType: Int = 0,
@SerialId(9) val encryptKey: ByteArray = EMPTY_BYTE_ARRAY,
@SerialId(10) val readTimes: Int = 0,
@SerialId(11) val leftTime: Int = 0,
@SerialId(12) val notOnlineImage: SubMsgType0xc1.NotOnlineImage? = null
) : ProtoBuf
}
@Serializable
class SubMsgType0x1a {
@Serializable
class MsgBody(
@SerialId(1) val fileKey: ByteArray = EMPTY_BYTE_ARRAY,
@SerialId(2) val fromUin_int32: Int = 0,
@SerialId(3) val toUin_int32: Int = 0,
@SerialId(4) val status: Int = 0,
@SerialId(5) val ttl: Int = 0,
@SerialId(6) val ingDesc: String = "",
@SerialId(7) val type: Int = 0,
@SerialId(8) val captureTimes: Int = 0,
@SerialId(9) val fromUin: Long = 0L,
@SerialId(10) val toUin: Long = 0L
) : ProtoBuf
}
\ No newline at end of file
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/receive/MessageSvc.PushNotify.kt
View file @ 4ac84cf1
...@@ -16,7 +16,6 @@ import net.mamoe.mirai.utils.cryptor.contentToString ...@@ -16,7 +16,6 @@ import net.mamoe.mirai.utils.cryptor.contentToString
import net.mamoe.mirai.utils.firstValue import net.mamoe.mirai.utils.firstValue
import net.mamoe.mirai.utils.io.debugPrint import net.mamoe.mirai.utils.io.debugPrint
import net.mamoe.mirai.utils.io.toReadPacket import net.mamoe.mirai.utils.io.toReadPacket
import net.mamoe.mirai.utils.io.toUHexString
class MessageSvc { class MessageSvc {
internal object PushNotify : PacketFactory<RequestPushNotify>("MessageSvc.PushNotify") { internal object PushNotify : PacketFactory<RequestPushNotify>("MessageSvc.PushNotify") {
...@@ -35,6 +34,8 @@ class MessageSvc { ...@@ -35,6 +34,8 @@ class MessageSvc {
.readRemainingAsJceStruct(RequestPushNotify.serializer()) .readRemainingAsJceStruct(RequestPushNotify.serializer())
println(requestPushNotify.contentToString()) println(requestPushNotify.contentToString())
return requestPushNotify return requestPushNotify
} }
} }
......
mirai-core-qqandroid/src/jvmTest/kotlin/test/JceDataClassGenerator.kt
View file @ 4ac84cf1
...@@ -24,13 +24,6 @@ class JCEInfo( ...@@ -24,13 +24,6 @@ class JCEInfo(
override fun toString(): String { override fun toString(): String {
properties = properties.sortedBy { it->it.jceID } properties = properties.sortedBy { it->it.jceID }
/**
*
@Serializable
class RequestDataVersion2(
@SerialId(0) val map: Map<String, Map<String, ByteArray>>
) : JceStruct
*/
val max = (properties.size - 1).toString().length val max = (properties.size - 1).toString().length
val builder:StringBuilder = StringBuilder("@Serializable") val builder:StringBuilder = StringBuilder("@Serializable")
builder.append("\n").append("internal class ").append(className).append("(") builder.append("\n").append("internal class ").append(className).append("(")
...@@ -45,10 +38,11 @@ class JCEInfo( ...@@ -45,10 +38,11 @@ class JCEInfo(
} }
class Property( class Property(
val name:String, var name:String,
var type:String, var type:String,
var defaultValue:String? = null var defaultValue:String? = null
){ ){
var isRequired: Boolean = true
var jceID:Int = -1 var jceID:Int = -1
//convert type/default value to kotlin format //convert type/default value to kotlin format
init { init {
...@@ -59,6 +53,28 @@ class Property( ...@@ -59,6 +53,28 @@ class Property(
.replace("int", "Int") .replace("int", "Int")
.replace("short", "Short") .replace("short", "Short")
.replace("long", "Long") .replace("long", "Long")
if(name.length >1 && name.get(1).isUpperCase()){
if(name.get(0) == 'l' || name.get(0) =='c' || name.get(0) == 'b'){
name = name.substring(1)
}
}
if(name.startsWith("str") || name.startsWith("bytes")){
name = name.replace("str","").replace("bytes","")
}
if(name.contains("_")){
val x = name.split("_")
name = x.get(0);
var z = 1;
repeat(x.size-1){
name+= "" + x.get(z).get(0).toUpperCase() + x.get(z).substring(1).toLowerCase()
++z;
}
}
name = "" + name.get(0).toLowerCase() + "" + name.substring(1)
} }
//@SerialId(1) val iVersion: Short = 3, //@SerialId(1) val iVersion: Short = 3,
override fun toString(): String { override fun toString(): String {
...@@ -70,10 +86,19 @@ class Property( ...@@ -70,10 +86,19 @@ class Property(
fun toStringWithSpacing(maxIDLength:Int): String { fun toStringWithSpacing(maxIDLength:Int): String {
val space = " ".repeat(maxIDLength - (jceID.toString().length)) val space = " ".repeat(maxIDLength - (jceID.toString().length))
if (defaultValue != null) { var base = " @SerialId(" + jceID + ") " + space + "val " + name + ":" + type + ""
return " @SerialId(" + jceID + ") " + space + "val " + name + ":" + type + " = " + defaultValue if(!isRequired){
if(defaultValue == null) {
base += "? = null"
}else{
base += "? = $defaultValue"
}
}else{
if(defaultValue != null) {
base+=" = " + defaultValue
} }
return " @SerialId(" + jceID + ") "+ space +"val " + name + ":" + type+"? = null" }
return base
} }
} }
...@@ -128,10 +153,14 @@ fun toJCEInfo(source:String):JCEInfo{ ...@@ -128,10 +153,14 @@ fun toJCEInfo(source:String):JCEInfo{
if(!allProperties.containsKey(key)){ if(!allProperties.containsKey(key)){
println(key + " is found in readFrom but not in properties") println(key + " is found in readFrom but not in properties")
} }
val id = it val src = it
.substringBetween(".read(",");") .replace(".readString(",".read(\" \",")
.split(",")[1].trim().toInt() .substringBetween("(",");")
allProperties.get(key)?.jceID = id; .split(",")
with(allProperties.get(key)!!){
this.jceID = src[1].trim().toInt()
this.isRequired = src[2].trim().toBoolean()
}
} }
} }
} }
......
mirai-core-qqandroid/src/jvmTest/kotlin/test/ProtoBufDataClassGenerator.kt
View file @ 4ac84cf1
...@@ -6,7 +6,7 @@ import java.io.File ...@@ -6,7 +6,7 @@ import java.io.File
fun main() { fun main() {
println( println(
File("""E:\Projects\QQAndroidFF\app\src\main\java\msf\onlinepush""") File("""/Users/jiahua.liu/Desktop/QQAndroid-F/app/src/main/java/tencent/im/s2c/msgtype0x210/submsgtype0x1a/""")
.generateUnarrangedClasses().toMutableList().arrangeClasses().joinToString("\n\n") .generateUnarrangedClasses().toMutableList().arrangeClasses().joinToString("\n\n")
) )
} }
......
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