rx-player 3.26.2 → 3.27.0-dev.20220317

package/src/errors/request_error.ts

@@ -50,7 +50,10 @@ export default class RequestError extends Error {
 
     this.name = "RequestError";
     this.url = url;
-    this.xhr = xhr;
+
+    if (xhr !== undefined) {
+      this.xhr = xhr;
+    }
     this.status = status;
     this.type = type;
     this.message = type;

package/src/experimental/index.ts

@@ -0,0 +1,5 @@
+import configHandler from "../config";
+
+export {
+  configHandler as config,
+};

package/src/experimental/tools/VideoThumbnailLoader/push_data.ts

@@ -24,6 +24,7 @@ export default function pushData(
                     adaptation: Adaptation;
                     representation: Representation;
                     segment: ISegment;
+                    chunkSize: number | undefined;
                     start: number;
                     end: number; },
   parsed: ISegmentParserParsedMediaChunk<Uint8Array | ArrayBuffer>,

package/src/experimental/tools/VideoThumbnailLoader/thumbnail_loader.ts

@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-import pinkie from "pinkie";
 import {
   catchError,
   combineLatest,
@@ -36,6 +35,7 @@ import createSegmentFetcher, {
 import log from "../../../log";
 import { ISegment } from "../../../manifest";
 import objectAssign from "../../../utils/object_assign";
+import PPromise from "../../../utils/promise";
 import { freeRequest } from "./create_request";
 import getCompleteSegmentId from "./get_complete_segment_id";
 import getContentInfos from "./get_content_infos";
@@ -52,9 +52,6 @@ import {
 } from "./types";
 import VideoThumbnailLoaderError from "./video_thumbnail_loader_error";
 
-const PPromise = typeof Promise === "function" ? Promise :
-                                                 pinkie;
-
 const MIN_NEEDED_DATA_AFTER_TIME = 2;
 
 interface ITimeSettingTask { contentInfos: IContentInfos;
@@ -75,8 +72,8 @@ export default class VideoThumbnailLoader {
   private readonly _videoElement: HTMLVideoElement;
 
   private _player: Player;
-  private _currentTask?: ITimeSettingTask;
-  private _nextTaskSegmentsCompleteIds?: string[];
+  private _currentTask : ITimeSettingTask | undefined;
+  private _nextTaskSegmentsCompleteIds : string[] | undefined;
   constructor(videoElement: HTMLVideoElement,
               player: Player) {
     this._videoElement = videoElement;
@@ -252,7 +249,8 @@ export default class VideoThumbnailLoader {
                   if (end === undefined) {
                     end = start + (segment.duration / segment.timescale);
                   }
-                  const inventoryInfos = objectAssign({ segment,
+                  const inventoryInfos = objectAssign({ chunkSize: data.chunkSize,
+                                                        segment,
                                                         start,
                                                         end }, contentInfos);
                   return pushData(inventoryInfos,

package/src/experimental/tools/mediaCapabilitiesProber/__tests__/probers/DRMInfos.test.ts

@@ -20,11 +20,8 @@
 /* eslint-disable @typescript-eslint/no-unsafe-call */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable @typescript-eslint/no-unsafe-return */
+/* eslint-disable no-restricted-properties */
 
-import {
-  map,
-  of as observableOf,
-} from "rxjs";
 import { ProberStatus } from "../../types";
 
 
@@ -81,7 +78,7 @@ describe("MediaCapabilitiesProber probers - DRMInfos", () => {
       },
     };
     const mockRequestMediaKeySystemAccess = jest.fn(() => {
-      return observableOf({
+      return Promise.resolve({
         getConfiguration: () => ({}),
       });
     });
@@ -114,11 +111,7 @@ describe("MediaCapabilitiesProber probers - DRMInfos", () => {
     };
     const mockRequestMediaKeySystemAccess = jest.fn(
       () => {
-        return observableOf(null).pipe(
-          map(() => {
-            throw new Error();
-          })
-        );
+        return Promise.reject(new Error());
       }
     );
     jest.mock("../../../../../compat", () => ({

package/src/experimental/tools/mediaCapabilitiesProber/__tests__/probers/HDCPPolicy.test.ts

@@ -20,8 +20,8 @@
 /* eslint-disable @typescript-eslint/no-unsafe-call */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable @typescript-eslint/no-unsafe-return */
+/* eslint-disable no-restricted-properties */
 
-import { of as observableOf } from "rxjs";
 import PPromise from "../../../../../utils/promise";
 import { ProberStatus } from "../../types";
 
@@ -60,7 +60,7 @@ describe("MediaCapabilitiesProber probers - HDCPPolicy", () => {
       return PPromise.resolve({});
     });
     const mockRequestMediaKeySystemAcces = jest.fn(() => {
-      return observableOf({
+      return Promise.resolve({
         createMediaKeys: mockCreateMediaKeys,
       });
     });
@@ -90,7 +90,7 @@ describe("MediaCapabilitiesProber probers - HDCPPolicy", () => {
       });
     });
     const mockRequestMediaKeySystemAcces = jest.fn(() => {
-      return observableOf({
+      return Promise.resolve({
         createMediaKeys: mockCreateMediaKeys,
       });
     });
@@ -120,7 +120,7 @@ describe("MediaCapabilitiesProber probers - HDCPPolicy", () => {
       });
     });
     const mockRequestMediaKeySystemAcces = jest.fn(() => {
-      return observableOf({
+      return Promise.resolve({
         createMediaKeys: mockCreateMediaKeys,
       });
     });

package/src/experimental/tools/mediaCapabilitiesProber/api/index.ts

@@ -127,7 +127,7 @@ const mediaCapabilitiesProber = {
     }>
   ) : Promise<ICompatibleKeySystem[]> {
     const promises: Array<Promise<{ globalStatus: ProberStatus;
-                                    result? : ICompatibleKeySystem; }>> = [];
+                                    result? : ICompatibleKeySystem | undefined; }>> = [];
     configurations.forEach((configuration) => {
       const globalConfig = {
         keySystem: configuration,

package/src/experimental/tools/mediaCapabilitiesProber/api/probeMediaConfiguration.ts

@@ -36,7 +36,7 @@ export interface IProbedMediaConfiguration {
   globalStatus: ProberStatus;
   resultsFromAPIS: Array<{
     APIName: ICapabilitiesTypes;
-    result?: IResultsFromAPI;
+    result?: IResultsFromAPI | undefined;
   }>;
 }
 
@@ -63,7 +63,7 @@ function probeMediaConfiguration(
   let globalStatus : ProberStatus|undefined;
   const resultsFromAPIS: Array<{
     APIName: ICapabilitiesTypes;
-    result?: IResultsFromAPI;
+    result: IResultsFromAPI | undefined;
   }> = [];
   const promises = [];
   for (const browserAPI of browserAPIS) {
@@ -103,7 +103,7 @@ function probeMediaConfiguration(
   }
 
   return PPromise.all(promises).then(() => {
-    if (globalStatus == null) {
+    if (globalStatus === undefined) {
       globalStatus = ProberStatus.Unknown;
     }
 

package/src/experimental/tools/mediaCapabilitiesProber/probers/DRMInfos.ts

@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-import { lastValueFrom } from "rxjs";
 import { requestMediaKeySystemAccess } from "../../../../compat";
 import PPromise from "../../../../utils/promise";
 import log from "../log";
@@ -55,7 +54,7 @@ export default function probeDRMInfos(
     return PPromise.resolve([ProberStatus.NotSupported, result]);
   }
 
-  return lastValueFrom(requestMediaKeySystemAccess(type, [configuration]))
+  return requestMediaKeySystemAccess(type, [configuration])
     .then((keySystemAccess) => {
       result.compatibleConfiguration = keySystemAccess.getConfiguration();
       const status : [ProberStatus, ICompatibleKeySystem?] =

package/src/experimental/tools/mediaCapabilitiesProber/probers/HDCPPolicy.ts

@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-import { lastValueFrom } from "rxjs";
 import { requestMediaKeySystemAccess } from "../../../../compat";
 import PPromise from "../../../../utils/promise";
 import {
@@ -61,7 +60,7 @@ export default function probeHDCPPolicy(
     }],
   };
 
-  return lastValueFrom(requestMediaKeySystemAccess(keySystem, [drmConfig]))
+  return requestMediaKeySystemAccess(keySystem, [drmConfig])
     .then((mediaKeysSystemAccess) => {
       return mediaKeysSystemAccess.createMediaKeys().then((mediaKeys) => {
         if (!("getStatusForPolicy" in mediaKeys)) {

package/src/experimental/tools/mediaCapabilitiesProber/types.ts

@@ -52,9 +52,9 @@ export interface IDisplayConfiguration {
 }
 
 export interface IMediaConfiguration {
-  type?: "media-source"|"file";
-  video?: IVideoConfiguration;
-  audio?: IAudioConfiguration;
+  type?: "media-source" | "file" | undefined;
+  video?: IVideoConfiguration | undefined;
+  audio?: IAudioConfiguration | undefined;
   keySystem?: IKeySystem;
   hdcp?: string;
   display?: IDisplayConfiguration;

package/src/features/__tests__/initialize_features.test.ts

@@ -93,7 +93,7 @@ describe("Features - initializeFeaturesObject", () => {
       nativeTextTracksParsers: {},
       htmlTextTracksBuffer: null,
       htmlTextTracksParsers: {},
-      emeManager: null,
+      ContentDecryptor: null,
       directfile: null,
     };
     jest.mock("../features_object", () => ({
@@ -113,7 +113,7 @@ describe("Features - initializeFeaturesObject", () => {
         js: require("../../parsers/manifest/dash/js-parser").default,
         wasm: null,
       },
-      emeManager: require("../../core/eme/index").default,
+      ContentDecryptor: require("../../core/decrypt/index").default,
       directfile: {
         initDirectFile: require("../../core/init/initialize_directfile").default,
         mediaElementTrackChoiceManager:

package/src/features/features_object.ts

@@ -23,7 +23,7 @@ import { IFeaturesObject } from "./types";
 const features : IFeaturesObject = { dashParsers: { wasm: null,
                                                     js: null },
                                      directfile: null,
-                                     emeManager: null,
+                                     ContentDecryptor: null,
                                      htmlTextTracksBuffer: null,
                                      htmlTextTracksParsers: {},
                                      imageBuffer: null,

package/src/features/initialize_features.ts

@@ -27,7 +27,7 @@ import features from "./features_object";
  */
 export default function initializeFeaturesObject() : void {
   if (__FEATURES__.EME === __FEATURES__.IS_ENABLED as number) {
-    features.emeManager = require("../core/eme/index.ts").default;
+    features.ContentDecryptor = require("../core/decrypt/index.ts").default;
   }
 
   if (__FEATURES__.BIF_PARSER === __FEATURES__.IS_ENABLED as number) {

package/src/features/list/__tests__/eme.test.ts

@@ -17,20 +17,20 @@
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 /* eslint-disable @typescript-eslint/no-unsafe-argument */
 
-import emeManager from "../../../core/eme";
+import ContentDecryptor from "../../../core/decrypt";
 import addEMEFeature from "../eme";
 
-jest.mock("../../../core/eme", () => ({
+jest.mock("../../../core/decrypt", () => ({
   __esModule: true as const,
   default: jest.fn(),
 }));
 
 describe("Features list - EME", () => {
-  it("should add EME in the current features", () => {
+  it("should add the ContentDecryptor in the current features", () => {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const featureObject : any = {};
     addEMEFeature(featureObject);
-    expect(featureObject).toEqual({ emeManager });
-    expect(featureObject.emeManager).toBe(emeManager);
+    expect(featureObject).toEqual({ ContentDecryptor });
+    expect(featureObject.ContentDecryptor).toBe(ContentDecryptor);
   });
 });

package/src/features/list/eme.ts

@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-import EMEManager from "../../core/eme";
+import ContentDecryptor from "../../core/decrypt";
 import { IFeaturesObject } from "../types";
 
 /**
  * Add ability to play encrypted contents
  * @param {Object} features
  */
-function addEMEManagerFeature(features : IFeaturesObject) : void {
-  features.emeManager = EMEManager;
+function addEMEFeature(features : IFeaturesObject) : void {
+  features.ContentDecryptor = ContentDecryptor;
 }
 
-export { addEMEManagerFeature as EME };
-export default addEMEManagerFeature;
+export { addEMEFeature as EME };
+export default addEMEFeature;

package/src/features/types.ts

@@ -17,11 +17,7 @@
 import { Observable } from "rxjs";
 // eslint-disable-next-line max-len
 import MediaElementTrackChoiceManager from "../core/api/media_element_track_choice_manager";
-import {
-  IContentProtection,
-  IEMEManagerEvent,
-  IKeySystemOption,
-} from "../core/eme";
+import type ContentDecryptor from "../core/decrypt";
 import {
   IDirectfileEvent,
   IDirectFileOptions,
@@ -41,10 +37,7 @@ import { ITransportFunction } from "../transports";
 export type IDirectFileInit = (args : IDirectFileOptions) =>
                                 Observable<IDirectfileEvent>;
 
-export type IEMEManager = (mediaElement : HTMLMediaElement,
-                           keySystems: IKeySystemOption[],
-                           contentProtections$ : Observable<IContentProtection>) =>
-                             Observable<IEMEManagerEvent>;
+export type IContentDecryptorClass = typeof ContentDecryptor;
 
 export type IHTMLTextTracksBuffer =
   new(mediaElement : HTMLMediaElement,
@@ -89,7 +82,7 @@ export interface IFeaturesObject {
   directfile : { initDirectFile: IDirectFileInit;
                  mediaElementTrackChoiceManager : IMediaElementTrackChoiceManager; } |
                null;
-  emeManager : IEMEManager|null;
+  ContentDecryptor : IContentDecryptorClass|null;
   htmlTextTracksBuffer : IHTMLTextTracksBuffer|null;
   htmlTextTracksParsers : Partial<Record<string, IHTMLTextTracksParserFn>>;
   imageBuffer : IImageBuffer|null;

package/src/manifest/adaptation.ts

@@ -109,16 +109,18 @@ export default class Adaptation {
    * @param {Object|undefined} [options]
    */
   constructor(parsedAdaptation : IParsedAdaptation, options : {
-    representationFilter? : IRepresentationFilter;
-    isManuallyAdded? : boolean;
+    representationFilter? : IRepresentationFilter | undefined;
+    isManuallyAdded? : boolean | undefined;
   } = {}) {
     const { trickModeTracks } = parsedAdaptation;
     const { representationFilter, isManuallyAdded } = options;
     this.id = parsedAdaptation.id;
-    this.isTrickModeTrack = parsedAdaptation.isTrickModeTrack;
-
     this.type = parsedAdaptation.type;
 
+    if  (parsedAdaptation.isTrickModeTrack !== undefined) {
+      this.isTrickModeTrack = parsedAdaptation.isTrickModeTrack;
+    }
+
     if (parsedAdaptation.language !== undefined) {
       this.language = parsedAdaptation.language;
       this.normalizedLanguage = normalizeLanguage(parsedAdaptation.language);

package/src/manifest/manifest.ts

@@ -14,13 +14,11 @@
  * limitations under the License.
  */
 
-import { IInitializationDataInfo } from "../core/eme";
 import {
   ICustomError,
   MediaError,
 } from "../errors";
 import { IParsedManifest } from "../parsers/manifest";
-import areArraysOfNumbersEqual from "../utils/are_arrays_of_numbers_equal";
 import arrayFind from "../utils/array_find";
 import EventEmitter from "../utils/event_emitter";
 import idGenerator from "../utils/id_generator";
@@ -83,18 +81,18 @@ interface ISupplementaryTextTrack {
 interface IManifestParsingOptions {
   /* eslint-disable import/no-deprecated */
   /** Text tracks to add manually to the Manifest instance. */
-  supplementaryTextTracks? : ISupplementaryTextTrack[];
+  supplementaryTextTracks? : ISupplementaryTextTrack[] | undefined;
   /** Image tracks to add manually to the Manifest instance. */
-  supplementaryImageTracks? : ISupplementaryImageTrack[];
+  supplementaryImageTracks? : ISupplementaryImageTrack[] | undefined;
   /* eslint-enable import/no-deprecated */
   /** External callback peforming an automatic filtering of wanted Representations. */
-  representationFilter? : IRepresentationFilter;
+  representationFilter? : IRepresentationFilter | undefined;
   /** Optional URL that points to a shorter version of the Manifest used
    * for updates only. When using this URL for refresh, the manifest will be
    * updated with the partial update type. If this URL is undefined, then the
    * manifest will be updated fully when it needs to be refreshed, and it will
    * fetched through the original URL. */
-  manifestUpdateUrl? : string;
+  manifestUpdateUrl? : string | undefined;
 }
 
 /** Representation affected by a `decipherabilityUpdate` event. */
@@ -197,7 +195,7 @@ export default class Manifest extends EventEmitter<IManifestEvents> {
 
   /** Optional URL that points to a shorter version of the Manifest used
    * for updates only. */
-  public updateUrl?: string;
+  public updateUrl : string | undefined;
 
   /**
    * Suggested delay from the "live edge" (i.e. the position corresponding to
@@ -205,7 +203,7 @@ export default class Manifest extends EventEmitter<IManifestEvents> {
    * from.
    * This only applies to live contents.
    */
-  public suggestedPresentationDelay? : number;
+  public suggestedPresentationDelay : number | undefined;
 
   /**
    * Amount of time, in seconds, this Manifest is valid from the time when it
@@ -213,7 +211,7 @@ export default class Manifest extends EventEmitter<IManifestEvents> {
    * If no lifetime is set, this Manifest does not become invalid after an
    * amount of time.
    */
-  public lifetime? : number;
+  public lifetime : number | undefined;
 
   /**
    * Minimum time, in seconds, at which a segment defined in the Manifest
@@ -221,14 +219,14 @@ export default class Manifest extends EventEmitter<IManifestEvents> {
    * This is also used as an offset for live content to apply to a segment's
    * time.
    */
-  public availabilityStartTime? : number;
+  public availabilityStartTime : number | undefined;
 
   /**
    * It specifies the wall-clock time when the manifest was generated and published
    * at the origin server. It is present in order to identify different versions
    * of manifest instances.
    */
-  public publishTime?: number;
+  public publishTime: number | undefined;
 
   /**
    * Array containing every minor errors that happened when the Manifest has
@@ -271,7 +269,7 @@ export default class Manifest extends EventEmitter<IManifestEvents> {
      *      segment, and `timeshiftDepth` would be the whole depth that will
      *      become available once enough segments have been generated.
      */
-    absoluteMinimumTime? : number;
+    absoluteMinimumTime? : number | undefined;
     /**
      * Some dynamic contents have the concept of a "window depth" (or "buffer
      * depth") which allows to set a minimum position for all reachable
@@ -502,73 +500,10 @@ export default class Manifest extends EventEmitter<IManifestEvents> {
    * changes performed.
    * @param {Object} keyUpdates
    */
-  public updateDeciperabilitiesBasedOnKeyIds(
-    { whitelistedKeyIds,
-      blacklistedKeyIDs } : { whitelistedKeyIds : Uint8Array[];
-                              blacklistedKeyIDs : Uint8Array[]; }
+  public updateRepresentationsDeciperability(
+    isDecipherableCb : (rep : Representation) => boolean | undefined
   ) : void {
-    const updates = updateDeciperability(this, (representation) => {
-      if (representation.decipherable === false ||
-          representation.contentProtections === undefined)
-      {
-        return representation.decipherable;
-      }
-      const contentKIDs = representation.contentProtections.keyIds;
-      for (let i = 0; i < contentKIDs.length; i++) {
-        const elt = contentKIDs[i];
-        for (let j = 0; j < blacklistedKeyIDs.length; j++) {
-          if (areArraysOfNumbersEqual(blacklistedKeyIDs[j], elt.keyId)) {
-            return false;
-          }
-        }
-        for (let j = 0; j < whitelistedKeyIds.length; j++) {
-          if (areArraysOfNumbersEqual(whitelistedKeyIds[j], elt.keyId)) {
-            return true;
-          }
-        }
-      }
-      return representation.decipherable;
-    });
-
-    if (updates.length > 0) {
-      this.trigger("decipherabilityUpdate", updates);
-    }
-  }
-
-  /**
-   * Look in the Manifest for Representations linked to the given content
-   * protection initialization data and mark them as being impossible to
-   * decrypt.
-   * Then trigger a "decipherabilityUpdate" event to notify everyone of the
-   * changes performed.
-   * @param {Object} initData
-   */
-  public addUndecipherableProtectionData(initData : IInitializationDataInfo) : void {
-    const updates = updateDeciperability(this, (representation) => {
-      if (representation.decipherable === false) {
-        return false;
-      }
-      const segmentProtections = representation.contentProtections?.initData ?? [];
-      for (let i = 0; i < segmentProtections.length; i++) {
-        if (initData.type === undefined ||
-            segmentProtections[i].type === initData.type)
-        {
-          const containedInitData = initData.values.every(undecipherableVal => {
-            return segmentProtections[i].values.some(currVal => {
-              return (undecipherableVal.systemId === undefined ||
-                      currVal.systemId === undecipherableVal.systemId) &&
-                     areArraysOfNumbersEqual(currVal.data,
-                                             undecipherableVal.data);
-            });
-          });
-          if (containedInitData) {
-            return false;
-          }
-        }
-      }
-      return representation.decipherable;
-    });
-
+    const updates = updateDeciperability(this, isDecipherableCb);
     if (updates.length > 0) {
       this.trigger("decipherabilityUpdate", updates);
     }
@@ -795,14 +730,9 @@ function updateDeciperability(
   isDecipherable : (rep : Representation) => boolean | undefined
 ) : IDecipherabilityUpdateElement[] {
   const updates : IDecipherabilityUpdateElement[] = [];
-  for (let i = 0; i < manifest.periods.length; i++) {
-    const period = manifest.periods[i];
-    const adaptations = period.getAdaptations();
-    for (let j = 0; j < adaptations.length; j++) {
-      const adaptation = adaptations[j];
-      const representations = adaptation.representations;
-      for (let k = 0; k < representations.length; k++) {
-        const representation = representations[k];
+  for (const period of manifest.periods) {
+    for (const adaptation of period.getAdaptations()) {
+      for (const representation of adaptation.representations) {
         const result = isDecipherable(representation);
         if (result !== representation.decipherable) {
           updates.push({ manifest, period, adaptation, representation });

package/src/manifest/period.ts

@@ -50,13 +50,13 @@ export default class Period {
    * Duration of this Period, in seconds.
    * `undefined` for still-running Periods.
    */
-  public duration? : number;
+  public duration : number | undefined;
 
   /**
    * Absolute end time of the Period, in seconds.
    * `undefined` for still-running Periods.
    */
-  public end? : number;
+  public end : number | undefined;
 
   /**
    * Array containing every errors that happened when the Period has been
@@ -74,7 +74,7 @@ export default class Period {
    */
   constructor(
     args : IParsedPeriod,
-    representationFilter? : IRepresentationFilter
+    representationFilter? : IRepresentationFilter | undefined
   ) {
     this.contentWarnings = [];
     this.id = args.id;