Skip to content

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

implemented fix

David Nashash3aa98cc8ecdc
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.kt
index dee66411..c89056a9 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
@@ -766,6 +766,12 @@ class OkHttpStalkerApiService @Inject constructor(
} else {
"0"
}
+ val forcedStorage = when (kind) {
+ StalkerStreamKind.LIVE,
+ StalkerStreamKind.ARCHIVE -> "undefined"
+ StalkerStreamKind.MOVIE,
+ StalkerStreamKind.EPISODE -> "0"
+ }
val payload = requestJson(
url = session.loadUrl,
profile = profile,
@@ -777,7 +783,7 @@ class OkHttpStalkerApiService @Inject constructor(
"JsHttpRequest" to "1-xml",
"cmd" to cmd,
"series" to seriesSelector,
- "forced_storage" to "0",
+ "forced_storage" to forcedStorage,
"disable_ad" to "0",
"download" to "0"
)
diff --git a/data/src/main/java/com/streamvault/data/remote/stalker/StalkerProvider.kt b/data/src/main/java/com/streamvault/data/remote/stalker/StalkerProvider.kt
index a6f44481..f71a2c37 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
@@ -494,7 +494,8 @@ class StalkerProvider(
TAG,
"Resolved create_link playback provider=$providerId kind=${kind.name} mode=${adapter.adapterMode.name} " +
"candidateMode=${variant.playbackMode.name} endpoint=${effectiveArchiveEndpointPreference(kind, session).name} " +
- "cookie=${effectiveArchiveCookieMode(kind, session, resolvedUrl).name}"
+ "cookie=${effectiveArchiveCookieMode(kind, session, resolvedUrl).name} " +
+ "liveTarget=${livePlaybackTargetSummary(directUrl, resolvedUrl)}"
)
return Result.success(
StalkerPlaybackInfo(
@@ -1027,35 +1028,58 @@ class StalkerProvider(
}
val resolvedUri = runCatching { URI(repairedArchive) }.getOrNull() ?: return repairedArchive
- val sourceUri = runCatching { URI(sourceDirectUrl) }.getOrNull() ?: return resolvedUrl
- if (!isSameLivePlayPath(resolvedUri, sourceUri)) {
+ if (!isLivePlayPath(resolvedUri)) {
return repairedArchive
}
- if (hasUsableLiveStreamTarget(resolvedUri)) {
+ val resolvedStreamId = resolvedUri.queryParameter("stream")?.takeIf { it.isUsableStreamId() }
+ if (resolvedStreamId != null) {
return repairedArchive
}
- val sourceStreamId = sourceUri.queryParameter("stream")?.takeIf { it.isNotBlank() } ?: return repairedArchive
- return replaceQueryParameter(resolvedUri, "stream", sourceStreamId) ?: repairedArchive
+ val sourceUri = runCatching { URI(sourceDirectUrl) }.getOrNull()
+ val sourceStreamId = sourceUri?.liveStreamTargetId() ?: return repairedArchive
+ return upsertQueryParameter(resolvedUri, "stream", sourceStreamId) ?: repairedArchive
}
private fun hasUsableLiveStreamTarget(uri: URI): Boolean {
- val path = uri.path?.lowercase(Locale.ROOT).orEmpty()
- if (!path.endsWith("/play/live.php")) {
+ if (!isLivePlayPath(uri)) {
return true
}
- return !uri.queryParameter("stream").isNullOrBlank()
+ return uri.queryParameter("stream")?.isUsableStreamId() == true
}
- private fun isSameLivePlayPath(first: URI, second: URI): Boolean {
- val firstHost = first.host?.trim()?.lowercase(Locale.ROOT).orEmpty()
- val secondHost = second.host?.trim()?.lowercase(Locale.ROOT).orEmpty()
- val firstPath = first.path?.trim()?.lowercase(Locale.ROOT).orEmpty()
- val secondPath = second.path?.trim()?.lowercase(Locale.ROOT).orEmpty()
- return firstHost.isNotBlank() &&
- firstHost == secondHost &&
- firstPath == secondPath &&
- firstPath.endsWith("/play/live.php")
+ private fun isLivePlayPath(uri: URI): Boolean =
+ uri.path?.trim()?.lowercase(Locale.ROOT).orEmpty().endsWith("/play/live.php")
+
+ private fun URI.liveStreamTargetId(): String? {
+ queryParameter("stream")?.takeIf { it.isUsableStreamId() }?.let { return it }
+ val path = path?.trim('/') ?: return null
+ val segments = path.split('/').filter { it.isNotBlank() }
+ val channelSegment = segments
+ .dropLast(1)
+ .zip(segments.drop(1))
+ .firstOrNull { (previous, _) -> previous.equals("ch", ignoreCase = true) }
+ ?.second
+ ?: return null
+ return channelSegment.trimEnd('_').takeIf { it.isUsableStreamId() }
+ }
+
+ private fun String.isUsableStreamId(): Boolean {
+ val value = trim()
+ return value.isNotBlank() &&
+ value != "0" &&
+ !value.equals("null", ignoreCase = true)
+ }
+
+ private fun livePlaybackTargetSummary(sourceDirectUrl: String?, resolvedUrl: String): String {
+ val sourceUri = sourceDirectUrl?.let { runCatching { URI(it) }.getOrNull() }
+ val resolvedUri = runCatching { URI(resolvedUrl) }.getOrNull()
+ if (sourceUri == null && resolvedUri == null) {
+ return "none"
+ }
+ val sourceTarget = sourceUri?.liveStreamTargetId().orEmpty()
+ val resolvedTarget = resolvedUri?.takeIf(::isLivePlayPath)?.queryParameter("stream").orEmpty()
+ return "source=${sourceTarget.ifBlank { "none" }} resolved=${resolvedTarget.ifBlank { "none" }}"
}
private fun URI.queryParameter(name: String): String? {
@@ -1071,19 +1095,25 @@ class StalkerProvider(
?.second
}
- private fun replaceQueryParameter(uri: URI, name: String, value: String): String? {
- val rawQuery = uri.rawQuery ?: return null
- val updated = rawQuery.split('&')
+ private fun upsertQueryParameter(uri: URI, name: String, value: String): String? {
+ val rawQuery = uri.rawQuery.orEmpty()
+ val parts = rawQuery.split('&')
.filter { it.isNotBlank() }
- .map { part ->
- val key = part.substringBefore('=', missingDelimiterValue = "")
- if (key.equals(name, ignoreCase = true)) {
- "$key=$value"
- } else {
- part
- }
+ var replaced = false
+ val updatedParts = parts.map { part ->
+ val key = part.substringBefore('=', missingDelimiterValue = "")
+ if (key.equals(name, ignoreCase = true)) {
+ replaced = true
+ "$key=$value"
+ } else {
+ part
}
- .joinToString("&")
+ }
+ val updated = if (replaced) {
+ updatedParts
+ } else {
+ updatedParts + "$name=$value"
+ }.joinToString("&")
return URI(uri.scheme, uri.authority, uri.path, updated, uri.fragment).toString()
}
diff --git a/data/src/test/java/com/streamvault/data/remote/stalker/OkHttpStalkerApiServiceTest.kt b/data/src/test/java/com/streamvault/data/remote/stalker/OkHttpStalkerApiServiceTest.kt
index 72a0a78c..66877c87 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
@@ -187,6 +187,58 @@ class OkHttpStalkerApiServiceTest {
assertThat(success.data).isEqualTo("http://cdn.example.com/live/stream.ts")
}
+ @Test
+ fun createLink_uses_mag_live_storage_selector_without_changing_vod() = runTest {
+ val requested = mutableListOf<Pair<String, String>>()
+ val service = OkHttpStalkerApiService(
+ okHttpClient = OkHttpClient.Builder()
+ .addInterceptor { chain ->
+ val request = chain.request()
+ requested += request.url.queryParameter("type").orEmpty() to
+ request.url.queryParameter("forced_storage").orEmpty()
+ Response.Builder()
+ .request(request)
+ .protocol(Protocol.HTTP_1_1)
+ .code(200)
+ .message("OK")
+ .body(
+ """{"js":{"cmd":"ffmpeg http://cdn.example.com/media.ts"}}"""
+ .toResponseBody("application/json".toMediaType())
+ )
+ .build()
+ }
+ .build(),
+ json = Json { ignoreUnknownKeys = true }
+ )
+ val session = StalkerSession(
+ loadUrl = "https://portal.example.com/server/load.php",
+ portalReferer = "https://portal.example.com/c/",
+ token = "token-123"
+ )
+ val profile = buildStalkerDeviceProfile(
+ portalUrl = "https://portal.example.com/c",
+ macAddress = "00:1A:79:12:34:56",
+ deviceProfile = "MAG250",
+ timezone = "UTC",
+ locale = "en"
+ )
+
+ service.createLink(
+ session = session,
+ profile = profile,
+ kind = StalkerStreamKind.LIVE,
+ cmd = "ffmpeg http://localhost/ch/301_"
+ )
+ service.createLink(
+ session = session,
+ profile = profile,
+ kind = StalkerStreamKind.MOVIE,
+ cmd = "ffmpeg http://localhost/movie/401"
+ )
+
+ assertThat(requested).containsExactly("itv" to "undefined", "vod" to "0").inOrder()
+ }
+
@Test
fun createLink_uses_episode_number_as_series_selector_for_stalker_shell_episode() = runTest {
var requestedSeries: String? = null
diff --git a/data/src/test/java/com/streamvault/data/remote/stalker/StalkerProviderTest.kt b/data/src/test/java/com/streamvault/data/remote/stalker/StalkerProviderTest.kt
index ae5a7f82..b1b4773a 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
@@ -263,6 +263,40 @@ class StalkerProviderTest {
assertThat(success.data.headers["Accept-Encoding"]).isEqualTo("identity")
}
+ @Test
+ fun resolvePlaybackInfo_repairs_blank_live_stream_from_localhost_channel_command() = runTest {
+ val provider = StalkerProvider(
+ providerId = 7,
+ api = FakeStalkerApiService(
+ profile = StalkerProviderProfile(accountName = "Room"),
+ createLinkUrl = "http://fdox.org:8080/play/live.php?mac=00:1A:79:BA:73:FA&stream=&extension=ts&play_token=abc123"
+ ),
+ portalUrl = "https://portal.example.com/c/",
+ macAddress = "00:1A:79:12:34:56",
+ playbackBackendHint = com.streamvault.domain.model.StalkerPlaybackBackendHint.TEMP_LINK_STRICT,
+ cookieModeHint = com.streamvault.domain.model.StalkerCookieMode.CREATE_LINK,
+ deviceProfile = "MAG322",
+ timezone = "UTC",
+ locale = "en"
+ )
+
+ val result = provider.resolvePlaybackInfo(
+ kind = StalkerStreamKind.LIVE,
+ descriptor = checkNotNull(
+ buildStalkerPlaybackDescriptor(
+ primaryCmd = "ffmpeg http://localhost/ch/61523_",
+ capabilities = StalkerPortalCapabilities(useHttpTemporaryLink = true)
+ )
+ )
+ )
+
+ assertThat(result).isInstanceOf(Result.Success::class.java)
+ val success = result as Result.Success
+ assertThat(success.data.url).isEqualTo(
+ "http://fdox.org:8080/play/live.php?mac=00:1A:79:BA:73:FA&stream=61523&extension=ts&play_token=abc123"
+ )
+ }
+
@Test
fun authenticate_persists_effective_learned_mag_identity() = runTest {
val provider = StalkerProvider(