Introduce MultiPacket

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/QQAndroidBot.kt

@@ -8,8 +8,8 @@ import net.mamoe.mirai.data.ImageLink
 import net.mamoe.mirai.message.data.Image
 import net.mamoe.mirai.qqandroid.network.QQAndroidBotNetworkHandler
 import net.mamoe.mirai.qqandroid.network.QQAndroidClient
-import net.mamoe.mirai.qqandroid.network.protocol.packet.chat.receive.ImageIdQQA
 import net.mamoe.mirai.qqandroid.utils.Context
+import net.mamoe.mirai.qqandroid.utils.ImageIdQQA
 import net.mamoe.mirai.utils.BotConfiguration
 import net.mamoe.mirai.utils.LockFreeLinkedList
 import net.mamoe.mirai.utils.MiraiInternalAPI
@@ -28,7 +28,7 @@ internal abstract class QQAndroidBotBase constructor(
     configuration: BotConfiguration
 ) : BotImpl<QQAndroidBotNetworkHandler>(account, configuration) {
     val client: QQAndroidClient = QQAndroidClient(context, account, bot = @Suppress("LeakingThis") this as QQAndroidBot)
-
+    override val uin: Long get() = client.uin
     override val qqs: ContactList<QQ> = ContactList(LockFreeLinkedList())
 
     override fun getQQ(id: Long): QQ {

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

@@ -14,6 +14,7 @@ import net.mamoe.mirai.qqandroid.network.protocol.packet.login.data.RequestPacke
 import net.mamoe.mirai.utils.DefaultLogger
 import net.mamoe.mirai.utils.MiraiLogger
 import net.mamoe.mirai.utils.cryptor.adjustToPublicKey
+import net.mamoe.mirai.utils.cryptor.contentToString
 import net.mamoe.mirai.utils.cryptor.decryptBy
 import net.mamoe.mirai.utils.io.*
 import kotlin.contracts.ExperimentalContracts
@@ -27,7 +28,7 @@ import kotlin.jvm.JvmName
  * @param TPacket 服务器回复包解析结果
  */
 @UseExperimental(ExperimentalUnsignedTypes::class)
-internal abstract class PacketFactory<out TPacket : Packet>(
+internal abstract class PacketFactory<TPacket : Packet>(
     /**
      * 命令名. 如 `wtlogin.login`, `ConfigPushSvc.PushDomain`
      */
@@ -41,7 +42,7 @@ internal abstract class PacketFactory<out TPacket : Packet>(
     /**
      * 可选的处理这个包. 可以在这里面发新的包.
      */
-    open suspend fun @UnsafeVariance TPacket.handle(bot: QQAndroidBot) {}
+    open suspend fun QQAndroidBot.handle(packet: TPacket) {}
 }
 
 @JvmName("decode0")
@@ -59,7 +60,8 @@ internal object KnownPacketFactories : List<PacketFactory<*>> by mutableListOf(
     LoginPacket,
     StatSvc.Register,
     OnlinePush.PbPushGroupMsg,
-    MessageSvc.PushNotify
+    MessageSvc.PushNotify,
+    MessageSvc.PbGetMsg
 ) {
 
     fun findPacketFactory(commandName: String): PacketFactory<*>? = this.firstOrNull { it.commandName == commandName }
@@ -194,7 +196,15 @@ internal object KnownPacketFactories : List<PacketFactory<*>> by mutableListOf(
             val unknown = readBytes(readInt() - 4)
             if (unknown.toInt() != 0x02B05B8B) DebugLogger.debug("got new unknown: ${unknown.toUHexString()}")
 
-            check(readInt() == 0)
+            readInt().let {
+                if (it != 0) {
+                    DebugLogger.debug("!! 得到一个原本是 0, 现在是 ${it.contentToString()}")
+                    if (it == 1){
+                        PacketLogger.info("无法处理的数据 = ${input.readBytes().toUHexString()}")
+                        return IncomingPacket(null, ssoSequenceId, input)
+                    }
+                }
+            }
         }
 
         // body

mirai-core/src/commonMain/kotlin/net.mamoe.mirai/data/Packet.kt

@@ -4,3 +4,12 @@ package net.mamoe.mirai.data
  * 从服务器收到的包解析之后的结构化数据.
  */
 interface Packet
+
+/**
+ * PacketFactory 可以一次解析多个包出来. 它们将会被分别广播.
+ */
+class MultiPacket<P : Packet>(delegate: List<P>) : List<P> by delegate, Packet {
+    override fun toString(): String {
+        return "MultiPacket<${this.firstOrNull()?.let { it::class.simpleName }?: "?"}>"
+    }
+}
\ No newline at end of file

mirai-core/src/jvmMain/kotlin/net/mamoe/mirai/utils/io/PlatformSocket.kt

@@ -36,7 +36,11 @@ actual class PlatformSocket : Closeable {
      * @throws SendPacketInternalException
      */
     actual suspend inline fun send(packet: ByteReadPacket) {
-        writeChannel.writePacket(packet)
+        try {
+            writeChannel.writePacket(packet)
+        } catch (e: Exception) {
+            throw SendPacketInternalException(e)
+        }
     }
 
     /**
@@ -45,7 +49,11 @@ actual class PlatformSocket : Closeable {
     actual suspend inline fun read(): ByteReadPacket {
         // do not use readChannel.readRemaining() !!! this function never returns
         ByteArrayPool.useInstance { buffer ->
-            val count = readChannel.readAvailable(buffer)
+            val count = try {
+                readChannel.readAvailable(buffer)
+            } catch (e: Exception) {
+                throw ReadPacketInternalException(e)
+            }
             return buffer.toReadPacket(0, count)
         }
     }