From 8570987c34283281513765073d02e42fe9ce053f Mon Sep 17 00:00:00 2001
From: sandtechnology <a1294790523@hotmail.com>
Date: Sun, 18 Jun 2023 19:59:30 +0800
Subject: [PATCH] [core] Add extraData decoding for future debugging

---
 .../kotlin/network/components/PacketCodec.kt         | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/mirai-core/src/commonMain/kotlin/network/components/PacketCodec.kt b/mirai-core/src/commonMain/kotlin/network/components/PacketCodec.kt
index 3fe7342af..11dd0bb9f 100644
--- a/mirai-core/src/commonMain/kotlin/network/components/PacketCodec.kt
+++ b/mirai-core/src/commonMain/kotlin/network/components/PacketCodec.kt
@@ -16,11 +16,13 @@ import net.mamoe.mirai.internal.network.component.ComponentKey
 import net.mamoe.mirai.internal.network.components.PacketCodec.Companion.PacketLogger
 import net.mamoe.mirai.internal.network.components.PacketCodecException.Kind.*
 import net.mamoe.mirai.internal.network.handler.selector.NetworkException
+import net.mamoe.mirai.internal.network.protocol.data.proto.SSOReserveField
 import net.mamoe.mirai.internal.network.protocol.packet.*
 import net.mamoe.mirai.internal.network.protocol.packet.login.WtLogin
 import net.mamoe.mirai.internal.network.protocol.packet.sso.TRpcRawPacket
 import net.mamoe.mirai.internal.utils.crypto.Ecdh
 import net.mamoe.mirai.internal.utils.crypto.TEA
+import net.mamoe.mirai.internal.utils.io.serialization.readProtoBuf
 import net.mamoe.mirai.utils.*
 
 
@@ -266,7 +268,15 @@ internal class PacketCodecImpl : PacketCodec {
                 if (PacketLogger.isEnabled) {
                     val extraData = readBytes(readInt() - 4)
                     if (extraData.isNotEmpty()) {
-                        PacketLogger.verbose { "(sso/inner)extraData = ${extraData.toUHexString()}" }
+                        PacketLogger.verbose {
+                            "(sso/inner)extraData = ${extraData.toUHexString()}, result= ${
+                                kotlin.runCatching {
+                                    readProtoBuf(
+                                        SSOReserveField.ReserveFields.serializer()
+                                    ).structureToString()
+                                }.getOrElse { e -> "error: " + e.message }
+                            }"
+                        }
                     }
                 } else {
                     discardExact(readInt() - 4)