StreamVault is a TV-first free IPTV player for Android TV built with Kotlin, Jetpack Compose, Room, Hilt, and Media3.
Kotlin iptv-player
fix stalker live portal endpoint
David Nashash9baf5e5f6167
diff --git a/app/src/main/java/com/streamvault/app/navigation/AppNavigation.kt b/app/src/main/java/com/streamvault/app/navigation/AppNavigation.ktindex 86f815a7..1a77d2c2 100644--- a/app/src/main/java/com/streamvault/app/navigation/AppNavigation.kt+++ b/app/src/main/java/com/streamvault/app/navigation/AppNavigation.kt@@ -209,7 +209,7 @@ object Routes {private fun isStreamUrlSafe(url: String?): Boolean {if (url.isNullOrBlank()) return falseval scheme = url.substringBefore("://").lowercase()- return scheme in setOf("http", "https", "rtsp", "rtmp", "rtsps", "mms", "xtream", "content", "file")+ return scheme in setOf("http", "https", "rtsp", "rtmp", "rtsps", "mms", "xtream", "stalker", "content", "file")}internal fun safePlayerNavigationRequest(request: PlayerNavigationRequest?): PlayerNavigationRequest? =diff --git a/app/src/test/java/com/streamvault/app/navigation/PlaybackHistoryNavigationTest.kt b/app/src/test/java/com/streamvault/app/navigation/PlaybackHistoryNavigationTest.ktindex a9891405..bca38fdb 100644--- a/app/src/test/java/com/streamvault/app/navigation/PlaybackHistoryNavigationTest.kt+++ b/app/src/test/java/com/streamvault/app/navigation/PlaybackHistoryNavigationTest.kt@@ -30,4 +30,15 @@ class PlaybackHistoryNavigationTest {assertThat(request.seasonNumber).isEqualTo(3)assertThat(request.episodeNumber).isEqualTo(4)}-}\ No newline at end of file++ @Test+ fun safePlayerNavigationRequest_allowsInternalStalkerUrls() {+ val request = PlayerNavigationRequest(+ streamUrl = "stalker://7/live/390414?cmd=ffmpeg%20http%3A%2F%2Fportal.example.com%2Fch%2F390414_",+ title = "Channel",+ contentType = ContentType.LIVE.name+ )++ assertThat(safePlayerNavigationRequest(request)).isEqualTo(request)+ }+}diff --git a/data/src/main/java/com/streamvault/data/remote/stalker/OkHttpStalkerApiService.kt b/data/src/main/java/com/streamvault/data/remote/stalker/OkHttpStalkerApiService.ktindex c89056a9..594dab05 100644--- a/data/src/main/java/com/streamvault/data/remote/stalker/OkHttpStalkerApiService.kt+++ b/data/src/main/java/com/streamvault/data/remote/stalker/OkHttpStalkerApiService.kt@@ -772,8 +772,9 @@ class OkHttpStalkerApiService @Inject constructor(StalkerStreamKind.MOVIE,StalkerStreamKind.EPISODE -> "0"}+ val playbackLoadUrl = createLinkLoadUrl(session, kind)val payload = requestJson(- url = session.loadUrl,+ url = playbackLoadUrl,profile = profile,referer = session.portalReferer,token = session.token,@@ -810,6 +811,25 @@ class OkHttpStalkerApiService @Inject constructor(?: throw IOException("Portal did not return a playable URL.")}+ private fun createLinkLoadUrl(+ session: StalkerSession,+ kind: StalkerStreamKind+ ): String {+ if (kind != StalkerStreamKind.LIVE && kind != StalkerStreamKind.ARCHIVE) {+ return session.loadUrl+ }+ if (session.fingerprintEvidence.playbackBackendHint != StalkerPlaybackBackendHint.TEMP_LINK_STRICT) {+ return session.loadUrl+ }+ val normalized = StalkerUrlFactory.normalizePortalUrl(session.loadUrl)+ if (!normalized.lowercase(Locale.ROOT).endsWith("/server/load.php")) {+ return session.loadUrl+ }+ return siblingLoadUrl(normalized)+ ?.takeIf { it.lowercase(Locale.ROOT).endsWith("/portal.php") }+ ?: session.loadUrl+ }+override fun currentCookieHeader(session: StalkerSession): String =cookieJar.cookieHeaderFor(session.loadUrl).ifBlank { session.serverCookieHeader }diff --git a/data/src/main/java/com/streamvault/data/remote/stalker/StalkerCompatibility.kt b/data/src/main/java/com/streamvault/data/remote/stalker/StalkerCompatibility.ktindex 73d1c241..4c3af9ae 100644--- a/data/src/main/java/com/streamvault/data/remote/stalker/StalkerCompatibility.kt+++ b/data/src/main/java/com/streamvault/data/remote/stalker/StalkerCompatibility.kt@@ -107,6 +107,9 @@ internal fun detectStalkerPlaybackMode(host.isBlank() || host == "localhost" || host == "127.0.0.1" || host == "0.0.0.0" ->StalkerPlaybackMode.LOCALHOST_CMD+ uri?.isStalkerChannelCommandPath() == true ->+ StalkerPlaybackMode.LOCALHOST_CMD+path.endsWith("/play/live.php") ->StalkerPlaybackMode.PLAY_LIVE_PORTAL@@ -135,9 +138,37 @@ internal fun detectStalkerPlaybackMode(internal fun orderStalkerCommandVariants(variants: List<StalkerCommandVariant>): List<StalkerCommandVariant> = variants+ .map { variant -> variant.correctStoredCommandMode() }.distinctBy { it.cmd.trim() }.sortedWith(compareBy<StalkerCommandVariant>({ playbackModeRank(it.playbackMode) }, { it.priority }))+internal fun URI.isStalkerChannelCommandPath(): Boolean {+ val segments = path+ ?.trim('/')+ ?.split('/')+ ?.filter { it.isNotBlank() }+ .orEmpty()+ val channelTarget = segments+ .dropLast(1)+ .zip(segments.drop(1))+ .firstOrNull { (previous, _) -> previous.equals("ch", ignoreCase = true) }+ ?.second+ ?: return false+ return channelTarget.trimEnd('_').all(Char::isDigit) &&+ channelTarget.trimEnd('_').isNotBlank()+}++private fun StalkerCommandVariant.correctStoredCommandMode(): StalkerCommandVariant {+ if (playbackMode != StalkerPlaybackMode.DIRECT_URL) {+ return this+ }+ return if (detectStalkerPlaybackMode(cmd) == StalkerPlaybackMode.LOCALHOST_CMD) {+ copy(playbackMode = StalkerPlaybackMode.LOCALHOST_CMD)+ } else {+ this+ }+}+private fun playbackModeRank(mode: StalkerPlaybackMode): Int = when (mode) {StalkerPlaybackMode.DIRECT_URL -> 0StalkerPlaybackMode.MULTI_CMD -> 1diff --git a/data/src/main/java/com/streamvault/data/remote/stalker/StalkerProvider.kt b/data/src/main/java/com/streamvault/data/remote/stalker/StalkerProvider.ktindex f71a2c37..b1d1efe5 100644--- a/data/src/main/java/com/streamvault/data/remote/stalker/StalkerProvider.kt+++ b/data/src/main/java/com/streamvault/data/remote/stalker/StalkerProvider.kt@@ -409,9 +409,10 @@ class StalkerProvider(val (session, accountProfile) = authResult.dataval profile = currentDeviceProfile()var lastError: Result.Error? = null- val orderedCandidates = descriptor.candidates.sortedBy { variant ->- if (preferredPlaybackMode != null && variant.playbackMode == preferredPlaybackMode) 0 else 1- }+ val orderedCandidates = orderStalkerCommandVariants(descriptor.candidates)+ .sortedBy { variant ->+ if (preferredPlaybackMode != null && variant.playbackMode == preferredPlaybackMode) 0 else 1+ }orderedCandidates.forEach { variant ->val adapter = resolveStalkerPlaybackAdapter(descriptor = descriptor,@@ -1005,6 +1006,11 @@ class StalkerProvider(val host = parsed.host?.trim()?.lowercase(Locale.ROOT).orEmpty()if (host.isBlank()) return falseif (host == "localhost" || host == "127.0.0.1" || host == "0.0.0.0") return false+ if ((kind == StalkerStreamKind.LIVE || kind == StalkerStreamKind.ARCHIVE) &&+ parsed.isStalkerChannelCommandPath()+ ) {+ return false+ }if ((kind == StalkerStreamKind.LIVE || kind == StalkerStreamKind.ARCHIVE) && !hasUsableLiveStreamTarget(parsed)) return falsereturn truediff --git a/data/src/test/java/com/streamvault/data/remote/stalker/OkHttpStalkerApiServiceTest.kt b/data/src/test/java/com/streamvault/data/remote/stalker/OkHttpStalkerApiServiceTest.ktindex 66877c87..67181dea 100644--- a/data/src/test/java/com/streamvault/data/remote/stalker/OkHttpStalkerApiServiceTest.kt+++ b/data/src/test/java/com/streamvault/data/remote/stalker/OkHttpStalkerApiServiceTest.kt@@ -5,6 +5,7 @@ import com.streamvault.domain.model.Resultimport com.streamvault.domain.model.StalkerAuthModeimport com.streamvault.domain.model.StalkerBootstrapRecipeimport com.streamvault.domain.model.StalkerMagPreset+import com.streamvault.domain.model.StalkerPlaybackBackendHintimport kotlinx.coroutines.test.runTestimport kotlinx.serialization.json.Jsonimport okhttp3.Interceptor@@ -239,6 +240,100 @@ class OkHttpStalkerApiServiceTest {assertThat(requested).containsExactly("itv" to "undefined", "vod" to "0").inOrder()}+ @Test+ fun createLink_prefers_portal_endpoint_for_strict_live_temp_links() = runTest {+ val requestedPaths = mutableListOf<String>()+ val service = OkHttpStalkerApiService(+ okHttpClient = OkHttpClient.Builder()+ .addInterceptor { chain ->+ val request = chain.request()+ requestedPaths += request.url.encodedPath+ Response.Builder()+ .request(request)+ .protocol(Protocol.HTTP_1_1)+ .code(200)+ .message("OK")+ .body(+ """{"js":{"cmd":"ffmpeg http://portal.example.com/play/live.php?stream=301&play_token=abc"}}"""+ .toResponseBody("application/json".toMediaType())+ )+ .build()+ }+ .build(),+ json = Json { ignoreUnknownKeys = true }+ )++ val result = service.createLink(+ session = StalkerSession(+ loadUrl = "https://portal.example.com/server/load.php",+ portalReferer = "https://portal.example.com/c/",+ token = "token-123",+ fingerprintEvidence = StalkerFingerprintEvidence(+ playbackBackendHint = StalkerPlaybackBackendHint.TEMP_LINK_STRICT+ )+ ),+ profile = buildStalkerDeviceProfile(+ portalUrl = "https://portal.example.com/c",+ macAddress = "00:1A:79:12:34:56",+ deviceProfile = "MAG322",+ timezone = "UTC",+ locale = "en"+ ),+ kind = StalkerStreamKind.LIVE,+ cmd = "ffmpeg http://localhost/ch/301_"+ )++ assertThat(result).isInstanceOf(Result.Success::class.java)+ assertThat(requestedPaths).containsExactly("/portal.php")+ }++ @Test+ fun createLink_keeps_server_endpoint_for_strict_vod_links() = runTest {+ val requestedPaths = mutableListOf<String>()+ val service = OkHttpStalkerApiService(+ okHttpClient = OkHttpClient.Builder()+ .addInterceptor { chain ->+ val request = chain.request()+ requestedPaths += request.url.encodedPath+ Response.Builder()+ .request(request)+ .protocol(Protocol.HTTP_1_1)+ .code(200)+ .message("OK")+ .body(+ """{"js":{"cmd":"ffmpeg http://portal.example.com/play/movie.php?stream=401.mkv&play_token=abc"}}"""+ .toResponseBody("application/json".toMediaType())+ )+ .build()+ }+ .build(),+ json = Json { ignoreUnknownKeys = true }+ )++ val result = service.createLink(+ session = StalkerSession(+ loadUrl = "https://portal.example.com/server/load.php",+ portalReferer = "https://portal.example.com/c/",+ token = "token-123",+ fingerprintEvidence = StalkerFingerprintEvidence(+ playbackBackendHint = StalkerPlaybackBackendHint.TEMP_LINK_STRICT+ )+ ),+ profile = buildStalkerDeviceProfile(+ portalUrl = "https://portal.example.com/c",+ macAddress = "00:1A:79:12:34:56",+ deviceProfile = "MAG322",+ timezone = "UTC",+ locale = "en"+ ),+ kind = StalkerStreamKind.MOVIE,+ cmd = "ffmpeg http://localhost/movie/401"+ )++ assertThat(result).isInstanceOf(Result.Success::class.java)+ assertThat(requestedPaths).containsExactly("/server/load.php")+ }+@Testfun createLink_uses_episode_number_as_series_selector_for_stalker_shell_episode() = runTest {var requestedSeries: String? = nulldiff --git a/data/src/test/java/com/streamvault/data/remote/stalker/StalkerProviderTest.kt b/data/src/test/java/com/streamvault/data/remote/stalker/StalkerProviderTest.ktindex b1b4773a..25aceb0c 100644--- a/data/src/test/java/com/streamvault/data/remote/stalker/StalkerProviderTest.kt+++ b/data/src/test/java/com/streamvault/data/remote/stalker/StalkerProviderTest.kt@@ -297,6 +297,71 @@ class StalkerProviderTest {)}+ @Test+ fun resolvePlaybackInfo_sends_absolute_portal_channel_commands_through_create_link() = runTest {+ val api = FakeStalkerApiService(+ profile = StalkerProviderProfile(accountName = "Room"),+ createLinkUrl = "http://fdox.org:8080/play/live.php?mac=00:1A:79:BA:73:FA&stream=390414&extension=ts&play_token=abc123"+ )+ val provider = StalkerProvider(+ providerId = 7,+ api = api,+ portalUrl = "https://portal.example.com/c/",+ macAddress = "00:1A:79:12:34:56",+ deviceProfile = "MAG322",+ timezone = "UTC",+ locale = "en"+ )++ val result = provider.resolvePlaybackInfo(+ kind = StalkerStreamKind.LIVE,+ descriptor = checkNotNull(+ buildStalkerPlaybackDescriptor(+ primaryCmd = "ffmpeg http://portal.example.com/ch/390414_"+ )+ )+ )++ assertThat(result).isInstanceOf(Result.Success::class.java)+ val success = result as Result.Success+ assertThat(success.data.url).contains("/play/live.php")+ assertThat(api.createLinkCalls).isEqualTo(1)+ }++ @Test+ fun resolvePlaybackInfo_corrects_stored_direct_mode_for_absolute_portal_channel_commands() = runTest {+ val api = FakeStalkerApiService(+ profile = StalkerProviderProfile(accountName = "Room"),+ createLinkUrl = "http://fdox.org:8080/play/live.php?mac=00:1A:79:BA:73:FA&stream=390414&extension=ts&play_token=abc123"+ )+ val provider = StalkerProvider(+ providerId = 7,+ api = api,+ portalUrl = "https://portal.example.com/c/",+ macAddress = "00:1A:79:12:34:56",+ deviceProfile = "MAG322",+ timezone = "UTC",+ locale = "en"+ )+ val descriptor = StalkerPlaybackDescriptor(+ primaryMode = StalkerPlaybackMode.DIRECT_URL,+ candidates = listOf(+ StalkerCommandVariant(+ cmd = "ffmpeg http://portal.example.com/ch/390414_",+ playbackMode = StalkerPlaybackMode.DIRECT_URL+ )+ )+ )++ val result = provider.resolvePlaybackInfo(+ kind = StalkerStreamKind.LIVE,+ descriptor = descriptor+ )++ assertThat(result).isInstanceOf(Result.Success::class.java)+ assertThat(api.createLinkCalls).isEqualTo(1)+ }+@Testfun authenticate_persists_effective_learned_mag_identity() = runTest {val provider = StalkerProvider(@@ -339,6 +404,9 @@ class StalkerProviderTest {private val createLinkUrl: String = "http://cdn.example.com/stream.ts",private val currentCookieHeader: String = "") : StalkerApiService {+ var createLinkCalls: Int = 0+ private set+override suspend fun authenticate(profile: StalkerDeviceProfile): Result<Pair<StalkerSession, StalkerProviderProfile>> =Result.success(StalkerSession(@@ -454,7 +522,10 @@ class StalkerProviderTest {seriesNumber: Int?,archiveStartSeconds: Long?,archiveEndSeconds: Long?- ) = Result.success(createLinkUrl)+ ): Result<String> {+ createLinkCalls += 1+ return Result.success(createLinkUrl)+ }override fun currentCookieHeader(session: StalkerSession): String = currentCookieHeader}