rx-player 4.0.0-beta.2 → 4.0.0-beta.3

package/src/errors/error_message.ts

@@ -16,15 +16,10 @@
 
 /**
  * Generate a normalized error message.
- * @param {string} name
  * @param {string} code
  * @param {Error|string|Event|null} [reason]
  * @returns {string}
  */
-export default function errorMessage(
-  name : string,
-  code : string,
-  reason : string
-) : string {
-  return `${name} (${code}) ${reason}`;
+export default function errorMessage(code : string, reason : string) : string {
+  return `${code}: ${reason}`;
 }

package/src/errors/media_error.ts

@@ -61,7 +61,7 @@ export default class MediaError extends Error {
   public readonly type : "MEDIA_ERROR";
   public readonly message : string;
   public readonly code : IMediaErrorCode;
-  public readonly trackInfo : IMediaErrorTrackContext | undefined;
+  public readonly tracksInfo : IMediaErrorTrackContext[] | undefined;
   public fatal : boolean;
 
   /**
@@ -73,7 +73,7 @@ export default class MediaError extends Error {
     code : ICodeWithAdaptationType,
     reason : string,
     context: {
-      adaptation : Adaptation | undefined;
+      adaptations : Adaptation[] | undefined;
     }
   );
   constructor(
@@ -84,7 +84,7 @@ export default class MediaError extends Error {
     code : IMediaErrorCode,
     reason : string,
     context? : {
-      adaptation? : Adaptation | undefined;
+      adaptations? : Adaptation[] | undefined;
     } | undefined
   ) {
     super();
@@ -95,24 +95,30 @@ export default class MediaError extends Error {
     this.type = ErrorTypes.MEDIA_ERROR;
 
     this.code = code;
-    this.message = errorMessage(this.name, this.code, reason);
+    this.message = errorMessage(this.code, reason);
     this.fatal = false;
-    const adaptation = context?.adaptation;
-    if (adaptation !== undefined) {
-      switch (adaptation.type) {
-        case "audio":
-          this.trackInfo = { type: "audio",
-                             track: adaptation.toAudioTrack(false) };
-          break;
-        case "video":
-          this.trackInfo = { type: "video",
-                             track: adaptation.toVideoTrack(false) };
-          break;
-        case "text":
-          this.trackInfo = { type: "text",
-                             track: adaptation.toTextTrack() };
-          break;
-      }
+    const adaptations = context?.adaptations;
+    if (adaptations !== undefined && adaptations.length > 0) {
+      this.tracksInfo = adaptations.reduce((
+        acc: IMediaErrorTrackContext[],
+        adaptation: Adaptation
+      ) => {
+        switch (adaptation.type) {
+          case "audio":
+            acc.push({ type: "audio",
+                       track: adaptation.toAudioTrack(false) });
+            break;
+          case "video":
+            acc.push({ type: "video",
+                       track: adaptation.toVideoTrack(false) });
+            break;
+          case "text":
+            acc.push({ type: "text",
+                       track: adaptation.toTextTrack() });
+            break;
+        }
+        return acc;
+      }, []);
     }
   }
 }

package/src/errors/network_error.ts

@@ -56,7 +56,7 @@ export default class NetworkError extends Error {
     this.errorType = baseError.type;
 
     this.code = code;
-    this.message = errorMessage(this.name, this.code, baseError.message);
+    this.message = errorMessage(this.code, baseError.message);
     this.fatal = false;
   }
 

package/src/errors/other_error.ts

@@ -44,7 +44,7 @@ export default class OtherError extends Error {
     this.type = ErrorTypes.OTHER_ERROR;
 
     this.code = code;
-    this.message = errorMessage(this.name, this.code, reason);
+    this.message = errorMessage(this.code, reason);
     this.fatal = false;
   }
 }

package/src/errors/request_error.ts

@@ -50,6 +50,21 @@ export default class RequestError extends Error {
     this.url = url;
     this.status = status;
     this.type = type;
-    this.message = type;
+
+    switch (type) {
+      case "TIMEOUT":
+        this.message = "The request timed out";
+        break;
+      case "ERROR_EVENT":
+        this.message = "An error prevented the request to be performed successfully";
+        break;
+      case "PARSE_ERROR":
+        this.message = "An error happened while formatting the response data";
+        break;
+      case "ERROR_HTTP_CODE":
+        this.message = "An HTTP status code indicating failure was received: " +
+          String(this.status);
+        break;
+    }
   }
 }

package/src/experimental/features/__tests__/dash_wasm.test.ts

@@ -14,18 +14,11 @@
  * limitations under the License.
  */
 
-/* eslint-disable @typescript-eslint/no-unsafe-member-access */
-/* eslint-disable @typescript-eslint/no-unsafe-argument */
-
+import { IFeaturesObject } from "../../../features/types";
 import DashWasmParser from "../../../parsers/manifest/dash/wasm-parser";
 import DASHFeature from "../../../transports/dash";
 import dashWasmFeature from "../dash_wasm";
 
-jest.mock("../../../transports/dash", () => ({
-  __esModule: true as const,
-  default: jest.fn(),
-}));
-
 describe("Features list - DASH WASM Parser", () => {
   it("should add DASH WASM parser in the current features", () => {
     const mockInitialize = jest.spyOn(DashWasmParser.prototype, "initialize")
@@ -40,10 +33,9 @@ describe("Features list - DASH WASM Parser", () => {
 
     expect(mockInitialize).toHaveBeenCalledTimes(1);
 
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    const featureObject : any = { transports: {},
-                                  dashParsers: { js: null,
-                                                 wasm: null } };
+    const featureObject = { transports: {},
+                            dashParsers: { js: null,
+                                           wasm: null } } as unknown as IFeaturesObject;
     DASH_WASM._addFeature(featureObject);
     expect(featureObject.transports).toEqual({ dash: DASHFeature });
     expect(featureObject.dashParsers.js).toEqual(null);

package/src/experimental/features/__tests__/debug_element.test.ts

@@ -1,26 +1,12 @@
-/* eslint-disable @typescript-eslint/no-unsafe-assignment */
-/* eslint-disable @typescript-eslint/no-unsafe-member-access */
-/* eslint-disable @typescript-eslint/no-var-requires */
-/* eslint-disable @typescript-eslint/no-unsafe-call */
-/* eslint-disable @typescript-eslint/no-unsafe-assignment */
-/* eslint-disable @typescript-eslint/no-unsafe-return */
+import createDebugElement from "../../../core/api/debug";
+import { IFeaturesObject } from "../../../features/types";
+import addDebugElementFeature from "../debug_element";
 
 describe("Features list - DEBUG_ELEMENT", () => {
-  beforeEach(() => {
-    jest.resetModules();
-  });
-
   it("should add DEBUG_ELEMENT in the current features", () => {
-    const feat = {};
-    jest.mock("../../../core/api/debug", () => ({ __esModule: true as const,
-                                                  default: feat }));
-    const addFeature = jest.requireActual("../debug_element").default;
-
-    const featureObject : {
-      createDebugElement? : unknown;
-    } = {};
-    addFeature(featureObject);
-    expect(featureObject).toEqual({ createDebugElement: {} });
-    expect(featureObject.createDebugElement).toBe(feat);
+    const featureObject  = {} as unknown as IFeaturesObject;
+    addDebugElementFeature(featureObject);
+    expect(featureObject).toEqual({ createDebugElement });
+    expect(featureObject.createDebugElement).toBe(createDebugElement);
   });
 });

package/src/experimental/features/__tests__/local.test.ts

@@ -14,31 +14,22 @@
  * limitations under the License.
  */
 
-/* eslint-disable @typescript-eslint/no-unsafe-assignment */
-/* eslint-disable @typescript-eslint/no-unsafe-member-access */
-/* eslint-disable @typescript-eslint/no-var-requires */
-/* eslint-disable @typescript-eslint/no-unsafe-call */
-/* eslint-disable @typescript-eslint/no-unsafe-assignment */
-/* eslint-disable @typescript-eslint/no-unsafe-return */
+/* eslint-disable-next-line max-len */
+import MediaSourceContentInitializer from "../../../core/init/media_source_content_initializer";
+import { IFeaturesObject } from "../../../features/types";
+import local from "../../../transports/local";
+import addLocalManifestFeature from "../local";
 
 describe("Features list - LOCAL_MANIFEST", () => {
-  beforeEach(() => {
-    jest.resetModules();
-  });
-
   it("should add LOCAL_MANIFEST in the current features", () => {
-    const feat = {};
-    jest.mock("../../../transports/local", () => ({ __esModule: true as const,
-                                                    default: feat }));
-    const addDASHFeature = jest.requireActual("../local").default;
-
-    const featureObject : {
-      transports : { [featureName : string] : unknown };
-    } = { transports: {} };
-
-    addDASHFeature(featureObject);
-
-    expect(featureObject).toEqual({ transports: { local: {} } });
-    expect(featureObject.transports.local).toBe(feat);
+    const featureObject = { transports: {} } as unknown as IFeaturesObject;
+    addLocalManifestFeature(featureObject);
+    expect(featureObject).toEqual({
+      transports: { local },
+      mediaSourceInit: MediaSourceContentInitializer,
+    });
+    expect(featureObject.transports.local).toBe(local);
+    expect(featureObject.mediaSourceInit)
+      .toBe(MediaSourceContentInitializer);
   });
 });

package/src/experimental/features/__tests__/metaplaylist.test.ts

@@ -14,29 +14,22 @@
  * limitations under the License.
  */
 
-/* eslint-disable @typescript-eslint/no-unsafe-assignment */
-/* eslint-disable @typescript-eslint/no-unsafe-member-access */
-/* eslint-disable @typescript-eslint/no-var-requires */
-/* eslint-disable @typescript-eslint/no-unsafe-call */
-/* eslint-disable @typescript-eslint/no-unsafe-assignment */
-/* eslint-disable @typescript-eslint/no-unsafe-return */
+/* eslint-disable-next-line max-len */
+import MediaSourceContentInitializer from "../../../core/init/media_source_content_initializer";
+import { IFeaturesObject } from "../../../features/types";
+import metaplaylist from "../../../transports/metaplaylist";
+import addLocalManifestFeature from "../metaplaylist";
 
 describe("Features list - METAPLAYLIST", () => {
-  beforeEach(() => {
-    jest.resetModules();
-  });
-
   it("should add METAPLAYLIST in the current features", () => {
-    const feat = {};
-    jest.mock("../../../transports/metaplaylist", () => ({ __esModule: true as const,
-                                                           default: feat }));
-    const addDASHFeature = jest.requireActual("../metaplaylist").default;
-
-    const featureObject : {
-      transports : { [featureName : string] : unknown };
-    } = { transports: {} };
-    addDASHFeature(featureObject);
-    expect(featureObject).toEqual({ transports: { metaplaylist: {} } });
-    expect(featureObject.transports.metaplaylist).toBe(feat);
+    const featureObject = { transports: {} } as unknown as IFeaturesObject;
+    addLocalManifestFeature(featureObject);
+    expect(featureObject).toEqual({
+      transports: { metaplaylist },
+      mediaSourceInit: MediaSourceContentInitializer,
+    });
+    expect(featureObject.transports.metaplaylist).toBe(metaplaylist);
+    expect(featureObject.mediaSourceInit)
+      .toBe(MediaSourceContentInitializer);
   });
 });

package/src/experimental/features/dash_wasm.ts

@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+// eslint-disable-next-line max-len
+import MediaSourceContentInitializer from "../../core/init/media_source_content_initializer";
 import { IFeaturesObject } from "../../features/types";
 import DashWasmParser, {
   IDashWasmParserOptions,
@@ -27,6 +29,7 @@ const dashWasmFeature = {
       features.transports.dash = dash;
     }
     features.dashParsers.wasm = dashWasmParser;
+    features.mediaSourceInit = MediaSourceContentInitializer;
   },
 
   initialize(opts : IDashWasmParserOptions) : Promise<void> {

package/src/experimental/features/index.ts

@@ -16,5 +16,4 @@
 
 export { DASH_WASM } from "./dash_wasm";
 export { DEBUG_ELEMENT } from "./debug_element";
-export { LOCAL_MANIFEST } from "./local";
 export { METAPLAYLIST } from "./metaplaylist";

package/src/experimental/features/local.ts

@@ -14,11 +14,14 @@
  * limitations under the License.
  */
 
+// eslint-disable-next-line max-len
+import MediaSourceContentInitializer from "../../core/init/media_source_content_initializer";
 import { IFeaturesObject } from "../../features/types";
 import local from "../../transports/local";
 
 function addLocalManifestFeature(features: IFeaturesObject) : void {
   features.transports.local = local;
+  features.mediaSourceInit = MediaSourceContentInitializer;
 }
 
 export { addLocalManifestFeature as LOCAL_MANIFEST };

package/src/experimental/features/metaplaylist.ts

@@ -14,11 +14,14 @@
  * limitations under the License.
  */
 
+// eslint-disable-next-line max-len
+import MediaSourceContentInitializer from "../../core/init/media_source_content_initializer";
 import { IFeaturesObject } from "../../features/types";
 import metaplaylist from "../../transports/metaplaylist";
 
 function addMetaPlaylistFeature(features: IFeaturesObject) : void {
   features.transports.metaplaylist = metaplaylist;
+  features.mediaSourceInit = MediaSourceContentInitializer;
 }
 
 export { addMetaPlaylistFeature as METAPLAYLIST };

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

@@ -26,7 +26,7 @@ import { ProberStatus } from "../../types";
 
 
 describe("MediaCapabilitiesProber probers - DRMInfos", () => {
-  beforeEach(() => {
+  afterEach(() => {
     jest.resetModules();
   });
 
@@ -60,8 +60,9 @@ describe("MediaCapabilitiesProber probers - DRMInfos", () => {
         type: "clearkick",
       },
     };
-    jest.mock("../../../../../compat", () => ({
-      requestMediaKeySystemAccess: null,
+    jest.mock("../../../../../compat/eme", () => ({
+      _esModule: true,
+      default: {},
     }));
     const probeDRMInfos = jest.requireActual("../../probers/DRMInfos").default;
     /* eslint-disable @typescript-eslint/no-floating-promises */
@@ -82,11 +83,11 @@ describe("MediaCapabilitiesProber probers - DRMInfos", () => {
         getConfiguration: () => ({}),
       });
     });
-    jest.mock("../../../../../compat", () => ({
-      requestMediaKeySystemAccess: mockRequestMediaKeySystemAccess,
+    jest.mock("../../../../../compat/eme", () => ({
+      _esModule: true,
+      default: { requestMediaKeySystemAccess: mockRequestMediaKeySystemAccess },
     }));
     const probeDRMInfos = jest.requireActual("../../probers/DRMInfos").default;
-    expect.assertions(2);
     probeDRMInfos(configuration)
       .then((res: unknown) => {
         expect(res).toEqual(
@@ -114,12 +115,12 @@ describe("MediaCapabilitiesProber probers - DRMInfos", () => {
         return Promise.reject(new Error());
       }
     );
-    jest.mock("../../../../../compat", () => ({
-      requestMediaKeySystemAccess: mockRequestMediaKeySystemAccess,
+    jest.mock("../../../../../compat/eme", () => ({
+      _esModule: true,
+      default: { requestMediaKeySystemAccess: mockRequestMediaKeySystemAccess },
     }));
 
     const probeDRMInfos = jest.requireActual("../../probers/DRMInfos").default;
-    expect.assertions(2);
     probeDRMInfos(configuration)
       .then((res: unknown) => {
         expect(res).toEqual(

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

@@ -24,15 +24,19 @@
 
 import { ProberStatus } from "../../types";
 
+// TODO for whatever reason about which I spent too much time already,
+// `jest.mock` with `_esModule` set to `true` does not work as expected here
+// like it does on every other RxPlayer test file on the planet.
+// I chose to scrap that default import syntax in `jest.mock` just in this
+// file and make it as if compat/eme exported an object instead.
 
 describe("MediaCapabilitiesProber probers - HDCPPolicy", () => {
-  beforeEach(() => {
+  afterEach(() => {
     jest.resetModules();
   });
 
   it("should throw if no requestMediaKeySystemAccess", () => {
-    jest.mock("../../../../../compat", () => ({
-      requestMediaKeySystemAccess: null,
+    jest.mock("../../../../../compat/eme", () => ({
     }));
     const probeHDCPPolicy = jest.requireActual("../../probers/HDCPPolicy").default;
     /* eslint-disable @typescript-eslint/no-floating-promises */
@@ -42,8 +46,13 @@ describe("MediaCapabilitiesProber probers - HDCPPolicy", () => {
   });
 
   it("should throw if no hdcp attribute in config", () => {
-    jest.mock("../../../../../compat", () => ({
-      requestMediaKeySystemAccess: {},
+    const mockRequestMediaKeySystemAccess = jest.fn(() => {
+      return Promise.resolve({
+        getConfiguration: () => ({}),
+      });
+    });
+    jest.mock("../../../../../compat/eme", () => ({
+      requestMediaKeySystemAccess: mockRequestMediaKeySystemAccess,
     }));
     const probeHDCPPolicy = jest.requireActual("../../probers/HDCPPolicy").default;
     /* eslint-disable @typescript-eslint/no-floating-promises */
@@ -63,13 +72,12 @@ describe("MediaCapabilitiesProber probers - HDCPPolicy", () => {
         createMediaKeys: mockCreateMediaKeys,
       });
     });
-    jest.mock("../../../../../compat", () => ({
+    jest.mock("../../../../../compat/eme", () => ({
       requestMediaKeySystemAccess: mockRequestMediaKeySystemAcces,
     }));
 
     const probeHDCPPolicy = jest.requireActual("../../probers/HDCPPolicy").default;
 
-    expect.assertions(3);
     probeHDCPPolicy({ hdcp: "1.1" })
       .then(([res]: [unknown]) => {
         expect(res).toEqual(ProberStatus.Unknown);
@@ -77,8 +85,9 @@ describe("MediaCapabilitiesProber probers - HDCPPolicy", () => {
         expect(mockRequestMediaKeySystemAcces).toHaveBeenCalledTimes(1);
         done();
       })
-      .catch(() => {
-        done();
+      .catch((err: unknown) => {
+        // eslint-disable-next-line no-console
+        console.error(err);
       });
   });
 
@@ -93,13 +102,12 @@ describe("MediaCapabilitiesProber probers - HDCPPolicy", () => {
         createMediaKeys: mockCreateMediaKeys,
       });
     });
-    jest.mock("../../../../../compat", () => ({
+    jest.mock("../../../../../compat/eme", () => ({
       requestMediaKeySystemAccess: mockRequestMediaKeySystemAcces,
     }));
 
     const probeHDCPPolicy = jest.requireActual("../../probers/HDCPPolicy").default;
 
-    expect.assertions(3);
     probeHDCPPolicy({ hdcp: "1.1" })
       .then(([res]: [unknown]) => {
         expect(res).toEqual(ProberStatus.Supported);
@@ -107,8 +115,9 @@ describe("MediaCapabilitiesProber probers - HDCPPolicy", () => {
         expect(mockRequestMediaKeySystemAcces).toHaveBeenCalledTimes(1);
         done();
       })
-      .catch(() => {
-        done();
+      .catch((err: unknown) => {
+        // eslint-disable-next-line no-console
+        console.error(err);
       });
   });
 
@@ -123,13 +132,11 @@ describe("MediaCapabilitiesProber probers - HDCPPolicy", () => {
         createMediaKeys: mockCreateMediaKeys,
       });
     });
-    jest.mock("../../../../../compat", () => ({
+    jest.mock("../../../../../compat/eme", () => ({
       requestMediaKeySystemAccess: mockRequestMediaKeySystemAcces,
     }));
 
     const probeHDCPPolicy = jest.requireActual("../../probers/HDCPPolicy").default;
-
-    expect.assertions(3);
     probeHDCPPolicy({ hdcp: "1.1" })
       .then(([res]: [unknown]) => {
         expect(res).toEqual(ProberStatus.NotSupported);
@@ -137,8 +144,9 @@ describe("MediaCapabilitiesProber probers - HDCPPolicy", () => {
         expect(mockRequestMediaKeySystemAcces).toHaveBeenCalledTimes(1);
         done();
       })
-      .catch(() => {
-        done();
+      .catch((err: unknown) => {
+        // eslint-disable-next-line no-console
+        console.error(err);
       });
   });
 });