@npaw/forge-react-native-video 9.7.1 → 9.7.3

package/android/build.gradle

@@ -25,11 +25,11 @@ def safeExtGet(prop, fallback) {
 
 def forgeCoreVersion = project.hasProperty('NpawForge_forgeCoreVersion')
     ? project.property('NpawForge_forgeCoreVersion')
-    : (System.getenv('FORGE_CORE_VERSION') ?: '9.7.1')
+    : (System.getenv('FORGE_CORE_VERSION') ?: '9.7.3')
 
 def forgeAdapterVersion = project.hasProperty('NpawForge_forgeAdapterVersion')
     ? project.property('NpawForge_forgeAdapterVersion')
-    : (System.getenv('FORGE_ADAPTER_VERSION') ?: '9.7.1')
+    : (System.getenv('FORGE_ADAPTER_VERSION') ?: '9.7.3')
 
 android {
     namespace 'com.npaw.forge.reactnative.video'

package/ios/ForgeRNVPlayerPlugin.swift

@@ -55,12 +55,16 @@ final class ForgeRNVPlayerPlugin: RNVAVPlayerPlugin {
     override func overridePlayerAsset(source: VideoSource, asset: AVAsset) async -> OverridePlayerAssetResult? {
         var token: String?
         var uri: String?
+        var sawUriLabel = false
+        var sawHeadersLabel = false
         let mirror = Mirror(reflecting: source)
         for child in mirror.children {
             switch child.label {
             case "uri":
+                sawUriLabel = true
                 uri = child.value as? String ?? (child.value as? String?) ?? nil
             case "requestHeaders":
+                sawHeadersLabel = true
                 let headers = (child.value as? [String: Any]) ?? (child.value as? [String: Any]?) ?? nil
                 if let headers {
                     for (key, value) in headers where key.lowercased() == ForgeVideoModuleImpl.tokenHeader {
@@ -71,10 +75,48 @@ final class ForgeRNVPlayerPlugin: RNVAVPlayerPlugin {
                 break
             }
         }
+        // Reflection has no compile-time contract, so a renamed field would
+        // otherwise degrade in silence: `uri` falls back to the asset URL below
+        // and playback still reports, while token correlation quietly stops.
+        // Say so once, loudly enough to be found in a device log. The CI-side
+        // guard is __tests__/rn-video-source-contract.test.ts.
+        if !sawUriLabel || !sawHeadersLabel {
+            ForgeRNVPlayerPlugin.reportReflectionDrift(sawUri: sawUriLabel, sawHeaders: sawHeadersLabel)
+        }
         if uri == nil, let urlAsset = asset as? AVURLAsset {
             uri = urlAsset.url.absoluteString
         }
         ForgeVideoModuleImpl.shared.sourceSeen(asset: asset, token: token, uri: uri)
         return nil
     }
+
+    /// One-shot notice that `VideoSource`'s shape no longer matches what the
+    /// reflection expects.
+    ///
+    /// Reported once per process: this runs for every player item, and a
+    /// per-item log on a list screen would bury the very message it exists to
+    /// surface. Reuses the same static-lock pattern as `registerOnce`.
+    private static var reflectionDriftReported = false
+
+    private static func reportReflectionDrift(sawUri: Bool, sawHeaders: Bool) {
+        registrationLock.lock()
+        if reflectionDriftReported {
+            registrationLock.unlock()
+            return
+        }
+        reflectionDriftReported = true
+        registrationLock.unlock()
+
+        let missing = [sawUri ? nil : "uri", sawHeaders ? nil : "requestHeaders"]
+            .compactMap { $0 }
+            .joined(separator: ", ")
+        NSLog(
+            "[NPAWForge] react-native-video VideoSource no longer exposes: %@. "
+                + "Forge reads these by reflection because they are internal upstream. "
+                + "Playback reporting continues, but token correlation is degraded. "
+                + "Check the installed react-native-video version against the "
+                + "supported range (>=6.11.0 <7).",
+            missing
+        )
+    }
 }

package/ios/ForgeVideoModuleImpl.swift

@@ -310,16 +310,32 @@ public final class ForgeVideoModuleImpl: NSObject {
         }
     }
 
+    /// Tears the binding down: detach the player adapter, then fire the
+    /// terminal stop.
+    ///
+    /// The detach comes first deliberately. By the time this block runs,
+    /// react-native-video has already released its player - `playerRemoved`
+    /// arrives on the main thread and this hop defers a full runloop turn - so
+    /// the adapter is observing a player that is being deallocated. Detaching
+    /// first means the view is closed to it before the stop makes the view
+    /// terminal, and nothing the dying player reports afterwards can be
+    /// mistaken for a replay.
+    ///
+    /// The stop still carries the final position: it never read the player
+    /// (`fireStop` builds its metadata from params), and the kernel backfills
+    /// `playhead` from the last observed position when the firing params carry
+    /// none - `backfill_stop_playhead`, added for
+    /// `apple/2026-07-13_ios-stop-playhead-zero-instead-of-final-position`.
     private func unbindOnMain(_ binding: Binding, fireStop: Bool) {
         let instanceId = binding.request.instanceId
         let identifier = binding.request.identifier
         DispatchQueue.main.async { [weak self] in
             guard let self, let forge = self.resolveForge(instanceId) else { return }
             guard let video = forge.getVideoAdapter(identifier: identifier) else { return }
+            _ = video.setPlayerAdapter(nil)
             if fireStop {
                 _ = video.fireStop()
             }
-            _ = video.setPlayerAdapter(nil)
         }
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@npaw/forge-react-native-video",
-  "version": "9.7.1",
+  "version": "9.7.3",
   "description": "react-native-video adapter glue for NPAW Forge: attaches the native Media3/AVPlayer Forge adapters to react-native-video's internal players via its native plugin API.",
   "license": "SEE LICENSE IN LICENSE",
   "author": "Victor Soto <victor.soto@nicepeopleatwork.com>",
@@ -15,10 +15,11 @@
     "src"
   ],
   "scripts": {
-    "typecheck": "tsc --noEmit"
+    "typecheck": "tsc --noEmit",
+    "test": "jest"
   },
   "peerDependencies": {
-    "@npaw/forge-react-native": "^9.7.1",
+    "@npaw/forge-react-native": "^9.7.3",
     "react": "*",
     "react-native": "*",
     "react-native-video": ">=6.11.0 <7"