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

package/src/compat/__tests__/can_reuse_media_keys.test.ts

@@ -8,7 +8,12 @@ describe("Compat - canReuseMediaKeys", () => {
 
   it("should return true on most browsers", async () => {
     vi.doMock("../browser_detection", () => {
-      return { isWebOs: false, isPhilipsNetTv: false, isPanasonic: false };
+      return {
+        isA1KStb40xx: false,
+        isWebOs: false,
+        isPhilipsNetTv: false,
+        isPanasonic: false,
+      };
     });
     const canReuseMediaKeys = (await vi.importActual("../can_reuse_media_keys.ts"))
       .default as typeof ICanReuseMediaKeys;
@@ -18,6 +23,7 @@ describe("Compat - canReuseMediaKeys", () => {
   it("should return false on WebOs", async () => {
     vi.doMock("../browser_detection", () => {
       return {
+        isA1KStb40xx: false,
         isWebOs: true,
         isWebOs2022: false,
         isPanasonic: false,
@@ -32,6 +38,7 @@ describe("Compat - canReuseMediaKeys", () => {
   it("should return false on Panasonic", async () => {
     vi.doMock("../browser_detection", () => {
       return {
+        isA1KStb40xx: false,
         isWebOs: false,
         isWebOs2022: false,
         isPanasonic: true,
@@ -46,6 +53,7 @@ describe("Compat - canReuseMediaKeys", () => {
   it("should return false on Philips' NETTV", async () => {
     vi.doMock("../browser_detection", () => {
       return {
+        isA1KStb40xx: false,
         isWebOs: false,
         isWebOs2022: false,
         isPanasonic: false,
@@ -56,4 +64,19 @@ describe("Compat - canReuseMediaKeys", () => {
       .default as typeof ICanReuseMediaKeys;
     expect(canReuseMediaKeys()).toBe(false);
   });
+
+  it("should return false on A1 KSTB 40xxx", async () => {
+    vi.doMock("../browser_detection", () => {
+      return {
+        isA1KStb40xx: true,
+        isWebOs: false,
+        isWebOs2022: false,
+        isPanasonic: false,
+        isPhilipsNetTv: false,
+      };
+    });
+    const canReuseMediaKeys = (await vi.importActual("../can_reuse_media_keys.ts"))
+      .default as typeof ICanReuseMediaKeys;
+    expect(canReuseMediaKeys()).toBe(false);
+  });
 });

package/src/compat/browser_detection.ts

@@ -79,6 +79,9 @@ let isPlayStation5 = false;
 /** `true` for the Xbox game consoles. */
 let isXbox = false;
 
+/** `true` for specific A1 STB: KSTB 40xx from Kaon Media. */
+let isA1KStb40xx = false;
+
 (function findCurrentBrowser(): void {
   if (isNode) {
     return;
@@ -167,24 +170,30 @@ let isXbox = false;
     isPanasonic = true;
   } else if (navigator.userAgent.indexOf("Xbox") !== -1) {
     isXbox = true;
+  } else if (navigator.userAgent.indexOf("Model/a1-kstb40xx")) {
+    isA1KStb40xx = true;
   }
 })();
 
 export {
+  // browsers
   isEdgeChromium,
+  isFirefox,
   isIE11,
   isIEOrEdge,
-  isFirefox,
+  isSafariDesktop,
+  isSafariMobile,
+
+  // specific devices
+  isA1KStb40xx,
   isPanasonic,
   isPhilipsNetTv,
   isPlayStation4,
   isPlayStation5,
-  isXbox,
-  isSafariDesktop,
-  isSafariMobile,
   isSamsungBrowser,
   isTizen,
   isWebOs,
   isWebOs2021,
   isWebOs2022,
+  isXbox,
 };

package/src/compat/can_reuse_media_keys.ts

@@ -1,4 +1,4 @@
-import { isPanasonic, isPhilipsNetTv, isWebOs } from "./browser_detection";
+import { isA1KStb40xx, isPanasonic, isPhilipsNetTv, isWebOs } from "./browser_detection";
 
 /**
  * Returns `true` if a `MediaKeys` instance (the  `Encrypted Media Extension`
@@ -11,9 +11,13 @@ import { isPanasonic, isPhilipsNetTv, isWebOs } from "./browser_detection";
  *     HTMLMediaElement.
  *   - (2024-08-23): Seen on Philips 2024 and 2023 in:
  *     https://github.com/canalplus/rx-player/issues/1464
+ *   - (2024-09-04): Another case seen on an "A1" set-top box model made by
+ *     Kaonmedia we will call the KSTB40xx.
+ *     It may share the problematic with other devices, but we have only seen
+ *     the problem on this one for now.
  *
  * @returns {boolean}
  */
 export default function canReuseMediaKeys(): boolean {
-  return !isWebOs && !isPhilipsNetTv && !isPanasonic;
+  return !isWebOs && !isPhilipsNetTv && !isPanasonic && !isA1KStb40xx;
 }

package/src/core/main/worker/worker_main.ts

@@ -884,6 +884,10 @@ function loadOrReloadPreparedContent(
         );
       },
       (err: unknown) => {
+        if (TaskCanceller.isCancellationError(err)) {
+          log.info("WP: A reloading operation was cancelled");
+          return;
+        }
         sendMessage({
           type: WorkerMessageType.Error,
           contentId,

package/src/main_thread/api/public_api.ts

@@ -409,7 +409,7 @@ class Player extends EventEmitter<IPublicAPIEvent> {
     // See: https://bugzilla.mozilla.org/show_bug.cgi?id=1194624
     videoElement.preload = "auto";
 
-    this.version = /* PLAYER_VERSION */ "4.2.0-dev.2024090500";
+    this.version = /* PLAYER_VERSION */ "4.2.0-dev.2024090600";
     this.log = log;
     this.state = "STOPPED";
     this.videoElement = videoElement;
@@ -3313,7 +3313,7 @@ class Player extends EventEmitter<IPublicAPIEvent> {
     }
   }
 }
-Player.version = /* PLAYER_VERSION */ "4.2.0-dev.2024090500";
+Player.version = /* PLAYER_VERSION */ "4.2.0-dev.2024090600";
 
 /** Every events sent by the RxPlayer's public API. */
 interface IPublicAPIEvent {

package/src/utils/logger.ts

@@ -138,18 +138,17 @@ export default class Logger extends EventEmitter<ILoggerEvents> {
       /* eslint-enable no-console */
       /* eslint-enable no-invalid-this */
     } else {
-      const produceLogFn = (logLevel: ILoggerLevel, namespace: string) => {
+      const produceLogFn = (logLevel: ILoggerLevel) => {
         return level >= this._levels[logLevel]
           ? (...args: IAcceptedLogValue[]) => {
-              const now = getMonotonicTimeStamp();
-              return logFn(logLevel, [now, namespace, ...args]);
+              return logFn(logLevel, args);
             }
           : noop;
       };
-      this.error = produceLogFn("ERROR", "error");
-      this.warn = produceLogFn("WARNING", "warn");
-      this.info = produceLogFn("INFO", "info");
-      this.debug = produceLogFn("DEBUG", "log");
+      this.error = produceLogFn("ERROR");
+      this.warn = produceLogFn("WARNING");
+      this.info = produceLogFn("INFO");
+      this.debug = produceLogFn("DEBUG");
     }
 
     this.trigger("onLogLevelChange", {