StreamVault is a TV-first free IPTV player for Android TV built with Kotlin, Jetpack Compose, Room, Hilt, and Media3.
Kotlin iptv-player
Make live zapping connection conservative
David Nashash351eba74c28a
diff --git a/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerRecoveryActions.kt b/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerRecoveryActions.ktindex 291d620d..c29a69b0 100644--- a/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerRecoveryActions.kt+++ b/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerRecoveryActions.kt@@ -8,7 +8,7 @@ import com.streamvault.player.PlayerErrorimport kotlinx.coroutines.delayimport kotlinx.coroutines.launch-private const val AUTH_REFRESH_RETRY_GRACE_MS = 1_500L+private const val PROVIDER_AUTH_RETRY_GRACE_MS = 1_200Linternal fun PlayerViewModel.buildRecoveryActions(recoveryType: PlayerRecoveryType): List<PlayerNoticeAction> {return buildPlayerRecoveryActions(@@ -18,6 +18,12 @@ internal fun PlayerViewModel.buildRecoveryActions(recoveryType: PlayerRecoveryTy)}+internal fun shouldAttemptProviderAuthRetry(+ providerType: ProviderType,+ contentType: ContentType+): Boolean = contentType == ContentType.LIVE &&+ (providerType == ProviderType.XTREAM_CODES || providerType == ProviderType.STALKER_PORTAL)+internal suspend fun PlayerViewModel.tryRefreshXtreamPlaybackAfterAuthError(error: PlayerError,requestVersion: Long,@@ -45,15 +51,12 @@ internal suspend fun PlayerViewModel.tryRefreshXtreamPlaybackAfterAuthError())setLastFailureReason(error.message)- appendRecoveryAction("Refreshed provider playback URL after auth failure")- showPlayerNotice(- message = "Refreshing the provider playback URL…",- recoveryType = PlayerRecoveryType.NETWORK,- actions = buildRecoveryActions(PlayerRecoveryType.NETWORK),- isRetryNotice = true- )- delay(AUTH_REFRESH_RETRY_GRACE_MS)+ appendRecoveryAction("Retrying provider playback from a fresh live URL")+ delay(PROVIDER_AUTH_RETRY_GRACE_MS)if (!isActivePlaybackSession(requestVersion, playbackUrl)) return true+ currentResolvedPlaybackUrl = ""+ currentResolvedStreamInfo = null+ playerEngine.preload(null)if (!preparePlayer(refreshedStreamInfo, requestVersion, probeBeforePlayback = false)) return trueplayerEngine.play()return true@@ -62,14 +65,7 @@ internal suspend fun PlayerViewModel.tryRefreshXtreamPlaybackAfterAuthError(internal suspend fun PlayerViewModel.isXtreamPlaybackSession(): Boolean {val providerId = currentProviderId.takeIf { it > 0L } ?: return falseval provider = providerRepository.getProvider(providerId) ?: return false- if (- provider.type != ProviderType.XTREAM_CODES &&- provider.type != ProviderType.STALKER_PORTAL- ) {- return false- }- return xtreamStreamUrlResolver.isInternalStreamUrl(currentStreamUrl) ||- xtreamStreamUrlResolver.isInternalStreamUrl(currentResolvedPlaybackUrl)+ return shouldAttemptProviderAuthRetry(provider.type, currentContentType)}internal fun PlayerViewModel.fallbackToPreviousChannel(reason: String): Boolean {diff --git a/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerZapActions.kt b/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerZapActions.ktindex 6cba9cda..3dccb163 100644--- a/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerZapActions.kt+++ b/app/src/main/java/com/streamvault/app/ui/screens/player/PlayerZapActions.kt@@ -1,11 +1,11 @@package com.streamvault.app.ui.screens.playerimport androidx.lifecycle.viewModelScope-import com.streamvault.data.remote.stalker.StalkerUrlFactoryimport com.streamvault.domain.model.Channelimport com.streamvault.domain.model.ChannelNumberingModeimport com.streamvault.domain.model.ContentTypeimport com.streamvault.domain.model.PlaybackHistory+import com.streamvault.domain.model.ProviderTypeimport kotlinx.coroutines.delayimport kotlinx.coroutines.flow.updateimport kotlinx.coroutines.flow.filter@@ -92,8 +92,8 @@ internal fun releaseOutgoingLiveZapPlayback(internal fun shouldPreloadAdjacentChannel(streamUrl: String,- isStalkerInternalUrl: (String) -> Boolean-): Boolean = streamUrl.isNotBlank() && !isStalkerInternalUrl(streamUrl)+ providerType: ProviderType?+): Boolean = streamUrl.isNotBlank() && providerType == ProviderType.M3Ufun PlayerViewModel.playNext() {clearNumericChannelInput()@@ -264,11 +264,16 @@ internal fun PlayerViewModel.preloadAdjacentChannel(currentIndex: Int) {if (channelList.size < 2) returnval nextIndex = (currentIndex + 1) % channelList.sizeval nextChannel = channelList[nextIndex]- if (!shouldPreloadAdjacentChannel(nextChannel.streamUrl, StalkerUrlFactory::isInternalStreamUrl)) {+ if (nextChannel.streamUrl.isBlank()) {playerEngine.preload(null)return}viewModelScope.launch {+ val providerType = providerRepository.getProvider(nextChannel.providerId)?.type+ if (!shouldPreloadAdjacentChannel(nextChannel.streamUrl, providerType)) {+ playerEngine.preload(null)+ return@launch+ }val streamInfo = resolvePlaybackStreamInfo(nextChannel.streamUrl,nextChannel.id,diff --git a/app/src/test/java/com/streamvault/app/ui/screens/player/PlayerPlaybackRecoverySupportTest.kt b/app/src/test/java/com/streamvault/app/ui/screens/player/PlayerPlaybackRecoverySupportTest.ktindex 5e7c7fc4..656b43ea 100644--- a/app/src/test/java/com/streamvault/app/ui/screens/player/PlayerPlaybackRecoverySupportTest.kt+++ b/app/src/test/java/com/streamvault/app/ui/screens/player/PlayerPlaybackRecoverySupportTest.kt@@ -1,6 +1,8 @@package com.streamvault.app.ui.screens.playerimport com.google.common.truth.Truth.assertThat+import com.streamvault.domain.model.ContentType+import com.streamvault.domain.model.ProviderTypeimport com.streamvault.player.PlayerErrorimport org.junit.Test@@ -16,4 +18,17 @@ class PlayerPlaybackRecoverySupportTest {assertThat(resolvePlaybackErrorMessage(error)).isEqualTo("Provider rejected playback, likely max connections or bandwidth limit.")}++ @Test+ fun `live provider auth retry is limited to managed IPTV providers`() {+ assertThat(shouldAttemptProviderAuthRetry(ProviderType.XTREAM_CODES, ContentType.LIVE)).isTrue()+ assertThat(shouldAttemptProviderAuthRetry(ProviderType.STALKER_PORTAL, ContentType.LIVE)).isTrue()+ assertThat(shouldAttemptProviderAuthRetry(ProviderType.M3U, ContentType.LIVE)).isFalse()+ }++ @Test+ fun `provider auth retry does not run for non-live playback`() {+ assertThat(shouldAttemptProviderAuthRetry(ProviderType.XTREAM_CODES, ContentType.MOVIE)).isFalse()+ assertThat(shouldAttemptProviderAuthRetry(ProviderType.STALKER_PORTAL, ContentType.SERIES_EPISODE)).isFalse()+ }}diff --git a/app/src/test/java/com/streamvault/app/ui/screens/player/PlayerZapActionsTest.kt b/app/src/test/java/com/streamvault/app/ui/screens/player/PlayerZapActionsTest.ktindex 39fac0a7..d53d7a23 100644--- a/app/src/test/java/com/streamvault/app/ui/screens/player/PlayerZapActionsTest.kt+++ b/app/src/test/java/com/streamvault/app/ui/screens/player/PlayerZapActionsTest.kt@@ -1,6 +1,7 @@package com.streamvault.app.ui.screens.playerimport com.google.common.truth.Truth.assertThat+import com.streamvault.domain.model.ProviderTypeimport kotlinx.coroutines.test.runTestimport org.junit.Test@@ -70,17 +71,27 @@ class PlayerZapActionsTest {fun `shouldPreloadAdjacentChannel skips Stalker internal streams`() {val shouldPreload = shouldPreloadAdjacentChannel(streamUrl = "stalker://1/live/99?cmd=ffmpeg%20http%3A%2F%2Fportal.example.com%2Fch%2F99",- isStalkerInternalUrl = { it.startsWith("stalker://") }+ providerType = ProviderType.STALKER_PORTAL)assertThat(shouldPreload).isFalse()}@Test- fun `shouldPreloadAdjacentChannel allows regular streams`() {+ fun `shouldPreloadAdjacentChannel skips Xtream live streams`() {val shouldPreload = shouldPreloadAdjacentChannel(streamUrl = "http://cdn.example.com/live/stream.ts",- isStalkerInternalUrl = { it.startsWith("stalker://") }+ providerType = ProviderType.XTREAM_CODES+ )++ assertThat(shouldPreload).isFalse()+ }++ @Test+ fun `shouldPreloadAdjacentChannel allows M3U streams`() {+ val shouldPreload = shouldPreloadAdjacentChannel(+ streamUrl = "http://cdn.example.com/live/stream.ts",+ providerType = ProviderType.M3U)assertThat(shouldPreload).isTrue()