rx-player 3.25.2 → 3.26.3-dev.2022021400

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

@@ -16,6 +16,7 @@
 import log from "../../log";
 import arrayFind from "../../utils/array_find";
 import arrayIncludes from "../../utils/array_includes";
+import isNullOrUndefined from "../../utils/is_null_or_undefined";
 import normalizeLanguage from "../../utils/languages";
 import SortedList from "../../utils/sorted_list";
 import takeFirstSet from "../../utils/take_first_set";
@@ -26,7 +27,7 @@ import takeFirstSet from "../../utils/take_first_set";
  * @returns {Array.<Object|null>}
  */
 function normalizeAudioTracks(tracks) {
-    return tracks.map(function (t) { return t == null ?
+    return tracks.map(function (t) { return t === null ?
         t :
         { normalized: t.language === undefined ? undefined :
                 normalizeLanguage(t.language),
@@ -40,7 +41,7 @@ function normalizeAudioTracks(tracks) {
  * @returns {Array.<Object|null>}
  */
 function normalizeTextTracks(tracks) {
-    return tracks.map(function (t) { return t == null ?
+    return tracks.map(function (t) { return t === null ?
         t :
         { normalized: normalizeLanguage(t.language),
             closedCaption: t.closedCaption }; });
@@ -111,9 +112,9 @@ var TrackChoiceManager = /** @class */ (function () {
         var _a;
         var periodItem = getPeriodItem(this._periods, period);
         var adaptations = period.getSupportedAdaptations(bufferType);
-        if (periodItem != null) {
-            if (periodItem[bufferType] != null) {
-                log.warn("TrackChoiceManager: " + bufferType + " already added for period", period);
+        if (periodItem !== undefined) {
+            if (periodItem[bufferType] !== undefined) {
+                log.warn("TrackChoiceManager: ".concat(bufferType, " already added for period"), period.start);
                 return;
             }
             else {
@@ -132,19 +133,19 @@ var TrackChoiceManager = /** @class */ (function () {
      */
     TrackChoiceManager.prototype.removePeriod = function (bufferType, period) {
         var periodIndex = findPeriodIndex(this._periods, period);
-        if (periodIndex == null) {
-            log.warn("TrackChoiceManager: " + bufferType + " not found for period", period);
+        if (periodIndex === undefined) {
+            log.warn("TrackChoiceManager: ".concat(bufferType, " not found for period"), period.start);
             return;
         }
         var periodItem = this._periods.get(periodIndex);
-        if (periodItem[bufferType] == null) {
-            log.warn("TrackChoiceManager: " + bufferType + " already removed for period", period);
+        if (periodItem[bufferType] === undefined) {
+            log.warn("TrackChoiceManager: ".concat(bufferType, " already removed for period"), period.start);
             return;
         }
         delete periodItem[bufferType];
-        if (periodItem.audio == null &&
-            periodItem.text == null &&
-            periodItem.video == null) {
+        if (periodItem.audio === undefined &&
+            periodItem.text === undefined &&
+            periodItem.video === undefined) {
             this._periods.removeElement(periodItem);
         }
     };
@@ -171,9 +172,9 @@ var TrackChoiceManager = /** @class */ (function () {
      */
     TrackChoiceManager.prototype.setInitialAudioTrack = function (period) {
         var periodItem = getPeriodItem(this._periods, period);
-        var audioInfos = periodItem != null ? periodItem.audio :
+        var audioInfos = periodItem !== undefined ? periodItem.audio :
             null;
-        if (audioInfos == null || periodItem == null) {
+        if (isNullOrUndefined(audioInfos) || periodItem === undefined) {
             throw new Error("TrackChoiceManager: Given Period not found.");
         }
         var audioAdaptations = period.getSupportedAdaptations("audio");
@@ -203,9 +204,9 @@ var TrackChoiceManager = /** @class */ (function () {
      */
     TrackChoiceManager.prototype.setInitialTextTrack = function (period) {
         var periodItem = getPeriodItem(this._periods, period);
-        var textInfos = periodItem != null ? periodItem.text :
+        var textInfos = periodItem !== undefined ? periodItem.text :
             null;
-        if (textInfos == null || periodItem == null) {
+        if (isNullOrUndefined(textInfos) || periodItem === undefined) {
             throw new Error("TrackChoiceManager: Given Period not found.");
         }
         var textAdaptations = period.getSupportedAdaptations("text");
@@ -235,9 +236,9 @@ var TrackChoiceManager = /** @class */ (function () {
      */
     TrackChoiceManager.prototype.setInitialVideoTrack = function (period) {
         var periodItem = getPeriodItem(this._periods, period);
-        var videoInfos = periodItem != null ? periodItem.video :
+        var videoInfos = periodItem !== undefined ? periodItem.video :
             null;
-        if (videoInfos == null || periodItem == null) {
+        if (isNullOrUndefined(videoInfos) || periodItem === undefined) {
             throw new Error("TrackChoiceManager: Given Period not found.");
         }
         var videoAdaptations = period.getSupportedAdaptations("video");
@@ -274,9 +275,9 @@ var TrackChoiceManager = /** @class */ (function () {
      */
     TrackChoiceManager.prototype.setAudioTrackByID = function (period, wantedId) {
         var periodItem = getPeriodItem(this._periods, period);
-        var audioInfos = periodItem != null ? periodItem.audio :
+        var audioInfos = periodItem !== undefined ? periodItem.audio :
             null;
-        if (audioInfos == null) {
+        if (isNullOrUndefined(audioInfos)) {
             throw new Error("TrackChoiceManager: Given Period not found.");
         }
         var wantedAdaptation = arrayFind(audioInfos.adaptations, function (_a) {
@@ -300,9 +301,9 @@ var TrackChoiceManager = /** @class */ (function () {
      */
     TrackChoiceManager.prototype.setTextTrackByID = function (period, wantedId) {
         var periodItem = getPeriodItem(this._periods, period);
-        var textInfos = periodItem != null ? periodItem.text :
+        var textInfos = periodItem !== undefined ? periodItem.text :
             null;
-        if (textInfos == null) {
+        if (isNullOrUndefined(textInfos)) {
             throw new Error("TrackChoiceManager: Given Period not found.");
         }
         var wantedAdaptation = arrayFind(textInfos.adaptations, function (_a) {
@@ -330,9 +331,9 @@ var TrackChoiceManager = /** @class */ (function () {
      */
     TrackChoiceManager.prototype.setVideoTrackByID = function (period, wantedId) {
         var periodItem = getPeriodItem(this._periods, period);
-        var videoInfos = periodItem != null ? periodItem.video :
+        var videoInfos = periodItem !== undefined ? periodItem.video :
             null;
-        if (videoInfos == null) {
+        if (isNullOrUndefined(videoInfos)) {
             throw new Error("LanguageManager: Given Period not found.");
         }
         var wantedBaseAdaptation = arrayFind(videoInfos.adaptations, function (_a) {
@@ -356,9 +357,9 @@ var TrackChoiceManager = /** @class */ (function () {
      */
     TrackChoiceManager.prototype.disableTextTrack = function (period) {
         var periodItem = getPeriodItem(this._periods, period);
-        var textInfos = periodItem != null ? periodItem.text :
+        var textInfos = periodItem !== undefined ? periodItem.text :
             null;
-        if (textInfos == null) {
+        if (isNullOrUndefined(textInfos)) {
             throw new Error("TrackChoiceManager: Given Period not found.");
         }
         var chosenTextAdaptation = this._textChoiceMemory.get(period);
@@ -418,13 +419,13 @@ var TrackChoiceManager = /** @class */ (function () {
      */
     TrackChoiceManager.prototype.getChosenAudioTrack = function (period) {
         var periodItem = getPeriodItem(this._periods, period);
-        var audioInfos = periodItem != null ? periodItem.audio :
+        var audioInfos = periodItem !== undefined ? periodItem.audio :
             null;
-        if (audioInfos == null) {
+        if (isNullOrUndefined(audioInfos)) {
             return null;
         }
         var chosenTrack = this._audioChoiceMemory.get(period);
-        if (chosenTrack == null) {
+        if (isNullOrUndefined(chosenTrack)) {
             return null;
         }
         var audioTrack = {
@@ -451,13 +452,13 @@ var TrackChoiceManager = /** @class */ (function () {
      */
     TrackChoiceManager.prototype.getChosenTextTrack = function (period) {
         var periodItem = getPeriodItem(this._periods, period);
-        var textInfos = periodItem != null ? periodItem.text :
+        var textInfos = periodItem !== undefined ? periodItem.text :
             null;
-        if (textInfos == null) {
+        if (isNullOrUndefined(textInfos)) {
             return null;
         }
         var chosenTextAdaptation = this._textChoiceMemory.get(period);
-        if (chosenTextAdaptation == null) {
+        if (isNullOrUndefined(chosenTextAdaptation)) {
             return null;
         }
         return {
@@ -479,16 +480,13 @@ var TrackChoiceManager = /** @class */ (function () {
      */
     TrackChoiceManager.prototype.getChosenVideoTrack = function (period) {
         var periodItem = getPeriodItem(this._periods, period);
-        var videoInfos = periodItem != null ? periodItem.video :
+        var videoInfos = periodItem !== undefined ? periodItem.video :
             null;
-        if (videoInfos == null) {
+        if (isNullOrUndefined(videoInfos)) {
             return null;
         }
         var chosenVideoAdaptation = this._videoChoiceMemory.get(period);
-        if (chosenVideoAdaptation === undefined) {
-            return null; // not set yet
-        }
-        if (chosenVideoAdaptation === null) {
+        if (isNullOrUndefined(chosenVideoAdaptation)) {
             return null;
         }
         var currAdaptation = chosenVideoAdaptation.adaptation;
@@ -496,9 +494,7 @@ var TrackChoiceManager = /** @class */ (function () {
             currAdaptation.trickModeTracks.map(function (trickModeAdaptation) {
                 var representations = trickModeAdaptation.representations
                     .map(parseVideoRepresentation);
-                var trickMode = { id: trickModeAdaptation.id,
-                    representations: representations,
-                    isTrickModeTrack: true };
+                var trickMode = { id: trickModeAdaptation.id, representations: representations, isTrickModeTrack: true };
                 if (trickModeAdaptation.isSignInterpreted === true) {
                     trickMode.signInterpreted = true;
                 }
@@ -528,13 +524,14 @@ var TrackChoiceManager = /** @class */ (function () {
      */
     TrackChoiceManager.prototype.getAvailableAudioTracks = function (period) {
         var periodItem = getPeriodItem(this._periods, period);
-        var audioInfos = periodItem != null ? periodItem.audio :
+        var audioInfos = periodItem !== undefined ? periodItem.audio :
             null;
-        if (audioInfos == null) {
+        if (isNullOrUndefined(audioInfos)) {
             return [];
         }
         var chosenAudioAdaptation = this._audioChoiceMemory.get(period);
-        var currentId = chosenAudioAdaptation != null ? chosenAudioAdaptation.id :
+        var currentId = !isNullOrUndefined(chosenAudioAdaptation) ?
+            chosenAudioAdaptation.id :
             null;
         return audioInfos.adaptations
             .map(function (adaptation) {
@@ -543,7 +540,8 @@ var TrackChoiceManager = /** @class */ (function () {
                 normalized: takeFirstSet(adaptation.normalizedLanguage, ""),
                 audioDescription: adaptation.isAudioDescription === true,
                 id: adaptation.id,
-                active: currentId == null ? false : currentId === adaptation.id,
+                active: currentId === null ? false :
+                    currentId === adaptation.id,
                 representations: adaptation.representations.map(parseAudioRepresentation),
             };
             if (adaptation.isDub === true) {
@@ -561,13 +559,14 @@ var TrackChoiceManager = /** @class */ (function () {
      */
     TrackChoiceManager.prototype.getAvailableTextTracks = function (period) {
         var periodItem = getPeriodItem(this._periods, period);
-        var textInfos = periodItem != null ? periodItem.text :
+        var textInfos = periodItem !== undefined ? periodItem.text :
             null;
-        if (textInfos == null) {
+        if (isNullOrUndefined(textInfos)) {
             return [];
         }
         var chosenTextAdaptation = this._textChoiceMemory.get(period);
-        var currentId = chosenTextAdaptation != null ? chosenTextAdaptation.id :
+        var currentId = !isNullOrUndefined(chosenTextAdaptation) ?
+            chosenTextAdaptation.id :
             null;
         return textInfos.adaptations
             .map(function (adaptation) { return ({
@@ -575,7 +574,7 @@ var TrackChoiceManager = /** @class */ (function () {
             normalized: takeFirstSet(adaptation.normalizedLanguage, ""),
             closedCaption: adaptation.isClosedCaption === true,
             id: adaptation.id,
-            active: currentId == null ? false :
+            active: currentId === null ? false :
                 currentId === adaptation.id,
         }); });
     };
@@ -588,9 +587,9 @@ var TrackChoiceManager = /** @class */ (function () {
     TrackChoiceManager.prototype.getAvailableVideoTracks = function (period) {
         var _a;
         var periodItem = getPeriodItem(this._periods, period);
-        var videoInfos = periodItem != null ? periodItem.video :
+        var videoInfos = periodItem !== undefined ? periodItem.video :
             null;
-        if (videoInfos == null) {
+        if (isNullOrUndefined(videoInfos)) {
             return [];
         }
         var chosenVideoAdaptation = this._videoChoiceMemory.get(period);
@@ -605,9 +604,7 @@ var TrackChoiceManager = /** @class */ (function () {
                         currentId === trickModeAdaptation.id;
                     var representations = trickModeAdaptation.representations
                         .map(parseVideoRepresentation);
-                    var trickMode = { id: trickModeAdaptation.id,
-                        representations: representations,
-                        isTrickModeTrack: true,
+                    var trickMode = { id: trickModeAdaptation.id, representations: representations, isTrickModeTrack: true,
                         active: isActive };
                     if (trickModeAdaptation.isSignInterpreted === true) {
                         trickMode.signInterpreted = true;
@@ -672,7 +669,7 @@ var TrackChoiceManager = /** @class */ (function () {
                 return;
             }
             var periodItem = _this._periods.get(index);
-            if (periodItem.audio == null) {
+            if (isNullOrUndefined(periodItem.audio)) {
                 // No audio choice for this period, check next one
                 recursiveUpdateAudioTrack(index + 1);
                 return;
@@ -713,7 +710,7 @@ var TrackChoiceManager = /** @class */ (function () {
                 return;
             }
             var periodItem = _this._periods.get(index);
-            if (periodItem.text == null) {
+            if (isNullOrUndefined(periodItem.text)) {
                 // No text choice for this period, check next one
                 recursiveUpdateTextTrack(index + 1);
                 return;
@@ -753,7 +750,7 @@ var TrackChoiceManager = /** @class */ (function () {
                 return;
             }
             var periodItem = _this._periods.get(index);
-            if (periodItem.video == null) {
+            if (isNullOrUndefined(periodItem.video)) {
                 // No video choice for this period, check next one
                 recursiveUpdateVideoTrack(index + 1);
                 return;

package/dist/_esm5.processed/core/eme/__tests__/__global__/utils.d.ts

@@ -21,7 +21,6 @@ import EventEmitter from "../../../../utils/event_emitter";
 export declare const defaultKSConfig: {
     audioCapabilities: {
         contentType: string;
-        robustness: undefined;
     }[];
     distinctiveIdentifier: "optional";
     initDataTypes: readonly ["cenc"];
@@ -29,7 +28,6 @@ export declare const defaultKSConfig: {
     sessionTypes: readonly ["temporary"];
     videoCapabilities: {
         contentType: string;
-        robustness: undefined;
     }[];
 }[];
 /** Default Widevine MediaKeySystemAccess configuration used by the RxPlayer. */
@@ -57,20 +55,20 @@ export declare class MediaKeyStatusMapImpl {
     constructor();
     get(keyId: BufferSource): MediaKeyStatus | undefined;
     has(keyId: BufferSource): boolean;
-    forEach(callbackfn: (value: MediaKeyStatus, key: BufferSource, parent: MediaKeyStatusMapImpl) => void, thisArg?: any): void;
+    forEach(callbackfn: (value: MediaKeyStatus, key: BufferSource, parent: MediaKeyStatusMapImpl) => void, thisArg?: unknown): void;
     _setKeyStatus(keyId: BufferSource, value: MediaKeyStatus | undefined): void;
 }
 /**
  * Custom implementation of an EME-compliant MediaKeySession.
  * @class MediaKeySessionImpl
  */
-export declare class MediaKeySessionImpl extends EventEmitter<any> {
+export declare class MediaKeySessionImpl extends EventEmitter<Record<string, unknown>> {
     readonly closed: Promise<void>;
     readonly expiration: number;
     readonly keyStatuses: MediaKeyStatusMapImpl;
     readonly sessionId: string;
-    onkeystatuseschange: ((this: MediaKeySessionImpl, ev: Event) => any) | null;
-    onmessage: ((this: MediaKeySessionImpl, ev: MediaKeyMessageEvent) => any) | null;
+    onkeystatuseschange: ((this: MediaKeySessionImpl, ev: Event) => unknown) | null;
+    onmessage: ((this: MediaKeySessionImpl, ev: MediaKeyMessageEvent) => unknown) | null;
     private _currentKeyId;
     private _close?;
     constructor();

package/dist/_esm5.processed/core/eme/__tests__/__global__/utils.js

@@ -45,6 +45,7 @@ var __assign = (this && this.__assign) || function () {
 /* eslint-disable @typescript-eslint/no-unsafe-call */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable @typescript-eslint/no-unsafe-return */
+/* eslint-disable @typescript-eslint/no-unsafe-argument */
 /* eslint-disable no-restricted-properties */
 import { defer as observableDefer, of as observableOf, Subject, } from "rxjs";
 import { base64ToBytes, bytesToBase64, } from "../../../../utils/base64";
@@ -54,20 +55,15 @@ import flatMap from "../../../../utils/flat_map";
 import { strToUtf8, utf8ToStr, } from "../../../../utils/string_parsing";
 /** Default MediaKeySystemAccess configuration used by the RxPlayer. */
 export var defaultKSConfig = [{
-        audioCapabilities: [{ contentType: "audio/mp4;codecs=\"mp4a.40.2\"",
-                robustness: undefined },
-            { contentType: "audio/webm;codecs=opus",
-                robustness: undefined }],
+        audioCapabilities: [{ contentType: "audio/mp4;codecs=\"mp4a.40.2\"" },
+            { contentType: "audio/webm;codecs=opus" }],
         distinctiveIdentifier: "optional",
         initDataTypes: ["cenc"],
         persistentState: "optional",
         sessionTypes: ["temporary"],
-        videoCapabilities: [{ contentType: "video/mp4;codecs=\"avc1.4d401e\"",
-                robustness: undefined },
-            { contentType: "video/mp4;codecs=\"avc1.42e01e\"",
-                robustness: undefined },
-            { contentType: "video/webm;codecs=\"vp8\"",
-                robustness: undefined }],
+        videoCapabilities: [{ contentType: "video/mp4;codecs=\"avc1.4d401e\"" },
+            { contentType: "video/mp4;codecs=\"avc1.42e01e\"" },
+            { contentType: "video/webm;codecs=\"vp8\"" }],
     }];
 /** Default Widevine MediaKeySystemAccess configuration used by the RxPlayer. */
 export var defaultWidevineConfig = (function () {
@@ -77,18 +73,13 @@ export var defaultWidevineConfig = (function () {
         "SW_SECURE_DECODE",
         "SW_SECURE_CRYPTO"];
     var videoCapabilities = flatMap(ROBUSTNESSES, 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 }];
+        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(ROBUSTNESSES, function (robustness) {
-        return [{ contentType: "audio/mp4;codecs=\"mp4a.40.2\"",
-                robustness: robustness },
-            { contentType: "audio/webm;codecs=opus",
-                robustness: robustness }];
+        return [{ contentType: "audio/mp4;codecs=\"mp4a.40.2\"", robustness: robustness },
+            { contentType: "audio/webm;codecs=opus", robustness: robustness }];
     });
     return defaultKSConfig.map(function (conf) {
         return __assign(__assign({}, conf), { audioCapabilities: audioCapabilities, videoCapabilities: videoCapabilities });
@@ -264,15 +255,8 @@ export function mockCompat(exportedFunctions) {
         return encryptedEvent;
     });
     jest.mock("../../../../compat", function () { return (__assign({ events: eventSpies, requestMediaKeySystemAccess: rmksaSpy, setMediaKeys: setMediaKeysSpy, getInitData: getInitDataSpy, generateKeyRequest: generateKeyRequestSpy }, exportedFunctions)); });
-    return { eventSpies: eventSpies,
-        eventTriggers: { triggerEncrypted: triggerEncrypted,
-            triggerKeyMessage: triggerKeyMessage,
-            triggerKeyError: triggerKeyError,
-            triggerKeyStatusesChange: triggerKeyStatusesChange },
-        requestMediaKeySystemAccessSpy: rmksaSpy,
-        getInitDataSpy: getInitDataSpy,
-        setMediaKeysSpy: setMediaKeysSpy,
-        generateKeyRequestSpy: generateKeyRequestSpy };
+    return { eventSpies: eventSpies, eventTriggers: { triggerEncrypted: triggerEncrypted, triggerKeyMessage: triggerKeyMessage, triggerKeyError: triggerKeyError, triggerKeyStatusesChange: triggerKeyStatusesChange },
+        requestMediaKeySystemAccessSpy: rmksaSpy, getInitDataSpy: getInitDataSpy, setMediaKeysSpy: setMediaKeysSpy, generateKeyRequestSpy: generateKeyRequestSpy };
 }
 /**
  * Check that the EMEManager, when called with those arguments, throws
@@ -287,13 +271,16 @@ export function mockCompat(exportedFunctions) {
  */
 export function testEMEManagerImmediateError(
 /* eslint-disable @typescript-eslint/naming-convention */
+/* eslint-disable @typescript-eslint/no-explicit-any */
 // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
 EMEManager, 
+/* eslint-enable @typescript-eslint/no-explicit-any */
 /* eslint-enable @typescript-eslint/naming-convention */
 mediaElement, keySystemsConfigs, contentProtections$) {
     return new Promise(function (res, rej) {
         EMEManager(mediaElement, keySystemsConfigs, contentProtections$)
             .subscribe(function (evt) {
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
             var eventStr = JSON.stringify(evt);
             rej(new Error("Received an EMEManager event: " + eventStr));
         }, function (err) { res(err); }, function () { return rej(new Error("EMEManager completed.")); });
@@ -305,7 +292,9 @@ mediaElement, keySystemsConfigs, contentProtections$) {
  * @param {Object} evt
  * @param {Object} initDataVal
  */
-export function expectLicenseRequestMessage(evt, initDataVal) {
+export function expectLicenseRequestMessage(
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+evt, initDataVal) {
     expect(evt.type).toEqual("session-message");
     expect(evt.value.messageType).toEqual("license-request");
     expect(evt.value.initializationData).toEqual(initDataVal);
@@ -315,7 +304,9 @@ export function expectLicenseRequestMessage(evt, initDataVal) {
  * @param {Uint8Array} initData
  * @param {string|undefined} initDataType
  */
-export function expectInitDataIgnored(evt, initDataVal) {
+export function expectInitDataIgnored(
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+evt, initDataVal) {
     expect(evt.type).toEqual("init-data-ignored");
     expect(evt.value.initializationData).toEqual(initDataVal);
 }
@@ -324,7 +315,9 @@ export function expectInitDataIgnored(evt, initDataVal) {
  * @param {Uint8Array} initData
  * @param {string|undefined} initDataType
  */
-export function expectEncryptedEventReceived(evt, initData) {
+export function expectEncryptedEventReceived(
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+evt, initData) {
     expect(evt.type).toEqual("encrypted-event-received");
     expect(evt.value).toEqual(initData);
 }

package/dist/_esm5.processed/core/eme/attach_media_keys.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, } from "rxjs";
-import { mergeMap, tap } from "rxjs/operators";
+import { defer as observableDefer, mergeMap, tap, of as observableOf, } from "rxjs";
 import { setMediaKeys, } from "../../compat";
 import log from "../../log";
 import MediaKeysInfosStore from "./media_keys_infos_store";
@@ -46,10 +45,7 @@ export default function attachMediaKeys(mediaElement, _a) {
             previousState.loadedSessionsStore.closeAllSessions() :
             observableOf(null);
         return closeAllSessions$.pipe(mergeMap(function () {
-            MediaKeysInfosStore.setState(mediaElement, { keySystemOptions: keySystemOptions,
-                mediaKeySystemAccess: mediaKeySystemAccess,
-                mediaKeys: mediaKeys,
-                loadedSessionsStore: loadedSessionsStore });
+            MediaKeysInfosStore.setState(mediaElement, { keySystemOptions: keySystemOptions, mediaKeySystemAccess: mediaKeySystemAccess, mediaKeys: mediaKeys, loadedSessionsStore: loadedSessionsStore });
             if (mediaElement.mediaKeys === mediaKeys) {
                 return observableOf(null);
             }

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

@@ -15,6 +15,7 @@
  */
 import getUUIDKidFromKeyStatusKID from "../../compat/eme/get_uuid_kid_from_keystatus_kid";
 import { EncryptedMediaError } from "../../errors";
+import { bytesToHex } from "../../utils/string_parsing";
 var KEY_STATUSES = { EXPIRED: "expired",
     INTERNAL_ERROR: "internal-error",
     OUTPUT_RESTRICTED: "output-restricted" };
@@ -34,11 +35,7 @@ export default function checkKeyStatuses(session, options, keySystem) {
     var blacklistedKeyIDs = [];
     var whitelistedKeyIds = [];
     var _a = options.fallbackOn, fallbackOn = _a === void 0 ? {} : _a, throwOnLicenseExpiration = options.throwOnLicenseExpiration;
-    /* eslint-disable @typescript-eslint/no-unsafe-member-access */
-    /* eslint-disable @typescript-eslint/no-unsafe-call */
     session.keyStatuses.forEach(function (_arg1, _arg2) {
-        /* eslint-enable @typescript-eslint/no-unsafe-member-access */
-        /* eslint-enable @typescript-eslint/no-unsafe-call */
         // Hack present because the order of the arguments has changed in spec
         // and is not the same between some versions of Edge and Chrome.
         var _a = (function () {
@@ -48,7 +45,7 @@ export default function checkKeyStatuses(session, options, keySystem) {
         var keyId = getUUIDKidFromKeyStatusKID(keySystem, new Uint8Array(keyStatusKeyId));
         switch (keyStatus) {
             case KEY_STATUSES.EXPIRED: {
-                var error = new EncryptedMediaError("KEY_STATUS_CHANGE_ERROR", "A decryption key expired");
+                var error = new EncryptedMediaError("KEY_STATUS_CHANGE_ERROR", "A decryption key expired (".concat(bytesToHex(keyId), ")"));
                 if (throwOnLicenseExpiration !== false) {
                     throw error;
                 }
@@ -57,8 +54,7 @@ export default function checkKeyStatuses(session, options, keySystem) {
                 break;
             }
             case KEY_STATUSES.INTERNAL_ERROR: {
-                var error = new EncryptedMediaError("KEY_STATUS_CHANGE_ERROR", "An invalid key status has been " +
-                    "encountered: " + keyStatus);
+                var error = new EncryptedMediaError("KEY_STATUS_CHANGE_ERROR", "A \"".concat(keyStatus, "\" status has been encountered (").concat(bytesToHex(keyId), ")"));
                 if (fallbackOn.keyInternalError !== true) {
                     throw error;
                 }
@@ -67,8 +63,7 @@ export default function checkKeyStatuses(session, options, keySystem) {
                 break;
             }
             case KEY_STATUSES.OUTPUT_RESTRICTED: {
-                var error = new EncryptedMediaError("KEY_STATUS_CHANGE_ERROR", "An invalid key status has been " +
-                    "encountered: " + keyStatus);
+                var error = new EncryptedMediaError("KEY_STATUS_CHANGE_ERROR", "A \"".concat(keyStatus, "\" status has been encountered (").concat(bytesToHex(keyId), ")"));
                 if (fallbackOn.keyOutputRestricted !== true) {
                     throw error;
                 }

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

@@ -13,8 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { EMPTY, merge as observableMerge, } from "rxjs";
-import { mapTo, startWith, } from "rxjs/operators";
+import { EMPTY, mapTo, merge as observableMerge, startWith, } from "rxjs";
 /**
  * Close sessions from the loadedSessionsStore to allow at maximum `limit`
  * stored MediaKeySessions in it.

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

@@ -13,8 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { defer as observableDefer, EMPTY, } from "rxjs";
-import { ignoreElements } from "rxjs/operators";
+import { defer as observableDefer, EMPTY, ignoreElements, } from "rxjs";
 import { shouldUnsetMediaKeys } from "../../compat/";
 import log from "../../log";
 import disposeMediaKeys from "./dispose_media_keys";
@@ -38,6 +37,11 @@ export default function clearEMESession(mediaElement) {
             currentState.keySystemOptions.closeSessionsOnStop === true) {
             log.info("EME: closing all current sessions.");
             return currentState.loadedSessionsStore.closeAllSessions()
+                // 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-next-line @typescript-eslint/no-unsafe-argument */
                 .pipe(ignoreElements());
         }
         log.info("EME: Nothing to clear. Returning right away. No state =", currentState === null);

package/dist/_esm5.processed/core/eme/create_session.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, } from "rxjs";
-import { catchError, map, mergeMap, } from "rxjs/operators";
+import { catchError, defer as observableDefer, map, mergeMap, of as observableOf, } from "rxjs";
 import { loadSession, } from "../../compat";
 import log from "../../log";
 import isSessionUsable from "./utils/is_session_usable";

package/dist/_esm5.processed/core/eme/dispose_media_keys.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, } from "rxjs";
-import { mergeMapTo } from "rxjs/operators";
+import { defer as observableDefer, mergeMap, of as observableOf, } from "rxjs";
 import { setMediaKeys } from "../../compat";
 import log from "../../log";
 import MediaKeysInfosStore from "./media_keys_infos_store";
@@ -32,6 +31,6 @@ export default function disposeMediaKeys(mediaElement) {
         var loadedSessionsStore = currentState.loadedSessionsStore;
         MediaKeysInfosStore.clearState(mediaElement);
         return loadedSessionsStore.closeAllSessions()
-            .pipe(mergeMapTo(setMediaKeys(mediaElement, null)));
+            .pipe(mergeMap(function () { return setMediaKeys(mediaElement, null); }));
     });
 }