rx-player 4.3.0-dev.2024112900 → 4.3.0-dev.2025011000

package/dist/es2017/main_thread/decrypt/find_key_system.js

@@ -24,37 +24,67 @@ import { parseCodec } from "../../utils/are_codecs_compatible";
 import arrayIncludes from "../../utils/array_includes";
 import flatMap from "../../utils/flat_map";
 import isNullOrUndefined from "../../utils/is_null_or_undefined";
-import MediaKeysInfosStore from "./utils/media_keys_infos_store";
+import MediaKeysAttacher from "./utils/media_keys_attacher";
 /**
- * @param {Object} keySystem
- * @param {Object} askedConfiguration
- * @param {MediaKeySystemAccess} currentKeySystemAccess
- * @param {Object} currentKeySystemOptions
- * @returns {null|Object}
+ * Takes a `newConfiguration` `MediaKeySystemConfiguration`, that is intended
+ * for the creation of a `MediaKeySystemAccess`, and a `prevConfiguration`
+ * `MediaKeySystemConfiguration`, that was the one used at creation of the
+ * current `MediaKeySystemAccess`.
+ *
+ * This function will then return `true` if it determined that the new
+ * configuration is conceptually compatible with the one used before, and
+ * `false` otherwise.
+ * @param {Object} newConfiguration - New wanted `MediaKeySystemConfiguration`
+ * @param {Object} prevConfiguration - The `MediaKeySystemConfiguration` that is
+ * relied on util now.
+ * @returns {boolean} - `true` if `newConfiguration` is compatible with
+ * `prevConfiguration`.
  */
