react-native-theoplayer 8.11.0 → 8.12.0

package/src/internal/adapter/WebEventForwarder.ts

@@ -18,7 +18,7 @@ import type {
   VolumeChangeEvent as NativeVolumeChangeEvent,
   DimensionChangeEvent as NativeDimensionChangeEvent,
 } from 'theoplayer';
-import type { AdEvent, MediaTrack, TextTrack, TimeRange } from 'react-native-theoplayer';
+import type { AdEvent, MediaTrack, TimeRange } from 'react-native-theoplayer';
 import {
   AdEventType,
   CastState,
@@ -267,7 +267,7 @@ export class WebEventForwarder {
     track.addEventListener('removecue', this.onRemoveTextTrackCue(track));
     track.addEventListener('entercue', this.onEnterTextTrackCue(track));
     track.addEventListener('exitcue', this.onExitTextTrackCue(track));
-    this._facade.dispatchEvent(new DefaultTextTrackListEvent(TrackListEventType.ADD_TRACK, track as TextTrack));
+    this._facade.dispatchEvent(new DefaultTextTrackListEvent(TrackListEventType.ADD_TRACK, fromNativeTextTrack(track)));
   };
 
   private readonly onRemoveTextTrack = (event: RemoveTrackEvent) => {
@@ -276,11 +276,11 @@ export class WebEventForwarder {
     track.removeEventListener('removecue', this.onRemoveTextTrackCue(track));
     track.removeEventListener('entercue', this.onEnterTextTrackCue(track));
     track.removeEventListener('exitcue', this.onExitTextTrackCue(track));
-    this._facade.dispatchEvent(new DefaultTextTrackListEvent(TrackListEventType.REMOVE_TRACK, track as NativeTextTrack as TextTrack));
+    this._facade.dispatchEvent(new DefaultTextTrackListEvent(TrackListEventType.REMOVE_TRACK, fromNativeTextTrack(track)));
   };
 
   private readonly onChangeTextTrack = (event: TrackChangeEvent) => {
-    this._facade.dispatchEvent(new DefaultTextTrackListEvent(TrackListEventType.CHANGE_TRACK, event.track as NativeTextTrack as TextTrack));
+    this._facade.dispatchEvent(new DefaultTextTrackListEvent(TrackListEventType.CHANGE_TRACK, fromNativeTextTrack(event.track as NativeTextTrack)));
   };
 
   private readonly onAddAudioTrack = (event: AddTrackEvent) => {

package/src/internal/adapter/event/DefaultEventDispatcher.ts

@@ -1,17 +1,25 @@
-import type { EventDispatcher, EventMap, StringKeyOf } from '../../../api/event/EventDispatcher';
-import type { EventListener } from '../../../api/event/EventListener';
+import type { EventDispatcher, EventMap, StringKeyOf } from 'react-native-theoplayer';
+import type { EventListener } from 'react-native-theoplayer';
 import { arrayRemoveElement } from '../../utils/arrayUtil';
 
 export class DefaultEventDispatcher<TMap extends EventMap<StringKeyOf<TMap>>> implements EventDispatcher<TMap> {
   readonly _eventListeners: Map<StringKeyOf<TMap>, EventListener<TMap[StringKeyOf<TMap>]>[]> = new Map();
 
-  addEventListener<K extends StringKeyOf<TMap>>(type: K, listener: EventListener<TMap[K]>): void {
+  addEventListener<K extends StringKeyOf<TMap>>(type: K | readonly K[], listener: EventListener<TMap[K]>): void {
+    if (typeof listener !== 'function') {
+      return;
+    } else if (Array.isArray(type)) {
+      type.forEach((t) => this.addSingleEventListener(t, listener));
+    } else {
+      this.addSingleEventListener(type as K, listener);
+    }
+  }
+
+  private addSingleEventListener<K extends StringKeyOf<TMap>>(type: K, listener: EventListener<TMap[K]>): void {
     if (!this._eventListeners.has(type)) {
-      // @ts-ignore
-      this._eventListeners.set(type, [listener]);
+      this._eventListeners.set(type, [listener as EventListener<TMap[StringKeyOf<TMap>]>]);
     } else {
-      // @ts-ignore
-      this._eventListeners.get(type)?.push(listener);
+      this._eventListeners.get(type)?.push(listener as EventListener<TMap[StringKeyOf<TMap>]>);
     }
   }
 
@@ -26,7 +34,17 @@ export class DefaultEventDispatcher<TMap extends EventMap<StringKeyOf<TMap>>> im
     }
   };
 
-  removeEventListener<K extends StringKeyOf<TMap>>(type: K, listener: EventListener<TMap[K]>): void {
+  removeEventListener<K extends StringKeyOf<TMap>>(type: K | readonly K[], listener: EventListener<TMap[K]>): void {
+    if (typeof listener !== 'function') {
+      return;
+    } else if (Array.isArray(type)) {
+      type.forEach((t) => this.removeSingleEventListener(t, listener));
+    } else {
+      this.removeSingleEventListener(type as K, listener);
+    }
+  }
+
+  private removeSingleEventListener<K extends StringKeyOf<TMap>>(type: K, listener: EventListener<TMap[K]>): void {
     const listeners = this._eventListeners.get(type);
     if (listeners) {
       arrayRemoveElement(listeners, listener);

package/src/internal/adapter/web/WebPresentationModeManager.ts

@@ -66,8 +66,12 @@ export class WebPresentationModeManager {
   private prepareForPresentationModeChanges() {
     const elements = this._player.element.children;
     for (const element of Array.from(elements)) {
-      if (element.tagName === 'VIDEO' && element.attributes.getNamedItem('src') !== null) {
-        this._element = element as HTMLVideoElement;
+      if (element.tagName === 'VIDEO') {
+        const videoElement = element as HTMLVideoElement;
+        if ((videoElement.src !== null && videoElement.src !== '') || videoElement.srcObject !== null) {
+          this._element = videoElement;
+          break;
+        }
       }
     }
     // listen for pip updates on element

package/src/manifest.json

@@ -1 +1 @@
-{"version":"8.11.0","buildDate":"2024-12-13T11:03:38.635Z"}
+{"version":"8.12.0","buildDate":"2025-01-09T15:09:23.405Z"}

package/lib/commonjs/internal/utils/ServiceWorkerUtils.js

@@ -1,44 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.browserCanPlayHLSAndHasNoMSE = browserCanPlayHLSAndHasNoMSE;
-exports.maybeUnregisterServiceWorker = maybeUnregisterServiceWorker;
-exports.registerServiceWorker = registerServiceWorker;
-function browserCanPlayHLSAndHasNoMSE() {
-  const videoElement = document.createElement('video');
-  const canPlayHls = videoElement && videoElement.canPlayType && videoElement.canPlayType('application/vnd.apple.mpegURL') !== '';
-  // @ts-ignore
-  const canPlayMse = Boolean(window.MediaSource || window.WebKitMediaSource || window.ManagedMediaSource);
-  return canPlayHls && !canPlayMse;
-}
-async function registerServiceWorker(libraryLocation) {
-  if ('serviceWorker' in navigator) {
-    try {
-      const serviceWorkerName = 'theoplayer.sw.js';
-      const serviceWorkerPath = libraryLocation ? (libraryLocation.endsWith('/') ? libraryLocation : `${libraryLocation}/`) + serviceWorkerName : serviceWorkerName;
-      const serviceWorkerScope = libraryLocation ? libraryLocation.endsWith('/') ? libraryLocation : `${libraryLocation}/` : '/';
-
-      // unregister beforehand to solve an issue when doing a hard reload of the page causing the service worker to not intercept the manifests.
-      await maybeUnregisterServiceWorker(serviceWorkerPath);
-      await navigator.serviceWorker.register(serviceWorkerPath, {
-        scope: serviceWorkerScope
-      });
-      //console.log('Successfully registered server worker');
-    } catch (error) {
-      console.error(`Service worker registration failed: ${error}`);
-    }
-  }
-}
-async function maybeUnregisterServiceWorker(serviceWorkerPath) {
-  if ('serviceWorker' in navigator) {
-    try {
-      const registration = await navigator.serviceWorker.getRegistration(serviceWorkerPath);
-      await registration?.unregister();
-    } catch (error) {
-      console.error(`Service worker unregistration failed: ${error}`);
-    }
-  }
-}
-//# sourceMappingURL=ServiceWorkerUtils.js.map

package/lib/commonjs/internal/utils/ServiceWorkerUtils.js.map

@@ -1 +0,0 @@
-{"version":3,"names":["browserCanPlayHLSAndHasNoMSE","videoElement","document","createElement","canPlayHls","canPlayType","canPlayMse","Boolean","window","MediaSource","WebKitMediaSource","ManagedMediaSource","registerServiceWorker","libraryLocation","navigator","serviceWorkerName","serviceWorkerPath","endsWith","serviceWorkerScope","maybeUnregisterServiceWorker","serviceWorker","register","scope","error","console","registration","getRegistration","unregister"],"sourceRoot":"../../../../src","sources":["internal/utils/ServiceWorkerUtils.ts"],"mappings":";;;;;;;;AAAO,SAASA,4BAA4BA,CAAA,EAAG;EAC7C,MAAMC,YAAY,GAAGC,QAAQ,CAACC,aAAa,CAAC,OAAO,CAAC;EACpD,MAAMC,UAAU,GAAGH,YAAY,IAAIA,YAAY,CAACI,WAAW,IAAIJ,YAAY,CAACI,WAAW,CAAC,+BAA+B,CAAC,KAAK,EAAE;EAC/H;EACA,MAAMC,UAAU,GAAGC,OAAO,CAACC,MAAM,CAACC,WAAW,IAAID,MAAM,CAACE,iBAAiB,IAAIF,MAAM,CAACG,kBAAkB,CAAC;EACvG,OAAOP,UAAU,IAAI,CAACE,UAAU;AAClC;AAEO,eAAeM,qBAAqBA,CAACC,eAAwB,EAAiB;EACnF,IAAI,eAAe,IAAIC,SAAS,EAAE;IAChC,IAAI;MACF,MAAMC,iBAAiB,GAAG,kBAAkB;MAC5C,MAAMC,iBAAiB,GAAGH,eAAe,GACrC,CAACA,eAAe,CAACI,QAAQ,CAAC,GAAG,CAAC,GAAGJ,eAAe,GAAG,GAAGA,eAAe,GAAG,IAAIE,iBAAiB,GAC7FA,iBAAiB;MACrB,MAAMG,kBAAkB,GAAGL,eAAe,GAAIA,eAAe,CAACI,QAAQ,CAAC,GAAG,CAAC,GAAGJ,eAAe,GAAG,GAAGA,eAAe,GAAG,GAAI,GAAG;;MAE5H;MACA,MAAMM,4BAA4B,CAACH,iBAAiB,CAAC;MACrD,MAAMF,SAAS,CAACM,aAAa,CAACC,QAAQ,CAACL,iBAAiB,EAAE;QACxDM,KAAK,EAAEJ;MACT,CAAC,CAAC;MACF;IACF,CAAC,CAAC,OAAOK,KAAK,EAAE;MACdC,OAAO,CAACD,KAAK,CAAC,uCAAuCA,KAAK,EAAE,CAAC;IAC/D;EACF;AACF;AAEO,eAAeJ,4BAA4BA,CAACH,iBAA0B,EAAiB;EAC5F,IAAI,eAAe,IAAIF,SAAS,EAAE;IAChC,IAAI;MACF,MAAMW,YAAY,GAAG,MAAMX,SAAS,CAACM,aAAa,CAACM,eAAe,CAACV,iBAAiB,CAAC;MACrF,MAAMS,YAAY,EAAEE,UAAU,CAAC,CAAC;IAClC,CAAC,CAAC,OAAOJ,KAAK,EAAE;MACdC,OAAO,CAACD,KAAK,CAAC,yCAAyCA,KAAK,EAAE,CAAC;IACjE;EACF;AACF","ignoreList":[]}

package/lib/module/internal/utils/ServiceWorkerUtils.js

@@ -1,36 +0,0 @@
-export function browserCanPlayHLSAndHasNoMSE() {
-  const videoElement = document.createElement('video');
-  const canPlayHls = videoElement && videoElement.canPlayType && videoElement.canPlayType('application/vnd.apple.mpegURL') !== '';
-  // @ts-ignore
-  const canPlayMse = Boolean(window.MediaSource || window.WebKitMediaSource || window.ManagedMediaSource);
-  return canPlayHls && !canPlayMse;
-}
-export async function registerServiceWorker(libraryLocation) {
-  if ('serviceWorker' in navigator) {
-    try {
-      const serviceWorkerName = 'theoplayer.sw.js';
-      const serviceWorkerPath = libraryLocation ? (libraryLocation.endsWith('/') ? libraryLocation : `${libraryLocation}/`) + serviceWorkerName : serviceWorkerName;
-      const serviceWorkerScope = libraryLocation ? libraryLocation.endsWith('/') ? libraryLocation : `${libraryLocation}/` : '/';
-
-      // unregister beforehand to solve an issue when doing a hard reload of the page causing the service worker to not intercept the manifests.
-      await maybeUnregisterServiceWorker(serviceWorkerPath);
-      await navigator.serviceWorker.register(serviceWorkerPath, {
-        scope: serviceWorkerScope
-      });
-      //console.log('Successfully registered server worker');
-    } catch (error) {
-      console.error(`Service worker registration failed: ${error}`);
-    }
-  }
-}
-export async function maybeUnregisterServiceWorker(serviceWorkerPath) {
-  if ('serviceWorker' in navigator) {
-    try {
-      const registration = await navigator.serviceWorker.getRegistration(serviceWorkerPath);
-      await registration?.unregister();
-    } catch (error) {
-      console.error(`Service worker unregistration failed: ${error}`);
-    }
-  }
-}
-//# sourceMappingURL=ServiceWorkerUtils.js.map

package/lib/module/internal/utils/ServiceWorkerUtils.js.map

@@ -1 +0,0 @@
-{"version":3,"names":["browserCanPlayHLSAndHasNoMSE","videoElement","document","createElement","canPlayHls","canPlayType","canPlayMse","Boolean","window","MediaSource","WebKitMediaSource","ManagedMediaSource","registerServiceWorker","libraryLocation","navigator","serviceWorkerName","serviceWorkerPath","endsWith","serviceWorkerScope","maybeUnregisterServiceWorker","serviceWorker","register","scope","error","console","registration","getRegistration","unregister"],"sourceRoot":"../../../../src","sources":["internal/utils/ServiceWorkerUtils.ts"],"mappings":"AAAA,OAAO,SAASA,4BAA4BA,CAAA,EAAG;EAC7C,MAAMC,YAAY,GAAGC,QAAQ,CAACC,aAAa,CAAC,OAAO,CAAC;EACpD,MAAMC,UAAU,GAAGH,YAAY,IAAIA,YAAY,CAACI,WAAW,IAAIJ,YAAY,CAACI,WAAW,CAAC,+BAA+B,CAAC,KAAK,EAAE;EAC/H;EACA,MAAMC,UAAU,GAAGC,OAAO,CAACC,MAAM,CAACC,WAAW,IAAID,MAAM,CAACE,iBAAiB,IAAIF,MAAM,CAACG,kBAAkB,CAAC;EACvG,OAAOP,UAAU,IAAI,CAACE,UAAU;AAClC;AAEA,OAAO,eAAeM,qBAAqBA,CAACC,eAAwB,EAAiB;EACnF,IAAI,eAAe,IAAIC,SAAS,EAAE;IAChC,IAAI;MACF,MAAMC,iBAAiB,GAAG,kBAAkB;MAC5C,MAAMC,iBAAiB,GAAGH,eAAe,GACrC,CAACA,eAAe,CAACI,QAAQ,CAAC,GAAG,CAAC,GAAGJ,eAAe,GAAG,GAAGA,eAAe,GAAG,IAAIE,iBAAiB,GAC7FA,iBAAiB;MACrB,MAAMG,kBAAkB,GAAGL,eAAe,GAAIA,eAAe,CAACI,QAAQ,CAAC,GAAG,CAAC,GAAGJ,eAAe,GAAG,GAAGA,eAAe,GAAG,GAAI,GAAG;;MAE5H;MACA,MAAMM,4BAA4B,CAACH,iBAAiB,CAAC;MACrD,MAAMF,SAAS,CAACM,aAAa,CAACC,QAAQ,CAACL,iBAAiB,EAAE;QACxDM,KAAK,EAAEJ;MACT,CAAC,CAAC;MACF;IACF,CAAC,CAAC,OAAOK,KAAK,EAAE;MACdC,OAAO,CAACD,KAAK,CAAC,uCAAuCA,KAAK,EAAE,CAAC;IAC/D;EACF;AACF;AAEA,OAAO,eAAeJ,4BAA4BA,CAACH,iBAA0B,EAAiB;EAC5F,IAAI,eAAe,IAAIF,SAAS,EAAE;IAChC,IAAI;MACF,MAAMW,YAAY,GAAG,MAAMX,SAAS,CAACM,aAAa,CAACM,eAAe,CAACV,iBAAiB,CAAC;MACrF,MAAMS,YAAY,EAAEE,UAAU,CAAC,CAAC;IAClC,CAAC,CAAC,OAAOJ,KAAK,EAAE;MACdC,OAAO,CAACD,KAAK,CAAC,yCAAyCA,KAAK,EAAE,CAAC;IACjE;EACF;AACF","ignoreList":[]}

package/lib/typescript/internal/utils/ServiceWorkerUtils.d.ts

@@ -1,4 +0,0 @@
-export declare function browserCanPlayHLSAndHasNoMSE(): boolean;
-export declare function registerServiceWorker(libraryLocation?: string): Promise<void>;
-export declare function maybeUnregisterServiceWorker(serviceWorkerPath?: string): Promise<void>;
-//# sourceMappingURL=ServiceWorkerUtils.d.ts.map

package/lib/typescript/internal/utils/ServiceWorkerUtils.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"ServiceWorkerUtils.d.ts","sourceRoot":"","sources":["../../../../src/internal/utils/ServiceWorkerUtils.ts"],"names":[],"mappings":"AAAA,wBAAgB,4BAA4B,YAM3C;AAED,wBAAsB,qBAAqB,CAAC,eAAe,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAmBnF;AAED,wBAAsB,4BAA4B,CAAC,iBAAiB,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAS5F"}

package/src/internal/utils/ServiceWorkerUtils.ts

@@ -1,39 +0,0 @@
-export function browserCanPlayHLSAndHasNoMSE() {
-  const videoElement = document.createElement('video');
-  const canPlayHls = videoElement && videoElement.canPlayType && videoElement.canPlayType('application/vnd.apple.mpegURL') !== '';
-  // @ts-ignore
-  const canPlayMse = Boolean(window.MediaSource || window.WebKitMediaSource || window.ManagedMediaSource);
-  return canPlayHls && !canPlayMse;
-}
-
-export async function registerServiceWorker(libraryLocation?: string): Promise<void> {
-  if ('serviceWorker' in navigator) {
-    try {
-      const serviceWorkerName = 'theoplayer.sw.js';
-      const serviceWorkerPath = libraryLocation
-        ? (libraryLocation.endsWith('/') ? libraryLocation : `${libraryLocation}/`) + serviceWorkerName
-        : serviceWorkerName;
-      const serviceWorkerScope = libraryLocation ? (libraryLocation.endsWith('/') ? libraryLocation : `${libraryLocation}/`) : '/';
-
-      // unregister beforehand to solve an issue when doing a hard reload of the page causing the service worker to not intercept the manifests.
-      await maybeUnregisterServiceWorker(serviceWorkerPath);
-      await navigator.serviceWorker.register(serviceWorkerPath, {
-        scope: serviceWorkerScope,
-      });
-      //console.log('Successfully registered server worker');
-    } catch (error) {
-      console.error(`Service worker registration failed: ${error}`);
-    }
-  }
-}
-
-export async function maybeUnregisterServiceWorker(serviceWorkerPath?: string): Promise<void> {
-  if ('serviceWorker' in navigator) {
-    try {
-      const registration = await navigator.serviceWorker.getRegistration(serviceWorkerPath);
-      await registration?.unregister();
-    } catch (error) {
-      console.error(`Service worker unregistration failed: ${error}`);
-    }
-  }
-}