From ce6da7d19364d757d473c35ec307abcebe424db0 Mon Sep 17 00:00:00 2001
From: Him188 <Him188@mamoe.net>
Date: Mon, 6 Jan 2020 18:27:42 +0800
Subject: [PATCH] Make member functions in LockFreeLinkedList open

---
 .../network/TIMPCBotNetworkHandler.kt         | 42 ++++---------------
 1 file changed, 8 insertions(+), 34 deletions(-)

diff --git a/mirai-core-timpc/src/commonMain/kotlin/net.mamoe.mirai.timpc/network/TIMPCBotNetworkHandler.kt b/mirai-core-timpc/src/commonMain/kotlin/net.mamoe.mirai.timpc/network/TIMPCBotNetworkHandler.kt
index fafb4efc4..b093a6c32 100644
--- a/mirai-core-timpc/src/commonMain/kotlin/net.mamoe.mirai.timpc/network/TIMPCBotNetworkHandler.kt
+++ b/mirai-core-timpc/src/commonMain/kotlin/net.mamoe.mirai.timpc/network/TIMPCBotNetworkHandler.kt
@@ -4,7 +4,6 @@ package net.mamoe.mirai.timpc.network
 
 import kotlinx.coroutines.*
 import kotlinx.io.core.*
-import kotlinx.io.pool.useInstance
 import net.mamoe.mirai.Bot
 import net.mamoe.mirai.data.LoginResult
 import net.mamoe.mirai.data.OnlineStatus
@@ -21,13 +20,10 @@ import net.mamoe.mirai.timpc.network.handler.DataPacketSocketAdapter
 import net.mamoe.mirai.timpc.network.handler.TemporaryPacketHandler
 import net.mamoe.mirai.timpc.network.packet.*
 import net.mamoe.mirai.timpc.network.packet.login.*
-import net.mamoe.mirai.utils.LockFreeLinkedList
-import net.mamoe.mirai.utils.LoginFailedException
-import net.mamoe.mirai.utils.NoLog
+import net.mamoe.mirai.utils.*
 import net.mamoe.mirai.utils.cryptor.Decrypter
 import net.mamoe.mirai.utils.cryptor.NoDecrypter
 import net.mamoe.mirai.utils.io.*
-import net.mamoe.mirai.utils.unsafeWeakRef
 import kotlin.coroutines.CoroutineContext
 import kotlin.random.Random
 
@@ -109,6 +105,7 @@ internal class TIMPCBotNetworkHandler internal constructor(coroutineContext: Cor
         this.socket.close()
     }
 
+    @UseExperimental(MiraiInternalAPI::class)
     internal inner class BotSocketAdapter(override val serverIp: String) :
         DataPacketSocketAdapter {
 
@@ -120,10 +117,8 @@ internal class TIMPCBotNetworkHandler internal constructor(coroutineContext: Cor
 
         private suspend fun processReceive() {
             while (channel.isOpen) {
-                val buffer = IoBuffer.Pool.borrow()
-
-                try {
-                    channel.read(buffer)// JVM: withContext(IO)
+                val input: ByteReadPacket = try {
+                    channel.read()// JVM: withContext(IO)
                 } catch (e: ClosedChannelException) {
                     close()
                     return
@@ -135,25 +130,13 @@ internal class TIMPCBotNetworkHandler internal constructor(coroutineContext: Cor
                 } catch (e: Throwable) {
                     bot.logger.error("Caught unexpected exceptions", e)
                     continue
-                } finally {
-                    if (!buffer.canRead() || buffer.readRemaining == 0) {//size==0
-                        //bot.logger.debug("processReceive: Buffer cannot be read")
-                        buffer.release(IoBuffer.Pool)
-                        continue
-                    }// sometimes exceptions are thrown without this `if` clause
                 }
 
                 //buffer.resetForRead()
                 launch(CoroutineName("handleServerPacket")) {
                     // `.use`: Ensure that the packet is consumed **totally**
                     // so that all the buffers are released
-                    ByteArrayPool.useInstance {
-                        val length = buffer.readRemaining - 1
-                        buffer.readFully(it, 0, length)
-                        buffer.resetForWrite()
-                        buffer.writeFully(it, 0, length)
-                    }
-                    ByteReadPacket(buffer, IoBuffer.Pool).use { input ->
+                    input.use {
                         try {
                             input.discardExact(3)
 
@@ -165,7 +148,7 @@ internal class TIMPCBotNetworkHandler internal constructor(coroutineContext: Cor
                             val packet = try {
                                 with(id.factory) {
                                     loginHandler!!.provideDecrypter(id.factory)
-                                        .decrypt(input)
+                                        .decrypt(input, 0, (input.remaining - 1).toInt()) // tail
                                         .decode(id, sequenceId, this@TIMPCBotNetworkHandler)
                                 }
                             } finally {
@@ -252,16 +235,9 @@ internal class TIMPCBotNetworkHandler internal constructor(coroutineContext: Cor
         internal suspend fun sendPacket(packet: OutgoingPacket): Unit = withContext(coroutineContext + CoroutineName("sendPacket")) {
             check(channel.isOpen) { "channel is not open" }
 
-            packet.delegate.use { built ->
-                val buffer = IoBuffer.Pool.borrow()
+            packet.delegate.use {
                 try {
-                    built.readAvailable(buffer)
-                    val shouldBeSent = buffer.readRemaining
-                    check(channel.send(buffer) == shouldBeSent) {
-                        "Buffer is not entirely sent. " +
-                                "Required sent length=$shouldBeSent, but after channel.send, " +
-                                "buffer remains ${buffer.readBytes().toUHexString()}"
-                    }//JVM: withContext(IO)
+                    check(channel.send(it) ) { "Send packet failed" }
                 } catch (e: SendPacketInternalException) {
                     if (e.cause !is CancellationException) {
                         bot.logger.error("Caught SendPacketInternalException: ${e.cause?.message}")
@@ -269,8 +245,6 @@ internal class TIMPCBotNetworkHandler internal constructor(coroutineContext: Cor
                     delay(bot.configuration.firstReconnectDelayMillis)
                     bot.tryReinitializeNetworkHandler(e)
                     return@withContext
-                } finally {
-                    buffer.release(IoBuffer.Pool)
                 }
             }