rx-player 3.27.0-dev.2022032100 → 3.27.0

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 # Changelog
 
-## v3.27.0-dev.2022032100 (2022-03-21)
+## v3.27.0 (2022-03-31)
 
 ### Features
 
@@ -16,17 +16,20 @@
   - avoid performing a small seek when changing the audio track [#1080]
   - api: allow switching to RELOADING state synchronously after LOADED [#1083]
   - Safari Mobile: Improve decryption support on Safari mobile by relying on the vendored `WebKitMediaKeys` API [#1072]
+  - DASH: Fix issue which prevented the integrity check of most MP4 DASH segments when `transportOptions.checkMediaSegmentIntegrity` was set to `true`
   - 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
 
   - DASH: always consider that the non-last Period is finished when it contains SegmentTimeline elements [#1047]
   - 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]
+  - directfile/Safari: use the `getStartDate` method in `getWallClockTime`, `seekTo` and the `positionUpdate` event when available to obtain true offseted "wall-clock" times when playing HLS contents on Safari [#1055]
   - 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]

package/VERSION

@@ -1 +1 @@
-3.27.0-dev.2022032100
+3.27.0

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

@@ -56,16 +56,26 @@ var OldWebkitMediaKeySession = /** @class */ (function (_super) {
         _this._key = keySystem;
         _this.sessionId = "";
         _this._closeSession = noop; // Just here to make TypeScript happy
-        _this.closed = new Promise(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) {
@@ -105,7 +115,6 @@ var OldWebkitMediaKeySession = /** @class */ (function (_super) {
     OldWebkitMediaKeySession.prototype.close = function () {
         var _this = this;
         return new Promise(function (resolve) {
-            _this._unbindSession();
             _this._closeSession();
             resolve();
         });
@@ -122,11 +131,6 @@ var OldWebkitMediaKeySession = /** @class */ (function (_super) {
     OldWebkitMediaKeySession.prototype.remove = function () {
         return Promise.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 OldWebkitMediaKeySession;
 }(EventEmitter));
 var OldWebKitCustomMediaKeys = /** @class */ (function () {

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

@@ -81,9 +81,6 @@ var WebkitMediaKeySession = /** @class */ (function (_super) {
         });
         _this.keyStatuses = new Map();
         _this.expiration = NaN;
-        _this._onEvent = function (evt) {
-            _this.trigger(evt.type, evt);
-        };
         return _this;
     }
     WebkitMediaKeySession.prototype.update = function (license) {
@@ -96,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) {
@@ -171,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 */

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/get_start_date.d.ts

@@ -0,0 +1,30 @@
+/**
+ * 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.
+ */
+/**
+ * Calculating a live-offseted media position necessitate to obtain first an
+ * offset, and then adding that offset to the wanted position.
+ *
+ * That offset is in most case present inside the Manifest file, yet in cases
+ * without it or without a Manifest, such as the "directfile" mode, the RxPlayer
+ * won't know that offset.
+ *
+ * Thankfully Safari declares a `getStartDate` method allowing to obtain that
+ * offset when available. This logic is mainly useful when playing HLS contents
+ * in directfile mode on Safari.
+ * @param {HTMLMediaElement} mediaElement
+ * @returns {number|undefined}
+ */
+export default function getStartDate(mediaElement: HTMLMediaElement): number | undefined;

package/dist/_esm5.processed/compat/get_start_date.js

@@ -0,0 +1,44 @@
+/**
+ * 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.
+ */
+/**
+ * Calculating a live-offseted media position necessitate to obtain first an
+ * offset, and then adding that offset to the wanted position.
+ *
+ * That offset is in most case present inside the Manifest file, yet in cases
+ * without it or without a Manifest, such as the "directfile" mode, the RxPlayer
+ * won't know that offset.
+ *
+ * Thankfully Safari declares a `getStartDate` method allowing to obtain that
+ * offset when available. This logic is mainly useful when playing HLS contents
+ * in directfile mode on Safari.
+ * @param {HTMLMediaElement} mediaElement
+ * @returns {number|undefined}
+ */
+export default function getStartDate(mediaElement) {
+    var _mediaElement = mediaElement;
+    if (typeof _mediaElement.getStartDate === "function") {
+        var startDate = _mediaElement.getStartDate();
+        if (typeof startDate === "object" && startDate !== null) {
+            var startDateNum = +startDate;
+            if (!isNaN(startDateNum)) {
+                return startDateNum / 1000;
+            }
+        }
+        else if (typeof startDate === "number" && !isNaN(startDate)) {
+            return startDate;
+        }
+    }
+}

package/dist/_esm5.processed/compat/index.d.ts

@@ -22,6 +22,7 @@ import clearElementSrc from "./clear_element_src";
 import { closeSession, CustomMediaKeySystemAccess, generateKeyRequest, getInitData, ICustomMediaKeys, ICustomMediaKeySession, ICustomMediaKeySystemAccess, loadSession, requestMediaKeySystemAccess, setMediaKeys } from "./eme";
 import * as events from "./event_listeners";
 import { exitFullscreen, isFullscreen, requestFullscreen } from "./fullscreen";
+import getStartDate from "./get_start_date";
 import hasEMEAPIs from "./has_eme_apis";
 import isCodecSupported from "./is_codec_supported";
 import isNode from "./is_node";
@@ -38,4 +39,4 @@ import shouldValidateMetadata from "./should_validate_metadata";
 import shouldWaitForDataBeforeLoaded from "./should_wait_for_data_before_loaded";
 import whenLoadedMetadata$ from "./when_loaded_metadata";
 import whenMediaSourceOpen$ from "./when_media_source_open";
-export { addClassName, addTextTrack, canPatchISOBMFFSegment, clearElementSrc, closeSession, CustomMediaKeySystemAccess, events, exitFullscreen, generateKeyRequest, getInitData, hasEMEAPIs, ICompatTextTrack, ICompatVTTCue, ICustomMediaKeySession, ICustomMediaKeySystemAccess, ICustomMediaKeys, ICompatSourceBuffer, isCodecSupported, isFullscreen, isNode, isOffline, isVTTCue, loadSession, makeVTTCue, MediaSource_, onHeightWidthChange, play, requestFullscreen, requestMediaKeySystemAccess, setElementSrc$, setMediaKeys, shouldReloadMediaSourceOnDecipherabilityUpdate, shouldRenewMediaKeys, shouldUnsetMediaKeys, shouldValidateMetadata, shouldWaitForDataBeforeLoaded, tryToChangeSourceBufferType, whenLoadedMetadata$, whenMediaSourceOpen$, };
+export { addClassName, addTextTrack, canPatchISOBMFFSegment, clearElementSrc, closeSession, CustomMediaKeySystemAccess, events, exitFullscreen, generateKeyRequest, getInitData, getStartDate, hasEMEAPIs, ICompatTextTrack, ICompatVTTCue, ICustomMediaKeySession, ICustomMediaKeySystemAccess, ICustomMediaKeys, ICompatSourceBuffer, isCodecSupported, isFullscreen, isNode, isOffline, isVTTCue, loadSession, makeVTTCue, MediaSource_, onHeightWidthChange, play, requestFullscreen, requestMediaKeySystemAccess, setElementSrc$, setMediaKeys, shouldReloadMediaSourceOnDecipherabilityUpdate, shouldRenewMediaKeys, shouldUnsetMediaKeys, shouldValidateMetadata, shouldWaitForDataBeforeLoaded, tryToChangeSourceBufferType, whenLoadedMetadata$, whenMediaSourceOpen$, };

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

@@ -22,6 +22,7 @@ import clearElementSrc from "./clear_element_src";
 import { closeSession, CustomMediaKeySystemAccess, generateKeyRequest, getInitData, loadSession, requestMediaKeySystemAccess, setMediaKeys, } from "./eme";
 import * as events from "./event_listeners";
 import { exitFullscreen, isFullscreen, requestFullscreen, } from "./fullscreen";
+import getStartDate from "./get_start_date";
 import hasEMEAPIs from "./has_eme_apis";
 import isCodecSupported from "./is_codec_supported";
 import isNode from "./is_node";
@@ -44,4 +45,4 @@ import whenMediaSourceOpen$ from "./when_media_source_open";
 // we  would prefer to disallow (both for the understandability of the code and
 // to better exploit tree shaking.
 patchWebkitSourceBuffer();
-export { addClassName, addTextTrack, canPatchISOBMFFSegment, clearElementSrc, closeSession, CustomMediaKeySystemAccess, events, exitFullscreen, generateKeyRequest, getInitData, hasEMEAPIs, isCodecSupported, isFullscreen, isNode, isOffline, isVTTCue, loadSession, makeVTTCue, MediaSource_, onHeightWidthChange, play, requestFullscreen, requestMediaKeySystemAccess, setElementSrc$, setMediaKeys, shouldReloadMediaSourceOnDecipherabilityUpdate, shouldRenewMediaKeys, shouldUnsetMediaKeys, shouldValidateMetadata, shouldWaitForDataBeforeLoaded, tryToChangeSourceBufferType, whenLoadedMetadata$, whenMediaSourceOpen$, };
+export { addClassName, addTextTrack, canPatchISOBMFFSegment, clearElementSrc, closeSession, CustomMediaKeySystemAccess, events, exitFullscreen, generateKeyRequest, getInitData, getStartDate, hasEMEAPIs, isCodecSupported, isFullscreen, isNode, isOffline, isVTTCue, loadSession, makeVTTCue, MediaSource_, onHeightWidthChange, play, requestFullscreen, requestMediaKeySystemAccess, setElementSrc$, setMediaKeys, shouldReloadMediaSourceOnDecipherabilityUpdate, shouldRenewMediaKeys, shouldUnsetMediaKeys, shouldValidateMetadata, shouldWaitForDataBeforeLoaded, tryToChangeSourceBufferType, whenLoadedMetadata$, whenMediaSourceOpen$, };

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: {
@@ -178,8 +175,7 @@ declare class ConfigHandler {
         DEFAULT_MAXIMUM_TIME_ROUNDING_ERROR: number;
         BUFFERED_HISTORY_RETENTION_TIME: number;
         BUFFERED_HISTORY_MAXIMUM_ENTRIES: number;
-        MIN_BUFFER_LENGTH: number;
-        MIN_BUFFER_DISTANCE_BEFORE_CLEAN_UP: number;
+        MIN_BUFFER_AHEAD: number;
         UPTO_CURRENT_POSITION_CLEANUP: number;
     };
     update(config: Partial<IDefaultConfig>): void;

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

@@ -44,7 +44,7 @@ var __assign = (this && this.__assign) || function () {
  * It also starts the different sub-parts of the player on various API calls.
  */
 import { combineLatest as observableCombineLatest, concat as observableConcat, connectable, distinctUntilChanged, EMPTY, filter, map, merge as observableMerge, mergeMap, of as observableOf, ReplaySubject, share, shareReplay, skipWhile, startWith, Subject, switchMap, take, takeUntil, } from "rxjs";
-import { events, exitFullscreen, isFullscreen, requestFullscreen, } from "../../compat";
+import { events, exitFullscreen, getStartDate, isFullscreen, requestFullscreen, } from "../../compat";
 /* eslint-disable-next-line max-len */
 import canRelyOnVideoVisibilityAndSize from "../../compat/can_rely_on_video_visibility_and_size";
 import config from "../../config";
@@ -87,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.2022032100";
+        _this.version = /* PLAYER_VERSION */ "3.27.0";
         _this.log = log;
         _this.state = "STOPPED";
         _this.videoElement = videoElement;
@@ -805,22 +805,8 @@ var Player = /** @class */ (function (_super) {
         }
         var _a = this._priv_contentInfos, isDirectFile = _a.isDirectFile, manifest = _a.manifest;
         if (isDirectFile) {
-            // Calculating the "wall-clock time" necessitate to obtain first an offset,
-            // and then adding that offset to the HTMLMediaElement's current position.
-            // That offset is in most case present inside the Manifest file, yet in
-            // directfile mode, the RxPlayer won't parse that file, the browser does it.
-            //
-            // Thankfully Safari declares a `getStartDate` method allowing to obtain
-            // that offset when available. This logic is thus mainly useful when
-            // playing HLS contents in directfile mode on Safari.
-            var mediaElement = this.videoElement;
-            if (typeof mediaElement.getStartDate === "function") {
-                var startDate = mediaElement.getStartDate();
-                if (typeof startDate === "number" && !isNaN(startDate)) {
-                    return startDate + mediaElement.currentTime;
-                }
-            }
-            return mediaElement.currentTime;
+            var startDate = getStartDate(this.videoElement);
+            return (startDate !== null && startDate !== void 0 ? startDate : 0) + this.videoElement.currentTime;
         }
         if (manifest !== null) {
             var currentTime = this.videoElement.currentTime;
@@ -1069,13 +1055,14 @@ var Player = /** @class */ (function (_super) {
      * @returns {Number} - The time the player has seek to
      */
     Player.prototype.seekTo = function (time) {
+        var _a;
         if (this.videoElement === null) {
             throw new Error("Disposed player");
         }
         if (this._priv_contentInfos === null) {
             throw new Error("player: no content loaded");
         }
-        var _a = this._priv_contentInfos, isDirectFile = _a.isDirectFile, manifest = _a.manifest;
+        var _b = this._priv_contentInfos, isDirectFile = _b.isDirectFile, manifest = _b.manifest;
         if (!isDirectFile && manifest === null) {
             throw new Error("player: the content did not load yet");
         }
@@ -1093,11 +1080,18 @@ var Player = /** @class */ (function (_super) {
                 positionWanted = timeObj.position;
             }
             else if (!isNullOrUndefined(timeObj.wallClockTime)) {
-                positionWanted = (isDirectFile || manifest === null) ?
-                    timeObj.wallClockTime :
-                    timeObj.wallClockTime - (manifest.availabilityStartTime !== undefined ?
-                        manifest.availabilityStartTime :
-                        0);
+                if (manifest !== null) {
+                    positionWanted = timeObj.wallClockTime - ((_a = manifest.availabilityStartTime) !== null && _a !== void 0 ? _a : 0);
+                }
+                else if (isDirectFile && this.videoElement !== null) {
+                    var startDate = getStartDate(this.videoElement);
+                    if (startDate !== undefined) {
+                        positionWanted = timeObj.wallClockTime - startDate;
+                    }
+                }
+                if (positionWanted === undefined) {
+                    positionWanted = timeObj.wallClockTime;
+                }
             }
             else {
                 throw new Error("invalid time object. You must set one of the " +
@@ -2261,6 +2255,12 @@ var Player = /** @class */ (function (_super) {
             positionData.wallClockTime = observation.position + ast;
             positionData.liveGap = maximumPosition - observation.position;
         }
+        else if (isDirectFile && this.videoElement !== null) {
+            var startDate = getStartDate(this.videoElement);
+            if (startDate !== undefined) {
+                positionData.wallClockTime = startDate + observation.position;
+            }
+        }
         this.trigger("positionUpdate", positionData);
     };
     /**
@@ -2302,5 +2302,5 @@ var Player = /** @class */ (function (_super) {
     };
     return Player;
 }(EventEmitter));
-Player.version = /* PLAYER_VERSION */ "3.27.0-dev.2022032100";
+Player.version = /* PLAYER_VERSION */ "3.27.0";
 export default Player;

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

@@ -84,7 +84,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     }
     return to.concat(ar || Array.prototype.slice.call(from));
 };
-import { events, generateKeyRequest, getInitData, } from "../../compat/";
+import { events, getInitData, } from "../../compat/";
 import config from "../../config";
 import { EncryptedMediaError, OtherError, } from "../../errors";
 import log from "../../log";
@@ -318,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) {
@@ -486,12 +486,20 @@ 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*/, 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,

package/dist/_esm5.processed/core/decrypt/create_session.d.ts

@@ -14,6 +14,7 @@
  * limitations under the License.
  */
 import { ICustomMediaKeySession } from "../../compat";
+import { CancellationSignal } from "../../utils/task_canceller";
 import { IProcessedProtectionData, IMediaKeySessionStores, MediaKeySessionLoadingType } from "./types";
 import KeySessionRecord from "./utils/key_session_record";
 /**
@@ -29,9 +30,10 @@ import KeySessionRecord from "./utils/key_session_record";
  * @param {Object} stores
  * @param {Object} initData
  * @param {string} wantedSessionType
+ * @param {Object} cancelSignal
  * @returns {Promise}
  */
-export default function createSession(stores: IMediaKeySessionStores, initData: IProcessedProtectionData, wantedSessionType: MediaKeySessionType): Promise<ICreateSessionEvent>;
+export default function createSession(stores: IMediaKeySessionStores, initData: IProcessedProtectionData, wantedSessionType: MediaKeySessionType, cancelSignal: CancellationSignal): Promise<ICreateSessionEvent>;
 export interface INewSessionCreatedEvent {
     type: MediaKeySessionLoadingType.Created;
     value: {

package/dist/_esm5.processed/core/decrypt/create_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 { loadSession, } from "../../compat";
 import log from "../../log";
 import isSessionUsable from "./utils/is_session_usable";
 /**
@@ -65,9 +64,10 @@ import isSessionUsable from "./utils/is_session_usable";
  * @param {Object} stores
  * @param {Object} initData
  * @param {string} wantedSessionType
+ * @param {Object} cancelSignal
  * @returns {Promise}
  */
-export default function createSession(stores, initData, wantedSessionType) {
+export default function createSession(stores, initData, wantedSessionType, cancelSignal) {
     var loadedSessionsStore = stores.loadedSessionsStore, persistentSessionsStore = stores.persistentSessionsStore;
     if (wantedSessionType === "temporary") {
         return createTemporarySession(loadedSessionsStore, initData);
@@ -77,7 +77,7 @@ export default function createSession(stores, initData, wantedSessionType) {
             "PersistentSessionsStore not created.");
         return createTemporarySession(loadedSessionsStore, initData);
     }
-    return createAndTryToRetrievePersistentSession(loadedSessionsStore, persistentSessionsStore, initData);
+    return createAndTryToRetrievePersistentSession(loadedSessionsStore, persistentSessionsStore, initData, cancelSignal);
 }
 /**
  * Create a new temporary MediaKeySession linked to the given initData and
@@ -98,9 +98,10 @@ function createTemporarySession(loadedSessionsStore, initData) {
  * @param {Object} loadedSessionsStore
  * @param {Object} persistentSessionsStore
  * @param {Object} initData
+ * @param {Object} cancelSignal
  * @returns {Promise}
  */
-function createAndTryToRetrievePersistentSession(loadedSessionsStore, persistentSessionsStore, initData) {
+function createAndTryToRetrievePersistentSession(loadedSessionsStore, persistentSessionsStore, initData, cancelSignal) {
     return __awaiter(this, void 0, void 0, function () {
         /**
          * Helper function to close and restart the current persistent session
@@ -113,6 +114,9 @@ function createAndTryToRetrievePersistentSession(loadedSessionsStore, persistent
                 return __generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
+                            if (cancelSignal.cancellationError !== null) {
+                                throw cancelSignal.cancellationError;
+                            }
                             log.info("DRM: Removing previous persistent session.");
                             persistentEntry = persistentSessionsStore.get(initData);
                             if (persistentEntry !== null) {
@@ -121,6 +125,9 @@ function createAndTryToRetrievePersistentSession(loadedSessionsStore, persistent
                             return [4 /*yield*/, loadedSessionsStore.closeSession(entry.mediaKeySession)];
                         case 1:
                             _a.sent();
+                            if (cancelSignal.cancellationError !== null) {
+                                throw cancelSignal.cancellationError;
+                            }
                             newEntry = loadedSessionsStore.createSession(initData, "persistent-license");
                             return [2 /*return*/, { type: "created-session" /* Created */,
                                     value: newEntry }];
@@ -132,6 +139,9 @@ function createAndTryToRetrievePersistentSession(loadedSessionsStore, persistent
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
+                    if (cancelSignal.cancellationError !== null) {
+                        throw cancelSignal.cancellationError;
+                    }
                     log.info("DRM: Creating persistent MediaKeySession");
                     entry = loadedSessionsStore.createSession(initData, "persistent-license");
                     storedEntry = persistentSessionsStore.getAndReuse(initData);
@@ -142,7 +152,7 @@ function createAndTryToRetrievePersistentSession(loadedSessionsStore, persistent
                     _a.label = 1;
                 case 1:
                     _a.trys.push([1, 3, , 4]);
-                    return [4 /*yield*/, loadSession(entry.mediaKeySession, storedEntry.sessionId)];
+                    return [4 /*yield*/, loadedSessionsStore.loadPersistentSession(entry.mediaKeySession, storedEntry.sessionId)];
                 case 2:
                     hasLoadedSession = _a.sent();
                     if (!hasLoadedSession) {