Fix packet resend

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

@@ -342,34 +342,33 @@ internal class QQAndroidBotNetworkHandler(bot: QQAndroidBot) : BotNetworkHandler
         require(timeoutMillis > 0) { "timeoutMillis must > 0" }
         require(retry >= 0) { "retry must >= 0" }
 
-        val handler = PacketListener(commandName = commandName, sequenceId = sequenceId)
-        packetListeners.addLast(handler)
         var lastException: Exception? = null
         repeat(retry + 1) {
+            val handler = PacketListener(commandName = commandName, sequenceId = sequenceId)
+            packetListeners.addLast(handler)
             try {
-                return doSendAndReceive(timeoutMillis, handler)
+                withContext(this@QQAndroidBotNetworkHandler.coroutineContext + CoroutineName("Packet sender")) {
+                    channel.send(delegate)
+                }
+                bot.logger.info("Send: ${this.commandName}")
+                try {
+                    return withTimeoutOrNull(timeoutMillis) {
+                        @Suppress("UNCHECKED_CAST")
+                        handler.await() as E
+                        // 不要 `withTimeout`. timeout 的异常会不知道去哪了.
+                    } ?: net.mamoe.mirai.qqandroid.utils.inline {
+                        error("timeout when receiving response of $commandName")
+                    }
+                } finally {
+                    packetListeners.remove(handler)
+                }
             } catch (e: Exception) {
                 lastException = e
             }
         }
-        packetListeners.remove(handler)
         throw lastException!!
     }
 
-    private suspend inline fun <E : Packet> OutgoingPacket.doSendAndReceive(timeoutMillis: Long = 3000, handler: PacketListener): E {
-        withContext(this@QQAndroidBotNetworkHandler.coroutineContext + CoroutineName("Packet sender")) {
-            channel.send(delegate)
-        }
-        bot.logger.info("Send: ${this.commandName}")
-        return withTimeoutOrNull(timeoutMillis) {
-            @Suppress("UNCHECKED_CAST")
-            handler.await() as E
-            // 不要 `withTimeout`. timeout 的异常会不知道去哪了.
-        } ?: net.mamoe.mirai.qqandroid.utils.inline {
-            error("timeout when receiving response of $commandName")
-        }
-    }
-
     @PublishedApi
     internal val packetListeners = LockFreeLinkedList<PacketListener>()
 

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/packet/chat/receive/MessageSvc.kt

@@ -192,8 +192,8 @@ internal class MessageSvc {
                         )
                     ),
                     msgSeq = client.atomicNextMessageSequenceId(),
-                    msgRand = Random.nextInt().absoluteValue
-                    // syncCookie = client.c2cMessageSync.syncCookie.takeIf { it.isNotEmpty() } ?: "08 92 C2 C4 F1 05 10 92 C2 C4 F1 05 18 E6 ED B9 C3 02 20 89 FE BE A4 06 28 89 84 F9 A2 06 48 DE 8C EA E5 0E 58 D9 BD BB A0 09 60 1D 68 92 C2 C4 F1 05 70 00".hexToBytes(),
+                    msgRand = 123,
+                    syncCookie = client.c2cMessageSync.syncCookie?.takeIf { it.isNotEmpty() } ?: byteArrayOf()
                     // msgVia = 1
                 )
             )