[core] Implement correct TlvMap dump for unrecognized login errors

Him188 · Him188 · commit 2accabef9ef2 · 2022-12-27T16:29:42.000Z
diff --git a/mirai-core/src/commonMain/kotlin/network/protocol/packet/login/WtLogin.kt b/mirai-core/src/commonMain/kotlin/network/protocol/packet/login/WtLogin.kt
@@ -238,11 +238,17 @@ internal class WtLogin {
                 // 1, 15 -> onErrorMessage(tlvMap) ?: error("Cannot find error message")
                 else -> {
                     onErrorMessage(type.toInt(), tlvMap, bot)
-                        ?: error("Cannot find error message, unknown login result type: $type, TLVMap = ${tlvMap.structureToString()}")
+                        ?: error(
+                            "Cannot find error message, unknown login result type: $type, TLVMap = ${dumpTlvMap(tlvMap)}"
+                        )
                 }
             }
         }
 
+        private fun dumpTlvMap(tlvMap: TlvMap) {
+            tlvMap.entries.joinToString { "${it.key}=${it.value.toUHexString()}" }
+        }
+
         private fun onDevLockLogin(
             tlvMap: TlvMap,
             bot: QQAndroidBot

Original file line number	Diff line number	Diff line change
`@@ -238,11 +238,17 @@ internal class WtLogin {`
`238`	`238`	`// 1, 15 -> onErrorMessage(tlvMap) ?: error("Cannot find error message")`
`239`	`239`	`else -> {`
`240`	`240`	`onErrorMessage(type.toInt(), tlvMap, bot)`
`241`		`- ?: error("Cannot find error message, unknown login result type: $type, TLVMap = ${tlvMap.structureToString()}")`
	`241`	`+ ?: error(`
	`242`	`+ "Cannot find error message, unknown login result type: $type, TLVMap = ${dumpTlvMap(tlvMap)}"`
	`243`	`+ )`
`242`	`244`	`}`
`243`	`245`	`}`
`244`	`246`	`}`
`245`	`247`
	`248`	`+ private fun dumpTlvMap(tlvMap: TlvMap) {`
	`249`	`+ tlvMap.entries.joinToString { "${it.key}=${it.value.toUHexString()}" }`
	`250`	`+ }`
	`251`	`+`
`246`	`252`	`private fun onDevLockLogin(`
`247`	`253`	`tlvMap: TlvMap,`
`248`	`254`	`bot: QQAndroidBot`