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

package/NPAWForgeReactNativeVideo.podspec

@@ -8,11 +8,45 @@
 #
 #
 # @author: Victor Soto <victor.soto@nicepeopleatwork.com>
-# @description: CocoaPods spec for the @npaw/forge-react-native-video glue (Forge AVPlayerAdapter onto react-native-video's plugin API).
+# @description: CocoaPods spec for the @npaw/forge-react-native-video glue (Forge AVPlayerAdapter onto react-native-video's plugin API). Selects the react-native-video generation (ios/rnv6 + pod react-native-video, or ios/rnv7 + pods ReactNativeVideo/NitroModules with C++ interop) from the react-native-video version installed in the consuming app; see generations.json.
 
 require "json"
 
 package = JSON.parse(File.read(File.join(__dir__, "package.json")))
+generations = JSON.parse(File.read(File.join(__dir__, "generations.json")))["generations"]
+
+# Which react-native-video generation is installed in the consuming app?
+# Preferred: node resolution from the CocoaPods installation root (the app's
+# ios/ dir), the same technique react-native-video's own podspec uses to find
+# react-native; it follows hoisted and monorepo layouts. Fallback: the sibling
+# node_modules entry next to this package.
+forge_installed_rnv_version = lambda do
+  candidates = []
+  root = (Pod::Config.instance.installation_root rescue nil)
+  if root
+    resolved = `cd "#{root}" && node --print "require.resolve('react-native-video/package.json')" 2>/dev/null`.strip
+    candidates << resolved unless resolved.empty?
+  end
+  candidates << File.expand_path(File.join(__dir__, "..", "react-native-video", "package.json"))
+  candidates.each do |path|
+    next unless File.exist?(path)
+    return JSON.parse(File.read(path))["version"]
+  end
+  nil
+end
+
+rnv_version = forge_installed_rnv_version.call
+rnv_major = rnv_version ? rnv_version.split(".").first.to_i : 6
+generation_key = rnv_major >= 7 ? "rnv7" : "rnv6"
+generation = generations[generation_key]
+generation_dir = File.join(__dir__, generation["iosDir"])
+unless File.directory?(generation_dir)
+  raise "[NPAWForge] @npaw/forge-react-native-video #{package['version']} does not ship the " \
+        "react-native-video #{rnv_major} glue (installed react-native-video #{rnv_version || 'not found'}). " \
+        "Install the major that matches your react-native-video: 6.x -> @npaw/forge-react-native-video@^9 " \
+        "(npm tag latest); 7.x -> @npaw/forge-react-native-video@^10 (npm tag rn-video-7)."
+end
+Pod::UI.puts "[NPAWForge] react-native-video #{rnv_version || 'not found'} -> #{generation_key} glue (#{generation['iosDir']})"
 
 Pod::Spec.new do |s|
   s.name         = "NPAWForgeReactNativeVideo"
@@ -21,23 +55,33 @@ Pod::Spec.new do |s|
   s.homepage     = "https://npaw.com"
   s.license      = { :type => "Commercial", :text => "Copyright (C) NPAW - All Rights Reserved" }
   s.authors      = { "Victor Soto" => "victor.soto@nicepeopleatwork.com" }
-  s.platforms    = { :ios => "13.0", :tvos => "13.0" }
+  # react-native-video 7 (beta) declares iOS only; the v6 generation keeps tvOS.
+  s.platforms    = generation_key == "rnv7" ? { :ios => "13.0" } : { :ios => "13.0", :tvos => "13.0" }
   s.source       = { :path => "." }
 
-  s.source_files  = "ios/**/*.{h,m,mm,swift}"
+  # The ObjC++ TurboModule shell is shared; the Swift coordinator/plugin pair is
+  # per generation (the two upstream plugin APIs cannot coexist in one module).
+  s.source_files  = ["ios/*.{h,m,mm,swift}", "#{generation['iosDir']}/**/*.{h,m,mm,swift}"]
   s.swift_version = "5.9"
