rx-player 3.27.0-dev.20220317 → 3.27.0-dev.2022032800

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "rx-player",
   "author": "Canal+",
-  "version": "3.27.0-dev.20220317",
+  "version": "3.27.0-dev.2022032800",
   "description": "Canal+ HTML5 Video Player",
   "main": "./dist/rx-player.js",
   "keywords": [
@@ -76,7 +76,6 @@
   },
   "dependencies": {
     "next-tick": "1.1.0",
-    "pinkie": "2.0.4",
     "rxjs": "7.4.0"
   },
   "devDependencies": {

package/scripts/update-version

@@ -24,8 +24,8 @@ set -e
 version=$1
 
 sed -i.bak -e "s/\/\\* PLAYER_VERSION \\*\/\"\(.*\)\";/\/* PLAYER_VERSION *\/\"${version}\";/g" src/core/api/public_api.ts && rm src/core/api/public_api.ts.bak
-sed -i.bak -e "s/\"version\": \"[0-9]\+\.[0-9]\+\.[0-9]\+\(-\w\+[0-9]\)\?\"/\"version\": \"${version}\"/g" package.json && rm package.json.bak
-sed -i.bak -e "s/sonar\.projectVersion= *[0-9]\+\.[0-9]\+\.[0-9]\+/sonar.projectVersion=${version}/g" sonar-project.properties && rm sonar-project.properties.bak
+sed -i.bak -e "s/\"version\":\s*\"[0-9]\+\.[0-9]\+\.[0-9]\+[^\"]*\"/\"version\": \"${version}\"/g" package.json && rm package.json.bak
+sed -i.bak -e "s/sonar\.projectVersion= *.*/sonar.projectVersion=${version}/g" sonar-project.properties && rm sonar-project.properties.bak
 echo $version > VERSION
 
 npm install

package/sonar-project.properties

@@ -1,7 +1,7 @@
 sonar.projectKey=rx-player
 sonar.organization=rx-player
 sonar.projectName=rx-player
-sonar.projectVersion=3.27.0-dev.2022031700
+sonar.projectVersion=3.27.0-dev.2022032800
 sonar.sources=./src,./demo,./tests
 sonar.exclusions=demo/full/bundle.js,demo/standalone/lib.js,demo/bundle.js
 sonar.host.url=https://sonarcloud.io

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

@@ -21,11 +21,9 @@
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable @typescript-eslint/no-unsafe-return */
 
-import PPromise from "../../utils/promise";
-
 describe("compat - play", () => {
   it("should call play and returns an Observable if play returns a Promise", (done) => {
-    const mockPlay = jest.fn(() => PPromise.resolve());
+    const mockPlay = jest.fn(() => Promise.resolve());
     const fakeMediaElement = { play: mockPlay };
 
     const play$ = require("../play").default;
@@ -48,7 +46,7 @@ describe("compat - play", () => {
   it("should throw through an Observable if the `play` promise is rejected", (done) => {
     const notAllowedError = new Error("NotAllowedError: Can't play");
     const mockPlay = jest.fn(() => {
-      return PPromise.reject(notAllowedError);
+      return Promise.reject(notAllowedError);
     });
     const fakeMediaElement = { play: mockPlay };
 

package/src/compat/eme/close_session.ts

@@ -16,7 +16,6 @@
 
 import log from "../../log";
 import cancellableSleep from "../../utils/cancellable_sleep";
-import PPromise from "../../utils/promise";
 import TaskCanceller, {
   CancellationError,
 } from "../../utils/task_canceller";
@@ -40,7 +39,7 @@ export default function closeSession(
 ): Promise<void> {
   const timeoutCanceller = new TaskCanceller();
 
-  return PPromise.race([
+  return Promise.race([
     session.close()
       .then(() => { timeoutCanceller.cancel(); }),
     // The `closed` promise may resolve, even if `close()` result has not

package/src/compat/eme/custom_key_system_access.ts

@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import PPromise from "../../utils/promise";
 import { ICustomMediaKeys } from "./custom_media_keys";
 
 // MediaKeySystemAccess implementation
@@ -56,7 +55,7 @@ export default class CustomMediaKeySystemAccess implements ICustomMediaKeySystem
    * MediaKeySystemAccess. Never rejects.
    */
   public createMediaKeys() : Promise<ICustomMediaKeys|MediaKeys> {
-    return new PPromise((res) => res(this._mediaKeys));
+    return new Promise((res) => res(this._mediaKeys));
   }
 
   /**

package/src/compat/eme/custom_media_keys/ie11_media_keys.ts

@@ -20,7 +20,6 @@ import {
   takeUntil,
 } from "rxjs";
 import EventEmitter from "../../../utils/event_emitter";
-import PPromise from "../../../utils/promise";
 import { ICompatHTMLMediaElement } from "../../browser_compatibility_types";
 import * as events from "../../event_listeners";
 import {
@@ -52,11 +51,11 @@ class IE11MediaKeySession
     this.keyStatuses = new Map();
     this._mk = mk;
     this._closeSession$ = new Subject();
-    this.closed = new PPromise((resolve) => {
+    this.closed = new Promise((resolve) => {
       this._closeSession$.subscribe(resolve);
     });
     this.update = (license: Uint8Array) => {
-      return new PPromise((resolve, reject) => {
+      return new Promise((resolve, reject) => {
         if (this._ss === undefined) {
           return reject("MediaKeySession not set.");
         }
@@ -74,7 +73,7 @@ class IE11MediaKeySession
     };
   }
   generateRequest(_initDataType: string, initData: BufferSource): Promise<void> {
-    return new PPromise((resolve) => {
+    return new Promise((resolve) => {
       const initDataU8 =
         initData instanceof Uint8Array  ? initData :
         initData instanceof ArrayBuffer ? new Uint8Array(initData) :
@@ -89,7 +88,7 @@ class IE11MediaKeySession
     });
   }
   close(): Promise<void> {
-    return new PPromise((resolve) => {
+    return new Promise((resolve) => {
       if (this._ss != null) {
         this._ss.close();
         this._ss = undefined;
@@ -100,10 +99,10 @@ class IE11MediaKeySession
     });
   }
   load(): Promise<boolean> {
-    return PPromise.resolve(false);
+    return Promise.resolve(false);
   }
   remove(): Promise<void> {
-    return PPromise.resolve();
+    return Promise.resolve();
   }
   get sessionId(): string {
     return this._ss?.sessionId ?? "";

package/src/compat/eme/custom_media_keys/index.ts

@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-import PPromise from "pinkie";
 import { MediaError } from "../../../errors";
 import assert from "../../../utils/assert";
 import { ICompatHTMLMediaElement } from "../../browser_compatibility_types";
@@ -154,7 +153,7 @@ if (isNode ||
     keySystemConfigurations : MediaKeySystemConfiguration[]
   ) : Promise<MediaKeySystemAccess|CustomMediaKeySystemAccess> {
     if (!isTypeSupported(keyType)) {
-      return PPromise.reject(new Error("Unsupported key type"));
+      return Promise.reject(new Error("Unsupported key type"));
     }
 
     for (let i = 0; i < keySystemConfigurations.length; i++) {
@@ -185,7 +184,7 @@ if (isNode ||
 
         // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
         const customMediaKeys = createCustomMediaKeys(keyType);
-        return PPromise.resolve(
+        return Promise.resolve(
           new CustomMediaKeySystemAccess(keyType,
                                          customMediaKeys,
                                          keySystemConfigurationResponse)
@@ -193,7 +192,7 @@ if (isNode ||
       }
     }
 
-    return PPromise.reject(new Error("Unsupported configuration"));
+    return Promise.reject(new Error("Unsupported configuration"));
   };
 }
 

package/src/compat/eme/custom_media_keys/old_webkit_media_keys.ts

@@ -17,7 +17,6 @@
 import { base64ToBytes } from "../../../utils/base64";
 import EventEmitter from "../../../utils/event_emitter";
 import noop from "../../../utils/noop";
-import PPromise from "../../../utils/promise";
 import { utf8ToStr } from "../../../utils/string_parsing";
 import {
   ICustomMediaKeys,
@@ -67,7 +66,6 @@ class OldWebkitMediaKeySession
   private readonly _vid: IOldWebkitHTMLMediaElement;
   private readonly _key: string;
 
-  private readonly _onSessionRelatedEvent : (evt : Event) => void;
   private _closeSession : () => void;
 
   constructor(mediaElement: IOldWebkitHTMLMediaElement, keySystem: string) {
@@ -77,22 +75,33 @@ class OldWebkitMediaKeySession
 
     this.sessionId = "";
     this._closeSession = noop; // Just here to make TypeScript happy
-    this.closed = new PPromise((resolve) => {
-      this._closeSession = resolve;
-    });
     this.keyStatuses = new Map();
     this.expiration = NaN;
 
-    this._onSessionRelatedEvent = (evt : Event) => {
+    const onSessionRelatedEvent = (evt : Event) => {
       this.trigger(evt.type, evt);
     };
+    this.closed = new Promise((resolve) => {
+      this._closeSession = () => {
+        ["keymessage", "message", "keyadded", "ready", "keyerror", "error"]
+          .forEach(evt => {
+            mediaElement.removeEventListener(evt, onSessionRelatedEvent);
+            mediaElement.removeEventListener(`webkit${evt}`, onSessionRelatedEvent);
+          });
+        resolve();
+      };
+    });
+
 
     ["keymessage", "message", "keyadded", "ready", "keyerror", "error"]
-      .forEach(evt => mediaElement.addEventListener(evt, this._onSessionRelatedEvent));
+      .forEach(evt => {
+        mediaElement.addEventListener(evt, onSessionRelatedEvent);
+        mediaElement.addEventListener(`webkit${evt}`, onSessionRelatedEvent);
+      });
   }
 
   public update(license: Uint8Array) : Promise<void> {
-    return new PPromise((resolve, reject) => {
+    return new Promise((resolve, reject) => {
       try {
         if (this._key.indexOf("clearkey") >= 0) {
           const licenseTypedArray =
@@ -121,15 +130,14 @@ class OldWebkitMediaKeySession
     _initDataType: string,
     initData: ArrayBuffer
   ): Promise<void> {
-    return new PPromise((resolve) => {
+    return new Promise((resolve) => {
       this._vid.webkitGenerateKeyRequest(this._key, initData);
       resolve();
     });
   }
 
   public close(): Promise<void> {
-    return new PPromise((resolve) => {
-      this._unbindSession();
+    return new Promise((resolve) => {
       this._closeSession();
       resolve();
     });
@@ -142,16 +150,11 @@ class OldWebkitMediaKeySession
    */
   public load(): Promise<boolean> {
     // Not implemented. Always return false as in "no session with that id".
-    return PPromise.resolve(false);
+    return Promise.resolve(false);
   }
 
   public remove(): Promise<void> {
-    return PPromise.resolve();
-  }
-
-  private _unbindSession() {
-    ["keymessage", "message", "keyadded", "ready", "keyerror", "error"]
-      .forEach(evt => this._vid.removeEventListener(evt, this._onSessionRelatedEvent));
+    return Promise.resolve();
   }
 }
 

package/src/compat/eme/custom_media_keys/webkit_media_keys.ts

@@ -16,7 +16,6 @@
 
 import EventEmitter from "../../../utils/event_emitter";
 import noop from "../../../utils/noop";
-import PPromise from "../../../utils/promise";
 import { ICompatHTMLMediaElement } from "../../browser_compatibility_types";
 import getWebKitFairplayInitData from "../get_webkit_fairplay_initdata";
 import {
@@ -84,7 +83,6 @@ class WebkitMediaKeySession
   private _nativeSession: undefined | MediaKeySession;
   private _serverCertificate: Uint8Array | undefined;
 
-  private readonly _onEvent : (evt : Event) => void;
   private _closeSession : () => void;
   private _unbindSession : () => void;
 
@@ -105,19 +103,15 @@ class WebkitMediaKeySession
 
     this._unbindSession = noop;
     this._closeSession = noop; // Just here to make TypeScript happy
-    this.closed = new PPromise((resolve) => {
+    this.closed = new Promise((resolve) => {
       this._closeSession = resolve;
     });
     this.keyStatuses = new Map();
     this.expiration = NaN;
-
-    this._onEvent = (evt : Event) => {
-      this.trigger(evt.type, evt);
-    };
   }
 
   public update(license: BufferSource) : Promise<void> {
-    return new PPromise((resolve, reject) => {
+    return new Promise((resolve, reject) => {
       /* eslint-disable @typescript-eslint/no-unsafe-member-access */
       if (this._nativeSession === undefined ||
           this._nativeSession.update === undefined ||
@@ -125,9 +119,17 @@ class WebkitMediaKeySession
         return reject("Unavailable WebKit key session.");
       }
       try {
+        let uInt8Arraylicense: Uint8Array;
+        if (license instanceof ArrayBuffer) {
+          uInt8Arraylicense = new Uint8Array(license);
+        } else if (license instanceof Uint8Array) {
+          uInt8Arraylicense = license;
+        } else {
+          uInt8Arraylicense = new Uint8Array(license.buffer);
+        }
         /* eslint-disable @typescript-eslint/no-unsafe-member-access */
         // eslint-disable-next-line @typescript-eslint/no-unsafe-call
-        resolve(this._nativeSession.update(license));
+        resolve(this._nativeSession.update(uInt8Arraylicense));
         /* eslint-enable @typescript-eslint/no-unsafe-member-access */
       } catch (err) {
         reject(err);
@@ -140,7 +142,7 @@ class WebkitMediaKeySession
     _initDataType: string,
     initData: ArrayBuffer
   ): Promise<void> {
-    return new PPromise((resolve) => {
+    return new Promise((resolve) => {
       const elt = this._videoElement as ICompatHTMLMediaElement;
       if (elt.webkitKeys?.createSession === undefined) {
         throw new Error("No WebKitMediaKeys API.");
@@ -170,7 +172,7 @@ class WebkitMediaKeySession
   }
 
   public close(): Promise<void> {
-    return new PPromise((resolve, reject) => {
+    return new Promise((resolve, reject) => {
       this._unbindSession();
       this._closeSession();
       if (this._nativeSession === undefined) {
@@ -185,11 +187,11 @@ class WebkitMediaKeySession
   }
 
   load(): Promise<boolean> {
-    return PPromise.resolve(false);
+    return Promise.resolve(false);
   }
 
   remove(): Promise<void> {
-    return PPromise.resolve();
+    return Promise.resolve();
   }
 
   get sessionId(): string {
@@ -203,15 +205,25 @@ class WebkitMediaKeySession
   private _listenEvent(session: MediaKeySession) : void {
     this._unbindSession(); // If previous session was linked
 
+    const onEvent = (evt : Event) => {
+      this.trigger(evt.type, evt);
+    };
+
     /* eslint-disable @typescript-eslint/no-unsafe-call */
     /* eslint-disable @typescript-eslint/no-unsafe-member-access */
     /* eslint-disable @typescript-eslint/no-unsafe-return */
     ["keymessage", "message", "keyadded", "ready", "keyerror", "error"]
-      .forEach(evt => session.addEventListener(evt, this._onEvent));
+      .forEach(evt => {
+        session.addEventListener(evt, onEvent);
+        session.addEventListener(`webkit${evt}`, onEvent);
+      });
 
     this._unbindSession = () => {
       ["keymessage", "message", "keyadded", "ready", "keyerror", "error"]
-        .forEach(evt => session.removeEventListener(evt, this._onEvent));
+        .forEach(evt => {
+          session.removeEventListener(evt, onEvent);
+          session.removeEventListener(`webkit${evt}`, onEvent);
+        });
     };
     /* eslint-disable @typescript-eslint/no-unsafe-return */
     /* eslint-disable @typescript-eslint/no-unsafe-member-access */
@@ -253,7 +265,7 @@ class WebKitCustomMediaKeys implements ICustomWebKitMediaKeys {
 
   setServerCertificate(serverCertificate: Uint8Array): Promise<void> {
     this._serverCertificate = serverCertificate;
-    return PPromise.resolve();
+    return Promise.resolve();
   }
 }
 

package/src/compat/eme/generate_key_request.ts

@@ -124,12 +124,10 @@ export function patchInitData(initData : Uint8Array) : Uint8Array {
  * Generate a request from session.
  * @param {MediaKeySession} session - MediaKeySession on which the request will
  * be done.
- * @param {Uint8Array} initData - Initialization data given e.g. by the
- * "encrypted" event for the corresponding request.
- * @param {string} initDataType - Initialization data type given e.g. by the
- * "encrypted" event for the corresponding request.
- * @param {string} sessionType - Type of session you want to generate. Consult
- * EME Specification for more information on session types.
+ * @param {string} initializationDataType - Initialization data type given e.g.
+ * by the "encrypted" event for the corresponding request.
+ * @param {Uint8Array} initializationData - Initialization data given e.g. by
+ * the "encrypted" event for the corresponding request.
  * @returns {Promise} - Emit when done. Errors if fails.
  */
 export default function generateKeyRequest(

package/src/compat/eme/load_session.ts

@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-import PPromise from "pinkie";
 import log from "../../log";
 import { ICustomMediaKeySession } from "./custom_media_keys";
 
@@ -49,7 +48,7 @@ export default async function loadSession(
   // Chromium/Chrome versions where the `keyStatuses` property from a loaded
   // MediaKeySession would not be populated directly as the load answer but
   // asynchronously after.
-  return new PPromise((resolve) => {
+  return new Promise((resolve) => {
     (session as MediaKeySession).addEventListener("keystatuseschange",
                                                   resolveWithLoadedStatus);
     const timeout = setTimeout(resolveWithLoadedStatus,

package/src/core/api/__tests__/option_utils.test.ts

@@ -953,6 +953,17 @@ describe("API - parseLoadVideoOptions", () => {
       audioTrackSwitchingMode: "direct",
     });
 
+    expect(parseLoadVideoOptions({
+      audioTrackSwitchingMode: "reload",
+      url: "foo",
+      transport: "bar",
+    })).toEqual({
+      ...defaultLoadVideoOptions,
+      url: "foo",
+      transport: "bar",
+      audioTrackSwitchingMode: "reload",
+    });
+
     expect(parseLoadVideoOptions({
       audioTrackSwitchingMode: "seamless",
       url: "foo",
@@ -985,6 +996,7 @@ describe("API - parseLoadVideoOptions", () => {
         `the following strategy name:
 - \`seamless\`
 - \`direct\`
+- \`reload\`
 If badly set, seamless strategy will be used as default`);
     logWarnMock.mockReset();
     logWarnMock.mockReturnValue(undefined);

package/src/core/api/option_utils.ts

@@ -37,6 +37,7 @@ import {
 import objectAssign from "../../utils/object_assign";
 import warnOnce from "../../utils/warn_once";
 import { IKeySystemOption } from "../decrypt";
+import { IAudioTrackSwitchingMode } from "../stream";
 import {
   IAudioTrackPreference,
   ITextTrackPreference,
@@ -236,7 +237,7 @@ export interface ILoadVideoOptions {
   textTrackElement? : HTMLElement;
   manualBitrateSwitchingMode? : "seamless"|"direct";
   enableFastSwitching? : boolean;
-  audioTrackSwitchingMode? : "seamless"|"direct";
+  audioTrackSwitchingMode? : IAudioTrackSwitchingMode;
   onCodecSwitch? : "continue"|"reload";
 
   /* eslint-disable import/no-deprecated */
@@ -266,7 +267,7 @@ interface IParsedLoadVideoOptionsBase {
   startAt : IParsedStartAtOption|undefined;
   manualBitrateSwitchingMode : "seamless"|"direct";
   enableFastSwitching : boolean;
-  audioTrackSwitchingMode : "seamless"|"direct";
+  audioTrackSwitchingMode : IAudioTrackSwitchingMode;
   onCodecSwitch : "continue"|"reload";
 }
 
@@ -649,11 +650,12 @@ function parseLoadVideoOptions(
   let audioTrackSwitchingMode = isNullOrUndefined(options.audioTrackSwitchingMode)
                                   ? DEFAULT_AUDIO_TRACK_SWITCHING_MODE
                                   : options.audioTrackSwitchingMode;
-  if (!arrayIncludes(["seamless", "direct"], audioTrackSwitchingMode)) {
+  if (!arrayIncludes(["seamless", "direct", "reload"], audioTrackSwitchingMode)) {
     log.warn("The `audioTrackSwitchingMode` loadVideo option must match one of " +
              "the following strategy name:\n" +
              "- `seamless`\n" +
              "- `direct`\n" +
+             "- `reload`\n" +
              "If badly set, " + DEFAULT_AUDIO_TRACK_SWITCHING_MODE +
              " strategy will be used as default");
     audioTrackSwitchingMode = DEFAULT_AUDIO_TRACK_SWITCHING_MODE;

package/src/core/api/public_api.ts

@@ -76,7 +76,6 @@ import EventEmitter, {
 import isNullOrUndefined from "../../utils/is_null_or_undefined";
 import Logger from "../../utils/logger";
 import objectAssign from "../../utils/object_assign";
-import PPromise from "../../utils/promise";
 import {
   getLeftSizeOfRange,
   getPlayedSizeOfRange,
@@ -428,7 +427,7 @@ class Player extends EventEmitter<IPublicAPIEvent> {
     // See: https://bugzilla.mozilla.org/show_bug.cgi?id=1194624
     videoElement.preload = "auto";
 
-    this.version = /* PLAYER_VERSION */"3.27.0-dev.2022031700";
+    this.version = /* PLAYER_VERSION */"3.27.0-dev.2022032800";
     this.log = log;
     this.state = "STOPPED";
     this.videoElement = videoElement;
@@ -1539,7 +1538,7 @@ class Player extends EventEmitter<IPublicAPIEvent> {
     /* eslint-disable @typescript-eslint/unbound-method */
     if (isNullOrUndefined(playPromise) || typeof playPromise.catch !== "function") {
     /* eslint-enable @typescript-eslint/unbound-method */
-      return PPromise.resolve();
+      return Promise.resolve();
     }
     return playPromise.catch((error: Error) => {
       if (error.name === "NotAllowedError") {
@@ -2947,7 +2946,7 @@ class Player extends EventEmitter<IPublicAPIEvent> {
     return activeRepresentations[currentPeriod.id];
   }
 }
-Player.version = /* PLAYER_VERSION */"3.27.0-dev.2022031700";
+Player.version = /* PLAYER_VERSION */"3.27.0-dev.2022032800";
 
 /** Payload emitted with a `positionUpdate` event. */
 export interface IPositionUpdateItem {

package/src/core/decrypt/attach_media_keys.ts

@@ -20,7 +20,6 @@ import {
   setMediaKeys,
 } from "../../compat";
 import log from "../../log";
-import PPromise from "../../utils/promise";
 import { CancellationSignal } from "../../utils/task_canceller";
 import {
   IKeySystemOption,
@@ -58,7 +57,7 @@ export default async function attachMediaKeys(
   const closeAllSessions = previousState !== null &&
                            previousState.loadedSessionsStore !== loadedSessionsStore ?
                              previousState.loadedSessionsStore.closeAllSessions() :
-                             PPromise.resolve();
+                             Promise.resolve();
 
   await closeAllSessions;
 

package/src/core/decrypt/clear_on_stop.ts

@@ -16,7 +16,6 @@
 
 import { shouldUnsetMediaKeys } from "../../compat/";
 import log from "../../log";
-import PPromise from "../../utils/promise";
 import disposeDecryptionResources from "./dispose_decryption_resources";
 import MediaKeysInfosStore from "./utils/media_keys_infos_store";
 
@@ -44,5 +43,5 @@ export default function clearOnStop(
   }
   log.info("DRM: Nothing to clear. Returning right away. No state =",
            currentState === null);
-  return PPromise.resolve();
+  return Promise.resolve();
 }

package/src/core/decrypt/content_decryptor.ts

@@ -14,10 +14,8 @@
  * limitations under the License.
  */
 
-import PPromise from "pinkie";
 import {
   events,
-  generateKeyRequest,
   getInitData,
   ICustomMediaKeys,
   ICustomMediaKeySystemAccess,
@@ -568,17 +566,29 @@ export default class ContentDecryptor extends EventEmitter<IContentDecryptorEven
     if (sessionRes.type === MediaKeySessionLoadingType.Created) {
       const requestData = initializationData.values.constructRequestData();
       try {
-        await generateKeyRequest(mediaKeySession,
-                                 initializationData.type,
-                                 requestData);
+        await stores.loadedSessionsStore.generateLicenseRequest(
+          mediaKeySession,
+          initializationData.type,
+          requestData);
       } catch (error) {
+        // First check that the error was not due to the MediaKeySession closing
+        // or being closed
+        const entry = stores.loadedSessionsStore.getEntryForSession(mediaKeySession);
+        if (entry === null || entry.closingStatus.type !== "none") {
+          // MediaKeySession closing/closed: Just remove from handled list and abort.
+          const indexInCurrent = this._currentSessions.indexOf(sessionInfo);
+          if (indexInCurrent >= 0) {
+            this._currentSessions.splice(indexInCurrent, 1);
+          }
+          return Promise.resolve();
+        }
         throw new EncryptedMediaError("KEY_GENERATE_REQUEST_ERROR",
                                       error instanceof Error ? error.toString() :
                                       "Unknown error");
       }
     }
 
-    return PPromise.resolve();
+    return Promise.resolve();
   }
 
   private _tryToUseAlreadyCreatedSession(

package/src/core/decrypt/create_or_load_session.ts

@@ -88,7 +88,10 @@ export default async function createOrLoadSession(
     throw cancelSignal.cancellationError; // stop here if cancelled since
   }
 
-  const evt = await createSession(stores, initializationData, wantedSessionType);
+  const evt = await createSession(stores,
+                                  initializationData,
+                                  wantedSessionType,
+                                  cancelSignal);
   return { type: evt.type,
            value: { mediaKeySession: evt.value.mediaKeySession,
                     sessionType: evt.value.sessionType,