rx-player 3.25.2 → 3.26.3-dev.2022021400

package/dist/_esm5.processed/core/eme/eme_manager.js

@@ -13,8 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { concat as observableConcat, EMPTY, merge as observableMerge, of as observableOf, ReplaySubject, throwError, } from "rxjs";
-import { catchError, filter, ignoreElements, map, mergeMap, shareReplay, take, tap, } from "rxjs/operators";
+import { catchError, concat as observableConcat, EMPTY, filter, ignoreElements, map, merge as observableMerge, mergeMap, of as observableOf, ReplaySubject, shareReplay, take, tap, throwError, } from "rxjs";
 import { events, generateKeyRequest, getInitData, } from "../../compat/";
 import config from "../../config";
 import { EncryptedMediaError } from "../../errors";
@@ -80,12 +79,12 @@ export default function EMEManager(mediaElement, keySystemsConfigs, contentProte
         return evt.type === "attached-media-keys";
     }), take(1));
     /** Parsed `encrypted` events coming from the HTMLMediaElement. */
-    var mediaEncryptedEvents$ = onEncrypted$(mediaElement).pipe(tap(function (evt) {
-        log.debug("EME: Encrypted event received from media element.", evt);
+    var mediaEncryptedEvents$ = onEncrypted$(mediaElement).pipe(tap(function () {
+        log.debug("EME: Encrypted event received from media element.");
     }), filterMap(function (evt) { return getInitData(evt); }, null), shareReplay({ refCount: true })); // multiple Observables listen to that one
     // as soon as the EMEManager is subscribed
     /** Encryption events coming from the `contentProtections$` argument. */
-    var externalEvents$ = contentProtections$.pipe(tap(function (evt) { log.debug("EME: Encrypted event received from Player", evt); }));
+    var externalEvents$ = contentProtections$.pipe(tap(function () { log.debug("EME: Encrypted event received from Player"); }));
     /** Emit events signaling that an encryption initialization data is encountered. */
     var initializationData$ = observableMerge(externalEvents$, mediaEncryptedEvents$);
     /** Create MediaKeySessions and handle the corresponding events. */
@@ -145,8 +144,7 @@ export default function EMEManager(mediaElement, keySystemsConfigs, contentProte
                     value: { initializationData: initializationData } });
             }));
         }