-  s.pod_target_xcconfig = {
-    "DEFINES_MODULE" => "YES",
-  }
+
+  xcconfig = { "DEFINES_MODULE" => "YES" }
+  if generation_key == "rnv7"
+    # ReactNativeVideo is a nitro module built with Swift/C++ interop and its
+    # public API exposes C++-backed types (NativeVideoConfig, ...); importing it
+    # requires the same interop mode here.
+    xcconfig["SWIFT_OBJC_INTEROP_MODE"] = "objcxx"
+    xcconfig["CLANG_CXX_LANGUAGE_STANDARD"] = "c++20"
+  end
+  s.pod_target_xcconfig = xcconfig
 
   s.dependency "NPAWForgeReactNative"
-  s.dependency "react-native-video"
+  s.dependency generation["podDependency"]
+  (generation["extraPodDependencies"] || []).each { |extra| s.dependency extra }
 
   # FORGE_APPLE_CONSUMPTION BEGIN (staged: ForgeApple ships inside the core pod)
-  s.pod_target_xcconfig = {
-    "DEFINES_MODULE" => "YES",
+  s.pod_target_xcconfig = (s.attributes_hash["pod_target_xcconfig"] || {}).merge({
     "OTHER_SWIFT_FLAGS" => "$(inherited) -DFORGE_RN_HYDRATED",
-  }
+  })
   # FORGE_APPLE_CONSUMPTION END
 
   if respond_to?(:install_modules_dependencies, true)

package/README.md

@@ -7,14 +7,20 @@ manages.
 Use of this package requires an active NPAW commercial agreement. See
 [LICENSE](./LICENSE).
 
-## Install
+## Pick the major that matches your react-native-video
 
-```sh
-npm install @npaw/forge-react-native @npaw/forge-react-native-video
-```
+One package name, one major per react-native-video generation:
 
-Requires `react-native-video` v6 and React Native 0.75+ with the New
-Architecture enabled.
+| Your `react-native-video` | Install | npm tag |
+| --- | --- | --- |
+| 6.x (`>=6.11.0 <7`) | `npm install @npaw/forge-react-native @npaw/forge-react-native-video@^9` | `latest` |
+| 7.x (`>=7.0.0-beta.11 <8`, needs `react-native-nitro-modules`) | `npm install @npaw/forge-react-native @npaw/forge-react-native-video@rn-video-7` | `rn-video-7` |
+
+The 6.x major runs on React Native 0.74+ with the New Architecture and
+**bridgeless disabled**. The 7.x major is Fabric-native and runs with the
+React Native 0.76+ defaults (New Architecture, bridgeless on). Upstream
+react-native-video 7 is still a beta: the 7.x major of this package tracks
+`7.0.0-beta.11` and is re-verified when 7.0.0 GA ships.
 
 ### iOS
 
@@ -24,17 +30,23 @@ cd ios && pod install
 
 ## Usage
 
