fix: resolve search & session race conditions under concurrent startup rail loads

Author: RiskyN

AnimeVerse/build.gradle.kts

@@ -6,7 +6,7 @@ dependencies {
     testImplementation(files("C:/Users/user/.gradle/caches/cloudstream/cloudstream/cloudstream.jar"))
 }
 
-version = 2
+version = 3
 
 cloudstream {
     description = "AnimeVerse Provider"

AnimeVerse/src/main/kotlin/com/animeverse/AnimeVerseProvider.kt

@@ -13,6 +13,8 @@ import com.lagradost.cloudstream3.utils.newExtractorLink
 import java.util.EnumSet
 import javax.crypto.Mac
 import javax.crypto.spec.SecretKeySpec
+import kotlinx.coroutines.sync.Mutex
+import kotlinx.coroutines.sync.withLock
 
 class AnimeVerseProvider : MainAPI() {
     override var mainUrl       = "https://animeverse.to"
@@ -35,6 +37,9 @@ class AnimeVerseProvider : MainAPI() {
     private var catalogCache: List<CatalogItem>? = null
     private var cacheTimestamp: Long = 0
 
+    private val sessionMutex = Mutex()
+    private val catalogMutex = Mutex()
+
     // Custom browser fingerprint parameters accepted by the API
     private val fingerprint = mapOf(
         "ua" to "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36",
@@ -86,29 +91,35 @@ class AnimeVerseProvider : MainAPI() {
 
     // Requests a signed API session — retries up to 3 times since the server is flaky
     private suspend fun establishSession() {
-        var lastError: Exception? = null
-        repeat(3) { attempt ->
-            try {
-                val response = app.post(
-                    "$mainUrl/api/v1/session",
-                    json = mapOf("fp" to fingerprint),
-                    headers = mapOf(
-                        "User-Agent" to fingerprint["ua"].toString(),
-                        "Referer"    to "$mainUrl/"
+        sessionMutex.withLock {
+            val currentTime = System.currentTimeMillis() / 1000
+            if (clientAuthKey != null && currentTime < expiresAt) {
+                return
+            }
+            var lastError: Exception? = null
+            repeat(3) { attempt ->
+                try {
+                    val response = app.post(
+                        "$mainUrl/api/v1/session",
+                        json = mapOf("fp" to fingerprint),
+                        headers = mapOf(
+                            "User-Agent" to fingerprint["ua"].toString(),
+                            "Referer"    to "$mainUrl/"
+                        )
                     )
-                )
-                val res = localMapper.readValue(response.text, SessionResponse::class.java)
-                clientAuthKey = res.clientAuthKey
-                expiresAt     = res.expiresAt
-                sessionCookies = response.cookies
-                return  // success — exit early
-            } catch (e: Exception) {
-                lastError = e
-                // brief pause before next attempt
-                kotlinx.coroutines.delay((attempt + 1) * 1000L)
+                    val res = localMapper.readValue(response.text, SessionResponse::class.java)
+                    clientAuthKey = res.clientAuthKey
+                    expiresAt     = res.expiresAt
+                    sessionCookies = response.cookies
+                    return  // success — exit early
+                } catch (e: Exception) {
+                    lastError = e
+                    // brief pause before next attempt
+                    kotlinx.coroutines.delay((attempt + 1) * 1000L)
+                }
             }
+            throw lastError ?: Exception("Failed to establish session after 3 attempts")
         }
-        throw lastError ?: Exception("Failed to establish session after 3 attempts")
     }
 
     // Signed GET — re-establishes session when expired or missing
@@ -137,17 +148,24 @@ class AnimeVerseProvider : MainAPI() {
             return cache
         }
 
-        return try {
-            val jsonText = signedGet("/api/v1/catalog")
-            val response = localMapper.readValue(jsonText, CatalogResponse::class.java)
-            val items = response.items.filter { it.slug.isNotEmpty() && it.title.isNotEmpty() }
-            catalogCache = items
-            cacheTimestamp = current
-            Log.d("AnimeVerse", "Catalog loaded: ${items.size} items")
-            items
-        } catch (e: Exception) {
-            Log.e("AnimeVerse", "getCatalog FAILED: ${e.javaClass.simpleName}: ${e.message}")
-            emptyList()
+        return catalogMutex.withLock {
+            val doubleCheckCache = catalogCache
+            if (doubleCheckCache != null && System.currentTimeMillis() - cacheTimestamp < 10 * 60 * 1000) {
+                return@withLock doubleCheckCache
+            }
+
+            try {
+                val jsonText = signedGet("/api/v1/catalog")
+                val response = localMapper.readValue(jsonText, CatalogResponse::class.java)
+                val items = response.items.filter { it.slug.isNotEmpty() && it.title.isNotEmpty() }
+                catalogCache = items
+                cacheTimestamp = System.currentTimeMillis()
+                Log.d("AnimeVerse", "Catalog loaded: ${items.size} items")
+                items
+            } catch (e: Exception) {
+                Log.e("AnimeVerse", "getCatalog FAILED: ${e.javaClass.simpleName}: ${e.message}")
+                emptyList()
+            }
         }
     }