-function checkCachedMediaKeySystemAccess(keySystem, askedConfiguration, currentKeySystemAccess, currentKeySystemOptions) {
-    const mksConfiguration = currentKeySystemAccess.getConfiguration();
-    if (shouldRenewMediaKeySystemAccess() || isNullOrUndefined(mksConfiguration)) {
-        return null;
+function isNewMediaKeySystemConfigurationCompatibleWithPreviousOne(newConfiguration, prevConfiguration) {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+    if (newConfiguration.label !== prevConfiguration.label) {
+        return false;
     }
-    // TODO Do it with MediaKeySystemAccess.prototype.keySystem instead
-    if (keySystem.type !== currentKeySystemOptions.type) {
-        return null;
+    const prevDistinctiveIdentifier = (_a = prevConfiguration.distinctiveIdentifier) !== null && _a !== void 0 ? _a : "optional";
+    const newDistinctiveIdentifier = (_b = newConfiguration.distinctiveIdentifier) !== null && _b !== void 0 ? _b : "optional";
+    if (prevDistinctiveIdentifier !== newDistinctiveIdentifier) {
+        return false;
     }
-    if ((!isNullOrUndefined(keySystem.persistentLicenseConfig) ||
-        keySystem.persistentState === "required") &&
-        mksConfiguration.persistentState !== "required") {
-        return null;
+    const prevPersistentState = (_c = prevConfiguration.persistentState) !== null && _c !== void 0 ? _c : "optional";
+    const newPersistentState = (_d = newConfiguration.persistentState) !== null && _d !== void 0 ? _d : "optional";
+    if (prevPersistentState !== newPersistentState) {
+        return false;
     }
-    if (keySystem.distinctiveIdentifier === "required" &&
-        mksConfiguration.distinctiveIdentifier !== "required") {
-        return null;
+    const prevInitDataTypes = (_e = prevConfiguration.initDataTypes) !== null && _e !== void 0 ? _e : [];
+    const newInitDataTypes = (_f = newConfiguration.initDataTypes) !== null && _f !== void 0 ? _f : [];
+    if (!isArraySubsetOf(newInitDataTypes, prevInitDataTypes)) {
+        return false;
     }
-    return {
-        keySystemOptions: keySystem,
-        keySystemAccess: currentKeySystemAccess,
-        askedConfiguration,
-    };
+    const prevSessionTypes = (_g = prevConfiguration.sessionTypes) !== null && _g !== void 0 ? _g : [];
+    const newSessionTypes = (_h = newConfiguration.sessionTypes) !== null && _h !== void 0 ? _h : [];
+    if (!isArraySubsetOf(newSessionTypes, prevSessionTypes)) {
+        return false;
+    }
+    for (const prop of ["audioCapabilities", "videoCapabilities"]) {
+        const newCapabilities = (_j = newConfiguration[prop]) !== null && _j !== void 0 ? _j : [];
+        const prevCapabilities = (_k = prevConfiguration[prop]) !== null && _k !== void 0 ? _k : [];
+        const wasFound = newCapabilities.every((n) => {
+            var _a, _b, _c, _d, _e, _f;
+            for (let i = 0; i < prevCapabilities.length; i++) {
+                const prevCap = prevCapabilities[i];
+                if (((_a = prevCap.robustness) !== null && _a !== void 0 ? _a : "") === ((_b = n.robustness) !== null && _b !== void 0 ? _b : "") ||
+                    ((_c = prevCap.encryptionScheme) !== null && _c !== void 0 ? _c : null) === ((_d = n.encryptionScheme) !== null && _d !== void 0 ? _d : null) ||
+                    ((_e = prevCap.robustness) !== null && _e !== void 0 ? _e : "") === ((_f = n.robustness) !== null && _f !== void 0 ? _f : "")) {
+                    return true;
+                }
+            }
+            return false;
+        });
+        if (!wasFound) {
+            return false;
+        }
+    }
+    return true;
 }
 /**
  * Find key system canonical name from key system type.
@@ -79,12 +109,22 @@ function findKeySystemCanonicalName(ksType) {
  */
 function buildKeySystemConfigurations(keySystemTypeInfo) {
     const { keyName, keyType, keySystemOptions: keySystem } = keySystemTypeInfo;
-    const sessionTypes = ["temporary"];
+    let sessionTypes;
     let persistentState = "optional";
     let distinctiveIdentifier = "optional";
-    if (!isNullOrUndefined(keySystem.persistentLicenseConfig)) {
+    if (Array.isArray(keySystem.wantedSessionTypes)) {
+        sessionTypes = keySystem.wantedSessionTypes;
+        if (arrayIncludes(keySystem.wantedSessionTypes, "persistent-license") &&
+            !isNullOrUndefined(keySystem.persistentLicenseConfig)) {
+            persistentState = "required";
+        }
+    }
+    else if (!isNullOrUndefined(keySystem.persistentLicenseConfig)) {
         persistentState = "required";
-        sessionTypes.push("persistent-license");
+        sessionTypes = ["persistent-license"];
+    }
+    else {
+        sessionTypes = ["temporary"];
     }
     if (!isNullOrUndefined(keySystem.persistentState)) {
         persistentState = keySystem.persistentState;
@@ -259,14 +299,7 @@ export function extractCodecSupportListFromConfiguration(initialConfiguration, m
  */
 export default function getMediaKeySystemAccess(mediaElement, keySystemsConfigs, cancelSignal) {
     log.info("DRM: Searching for compatible MediaKeySystemAccess");
-    /**
-     * Array of set keySystems for this content.
-     * Each item of this array is an object containing the following keys:
-     *   - keyName {string}: keySystem canonical name (e.g. "widevine")
-     *   - keyType {string}: keySystem type (e.g. "com.widevine.alpha")
-     *   - keySystem {Object}: the original keySystem object
-     * @type {Array.<Object>}
-     */
+    /** Array of set keySystems for this content. */
     const keySystemsType = keySystemsConfigs.reduce((arr, keySystemOptions) => {
         const { EME_KEY_SYSTEMS } = config.getCurrent();
         const managedRDNs = EME_KEY_SYSTEMS[keySystemOptions.type];
@@ -306,33 +339,32 @@ export default function getMediaKeySystemAccess(mediaElement, keySystemsConfigs,
             throw new Error("requestMediaKeySystemAccess is not implemented in your browser.");
         }
         const chosenType = keySystemsType[index];
-        const currentState = MediaKeysInfosStore.getState(mediaElement);
-        if (currentState !== null) {
-            if (eme.implementation === currentState.emeImplementation.implementation) {
-                // Fast way to find a compatible keySystem if the currently loaded
-                // one as exactly the same compatibility options.
-                const cachedKeySystemAccess = checkCachedMediaKeySystemAccess(chosenType.keySystemOptions, currentState.askedConfiguration, currentState.mediaKeySystemAccess, currentState.keySystemOptions);
-                if (cachedKeySystemAccess !== null) {
-                    log.info("DRM: Found cached compatible keySystem");
-                    return Promise.resolve({
-                        type: "reuse-media-key-system-access",
-                        value: {
-                            mediaKeySystemAccess: cachedKeySystemAccess.keySystemAccess,
-                            askedConfiguration: cachedKeySystemAccess.askedConfiguration,
-                            options: cachedKeySystemAccess.keySystemOptions,
-                            codecSupport: extractCodecSupportListFromConfiguration(cachedKeySystemAccess.askedConfiguration, cachedKeySystemAccess.keySystemAccess.getConfiguration()),
-                        },
-                    });
-                }
-            }
-        }
         const { keyType, keySystemOptions } = chosenType;
         const keySystemConfigurations = buildKeySystemConfigurations(chosenType);
         log.debug(`DRM: Request keysystem access ${keyType},` +
             `${index + 1} of ${keySystemsType.length}`);
         let keySystemAccess;
+        const currentState = await MediaKeysAttacher.getAttachedMediaKeysState(mediaElement);
         for (let configIdx = 0; configIdx < keySystemConfigurations.length; configIdx++) {
             const keySystemConfiguration = keySystemConfigurations[configIdx];
+            // Check if the current `MediaKeySystemAccess` created cannot be reused here
+            if (currentState !== null &&
+                !shouldRenewMediaKeySystemAccess() &&
+                // TODO: Do it with MediaKeySystemAccess.prototype.keySystem instead?
+                keyType === currentState.mediaKeySystemAccess.keySystem &&
+                eme.implementation === currentState.emeImplementation.implementation &&
+                isNewMediaKeySystemConfigurationCompatibleWithPreviousOne(keySystemConfiguration, currentState.askedConfiguration)) {
+                log.info("DRM: Found cached compatible keySystem");
+                return Promise.resolve({
+                    type: "reuse-media-key-system-access",
+                    value: {
+                        mediaKeySystemAccess: currentState.mediaKeySystemAccess,
+                        askedConfiguration: currentState.askedConfiguration,
+                        options: keySystemOptions,
+                        codecSupport: extractCodecSupportListFromConfiguration(currentState.askedConfiguration, currentState.mediaKeySystemAccess.getConfiguration()),
+                    },
+                });
+            }
             try {
                 keySystemAccess = await testKeySystem(keyType, [keySystemConfiguration]);
                 log.info("DRM: Found compatible keysystem", keyType, index + 1);
@@ -382,3 +414,17 @@ export async function testKeySystem(keyType, keySystemConfigurations) {
     }
     return keySystemAccess;
 }
+/**
+ * Returns `true` if `arr1`'s values are entirely contained in `arr2`.
+ * @param {string} arr1
+ * @param {string} arr2
+ * @return {boolean}
+ */
+function isArraySubsetOf(arr1, arr2) {
+    for (let i = 0; i < arr1.length; i++) {
+        if (!arrayIncludes(arr2, arr1[i])) {
+            return false;
+        }
+    }
+    return true;
+}

package/dist/es2017/main_thread/decrypt/get_key_system_configuration.js

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import MediaKeysInfosStore from "./utils/media_keys_infos_store";
+import MediaKeysAttacher from "./utils/media_keys_attacher";
 /**
  * Returns the name of the current key system used as well as its configuration,
  * as reported by the `MediaKeySystemAccess` itself.
@@ -21,7 +21,7 @@ import MediaKeysInfosStore from "./utils/media_keys_infos_store";
  * @returns {Array|null}
  */
 export default function getKeySystemConfiguration(mediaElement) {
-    const currentState = MediaKeysInfosStore.getState(mediaElement);
+    const currentState = MediaKeysAttacher.getAwaitedState(mediaElement);
     if (currentState === null) {
         return null;
     }

package/dist/es2017/main_thread/decrypt/get_media_keys.js

@@ -19,7 +19,7 @@ import log from "../../log";
 import isNullOrUndefined from "../../utils/is_null_or_undefined";
 import getMediaKeySystemAccess from "./find_key_system";
 import LoadedSessionsStore from "./utils/loaded_sessions_store";
-import MediaKeysInfosStore from "./utils/media_keys_infos_store";
+import MediaKeysAttacher from "./utils/media_keys_attacher";
 import PersistentSessionsStore from "./utils/persistent_sessions_store";
 import ServerCertificateStore from "./utils/server_certificate_store";
 /**
@@ -54,7 +54,7 @@ export default async function getMediaKeysInfos(mediaElement, keySystemsConfigs,
         throw cancelSignal.cancellationError;
     }
     const { options, mediaKeySystemAccess, askedConfiguration, codecSupport } = evt.value;
-    const currentState = MediaKeysInfosStore.getState(mediaElement);
+    const currentState = await MediaKeysAttacher.getAttachedMediaKeysState(mediaElement);
     const persistentSessionsStore = createPersistentSessionsStorage(options);
     if (evt.value.options.reuseMediaKeys !== false &&
         canReuseMediaKeys() &&

package/dist/es2017/main_thread/decrypt/init_media_keys.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"init_media_keys.d.ts","sourceRoot":"","sources":["../../../../src/main_thread/decrypt/init_media_keys.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,0CAA0C,CAAC;AAE9E,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAC3D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAErE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAGxD;;;;;;GAMG;AACH,wBAA8B,aAAa,CACzC,YAAY,EAAE,aAAa,EAC3B,iBAAiB,EAAE,gBAAgB,EAAE,EACrC,YAAY,EAAE,kBAAkB,GAC/B,OAAO,CAAC,eAAe,CAAC,CAkB1B"}
+{"version":3,"file":"init_media_keys.d.ts","sourceRoot":"","sources":["../../../../src/main_thread/decrypt/init_media_keys.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,0CAA0C,CAAC;AAE9E,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAC3D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AACrE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAIxD;;;;;;GAMG;AACH,wBAA8B,aAAa,CACzC,YAAY,EAAE,aAAa,EAC3B,iBAAiB,EAAE,gBAAgB,EAAE,EACrC,YAAY,EAAE,kBAAkB,GAC/B,OAAO,CAAC,eAAe,CAAC,CAkB1B"}

package/dist/es2017/main_thread/decrypt/init_media_keys.js

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 import log from "../../log";
-import { disableMediaKeys } from "./attach_media_keys";
 import getMediaKeysInfos from "./get_media_keys";
+import MediaKeysAttacher from "./utils/media_keys_attacher";
 /**
  * Get media keys infos from key system configs then attach media keys to media element.
  * @param {HTMLMediaElement} mediaElement
@@ -31,7 +31,7 @@ export default async function initMediaKeys(mediaElement, keySystemsConfigs, can
         mediaKeys !== mediaElement.mediaKeys;
     if (shouldDisableOldMediaKeys) {
         log.debug("DRM: Disabling old MediaKeys");
-        await disableMediaKeys(mediaElement);
+        await MediaKeysAttacher.clearMediaKeys(mediaElement);
     }
     return mediaKeysInfo;
 }

package/dist/{commonjs/main_thread/decrypt/utils/media_keys_infos_store.d.ts → es2017/main_thread/decrypt/utils/media_keys_attacher.d.ts}

@@ -42,22 +42,44 @@ export interface IMediaElementMediaKeysInfos {
 }
 declare const _default: {
     /**
-     * Update MediaKeys infos set on a HMTLMediaElement
+     * Attach new MediaKeys infos set on a HMTLMediaElement.
      * @param {HTMLMediaElement} mediaElement
-     * @param {Object} state
+     * @param {Object} mediaKeysInfo
+     * @returns {Promise}
      */
-    setState(mediaElement: IMediaElement, state: IMediaElementMediaKeysInfos | null): void;
+    attach(mediaElement: IMediaElement, mediaKeysInfo: IMediaElementMediaKeysInfos): Promise<void>;
     /**
-     * Get MediaKeys infos currently set on a HMTLMediaElement
+     * Get MediaKeys information expected to be linked to the given
+     * `HTMLMediaElement`.
+     *
+     * Unlike `getAttachedMediaKeysState`, this method is synchronous and will
+     * also return the expected state when `MediaKeys` attachment is still
+     * pending and thus when that state is not truly applied (and where it
+     * might fail before being applied).
+     *
+     * As such, only call this method if you want the currently expected state,
+     * not the actual one.
      * @param {HTMLMediaElement} mediaElement
-     * @returns {Object}
+     * @returns {Array}
      */
-    getState(mediaElement: IMediaElement): IMediaElementMediaKeysInfos | null;
+    getAwaitedState(mediaElement: IMediaElement): IMediaElementMediaKeysInfos | null;
     /**
-     * Remove MediaKeys infos currently set on a HMTLMediaElement
+     * Get MediaKeys information set on a HMTLMediaElement.
+     *
+     * This method is asynchronous because that state may still be in a process
+     * of being attached to the `HTMLMediaElement` (and the state we're
+     * currently setting may not work out).
      * @param {HTMLMediaElement} mediaElement
+     * @returns {Object|null}
      */
-    clearState(mediaElement: IMediaElement): void;
+    getAttachedMediaKeysState(mediaElement: IMediaElement): Promise<IMediaElementMediaKeysInfos | null>;
+    /**
+     * Remove MediaKeys currently set on a HMTLMediaElement and update state
+     * accordingly.
+     * @param {HTMLMediaElement} mediaElement
+     * @returns {Promise}
+     */
+    clearMediaKeys(mediaElement: IMediaElement): Promise<void>;
 };
 export default _default;
-//# sourceMappingURL=media_keys_infos_store.d.ts.map
+//# sourceMappingURL=media_keys_attacher.d.ts.map

package/dist/es2017/main_thread/decrypt/utils/media_keys_attacher.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"media_keys_attacher.d.ts","sourceRoot":"","sources":["../../../../../src/main_thread/decrypt/utils/media_keys_attacher.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6CAA6C,CAAC;AACjF,OAAO,KAAK,EACV,gBAAgB,EAChB,2BAA2B,EAC3B,qBAAqB,EACtB,MAAM,qBAAqB,CAAC;AAI7B,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAE9D,OAAO,KAAK,mBAAmB,MAAM,yBAAyB,CAAC;AAE/D,6EAA6E;AAC7E,MAAM,WAAW,2BAA2B;IAC1C,iBAAiB,EAAE,qBAAqB,CAAC;IAEzC,6DAA6D;IAC7D,gBAAgB,EAAE,gBAAgB,CAAC;IAEnC;;;OAGG;IACH,kBAAkB,EAAE,2BAA2B,CAAC;IAEhD;;;OAGG;IACH,oBAAoB,EAAE,2BAA2B,GAAG,oBAAoB,CAAC;IAEzE,8DAA8D;IAC9D,SAAS,EAAE,SAAS,GAAG,gBAAgB,CAAC;IAExC;;;OAGG;IACH,mBAAmB,EAAE,mBAAmB,CAAC;CAC1C;;IA6BC;;;;;OAKG;yBAEa,aAAa,iBACZ,2BAA2B,GACzC,OAAO,CAAC,IAAI,CAAC;IAuBhB;;;;;;;;;;;;;OAaG;kCAC2B,aAAa,GAAG,2BAA2B,GAAG,IAAI;IAKhF;;;;;;;;OAQG;4CAEa,aAAa,GAC1B,OAAO,CAAC,2BAA2B,GAAG,IAAI,CAAC;IAY9C;;;;;OAKG;iCAC0B,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;;AAjF5D,wBAuGE"}

package/dist/es2017/main_thread/decrypt/utils/media_keys_attacher.js

@@ -0,0 +1,180 @@
+/**
+ * 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 { setMediaKeys } from "../../../compat/eme/set_media_keys";
+import { EncryptedMediaError } from "../../../errors";
+import log from "../../../log";
+import isNullOrUndefined from "../../../utils/is_null_or_undefined";
+// Store the MediaKeys infos attached to a media element.
+const currentMediaState = new WeakMap();
+export default {
+    /**
+     * Attach new MediaKeys infos set on a HMTLMediaElement.
+     * @param {HTMLMediaElement} mediaElement
+     * @param {Object} mediaKeysInfo
+     * @returns {Promise}
+     */
+    async attach(mediaElement, mediaKeysInfo) {
+        const previousState = currentMediaState.get(mediaElement);
+        const pendingTask = attachMediaKeys(mediaElement, previousState, mediaKeysInfo).then(() => {
+            currentMediaState.set(mediaElement, {
+                pendingTask: null,
+                mediaKeysState: mediaKeysInfo,
+            });
+        }, () => {
+            currentMediaState.set(mediaElement, {
+                pendingTask: null,
+                mediaKeysState: null,
+            });
+        });
+        currentMediaState.set(mediaElement, {
+            pendingTask,
+            mediaKeysState: mediaKeysInfo,
+        });
+        return pendingTask;
+    },
+    /**
+     * Get MediaKeys information expected to be linked to the given
+     * `HTMLMediaElement`.
+     *
+     * Unlike `getAttachedMediaKeysState`, this method is synchronous and will
+     * also return the expected state when `MediaKeys` attachment is still
+     * pending and thus when that state is not truly applied (and where it
+     * might fail before being applied).
+     *
+     * As such, only call this method if you want the currently expected state,
+     * not the actual one.
+     * @param {HTMLMediaElement} mediaElement
+     * @returns {Array}
+     */
+    getAwaitedState(mediaElement) {
+        var _a;
+        const currentState = currentMediaState.get(mediaElement);
+        return (_a = currentState === null || currentState === void 0 ? void 0 : currentState.mediaKeysState) !== null && _a !== void 0 ? _a : null;
+    },
+    /**
+     * Get MediaKeys information set on a HMTLMediaElement.
+     *
+     * This method is asynchronous because that state may still be in a process
+     * of being attached to the `HTMLMediaElement` (and the state we're
+     * currently setting may not work out).
+     * @param {HTMLMediaElement} mediaElement
+     * @returns {Object|null}
+     */
+    async getAttachedMediaKeysState(mediaElement) {
+        const currentState = currentMediaState.get(mediaElement);
+        if (currentState === undefined) {
+            return null;
+        }
+        if (currentState.pendingTask !== null) {
+            await currentState.pendingTask;
+            return this.getAttachedMediaKeysState(mediaElement);
+        }
+        return currentState.mediaKeysState;
+    },
+    /**
+     * Remove MediaKeys currently set on a HMTLMediaElement and update state
+     * accordingly.
+     * @param {HTMLMediaElement} mediaElement
+     * @returns {Promise}
+     */
+    clearMediaKeys(mediaElement) {
+        const previousState = currentMediaState.get(mediaElement);
+        const pendingTask = clearMediaKeys(mediaElement, previousState).then(() => {
+            currentMediaState.set(mediaElement, {
+                pendingTask: null,
+                mediaKeysState: null,
+            });
+        }, () => {
+            currentMediaState.set(mediaElement, {
+                pendingTask: null,
+                mediaKeysState: null,
+            });
+        });
+        currentMediaState.set(mediaElement, {
+            pendingTask,
+            mediaKeysState: null,
+        });
+        return pendingTask;
+    },
+};
+/**
+ * Ensure that the last `MediaKeys` set on the given HTMLMediaElement is
+ * attached.
+ *
+ * The returned Promise never rejects, it will just log an error if the
+ * previous attachment failed.
+ *
+ * @param {Object} previousState
+ * @returns {Promise.<undefined>}
+ */
+async function awaitMediaKeysAttachment(previousState) {
+    const promise = previousState.pendingTask;
+    if (isNullOrUndefined(promise)) {
+        return;
+    }
+    log.info("DRM: Awaiting previous MediaKeys attachment operation");
+    try {
+        await previousState.pendingTask;
+    }
+    catch (err) {
+        log.info("DRM: previous MediaKeys attachment operation failed", err instanceof Error ? err : "Unknown error");
+    }
+}
+async function attachMediaKeys(mediaElement, previousState, mediaKeysInfo) {
+    if (previousState !== undefined) {
+        if (previousState.pendingTask !== null) {
+            // Ensure the `MediaKeys` has been fully attached to the HTMLMediaElement before
+            // resetting things, to avoid browser errors due to an invalid state.
+            await awaitMediaKeysAttachment(previousState);
+        }
+        const closeAllSessions = !isNullOrUndefined(previousState.mediaKeysState) &&
+            previousState.mediaKeysState.loadedSessionsStore !==
+                mediaKeysInfo.loadedSessionsStore
+            ? previousState.mediaKeysState.loadedSessionsStore.closeAllSessions()
+            : Promise.resolve();
+        await closeAllSessions;
+        if (mediaElement.mediaKeys === mediaKeysInfo.mediaKeys) {
+            log.debug("DRM: Right MediaKeys already set");
+            return;
+        }
+    }
+    log.info("DRM: Attaching MediaKeys to the media element");
+    try {
+        await setMediaKeys(mediaKeysInfo.emeImplementation, mediaElement, mediaKeysInfo.mediaKeys);
+        log.info("DRM: MediaKeys attached with success");
+    }
+    catch (err) {
+        const errMessage = err instanceof Error ? err.toString() : "Unknown Error";
+        throw new EncryptedMediaError("MEDIA_KEYS_ATTACHMENT_ERROR", "Could not attach the MediaKeys to the media element: " + errMessage);
+    }
+}
+async function clearMediaKeys(mediaElement, previousState) {
+    if (previousState === undefined) {
+        return;
+    }
+    if (previousState.pendingTask !== null) {
+        // Ensure the `MediaKeys` has been fully attached to the HTMLMediaElement before
+        // resetting things, to avoid browser errors due to an invalid state.
+        await awaitMediaKeysAttachment(previousState);
+    }
+    if (previousState.mediaKeysState === null) {
+        return;
+    }
+    log.info("DRM: Disposing of the current MediaKeys");
+    const { loadedSessionsStore } = previousState.mediaKeysState;
+    await loadedSessionsStore.closeAllSessions();
+    return setMediaKeys(previousState.mediaKeysState.emeImplementation, mediaElement, null);
+}

package/dist/es2017/main_thread/init/utils/rebuffering_controller.js

@@ -214,7 +214,7 @@ export default class RebufferingController extends EventEmitter {
             this.start();
         }
         const observation = this._playbackObserver.getReference().getValue();
-        if (!observation.rebuffering ||
+        if (observation.rebuffering === null ||
             observation.paused ||
             this._speed.getValue() <= 0 ||
             (bufferType !== "audio" && bufferType !== "video")) {

package/dist/es2017/main_thread/text_displayer/html/text_track_cues_store.js

@@ -336,7 +336,7 @@ export default class TextTrackCuesStore {
                 }
             }
         }
-        if (cuesBuffer.length) {
+        if (cuesBuffer.length > 0) {
             const lastCue = cuesBuffer[cuesBuffer.length - 1];
             if (areNearlyEqual(lastCue.end, start, relativeDelta)) {
                 // Match the end of the previous cue to the start of the following one

package/dist/es2017/main_thread/tracks_store/track_dispatcher.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"track_dispatcher.d.ts","sourceRoot":"","sources":["../../../../src/main_thread/tracks_store/track_dispatcher.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,iBAAiB,EACjB,sBAAsB,EACtB,mBAAmB,EACpB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,KAAK,EAAE,mBAAmB,EAA2B,MAAM,gBAAgB,CAAC;AAMnF,OAAO,YAAY,MAAM,2BAA2B,CAAC;AAErD,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AACtE,OAAO,eAAe,MAAM,uBAAuB,CAAC;AAGpD;;;;GAIG;AACH,MAAM,CAAC,OAAO,OAAO,eAAgB,SAAQ,YAAY,CAAC,qBAAqB,CAAC;IAC9E;;;;;;;OAOG;IACI,OAAO,EAAE,MAAM,IAAI,CAAC;IAE3B;;;OAGG;IACH,OAAO,CAAC,QAAQ,CAAC,cAAc,CAa7B;IAEF;;;;;;;OAOG;IACH,OAAO,CAAC,YAAY,CAON;IAEd,iFAAiF;IACjF,OAAO,CAAC,UAAU,CAAgB;IAElC;;;;;;OAMG;IACH,OAAO,CAAC,YAAY,CAAU;IAE9B;;;;;;OAMG;gBACS,aAAa,EAAE,eAAe,CAAC,iBAAiB,GAAG,IAAI,GAAG,SAAS,CAAC;IAShF;;;;;OAKG;IACI,WAAW,IAAI,OAAO;IAI7B;;;OAGG;IACI,WAAW,CAAC,YAAY,EAAE,aAAa,GAAG,IAAI,GAAG,IAAI;IAoC5D;;;;;;OAMG;IACH,OAAO,CAAC,wCAAwC;IAmFhD;;;OAGG;IACI,OAAO,IAAI,IAAI;CAKvB;AAED,MAAM,WAAW,qBAAqB;IACpC;;;OAGG;IACH,8BAA8B,EAAE,IAAI,CAAC;IACrC,wBAAwB,EAAE,IAAI,CAAC;CAChC;AAED,oEAAoE;AACpE,MAAM,WAAW,aAAa;IAC5B,oDAAoD;IACpD,UAAU,EAAE,mBAAmB,CAAC;IAChC,gEAAgE;IAChE,aAAa,EAAE,mBAAmB,CAAC;IACnC,sDAAsD;IACtD,wBAAwB,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC9C;;;;;;;OAOG;IACH,qBAAqB,EAAE,wBAAwB,CAAC,sBAAsB,GAAG,IAAI,CAAC,CAAC;CAChF"}
+{"version":3,"file":"track_dispatcher.d.ts","sourceRoot":"","sources":["../../../../src/main_thread/tracks_store/track_dispatcher.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,iBAAiB,EACjB,sBAAsB,EACtB,mBAAmB,EACpB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,KAAK,EAAE,mBAAmB,EAA2B,MAAM,gBAAgB,CAAC;AAOnF,OAAO,YAAY,MAAM,2BAA2B,CAAC;AAErD,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAC;AACtE,OAAO,eAAe,MAAM,uBAAuB,CAAC;AAGpD;;;;GAIG;AACH,MAAM,CAAC,OAAO,OAAO,eAAgB,SAAQ,YAAY,CAAC,qBAAqB,CAAC;IAC9E;;;;;;;OAOG;IACI,OAAO,EAAE,MAAM,IAAI,CAAC;IAE3B;;;OAGG;IACH,OAAO,CAAC,QAAQ,CAAC,cAAc,CAa7B;IAEF;;;;;;;OAOG;IACH,OAAO,CAAC,YAAY,CAON;IAEd,iFAAiF;IACjF,OAAO,CAAC,UAAU,CAAgB;IAElC;;;;;;OAMG;IACH,OAAO,CAAC,YAAY,CAAU;IAE9B;;;;;;OAMG;gBACS,aAAa,EAAE,eAAe,CAAC,iBAAiB,GAAG,IAAI,GAAG,SAAS,CAAC;IAShF;;;;;OAKG;IACI,WAAW,IAAI,OAAO;IAI7B;;;OAGG;IACI,WAAW,CAAC,YAAY,EAAE,aAAa,GAAG,IAAI,GAAG,IAAI;IAoC5D;;;;;;OAMG;IACH,OAAO,CAAC,wCAAwC;IA+EhD;;;OAGG;IACI,OAAO,IAAI,IAAI;CAKvB;AAED,MAAM,WAAW,qBAAqB;IACpC;;;OAGG;IACH,8BAA8B,EAAE,IAAI,CAAC;IACrC,wBAAwB,EAAE,IAAI,CAAC;CAChC;AAED,oEAAoE;AACpE,MAAM,WAAW,aAAa;IAC5B,oDAAoD;IACpD,UAAU,EAAE,mBAAmB,CAAC;IAChC,gEAAgE;IAChE,aAAa,EAAE,mBAAmB,CAAC;IACnC,sDAAsD;IACtD,wBAAwB,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC9C;;;;;;;OAOG;IACH,qBAAqB,EAAE,wBAAwB,CAAC,sBAAsB,GAAG,IAAI,CAAC,CAAC;CAChF"}

package/dist/es2017/main_thread/tracks_store/track_dispatcher.js

@@ -1,3 +1,4 @@
+import { isRepresentationPlayable } from "../../manifest";
 import arrayIncludes from "../../utils/array_includes";
 import EventEmitter from "../../utils/event_emitter";
 import noop from "../../utils/noop";
@@ -101,9 +102,7 @@ export default class TrackDispatcher extends EventEmitter {
             let playableRepresentations;
             if (repSettings === null) {
                 // unlocking
-                playableRepresentations = trackInfo.adaptation.representations.filter((representation) => {
-                    return (representation.isSupported === true && representation.decipherable !== false);
-                });
+                playableRepresentations = trackInfo.adaptation.representations.filter((representation) => isRepresentationPlayable(representation) === true);
                 // No need to remove the previous content when unlocking
                 switchingMode = "lazy";
             }
@@ -111,7 +110,7 @@ export default class TrackDispatcher extends EventEmitter {
                 const { representationIds } = repSettings;
                 switchingMode = repSettings.switchingMode;
                 const representations = trackInfo.adaptation.representations.filter((r) => arrayIncludes(representationIds, r.id));
-                playableRepresentations = representations.filter((r) => r.isSupported === true && r.decipherable !== false);
+                playableRepresentations = representations.filter((representation) => isRepresentationPlayable(representation) === true);
                 if (playableRepresentations.length === 0) {
                     self.trigger("noPlayableLockedRepresentation", null);
                     return;

package/dist/es2017/main_thread/tracks_store/tracks_store.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tracks_store.d.ts","sourceRoot":"","sources":["../../../../src/main_thread/tracks_store/tracks_store.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"tracks_store.d.ts","sourceRoot":"","sources":["../../../../src/main_thread/tracks_store/tracks_store.ts"],"names":[],"mappings":"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"}

package/dist/es2017/main_thread/tracks_store/tracks_store.js

@@ -20,7 +20,7 @@
 import config from "../../config";
 import { MediaError } from "../../errors";
 import log from "../../log";
-import { getSupportedAdaptations, toAudioTrack, toTextTrack, toVideoTrack, } from "../../manifest";
+import { getSupportedAdaptations, isRepresentationPlayable, toAudioTrack, toTextTrack, toVideoTrack, } from "../../manifest";
 import arrayFind from "../../utils/array_find";
 import assert from "../../utils/assert";
 import EventEmitter from "../../utils/event_emitter";
@@ -283,7 +283,7 @@ export default class TracksStore extends EventEmitter {
                     adaptation.supportStatus.isDecipherable === false) {
                     return false;
                 }
-                const playableRepresentations = adaptation.representations.filter((r) => r.isSupported === true && r.decipherable !== false);
+                const playableRepresentations = adaptation.representations.filter((r) => isRepresentationPlayable(r) === true);
                 return playableRepresentations.length > 0;
             });
             if (nextAdaptation === undefined) {

package/dist/es2017/manifest/classes/representation.d.ts

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import type { IRepresentationMetadata } from "../../manifest";
+import { type IRepresentationMetadata } from "../../manifest";
 import type { ICdnMetadata, IContentProtections, IParsedRepresentation } from "../../parsers/manifest";
 import type { ITrackType, IHDRInformation } from "../../public_types";
 import type codecSupportCache from "./codec_support_cache";
@@ -193,6 +193,20 @@ declare class Representation implements IRepresentationMetadata {
         systemId: string;
         data: Uint8Array;
     }>): boolean;
+    /**
+     * Returns `true` if the `Representation` has a high chance of being playable on
+     * the current device (its codec seems supported and we don't consider it to be
+     * un-decipherable).
+     *
+     * Returns `false` if the `Representation` has a high chance of being unplayable
+     * on the current device (its codec seems unsupported and/or we consider it to
+     * be un-decipherable).
+     *
+     * Returns `undefined` if we don't know as the codec has not been checked yet.
+     *
+     * @returns {boolean|undefined}
+     */
+    isPlayable(): boolean | undefined;
     /**
      * Format the current `Representation`'s properties into a
      * `IRepresentationMetadata` format which can better be communicated through