@npaw/forge-react-native-video 20.5.14 → 20.6.0

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') ?: '10.5.14')
+    : (System.getenv('FORGE_CORE_VERSION') ?: '10.6.0')
 
 def forgeAdapterVersion = project.hasProperty('NpawForge_forgeAdapterVersion')
     ? project.property('NpawForge_forgeAdapterVersion')
-    : (System.getenv('FORGE_ADAPTER_VERSION') ?: '10.5.14')
+    : (System.getenv('FORGE_ADAPTER_VERSION') ?: '10.6.0')
 
 android {
     namespace 'com.npaw.forge.reactnative.video'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@npaw/forge-react-native-video",
-  "version": "20.5.14",
+  "version": "20.6.0",
   "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>",
@@ -11,6 +11,7 @@
     "NPAWForgeReactNativeVideo.podspec",
     "README.md",
     "android",
+    "!android/src/test",
     "generations.json",
     "ios",
     "src"
@@ -20,7 +21,7 @@
     "test": "jest"
   },
   "peerDependencies": {
-    "@npaw/forge-react-native": "^10.5.14",
+    "@npaw/forge-react-native": "^10.6.0",
     "react": "*",
     "react-native": "*",
     "react-native-video": ">=7.0.0-beta.11 <8",

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

@@ -1,218 +0,0 @@
-/**
- * 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 attach correlation policy engine (fake players; no ExoPlayer or Android runtime).
- */
-
-package com.npaw.forge.reactnative.video;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import androidx.annotation.Nullable;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import org.junit.Before;
-import org.junit.Test;
-
-public class RNVideoAttachCoordinatorTest {
-
-  private static final class FakeBinder implements RNVideoAttachCoordinator.Binder<Object> {
-    final List<String> binds = new ArrayList<>();
-    final List<String> unbinds = new ArrayList<>();
-
-    @Override
-    public void bind(String instanceId, String identifier, String playerId, Object player) {
-      binds.add(identifier + "->" + playerId);
-    }
-
-    @Override
-    public void unbind(String instanceId, String identifier, String playerId, boolean fireStop) {
-      unbinds.add(identifier + "->" + playerId + (fireStop ? " stop" : " silent"));
-    }
-  }
-
-  private final Map<String, String> tokens = new HashMap<>();
-  private final Map<String, String> uris = new HashMap<>();
-  private FakeBinder binder;
-  private RNVideoAttachCoordinator<Object> coordinator;
-
-  @Before
-  public void setUp() {
-    tokens.clear();
-    uris.clear();
-    binder = new FakeBinder();
-    coordinator =
-        new RNVideoAttachCoordinator<>(
-            new RNVideoAttachCoordinator.PlayerIntrospection() {
-              @Nullable
-              @Override
-              public String currentToken(String playerId) {
-                return tokens.get(playerId);
-              }
-
-              @Nullable
-              @Override
-              public String currentUri(String playerId) {
-                return uris.get(playerId);
-              }
-            },
-            binder);
-  }
-
-  private static RNVideoAttachCoordinator.AttachRequest auto(String identifier) {
-    return new RNVideoAttachCoordinator.AttachRequest(
-        "forge-1", identifier, "auto", null, null, true);
-  }
-
-  private static RNVideoAttachCoordinator.AttachRequest token(String identifier, String token) {
-    return new RNVideoAttachCoordinator.AttachRequest(
-        "forge-1", identifier, "match", token, null, true);
-  }
-
-  private static RNVideoAttachCoordinator.AttachRequest uri(String identifier, String uri) {
-    return new RNVideoAttachCoordinator.AttachRequest(
-        "forge-1", identifier, "match", null, uri, true);
-  }
-
-  @Test
-  public void attachBeforeCreateBindsWhenPlayerArrives() {
-    RNVideoAttachCoordinator.AttachOutcome outcome = coordinator.attach(auto("default"));
-    assertEquals("pending", outcome.attachment);
-    assertTrue(outcome.accepted);
-
-    coordinator.playerCreated("p1", new Object());
-    assertEquals(List.of("default->p1"), binder.binds);
-  }
-
-  @Test
-  public void createBeforeAttachBindsImmediately() {
-    coordinator.playerCreated("p1", new Object());
-    RNVideoAttachCoordinator.AttachOutcome outcome = coordinator.attach(auto("default"));
-    assertEquals("bound", outcome.attachment);
-    assertEquals(List.of("default->p1"), binder.binds);
-  }
-
-  @Test
-  public void autoRefusesAmbiguity() {
-    coordinator.playerCreated("p1", new Object());
-    coordinator.playerCreated("p2", new Object());
-    RNVideoAttachCoordinator.AttachOutcome outcome = coordinator.attach(auto("default"));
-    assertEquals("unsupported_capability", outcome.code);
-    assertEquals("ambiguous_auto_attach", outcome.reason);
-    assertTrue(binder.binds.isEmpty());
-  }
-
-  @Test
-  public void autoPendingDoesNotBindWhileAmbiguous() {
-    coordinator.attach(auto("default"));
-    coordinator.playerCreated("p1", new Object());
-    coordinator.playerCreated("p2", new Object());
-    // p1 bound the pending attach when it was the single player; p2 arriving
-    // afterwards must not steal or duplicate.
-    assertEquals(List.of("default->p1"), binder.binds);
-  }
-
-  @Test
-  public void headerTokenMatchesTheRightPlayer() {
-    coordinator.playerCreated("p1", new Object());
-    coordinator.playerCreated("p2", new Object());
-    tokens.put("p2", "main");
-
-    RNVideoAttachCoordinator.AttachOutcome outcome = coordinator.attach(token("default", "main"));
-    assertEquals("bound", outcome.attachment);
-    assertEquals(List.of("default->p2"), binder.binds);
-  }
-
-  @Test
-  public void tokenSettlingLateBindsOnSourceSettled() {
-    coordinator.playerCreated("p1", new Object());
-    coordinator.playerCreated("p2", new Object());
-    RNVideoAttachCoordinator.AttachOutcome outcome = coordinator.attach(token("default", "main"));
-    assertEquals("pending", outcome.attachment);
-
-    tokens.put("p1", "main");
-    coordinator.playerSourceSettled();
-    assertEquals(List.of("default->p1"), binder.binds);
-  }
-
-  @Test
-  public void sourceUriFallbackMatches() {
-    coordinator.playerCreated("p1", new Object());
-    coordinator.playerCreated("p2", new Object());
-    uris.put("p2", "https://cdn/x.m3u8");
-
-    coordinator.attach(uri("default", "https://cdn/x.m3u8"));
-    assertEquals(List.of("default->p2"), binder.binds);
-  }
-
-  @Test
-  public void twoIdentifiersTwoTokensBindDistinctPlayers() {
-    coordinator.playerCreated("p1", new Object());
-    coordinator.playerCreated("p2", new Object());
-    tokens.put("p1", "a");
-    tokens.put("p2", "b");
-
-    coordinator.attach(token("main", "a"));
-    coordinator.attach(token("pip", "b"));
-    assertEquals(List.of("main->p1", "pip->b".replace("b", "p2")), binder.binds);
-  }
-
-  @Test
-  public void duplicateAttachIsIgnored() {
-    coordinator.playerCreated("p1", new Object());
-    coordinator.attach(auto("default"));
-    RNVideoAttachCoordinator.AttachOutcome outcome = coordinator.attach(auto("default"));
-    assertEquals("ignored_duplicate", outcome.code);
-    assertEquals(1, binder.binds.size());
-  }
-
-  @Test
-  public void detachUnbindsWithStopAndAllowsRebind() {
-    coordinator.playerCreated("p1", new Object());
-    coordinator.attach(auto("default"));
-
-    assertTrue(coordinator.detach("forge-1", "default", true));
-    assertEquals(List.of("default->p1 stop"), binder.unbinds);
-
-    coordinator.attach(auto("default"));
-    assertEquals(2, binder.binds.size());
-  }
-
-  @Test
-  public void detachWithoutBindingReportsFalse() {
-    assertFalse(coordinator.detach("forge-1", "default", true));
-  }
-
-  @Test
-  public void playerRemovedHonorsStopOnPlayerRemoved() {
-    coordinator.playerCreated("p1", new Object());
-    coordinator.attach(
-        new RNVideoAttachCoordinator.AttachRequest("forge-1", "default", "auto", null, null, false));
-    coordinator.playerRemoved("p1");
-    assertEquals(List.of("default->p1 silent"), binder.unbinds);
-  }
-
-  @Test
-  public void reattachAfterRemovalGoesPendingThenBindsNextPlayer() {
-    coordinator.playerCreated("p1", new Object());
-    coordinator.attach(auto("default"));
-    coordinator.playerRemoved("p1");
-
-    RNVideoAttachCoordinator.AttachOutcome outcome = coordinator.attach(auto("default"));
-    assertEquals("pending", outcome.attachment);
-    coordinator.playerCreated("p2", new Object());
-    assertEquals(List.of("default->p1", "default->p2"), binder.binds);
-  }
-}

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

@@ -1,68 +0,0 @@
-/**
- * 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));
-  }
-}