Skip to content

StreamVault is a TV-first free IPTV player for Android TV built with Kotlin, Jetpack Compose, Room, Hilt, and Media3.

Recheck extended Xtream retry deadlines before request admission

David Nashasha723da7800ec
diff --git a/data/src/main/java/com/streamvault/data/sync/XtreamAdaptiveSyncPolicy.kt b/data/src/main/java/com/streamvault/data/sync/XtreamAdaptiveSyncPolicy.kt
index 625b9901..6a18c34a 100644
--- a/data/src/main/java/com/streamvault/data/sync/XtreamAdaptiveSyncPolicy.kt
+++ b/data/src/main/java/com/streamvault/data/sync/XtreamAdaptiveSyncPolicy.kt
@@ -51,11 +51,7 @@ internal class XtreamAdaptiveSyncPolicy(private val nowMillis: () -> Long = Syst
if ((providerHealth[providerId]?.stressLevel ?: 0) > 0) 1 else 2
suspend fun awaitTurn(providerId: Long, stage: Stage) {
- val health = providerHealth[providerId]
- val waitMs = maxOf(health?.backoffUntilMs ?: 0L, health?.retryAfterUntilMs ?: 0L) - nowMillis()
- if (waitMs > 0L) {
- delay(waitMs)
- }
+ awaitProviderBackoff(providerId)
val requestSpacingMs = segmentedRequestSpacingFor(providerId, stage)
if (requestSpacingMs <= 0L) {
return
@@ -67,10 +63,20 @@ internal class XtreamAdaptiveSyncPolicy(private val nowMillis: () -> Long = Syst
if (pacingWaitMs > 0L) {
delay(pacingWaitMs)
}
+ awaitProviderBackoff(providerId)
pacingState.nextSegmentedRequestStartMs = nowMillis() + requestSpacingMs
}
}
+ private suspend fun awaitProviderBackoff(providerId: Long) {
+ while (true) {
+ val health = providerHealth[providerId]
+ val waitMs = maxOf(health?.backoffUntilMs ?: 0L, health?.retryAfterUntilMs ?: 0L) - nowMillis()
+ if (waitMs <= 0L) return
+ delay(waitMs)
+ }
+ }
+
fun timeoutFor(providerId: Long, stage: Stage): Long? = stage.timeoutMs
fun concurrencyFor(
diff --git a/data/src/test/java/com/streamvault/data/sync/XtreamLiveCategorySchedulingTest.kt b/data/src/test/java/com/streamvault/data/sync/XtreamLiveCategorySchedulingTest.kt
index e5af365b..82f62144 100644
--- a/data/src/test/java/com/streamvault/data/sync/XtreamLiveCategorySchedulingTest.kt
+++ b/data/src/test/java/com/streamvault/data/sync/XtreamLiveCategorySchedulingTest.kt
@@ -8,6 +8,7 @@ import com.streamvault.domain.model.LegacyProvider
import com.streamvault.domain.model.ProviderType
import kotlinx.coroutines.delay
import kotlinx.coroutines.awaitCancellation
+import kotlinx.coroutines.async
import kotlinx.coroutines.test.runTest
import org.junit.Test
@@ -68,6 +69,18 @@ class XtreamLiveCategorySchedulingTest {
assertThat(testScheduler.currentTime).isEqualTo(10_000L)
}
+ @Test
+ fun `retry after extension while waiting delays the next request to the new deadline`() = runTest {
+ val policy = XtreamAdaptiveSyncPolicy { testScheduler.currentTime }
+ policy.recordFailure(7, XtreamNetworkException("HTTP 429", statusCode = 429, retryAfterMs = 10_000))
+ val waiting = async { policy.awaitTurn(7, XtreamAdaptiveSyncPolicy.Stage.LIVE_CATEGORY) }
+ delay(1000)
+ policy.recordFailure(7, XtreamNetworkException("HTTP 429", statusCode = 429, retryAfterMs = 20_000))
+ repeat(6) { policy.recordSuccess(7) }
+ waiting.await()
+ assertThat(testScheduler.currentTime).isEqualTo(21_000L)
+ }
+
@Test
fun `repeated stress drains active requests and stops before fetching every category`() = runTest {
var started = 0
diff --git a/docs/XTREAM_SYNC_CATEGORY_IMPLEMENTATION.md b/docs/XTREAM_SYNC_CATEGORY_IMPLEMENTATION.md
index 7fc93bfb..fda1c7a1 100644
--- a/docs/XTREAM_SYNC_CATEGORY_IMPLEMENTATION.md
+++ b/docs/XTREAM_SYNC_CATEGORY_IMPLEMENTATION.md
@@ -25,6 +25,9 @@ fields instead of wrapping the exception again. Retry-After accepts seconds or
an HTTP date. Provider-wide Retry-After deadlines survive successful concurrent
requests and stress recovery; the next request waits for the later of that
deadline and adaptive backoff. Authentication is not classified as throttling.
+Waiting requests recheck the deadline after waking, including when another
+response extends Retry-After while they are asleep; a deterministic test covers
+that extension.
## Evidence