@granite-js/video 1.0.29 → 1.0.30

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @granite-js/video
 
+## 1.0.30
+
+### Patch Changes
+
+- 4b2e737: Fix Android video source headers parsing for React Native codegen header entries.
+
 ## 1.0.29
 
 ## 1.0.28

package/android/src/main/java/run/granite/video/GraniteVideoView.kt

@@ -66,11 +66,10 @@ class GraniteVideoView @JvmOverloads constructor(
     }
 
     // Source
-    @Suppress("UNCHECKED_CAST")
     fun setSource(source: Map<String, Any>?) {
         source ?: return
 
-        val headers = source["headers"] as? Map<String, String>
+        val headers = parseHeaders(source["headers"])
 
         val videoSource = GraniteVideoSource(
             uri = source["uri"] as? String,
@@ -113,7 +112,7 @@ class GraniteVideoView @JvmOverloads constructor(
             "clearkey" -> GraniteVideoDrmType.CLEARKEY
             else -> GraniteVideoDrmType.NONE
         }
-        val headers = map["headers"] as? Map<String, String>
+        val headers = parseHeaders(map["headers"])
         return GraniteVideoDrmConfig(
             type = drmType,
             licenseServer = map["licenseServer"] as? String,
@@ -122,6 +121,25 @@ class GraniteVideoView @JvmOverloads constructor(
         )
     }
 
+    private fun parseHeaders(value: Any?): Map<String, String>? {
+        return when (value) {
+            is Map<*, *> -> value.entries.mapNotNull { (name, headerValue) ->
+                val headerName = name as? String ?: return@mapNotNull null
+                val headerStringValue = headerValue as? String ?: return@mapNotNull null
+                headerName to headerStringValue
+            }.toMap().ifEmpty { null }
+
+            is List<*> -> value.mapNotNull { entry ->
+                val header = entry as? Map<*, *> ?: return@mapNotNull null
+                val headerName = header["name"] as? String ?: return@mapNotNull null
+                val headerValue = header["value"] as? String ?: return@mapNotNull null
+                headerName to headerValue
+            }.toMap().ifEmpty { null }
+
+            else -> null
+        }
+    }
+
     private fun parseMetadata(map: Map<String, Any>?): GraniteVideoMetadata? {
         map ?: return null
         return GraniteVideoMetadata(

package/android/src/test/java/run/granite/video/GraniteVideoViewRobolectricTest.kt

@@ -124,6 +124,31 @@ class GraniteVideoViewRobolectricTest {
         }
     }
 
+    @Test
+    fun `setSource with codegen header entries should restore headers map`() {
+        val view = GraniteVideoView(
+            context = context,
+            providerFactory = { mockProvider }
+        )
+
+        val source = mapOf(
+            "uri" to "https://example.com/protected.m3u8",
+            "headers" to listOf(
+                mapOf(
+                    "name" to "X-Auth-Token",
+                    "value" to "test-secret"
+                )
+            )
+        )
+        view.setSource(source)
+
+        verify {
+            mockProvider.loadSource(match<GraniteVideoSource> {
+                it.headers == mapOf("X-Auth-Token" to "test-secret")
+            })
+        }
+    }
+
     @Test
     fun `setSource with null source should not call loadSource`() {
         val view = GraniteVideoView(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@granite-js/video",
-  "version": "1.0.29",
+  "version": "1.0.30",
   "description": "Pluggable video component for React Native with provider selection",
   "type": "module",
   "main": "./dist/module/index.js",