rx-player 4.0.0-dev.2023121900 → 4.0.0-rc.2

package/dist/commonjs/core/decrypt/content_decryptor.js

@@ -122,6 +122,7 @@ var array_find_1 = require("../../utils/array_find");
 var array_includes_1 = require("../../utils/array_includes");
 var event_emitter_1 = require("../../utils/event_emitter");
 var is_null_or_undefined_1 = require("../../utils/is_null_or_undefined");
+var object_values_1 = require("../../utils/object_values");
 var string_parsing_1 = require("../../utils/string_parsing");
 var task_canceller_1 = require("../../utils/task_canceller");
 var attach_media_keys_1 = require("./attach_media_keys");
@@ -379,7 +380,7 @@ var ContentDecryptor = /** @class */ (function (_super) {
                                         log_1.default.warn("DRM: Unable to fallback from a non-decipherable quality.");
                                     }
                                     else {
-                                        blackListProtectionData(initializationData.content.manifest, initializationData);
+                                        this.trigger("blackListProtectionData", initializationData);
                                     }
                                     return [2 /*return*/];
                                 }
@@ -390,7 +391,11 @@ var ContentDecryptor = /** @class */ (function (_super) {
                                             .reduce(function (acc, kid) { return "".concat(acc, ", ").concat((0, string_parsing_1.bytesToHex)(kid)); }, "");
                                         log_1.default.debug("DRM: Blacklisting new key ids", hexKids);
                                     }
-                                    updateDecipherability(initializationData.content.manifest, [], keyIds, []);
+                                    this.trigger("keyIdsCompatibilityUpdate", {
+                                        whitelistedKeyIds: [],
+                                        blacklistedKeyIds: keyIds,
+                                        delistedKeyIds: [],
+                                    });
                                 }
                                 return [2 /*return*/];
                             }
@@ -435,7 +440,11 @@ var ContentDecryptor = /** @class */ (function (_super) {
                                                     }
                                                     finally { if (e_3) throw e_3.error; }
                                                 }
-                                                updateDecipherability(initializationData.content.manifest, createdSess.keyStatuses.whitelisted, createdSess.keyStatuses.blacklisted, []);
+                                                this.trigger("keyIdsCompatibilityUpdate", {
+                                                    whitelistedKeyIds: createdSess.keyStatuses.whitelisted,
+                                                    blacklistedKeyIds: createdSess.keyStatuses.blacklisted,
+                                                    delistedKeyIds: [],
+                                                });
                                                 return [2 /*return*/];
                                             }
                                         }
@@ -508,7 +517,11 @@ var ContentDecryptor = /** @class */ (function (_super) {
                                     isSessionPersisted = true;
                                 }
                                 if (initializationData.content !== undefined) {
-                                    updateDecipherability(initializationData.content.manifest, linkedKeys.whitelisted, linkedKeys.blacklisted, []);
+                                    _this.trigger("keyIdsCompatibilityUpdate", {
+                                        whitelistedKeyIds: linkedKeys.whitelisted,
+                                        blacklistedKeyIds: linkedKeys.blacklisted,
+                                        delistedKeyIds: [],
+                                    });
                                 }
                                 _this._unlockInitDataQueue();
                             },
