rx-player 3.28.0-dev.2022061700 → 3.28.0-dev.2022062000

package/dist/rx-player.js

@@ -9919,23 +9919,9 @@ var ContentDecryptor = /*#__PURE__*/function (_EventEmitter) {
                       return;
                   }
 
-                  var linkedKeys;
-
-                  if (sessionInfo.source === "created-session"
+                  var linkedKeys = getKeyIdsLinkedToSession(initializationData, sessionInfo.record, options.singleLicensePer, sessionInfo.source === "created-session"
                   /* MediaKeySessionLoadingType.Created */
-                  ) {
-                    // When the license has been fetched, there might be implicit key ids
-                    // linked to the session depending on the `singleLicensePer` option.
-                    linkedKeys = getFetchedLicenseKeysInfo(initializationData, options.singleLicensePer, evt.value.whitelistedKeyIds, evt.value.blacklistedKeyIDs);
-                  } else {
-                    // When the MediaKeySession is just a cached/persisted one, we don't
-                    // have any concept of "implicit key id".
-                    linkedKeys = {
-                      whitelisted: evt.value.whitelistedKeyIds,
-                      blacklisted: evt.value.blacklistedKeyIDs
-                    };
-                  }
-
+                  , evt.value.whitelistedKeyIds, evt.value.blacklistedKeyIDs);
                   sessionInfo.record.associateKeyIds(linkedKeys.whitelisted);
                   sessionInfo.record.associateKeyIds(linkedKeys.blacklisted);
                   sessionInfo.keyStatuses = {
@@ -10336,22 +10322,44 @@ var ContentDecryptorState;
   ContentDecryptorState[ContentDecryptorState["Disposed"] = 4] = "Disposed";
 })(ContentDecryptorState || (ContentDecryptorState = {}));
 /**
- * Returns information on all keys - explicit or implicit - that are linked to
- * a loaded license.
+ * Returns set of all usable and unusable keys - explicit or implicit - that are
+ * linked to a `MediaKeySession`.
  *
  * In the RxPlayer, there is a concept of "explicit" key ids, which are key ids
  * found in a license whose status can be known through the `keyStatuses`
  * property from a `MediaKeySession`, and of "implicit" key ids, which are key
  * ids which were expected to be in a fetched license, but apparently weren't.
- * @param {Object} initializationData
- * @param {string|undefined} singleLicensePer
- * @param {Array.<Uint8Array>} usableKeyIds
- * @param {Array.<Uint8Array>} unusableKeyIds
- * @returns {Object}
+ *
+ * @param {Object} initializationData - Initialization data object used to make
+ * the request for the current license.
+ * @param {Object} keySessionRecord - The `KeySessionRecord` associated with the
+ * session that has been loaded. It might give supplementary information on
+ * keys implicitly linked to the license.
+ * @param {string|undefined} singleLicensePer - Setting allowing to indicate the
+ * scope a given license should have.
+ * @param {boolean} isCurrentLicense - If `true` the license has been fetched
+ * especially for the current content.
+ *
+ * Knowing this allows to determine that if decryption keys that should have
+ * been referenced in the fetched license (according to the `singleLicensePer`
+ * setting) are missing, then the keys surely must have been voluntarly
+ * removed from the license.
+ *
+ * If it is however set to `false`, it means that the license is an older
+ * license that might have been linked to another content, thus we cannot make
+ * that assumption.
+ * @param {Array.<Uint8Array>} usableKeyIds - Key ids that are present in the
+ * license and can be used.
+ * @param {Array.<Uint8Array>} unusableKeyIds - Key ids that are present in the
+ * license yet cannot be used.
+ * @returns {Object} - Returns an object with the following properties:
+ *   - `whitelisted`: Array of key ids for keys that are known to be usable
+ *   - `blacklisted`: Array of key ids for keys that are considered unusable.
+ *     The qualities linked to those keys should not be played.
  */
 
 
