rx-player 3.25.2 → 3.26.3-dev.2022021400

package/src/core/api/track_choice_manager.ts

@@ -23,12 +23,13 @@ import { Subject } from "rxjs";
 import log from "../../log";
 import {
   Adaptation,
+  IHDRInformation,
   Period,
   Representation,
 } from "../../manifest";
-import { IHDRInformation } from "../../manifest/types";
 import arrayFind from "../../utils/array_find";
 import arrayIncludes from "../../utils/array_includes";
+import isNullOrUndefined from "../../utils/is_null_or_undefined";
 import normalizeLanguage from "../../utils/languages";
 import SortedList from "../../utils/sorted_list";
 import takeFirstSet from "../../utils/take_first_set";
@@ -62,7 +63,7 @@ interface IVideoTrackPreferenceObject {
  */
 interface ITMAudioRepresentation { id : string|number;
                                    bitrate : number;
-                                   codec? : string; }
+                                   codec? : string | undefined; }
 
 /** Audio track returned by the TrackChoiceManager. */
 export interface ITMAudioTrack { language : string;
@@ -84,11 +85,11 @@ export interface ITMTextTrack { language : string;
  */
 interface ITMVideoRepresentation { id : string|number;
                                    bitrate : number;
-                                   width? : number;
-                                   height? : number;
-                                   codec? : string;
-                                   frameRate? : string;
-                                   hdrInfo?: IHDRInformation; }
+                                   width? : number | undefined;
+                                   height? : number | undefined;
+                                   codec? : string | undefined;
+                                   frameRate? : string | undefined;
+                                   hdrInfo?: IHDRInformation | undefined; }
 
 /** Video track returned by the TrackChoiceManager. */
 export interface ITMVideoTrack { id : number|string;
@@ -133,10 +134,11 @@ type INormalizedPreferredAudioTrack = null |
 
 /** Audio track preference when it is not set to `null`. */
 interface INormalizedPreferredAudioTrackObject {
-  normalized? : string;
-  audioDescription? : boolean;
+  normalized? : string | undefined;
+  audioDescription? : boolean | undefined;
   codec? : { all: boolean;
-             test: RegExp; };
+             test: RegExp; } |
+           undefined;
 }
 
 /** Text track preference once normalized by the TrackChoiceManager. */
@@ -158,7 +160,7 @@ interface INormalizedPreferredTextTrackObject {
 function normalizeAudioTracks(
   tracks : IAudioTrackPreference[]
 ) : INormalizedPreferredAudioTrack[] {
-  return tracks.map(t => t == null ?
+  return tracks.map(t => t === null ?
     t :
     { normalized: t.language === undefined ? undefined :
                                              normalizeLanguage(t.language),
@@ -175,7 +177,7 @@ function normalizeAudioTracks(
 function normalizeTextTracks(
   tracks : ITextTrackPreference[]
 ) : INormalizedPreferredTextTrack[] {
-  return tracks.map(t => t == null ?
+  return tracks.map(t => t === null ?
     t :
     { normalized: normalizeLanguage(t.language),
       closedCaption: t.closedCaption });
@@ -322,9 +324,10 @@ export default class TrackChoiceManager {
   ) : void {
     const periodItem = getPeriodItem(this._periods, period);
     const adaptations = period.getSupportedAdaptations(bufferType);
-    if (periodItem != null) {
-      if (periodItem[bufferType] != null) {
-        log.warn(`TrackChoiceManager: ${bufferType} already added for period`, period);
+    if (periodItem !== undefined) {
+      if (periodItem[bufferType] !== undefined) {
+        log.warn(`TrackChoiceManager: ${bufferType} already added for period`,
+                 period.start);
         return;
       } else {
         periodItem[bufferType] = { adaptations, adaptation$ };
@@ -346,20 +349,22 @@ export default class TrackChoiceManager {
     period : Period
   ) : void {
     const periodIndex = findPeriodIndex(this._periods, period);
-    if (periodIndex == null) {
-      log.warn(`TrackChoiceManager: ${bufferType} not found for period`, period);
+    if (periodIndex === undefined) {
+      log.warn(`TrackChoiceManager: ${bufferType} not found for period`,
+               period.start);
       return;
     }
 
     const periodItem = this._periods.get(periodIndex);
-    if (periodItem[bufferType] == null) {
-      log.warn(`TrackChoiceManager: ${bufferType} already removed for period`, period);
+    if (periodItem[bufferType] === undefined) {
+      log.warn(`TrackChoiceManager: ${bufferType} already removed for period`,
+               period.start);
       return;
     }
     delete periodItem[bufferType];
-    if (periodItem.audio == null &&
-        periodItem.text == null &&
-        periodItem.video == null)
+    if (periodItem.audio === undefined &&
+        periodItem.text === undefined &&
+        periodItem.video === undefined)
     {
       this._periods.removeElement(periodItem);
     }
@@ -390,9 +395,9 @@ export default class TrackChoiceManager {
    */
   public setInitialAudioTrack(period : Period) : void {
     const periodItem = getPeriodItem(this._periods, period);
-    const audioInfos = periodItem != null ? periodItem.audio :
-                                            null;
-    if (audioInfos == null || periodItem == null) {
+    const audioInfos = periodItem !== undefined ? periodItem.audio :
+                                                  null;
+    if (isNullOrUndefined(audioInfos) || periodItem === undefined) {
       throw new Error("TrackChoiceManager: Given Period not found.");
     }
 
@@ -426,9 +431,9 @@ export default class TrackChoiceManager {
    */
   public setInitialTextTrack(period : Period) : void {
     const periodItem = getPeriodItem(this._periods, period);
-    const textInfos = periodItem != null ? periodItem.text :
-                                           null;
-    if (textInfos == null || periodItem == null) {
+    const textInfos = periodItem !== undefined ? periodItem.text :
+                                                 null;
+    if (isNullOrUndefined(textInfos) || periodItem === undefined) {
       throw new Error("TrackChoiceManager: Given Period not found.");
     }
 
@@ -460,9 +465,9 @@ export default class TrackChoiceManager {
    */
   public setInitialVideoTrack(period : Period) : void {
     const periodItem = getPeriodItem(this._periods, period);
-    const videoInfos = periodItem != null ? periodItem.video :
-                                            null;
-    if (videoInfos == null || periodItem == null) {
+    const videoInfos = periodItem !== undefined ? periodItem.video :
+                                                 null;
+    if (isNullOrUndefined(videoInfos) || periodItem === undefined) {
       throw new Error("TrackChoiceManager: Given Period not found.");
     }
 
@@ -506,9 +511,9 @@ export default class TrackChoiceManager {
    */
   public setAudioTrackByID(period : Period, wantedId : string) : void {
     const periodItem = getPeriodItem(this._periods, period);
-    const audioInfos = periodItem != null ? periodItem.audio :
-                                            null;
-    if (audioInfos == null) {
+    const audioInfos = periodItem !== undefined ? periodItem.audio :
+                                                  null;
+    if (isNullOrUndefined(audioInfos)) {
       throw new Error("TrackChoiceManager: Given Period not found.");
     }
 
@@ -534,9 +539,9 @@ export default class TrackChoiceManager {
    */
   public setTextTrackByID(period : Period, wantedId : string) : void {
     const periodItem = getPeriodItem(this._periods, period);
-    const textInfos = periodItem != null ? periodItem.text :
-                                           null;
-    if (textInfos == null) {
+    const textInfos = periodItem !== undefined ? periodItem.text :
+                                                 null;
+    if (isNullOrUndefined(textInfos)) {
       throw new Error("TrackChoiceManager: Given Period not found.");
     }
     const wantedAdaptation = arrayFind(textInfos.adaptations,
@@ -565,9 +570,9 @@ export default class TrackChoiceManager {
    */
   public setVideoTrackByID(period : Period, wantedId : string) : void {
     const periodItem = getPeriodItem(this._periods, period);
-    const videoInfos = periodItem != null ? periodItem.video :
-                                            null;
-    if (videoInfos == null) {
+    const videoInfos = periodItem !== undefined ? periodItem.video :
+                                                  null;
+    if (isNullOrUndefined(videoInfos)) {
       throw new Error("LanguageManager: Given Period not found.");
     }
 
@@ -594,9 +599,9 @@ export default class TrackChoiceManager {
    */
   public disableTextTrack(period : Period) : void {
     const periodItem = getPeriodItem(this._periods, period);
-    const textInfos = periodItem != null ? periodItem.text :
-                                           null;
-    if (textInfos == null) {
+    const textInfos = periodItem !== undefined ? periodItem.text :
+                                                 null;
+    if (isNullOrUndefined(textInfos)) {
       throw new Error("TrackChoiceManager: Given Period not found.");
     }
     const chosenTextAdaptation = this._textChoiceMemory.get(period);
@@ -662,14 +667,14 @@ export default class TrackChoiceManager {
    */
   public getChosenAudioTrack(period : Period) : ITMAudioTrack|null {
     const periodItem = getPeriodItem(this._periods, period);
-    const audioInfos = periodItem != null ? periodItem.audio :
-                                            null;
-    if (audioInfos == null) {
+    const audioInfos = periodItem !== undefined ? periodItem.audio :
+                                                  null;
+    if (isNullOrUndefined(audioInfos)) {
       return null;
     }
 
     const chosenTrack = this._audioChoiceMemory.get(period);
-    if (chosenTrack == null) {
+    if (isNullOrUndefined(chosenTrack)) {
       return null;
     }
 
@@ -698,14 +703,14 @@ export default class TrackChoiceManager {
    */
   public getChosenTextTrack(period : Period) : ITMTextTrack|null {
     const periodItem = getPeriodItem(this._periods, period);
-    const textInfos = periodItem != null ? periodItem.text :
-                                           null;
-    if (textInfos == null) {
+    const textInfos = periodItem !== undefined ? periodItem.text :
+                                                 null;
+    if (isNullOrUndefined(textInfos)) {
       return null;
     }
 
     const chosenTextAdaptation = this._textChoiceMemory.get(period);
-    if (chosenTextAdaptation == null) {
+    if (isNullOrUndefined(chosenTextAdaptation)) {
       return null;
     }
 
@@ -729,18 +734,14 @@ export default class TrackChoiceManager {
    */
   public getChosenVideoTrack(period : Period) : ITMVideoTrack|null {
     const periodItem = getPeriodItem(this._periods, period);
-    const videoInfos = periodItem != null ? periodItem.video :
-                                            null;
-    if (videoInfos == null) {
+    const videoInfos = periodItem !== undefined ? periodItem.video :
+                                                  null;
+    if (isNullOrUndefined(videoInfos)) {
       return null;
     }
 
     const chosenVideoAdaptation = this._videoChoiceMemory.get(period);
-    if (chosenVideoAdaptation === undefined) {
-      return null; // not set yet
-    }
-
-    if (chosenVideoAdaptation === null) {
+    if (isNullOrUndefined(chosenVideoAdaptation)) {
       return null;
     }
     const currAdaptation = chosenVideoAdaptation.adaptation;
@@ -783,15 +784,16 @@ export default class TrackChoiceManager {
    */
   public getAvailableAudioTracks(period : Period) : ITMAudioTrackListItem[] {
     const periodItem = getPeriodItem(this._periods, period);
-    const audioInfos = periodItem != null ? periodItem.audio :
-                                           null;
-    if (audioInfos == null) {
+    const audioInfos = periodItem !== undefined ? periodItem.audio :
+                                                  null;
+    if (isNullOrUndefined(audioInfos)) {
       return [];
     }
 
     const chosenAudioAdaptation = this._audioChoiceMemory.get(period);
-    const currentId = chosenAudioAdaptation != null ? chosenAudioAdaptation.id :
-                                                      null;
+    const currentId = !isNullOrUndefined(chosenAudioAdaptation) ?
+      chosenAudioAdaptation.id :
+      null;
 
     return audioInfos.adaptations
       .map((adaptation) => {
@@ -800,7 +802,8 @@ export default class TrackChoiceManager {
           normalized: takeFirstSet<string>(adaptation.normalizedLanguage, ""),
           audioDescription: adaptation.isAudioDescription === true,
           id: adaptation.id,
-          active: currentId == null ? false : currentId === adaptation.id,
+          active: currentId === null ? false :
+                                       currentId === adaptation.id,
           representations: adaptation.representations.map(parseAudioRepresentation),
         };
         if (adaptation.isDub === true) {
@@ -819,15 +822,16 @@ export default class TrackChoiceManager {
    */
   public getAvailableTextTracks(period : Period) : ITMTextTrackListItem[] {
     const periodItem = getPeriodItem(this._periods, period);
-    const textInfos = periodItem != null ? periodItem.text :
-                                           null;
-    if (textInfos == null) {
+    const textInfos = periodItem !== undefined ? periodItem.text :
+                                                 null;
+    if (isNullOrUndefined(textInfos)) {
       return [];
     }
 
     const chosenTextAdaptation = this._textChoiceMemory.get(period);
-    const currentId = chosenTextAdaptation != null ? chosenTextAdaptation.id :
-                                                    null;
+    const currentId = !isNullOrUndefined(chosenTextAdaptation) ?
+      chosenTextAdaptation.id :
+      null;
 
     return textInfos.adaptations
       .map((adaptation) => ({
@@ -835,8 +839,8 @@ export default class TrackChoiceManager {
         normalized: takeFirstSet<string>(adaptation.normalizedLanguage, ""),
         closedCaption: adaptation.isClosedCaption === true,
         id: adaptation.id,
-        active: currentId == null ? false :
-                                    currentId === adaptation.id,
+        active: currentId === null ? false :
+                                     currentId === adaptation.id,
       }));
   }
 
@@ -848,9 +852,9 @@ export default class TrackChoiceManager {
    */
   public getAvailableVideoTracks(period : Period) : ITMVideoTrackListItem[] {
     const periodItem = getPeriodItem(this._periods, period);
-    const videoInfos = periodItem != null ? periodItem.video :
-                                            null;
-    if (videoInfos == null) {
+    const videoInfos = periodItem !== undefined ? periodItem.video :
+                                                  null;
+    if (isNullOrUndefined(videoInfos)) {
       return [];
     }
 
@@ -940,7 +944,7 @@ export default class TrackChoiceManager {
       }
 
       const periodItem = this._periods.get(index);
-      if (periodItem.audio == null) {
+      if (isNullOrUndefined(periodItem.audio)) {
         // No audio choice for this period, check next one
         recursiveUpdateAudioTrack(index + 1);
         return;
@@ -994,7 +998,7 @@ export default class TrackChoiceManager {
       }
 
       const periodItem = this._periods.get(index);
-      if (periodItem.text == null) {
+      if (isNullOrUndefined(periodItem.text)) {
         // No text choice for this period, check next one
         recursiveUpdateTextTrack(index + 1);
         return;
@@ -1046,7 +1050,7 @@ export default class TrackChoiceManager {
       }
 
       const periodItem = this._periods.get(index);
-      if (periodItem.video == null) {
+      if (isNullOrUndefined(periodItem.video)) {
         // No video choice for this period, check next one
         recursiveUpdateVideoTrack(index + 1);
         return;

package/src/core/eme/__tests__/__global__/get_license.test.ts

@@ -23,8 +23,11 @@
 /* eslint-disable @typescript-eslint/restrict-template-expressions */
 /* eslint-disable no-restricted-properties */
 
-import { Subject } from "rxjs";
-import { takeUntil } from "rxjs/operators";
+import {
+  Subject,
+  takeUntil,
+} from "rxjs";
+import { ICustomError } from "../../../../errors";
 import { concat } from "../../../../utils/byte_parsing";
 import { IContentProtection } from "../../types";
 import {
@@ -337,20 +340,22 @@ function checkGetLicense(
   const initDataEvent = { type: "cenc", values: [ { systemId: "15", data: initData } ] };
   const kill$ = new Subject<void>();
   const challenge = formatFakeChallengeFromInitData(initData, "cenc");
-  function checkKeyLoadError(error : any) {
-    expect(error.name).toEqual("EncryptedMediaError");
-    expect(error.type).toEqual("ENCRYPTED_MEDIA_ERROR");
-    expect(error.code).toEqual("KEY_LOAD_ERROR");
-    expect(error.message).toEqual("AAAA");
+  function checkKeyLoadError(error : unknown) {
+    expect(error).toBeInstanceOf(Error);
+    expect((error as ICustomError).name).toEqual("EncryptedMediaError");
+    expect((error as ICustomError).type).toEqual("ENCRYPTED_MEDIA_ERROR");
+    expect((error as ICustomError).code).toEqual("KEY_LOAD_ERROR");
+    expect((error as ICustomError).message).toEqual("AAAA");
   }
 
   // == test ==
   const EMEManager = require("../../eme_manager").default;
   EMEManager(videoElt, ksConfig, initDataSubject)
     .pipe(takeUntil(kill$))
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     .subscribe((evt : any) => {
       if (evt.type === "created-media-keys") {
-        evt.value.attachMediaKeys$.next();
+        evt.value.canAttachMediaKeys.setValue(true);
       }
       eventsReceived++;
       // Those first three have been tested enough
@@ -393,7 +398,7 @@ function checkGetLicense(
         return;
       }
       throw new Error(`Unexpected event: ${evt.type}`);
-    }, (error : any) => {
+    }, (error : unknown) => {
       if (shouldFail) {
         checkKeyLoadError(error);
         expect(eventsReceived).toEqual(5);

package/src/core/eme/__tests__/__global__/init_data.test.ts

@@ -20,15 +20,15 @@
 /* eslint-disable @typescript-eslint/no-unsafe-call */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable @typescript-eslint/no-unsafe-return */
+/* eslint-disable @typescript-eslint/no-unsafe-argument */
 /* eslint-disable @typescript-eslint/restrict-template-expressions */
+/* eslint-disable @typescript-eslint/no-explicit-any */
 
 import {
   EMPTY,
-  // of as observableOf,
   Subject,
-  // throwError as observableThrow,
+  takeUntil,
 } from "rxjs";
-import { takeUntil } from "rxjs/operators";
 import { IEncryptedEventData } from "../../../../compat/eme";
 import { IContentProtection } from "../../types";
 import {
@@ -82,7 +82,7 @@ describe("core - eme - global tests - init data", () => {
         switch (++eventsReceived) {
           case 1:
             expect(evt.type).toEqual("created-media-keys");
-            evt.value.attachMediaKeys$.next();
+            evt.value.canAttachMediaKeys.setValue(true);
             break;
           case 2:
             expect(evt.type).toEqual("attached-media-keys");
@@ -134,7 +134,7 @@ describe("core - eme - global tests - init data", () => {
         switch (++eventsReceived) {
           case 1:
             expect(evt.type).toEqual("created-media-keys");
-            evt.value.attachMediaKeys$.next();
+            evt.value.canAttachMediaKeys.setValue(true);
             break;
           case 2:
             expect(evt.type).toEqual("attached-media-keys");
@@ -208,7 +208,7 @@ describe("core - eme - global tests - init data", () => {
         switch (++eventsReceived) {
           case 1:
             expect(evt.type).toEqual("created-media-keys");
-            evt.value.attachMediaKeys$.next();
+            evt.value.canAttachMediaKeys.setValue(true);
             break;
           case 2:
             expect(evt.type).toEqual("attached-media-keys");
@@ -302,7 +302,7 @@ describe("core - eme - global tests - init data", () => {
         switch (++eventsReceived) {
           case 1:
             expect(evt.type).toEqual("created-media-keys");
-            evt.value.attachMediaKeys$.next();
+            evt.value.canAttachMediaKeys.setValue(true);
             break;
           case 2:
             expect(evt.type).toEqual("attached-media-keys");
@@ -395,7 +395,7 @@ describe("core - eme - global tests - init data", () => {
             break;
           case 2:
             expect(evt.type).toEqual("created-media-keys");
-            evt.value.attachMediaKeys$.next();
+            evt.value.canAttachMediaKeys.setValue(true);
             break;
           case 3:
             expect(evt.type).toEqual("attached-media-keys");
@@ -457,7 +457,7 @@ describe("core - eme - global tests - init data", () => {
             break;
           case 5:
             expect(evt.type).toEqual("created-media-keys");
-            evt.value.attachMediaKeys$.next();
+            evt.value.canAttachMediaKeys.setValue(true);
             break;
           case 6:
             expect(evt.type).toEqual("attached-media-keys");
@@ -552,7 +552,7 @@ describe("core - eme - global tests - init data", () => {
           case 5: checkEncryptedEventReceived(evt, initDataEvent2, 5); break;
           case 6:
             expect(evt.type).toEqual("created-media-keys");
-            evt.value.attachMediaKeys$.next();
+            evt.value.canAttachMediaKeys.setValue(true);
             break;
           case 7: expect(evt.type).toEqual("attached-media-keys"); break;
           case 8:
@@ -667,7 +667,7 @@ describe("core - eme - global tests - init data", () => {
           case 4: checkEncryptedEventReceived(evt, initDataEvent4, 4); break;
           case 5:
             expect(evt.type).toEqual("created-media-keys");
-            evt.value.attachMediaKeys$.next();
+            evt.value.canAttachMediaKeys.setValue(true);
             break;
           case 6: expect(evt.type).toEqual("attached-media-keys"); break;
           case 7:
@@ -777,7 +777,7 @@ describe("core - eme - global tests - init data", () => {
           case 1: checkEncryptedEventReceived(evt, initDataEvent1, 1); break;
           case 2:
             expect(evt.type).toEqual("created-media-keys");
-            evt.value.attachMediaKeys$.next();
+            evt.value.canAttachMediaKeys.setValue(true);
             break;
           case 3:
             expect(evt.type).toEqual("attached-media-keys");

package/src/core/eme/__tests__/__global__/media_key_system_access.test.ts

@@ -20,15 +20,17 @@
 /* eslint-disable @typescript-eslint/no-unsafe-call */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable @typescript-eslint/no-unsafe-return */
+/* eslint-disable @typescript-eslint/no-unsafe-argument */
+/* eslint-disable @typescript-eslint/no-explicit-any */
 
 import {
   EMPTY,
   Observable,
   of as observableOf,
   Subject,
+  takeUntil,
   throwError as observableThrow,
 } from "rxjs";
-import { takeUntil } from "rxjs/operators";
 import { ICustomMediaKeySystemAccess } from "../../../../compat";
 import {
   defaultKSConfig,

package/src/core/eme/__tests__/__global__/media_keys.test.ts

@@ -20,18 +20,16 @@
 /* eslint-disable @typescript-eslint/no-unsafe-call */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable @typescript-eslint/no-unsafe-return */
+/* eslint-disable @typescript-eslint/no-explicit-any */
 /* eslint-disable no-restricted-properties */
 
 import {
   EMPTY,
   of as observableOf,
   Subject,
-  // throwError as observableThrow,
-} from "rxjs";
-import {
   take,
   takeUntil,
-} from "rxjs/operators";
+} from "rxjs";
 import {
   MediaKeysImpl,
   MediaKeySystemAccessImpl,
@@ -143,7 +141,7 @@ describe("core - eme - global tests - media key system access", () => {
       .subscribe((evt : any) => {
         eventsReceived++;
         expect(evt.type).toEqual("created-media-keys");
-        evt.value.attachMediaKeys$.next();
+        evt.value.canAttachMediaKeys.setValue(true);
         setTimeout(() => {
           expect(eventsReceived).toEqual(1);
           expect(setMediaKeysSpy).toHaveBeenCalledTimes(1);
@@ -172,7 +170,7 @@ describe("core - eme - global tests - media key system access", () => {
         switch (++eventsReceived) {
           case 1:
             expect(evt.type).toEqual("created-media-keys");
-            evt.value.attachMediaKeys$.next();
+            evt.value.canAttachMediaKeys.setValue(true);
             break;
           case 2:
             expect(evt.type).toEqual("attached-media-keys");
@@ -206,7 +204,7 @@ describe("core - eme - global tests - media key system access", () => {
         switch (++eventsReceived) {
           case 1:
             expect(evt.type).toEqual("created-media-keys");
-            evt.value.attachMediaKeys$.next();
+            evt.value.canAttachMediaKeys.setValue(true);
             break;
           case 2:
             expect(evt.type).toEqual("attached-media-keys");
@@ -249,7 +247,7 @@ describe("core - eme - global tests - media key system access", () => {
         switch (++eventsReceived) {
           case 1:
             expect(evt.type).toEqual("created-media-keys");
-            evt.value.attachMediaKeys$.next();
+            evt.value.canAttachMediaKeys.setValue(true);
             break;
           case 2:
             expect(evt.type).toEqual("attached-media-keys");