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

package/src/modules/SourceModule.ts

@@ -0,0 +1,74 @@
+import { NativeModule, requireNativeModule } from 'expo-modules-core';
+import { LoadingState, SourceRemoteControlConfig } from '../source';
+import { Thumbnail } from '../thumbnail';
+
+export type SourceModuleEvents = Record<string, any>;
+
+declare class SourceModule extends NativeModule<SourceModuleEvents> {
+  /**
+   * Checks if the source is attached to a player.
+   */
+  isAttachedToPlayer(nativeId: string): Promise<boolean | null>;
+
+  /**
+   * Checks if the source is currently active.
+   */
+  isActive(nativeId: string): Promise<boolean | null>;
+
+  /**
+   * Initializes a source with the given nativeId, optional DRM nativeId, configuration object,
+   * and remote control object.
+   */
+  initializeWithConfig(
+    nativeId: string,
+    drmNativeId?: string,
+    config?: Record<string, any>,
+    remoteControl?: SourceRemoteControlConfig
+  ): Promise<void>;
+
+  /**
+   * Initializes a source with the given nativeId, optional DRM nativeId, configuration object,
+   * remote control object, and analytics source metadata.
+   */
+  initializeWithAnalyticsConfig(
+    nativeId: string,
+    drmNativeId?: string,
+    config?: Record<string, any>,
+    remoteControl?: SourceRemoteControlConfig,
+    analyticsSourceMetadata?: Record<string, any>
+  ): Promise<void>;
+
+  /**
+   * Destroys the source with the given nativeId.
+   */
+  destroy(nativeId: string): Promise<void>;
+
+  /**
+   * Returns the native DRM config reference of the source with the given nativeId.
+   */
+  duration(nativeId: string): Promise<number | null>;
+  /**
+   * Returns the current loading state of the source with the given nativeId.
+   */
+  loadingState(nativeId: string): Promise<LoadingState | null>;
+
+  /**
+   * Returns the metadata of the source with the given nativeId.
+   */
+  getMetadata(nativeId: string): Promise<Record<string, any> | null>;
+
+  /**
+   * Sets the metadata of the source with the given nativeId.
+   */
+  setMetadata(
+    nativeId: string,
+    metadata: Record<string, any> | null
+  ): Promise<void>;
+
+  /**
+   * Returns a thumbnail for the specified playback time.
+   */
+  getThumbnail(nativeId: string, time: number): Promise<Thumbnail | null>;
+}
+
+export default requireNativeModule<SourceModule>('SourceModule');

package/src/modules/UuidModule.ts

@@ -0,0 +1,9 @@
+import { NativeModule, requireNativeModule } from 'expo-modules-core';
+
+export type UuidModuleEvents = Record<string, any>;
+
+declare class UuidModule extends NativeModule<UuidModuleEvents> {
+  generate(): string;
+}
+
+export default requireNativeModule<UuidModule>('UuidModule');

package/src/nativeInstance.ts

@@ -1,6 +1,6 @@
-import { NativeModules } from 'react-native';
+import UuidModule from './modules/UuidModule';
 