-function getFetchedLicenseKeysInfo(initializationData, singleLicensePer, usableKeyIds, unusableKeyIds) {
+function getKeyIdsLinkedToSession(initializationData, keySessionRecord, singleLicensePer, isCurrentLicense, usableKeyIds, unusableKeyIds) {
   var _a;
   /**
    * Every key id associated with the MediaKeySession, starting with
@@ -10359,7 +10367,28 @@ function getFetchedLicenseKeysInfo(initializationData, singleLicensePer, usableK
    */
 
 
-  var associatedKeyIds = [].concat(usableKeyIds, unusableKeyIds);
+  var associatedKeyIds = [].concat(usableKeyIds, unusableKeyIds); // Add all key ids associated to the `KeySessionRecord` yet not in
+  // `usableKeyIds` nor in `unusableKeyIds`
+
+  var allKnownKeyIds = keySessionRecord.getAssociatedKeyIds();
+
+  var _loop3 = function _loop3() {
+    var kid = _step3.value;
+
+    if (!associatedKeyIds.some(function (ak) {
+      return areKeyIdsEqual(ak, kid);
+    })) {
+      if (log/* default.hasLevel */.Z.hasLevel("DEBUG")) {
+        log/* default.debug */.Z.debug("DRM: KeySessionRecord's key missing in the license, blacklisting it", (0,string_parsing/* bytesToHex */.ci)(kid));
+      }
+
+      associatedKeyIds.push(kid);
+    }
+  };
+
+  for (var _iterator3 = content_decryptor_createForOfIteratorHelperLoose(allKnownKeyIds), _step3; !(_step3 = _iterator3()).done;) {
+    _loop3();
+  }
 
   if (singleLicensePer !== undefined && singleLicensePer !== "init-data") {
     // We want to add the current key ids in the blacklist if it is
@@ -10386,18 +10415,24 @@ function getFetchedLicenseKeysInfo(initializationData, singleLicensePer, usableK
       });
 
       if (missingKeyIds.length > 0) {
+        if (log/* default.hasLevel */.Z.hasLevel("DEBUG")) {
+          log/* default.debug */.Z.debug("DRM: init data keys missing in the license, blacklisting them", missingKeyIds.map(function (m) {
+            return (0,string_parsing/* bytesToHex */.ci)(m);
+          }).join(", "));
+        }
+
         associatedKeyIds.push.apply(associatedKeyIds, missingKeyIds);
       }
     }
 
-    if (content !== undefined) {
+    if (isCurrentLicense && content !== undefined) {
       if (singleLicensePer === "content") {
         // Put it in a Set to automatically filter out duplicates (by ref)
         var contentKeys = new Set();
         var manifest = content.manifest;
 
-        for (var _iterator3 = content_decryptor_createForOfIteratorHelperLoose(manifest.periods), _step3; !(_step3 = _iterator3()).done;) {
-          var period = _step3.value;
+        for (var _iterator4 = content_decryptor_createForOfIteratorHelperLoose(manifest.periods), _step4; !(_step4 = _iterator4()).done;) {
+          var period = _step4.value;
           addKeyIdsFromPeriod(contentKeys, period);
         }
 
@@ -10405,8 +10440,8 @@ function getFetchedLicenseKeysInfo(initializationData, singleLicensePer, usableK
       } else if (singleLicensePer === "periods") {
         var _manifest = content.manifest;
 
-        for (var _iterator4 = content_decryptor_createForOfIteratorHelperLoose(_manifest.periods), _step4; !(_step4 = _iterator4()).done;) {
-          var _period = _step4.value;
+        for (var _iterator5 = content_decryptor_createForOfIteratorHelperLoose(_manifest.periods), _step5; !(_step5 = _iterator5()).done;) {
+          var _period = _step5.value;
           var periodKeys = new Set();
           addKeyIdsFromPeriod(periodKeys, _period);
 
@@ -10449,7 +10484,7 @@ function getFetchedLicenseKeysInfo(initializationData, singleLicensePer, usableK
 function mergeKeyIdSetIntoArray(set, arr) {
   var setArr = Array.from(set.values());
 
-  var _loop3 = function _loop3() {
+  var _loop4 = function _loop4() {
     var kid = _setArr[_i3];
     var isFound = arr.some(function (k) {
       return areKeyIdsEqual(k, kid);
@@ -10461,20 +10496,20 @@ function mergeKeyIdSetIntoArray(set, arr) {
   };
 
   for (var _i3 = 0, _setArr = setArr; _i3 < _setArr.length; _i3++) {
-    _loop3();
+    _loop4();
   }
 }
 
 function addKeyIdsFromPeriod(set, period) {
-  for (var _iterator5 = content_decryptor_createForOfIteratorHelperLoose(period.getAdaptations()), _step5; !(_step5 = _iterator5()).done;) {
-    var adaptation = _step5.value;
+  for (var _iterator6 = content_decryptor_createForOfIteratorHelperLoose(period.getAdaptations()), _step6; !(_step6 = _iterator6()).done;) {
+    var adaptation = _step6.value;
 
-    for (var _iterator6 = content_decryptor_createForOfIteratorHelperLoose(adaptation.representations), _step6; !(_step6 = _iterator6()).done;) {
-      var representation = _step6.value;
+    for (var _iterator7 = content_decryptor_createForOfIteratorHelperLoose(adaptation.representations), _step7; !(_step7 = _iterator7()).done;) {
+      var representation = _step7.value;
 
       if (representation.contentProtections !== undefined && representation.contentProtections.keyIds !== undefined) {
-        for (var _iterator7 = content_decryptor_createForOfIteratorHelperLoose(representation.contentProtections.keyIds), _step7; !(_step7 = _iterator7()).done;) {
-          var kidInf = _step7.value;
+        for (var _iterator8 = content_decryptor_createForOfIteratorHelperLoose(representation.contentProtections.keyIds), _step8; !(_step8 = _iterator8()).done;) {
+          var kidInf = _step8.value;
           set.add(kidInf.keyId);
         }
       }
@@ -41379,7 +41414,7 @@ function createSharedReference(initialValue) {
 
     /**
      * Update the value of this shared reference.
-     * @param {*}
+     * @param {*} newVal
      */
     setValue: function setValue(newVal) {
       if (isFinished) {
@@ -41408,6 +41443,11 @@ function createSharedReference(initialValue) {
         }
       }
     },
+
+    /**
+     * Update the value of this shared reference only if it changed.
+     * @param {*} newVal
+     */
     setValueIfChanged: function setValueIfChanged(newVal) {
       if (newVal !== value) {
         this.setValue(newVal);
@@ -41525,6 +41565,18 @@ function createSharedReference(initialValue) {
     }
   };
 }
+/**
+ * Create a new `ISharedReference` based on another one by mapping over its
+ * referenced value each time it is updated.
+ * @param {Object} originalRef - The Original `ISharedReference` you wish to map
+ * over.
+ * @param {Function} mappingFn - The mapping function which will receives
+ * `originalRef`'s value and outputs this new reference's value.
+ * @param {Object | undefined} [cancellationSignal] - Optionally, a
+ * `CancellationSignal` which will finish that reference when it emits.
+ * @returns {Object} - The new, mapped, reference.
+ */
+
 function createMappedReference(originalRef, mappingFn, cancellationSignal) {
   var newRef = createSharedReference(mappingFn(originalRef.getValue()));
   originalRef.onUpdate(function mapOriginalReference(x) {
@@ -50557,8 +50609,10 @@ function selectOptimalRepresentation(representations, optimalBitrate, minBitrate
 /**
  * Select the most adapted Representation according to the network and buffer
  * metrics it receives.
+ *
  * @param {Object} options - Initial configuration (see type definition)
- * @returns {Object} - Interface allowing to select a Representation
+ * @returns {Object} - Interface allowing to select a Representation.
+ * @see IRepresentationEstimator
  */
 
 function createAdaptiveRepresentationSelector(options) {
@@ -50576,18 +50630,17 @@ function createAdaptiveRepresentationSelector(options) {
   /**
    * Returns Object emitting Representation estimates as well as callbacks
    * allowing to helping it produce them.
+   *
+   * @see IRepresentationEstimator
    * @param {Object} context
-   * @param {Object} currentRepresentation - Reference emitting the
-   * Representation currently loaded.
-   * @param {Object} representations - Reference emitting the list of available
-   * Representations to choose from.
-   * @param {Object} playbackObserver - Emits regularly playback conditions
-   * @param {Object} cancellationSignal - After this `CancellationSignal` emits,
-   * estimates will stop to be emitted.
+   * @param {Object} currentRepresentation
+   * @param {Object} representations
+   * @param {Object} playbackObserver
+   * @param {Object} stopAllEstimates
    * @returns {Array.<Object>}
    */
 
-  return function getEstimates(context, currentRepresentation, representations, playbackObserver, cancellationSignal) {
+  return function getEstimates(context, currentRepresentation, representations, playbackObserver, stopAllEstimates) {
     var type = context.adaptation.type;
 
     var bandwidthEstimator = _getBandwidthEstimator(type);
@@ -50612,7 +50665,7 @@ function createAdaptiveRepresentationSelector(options) {
       playbackObserver: playbackObserver,
       representations: representations,
       lowLatencyMode: lowLatencyMode
-    }, cancellationSignal);
+    }, stopAllEstimates);
   };
   /**
    * Returns interface allowing to estimate network throughtput for a given type.
@@ -50649,11 +50702,11 @@ function createAdaptiveRepresentationSelector(options) {
  *     events to help it doing those estimates.
  *
  * @param {Object} args
- * @param {Object} cancellationSignal
+ * @param {Object} stopAllEstimates
  * @returns {Array.<Object>}
  */
 
-function getEstimateReference(_ref, cancellationSignal) {
+function getEstimateReference(_ref, stopAllEstimates) {
   var bandwidthEstimator = _ref.bandwidthEstimator,
       context = _ref.context,
       currentRepresentation = _ref.currentRepresentation,
@@ -50684,19 +50737,21 @@ function getEstimateReference(_ref, cancellationSignal) {
    * configuration and to cancel them altogether.
    */
 
-  var currentEstimatesCanceller = new task_canceller/* default */.ZP();
-  cancellationSignal.register(function () {
-    currentEstimatesCanceller.cancel();
+  var currentEstimatesCanceller = new task_canceller/* default */.ZP({
+    cancelOn: stopAllEstimates
   }); // Create `ISharedReference` on which estimates will be emitted.
 
   var estimateRef = createEstimateReference(manualBitrate.getValue(), representationsRef.getValue(), currentEstimatesCanceller.signal);
   manualBitrate.onUpdate(restartEstimatesProductionFromCurrentConditions, {
-    clearSignal: currentEstimatesCanceller.signal
+    clearSignal: stopAllEstimates
   });
   representationsRef.onUpdate(restartEstimatesProductionFromCurrentConditions, {
-    clearSignal: currentEstimatesCanceller.signal
+    clearSignal: stopAllEstimates
   });
-  return [estimateRef, callbacks];
+  return {
+    estimates: estimateRef,
+    callbacks: callbacks
+  };
 
   function createEstimateReference(manualBitrateVal, representations, innerCancellationSignal) {
     if (manualBitrateVal >= 0) {
@@ -50942,7 +50997,9 @@ function getEstimateReference(_ref, cancellationSignal) {
     var manualBitrateVal = manualBitrate.getValue();
     var representations = representationsRef.getValue();
     currentEstimatesCanceller.cancel();
-    currentEstimatesCanceller = new task_canceller/* default */.ZP();
+    currentEstimatesCanceller = new task_canceller/* default */.ZP({
+      cancelOn: stopAllEstimates
+    });
     var newRef = createEstimateReference(manualBitrateVal, representations, currentEstimatesCanceller.signal);
     newRef.onUpdate(function onNewEstimate(newEstimate) {
       estimateRef.setValue(newEstimate);
@@ -55013,8 +55070,8 @@ function getRepresentationEstimate(content, representationEstimator, currentRepr
   var unregisterCleanUp = cancellationSignal.register(cleanUp);
 
   var _representationEstima = representationEstimator(content, currentRepresentation, representations, playbackObserver, cancellationSignal),
-      estimateRef = _representationEstima[0],
-      abrCallbacks = _representationEstima[1];
+      estimateRef = _representationEstima.estimates,
+      abrCallbacks = _representationEstima.callbacks;
 
   return {
     abrCallbacks: abrCallbacks,
@@ -61183,7 +61240,7 @@ var Player = /*#__PURE__*/function (_EventEmitter) {
     videoElement.preload = "auto";
     _this.version =
     /* PLAYER_VERSION */
-    "3.28.0-dev.2022061700";
+    "3.28.0-dev.2022062000";
     _this.log = log/* default */.Z;
     _this.state = "STOPPED";
     _this.videoElement = videoElement;
@@ -64008,7 +64065,7 @@ var Player = /*#__PURE__*/function (_EventEmitter) {
 
 Player.version =
 /* PLAYER_VERSION */
-"3.28.0-dev.2022061700";
+"3.28.0-dev.2022062000";
 /* harmony default export */ var public_api = (Player);
 ;// CONCATENATED MODULE: ./src/core/api/index.ts
 /**