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

package/dist/hls.light.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();
@@ -668,6 +668,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;
+}
 
 var urlToolkit = {exports: {}};
 
@@ -4684,7 +4687,7 @@ function getAesModeFromFullSegmentMethod(method) {
 class LevelKey {
   static clearKeyUriToKeyIdMap() {
   }
-  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;
@@ -4702,6 +4705,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
@@ -5178,10 +5188,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}"`);
               }
@@ -5404,7 +5418,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);
@@ -18727,9 +18741,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;
@@ -19893,7 +19904,7 @@ function assignTrackIdsByGroup(tracks) {
   });
 }
 
-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