@@ -525,7 +538,11 @@ var ContentDecryptor = /** @class */ (function (_super) {
                                         _this._currentSessions.splice(indexOf);
                                     }
                                     if (initializationData.content !== undefined) {
-                                        updateDecipherability(initializationData.content.manifest, [], [], sessionInfo.record.getAssociatedKeyIds());
+                                        _this.trigger("keyIdsCompatibilityUpdate", {
+                                            whitelistedKeyIds: [],
+                                            blacklistedKeyIds: [],
+                                            delistedKeyIds: sessionInfo.record.getAssociatedKeyIds(),
+                                        });
                                     }
                                     (_a = stores.persistentSessionsStore) === null || _a === void 0 ? void 0 : _a.delete(mediaKeySession.sessionId);
                                     stores.loadedSessionsStore.closeSession(mediaKeySession)
@@ -547,10 +564,9 @@ var ContentDecryptor = /** @class */ (function (_super) {
                                 }
                                 sessionInfo.blacklistedSessionError = err;
                                 if (initializationData.content !== undefined) {
-                                    var manifest = initializationData.content.manifest;
                                     log_1.default.info("DRM: blacklisting Representations based on " +
                                         "protection data.");
-                                    blackListProtectionData(manifest, initializationData);
+                                    _this.trigger("blackListProtectionData", initializationData);
                                 }
                                 _this._unlockInitDataQueue();
                                 // TODO warning for blacklisted session?
@@ -608,8 +624,7 @@ var ContentDecryptor = /** @class */ (function (_super) {
             else {
                 log_1.default.info("DRM: This initialization data has already been blacklisted. " +
                     "Blacklisting the related content.");
-                var manifest = initializationData.content.manifest;
-                blackListProtectionData(manifest, initializationData);
+                this.trigger("blackListProtectionData", initializationData);
                 return true;
             }
         }
@@ -649,7 +664,11 @@ var ContentDecryptor = /** @class */ (function (_super) {
                 }
                 log_1.default.info("DRM: Current initialization data is linked to blacklisted keys. " +
                     "Marking Representations as not decipherable");
-                updateDecipherability(initializationData.content.manifest, [], initializationData.keyIds, []);
+                this.trigger("keyIdsCompatibilityUpdate", {
+                    whitelistedKeyIds: [],
+                    blacklistedKeyIds: initializationData.keyIds,
+                    delistedKeyIds: [],
+                });
                 return true;
             }
         }
@@ -767,141 +786,6 @@ function canCreatePersistentSession(mediaKeySystemAccess) {
     return sessionTypes !== undefined &&
         (0, array_includes_1.default)(sessionTypes, "persistent-license");
 }
-/**
- * Change the decipherability of Representations which have their key id in one
- * of the given Arrays:
- *
- *   - Those who have a key id listed in `whitelistedKeyIds` will have their
- *     decipherability updated to `true`
- *
- *   - Those who have a key id listed in `blacklistedKeyIds` will have their
- *     decipherability updated to `false`
- *
- *   - Those who have a key id listed in `delistedKeyIds` will have their
- *     decipherability updated to `undefined`.
- *
- * @param {Object} manifest
- * @param {Array.<Uint8Array>} whitelistedKeyIds
- * @param {Array.<Uint8Array>} blacklistedKeyIds
- * @param {Array.<Uint8Array>} delistedKeyIds
- */
-function updateDecipherability(manifest, whitelistedKeyIds, blacklistedKeyIds, delistedKeyIds) {
-    manifest.updateRepresentationsDeciperability(function (representation) {
-        var e_4, _a, e_5, _b, e_6, _c, e_7, _d;
-        if (representation.contentProtections === undefined) {
-            return representation.decipherable;
-        }
-        var contentKIDs = representation.contentProtections.keyIds;
-        if (contentKIDs !== undefined) {
-            try {
-                for (var contentKIDs_1 = __values(contentKIDs), contentKIDs_1_1 = contentKIDs_1.next(); !contentKIDs_1_1.done; contentKIDs_1_1 = contentKIDs_1.next()) {
-                    var elt = contentKIDs_1_1.value;
-                    try {
-                        for (var blacklistedKeyIds_1 = (e_5 = void 0, __values(blacklistedKeyIds)), blacklistedKeyIds_1_1 = blacklistedKeyIds_1.next(); !blacklistedKeyIds_1_1.done; blacklistedKeyIds_1_1 = blacklistedKeyIds_1.next()) {
-                            var blacklistedKeyId = blacklistedKeyIds_1_1.value;
-                            if ((0, are_arrays_of_numbers_equal_1.default)(blacklistedKeyId, elt.keyId)) {
-                                return false;
-                            }
-                        }
-                    }
-                    catch (e_5_1) { e_5 = { error: e_5_1 }; }
-                    finally {
-                        try {
-                            if (blacklistedKeyIds_1_1 && !blacklistedKeyIds_1_1.done && (_b = blacklistedKeyIds_1.return)) _b.call(blacklistedKeyIds_1);
-                        }
-                        finally { if (e_5) throw e_5.error; }
-                    }
-                    try {
-                        for (var whitelistedKeyIds_1 = (e_6 = void 0, __values(whitelistedKeyIds)), whitelistedKeyIds_1_1 = whitelistedKeyIds_1.next(); !whitelistedKeyIds_1_1.done; whitelistedKeyIds_1_1 = whitelistedKeyIds_1.next()) {
-                            var whitelistedKeyId = whitelistedKeyIds_1_1.value;
-                            if ((0, are_arrays_of_numbers_equal_1.default)(whitelistedKeyId, elt.keyId)) {
-                                return true;
-                            }
-                        }
-                    }
-                    catch (e_6_1) { e_6 = { error: e_6_1 }; }
-                    finally {
-                        try {
-                            if (whitelistedKeyIds_1_1 && !whitelistedKeyIds_1_1.done && (_c = whitelistedKeyIds_1.return)) _c.call(whitelistedKeyIds_1);
-                        }
-                        finally { if (e_6) throw e_6.error; }
-                    }
-                    try {
-                        for (var delistedKeyIds_1 = (e_7 = void 0, __values(delistedKeyIds)), delistedKeyIds_1_1 = delistedKeyIds_1.next(); !delistedKeyIds_1_1.done; delistedKeyIds_1_1 = delistedKeyIds_1.next()) {
-                            var delistedKeyId = delistedKeyIds_1_1.value;
-                            if ((0, are_arrays_of_numbers_equal_1.default)(delistedKeyId, elt.keyId)) {
-                                return undefined;
-                            }
-                        }
-                    }
-                    catch (e_7_1) { e_7 = { error: e_7_1 }; }
-                    finally {
-                        try {
-                            if (delistedKeyIds_1_1 && !delistedKeyIds_1_1.done && (_d = delistedKeyIds_1.return)) _d.call(delistedKeyIds_1);
-                        }
-                        finally { if (e_7) throw e_7.error; }
-                    }
-                }
-            }
-            catch (e_4_1) { e_4 = { error: e_4_1 }; }
-            finally {
-                try {
-                    if (contentKIDs_1_1 && !contentKIDs_1_1.done && (_a = contentKIDs_1.return)) _a.call(contentKIDs_1);
-                }
-                finally { if (e_4) throw e_4.error; }
-            }
-        }
-        return representation.decipherable;
-    });
-}
-/**
- * Update decipherability to `false` to any Representation which is linked to
- * the given initialization data.
- * @param {Object} manifest
- * @param {Object} initData
- */
-function blackListProtectionData(manifest, initData) {
-    manifest.updateRepresentationsDeciperability(function (representation) {
-        var e_8, _a;
-        var _b, _c;
-        if (representation.decipherable === false) {
-            return false;
-        }
-        var segmentProtections = (_c = (_b = representation.contentProtections) === null || _b === void 0 ? void 0 : _b.initData) !== null && _c !== void 0 ? _c : [];
-        var _loop_2 = function (protection) {
-            if (initData.type === undefined ||
-                protection.type === initData.type) {
-                var containedInitData = initData.values.getFormattedValues()
-                    .every(function (undecipherableVal) {
-                    return protection.values.some(function (currVal) {
-                        return (undecipherableVal.systemId === undefined ||
-                            currVal.systemId === undecipherableVal.systemId) &&
-                            (0, are_arrays_of_numbers_equal_1.default)(currVal.data, undecipherableVal.data);
-                    });
-                });
-                if (containedInitData) {
-                    return { value: false };
-                }
-            }
-        };
-        try {
-            for (var segmentProtections_1 = __values(segmentProtections), segmentProtections_1_1 = segmentProtections_1.next(); !segmentProtections_1_1.done; segmentProtections_1_1 = segmentProtections_1.next()) {
-                var protection = segmentProtections_1_1.value;
-                var state_1 = _loop_2(protection);
-                if (typeof state_1 === "object")
-                    return state_1.value;
-            }
-        }
-        catch (e_8_1) { e_8 = { error: e_8_1 }; }
-        finally {
-            try {
-                if (segmentProtections_1_1 && !segmentProtections_1_1.done && (_a = segmentProtections_1.return)) _a.call(segmentProtections_1);
-            }
-            finally { if (e_8) throw e_8.error; }
-        }
-        return representation.decipherable;
-    });
-}
 /**
  * Returns set of all usable and unusable keys - explicit or implicit - that are
  * linked to a `MediaKeySession`.
@@ -939,7 +823,7 @@ function blackListProtectionData(manifest, initData) {
  *     The qualities linked to those keys should not be played.
  */
 function getKeyIdsLinkedToSession(initializationData, keySessionRecord, singleLicensePer, isCurrentLicense, usableKeyIds, unusableKeyIds) {
-    var e_9, _a, e_10, _b, e_11, _c, e_12, _d;
+    var e_4, _a, e_5, _b, e_6, _c, e_7, _d;
     var _e;
     /**
      * Every key id associated with the MediaKeySession, starting with
@@ -949,7 +833,7 @@ function getKeyIdsLinkedToSession(initializationData, keySessionRecord, singleLi
     // Add all key ids associated to the `KeySessionRecord` yet not in
     // `usableKeyIds` nor in `unusableKeyIds`
     var allKnownKeyIds = keySessionRecord.getAssociatedKeyIds();
-    var _loop_3 = function (kid) {
+    var _loop_2 = function (kid) {
         if (!associatedKeyIds.some(function (ak) { return (0, are_arrays_of_numbers_equal_1.default)(ak, kid); })) {
             if (log_1.default.hasLevel("DEBUG")) {
                 log_1.default.debug("DRM: KeySessionRecord's key missing in the license, blacklisting it", (0, string_parsing_1.bytesToHex)(kid));
@@ -960,15 +844,15 @@ function getKeyIdsLinkedToSession(initializationData, keySessionRecord, singleLi
     try {
         for (var allKnownKeyIds_1 = __values(allKnownKeyIds), allKnownKeyIds_1_1 = allKnownKeyIds_1.next(); !allKnownKeyIds_1_1.done; allKnownKeyIds_1_1 = allKnownKeyIds_1.next()) {
             var kid = allKnownKeyIds_1_1.value;
-            _loop_3(kid);
+            _loop_2(kid);
         }
     }
-    catch (e_9_1) { e_9 = { error: e_9_1 }; }
+    catch (e_4_1) { e_4 = { error: e_4_1 }; }
     finally {
         try {
             if (allKnownKeyIds_1_1 && !allKnownKeyIds_1_1.done && (_a = allKnownKeyIds_1.return)) _a.call(allKnownKeyIds_1);
         }
-        finally { if (e_9) throw e_9.error; }
+        finally { if (e_4) throw e_4.error; }
     }
     if (singleLicensePer !== undefined && singleLicensePer !== "init-data") {
         // We want to add the current key ids in the blacklist if it is
@@ -1007,12 +891,12 @@ function getKeyIdsLinkedToSession(initializationData, keySessionRecord, singleLi
                         addKeyIdsFromPeriod(contentKeys, period);
                     }
                 }
-                catch (e_10_1) { e_10 = { error: e_10_1 }; }
+                catch (e_5_1) { e_5 = { error: e_5_1 }; }
                 finally {
                     try {
                         if (_g && !_g.done && (_b = _f.return)) _b.call(_f);
                     }
-                    finally { if (e_10) throw e_10.error; }
+                    finally { if (e_5) throw e_5.error; }
                 }
                 mergeKeyIdSetIntoArray(contentKeys, associatedKeyIds);
             }
@@ -1028,7 +912,7 @@ function getKeyIdsLinkedToSession(initializationData, keySessionRecord, singleLi
                         }
                         else {
                             var periodKeysArr = Array.from(periodKeys);
-                            var _loop_4 = function (kid) {
+                            var _loop_3 = function (kid) {
                                 var isFound = associatedKeyIds.some(function (k) { return (0, are_arrays_of_numbers_equal_1.default)(k, kid); });
                                 if (isFound) {
                                     mergeKeyIdSetIntoArray(periodKeys, associatedKeyIds);
@@ -1036,29 +920,29 @@ function getKeyIdsLinkedToSession(initializationData, keySessionRecord, singleLi
                                 }
                             };
                             try {
-                                for (var periodKeysArr_3 = (e_12 = void 0, __values(periodKeysArr)), periodKeysArr_3_1 = periodKeysArr_3.next(); !periodKeysArr_3_1.done; periodKeysArr_3_1 = periodKeysArr_3.next()) {
+                                for (var periodKeysArr_3 = (e_7 = void 0, __values(periodKeysArr)), periodKeysArr_3_1 = periodKeysArr_3.next(); !periodKeysArr_3_1.done; periodKeysArr_3_1 = periodKeysArr_3.next()) {
                                     var kid = periodKeysArr_3_1.value;
-                                    var state_2 = _loop_4(kid);
-                                    if (state_2 === "break")
+                                    var state_1 = _loop_3(kid);
+                                    if (state_1 === "break")
                                         break;
                                 }
                             }
-                            catch (e_12_1) { e_12 = { error: e_12_1 }; }
+                            catch (e_7_1) { e_7 = { error: e_7_1 }; }
                             finally {
                                 try {
                                     if (periodKeysArr_3_1 && !periodKeysArr_3_1.done && (_d = periodKeysArr_3.return)) _d.call(periodKeysArr_3);
                                 }
-                                finally { if (e_12) throw e_12.error; }
+                                finally { if (e_7) throw e_7.error; }
                             }
                         }
                     }
                 }
-                catch (e_11_1) { e_11 = { error: e_11_1 }; }
+                catch (e_6_1) { e_6 = { error: e_6_1 }; }
                 finally {
                     try {
                         if (_j && !_j.done && (_c = _h.return)) _c.call(_h);
                     }
-                    finally { if (e_11) throw e_11.error; }
+                    finally { if (e_6) throw e_6.error; }
                 }
             }
         }
@@ -1074,9 +958,9 @@ function getKeyIdsLinkedToSession(initializationData, keySessionRecord, singleLi
  * @param {Array.<Uint8Array>} arr
  */
 function mergeKeyIdSetIntoArray(set, arr) {
-    var e_13, _a;
+    var e_8, _a;
     var setArr = Array.from(set.values());
-    var _loop_5 = function (kid) {
+    var _loop_4 = function (kid) {
         var isFound = arr.some(function (k) { return (0, are_arrays_of_numbers_equal_1.default)(k, kid); });
         if (!isFound) {
             arr.push(kid);
@@ -1085,15 +969,15 @@ function mergeKeyIdSetIntoArray(set, arr) {
     try {
         for (var setArr_1 = __values(setArr), setArr_1_1 = setArr_1.next(); !setArr_1_1.done; setArr_1_1 = setArr_1.next()) {
             var kid = setArr_1_1.value;
-            _loop_5(kid);
+            _loop_4(kid);
         }
     }
-    catch (e_13_1) { e_13 = { error: e_13_1 }; }
+    catch (e_8_1) { e_8 = { error: e_8_1 }; }
     finally {
         try {
             if (setArr_1_1 && !setArr_1_1.done && (_a = setArr_1.return)) _a.call(setArr_1);
         }
-        finally { if (e_13) throw e_13.error; }
+        finally { if (e_8) throw e_8.error; }
     }
 }
 /**
@@ -1102,45 +986,50 @@ function mergeKeyIdSetIntoArray(set, arr) {
  * @param {Object} period
  */
 function addKeyIdsFromPeriod(set, period) {
-    var e_14, _a, e_15, _b, e_16, _c;
+    var e_9, _a, e_10, _b, e_11, _c;
+    var adaptationsByType = period.adaptations;
+    var adaptations = (0, object_values_1.objectValues)(adaptationsByType).reduce(
+    // Note: the second case cannot happen. TS is just being dumb here
+    function (acc, adaps) { return adaps != null ? acc.concat(adaps) :
+        acc; }, []);
     try {
-        for (var _d = __values(period.getAdaptations()), _e = _d.next(); !_e.done; _e = _d.next()) {
-            var adaptation = _e.value;
+        for (var adaptations_1 = __values(adaptations), adaptations_1_1 = adaptations_1.next(); !adaptations_1_1.done; adaptations_1_1 = adaptations_1.next()) {
+            var adaptation = adaptations_1_1.value;
             try {
-                for (var _f = (e_15 = void 0, __values(adaptation.representations)), _g = _f.next(); !_g.done; _g = _f.next()) {
-                    var representation = _g.value;
+                for (var _d = (e_10 = void 0, __values(adaptation.representations)), _e = _d.next(); !_e.done; _e = _d.next()) {
+                    var representation = _e.value;
                     if (representation.contentProtections !== undefined &&
                         representation.contentProtections.keyIds !== undefined) {
                         try {
-                            for (var _h = (e_16 = void 0, __values(representation.contentProtections.keyIds)), _j = _h.next(); !_j.done; _j = _h.next()) {
-                                var kidInf = _j.value;
+                            for (var _f = (e_11 = void 0, __values(representation.contentProtections.keyIds)), _g = _f.next(); !_g.done; _g = _f.next()) {
+                                var kidInf = _g.value;
                                 set.add(kidInf.keyId);
                             }
                         }
-                        catch (e_16_1) { e_16 = { error: e_16_1 }; }
+                        catch (e_11_1) { e_11 = { error: e_11_1 }; }
                         finally {
                             try {
-                                if (_j && !_j.done && (_c = _h.return)) _c.call(_h);
+                                if (_g && !_g.done && (_c = _f.return)) _c.call(_f);
                             }
-                            finally { if (e_16) throw e_16.error; }
+                            finally { if (e_11) throw e_11.error; }
                         }
                     }
                 }
             }
-            catch (e_15_1) { e_15 = { error: e_15_1 }; }
+            catch (e_10_1) { e_10 = { error: e_10_1 }; }
             finally {
                 try {
-                    if (_g && !_g.done && (_b = _f.return)) _b.call(_f);
+                    if (_e && !_e.done && (_b = _d.return)) _b.call(_d);
                 }
-                finally { if (e_15) throw e_15.error; }
+                finally { if (e_10) throw e_10.error; }
             }
         }
     }
-    catch (e_14_1) { e_14 = { error: e_14_1 }; }
+    catch (e_9_1) { e_9 = { error: e_9_1 }; }
     finally {
         try {
-            if (_e && !_e.done && (_a = _d.return)) _a.call(_d);
+            if (adaptations_1_1 && !adaptations_1_1.done && (_a = adaptations_1.return)) _a.call(adaptations_1);
         }
-        finally { if (e_14) throw e_14.error; }
+        finally { if (e_9) throw e_9.error; }
     }
 }

package/dist/commonjs/core/decrypt/init_media_keys.js

@@ -51,7 +51,9 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+var browser_detection_1 = require("../../compat/browser_detection");
 var log_1 = require("../../log");
+var noop_1 = require("../../utils/noop");
 var attach_media_keys_1 = require("./attach_media_keys");
 var get_media_keys_1 = require("./get_media_keys");
 /**
@@ -73,11 +75,17 @@ function initMediaKeys(mediaElement, keySystemsConfigs, cancelSignal) {
                     shouldDisableOldMediaKeys = mediaElement.mediaKeys !== null &&
                         mediaElement.mediaKeys !== undefined &&
                         mediaKeys !== mediaElement.mediaKeys;
-                    if (shouldDisableOldMediaKeys) {
-                        log_1.default.debug("DRM: Disabling old MediaKeys");
-                        (0, attach_media_keys_1.disableMediaKeys)(mediaElement);
-                    }
-                    return [2 /*return*/, mediaKeysInfo];
+                    if (!shouldDisableOldMediaKeys) return [3 /*break*/, 4];
+                    log_1.default.debug("DRM: Disabling old MediaKeys");
+                    if (!browser_detection_1.isWebOs) return [3 /*break*/, 3];
+                    return [4 /*yield*/, (0, attach_media_keys_1.disableMediaKeys)(mediaElement)];
+                case 2:
+                    _a.sent();
+                    return [3 /*break*/, 4];
+                case 3:
+                    (0, attach_media_keys_1.disableMediaKeys)(mediaElement).catch(noop_1.default);
+                    _a.label = 4;
+                case 4: return [2 /*return*/, mediaKeysInfo];
             }
         });
     });

package/dist/commonjs/core/decrypt/types.d.ts

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import Manifest, { Adaptation, Period, Representation } from "../../manifest";
+import { IAdaptationMetadata, IManifestMetadata, IPeriodMetadata, IRepresentationMetadata } from "../../manifest";
 import { IPlayerError } from "../../public_types";
 import InitDataValuesContainer from "./utils/init_data_values_container";
 import LoadedSessionsStore from "./utils/loaded_sessions_store";
@@ -38,6 +38,12 @@ export interface IContentDecryptorEvent {
      * ContentDecryptorState type.
      */
     stateChange: ContentDecryptorState;
+    blackListProtectionData: IProcessedProtectionData;
+    keyIdsCompatibilityUpdate: {
+        whitelistedKeyIds: Uint8Array[];
+        blacklistedKeyIds: Uint8Array[];
+        delistedKeyIds: Uint8Array[];
+    };
 }
 /** Enumeration of the various "state" the `ContentDecryptor` can be in. */
 export declare enum ContentDecryptorState {
@@ -164,13 +170,13 @@ export interface IContentProtection {
 /** Content linked to protection data. */
 export interface IContent {
     /** Manifest object associated to the protection data. */
-    manifest: Manifest;
+    manifest: IManifestMetadata;
     /** Period object associated to the protection data. */
-    period: Period;
+    period: IPeriodMetadata;
     /** Adaptation object associated to the protection data. */
-    adaptation: Adaptation;
+    adaptation: IAdaptationMetadata;
     /** Representation object associated to the protection data. */
-    representation: Representation;
+    representation: IRepresentationMetadata;
 }
 /** Stores helping to create and retrieve MediaKeySessions. */
 export interface IMediaKeySessionStores {

package/dist/commonjs/core/decrypt/utils/check_key_statuses.js

@@ -60,7 +60,7 @@ exports.DecommissionedSessionError = void 0;
 var get_uuid_kid_from_keystatus_kid_1 = require("../../../compat/eme/get_uuid_kid_from_keystatus_kid");
 var errors_1 = require("../../../errors");
 var log_1 = require("../../../log");
-var assert_unreachable_1 = require("../../../utils/assert_unreachable");
+var assert_1 = require("../../../utils/assert");
 var string_parsing_1 = require("../../../utils/string_parsing");
 /**
  * Error thrown when the MediaKeySession has to be closed due to a trigger
@@ -138,7 +138,7 @@ function checkKeyStatuses(session, options, keySystem) {
                         }
                         else {
                             // Compile-time check throwing when not all possible cases are handled
-                            (0, assert_unreachable_1.default)(onKeyExpiration);
+                            (0, assert_1.assertUnreachable)(onKeyExpiration);
                         }
                         break;
                 }
@@ -163,7 +163,7 @@ function checkKeyStatuses(session, options, keySystem) {
                         // Weirdly enough, TypeScript is not checking properly
                         // `case undefined` (bug?)
                         if (onKeyInternalError !== undefined) {
-                            (0, assert_unreachable_1.default)(onKeyInternalError);
+                            (0, assert_1.assertUnreachable)(onKeyInternalError);
                         }
                         else {
                             throw error;
@@ -188,7 +188,7 @@ function checkKeyStatuses(session, options, keySystem) {
                         // Weirdly enough, TypeScript is not checking properly
                         // `case undefined` (bug?)
                         if (onKeyOutputRestricted !== undefined) {
-                            (0, assert_unreachable_1.default)(onKeyOutputRestricted);
+                            (0, assert_1.assertUnreachable)(onKeyOutputRestricted);
                         }
                         else {
                             throw error;

package/dist/commonjs/core/fetchers/segment/initialization_segment_cache.d.ts

@@ -0,0 +1,42 @@
+/**
+ * Copyright 2015 CANAL+ Group
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { ISegment, Representation } from "../../../manifest";
+/**
+ * Caching object used to cache initialization segments.
+ * This allow to have a faster representation switch and faster seeking.
+ * @class InitializationSegmentCache
+ */
+declare class InitializationSegmentCache<T> {
+    private _cache;
+    constructor();
+    /**
+     * @param {Object} obj
+     * @param {*} response
+     */
+    add({ representation, segment }: {
+        representation: Representation;
+        segment: ISegment;
+    }, response: T): void;
+    /**
+     * @param {Object} obj
+     * @returns {*} response
+     */
+    get({ representation, segment }: {
+        representation: Representation;
+        segment: ISegment;
+    }): T | null;
+}
+export default InitializationSegmentCache;

package/dist/commonjs/core/fetchers/segment/segment_fetcher.js

@@ -58,13 +58,13 @@ var log_1 = require("../../../log");
 var manifest_1 = require("../../../manifest");
 var array_includes_1 = require("../../../utils/array_includes");
 var id_generator_1 = require("../../../utils/id_generator");
-var initialization_segment_cache_1 = require("../../../utils/initialization_segment_cache");
 var is_null_or_undefined_1 = require("../../../utils/is_null_or_undefined");
 var monotonic_timestamp_1 = require("../../../utils/monotonic_timestamp");
 var object_assign_1 = require("../../../utils/object_assign");
 var task_canceller_1 = require("../../../utils/task_canceller");
 var error_selector_1 = require("../utils/error_selector");
 var schedule_request_1 = require("../utils/schedule_request");
+var initialization_segment_cache_1 = require("./initialization_segment_cache");
 /** Allows to generate a unique identifies for each request. */
 var generateRequestID = (0, id_generator_1.default)();
 /**
@@ -211,7 +211,7 @@ function createSegmentFetcher(bufferType, pipeline, cdnPrioritizer, lifecycleCal
                             periodStart: period.start,
                             periodEnd: period.end,
                             mimeType: representation.mimeType,
-                            codecs: representation.codec,
+                            codecs: representation.codecs[0],
                             manifestPublishTime: manifest.publishTime };
                         loaderCallbacks = {
                             /**

package/dist/commonjs/core/fetchers/utils/error_selector.js

@@ -16,6 +16,7 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 var errors_1 = require("../../../errors");
+var request_1 = require("../../../utils/request");
 /**
  * Generate a new error from the infos given.
  * @param {string} code
@@ -23,7 +24,7 @@ var errors_1 = require("../../../errors");
  * @returns {Error}
  */
 function errorSelector(error) {
-    if (error instanceof errors_1.RequestError) {
+    if (error instanceof request_1.RequestError) {
         return new errors_1.NetworkError("PIPELINE_LOAD_ERROR", error);
     }
     return (0, errors_1.formatError)(error, {

package/dist/commonjs/core/fetchers/utils/schedule_request.js

@@ -58,6 +58,7 @@ var cancellable_sleep_1 = require("../../../utils/cancellable_sleep");
 var get_fuzzed_delay_1 = require("../../../utils/get_fuzzed_delay");
 var monotonic_timestamp_1 = require("../../../utils/monotonic_timestamp");
 var noop_1 = require("../../../utils/noop");
+var request_1 = require("../../../utils/request");
 var task_canceller_1 = require("../../../utils/task_canceller");
 /**
  * Called on a loader error.
@@ -72,7 +73,7 @@ var task_canceller_1 = require("../../../utils/task_canceller");
  * @returns {Boolean} - If true, the request can be retried.
  */
 function shouldRetry(error) {
-    if (error instanceof errors_1.RequestError) {
+    if (error instanceof request_1.RequestError) {
         if (error.type === errors_1.NetworkErrorTypes.ERROR_HTTP_CODE) {
             return error.status >= 500 ||
                 error.status === 404 ||