hls.js 1.6.7-0.canary.11366 → 1.6.7-0.canary.11369

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.7-0.canary.11366"}`);
+      newLogger.log(`Debug logs enabled for "${context}" in hls.js version ${"1.6.7-0.canary.11369"}`);
     } catch (e) {
       /* log fn threw an exception. All logger methods are no-ops. */
       return createLogger();
@@ -648,6 +648,9 @@ const Hex = {
     return str;
   }
 };
+function hexToArrayBuffer(str) {
+  return Uint8Array.from(str.replace(/^0x/, '').replace(/([\da-fA-F]{2}) ?/g, '0x$1 ').replace(/ +$/, '').split(' ')).buffer;
+}
 
 function getDefaultExportFromCjs (x) {
 	return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;
@@ -2298,88 +2301,6 @@ function mp4pssh(systemId, keyids, data) {
   // 16 bytes
   kidCount, kids, dataSize, data || new Uint8Array());
 }
-function parseMultiPssh(initData) {
-  const results = [];
-  if (initData instanceof ArrayBuffer) {
-    const length = initData.byteLength;
-    let offset = 0;
-    while (offset + 32 < length) {
-      const view = new DataView(initData, offset);
-      const pssh = parsePssh(view);
-      results.push(pssh);
-      offset += pssh.size;
-    }
-  }
-  return results;
-}
-function parsePssh(view) {
-  const size = view.getUint32(0);
-  const offset = view.byteOffset;
-  const length = view.byteLength;
-  if (length < size) {
-    return {
-      offset,
-      size: length
-    };
-  }
-  const type = view.getUint32(4);
-  if (type !== 0x70737368) {
-    return {
-      offset,
-      size
-    };
-  }
-  const version = view.getUint32(8) >>> 24;
-  if (version !== 0 && version !== 1) {
-    return {
-      offset,
-      size
-    };
-  }
-  const buffer = view.buffer;
-  const systemId = Hex.hexDump(new Uint8Array(buffer, offset + 12, 16));
-  let kids = null;
-  let data = null;
-  let dataSizeOffset = 0;
-  if (version === 0) {
-    dataSizeOffset = 28;
-  } else if (version === 1) {
-    const kidCounts = view.getUint32(28);
-    if (!kidCounts || length < 32 + kidCounts * 16) {
-      return {
-        offset,
-        size
-      };
-    }
-    kids = [];
-    for (let i = 0; i < kidCounts; i++) {
-      kids.push(new Uint8Array(buffer, offset + 32 + i * 16, 16));
-    }
-    dataSizeOffset = 32 + kidCounts * 16;
-  }
-  if (!dataSizeOffset) {
-    return {
-      offset,
-      size
-    };
-  }
-  const dataSizeOrKidCount = view.getUint32(dataSizeOffset);
-  if (size - 32 < dataSizeOrKidCount) {
-    return {
-      offset,
-      size
-    };
-  }
-  data = new Uint8Array(buffer, offset + dataSizeOffset + 4, dataSizeOrKidCount);
-  return {
-    version,
-    systemId,
-    kids,
-    data,
-    offset,
-    size
-  };
-}
 
 const userAgentHevcSupportIsInaccurate = () => {
   return /\(Windows.+Firefox\//i.test(navigator.userAgent);
@@ -6825,23 +6746,6 @@ function keySystemFormatToKeySystemDomain(format) {
       return KeySystems.CLEARKEY;
   }
 }
-
-// System IDs for which we can extract a key ID from "encrypted" event PSSH
-var KeySystemIds = {
-  CENC: "1077efecc0b24d02ace33c1e52e2fb4b",
-  CLEARKEY: "e2719d58a985b3c9781ab030af78d30e",
-  PLAYREADY: "9a04f07998404286ab92e65be0885f95",
-  WIDEVINE: "edef8ba979d64acea3c827dcd51d21ed"
-};
-function keySystemIdToKeySystemDomain(systemId) {
-  if (systemId === KeySystemIds.WIDEVINE) {
-    return KeySystems.WIDEVINE;
-  } else if (systemId === KeySystemIds.PLAYREADY) {
-    return KeySystems.PLAYREADY;
-  } else if (systemId === KeySystemIds.CENC || systemId === KeySystemIds.CLEARKEY) {
-    return KeySystems.CLEARKEY;
-  }
-}
 function keySystemDomainToKeySystemFormat(keySystem) {
   switch (keySystem) {
     case KeySystems.FAIRPLAY:
@@ -6944,7 +6848,7 @@ class LevelKey {
   static clearKeyUriToKeyIdMap() {
     keyUriToKeyIdMap = {};
   }
-  constructor(method, uri, format, formatversions = [1], iv = null) {
+  constructor(method, uri, format, formatversions = [1], iv = null, keyId) {
     this.uri = void 0;
     this.method = void 0;
     this.keyFormat = void 0;
@@ -6962,6 +6866,13 @@ class LevelKey {
     this.iv = iv;
     this.encrypted = method ? method !== 'NONE' : false;
     this.isCommonEncryption = this.encrypted && !isFullSegmentEncryption(method);
+    if (keyId != null && keyId.startsWith('0x')) {
+      this.keyId = new Uint8Array(hexToArrayBuffer(keyId));
+    }
+  }
+  matches(key) {
+    var _key$iv, _this$iv;
+    return key.uri === this.uri && key.method === this.method && key.encrypted === this.encrypted && key.keyFormat === this.keyFormat && key.keyFormatVersions.join(',') === this.keyFormatVersions.join(',') && ((_key$iv = key.iv) == null ? void 0 : _key$iv.join(',')) === ((_this$iv = this.iv) == null ? void 0 : _this$iv.join(','));
   }
   isSupported() {
     // If it's Segment encryption or No encryption, just select that key system
@@ -7002,6 +6913,9 @@ class LevelKey {
       const decryptdata = new LevelKey(this.method, this.uri, 'identity', this.keyFormatVersions, iv);
       return decryptdata;
     }
+    if (this.pssh && this.keyId) {
+      return this;
+    }
 
     // Initialize keyId if possible
     const keyBytes = convertDataUriToArrayBytes(this.uri);
@@ -7011,9 +6925,10 @@ class LevelKey {
           // Setting `pssh` on this LevelKey/DecryptData allows HLS.js to generate a session using
           // the playlist-key before the "encrypted" event. (Comment out to only use "encrypted" path.)
           this.pssh = keyBytes;
-          // In case of widevine keyID is embedded in PSSH box. Read Key ID.
-          if (keyBytes.length >= 22) {
-            this.keyId = keyBytes.subarray(keyBytes.length - 22, keyBytes.length - 6);
+          // In case of Widevine, if KEYID is not in the playlist, assume only two fields in the pssh KEY tag URI.
+          if (!this.keyId && keyBytes.length >= 22) {
+            const offset = keyBytes.length - 22;
+            this.keyId = keyBytes.subarray(offset, offset + 16);
           }
           break;
         case KeySystemFormats.PLAYREADY:
@@ -7507,10 +7422,14 @@ class M3U8Parser {
                 if (!levelkeys) {
                   levelkeys = {};
                 }
-                if (levelkeys[levelKey.keyFormat]) {
-                  levelkeys = _extends({}, levelkeys);
+                const currentKey = levelkeys[levelKey.keyFormat];
+                // Ignore duplicate playlist KEY tags
+                if (!(currentKey != null && currentKey.matches(levelKey))) {
+                  if (currentKey) {
+                    levelkeys = _extends({}, levelkeys);
+                  }
+                  levelkeys[levelKey.keyFormat] = levelKey;
                 }
-                levelkeys[levelKey.keyFormat] = levelKey;
               } else {
                 logger.warn(`[Keys] Ignoring invalid EXT-X-KEY tag: "${value1}"`);
               }
@@ -7733,7 +7652,7 @@ function parseKey(keyTagAttributes, baseurl, parsed) {
   // No uri is allowed when METHOD is NONE
   const resolvedUri = decrypturi ? M3U8Parser.resolve(decrypturi, baseurl) : '';
   const keyFormatVersions = (decryptkeyformatversions ? decryptkeyformatversions : '1').split('/').map(Number).filter(Number.isFinite);
-  return new LevelKey(decryptmethod, resolvedUri, decryptkeyformat, keyFormatVersions, decryptiv);
+  return new LevelKey(decryptmethod, resolvedUri, decryptkeyformat, keyFormatVersions, decryptiv, keyAttrs.KEYID);
 }
 function parseStartTimeOffset(startAttributes) {
   const startAttrs = new AttrList(startAttributes);
@@ -10267,7 +10186,7 @@ function requireEventemitter3 () {
 var eventemitter3Exports = requireEventemitter3();
 var EventEmitter = /*@__PURE__*/getDefaultExportFromCjs(eventemitter3Exports);
 
-const version = "1.6.7-0.canary.11366";
+const version = "1.6.7-0.canary.11369";
 
 // ensure the worker ends up in the bundle
 // If the worker should not be included this gets aliased to empty.js
@@ -16597,7 +16516,7 @@ class AudioStreamController extends BaseStreamController {
     const syncFrag = findNearestWithCC(trackDetails, targetDiscontinuity, pos);
     // Only stop waiting for audioFrag.cc if an audio segment of the same discontinuity domain (cc) is found
     if (syncFrag) {
-      this.log(`Waiting fragment cc (${waitingToAppend == null ? void 0 : waitingToAppend.cc}) cancelled because video is at cc ${mainAnchor.cc}`);
+      this.log(`Syncing with main frag at ${syncFrag.start} cc ${syncFrag.cc}`);
       this.startFragRequested = false;
       this.nextLoadPosition = syncFrag.start;
       this.resetLoadingState();
@@ -21633,140 +21552,6 @@ class EMEController extends Logger {
     this.keyIdToKeySessionPromise = {};
     this.mediaKeys = null;
     this.setMediaKeysQueue = EMEController.CDMCleanupPromise ? [EMEController.CDMCleanupPromise] : [];
-    this.onMediaEncrypted = event => {
-      const {
-        initDataType,
-        initData
-      } = event;
-      const logMessage = `"${event.type}" event: init data type: "${initDataType}"`;
-      this.debug(logMessage);
-
-      // Ignore event when initData is null
-      if (initData === null) {
-        return;
-      }
-      if (!this.keyFormatPromise) {
-        let keySystems = Object.keys(this.keySystemAccessPromises);
-        if (!keySystems.length) {
-          keySystems = getKeySystemsForConfig(this.config);
-        }
-        const keyFormats = keySystems.map(keySystemDomainToKeySystemFormat).filter(k => !!k);
-        this.keyFormatPromise = this.getKeyFormatPromise(keyFormats);
-      }
-      this.keyFormatPromise.then(keySystemFormat => {
-        const keySystem = keySystemFormatToKeySystemDomain(keySystemFormat);
-        let keyId;
-        let keySystemDomain;
-        if (initDataType === 'sinf') {
-          if (keySystem !== KeySystems.FAIRPLAY) {
-            this.warn(`Ignoring unexpected "${event.type}" event with init data type: "${initDataType}" for selected key-system ${keySystem}`);
-            return;
-          }
-          // Match sinf keyId to playlist skd://keyId=
-          const json = bin2str(new Uint8Array(initData));
-          try {
-            const sinf = base64Decode(JSON.parse(json).sinf);
-            const tenc = parseSinf(sinf);
-            if (!tenc) {
-              throw new Error(`'schm' box missing or not cbcs/cenc with schi > tenc`);
-            }
-            keyId = new Uint8Array(tenc.subarray(8, 24));
-            keySystemDomain = KeySystems.FAIRPLAY;
-          } catch (error) {
-            this.warn(`${logMessage} Failed to parse sinf: ${error}`);
-            return;
-          }
-        } else {
-          if (keySystem !== KeySystems.WIDEVINE && keySystem !== KeySystems.PLAYREADY) {
-            this.warn(`Ignoring unexpected "${event.type}" event with init data type: "${initDataType}" for selected key-system ${keySystem}`);
-            return;
-          }
-          // Support Widevine/PlayReady clear-lead key-session creation (otherwise depend on playlist keys)
-          const psshResults = parseMultiPssh(initData);
-          const psshInfos = psshResults.filter(pssh => !!pssh.systemId && keySystemIdToKeySystemDomain(pssh.systemId) === keySystem);
-          if (psshInfos.length > 1) {
-            this.warn(`${logMessage} Using first of ${psshInfos.length} pssh found for selected key-system ${keySystem}`);
-          }
-          const psshInfo = psshInfos[0];
-          if (!psshInfo) {
-            if (psshResults.length === 0 || psshResults.some(pssh => !pssh.systemId)) {
-              this.warn(`${logMessage} contains incomplete or invalid pssh data`);
-            } else {
-              this.log(`ignoring ${logMessage} for ${psshResults.map(pssh => keySystemIdToKeySystemDomain(pssh.systemId)).join(',')} pssh data in favor of playlist keys`);
-            }
-            return;
-          }
-          keySystemDomain = keySystemIdToKeySystemDomain(psshInfo.systemId);
-          if (psshInfo.version === 0 && psshInfo.data) {
-            if (keySystemDomain === KeySystems.WIDEVINE) {
-              const offset = psshInfo.data.length - 22;
-              keyId = new Uint8Array(psshInfo.data.subarray(offset, offset + 16));
-            } else if (keySystemDomain === KeySystems.PLAYREADY) {
-              keyId = parsePlayReadyWRM(psshInfo.data);
-            }
-          }
-        }
-        if (!keySystemDomain || !keyId) {
-          return;
-        }
-        const keyIdHex = Hex.hexDump(keyId);
-        const {
-          keyIdToKeySessionPromise,
-          mediaKeySessions
-        } = this;
-        let keySessionContextPromise = keyIdToKeySessionPromise[keyIdHex];
-        for (let i = 0; i < mediaKeySessions.length; i++) {
-          // Match playlist key
-          const keyContext = mediaKeySessions[i];
-          const decryptdata = keyContext.decryptdata;
-          if (!decryptdata.keyId) {
-            continue;
-          }
-          const oldKeyIdHex = Hex.hexDump(decryptdata.keyId);
-          if (keyIdHex === oldKeyIdHex || decryptdata.uri.replace(/-/g, '').indexOf(keyIdHex) !== -1) {
-            keySessionContextPromise = keyIdToKeySessionPromise[oldKeyIdHex];
-            if (decryptdata.pssh) {
-              break;
-            }
-            delete keyIdToKeySessionPromise[oldKeyIdHex];
-            decryptdata.pssh = new Uint8Array(initData);
-            decryptdata.keyId = keyId;
-            keySessionContextPromise = keyIdToKeySessionPromise[keyIdHex] = keySessionContextPromise.then(() => {
-              return this.generateRequestWithPreferredKeySession(keyContext, initDataType, initData, 'encrypted-event-key-match');
-            });
-            keySessionContextPromise.catch(error => this.handleError(error));
-            break;
-          }
-        }
-        if (!keySessionContextPromise) {
-          if (keySystemDomain !== keySystem) {
-            this.log(`Ignoring "${event.type}" event with ${keySystemDomain} init data for selected key-system ${keySystem}`);
-            return;
-          }
-          // "Clear-lead" (misc key not encountered in playlist)
-          keySessionContextPromise = keyIdToKeySessionPromise[keyIdHex] = this.getKeySystemSelectionPromise([keySystemDomain]).then(({
-            keySystem,
-            mediaKeys
-          }) => {
-            var _keySystemToKeySystem;
-            this.throwIfDestroyed();
-            const decryptdata = new LevelKey('ISO-23001-7', keyIdHex, (_keySystemToKeySystem = keySystemDomainToKeySystemFormat(keySystem)) != null ? _keySystemToKeySystem : '');
-            decryptdata.pssh = new Uint8Array(initData);
-            decryptdata.keyId = keyId;
-            return this.attemptSetMediaKeys(keySystem, mediaKeys).then(() => {
-              this.throwIfDestroyed();
-              const keySessionContext = this.createMediaKeySessionContext({
-                decryptdata,
-                keySystem,
-                mediaKeys
-              });
-              return this.generateRequestWithPreferredKeySession(keySessionContext, initDataType, initData, 'encrypted-event-no-match');
-            });
-          });
-          keySessionContextPromise.catch(error => this.handleError(error));
-        }
-      });
-    };
     this.onWaitingForKey = event => {
       this.log(`"${event.type}" event`);
     };
@@ -21785,7 +21570,7 @@ class EMEController extends Logger {
     // @ts-ignore
     this.hls = this.config = this.keyIdToKeySessionPromise = null;
     // @ts-ignore
-    this.onMediaEncrypted = this.onWaitingForKey = null;
+    this.onWaitingForKey = null;
   }
   registerListeners() {
     this.hls.on(Events.MEDIA_ATTACHED, this.onMediaAttached, this);
@@ -22464,13 +22249,11 @@ class EMEController extends Logger {
 
     // keep reference of media
     this.media = media;
-    addEventListener(media, 'encrypted', this.onMediaEncrypted);
     addEventListener(media, 'waitingforkey', this.onWaitingForKey);
   }
   onMediaDetached() {
     const media = this.media;
     if (media) {
-      removeEventListener(media, 'encrypted', this.onMediaEncrypted);
       removeEventListener(media, 'waitingforkey', this.onWaitingForKey);
       this.media = null;
       this.mediaKeys = null;
@@ -31267,9 +31050,6 @@ const MAX_CUE_ENDTIME = (() => {
   }
   return Number.POSITIVE_INFINITY;
 })();
-function hexToArrayBuffer(str) {
-  return Uint8Array.from(str.replace(/^0x/, '').replace(/([\da-fA-F]{2}) ?/g, '0x$1 ').replace(/ +$/, '').split(' ')).buffer;
-}
 class ID3TrackController {
   constructor(hls) {
     this.hls = void 0;