StreamVault is a TV-first free IPTV player for Android TV built with Kotlin, Jetpack Compose, Room, Hilt, and Media3.
Kotlin iptv-player
feat(stalker): add support for observing all Stalker index jobs and enhance provider setup validation
David Nashash25eee787620c
diff --git a/data/src/main/java/com/streamvault/data/local/dao/StalkerSyncDaos.kt b/data/src/main/java/com/streamvault/data/local/dao/StalkerSyncDaos.ktindex c3b1a93b..fa631fdf 100644--- a/data/src/main/java/com/streamvault/data/local/dao/StalkerSyncDaos.kt+++ b/data/src/main/java/com/streamvault/data/local/dao/StalkerSyncDaos.kt@@ -13,6 +13,9 @@ import kotlinx.coroutines.flow.Flow@Daointerface StalkerIndexJobDao {+ @Query("SELECT * FROM stalker_index_jobs ORDER BY provider_id ASC, section ASC")+ fun observeAll(): Flow<List<StalkerIndexJobEntity>>+@Query("SELECT * FROM stalker_index_jobs WHERE provider_id = :providerId ORDER BY updated_at ASC, section ASC")fun observeForProvider(providerId: Long): Flow<List<StalkerIndexJobEntity>>diff --git a/data/src/main/java/com/streamvault/data/settings/SettingsOperationsImpl.kt b/data/src/main/java/com/streamvault/data/settings/SettingsOperationsImpl.ktindex 33f81975..a73aedc3 100644--- a/data/src/main/java/com/streamvault/data/settings/SettingsOperationsImpl.kt+++ b/data/src/main/java/com/streamvault/data/settings/SettingsOperationsImpl.kt@@ -1,6 +1,7 @@package com.streamvault.data.settingsimport com.streamvault.data.local.dao.ProgramDao+import com.streamvault.data.local.dao.StalkerIndexJobDaoimport com.streamvault.data.local.dao.XtreamIndexJobDaoimport com.streamvault.data.local.dao.XtreamLiveOnboardingDaoimport com.streamvault.data.local.entity.XtreamIndexJobEntity@@ -13,11 +14,13 @@ import com.streamvault.domain.settings.SettingsSyncSectionimport com.streamvault.domain.settings.SettingsXtreamIndexJobimport com.streamvault.domain.settings.SettingsXtreamLiveOnboardingimport kotlinx.coroutines.flow.Flow+import kotlinx.coroutines.flow.combineimport kotlinx.coroutines.flow.mapimport javax.inject.Injectclass SettingsOperationsImpl @Inject constructor(private val programDao: ProgramDao,+ private val stalkerIndexJobDao: StalkerIndexJobDao,private val xtreamIndexJobDao: XtreamIndexJobDao,private val xtreamLiveOnboardingDao: XtreamLiveOnboardingDao,private val syncCommands: ProviderSyncCommands@@ -26,7 +29,9 @@ class SettingsOperationsImpl @Inject constructor(programDao.observeCountByProvider(providerId)override fun observeXtreamIndexJobs(): Flow<List<SettingsXtreamIndexJob>> =- xtreamIndexJobDao.observeAll().map { jobs -> jobs.map { it.toSettingsSnapshot() } }+ combine(stalkerIndexJobDao.observeAll(), xtreamIndexJobDao.observeAll()) { stalkerJobs, xtreamJobs ->+ stalkerJobs.map { it.toSettingsSnapshot() } + xtreamJobs.map { it.toSettingsSnapshot() }+ }override fun observeIncompleteXtreamLiveOnboarding(): Flow<List<SettingsXtreamLiveOnboarding>> =xtreamLiveOnboardingDao.observeIncomplete().map { states ->@@ -63,6 +68,15 @@ class SettingsOperationsImpl @Inject constructor(lastError = lastError)+ private fun com.streamvault.data.local.entity.StalkerIndexJobEntity.toSettingsSnapshot() =+ SettingsXtreamIndexJob(+ providerId = providerId,+ section = section.name,+ state = state.name,+ indexedRows = indexedRows,+ lastError = lastError+ )+private fun XtreamLiveOnboardingStateEntity.toSettingsSnapshot() = SettingsXtreamLiveOnboarding(providerId = providerId,phase = phase,diff --git a/data/src/test/java/com/streamvault/data/settings/SettingsOperationsImplTest.kt b/data/src/test/java/com/streamvault/data/settings/SettingsOperationsImplTest.ktindex 46cf4474..e77de927 100644--- a/data/src/test/java/com/streamvault/data/settings/SettingsOperationsImplTest.kt+++ b/data/src/test/java/com/streamvault/data/settings/SettingsOperationsImplTest.kt@@ -2,6 +2,7 @@ package com.streamvault.data.settingsimport com.google.common.truth.Truth.assertThatimport com.streamvault.data.local.dao.ProgramDao+import com.streamvault.data.local.dao.StalkerIndexJobDaoimport com.streamvault.data.local.dao.XtreamIndexJobDaoimport com.streamvault.data.local.dao.XtreamLiveOnboardingDaoimport com.streamvault.data.local.entity.XtreamIndexJobEntity@@ -26,11 +27,13 @@ import org.mockito.kotlin.wheneverclass SettingsOperationsImplTest {private val programDao = mock<ProgramDao>()+ private val stalkerIndexJobDao = mock<StalkerIndexJobDao>()private val xtreamIndexJobDao = mock<XtreamIndexJobDao>()private val xtreamLiveOnboardingDao = mock<XtreamLiveOnboardingDao>()private val syncCommands = mock<ProviderSyncCommands>()private val operations = SettingsOperationsImpl(programDao = programDao,+ stalkerIndexJobDao = stalkerIndexJobDao,xtreamIndexJobDao = xtreamIndexJobDao,xtreamLiveOnboardingDao = xtreamLiveOnboardingDao,syncCommands = syncCommands@@ -45,6 +48,7 @@ class SettingsOperationsImplTest {@Testfun `observe index jobs maps every settings-facing field`() = runTest {+ whenever(stalkerIndexJobDao.observeAll()).thenReturn(flowOf(emptyList()))whenever(xtreamIndexJobDao.observeAll()).thenReturn(flowOf(listOf(XtreamIndexJobEntity(7L, "MOVIE", "PARTIAL", indexedRows = 18, lastError = "bad row"))))diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.mdindex 6d25aa00..9eb84d2a 100644--- a/docs/CHANGELOG.md+++ b/docs/CHANGELOG.md@@ -9,6 +9,7 @@ All notable product changes are recorded in this document.- Added temporary automatic quality reduction for supported adaptive streams when decoding struggles, with gradual restoration and respect for manual quality choices.- Added AVC/H.264 fallback for eligible HEVC episodes, preserving playback position, audio, subtitles, and episode history.- Added durable retries for failed Stalker live categories, scoped to the current provider configuration and visible categories, with retry promotion and cleanup committed atomically (Room migration v80 to v81).+- Added Stalker provider setup from supported Stalker playback or export URLs in the URL tab by detecting the portal and MAC address.### Fixed@@ -24,6 +25,7 @@ All notable product changes are recorded in this document.- Fixed Xtream playlist setup ignoring the requested HLS or MPEG-TS format when playback format is set to Auto.- Fixed matching AVC/H.264 and HEVC/H.265 movie versions failing to group together.- Fixed newly imported movie summaries skipping detail loading.+- Fixed provider diagnostics reporting movie catalogs as stale while their background index was queued, retrying, or running, including Stalker providers.- Fixed Stalker add-provider security and verification dialogs stretching to near full screen; they now size to their content and use a narrower width on compact screens.- Fixed Xtream series losing some or all of their episodes after another series was opened (#166). Episode ids are now unique per series instead of per provider, and series cached before the fix are re-fetched the next time they are opened.- Fixed M3U channels sharing a `tvg-id` but using different stream URLs or Acestream hashes from being incorrectly treated as the same channel (#231).diff --git a/domain/src/main/java/com/streamvault/domain/usecase/ValidateAndAddProvider.kt b/domain/src/main/java/com/streamvault/domain/usecase/ValidateAndAddProvider.ktindex b3d84ae1..c896e051 100644--- a/domain/src/main/java/com/streamvault/domain/usecase/ValidateAndAddProvider.kt+++ b/domain/src/main/java/com/streamvault/domain/usecase/ValidateAndAddProvider.kt@@ -119,6 +119,9 @@ class ValidateAndAddProvider @Inject constructor(companion object {private const val MAX_XTREAM_PLAYLIST_USERNAME_LENGTH = 128private const val MAX_XTREAM_PLAYLIST_PASSWORD_LENGTH = 256+ private val STALKER_MAC_ADDRESS = Regex("^[0-9a-f]{2}(?::[0-9a-f]{2}){5}$", RegexOption.IGNORE_CASE)+ private val STALKER_MAC_IN_PLAYBACK_ROUTE =+ Regex("live\\.php\\?mac=([0-9a-f]{2}(?::[0-9a-f]{2}){5})", RegexOption.IGNORE_CASE)}/**@@ -248,6 +251,28 @@ class ValidateAndAddProvider @Inject constructor() {is Result.Success -> {val validatedInput = validated.data+ when (val parsedStalker = parseStalkerPlaylistUrl(validatedInput.url)) {+ is ParsedStalkerUrlResult.ValidationError ->+ return ValidateAndAddProviderResult.ValidationError(parsedStalker.message)++ is ParsedStalkerUrlResult.Success -> return loginStalker(+ StalkerProviderSetupCommand(+ portalUrl = parsedStalker.portalUrl,+ macAddress = parsedStalker.macAddress,+ name = validatedInput.name,+ authMode = StalkerAuthMode.AUTO,+ httpUserAgent = validatedInput.httpUserAgent,+ httpHeaders = validatedInput.httpHeaders,+ epgSyncMode = command.epgSyncMode,+ guideSourcePolicy = command.guideSourcePolicy,+ channelLogoSourcePolicy = command.channelLogoSourcePolicy,+ existingProviderId = command.existingProviderId+ ),+ onProgress = onProgress+ )++ ParsedStalkerUrlResult.NotStalkerUrl -> Unit+ }when (val parsedXtream = parseXtreamPlaylistUrl(validatedInput.url)) {is ParsedXtreamPlaylistUrlResult.ValidationError ->ValidateAndAddProviderResult.ValidationError(parsedXtream.message)@@ -470,6 +495,68 @@ class ValidateAndAddProvider @Inject constructor() : ParsedXtreamPlaylistUrlResult}+ private sealed interface ParsedStalkerUrlResult {+ data object NotStalkerUrl : ParsedStalkerUrlResult+ data class ValidationError(val message: String) : ParsedStalkerUrlResult+ data class Success(val portalUrl: String, val macAddress: String) : ParsedStalkerUrlResult+ }++ /**+ * Some Stalker portals publish an Xtream-shaped get.php URL whose password contains the+ * actual Stalker live.php?mac=... identity. Detect that signature before the Xtream parser+ * sees it, then set up the portal with the MAC instead of treating the playback route as a+ * Xtream password.+ */+ private fun parseStalkerPlaylistUrl(url: String): ParsedStalkerUrlResult {+ val uri = runCatching { URI(url) }.getOrNull()+ ?: return ParsedStalkerUrlResult.NotStalkerUrl+ val scheme = uri.scheme?.lowercase()+ ?.takeIf { it == "http" || it == "https" }+ ?: return ParsedStalkerUrlResult.NotStalkerUrl++ val path = uri.path.orEmpty().lowercase()+ val query = parseQueryParameters(uri.rawQuery)+ val password = query["password"].orEmpty()+ val nestedPlaybackQuery = password.substringAfter('?', missingDelimiterValue = "")+ val nestedQuery = parseQueryParameters(nestedPlaybackQuery)+ val macAddress = query["mac"] ?: nestedQuery["mac"]+ ?: STALKER_MAC_IN_PLAYBACK_ROUTE.find(password)?.groupValues?.getOrNull(1)+ val hasStreamRoute = (!query["stream"].isNullOrBlank() || !nestedQuery["stream"].isNullOrBlank()) &&+ (!query["extension"].isNullOrBlank() || !nestedQuery["extension"].isNullOrBlank())+ val isStalkerGetPhpExport = path.endsWith("/get.php") &&+ query["username"].isNullOrBlank().not() &&+ query["type"]?.lowercase() in setOf("m3u", "m3u_plus") &&+ password.startsWith("live.php?", ignoreCase = true) &&+ hasStreamRoute+ val isStalkerPlaybackUrl = path.endsWith("/play/live.php") && hasStreamRoute+ if (!isStalkerGetPhpExport && !isStalkerPlaybackUrl) {+ return ParsedStalkerUrlResult.NotStalkerUrl+ }++ val validatedMacAddress = macAddress?.takeIf(STALKER_MAC_ADDRESS::matches)+ ?: return ParsedStalkerUrlResult.ValidationError(+ "Stalker URL must include a valid MAC address."+ )+ val host = uri.host?.takeIf { it.isNotBlank() }+ ?: return ParsedStalkerUrlResult.ValidationError("Stalker URL must include a host.")+ val portalPath = when {+ path.endsWith("/get.php") -> uri.path.orEmpty().dropLast("/get.php".length).trimEnd('/')+ path.endsWith("/play/live.php") -> uri.path.orEmpty().dropLast("/play/live.php".length).trimEnd('/')+ else -> ""+ }+ val portalUrl = buildString {+ append(scheme)+ append("://")+ append(host)+ if (uri.port != -1) {+ append(":")+ append(uri.port)+ }+ append(portalPath)+ }+ return ParsedStalkerUrlResult.Success(portalUrl, validatedMacAddress)+ }+private fun parseXtreamPlaylistUrl(url: String): ParsedXtreamPlaylistUrlResult {val uri = runCatching { URI(url) }.getOrNull() ?: return ParsedXtreamPlaylistUrlResult.NotXtreamPlaylistval scheme = uri.scheme?.lowercase() ?: return ParsedXtreamPlaylistUrlResult.NotXtreamPlaylistdiff --git a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsViewModel.kt b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsViewModel.ktindex 38331ff9..ad718235 100644--- a/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsViewModel.kt+++ b/feature/settings/src/main/java/com/streamvault/feature/settings/presentation/SettingsViewModel.kt@@ -349,10 +349,11 @@ class SettingsViewModel @Inject constructor(private fun String.toCatalogCountStatus(): ProviderCatalogCountStatus = when (uppercase()) {"QUEUED", "STALE" -> ProviderCatalogCountStatus.QUEUED+ "RETRY_WAIT" -> ProviderCatalogCountStatus.QUEUED"RUNNING" -> ProviderCatalogCountStatus.SYNCING- "PARTIAL" -> ProviderCatalogCountStatus.PARTIAL- "FAILED_RETRYABLE", "FAILED_PERMANENT" -> ProviderCatalogCountStatus.FAILED- "SUCCESS" -> ProviderCatalogCountStatus.READY+ "PARTIAL", "TRUNCATED" -> ProviderCatalogCountStatus.PARTIAL+ "FAILED", "FAILED_RETRYABLE", "FAILED_PERMANENT" -> ProviderCatalogCountStatus.FAILED+ "SUCCESS", "COMPLETE" -> ProviderCatalogCountStatus.READYelse -> ProviderCatalogCountStatus.PENDING}@@ -384,6 +385,8 @@ class SettingsViewModel @Inject constructor(}return when (state) {"PARTIAL" -> "$BACKGROUND_INDEX_STATUS_PREFIX $label partial: ${indexedRows} indexed"+ "TRUNCATED" -> "$BACKGROUND_INDEX_STATUS_PREFIX $label truncated: ${indexedRows} indexed"+ "FAILED" -> "$BACKGROUND_INDEX_STATUS_PREFIX $label failed${lastError?.let { ": $it" }.orEmpty()}""FAILED_RETRYABLE" -> "$BACKGROUND_INDEX_STATUS_PREFIX $label retryable failed${lastError?.let { ": $it" }.orEmpty()}""FAILED_PERMANENT" -> "$BACKGROUND_INDEX_STATUS_PREFIX $label permanently failed${lastError?.let { ": $it" }.orEmpty()}"else -> null