rx-player 4.2.0-dev.2024090300 → 4.2.0-dev.2024090500

package/src/main_thread/init/utils/__tests__/are_same_stream_events.test.ts

@@ -1,18 +1,13 @@
 import { describe, it, expect, vi } from "vitest";
-
-/* eslint-disable @typescript-eslint/no-unsafe-member-access */
-/* 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 */
+import type IAreSameStreamEvents from "../stream_events_emitter/are_same_stream_events";
 
 describe("init - areSameStreamEvents", () => {
   it("should consider two events to be the same with defined ends", async () => {
     const evt1 = { start: 0, end: 10, id: "1" };
     const evt2 = { start: 0, end: 10, id: "1" };
     const areSameStreamEvents = (
-      (await vi.importActual("../stream_events_emitter/are_same_stream_events.ts")) as any
-    ).default;
+      await vi.importActual("../stream_events_emitter/are_same_stream_events.ts")
+    ).default as typeof IAreSameStreamEvents;
     const result = areSameStreamEvents(evt1, evt2);
     expect(result).toBe(true);
   });
@@ -20,8 +15,8 @@ describe("init - areSameStreamEvents", () => {
     const evt1 = { start: 0, end: undefined, id: "1" };
     const evt2 = { start: 0, end: undefined, id: "1" };
     const areSameStreamEvents = (
-      (await vi.importActual("../stream_events_emitter/are_same_stream_events.ts")) as any
-    ).default;
+      await vi.importActual("../stream_events_emitter/are_same_stream_events.ts")
+    ).default as typeof IAreSameStreamEvents;
     const result = areSameStreamEvents(evt1, evt2);
     expect(result).toBe(true);
   });
@@ -29,8 +24,8 @@ describe("init - areSameStreamEvents", () => {
     const evt1 = { start: 0, end: undefined, id: "1" };
     const evt2 = { start: 0, end: undefined, id: "2" };
     const areSameStreamEvents = (
-      (await vi.importActual("../stream_events_emitter/are_same_stream_events.ts")) as any
-    ).default;
+      await vi.importActual("../stream_events_emitter/are_same_stream_events.ts")
+    ).default as typeof IAreSameStreamEvents;
     const result = areSameStreamEvents(evt1, evt2);
     expect(result).toBe(false);
   });
@@ -38,8 +33,8 @@ describe("init - areSameStreamEvents", () => {
     const evt1 = { start: 0, end: undefined, id: "1" };
     const evt2 = { start: 10, end: undefined, id: "1" };
     const areSameStreamEvents = (
-      (await vi.importActual("../stream_events_emitter/are_same_stream_events.ts")) as any
-    ).default;
+      await vi.importActual("../stream_events_emitter/are_same_stream_events.ts")
+    ).default as typeof IAreSameStreamEvents;
     const result = areSameStreamEvents(evt1, evt2);
     expect(result).toBe(false);
   });
@@ -47,8 +42,8 @@ describe("init - areSameStreamEvents", () => {
     const evt1 = { start: 0, end: 10, id: "1" };
     const evt2 = { start: 0, end: 30, id: "1" };
     const areSameStreamEvents = (
-      (await vi.importActual("../stream_events_emitter/are_same_stream_events.ts")) as any
-    ).default;
+      await vi.importActual("../stream_events_emitter/are_same_stream_events.ts")
+    ).default as typeof IAreSameStreamEvents;
     const result = areSameStreamEvents(evt1, evt2);
     expect(result).toBe(false);
   });

package/src/main_thread/init/utils/__tests__/refresh_scheduled_events_list.test.ts

@@ -1,14 +1,15 @@
 import { describe, it, expect, vi } from "vitest";
