From 0294df4700559b4303566135b2516bfbe27ad316 Mon Sep 17 00:00:00 2001
From: Him188 <Him188@mamoe.net>
Date: Tue, 15 Sep 2020 10:29:51 +0800
Subject: [PATCH] Use single thread for reading packet, fix #557

---
 .../mamoe/mirai/qqandroid/utils/PlatformSocket.kt | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/mirai-core-qqandroid/src/jvmMain/kotlin/net/mamoe/mirai/qqandroid/utils/PlatformSocket.kt b/mirai-core-qqandroid/src/jvmMain/kotlin/net/mamoe/mirai/qqandroid/utils/PlatformSocket.kt
index 7b3957606..78a9ca73f 100644
--- a/mirai-core-qqandroid/src/jvmMain/kotlin/net/mamoe/mirai/qqandroid/utils/PlatformSocket.kt
+++ b/mirai-core-qqandroid/src/jvmMain/kotlin/net/mamoe/mirai/qqandroid/utils/PlatformSocket.kt
@@ -10,6 +10,7 @@
 package net.mamoe.mirai.qqandroid.utils
 
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.suspendCancellableCoroutine
 import kotlinx.coroutines.withContext
 import kotlinx.io.core.ByteReadPacket
 import kotlinx.io.core.Closeable
@@ -20,6 +21,7 @@ import java.io.BufferedInputStream
 import java.io.BufferedOutputStream
 import java.net.Socket
 import java.net.SocketException
+import java.util.concurrent.Executors
 import kotlin.coroutines.CoroutineContext
 
 /**
@@ -38,6 +40,7 @@ internal actual class PlatformSocket : Closeable {
         if (::socket.isInitialized) {
             socket.close()
         }
+        thread.shutdownNow()
     }
 
     @PublishedApi
@@ -67,15 +70,17 @@ internal actual class PlatformSocket : Closeable {
         }
     }
 
+    private val thread = Executors.newSingleThreadExecutor()
+
     /**
      * @throws ReadPacketInternalException
      */
-    actual suspend fun read(): ByteReadPacket {
-        return withContext(Dispatchers.IO) {
-            try {
+    actual suspend fun read(): ByteReadPacket = suspendCancellableCoroutine { cont ->
+        thread.submit {
+            kotlin.runCatching {
                 readChannel.readPacketAtMost(Long.MAX_VALUE)
-            } catch (e: IOException) {
-                throw ReadPacketInternalException(e)
+            }.let {
+                cont.resumeWith(it)
             }
         }
     }