Remove redundant AnnotatedId

bd1e5e09 · Him188 · b42b40dd · bd1e5e09 · bd1e5e09 · bd1e5e09
Commit bd1e5e09 authored Dec 14, 2019 by Him188
21 changed files
--- a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/Bot.kt
+++ b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/Bot.kt
@@ -11,6 +11,7 @@ import net.mamoe.mirai.contact.internal.Group
 import net.mamoe.mirai.contact.internal.QQ
 import net.mamoe.mirai.network.BotNetworkHandler
 import net.mamoe.mirai.network.protocol.tim.TIMBotNetworkHandler
+import net.mamoe.mirai.network.protocol.tim.packet.KnownPacketId
 import net.mamoe.mirai.network.protocol.tim.packet.action.GroupNotFound
 import net.mamoe.mirai.network.protocol.tim.packet.action.GroupPacket
 import net.mamoe.mirai.network.protocol.tim.packet.action.RawGroupInfo
@@ -247,5 +248,9 @@ class Bot(val account: BotAccount, val logger: MiraiLogger, context: CoroutineCo
        internal suspend fun addInstance(bot: Bot) = instanceLock.withLock {
            _instances += bot
        }
+        init {
+            KnownPacketId.values() // load packet ids
+        }
    }
 }
\ No newline at end of file
--- a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/network/protocol/tim/packet/Annotations.kt
+++ b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/network/protocol/tim/packet/Annotations.kt
@@ -2,19 +2,6 @@
 package net.mamoe.mirai.network.protocol.tim.packet
-/**
- * 包 ID. 除特殊外, [PacketFactory] 都需要这个注解来指定包 ID.
- */
-@MustBeDocumented
-@Retention(AnnotationRetention.RUNTIME)
-@Target(AnnotationTarget.CLASS)
-internal annotation class AnnotatedId( // 注解无法在 JS 平台使用, 但现在暂不需要考虑 JS
-    val id: KnownPacketId
-)
-internal inline val AnnotatedId.value: UShort get() = id.value
 /**
 * 包的最后一次修改时间, 和分析时使用的 TIM 版本
 */

--- a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/network/protocol/tim/packet/PacketFactory.kt
+++ b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/network/protocol/tim/packet/PacketFactory.kt
@@ -10,7 +10,6 @@ import kotlinx.io.pool.useInstance
 import kotlinx.serialization.DeserializationStrategy
 import kotlinx.serialization.protobuf.ProtoBuf
 import net.mamoe.mirai.network.BotNetworkHandler
-import net.mamoe.mirai.utils.MiraiInternalAPI
 import net.mamoe.mirai.utils.io.ByteArrayPool
 import net.mamoe.mirai.utils.io.debugPrint
 import net.mamoe.mirai.utils.io.read
