hls.js 1.6.1-0.canary.11110 → 1.6.1-0.canary.11112

package/dist/hls.mjs

@@ -523,7 +523,7 @@ function enableLogs(debugConfig, context, id) {
     // Some browsers don't allow to use bind on console object anyway
     // fallback to default if needed
     try {
-      newLogger.log(`Debug logs enabled for "${context}" in hls.js version ${"1.6.1-0.canary.11110"}`);
+      newLogger.log(`Debug logs enabled for "${context}" in hls.js version ${"1.6.1-0.canary.11112"}`);
     } catch (e) {
       /* log fn threw an exception. All logger methods are no-ops. */
       return createLogger();
@@ -6916,6 +6916,10 @@ function createMediaKeySystemConfigurations(initDataTypes, audioCodecs, videoCod
   };
   return [baseConfig];
 }
+function isPersistentSessionType(drmSystemOptions) {
+  var _drmSystemOptions$ses;
+  return drmSystemOptions.sessionType === 'persistent-license' || !!((_drmSystemOptions$ses = drmSystemOptions.sessionTypes) != null && _drmSystemOptions$ses.some(type => type === 'persistent-license'));
+}
 function parsePlayReadyWRM(keyBytes) {
   const keyBytesUtf16 = new Uint16Array(keyBytes.buffer, keyBytes.byteOffset, keyBytes.byteLength / 2);
   const keyByteStr = String.fromCharCode.apply(null, Array.from(keyBytesUtf16));
@@ -10243,7 +10247,7 @@ function requireEventemitter3 () {
 var eventemitter3Exports = requireEventemitter3();
 var EventEmitter = /*@__PURE__*/getDefaultExportFromCjs(eventemitter3Exports);
 
-const version = "1.6.1-0.canary.11110";
+const version = "1.6.1-0.canary.11112";
 
 // ensure the worker ends up in the bundle
 // If the worker should not be included this gets aliased to empty.js
@@ -22101,6 +22105,13 @@ class EMEController extends Logger {
   }
   onKeyStatusChange(mediaKeySessionContext) {
     mediaKeySessionContext.mediaKeysSession.keyStatuses.forEach((status, keyId) => {
+      // keyStatuses.forEach is not standard API so the callback value looks weird on xboxone
+      // xboxone callback(keyId, status) so we need to exchange them
+      if (typeof keyId === 'string' && typeof status === 'object') {
+        const temp = keyId;
+        keyId = status;
+        status = temp;
+      }
       this.log(`key status change "${status}" for keyStatuses keyId: ${Hex.hexDump('buffer' in keyId ? new Uint8Array(keyId.buffer, keyId.byteOffset, keyId.byteLength) : new Uint8Array(keyId))} session keyId: ${Hex.hexDump(new Uint8Array(mediaKeySessionContext.decryptdata.keyId || []))} uri: ${mediaKeySessionContext.decryptdata.uri}`);
       mediaKeySessionContext.keyStatus = status;
     });
@@ -22425,7 +22436,14 @@ class EMEController extends Logger {
       if (index > -1) {
         this.mediaKeySessions.splice(index, 1);
       }
-      return mediaKeysSession.remove().catch(error => {
+      const {
+        drmSystemOptions
+      } = this.config;
+      const removePromise = isPersistentSessionType(drmSystemOptions) ? new Promise((resolve, reject) => {
+        self.setTimeout(() => reject(new Error(`MediaKeySession.remove() timeout`)), 8000);
+        mediaKeysSession.remove().then(resolve);
+      }) : Promise.resolve();
+      return removePromise.catch(error => {
         var _this$hls4;
         this.log(`Could not remove session: ${error}`);
         (_this$hls4 = this.hls) == null ? void 0 : _this$hls4.trigger(Events.ERROR, {