-        else if (!contentSessions.storeIfNone(initializationData, { initializationData: initializationData,
-            lastKeyUpdate$: lastKeyUpdate$ })) {
+        else if (!contentSessions.storeIfNone(initializationData, { initializationData: initializationData, lastKeyUpdate$: lastKeyUpdate$ })) {
             log.debug("EME: Init data already received. Skipping it.");
             return observableOf({ type: "init-data-ignored",
                 value: { initializationData: initializationData } });

package/dist/_esm5.processed/core/eme/find_key_system.js

@@ -13,8 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { defer as observableDefer, of as observableOf, throwError as observableThrow, } from "rxjs";
-import { catchError, map, } from "rxjs/operators";
+import { catchError, defer as observableDefer, map, of as observableOf, throwError as observableThrow, } from "rxjs";
 import { requestMediaKeySystemAccess, shouldRenewMediaKeys, } from "../../compat";
 import config from "../../config";
 import { EncryptedMediaError } from "../../errors";
@@ -122,16 +121,21 @@ function buildKeySystemConfigurations(ksName, keySystem) {
     // More details here:
     // https://storage.googleapis.com/wvdocs/Chrome_EME_Changes_and_Best_Practices.pdf
     // https://www.w3.org/TR/encrypted-media/#get-supported-configuration-and-consent
-    var videoCapabilities = flatMap(videoRobustnesses, function (robustness) { return [{ contentType: "video/mp4;codecs=\"avc1.4d401e\"",
-            robustness: robustness },
-        { contentType: "video/mp4;codecs=\"avc1.42e01e\"",
-            robustness: robustness },
-        { contentType: "video/webm;codecs=\"vp8\"",
-            robustness: robustness }]; });
-    var audioCapabilities = flatMap(audioRobustnesses, function (robustness) { return [{ contentType: "audio/mp4;codecs=\"mp4a.40.2\"",
-            robustness: robustness },
-        { contentType: "audio/webm;codecs=opus",
-            robustness: robustness }]; });
+    var videoCapabilities = flatMap(audioRobustnesses, function (robustness) {
+        return ["video/mp4;codecs=\"avc1.4d401e\"",
+            "video/mp4;codecs=\"avc1.42e01e\"",
+            "video/webm;codecs=\"vp8\""].map(function (contentType) {
+            return robustness !== undefined ? { contentType: contentType, robustness: robustness } :
+                { contentType: contentType };
+        });
+    });
+    var audioCapabilities = flatMap(audioRobustnesses, function (robustness) {
+        return ["audio/mp4;codecs=\"mp4a.40.2\"",
+            "audio/webm;codecs=opus"].map(function (contentType) {
+            return robustness !== undefined ? { contentType: contentType, robustness: robustness } :
+                { contentType: contentType };
+        });
+    });
     // TODO Re-test with a set contentType but an undefined robustness on the
     // STBs on which this problem was found.
     //
@@ -145,12 +149,7 @@ function buildKeySystemConfigurations(ksName, keySystem) {
     // distinctiveIdentifier,
     // persistentState,
     // sessionTypes,
-    return [{ initDataTypes: ["cenc"],
-            videoCapabilities: videoCapabilities,
-            audioCapabilities: audioCapabilities,
-            distinctiveIdentifier: distinctiveIdentifier,
-            persistentState: persistentState,
-            sessionTypes: sessionTypes }];
+    return [{ initDataTypes: ["cenc"], videoCapabilities: videoCapabilities, audioCapabilities: audioCapabilities, distinctiveIdentifier: distinctiveIdentifier, persistentState: persistentState, sessionTypes: sessionTypes }];
 }
 /**
  * Try to find a compatible key system from the keySystems array given.
@@ -180,7 +179,7 @@ export default function getMediaKeySystemAccess(mediaElement, keySystemsConfigs)
             // one as exactly the same compatibility options.
             var cachedKeySystemAccess = checkCachedMediaKeySystemAccess(keySystemsConfigs, currentState.mediaKeySystemAccess, currentState.keySystemOptions);
             if (cachedKeySystemAccess !== null) {
-                log.info("EME: Found cached compatible keySystem", cachedKeySystemAccess);
+                log.info("EME: Found cached compatible keySystem");
                 return observableOf({
                     type: "reuse-media-key-system-access",
                     value: { mediaKeySystemAccess: cachedKeySystemAccess.keySystemAccess,
@@ -238,8 +237,8 @@ export default function getMediaKeySystemAccess(mediaElement, keySystemsConfigs)
             }
             var _a = keySystemsType[index], keyName = _a.keyName, keyType = _a.keyType, keySystemOptions = _a.keySystemOptions;
             var keySystemConfigurations = buildKeySystemConfigurations(keyName, keySystemOptions);
-            log.debug("EME: Request keysystem access " + keyType + "," +
-                (index + 1 + " of " + keySystemsType.length), keySystemConfigurations);
+            log.debug("EME: Request keysystem access ".concat(keyType, ",") +
+                "".concat(index + 1, " of ").concat(keySystemsType.length), keySystemConfigurations);
             return requestMediaKeySystemAccess(keyType, keySystemConfigurations).pipe(map(function (keySystemAccess) {
                 log.info("EME: Found compatible keysystem", keyType, keySystemConfigurations);
                 return { type: "create-media-key-system-access",

package/dist/_esm5.processed/core/eme/get_media_keys.js

@@ -13,8 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { of as observableOf, } from "rxjs";
-import { catchError, map, mergeMap, } from "rxjs/operators";
+import { catchError, map, mergeMap, of as observableOf, } from "rxjs";
 import { EncryptedMediaError } from "../../errors";
 import log from "../../log";
 import castToObservable from "../../utils/cast_to_observable";
@@ -59,19 +58,13 @@ export default function getMediaKeysInfos(mediaElement, keySystemsConfigs) {
             if (ServerCertificateStore.hasOne(mediaKeys) === false ||
                 (!isNullOrUndefined(options.serverCertificate) &&
                     ServerCertificateStore.has(mediaKeys, options.serverCertificate))) {
-                return observableOf({ mediaKeys: mediaKeys,
-                    mediaKeySystemAccess: mediaKeySystemAccess,
-                    stores: { loadedSessionsStore: loadedSessionsStore, persistentSessionsStore: persistentSessionsStore },
-                    options: options });
+                return observableOf({ mediaKeys: mediaKeys, mediaKeySystemAccess: mediaKeySystemAccess, stores: { loadedSessionsStore: loadedSessionsStore, persistentSessionsStore: persistentSessionsStore }, options: options });
             }
         }
         return createMediaKeys(mediaKeySystemAccess).pipe(map(function (mediaKeys) {
-            log.info("EME: MediaKeys created with success", mediaKeys);
+            log.info("EME: MediaKeys created with success");
             var loadedSessionsStore = new LoadedSessionsStore(mediaKeys);
-            return { mediaKeys: mediaKeys,
-                mediaKeySystemAccess: mediaKeySystemAccess,
-                stores: { loadedSessionsStore: loadedSessionsStore, persistentSessionsStore: persistentSessionsStore },
-                options: options };
+            return { mediaKeys: mediaKeys, mediaKeySystemAccess: mediaKeySystemAccess, stores: { loadedSessionsStore: loadedSessionsStore, persistentSessionsStore: persistentSessionsStore }, options: options };
         }));
     }));
 }

package/dist/_esm5.processed/core/eme/get_session.js

@@ -13,8 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { concat as observableConcat, defer as observableDefer, of as observableOf, } from "rxjs";
-import { map, mergeMap, } from "rxjs/operators";
+import { concat as observableConcat, defer as observableDefer, map, mergeMap, of as observableOf, } from "rxjs";
 import log from "../../log";
 import cleanOldLoadedSessions from "./clean_old_loaded_sessions";
 import createSession from "./create_session";
@@ -48,8 +47,7 @@ export default function getSession(initializationData, stores, wantedSessionType
                 log.info("EME: Reuse loaded session", previousLoadedSession.sessionId);
                 return observableOf({ type: "loaded-open-session",
                     value: { mediaKeySession: previousLoadedSession,
-                        sessionType: entry.sessionType,
-                        initializationData: initializationData } });
+                        sessionType: entry.sessionType, initializationData: initializationData } });
             }
             else if (persistentSessionsStore !== null) {
                 // If the session is not usable anymore, we can also remove it from the
@@ -64,8 +62,7 @@ export default function getSession(initializationData, stores, wantedSessionType
             return observableConcat(cleanOldLoadedSessions(loadedSessionsStore, maxSessionCacheSize), createSession(stores, initializationData, wantedSessionType)
                 .pipe(map(function (evt) { return ({ type: evt.type,
                 value: { mediaKeySession: evt.value.mediaKeySession,
-                    sessionType: evt.value.sessionType,
-                    initializationData: initializationData } }); })));
+                    sessionType: evt.value.sessionType, initializationData: initializationData } }); })));
         }));
     });
 }

package/dist/_esm5.processed/core/eme/init_media_keys.js

@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { of as observableOf, ReplaySubject, } from "rxjs";
-import { mapTo, mergeMap, startWith, take, } from "rxjs/operators";
+import { filter, mapTo, mergeMap, of as observableOf, startWith, take, } from "rxjs";
 import log from "../../log";
 import isNullOrUndefined from "../../utils/is_null_or_undefined";
+import createSharedReference from "../../utils/reference";
 import attachMediaKeys, { disableMediaKeys, } from "./attach_media_keys";
 import getDrmSystemId from "./get_drm_system_id";
 import getMediaKeysInfos from "./get_media_keys";
@@ -44,7 +44,7 @@ export default function initMediaKeys(mediaElement, keySystemsConfigs) {
             options.licenseStorage.disableRetroCompatibility === true) {
             initializationDataSystemId = getDrmSystemId(mediaKeySystemAccess.keySystem);
         }
-        var attachMediaKeys$ = new ReplaySubject(1);
+        var canAttachMediaKeys = createSharedReference(false);
         var shouldDisableOldMediaKeys = mediaElement.mediaKeys !== null &&
             mediaElement.mediaKeys !== undefined &&
             mediaKeys !== mediaElement.mediaKeys;
@@ -55,20 +55,12 @@ export default function initMediaKeys(mediaElement, keySystemsConfigs) {
         }
         return disableOldMediaKeys$.pipe(mergeMap(function () {
             log.debug("EME: Attaching current MediaKeys");
-            return attachMediaKeys$.pipe(mergeMap(function () {
-                var stateToAttatch = { loadedSessionsStore: stores.loadedSessionsStore,
-                    mediaKeySystemAccess: mediaKeySystemAccess,
-                    mediaKeys: mediaKeys,
-                    keySystemOptions: options };
+            return canAttachMediaKeys.asObservable().pipe(filter(function (canAttach) { return canAttach; }), mergeMap(function () {
+                var stateToAttatch = { loadedSessionsStore: stores.loadedSessionsStore, mediaKeySystemAccess: mediaKeySystemAccess, mediaKeys: mediaKeys, keySystemOptions: options };
                 return attachMediaKeys(mediaElement, stateToAttatch);
             }), take(1), mapTo({ type: "attached-media-keys",
                 value: { mediaKeySystemAccess: mediaKeySystemAccess, mediaKeys: mediaKeys, stores: stores, options: options } }), startWith({ type: "created-media-keys",
-                value: { mediaKeySystemAccess: mediaKeySystemAccess,
-                    initializationDataSystemId: initializationDataSystemId,
-                    mediaKeys: mediaKeys,
-                    stores: stores,
-                    options: options,
-                    attachMediaKeys$: attachMediaKeys$ } }));
+                value: { mediaKeySystemAccess: mediaKeySystemAccess, initializationDataSystemId: initializationDataSystemId, mediaKeys: mediaKeys, stores: stores, options: options, canAttachMediaKeys: canAttachMediaKeys } }));
         }));
     }));
 }

package/dist/_esm5.processed/core/eme/session_events_listener.js

@@ -28,8 +28,7 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
-import { concat as observableConcat, defer as observableDefer, EMPTY, identity, merge as observableMerge, of as observableOf, Subject, TimeoutError, } from "rxjs";
-import { catchError, concatMap, map, mapTo, mergeMap, startWith, takeUntil, tap, timeout, } from "rxjs/operators";
+import { catchError, concat as observableConcat, concatMap, defer as observableDefer, EMPTY, identity, map, merge as observableMerge, mergeMap, of as observableOf, startWith, Subject, takeUntil, tap, timeout, TimeoutError, } from "rxjs";
 import { events, } from "../../compat";
 import { EncryptedMediaError, } from "../../errors";
 import log from "../../log";
@@ -70,7 +69,7 @@ export { BlacklistedSessionError };
  * @returns {Observable}
  */
 export default function SessionEventsListener(session, keySystemOptions, keySystem, initializationData) {
-    log.info("EME: Binding session events", session);
+    log.info("EME: Binding session events", session.sessionId);
     var sessionWarningSubject$ = new Subject();
     var _a = keySystemOptions.getLicenseConfig, getLicenseConfig = _a === void 0 ? {} : _a;
     var keyErrors = onKeyError$(session)
@@ -84,7 +83,7 @@ export default function SessionEventsListener(session, keySystemOptions, keySyst
         var messageType = isNonEmptyString(messageEvent.messageType) ?
             messageEvent.messageType :
             "license-request";
-        log.info("EME: Received message event, type " + messageType, session, messageEvent);
+        log.info("EME: Received message event, type ".concat(messageType), session.sessionId, messageEvent);
         var getLicense$ = observableDefer(function () {
             var getLicense = keySystemOptions.getLicense(message, messageType);
             var getLicenseTimeout = isNullOrUndefined(getLicenseConfig.timeout) ?
@@ -124,7 +123,11 @@ export default function SessionEventsListener(session, keySystemOptions, keySyst
     }));
     var sessionEvents = observableMerge(getKeyStatusesEvents(session, keySystemOptions, keySystem), sessionUpdates, keyErrors, sessionWarningSubject$);
     return !isNullOrUndefined(session.closed) ?
-        sessionEvents.pipe(takeUntil(castToObservable(session.closed))) :
+        sessionEvents
+            // TODO There is a subtle TypeScript issue there that made casting
+            // to a type-compatible type mandatory. If a more elegant solution
+            // can be found, it should be preffered.
+            .pipe(takeUntil(castToObservable(session.closed))) :
         sessionEvents;
 }
 /**
@@ -147,8 +150,7 @@ function getKeyStatusesEvents(session, options, keySystem) {
         var warnings$ = warnings.length > 0 ? observableOf.apply(void 0, warnings) :
             EMPTY;
         var keysUpdate$ = observableOf({ type: "keys-update",
-            value: { whitelistedKeyIds: whitelistedKeyIds,
-                blacklistedKeyIDs: blacklistedKeyIDs } });
+            value: { whitelistedKeyIds: whitelistedKeyIds, blacklistedKeyIDs: blacklistedKeyIDs } });
         return observableConcat(warnings$, keysUpdate$);
     });
 }
@@ -189,8 +191,8 @@ function updateSessionWithMessage(session, message, initializationData) {
         var reason = error instanceof Error ? error.toString() :
             "`session.update` failed";
         throw new EncryptedMediaError("KEY_UPDATE_ERROR", reason);
-    }), tap(function () { log.info("EME: MediaKeySession update succeeded."); }), mapTo({ type: "session-updated",
-        value: { session: session, license: message, initializationData: initializationData } }));
+    }), tap(function () { log.info("EME: MediaKeySession update succeeded."); }), map(function () { return ({ type: "session-updated",
+        value: { session: session, license: message, initializationData: initializationData } }); }));
 }
 /**
  * @param {MediaKeySession}
@@ -199,7 +201,7 @@ function updateSessionWithMessage(session, message, initializationData) {
  * @returns {Observable}
  */
 function handleKeyStatusesChangeEvent(session, keySystemOptions, keySystem, keyStatusesEvent) {
-    log.info("EME: keystatuseschange event received", session, keyStatusesEvent);
+    log.info("EME: keystatuseschange event received", session.sessionId);
     var callback$ = observableDefer(function () {
         return tryCatch(function () {
             if (typeof keySystemOptions.onKeyStatusesChange !== "function") {

package/dist/_esm5.processed/core/eme/set_server_certificate.js

@@ -13,8 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { defer as observableDefer, EMPTY, of as observableOf, } from "rxjs";
-import { catchError, ignoreElements, tap, } from "rxjs/operators";
+import { catchError, defer as observableDefer, EMPTY, ignoreElements, tap, of as observableOf, } from "rxjs";
 import { EncryptedMediaError } from "../../errors";
 import log from "../../log";
 import castToObservable from "../../utils/cast_to_observable";
@@ -70,7 +69,13 @@ export default function trySettingServerCertificate(mediaKeys, serverCertificate
         // know if we attached the server certificate or not.
         // Calling `prepare` allow to invalidate temporarily that status.
         ServerCertificateStore.prepare(mediaKeys);
-        return setServerCertificate(mediaKeys, serverCertificate).pipe(tap(function () { ServerCertificateStore.set(mediaKeys, serverCertificate); }), ignoreElements(), catchError(function (error) { return observableOf({
+        return setServerCertificate(mediaKeys, serverCertificate).pipe(tap(function () { ServerCertificateStore.set(mediaKeys, serverCertificate); }), 
+        // NOTE As of now (RxJS 7.4.0), RxJS defines `ignoreElements` default
+        // first type parameter as `any` instead of the perfectly fine `unknown`,
+        // leading to linter issues, as it forbids the usage of `any`.
+        // This is why we're disabling the eslint rule.
+        /* eslint-disable @typescript-eslint/no-unsafe-argument */
+        ignoreElements(), catchError(function (error) { return observableOf({
             type: "warning",
             // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
             value: error,

package/dist/_esm5.processed/core/eme/types.d.ts

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { Subject } from "rxjs";
 import { ICustomMediaKeys, ICustomMediaKeySession, ICustomMediaKeySystemAccess } from "../../compat";
 import { ICustomError } from "../../errors";
+import { ISharedReference } from "../../utils/reference";
 import LoadedSessionsStore from "./utils/loaded_sessions_store";
 import PersistentSessionsStore from "./utils/persistent_sessions_store";
 /** Information about the encryption initialization data. */
@@ -34,7 +34,7 @@ export interface IInitializationDataInfo {
      * `undefined` when not known (different from an empty array - which would
      * just mean that there's no key id involved).
      */
-    keyIds?: Uint8Array[];
+    keyIds?: Uint8Array[] | undefined;
     /** Every initialization data for that type. */
     values: Array<{
         /**
@@ -73,8 +73,10 @@ export interface IEncryptedEvent {
  * current content.
  * This is necessary before creating a MediaKeySession which will allow
  * encryption keys to be communicated.
- * It carries a subject (attachMediaKeys$) that will be used by the init to
- * ask the EME to attach the mediakeys.
+ *
+ * It carries a shared reference (`canAttachMediaKeys`) that should be setted to
+ * `true` to indicate that RxPlayer's EME logic can start to attach the
+ * `MediaKeys` instance to the HTMLMediaElement.
  */
 export interface ICreatedMediaKeysEvent {
     type: "created-media-keys";
@@ -106,9 +108,15 @@ export interface ICreatedMediaKeysEvent {
         initializationDataSystemId: string | undefined;
         /** The MediaKeys instance. */
         mediaKeys: MediaKeys | ICustomMediaKeys;
+        /** Stores allowing to cache MediaKeySession instances. */
         stores: IMediaKeySessionStores;
+        /** key system options considered. */
         options: IKeySystemOption;
-        attachMediaKeys$: Subject<void>;
+        /**
+         * Shared reference that should be set to `true` once the `MediaKeys`
+         * instance can be attached to the HTMLMediaElement.
+         */
+        canAttachMediaKeys: ISharedReference<boolean>;
     };
 }
 /**
@@ -264,7 +272,7 @@ export interface IContentProtection {
      * `undefined` when not known (different from an empty array - which would
      * just mean that there's no key id involved).
      */
-    keyIds?: Uint8Array[];
+    keyIds?: Uint8Array[] | undefined;
     /** Every initialization data for that type. */
     values: Array<{
         /**

package/dist/_esm5.processed/core/eme/utils/close_session.js

@@ -13,8 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { of as observableOf, timer, race as observableRace, } from "rxjs";
-import { catchError, mergeMap, take, tap, } from "rxjs/operators";
+import { catchError, mergeMap, of as observableOf, take, tap, timer, race as observableRace, } from "rxjs";
 import { closeSession, } from "../../../compat";
 import { onKeyMessage$, onKeyStatusesChange$ } from "../../../compat/event_listeners";
 import config from "../../../config";
@@ -39,7 +38,7 @@ export default function safelyCloseMediaKeySession(mediaKeySession) {
      * @returns {Observable}
      */
     function recursivelyTryToCloseMediaKeySession(retryNb) {
-        log.debug("EME: Trying to close a MediaKeySession", mediaKeySession, retryNb);
+        log.debug("EME: Trying to close a MediaKeySession", mediaKeySession.sessionId, retryNb);
         return closeSession(mediaKeySession).pipe(tap(function () { log.debug("EME: Succeeded to close MediaKeySession"); }), catchError(function (err) {
             // Unitialized MediaKeySession may not close properly until their
             // corresponding `generateRequest` or `load` call are handled by the

package/dist/_esm5.processed/core/eme/utils/init_data_store.js

@@ -97,9 +97,7 @@ var InitDataStore = /** @class */ (function () {
             this._storage.splice(indexOf, 1);
         }
         var values = this._formatValuesForStore(initializationData.values);
-        this._storage.push({ type: initializationData.type,
-            values: values,
-            payload: payload });
+        this._storage.push({ type: initializationData.type, values: values, payload: payload });
     };
     /**
      * Add to the store a value linked to the corresponding initData and
@@ -122,9 +120,7 @@ var InitDataStore = /** @class */ (function () {
             return false;
         }
         var values = this._formatValuesForStore(initializationData.values);
-        this._storage.push({ type: initializationData.type,
-            values: values,
-            payload: payload });
+        this._storage.push({ type: initializationData.type, values: values, payload: payload });
         return true;
     };
     /**
@@ -177,9 +173,7 @@ var InitDataStore = /** @class */ (function () {
                         1; })
             .map(function (_a) {
             var systemId = _a.systemId, data = _a.data;
-            return ({ systemId: systemId,
-                data: data,
-                hash: hashBuffer(data) });
+            return ({ systemId: systemId, data: data, hash: hashBuffer(data) });
         });
     };
     return InitDataStore;

package/dist/_esm5.processed/core/eme/utils/is_session_usable.js

@@ -33,7 +33,7 @@ export default function isSessionUsable(loadedSession) {
         keyStatuses.push(keyStatus);
     });
     if (keyStatuses.length <= 0) {
-        log.debug("EME: isSessionUsable: MediaKeySession given has an empty keyStatuses", loadedSession);
+        log.debug("EME: isSessionUsable: MediaKeySession given has an empty keyStatuses", loadedSession.sessionId);
         return false;
     }
     if (arrayIncludes(keyStatuses, "expired")) {

package/dist/_esm5.processed/core/eme/utils/loaded_sessions_store.js

@@ -13,8 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { concat as observableConcat, defer as observableDefer, EMPTY, merge as observableMerge, of as observableOf, } from "rxjs";
-import { ignoreElements } from "rxjs/operators";
+import { concat as observableConcat, defer as observableDefer, EMPTY, ignoreElements, merge as observableMerge, of as observableOf, } from "rxjs";
 import { EncryptedMediaError } from "../../../errors";
 import log from "../../../log";
 import isNullOrUndefined from "../../../utils/is_null_or_undefined";
@@ -110,10 +109,10 @@ var LoadedSessionsStore = /** @class */ (function () {
             })
                 .catch(function (e) {
                 // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
-                log.warn("EME-LSS: MediaKeySession.closed rejected: " + e);
+                log.warn("EME-LSS: MediaKeySession.closed rejected: ".concat(e));
             });
         }
-        log.debug("EME-LSS: Add MediaKeySession", entry);
+        log.debug("EME-LSS: Add MediaKeySession", entry.sessionType);
         this._storage.store(initializationData, entry);
         return mediaKeySession;
     };

package/dist/_esm5.processed/core/eme/utils/persistent_sessions_store.js

@@ -154,10 +154,8 @@ var PersistentSessionsStore = /** @class */ (function () {
         else if (currentEntry !== null) { // currentEntry has a different sessionId
             this.delete(initData);
         }
-        log.info("EME-PSS: Add new session", sessionId, session);
-        this._entries.push({ version: 3,
-            sessionId: sessionId,
-            values: this._formatValuesForStore(initData.values),
+        log.info("EME-PSS: Add new session", sessionId);
+        this._entries.push({ version: 3, sessionId: sessionId, values: this._formatValuesForStore(initData.values),
             initDataType: initData.type });
         this._save();
     };
@@ -174,12 +172,12 @@ var PersistentSessionsStore = /** @class */ (function () {
             return;
         }
         var entry = this._entries[index];
-        log.warn("EME-PSS: Delete session from store", entry);
+        log.warn("EME-PSS: Delete session from store", entry.sessionId);
         this._entries.splice(index, 1);
         this._save();
     };
     PersistentSessionsStore.prototype.deleteOldSessions = function (sessionsToDelete) {
-        log.info("EME-PSS: Deleting last " + sessionsToDelete + " sessions.");
+        log.info("EME-PSS: Deleting last ".concat(sessionsToDelete, " sessions."));
         if (sessionsToDelete <= 0) {
             return;
         }
@@ -286,8 +284,7 @@ var PersistentSessionsStore = /** @class */ (function () {
                         1; })
             .map(function (_a) {
             var systemId = _a.systemId, data = _a.data;
-            return ({ systemId: systemId,
-                data: new InitDataContainer(data),
+            return ({ systemId: systemId, data: new InitDataContainer(data),
                 hash: hashBuffer(data) });
         });
     };

package/dist/_esm5.processed/core/fetchers/index.d.ts

@@ -14,5 +14,5 @@
  * limitations under the License.
  */
 import ManifestFetcher, { IManifestFetcherParsedResult, IManifestFetcherParserOptions, IManifestFetcherWarningEvent } from "./manifest";
-import SegmentFetcherCreator, { IPrioritizedSegmentFetcher, IPrioritizedSegmentFetcherEvent, ISegmentFetcherChunkCompleteEvent, ISegmentFetcherChunkEvent, ISegmentFetcherCreatorBackoffOptions, ISegmentFetcherEvent, ISegmentFetcherWarning } from "./segment";
-export { ManifestFetcher, SegmentFetcherCreator, IManifestFetcherParserOptions, IManifestFetcherParsedResult, IManifestFetcherWarningEvent, IPrioritizedSegmentFetcher, IPrioritizedSegmentFetcherEvent, ISegmentFetcherEvent, ISegmentFetcherCreatorBackoffOptions, ISegmentFetcherChunkEvent, ISegmentFetcherChunkCompleteEvent, ISegmentFetcherWarning, };
+import SegmentFetcherCreator, { IPrioritizedSegmentFetcher, IPrioritizedSegmentFetcherEvent, ISegmentFetcherChunkCompleteEvent, ISegmentFetcherChunkEvent, ISegmentFetcherCreatorBackoffOptions, ISegmentFetcherEvent, ISegmentFetcherRetry } from "./segment";
+export { ManifestFetcher, SegmentFetcherCreator, IManifestFetcherParserOptions, IManifestFetcherParsedResult, IManifestFetcherWarningEvent, IPrioritizedSegmentFetcher, IPrioritizedSegmentFetcherEvent, ISegmentFetcherEvent, ISegmentFetcherCreatorBackoffOptions, ISegmentFetcherChunkEvent, ISegmentFetcherChunkCompleteEvent, ISegmentFetcherRetry, };

package/dist/_esm5.processed/core/fetchers/manifest/manifest_fetcher.d.ts

@@ -27,10 +27,10 @@ export interface IManifestFetcherParsedResult {
      * The time (`performance.now()`) at which the request was started (at which
      * the JavaScript call was done).
      */
-    sendingTime?: number;
+    sendingTime?: number | undefined;
     /** The time (`performance.now()`) at which the request was fully received. */
-    receivedTime?: number;
-    parsingTime?: number;
+    receivedTime?: number | undefined;
+    parsingTime?: number | undefined;
 }
 /** Emitted when a fetching or parsing minor error happened. */
 export interface IManifestFetcherWarningEvent {
@@ -51,7 +51,7 @@ export interface IManifestFetcherParserOptions {
      * If set, offset to add to `performance.now()` to obtain the current
      * server's time.
      */
-    externalClockOffset?: number;
+    externalClockOffset?: number | undefined;
     /** The previous value of the Manifest (when updating). */
     previousManifest: Manifest | null;
     /**
@@ -64,7 +64,7 @@ export interface IManifestFetcherParserOptions {
     unsafeMode: boolean;
 }
 /** Options used by `createManifestFetcher`. */
-export interface IManifestFetcherBackoffOptions {
+export interface IManifestFetcherSettings {
     /**
      * Whether the content is played in a low-latency mode.
      * This has an impact on default backoff delays.
@@ -94,21 +94,29 @@ export interface IManifestFetcherBackoffOptions {
  * ```
  */
 export default class ManifestFetcher {
-    private _backoffOptions;
+    private _settings;
     private _manifestUrl;
     private _pipelines;
     /**
-     * @param {string | undefined} url
-     * @param {Object} pipelines
-     * @param {Object} backoffOptions
+     * Construct a new ManifestFetcher.
+     * @param {string | undefined} url - Default Manifest url, will be used when
+     * no URL is provided to the `fetch` function.
+     * `undefined` if unknown or if a Manifest should be retrieved through other
+     * means than an HTTP request.
+     * @param {Object} pipelines - Transport pipelines used to perform the
+     * Manifest loading and parsing operations.
+     * @param {Object} settings - Configure the `ManifestFetcher`.
      */
-    constructor(url: string | undefined, pipelines: ITransportPipelines, backoffOptions: IManifestFetcherBackoffOptions);
+    constructor(url: string | undefined, pipelines: ITransportPipelines, settings: IManifestFetcherSettings);
     /**
-     * (re-)Load the Manifest without yet parsing it.
+     * (re-)Load the Manifest.
+     * This method does not yet parse it, parsing will then be available through
+     * a callback available on the response.
      *
      * You can set an `url` on which that Manifest will be requested.
-     * If not set, the regular Manifest url - defined on the
-     * `ManifestFetcher` instanciation - will be used instead.
+     * If not set, the regular Manifest url - defined on the `ManifestFetcher`
+     * instanciation - will be used instead.
+     *
      * @param {string} [url]
      * @returns {Observable}
      */
@@ -134,4 +142,11 @@ export default class ManifestFetcher {
      * @returns {Observable}
      */
     private _parseLoadedManifest;
+    /**
+     * Construct "backoff settings" that can be used with a range of functions
+     * allowing to perform multiple request attempts
+     * @param {Function} onRetry
+     * @returns {Object}
+     */
+    private _getBackoffSetting;
 }