@castlabs/react-native-prestoplay-ios-avplayerviewcontroller 1.1.3 → 1.2.0

package/ios/{RNPrestroplayBridge.m → LegacyArchitecture/RNPrestroplayBridge.m}

@@ -4,6 +4,10 @@
 #import <React/RCTEventEmitter.h>
 
 
+@interface RCT_EXTERN_MODULE(RNPrestoplayAVPlayerViewControllerPluginFactory, NSObject)
+
+@end
+
 @interface RCT_EXTERN_MODULE(RNPrestoplayApplePlayerControlsModule, NSObject)
 
 RCT_EXTERN_METHOD(

package/ios/NewArchitecture/RCTNativeApplePlayerControlsFactoryModule.h

@@ -0,0 +1,19 @@
+//
+//  RCTNativeApplePlayerControlsFactoryModule.h
+//  Pods
+//
+#ifdef RCT_NEW_ARCH_ENABLED
+
+#import <NativePrestoPlayReactApplePlayerControlsSpec/NativePrestoPlayReactApplePlayerControlsSpec.h>
+#import <react-native-prestoplay/PluginFactoryProtocol.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface RCTNativeApplePlayerControlsFactoryModule : NativeApplePlayerControlsFactoryModuleSpecBase <NativeApplePlayerControlsFactoryModuleSpec, PluginFactoryProtocolNewArch>
+
+
+@end
+
+NS_ASSUME_NONNULL_END
+
+#endif

package/ios/NewArchitecture/RCTNativeApplePlayerControlsFactoryModule.mm

@@ -0,0 +1,35 @@
+#ifdef RCT_NEW_ARCH_ENABLED
+
+#import "RCTNativeApplePlayerControlsFactoryModule.h"
+#import "react_native_prestoplay_ios_avplayerviewcontroller-Swift.h"
+
+@interface RCTNativeApplePlayerControlsFactoryModule ()
+@property (nonatomic, strong) RCTNativeApplePlayerControlsFactoryModuleSwift *instance;
+@end
+
+@implementation RCTNativeApplePlayerControlsFactoryModule
+
++ (NSString *)moduleName {
+    return @"NativeApplePlayerControlsFactoryModule";
+}
+
++ (BOOL)requiresMainQueueSetup {
+    return YES;
+}
+
+- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:(const facebook::react::ObjCTurboModule::InitParams &)params {
+    return std::make_shared<facebook::react::NativeApplePlayerControlsFactoryModuleSpecJSI>(params);
+}
+
+- (void)initialize {
+    self.instance = [[RCTNativeApplePlayerControlsFactoryModuleSwift alloc] init];
+}
+
+- (RCTNativeApplePlayerControlsFactoryModuleSwift*)getSwiftInstance {
+    return self.instance;
+}
+
+
+@end
+
+#endif

package/ios/NewArchitecture/RCTNativeApplePlayerControlsFactoryModule.swift

@@ -0,0 +1,18 @@
+import react_native_prestoplay
+
+@available(tvOS 14.0, *)
+@objc(RCTNativeApplePlayerControlsFactoryModuleSwift)
+public class RCTNativeApplePlayerControlsFactoryModuleSwift: NSObject, PluginFactoryProtocol {
+
+    private var instance: RNPrestoplayAVPlayerViewControllerPluginFactory!
+
+    @objc
+    override public init()
+    {
+        self.instance = RNPrestoplayAVPlayerViewControllerPluginFactory()
+    }
+
+    public func getPlugin() -> PluginProtocol {
+        return self.instance.getPlugin()
+    }
+}

package/ios/NewArchitecture/RCTNativeApplePlayerControlsModule.h

@@ -0,0 +1,14 @@
+//
+//  RCTNativeApplePlayerControlsModule.h
+//  Pods
+//
+#import <NativePrestoPlayReactApplePlayerControlsSpec/NativePrestoPlayReactApplePlayerControlsSpec.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface RCTNativeApplePlayerControlsModule : NativeApplePlayerControlsModuleSpecBase <NativeApplePlayerControlsModuleSpec>
+
+
+@end
+
+NS_ASSUME_NONNULL_END

package/ios/NewArchitecture/RCTNativeApplePlayerControlsModule.mm

@@ -0,0 +1,30 @@
+#import "RCTNativeApplePlayerControlsModule.h"
+#import "react_native_prestoplay_ios_avplayerviewcontroller-Swift.h"
+
+@interface RCTNativeApplePlayerControlsModule ()
+@property (nonatomic, strong) RCTNativeApplePlayerControlsModuleSwift *instance;
+@end
+
+@implementation RCTNativeApplePlayerControlsModule
+
++ (NSString *)moduleName {
+    return @"NativeApplePlayerControlsModule";
+}
+
+- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:(const facebook::react::ObjCTurboModule::InitParams &)params {
+    return std::make_shared<facebook::react::NativeApplePlayerControlsModuleSpecJSI>(params);
+}
+
+- (void)initialize {
+    self.instance = [[RCTNativeApplePlayerControlsModuleSwift alloc] init];
+}
+
+- (void)setAppleTvActions:(nonnull NSString *)playerId transportBarActions:(nonnull NSArray *)transportBarActions infoBarActions:(nonnull NSArray *)infoBarActions contextualActions:(nonnull NSArray *)contextualActions resolve:(nonnull RCTPromiseResolveBlock)resolve reject:(nonnull RCTPromiseRejectBlock)reject {
+    [self.instance setAppleTvActions:playerId transportBarActions:transportBarActions infoBarActions:infoBarActions contextualActions:contextualActions resolve:^(){ resolve(nil); } reject:^(NSString* prestoPlayErrorJson){ reject(nil, prestoPlayErrorJson, nil);}];
+}
+
+- (void)setActionStateAndUi:(nonnull NSString *)playerId actionId:(nonnull NSString *)actionId state:(BOOL)state uiInfo:(nonnull NSDictionary *)uiInfo resolve:(nonnull RCTPromiseResolveBlock)resolve reject:(nonnull RCTPromiseRejectBlock)reject {
+    [self.instance setActionStateAndUi:playerId actionId:actionId state:state uiInfo:uiInfo resolve:^(){ resolve(nil); } reject:^(NSString* prestoPlayErrorJson){ reject(nil, prestoPlayErrorJson, nil);}];
+}
+
+@end

package/ios/NewArchitecture/RCTNativeApplePlayerControlsModule.swift

@@ -0,0 +1,48 @@
+@available(tvOS 14.0, *)
+@objc(RCTNativeApplePlayerControlsModuleSwift)
+public class RCTNativeApplePlayerControlsModuleSwift: NSObject {
+
+    private var instance: RNPrestoplayApplePlayerControlsModule!
+
+    @objc
+    override public init()
+    {
+        self.instance = RNPrestoplayApplePlayerControlsModule()
+    }
+
+    @objc
+    public func setAppleTvActions(
+        _ playerId: String,
+        transportBarActions: NSArray,
+        infoBarActions: NSArray,
+        contextualActions: NSArray,
+        resolve: @escaping () -> Void,
+        reject: @escaping (String?) -> Void
+    ) {
+        self.instance.setAppleTvActions(
+            playerId,
+            transportBarActions as? [NSDictionary],
+            infoBarActions as? [NSDictionary],
+            contextualActions as? [NSDictionary],
+            resolver: { result in resolve() },
+            rejecter: { code, message, error in reject(message) })
+    }
+
+    @objc
+    public func setActionStateAndUi(
+        _ playerId: String,
+        actionId: String,
+        state: Bool,
+        uiInfo: NSDictionary,
+        resolve: @escaping () -> Void,
+        reject: @escaping (String?) -> Void
+    ) {
+        self.instance.setActionStateAndUi(
+            playerId,
+            actionId,
+            state: state,
+            uiInfo: uiInfo,
+            resolver: { result in resolve() },
+            rejecter: { code, message, error in reject(message) })
+    }
+}

package/lib/AVPlayerViewControllerExtension.js

@@ -1,5 +1,5 @@
 import { PlayerExtension, rethrowAsPrestoPlayErrorIfPossible, Logger, BaseEventEmitter, } from '@castlabs/react-native-prestoplay';
-import { NativeModules } from 'react-native';
+import { NativeModules, TurboModuleRegistry } from 'react-native';
 import { ActionType } from './types/ActionType';
 import { EventType as LocalEventType } from './events/EventType';
 export class AVPlayerViewControllerExtension extends PlayerExtension {
@@ -119,7 +119,9 @@ export class AVPlayerViewControllerExtension extends PlayerExtension {
             title: title,
             imageName: icon,
         };
-        await NativeModules.RNPrestoplayApplePlayerControlsModule.setActionStateAndUi(this.player.id, actionId, state, update);
+        const controlsModule = TurboModuleRegistry.get('NativeApplePlayerControlsModule') ??
+            NativeModules.RNPrestoplayApplePlayerControlsModule;
+        await controlsModule.setActionStateAndUi(this.player.id, actionId, state, update);
     }
     onContentLoaded() {
         /**
@@ -137,7 +139,10 @@ export class AVPlayerViewControllerExtension extends PlayerExtension {
         this.popUpMenus.forEach((menu, _id) => {
             transportBarActions.push(menu);
         });
-        NativeModules.RNPrestoplayApplePlayerControlsModule.setAppleTvActions(this.player.id, transportBarActions, this.infoBarActions, this.contextualActions)
+        const controlsModule = TurboModuleRegistry.get('NativeApplePlayerControlsModule') ??
+            NativeModules.RNPrestoplayApplePlayerControlsModule;
+        controlsModule
+            .setAppleTvActions(this.player.id, transportBarActions, this.infoBarActions, this.contextualActions)
             .then(() => {
             this.logger.debug('AVPlayerViewControllerExtension: submitActions done');
         })

package/lib/AVPlayerViewControllerPlugin.js

@@ -1,4 +1,5 @@
 import { Plugin } from '@castlabs/react-native-prestoplay';
+import { TurboModuleRegistry } from 'react-native';
 /**
  * Provides {@link AVPlayerViewControllerProvider} integration for iOS and tvOS.
  *
@@ -10,7 +11,13 @@ import { Plugin } from '@castlabs/react-native-prestoplay';
 export default class AVPlayerViewControllerPlugin extends Plugin {
     /** @hidden */
     getNativePluginFactoryModuleName() {
-        return 'RNPrestoplayAVPlayerViewControllerPluginFactory';
+        try {
+            TurboModuleRegistry.getEnforcing('NativeApplePlayerControlsFactoryModule');
+            return 'NativeApplePlayerControlsFactoryModule';
+        }
+        catch (e) {
+            return 'RNPrestoplayAVPlayerViewControllerPluginFactory';
+        }
     }
     /** @hidden */
     onPlayerCreated(_player) {

package/lib/components/AVPlayerViewControllerProvider.ios.js

@@ -1,5 +1,5 @@
 import React, { memo, useEffect, useMemo } from 'react';
-import { EventType, PlayerContext, } from '@castlabs/react-native-prestoplay';
+import { EventType, Logger, PlayerContext, } from '@castlabs/react-native-prestoplay';
 import { Player } from '@castlabs/react-native-prestoplay';
 import { AVPlayerViewControllerExtension } from '../AVPlayerViewControllerExtension';
 /**
@@ -12,6 +12,7 @@ import { AVPlayerViewControllerExtension } from '../AVPlayerViewControllerExtens
  * @group Components
  */
 export const AVPlayerViewControllerProvider = memo(function ({ playerConfig, onClose, children, }) {
+    const logger = new Logger('AVPlayerViewControllerProvider');
     const player = useMemo(() => {
         const player_ = new Player(true);
         player_.addExtension(new AVPlayerViewControllerExtension(player_));
@@ -33,7 +34,7 @@ export const AVPlayerViewControllerProvider = memo(function ({ playerConfig, onC
     useEffect(() => {
         if (playerConfig) {
             player.open(playerConfig).catch(error => {
-                console.error('Error opening player:', error);
+                logger.error('Error opening player:', error);
             });
         }
     }, 

package/lib/components/AppleTvPlayerControls.ios.js

@@ -1,5 +1,5 @@
 import React, { createContext } from 'react';
-import { BaseEventEmitter, usePlayer } from '@castlabs/react-native-prestoplay';
+import { BaseEventEmitter, ErrorCode, Logger, usePlayer, } from '@castlabs/react-native-prestoplay';
 import { AVPlayerViewControllerExtension } from '../AVPlayerViewControllerExtension';
 export const AppleTvPlayerControlsContext = createContext({
     eventEmitter: new BaseEventEmitter(),
@@ -29,32 +29,45 @@ export const AppleTvPlayerControlsContext = createContext({
  * @group Components
  */
 const AppleTvPlayerControls = React.memo(({ children }) => {
-    const player = usePlayer();
-    const avPlayerExtension = player.getExtension(AVPlayerViewControllerExtension);
-    const addAction = (type, actionId, props) => {
-        avPlayerExtension.addAction(type, actionId, props);
-    };
-    const removeAction = (type, actionId) => {
-        avPlayerExtension.removeAction(type, actionId);
-    };
-    const updateAction = (actionId, state, title, icon) => {
-        avPlayerExtension.updateAction(actionId, state, title, icon);
-    };
-    const setPopupMenu = (menuId, popUpMenu) => {
-        avPlayerExtension.setPopupMenu(menuId, popUpMenu);
-    };
-    const removePopupMenu = (menuId) => {
-        avPlayerExtension.removePopupMenu(menuId);
-    };
-    return (<AppleTvPlayerControlsContext.Provider value={{
-            eventEmitter: avPlayerExtension.eventEmitter,
-            updateAction,
-            addAction,
-            removeAction,
-            setPopupMenu: setPopupMenu,
-            removePopupMenu,
-        }}>
-        {children}
-      </AppleTvPlayerControlsContext.Provider>);
+    try {
+        const player = usePlayer();
+        const avPlayerExtension = player.getExtension(AVPlayerViewControllerExtension);
+        const addAction = (type, actionId, props) => {
+            avPlayerExtension.addAction(type, actionId, props);
+        };
+        const removeAction = (type, actionId) => {
+            avPlayerExtension.removeAction(type, actionId);
+        };
+        const updateAction = (actionId, state, title, icon) => {
+            avPlayerExtension.updateAction(actionId, state, title, icon);
+        };
+        const setPopupMenu = (menuId, popUpMenu) => {
+            avPlayerExtension.setPopupMenu(menuId, popUpMenu);
+        };
+        const removePopupMenu = (menuId) => {
+            avPlayerExtension.removePopupMenu(menuId);
+        };
+        return (<AppleTvPlayerControlsContext.Provider value={{
+                eventEmitter: avPlayerExtension.eventEmitter,
+                updateAction,
+                addAction,
+                removeAction,
+                setPopupMenu: setPopupMenu,
+                removePopupMenu,
+            }}>
+          {children}
+        </AppleTvPlayerControlsContext.Provider>);
+    }
+    catch (e) {
+        const logger = new Logger('AppleTvPlayerControls');
+        const error = e;
+        if (error.code === ErrorCode.PlayerNotFound) {
+            logger.error(`${error.message} Ensure that <AppleTvPlayerControls> is within the <AVPlayerViewControllerProvider> hierarchy.`);
+        }
+        else {
+            logger.error(`<AppleTvPlayerControls>: Unexpected error ${error}`);
+        }
+        return null;
+    }
 });
 export default AppleTvPlayerControls;

package/lib/specs/NativeApplePlayerControlsFactoryModule.d.ts

@@ -0,0 +1,5 @@
+import type { TurboModule } from 'react-native';
+export interface Spec extends TurboModule {
+}
+declare const _default: Spec;
+export default _default;

package/lib/specs/NativeApplePlayerControlsFactoryModule.js

@@ -0,0 +1,2 @@
+import { TurboModuleRegistry } from 'react-native';
+export default TurboModuleRegistry.getEnforcing('NativeApplePlayerControlsFactoryModule');

package/lib/specs/NativeApplePlayerControlsModule.d.ts

@@ -0,0 +1,7 @@
+import type { TurboModule } from 'react-native';
+export interface Spec extends TurboModule {
+    setAppleTvActions(playerId: string, transportBarActions: Object[], infoBarActions: Object[], contextualActions: Object[]): Promise<void>;
+    setActionStateAndUi(playerId: string, actionId: string, state: boolean, uiInfo: Object): Promise<void>;
+}
+declare const _default: Spec;
+export default _default;

package/lib/specs/NativeApplePlayerControlsModule.js

@@ -0,0 +1,2 @@
+import { TurboModuleRegistry } from 'react-native';
+export default TurboModuleRegistry.getEnforcing('NativeApplePlayerControlsModule');

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@castlabs/react-native-prestoplay-ios-avplayerviewcontroller",
-  "version": "1.1.3",
-  "prestoplayAppleSdkVersion": "4.0.25.1",
+  "version": "1.2.0",
+  "prestoplayAppleSdkVersion": "4.0.27",
   "prestoplayAndroidSdkVersion": "4.4.8",
   "prestoplayWebSdkVersion": "6.26.0",
   "description": "PRESTOplay for React Native",
@@ -46,7 +46,7 @@
     "typescript": "5.0.4"
   },
   "dependencies": {
-    "@castlabs/react-native-prestoplay": "1.1.3"
+    "@castlabs/react-native-prestoplay": "1.2.0"
   },
   "keywords": [
     "react native player",
@@ -85,5 +85,16 @@
     "bracketSpacing": false,
     "singleQuote": true,
     "trailingComma": "all"
+  },
+  "codegenConfig": {
+    "name": "NativePrestoPlayReactApplePlayerControlsSpec",
+    "type": "modules",
+    "jsSrcsDir": "src/specs",
+    "ios": {
+      "modulesProvider": {
+        "NativeApplePlayerControlsFactoryModule": "RCTNativeApplePlayerControlsFactoryModule",
+        "NativeApplePlayerControlsModule": "RCTNativeApplePlayerControlsModule"
+      }
+    }
   }
 }

package/react-native-prestoplay-ios-avplayerviewcontroller.podspec

@@ -14,6 +14,10 @@ Pod::Spec.new do |s|
   s.source       = { :git => "https://github.com/castlabs/prestoplay-react.git", :tag => "#{s.version}" }
   s.source_files = "ios/**/*.{h,m,mm,swift}"
   s.exclude_files = "ios/**/*.xcframework/**/*.h"
+  s.private_header_files = [
+    "ios/**/RCTNativeApplePlayerControlsFactoryModule.h",
+    "ios/**/RCTNativeApplePlayerControlsModule.h"
+  ]
 
   s.dependency "react-native-prestoplay", package["version"]