@bluebillywig/react-native-bb-player 8.45.9 → 8.45.10

package/android/build.gradle

@@ -64,6 +64,10 @@ android {
 }
 
 repositories {
+  def localRepo = file("$projectDir/repo")
+  if (localRepo.exists()) {
+    maven { url localRepo.toURI() }
+  }
   mavenLocal()
   mavenCentral()
   google()

package/ios/BBPlayer-Bridging-Header.h

@@ -11,3 +11,4 @@
 #import <React/RCTBridge.h>
 #import <React/RCTEventEmitter.h>
 #import <React/RCTLog.h>
+#import <React/RCTUtils.h>

package/ios/BBPlayerModule.swift

@@ -303,7 +303,13 @@ class BBPlayerModule: RCTEventEmitter {
 
     @objc func presentModalPlayer(_ jsonUrl: String, optionsJson: String?, contextJson: String?) {
         DispatchQueue.main.async {
-            guard let rootVC = RCTPresentedViewController() else {
+            // RCTPresentedViewController() can return nil with RCTReactNativeFactory (RN 0.83+).
+            // Fallback to UIScene-based lookup to find the root view controller.
+            guard let rootVC = RCTPresentedViewController()
+                    ?? UIApplication.shared.connectedScenes
+                        .compactMap({ ($0 as? UIWindowScene)?.windows.first(where: { $0.isKeyWindow })?.rootViewController })
+                        .first
+            else {
                 NSLog("BBPlayerModule: No root view controller found")
                 return
             }

package/lib/commonjs/BBModalPlayer.js

@@ -5,11 +5,38 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.BBModalPlayer = void 0;
 var _reactNative = require("react-native");
-const BBPlayerModule = _reactNative.NativeModules.BBPlayerModule;
-const eventEmitter = new _reactNative.NativeEventEmitter(BBPlayerModule);
+// Resolve BBPlayerModule: TurboModuleRegistry (New Arch) with NativeModules fallback
+let BBPlayerModule = null;
+try {
+  BBPlayerModule = require('./specs/NativeBBPlayerModule').default;
+} catch {
+  // TurboModule not available
+}
+if (!BBPlayerModule) {
+  BBPlayerModule = _reactNative.NativeModules.BBPlayerModule;
+}
+if (!BBPlayerModule) {
+  console.warn('[BBModalPlayer] Native BBPlayerModule not found. ' + 'TurboModuleRegistry and NativeModules both returned null. ' + `Platform: ${_reactNative.Platform.OS}`);
+}
+
+// NativeEventEmitter requires a non-null module on iOS to avoid warnings.
+// Pass null-safe: events will simply never fire if module is missing.
+const eventEmitter = BBPlayerModule ? new _reactNative.NativeEventEmitter(BBPlayerModule) : new _reactNative.NativeEventEmitter();
 const BBModalPlayer = exports.BBModalPlayer = {
+  /**
+   * Whether the native modal player module is available.
+   * When false, present() will be a no-op.
+   */
+  get isAvailable() {
+    return BBPlayerModule != null;
+  },
   present(jsonUrl, options, context) {
-    BBPlayerModule?.presentModalPlayer(jsonUrl, options ? JSON.stringify(options) : null, context ? JSON.stringify(context) : null);
+    if (!BBPlayerModule) {
+      console.warn('[BBModalPlayer] present() called but native module is null — cannot open modal');
+      return false;
+    }
+    BBPlayerModule.presentModalPlayer(jsonUrl, options ? JSON.stringify(options) : null, context ? JSON.stringify(context) : null);
+    return true;
   },
   dismiss() {
     BBPlayerModule?.dismissModalPlayer();

package/lib/commonjs/BBModalPlayer.js.map

@@ -1 +1 @@
-{"version":3,"names":["_reactNative","require","BBPlayerModule","NativeModules","eventEmitter","NativeEventEmitter","BBModalPlayer","exports","present","jsonUrl","options","context","presentModalPlayer","JSON","stringify","dismiss","dismissModalPlayer","addEventListener","event","callback","addListener"],"sourceRoot":"../../src","sources":["BBModalPlayer.ts"],"mappings":";;;;;;AAAA,IAAAA,YAAA,GAAAC,OAAA;AAEA,MAAMC,cAAc,GAAGC,0BAAa,CAACD,cAAc;AACnD,MAAME,YAAY,GAAG,IAAIC,+BAAkB,CAACH,cAAc,CAAC;AAUpD,MAAMI,aAAa,GAAAC,OAAA,CAAAD,aAAA,GAAG;EAC3BE,OAAOA,CAACC,OAAe,EAAEC,OAA4B,EAAEC,OAAgC,EAAE;IACvFT,cAAc,EAAEU,kBAAkB,CAChCH,OAAO,EACPC,OAAO,GAAGG,IAAI,CAACC,SAAS,CAACJ,OAAO,CAAC,GAAG,IAAI,EACxCC,OAAO,GAAGE,IAAI,CAACC,SAAS,CAACH,OAAO,CAAC,GAAG,IACtC,CAAC;EACH,CAAC;EAEDI,OAAOA,CAAA,EAAG;IACRb,cAAc,EAAEc,kBAAkB,CAAC,CAAC;EACtC,CAAC;EAEDC,gBAAgBA,CACdC,KAAa,EACbC,QAAkC,EAClC;IACA,OAAOf,YAAY,CAACgB,WAAW,CAACF,KAAK,EAAEC,QAAQ,CAAC;EAClD;AACF,CAAC","ignoreList":[]}
+{"version":3,"names":["_reactNative","require","BBPlayerModule","default","NativeModules","console","warn","Platform","OS","eventEmitter","NativeEventEmitter","BBModalPlayer","exports","isAvailable","present","jsonUrl","options","context","presentModalPlayer","JSON","stringify","dismiss","dismissModalPlayer","addEventListener","event","callback","addListener"],"sourceRoot":"../../src","sources":["BBModalPlayer.ts"],"mappings":";;;;;;AAAA,IAAAA,YAAA,GAAAC,OAAA;AAEA;AACA,IAAIC,cAAmB,GAAG,IAAI;AAC9B,IAAI;EACFA,cAAc,GAAGD,OAAO,CAAC,8BAA8B,CAAC,CAACE,OAAO;AAClE,CAAC,CAAC,MAAM;EACN;AAAA;AAEF,IAAI,CAACD,cAAc,EAAE;EACnBA,cAAc,GAAGE,0BAAa,CAACF,cAAc;AAC/C;AAEA,IAAI,CAACA,cAAc,EAAE;EACnBG,OAAO,CAACC,IAAI,CACV,mDAAmD,GACnD,4DAA4D,GAC5D,aAAaC,qBAAQ,CAACC,EAAE,EAC1B,CAAC;AACH;;AAEA;AACA;AACA,MAAMC,YAAY,GAAGP,cAAc,GAC/B,IAAIQ,+BAAkB,CAACR,cAAc,CAAC,GACtC,IAAIQ,+BAAkB,CAAC,CAAC;AAUrB,MAAMC,aAAa,GAAAC,OAAA,CAAAD,aAAA,GAAG;EAC3B;AACF;AACA;AACA;EACE,IAAIE,WAAWA,CAAA,EAAY;IACzB,OAAOX,cAAc,IAAI,IAAI;EAC/B,CAAC;EAEDY,OAAOA,CAACC,OAAe,EAAEC,OAA4B,EAAEC,OAAgC,EAAW;IAChG,IAAI,CAACf,cAAc,EAAE;MACnBG,OAAO,CAACC,IAAI,CAAC,gFAAgF,CAAC;MAC9F,OAAO,KAAK;IACd;IACAJ,cAAc,CAACgB,kBAAkB,CAC/BH,OAAO,EACPC,OAAO,GAAGG,IAAI,CAACC,SAAS,CAACJ,OAAO,CAAC,GAAG,IAAI,EACxCC,OAAO,GAAGE,IAAI,CAACC,SAAS,CAACH,OAAO,CAAC,GAAG,IACtC,CAAC;IACD,OAAO,IAAI;EACb,CAAC;EAEDI,OAAOA,CAAA,EAAG;IACRnB,cAAc,EAAEoB,kBAAkB,CAAC,CAAC;EACtC,CAAC;EAEDC,gBAAgBA,CACdC,KAAa,EACbC,QAAkC,EAClC;IACA,OAAOhB,YAAY,CAACiB,WAAW,CAACF,KAAK,EAAEC,QAAQ,CAAC;EAClD;AACF,CAAC","ignoreList":[]}

package/lib/module/BBModalPlayer.js

@@ -1,11 +1,39 @@
 "use strict";
 
-import { NativeEventEmitter, NativeModules } from 'react-native';
-const BBPlayerModule = NativeModules.BBPlayerModule;
-const eventEmitter = new NativeEventEmitter(BBPlayerModule);
+import { NativeEventEmitter, NativeModules, Platform } from 'react-native';
+
+// Resolve BBPlayerModule: TurboModuleRegistry (New Arch) with NativeModules fallback
+let BBPlayerModule = null;
+try {
+  BBPlayerModule = require('./specs/NativeBBPlayerModule').default;
+} catch {
+  // TurboModule not available
+}
+if (!BBPlayerModule) {
+  BBPlayerModule = NativeModules.BBPlayerModule;
+}
+if (!BBPlayerModule) {
+  console.warn('[BBModalPlayer] Native BBPlayerModule not found. ' + 'TurboModuleRegistry and NativeModules both returned null. ' + `Platform: ${Platform.OS}`);
+}
+
+// NativeEventEmitter requires a non-null module on iOS to avoid warnings.
+// Pass null-safe: events will simply never fire if module is missing.
+const eventEmitter = BBPlayerModule ? new NativeEventEmitter(BBPlayerModule) : new NativeEventEmitter();
 export const BBModalPlayer = {
+  /**
+   * Whether the native modal player module is available.
+   * When false, present() will be a no-op.
+   */
+  get isAvailable() {
+    return BBPlayerModule != null;
+  },
   present(jsonUrl, options, context) {
-    BBPlayerModule?.presentModalPlayer(jsonUrl, options ? JSON.stringify(options) : null, context ? JSON.stringify(context) : null);
+    if (!BBPlayerModule) {
+      console.warn('[BBModalPlayer] present() called but native module is null — cannot open modal');
+      return false;
+    }
+    BBPlayerModule.presentModalPlayer(jsonUrl, options ? JSON.stringify(options) : null, context ? JSON.stringify(context) : null);
+    return true;
   },
   dismiss() {
     BBPlayerModule?.dismissModalPlayer();

package/lib/module/BBModalPlayer.js.map

@@ -1 +1 @@
-{"version":3,"names":["NativeEventEmitter","NativeModules","BBPlayerModule","eventEmitter","BBModalPlayer","present","jsonUrl","options","context","presentModalPlayer","JSON","stringify","dismiss","dismissModalPlayer","addEventListener","event","callback","addListener"],"sourceRoot":"../../src","sources":["BBModalPlayer.ts"],"mappings":";;AAAA,SAASA,kBAAkB,EAAEC,aAAa,QAAQ,cAAc;AAEhE,MAAMC,cAAc,GAAGD,aAAa,CAACC,cAAc;AACnD,MAAMC,YAAY,GAAG,IAAIH,kBAAkB,CAACE,cAAc,CAAC;AAU3D,OAAO,MAAME,aAAa,GAAG;EAC3BC,OAAOA,CAACC,OAAe,EAAEC,OAA4B,EAAEC,OAAgC,EAAE;IACvFN,cAAc,EAAEO,kBAAkB,CAChCH,OAAO,EACPC,OAAO,GAAGG,IAAI,CAACC,SAAS,CAACJ,OAAO,CAAC,GAAG,IAAI,EACxCC,OAAO,GAAGE,IAAI,CAACC,SAAS,CAACH,OAAO,CAAC,GAAG,IACtC,CAAC;EACH,CAAC;EAEDI,OAAOA,CAAA,EAAG;IACRV,cAAc,EAAEW,kBAAkB,CAAC,CAAC;EACtC,CAAC;EAEDC,gBAAgBA,CACdC,KAAa,EACbC,QAAkC,EAClC;IACA,OAAOb,YAAY,CAACc,WAAW,CAACF,KAAK,EAAEC,QAAQ,CAAC;EAClD;AACF,CAAC","ignoreList":[]}
+{"version":3,"names":["NativeEventEmitter","NativeModules","Platform","BBPlayerModule","require","default","console","warn","OS","eventEmitter","BBModalPlayer","isAvailable","present","jsonUrl","options","context","presentModalPlayer","JSON","stringify","dismiss","dismissModalPlayer","addEventListener","event","callback","addListener"],"sourceRoot":"../../src","sources":["BBModalPlayer.ts"],"mappings":";;AAAA,SAASA,kBAAkB,EAAEC,aAAa,EAAEC,QAAQ,QAAQ,cAAc;;AAE1E;AACA,IAAIC,cAAmB,GAAG,IAAI;AAC9B,IAAI;EACFA,cAAc,GAAGC,OAAO,CAAC,8BAA8B,CAAC,CAACC,OAAO;AAClE,CAAC,CAAC,MAAM;EACN;AAAA;AAEF,IAAI,CAACF,cAAc,EAAE;EACnBA,cAAc,GAAGF,aAAa,CAACE,cAAc;AAC/C;AAEA,IAAI,CAACA,cAAc,EAAE;EACnBG,OAAO,CAACC,IAAI,CACV,mDAAmD,GACnD,4DAA4D,GAC5D,aAAaL,QAAQ,CAACM,EAAE,EAC1B,CAAC;AACH;;AAEA;AACA;AACA,MAAMC,YAAY,GAAGN,cAAc,GAC/B,IAAIH,kBAAkB,CAACG,cAAc,CAAC,GACtC,IAAIH,kBAAkB,CAAC,CAAC;AAU5B,OAAO,MAAMU,aAAa,GAAG;EAC3B;AACF;AACA;AACA;EACE,IAAIC,WAAWA,CAAA,EAAY;IACzB,OAAOR,cAAc,IAAI,IAAI;EAC/B,CAAC;EAEDS,OAAOA,CAACC,OAAe,EAAEC,OAA4B,EAAEC,OAAgC,EAAW;IAChG,IAAI,CAACZ,cAAc,EAAE;MACnBG,OAAO,CAACC,IAAI,CAAC,gFAAgF,CAAC;MAC9F,OAAO,KAAK;IACd;IACAJ,cAAc,CAACa,kBAAkB,CAC/BH,OAAO,EACPC,OAAO,GAAGG,IAAI,CAACC,SAAS,CAACJ,OAAO,CAAC,GAAG,IAAI,EACxCC,OAAO,GAAGE,IAAI,CAACC,SAAS,CAACH,OAAO,CAAC,GAAG,IACtC,CAAC;IACD,OAAO,IAAI;EACb,CAAC;EAEDI,OAAOA,CAAA,EAAG;IACRhB,cAAc,EAAEiB,kBAAkB,CAAC,CAAC;EACtC,CAAC;EAEDC,gBAAgBA,CACdC,KAAa,EACbC,QAAkC,EAClC;IACA,OAAOd,YAAY,CAACe,WAAW,CAACF,KAAK,EAAEC,QAAQ,CAAC;EAClD;AACF,CAAC","ignoreList":[]}

package/lib/typescript/src/BBModalPlayer.d.ts

@@ -6,7 +6,12 @@ export interface ModalPlayerOptions {
     [key: string]: unknown;
 }
 export declare const BBModalPlayer: {
-    present(jsonUrl: string, options?: ModalPlayerOptions, context?: Record<string, string>): void;
+    /**
+     * Whether the native modal player module is available.
+     * When false, present() will be a no-op.
+     */
+    readonly isAvailable: boolean;
+    present(jsonUrl: string, options?: ModalPlayerOptions, context?: Record<string, string>): boolean;
     dismiss(): void;
     addEventListener(event: string, callback: (...args: any[]) => void): import("react-native").EmitterSubscription;
 };

package/lib/typescript/src/BBModalPlayer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BBModalPlayer.d.ts","sourceRoot":"","sources":["../../../src/BBModalPlayer.ts"],"names":[],"mappings":"AAKA,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAED,eAAO,MAAM,aAAa;qBACP,MAAM,YAAY,kBAAkB,YAAY,OAAO,MAAM,EAAE,MAAM,CAAC;;4BAa9E,MAAM,sBACO,GAAG,EAAE,KAAK,IAAI;CAIrC,CAAC"}
+{"version":3,"file":"BBModalPlayer.d.ts","sourceRoot":"","sources":["../../../src/BBModalPlayer.ts"],"names":[],"mappings":"AA2BA,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAED,eAAO,MAAM,aAAa;IACxB;;;OAGG;;qBAKc,MAAM,YAAY,kBAAkB,YAAY,OAAO,MAAM,EAAE,MAAM,CAAC,GAAG,OAAO;;4BAkBxF,MAAM,sBACO,GAAG,EAAE,KAAK,IAAI;CAIrC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bluebillywig/react-native-bb-player",
-  "version": "8.45.9",
+  "version": "8.45.10",
   "description": "Blue Billywig Native Video Player for React Native - iOS AVPlayer and Android ExoPlayer integration",
   "main": "lib/commonjs/index.js",
   "module": "lib/module/index.js",
@@ -32,6 +32,7 @@
     "ios",
     "android/src",
     "android/build.gradle",
+    "android/repo",
     "plugin/build",
     "app.plugin.js",
     "README.md",

package/react-native-bb-player.podspec

@@ -23,12 +23,19 @@ Pod::Spec.new do |s|
   s.static_framework = true
 
   s.dependency 'React-Core'
-  s.dependency 'BlueBillywigNativePlayerKit-iOS'
-  s.dependency 'BlueBillywigNativePlayerKit-iOS/GoogleCastSDK'
 
-  # Note: TurboModule/New Architecture dependencies (React-Codegen, RCT-Folly, etc.)
-  # are automatically provided by React Native when New Architecture is enabled.
-  # No need to specify them here as they would create duplicate/conflicting deps.
+  # Prefer vendored frameworks (from npm package) over CocoaPods remote
+  frameworks_dir = File.join(__dir__, 'ios', 'Frameworks')
+  if File.exist?(File.join(frameworks_dir, 'BBNativePlayerKit.xcframework'))
+    s.vendored_frameworks = 'ios/Frameworks/BBNativePlayerKit.xcframework',
+                            'ios/Frameworks/bbnativeshared.xcframework'
+    s.dependency 'GoogleAds-IMA-iOS-SDK', '3.23.0'
+    s.dependency 'GoogleUserMessagingPlatform', '~> 2.1'
+    s.dependency 'google-cast-sdk-dynamic-xcframework-ios-bb', '4.8.0'
+  else
+    s.dependency 'BlueBillywigNativePlayerKit-iOS'
+    s.dependency 'BlueBillywigNativePlayerKit-iOS/GoogleCastSDK'
+  end
 
   # Swift/Objective-C compatibility
   s.pod_target_xcconfig = {
@@ -36,5 +43,5 @@ Pod::Spec.new do |s|
     'SWIFT_COMPILATION_MODE' => 'wholemodule'
   }
 
-  s.source_files = "ios/**/*.{h,m,mm,swift,hpp,cpp}"
+  s.source_files = "ios/*.{h,m,mm,swift,hpp,cpp}"
 end

package/src/BBModalPlayer.ts

@@ -1,7 +1,29 @@
-import { NativeEventEmitter, NativeModules } from 'react-native';
+import { NativeEventEmitter, NativeModules, Platform } from 'react-native';
 
-const BBPlayerModule = NativeModules.BBPlayerModule;
-const eventEmitter = new NativeEventEmitter(BBPlayerModule);
+// Resolve BBPlayerModule: TurboModuleRegistry (New Arch) with NativeModules fallback
+let BBPlayerModule: any = null;
+try {
+  BBPlayerModule = require('./specs/NativeBBPlayerModule').default;
+} catch {
+  // TurboModule not available
+}
+if (!BBPlayerModule) {
+  BBPlayerModule = NativeModules.BBPlayerModule;
+}
+
+if (!BBPlayerModule) {
+  console.warn(
+    '[BBModalPlayer] Native BBPlayerModule not found. ' +
+    'TurboModuleRegistry and NativeModules both returned null. ' +
+    `Platform: ${Platform.OS}`,
+  );
+}
+
+// NativeEventEmitter requires a non-null module on iOS to avoid warnings.
+// Pass null-safe: events will simply never fire if module is missing.
+const eventEmitter = BBPlayerModule
+  ? new NativeEventEmitter(BBPlayerModule)
+  : new NativeEventEmitter();
 
 export interface ModalPlayerOptions {
   autoPlay?: boolean;
@@ -12,12 +34,25 @@ export interface ModalPlayerOptions {
 }
 
 export const BBModalPlayer = {
-  present(jsonUrl: string, options?: ModalPlayerOptions, context?: Record<string, string>) {
-    BBPlayerModule?.presentModalPlayer(
+  /**
+   * Whether the native modal player module is available.
+   * When false, present() will be a no-op.
+   */
+  get isAvailable(): boolean {
+    return BBPlayerModule != null;
+  },
+
+  present(jsonUrl: string, options?: ModalPlayerOptions, context?: Record<string, string>): boolean {
+    if (!BBPlayerModule) {
+      console.warn('[BBModalPlayer] present() called but native module is null — cannot open modal');
+      return false;
+    }
+    BBPlayerModule.presentModalPlayer(
       jsonUrl,
       options ? JSON.stringify(options) : null,
       context ? JSON.stringify(context) : null,
     );
+    return true;
   },
 
   dismiss() {