@@ -26,20 +25,13 @@ import net.mamoe.mirai.utils.readProtoMap
 */
 internal abstract class PacketFactory<out TPacket : Packet, TDecrypter : Decrypter>(val decrypterType: DecrypterType<TDecrypter>) {
-    /**
+    @Suppress("PropertyName")
-     * 2 Ubyte.
+    internal var _id: PacketId = NullPacketId
-     * 读取注解 [AnnotatedId]
-     */
-    private val annotatedId: AnnotatedId
-        get() = (this::class.annotations.firstOrNull { it is AnnotatedId } as? AnnotatedId)
-            ?: error("Annotation AnnotatedId not found for class ${this::class.simpleName}")
-    // TODO: 2019/11/22 修改 包 ID 为参数
    /**
     * 包 ID.
     */
-    open val id: PacketId by lazy { annotatedId.id }
+    open val id: PacketId get() = _id
    /**
     * **解码**服务器的回复数据包

--- a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/network/protocol/tim/packet/PacketId.kt
+++ b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/network/protocol/tim/packet/PacketId.kt
@@ -55,35 +55,35 @@ internal inline class IgnoredPacketId constructor(override val value: UShort) :
 * 已知的 [matchPacketId]. 所有在 Mirai 中实现过的包都会使用这些 Id
 */
 @Suppress("unused")
-internal enum class KnownPacketId(override inline val value: UShort, override inline val factory: PacketFactory<*, *>) :
+internal enum class KnownPacketId(override val value: UShort, override val factory: PacketFactory<*, *>) :
    PacketId {
-    inline TOUCH(0x0825u, TouchPacket),
+    TOUCH(0x0825u, TouchPacket),
-    inline SESSION_KEY(0x0828u, RequestSessionPacket),
+    SESSION_KEY(0x0828u, RequestSessionPacket),
-    inline LOGIN(0x0836u, SubmitPasswordPacket),
+    LOGIN(0x0836u, SubmitPasswordPacket),
-    inline CAPTCHA(0x00BAu, CaptchaPacket),
+    CAPTCHA(0x00BAu, CaptchaPacket),
-    inline SERVER_EVENT_1(0x00CEu, EventPacketFactory),
+    SERVER_EVENT_1(0x00CEu, EventPacketFactory),
-    inline SERVER_EVENT_2(0x0017u, EventPacketFactory),
+    SERVER_EVENT_2(0x0017u, EventPacketFactory),
-    inline FRIEND_ONLINE_STATUS_CHANGE(0x0081u, FriendOnlineStatusChangedPacket),
+    FRIEND_ONLINE_STATUS_CHANGE(0x0081u, FriendOnlineStatusChangedPacket),
-    inline CHANGE_ONLINE_STATUS(0x00ECu, ChangeOnlineStatusPacket),
+    CHANGE_ONLINE_STATUS(0x00ECu, ChangeOnlineStatusPacket),
-    inline HEARTBEAT(0x0058u, HeartbeatPacket),
+    HEARTBEAT(0x0058u, HeartbeatPacket),
-    inline S_KEY(0x001Du, RequestSKeyPacket),
+    S_KEY(0x001Du, RequestSKeyPacket),
-    inline ACCOUNT_INFO(0x005Cu, RequestAccountInfoPacket),
+    ACCOUNT_INFO(0x005Cu, RequestAccountInfoPacket),
-    inline GROUP_PACKET(0x0002u, GroupPacket),
+    GROUP_PACKET(0x0002u, GroupPacket),
-    inline SEND_FRIEND_MESSAGE(0x00CDu, SendFriendMessagePacket),
+    SEND_FRIEND_MESSAGE(0x00CDu, SendFriendMessagePacket),
-    inline CAN_ADD_FRIEND(0x00A7u, CanAddFriendPacket),
+    CAN_ADD_FRIEND(0x00A7u, CanAddFriendPacket),
-    inline ADD_FRIEND(0x00A8u, AddFriendPacket),
+    ADD_FRIEND(0x00A8u, AddFriendPacket),
-    inline REQUEST_FRIEND_ADDITION_KEY(0x00AEu, RequestFriendAdditionKeyPacket),
+    REQUEST_FRIEND_ADDITION_KEY(0x00AEu, RequestFriendAdditionKeyPacket),
-    inline GROUP_IMAGE_ID(0x0388u, GroupImagePacket),
+    GROUP_IMAGE_ID(0x0388u, GroupImagePacket),
-    inline FRIEND_IMAGE_ID(0x0352u, FriendImagePacket),
+    FRIEND_IMAGE_ID(0x0352u, FriendImagePacket),
-    inline REQUEST_PROFILE_AVATAR(0x0031u, RequestProfileAvatarPacket),
+    REQUEST_PROFILE_AVATAR(0x0031u, RequestProfileAvatarPacket),
-    inline REQUEST_PROFILE_DETAILS(0x003Cu, RequestProfileDetailsPacket),
+    REQUEST_PROFILE_DETAILS(0x003Cu, RequestProfileDetailsPacket),
-    inline QUERY_NICKNAME(0x0126u, QueryNicknamePacket),
+    QUERY_NICKNAME(0x0126u, QueryNicknamePacket),
-    inline QUERY_PREVIOUS_NAME(0x01BCu, QueryPreviousNamePacket),
+    QUERY_PREVIOUS_NAME(0x01BCu, QueryPreviousNamePacket),
-    inline QUERY_FRIEND_REMARK(0x003Eu, QueryFriendRemarkPacket)
+    QUERY_FRIEND_REMARK(0x003Eu, QueryFriendRemarkPacket)
    // 031F  查询 "新朋友" 记录
@@ -92,5 +92,9 @@ internal enum class KnownPacketId(override inline val value: UShort, override in
    ;
+    init {
+        factory._id = this
+    }
    override fun toString(): String = (factory::class.simpleName ?: this.name) + "(${value.toUHexString()})"
 }
--- a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/network/protocol/tim/packet/action/AddContact.kt
+++ b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/network/protocol/tim/packet/action/AddContact.kt
@@ -19,7 +19,6 @@ import net.mamoe.mirai.withSession
 * - 昵称
 * - 共同群内的群名片
 */
-@AnnotatedId(KnownPacketId.QUERY_PREVIOUS_NAME)
 @PacketVersion(date = "2019.11.11", timVersion = "2.3.2 (21173)")
 internal object QueryPreviousNamePacket : SessionPacketFactory<PreviousNameList>() {
    operator fun invoke(
@@ -77,7 +76,6 @@ class PreviousNameList(
 *
 * @author Him188moe
 */
-@AnnotatedId(KnownPacketId.CAN_ADD_FRIEND)
 @PacketVersion(date = "2019.11.11", timVersion = "2.3.2 (21173)")
 internal object CanAddFriendPacket : SessionPacketFactory<CanAddFriendResponse>() {
    operator fun invoke(
@@ -155,7 +153,6 @@ inline class FriendAdditionKey(val value: IoBuffer)
 /**
 * 请求一个 32 位 Key, 在添加好友时发出
 */
-@AnnotatedId(KnownPacketId.REQUEST_FRIEND_ADDITION_KEY)
 @PacketVersion(date = "2019.11.11", timVersion = "2.3.2 (21173)")
 internal object RequestFriendAdditionKeyPacket : SessionPacketFactory<RequestFriendAdditionKeyPacket.Response>() {
    operator fun invoke(
@@ -182,7 +179,6 @@ internal object RequestFriendAdditionKeyPacket : SessionPacketFactory<RequestFri
 /**
 * 请求添加好友
 */
-@AnnotatedId(KnownPacketId.ADD_FRIEND)
 internal object AddFriendPacket : SessionPacketFactory<AddFriendPacket.Response>() {
    @PacketVersion(date = "2019.11.11", timVersion = "2.3.2 (21173)")
    @Suppress("FunctionName")

--- a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/network/protocol/tim/packet/action/FriendImage.kt
+++ b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/network/protocol/tim/packet/action/FriendImage.kt
@@ -92,7 +92,6 @@ internal object FriendImageOverFileSizeMax : FriendImageResponse {
 * - 服务器已经存有这个图片
 * - 服务器未存有, 返回一个 key 用于客户端上传
 */
-@AnnotatedId(KnownPacketId.FRIEND_IMAGE_ID)
 @PacketVersion(date = "2019.11.16", timVersion = "2.3.2 (21173)")
 internal object FriendImagePacket : SessionPacketFactory<FriendImageResponse>() {
    @Suppress("FunctionName")

--- a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/network/protocol/tim/packet/action/GradeInfo.kt
+++ b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/network/protocol/tim/packet/action/GradeInfo.kt
@@ -16,7 +16,6 @@ import net.mamoe.mirai.utils.io.writeQQ
 *
 * @author Him188moe
 */
-@AnnotatedId(KnownPacketId.ACCOUNT_INFO)
 internal object RequestAccountInfoPacket : SessionPacketFactory<RequestAccountInfoPacket.Response>() {
    operator fun invoke(
        qq: UInt,

--- a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/network/protocol/tim/packet/action/GroupImage.kt
+++ b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/network/protocol/tim/packet/action/GroupImage.kt
@@ -99,7 +99,6 @@ internal class ImageUploadInfo(
 /**
 * 获取 Image Id 和上传用的一个 uKey
 */
-@AnnotatedId(KnownPacketId.GROUP_IMAGE_ID)
 @PacketVersion(date = "2019.11.22", timVersion = "2.3.2 (21173)")
 internal object GroupImagePacket : SessionPacketFactory<GroupImageResponse>() {

--- a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/network/protocol/tim/packet/action/GroupPacket.kt
+++ b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/network/protocol/tim/packet/action/GroupPacket.kt
@@ -79,7 +79,6 @@ inline class QuitGroupResponse(private val _group: GroupInternalId?) : Packet, G
 }
 @Suppress("FunctionName")
-@AnnotatedId(KnownPacketId.GROUP_PACKET)
 internal object GroupPacket : SessionPacketFactory<GroupPacket.GroupPacketResponse>() {
    @PacketVersion(date = "2019.10.19", timVersion = "2.3.2 (21173)")
    fun Message(

--- a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/network/protocol/tim/packet/action/Profile.kt
+++ b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/network/protocol/tim/packet/action/Profile.kt
@@ -17,7 +17,6 @@ inline class NicknameMap(val delegate: Map<UInt, String>) : Packet
 /**
 * 批量查询昵称.
 */
-@AnnotatedId(KnownPacketId.QUERY_NICKNAME)
 internal object QueryNicknamePacket : SessionPacketFactory<NicknameMap>() {
    /**
     * 单个查询.
@@ -135,7 +134,6 @@ body=03 00 00 00 00 00 00 00 00 00 00 00 03 8E 3C A6 A0 EE EF 02 07 6C 01 14 E8
 /**
 * 请求获取头像
 */ // ? 这个包的数据跟下面那个包一样
-@AnnotatedId(KnownPacketId.REQUEST_PROFILE_AVATAR)
 internal object RequestProfileAvatarPacket : SessionPacketFactory<AvatarLink>() {
    //00 01 00 17 D4 54 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 29 4E 22 4E 25 4E 26 4E 27 4E 29 4E 2A 4E 2B 4E 2D 4E 2E 4E 2F 4E 30 4E 31 4E 33 4E 35 4E 36 4E 37 4E 38 4E 3F 4E 40 4E 41 4E 42 4E 43 4E 45 4E 49 4E 4B 4E 4F 4E 54 4E 5B 52 0B 52 0F 5D C2 5D C8 65 97 69 9D 69 A9 9D A5 A4 91 A4 93 A4 94 A4 9C A4 B5
    operator fun invoke(
@@ -159,7 +157,6 @@ internal object RequestProfileAvatarPacket : SessionPacketFactory<AvatarLink>()
 *
 * @see Profile
 */
-@AnnotatedId(KnownPacketId.REQUEST_PROFILE_DETAILS)
 internal object RequestProfileDetailsPacket : SessionPacketFactory<RequestProfileDetailsResponse>() {
    //00 01 3E F8 FB E3 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 29 4E 22 4E 25 4E 26 4E 27 4E 29 4E 2A 4E 2B 4E 2D 4E 2E 4E 2F 4E 30 4E 31 4E 33 4E 35 4E 36 4E 37 4E 38 4E 3F 4E 40 4E 41 4E 42 4E 43 4E 45 4E 49 4E 4B 4E 4F 4E 54 4E 5B 52 0B 52 0F 5D C2 5D C8 65 97 69 9D 69 A9 9D A5 A4 91 A4 93 A4 94 A4 9C A4 B5
    //00 01 B1 89 BE 09 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 29 4E 22 4E 25 4E 26 4E 27 4E 29 4E 2A 4E 2B 4E 2D 4E 2E 4E 2F 4E 30 4E 31 4E 33 4E 35 4E 36 4E 37 4E 38 4E 3F 4E 40 4E 41 4E 42 4E 43 4E 45 4E 49 4E 4B 4E 4F 4E 54 4E 5B 52 0B 52 0F 5D C2 5D C8 65 97 69 9D 69 A9 9D A5 A4 91 A4 93 A4 94 A4 9C A4 B5
@@ -211,7 +208,6 @@ internal object RequestProfileDetailsPacket : SessionPacketFactory<RequestProfil
    }
 }
-@AnnotatedId(KnownPacketId.REQUEST_PROFILE_DETAILS)
 internal data class RequestProfileDetailsResponse(
    val qq: UInt,
    val profile: Profile

--- a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/network/protocol/tim/packet/action/Remark.kt
+++ b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/network/protocol/tim/packet/action/Remark.kt
@@ -15,7 +15,6 @@ import net.mamoe.mirai.utils.io.writeZero
 */
 inline class FriendNameRemark(val value: String) : Packet
-@AnnotatedId(KnownPacketId.QUERY_FRIEND_REMARK)
 internal object QueryFriendRemarkPacket : SessionPacketFactory<FriendNameRemark>() {
    /**
     * 查询好友的备注

--- a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/network/protocol/tim/packet/action/SendFriendMessagePacket.kt
+++ b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/network/protocol/tim/packet/action/SendFriendMessagePacket.kt
@@ -11,7 +11,6 @@ import net.mamoe.mirai.network.protocol.tim.packet.*
 import net.mamoe.mirai.utils.io.*
 import net.mamoe.mirai.utils.md5
-@AnnotatedId(KnownPacketId.SEND_FRIEND_MESSAGE)
 @PacketVersion(date = "2019.10.19", timVersion = "2.3.2 (21173)")
 internal object SendFriendMessagePacket : SessionPacketFactory<SendFriendMessagePacket.Response>() {
    operator fun invoke(

--- a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/network/protocol/tim/packet/event/FriendOnlineStatusChanged.kt
+++ b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/network/protocol/tim/packet/event/FriendOnlineStatusChanged.kt
@@ -9,7 +9,6 @@ import kotlinx.io.core.readUInt
 import net.mamoe.mirai.contact.QQ
 import net.mamoe.mirai.getQQ
 import net.mamoe.mirai.network.BotNetworkHandler
-import net.mamoe.mirai.network.protocol.tim.packet.AnnotatedId
 import net.mamoe.mirai.network.protocol.tim.packet.KnownPacketId
 import net.mamoe.mirai.network.protocol.tim.packet.PacketId
 import net.mamoe.mirai.network.protocol.tim.packet.SessionPacketFactory
@@ -23,7 +22,6 @@ data class FriendStatusChanged(
 /**
 * 好友在线状态改变
 */
-@AnnotatedId(KnownPacketId.FRIEND_ONLINE_STATUS_CHANGE)
 internal object FriendOnlineStatusChangedPacket : SessionPacketFactory<FriendStatusChanged>() {
    override suspend fun ByteReadPacket.decode(id: PacketId, sequenceId: UShort, handler: BotNetworkHandler<*>): FriendStatusChanged {

--- a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/network/protocol/tim/packet/event/MemberMute.kt
+++ b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/network/protocol/tim/packet/event/MemberMute.kt
-@file:Suppress("EXPERIMENTAL_UNSIGNED_LITERALS", "EXPERIMENTAL_API_USAGE")
+@file:Suppress("EXPERIMENTAL_UNSIGNED_LITERALS", "EXPERIMENTAL_API_USAGE", "MemberVisibilityCanBePrivate")
 package net.mamoe.mirai.network.protocol.tim.packet.event
@@ -61,6 +61,7 @@ class MemberUnmuteEvent(
 /**
 * 机器人被解除禁言事件
 */
+@Suppress("SpellCheckingInspection")
 class BeingUnmutedEvent(
    override val operator: Member
 ) : UnmuteEvent() {
@@ -75,9 +76,11 @@ sealed class UnmuteEvent : EventOfMute() {
 // endregion
+@Suppress("ClassName")
 internal object `Unknown0x02DCPacket_falg=0x0E_MaybeMutePacket` : EventOfMute() {
    override val operator: Member get() = error("Getting a field from Unknown0x02DCPacket_MaybeMutePacket")
    override val group: Group get() = error("Getting a field from Unknown0x02DCPacket_MaybeMutePacket")
+    override fun toString(): String = "`Unknown0x02DCPacket_falg=0x0E_MaybeMutePacket`"
 }
 sealed class EventOfMute : EventPacket {
@@ -117,8 +120,7 @@ internal object MemberMuteEventPacketParserAndHandler : KnownEventParserAndHandl
        // 00 27 8D 00
        discardExact(3)
-        val flag = readByte().toUInt()
+        return when (val flag = readByte().toUInt()) {
-        return when (flag) {
            0x0Eu -> {
                //00 00 00 0E 00 08 00 02 00 01 00
                // 0A 00 04 01 00 00 00 35 DB 60 A2 11 00 3E 08 07 20 A2 C1 ED AE 03 5A 34 08 A2 FF 8C F0 03 1A 19 08 F4 0E 10 FE 8C D3 EF 05 18 84 A1 F8 F9 06 20 00 28 00 30 A2 FF 8C F0 03 2A 0D 08 00 12 09 08 F4 0E 10 00 18 01 20 00 30 00 38 00

--- a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/network/protocol/tim/packet/login/Captcha.kt
+++ b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/network/protocol/tim/packet/login/Captcha.kt
@@ -12,7 +12,6 @@ internal object CaptchaKey : DecrypterByteArray, DecrypterType<CaptchaKey> {
    override val value: ByteArray = TIMProtocol.key00BA
 }
-@AnnotatedId(KnownPacketId.CAPTCHA)
 internal object CaptchaPacket : PacketFactory<CaptchaPacket.CaptchaResponse, CaptchaKey>(CaptchaKey) {
    /**
     * 请求验证码传输

--- a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/network/protocol/tim/packet/login/ChangeOnlineStatusPacket.kt
+++ b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/network/protocol/tim/packet/login/ChangeOnlineStatusPacket.kt
@@ -16,7 +16,6 @@ import net.mamoe.mirai.utils.io.writeQQ
 /**
 * 改变在线状态: "我在线上", "隐身" 等
 */
-@AnnotatedId(KnownPacketId.CHANGE_ONLINE_STATUS)
 internal object ChangeOnlineStatusPacket : PacketFactory<ChangeOnlineStatusPacket.ChangeOnlineStatusResponse, NoDecrypter>(NoDecrypter) {
    operator fun invoke(
        bot: UInt,

--- a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/network/protocol/tim/packet/login/Heartbeat.kt
+++ b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/network/protocol/tim/packet/login/Heartbeat.kt
@@ -13,7 +13,6 @@ import net.mamoe.mirai.utils.io.writeHex
 import net.mamoe.mirai.utils.io.writeQQ
 @NoLog
-@AnnotatedId(KnownPacketId.HEARTBEAT)
 internal object HeartbeatPacket : SessionPacketFactory<HeartbeatPacketResponse>() {
    operator fun invoke(
        bot: UInt,
@@ -31,5 +30,4 @@ internal object HeartbeatPacket : SessionPacketFactory<HeartbeatPacketResponse>(
 }
 @NoLog
-@AnnotatedId(KnownPacketId.HEARTBEAT)
 internal object HeartbeatPacketResponse : Packet, Subscribable
\ No newline at end of file
--- a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/network/protocol/tim/packet/login/PasswordSubmission.kt
+++ b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/network/protocol/tim/packet/login/PasswordSubmission.kt
@@ -44,7 +44,6 @@ internal inline class SubmitPasswordResponseDecrypter(private val privateKey: Pr
 /**
 * 提交密码
 */
-@AnnotatedId(KnownPacketId.LOGIN)
 internal object SubmitPasswordPacket : PacketFactory<SubmitPasswordPacket.LoginResponse, SubmitPasswordResponseDecrypter>(SubmitPasswordResponseDecrypter) {
    operator fun invoke(
        bot: UInt,

--- a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/network/protocol/tim/packet/login/SKey.kt
+++ b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/network/protocol/tim/packet/login/SKey.kt
@@ -23,7 +23,6 @@ internal inline class SKey(
 * 请求 `SKey`
 * SKey 用于 http api
 */
-@AnnotatedId(KnownPacketId.S_KEY)
 internal object RequestSKeyPacket : SessionPacketFactory<SKey>() {
    operator fun invoke(
        bot: UInt,

--- a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/network/protocol/tim/packet/login/Session.kt
+++ b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/network/protocol/tim/packet/login/Session.kt
@@ -9,7 +9,6 @@ import net.mamoe.mirai.network.protocol.tim.packet.*
 import net.mamoe.mirai.utils.io.*
 import net.mamoe.mirai.utils.localIpAddress
-@AnnotatedId(KnownPacketId.SESSION_KEY)
 internal object RequestSessionPacket : PacketFactory<RequestSessionPacket.SessionKeyResponse, SessionResponseDecryptionKey>(SessionResponseDecryptionKey) {
    operator fun invoke(
        bot: UInt,

--- a/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/network/protocol/tim/packet/login/Touch.kt
+++ b/mirai-core/src/commonMain/kotlin/net.mamoe.mirai/network/protocol/tim/packet/login/Touch.kt
@@ -20,7 +20,6 @@ internal object TouchKey : DecrypterByteArray, DecrypterType<TouchKey> {
 *
 * @author Him188moe
 */
-@AnnotatedId(KnownPacketId.TOUCH)
 internal object TouchPacket : PacketFactory<TouchPacket.TouchResponse, TouchKey>(TouchKey) {
    operator fun invoke(
        bot: UInt,
@@ -45,7 +44,7 @@ internal object TouchPacket : PacketFactory<TouchPacket.TouchResponse, TouchKey>
        }
    }
-    internal  sealed class TouchResponse : Packet {
+    internal sealed class TouchResponse : Packet {
        class OK(
            var loginTime: Int,
            val loginIP: String,