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

package/dist/hls.light.js

@@ -1165,7 +1165,7 @@
       // 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.11368");
+        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();
@@ -1312,6 +1312,9 @@
       return str;
     }
   };
+  function hexToArrayBuffer(str) {
+    return Uint8Array.from(str.replace(/^0x/, '').replace(/([\da-fA-F]{2}) ?/g, '0x$1 ').replace(/ +$/, '').split(' ')).buffer;
+  }
 
   var LoadStats = function LoadStats() {
     this.aborted = false;
@@ -7418,7 +7421,7 @@
   }
 
   var LevelKey = /*#__PURE__*/function () {
-    function LevelKey(method, uri, format, formatversions, iv) {
+    function LevelKey(method, uri, format, formatversions, iv, keyId) {
       if (formatversions === void 0) {
         formatversions = [1];
       }
@@ -7442,10 +7445,17 @@
       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));
+      }
     }
     LevelKey.clearKeyUriToKeyIdMap = function clearKeyUriToKeyIdMap() {
     };
     var _proto = LevelKey.prototype;
+    _proto.matches = function 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(','));
+    };
     _proto.isSupported = function isSupported() {
       // If it's Segment encryption or No encryption, just select that key system
       if (this.method) {
@@ -7927,10 +7937,14 @@
                   if (!levelkeys) {
                     levelkeys = {};
                   }
-                  if (levelkeys[levelKey.keyFormat]) {
-                    levelkeys = _extends({}, levelkeys);
+                  var 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 + "\"");
                 }
@@ -8154,7 +8168,7 @@
     // No uri is allowed when METHOD is NONE
     var resolvedUri = decrypturi ? M3U8Parser.resolve(decrypturi, baseurl) : '';
     var 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) {
     var startAttrs = new AttrList(startAttributes);
@@ -18883,9 +18897,6 @@
     }
     return Number.POSITIVE_INFINITY;
   }();
-  function hexToArrayBuffer(str) {
-    return Uint8Array.from(str.replace(/^0x/, '').replace(/([\da-fA-F]{2}) ?/g, '0x$1 ').replace(/ +$/, '').split(' ')).buffer;
-  }
   var ID3TrackController = /*#__PURE__*/function () {
     function ID3TrackController(hls) {
       var _this = this;
@@ -20524,7 +20535,7 @@
     return !remuxResult.audio && !remuxResult.video && !remuxResult.text && !remuxResult.id3 && !remuxResult.initSegment;
   }
 
-  var version = "1.6.7-0.canary.11368";
+  var 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