bitmovin-player-react-native 0.44.1-alpha.0 → 1.0.0-alpha.0

package/src/decoder/index.ts

@@ -1,18 +1,12 @@
-import { NativeModules } from 'react-native';
-import BatchedBridge from 'react-native/Libraries/BatchedBridge/BatchedBridge';
+import { EventSubscription } from 'expo-modules-core';
 import { DecoderConfig, DecoderContext, MediaCodecInfo } from './decoderConfig';
 import NativeInstance from '../nativeInstance';
-
-const DecoderConfigModule = NativeModules.DecoderConfigModule;
+import DecoderConfigModule from './decoderConfigModule';
 
 /**
  * Takes care of JS/Native communication for a `DecoderConfig`.
  */
 export class DecoderConfigBridge extends NativeInstance<DecoderConfig> {
-  constructor(decoderConfig: DecoderConfig) {
-    super(decoderConfig);
-  }
-
   /**
    * Whether this object's native instance has been created.
    */
@@ -22,14 +16,35 @@ export class DecoderConfigBridge extends NativeInstance<DecoderConfig> {
    */
   isDestroyed = false;
 
+  private onOverrideDecodersPrioritySubscription?: EventSubscription;
+
   initialize() {
     if (!this.isInitialized) {
-      BatchedBridge.registerCallableModule(
-        `DecoderConfigBridge-${this.nativeId}`,
-        this
-      );
+      // Set up event listener for decoder priority override
+      this.onOverrideDecodersPrioritySubscription =
+        DecoderConfigModule.addListener(
+          'onOverrideDecodersPriority',
+          ({
+            nativeId,
+            context,
+            preferredDecoders,
+          }: {
+            nativeId: string;
+            context: DecoderContext;
+            preferredDecoders: MediaCodecInfo[];
+          }) => {
+            if (nativeId !== this.nativeId) {
+              return;
+            }
+            this.overrideDecodersPriority(context, preferredDecoders);
+          }
+        );
+
       // Create native configuration object.
-      DecoderConfigModule.initWithConfig(this.nativeId, this.config);
+      DecoderConfigModule.initializeWithConfig(
+        this.nativeId,
+        this.config || {}
+      );
       this.isInitialized = true;
     }
   }
@@ -40,17 +55,18 @@ export class DecoderConfigBridge extends NativeInstance<DecoderConfig> {
   destroy() {
     if (!this.isDestroyed) {
       DecoderConfigModule.destroy(this.nativeId);
+      this.onOverrideDecodersPrioritySubscription?.remove();
+      this.onOverrideDecodersPrioritySubscription = undefined;
       this.isDestroyed = true;
     }
   }
 
-  // noinspection JSUnusedGlobalSymbols
   /**
    * Called by native code, when the decoder priority should be evaluated.
    */
-  overrideDecodersPriority(
+  private overrideDecodersPriority(
     context: DecoderContext,
-    preferredDecoders: [MediaCodecInfo]
+    preferredDecoders: MediaCodecInfo[]
   ): void {
     const orderedPriority =
       this.config?.decoderPriorityProvider?.overrideDecodersPriority(

package/src/drm/drmModule.ts

@@ -0,0 +1,84 @@
+import { NativeModule, requireNativeModule } from 'expo-modules-core';
+import { DrmConfig } from './index';
+
+export type DrmModuleEvents = {
+  onPrepareCertificate: ({
+    nativeId,
+    id,
+    certificate,
+  }: {
+    nativeId: string;
+    id: string;
+    certificate: string;
+  }) => void;
+  onPrepareMessage: ({
+    nativeId,
+    id,
+    data,
+    message,
+    assetId,
+  }: {
+    nativeId: string;
+    id: string;
+    data?: string;
+    message?: string;
+    assetId?: string;
+  }) => void;
+  onPrepareSyncMessage: ({
+    nativeId,
+    id,
+    syncMessage,
+    assetId,
+  }: {
+    nativeId: string;
+    id: string;
+    syncMessage: string;
+    assetId: string;
+  }) => void;
+  onPrepareLicense: ({
+    nativeId,
+    id,
+    data,
+    license,
+  }: {
+    nativeId: string;
+    id: string;
+    data?: string;
+    license?: string;
+  }) => void;
+  onPrepareLicenseServerUrl: ({
+    nativeId,
+    id,
+    licenseServerUrl,
+  }: {
+    nativeId: string;
+    id: string;
+    licenseServerUrl: string;
+  }) => void;
+  onPrepareContentId: ({
+    nativeId,
+    id,
+    contentId,
+  }: {
+    nativeId: string;
+    id: string;
+    contentId: string;
+  }) => void;
+};
+
+/**
+ * Native DrmModule using Expo modules API.
+ * Provides modern async/await interface while maintaining backward compatibility.
+ */
+declare class DrmModule extends NativeModule<DrmModuleEvents> {
+  initializeWithConfig(nativeId: string, config: DrmConfig): Promise<void>;
+  destroy(nativeId: string): Promise<void>;
+  setPreparedCertificate(id: string, certificate: string): any;
+  setPreparedMessage(id: string, message?: string): any;
+  setPreparedSyncMessage(id: string, syncMessage?: string): any;
+  setPreparedLicense(id: string, license?: string): any;
+  setPreparedLicenseServerUrl(id: string, url?: string): any;
+  setPreparedContentId(id: string, contentId?: string): any;
+}
+
+export default requireNativeModule<DrmModule>('DrmModule');

package/src/drm/fairplayConfig.ts

@@ -51,7 +51,7 @@ export interface FairplayConfig {
    * Note that both the passed `syncMessage` data and this block return value should be a Base64
    * string. So use whatever solution suits you best to handle Base64 in React Native.
    *
-   * @param message - Base64 encoded message data.
+   * @param syncMessage - Base64 encoded message data.
    * @param assetId - Asset ID.
    * @returns The processed Base64 encoded sync message.
    */

package/src/drm/index.ts

@@ -1,14 +1,13 @@
-import { NativeModules, Platform } from 'react-native';
-import BatchedBridge from 'react-native/Libraries/BatchedBridge/BatchedBridge';
+import { Platform } from 'react-native';
+import { EventSubscription } from 'expo-modules-core';
 import NativeInstance, { NativeInstanceConfig } from '../nativeInstance';
 import { FairplayConfig } from './fairplayConfig';
 import { WidevineConfig } from './widevineConfig';
+import DrmModule from './drmModule';
 
 // Export config types from DRM module.
 export { FairplayConfig, WidevineConfig };
 
-const DrmModule = NativeModules.DrmModule;
-
 /**
  * Represents the general Streaming DRM config.
  */
@@ -16,13 +15,13 @@ export interface DrmConfig extends NativeInstanceConfig {
   /**
    * FairPlay specific configuration.
    *
-   * @platform iOS
+   * @remarks Platform: iOS
    */
   fairplay?: FairplayConfig;
   /**
    * Widevine specific configuration.
    *
-   * @platform Android, iOS (only for casting).
+   * @remarks Platform: Android, iOS (only for casting).
    */
   widevine?: WidevineConfig;
 }
@@ -41,16 +40,20 @@ export class Drm extends NativeInstance<DrmConfig> {
    */
   isDestroyed = false;
 
+  private eventSubscriptions: EventSubscription[] = [];
+
   /**
    * Allocates the DRM config instance and its resources natively.
    */
-  initialize = () => {
+  initialize = async () => {
     if (!this.isInitialized) {
-      // Register this object as a callable module so it's possible to
-      // call functions on it from native code, e.g `onPrepareMessage`.
-      BatchedBridge.registerCallableModule(`DRM-${this.nativeId}`, this);
-      // Create native configuration object.
-      DrmModule.initWithConfig(this.nativeId, this.config);
+      // Set up event listeners for DRM preparation callbacks
+      this.setupEventListeners();
+
+      // Create native configuration object using Expo module.
+      if (this.config) {
+        await DrmModule.initializeWithConfig(this.nativeId, this.config);
+      }
       this.isInitialized = true;
     }
   };
@@ -58,13 +61,85 @@ export class Drm extends NativeInstance<DrmConfig> {
   /**
    * Destroys the native DRM config and releases all of its allocated resources.
    */
-  destroy = () => {
+  destroy = async () => {
     if (!this.isDestroyed) {
-      DrmModule.destroy(this.nativeId);
+      await DrmModule.destroy(this.nativeId);
+      // Clean up event subscriptions
+      this.eventSubscriptions.forEach((subscription) => subscription.remove());
+      this.eventSubscriptions = [];
       this.isDestroyed = true;
     }
   };
 
+  /**
+   * Sets up event listeners for all DRM preparation callbacks
+   */
+  private setupEventListeners() {
+    // iOS-only events
+    this.eventSubscriptions.push(
+      DrmModule.addListener(
+        'onPrepareCertificate',
+        ({ nativeId, id, certificate }) => {
+          if (nativeId !== this.nativeId) return;
+          this.onPrepareCertificate(id, certificate);
+        }
+      )
+    );
+
+    this.eventSubscriptions.push(
+      DrmModule.addListener(
+        'onPrepareSyncMessage',
+        ({ nativeId, id, syncMessage, assetId }) => {
+          if (nativeId !== this.nativeId) return;
+          this.onPrepareSyncMessage(id, syncMessage, assetId);
+        }
+      )
+    );
+
+    this.eventSubscriptions.push(
+      DrmModule.addListener(
+        'onPrepareLicenseServerUrl',
+        ({ nativeId, id, licenseServerUrl }) => {
+          if (nativeId !== this.nativeId) return;
+          this.onPrepareLicenseServerUrl(id, licenseServerUrl);
+        }
+      )
+    );
+
+    this.eventSubscriptions.push(
+      DrmModule.addListener(
+        'onPrepareContentId',
+        ({ nativeId, id, contentId }) => {
+          if (nativeId !== this.nativeId) return;
+          this.onPrepareContentId(id, contentId);
+        }
+      )
+    );
+
+    // Cross-platform events
+    this.eventSubscriptions.push(
+      DrmModule.addListener(
+        'onPrepareMessage',
+        ({ nativeId, id, data, message, assetId }) => {
+          if (nativeId !== this.nativeId) return;
+          // Android sends 'data', iOS sends 'message'
+          this.onPrepareMessage(id, data || message, assetId);
+        }
+      )
+    );
+
+    this.eventSubscriptions.push(
+      DrmModule.addListener(
+        'onPrepareLicense',
+        ({ nativeId, id, data, license }) => {
+          if (nativeId !== this.nativeId) return;
+          // Android sends 'data', iOS sends 'license'
+          this.onPrepareLicense(id, data || license);
+        }
+      )
+    );
+  }
+
   /**
    * iOS only.
    *
@@ -75,12 +150,10 @@ export class Drm extends NativeInstance<DrmConfig> {
    *
    * @param certificate - Base64 encoded certificate data.
    */
-  onPrepareCertificate = (certificate: string) => {
+  private onPrepareCertificate = (id: string, certificate: string) => {
     if (this.config?.fairplay?.prepareCertificate) {
-      DrmModule.setPreparedCertificate(
-        this.nativeId,
-        this.config?.fairplay?.prepareCertificate?.(certificate)
-      );
+      const result = this.config?.fairplay?.prepareCertificate?.(certificate);
+      DrmModule.setPreparedCertificate(id, result);
     }
   };
 
@@ -93,16 +166,23 @@ export class Drm extends NativeInstance<DrmConfig> {
    * @param message - Base64 encoded message data.
    * @param assetId - Optional asset ID. Only sent by iOS.
    */
-  onPrepareMessage = (message: string, assetId?: string) => {
+  private onPrepareMessage = (
+    id: string,
+    message?: string,
+    assetId?: string
+  ) => {
+    if (!message) {
+      DrmModule.setPreparedMessage(id, undefined);
+      return;
+    }
     const config =
       Platform.OS === 'ios' ? this.config?.fairplay : this.config?.widevine;
     if (config && config.prepareMessage) {
-      DrmModule.setPreparedMessage(
-        this.nativeId,
+      const result =
         Platform.OS === 'ios'
           ? (config as FairplayConfig).prepareMessage?.(message, assetId!)
-          : (config as WidevineConfig).prepareMessage?.(message)
-      );
+          : (config as WidevineConfig).prepareMessage?.(message);
+      DrmModule.setPreparedMessage(id, result);
     }
   };
 
@@ -116,12 +196,17 @@ export class Drm extends NativeInstance<DrmConfig> {
    *
    * @param syncMessage - Base64 encoded sync SPC message data.
    */
-  onPrepareSyncMessage = (syncMessage: string, assetId: string) => {
+  private onPrepareSyncMessage = (
+    id: string,
+    syncMessage: string,
+    assetId: string
+  ) => {
     if (this.config?.fairplay?.prepareSyncMessage) {
-      DrmModule.setPreparedSyncMessage(
-        this.nativeId,
-        this.config?.fairplay?.prepareSyncMessage?.(syncMessage, assetId)
+      const result = this.config?.fairplay?.prepareSyncMessage?.(
+        syncMessage,
+        assetId
       );
+      DrmModule.setPreparedSyncMessage(id, result);
     }
   };
 
@@ -133,13 +218,17 @@ export class Drm extends NativeInstance<DrmConfig> {
    *
    * @param license - Base64 encoded license data.
    */
-  onPrepareLicense = (license: string) => {
+  private onPrepareLicense = (id: string, license?: string) => {
+    if (!license) {
+      DrmModule.setPreparedLicense(id, undefined);
+      return;
+    }
     const prepareLicense =
       Platform.OS === 'ios'
         ? this.config?.fairplay?.prepareLicense
         : this.config?.widevine?.prepareLicense;
     if (prepareLicense) {
-      DrmModule.setPreparedLicense(this.nativeId, prepareLicense(license));
+      DrmModule.setPreparedLicense(id, prepareLicense(license));
     }
   };
 
@@ -153,12 +242,14 @@ export class Drm extends NativeInstance<DrmConfig> {
    *
    * @param licenseServerUrl - The license server URL string.
    */
-  onPrepareLicenseServerUrl = (licenseServerUrl: string) => {
+  private onPrepareLicenseServerUrl = (
+    id: string,
+    licenseServerUrl: string
+  ) => {
     if (this.config?.fairplay?.prepareLicenseServerUrl) {
-      DrmModule.setPreparedLicenseServerUrl(
-        this.nativeId,
-        this.config?.fairplay?.prepareLicenseServerUrl?.(licenseServerUrl)
-      );
+      const result =
+        this.config?.fairplay?.prepareLicenseServerUrl?.(licenseServerUrl);
+      DrmModule.setPreparedLicenseServerUrl(id, result);
     }
   };
 
@@ -172,12 +263,11 @@ export class Drm extends NativeInstance<DrmConfig> {
    *
    * @param contentId - The extracted contentId string.
    */
-  onPrepareContentId = (contentId: string) => {
+  private onPrepareContentId = (id: string, contentId: string) => {
+    console.log('onPrepareContentId', contentId);
     if (this.config?.fairplay?.prepareContentId) {
-      DrmModule.setPreparedContentId(
-        this.nativeId,
-        this.config?.fairplay?.prepareContentId?.(contentId)
-      );
+      const result = this.config?.fairplay?.prepareContentId?.(contentId);
+      DrmModule.setPreparedContentId(id, result);
     }
   };
 }

package/src/drm/widevineConfig.ts

@@ -1,6 +1,6 @@
 /**
  * Represents a Widevine Streaming DRM config.
- * @platform Android, iOS (only for casting).
+ * @remarks Platform: Android, iOS (only for casting).
  */
 export interface WidevineConfig {
   /**
@@ -19,7 +19,7 @@ export interface WidevineConfig {
    * Note that both the passed `message` data and this block return value should be a Base64 string.
    * So use whatever solution suits you best to handle Base64 in React Native.
    *
-   * @platform Android
+   * @remarks Platform: Android
    *
    * @param message - Base64 encoded message data.
    * @returns The processed Base64 encoded message.
@@ -33,7 +33,7 @@ export interface WidevineConfig {
    * Note that both the passed `license` data and this block return value should be a Base64 string.
    * So use whatever solution suits you best to handle Base64 in React Native.
    *
-   * @platform Android
+   * @remarks Platform: Android
    *
    * @param license - Base64 encoded license data.
    * @returns The processed Base64 encoded license.
@@ -42,7 +42,7 @@ export interface WidevineConfig {
   /**
    * Set widevine's preferred security level.
    *
-   * @platform Android
+   * @remarks Platform: Android
    */
   preferredSecurityLevel?: string;
   /**
@@ -51,7 +51,7 @@ export interface WidevineConfig {
    * as the same DRM scheme information.
    * Default: `false`
    *
-   * @platform Android
+   * @remarks Platform: Android
    */
   shouldKeepDrmSessionsAlive?: boolean;
 }