StreamVault is a TV-first free IPTV player for Android TV built with Kotlin, Jetpack Compose, Room, Hilt, and Media3.
Kotlin iptv-player
Rebuild direct Xtream live URLs
David Nashash5d505a4b1fdf
diff --git a/data/src/main/java/com/streamvault/data/remote/xtream/XtreamStreamUrlResolver.kt b/data/src/main/java/com/streamvault/data/remote/xtream/XtreamStreamUrlResolver.ktindex efe76e5f..d04109ea 100644--- a/data/src/main/java/com/streamvault/data/remote/xtream/XtreamStreamUrlResolver.kt+++ b/data/src/main/java/com/streamvault/data/remote/xtream/XtreamStreamUrlResolver.kt@@ -103,6 +103,15 @@ class XtreamStreamUrlResolver @Inject constructor(val provider = providerId?.let { id -> providerDao.getById(id) }if (url.isNotBlank() && !XtreamUrlFactory.isInternalStreamUrl(url) && !StalkerUrlFactory.isInternalStreamUrl(url)) {+ if (provider?.type == ProviderType.XTREAM_CODES) {+ resolveDirectXtreamUrl(+ provider = provider,+ url = url,+ fallbackStreamId = fallbackStreamId,+ fallbackContentType = fallbackContentType,+ fallbackContainerExtension = fallbackContainerExtension+ )?.let { return it }+ }if (provider?.type == ProviderType.STALKER_PORTAL) {resolveDirectStalkerUrl(provider = provider,@@ -205,6 +214,38 @@ class XtreamStreamUrlResolver @Inject constructor()}+ private fun resolveDirectXtreamUrl(+ provider: ProviderEntity,+ url: String,+ fallbackStreamId: Long?,+ fallbackContentType: ContentType?,+ fallbackContainerExtension: String?+ ): ResolvedStreamUrl? {+ val parsed = XtreamUrlFactory.parseCredentialedStreamUrl(url, provider.id)+ val kind = parsed?.kind ?: fallbackContentType?.let(XtreamUrlFactory::kindForContentType) ?: return null+ if (kind != XtreamStreamKind.LIVE) {+ return null+ }+ val streamId = parsed?.streamId ?: fallbackStreamId?.takeIf { it > 0L } ?: return null+ val ext = parsed?.containerExtension ?: fallbackContainerExtension+ val decryptedPassword = credentialCrypto.decryptIfNeeded(provider.password)+ val resolvedUrl = XtreamUrlFactory.buildPlaybackUrl(+ serverUrl = provider.serverUrl,+ username = provider.username,+ password = decryptedPassword,+ kind = kind,+ streamId = streamId,+ containerExtension = ext+ )+ return provider.applyPlaybackRequestProfile(+ ResolvedStreamUrl(+ url = resolvedUrl,+ expirationTime = extractStreamExpirationTime(resolvedUrl),+ containerExtension = ext+ )+ )+ }+private suspend fun resolveDirectStalkerUrl(provider: ProviderEntity,url: String,diff --git a/data/src/main/java/com/streamvault/data/remote/xtream/XtreamUrlFactory.kt b/data/src/main/java/com/streamvault/data/remote/xtream/XtreamUrlFactory.ktindex 70b52633..5617362d 100644--- a/data/src/main/java/com/streamvault/data/remote/xtream/XtreamUrlFactory.kt+++ b/data/src/main/java/com/streamvault/data/remote/xtream/XtreamUrlFactory.kt@@ -348,7 +348,7 @@ object XtreamUrlFactory {}}- private fun parseCredentialedStreamUrl(url: String, providerId: Long): XtreamStreamToken? {+ internal fun parseCredentialedStreamUrl(url: String, providerId: Long): XtreamStreamToken? {val uri = runCatching { URI(url) }.getOrNull() ?: return nullval pathSegments = uri.path?.trim('/')diff --git a/data/src/test/java/com/streamvault/data/remote/xtream/XtreamStreamUrlResolverTest.kt b/data/src/test/java/com/streamvault/data/remote/xtream/XtreamStreamUrlResolverTest.ktindex 59a37173..6f767bd5 100644--- a/data/src/test/java/com/streamvault/data/remote/xtream/XtreamStreamUrlResolverTest.kt+++ b/data/src/test/java/com/streamvault/data/remote/xtream/XtreamStreamUrlResolverTest.kt@@ -134,6 +134,38 @@ class XtreamStreamUrlResolverTest {}}+ @Test+ fun resolveWithMetadata_rebuilds_direct_credentialed_live_url_from_provider() {+ runBlocking {+ val resolver = XtreamStreamUrlResolver(+ providerDao = FakeProviderDao(+ ProviderEntity(+ id = 9,+ name = "Xtream",+ type = ProviderType.XTREAM_CODES,+ serverUrl = "https://portal.example.com",+ username = "alice",+ password = "fresh-secret",+ httpUserAgent = "ProviderAgent/2.0"+ )+ ),+ credentialCrypto = credentialCrypto,+ stalkerApiService = stalkerApiService+ )++ val resolved = resolver.resolveWithMetadata(+ url = "https://old-edge.example.com/live/old-user/old-pass/456.m3u8?token=stale",+ fallbackProviderId = 9,+ fallbackContentType = ContentType.LIVE+ )++ assertThat(resolved?.url).isEqualTo("https://portal.example.com/live/alice/fresh-secret/456.m3u8")+ assertThat(resolved?.expirationTime).isNull()+ assertThat(resolved?.containerExtension).isEqualTo("m3u8")+ assertThat(resolved?.userAgent).isEqualTo("ProviderAgent/2.0")+ }+ }+@Testfun resolveWithMetadata_ignores_unsupported_direct_source_scheme() {runBlocking {