rx-player 4.2.0-dev.2024100200 → 4.2.0

package/dist/rx-player.js

@@ -8349,7 +8349,12 @@
         throw cancelSignal.cancellationError;
       }
     }
-    await cleanOldLoadedSessions(loadedSessionsStore, maxSessionCacheSize);
+    await cleanOldLoadedSessions(
+      loadedSessionsStore,
+      // Account for the next session we will be creating
+      // Note that `maxSessionCacheSize < 0 has special semantic (no limit)`
+      maxSessionCacheSize <= 0 ? maxSessionCacheSize : maxSessionCacheSize - 1
+    );
     if (cancelSignal.cancellationError !== null) {
       throw cancelSignal.cancellationError;
     }
@@ -8762,6 +8767,9 @@
         const session = mediaKeys.createSession();
         const initData = generatePlayReadyInitData(DUMMY_PLAY_READY_HEADER);
         await session.generateRequest("cenc", initData);
+        session.close().catch(() => {
+          log_default.warn("DRM: Failed to close the dummy session");
+        });
       } catch (err) {
         log_default.debug("DRM: KeySystemAccess was granted but it is not usable");
         throw err;
@@ -9747,7 +9755,7 @@
     const { options, mediaKeySystemAccess, askedConfiguration, codecSupport } = evt.value;
     const currentState = media_keys_infos_store_default.getState(mediaElement);
     const persistentSessionsStore = createPersistentSessionsStorage(options);
-    if (canReuseMediaKeys() && currentState !== null && evt.type === "reuse-media-key-system-access") {
+    if (evt.value.options.reuseMediaKeys !== false && canReuseMediaKeys() && currentState !== null && evt.type === "reuse-media-key-system-access") {
       log_default.debug("DRM: Reusing already created MediaKeys");
       const { mediaKeys: mediaKeys2, loadedSessionsStore: loadedSessionsStore2 } = currentState;
       if (server_certificate_store_default.hasOne(mediaKeys2) === false || !isNullOrUndefined(options.serverCertificate) && server_certificate_store_default.has(mediaKeys2, options.serverCertificate)) {
@@ -18714,7 +18722,9 @@
         ret = resolved;
       }, noop_default);
       return {
-        syncValue: ret,
+        get syncValue() {
+          return ret;
+        },
         getValueAsAsync() {
           return val;
         }
@@ -20751,7 +20761,7 @@
      */
     constructor(settings) {
       super();
-      this._settings = settings;
+      this._initSettings = settings;
       this._initCanceller = new TaskCanceller();
       this._manifest = null;
       this._decryptionCapabilities = { status: "uninitialized", value: null };
@@ -20826,6 +20836,10 @@
     dispose() {
       this._initCanceller.cancel();
     }
+    /**
+     * Callback called when an error interrupting playback arised.
+     * @param {*} err
+     */
     _onFatalError(err) {
       if (this._initCanceller.isUsed()) {
         return;
@@ -20833,10 +20847,16 @@
       this._initCanceller.cancel();
       this.trigger("error", err);
     }
+    /**
+     * Initialize decryption mechanisms if needed and begin creating and relying
+     * on the initial `MediaSourceInterface` for this content.
+     * @param {HTMLMediaElement|null} mediaElement
+     * @returns {Promise.<Object>}
+     */
     _initializeMediaSourceAndDecryption(mediaElement) {
       const initCanceller = this._initCanceller;
       return createCancellablePromise(initCanceller.signal, (resolve) => {
-        const { keySystems } = this._settings;
+        const { keySystems } = this._initSettings;
         const { statusRef: drmInitRef, contentDecryptor } = initializeContentDecryption(
           mediaElement,
           keySystems,
@@ -20953,7 +20973,7 @@
         startAt,
         textTrackOptions,
         transport
-      } = this._settings;
+      } = this._initSettings;
       const initCanceller = this._initCanceller;
       assert(this._manifest !== null);
       let manifest;
@@ -21082,15 +21102,10 @@
         return this._onFatalError(error);
       }
       let textDisplayerInterface = null;
-      let textDisplayer = null;
-      if (this._settings.textTrackOptions.textTrackMode === "html" && features_default.htmlTextDisplayer !== null) {
-        textDisplayer = new features_default.htmlTextDisplayer(
-          mediaElement,
-          this._settings.textTrackOptions.textTrackElement
-        );
-      } else if (features_default.nativeTextDisplayer !== null) {
-        textDisplayer = new features_default.nativeTextDisplayer(mediaElement);
-      }
+      const textDisplayer = createTextDisplayer(
+        mediaElement,
+        this._initSettings.textTrackOptions
+      );
       if (textDisplayer !== null) {
         const sender = new MainThreadTextDisplayerInterface(textDisplayer);
         textDisplayerInterface = sender;
@@ -21529,6 +21544,17 @@
       }
     }
   };
+  function createTextDisplayer(mediaElement, textTrackOptions) {
+    if (textTrackOptions.textTrackMode === "html" && features_default.htmlTextDisplayer !== null) {
+      return new features_default.htmlTextDisplayer(
+        mediaElement,
+        textTrackOptions.textTrackElement
+      );
+    } else if (features_default.nativeTextDisplayer !== null) {
+      return new features_default.nativeTextDisplayer(mediaElement);
+    }
+    return null;
+  }
   function updateKeyIdsDecipherabilityOnManifest(manifest, whitelistedKeyIds, blacklistedKeyIds, delistedKeyIds) {
     manifest.updateRepresentationsDeciperability((ctx) => {
       const { representation } = ctx;
@@ -31875,20 +31901,7 @@
     reset() {
       log_default.debug("NTD: Aborting NativeTextDisplayer");
       this._removeData(0, Infinity);
-      const { _trackElement, _videoElement } = this;
-      if (_trackElement !== void 0 && _videoElement.hasChildNodes()) {
-        try {
-          _videoElement.removeChild(_trackElement);
-        } catch (_e) {
-          log_default.warn("NTD: Can't remove track element from the video");
-        }
-      }
-      const oldMode = this._track.mode;
-      this._track.mode = "disabled";
-      this._track.mode = oldMode;
-      if (this._trackElement !== void 0) {
-        this._trackElement.innerHTML = "";
-      }
+      this._clearTrackElement();
     }
     stop() {
       log_default.debug("NTD: Aborting NativeTextDisplayer");
@@ -31921,6 +31934,22 @@
       }
       this._buffered.remove(start, end);
     }
+    _clearTrackElement() {
+      const { _trackElement, _videoElement } = this;
+      if (_trackElement !== void 0 && _videoElement.hasChildNodes()) {
+        try {
+          _videoElement.removeChild(_trackElement);
+        } catch (_e) {
+          log_default.warn("NTD: Can't remove track element from the video");
+        }
+      }
+      const oldMode = this._track.mode;
+      this._track.mode = "disabled";
+      this._track.mode = oldMode;
+      if (this._trackElement !== void 0) {
+        this._trackElement.innerHTML = "";
+      }
+    }
   };
   if (define_ENVIRONMENT_default.CURRENT_ENV === define_ENVIRONMENT_default.DEV) {
     let _checkType = function(input) {
@@ -36911,7 +36940,7 @@ ${event}`
       } = parseConstructorOptions(options);
       videoElement.preload = "auto";
       this.version = /* PLAYER_VERSION */
-      "4.2.0-dev.2024100200";
+      "4.2.0";
       this.log = log_default;
       this.state = "STOPPED";
       this.videoElement = videoElement;
@@ -39452,7 +39481,7 @@ ${event}`
   _Player._priv_currentlyUsedVideoElements = /* @__PURE__ */ new WeakSet();
   var Player = _Player;
   Player.version = /* PLAYER_VERSION */
-  "4.2.0-dev.2024100200";
+  "4.2.0";
   var public_api_default = Player;
 
   // src/main_thread/api/index.ts