Extract JCE serialization to him188/jcekt. close #300

build.gradle.kts

@@ -53,6 +53,7 @@ allprojects {
     repositories {
         maven(url = "https://mirrors.huaweicloud.com/repository/maven")
         maven(url = "https://dl.bintray.com/kotlin/kotlin-eap")
+        maven(url = "https://dl.bintray.com/him188moe/jcekt")
         jcenter()
         google()
     }

buildSrc/src/main/kotlin/Versions.kt

@@ -24,6 +24,8 @@ object Versions {
         const val dokka = "0.10.1"
     }
 
+    const val jcekt = "1.0.0"
+
     object Android {
         const val androidGradlePlugin = "3.5.3"
     }

mirai-core-qqandroid/build.gradle.kts

@@ -51,6 +51,7 @@ kotlin {
                 api(kotlin("stdlib", Versions.Kotlin.stdlib))
                 api(kotlinx("serialization-runtime-common", Versions.Kotlin.serialization))
                 api(kotlinx("serialization-protobuf-common", Versions.Kotlin.serialization))
+                api("moe.him188:jcekt-common:${Versions.jcekt}")
                 api("org.jetbrains.kotlinx:atomicfu:${Versions.Kotlin.atomicFU}")
                 api(kotlinx("io", Versions.Kotlin.io))
                 api(kotlinx("coroutines-io", Versions.Kotlin.coroutinesIo))
@@ -86,6 +87,7 @@ kotlin {
             dependencies {
                 runtimeOnly(files("build/classes/kotlin/jvm/main")) // classpath is not properly set by IDE
                 //    api(kotlinx("coroutines-debug", "1.3.5"))
+                api("moe.him188:jcekt:${Versions.jcekt}")
                 api(kotlinx("serialization-runtime", Versions.Kotlin.serialization))
                 //api(kotlinx("serialization-protobuf", Versions.Kotlin.serialization))
 

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/ConfigPush.kt

@@ -10,9 +10,9 @@
 package net.mamoe.mirai.qqandroid.network.protocol.data.jce
 
 import kotlinx.serialization.Serializable
+import moe.him188.jcekt.JceId
 import net.mamoe.mirai.qqandroid.network.Packet
 import net.mamoe.mirai.qqandroid.utils.io.JceStruct
-import net.mamoe.mirai.qqandroid.utils.io.serialization.jce.JceId
 import kotlin.jvm.JvmField
 
 @Serializable

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/FriendList.kt

@@ -10,8 +10,8 @@
 package net.mamoe.mirai.qqandroid.network.protocol.data.jce
 
 import kotlinx.serialization.Serializable
+import moe.him188.jcekt.JceId
 import net.mamoe.mirai.qqandroid.utils.io.JceStruct
-import net.mamoe.mirai.qqandroid.utils.io.serialization.jce.JceId
 import kotlin.jvm.JvmField
 
 @Serializable

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/GroupMngReq.kt

 package net.mamoe.mirai.qqandroid.network.protocol.data.jce
 
 import kotlinx.serialization.Serializable
+import moe.him188.jcekt.JceId
 import net.mamoe.mirai.qqandroid.utils.io.JceStruct
-import net.mamoe.mirai.qqandroid.utils.io.serialization.jce.JceId
 import kotlin.jvm.JvmField
 
 @Serializable

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/MsgType0x210.kt

 package net.mamoe.mirai.qqandroid.network.protocol.data.jce
 
 import kotlinx.serialization.Serializable
+import moe.him188.jcekt.JceId
 import net.mamoe.mirai.qqandroid.network.protocol.packet.EMPTY_BYTE_ARRAY
 import net.mamoe.mirai.qqandroid.utils.io.JceStruct
-import net.mamoe.mirai.qqandroid.utils.io.serialization.jce.JceId
 import kotlin.jvm.JvmField
 
 @Serializable

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/OnlinePushPack.kt

@@ -10,8 +10,8 @@
 package net.mamoe.mirai.qqandroid.network.protocol.data.jce
 
 import kotlinx.serialization.Serializable
+import moe.him188.jcekt.JceId
 import net.mamoe.mirai.qqandroid.utils.io.JceStruct
-import net.mamoe.mirai.qqandroid.utils.io.serialization.jce.JceId
 import kotlin.jvm.JvmField
 
 internal class OnlinePushPack {

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/PushNotifyPack.kt

@@ -10,10 +10,10 @@
 package net.mamoe.mirai.qqandroid.network.protocol.data.jce
 
 import kotlinx.serialization.Serializable
+import moe.him188.jcekt.JceId
 import net.mamoe.mirai.qqandroid.network.Packet
 import net.mamoe.mirai.qqandroid.network.protocol.packet.EMPTY_BYTE_ARRAY
 import net.mamoe.mirai.qqandroid.utils.io.JceStruct
-import net.mamoe.mirai.qqandroid.utils.io.serialization.jce.JceId
 import kotlin.jvm.JvmField
 
 @Suppress("ArrayInDataClass")

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/RequestMSFForceOffline.kt

 package net.mamoe.mirai.qqandroid.network.protocol.data.jce
 
 import kotlinx.serialization.Serializable
+import moe.him188.jcekt.JceId
 import net.mamoe.mirai.qqandroid.utils.io.JceStruct
-import net.mamoe.mirai.qqandroid.utils.io.serialization.jce.JceId
 import kotlin.jvm.JvmField
 
 @Serializable

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

@@ -10,9 +10,9 @@
 package net.mamoe.mirai.qqandroid.network.protocol.data.jce
 
 import kotlinx.serialization.Serializable
+import moe.him188.jcekt.JceId
 import net.mamoe.mirai.qqandroid.network.protocol.packet.EMPTY_BYTE_ARRAY
 import net.mamoe.mirai.qqandroid.utils.io.JceStruct
-import net.mamoe.mirai.qqandroid.utils.io.serialization.jce.JceId
 import kotlin.jvm.JvmField
 
 private val EMPTY_MAP = mapOf<String, String>()

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/RequestPushForceOffline.kt

@@ -10,8 +10,8 @@
 package net.mamoe.mirai.qqandroid.network.protocol.data.jce
 
 import kotlinx.serialization.Serializable
+import moe.him188.jcekt.JceId
 import net.mamoe.mirai.qqandroid.utils.io.JceStruct
-import net.mamoe.mirai.qqandroid.utils.io.serialization.jce.JceId
 import kotlin.jvm.JvmField
 
 @Serializable

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

@@ -10,8 +10,8 @@
 package net.mamoe.mirai.qqandroid.network.protocol.data.jce
 
 import kotlinx.serialization.Serializable
+import moe.him188.jcekt.JceId
 import net.mamoe.mirai.qqandroid.utils.io.JceStruct
-import net.mamoe.mirai.qqandroid.utils.io.serialization.jce.JceId
 import kotlin.jvm.JvmField
 
 @Serializable

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/jce/TroopList.kt

@@ -10,8 +10,8 @@
 package net.mamoe.mirai.qqandroid.network.protocol.data.jce
 
 import kotlinx.serialization.Serializable
+import moe.him188.jcekt.JceId
 import net.mamoe.mirai.qqandroid.utils.io.JceStruct
-import net.mamoe.mirai.qqandroid.utils.io.serialization.jce.JceId
 import kotlin.jvm.JvmField
 
 @Serializable

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

@@ -10,6 +10,7 @@
 package net.mamoe.mirai.qqandroid.network.protocol.packet.login
 
 import kotlinx.io.core.ByteReadPacket
+import kotlinx.serialization.protobuf.ProtoBuf
 import net.mamoe.mirai.event.events.BotOfflineEvent
 import net.mamoe.mirai.qqandroid.QQAndroidBot
 import net.mamoe.mirai.qqandroid.network.Packet
@@ -151,7 +152,7 @@ internal class StatSvc {
                                 var44.strVendorName = ROMUtil.getRomName();
                                 var44.strVendorOSName = ROMUtil.getRomVersion(20);
                                 */
-                                bytes_0x769_reqbody = ProtoBufWithNullableSupport.dump(
+                                bytes_0x769_reqbody = ProtoBuf.dump(
                                     Oidb0x769.RequestBody.serializer(), Oidb0x769.RequestBody(
                                         rpt_config_list = listOf(
                                             Oidb0x769.ConfigSeq(

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

-package net.mamoe.mirai.qqandroid.utils.io.serialization
-
-import kotlinx.io.core.Input
-import kotlinx.io.core.Output
-import kotlinx.serialization.DeserializationStrategy
-import kotlinx.serialization.SerialFormat
-import kotlinx.serialization.SerializationStrategy
-
-internal interface IOFormat : SerialFormat {
-
-    fun <T> dumpTo(serializer: SerializationStrategy<T>, ojb: T, output: Output)
-
-    fun <T> load(deserializer: DeserializationStrategy<T>, input: Input): T
-}

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

@@ -23,10 +23,13 @@ import kotlinx.serialization.modules.SerialModule
 import kotlinx.serialization.protobuf.ProtoBuf
 import kotlinx.serialization.protobuf.ProtoNumberType
 import kotlinx.serialization.protobuf.ProtoType
+import moe.him188.jcekt.JceId
 import net.mamoe.mirai.qqandroid.utils.io.serialization.ProtoBufWithNullableSupport.Varint.encodeVarint
 
 internal typealias ProtoDesc = Pair<Int, ProtoNumberType>
 
+internal fun getSerialId(desc: SerialDescriptor, index: Int): Int? = desc.findAnnotation<JceId>(index)?.id
+
 internal fun extractParameters(desc: SerialDescriptor, index: Int, zeroBasedDefault: Boolean = false): ProtoDesc {
     val idx = getSerialId(desc, index) ?: (if (zeroBasedDefault) index else index + 1)
     val format = desc.findAnnotation<ProtoType>(index)?.type

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/utils/io/serialization/README.md

-# io.serialization
-
-**序列化支持**
-
-包含:
-- QQ 的 JceStruct 相关的全自动序列化和反序列化: [Jce.kt](jce/JceNew.kt)
-- Protocol Buffers 的 optional 支持: [ProtoBufWithNullableSupport.kt](ProtoBufWithNullableSupport.kt)
-
-其中, `ProtoBufWithNullableSupport` 的绝大部分源码来自 `kotlinx.serialization`. 原著权归该项目作者所有.  
-Mirai 所做的修改已经标记上了 `MIRAI MODIFY START`
\ No newline at end of file

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/utils/io/serialization/jce/JceInput.kt

-/*
- * Copyright 2020 Mamoe Technologies and contributors.
- *
- * 此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证.
- * Use of this source code is governed by the GNU AGPLv3 license that can be found through the following link.
- *
- * https://github.com/mamoe/mirai/blob/master/LICENSE
- */
-
-package net.mamoe.mirai.qqandroid.utils.io.serialization.jce
-
-import kotlinx.io.core.*
-import net.mamoe.mirai.qqandroid.utils.io.readString
-import net.mamoe.mirai.qqandroid.utils.io.serialization.JceCharset
-import net.mamoe.mirai.qqandroid.utils.toUHexString
-
-
-/**
- * Jce Input. 需要手动管理 head.
- */
-internal class JceInput(
-    val input: Input, val charset: JceCharset
-) {
-    private var _head: JceHead? = null
-
-    val currentHead: JceHead get() = _head ?: throw EOFException("No current JceHead available")
-    val currentHeadOrNull: JceHead? get() = _head
-
-    init {
-        prepareNextHead()
-    }
-
-    /**
-     * 读取下一个 [JceHead] 并保存. 可通过 [currentHead] 获取这个 [JceHead].
-     *
-     * @return 是否成功读取. 返回 `false` 时代表 [Input.endOfInput]
-     */
-    fun prepareNextHead(): Boolean {
-        return readNextHeadButDoNotAssignTo_Head().also { _head = it; } != null
-    }
-
-    fun nextHead(): JceHead {
-        if (!prepareNextHead()) {
-            throw EOFException("No more JceHead available")
-        }
-        return currentHead
-    }
-
-    /**
-     * 直接读取下一个 [JceHead] 并返回.
-     * 返回 `null` 则代表 [Input.endOfInput]
-     */
-    @Suppress("FunctionName")
-    @OptIn(ExperimentalUnsignedTypes::class)
-    private fun readNextHeadButDoNotAssignTo_Head(): JceHead? {
-        if (input.endOfInput) {
-            return null
-        }
-        val var2 = input.readUByte()
-        val type = var2 and 15u
-        var tag = var2.toUInt() shr 4
-        if (tag == 15u) {
-            tag = input.readUByte().toUInt()
-        }
-        return JceHead(
-            tag = tag.toInt(),
-            type = type.toByte()
-        )
-    }
-
-    /**
-     * 使用这个 [JceHead].
-     * [block] 结束后将会 [准备下一个 [JceHead]][prepareNextHead]
-     */
-    inline fun <R> useHead(crossinline block: (JceHead) -> R): R {
-        return currentHead.let(block).also { prepareNextHead() }
-    }
-
-    /**
-     * 跳过 [JceHead] 和对应的数据值, 直到找到 [tag], 否则返回 `null`
-     */
-    inline fun <R> skipToHeadAndUseIfPossibleOrNull(tag: Int, crossinline block: (JceHead) -> R): R? {
-        return skipToHeadOrNull(tag)?.let(block).also { prepareNextHead() }
-    }
-
-    /**
-     * 跳过 [JceHead] 和对应的数据值, 直到找到 [tag], 否则抛出异常
-     */
-    inline fun <R : Any> skipToHeadAndUseIfPossibleOrFail(
-        tag: Int,
-        crossinline message: () -> String = { "tag not found: $tag" },
-        crossinline block: (JceHead) -> R
-    ): R {
-        return checkNotNull<R>(skipToHeadAndUseIfPossibleOrNull(tag, block), message)
-    }
-
-    tailrec fun skipToHeadOrNull(tag: Int): JceHead? {
-        val current: JceHead = currentHeadOrNull ?: return null // no backing field
-
-        return when {
-            current.tag > tag -> null // tag 大了，即找不到
-            current.tag == tag -> current // 满足需要.
-            else -> { // tag 小了
-                skipField(current.type)
-                check(prepareNextHead()) { "cannot skip to tag $tag, early EOF" }
-                skipToHeadOrNull(tag)
-            }
-        }
-    }
-
-    inline fun skipToHeadOrFail(
-        tag: Int,
-        message: () -> String = { "head not found: $tag" }
-    ): JceHead {
-        return checkNotNull(skipToHeadOrNull(tag), message)
-    }
-
-    @OptIn(ExperimentalUnsignedTypes::class)
-    @PublishedApi
-    internal fun skipField(type: Byte): Unit {
-        JceDecoder.println {
-            "skipping ${JceHead.findJceTypeName(
-                type
-            )}"
-        }
-        when (type) {
-            Jce.BYTE -> this.input.discardExact(1)
-            Jce.SHORT -> this.input.discardExact(2)
-            Jce.INT -> this.input.discardExact(4)
-            Jce.LONG -> this.input.discardExact(8)
-            Jce.FLOAT -> this.input.discardExact(4)
-            Jce.DOUBLE -> this.input.discardExact(8)
-            Jce.STRING1 -> this.input.discardExact(this.input.readUByte().toInt())
-            Jce.STRING4 -> this.input.discardExact(this.input.readInt())
-            Jce.MAP -> { // map
-                JceDecoder.structureHierarchy++
-                var count: Int = 0
-                nextHead() // avoid shadowing, don't remove
-                repeat(skipToHeadAndUseIfPossibleOrFail(0, message = { "tag 0 not found when skipping map" }) {
-                    readJceIntValue(it).also { count = it * 2 }
-                } * 2) {
-                    skipField(currentHead.type)
-                    if (it != count - 1) { // don't read last head
-                        nextHead()
-                    }
-                }
-                JceDecoder.structureHierarchy--
-            }
-            Jce.LIST -> { // list
-                JceDecoder.structureHierarchy++
-                var count: Int = 0
-                nextHead() // avoid shadowing, don't remove
-                repeat(skipToHeadAndUseIfPossibleOrFail(0, message = { "tag 0 not found when skipping list" }) { head ->
-                    readJceIntValue(head).also { count = it }
-                }) {
-                    skipField(currentHead.type)
-                    if (it != count - 1) { // don't read last head
-                        nextHead()
-                    }
-                }
-                JceDecoder.structureHierarchy--
-            }
-            Jce.STRUCT_BEGIN -> {
-                JceDecoder.structureHierarchy++
-                var head: JceHead
-                do {
-                    head = nextHead()
-                    skipField(head.type)
-                } while (head.type != Jce.STRUCT_END)
-                JceDecoder.structureHierarchy--
-            }
-            Jce.STRUCT_END, Jce.ZERO_TYPE -> {
-            }
-            Jce.SIMPLE_LIST -> {
-                JceDecoder.structureHierarchy++
-                var head = nextHead()
-                check(head.type == Jce.BYTE) { "bad simple list element type: " + head.type }
-                check(head.tag == 0) { "simple list element tag must be 0, but was ${head.tag}" }
-
-                head = nextHead()
-                check(head.tag == 0) { "tag for size for simple list must be 0, but was ${head.tag}" }
-                this.input.discardExact(readJceIntValue(head))
-                JceDecoder.structureHierarchy--
-            }
-            else -> error("invalid type: $type")
-        }
-    }
-
-    // region readers
-    fun readJceIntValue(head: JceHead): Int {
-        //println("readJceIntValue: $head")
-        return when (head.type) {
-            Jce.ZERO_TYPE -> 0
-            Jce.BYTE -> input.readByte().toInt()
-            Jce.SHORT -> input.readShort().toInt()
-            Jce.INT -> input.readInt()
-            else -> error("type mismatch: $head, remaining=${input.readBytes().toUHexString()}")
-        }
-    }
-
-    fun readJceShortValue(head: JceHead): Short {
-        return when (head.type) {
-            Jce.ZERO_TYPE -> 0
-            Jce.BYTE -> input.readByte().toShort()
-            Jce.SHORT -> input.readShort()
-            else -> error("type mismatch: $head")
-        }
-    }
-
-    fun readJceLongValue(head: JceHead): Long {
-        return when (head.type) {
-            Jce.ZERO_TYPE -> 0
-            Jce.BYTE -> input.readByte().toLong()
-            Jce.SHORT -> input.readShort().toLong()
-            Jce.INT -> input.readInt().toLong()
-            Jce.LONG -> input.readLong()
-            else -> error("type mismatch ${head.type}")
-        }
-    }
-
-    fun readJceByteValue(head: JceHead): Byte {
-        //println("readJceByteValue: $head")
-        return when (head.type) {
-            Jce.ZERO_TYPE -> 0
-            Jce.BYTE -> input.readByte()
-            else -> error("type mismatch: $head")
-        }
-    }
-
-    fun readJceFloatValue(head: JceHead): Float {
-        return when (head.type) {
-            Jce.ZERO_TYPE -> 0f
-            Jce.FLOAT -> input.readFloat()
-            else -> error("type mismatch: $head")
-        }
-    }
-
-    @OptIn(ExperimentalUnsignedTypes::class)
-    fun readJceStringValue(head: JceHead): String {
-        //println("readJceStringValue: $head")
-        return when (head.type) {
-            Jce.STRING1 -> input.readString(input.readUByte().toInt(), charset = charset.kotlinCharset)
-            Jce.STRING4 -> input.readString(
-                input.readUInt().toInt().also { require(it in 1 until 104857600) { "bad string length: $it" } },
-                charset = charset.kotlinCharset
-            )
-            else -> error("type mismatch: $head, expecting 6 or 7 (for string)")
-        }
-    }
-
-    fun readJceDoubleValue(head: JceHead): Double {
-        return when (head.type.toInt()) {
-            12 -> 0.0
-            4 -> input.readFloat().toDouble()
-            5 -> input.readDouble()
-            else -> error("type mismatch: $head")
-        }
-    }
-
-    fun readJceBooleanValue(head: JceHead): Boolean {
-        return readJceByteValue(head) == 1.toByte()
-    }
-}

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/utils/io/serialization/jce/JceNew.kt

-/*
- * Copyright 2020 Mamoe Technologies and contributors.
- *
- * 此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证.
- * Use of this source code is governed by the GNU AGPLv3 license that can be found through the following link.
- *
- * https://github.com/mamoe/mirai/blob/master/LICENSE
- */
-
-package net.mamoe.mirai.qqandroid.utils.io.serialization.jce
-
-import kotlinx.io.core.*
-import kotlinx.serialization.BinaryFormat
-import kotlinx.serialization.DeserializationStrategy
-import kotlinx.serialization.SerialFormat
-import kotlinx.serialization.SerializationStrategy
-import kotlinx.serialization.modules.EmptyModule
-import kotlinx.serialization.modules.SerialModule
-import net.mamoe.mirai.qqandroid.utils.io.serialization.IOFormat
-import net.mamoe.mirai.qqandroid.utils.io.serialization.JceCharset
-import net.mamoe.mirai.qqandroid.utils.io.serialization.JceOld
-import net.mamoe.mirai.qqandroid.utils.toReadPacket
-
-/**
- * Jce 数据结构序列化和反序列化器.
- *
- * @author Him188
- */
-internal class Jce(
-    override val context: SerialModule,
-    val charset: JceCharset
-) : SerialFormat, IOFormat, BinaryFormat {
-    override fun <T> dumpTo(serializer: SerializationStrategy<T>, ojb: T, output: Output) {
-        output.writePacket(JceOld.byCharSet(this.charset).dumpAsPacket(serializer, ojb))
-    }
-
-    override fun <T> load(deserializer: DeserializationStrategy<T>, input: Input): T {
-        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 {
-        val UTF_8 = Jce(
-            EmptyModule,
-            JceCharset.UTF8
-        )
-        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/utils/io/serialization/jce/common.kt

-/*
- * Copyright 2020 Mamoe Technologies and contributors.
- *
- * 此源代码的使用受 GNU AFFERO GENERAL PUBLIC LICENSE version 3 许可证的约束, 可以在以下链接找到该许可证.
- * Use of this source code is governed by the GNU AGPLv3 license that can be found through the following link.
- *
- * https://github.com/mamoe/mirai/blob/master/LICENSE
- */
-
-package net.mamoe.mirai.qqandroid.utils.io.serialization.jce
-
-import kotlinx.io.core.Output
-import kotlinx.serialization.SerialDescriptor
-import kotlinx.serialization.SerialInfo
-
-
-/**
- * 标注 JCE 序列化时使用的 ID
- */
-@SerialInfo
-@Target(AnnotationTarget.PROPERTY)
-internal annotation class JceId(val id: Int)
-
-/**
- * 类中元素的 tag
- *
- * 保留这个结构, 为将来增加功能的兼容性.
- */
-@PublishedApi
-internal abstract class JceTag {
-    abstract val id: Int
-
-    internal var isSimpleByteArray: Boolean = false
-}
-
-internal object JceTagListElement : JceTag() {
-    override val id: Int get() = 0
-    override fun toString(): String {
-        return "JceTagListElement"
-    }
-}
-
-internal object JceTagMapEntryKey : JceTag() {
-    override val id: Int get() = 0
-    override fun toString(): String {
-        return "JceTagMapEntryKey"
-    }
-}
-
-internal object JceTagMapEntryValue : JceTag() {
-    override val id: Int get() = 1
-    override fun toString(): String {
-        return "JceTagMapEntryValue"
-    }
-}
-
-internal data class JceTagCommon(
-    override val id: Int
-) : JceTag()
-
-internal fun JceHead.checkType(type: Byte, message: String, tag: JceTag, descriptor: SerialDescriptor) {
-    check(this.type == type) {
-        "type mismatch. " +
-                "Expected ${JceHead.findJceTypeName(type)}, " +
-                "actual ${JceHead.findJceTypeName(this.type)} for $message. " +
-                "Tag info: " +
-                "id=${tag.id}, " +
-                "name=${descriptor.getElementName(tag.id)} " +
-                "in ${descriptor.serialName}" }
-}
-
-@PublishedApi
-internal fun Output.writeJceHead(type: Byte, tag: Int) {
-    if (tag < 15) {
-        writeByte(((tag shl 4) or type.toInt()).toByte())
-        return
-    }
-    if (tag < 256) {
-        writeByte((type.toInt() or 0xF0).toByte())
-        writeByte(tag.toByte())
-        return
-    }
-    error("tag is too large: $tag")
-}
-
-@OptIn(ExperimentalUnsignedTypes::class)
-inline class JceHead(private val value: Long) {
-    constructor(tag: Int, type: Byte) : this(tag.toLong().shl(32) or type.toLong())
-
-    val tag: Int get() = (value ushr 32).toInt()
-    val type: Byte get() = value.toUInt().toByte()
-
-    override fun toString(): String {
-        return "JceHead(tag=$tag, type=$type(${findJceTypeName(type)}))"
-    }
-
-    companion object {
-        fun findJceTypeName(type: Byte): String {
-            return when (type) {
-                Jce.BYTE -> "Byte"
-                Jce.DOUBLE -> "Double"
-                Jce.FLOAT -> "Float"
-                Jce.INT -> "Int"
-                Jce.LIST -> "List"
-                Jce.LONG -> "Long"
-                Jce.MAP -> "Map"
-                Jce.SHORT -> "Short"
-                Jce.SIMPLE_LIST -> "SimpleList"
-                Jce.STRING1 -> "String1"
-                Jce.STRING4 -> "String4"
-                Jce.STRUCT_BEGIN -> "StructBegin"
-                Jce.STRUCT_END -> "StructEnd"
-                Jce.ZERO_TYPE -> "Zero"
-                else -> error("illegal jce type: $type")
-            }
-        }
-    }
-}
\ No newline at end of file

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

@@ -16,15 +16,14 @@ import kotlinx.io.core.*
 import kotlinx.serialization.DeserializationStrategy
 import kotlinx.serialization.SerialDescriptor
 import kotlinx.serialization.SerializationStrategy
+import moe.him188.jcekt.Jce
 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.RequestPacket
 import net.mamoe.mirai.qqandroid.utils.io.JceStruct
 import net.mamoe.mirai.qqandroid.utils.io.ProtoBuf
 import net.mamoe.mirai.qqandroid.utils.io.readPacketExact
-import net.mamoe.mirai.qqandroid.utils.io.serialization.jce.Jce
 import net.mamoe.mirai.qqandroid.utils.read
-import net.mamoe.mirai.utils.MiraiInternalAPI
 import kotlin.jvm.JvmMultifileClass
 import kotlin.jvm.JvmName
 
@@ -34,25 +33,21 @@ internal fun <T : JceStruct> ByteArray.loadWithUniPacket(
 ): T = this.read { readUniPacket(deserializer, name) }
 
 internal fun <T : JceStruct> ByteArray.loadAs(
-    deserializer: DeserializationStrategy<T>,
-    c: JceCharset = JceCharset.UTF8
-): T = this.read { Jce.byCharSet(c).load(deserializer, this) }
+    deserializer: DeserializationStrategy<T>
+): T = this.read { Jce.UTF_8.load(deserializer, this) }
 
 internal fun <T : JceStruct> BytePacketBuilder.writeJceStruct(
     serializer: SerializationStrategy<T>,
-    struct: T,
-    charset: JceCharset = JceCharset.UTF8
+    struct: T
 ) {
-    Jce.byCharSet(charset).dumpTo(serializer, struct, this)
+    Jce.UTF_8.dumpTo(serializer, struct, this)
 }
 
 internal fun <T : JceStruct> ByteReadPacket.readJceStruct(
     serializer: DeserializationStrategy<T>,
-    charset: JceCharset = JceCharset.UTF8,
     length: Int = this.remaining.toInt()
 ): T {
-    @OptIn(MiraiInternalAPI::class)
-    return Jce.byCharSet(charset).load(serializer, this.readPacketExact(length))
+    return Jce.UTF_8.load(serializer, this.readPacketExact(length))
 }
 
 /**
@@ -103,9 +98,8 @@ private fun <R> ByteReadPacket.decodeUniRequestPacketAndDeserialize(name: String
 }
 
 internal fun <T : JceStruct> T.toByteArray(
-    serializer: SerializationStrategy<T>,
-    c: JceCharset = JceCharset.UTF8
-): ByteArray = Jce.byCharSet(c).dump(serializer, this)
+    serializer: SerializationStrategy<T>
+): ByteArray = Jce.UTF_8.dump(serializer, this)
 
 internal fun <T : ProtoBuf> BytePacketBuilder.writeProtoBuf(serializer: SerializationStrategy<T>, v: T) {
     this.writeFully(v.toByteArray(serializer))
@@ -140,19 +134,12 @@ internal fun <T : JceStruct> jceRequestSBuffer(
     name: String,
     serializer: SerializationStrategy<T>,
     jceStruct: T
-): ByteArray = jceRequestSBuffer(name, serializer, jceStruct, JceCharset.UTF8)
-
-internal fun <T : JceStruct> jceRequestSBuffer(
-    name: String,
-    serializer: SerializationStrategy<T>,
-    jceStruct: T,
-    charset: JceCharset
 ): ByteArray {
     return RequestDataVersion3(
         mapOf(
             name to JCE_STRUCT_HEAD_OF_TAG_0 + jceStruct.toByteArray(serializer) + JCE_STRUCT_TAIL_OF_TAG_0
         )
-    ).toByteArray(RequestDataVersion3.serializer(), charset)
+    ).toByteArray(RequestDataVersion3.serializer())
 }
 
 private val JCE_STRUCT_HEAD_OF_TAG_0 = byteArrayOf(0x0A)