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 compatibility settings wiring
David Nashash3f8a84df0d6c
diff --git a/app/src/main/java/com/streamvault/app/tvinput/StreamVaultTvInputService.kt b/app/src/main/java/com/streamvault/app/tvinput/StreamVaultTvInputService.ktindex 9728d513..dd99edaf 100644--- a/app/src/main/java/com/streamvault/app/tvinput/StreamVaultTvInputService.kt+++ b/app/src/main/java/com/streamvault/app/tvinput/StreamVaultTvInputService.kt@@ -24,6 +24,7 @@ import com.streamvault.domain.model.Channelimport com.streamvault.domain.model.StreamInfoimport com.streamvault.domain.model.StreamTypeimport com.streamvault.domain.repository.ChannelRepository+import com.streamvault.player.playback.applyUnsafeTlsBypassimport dagger.hilt.android.AndroidEntryPointimport kotlinx.coroutines.CoroutineScopeimport kotlinx.coroutines.Dispatchers@@ -31,6 +32,9 @@ import kotlinx.coroutines.SupervisorJobimport kotlinx.coroutines.cancelimport kotlinx.coroutines.launchimport kotlinx.coroutines.withContext+import java.net.InetSocketAddress+import java.net.Proxy+import java.util.concurrent.ConcurrentHashMapimport okhttp3.OkHttpClientimport javax.inject.Inject@@ -43,6 +47,8 @@ class StreamVaultTvInputService : TvInputService() {@Injectlateinit var okHttpClient: OkHttpClient+ private val playbackClients = ConcurrentHashMap<PlaybackClientKey, OkHttpClient>()+override fun onCreateSession(inputId: String): Session = StreamVaultSession(this)private inner class StreamVaultSession(context: Context) : Session(context) {@@ -127,7 +133,7 @@ class StreamVaultTvInputService : TvInputService() {}private fun buildHttpDataSource(streamInfo: StreamInfo): DataSource.Factory {- return OkHttpDataSource.Factory(okHttpClient).apply {+ return OkHttpDataSource.Factory(okHttpClient.forPlayback(streamInfo)).apply {setUserAgent(streamInfo.userAgent ?: DEFAULT_USER_AGENT)setDefaultRequestProperties(streamInfo.headers)}@@ -176,6 +182,40 @@ class StreamVaultTvInputService : TvInputService() {val channelId: Long)+ private fun OkHttpClient.forPlayback(streamInfo: StreamInfo): OkHttpClient {+ val proxy = streamInfo.httpProxy()+ if (!streamInfo.allowInvalidSsl && proxy == null) {+ return this+ }+ val key = PlaybackClientKey(+ allowInvalidSsl = streamInfo.allowInvalidSsl,+ proxyHost = streamInfo.proxyHost.trim(),+ proxyPort = streamInfo.proxyPort+ )+ return playbackClients.computeIfAbsent(key) {+ newBuilder()+ .apply {+ if (streamInfo.allowInvalidSsl) {+ applyUnsafeTlsBypass()+ }+ proxy?.let { proxy(it) }+ }+ .build()+ }+ }++ private fun StreamInfo.httpProxy(): Proxy? {+ val host = proxyHost.trim().takeIf { it.isNotBlank() } ?: return null+ val port = proxyPort ?: return null+ return Proxy(Proxy.Type.HTTP, InetSocketAddress(host, port))+ }++ private data class PlaybackClientKey(+ val allowInvalidSsl: Boolean,+ val proxyHost: String,+ val proxyPort: Int?+ )+private companion object {const val TAG = "StreamVaultTvInput"const val DEFAULT_USER_AGENT = "StreamVaultTvInput"diff --git a/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupScreen.kt b/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupScreen.ktindex 87c31c32..13af467e 100644--- a/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupScreen.kt+++ b/app/src/main/java/com/streamvault/app/ui/screens/provider/ProviderSetupScreen.kt@@ -280,7 +280,8 @@ fun ProviderSetupScreen(username = uiState.usernamepassword = uiState.passwordm3uUrl = uiState.m3uUrl- httpUserAgent = uiState.httpUserAgent+ val isEditingStalker = uiState.selectedTab == 1+ httpUserAgent = if (isEditingStalker) "" else uiState.httpUserAgenthttpHeaders = uiState.httpHeadersstalkerMacAddress = uiState.stalkerMacAddressstalkerAuthMode = uiState.stalkerAuthMode@@ -293,7 +294,9 @@ fun ProviderSetupScreen(stalkerSignature = uiState.stalkerSignatureval advanced = StalkerAdvancedOptionsCodec.decode(uiState.stalkerAdvancedOptionsJson)stalkerHwVersion = advanced.hwVersion- stalkerApiUserAgent = advanced.apiUserAgent+ stalkerApiUserAgent = advanced.apiUserAgent.ifBlank {+ if (isEditingStalker) uiState.httpUserAgent else ""+ }stalkerPlayerUserAgent = advanced.playerUserAgentstalkerXUserAgentLink = advanced.normalizedLinkstalkerProxyEnabled = advanced.proxyEnabled@@ -450,7 +453,7 @@ fun ProviderSetupScreen(fileImportError = fileImportError,onFilePick = { filePickerLauncher.launch(arrayOf("*/*")) },onLoginXtream = { viewModel.loginXtream(serverUrl, username, password, name, httpUserAgent, httpHeaders) },- onLoginStalker = { viewModel.loginStalker(serverUrl, stalkerMacAddress, stalkerAuthMode, username, password, name, httpUserAgent, httpHeaders, stalkerDeviceProfile, stalkerDeviceTimezone, stalkerDeviceLocale, stalkerSerialNumber, stalkerDeviceId, stalkerDeviceId2, stalkerSignature, buildStalkerAdvancedOptionsJson()) },+ onLoginStalker = { viewModel.loginStalker(serverUrl, stalkerMacAddress, stalkerAuthMode, username, password, name, "", httpHeaders, stalkerDeviceProfile, stalkerDeviceTimezone, stalkerDeviceLocale, stalkerSerialNumber, stalkerDeviceId, stalkerDeviceId2, stalkerSignature, buildStalkerAdvancedOptionsJson()) },onAddM3u = { viewModel.addM3u(m3uUrl, name, httpUserAgent, httpHeaders) },onStartPhonePairing = viewModel::startPhonePairing,onStopPhonePairing = viewModel::stopPhonePairing,@@ -505,7 +508,7 @@ fun ProviderSetupScreen(fileImportError = fileImportError,onFilePick = { filePickerLauncher.launch(arrayOf("*/*")) },onLoginXtream = { viewModel.loginXtream(serverUrl, username, password, name, httpUserAgent, httpHeaders) },- onLoginStalker = { viewModel.loginStalker(serverUrl, stalkerMacAddress, stalkerAuthMode, username, password, name, httpUserAgent, httpHeaders, stalkerDeviceProfile, stalkerDeviceTimezone, stalkerDeviceLocale, stalkerSerialNumber, stalkerDeviceId, stalkerDeviceId2, stalkerSignature, buildStalkerAdvancedOptionsJson()) },+ onLoginStalker = { viewModel.loginStalker(serverUrl, stalkerMacAddress, stalkerAuthMode, username, password, name, "", httpHeaders, stalkerDeviceProfile, stalkerDeviceTimezone, stalkerDeviceLocale, stalkerSerialNumber, stalkerDeviceId, stalkerDeviceId2, stalkerSignature, buildStalkerAdvancedOptionsJson()) },onAddM3u = { viewModel.addM3u(m3uUrl, name, httpUserAgent, httpHeaders) },onStartPhonePairing = viewModel::startPhonePairing,onStopPhonePairing = viewModel::stopPhonePairing,@@ -1218,20 +1221,30 @@ private fun AdvancedProviderOptionsSection(val hasNonDefaultSelection = ((sourceType == SourceType.XTREAM || sourceType == SourceType.STALKER) && uiState.epgSyncMode != defaultEpgSyncMode) ||(sourceType == SourceType.XTREAM && uiState.xtreamLiveSyncMode != ProviderXtreamLiveSyncMode.AUTO) ||((sourceType == SourceType.M3U_URL || sourceType == SourceType.M3U_FILE) && !uiState.m3uVodClassificationEnabled) ||+ ((sourceType == SourceType.XTREAM || sourceType == SourceType.M3U_URL || sourceType == SourceType.M3U_FILE) &&+ httpUserAgent.isNotBlank()) ||((sourceType == SourceType.XTREAM || sourceType == SourceType.STALKER || sourceType == SourceType.M3U_URL || sourceType == SourceType.M3U_FILE) &&- (httpUserAgent.isNotBlank() || httpHeaders.isNotBlank())) ||+ httpHeaders.isNotBlank()) ||(sourceType == SourceType.STALKER && (stalkerAuthMode != StalkerAuthMode.AUTO ||username.isNotBlank() ||password.isNotBlank() ||stalkerMacAddress.isBlank() ||- stalkerDeviceProfile.isNotBlank() ||+ stalkerDeviceProfile.isNotBlank() ||stalkerDeviceTimezone.isNotBlank() ||stalkerDeviceLocale.isNotBlank() ||stalkerSerialNumber.isNotBlank() ||stalkerDeviceId.isNotBlank() ||stalkerDeviceId2.isNotBlank() ||- stalkerSignature.isNotBlank()+ stalkerSignature.isNotBlank() ||+ stalkerHwVersion.isNotBlank() ||+ stalkerApiUserAgent.isNotBlank() ||+ stalkerPlayerUserAgent.isNotBlank() ||+ stalkerXUserAgentLink != StalkerAdvancedOptions.LINK_ETHERNET ||+ stalkerProxyEnabled ||+ stalkerProxyHost.isNotBlank() ||+ stalkerProxyPort.isNotBlank() ||+ stalkerRequestRules.isNotEmpty()))if (uiState.isEditing && hasNonDefaultSelection) {showAdvancedOptions = true@@ -1341,7 +1354,7 @@ private fun AdvancedProviderOptionsSection(}}- if (sourceType == SourceType.XTREAM || sourceType == SourceType.STALKER || sourceType == SourceType.M3U_URL || sourceType == SourceType.M3U_FILE) {+ if (sourceType == SourceType.XTREAM || sourceType == SourceType.M3U_URL || sourceType == SourceType.M3U_FILE) {ProviderTextField(value = httpUserAgent,onValueChange = onHttpUserAgentChange,@@ -1353,6 +1366,9 @@ private fun AdvancedProviderOptionsSection(imeAction = ImeAction.Next))+ }++ if (sourceType == SourceType.XTREAM || sourceType == SourceType.STALKER || sourceType == SourceType.M3U_URL || sourceType == SourceType.M3U_FILE) {ProviderTextField(value = httpHeaders,onValueChange = onHttpHeadersChange,@@ -2363,7 +2379,7 @@ private fun ProviderTextField(modifier = Modifier.weight(1f),contentAlignment = Alignment.CenterStart) {- if (value.isEmpty()) {+ if (fieldValue.text.isEmpty()) {Text(text = placeholder, style = MaterialTheme.typography.bodyMedium, color = OnSurfaceDim)}innerTextField()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 2243b28b..71804b93 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@@ -70,12 +70,16 @@ class OkHttpStalkerApiService @Inject constructor(override suspend fun authenticate(profile: StalkerDeviceProfile): Result<Pair<StalkerSession, StalkerProviderProfile>> {var lastError: Throwable? = null+ var lockedLoadUrl: String? = nullval authModes = candidateAuthModes(profile)for (effectiveAuthMode in authModes) {for (attempt in candidateAuthAttempts(profile, effectiveAuthMode)) {val recipeIndex = attempt.recipeIndexval recipe = attempt.recipeval loadUrl = attempt.loadUrl+ if (lockedLoadUrl != null && lockedLoadUrl != loadUrl) {+ continue+ }cookieJar.clear()val referer = StalkerUrlFactory.portalReferer(loadUrl)val evidence = mutableListOf<String>()@@ -86,7 +90,6 @@ class OkHttpStalkerApiService @Inject constructor(url = loadUrl,profile = attemptProfile,referer = referer,- allowAlternateEndpointRetry = true,query = mapOf("type" to "stb","action" to "handshake",@@ -105,6 +108,7 @@ class OkHttpStalkerApiService @Inject constructor(lastError = IOException("Portal handshake did not return a token.")continue}+ lockedLoadUrl = loadUrlif (recipe.authMode.requiresCredentials()) {if (attemptProfile.username.isBlank()) {@@ -117,7 +121,7 @@ class OkHttpStalkerApiService @Inject constructor(profile = attemptProfile,referer = referer,token = token,- allowAlternateEndpointRetry = true+ allowAlternateEndpointRetry = false)}.getOrElse { error ->lastError = error@@ -139,7 +143,6 @@ class OkHttpStalkerApiService @Inject constructor(profile = attemptProfile,referer = referer,token = token,- allowAlternateEndpointRetry = true,query = mapOf("type" to "stb","action" to "get_localization",@@ -156,7 +159,6 @@ class OkHttpStalkerApiService @Inject constructor(profile = attemptProfile,referer = referer,token = token,- allowAlternateEndpointRetry = true,query = buildProfileQuery(attemptProfile))}.getOrElse { error ->@@ -183,7 +185,6 @@ class OkHttpStalkerApiService @Inject constructor(profile = attemptProfile,referer = referer,token = token,- allowAlternateEndpointRetry = true,query = mapOf("type" to "account_info","action" to "get_main_info",@@ -203,7 +204,6 @@ class OkHttpStalkerApiService @Inject constructor(profile = attemptProfile,referer = referer,token = token,- allowAlternateEndpointRetry = true,query = mapOf("type" to "stb","action" to "get_localization",@@ -221,7 +221,6 @@ class OkHttpStalkerApiService @Inject constructor(profile = attemptProfile,referer = referer,token = token,- allowAlternateEndpointRetry = true,query = mapOf("type" to "stb","action" to "get_modules",@@ -246,7 +245,6 @@ class OkHttpStalkerApiService @Inject constructor(profile = attemptProfile,referer = referer,token = token,- allowAlternateEndpointRetry = true,query = mapOf("type" to "stb","action" to "get_events",@@ -936,7 +934,10 @@ class OkHttpStalkerApiService @Inject constructor(.apply {token?.takeIf { it.isNotBlank() }?.let { header("Authorization", "Bearer $it") }}- .applyStalkerHeaderOverrides(profile.headerOverrides)+ .applyStalkerHeaderOverrides(+ headerOverrides = profile.headerOverrides,+ preserveUserAgent = profile.advancedOptions.apiUserAgent.isNotBlank()+ )val requestBody = body?.toRequestBody(FORM_URL_ENCODED_MEDIA_TYPE)val request = requestBuilder.method(method, requestBody)@@ -957,7 +958,10 @@ class OkHttpStalkerApiService @Inject constructor(.url(buildUrl(alternateUrl, effectiveQuery)).header("Referer", StalkerUrlFactory.portalReferer(alternateUrl)).header("Cookie", buildCookieHeader(buildUrl(alternateUrl, effectiveQuery), profile))- .applyStalkerHeaderOverrides(profile.headerOverrides)+ .applyStalkerHeaderOverrides(+ headerOverrides = profile.headerOverrides,+ preserveUserAgent = profile.advancedOptions.apiUserAgent.isNotBlank()+ ).method(method, requestBody).build()executeJsonRequest(alternateRequest, action, profile)@@ -1056,7 +1060,10 @@ class OkHttpStalkerApiService @Inject constructor(.header("Accept", "*/*").header("Cookie", buildCookieHeader(fullUrl, profile)).header("Authorization", "Bearer $token")- .applyStalkerHeaderOverrides(profile.headerOverrides)+ .applyStalkerHeaderOverrides(+ headerOverrides = profile.headerOverrides,+ preserveUserAgent = profile.advancedOptions.apiUserAgent.isNotBlank()+ ).get().build()@@ -1191,7 +1198,10 @@ class OkHttpStalkerApiService @Inject constructor(.header("Accept", "*/*").header("Cookie", buildCookieHeader(fullUrl, profile)).header("Authorization", "Bearer $token")- .applyStalkerHeaderOverrides(profile.headerOverrides)+ .applyStalkerHeaderOverrides(+ headerOverrides = profile.headerOverrides,+ preserveUserAgent = profile.advancedOptions.apiUserAgent.isNotBlank()+ ).get().build()@@ -2611,9 +2621,13 @@ private fun resolveStalkerUserAgent(}private fun Request.Builder.applyStalkerHeaderOverrides(- headerOverrides: Map<String, String?>+ headerOverrides: Map<String, String?>,+ preserveUserAgent: Boolean = false): Request.Builder = apply {headerOverrides.forEach { (name, value) ->+ if (preserveUserAgent && name.equals("User-Agent", ignoreCase = true)) {+ return@forEach+ }if (value == null) {removeHeader(name)} else {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.ktindex 8db0148c..5aa36e0a 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@@ -899,10 +899,13 @@ class StalkerProvider(}}- private fun resolvePlaybackUserAgent(profile: StalkerDeviceProfile): String? =+ private fun resolvePlaybackUserAgent(profile: StalkerDeviceProfile): String? {+ profile.advancedOptions.playerUserAgent.trim().takeIf { it.isNotBlank() }?.let { return it }profile.headerOverrides.entries.firstOrNull { (name, _) ->name.equals("User-Agent", ignoreCase = true)- }?.value ?: profile.playerUserAgent.ifBlank { profile.userAgent.ifBlank { null } }+ }?.let { (_, value) -> return value }+ return profile.playerUserAgent.ifBlank { profile.userAgent.ifBlank { null } }+ }private fun shouldOmitPlaybackAuthorization(url: String): Boolean {val path = runCatching { URI(url).path?.lowercase(Locale.ROOT).orEmpty() }.getOrDefault("")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 f36f4361..8e6797b2 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@@ -50,6 +50,8 @@ class XtreamStreamUrlResolver @Inject constructor(val authMode: StalkerAuthMode,val username: String,val password: String,+ val httpUserAgent: String,+ val httpHeaders: String,val portalFingerprint: StalkerPortalFingerprint,val magPreset: StalkerMagPreset,val bootstrapRecipe: StalkerBootstrapRecipe,@@ -358,6 +360,8 @@ class XtreamStreamUrlResolver @Inject constructor(cached.authMode == provider.stalkerAuthMode &&cached.username == provider.username &&cached.password == provider.password &&+ cached.httpUserAgent == provider.httpUserAgent &&+ cached.httpHeaders == provider.httpHeaders &&cached.portalFingerprint == provider.stalkerPortalFingerprint &&cached.magPreset == provider.stalkerMagPreset &&cached.bootstrapRecipe == provider.stalkerLastBootstrapRecipe &&@@ -385,6 +389,8 @@ class XtreamStreamUrlResolver @Inject constructor(authMode = provider.stalkerAuthMode,username = provider.username,password = decryptedPassword,+ httpUserAgent = provider.httpUserAgent,+ httpHeaders = provider.httpHeaders,portalFingerprintHint = provider.stalkerPortalFingerprint,magPresetHint = provider.stalkerMagPreset,bootstrapRecipeHint = provider.stalkerLastBootstrapRecipe,@@ -409,6 +415,8 @@ class XtreamStreamUrlResolver @Inject constructor(authMode = provider.stalkerAuthMode,username = provider.username,password = provider.password,+ httpUserAgent = provider.httpUserAgent,+ httpHeaders = provider.httpHeaders,portalFingerprint = provider.stalkerPortalFingerprint,magPreset = provider.stalkerMagPreset,bootstrapRecipe = provider.stalkerLastBootstrapRecipe,diff --git a/data/src/main/java/com/streamvault/data/repository/MovieRepositoryImpl.kt b/data/src/main/java/com/streamvault/data/repository/MovieRepositoryImpl.ktindex a1a549dc..df67ca85 100644--- a/data/src/main/java/com/streamvault/data/repository/MovieRepositoryImpl.kt+++ b/data/src/main/java/com/streamvault/data/repository/MovieRepositoryImpl.kt@@ -1490,6 +1490,9 @@ class MovieRepositoryImpl @Inject constructor(provider.serverUrl,provider.username,provider.password,+ provider.httpUserAgent,+ provider.httpHeaders,+ provider.allowedOutputFormatsJson,enableBase64TextCompatibility.toString()).joinToString("\u0000")return requireNotNull(@@ -1525,6 +1528,8 @@ class MovieRepositoryImpl @Inject constructor(authMode = provider.stalkerAuthMode,username = provider.username,password = credentialCrypto.decryptIfNeeded(provider.password),+ httpUserAgent = provider.httpUserAgent,+ httpHeaders = provider.httpHeaders,portalFingerprintHint = provider.stalkerPortalFingerprint,magPresetHint = provider.stalkerMagPreset,bootstrapRecipeHint = provider.stalkerLastBootstrapRecipe,@@ -1540,7 +1545,8 @@ class MovieRepositoryImpl @Inject constructor(serialNumber = provider.stalkerSerialNumber,deviceId = provider.stalkerDeviceId,deviceId2 = provider.stalkerDeviceId2,- signature = provider.stalkerSignature+ signature = provider.stalkerSignature,+ stalkerAdvancedOptionsJson = provider.stalkerAdvancedOptionsJson)}diff --git a/data/src/main/java/com/streamvault/data/repository/SeriesRepositoryImpl.kt b/data/src/main/java/com/streamvault/data/repository/SeriesRepositoryImpl.ktindex 988521bf..c3e11d5c 100644--- a/data/src/main/java/com/streamvault/data/repository/SeriesRepositoryImpl.kt+++ b/data/src/main/java/com/streamvault/data/repository/SeriesRepositoryImpl.kt@@ -1461,6 +1461,9 @@ class SeriesRepositoryImpl @Inject constructor(provider.serverUrl,provider.username,provider.password,+ provider.httpUserAgent,+ provider.httpHeaders,+ provider.allowedOutputFormatsJson,enableBase64TextCompatibility.toString()).joinToString("\u0000")return requireNotNull(@@ -1496,6 +1499,8 @@ class SeriesRepositoryImpl @Inject constructor(authMode = provider.stalkerAuthMode,username = provider.username,password = credentialCrypto.decryptIfNeeded(provider.password),+ httpUserAgent = provider.httpUserAgent,+ httpHeaders = provider.httpHeaders,portalFingerprintHint = provider.stalkerPortalFingerprint,magPresetHint = provider.stalkerMagPreset,bootstrapRecipeHint = provider.stalkerLastBootstrapRecipe,@@ -1511,7 +1516,8 @@ class SeriesRepositoryImpl @Inject constructor(serialNumber = provider.stalkerSerialNumber,deviceId = provider.stalkerDeviceId,deviceId2 = provider.stalkerDeviceId2,- signature = provider.stalkerSignature+ signature = provider.stalkerSignature,+ stalkerAdvancedOptionsJson = provider.stalkerAdvancedOptionsJson)}}diff --git a/data/src/main/java/com/streamvault/data/sync/SyncManager.kt b/data/src/main/java/com/streamvault/data/sync/SyncManager.ktindex 167b863c..ca54ce4c 100644--- a/data/src/main/java/com/streamvault/data/sync/SyncManager.kt+++ b/data/src/main/java/com/streamvault/data/sync/SyncManager.kt@@ -5365,6 +5365,8 @@ class SyncManager @Inject constructor(authMode = provider.stalkerAuthMode,username = provider.username,password = provider.password,+ httpUserAgent = provider.httpUserAgent,+ httpHeaders = provider.httpHeaders,portalFingerprintHint = provider.stalkerPortalFingerprint,magPresetHint = provider.stalkerMagPreset,bootstrapRecipeHint = provider.stalkerLastBootstrapRecipe,@@ -5380,7 +5382,8 @@ class SyncManager @Inject constructor(serialNumber = provider.stalkerSerialNumber,deviceId = provider.stalkerDeviceId,deviceId2 = provider.stalkerDeviceId2,- signature = provider.stalkerSignature+ signature = provider.stalkerSignature,+ stalkerAdvancedOptionsJson = provider.stalkerAdvancedOptionsJson)}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.ktindex b19bcdb7..bd55285d 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@@ -35,7 +35,7 @@ class OkHttpStalkerApiServiceTest {}val body = when (action) {"handshake" -> """{"js":{"token":"token-123"}}"""- "get_profile" -> if (requestedVersions.size <= 2) {+ "get_profile" -> if (request.url.queryParameter("image_version") != "216") {""} else {"""{"js":{"id":"42","name":"Legacy Box","status":"1","auth_access":true}}"""@@ -73,7 +73,7 @@ class OkHttpStalkerApiServiceTest {assertThat(success.data.second.magPreset).isEqualTo(StalkerMagPreset.MAG250_LEGACY)assertThat(success.data.second.bootstrapRecipe).isEqualTo(StalkerBootstrapRecipe.LEGACY_MAG)assertThat(success.data.first.recipeEvidence).containsAtLeast("fallback_recipe", "rediscovery_attempted")- assertThat(requestedImages).containsExactly("218", "218", "216").inOrder()+ assertThat(requestedImages).containsAtLeast("218", "216").inOrder()assertThat(requestedVersions.last()).contains("0.2.16-r17-250")}@@ -104,6 +104,55 @@ class OkHttpStalkerApiServiceTest {assertThat(success.data.second.maxConnections).isEqualTo(2)}+ @Test+ fun authenticate_doesNotSwitchEndpointsAfterHandshakeSucceeds() = runTest {+ val requestedPaths = mutableListOf<String>()+ val service = OkHttpStalkerApiService(+ okHttpClient = OkHttpClient.Builder()+ .addInterceptor { chain ->+ val request = chain.request()+ requestedPaths += request.url.encodedPath+ val action = request.url.queryParameter("action").orEmpty()+ val body = when (request.url.encodedPath) {+ "/server/load.php" -> when (action) {+ "handshake" -> """{"js":{"token":"token-123"}}"""+ "get_profile" -> ""+ else -> """{"js":{}}"""+ }+ "/portal.php" -> when (action) {+ "handshake" -> """{"js":{"token":"portal-token"}}"""+ "get_profile" -> """{"js":{"name":"Portal Endpoint","status":"1"}}"""+ else -> """{"js":{}}"""+ }+ else -> error("Unexpected path ${request.url.encodedPath}")+ }+ Response.Builder()+ .request(request)+ .protocol(Protocol.HTTP_1_1)+ .code(200)+ .message("OK")+ .body(body.toResponseBody("application/json".toMediaType()))+ .build()+ }+ .build(),+ json = Json { ignoreUnknownKeys = true }+ )++ val result = service.authenticate(+ buildStalkerDeviceProfile(+ portalUrl = "https://portal.example.com/c",+ macAddress = "00:1A:79:12:34:56",+ deviceProfile = "MAG250",+ timezone = "UTC",+ locale = "en"+ )+ )++ assertThat(result).isInstanceOf(Result.Error::class.java)+ assertThat(requestedPaths).doesNotContain("/portal.php")+ assertThat(requestedPaths).contains("/server/load.php")+ }+@Testfun authenticate_applies_getProfile_param_overrides_and_keeps_jshttprequest_last() = runTest {var profileRawQuery = ""@@ -242,6 +291,51 @@ class OkHttpStalkerApiServiceTest {assertThat(seenCustomHeaders).contains("enabled")}+ @Test+ fun authenticate_dedicatedApiUserAgentOverridesCustomHeaderUserAgent() = runTest {+ val seenUserAgents = mutableListOf<String?>()+ val service = OkHttpStalkerApiService(+ okHttpClient = OkHttpClient.Builder()+ .addInterceptor { chain ->+ val request = chain.request()+ seenUserAgents += request.header("User-Agent")+ val action = request.url.queryParameter("action").orEmpty()+ val body = when (action) {+ "handshake" -> """{"js":{"token":"token-123"}}"""+ "get_profile" -> """{"js":{"name":"Living Room","status":"1"}}"""+ else -> error("Unexpected action '$action'")+ }+ Response.Builder()+ .request(request)+ .protocol(Protocol.HTTP_1_1)+ .code(200)+ .message("OK")+ .body(body.toResponseBody("application/json".toMediaType()))+ .build()+ }+ .build(),+ json = Json { ignoreUnknownKeys = true }+ )++ val result = service.authenticate(+ buildStalkerDeviceProfile(+ portalUrl = "https://portal.example.com/c",+ macAddress = "00:1A:79:12:34:56",+ deviceProfile = "MAG250",+ timezone = "UTC",+ locale = "en",+ httpHeadersOverride = "User-Agent: Header Agent/2.0",+ stalkerAdvancedOptionsJson = StalkerAdvancedOptionsCodec.encode(+ StalkerAdvancedOptions(apiUserAgent = "API Agent/9.0")+ )+ )+ )++ assertThat(result).isInstanceOf(Result.Success::class.java)+ assertThat(seenUserAgents).contains("API Agent/9.0")+ assertThat(seenUserAgents).doesNotContain("Header Agent/2.0")+ }+@Testfun authenticate_module_gated_recipe_rebuilds_profile_for_modern_mag_preset() = runTest {val requestedStbTypes = mutableListOf<String>()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.ktindex 4c68061a..e90d3681 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@@ -309,6 +309,13 @@ class StalkerProviderTest {portalUrl = "https://portal.example.com/c/",macAddress = "00:1A:79:12:34:56",httpHeaders = "User-Agent: | Referer: | X-Test: enabled",+ stalkerAdvancedOptionsJson = StalkerAdvancedOptionsCodec.encode(+ StalkerAdvancedOptions(+ proxyEnabled = true,+ proxyHost = "127.0.0.1",+ proxyPort = 8080+ )+ ),playbackBackendHint = com.streamvault.domain.model.StalkerPlaybackBackendHint.TEMP_LINK_STRICT,cookieModeHint = com.streamvault.domain.model.StalkerCookieMode.CREATE_LINK,deviceProfile = "MAG322",@@ -330,6 +337,8 @@ class StalkerProviderTest {val success = result as Result.SuccessassertThat(success.data.userAgent).isNull()assertThat(success.data.allowInvalidSsl).isTrue()+ assertThat(success.data.proxyHost).isEqualTo("127.0.0.1")+ assertThat(success.data.proxyPort).isEqualTo(8080)assertThat(success.data.headers).doesNotContainKey("Referer")assertThat(success.data.headers["X-Test"]).isEqualTo("enabled")}@@ -469,6 +478,41 @@ class StalkerProviderTest {assertThat(success.data.stalkerSignature).isEmpty()}+ @Test+ fun resolvePlaybackInfo_dedicatedPlayerUserAgentOverridesCustomHeaderUserAgent() = runTest {+ val provider = StalkerProvider(+ providerId = 7,+ api = FakeStalkerApiService(+ profile = StalkerProviderProfile(accountName = "Room"),+ createLinkUrl = "http://cdn.example.com/live.ts"+ ),+ portalUrl = "https://portal.example.com/c/",+ macAddress = "00:1A:79:12:34:56",+ httpHeaders = "User-Agent: Header Agent/2.0",+ stalkerAdvancedOptionsJson = StalkerAdvancedOptionsCodec.encode(+ StalkerAdvancedOptions(+ apiUserAgent = "API Agent/9.0",+ playerUserAgent = "Player Agent/10.0"+ )+ ),+ deviceProfile = "MAG250",+ timezone = "UTC",+ locale = "en"+ )++ val result = provider.resolvePlaybackInfo(+ kind = StalkerStreamKind.LIVE,+ descriptor = 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.userAgent).isEqualTo("Player Agent/10.0")+ assertThat(success.data.headers).doesNotContainKey("User-Agent")+ }+private class FakeStalkerApiService(private val profile: StalkerProviderProfile,private val liveStreams: List<StalkerItemRecord> = emptyList(),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 6f767bd5..534b7d46 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@@ -290,13 +290,13 @@ class XtreamStreamUrlResolverTest {assertThat(firstResolved?.url).isEqualTo("http://edge.example.com/live/77.m3u8")assertThat(firstResolved?.expirationTime).isNull()assertThat(firstResolved?.headers?.get("Referer")).isEqualTo("https://portal.example.com/c/")- assertThat(firstResolved?.headers?.get("Cookie")).contains("mac=00:1A:79:12:34:56")+ assertThat(firstResolved?.headers?.get("Cookie")).contains("mac=00%3A1A%3A79%3A12%3A34%3A56")assertThat(firstResolved?.headers?.get("Cookie")).contains("stb_lang=en")assertThat(firstResolved?.headers?.get("Cookie")).contains("timezone=UTC")- assertThat(firstResolved?.headers?.get("Cookie")).contains("sn=0001A79123456")- assertThat(firstResolved?.headers?.get("Cookie")).contains("device_id=")- assertThat(firstResolved?.headers?.get("Cookie")).contains("device_id2=")- assertThat(firstResolved?.headers?.get("Cookie")).contains("signature=")+ assertThat(firstResolved?.headers?.get("Cookie")).doesNotContain("sn=")+ assertThat(firstResolved?.headers?.get("Cookie")).doesNotContain("device_id=")+ assertThat(firstResolved?.headers?.get("Cookie")).doesNotContain("device_id2=")+ assertThat(firstResolved?.headers?.get("Cookie")).doesNotContain("signature=")assertThat(firstResolved?.headers?.get("Authorization")).isEqualTo("Bearer token")assertThat(firstResolved?.headers?.get("X-User-Agent")).isEqualTo("Model: MAG250; Link: Ethernet")assertThat(firstResolved?.userAgent).contains("MAG250 stbapp")@@ -306,6 +306,44 @@ class XtreamStreamUrlResolverTest {}}+ @Test+ fun resolveWithMetadata_applies_stalker_custom_headers_through_cached_provider() {+ runBlocking {+ val fakeStalkerApiService = FakeStalkerApiService()+ val resolver = XtreamStreamUrlResolver(+ providerDao = FakeProviderDao(+ ProviderEntity(+ id = 14,+ name = "Stalker",+ type = ProviderType.STALKER_PORTAL,+ serverUrl = "https://portal.example.com",+ httpHeaders = "X-Test: enabled | Referer: https://custom.example.com/ref",+ stalkerMacAddress = "00:1A:79:12:34:56",+ stalkerDeviceProfile = "MAG250",+ stalkerDeviceTimezone = "UTC",+ stalkerDeviceLocale = "en"+ )+ ),+ credentialCrypto = credentialCrypto,+ stalkerApiService = fakeStalkerApiService+ )+ val internalUrl = StalkerUrlFactory.buildInternalStreamUrl(+ providerId = 14,+ kind = StalkerStreamKind.LIVE,+ itemId = 77,+ cmd = "ffrt http://edge.example.com/live/77.m3u8",+ containerExtension = "m3u8"+ )++ val resolved = resolver.resolveWithMetadata(internalUrl)++ assertThat(resolved?.headers).containsEntry("X-Test", "enabled")+ assertThat(resolved?.headers).containsEntry("Referer", "https://custom.example.com/ref")+ assertThat(fakeStalkerApiService.lastAuthenticateProfile?.httpHeaders)+ .contains("X-Test: enabled")+ }+ }+@Testfun resolveWithMetadata_uses_direct_stalker_absolute_cmd_without_create_link() {runBlocking {@@ -548,10 +586,12 @@ class XtreamStreamUrlResolverTest {var authenticateCalls: Int = 0var createLinkCalls: Int = 0var lastCreateLinkSeriesNumber: Int? = null+ var lastAuthenticateProfile: StalkerDeviceProfile? = nullvar createLinkResponse: String = "http://edge.example.com/live/77.m3u8?exp=1774017000"override suspend fun authenticate(profile: StalkerDeviceProfile): Result<Pair<StalkerSession, StalkerProviderProfile>> {authenticateCalls += 1+ lastAuthenticateProfile = profilereturn Result.success(StalkerSession(loadUrl = "https://portal.example.com/server/load.php",diff --git a/data/src/test/java/com/streamvault/data/sync/SyncManagerTest.kt b/data/src/test/java/com/streamvault/data/sync/SyncManagerTest.ktindex 0c19cb31..7c2845e6 100644--- a/data/src/test/java/com/streamvault/data/sync/SyncManagerTest.kt+++ b/data/src/test/java/com/streamvault/data/sync/SyncManagerTest.kt@@ -46,6 +46,9 @@ import com.streamvault.data.remote.stalker.StalkerProgramRecordimport com.streamvault.data.remote.stalker.StalkerProviderProfileimport com.streamvault.data.remote.stalker.StalkerSessionimport com.streamvault.data.remote.stalker.StalkerApiService+import com.streamvault.data.remote.stalker.StalkerAdvancedOptions+import com.streamvault.data.remote.stalker.StalkerAdvancedOptionsCodec+import com.streamvault.data.remote.stalker.StalkerDeviceProfileimport com.streamvault.data.preferences.PreferencesRepositoryimport com.streamvault.domain.model.ContentTypeimport kotlinx.coroutines.CompletableDeferred@@ -407,6 +410,57 @@ class SyncManagerTest {assertThat(mgr.currentSyncState(99L)).isEqualTo(SyncState.Idle)}+ @Test+ fun sync_stalker_rebuilt_provider_respects_editable_setup_options() = runTest {+ val advancedOptionsJson = StalkerAdvancedOptionsCodec.encode(+ StalkerAdvancedOptions(+ apiUserAgent = "API Agent/9.0",+ playerUserAgent = "Player Agent/10.0",+ hwVersion = "1.2.3",+ xUserAgentLink = StalkerAdvancedOptions.LINK_WIFI,+ proxyEnabled = true,+ proxyHost = "127.0.0.1",+ proxyPort = 8888+ )+ )+ val providerEntity = sampleProvider(ProviderType.STALKER_PORTAL).copy(+ serverUrl = "http://example.com",+ username = "",+ password = "",+ httpUserAgent = "Legacy Agent/1.0",+ httpHeaders = "X-Test: enabled",+ stalkerMacAddress = "00:11:22:33:44:55",+ stalkerDeviceProfile = "MAG254",+ stalkerDeviceTimezone = "UTC",+ stalkerDeviceLocale = "en",+ stalkerSerialNumber = "SERIAL123",+ stalkerDeviceId = "AABBCC",+ stalkerDeviceId2 = "DDEEFF",+ stalkerAdvancedOptionsJson = advancedOptionsJson,+ epgSyncMode = ProviderEpgSyncMode.SKIP+ )+ val mgr = buildManager(providerType = ProviderType.STALKER_PORTAL, providerEntity = providerEntity)++ mgr.sync(1L, force = true)+ advanceUntilIdle()++ val profileCaptor = argumentCaptor<StalkerDeviceProfile>()+ verify(stalkerApiService, atLeastOnce()).authenticate(profileCaptor.capture())+ val profile = profileCaptor.firstValue+ assertThat(profile.httpUserAgent).isEqualTo("Legacy Agent/1.0")+ assertThat(profile.httpHeaders).isEqualTo("X-Test: enabled")+ assertThat(profile.headerOverrides).containsEntry("X-Test", "enabled")+ assertThat(profile.advancedOptions.apiUserAgent).isEqualTo("API Agent/9.0")+ assertThat(profile.advancedOptions.playerUserAgent).isEqualTo("Player Agent/10.0")+ assertThat(profile.advancedOptions.hwVersion).isEqualTo("1.2.3")+ assertThat(profile.advancedOptions.proxy?.host).isEqualTo("127.0.0.1")+ assertThat(profile.advancedOptions.proxy?.port).isEqualTo(8888)+ assertThat(profile.xUserAgent).isEqualTo("Model: MAG254; Link: WiFi")+ assertThat(profile.serialNumber).isEqualTo("SERIAL123")+ assertThat(profile.deviceId).isEqualTo("AABBCC")+ assertThat(profile.deviceId2).isEqualTo("DDEEFF")+ }+// ── Xtream sync failure ─────────────────────────────────────────@Testdiff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.mdindex 003bf9ea..fd006307 100644--- a/docs/CHANGELOG.md+++ b/docs/CHANGELOG.md@@ -12,6 +12,8 @@ All notable product changes are recorded in this document.- Fixed Stalker profile metrics so `uid` uses Device ID2, and removed `video_out` and `signature` from the generated metrics payload.- Fixed Stalker profile requests to send `prehash=false` literally instead of numeric `0`/`1` values.- Fixed the default Stalker `get_profile` version string to use the legacy MAG 250 `5.6.10` profile value expected by stricter portals.+- Fixed Stalker and Xtream setup overrides so saved User-Agent, custom headers, and Stalker advanced compatibility settings are respected across login, sync, playback resolution, and VOD/series detail requests.+- Fixed Stalker HTTP proxy playback support so proxy metadata is preserved through resolved streams and also used by Android TV Input playback.- Fixed Live TV favorites, recents, and custom-group ordered lists still collapsing SD/HD/FHD channel variants after grouped variants were disabled.### Added