From 9590abd70247ba8ecc4aadd5d5ebf0da58147e3a Mon Sep 17 00:00:00 2001
From: Him188 <him188@mamoe.net>
Date: Fri, 27 Aug 2021 15:40:53 +0800
Subject: [PATCH] Try to fix network when sending lots of packets
---
.../network/impl/netty/NettyNetworkHandler.kt | 30 +++++--------------
1 file changed, 7 insertions(+), 23 deletions(-)
diff --git a/mirai-core/src/commonMain/kotlin/network/impl/netty/NettyNetworkHandler.kt b/mirai-core/src/commonMain/kotlin/network/impl/netty/NettyNetworkHandler.kt
index 44daf7c3e..0be48b9d7 100644
--- a/mirai-core/src/commonMain/kotlin/network/impl/netty/NettyNetworkHandler.kt
+++ b/mirai-core/src/commonMain/kotlin/network/impl/netty/NettyNetworkHandler.kt
@@ -18,8 +18,6 @@ import io.netty.channel.socket.nio.NioSocketChannel
import io.netty.handler.codec.LengthFieldBasedFrameDecoder
import io.netty.handler.codec.MessageToByteEncoder
import kotlinx.coroutines.*
-import kotlinx.coroutines.channels.Channel
-import kotlinx.coroutines.channels.trySendBlocking
import net.mamoe.mirai.internal.network.components.*
import net.mamoe.mirai.internal.network.handler.NetworkHandler.State
import net.mamoe.mirai.internal.network.handler.NetworkHandlerContext
@@ -165,31 +163,17 @@ internal open class NettyNetworkHandler(
protected inner class PacketDecodePipeline(parentContext: CoroutineContext) :
CoroutineScope by parentContext.childScope() {
- private val channel: Channel<RawIncomingPacket> = Channel(Channel.BUFFERED)
private val packetCodec: PacketCodec by lazy { context[PacketCodec] }
- init {
- coroutineContext.job.invokeOnCompletion {
- channel.close() // normally close
+ fun send(raw: RawIncomingPacket) {
+ launch {
+ packetLogger.debug { "Packet Handling Processor: receive packet ${raw.commandName}" }
+ val result = packetCodec.processBody(context.bot, raw)
+ if (result == null) {
+ collectUnknownPacket(raw)
+ } else collectReceived(result)
}
}
-
- init {
- repeat(4) { processorId ->
- launch(CoroutineName("PacketDecodePipeline processor #$processorId")) {
- while (isActive) {
- val raw = channel.receiveCatching().getOrNull() ?: return@launch
- packetLogger.debug { "Packet Handling Processor #$processorId: receive packet ${raw.commandName}" }
- val result = packetCodec.processBody(context.bot, raw)
- if (result == null) {
- collectUnknownPacket(raw)
- } else collectReceived(result)
- }
- }
- }
- }
-
- fun send(raw: RawIncomingPacket) = channel.trySendBlocking(raw)
}