Adjust timeout, add retry for several servers

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

@@ -20,6 +20,7 @@ import kotlinx.coroutines.CoroutineName
 import kotlinx.coroutines.async
 import kotlinx.coroutines.io.ByteReadChannel
 import kotlinx.coroutines.withContext
+import kotlinx.coroutines.withTimeoutOrNull
 import kotlinx.serialization.UnstableDefault
 import kotlinx.serialization.json.Json
 import kotlinx.serialization.json.JsonConfiguration
@@ -417,11 +418,12 @@ internal abstract class QQAndroidBotBase constructor(
         val group = getGroup(groupCode)
 
         val time = currentTimeSeconds
+        val sequenceId = client.atomicNextMessageSequenceId()
         message.firstIsInstanceOrNull<QuoteReply>()?.source?.ensureSequenceIdAvailable()
 
         network.run {
             val data = message.calculateValidationDataForGroup(
-                sequenceId = client.atomicNextMessageSequenceId(),
+                sequenceId = sequenceId,
                 time = time.toInt(),
                 random = Random.nextInt().absoluteValue.toUInt(),
                 groupCode = groupCode,
@@ -464,16 +466,28 @@ internal abstract class QQAndroidBotBase constructor(
                         )
                     ).toByteArray(LongMsg.ReqBody.serializer())
 
-                    HighwayHelper.uploadImage(
+                    val success = response.proto.uint32UpIp.zip(response.proto.uint32UpPort).any { (ip, port) ->
-                        client,
+                        withTimeoutOrNull((body.size * 1000L / 1024 / 10).coerceAtLeast(5000L)) {
-                        serverIp = response.proto.uint32UpIp!!.first().toIpV4AddressString(),
+                            network.logger.verbose { "[Highway] Uploading group long message#$sequenceId to ${ip.toIpV4AddressString()}:$port: size=${body.size}" }
-                        serverPort = response.proto.uint32UpPort!!.first(),
+                            HighwayHelper.uploadImage(
-                        ticket = response.proto.msgSig, // 104
+                                client,
-                        imageInput = body.toReadPacket(),
+                                serverIp = ip.toIpV4AddressString(),
-                        inputSize = body.size,
+                                serverPort = port,
-                        fileMd5 = MiraiPlatformUtils.md5(body),
+                                ticket = response.proto.msgSig, // 104
-                        commandId = 27 // long msg
+                                imageInput = body.toReadPacket(),
-                    )
+                                inputSize = body.size,
+                                fileMd5 = MiraiPlatformUtils.md5(body),
+                                commandId = 27 // long msg
+                            )
+                            network.logger.verbose { "[Highway] Uploading group long message#$sequenceId: succeed" }
+                            true
+                        } ?: kotlin.run {
+                            network.logger.verbose { "[Highway] Uploading group long message: timeout, retrying next server" }
+                            false
+                        }
+                    }
+
+                    check(success) { "cannot upload group image, failed on all servers." }
                 }
             }
 

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

@@ -389,19 +389,30 @@ internal class GroupImpl(
                     ).also { ImageUploadEvent.Succeed(this@GroupImpl, image, it).broadcast() }
                 }
                 is ImgStore.GroupPicUp.Response.RequireUpload -> {
-                    // 每 10KB 等 1 秒
+                    // 每 10KB 等 1 秒, 最少等待 5 秒
-                    withTimeoutOrNull(image.inputSize * 1000 / 1024 / 10) {
+                    val success = response.uploadIpList.zip(response.uploadPortList).any { (ip, port) ->
-                        HighwayHelper.uploadImage(
+                        withTimeoutOrNull((image.inputSize * 1000 / 1024 / 10).coerceAtLeast(5000)) {
-                            client = bot.client,
+                            bot.network.logger.verbose { "[Highway] Uploading group image to ${ip.toIpV4AddressString()}:$port: size=${image.inputSize / 1024} KiB" }
-                            serverIp = response.uploadIpList.first().toIpV4AddressString(),
+                            HighwayHelper.uploadImage(
-                            serverPort = response.uploadPortList.first(),
+                                client = bot.client,
-                            imageInput = image.input,
+                                serverIp = ip.toIpV4AddressString(),
-                            inputSize = image.inputSize.toInt(),
+                                serverPort = port,
-                            fileMd5 = image.md5,
+                                imageInput = image.input,
-                            ticket = response.uKey,
+                                inputSize = image.inputSize.toInt(),
-                            commandId = 2
+                                fileMd5 = image.md5,
-                        )
+                                ticket = response.uKey,
-                    } ?: error("timeout uploading image: ${image.filename}")
+                                commandId = 2
+                            )
+                            bot.network.logger.verbose { "[Highway] Uploading group image: succeed" }
+                            true
+                        } ?: kotlin.run {
+                            bot.network.logger.verbose { "[Highway] Uploading group image: timeout, retrying next server" }
+                            false
+                        }
+                    }
+
+                    check(success) { "cannot upload group image, failed on all servers." }
+
                     val resourceId = image.calculateImageResourceId()
                     // return NotOnlineImageFromFile(
                     //     resourceId = resourceId,

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

@@ -206,7 +206,8 @@ internal class OfflineMessageSourceImplBySourceMsg( // from others' quotation
     */
 
     override val id: Int
-        get() = delegate.pbReserve.loadAs(SourceMsg.ResvAttr.serializer()).origUids!!.toInt()
+        get() = delegate.pbReserve.loadAs(SourceMsg.ResvAttr.serializer()).origUids?.toInt()
+            ?: error("在读取 OfflineMessageSourceImplBySourceMsg.id 时找不到 origUids, delegate=${delegate._miraiContentToString()}")
 
     // override val sourceMessage: MessageChain get() = delegate.toMessageChain()
     override val fromId: Long get() = delegate.senderUin

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

@@ -42,7 +42,7 @@ internal fun createImageDataPacketSequence( // RequestDataTrans
     data: Any,
     dataSize: Int,
     fileMd5: ByteArray,
-    sizePerPacket: Int = 8192
+    sizePerPacket: Int = 8192.coerceAtMost(ByteArrayPool.BUFFER_SIZE)
 ): Flow<ByteReadPacket> {
     ByteArrayPool.checkBufferSize(sizePerPacket)
     require(data is Input || data is InputStream || data is ByteReadChannel) { "unsupported data: ${data::class.simpleName}" }

mirai-core-qqandroid/src/commonMain/kotlin/net/mamoe/mirai/qqandroid/network/protocol/data/proto/MultiMsg.kt

@@ -46,8 +46,8 @@ internal class MultiMsg : ProtoBuf {
         @ProtoId(1) val result: Int = 0,
         @ProtoId(2) val msgResid: String = "",
         @ProtoId(3) val msgUkey: ByteArray = EMPTY_BYTE_ARRAY,
-        @ProtoId(4) val uint32UpIp: List<Int>? = null,
+        @ProtoId(4) val uint32UpIp: List<Int>,
-        @ProtoId(5) val uint32UpPort: List<Int>? = null,
+        @ProtoId(5) val uint32UpPort: List<Int>,
         @ProtoId(6) val blockSize: Long = 0L,
         @ProtoId(7) val upOffset: Long = 0L,
         @ProtoId(8) val applyId: Int = 0,