Skip to content

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

Migrate to new Jce serializer

parent 2acca0c2
Hide whitespace changes
Inline Side-by-side
Showing with 761 additions and 626 deletions
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/io/serialization/IOFormat.kt
View file @ ce7af37e
...@@ -8,7 +8,7 @@ import kotlinx.serialization.SerializationStrategy ...@@ -8,7 +8,7 @@ import kotlinx.serialization.SerializationStrategy
interface IOFormat : SerialFormat { interface IOFormat : SerialFormat {
fun <T> dump(serializer: SerializationStrategy<T>, output: Output): ByteArray fun <T> dumpTo(serializer: SerializationStrategy<T>, ojb: T, output: Output)
fun <T> load(deserializer: DeserializationStrategy<T>, input: Input): T fun <T> load(deserializer: DeserializationStrategy<T>, input: Input): T
} }
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/io/serialization/Jce.kt → mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/io/serialization/JceOld.kt
View file @ ce7af37e
...@@ -21,7 +21,24 @@ import kotlinx.serialization.modules.SerialModule ...@@ -21,7 +21,24 @@ import kotlinx.serialization.modules.SerialModule
import kotlinx.serialization.protobuf.ProtoId import kotlinx.serialization.protobuf.ProtoId
import net.mamoe.mirai.qqandroid.io.JceStruct import net.mamoe.mirai.qqandroid.io.JceStruct
import net.mamoe.mirai.qqandroid.io.ProtoBuf import net.mamoe.mirai.qqandroid.io.ProtoBuf
import net.mamoe.mirai.qqandroid.io.serialization.jce.Jce
import net.mamoe.mirai.qqandroid.io.serialization.jce.Jce.Companion.BYTE
import net.mamoe.mirai.qqandroid.io.serialization.jce.Jce.Companion.DOUBLE
import net.mamoe.mirai.qqandroid.io.serialization.jce.Jce.Companion.FLOAT
import net.mamoe.mirai.qqandroid.io.serialization.jce.Jce.Companion.INT
import net.mamoe.mirai.qqandroid.io.serialization.jce.Jce.Companion.JCE_MAX_STRING_LENGTH
import net.mamoe.mirai.qqandroid.io.serialization.jce.Jce.Companion.LIST
import net.mamoe.mirai.qqandroid.io.serialization.jce.Jce.Companion.LONG
import net.mamoe.mirai.qqandroid.io.serialization.jce.Jce.Companion.MAP
import net.mamoe.mirai.qqandroid.io.serialization.jce.Jce.Companion.SHORT
import net.mamoe.mirai.qqandroid.io.serialization.jce.Jce.Companion.SIMPLE_LIST
import net.mamoe.mirai.qqandroid.io.serialization.jce.Jce.Companion.STRING1
import net.mamoe.mirai.qqandroid.io.serialization.jce.Jce.Companion.STRING4
import net.mamoe.mirai.qqandroid.io.serialization.jce.Jce.Companion.STRUCT_BEGIN
import net.mamoe.mirai.qqandroid.io.serialization.jce.Jce.Companion.STRUCT_END
import net.mamoe.mirai.qqandroid.io.serialization.jce.Jce.Companion.ZERO_TYPE
import net.mamoe.mirai.qqandroid.io.serialization.jce.JceHead import net.mamoe.mirai.qqandroid.io.serialization.jce.JceHead
import net.mamoe.mirai.qqandroid.io.serialization.jce.JceId
import net.mamoe.mirai.utils.io.readString import net.mamoe.mirai.utils.io.readString
import net.mamoe.mirai.utils.io.toReadPacket import net.mamoe.mirai.utils.io.toReadPacket
...@@ -36,14 +53,14 @@ enum class JceCharset(val kotlinCharset: Charset) { ...@@ -36,14 +53,14 @@ enum class JceCharset(val kotlinCharset: Charset) {
UTF8(Charset.forName("UTF8")) UTF8(Charset.forName("UTF8"))
} }
internal fun getSerialId(desc: SerialDescriptor, index: Int): Int? = desc.findAnnotation<ProtoId>(index)?.id internal fun getSerialId(desc: SerialDescriptor, index: Int): Int? = desc.findAnnotation<JceId>(index)?.id
/** /**
* Jce 数据结构序列化和反序列化工具, 能将 kotlinx.serialization 通用的注解标记格式的 `class` 序列化为 [ByteArray] * Jce 数据结构序列化和反序列化工具, 能将 kotlinx.serialization 通用的注解标记格式的 `class` 序列化为 [ByteArray]
*/ */
@Suppress("DEPRECATION_ERROR") @Suppress("DEPRECATION_ERROR")
@OptIn(InternalSerializationApi::class) @OptIn(InternalSerializationApi::class)
class Jce private constructor(private val charset: JceCharset, override val context: SerialModule = EmptyModule) : class JceOld private constructor(private val charset: JceCharset, override val context: SerialModule = EmptyModule) :
SerialFormat, BinaryFormat { SerialFormat, BinaryFormat {
private inner class ListWriter( private inner class ListWriter(
...@@ -101,7 +118,7 @@ class Jce private constructor(private val charset: JceCharset, override val cont ...@@ -101,7 +118,7 @@ class Jce private constructor(private val charset: JceCharset, override val cont
private open inner class JceEncoder( private open inner class JceEncoder(
internal val output: BytePacketBuilder internal val output: BytePacketBuilder
) : TaggedEncoder<Int>() { ) : TaggedEncoder<Int>() {
override val context get() = this@Jce.context override val context get() = this@JceOld.context
override fun SerialDescriptor.getTag(index: Int): Int { override fun SerialDescriptor.getTag(index: Int): Int {
return getSerialId(this, index) ?: error("cannot find @SerialId") return getSerialId(this, index) ?: error("cannot find @SerialId")
...@@ -753,10 +770,10 @@ class Jce private constructor(private val charset: JceCharset, override val cont ...@@ -753,10 +770,10 @@ class Jce private constructor(private val charset: JceCharset, override val cont
@Suppress("MemberVisibilityCanBePrivate") @Suppress("MemberVisibilityCanBePrivate")
companion object { companion object {
val UTF8 = Jce(JceCharset.UTF8) val UTF8 = JceOld(JceCharset.UTF8)
val GBK = Jce(JceCharset.GBK) val GBK = JceOld(JceCharset.GBK)
fun byCharSet(c: JceCharset): Jce { fun byCharSet(c: JceCharset): JceOld {
return if (c == JceCharset.UTF8) { return if (c == JceCharset.UTF8) {
UTF8 UTF8
} else { } else {
...@@ -764,22 +781,6 @@ class Jce private constructor(private val charset: JceCharset, override val cont ...@@ -764,22 +781,6 @@ class Jce private constructor(private val charset: JceCharset, override val cont
} }
} }
internal const val BYTE: Byte = 0
internal const val DOUBLE: Byte = 5
internal const val FLOAT: Byte = 4
internal const val INT: Byte = 2
internal const val JCE_MAX_STRING_LENGTH = 104857600
internal const val LIST: Byte = 9
internal const val LONG: Byte = 3
internal const val MAP: Byte = 8
internal const val SHORT: Byte = 1
internal const val SIMPLE_LIST: Byte = 13
internal const val STRING1: Byte = 6
internal const val STRING4: Byte = 7
internal const val STRUCT_BEGIN: Byte = 10
internal const val STRUCT_END: Byte = 11
internal const val ZERO_TYPE: Byte = 12
private fun Any?.getClassName(): String = private fun Any?.getClassName(): String =
(if (this == null) Unit::class else this::class).qualifiedName?.split(".")?.takeLast(2)?.joinToString(".") (if (this == null) Unit::class else this::class).qualifiedName?.split(".")?.takeLast(2)?.joinToString(".")
?: "<unnamed class>" ?: "<unnamed class>"
...@@ -815,7 +816,7 @@ class Jce private constructor(private val charset: JceCharset, override val cont ...@@ -815,7 +816,7 @@ class Jce private constructor(private val charset: JceCharset, override val cont
} }
} }
internal inline fun <R> Jce.JceInput.skipToTagOrNull(tag: Int, block: (JceHead) -> R): R? { internal inline fun <R> JceOld.JceInput.skipToTagOrNull(tag: Int, block: (JceHead) -> R): R? {
// println("skipping to $tag start") // println("skipping to $tag start")
while (true) { while (true) {
if (isEndOfInput) { // 读不了了 if (isEndOfInput) { // 读不了了
......
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/io/serialization/jce/JceInput.kt
View file @ ce7af37e
...@@ -10,7 +10,6 @@ ...@@ -10,7 +10,6 @@
package net.mamoe.mirai.qqandroid.io.serialization.jce package net.mamoe.mirai.qqandroid.io.serialization.jce
import kotlinx.io.core.* import kotlinx.io.core.*
import net.mamoe.mirai.qqandroid.io.serialization.Jce
import net.mamoe.mirai.qqandroid.io.serialization.JceCharset import net.mamoe.mirai.qqandroid.io.serialization.JceCharset
import net.mamoe.mirai.utils.io.readString import net.mamoe.mirai.utils.io.readString
......
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/io/serialization/jce/JceNew.kt
View file @ ce7af37e
...@@ -9,8 +9,8 @@ ...@@ -9,8 +9,8 @@
package net.mamoe.mirai.qqandroid.io.serialization.jce package net.mamoe.mirai.qqandroid.io.serialization.jce
import kotlinx.io.core.Input import kotlinx.io.core.*
import kotlinx.io.core.Output import kotlinx.serialization.BinaryFormat
import kotlinx.serialization.DeserializationStrategy import kotlinx.serialization.DeserializationStrategy
import kotlinx.serialization.SerialFormat import kotlinx.serialization.SerialFormat
import kotlinx.serialization.SerializationStrategy import kotlinx.serialization.SerializationStrategy
...@@ -18,26 +18,56 @@ import kotlinx.serialization.modules.EmptyModule ...@@ -18,26 +18,56 @@ import kotlinx.serialization.modules.EmptyModule
import kotlinx.serialization.modules.SerialModule import kotlinx.serialization.modules.SerialModule
import net.mamoe.mirai.qqandroid.io.serialization.IOFormat import net.mamoe.mirai.qqandroid.io.serialization.IOFormat
import net.mamoe.mirai.qqandroid.io.serialization.JceCharset import net.mamoe.mirai.qqandroid.io.serialization.JceCharset
import net.mamoe.mirai.qqandroid.io.serialization.JceOld
import net.mamoe.mirai.utils.io.toReadPacket
/** /**
* Jce 数据结构序列化和反序列化器. * Jce 数据结构序列化和反序列化器.
* *
* @author Him188 * @author Him188
*/ */
class JceNew( class Jce(
override val context: SerialModule, override val context: SerialModule,
val charset: JceCharset val charset: JceCharset
) : SerialFormat, IOFormat { ) : SerialFormat, IOFormat, BinaryFormat {
override fun <T> dump(serializer: SerializationStrategy<T>, output: Output): ByteArray { override fun <T> dumpTo(serializer: SerializationStrategy<T>, ojb: T, output: Output) {
TODO("Not yet implemented") output.writePacket(JceOld.byCharSet(this.charset).dumpAsPacket(serializer, ojb))
} }
override fun <T> load(deserializer: DeserializationStrategy<T>, input: Input): T { override fun <T> load(deserializer: DeserializationStrategy<T>, input: Input): T {
return JceDecoder(JceInput(input, charset), context).decodeSerializableValue(deserializer) return JceDecoder(JceInput(input, charset), context).decodeSerializableValue(deserializer)
} }
override fun <T> dump(serializer: SerializationStrategy<T>, value: T): ByteArray {
return buildPacket { dumpTo(serializer, value, this) }.readBytes()
}
override fun <T> load(deserializer: DeserializationStrategy<T>, bytes: ByteArray): T {
return load(deserializer, bytes.toReadPacket())
}
companion object { companion object {
val UTF_8 = JceNew(EmptyModule, JceCharset.UTF8) val UTF_8 = Jce(EmptyModule, JceCharset.UTF8)
val GBK = JceNew(EmptyModule, JceCharset.GBK) val GBK = Jce(EmptyModule, JceCharset.GBK)
fun byCharSet(c: JceCharset): Jce {
return if (c == JceCharset.UTF8) UTF_8 else GBK
}
internal const val BYTE: Byte = 0
internal const val DOUBLE: Byte = 5
internal const val FLOAT: Byte = 4
internal const val INT: Byte = 2
internal const val JCE_MAX_STRING_LENGTH = 104857600
internal const val LIST: Byte = 9
internal const val LONG: Byte = 3
internal const val MAP: Byte = 8
internal const val SHORT: Byte = 1
internal const val SIMPLE_LIST: Byte = 13
internal const val STRING1: Byte = 6
internal const val STRING4: Byte = 7
internal const val STRUCT_BEGIN: Byte = 10
internal const val STRUCT_END: Byte = 11
internal const val ZERO_TYPE: Byte = 12
} }
} }
\ No newline at end of file
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/io/serialization/jce/common.kt
View file @ ce7af37e
...@@ -11,7 +11,6 @@ package net.mamoe.mirai.qqandroid.io.serialization.jce ...@@ -11,7 +11,6 @@ package net.mamoe.mirai.qqandroid.io.serialization.jce
import kotlinx.io.core.Output import kotlinx.io.core.Output
import kotlinx.serialization.SerialInfo import kotlinx.serialization.SerialInfo
import net.mamoe.mirai.qqandroid.io.serialization.Jce
/** /**
...@@ -27,15 +26,47 @@ annotation class JceId(val id: Int) ...@@ -27,15 +26,47 @@ annotation class JceId(val id: Int)
* 保留这个结构, 为将来增加功能的兼容性. * 保留这个结构, 为将来增加功能的兼容性.
*/ */
@PublishedApi @PublishedApi
internal data class JceTag( internal abstract class JceTag {
val id: Int, abstract val id: Int
val isNullable: Boolean abstract val isNullable: Boolean
){
internal var isSimpleByteArray: Boolean = false internal var isSimpleByteArray: Boolean = false
} }
internal sealed class JceTagListElement(
override val isNullable: Boolean
) : JceTag(){
override val id: Int get() = 0
object Nullable : JceTagListElement(true)
object NotNull : JceTagListElement(false)
}
internal sealed class JceTagMapEntryKey(
override val isNullable: Boolean
) : JceTag(){
override val id: Int get() = 0
object Nullable : JceTagMapEntryKey(true)
object NotNull : JceTagMapEntryKey(false)
}
internal sealed class JceTagMapEntryValue(
override val isNullable: Boolean
) : JceTag() {
override val id: Int get() = 1
object Nullable : JceTagMapEntryValue(true)
object NotNull : JceTagMapEntryValue(false)
}
internal data class JceTagCommon(
override val id: Int,
override val isNullable: Boolean
) : JceTag()
fun JceHead.checkType(type: Byte) { fun JceHead.checkType(type: Byte) {
check(this.type == type) {"type mismatch. Expected $type, actual ${this.type}"} check(this.type == type) { "type mismatch. Expected $type, actual ${this.type}" }
} }
@PublishedApi @PublishedApi
......
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/io/serialization/utils.kt
View file @ ce7af37e
...@@ -18,21 +18,29 @@ import kotlinx.serialization.SerialDescriptor ...@@ -18,21 +18,29 @@ import kotlinx.serialization.SerialDescriptor
import kotlinx.serialization.SerializationStrategy import kotlinx.serialization.SerializationStrategy
import net.mamoe.mirai.qqandroid.io.JceStruct import net.mamoe.mirai.qqandroid.io.JceStruct
import net.mamoe.mirai.qqandroid.io.ProtoBuf import net.mamoe.mirai.qqandroid.io.ProtoBuf
import net.mamoe.mirai.qqandroid.io.serialization.jce.Jce
import net.mamoe.mirai.qqandroid.network.protocol.data.jce.RequestDataVersion2 import net.mamoe.mirai.qqandroid.network.protocol.data.jce.RequestDataVersion2
import net.mamoe.mirai.qqandroid.network.protocol.data.jce.RequestDataVersion3 import net.mamoe.mirai.qqandroid.network.protocol.data.jce.RequestDataVersion3
import net.mamoe.mirai.qqandroid.network.protocol.data.jce.RequestPacket import net.mamoe.mirai.qqandroid.network.protocol.data.jce.RequestPacket
import net.mamoe.mirai.utils.MiraiInternalAPI
import net.mamoe.mirai.utils.firstValue import net.mamoe.mirai.utils.firstValue
import net.mamoe.mirai.utils.io.read import net.mamoe.mirai.utils.io.read
import net.mamoe.mirai.utils.io.readPacketExact
import net.mamoe.mirai.utils.io.toReadPacket
import kotlin.jvm.JvmMultifileClass import kotlin.jvm.JvmMultifileClass
import kotlin.jvm.JvmName import kotlin.jvm.JvmName
fun <T : JceStruct> ByteArray.loadAs(deserializer: DeserializationStrategy<T>, c: JceCharset = JceCharset.UTF8): T { fun <T : JceStruct> ByteArray.loadAs(deserializer: DeserializationStrategy<T>, c: JceCharset = JceCharset.UTF8): T {
return Jce.byCharSet(c).load(deserializer, this) return Jce.byCharSet(c).load(deserializer, this.toReadPacket())
} }
fun <T : JceStruct> BytePacketBuilder.writeJceStruct(serializer: SerializationStrategy<T>, struct: T, charset: JceCharset = JceCharset.GBK) { fun <T : JceStruct> BytePacketBuilder.writeJceStruct(
this.writePacket(Jce.byCharSet(charset).dumpAsPacket(serializer, struct)) serializer: SerializationStrategy<T>,
struct: T,
charset: JceCharset = JceCharset.GBK
) {
Jce.byCharSet(charset).dumpTo(serializer, struct, this)
} }
fun <T : JceStruct> ByteReadPacket.readJceStruct( fun <T : JceStruct> ByteReadPacket.readJceStruct(
...@@ -40,7 +48,8 @@ fun <T : JceStruct> ByteReadPacket.readJceStruct( ...@@ -40,7 +48,8 @@ fun <T : JceStruct> ByteReadPacket.readJceStruct(
charset: JceCharset = JceCharset.UTF8, charset: JceCharset = JceCharset.UTF8,
length: Int = this.remaining.toInt() length: Int = this.remaining.toInt()
): T { ): T {
return Jce.byCharSet(charset).load(serializer, this, length) @OptIn(MiraiInternalAPI::class)
return Jce.byCharSet(charset).load(serializer, this.readPacketExact(length))
} }
/** /**
...@@ -82,7 +91,8 @@ fun <R> ByteReadPacket.decodeUniRequestPacketAndDeserialize(name: String? = null ...@@ -82,7 +91,8 @@ fun <R> ByteReadPacket.decodeUniRequestPacketAndDeserialize(name: String? = null
}) })
} }
fun <T : JceStruct> T.toByteArray(serializer: SerializationStrategy<T>, c: JceCharset = JceCharset.GBK): ByteArray = Jce.byCharSet(c).dump(serializer, this) fun <T : JceStruct> T.toByteArray(serializer: SerializationStrategy<T>, c: JceCharset = JceCharset.GBK): ByteArray =
Jce.byCharSet(c).dump(serializer, this)
fun <T : ProtoBuf> BytePacketBuilder.writeProtoBuf(serializer: SerializationStrategy<T>, v: T) { fun <T : ProtoBuf> BytePacketBuilder.writeProtoBuf(serializer: SerializationStrategy<T>, v: T) {
this.writeFully(v.toByteArray(serializer)) this.writeFully(v.toByteArray(serializer))
......
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/ConfigPush.kt
View file @ ce7af37e
...@@ -10,138 +10,138 @@ ...@@ -10,138 +10,138 @@
package net.mamoe.mirai.qqandroid.network.protocol.data.jce package net.mamoe.mirai.qqandroid.network.protocol.data.jce
import kotlinx.serialization.Serializable import kotlinx.serialization.Serializable
import kotlinx.serialization.protobuf.ProtoId
import net.mamoe.mirai.data.Packet import net.mamoe.mirai.data.Packet
import net.mamoe.mirai.qqandroid.io.JceStruct import net.mamoe.mirai.qqandroid.io.JceStruct
import net.mamoe.mirai.qqandroid.io.serialization.jce.JceId
@Serializable @Serializable
internal class BigDataChannel( internal class BigDataChannel(
@ProtoId(0) val vBigdataIplists: List<BigDataIpList>, @JceId(0) val vBigdataIplists: List<BigDataIpList>,
@ProtoId(1) val sBigdataSigSession: ByteArray? = null, @JceId(1) val sBigdataSigSession: ByteArray? = null,
@ProtoId(2) val sBigdataKeySession: ByteArray? = null, @JceId(2) val sBigdataKeySession: ByteArray? = null,
@ProtoId(3) val uSigUin: Long? = null, @JceId(3) val uSigUin: Long? = null,
@ProtoId(4) val iConnectFlag: Int? = 1, @JceId(4) val iConnectFlag: Int? = 1,
@ProtoId(5) val vBigdataPbBuf: ByteArray? = null @JceId(5) val vBigdataPbBuf: ByteArray? = null
) : JceStruct ) : JceStruct
@Serializable @Serializable
internal class BigDataIpInfo( internal class BigDataIpInfo(
@ProtoId(0) val uType: Long, @JceId(0) val uType: Long,
@ProtoId(1) val sIp: String = "", @JceId(1) val sIp: String = "",
@ProtoId(2) val uPort: Long @JceId(2) val uPort: Long
) : JceStruct ) : JceStruct
@Serializable @Serializable
internal class BigDataIpList( internal class BigDataIpList(
@ProtoId(0) val uServiceType: Long, @JceId(0) val uServiceType: Long,
@ProtoId(1) val vIplist: List<BigDataIpInfo>, @JceId(1) val vIplist: List<BigDataIpInfo>,
@ProtoId(2) val netSegConfs: List<NetSegConf>? = null, @JceId(2) val netSegConfs: List<NetSegConf>? = null,
@ProtoId(3) val ufragmentSize: Long? = null @JceId(3) val ufragmentSize: Long? = null
) : JceStruct ) : JceStruct
@Serializable @Serializable
internal class ClientLogConfig( internal class ClientLogConfig(
@ProtoId(1) val type: Int, @JceId(1) val type: Int,
@ProtoId(2) val timeStart: TimeStamp? = null, @JceId(2) val timeStart: TimeStamp? = null,
@ProtoId(3) val timeFinish: TimeStamp? = null, @JceId(3) val timeFinish: TimeStamp? = null,
@ProtoId(4) val loglevel: Byte? = null, @JceId(4) val loglevel: Byte? = null,
@ProtoId(5) val cookie: Int? = null, @JceId(5) val cookie: Int? = null,
@ProtoId(6) val lseq: Long? = null @JceId(6) val lseq: Long? = null
) : JceStruct ) : JceStruct
@Serializable @Serializable
internal class DomainIpChannel( internal class DomainIpChannel(
@ProtoId(0) val vDomainIplists: List<DomainIpList> @JceId(0) val vDomainIplists: List<DomainIpList>
) : JceStruct ) : JceStruct
@Serializable @Serializable
internal class DomainIpInfo( internal class DomainIpInfo(
@ProtoId(1) val uIp: Int, @JceId(1) val uIp: Int,
@ProtoId(2) val uPort: Int @JceId(2) val uPort: Int
) : JceStruct ) : JceStruct
@Serializable @Serializable
internal class DomainIpList( internal class DomainIpList(
@ProtoId(0) val uDomainType: Int, @JceId(0) val uDomainType: Int,
@ProtoId(1) val vIplist: List<DomainIpInfo> @JceId(1) val vIplist: List<DomainIpInfo>
) : JceStruct ) : JceStruct
@Serializable @Serializable
internal class FileStoragePushFSSvcList( internal class FileStoragePushFSSvcList(
@ProtoId(0) val vUpLoadList: List<FileStorageServerListInfo>, @JceId(0) val vUpLoadList: List<FileStorageServerListInfo>,
@ProtoId(1) val vPicDownLoadList: List<FileStorageServerListInfo>, @JceId(1) val vPicDownLoadList: List<FileStorageServerListInfo>,
@ProtoId(2) val vGPicDownLoadList: List<FileStorageServerListInfo>? = null, @JceId(2) val vGPicDownLoadList: List<FileStorageServerListInfo>? = null,
@ProtoId(3) val vQzoneProxyServiceList: List<FileStorageServerListInfo>? = null, @JceId(3) val vQzoneProxyServiceList: List<FileStorageServerListInfo>? = null,
@ProtoId(4) val vUrlEncodeServiceList: List<FileStorageServerListInfo>? = null, @JceId(4) val vUrlEncodeServiceList: List<FileStorageServerListInfo>? = null,
@ProtoId(5) val bigDataChannel: BigDataChannel? = null, @JceId(5) val bigDataChannel: BigDataChannel? = null,
@ProtoId(6) val vVipEmotionList: List<FileStorageServerListInfo>? = null, @JceId(6) val vVipEmotionList: List<FileStorageServerListInfo>? = null,
@ProtoId(7) val vC2CPicDownList: List<FileStorageServerListInfo>? = null, @JceId(7) val vC2CPicDownList: List<FileStorageServerListInfo>? = null,
@ProtoId(8) val fmtIPInfo: FmtIPInfo? = null, @JceId(8) val fmtIPInfo: FmtIPInfo? = null,
@ProtoId(9) val domainIpChannel: DomainIpChannel? = null, @JceId(9) val domainIpChannel: DomainIpChannel? = null,
@ProtoId(10) val pttlist: ByteArray? = null @JceId(10) val pttlist: ByteArray? = null
) : JceStruct ) : JceStruct
@Serializable @Serializable
internal class FileStorageServerListInfo( internal class FileStorageServerListInfo(
@ProtoId(1) val sIP: String = "", @JceId(1) val sIP: String = "",
@ProtoId(2) val iPort: Int @JceId(2) val iPort: Int
) : JceStruct ) : JceStruct
@Serializable @Serializable
internal class FmtIPInfo( internal class FmtIPInfo(
@ProtoId(0) val sGateIp: String = "", @JceId(0) val sGateIp: String = "",
@ProtoId(1) val iGateIpOper: Long @JceId(1) val iGateIpOper: Long
) : JceStruct ) : JceStruct
@Serializable @Serializable
internal class NetSegConf( internal class NetSegConf(
@ProtoId(0) val uint32NetType: Long? = null, @JceId(0) val uint32NetType: Long? = null,
@ProtoId(1) val uint32Segsize: Long? = null, @JceId(1) val uint32Segsize: Long? = null,
@ProtoId(2) val uint32Segnum: Long? = null, @JceId(2) val uint32Segnum: Long? = null,
@ProtoId(3) val uint32Curconnnum: Long? = null @JceId(3) val uint32Curconnnum: Long? = null
) : JceStruct ) : JceStruct
@Suppress("ArrayInDataClass") @Suppress("ArrayInDataClass")
@Serializable @Serializable
internal data class PushReq( internal data class PushReq(
@ProtoId(1) val type: Int, @JceId(1) val type: Int,
@ProtoId(2) val jcebuf: ByteArray, @JceId(2) val jcebuf: ByteArray,
@ProtoId(3) val seq: Long @JceId(3) val seq: Long
) : JceStruct, Packet ) : JceStruct, Packet
@Serializable @Serializable
internal class PushResp( internal class PushResp(
@ProtoId(1) val type: Int, @JceId(1) val type: Int,
@ProtoId(2) val seq: Long, @JceId(2) val seq: Long,
@ProtoId(3) val jcebuf: ByteArray? = null @JceId(3) val jcebuf: ByteArray? = null
) : JceStruct ) : JceStruct
@Serializable @Serializable
internal class SsoServerList( internal class SsoServerList(
@ProtoId(1) val v2G3GList: List<SsoServerListInfo>, @JceId(1) val v2G3GList: List<SsoServerListInfo>,
@ProtoId(3) val vWifiList: List<SsoServerListInfo>, @JceId(3) val vWifiList: List<SsoServerListInfo>,
@ProtoId(4) val iReconnect: Int, @JceId(4) val iReconnect: Int,
@ProtoId(5) val testSpeed: Byte? = null, @JceId(5) val testSpeed: Byte? = null,
@ProtoId(6) val useNewList: Byte? = null, @JceId(6) val useNewList: Byte? = null,
@ProtoId(7) val iMultiConn: Int? = 1, @JceId(7) val iMultiConn: Int? = 1,
@ProtoId(8) val vHttp2g3glist: List<SsoServerListInfo>? = null, @JceId(8) val vHttp2g3glist: List<SsoServerListInfo>? = null,
@ProtoId(9) val vHttpWifilist: List<SsoServerListInfo>? = null @JceId(9) val vHttpWifilist: List<SsoServerListInfo>? = null
) : JceStruct ) : JceStruct
@Serializable @Serializable
internal class SsoServerListInfo( internal class SsoServerListInfo(
@ProtoId(1) val sIP: String = "", @JceId(1) val sIP: String = "",
@ProtoId(2) val iPort: Int, @JceId(2) val iPort: Int,
@ProtoId(3) val linkType: Byte, @JceId(3) val linkType: Byte,
@ProtoId(4) val proxy: Byte, @JceId(4) val proxy: Byte,
@ProtoId(5) val protocolType: Byte? = null, @JceId(5) val protocolType: Byte? = null,
@ProtoId(6) val iTimeOut: Int? = 10 @JceId(6) val iTimeOut: Int? = 10
) : JceStruct ) : JceStruct
@Serializable @Serializable
internal class TimeStamp( internal class TimeStamp(
@ProtoId(1) val year: Int, @JceId(1) val year: Int,
@ProtoId(2) val month: Byte, @JceId(2) val month: Byte,
@ProtoId(3) val day: Byte, @JceId(3) val day: Byte,
@ProtoId(4) val hour: Byte @JceId(4) val hour: Byte
) : JceStruct ) : JceStruct
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/FriendList.kt
View file @ ce7af37e
...@@ -10,171 +10,171 @@ ...@@ -10,171 +10,171 @@
package net.mamoe.mirai.qqandroid.network.protocol.data.jce package net.mamoe.mirai.qqandroid.network.protocol.data.jce
import kotlinx.serialization.Serializable import kotlinx.serialization.Serializable
import kotlinx.serialization.protobuf.ProtoId
import net.mamoe.mirai.qqandroid.io.JceStruct import net.mamoe.mirai.qqandroid.io.JceStruct
import net.mamoe.mirai.qqandroid.io.serialization.jce.JceId
@Serializable @Serializable
internal class ModifyGroupCardReq( internal class ModifyGroupCardReq(
@ProtoId(0) val dwZero: Long, @JceId(0) val dwZero: Long,
@ProtoId(1) val dwGroupCode: Long, @JceId(1) val dwGroupCode: Long,
@ProtoId(2) val dwNewSeq: Long, @JceId(2) val dwNewSeq: Long,
@ProtoId(3) val vecUinInfo: List<stUinInfo> @JceId(3) val vecUinInfo: List<stUinInfo>
) : JceStruct ) : JceStruct
@Serializable @Serializable
internal class stUinInfo( internal class stUinInfo(
@ProtoId(0) val dwuin: Long, @JceId(0) val dwuin: Long,
@ProtoId(1) val dwFlag: Long, @JceId(1) val dwFlag: Long,
@ProtoId(2) val sName: String = "", @JceId(2) val sName: String = "",
@ProtoId(3) val gender: Byte, @JceId(3) val gender: Byte,
@ProtoId(4) val sPhone: String = "", @JceId(4) val sPhone: String = "",
@ProtoId(5) val sEmail: String = "", @JceId(5) val sEmail: String = "",
@ProtoId(6) val sRemark: String = "" @JceId(6) val sRemark: String = ""
) : JceStruct ) : JceStruct
@Serializable @Serializable
internal class GetFriendListReq( internal class GetFriendListReq(
@ProtoId(0) val reqtype: Int? = null, @JceId(0) val reqtype: Int? = null,
@ProtoId(1) val ifReflush: Byte? = null, @JceId(1) val ifReflush: Byte? = null,
@ProtoId(2) val uin: Long? = null, @JceId(2) val uin: Long? = null,
@ProtoId(3) val startIndex: Short? = null, @JceId(3) val startIndex: Short? = null,
@ProtoId(4) val getfriendCount: Short? = null, @JceId(4) val getfriendCount: Short? = null,
@ProtoId(5) val groupid: Byte? = null, @JceId(5) val groupid: Byte? = null,
@ProtoId(6) val ifGetGroupInfo: Byte? = null, @JceId(6) val ifGetGroupInfo: Byte? = null,
@ProtoId(7) val groupstartIndex: Byte? = null, @JceId(7) val groupstartIndex: Byte? = null,
@ProtoId(8) val getgroupCount: Byte? = null, @JceId(8) val getgroupCount: Byte? = null,
@ProtoId(9) val ifGetMSFGroup: Byte? = null, @JceId(9) val ifGetMSFGroup: Byte? = null,
@ProtoId(10) val ifShowTermType: Byte? = null, @JceId(10) val ifShowTermType: Byte? = null,
@ProtoId(11) val version: Long? = null, @JceId(11) val version: Long? = null,
@ProtoId(12) val uinList: List<Long>? = null, @JceId(12) val uinList: List<Long>? = null,
@ProtoId(13) val eAppType: Int = 0, @JceId(13) val eAppType: Int = 0,
@ProtoId(14) val ifGetDOVId: Byte? = null, @JceId(14) val ifGetDOVId: Byte? = null,
@ProtoId(15) val ifGetBothFlag: Byte? = null, @JceId(15) val ifGetBothFlag: Byte? = null,
@ProtoId(16) val vec0xd50Req: ByteArray? = null, @JceId(16) val vec0xd50Req: ByteArray? = null,
@ProtoId(17) val vec0xd6bReq: ByteArray? = null, @JceId(17) val vec0xd6bReq: ByteArray? = null,
@ProtoId(18) val vecSnsTypelist: List<Long>? = null @JceId(18) val vecSnsTypelist: List<Long>? = null
) : JceStruct ) : JceStruct
@Serializable @Serializable
internal class GetFriendListResp( internal class GetFriendListResp(
@ProtoId(0) val reqtype: Int, @JceId(0) val reqtype: Int,
@ProtoId(1) val ifReflush: Byte, @JceId(1) val ifReflush: Byte,
@ProtoId(2) val uin: Long, @JceId(2) val uin: Long,
@ProtoId(3) val startIndex: Short, @JceId(3) val startIndex: Short,
@ProtoId(4) val getfriendCount: Short, @JceId(4) val getfriendCount: Short,
@ProtoId(5) val totoalFriendCount: Short, @JceId(5) val totoalFriendCount: Short,
@ProtoId(6) val friendCount: Short, @JceId(6) val friendCount: Short,
@ProtoId(7) val vecFriendInfo: List<FriendInfo>? = null, @JceId(7) val vecFriendInfo: List<FriendInfo>? = null,
@ProtoId(8) val groupid: Byte? = null, @JceId(8) val groupid: Byte? = null,
@ProtoId(9) val ifGetGroupInfo: Byte, @JceId(9) val ifGetGroupInfo: Byte,
@ProtoId(10) val groupstartIndex: Byte? = null, @JceId(10) val groupstartIndex: Byte? = null,
@ProtoId(11) val getgroupCount: Byte? = null, @JceId(11) val getgroupCount: Byte? = null,
@ProtoId(12) val totoalGroupCount: Short? = null, @JceId(12) val totoalGroupCount: Short? = null,
@ProtoId(13) val groupCount: Byte? = null, @JceId(13) val groupCount: Byte? = null,
@ProtoId(14) val vecGroupInfo: List<GroupInfo>? = null, @JceId(14) val vecGroupInfo: List<GroupInfo>? = null,
@ProtoId(15) val result: Int, @JceId(15) val result: Int,
@ProtoId(16) val errorCode: Short? = null, @JceId(16) val errorCode: Short? = null,
@ProtoId(17) val onlineFriendCount: Short? = null, @JceId(17) val onlineFriendCount: Short? = null,
@ProtoId(18) val serverTime: Long? = null, @JceId(18) val serverTime: Long? = null,
@ProtoId(19) val sqqOnLineCount: Short? = null, @JceId(19) val sqqOnLineCount: Short? = null,
@ProtoId(20) val vecMSFGroupInfo: List<GroupInfo>? = null, @JceId(20) val vecMSFGroupInfo: List<GroupInfo>? = null,
@ProtoId(21) val respType: Byte? = null, @JceId(21) val respType: Byte? = null,
@ProtoId(22) val hasOtherRespFlag: Byte? = null, @JceId(22) val hasOtherRespFlag: Byte? = null,
@ProtoId(23) val stSelfInfo: FriendInfo? = null, @JceId(23) val stSelfInfo: FriendInfo? = null,
@ProtoId(24) val showPcIcon: Byte? = null, @JceId(24) val showPcIcon: Byte? = null,
@ProtoId(25) val wGetExtSnsRspCode: Short? = null, @JceId(25) val wGetExtSnsRspCode: Short? = null,
@ProtoId(26) val stSubSrvRspCode: FriendListSubSrvRspCode? = null @JceId(26) val stSubSrvRspCode: FriendListSubSrvRspCode? = null
) : JceStruct ) : JceStruct
@Serializable @Serializable
internal class FriendListSubSrvRspCode( internal class FriendListSubSrvRspCode(
@ProtoId(0) val wGetMutualMarkRspCode: Short? = null, @JceId(0) val wGetMutualMarkRspCode: Short? = null,
@ProtoId(1) val wGetIntimateInfoRspCode: Short? = null @JceId(1) val wGetIntimateInfoRspCode: Short? = null
) : JceStruct ) : JceStruct
@Serializable @Serializable
internal class FriendInfo( internal class FriendInfo(
@ProtoId(0) val friendUin: Long, @JceId(0) val friendUin: Long,
@ProtoId(1) val groupId: Byte, @JceId(1) val groupId: Byte,
@ProtoId(2) val faceId: Short, @JceId(2) val faceId: Short,
@ProtoId(3) val remark: String = "", @JceId(3) val remark: String = "",
@ProtoId(4) val sqqtype: Byte, @JceId(4) val sqqtype: Byte,
@ProtoId(5) val status: Byte = 20, @JceId(5) val status: Byte = 20,
@ProtoId(6) val memberLevel: Byte? = null, @JceId(6) val memberLevel: Byte? = null,
@ProtoId(7) val isMqqOnLine: Byte? = null, @JceId(7) val isMqqOnLine: Byte? = null,
@ProtoId(8) val sqqOnLineState: Byte? = null, @JceId(8) val sqqOnLineState: Byte? = null,
@ProtoId(9) val isIphoneOnline: Byte? = null, @JceId(9) val isIphoneOnline: Byte? = null,
@ProtoId(10) val detalStatusFlag: Byte? = null, @JceId(10) val detalStatusFlag: Byte? = null,
@ProtoId(11) val sqqOnLineStateV2: Byte? = null, @JceId(11) val sqqOnLineStateV2: Byte? = null,
@ProtoId(12) val sShowName: String? = "", @JceId(12) val sShowName: String? = "",
@ProtoId(13) val isRemark: Byte? = null, @JceId(13) val isRemark: Byte? = null,
@ProtoId(14) val nick: String? = "", @JceId(14) val nick: String? = "",
@ProtoId(15) val specialFlag: Byte? = null, @JceId(15) val specialFlag: Byte? = null,
@ProtoId(16) val vecIMGroupID: ByteArray? = null, @JceId(16) val vecIMGroupID: ByteArray? = null,
@ProtoId(17) val vecMSFGroupID: ByteArray? = null, @JceId(17) val vecMSFGroupID: ByteArray? = null,
@ProtoId(18) val iTermType: Int? = null, @JceId(18) val iTermType: Int? = null,
@ProtoId(19) val oVipInfo: VipBaseInfo? = null, @JceId(19) val oVipInfo: VipBaseInfo? = null,
@ProtoId(20) val network: Byte? = null, @JceId(20) val network: Byte? = null,
@ProtoId(21) val vecRing: ByteArray? = null, @JceId(21) val vecRing: ByteArray? = null,
@ProtoId(22) val uAbiFlag: Long? = null, @JceId(22) val uAbiFlag: Long? = null,
@ProtoId(23) val ulFaceAddonId: Long? = null, @JceId(23) val ulFaceAddonId: Long? = null,
@ProtoId(24) val eNetworkType: Int? = 0, @JceId(24) val eNetworkType: Int? = 0,
@ProtoId(25) val uVipFont: Long? = null, @JceId(25) val uVipFont: Long? = null,
@ProtoId(26) val eIconType: Int? = 0, @JceId(26) val eIconType: Int? = 0,
@ProtoId(27) val termDesc: String? = "", @JceId(27) val termDesc: String? = "",
@ProtoId(28) val uColorRing: Long? = null, @JceId(28) val uColorRing: Long? = null,
@ProtoId(29) val apolloFlag: Byte? = null, @JceId(29) val apolloFlag: Byte? = null,
@ProtoId(30) val uApolloTimestamp: Long? = null, @JceId(30) val uApolloTimestamp: Long? = null,
@ProtoId(31) val sex: Byte? = null, @JceId(31) val sex: Byte? = null,
@ProtoId(32) val uFounderFont: Long? = null, @JceId(32) val uFounderFont: Long? = null,
@ProtoId(33) val eimId: String? = "", @JceId(33) val eimId: String? = "",
@ProtoId(34) val eimMobile: String? = "", @JceId(34) val eimMobile: String? = "",
@ProtoId(35) val olympicTorch: Byte? = null, @JceId(35) val olympicTorch: Byte? = null,
@ProtoId(36) val uApolloSignTime: Long? = null, @JceId(36) val uApolloSignTime: Long? = null,
@ProtoId(37) val uLaviUin: Long? = null, @JceId(37) val uLaviUin: Long? = null,
@ProtoId(38) val uTagUpdateTime: Long? = null, @JceId(38) val uTagUpdateTime: Long? = null,
@ProtoId(39) val uGameLastLoginTime: Long? = null, @JceId(39) val uGameLastLoginTime: Long? = null,
@ProtoId(40) val uGameAppid: Long? = null, @JceId(40) val uGameAppid: Long? = null,
@ProtoId(41) val vecCardID: ByteArray? = null, @JceId(41) val vecCardID: ByteArray? = null,
@ProtoId(42) val ulBitSet: Long? = null, @JceId(42) val ulBitSet: Long? = null,
@ProtoId(43) val kingOfGloryFlag: Byte? = null, @JceId(43) val kingOfGloryFlag: Byte? = null,
@ProtoId(44) val ulKingOfGloryRank: Long? = null, @JceId(44) val ulKingOfGloryRank: Long? = null,
@ProtoId(45) val masterUin: String? = "", @JceId(45) val masterUin: String? = "",
@ProtoId(46) val uLastMedalUpdateTime: Long? = null, @JceId(46) val uLastMedalUpdateTime: Long? = null,
@ProtoId(47) val uFaceStoreId: Long? = null, @JceId(47) val uFaceStoreId: Long? = null,
@ProtoId(48) val uFontEffect: Long? = null, @JceId(48) val uFontEffect: Long? = null,
@ProtoId(49) val sDOVId: String? = "", @JceId(49) val sDOVId: String? = "",
@ProtoId(50) val uBothFlag: Long? = null, @JceId(50) val uBothFlag: Long? = null,
@ProtoId(51) val centiShow3DFlag: Byte? = null, @JceId(51) val centiShow3DFlag: Byte? = null,
@ProtoId(52) val vecIntimateInfo: ByteArray? = null, @JceId(52) val vecIntimateInfo: ByteArray? = null,
@ProtoId(53) val showNameplate: Byte? = null, @JceId(53) val showNameplate: Byte? = null,
@ProtoId(54) val newLoverDiamondFlag: Byte? = null, @JceId(54) val newLoverDiamondFlag: Byte? = null,
@ProtoId(55) val vecExtSnsFrdData: ByteArray? = null, @JceId(55) val vecExtSnsFrdData: ByteArray? = null,
@ProtoId(56) val vecMutualMarkData: ByteArray? = null @JceId(56) val vecMutualMarkData: ByteArray? = null
) : JceStruct ) : JceStruct
@Serializable @Serializable
internal class VipBaseInfo( internal class VipBaseInfo(
@ProtoId(0) val mOpenInfo: Map<Int, VipOpenInfo> @JceId(0) val mOpenInfo: Map<Int, VipOpenInfo>
) : JceStruct ) : JceStruct
@Serializable @Serializable
internal class VipOpenInfo( internal class VipOpenInfo(
@ProtoId(0) val open: Boolean, @JceId(0) val open: Boolean,
@ProtoId(1) val iVipType: Int = -1, @JceId(1) val iVipType: Int = -1,
@ProtoId(2) val iVipLevel: Int = -1, @JceId(2) val iVipLevel: Int = -1,
@ProtoId(3) val iVipFlag: Int? = null, @JceId(3) val iVipFlag: Int? = null,
@ProtoId(4) val nameplateId: Long? = null @JceId(4) val nameplateId: Long? = null
) : JceStruct ) : JceStruct
@Serializable @Serializable
internal class GroupInfo( internal class GroupInfo(
@ProtoId(0) val groupId: Byte, @JceId(0) val groupId: Byte,
@ProtoId(1) val groupname: String = "", @JceId(1) val groupname: String = "",
@ProtoId(2) val friendCount: Int, @JceId(2) val friendCount: Int,
@ProtoId(3) val onlineFriendCount: Int, @JceId(3) val onlineFriendCount: Int,
@ProtoId(4) val seqid: Byte? = null, @JceId(4) val seqid: Byte? = null,
@ProtoId(5) val sqqOnLineCount: Int? = null @JceId(5) val sqqOnLineCount: Int? = null
) : JceStruct ) : JceStruct
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/OnlinePushPack.kt
View file @ ce7af37e
...@@ -10,249 +10,249 @@ ...@@ -10,249 +10,249 @@
package net.mamoe.mirai.qqandroid.network.protocol.data.jce package net.mamoe.mirai.qqandroid.network.protocol.data.jce
import kotlinx.serialization.Serializable import kotlinx.serialization.Serializable
import kotlinx.serialization.protobuf.ProtoId
import net.mamoe.mirai.qqandroid.io.JceStruct import net.mamoe.mirai.qqandroid.io.JceStruct
import net.mamoe.mirai.qqandroid.io.serialization.jce.JceId
internal class OnlinePushPack { internal class OnlinePushPack {
@Serializable @Serializable
internal class DelMsgInfo( internal class DelMsgInfo(
@ProtoId(0) val fromUin: Long, @JceId(0) val fromUin: Long,
@ProtoId(1) val uMsgTime: Long, @JceId(1) val uMsgTime: Long,
@ProtoId(2) val shMsgSeq: Short, @JceId(2) val shMsgSeq: Short,
@ProtoId(3) val vMsgCookies: ByteArray? = null, @JceId(3) val vMsgCookies: ByteArray? = null,
@ProtoId(4) val wCmd: Short? = null, @JceId(4) val wCmd: Short? = null,
@ProtoId(5) val uMsgType: Long? = null, @JceId(5) val uMsgType: Long? = null,
@ProtoId(6) val uAppId: Long? = null, @JceId(6) val uAppId: Long? = null,
@ProtoId(7) val sendTime: Long? = null, @JceId(7) val sendTime: Long? = null,
@ProtoId(8) val ssoSeq: Int? = null, @JceId(8) val ssoSeq: Int? = null,
@ProtoId(9) val ssoIp: Int? = null, @JceId(9) val ssoIp: Int? = null,
@ProtoId(10) val clientIp: Int? = null @JceId(10) val clientIp: Int? = null
) : JceStruct ) : JceStruct
@Serializable @Serializable
internal class DeviceInfo( internal class DeviceInfo(
@ProtoId(0) val netType: Byte? = null, @JceId(0) val netType: Byte? = null,
@ProtoId(1) val devType: String? = "", @JceId(1) val devType: String? = "",
@ProtoId(2) val oSVer: String? = "", @JceId(2) val oSVer: String? = "",
@ProtoId(3) val vendorName: String? = "", @JceId(3) val vendorName: String? = "",
@ProtoId(4) val vendorOSName: String? = "", @JceId(4) val vendorOSName: String? = "",
@ProtoId(5) val iOSIdfa: String? = "" @JceId(5) val iOSIdfa: String? = ""
) : JceStruct ) : JceStruct
@Serializable @Serializable
internal class Name( internal class Name(
@ProtoId(0) val fromUin: Long, @JceId(0) val fromUin: Long,
@ProtoId(1) val uMsgTime: Long, @JceId(1) val uMsgTime: Long,
@ProtoId(2) val shMsgType: Short, @JceId(2) val shMsgType: Short,
@ProtoId(3) val shMsgSeq: Short, @JceId(3) val shMsgSeq: Short,
@ProtoId(4) val msg: String = "", @JceId(4) val msg: String = "",
@ProtoId(5) val uRealMsgTime: Int? = null, @JceId(5) val uRealMsgTime: Int? = null,
@ProtoId(6) val vMsg: ByteArray? = null, @JceId(6) val vMsg: ByteArray? = null,
@ProtoId(7) val uAppShareID: Long? = null, @JceId(7) val uAppShareID: Long? = null,
@ProtoId(8) val vMsgCookies: ByteArray? = null, @JceId(8) val vMsgCookies: ByteArray? = null,
@ProtoId(9) val vAppShareCookie: ByteArray? = null, @JceId(9) val vAppShareCookie: ByteArray? = null,
@ProtoId(10) val msgUid: Long? = null, @JceId(10) val msgUid: Long? = null,
@ProtoId(11) val lastChangeTime: Long? = 1L, @JceId(11) val lastChangeTime: Long? = 1L,
@ProtoId(12) val vCPicInfo: List<CPicInfo>? = null, @JceId(12) val vCPicInfo: List<CPicInfo>? = null,
@ProtoId(13) val stShareData: ShareData? = null, @JceId(13) val stShareData: ShareData? = null,
@ProtoId(14) val fromInstId: Long? = null, @JceId(14) val fromInstId: Long? = null,
@ProtoId(15) val vRemarkOfSender: ByteArray? = null, @JceId(15) val vRemarkOfSender: ByteArray? = null,
@ProtoId(16) val fromMobile: String? = "", @JceId(16) val fromMobile: String? = "",
@ProtoId(17) val fromName: String? = "", @JceId(17) val fromName: String? = "",
@ProtoId(18) val vNickName: List<String>? = null, @JceId(18) val vNickName: List<String>? = null,
@ProtoId(19) val stC2CTmpMsgHead: TempMsgHead? = null @JceId(19) val stC2CTmpMsgHead: TempMsgHead? = null
) : JceStruct ) : JceStruct
@Serializable @Serializable
internal class SvcReqPushMsg( internal class SvcReqPushMsg(
@ProtoId(0) val uin: Long, @JceId(0) val uin: Long,
@ProtoId(1) val uMsgTime: Long, @JceId(1) val uMsgTime: Long,
@ProtoId(2) val vMsgInfos: List<MsgInfo>, @JceId(2) val vMsgInfos: List<MsgInfo>,
@ProtoId(3) val svrip: Int? = 0, @JceId(3) val svrip: Int? = 0,
@ProtoId(4) val vSyncCookie: ByteArray? = null, @JceId(4) val vSyncCookie: ByteArray? = null,
@ProtoId(5) val vUinPairMsg: List<UinPairMsg>? = null, @JceId(5) val vUinPairMsg: List<UinPairMsg>? = null,
@ProtoId(6) val mPreviews: Map<String, ByteArray>? = null @JceId(6) val mPreviews: Map<String, ByteArray>? = null
// @SerialId(7) val wUserActive: Int? = null, // @SerialId(7) val wUserActive: Int? = null,
//@SerialId(12) val wGeneralFlag: Int? = null //@SerialId(12) val wGeneralFlag: Int? = null
) : JceStruct ) : JceStruct
@Serializable @Serializable
internal class SvcRespPushMsg( internal class SvcRespPushMsg(
@ProtoId(0) val uin: Long, @JceId(0) val uin: Long,
@ProtoId(1) val vDelInfos: List<DelMsgInfo>, @JceId(1) val vDelInfos: List<DelMsgInfo>,
@ProtoId(2) val svrip: Int, @JceId(2) val svrip: Int,
@ProtoId(3) val pushToken: ByteArray? = null, @JceId(3) val pushToken: ByteArray? = null,
@ProtoId(4) val serviceType: Int? = null, @JceId(4) val serviceType: Int? = null,
@ProtoId(5) val deviceInfo: DeviceInfo? = null @JceId(5) val deviceInfo: DeviceInfo? = null
) : JceStruct ) : JceStruct
@Serializable @Serializable
internal class UinPairMsg( internal class UinPairMsg(
@ProtoId(1) val uLastReadTime: Long? = null, @JceId(1) val uLastReadTime: Long? = null,
@ProtoId(2) val peerUin: Long? = null, @JceId(2) val peerUin: Long? = null,
@ProtoId(3) val uMsgCompleted: Long? = null, @JceId(3) val uMsgCompleted: Long? = null,
@ProtoId(4) val vMsgInfos: List<MsgInfo>? = null @JceId(4) val vMsgInfos: List<MsgInfo>? = null
) : JceStruct ) : JceStruct
@Serializable @Serializable
internal class MsgType0x210( internal class MsgType0x210(
@ProtoId(0) val uSubMsgType: Long, @JceId(0) val uSubMsgType: Long,
@ProtoId(1) val stMsgInfo0x2: MsgType0x210SubMsgType0x2? = null, @JceId(1) val stMsgInfo0x2: MsgType0x210SubMsgType0x2? = null,
@ProtoId(3) val stMsgInfo0xa: MsgType0x210SubMsgType0xa? = null, @JceId(3) val stMsgInfo0xa: MsgType0x210SubMsgType0xa? = null,
@ProtoId(4) val stMsgInfo0xe: MsgType0x210SubMsgType0xe? = null, @JceId(4) val stMsgInfo0xe: MsgType0x210SubMsgType0xe? = null,
@ProtoId(5) val stMsgInfo0x13: MsgType0x210SubMsgType0x13? = null, @JceId(5) val stMsgInfo0x13: MsgType0x210SubMsgType0x13? = null,
@ProtoId(6) val stMsgInfo0x17: MsgType0x210SubMsgType0x17? = null, @JceId(6) val stMsgInfo0x17: MsgType0x210SubMsgType0x17? = null,
@ProtoId(7) val stMsgInfo0x20: MsgType0x210SubMsgType0x20? = null, @JceId(7) val stMsgInfo0x20: MsgType0x210SubMsgType0x20? = null,
@ProtoId(8) val stMsgInfo0x1d: MsgType0x210SubMsgType0x1d? = null, @JceId(8) val stMsgInfo0x1d: MsgType0x210SubMsgType0x1d? = null,
@ProtoId(9) val stMsgInfo0x24: MsgType0x210SubMsgType0x24? = null, @JceId(9) val stMsgInfo0x24: MsgType0x210SubMsgType0x24? = null,
@ProtoId(10) val vProtobuf: ByteArray? = null @JceId(10) val vProtobuf: ByteArray? = null
) : JceStruct ) : JceStruct
@Serializable @Serializable
internal class MsgType0x210SubMsgType0x13( internal class MsgType0x210SubMsgType0x13(
@ProtoId(0) val uint32SrcAppId: Long? = null, @JceId(0) val uint32SrcAppId: Long? = null,
@ProtoId(1) val uint32SrcInstId: Long? = null, @JceId(1) val uint32SrcInstId: Long? = null,
@ProtoId(2) val uint32DstAppId: Long? = null, @JceId(2) val uint32DstAppId: Long? = null,
@ProtoId(3) val uint32DstInstId: Long? = null, @JceId(3) val uint32DstInstId: Long? = null,
@ProtoId(4) val uint64DstUin: Long? = null, @JceId(4) val uint64DstUin: Long? = null,
@ProtoId(5) val uint64Sessionid: Long? = null, @JceId(5) val uint64Sessionid: Long? = null,
@ProtoId(6) val uint32Size: Long? = null, @JceId(6) val uint32Size: Long? = null,
@ProtoId(7) val uint32Index: Long? = null, @JceId(7) val uint32Index: Long? = null,
@ProtoId(8) val uint32Type: Long? = null, @JceId(8) val uint32Type: Long? = null,
@ProtoId(9) val buf: ByteArray? = null @JceId(9) val buf: ByteArray? = null
) : JceStruct ) : JceStruct
@Serializable @Serializable
internal class MsgType0x210SubMsgType0x17( internal class MsgType0x210SubMsgType0x17(
@ProtoId(0) val dwOpType: Long? = null, @JceId(0) val dwOpType: Long? = null,
@ProtoId(1) val stAddGroup: AddGroup? = null, @JceId(1) val stAddGroup: AddGroup? = null,
@ProtoId(2) val stDelGroup: DelGroup? = null, @JceId(2) val stDelGroup: DelGroup? = null,
@ProtoId(3) val stModGroupName: ModGroupName? = null, @JceId(3) val stModGroupName: ModGroupName? = null,
@ProtoId(4) val stModGroupSort: ModGroupSort? = null, @JceId(4) val stModGroupSort: ModGroupSort? = null,
@ProtoId(5) val stModFriendGroup: ModFriendGroup? = null @JceId(5) val stModFriendGroup: ModFriendGroup? = null
) : JceStruct ) : JceStruct
@Serializable @Serializable
internal class AddGroup( internal class AddGroup(
@ProtoId(0) val dwGroupID: Long? = null, @JceId(0) val dwGroupID: Long? = null,
@ProtoId(1) val dwSortID: Long? = null, @JceId(1) val dwSortID: Long? = null,
@ProtoId(2) val groupName: String? = "" @JceId(2) val groupName: String? = ""
) : JceStruct ) : JceStruct
@Serializable @Serializable
internal class DelGroup( internal class DelGroup(
@ProtoId(0) val dwGroupID: Long? = null @JceId(0) val dwGroupID: Long? = null
) : JceStruct ) : JceStruct
@Serializable @Serializable
internal class ModFriendGroup( internal class ModFriendGroup(
@ProtoId(0) val vMsgFrdGroup: List<FriendGroup>? = null @JceId(0) val vMsgFrdGroup: List<FriendGroup>? = null
) : JceStruct ) : JceStruct
@Serializable @Serializable
internal class FriendGroup( internal class FriendGroup(
@ProtoId(0) val dwFuin: Long? = null, @JceId(0) val dwFuin: Long? = null,
@ProtoId(1) val vOldGroupID: List<Long>? = null, @JceId(1) val vOldGroupID: List<Long>? = null,
@ProtoId(2) val vNewGroupID: List<Long>? = null @JceId(2) val vNewGroupID: List<Long>? = null
) : JceStruct ) : JceStruct
@Serializable @Serializable
internal class ModGroupName( internal class ModGroupName(
@ProtoId(0) val dwGroupID: Long? = null, @JceId(0) val dwGroupID: Long? = null,
@ProtoId(1) val groupName: String? = "" @JceId(1) val groupName: String? = ""
) : JceStruct ) : JceStruct
@Serializable @Serializable
internal class ModGroupSort( internal class ModGroupSort(
@ProtoId(0) val vMsgGroupSort: List<GroupSort>? = null @JceId(0) val vMsgGroupSort: List<GroupSort>? = null
) : JceStruct ) : JceStruct
@Serializable @Serializable
internal class GroupSort( internal class GroupSort(
@ProtoId(0) val dwGroupID: Long? = null, @JceId(0) val dwGroupID: Long? = null,
@ProtoId(1) val dwSortID: Long? = null @JceId(1) val dwSortID: Long? = null
) : JceStruct ) : JceStruct
@Serializable @Serializable
internal class MsgType0x210SubMsgType0x1d( internal class MsgType0x210SubMsgType0x1d(
@ProtoId(0) val dwOpType: Long? = null, @JceId(0) val dwOpType: Long? = null,
@ProtoId(1) val dwUin: Long? = null, @JceId(1) val dwUin: Long? = null,
@ProtoId(2) val dwID: Long? = null, @JceId(2) val dwID: Long? = null,
@ProtoId(3) val value: String? = "" @JceId(3) val value: String? = ""
) : JceStruct ) : JceStruct
@Serializable @Serializable
internal class MsgType0x210SubMsgType0x2( internal class MsgType0x210SubMsgType0x2(
@ProtoId(0) val uSrcAppId: Long? = null, @JceId(0) val uSrcAppId: Long? = null,
@ProtoId(1) val uSrcInstId: Long? = null, @JceId(1) val uSrcInstId: Long? = null,
@ProtoId(2) val uDstAppId: Long? = null, @JceId(2) val uDstAppId: Long? = null,
@ProtoId(3) val uDstInstId: Long? = null, @JceId(3) val uDstInstId: Long? = null,
@ProtoId(4) val uDstUin: Long? = null, @JceId(4) val uDstUin: Long? = null,
@ProtoId(5) val fileName: ByteArray? = null, @JceId(5) val fileName: ByteArray? = null,
@ProtoId(6) val fileIndex: ByteArray? = null, @JceId(6) val fileIndex: ByteArray? = null,
@ProtoId(7) val fileMd5: ByteArray? = null, @JceId(7) val fileMd5: ByteArray? = null,
@ProtoId(8) val fileKey: ByteArray? = null, @JceId(8) val fileKey: ByteArray? = null,
@ProtoId(9) val uServerIp: Long? = null, @JceId(9) val uServerIp: Long? = null,
@ProtoId(10) val uServerPort: Long? = null, @JceId(10) val uServerPort: Long? = null,
@ProtoId(11) val fileLen: Long? = null, @JceId(11) val fileLen: Long? = null,
@ProtoId(12) val sessionId: Long? = null, @JceId(12) val sessionId: Long? = null,
@ProtoId(13) val originfileMd5: ByteArray? = null, @JceId(13) val originfileMd5: ByteArray? = null,
@ProtoId(14) val uOriginfiletype: Long? = null, @JceId(14) val uOriginfiletype: Long? = null,
@ProtoId(15) val uSeq: Long? = null @JceId(15) val uSeq: Long? = null
) : JceStruct ) : JceStruct
@Serializable @Serializable
internal class MsgType0x210SubMsgType0x20( internal class MsgType0x210SubMsgType0x20(
@ProtoId(0) val dwOpType: Long? = null, @JceId(0) val dwOpType: Long? = null,
@ProtoId(1) val dwType: Long? = null, @JceId(1) val dwType: Long? = null,
@ProtoId(2) val dwUin: Long? = null, @JceId(2) val dwUin: Long? = null,
@ProtoId(3) val remaek: String? = "" @JceId(3) val remaek: String? = ""
) : JceStruct ) : JceStruct
@Serializable @Serializable
internal class MsgType0x210SubMsgType0x24( internal class MsgType0x210SubMsgType0x24(
@ProtoId(0) val vPluginNumList: List<PluginNum>? = null @JceId(0) val vPluginNumList: List<PluginNum>? = null
) : JceStruct ) : JceStruct
@Serializable @Serializable
internal class PluginNum( internal class PluginNum(
@ProtoId(0) val dwID: Long? = null, @JceId(0) val dwID: Long? = null,
@ProtoId(1) val dwNUm: Long? = null, @JceId(1) val dwNUm: Long? = null,
@ProtoId(2) val flag: Byte? = null @JceId(2) val flag: Byte? = null
) : JceStruct ) : JceStruct
@Serializable @Serializable
internal class MsgType0x210SubMsgType0xa( internal class MsgType0x210SubMsgType0xa(
@ProtoId(0) val uSrcAppId: Long? = null, @JceId(0) val uSrcAppId: Long? = null,
@ProtoId(1) val uSrcInstId: Long? = null, @JceId(1) val uSrcInstId: Long? = null,
@ProtoId(2) val uDstAppId: Long? = null, @JceId(2) val uDstAppId: Long? = null,
@ProtoId(3) val uDstInstId: Long? = null, @JceId(3) val uDstInstId: Long? = null,
@ProtoId(4) val uDstUin: Long? = null, @JceId(4) val uDstUin: Long? = null,
@ProtoId(5) val uType: Long? = null, @JceId(5) val uType: Long? = null,
@ProtoId(6) val uServerIp: Long? = null, @JceId(6) val uServerIp: Long? = null,
@ProtoId(7) val uServerPort: Long? = null, @JceId(7) val uServerPort: Long? = null,
@ProtoId(8) val vUrlNotify: ByteArray? = null, @JceId(8) val vUrlNotify: ByteArray? = null,
@ProtoId(9) val vTokenKey: ByteArray? = null, @JceId(9) val vTokenKey: ByteArray? = null,
@ProtoId(10) val uFileLen: Long? = null, @JceId(10) val uFileLen: Long? = null,
@ProtoId(11) val fileName: ByteArray? = null, @JceId(11) val fileName: ByteArray? = null,
@ProtoId(12) val vMd5: ByteArray? = null, @JceId(12) val vMd5: ByteArray? = null,
@ProtoId(13) val sessionId: Long? = null, @JceId(13) val sessionId: Long? = null,
@ProtoId(14) val originfileMd5: ByteArray? = null, @JceId(14) val originfileMd5: ByteArray? = null,
@ProtoId(15) val uOriginfiletype: Long? = null, @JceId(15) val uOriginfiletype: Long? = null,
@ProtoId(16) val uSeq: Long? = null @JceId(16) val uSeq: Long? = null
) : JceStruct ) : JceStruct
@Serializable @Serializable
internal class MsgType0x210SubMsgType0xe( internal class MsgType0x210SubMsgType0xe(
@ProtoId(0) val uint32SrcAppId: Long? = null, @JceId(0) val uint32SrcAppId: Long? = null,
@ProtoId(1) val uint32SrcInstId: Long? = null, @JceId(1) val uint32SrcInstId: Long? = null,
@ProtoId(2) val uint32DstAppId: Long? = null, @JceId(2) val uint32DstAppId: Long? = null,
@ProtoId(3) val uint32DstInstId: Long? = null, @JceId(3) val uint32DstInstId: Long? = null,
@ProtoId(4) val uint64DstUin: Long? = null, @JceId(4) val uint64DstUin: Long? = null,
@ProtoId(5) val uint64Sessionid: Long? = null, @JceId(5) val uint64Sessionid: Long? = null,
@ProtoId(6) val uint32Operate: Long? = null, @JceId(6) val uint32Operate: Long? = null,
@ProtoId(7) val uint32Seq: Long? = null, @JceId(7) val uint32Seq: Long? = null,
@ProtoId(8) val uint32Code: Long? = null, @JceId(8) val uint32Code: Long? = null,
@ProtoId(9) val msg: String? = "" @JceId(9) val msg: String? = ""
) : JceStruct ) : JceStruct
} }
\ No newline at end of file
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/PushNotifyPack.kt
View file @ ce7af37e
...@@ -10,71 +10,71 @@ ...@@ -10,71 +10,71 @@
package net.mamoe.mirai.qqandroid.network.protocol.data.jce package net.mamoe.mirai.qqandroid.network.protocol.data.jce
import kotlinx.serialization.Serializable import kotlinx.serialization.Serializable
import kotlinx.serialization.protobuf.ProtoId
import net.mamoe.mirai.data.Packet import net.mamoe.mirai.data.Packet
import net.mamoe.mirai.qqandroid.io.JceStruct import net.mamoe.mirai.qqandroid.io.JceStruct
import net.mamoe.mirai.qqandroid.io.serialization.jce.JceId
import net.mamoe.mirai.qqandroid.network.protocol.packet.EMPTY_BYTE_ARRAY import net.mamoe.mirai.qqandroid.network.protocol.packet.EMPTY_BYTE_ARRAY
@Suppress("ArrayInDataClass") @Suppress("ArrayInDataClass")
@Serializable @Serializable
internal data class RequestPushNotify( internal data class RequestPushNotify(
@ProtoId(0) val uin: Long? = 0L, @JceId(0) val uin: Long? = 0L,
@ProtoId(1) val ctype: Byte = 0, @JceId(1) val ctype: Byte = 0,
@ProtoId(2) val strService: String?, @JceId(2) val strService: String?,
@ProtoId(3) val strCmd: String?, @JceId(3) val strCmd: String?,
@ProtoId(4) val vNotifyCookie: ByteArray? = EMPTY_BYTE_ARRAY, @JceId(4) val vNotifyCookie: ByteArray? = EMPTY_BYTE_ARRAY,
@ProtoId(5) val usMsgType: Int?, @JceId(5) val usMsgType: Int?,
@ProtoId(6) val wUserActive: Int?, @JceId(6) val wUserActive: Int?,
@ProtoId(7) val wGeneralFlag: Int?, @JceId(7) val wGeneralFlag: Int?,
@ProtoId(8) val bindedUin: Long?, @JceId(8) val bindedUin: Long?,
@ProtoId(9) val stMsgInfo: MsgInfo?, @JceId(9) val stMsgInfo: MsgInfo?,
@ProtoId(10) val msgCtrlBuf: String?, @JceId(10) val msgCtrlBuf: String?,
@ProtoId(11) val serverBuf: ByteArray?, @JceId(11) val serverBuf: ByteArray?,
@ProtoId(12) val pingFlag: Long?, @JceId(12) val pingFlag: Long?,
@ProtoId(13) val svrip: Int? @JceId(13) val svrip: Int?
) : JceStruct, Packet ) : JceStruct, Packet
@Serializable @Serializable
internal class MsgInfo( internal class MsgInfo(
@ProtoId(0) val lFromUin: Long? = 0L, @JceId(0) val lFromUin: Long? = 0L,
@ProtoId(1) val uMsgTime: Long? = 0L, @JceId(1) val uMsgTime: Long? = 0L,
@ProtoId(2) val shMsgType: Short, @JceId(2) val shMsgType: Short,
@ProtoId(3) val shMsgSeq: Short, @JceId(3) val shMsgSeq: Short,
@ProtoId(4) val strMsg: String?, @JceId(4) val strMsg: String?,
@ProtoId(5) val uRealMsgTime: Int?, @JceId(5) val uRealMsgTime: Int?,
@ProtoId(6) val vMsg: ByteArray?, @JceId(6) val vMsg: ByteArray?,
@ProtoId(7) val uAppShareID: Long?, @JceId(7) val uAppShareID: Long?,
@ProtoId(8) val vMsgCookies: ByteArray? = EMPTY_BYTE_ARRAY, @JceId(8) val vMsgCookies: ByteArray? = EMPTY_BYTE_ARRAY,
@ProtoId(9) val vAppShareCookie: ByteArray? = EMPTY_BYTE_ARRAY, @JceId(9) val vAppShareCookie: ByteArray? = EMPTY_BYTE_ARRAY,
@ProtoId(10) val lMsgUid: Long?, @JceId(10) val lMsgUid: Long?,
@ProtoId(11) val lLastChangeTime: Long?, @JceId(11) val lLastChangeTime: Long?,
@ProtoId(12) val vCPicInfo: List<CPicInfo>?, @JceId(12) val vCPicInfo: List<CPicInfo>?,
@ProtoId(13) val stShareData: ShareData?, @JceId(13) val stShareData: ShareData?,
@ProtoId(14) val lFromInstId: Long?, @JceId(14) val lFromInstId: Long?,
@ProtoId(15) val vRemarkOfSender: ByteArray?, @JceId(15) val vRemarkOfSender: ByteArray?,
@ProtoId(16) val strFromMobile: String?, @JceId(16) val strFromMobile: String?,
@ProtoId(17) val strFromName: String?, @JceId(17) val strFromName: String?,
@ProtoId(18) val vNickName: List<String>?//, @JceId(18) val vNickName: List<String>?//,
//@SerialId(19) val stC2CTmpMsgHead: TempMsgHead? //@SerialId(19) val stC2CTmpMsgHead: TempMsgHead?
) : JceStruct ) : JceStruct
@Serializable @Serializable
internal class ShareData( internal class ShareData(
@ProtoId(0) val pkgname: String = "", @JceId(0) val pkgname: String = "",
@ProtoId(1) val msgtail: String = "", @JceId(1) val msgtail: String = "",
@ProtoId(2) val picurl: String = "", @JceId(2) val picurl: String = "",
@ProtoId(3) val url: String = "" @JceId(3) val url: String = ""
) : JceStruct ) : JceStruct
@Serializable @Serializable
internal class TempMsgHead( internal class TempMsgHead(
@ProtoId(0) val c2c_type: Int? = 0, @JceId(0) val c2c_type: Int? = 0,
@ProtoId(1) val serviceType: Int? = 0 @JceId(1) val serviceType: Int? = 0
) : JceStruct ) : JceStruct
@Serializable @Serializable
internal class CPicInfo( internal class CPicInfo(
@ProtoId(0) val vPath: ByteArray = EMPTY_BYTE_ARRAY, @JceId(0) val vPath: ByteArray = EMPTY_BYTE_ARRAY,
@ProtoId(1) val vHost: ByteArray? = EMPTY_BYTE_ARRAY @JceId(1) val vHost: ByteArray? = EMPTY_BYTE_ARRAY
) : JceStruct ) : JceStruct
\ No newline at end of file
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/RequestPacket.kt
View file @ ce7af37e
...@@ -10,37 +10,37 @@ ...@@ -10,37 +10,37 @@
package net.mamoe.mirai.qqandroid.network.protocol.data.jce package net.mamoe.mirai.qqandroid.network.protocol.data.jce
import kotlinx.serialization.Serializable import kotlinx.serialization.Serializable
import kotlinx.serialization.protobuf.ProtoId
import net.mamoe.mirai.qqandroid.io.JceStruct import net.mamoe.mirai.qqandroid.io.JceStruct
import net.mamoe.mirai.qqandroid.io.serialization.jce.JceId
import net.mamoe.mirai.qqandroid.network.protocol.packet.EMPTY_BYTE_ARRAY import net.mamoe.mirai.qqandroid.network.protocol.packet.EMPTY_BYTE_ARRAY
private val EMPTY_MAP = mapOf<String, String>() private val EMPTY_MAP = mapOf<String, String>()
@Serializable @Serializable
internal class RequestPacket( internal class RequestPacket(
@ProtoId(1) val iVersion: Short? = 3, @JceId(1) val iVersion: Short? = 3,
@ProtoId(2) val cPacketType: Byte = 0, @JceId(2) val cPacketType: Byte = 0,
@ProtoId(3) val iMessageType: Int = 0, @JceId(3) val iMessageType: Int = 0,
@ProtoId(4) val iRequestId: Int, @JceId(4) val iRequestId: Int,
@ProtoId(5) val sServantName: String = "", @JceId(5) val sServantName: String = "",
@ProtoId(6) val sFuncName: String = "", @JceId(6) val sFuncName: String = "",
@ProtoId(7) val sBuffer: ByteArray = EMPTY_BYTE_ARRAY, @JceId(7) val sBuffer: ByteArray = EMPTY_BYTE_ARRAY,
@ProtoId(8) val iTimeout: Int? = 0, @JceId(8) val iTimeout: Int? = 0,
@ProtoId(9) val context: Map<String, String>? = EMPTY_MAP, @JceId(9) val context: Map<String, String>? = EMPTY_MAP,
@ProtoId(10) val status: Map<String, String>? = EMPTY_MAP @JceId(10) val status: Map<String, String>? = EMPTY_MAP
) : JceStruct ) : JceStruct
@Serializable @Serializable
internal class RequestDataVersion3( internal class RequestDataVersion3(
@ProtoId(0) val map: Map<String, ByteArray> // 注意: ByteArray 不能直接放序列化的 JceStruct!! 要放类似 RequestDataStructSvcReqRegister 的 @JceId(0) val map: Map<String, ByteArray> // 注意: ByteArray 不能直接放序列化的 JceStruct!! 要放类似 RequestDataStructSvcReqRegister 的
) : JceStruct ) : JceStruct
@Serializable @Serializable
internal class RequestDataVersion2( internal class RequestDataVersion2(
@ProtoId(0) val map: Map<String, Map<String, ByteArray>> @JceId(0) val map: Map<String, Map<String, ByteArray>>
) : JceStruct ) : JceStruct
@Serializable @Serializable
internal class RequestDataStructSvcReqRegister( internal class RequestDataStructSvcReqRegister(
@ProtoId(0) val struct: SvcReqRegister @JceId(0) val struct: SvcReqRegister
) : JceStruct ) : JceStruct
\ No newline at end of file
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/RequestPushForceOffline.kt
View file @ ce7af37e
...@@ -12,11 +12,12 @@ package net.mamoe.mirai.qqandroid.network.protocol.data.jce ...@@ -12,11 +12,12 @@ package net.mamoe.mirai.qqandroid.network.protocol.data.jce
import kotlinx.serialization.Serializable import kotlinx.serialization.Serializable
import kotlinx.serialization.protobuf.ProtoId import kotlinx.serialization.protobuf.ProtoId
import net.mamoe.mirai.qqandroid.io.JceStruct import net.mamoe.mirai.qqandroid.io.JceStruct
import net.mamoe.mirai.qqandroid.io.serialization.jce.JceId
@Serializable @Serializable
internal class RequestPushForceOffline( internal class RequestPushForceOffline(
@ProtoId(0) val uin: Long, @JceId(0) val uin: Long,
@ProtoId(1) val title: String? = "", @JceId(1) val title: String? = "",
@ProtoId(2) val tips: String? = "", @JceId(2) val tips: String? = "",
@ProtoId(3) val sameDevice: Byte? = null @JceId(3) val sameDevice: Byte? = null
) : JceStruct ) : JceStruct
\ No newline at end of file
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/SvcReqRegister.kt
View file @ ce7af37e
...@@ -10,46 +10,46 @@ ...@@ -10,46 +10,46 @@
package net.mamoe.mirai.qqandroid.network.protocol.data.jce package net.mamoe.mirai.qqandroid.network.protocol.data.jce
import kotlinx.serialization.Serializable import kotlinx.serialization.Serializable
import kotlinx.serialization.protobuf.ProtoId
import net.mamoe.mirai.qqandroid.io.JceStruct import net.mamoe.mirai.qqandroid.io.JceStruct
import net.mamoe.mirai.qqandroid.io.serialization.jce.JceId
@Serializable @Serializable
internal class SvcReqRegister( internal class SvcReqRegister(
@ProtoId(0) val lUin: Long = 0L, @JceId(0) val lUin: Long = 0L,
@ProtoId(1) val lBid: Long = 0L, @JceId(1) val lBid: Long = 0L,
@ProtoId(2) val cConnType: Byte = 0, @JceId(2) val cConnType: Byte = 0,
@ProtoId(3) val sOther: String = "", @JceId(3) val sOther: String = "",
@ProtoId(4) val iStatus: Int = 11, @JceId(4) val iStatus: Int = 11,
@ProtoId(5) val bOnlinePush: Byte = 0, @JceId(5) val bOnlinePush: Byte = 0,
@ProtoId(6) val bIsOnline: Byte = 0, @JceId(6) val bIsOnline: Byte = 0,
@ProtoId(7) val bIsShowOnline: Byte = 0, @JceId(7) val bIsShowOnline: Byte = 0,
@ProtoId(8) val bKikPC: Byte = 0, @JceId(8) val bKikPC: Byte = 0,
@ProtoId(9) val bKikWeak: Byte = 0, @JceId(9) val bKikWeak: Byte = 0,
@ProtoId(10) val timeStamp: Long = 0L, @JceId(10) val timeStamp: Long = 0L,
@ProtoId(11) val iOSVersion: Long = 0L, @JceId(11) val iOSVersion: Long = 0L,
@ProtoId(12) val cNetType: Byte = 0, @JceId(12) val cNetType: Byte = 0,
@ProtoId(13) val sBuildVer: String? = "", @JceId(13) val sBuildVer: String? = "",
@ProtoId(14) val bRegType: Byte = 0, @JceId(14) val bRegType: Byte = 0,
@ProtoId(15) val vecDevParam: ByteArray? = null, @JceId(15) val vecDevParam: ByteArray? = null,
@ProtoId(16) val vecGuid: ByteArray? = null, @JceId(16) val vecGuid: ByteArray? = null,
@ProtoId(17) val iLocaleID: Int = 2052, @JceId(17) val iLocaleID: Int = 2052,
@ProtoId(18) val bSlientPush: Byte = 0, @JceId(18) val bSlientPush: Byte = 0,
@ProtoId(19) val strDevName: String? = null, @JceId(19) val strDevName: String? = null,
@ProtoId(20) val strDevType: String? = null, @JceId(20) val strDevType: String? = null,
@ProtoId(21) val strOSVer: String? = null, @JceId(21) val strOSVer: String? = null,
@ProtoId(22) val bOpenPush: Byte = 1, @JceId(22) val bOpenPush: Byte = 1,
@ProtoId(23) val iLargeSeq: Long = 0L, @JceId(23) val iLargeSeq: Long = 0L,
@ProtoId(24) val iLastWatchStartTime: Long = 0L, @JceId(24) val iLastWatchStartTime: Long = 0L,
@ProtoId(26) val uOldSSOIp: Long = 0L, @JceId(26) val uOldSSOIp: Long = 0L,
@ProtoId(27) val uNewSSOIp: Long = 0L, @JceId(27) val uNewSSOIp: Long = 0L,
@ProtoId(28) val sChannelNo: String? = null, @JceId(28) val sChannelNo: String? = null,
@ProtoId(29) val lCpId: Long = 0L, @JceId(29) val lCpId: Long = 0L,
@ProtoId(30) val strVendorName: String? = null, @JceId(30) val strVendorName: String? = null,
@ProtoId(31) val strVendorOSName: String? = null, @JceId(31) val strVendorOSName: String? = null,
@ProtoId(32) val strIOSIdfa: String? = null, @JceId(32) val strIOSIdfa: String? = null,
@ProtoId(33) val bytes_0x769_reqbody: ByteArray? = null, @JceId(33) val bytes_0x769_reqbody: ByteArray? = null,
@ProtoId(34) val bIsSetStatus: Byte = 0, @JceId(34) val bIsSetStatus: Byte = 0,
@ProtoId(35) val vecServerBuf: ByteArray? = null, @JceId(35) val vecServerBuf: ByteArray? = null,
@ProtoId(36) val bSetMute: Byte = 0 @JceId(36) val bSetMute: Byte = 0
// @SerialId(25) var vecBindUin: ArrayList<*>? = null // ?? 未知泛型 // @SerialId(25) var vecBindUin: ArrayList<*>? = null // ?? 未知泛型
) : JceStruct ) : JceStruct
\ No newline at end of file
mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/TroopList.kt
View file @ ce7af37e
...@@ -10,182 +10,182 @@ ...@@ -10,182 +10,182 @@
package net.mamoe.mirai.qqandroid.network.protocol.data.jce package net.mamoe.mirai.qqandroid.network.protocol.data.jce
import kotlinx.serialization.Serializable import kotlinx.serialization.Serializable
import kotlinx.serialization.protobuf.ProtoId
import net.mamoe.mirai.qqandroid.io.JceStruct import net.mamoe.mirai.qqandroid.io.JceStruct
import net.mamoe.mirai.qqandroid.io.serialization.jce.JceId
@Serializable @Serializable
internal class GetTroopListReqV2Simplify( internal class GetTroopListReqV2Simplify(
@ProtoId(0) val uin: Long, @JceId(0) val uin: Long,
@ProtoId(1) val getMSFMsgFlag: Byte? = null, @JceId(1) val getMSFMsgFlag: Byte? = null,
@ProtoId(2) val vecCookies: ByteArray? = null, @JceId(2) val vecCookies: ByteArray? = null,
@ProtoId(3) val vecGroupInfo: List<StTroopNumSimplify>? = null, @JceId(3) val vecGroupInfo: List<StTroopNumSimplify>? = null,
@ProtoId(4) val groupFlagExt: Byte? = null, @JceId(4) val groupFlagExt: Byte? = null,
@ProtoId(5) val shVersion: Int? = null, @JceId(5) val shVersion: Int? = null,
@ProtoId(6) val dwCompanyId: Long? = null, @JceId(6) val dwCompanyId: Long? = null,
@ProtoId(7) val versionNum: Long? = null, @JceId(7) val versionNum: Long? = null,
@ProtoId(8) val getLongGroupName: Byte? = null @JceId(8) val getLongGroupName: Byte? = null
) : JceStruct ) : JceStruct
@Serializable @Serializable
internal class StTroopNumSimplify( internal class StTroopNumSimplify(
@ProtoId(0) val groupCode: Long, @JceId(0) val groupCode: Long,
@ProtoId(1) val dwGroupInfoSeq: Long? = null, @JceId(1) val dwGroupInfoSeq: Long? = null,
@ProtoId(2) val dwGroupFlagExt: Long? = null, @JceId(2) val dwGroupFlagExt: Long? = null,
@ProtoId(3) val dwGroupRankSeq: Long? = null @JceId(3) val dwGroupRankSeq: Long? = null
) : JceStruct ) : JceStruct
@Serializable @Serializable
internal class GetTroopListRespV2( internal class GetTroopListRespV2(
@ProtoId(0) val uin: Long, @JceId(0) val uin: Long,
@ProtoId(1) val troopCount: Short, @JceId(1) val troopCount: Short,
@ProtoId(2) val result: Int, @JceId(2) val result: Int,
@ProtoId(3) val errorCode: Short? = null, @JceId(3) val errorCode: Short? = null,
@ProtoId(4) val vecCookies: ByteArray? = null, @JceId(4) val vecCookies: ByteArray? = null,
@ProtoId(5) val vecTroopList: List<StTroopNum>? = null, @JceId(5) val vecTroopList: List<StTroopNum>? = null,
@ProtoId(6) val vecTroopListDel: List<StTroopNum>? = null, @JceId(6) val vecTroopListDel: List<StTroopNum>? = null,
@ProtoId(7) val vecTroopRank: List<StGroupRankInfo>? = null, @JceId(7) val vecTroopRank: List<StGroupRankInfo>? = null,
@ProtoId(8) val vecFavGroup: List<StFavoriteGroup>? = null, @JceId(8) val vecFavGroup: List<StFavoriteGroup>? = null,
@ProtoId(9) val vecTroopListExt: List<StTroopNum>? = null @JceId(9) val vecTroopListExt: List<StTroopNum>? = null
) : JceStruct ) : JceStruct
@Serializable @Serializable
internal class StTroopNum( internal class StTroopNum(
@ProtoId(0) val groupUin: Long, @JceId(0) val groupUin: Long,
@ProtoId(1) val groupCode: Long, @JceId(1) val groupCode: Long,
@ProtoId(2) val flag: Byte? = null, @JceId(2) val flag: Byte? = null,
@ProtoId(3) val dwGroupInfoSeq: Long? = null, @JceId(3) val dwGroupInfoSeq: Long? = null,
@ProtoId(4) val groupName: String = "", @JceId(4) val groupName: String = "",
@ProtoId(5) val groupMemo: String = "", @JceId(5) val groupMemo: String = "",
@ProtoId(6) val dwGroupFlagExt: Long? = null, @JceId(6) val dwGroupFlagExt: Long? = null,
@ProtoId(7) val dwGroupRankSeq: Long? = null, @JceId(7) val dwGroupRankSeq: Long? = null,
@ProtoId(8) val dwCertificationType: Long? = null, @JceId(8) val dwCertificationType: Long? = null,
@ProtoId(9) val dwShutUpTimestamp: Long? = null, @JceId(9) val dwShutUpTimestamp: Long? = null,
@ProtoId(10) val dwMyShutUpTimestamp: Long? = null, @JceId(10) val dwMyShutUpTimestamp: Long? = null,
@ProtoId(11) val dwCmdUinUinFlag: Long? = null, @JceId(11) val dwCmdUinUinFlag: Long? = null,
@ProtoId(12) val dwAdditionalFlag: Long? = null, @JceId(12) val dwAdditionalFlag: Long? = null,
@ProtoId(13) val dwGroupTypeFlag: Long? = null, @JceId(13) val dwGroupTypeFlag: Long? = null,
@ProtoId(14) val dwGroupSecType: Long? = null, @JceId(14) val dwGroupSecType: Long? = null,
@ProtoId(15) val dwGroupSecTypeInfo: Long? = null, @JceId(15) val dwGroupSecTypeInfo: Long? = null,
@ProtoId(16) val dwGroupClassExt: Long? = null, @JceId(16) val dwGroupClassExt: Long? = null,
@ProtoId(17) val dwAppPrivilegeFlag: Long? = null, @JceId(17) val dwAppPrivilegeFlag: Long? = null,
@ProtoId(18) val dwSubscriptionUin: Long? = null, @JceId(18) val dwSubscriptionUin: Long? = null,
@ProtoId(19) val dwMemberNum: Long? = null, @JceId(19) val dwMemberNum: Long? = null,
@ProtoId(20) val dwMemberNumSeq: Long? = null, @JceId(20) val dwMemberNumSeq: Long? = null,
@ProtoId(21) val dwMemberCardSeq: Long? = null, @JceId(21) val dwMemberCardSeq: Long? = null,
@ProtoId(22) val dwGroupFlagExt3: Long? = null, @JceId(22) val dwGroupFlagExt3: Long? = null,
@ProtoId(23) val dwGroupOwnerUin: Long, @JceId(23) val dwGroupOwnerUin: Long,
@ProtoId(24) val isConfGroup: Byte? = null, @JceId(24) val isConfGroup: Byte? = null,
@ProtoId(25) val isModifyConfGroupFace: Byte? = null, @JceId(25) val isModifyConfGroupFace: Byte? = null,
@ProtoId(26) val isModifyConfGroupName: Byte? = null, @JceId(26) val isModifyConfGroupName: Byte? = null,
@ProtoId(27) val dwCmduinJoinTime: Long? = null, @JceId(27) val dwCmduinJoinTime: Long? = null,
@ProtoId(28) val ulCompanyId: Long? = null, @JceId(28) val ulCompanyId: Long? = null,
@ProtoId(29) val dwMaxGroupMemberNum: Long? = null, @JceId(29) val dwMaxGroupMemberNum: Long? = null,
@ProtoId(30) val dwCmdUinGroupMask: Long? = null, @JceId(30) val dwCmdUinGroupMask: Long? = null,
@ProtoId(31) val udwHLGuildAppid: Long? = null, @JceId(31) val udwHLGuildAppid: Long? = null,
@ProtoId(32) val udwHLGuildSubType: Long? = null, @JceId(32) val udwHLGuildSubType: Long? = null,
@ProtoId(33) val udwCmdUinRingtoneID: Long? = null, @JceId(33) val udwCmdUinRingtoneID: Long? = null,
@ProtoId(34) val udwCmdUinFlagEx2: Long? = null @JceId(34) val udwCmdUinFlagEx2: Long? = null
) : JceStruct ) : JceStruct
@Serializable @Serializable
internal class StGroupRankInfo( internal class StGroupRankInfo(
@ProtoId(0) val dwGroupCode: Long, @JceId(0) val dwGroupCode: Long,
@ProtoId(1) val groupRankSysFlag: Byte? = null, @JceId(1) val groupRankSysFlag: Byte? = null,
@ProtoId(2) val groupRankUserFlag: Byte? = null, @JceId(2) val groupRankUserFlag: Byte? = null,
@ProtoId(3) val vecRankMap: List<StLevelRankPair>? = null, @JceId(3) val vecRankMap: List<StLevelRankPair>? = null,
@ProtoId(4) val dwGroupRankSeq: Long? = null, @JceId(4) val dwGroupRankSeq: Long? = null,
@ProtoId(5) val ownerName: String? = "", @JceId(5) val ownerName: String? = "",
@ProtoId(6) val adminName: String? = "", @JceId(6) val adminName: String? = "",
@ProtoId(7) val dwOfficeMode: Long? = null @JceId(7) val dwOfficeMode: Long? = null
) : JceStruct ) : JceStruct
@Serializable @Serializable
internal class StFavoriteGroup( internal class StFavoriteGroup(
@ProtoId(0) val dwGroupCode: Long, @JceId(0) val dwGroupCode: Long,
@ProtoId(1) val dwTimestamp: Long? = null, @JceId(1) val dwTimestamp: Long? = null,
@ProtoId(2) val dwSnsFlag: Long? = 1L, @JceId(2) val dwSnsFlag: Long? = 1L,
@ProtoId(3) val dwOpenTimestamp: Long? = null @JceId(3) val dwOpenTimestamp: Long? = null
) : JceStruct ) : JceStruct
@Serializable @Serializable
internal class StLevelRankPair( internal class StLevelRankPair(
@ProtoId(0) val dwLevel: Long? = null, @JceId(0) val dwLevel: Long? = null,
@ProtoId(1) val rank: String? = "" @JceId(1) val rank: String? = ""
) : JceStruct ) : JceStruct
@Serializable @Serializable
internal class GetTroopMemberListReq( internal class GetTroopMemberListReq(
@ProtoId(0) val uin: Long, @JceId(0) val uin: Long,
@ProtoId(1) val groupCode: Long, @JceId(1) val groupCode: Long,
@ProtoId(2) val nextUin: Long, @JceId(2) val nextUin: Long,
@ProtoId(3) val groupUin: Long, @JceId(3) val groupUin: Long,
@ProtoId(4) val version: Long? = null, @JceId(4) val version: Long? = null,
@ProtoId(5) val reqType: Long? = null, @JceId(5) val reqType: Long? = null,
@ProtoId(6) val getListAppointTime: Long? = null, @JceId(6) val getListAppointTime: Long? = null,
@ProtoId(7) val richCardNameVer: Byte? = null @JceId(7) val richCardNameVer: Byte? = null
) : JceStruct ) : JceStruct
@Serializable @Serializable
internal class GetTroopMemberListResp( internal class GetTroopMemberListResp(
@ProtoId(0) val uin: Long, @JceId(0) val uin: Long,
@ProtoId(1) val groupCode: Long, @JceId(1) val groupCode: Long,
@ProtoId(2) val groupUin: Long, @JceId(2) val groupUin: Long,
@ProtoId(3) val vecTroopMember: List<StTroopMemberInfo>, @JceId(3) val vecTroopMember: List<StTroopMemberInfo>,
@ProtoId(4) val nextUin: Long, @JceId(4) val nextUin: Long,
@ProtoId(5) val result: Int, @JceId(5) val result: Int,
@ProtoId(6) val errorCode: Short? = null, @JceId(6) val errorCode: Short? = null,
@ProtoId(7) val officeMode: Long? = null, @JceId(7) val officeMode: Long? = null,
@ProtoId(8) val nextGetTime: Long? = null @JceId(8) val nextGetTime: Long? = null
) : JceStruct ) : JceStruct
@Serializable @Serializable
internal class StTroopMemberInfo( internal class StTroopMemberInfo(
@ProtoId(0) val memberUin: Long, @JceId(0) val memberUin: Long,
@ProtoId(1) val faceId: Short, @JceId(1) val faceId: Short,
@ProtoId(2) val age: Byte, @JceId(2) val age: Byte,
@ProtoId(3) val gender: Byte, @JceId(3) val gender: Byte,
@ProtoId(4) val nick: String = "", @JceId(4) val nick: String = "",
@ProtoId(5) val status: Byte = 20, @JceId(5) val status: Byte = 20,
@ProtoId(6) val sShowName: String? = null, @JceId(6) val sShowName: String? = null,
@ProtoId(8) val sName: String? = null, @JceId(8) val sName: String? = null,
@ProtoId(9) val cGender: Byte? = null, @JceId(9) val cGender: Byte? = null,
@ProtoId(10) val sPhone: String? = "", @JceId(10) val sPhone: String? = "",
@ProtoId(11) val sEmail: String? = "", @JceId(11) val sEmail: String? = "",
@ProtoId(12) val sMemo: String? = "", @JceId(12) val sMemo: String? = "",
@ProtoId(13) val autoRemark: String? = "", @JceId(13) val autoRemark: String? = "",
@ProtoId(14) val dwMemberLevel: Long? = null, @JceId(14) val dwMemberLevel: Long? = null,
@ProtoId(15) val dwJoinTime: Long? = null, @JceId(15) val dwJoinTime: Long? = null,
@ProtoId(16) val dwLastSpeakTime: Long? = null, @JceId(16) val dwLastSpeakTime: Long? = null,
@ProtoId(17) val dwCreditLevel: Long? = null, @JceId(17) val dwCreditLevel: Long? = null,
@ProtoId(18) val dwFlag: Long? = null, @JceId(18) val dwFlag: Long? = null,
@ProtoId(19) val dwFlagExt: Long? = null, @JceId(19) val dwFlagExt: Long? = null,
@ProtoId(20) val dwPoint: Long? = null, @JceId(20) val dwPoint: Long? = null,
@ProtoId(21) val concerned: Byte? = null, @JceId(21) val concerned: Byte? = null,
@ProtoId(22) val shielded: Byte? = null, @JceId(22) val shielded: Byte? = null,
@ProtoId(23) val sSpecialTitle: String? = "", @JceId(23) val sSpecialTitle: String? = "",
@ProtoId(24) val dwSpecialTitleExpireTime: Long? = null, @JceId(24) val dwSpecialTitleExpireTime: Long? = null,
@ProtoId(25) val job: String? = "", @JceId(25) val job: String? = "",
@ProtoId(26) val apolloFlag: Byte? = null, @JceId(26) val apolloFlag: Byte? = null,
@ProtoId(27) val dwApolloTimestamp: Long? = null, @JceId(27) val dwApolloTimestamp: Long? = null,
@ProtoId(28) val dwGlobalGroupLevel: Long? = null, @JceId(28) val dwGlobalGroupLevel: Long? = null,
@ProtoId(29) val dwTitleId: Long? = null, @JceId(29) val dwTitleId: Long? = null,
@ProtoId(30) val dwShutupTimestap: Long? = null, @JceId(30) val dwShutupTimestap: Long? = null,
@ProtoId(31) val dwGlobalGroupPoint: Long? = null, @JceId(31) val dwGlobalGroupPoint: Long? = null,
@ProtoId(32) val qzusrinfo: QzoneUserInfo? = null, @JceId(32) val qzusrinfo: QzoneUserInfo? = null,
@ProtoId(33) val richCardNameVer: Byte? = null, @JceId(33) val richCardNameVer: Byte? = null,
@ProtoId(34) val dwVipType: Long? = null, @JceId(34) val dwVipType: Long? = null,
@ProtoId(35) val dwVipLevel: Long? = null, @JceId(35) val dwVipLevel: Long? = null,
@ProtoId(36) val dwBigClubLevel: Long? = null, @JceId(36) val dwBigClubLevel: Long? = null,
@ProtoId(37) val dwBigClubFlag: Long? = null, @JceId(37) val dwBigClubFlag: Long? = null,
@ProtoId(38) val dwNameplate: Long? = null, @JceId(38) val dwNameplate: Long? = null,
@ProtoId(39) val vecGroupHonor: ByteArray? = null @JceId(39) val vecGroupHonor: ByteArray? = null
) : JceStruct ) : JceStruct
@Serializable @Serializable
internal class QzoneUserInfo( internal class QzoneUserInfo(
@ProtoId(0) val eStarState: Int? = null, @JceId(0) val eStarState: Int? = null,
@ProtoId(1) val extendInfo: Map<String, String>? = null @JceId(1) val extendInfo: Map<String, String>? = null
) : JceStruct ) : JceStruct
\ No newline at end of file
mirai-core-qqandroid/src/commonTest/kotlin/net.mamoe.mirai.qqandroid.io.serialization/JceInputTest.kt
View file @ ce7af37e
...@@ -6,9 +6,9 @@ import kotlinx.io.core.buildPacket ...@@ -6,9 +6,9 @@ import kotlinx.io.core.buildPacket
import kotlinx.io.core.writeFully import kotlinx.io.core.writeFully
import kotlinx.serialization.MissingFieldException import kotlinx.serialization.MissingFieldException
import kotlinx.serialization.Serializable import kotlinx.serialization.Serializable
import net.mamoe.mirai.qqandroid.io.serialization.jce.Jce
import net.mamoe.mirai.qqandroid.io.serialization.jce.JceId import net.mamoe.mirai.qqandroid.io.serialization.jce.JceId
import net.mamoe.mirai.qqandroid.io.serialization.jce.JceInput import net.mamoe.mirai.qqandroid.io.serialization.jce.JceInput
import net.mamoe.mirai.qqandroid.io.serialization.jce.JceNew
import net.mamoe.mirai.qqandroid.io.serialization.jce.writeJceHead import net.mamoe.mirai.qqandroid.io.serialization.jce.writeJceHead
import kotlin.test.Test import kotlin.test.Test
import kotlin.test.assertEquals import kotlin.test.assertEquals
...@@ -98,7 +98,7 @@ internal class JceInputTest { ...@@ -98,7 +98,7 @@ internal class JceInputTest {
to TestSerializableClassC(123123) to TestSerializableClassC(123123)
) )
), ),
JceNew.UTF_8.load(TestSerializableClassA.serializer(), input) Jce.UTF_8.load(TestSerializableClassA.serializer(), input)
) )
} }
...@@ -155,7 +155,7 @@ internal class JceInputTest { ...@@ -155,7 +155,7 @@ internal class JceInputTest {
5, 5,
TestSerializableClassB(123, TestSerializableClassC(123123), 9) TestSerializableClassB(123, TestSerializableClassC(123123), 9)
), ),
JceNew.UTF_8.load(TestSerializableClassA.serializer(), input) Jce.UTF_8.load(TestSerializableClassA.serializer(), input)
) )
} }
...@@ -194,7 +194,7 @@ internal class JceInputTest { ...@@ -194,7 +194,7 @@ internal class JceInputTest {
} }
} }
assertEquals(TestSerializableClassA(), JceNew.UTF_8.load(TestSerializableClassA.serializer(), input)) assertEquals(TestSerializableClassA(), Jce.UTF_8.load(TestSerializableClassA.serializer(), input))
} }
@Test @Test
...@@ -232,7 +232,70 @@ internal class JceInputTest { ...@@ -232,7 +232,70 @@ internal class JceInputTest {
assertEquals( assertEquals(
TestSerializableClassA(mapOf(1 to 2, 33 to 44)), TestSerializableClassA(mapOf(1 to 2, 33 to 44)),
JceNew.UTF_8.load(TestSerializableClassA.serializer(), input) Jce.UTF_8.load(TestSerializableClassA.serializer(), input)
)
}
@Test
fun testMapStringInt() {
@Serializable
data class TestSerializableClassA(
@JceId(0) val byteArray: Map<String, Int>
)
val input = buildPacket {
writeJceHead(MAP, 0)
mapOf("str1" to 2, "str2" to 44).let {
writeJceHead(BYTE, 0)
writeByte(it.size.toByte())
it.forEach { (key, value) ->
writeJceHead(STRING1, 0)
writeByte(key.length.toByte())
writeStringUtf8(key)
writeJceHead(INT, 1)
writeInt(value)
}
}
}
assertEquals(
TestSerializableClassA(mapOf("str1" to 2, "str2" to 44)),
Jce.UTF_8.load(TestSerializableClassA.serializer(), input)
)
}
@Test
fun testMapStringByteArray() {
@Serializable
data class TestSerializableClassA(
@JceId(0) val byteArray: Map<String, ByteArray>
)
val input = buildPacket {
writeJceHead(MAP, 0)
mapOf("str1" to byteArrayOf(2, 3, 4), "str2" to byteArrayOf(2, 3, 4)).let {
writeJceHead(BYTE, 0)
writeByte(it.size.toByte())
it.forEach { (key, value) ->
writeJceHead(STRING1, 0)
writeByte(key.length.toByte())
writeStringUtf8(key)
writeJceHead(SIMPLE_LIST, 1)
writeJceHead(BYTE, 0)
writeFully(value)
}
}
}
assertEquals(
TestSerializableClassA(mapOf("str1" to byteArrayOf(2, 3, 4), "str2" to byteArrayOf(2, 3, 4))),
Jce.UTF_8.load(TestSerializableClassA.serializer(), input)
) )
} }
...@@ -282,7 +345,7 @@ internal class JceInputTest { ...@@ -282,7 +345,7 @@ internal class JceInputTest {
} }
} }
assertEquals(TestSerializableClassA(), JceNew.UTF_8.load(TestSerializableClassA.serializer(), input)) assertEquals(TestSerializableClassA(), Jce.UTF_8.load(TestSerializableClassA.serializer(), input))
} }
...@@ -319,7 +382,7 @@ internal class JceInputTest { ...@@ -319,7 +382,7 @@ internal class JceInputTest {
writeByte(1) // boolean writeByte(1) // boolean
} }
assertEquals(TestSerializableClassA(), JceNew.UTF_8.load(TestSerializableClassA.serializer(), input)) assertEquals(TestSerializableClassA(), Jce.UTF_8.load(TestSerializableClassA.serializer(), input))
} }
@Test @Test
...@@ -338,7 +401,7 @@ internal class JceInputTest { ...@@ -338,7 +401,7 @@ internal class JceInputTest {
writeShort(123) writeShort(123)
} }
assertFailsWith<MissingFieldException> { JceNew.UTF_8.load(TestSerializableClassA.serializer(), input) } assertFailsWith<MissingFieldException> { Jce.UTF_8.load(TestSerializableClassA.serializer(), input) }
} }
@Test @Test
......
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