Skip to content

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

fix(stalker): use device id2 for metrics uid

David Nashash90c7108226c0
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 292c9375..77642e79 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
@@ -1502,10 +1502,8 @@ class OkHttpStalkerApiService @Inject constructor(
append("\"sn\":\"").append(profile.serialNumber).append("\",")
append("\"model\":\"").append(profile.deviceProfile).append("\",")
append("\"type\":\"STB\",")
- append("\"uid\":\"").append(profile.deviceId.take(16)).append("\",")
- append("\"random\":\"").append(profile.deviceId2.take(16)).append("\",")
- append("\"signature\":\"").append(profile.signature.take(16)).append("\",")
- append("\"video_out\":\"hdmi\"")
+ append("\"uid\":\"").append(profile.deviceId2.take(16)).append("\",")
+ append("\"random\":\"").append(profile.deviceId2.take(16)).append('"')
append('}')
}
}
@@ -2493,9 +2491,9 @@ private fun StalkerDeviceProfile.withRecipe(
timezone = timezone,
locale = locale,
serialNumberOverride = serialNumber,
- deviceIdOverride = "",
- deviceId2Override = "",
- signatureOverride = ""
+ deviceIdOverride = deviceId,
+ deviceId2Override = deviceId2,
+ signatureOverride = signature
)
}
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 e3512fbb..4bf2b33b 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
@@ -485,6 +485,56 @@ class OkHttpStalkerApiServiceTest {
assertThat(profile.signature).isEmpty()
}
+ @Test
+ fun authenticate_uses_device_id2_for_metrics_uid_and_omits_signature_and_video_out() = runTest {
+ val requestedMetrics = mutableListOf<String>()
+ val service = OkHttpStalkerApiService(
+ okHttpClient = OkHttpClient.Builder()
+ .addInterceptor { chain ->
+ val request = chain.request()
+ val action = request.url.queryParameter("action").orEmpty()
+ if (action == "get_profile") {
+ requestedMetrics += request.url.queryParameter("metrics").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",
+ serialNumberOverride = "SERIAL123",
+ deviceIdOverride = "DEVICEID1234567890",
+ deviceId2Override = "DEVICEID2ABCDEFGH",
+ signatureOverride = "SIGNATURE12345678"
+ )
+ )
+
+ assertThat(result).isInstanceOf(Result.Success::class.java)
+ val metrics = requestedMetrics.single()
+ assertThat(metrics).contains("\"uid\":\"DEVICEID2ABCDEFG\"")
+ assertThat(metrics).contains("\"random\":\"DEVICEID2ABCDEFG\"")
+ assertThat(metrics).doesNotContain("signature")
+ assertThat(metrics).doesNotContain("video_out")
+ }
+
@Test
fun authenticate_reads_json_from_callback_wrapper_and_control_char_noise() = runTest {
val service = OkHttpStalkerApiService(
diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index e1c65ae6..f741e11b 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -9,6 +9,7 @@ All notable product changes are recorded in this document.
- Fixed Stalker endpoint handling so authenticated requests stay on the discovered API endpoint instead of retrying the sibling `portal.php` or `server/load.php` path automatically.
- Fixed Stalker request and playback cookies to only send the required `mac`, `stb_lang`, and `timezone` client values, with encoded cookie formatting and no extra device-identity cookies.
- Fixed Stalker device-profile generation so empty Serial Number, Device ID, Device ID2, and Signature fields stay empty instead of being auto-generated.
+- Fixed Stalker profile metrics so `uid` uses Device ID2, and removed `video_out` and `signature` from the generated metrics payload.
## [1.0.14] - 2026-06-06