-const Uuid = NativeModules.UuidModule;
+const Uuid = UuidModule;
 
 export interface NativeInstanceConfig {
   /**
@@ -20,7 +20,7 @@ export interface NativeInstanceConfig {
 }
 
 export default abstract class NativeInstance<
-  Config extends NativeInstanceConfig
+  Config extends NativeInstanceConfig,
 > {
   /**
    * Optionally user-defined string `id` for the native instance, or UUIDv4.

package/src/network/index.ts

@@ -1,6 +1,6 @@
-import { NativeModules } from 'react-native';
-import BatchedBridge from 'react-native/Libraries/BatchedBridge/BatchedBridge';
+import { EventSubscription } from 'expo-modules-core';
 import NativeInstance from '../nativeInstance';
+import NetworkModule from './networkModule';
 import {
   HttpRequestType,
   HttpRequest,
@@ -8,11 +8,8 @@ import {
   NetworkConfig,
 } from './networkConfig';
 
-// Export config types from Network module.
 export { HttpRequestType, HttpRequest, HttpResponse, NetworkConfig };
 
-const NetworkModule = NativeModules.NetworkModule;
-
 /**
  * Represents a native Network configuration object.
  * @internal
@@ -27,16 +24,42 @@ export class Network extends NativeInstance<NetworkConfig> {
    */
   isDestroyed = false;
 
+  private onPreprocessHttpRequestSubscription?: EventSubscription;
+  private onPreprocessHttpResponseSubscription?: EventSubscription;
+
   /**
    * Allocates the Network 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 `onPreprocessHttpResponse`.
-      BatchedBridge.registerCallableModule(`Network-${this.nativeId}`, this);
-      // Create native configuration object.
-      NetworkModule.initWithConfig(this.nativeId, this.config);
+      console.log('Initializing Network config:', this.nativeId);
+      // Set up event listeners for HTTP request/response preprocessing
+      this.onPreprocessHttpRequestSubscription = NetworkModule.addListener(
+        'onPreprocessHttpRequest',
+        ({ nativeId, requestId, type, request }) => {
+          console.log(`Received HTTP Request [${type}]:`, request);
+          if (nativeId !== this.nativeId) {
+            return;
+          }
+          this.onPreprocessHttpRequest(requestId, type, request);
+        }
+      );
+
+      this.onPreprocessHttpResponseSubscription = NetworkModule.addListener(
+        'onPreprocessHttpResponse',
+        ({ nativeId, responseId, type, response }) => {
+          console.log(`Received HTTP Response [${type}]:`, response);
+          if (nativeId !== this.nativeId) {
+            return;
+          }
+          this.onPreprocessHttpResponse(responseId, type, response);
+        }
+      );
+
+      // Create native configuration object using Expo module
+      if (this.config) {
+        await NetworkModule.initializeWithConfig(this.nativeId, this.config);
+      }
       this.isInitialized = true;
     }
   };
@@ -44,9 +67,13 @@ export class Network extends NativeInstance<NetworkConfig> {
   /**
    * Destroys the native Network config and releases all of its allocated resources.
    */
-  destroy = () => {
+  destroy = async () => {
     if (!this.isDestroyed) {
-      NetworkModule.destroy(this.nativeId);
+      await NetworkModule.destroy(this.nativeId);
+      this.onPreprocessHttpRequestSubscription?.remove();
+      this.onPreprocessHttpResponseSubscription?.remove();
+      this.onPreprocessHttpRequestSubscription = undefined;
+      this.onPreprocessHttpResponseSubscription = undefined;
       this.isDestroyed = true;
     }
   };
@@ -61,7 +88,7 @@ export class Network extends NativeInstance<NetworkConfig> {
    * @param type Type of the request to be made.
    * @param request The HTTP request to process.
    */
-  onPreprocessHttpRequest = (
+  private onPreprocessHttpRequest = (
     requestId: string,
     type: HttpRequestType,
     request: HttpRequest
@@ -86,7 +113,7 @@ export class Network extends NativeInstance<NetworkConfig> {
    * @param type Type of the request to be made.
    * @param response The HTTP response to process.
    */
-  onPreprocessHttpResponse = (
+  private onPreprocessHttpResponse = (
     responseId: string,
     type: HttpRequestType,
     response: HttpResponse

package/src/network/networkConfig.ts

@@ -27,7 +27,7 @@ export type HttpRequestBody = string;
 
 /** Represents an HTTP request. */
 export interface HttpRequest {
-  /** The {@link HttpRequestBody} to send to the server. */
+  /** The HTTP request body to send to the server. */
   body?: HttpRequestBody;
   /**
    * The HTTP Headers of the request.
@@ -47,7 +47,7 @@ export type HttpResponseBody = string;
 
 /** Represents an HTTP response. */
 export interface HttpResponse {
-  /** The {@link HttpRequestBody} of the response. */
+  /** The HTTP response body of the response. */
   body?: HttpResponseBody;
   /**
    * The HTTP Headers of the response.
@@ -77,7 +77,7 @@ export interface NetworkConfig extends NativeInstanceConfig {
    *          - If the promise resolves, the player will use the processed request.
    *          - If the promise rejects, the player will fall back to using the original request.
    *
-   * @examples
+   * @example
    * ```
    *  const requestCallback = (type: HttpRequestType, request: HttpRequest) => {
    *    // Access current properties

package/src/network/networkModule.ts

@@ -0,0 +1,51 @@
+import { NativeModule, requireNativeModule } from 'expo-modules-core';
+import {
+  HttpRequest,
+  HttpResponse,
+  NetworkConfig,
+  HttpRequestType,
+} from './networkConfig';
+
+export type NetworkModuleEvents = {
+  onPreprocessHttpRequest: ({
+    nativeId,
+    requestId,
+    type,
+    request,
+  }: {
+    nativeId: string;
+    requestId: string;
+    type: HttpRequestType;
+    request: HttpRequest;
+  }) => void;
+  onPreprocessHttpResponse: ({
+    nativeId,
+    responseId,
+    type,
+    response,
+  }: {
+    nativeId: string;
+    responseId: string;
+    type: HttpRequestType;
+    response: HttpResponse;
+  }) => void;
+};
+
+/**
+ * Native NetworkModule using Expo modules API.
+ * Provides modern async/await interface while maintaining backward compatibility.
+ */
+declare class NetworkModule extends NativeModule<NetworkModuleEvents> {
+  initializeWithConfig(nativeId: string, config: NetworkConfig): Promise<void>;
+  destroy(nativeId: string): Promise<void>;
+  setPreprocessedHttpRequest(
+    requestId: string,
+    request: HttpRequest
+  ): Promise<void>;
+  setPreprocessedHttpResponse(
+    responseId: string,
+    response: HttpResponse
+  ): Promise<void>;
+}
+
+export default requireNativeModule<NetworkModule>('NetworkModule');

package/src/offline/offlineContentConfig.ts

@@ -3,7 +3,7 @@ import { SourceConfig } from '../source';
 
 /**
  * Object used to configure a new `OfflineContentManager` instance.
- * @platform Android, iOS
+ * @remarks Platform: Android, iOS
  */
 export interface OfflineContentConfig extends NativeInstanceConfig {
   /**

package/src/offline/offlineContentManager.ts

@@ -1,11 +1,5 @@
-import {
-  EmitterSubscription,
-  NativeEventEmitter,
-  NativeModule,
-  NativeModules,
-} from 'react-native';
+import { EventSubscription } from 'expo-modules-core';
 import NativeInstance from '../nativeInstance';
-import { SourceConfig } from '../source';
 import {
   BitmovinNativeOfflineEventData,
   OfflineContentManagerListener,
@@ -14,30 +8,8 @@ import {
 import { OfflineContentConfig } from './offlineContentConfig';
 import { OfflineDownloadRequest } from './offlineDownloadRequest';
 import { OfflineState } from './offlineState';
-import { Drm } from 'bitmovin-player-react-native';
-
-interface NativeOfflineModule extends NativeModule {
-  initWithConfig(
-    nativeId: string,
-    config: { identifier: string; sourceConfig: SourceConfig },
-    drmNativeId: string | undefined
-  ): Promise<void>;
-  getState(nativeId: string): Promise<OfflineState>;
-  getOptions(nativeId: string): Promise<void>;
-  download(nativeId: string, request: OfflineDownloadRequest): Promise<void>;
-  resume(nativeId: string): Promise<void>;
-  suspend(nativeId: string): Promise<void>;
-  cancelDownload(nativeId: string): Promise<void>;
-  usedStorage(nativeId: string): Promise<number>;
-  deleteAll(nativeId: string): Promise<void>;
-  downloadLicense(nativeId: string): Promise<void>;
-  releaseLicense(nativeId: string): Promise<void>;
-  renewOfflineLicense(nativeId: string): Promise<void>;
-  release(nativeId: string): Promise<void>;
-}
-
-const OfflineModule =
-  NativeModules.BitmovinOfflineModule as NativeOfflineModule;
+import { Drm } from '../drm';
+import OfflineModule from './offlineModule';
 
 const handleBitmovinNativeOfflineEvent = (
   data: BitmovinNativeOfflineEventData,
@@ -73,46 +45,39 @@ const handleBitmovinNativeOfflineEvent = (
  * without an active network connection. An OfflineContentManager instance can be created via
  * the constructor and will be idle until initialized.
  *
- * @platform Android, iOS
+ * @remarks Platform: Android, iOS
  */
 export class OfflineContentManager extends NativeInstance<OfflineContentConfig> {
   isInitialized = false;
   isDestroyed = false;
-  private eventSubscription?: EmitterSubscription = undefined;
+  private eventSubscription?: EventSubscription;
   private listeners: Set<OfflineContentManagerListener> =
     new Set<OfflineContentManagerListener>();
   private drm?: Drm;
 
-  constructor(config: OfflineContentConfig) {
-    super(config);
-  }
-
   /**
    * Allocates the native `OfflineManager` instance and its resources natively.
    * Registers the `DeviceEventEmitter` listener to receive data from the native `OfflineContentManagerListener` callbacks
    */
   initialize = async (): Promise<void> => {
-    let initPromise = Promise.resolve();
     if (!this.isInitialized && this.config) {
-      this.eventSubscription = new NativeEventEmitter(
-        OfflineModule
-      ).addListener(
-        'BitmovinOfflineEvent',
-        (data?: BitmovinNativeOfflineEventData) => {
-          if (this.nativeId !== data?.nativeId) {
+      this.eventSubscription = OfflineModule.addListener(
+        'onBitmovinOfflineEvent',
+        (event: BitmovinNativeOfflineEventData) => {
+          if (this.nativeId !== event.nativeId) {
             return;
           }
 
-          handleBitmovinNativeOfflineEvent(data, this.listeners);
+          handleBitmovinNativeOfflineEvent(event, this.listeners);
         }
       );
 
       if (this.config.sourceConfig.drmConfig) {
         this.drm = new Drm(this.config.sourceConfig.drmConfig);
-        this.drm.initialize();
+        await this.drm.initialize();
       }
 
-      initPromise = OfflineModule.initWithConfig(
+      await OfflineModule.initializeWithConfig(
         this.nativeId,
         {
           identifier: this.config.identifier,
@@ -123,7 +88,7 @@ export class OfflineContentManager extends NativeInstance<OfflineContentConfig>
     }
 
     this.isInitialized = true;
-    return initPromise;
+    return Promise.resolve();
   };
 
   /**
@@ -158,7 +123,7 @@ export class OfflineContentManager extends NativeInstance<OfflineContentConfig>
    * Gets the current state of the `OfflineContentManager`
    */
   state = async (): Promise<OfflineState> => {
-    return OfflineModule.getState(this.nativeId);
+    return OfflineModule.getState(this.nativeId) as Promise<OfflineState>;
   };
 
   /**
@@ -228,7 +193,7 @@ export class OfflineContentManager extends NativeInstance<OfflineContentConfig>
    * When finished successfully data will be passed to the `OfflineContentManagerListener.onDrmLicenseUpdated`.
    * Errors are transmitted to the `OfflineContentManagerListener.onError`.
    *
-   * @platform Android
+   * @remarks Platform: Android
    */
   releaseLicense = async (): Promise<void> => {
     return OfflineModule.releaseLicense(this.nativeId);

package/src/offline/offlineContentManagerListener.ts

@@ -3,7 +3,7 @@ import { OfflineState } from './offlineState';
 
 /**
  * Enum to hold the `eventType` on the `BitmovinNativeOfflineEventData`
- * @platform Android, iOS
+ * @remarks Platform: Android, iOS
  */
 export enum OfflineEventType {
   onCompleted = 'onCompleted',
@@ -19,7 +19,7 @@ export enum OfflineEventType {
 
 /**
  * The base interface for all offline events.
- * @platform Android, iOS
+ * @remarks Platform: Android, iOS
  */
 export interface OfflineEvent<T extends OfflineEventType> {
   /**
@@ -42,7 +42,7 @@ export interface OfflineEvent<T extends OfflineEventType> {
 
 /**
  * Emitted when the download process has completed.
- * @platform Android, iOS
+ * @remarks Platform: Android, iOS
  */
 export interface OnCompletedEvent
   extends OfflineEvent<OfflineEventType.onCompleted> {
@@ -54,7 +54,7 @@ export interface OnCompletedEvent
 
 /**
  * Emitted when an error has occurred.
- * @platform Android, iOS
+ * @remarks Platform: Android, iOS
  */
 export interface OnErrorEvent extends OfflineEvent<OfflineEventType.onError> {
   /**
@@ -69,7 +69,7 @@ export interface OnErrorEvent extends OfflineEvent<OfflineEventType.onError> {
 
 /**
  * Emitted when there is a progress change for the process call.
- * @platform Android, iOS
+ * @remarks Platform: Android, iOS
  */
 export interface OnProgressEvent
   extends OfflineEvent<OfflineEventType.onProgress> {
@@ -81,7 +81,7 @@ export interface OnProgressEvent
 
 /**
  * Emitted when the `OfflineContentOptions` is available after a `OfflineContentManager.getOptions` call.
- * @platform Android, iOS
+ * @remarks Platform: Android, iOS
  */
 export interface OnOptionsAvailableEvent
   extends OfflineEvent<OfflineEventType.onOptionsAvailable> {
@@ -93,42 +93,39 @@ export interface OnOptionsAvailableEvent
 
 /**
  * Emitted when the DRM license was updated.
- * @platform Android, iOS
+ * @remarks Platform: Android, iOS
  */
-export interface OnDrmLicenseUpdatedEvent
-  extends OfflineEvent<OfflineEventType.onDrmLicenseUpdated> {}
+export type OnDrmLicenseUpdatedEvent =
+  OfflineEvent<OfflineEventType.onDrmLicenseUpdated>;
 
 /**
  * Emitted when the DRM license has expired.
- * @platform iOS
+ * @remarks Platform: iOS
  */
-export interface OnDrmLicenseExpiredEvent
-  extends OfflineEvent<OfflineEventType.onDrmLicenseExpired> {}
+export type OnDrmLicenseExpiredEvent =
+  OfflineEvent<OfflineEventType.onDrmLicenseExpired>;
 
 /**
  * Emitted when all active actions have been suspended.
- * @platform Android, iOS
+ * @remarks Platform: Android, iOS
  */
-export interface OnSuspendedEvent
-  extends OfflineEvent<OfflineEventType.onSuspended> {}
+export type OnSuspendedEvent = OfflineEvent<OfflineEventType.onSuspended>;
 
 /**
  * Emitted when all actions have been resumed.
- * @platform Android, iOS
+ * @remarks Platform: Android, iOS
  */
-export interface OnResumedEvent
-  extends OfflineEvent<OfflineEventType.onResumed> {}
+export type OnResumedEvent = OfflineEvent<OfflineEventType.onResumed>;
 
 /**
  * Emitted when the download of the media content was canceled by the user and all partially downloaded content has been deleted from disk.
- * @platform Android, iOS
+ * @remarks Platform: Android, iOS
  */
-export interface OnCanceledEvent
-  extends OfflineEvent<OfflineEventType.onCanceled> {}
+export type OnCanceledEvent = OfflineEvent<OfflineEventType.onCanceled>;
 
 /**
  * The type aggregation for all possible native offline events received from the `DeviceEventEmitter`
- * @platform Android, iOS
+ * @remarks Platform: Android, iOS
  */
 export type BitmovinNativeOfflineEventData =
   | OnCompletedEvent
@@ -143,7 +140,7 @@ export type BitmovinNativeOfflineEventData =
 
 /**
  * The listener that can be passed to the `OfflineContentManager` to receive callbacks for different events.
- * @platform Android, iOS
+ * @remarks Platform: Android, iOS
  */
 export interface OfflineContentManagerListener {
   /**

package/src/offline/offlineContentOptions.ts

@@ -1,6 +1,6 @@
 /**
  * Superclass of entries which can be selected to download for offline playback
- * @platform Android, iOS
+ * @remarks Platform: Android, iOS
  */
 export interface OfflineContentOptionEntry {
   /**
@@ -15,7 +15,7 @@ export interface OfflineContentOptionEntry {
 
 /**
  * Represents the downloadable options provided via the `onOptionsAvailable` callback on `OfflineContentManagerListener`
- * @platform Android, iOS
+ * @remarks Platform: Android, iOS
  */
 export interface OfflineContentOptions {
   /**

package/src/offline/offlineDownloadRequest.ts

@@ -1,6 +1,6 @@
 /**
  * Represents the configuration to start a download.
- * @platform Android, iOS
+ * @remarks Platform: Android, iOS
  */
 export interface OfflineDownloadRequest {
   /**

package/src/offline/offlineModule.ts

@@ -0,0 +1,46 @@
+import { NativeModule, requireNativeModule } from 'expo-modules-core';
+import { SourceConfig } from '../source';
+import { OfflineDownloadRequest } from './offlineDownloadRequest';
+import { BitmovinNativeOfflineEventData } from './offlineContentManagerListener';
+
+export type OfflineModuleEvents = {
+  onBitmovinOfflineEvent: (event: BitmovinNativeOfflineEventData) => void;
+};
+
+/**
+ * Native OfflineModule using Expo modules API.
+ * Provides modern async/await interface while maintaining backward compatibility.
+ */
+declare class OfflineModule extends NativeModule<OfflineModuleEvents> {
+  initializeWithConfig(
+    nativeId: string,
+    config: { identifier: string; sourceConfig: SourceConfig },
+    drmNativeId: string | undefined
+  ): Promise<void>;
+
+  getState(nativeId: string): Promise<string>;
+
+  getOptions(nativeId: string): Promise<void>;
+
+  download(nativeId: string, request: OfflineDownloadRequest): Promise<void>;
+
+  resume(nativeId: string): Promise<void>;
+
+  suspend(nativeId: string): Promise<void>;
+
+  cancelDownload(nativeId: string): Promise<void>;
+
+  usedStorage(nativeId: string): Promise<number>;
+
+  deleteAll(nativeId: string): Promise<void>;
+
+  downloadLicense(nativeId: string): Promise<void>;
+
+  releaseLicense(nativeId: string): Promise<void>;
+
+  renewOfflineLicense(nativeId: string): Promise<void>;
+
+  release(nativeId: string): Promise<void>;
+}
+
+export default requireNativeModule<OfflineModule>('OfflineModule');

package/src/offline/offlineSourceOptions.ts

@@ -1,11 +1,11 @@
 /**
  * Object used configure how the native offline managers create and get offline source configurations
- * @platform Android, iOS
+ * @remarks Platform: Android, iOS
  */
 export interface OfflineSourceOptions {
   /**
    * Whether or not the player should restrict playback only to audio, video and subtitle tracks which are stored offline on the device. This has to be set to true if the device has no network access.
-   * @platform iOS
+   * @remarks Platform: iOS
    */
   restrictedToAssetCache?: boolean;
 }

package/src/offline/offlineState.ts

@@ -1,6 +1,6 @@
 /**
  * Contains the state an OfflineContentManager can have.
- * @platform Android, iOS
+ * @remarks Platform: Android, iOS
  */
 export enum OfflineState {
   /**

package/src/playbackConfig.ts

@@ -51,11 +51,10 @@ export interface PlaybackConfig {
    *
    * Default is `false`.
    *
-   * @note
-   * On Android, {@link MediaControlConfig.isEnabled} has to be `true` for
-   * background playback to work.
-   * @note
-   * On tvOS, background playback is only supported for audio-only content.
+   * @remarks
+   * - On Android, {@link MediaControlConfig.isEnabled} has to be `true` for
+   *   background playback to work.
+   * - On tvOS, background playback is only supported for audio-only content.
    *
    *  @example
    * ```
@@ -84,7 +83,7 @@ export interface PlaybackConfig {
   /**
    * Configures decoder behaviour.
    *
-   * @platform Android
+   * @remarks Platform: Android
    */
   decoderConfig?: DecoderConfig;
 }