-
-/* eslint-disable @typescript-eslint/no-unsafe-member-access */
-/* 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 */
+import type { IManifest } from "../../../../manifest";
+import type { IStreamEventData } from "../../../../public_types";
+import type IRefreshScheduledEventsList from "../stream_events_emitter/refresh_scheduled_events_list";
+import type {
+  INonFiniteStreamEventPayload,
+  IStreamEventPayload,
+} from "../stream_events_emitter/types";
 
 describe("init - refreshScheduledEventsList", () => {
-  it("should correclty refresh scheduled events", async () => {
-    function generateEventData() {
+  it("should correctly refresh scheduled events", async () => {
+    function generateEventData(): IStreamEventData {
       return {
         type: "dash-event-stream",
         value: {
@@ -33,20 +34,49 @@ describe("init - refreshScheduledEventsList", () => {
           ],
         },
       ],
-    };
-    const oldScheduledEvents = [
-      { start: 1000, end: 1000000, id: "must-disapear", _isBeingPlayed: true },
-      { start: 0, end: 1, data: generateEventData(), id: "1" },
-    ];
+    } as IManifest;
+    const oldScheduledEvents: Array<IStreamEventPayload | INonFiniteStreamEventPayload> =
+      [
+        {
+          start: 1000,
+          end: 1000000,
+          id: "must-disapear",
+          data: generateEventData(),
+          publicEvent: {
+            start: 1000,
+            end: 1000000,
+            data: generateEventData(),
+          },
+        },
+        {
+          start: 0,
+          end: 1,
+          data: generateEventData(),
+          id: "1",
+          publicEvent: {
+            start: 1000,
+            end: 1000000,
+            data: generateEventData(),
+          },
+        },
+      ];
     const refreshScheduledEventsList = (
-      (await vi.importActual(
-        "../stream_events_emitter/refresh_scheduled_events_list.ts",
-      )) as any
-    ).default;
+      await vi.importActual("../stream_events_emitter/refresh_scheduled_events_list.ts")
+    ).default as typeof IRefreshScheduledEventsList;
 
     const scheduledEvents = refreshScheduledEventsList(oldScheduledEvents, manifest);
     expect(scheduledEvents).toEqual([
-      { start: 0, end: 1, id: "1", data: generateEventData() },
+      {
+        start: 0,
+        end: 1,
+        id: "1",
+        data: generateEventData(),
+        publicEvent: {
+          start: 1000,
+          end: 1000000,
+          data: generateEventData(),
+        },
+      },
       {
         start: 11,
         end: 20,

package/src/main_thread/text_displayer/html/__tests__/text_track_cues_store.test.ts

@@ -53,15 +53,16 @@ describe("TextTrackCuesStore - insert()", () => {
     ];
 
     // small hack to access class private property with bracket notation without having ts errors
-    /* eslint-disable @typescript-eslint/dot-notation */
-    textTrackCuesStore["_cuesBuffer"] = currentCues;
+    // @ts-expect-error: property is normally private
+    textTrackCuesStore._cuesBuffer = currentCues;
     textTrackCuesStore.insert(
       [{ element: createCueElement("bye"), start: 1, end: 2 }],
       1,
       2,
     );
 
-    expect(textTrackCuesStore["_cuesBuffer"]).toEqual(expectedCues);
+    // @ts-expect-error: property is normally private
+    expect(textTrackCuesStore._cuesBuffer).toEqual(expectedCues);
   });
 
   it("inserting strictly before existing cue", () => {
@@ -90,13 +91,15 @@ describe("TextTrackCuesStore - insert()", () => {
       },
     ];
 
-    textTrackCuesStore["_cuesBuffer"] = currentCues;
+    // @ts-expect-error: property is normally private
+    textTrackCuesStore._cuesBuffer = currentCues;
     textTrackCuesStore.insert(
       [{ element: createCueElement("hello"), start: 0, end: 1 }],
       0,
       1,
     );
-    expect(textTrackCuesStore["_cuesBuffer"]).toEqual(expectedCues);
+    // @ts-expect-error: property is normally private
+    expect(textTrackCuesStore._cuesBuffer).toEqual(expectedCues);
   });
 
   it("inserting between two cues", () => {
@@ -135,13 +138,15 @@ describe("TextTrackCuesStore - insert()", () => {
       },
     ];
 
-    textTrackCuesStore["_cuesBuffer"] = currentCues;
+    // @ts-expect-error: property is normally private
+    textTrackCuesStore._cuesBuffer = currentCues;
     textTrackCuesStore.insert(
       [{ element: createCueElement("bye"), start: 1, end: 2 }],
       1,
       2,
     );
-    expect(textTrackCuesStore["_cuesBuffer"]).toEqual(expectedCues);
+    // @ts-expect-error: property is normally private
+    expect(textTrackCuesStore._cuesBuffer).toEqual(expectedCues);
   });
 
   it("replacing current cues", () => {
@@ -165,13 +170,15 @@ describe("TextTrackCuesStore - insert()", () => {
       },
     ];
 
-    textTrackCuesStore["_cuesBuffer"] = currentCues;
+    // @ts-expect-error: property is normally private
+    textTrackCuesStore._cuesBuffer = currentCues;
     textTrackCuesStore.insert(
       [{ element: createCueElement("hi"), start: 0, end: 1 }],
       0,
       1,
     );
-    expect(textTrackCuesStore["_cuesBuffer"]).toEqual(expectedCues);
+    // @ts-expect-error: property is normally private
+    expect(textTrackCuesStore._cuesBuffer).toEqual(expectedCues);
   });
 
   it("inserting cues that partially replace existing cues", () => {
@@ -200,13 +207,15 @@ describe("TextTrackCuesStore - insert()", () => {
       },
     ];
 
-    textTrackCuesStore["_cuesBuffer"] = currentCues;
+    // @ts-expect-error: property is normally private
+    textTrackCuesStore._cuesBuffer = currentCues;
     textTrackCuesStore.insert(
       [{ element: createCueElement("hi"), start: 0, end: 1 }],
       0,
       1,
     );
-    expect(textTrackCuesStore["_cuesBuffer"]).toEqual(expectedCues);
+    // @ts-expect-error: property is normally private
+    expect(textTrackCuesStore._cuesBuffer).toEqual(expectedCues);
   });
   it("inserting cues that replace existing cues and go beyond", () => {
     //   ours:            |AAAAAAA|
@@ -229,13 +238,15 @@ describe("TextTrackCuesStore - insert()", () => {
       },
     ];
 
-    textTrackCuesStore["_cuesBuffer"] = currentCues;
+    // @ts-expect-error: property is normally private
+    textTrackCuesStore._cuesBuffer = currentCues;
     textTrackCuesStore.insert(
       [{ element: createCueElement("how are you?"), start: 0, end: 2 }],
       0,
       2,
     );
-    expect(textTrackCuesStore["_cuesBuffer"]).toEqual(expectedCues);
+    // @ts-expect-error: property is normally private
+    expect(textTrackCuesStore._cuesBuffer).toEqual(expectedCues);
   });
 
   it("inserting after previous one with parsing approximation", () => {
@@ -264,13 +275,15 @@ describe("TextTrackCuesStore - insert()", () => {
       },
     ];
 
-    textTrackCuesStore["_cuesBuffer"] = currentCues;
+    // @ts-expect-error: property is normally private
+    textTrackCuesStore._cuesBuffer = currentCues;
     textTrackCuesStore.insert(
       [{ element: createCueElement("how are you?"), start: 1, end: 2 }],
       1,
       2,
     );
-    expect(textTrackCuesStore["_cuesBuffer"]).toEqual(expectedCues);
+    // @ts-expect-error: property is normally private
+    expect(textTrackCuesStore._cuesBuffer).toEqual(expectedCues);
   });
 
   it("inserting cues that replace existing cues and go beyond with parsing approximation", () => {
@@ -299,12 +312,14 @@ describe("TextTrackCuesStore - insert()", () => {
       },
     ];
 
-    textTrackCuesStore["_cuesBuffer"] = currentCues;
+    // @ts-expect-error: property is normally private
+    textTrackCuesStore._cuesBuffer = currentCues;
     textTrackCuesStore.insert(
       [{ element: createCueElement("hi"), start: 10, end: 12 }],
       10,
       12,
     );
-    expect(textTrackCuesStore["_cuesBuffer"]).toEqual(expectedCues);
+    // @ts-expect-error: property is normally private
+    expect(textTrackCuesStore._cuesBuffer).toEqual(expectedCues);
   });
 });

package/src/main_thread/text_displayer/html/html_text_displayer.ts

@@ -423,15 +423,11 @@ export interface ITextTracksBufferSegmentData {
  * a hack to tell TypeScript to perform that check.
  */
 if ((__ENVIRONMENT__.CURRENT_ENV as number) === (__ENVIRONMENT__.DEV as number)) {
-  /* eslint-disable @typescript-eslint/no-unused-vars */
-  /* eslint-disable @typescript-eslint/ban-ts-comment */
-  // @ts-ignore
+  // @ts-expect-error: uncalled function just for type-checking
   function _checkType(input: ITextTrackSegmentData): void {
     function checkEqual(_arg: ITextTracksBufferSegmentData): void {
       /* nothing */
     }
     checkEqual(input);
   }
-  /* eslint-enable @typescript-eslint/no-unused-vars */
-  /* eslint-enable @typescript-eslint/ban-ts-comment */
 }

package/src/main_thread/text_displayer/native/native_text_displayer.ts

@@ -163,7 +163,7 @@ export default class NativeTextDisplayer implements ITextDisplayer {
     if (_trackElement !== undefined && _videoElement.hasChildNodes()) {
       try {
         _videoElement.removeChild(_trackElement);
-      } catch (e) {
+      } catch (_e) {
         log.warn("NTD: Can't remove track element from the video");
       }
     }
@@ -186,7 +186,7 @@ export default class NativeTextDisplayer implements ITextDisplayer {
     if (_trackElement !== undefined && _videoElement.hasChildNodes()) {
       try {
         _videoElement.removeChild(_trackElement);
-      } catch (e) {
+      } catch (_e) {
         log.warn("NTD: Can't remove track element from the video");
       }
     }
@@ -243,15 +243,11 @@ export interface INativeTextTracksBufferSegmentData {
  * a hack to tell TypeScript to perform that check.
  */
 if ((__ENVIRONMENT__.CURRENT_ENV as number) === (__ENVIRONMENT__.DEV as number)) {
-  /* eslint-disable @typescript-eslint/no-unused-vars */
-  /* eslint-disable @typescript-eslint/ban-ts-comment */
-  // @ts-ignore
+  // @ts-expect-error: uncalled function just for type checking
   function _checkType(input: ITextTrackSegmentData): void {
     function checkEqual(_arg: INativeTextTracksBufferSegmentData): void {
       /* nothing */
     }
     checkEqual(input);
   }
-  /* eslint-enable @typescript-eslint/no-unused-vars */
-  /* eslint-enable @typescript-eslint/ban-ts-comment */
 }

package/src/main_thread/tracks_store/__tests__/media_element_tracks_store.test.ts

@@ -1,5 +1,6 @@
 import { describe, it, expect } from "vitest";
-
+import type { IMediaElement } from "../../../compat/browser_compatibility_types";
+import assert from "../../../utils/assert";
 import MediaElementTracksStore from "../media_element_tracks_store";
 
 const fakeMediaElement = {
@@ -16,7 +17,7 @@ const fakeMediaElement = {
     { language: "pt-BR", mode: "hidden" },
   ],
   videoTracks: [{ language: "", selected: true }],
-} as unknown as HTMLVideoElement;
+} as unknown as IMediaElement;
 
 describe("API - MediaElementTracksStore", () => {
   it("should returns correct results for getter", () => {
@@ -57,10 +58,8 @@ describe("API - MediaElementTracksStore", () => {
 
     trackManager.setAudioTrackById("gen_audio_en_1");
     // unset enabled attribute of other track, as browser is supported to do this
-    /* eslint-disable @typescript-eslint/no-unsafe-member-access */
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    (fakeMediaElement as any).audioTracks[1].enabled = false;
-    /* eslint-enable @typescript-eslint/no-unsafe-member-access */
+    assert(fakeMediaElement.audioTracks !== undefined);
+    fakeMediaElement.audioTracks[1].enabled = false;
     expect(trackManager.getChosenAudioTrack()).toEqual({
       id: "gen_audio_en_1",
       language: "en",
@@ -71,6 +70,7 @@ describe("API - MediaElementTracksStore", () => {
 
     trackManager.setTextTrackById("gen_text_en_1");
     // changed mode attribute of other track, as browser is supported to do this
+    assert(fakeMediaElement.textTracks !== undefined);
     fakeMediaElement.textTracks[1].mode = "hidden";
     expect(trackManager.getChosenTextTrack()).toEqual({
       id: "gen_text_en_1",
@@ -98,7 +98,12 @@ describe("API - MediaElementTracksStore", () => {
         language: "es",
         mode: "hidden",
       } as TextTrack);
-      fakeMediaElement.textTracks.onaddtrack?.({} as TrackEvent);
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-call
+      (
+        fakeMediaElement.textTracks as {
+          onaddtrack: ((arg: TrackEvent) => void) | undefined;
+        }
+      ).onaddtrack?.({} as TrackEvent);
     });
   });
 
@@ -113,16 +118,14 @@ describe("API - MediaElementTracksStore", () => {
       });
 
       // Fake browser behavior
-      /* eslint-disable @typescript-eslint/no-unsafe-call */
-      /* eslint-disable @typescript-eslint/no-unsafe-member-access */
-      /* eslint-disable @typescript-eslint/no-unsafe-assignment */
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      const _elt = fakeMediaElement as any;
-      _elt.videoTracks.unshift({ language: "en", selected: false });
-      _elt.videoTracks.onaddtrack?.({} as TrackEvent);
-      /* eslint-enable @typescript-eslint/no-unsafe-call */
-      /* eslint-disable @typescript-eslint/no-unsafe-member-access */
-      /* eslint-enable @typescript-eslint/no-unsafe-assignment */
+      const _elt = fakeMediaElement;
+      (
+        _elt.videoTracks as unknown as Array<{
+          language: string;
+          selected: boolean;
+        }>
+      ).unshift({ language: "en", selected: false });
+      _elt.videoTracks?.onaddtrack?.({} as TrackEvent);
     });
   });
 
@@ -140,16 +143,14 @@ describe("API - MediaElementTracksStore", () => {
       });
 
       // Fake browser behavior
-      /* eslint-disable @typescript-eslint/no-unsafe-call */
-      /* eslint-disable @typescript-eslint/no-unsafe-member-access */
-      /* eslint-disable @typescript-eslint/no-unsafe-assignment */
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      const _elt = fakeMediaElement as any;
-      _elt.audioTracks.unshift({ language: "en", selected: false });
-      _elt.audioTracks.onaddtrack?.({} as TrackEvent);
-      /* eslint-enable @typescript-eslint/no-unsafe-call */
-      /* eslint-disable @typescript-eslint/no-unsafe-member-access */
-      /* eslint-enable @typescript-eslint/no-unsafe-assignment */
+      const _elt = fakeMediaElement;
+      (
+        _elt.audioTracks as unknown as Array<{
+          language: string;
+          selected: boolean;
+        }>
+      ).unshift({ language: "en", selected: false });
+      _elt.audioTracks?.onaddtrack?.({} as TrackEvent);
     });
   });
 
@@ -166,7 +167,11 @@ describe("API - MediaElementTracksStore", () => {
 
       // Fake browser behavior
       fakeMediaElement.textTracks[0].mode = "hidden";
-      fakeMediaElement.textTracks?.onchange?.(undefined as unknown as Event);
+      (
+        fakeMediaElement.textTracks as {
+          onchange: ((arg: Event) => void) | undefined;
+        }
+      ).onchange?.(undefined as unknown as Event);
     });
   });
 });

package/src/main_thread/tracks_store/track_dispatcher.ts

@@ -161,7 +161,7 @@ export default class TrackDispatcher extends EventEmitter<ITrackDispatcherEvent>
       switchingMode: "lazy",
     });
 
-    /* eslint-disable-next-line @typescript-eslint/no-this-alias */
+    // eslint-disable-next-line @typescript-eslint/no-this-alias
     const self = this;
     this.refresh = updateReferenceIfNeeded;
     this._canceller.signal.register(removeListeners);

package/src/main_thread/types.ts

@@ -8,7 +8,6 @@ export type {
   // Decrypt Metadata
   IContentProtection,
   IProcessedProtectionData,
-
   // Text Displayer Metadata
   ITextDisplayer,
   ITextDisplayerData,