From 02eaedd6a08ab541e992f46748dd6ad3530a9d10 Mon Sep 17 00:00:00 2001
From: tarsin <yuanqingxiang233@163.com>
Date: Wed, 26 Jul 2023 15:52:55 +0800
Subject: [PATCH] Lazy borrow cronet bytebuffer

---
 .../spider/Android14CoroutineHttpEngine.kt    | 32 +++++++++----------
 .../com/hippo/ehviewer/util/PreConditions.kt  |  3 ++
 2 files changed, 18 insertions(+), 17 deletions(-)
 create mode 100644 app/src/main/java/com/hippo/ehviewer/util/PreConditions.kt

diff --git a/app/src/main/java/com/hippo/ehviewer/spider/Android14CoroutineHttpEngine.kt b/app/src/main/java/com/hippo/ehviewer/spider/Android14CoroutineHttpEngine.kt
index 751d8b8cc..5c1f95120 100644
--- a/app/src/main/java/com/hippo/ehviewer/spider/Android14CoroutineHttpEngine.kt
+++ b/app/src/main/java/com/hippo/ehviewer/spider/Android14CoroutineHttpEngine.kt
@@ -5,6 +5,7 @@ import com.hippo.ehviewer.client.CHROME_ACCEPT
 import com.hippo.ehviewer.client.CHROME_ACCEPT_LANGUAGE
 import com.hippo.ehviewer.client.CHROME_USER_AGENT
 import com.hippo.ehviewer.client.EhCookieStore
+import com.hippo.ehviewer.util.runIf
 import eu.kanade.tachiyomi.util.system.logcat
 import io.ktor.utils.io.pool.DirectByteBufferPool
 import kotlinx.coroutines.coroutineScope
@@ -72,9 +73,9 @@ class CronetRequest : AutoCloseable {
         }
     }
 
-    val buffer = pool.borrow()
+    lateinit var buffer: ByteBuffer
 
-    override fun close() = pool.recycle(buffer)
+    override fun close() = runIf(::buffer.isInitialized) { pool.recycle(buffer) }
 }
 
 inline fun cronetRequest(url: String, referer: String? = null, conf: UrlRequest.Builder.() -> Unit) = CronetRequest().apply {
@@ -87,23 +88,20 @@ inline fun cronetRequest(url: String, referer: String? = null, conf: UrlRequest.
     }.apply(conf).build()
 }
 
-suspend infix fun CronetRequest.awaitBodyFully(consumer: (ByteBuffer) -> Unit) = run {
-    this.consumer = consumer
-    suspendCancellableCoroutine { cont ->
-        readerCont = cont
-        request.read(buffer)
-    }
+suspend fun CronetRequest.awaitBodyFully(callback: (ByteBuffer) -> Unit) = suspendCancellableCoroutine { cont ->
+    consumer = callback
+    readerCont = cont
+    buffer = pool.borrow()
+    request.read(buffer)
 }
 
-suspend inline fun CronetRequest.execute(noinline onResponse: suspend CronetRequest.(UrlResponseInfo) -> Unit): Boolean {
-    return use {
-        coroutineScope {
-            this@execute.onResponse = { launch { onResponse(it) } }
-            suspendCancellableCoroutine { cont ->
-                cont.invokeOnCancellation { request.cancel() }
-                daemonCont = cont
-                request.start()
-            }
+suspend fun CronetRequest.execute(callback: suspend CronetRequest.(UrlResponseInfo) -> Unit) = use {
+    coroutineScope {
+        onResponse = { launch { callback(it) } }
+        suspendCancellableCoroutine { cont ->
+            cont.invokeOnCancellation { request.cancel() }
+            daemonCont = cont
+            request.start()
         }
     }
 }
diff --git a/app/src/main/java/com/hippo/ehviewer/util/PreConditions.kt b/app/src/main/java/com/hippo/ehviewer/util/PreConditions.kt
new file mode 100644
index 000000000..22f10cac2
--- /dev/null
+++ b/app/src/main/java/com/hippo/ehviewer/util/PreConditions.kt
@@ -0,0 +1,3 @@
+package com.hippo.ehviewer.util
+
+inline fun runIf(predicate: Boolean, block: () -> Unit) = if (predicate) block() else Unit