From fff417e0f204f77b9236363bcf89e5b614207ecf Mon Sep 17 00:00:00 2001
From: tapframe <85391825+tapframe@users.noreply.github.com>
Date: Sun, 5 Apr 2026 16:51:11 +0530
Subject: [PATCH] refactor: remove deduplicatedHttpGetText for caroutine
 handling

---
 .../nuvio/app/features/catalog/CatalogData.kt | 43 +++++++++++--------
 1 file changed, 24 insertions(+), 19 deletions(-)

diff --git a/composeApp/src/commonMain/kotlin/com/nuvio/app/features/catalog/CatalogData.kt b/composeApp/src/commonMain/kotlin/com/nuvio/app/features/catalog/CatalogData.kt
index a838864ce..70754a539 100644
--- a/composeApp/src/commonMain/kotlin/com/nuvio/app/features/catalog/CatalogData.kt
+++ b/composeApp/src/commonMain/kotlin/com/nuvio/app/features/catalog/CatalogData.kt
@@ -6,6 +6,10 @@ import com.nuvio.app.features.home.HomeCatalogParser
 import com.nuvio.app.features.home.MetaPreview
 import com.nuvio.app.features.home.stableKey
 import kotlinx.coroutines.CompletableDeferred
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.launch
 import kotlinx.coroutines.sync.Mutex
 import kotlinx.coroutines.sync.withLock
 
@@ -18,29 +22,30 @@ data class CatalogPage(
 )
 
 private val inflightMutex = Mutex()
+private val inflightRequestScope = CoroutineScope(SupervisorJob() + Dispatchers.Default)
 private val inflightRequests = mutableMapOf<String, CompletableDeferred<String>>()
 
 private suspend fun deduplicatedHttpGetText(url: String): String {
-    val existing = inflightMutex.withLock { inflightRequests[url] }
-    if (existing != null) return existing.await()
-    val deferred = CompletableDeferred<String>()
-    val isOwner = inflightMutex.withLock {
-        val race = inflightRequests[url]
-        if (race != null) return@withLock false
-        inflightRequests[url] = deferred
-        true
-    }
-    if (!isOwner) return inflightMutex.withLock { inflightRequests[url]!! }.await()
-    return try {
-        val result = httpGetText(url)
-        deferred.complete(result)
-        result
-    } catch (e: Throwable) {
-        deferred.completeExceptionally(e)
-        throw e
-    } finally {
-        inflightMutex.withLock { inflightRequests.remove(url) }
+    val deferred = inflightMutex.withLock {
+        inflightRequests[url] ?: CompletableDeferred<String>().also { created ->
+            inflightRequests[url] = created
+            inflightRequestScope.launch {
+                try {
+                    created.complete(httpGetText(url))
+                } catch (error: Throwable) {
+                    created.completeExceptionally(error)
+                } finally {
+                    inflightMutex.withLock {
+                        if (inflightRequests[url] === created) {
+                            inflightRequests.remove(url)
+                        }
+                    }
+                }
+            }
+        }
     }
+
+    return deferred.await()
 }
 
 suspend fun fetchCatalogPage(