-Register the adapter alongside your `Video` component; the adapter attaches to
-the underlying player and reports playback to the Forge session created with
-[`@npaw/forge-react-native`](https://www.npmjs.com/package/@npaw/forge-react-native).
+The JavaScript API is identical for both majors: request the attach, then
+render the player.
 
 ```js
-import { NPAWForge } from '@npaw/forge-react-native';
-import { attachForgeVideo } from '@npaw/forge-react-native-video';
+import NPAWForge from '@npaw/forge-react-native';
+import { attachReactNativeVideo } from '@npaw/forge-react-native-video';
 
-const video = await attachForgeVideo(forge, { identifier: 'main' });
+const forge = await NPAWForge.create('yourAccountCode', { appName: 'My App' });
+await attachReactNativeVideo(forge); // binds the one live player, or the next one created
 ```
 
+With several simultaneous players, tag each source with the
+`X-NPAW-Forge` header and attach by token — react-native-video 6:
+`<Video source={{ uri, headers: { 'X-NPAW-Forge': 'main' } }} />`;
+react-native-video 7: `useVideoPlayer({ uri, headers: { 'X-NPAW-Forge': 'main' } })` —
+then `attachReactNativeVideo(forge, { identifier: 'main', headerToken: 'main' })`.
+
 ## Documentation
 
 Integration guides and the API reference are published at

package/android/build.gradle

@@ -8,7 +8,7 @@
 //
 //
 // @author: Victor Soto <victor.soto@nicepeopleatwork.com>
-// @description: Android library build for the @npaw/forge-react-native-video glue module (Forge Media3 adapter onto react-native-video's plugin API). Pure-Java module so it builds under any host-app Kotlin version.
+// @description: Android library build for the @npaw/forge-react-native-video glue module (Forge Media3 adapter onto react-native-video's plugin API). Pure-Java module so it builds under any host-app Kotlin version. Selects the react-native-video generation source set (src/rnv6 or src/rnv7, see generations.json) from the react-native-video version installed in the host app.
 
 def isNewArchitectureEnabled() {
     return project.hasProperty('newArchEnabled') && project.newArchEnabled == 'true'
@@ -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.3')
+    : (System.getenv('FORGE_CORE_VERSION') ?: '9.7.5')
 
 def forgeAdapterVersion = project.hasProperty('NpawForge_forgeAdapterVersion')
     ? project.property('NpawForge_forgeAdapterVersion')
-    : (System.getenv('FORGE_ADAPTER_VERSION') ?: '9.7.3')
+    : (System.getenv('FORGE_ADAPTER_VERSION') ?: '9.7.5')
 
 android {
     namespace 'com.npaw.forge.reactnative.video'
@@ -70,6 +70,59 @@ def forgeCoreRnProject = [
 ].collect { findProject(it) }.find { it != null }
 
 def reactNativeVideoProject = findProject(':react-native-video')
+def nitroModulesProject = findProject(':react-native-nitro-modules')
+
+// ---- react-native-video generation selection ----
+// One package, one native source set per react-native-video major (see
+// generations.json). The installed react-native-video decides which one
+// compiles: rn-video 6 exposes RNVExoplayerPlugin, rn-video 7 exposes the
+// nitro-based ReactNativeVideoPlugin, and the two APIs cannot coexist in one
+// compilation. A generation dir that is missing from the installed package
+// major fails loudly here instead of as a wall of unresolved symbols.
+def generationsManifest = new groovy.json.JsonSlurper().parse(file('../generations.json'))
+
+def installedReactNativeVideoVersion = {
+    def candidates = []
+    if (reactNativeVideoProject != null) {
+        candidates << new File(reactNativeVideoProject.projectDir, '../package.json')
+    }
+    try {
+        def process = new ProcessBuilder(['node', '--print',
+            "require.resolve('react-native-video/package.json', { paths: [process.cwd()] })"])
+            .directory(rootProject.projectDir)
+            .start()
+        def resolved = process.inputStream.text.trim()
+        process.waitFor()
+        if (process.exitValue() == 0 && resolved) {
+            candidates << new File(resolved)
+        }
+    } catch (Exception ignored) {
+        // node is optional here; the autolinked project dir is the primary source.
+    }
+    for (candidate in candidates) {
+        if (candidate.exists()) {
+            return new groovy.json.JsonSlurper().parse(candidate).version?.toString()
+        }
+    }
+    return null
+}()
+
+def reactNativeVideoMajor = installedReactNativeVideoVersion != null
+    ? installedReactNativeVideoVersion.tokenize('.')[0].toInteger()
+    : 6
+def generationKey = reactNativeVideoMajor >= 7 ? 'rnv7' : 'rnv6'
+def generation = generationsManifest.generations[generationKey]
+def generationSourceDir = file(generation.androidSourceSet)
+if (!generationSourceDir.isDirectory()) {
+    throw new GradleException(
+        "@npaw/forge-react-native-video: this package major does not ship the react-native-video " +
+        "${reactNativeVideoMajor} glue (installed react-native-video ${installedReactNativeVideoVersion ?: 'not found'}). " +
+        "Install the major that matches your react-native-video: 6.x -> @npaw/forge-react-native-video@^9 " +
+        "(npm tag latest); 7.x -> @npaw/forge-react-native-video@^10 (npm tag rn-video-7).")
+}
+println "[NPAWForge] react-native-video ${installedReactNativeVideoVersion ?: 'not found'} -> ${generationKey} glue (${generation.androidSourceSet})"
+
+android.sourceSets.main.java.srcDirs = ['src/main/java', generation.androidSourceSet]
 
 // The Forge media3 adapter declares its player SDK compileOnly (runtime
 // player detection), and react-native-video provides media3 at the app level;
@@ -93,6 +146,12 @@ dependencies {
     if (reactNativeVideoProject != null) {
         compileOnly reactNativeVideoProject
     }
+    // rn-video 7's HybridVideoPlayer extends nitro's HybridObject: javac needs the
+    // supertype to resolve members, so the nitro project joins the compile classpath
+    // (only present in rn-video 7 apps; the v6 source set never references it).
+    if (generationKey == 'rnv7' && nitroModulesProject != null) {
+        compileOnly nitroModulesProject
+    }
 
     testImplementation 'junit:junit:4.13.2'
 }

package/android/src/main/java/com/npaw/forge/reactnative/video/RNVideoHeaderToken.java

@@ -0,0 +1,50 @@
+/**
+ * Copyright (C) NPAW - All Rights Reserved
+ *
+ * This source code is protected under international copyright law. All rights
+ * reserved and protected by the copyright holders.
+ * This file is confidential and only available to authorized individuals with the
+ * permission of the copyright holders. If you encounter this file and do not have
+ * permission, please contact the copyright holders and delete this file.
+ *
+ *
+ * @author: Victor Soto <victor.soto@nicepeopleatwork.com>
+ * @description: Generation-agnostic helper that extracts the X-NPAW-Forge correlation token from a react-native-video request-header map (case-insensitive key match, empty values ignored). Pure Java, JVM-unit-tested; the rn-video 7 module reads headers straight from the public source config and feeds them here.
+ */
+
+package com.npaw.forge.reactnative.video;
+
+import androidx.annotation.Nullable;
+import java.util.Locale;
+import java.util.Map;
+
+public final class RNVideoHeaderToken {
+
+  /** Header customers set on the source for multi-player matching (compared case-insensitively). */
+  public static final String HEADER = "x-npaw-forge";
+
+  private RNVideoHeaderToken() {}
+
+  /**
+   * Returns the token carried by the {@code X-NPAW-Forge} header, or null when the map is null,
+   * has no such header (any casing), or the value is empty. When the map carries the header
+   * under several casings the first non-empty match in iteration order wins.
+   */
+  @Nullable
+  public static String fromHeaders(@Nullable Map<String, String> headers) {
+    if (headers == null) {
+      return null;
+    }
+    for (Map.Entry<String, String> entry : headers.entrySet()) {
+      String key = entry.getKey();
+      if (key == null || !HEADER.equals(key.toLowerCase(Locale.ROOT))) {
+        continue;
+      }
+      String value = entry.getValue();
+      if (value != null && !value.isEmpty()) {
+        return value;
+      }
+    }
+    return null;
+  }
+}

package/android/src/test/java/com/npaw/forge/reactnative/video/RNVideoHeaderTokenTest.java

@@ -0,0 +1,68 @@
+/**
+ * Copyright (C) NPAW - All Rights Reserved
+ *
+ * This source code is protected under international copyright law. All rights
+ * reserved and protected by the copyright holders.
+ * This file is confidential and only available to authorized individuals with the
+ * permission of the copyright holders. If you encounter this file and do not have
+ * permission, please contact the copyright holders and delete this file.
+ *
+ *
+ * @author: Victor Soto <victor.soto@nicepeopleatwork.com>
+ * @description: JVM unit tests for the header-token extraction shared by the react-native-video 7 module (case-insensitive header key, empty and missing values, first non-empty casing wins).
+ */
+
+package com.npaw.forge.reactnative.video;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.Map;
+import org.junit.Test;
+
+public class RNVideoHeaderTokenTest {
+
+  @Test
+  public void nullMapYieldsNull() {
+    assertNull(RNVideoHeaderToken.fromHeaders(null));
+  }
+
+  @Test
+  public void missingHeaderYieldsNull() {
+    Map<String, String> headers = new HashMap<>();
+    headers.put("Authorization", "Bearer x");
+    assertNull(RNVideoHeaderToken.fromHeaders(headers));
+  }
+
+  @Test
+  public void matchesTheHeaderCaseInsensitively() {
+    Map<String, String> headers = new HashMap<>();
+    headers.put("X-NPAW-Forge", "main");
+    assertEquals("main", RNVideoHeaderToken.fromHeaders(headers));
+
+    headers.clear();
+    headers.put("x-npaw-forge", "pip");
+    assertEquals("pip", RNVideoHeaderToken.fromHeaders(headers));
+
+    headers.clear();
+    headers.put("X-Npaw-FORGE", "mixed");
+    assertEquals("mixed", RNVideoHeaderToken.fromHeaders(headers));
+  }
+
+  @Test
+  public void emptyValueCountsAsAbsent() {
+    Map<String, String> headers = new HashMap<>();
+    headers.put("X-NPAW-Forge", "");
+    assertNull(RNVideoHeaderToken.fromHeaders(headers));
+  }
+
+  @Test
+  public void firstNonEmptyCasingWins() {
+    Map<String, String> headers = new LinkedHashMap<>();
+    headers.put("x-npaw-forge", "");
+    headers.put("X-NPAW-Forge", "second");
+    assertEquals("second", RNVideoHeaderToken.fromHeaders(headers));
+  }
+}

package/generations.json

@@ -0,0 +1,31 @@
+{
+  "$comment": "Single source of truth for the react-native-video generations shipped by @npaw/forge-react-native-video. Read by android/build.gradle, the podspec, the jest guard, and scripts/react-native/stage-react-native-npm.sh. Same npm package name, one major per generation.",
+  "package": "@npaw/forge-react-native-video",
+  "generations": {
+    "rnv6": {
+      "reactNativeVideo": ">=6.11.0 <7",
+      "reactNativeVideoMajor": 6,
+      "verifiedUpstream": "6.19.2",
+      "packageMajor": "forge",
+      "distTag": "latest",
+      "androidSourceSet": "src/rnv6/java",
+      "iosDir": "ios/rnv6",
+      "podDependency": "react-native-video",
+      "platforms": ["ios", "tvos"]
+    },
+    "rnv7": {
+      "reactNativeVideo": ">=7.0.0-beta.11 <8",
+      "reactNativeVideoMajor": 7,
+      "verifiedUpstream": "7.0.0-beta.11",
+      "upstreamStatus": "beta",
+      "packageMajor": 10,
+      "distTag": "rn-video-7",
+      "androidSourceSet": "src/rnv7/java",
+      "iosDir": "ios/rnv7",
+      "podDependency": "ReactNativeVideo",
+      "extraPodDependencies": ["NitroModules"],
+      "nitroModules": ">=0.35.0",
+      "platforms": ["ios"]
+    }
+  }
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@npaw/forge-react-native-video",
-  "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.",
+  "version": "9.7.5",
+  "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 (react-native-video 6 and 7 generations, one major each).",
   "license": "SEE LICENSE IN LICENSE",
   "author": "Victor Soto <victor.soto@nicepeopleatwork.com>",
   "main": "src/index.ts",
@@ -11,6 +11,7 @@
     "NPAWForgeReactNativeVideo.podspec",
     "README.md",
     "android",
+    "generations.json",
     "ios",
     "src"
   ],
@@ -19,7 +20,7 @@
     "test": "jest"
   },
   "peerDependencies": {
-    "@npaw/forge-react-native": "^9.7.3",
+    "@npaw/forge-react-native": "^9.7.5",
     "react": "*",
     "react-native": "*",
     "react-native-video": ">=6.11.0 <7"