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

package/.eslintrc.js

@@ -350,10 +350,6 @@ module.exports = {
         "property": "substr",
         "message": "Please use `substring` instead.",
       },
-      {
-        "object": "Promise",
-        "message": "Not available in IE11, use promise ponyfill instead",
-      }
     ],
     "quote-props": [
       "error",

package/CHANGELOG.md

@@ -1,11 +1,12 @@
 # Changelog
 
-## v3.27.0-dev.2022031700 (2022-03-17)
+## v3.27.0-dev.2022032800 (2022-03-28)
 
 ### Features
 
   - Add a `maxVideoBufferSize` constructor option and `{get,set}MaxVideoBufferSize` methods to limit the size of loaded video data buffered at the same time [#1041, #1054]
   - DRM: Add a `"periods"` mode to the `keySystems[].singleLicensePer` `loadVideo` option, allowing to obtain decryption license for groups of Periods allowing a compromise between optimization, features and compatibility [#1028, #1061]
+  - Add a `"reload"` `audioTrackSwitchingMode` to work-around rare compatibility issues when switching audio tracks [#1089]
 
 ### Bug fixes
 
@@ -18,6 +19,7 @@
   - avoid unnecessary warning logs when loading some initialization segments [#1049]
   - TypeScript: Add forgotten TypeScript types in the exposed segment and manifest loader APIs [#1057]
   - DRM: Avoid decryption issues when a license is persisted in a `singleLicensePer` `"init-data"` mode but loaded in a `"content"` mode [#1031, #1042]
+  - DRM: Totally avoid the theoretical possibility of leaking MediaKeySessions when a `generateRequest` or `load` call takes multiple seconds [#1093]
 
 ### Other improvements
 
@@ -25,9 +27,10 @@
   - add better buffer cleaning logic on a browser's `QuotaExceededError` to better handle memory limitations [#1065]
   - DASH: Prioritize selectionPriority attribute over a "main" Role when ordering AdaptationSets [#1082]
   - directfile/Safari: use the `getStartDate` method in `getWallClockTime` when available to obtain true offseted times when playing HLS contents on Safari [#1055]
-  - avoid mistakenly relying on pinkie's Promise implementation when a native one is already available [#1058]
   - DRM: Improve DRM Session caches performance when `singleLicensePer` is set to `"content"`
+  - DRM: Stop retrying closing MediaKeySessions multiple times when it fails, instead doing it only once when it should work [#1093]
   - TypeScript: Add IBitrateEstimate, IPositionUpdate and IPlayerState types to the exported types [#1084]
+  - Remove dependency on pinkie's promise ponyfill [#1058, #1090]
   - tests: add performance tests, to better catch and avoid performance regressions [#1053, #1062]
   - DRM: Refactor DRM logic for better maintainability. DRM-linked logs are now prefixed by `DRM:` instead of `EME:` like previously [#1042]
 

package/VERSION

@@ -1 +1 @@
-3.27.0-dev.2022031700
+3.27.0-dev.2022032800

package/dist/_esm5.processed/compat/eme/close_session.js

@@ -51,7 +51,6 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 import log from "../../log";
 import cancellableSleep from "../../utils/cancellable_sleep";
-import PPromise from "../../utils/promise";
 import TaskCanceller, { CancellationError, } from "../../utils/task_canceller";
 /**
  * Close the given `MediaKeySession` and returns a Promise resolving when the
@@ -68,7 +67,7 @@ import TaskCanceller, { CancellationError, } from "../../utils/task_canceller";
  */
 export default function closeSession(session) {
     var timeoutCanceller = new TaskCanceller();
-    return PPromise.race([
+    return Promise.race([
         session.close()
             .then(function () { timeoutCanceller.cancel(); }),
         // The `closed` promise may resolve, even if `close()` result has not

package/dist/_esm5.processed/compat/eme/custom_key_system_access.d.ts

@@ -1,3 +1,18 @@
+/**
+ * Copyright 2015 CANAL+ Group
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 import { ICustomMediaKeys } from "./custom_media_keys";
 export interface ICustomMediaKeySystemAccess {
     readonly keySystem: string;

package/dist/_esm5.processed/compat/eme/custom_key_system_access.js

@@ -1,19 +1,3 @@
-/**
- * Copyright 2015 CANAL+ Group
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import PPromise from "../../utils/promise";
 /**
  * Simple implementation of the MediaKeySystemAccess EME API.
  *
@@ -50,7 +34,7 @@ var CustomMediaKeySystemAccess = /** @class */ (function () {
      */
     CustomMediaKeySystemAccess.prototype.createMediaKeys = function () {
         var _this = this;
-        return new PPromise(function (res) { return res(_this._mediaKeys); });
+        return new Promise(function (res) { return res(_this._mediaKeys); });
     };
     /**
      * @returns {Object} - Configuration accepted for this MediaKeySystemAccess.

package/dist/_esm5.processed/compat/eme/custom_media_keys/ie11_media_keys.js

@@ -30,7 +30,6 @@ var __extends = (this && this.__extends) || (function () {
 })();
 import { merge as observableMerge, Subject, takeUntil, } from "rxjs";
 import EventEmitter from "../../../utils/event_emitter";
-import PPromise from "../../../utils/promise";
 import * as events from "../../event_listeners";
 import { MSMediaKeysConstructor, } from "./ms_media_keys_constructor";
 var IE11MediaKeySession = /** @class */ (function (_super) {
@@ -41,11 +40,11 @@ var IE11MediaKeySession = /** @class */ (function (_super) {
         _this.keyStatuses = new Map();
         _this._mk = mk;
         _this._closeSession$ = new Subject();
-        _this.closed = new PPromise(function (resolve) {
+        _this.closed = new Promise(function (resolve) {
             _this._closeSession$.subscribe(resolve);
         });
         _this.update = function (license) {
-            return new PPromise(function (resolve, reject) {
+            return new Promise(function (resolve, reject) {
                 if (_this._ss === undefined) {
                     return reject("MediaKeySession not set.");
                 }
@@ -61,7 +60,7 @@ var IE11MediaKeySession = /** @class */ (function (_super) {
     }
     IE11MediaKeySession.prototype.generateRequest = function (_initDataType, initData) {
         var _this = this;
-        return new PPromise(function (resolve) {
+        return new Promise(function (resolve) {
             var initDataU8 = initData instanceof Uint8Array ? initData :
                 initData instanceof ArrayBuffer ? new Uint8Array(initData) :
                     new Uint8Array(initData.buffer);
@@ -73,7 +72,7 @@ var IE11MediaKeySession = /** @class */ (function (_super) {
     };
     IE11MediaKeySession.prototype.close = function () {
         var _this = this;
-        return new PPromise(function (resolve) {
+        return new Promise(function (resolve) {
             if (_this._ss != null) {
                 _this._ss.close();
                 _this._ss = undefined;
@@ -84,10 +83,10 @@ var IE11MediaKeySession = /** @class */ (function (_super) {
         });
     };
     IE11MediaKeySession.prototype.load = function () {
-        return PPromise.resolve(false);
+        return Promise.resolve(false);
     };
     IE11MediaKeySession.prototype.remove = function () {
-        return PPromise.resolve();
+        return Promise.resolve();
     };
     Object.defineProperty(IE11MediaKeySession.prototype, "sessionId", {
         get: function () {

package/dist/_esm5.processed/compat/eme/custom_media_keys/index.js

@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import PPromise from "pinkie";
 import { MediaError } from "../../../errors";
 import assert from "../../../utils/assert";
 import { isIE11 } from "../../browser_detection";
@@ -126,7 +125,7 @@ else {
     }
     requestMediaKeySystemAccess = function (keyType, keySystemConfigurations) {
         if (!isTypeSupported_1(keyType)) {
-            return PPromise.reject(new Error("Unsupported key type"));
+            return Promise.reject(new Error("Unsupported key type"));
         }
         for (var i = 0; i < keySystemConfigurations.length; i++) {
             var keySystemConfiguration = keySystemConfigurations[i];
@@ -151,10 +150,10 @@ else {
                 }
                 // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
                 var customMediaKeys = createCustomMediaKeys_1(keyType);
-                return PPromise.resolve(new CustomMediaKeySystemAccess(keyType, customMediaKeys, keySystemConfigurationResponse));
+                return Promise.resolve(new CustomMediaKeySystemAccess(keyType, customMediaKeys, keySystemConfigurationResponse));
             }
         }
-        return PPromise.reject(new Error("Unsupported configuration"));
+        return Promise.reject(new Error("Unsupported configuration"));
     };
 }
 export { requestMediaKeySystemAccess, setMediaKeys, };

package/dist/_esm5.processed/compat/eme/custom_media_keys/old_webkit_media_keys.js

@@ -31,7 +31,6 @@ var __extends = (this && this.__extends) || (function () {
 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";
 /**
  * Returns true if the given media element has old webkit methods
@@ -57,21 +56,31 @@ var OldWebkitMediaKeySession = /** @class */ (function (_super) {
         _this._key = keySystem;
         _this.sessionId = "";
         _this._closeSession = noop; // Just here to make TypeScript happy
-        _this.closed = new PPromise(function (resolve) {
-            _this._closeSession = resolve;
-        });
         _this.keyStatuses = new Map();
         _this.expiration = NaN;
-        _this._onSessionRelatedEvent = function (evt) {
+        var onSessionRelatedEvent = function (evt) {
             _this.trigger(evt.type, evt);
         };
+        _this.closed = new Promise(function (resolve) {
+            _this._closeSession = function () {
+                ["keymessage", "message", "keyadded", "ready", "keyerror", "error"]
+                    .forEach(function (evt) {
+                    mediaElement.removeEventListener(evt, onSessionRelatedEvent);
+                    mediaElement.removeEventListener("webkit".concat(evt), onSessionRelatedEvent);
+                });
+                resolve();
+            };
+        });
         ["keymessage", "message", "keyadded", "ready", "keyerror", "error"]
-            .forEach(function (evt) { return mediaElement.addEventListener(evt, _this._onSessionRelatedEvent); });
+            .forEach(function (evt) {
+            mediaElement.addEventListener(evt, onSessionRelatedEvent);
+            mediaElement.addEventListener("webkit".concat(evt), onSessionRelatedEvent);
+        });
         return _this;
     }
     OldWebkitMediaKeySession.prototype.update = function (license) {
         var _this = this;
-        return new PPromise(function (resolve, reject) {
+        return new Promise(function (resolve, reject) {
             try {
                 if (_this._key.indexOf("clearkey") >= 0) {
                     var licenseTypedArray = license instanceof ArrayBuffer ? new Uint8Array(license) :
@@ -98,15 +107,14 @@ var OldWebkitMediaKeySession = /** @class */ (function (_super) {
     };
     OldWebkitMediaKeySession.prototype.generateRequest = function (_initDataType, initData) {
         var _this = this;
-        return new PPromise(function (resolve) {
+        return new Promise(function (resolve) {
             _this._vid.webkitGenerateKeyRequest(_this._key, initData);
             resolve();
         });
     };
     OldWebkitMediaKeySession.prototype.close = function () {
         var _this = this;
-        return new PPromise(function (resolve) {
-            _this._unbindSession();
+        return new Promise(function (resolve) {
             _this._closeSession();
             resolve();
         });
@@ -118,15 +126,10 @@ var OldWebkitMediaKeySession = /** @class */ (function (_super) {
      */
     OldWebkitMediaKeySession.prototype.load = function () {
         // Not implemented. Always return false as in "no session with that id".
-        return PPromise.resolve(false);
+        return Promise.resolve(false);
     };
     OldWebkitMediaKeySession.prototype.remove = function () {
-        return PPromise.resolve();
-    };
-    OldWebkitMediaKeySession.prototype._unbindSession = function () {
-        var _this = this;
-        ["keymessage", "message", "keyadded", "ready", "keyerror", "error"]
-            .forEach(function (evt) { return _this._vid.removeEventListener(evt, _this._onSessionRelatedEvent); });
+        return Promise.resolve();
     };
     return OldWebkitMediaKeySession;
 }(EventEmitter));

package/dist/_esm5.processed/compat/eme/custom_media_keys/webkit_media_keys.js

@@ -30,7 +30,6 @@ var __extends = (this && this.__extends) || (function () {
 })();
 import EventEmitter from "../../../utils/event_emitter";
 import noop from "../../../utils/noop";
-import PPromise from "../../../utils/promise";
 import getWebKitFairplayInitData from "../get_webkit_fairplay_initdata";
 import { WebKitMediaKeysConstructor, } from "./webkit_media_keys_constructor";
 /**
@@ -77,19 +76,16 @@ var WebkitMediaKeySession = /** @class */ (function (_super) {
         _this._keyType = keyType;
         _this._unbindSession = noop;
         _this._closeSession = noop; // Just here to make TypeScript happy
-        _this.closed = new PPromise(function (resolve) {
+        _this.closed = new Promise(function (resolve) {
             _this._closeSession = resolve;
         });
         _this.keyStatuses = new Map();
         _this.expiration = NaN;
-        _this._onEvent = function (evt) {
-            _this.trigger(evt.type, evt);
-        };
         return _this;
     }
     WebkitMediaKeySession.prototype.update = function (license) {
         var _this = this;
-        return new PPromise(function (resolve, reject) {
+        return new Promise(function (resolve, reject) {
             /* eslint-disable @typescript-eslint/no-unsafe-member-access */
             if (_this._nativeSession === undefined ||
                 _this._nativeSession.update === undefined ||
@@ -97,9 +93,19 @@ var WebkitMediaKeySession = /** @class */ (function (_super) {
                 return reject("Unavailable WebKit key session.");
             }
             try {
+                var uInt8Arraylicense = void 0;
+                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) {
@@ -110,7 +116,7 @@ var WebkitMediaKeySession = /** @class */ (function (_super) {
     };
     WebkitMediaKeySession.prototype.generateRequest = function (_initDataType, initData) {
         var _this = this;
-        return new PPromise(function (resolve) {
+        return new Promise(function (resolve) {
             var _a;
             var elt = _this._videoElement;
             if (((_a = elt.webkitKeys) === null || _a === void 0 ? void 0 : _a.createSession) === undefined) {
@@ -138,7 +144,7 @@ var WebkitMediaKeySession = /** @class */ (function (_super) {
     };
     WebkitMediaKeySession.prototype.close = function () {
         var _this = this;
-        return new PPromise(function (resolve, reject) {
+        return new Promise(function (resolve, reject) {
             _this._unbindSession();
             _this._closeSession();
             if (_this._nativeSession === undefined) {
@@ -152,10 +158,10 @@ var WebkitMediaKeySession = /** @class */ (function (_super) {
         });
     };
     WebkitMediaKeySession.prototype.load = function () {
-        return PPromise.resolve(false);
+        return Promise.resolve(false);
     };
     WebkitMediaKeySession.prototype.remove = function () {
-        return PPromise.resolve();
+        return Promise.resolve();
     };
     Object.defineProperty(WebkitMediaKeySession.prototype, "sessionId", {
         get: function () {
@@ -172,14 +178,23 @@ var WebkitMediaKeySession = /** @class */ (function (_super) {
     WebkitMediaKeySession.prototype._listenEvent = function (session) {
         var _this = this;
         this._unbindSession(); // If previous session was linked
+        var onEvent = function (evt) {
+            _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(function (evt) { return session.addEventListener(evt, _this._onEvent); });
+            .forEach(function (evt) {
+            session.addEventListener(evt, onEvent);
+            session.addEventListener("webkit".concat(evt), onEvent);
+        });
         this._unbindSession = function () {
             ["keymessage", "message", "keyadded", "ready", "keyerror", "error"]
-                .forEach(function (evt) { return session.removeEventListener(evt, _this._onEvent); });
+                .forEach(function (evt) {
+                session.removeEventListener(evt, onEvent);
+                session.removeEventListener("webkit".concat(evt), onEvent);
+            });
         };
         /* eslint-disable @typescript-eslint/no-unsafe-return */
         /* eslint-disable @typescript-eslint/no-unsafe-member-access */
@@ -211,7 +226,7 @@ var WebKitCustomMediaKeys = /** @class */ (function () {
     };
     WebKitCustomMediaKeys.prototype.setServerCertificate = function (serverCertificate) {
         this._serverCertificate = serverCertificate;
-        return PPromise.resolve();
+        return Promise.resolve();
     };
     return WebKitCustomMediaKeys;
 }());

package/dist/_esm5.processed/compat/eme/generate_key_request.d.ts

@@ -45,12 +45,10 @@ export declare 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(session: MediaKeySession | ICustomMediaKeySession, initializationDataType: string | undefined, initializationData: Uint8Array): Promise<unknown>;

package/dist/_esm5.processed/compat/eme/generate_key_request.js

@@ -114,12 +114,10 @@ export function patchInitData(initData) {
  * 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(session, initializationDataType, initializationData) {

package/dist/_esm5.processed/compat/eme/load_session.js

@@ -49,7 +49,6 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
-import PPromise from "pinkie";
 import log from "../../log";
 var EME_WAITING_DELAY_LOADED_SESSION_EMPTY_KEYSTATUSES = 100;
 /**
@@ -83,7 +82,7 @@ export default function loadSession(session, sessionId) {
                     // Chromium/Chrome versions where the `keyStatuses` property from a loaded
                     // MediaKeySession would not be populated directly as the load answer but
                     // asynchronously after.
-                    return [2 /*return*/, new PPromise(function (resolve) {
+                    return [2 /*return*/, new Promise(function (resolve) {
                             session.addEventListener("keystatuseschange", resolveWithLoadedStatus);
                             var timeout = setTimeout(resolveWithLoadedStatus, EME_WAITING_DELAY_LOADED_SESSION_EMPTY_KEYSTATUSES);
                             function resolveWithLoadedStatus() {

package/dist/_esm5.processed/config.d.ts

@@ -145,9 +145,6 @@ declare class ConfigHandler {
         DASH_FALLBACK_LIFETIME_WHEN_MINIMUM_UPDATE_PERIOD_EQUAL_0: number;
         EME_DEFAULT_MAX_SIMULTANEOUS_MEDIA_KEY_SESSIONS: number;
         EME_MAX_STORED_PERSISTENT_SESSION_INFORMATION: number;
-        EME_SESSION_CLOSING_MAX_RETRY: number;
-        EME_SESSION_CLOSING_INITIAL_DELAY: number;
-        EME_SESSION_CLOSING_MAX_DELAY: number;
         EME_WAITING_DELAY_LOADED_SESSION_EMPTY_KEYSTATUSES: number;
         FORCED_ENDED_THRESHOLD: number;
         ADAPTATION_SWITCH_BUFFER_PADDINGS: {

package/dist/_esm5.processed/core/api/option_utils.d.ts

@@ -16,6 +16,7 @@
 import { IRepresentationFilter } from "../../manifest";
 import { ICustomManifestLoader, ICustomSegmentLoader, ILoadedManifestFormat, ITransportOptions as IParsedTransportOptions } from "../../transports";
 import { IKeySystemOption } from "../decrypt";
+import { IAudioTrackSwitchingMode } from "../stream";
 import { IAudioTrackPreference, ITextTrackPreference, IVideoTrackPreference } from "./track_choice_manager";
 export { IKeySystemOption };
 /** Value of the `serverSyncInfos` transport option. */
@@ -206,7 +207,7 @@ export interface ILoadVideoOptions {
     textTrackElement?: HTMLElement;
     manualBitrateSwitchingMode?: "seamless" | "direct";
     enableFastSwitching?: boolean;
-    audioTrackSwitchingMode?: "seamless" | "direct";
+    audioTrackSwitchingMode?: IAudioTrackSwitchingMode;
     onCodecSwitch?: "continue" | "reload";
     supplementaryTextTracks?: ISupplementaryTextTrackOption[];
     supplementaryImageTracks?: ISupplementaryImageTrackOption[];
@@ -232,7 +233,7 @@ interface IParsedLoadVideoOptionsBase {
     startAt: IParsedStartAtOption | undefined;
     manualBitrateSwitchingMode: "seamless" | "direct";
     enableFastSwitching: boolean;
-    audioTrackSwitchingMode: "seamless" | "direct";
+    audioTrackSwitchingMode: IAudioTrackSwitchingMode;
     onCodecSwitch: "continue" | "reload";
 }
 /**

package/dist/_esm5.processed/core/api/option_utils.js

@@ -326,11 +326,12 @@ function parseLoadVideoOptions(options) {
     var 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/dist/_esm5.processed/core/api/public_api.js

@@ -56,7 +56,6 @@ import areArraysOfNumbersEqual from "../../utils/are_arrays_of_numbers_equal";
 import EventEmitter, { fromEvent, } from "../../utils/event_emitter";
 import isNullOrUndefined from "../../utils/is_null_or_undefined";
 import objectAssign from "../../utils/object_assign";
-import PPromise from "../../utils/promise";
 import { getLeftSizeOfRange, getPlayedSizeOfRange, getSizeOfRange, } from "../../utils/ranges";
 import createSharedReference from "../../utils/reference";
 import warnOnce from "../../utils/warn_once";
@@ -88,7 +87,7 @@ var Player = /** @class */ (function (_super) {
         // Workaround to support Firefox autoplay on FF 42.
         // 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;
@@ -1045,7 +1044,7 @@ var Player = /** @class */ (function (_super) {
         /* 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(function (error) {
             if (error.name === "NotAllowedError") {
@@ -2303,5 +2302,5 @@ var Player = /** @class */ (function (_super) {
     };
     return Player;
 }(EventEmitter));
-Player.version = /* PLAYER_VERSION */ "3.27.0-dev.2022031700";
+Player.version = /* PLAYER_VERSION */ "3.27.0-dev.2022032800";
 export default Player;

package/dist/_esm5.processed/core/decrypt/attach_media_keys.js

@@ -51,7 +51,6 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 import { setMediaKeys, } from "../../compat";
 import log from "../../log";
-import PPromise from "../../utils/promise";
 import MediaKeysInfosStore from "./utils/media_keys_infos_store";
 /**
  * Dispose of the MediaKeys instance attached to the given media element, if
@@ -81,7 +80,7 @@ export default function attachMediaKeys(mediaElement, _a, cancelSignal) {
                     closeAllSessions = previousState !== null &&
                         previousState.loadedSessionsStore !== loadedSessionsStore ?
                         previousState.loadedSessionsStore.closeAllSessions() :
-                        PPromise.resolve();
+                        Promise.resolve();
                     return [4 /*yield*/, closeAllSessions];
                 case 1:
                     _b.sent();

package/dist/_esm5.processed/core/decrypt/clear_on_stop.js

@@ -15,7 +15,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";
 /**
@@ -37,5 +36,5 @@ export default function clearOnStop(mediaElement) {
         return currentState.loadedSessionsStore.closeAllSessions();
     }
     log.info("DRM: Nothing to clear. Returning right away. No state =", currentState === null);
-    return PPromise.resolve();
+    return Promise.resolve();
 }

package/dist/_esm5.processed/core/decrypt/content_decryptor.js

@@ -84,8 +84,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     }
     return to.concat(ar || Array.prototype.slice.call(from));
 };
-import PPromise from "pinkie";
-import { events, generateKeyRequest, getInitData, } from "../../compat/";
+import { events, getInitData, } from "../../compat/";
 import config from "../../config";
 import { EncryptedMediaError, OtherError, } from "../../errors";
 import log from "../../log";
@@ -319,7 +318,7 @@ var ContentDecryptor = /** @class */ (function (_super) {
      */
     ContentDecryptor.prototype._processInitializationData = function (initializationData, mediaKeysData) {
         return __awaiter(this, void 0, void 0, function () {
-            var mediaKeySystemAccess, stores, options, firstCreatedSession, keyIds, hexKids, period, createdSessions, periodKeys, _i, createdSessions_1, createdSess, periodKeysArr, _a, periodKeysArr_1, kid, _b, periodKeysArr_2, innerKid, wantedSessionType, _c, EME_DEFAULT_MAX_SIMULTANEOUS_MEDIA_KEY_SESSIONS, EME_MAX_STORED_PERSISTENT_SESSION_INFORMATION, maxSessionCacheSize, sessionRes, sessionInfo, _d, mediaKeySession, sessionType, isSessionPersisted, sub, requestData, error_1;
+            var mediaKeySystemAccess, stores, options, firstCreatedSession, keyIds, hexKids, period, createdSessions, periodKeys, _i, createdSessions_1, createdSess, periodKeysArr, _a, periodKeysArr_1, kid, _b, periodKeysArr_2, innerKid, wantedSessionType, _c, EME_DEFAULT_MAX_SIMULTANEOUS_MEDIA_KEY_SESSIONS, EME_MAX_STORED_PERSISTENT_SESSION_INFORMATION, maxSessionCacheSize, sessionRes, sessionInfo, _d, mediaKeySession, sessionType, isSessionPersisted, sub, requestData, error_1, entry, indexInCurrent;
             var _this = this;
             return __generator(this, function (_e) {
                 switch (_e.label) {
@@ -487,15 +486,23 @@ var ContentDecryptor = /** @class */ (function (_super) {
                         _e.label = 2;
                     case 2:
                         _e.trys.push([2, 4, , 5]);
-                        return [4 /*yield*/, generateKeyRequest(mediaKeySession, initializationData.type, requestData)];
+                        return [4 /*yield*/, stores.loadedSessionsStore.generateLicenseRequest(mediaKeySession, initializationData.type, requestData)];
                     case 3:
                         _e.sent();
                         return [3 /*break*/, 5];
                     case 4:
                         error_1 = _e.sent();
+                        entry = stores.loadedSessionsStore.getEntryForSession(mediaKeySession);
+                        if (entry === null || entry.closingStatus.type !== "none") {
+                            indexInCurrent = this._currentSessions.indexOf(sessionInfo);
+                            if (indexInCurrent >= 0) {
+                                this._currentSessions.splice(indexInCurrent, 1);
+                            }
+                            return [2 /*return*/, Promise.resolve()];
+                        }
                         throw new EncryptedMediaError("KEY_GENERATE_REQUEST_ERROR", error_1 instanceof Error ? error_1.toString() :
                             "Unknown error");
-                    case 5: return [2 /*return*/, PPromise.resolve()];
+                    case 5: return [2 /*return*/, Promise.resolve()];
                 }
             });
         });

package/dist/_esm5.processed/core/decrypt/create_or_load_session.js

@@ -111,7 +111,7 @@ export default function createOrLoadSession(initializationData, stores, wantedSe
                     if (cancelSignal.cancellationError !== null) {
                         throw cancelSignal.cancellationError; // stop here if cancelled since
                     }
-                    return [4 /*yield*/, createSession(stores, initializationData, wantedSessionType)];
+                    return [4 /*yield*/, createSession(stores, initializationData, wantedSessionType, cancelSignal)];
                 case 4:
                     evt = _a.sent();
                     return [2 /*return*/, { type: evt.type,