github-repos/mirai
1
0
Fork 0
mirror of https://github.com/mamoe/mirai.git synced 2025-01-23 14:20:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Avoid network congestion

Browse Source
This commit is contained in:
Karlatemp 2021-06-11 21:19:35 +08:00
parent 05a8419fb7
commit e9d9d56489
No known key found for this signature in database
GPG Key ID: 21FBDDF664FF06F8
2 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
mirai-core/src/commonMain/kotlin/network/handler/NetworkHandlerSupport.kt
View File

@ -92,11 +92,11 @@ internal abstract class NetworkHandlerSupport(
final override suspend fun sendAndExpect(packet: OutgoingPacket, timeout: Long, attempts: Int): Packet? { final override suspend fun sendAndExpect(packet: OutgoingPacket, timeout: Long, attempts: Int): Packet? {
require(attempts >= 1) { "attempts must be at least 1." } require(attempts >= 1) { "attempts must be at least 1." }
val listener = PacketListener(packet.commandName, packet.sequenceId) val listener = PacketListener(packet.commandName, packet.sequenceId)
packetListeners.add(listener)
withExceptionCollector { withExceptionCollector {
repeat(attempts) { try {
context[PacketLoggingStrategy].logSent(logger, packet) repeat(attempts) {
try { context[PacketLoggingStrategy].logSent(logger, packet)
packetListeners.add(listener)
sendPacketImpl(packet) sendPacketImpl(packet)
try { try {
return withTimeout(timeout) { return withTimeout(timeout) {
@ -105,12 +105,12 @@ internal abstract class NetworkHandlerSupport(
} catch (e: TimeoutCancellationException) { } catch (e: TimeoutCancellationException) {
collectException(e) collectException(e)
} }
} finally {
listener.result.completeExceptionally(getLast() ?: IllegalStateException("No response"))
packetListeners.remove(listener)
} }
throwLast()
} finally {
packetListeners.remove(listener)
listener.result.completeExceptionally(getLast() ?: IllegalStateException("No response"))
} }
throwLast()
} }
} }

19
mirai-core/src/commonMain/kotlin/network/impl/netty/NettyNetworkHandler.kt
View File

@ -20,8 +20,6 @@ import io.netty.handler.codec.MessageToByteEncoder
import kotlinx.coroutines.* import kotlinx.coroutines.*
import kotlinx.coroutines.channels.Channel import kotlinx.coroutines.channels.Channel
import kotlinx.coroutines.channels.trySendBlocking import kotlinx.coroutines.channels.trySendBlocking
import kotlinx.coroutines.flow.collect
import kotlinx.coroutines.flow.consumeAsFlow
import net.mamoe.mirai.internal.network.components.* import net.mamoe.mirai.internal.network.components.*
import net.mamoe.mirai.internal.network.handler.NetworkHandler.State import net.mamoe.mirai.internal.network.handler.NetworkHandler.State
import net.mamoe.mirai.internal.network.handler.NetworkHandlerContext import net.mamoe.mirai.internal.network.handler.NetworkHandlerContext
@ -185,13 +183,16 @@ internal open class NettyNetworkHandler(
} }
init { init {
launch(CoroutineName("PacketDecodePipeline processor")) { repeat(4) { processorId ->
// 'single thread' processor launch(CoroutineName("PacketDecodePipeline processor #$processorId")) {
channel.consumeAsFlow().collect { raw -> while (isActive) {
val result = packetCodec.processBody(context.bot, raw) val raw = channel.receiveCatching().getOrNull() ?: return@launch
if (result == null) { packetLogger.debug { "Packet Handling Processor #$processorId: receive packet ${raw.commandName}" }
collectUnknownPacket(raw) val result = packetCodec.processBody(context.bot, raw)
} else collectReceived(result) if (result == null) {
collectUnknownPacket(raw)
} else collectReceived(result)
}
} }
} }
} }