hls.js 1.5.12-0.canary.10340 → 1.5.12-0.canary.10341

package/dist/hls.light.js

@@ -434,14 +434,90 @@
     return ErrorDetails;
   }({});
 
+  var Logger = function Logger(label, logger) {
+    this.trace = void 0;
+    this.debug = void 0;
+    this.log = void 0;
+    this.warn = void 0;
+    this.info = void 0;
+    this.error = void 0;
+    var lb = "[" + label + "]:";
+    this.trace = noop;
+    this.debug = logger.debug.bind(null, lb);
+    this.log = logger.log.bind(null, lb);
+    this.warn = logger.warn.bind(null, lb);
+    this.info = logger.info.bind(null, lb);
+    this.error = logger.error.bind(null, lb);
+  };
+  var noop = function noop() {};
+  var fakeLogger = {
+    trace: noop,
+    debug: noop,
+    log: noop,
+    warn: noop,
+    info: noop,
+    error: noop
+  };
+  function createLogger() {
+    return _extends({}, fakeLogger);
+  }
+
+  // let lastCallTime;
+  // function formatMsgWithTimeInfo(type, msg) {
+  //   const now = Date.now();
+  //   const diff = lastCallTime ? '+' + (now - lastCallTime) : '0';
+  //   lastCallTime = now;
+  //   msg = (new Date(now)).toISOString() + ' | [' +  type + '] > ' + msg + ' ( ' + diff + ' ms )';
+  //   return msg;
+  // }
+
+  function consolePrintFn(type, id) {
+    var func = self.console[type];
+    return func ? func.bind(self.console, ('') + "[" + type + "] >") : noop;
+  }
+  function getLoggerFn(key, debugConfig, id) {
+    return debugConfig[key] ? debugConfig[key].bind(debugConfig) : consolePrintFn(key);
+  }
+  var exportedLogger = createLogger();
+  function enableLogs(debugConfig, context, id) {
+    // check that console is available
+    var newLogger = createLogger();
+    if (typeof console === 'object' && debugConfig === true || typeof debugConfig === 'object') {
+      var keys = [
+      // Remove out from list here to hard-disable a log-level
+      // 'trace',
+      'debug', 'log', 'info', 'warn', 'error'];
+      keys.forEach(function (key) {
+        newLogger[key] = getLoggerFn(key, debugConfig);
+      });
+      // 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.5.12-0.canary.10341");
+      } catch (e) {
+        /* log fn threw an exception. All logger methods are no-ops. */
+        return createLogger();
+      }
+      // global exported logger uses the same functions as new logger without `id`
+      keys.forEach(function (key) {
+        exportedLogger[key] = getLoggerFn(key, debugConfig);
+      });
+    } else {
+      // Reset global exported logger
+      _extends(exportedLogger, newLogger);
+    }
+    return newLogger;
+  }
+  var logger = exportedLogger;
+
   var DECIMAL_RESOLUTION_REGEX = /^(\d+)x(\d+)$/;
   var ATTR_LIST_REGEX = /(.+?)=(".*?"|.*?)(?:,|$)/g;
 
   // adapted from https://github.com/kanongil/node-m3u8parse/blob/master/attrlist.js
   var AttrList = /*#__PURE__*/function () {
-    function AttrList(attrs) {
+    function AttrList(attrs, parsed) {
       if (typeof attrs === 'string') {
-        attrs = AttrList.parseAttrList(attrs);
+        attrs = AttrList.parseAttrList(attrs, parsed);
       }
       _extends(this, attrs);
     }
@@ -483,6 +559,13 @@
     _proto.enumeratedString = function enumeratedString(attrName) {
       return this[attrName];
     };
+    _proto.enumeratedStringList = function enumeratedStringList(attrName, dict) {
+      var attrValue = this[attrName];
+      return (attrValue ? attrValue.split(/[ ,]+/) : []).reduce(function (result, identifier) {
+        result[identifier.toLowerCase()] = true;
+        return result;
+      }, dict);
+    };
     _proto.bool = function bool(attrName) {
       return this[attrName] === 'YES';
     };
@@ -496,17 +579,71 @@
         height: parseInt(res[2], 10)
       };
     };
-    AttrList.parseAttrList = function parseAttrList(input) {
+    AttrList.parseAttrList = function parseAttrList(input, parsed) {
       var match;
       var attrs = {};
       var quote = '"';
       ATTR_LIST_REGEX.lastIndex = 0;
       while ((match = ATTR_LIST_REGEX.exec(input)) !== null) {
+        var name = match[1].trim();
         var value = match[2];
-        if (value.indexOf(quote) === 0 && value.lastIndexOf(quote) === value.length - 1) {
+        var quotedString = value.indexOf(quote) === 0 && value.lastIndexOf(quote) === value.length - 1;
+        var hexadecimalSequence = false;
+        if (quotedString) {
           value = value.slice(1, -1);
+        } else {
+          switch (name) {
+            case 'IV':
+            case 'SCTE35-CMD':
+            case 'SCTE35-IN':
+            case 'SCTE35-OUT':
+              hexadecimalSequence = true;
+          }
+        }
+        if (parsed && (quotedString || hexadecimalSequence)) ; else if (!hexadecimalSequence && !quotedString) {
+          switch (name) {
+            case 'CLOSED-CAPTIONS':
+              if (value === 'NONE') {
+                break;
+              }
+            // falls through
+            case 'ALLOWED-CPC':
+            case 'CLASS':
+            case 'ASSOC-LANGUAGE':
+            case 'AUDIO':
+            case 'BYTERANGE':
+            case 'CHANNELS':
+            case 'CHARACTERISTICS':
+            case 'CODECS':
+            case 'DATA-ID':
+            case 'END-DATE':
+            case 'GROUP-ID':
+            case 'ID':
+            case 'IMPORT':
+            case 'INSTREAM-ID':
+            case 'KEYFORMAT':
+            case 'KEYFORMATVERSIONS':
+            case 'LANGUAGE':
+            case 'NAME':
+            case 'PATHWAY-ID':
+            case 'QUERYPARAM':
+            case 'RECENTLY-REMOVED-DATERANGES':
+            case 'SERVER-URI':
+            case 'STABLE-RENDITION-ID':
+            case 'STABLE-VARIANT-ID':
+            case 'START-DATE':
+            case 'SUBTITLES':
+            case 'SUPPLEMENTAL-CODECS':
+            case 'URI':
+            case 'VALUE':
+            case 'VIDEO':
+            case 'X-ASSET-LIST':
+            case 'X-ASSET-URI':
+              // Since we are not checking tag:attribute combination, just warn rather than ignoring attribute
+              logger.warn(input + ": attribute " + name + " is missing quotes");
+            // continue;
+          }
         }
-        var name = match[1].trim();
         attrs[name] = value;
       }
       return attrs;
@@ -521,96 +658,30 @@
     }]);
   }();
 
-  var Logger = function Logger(label, logger) {
-    this.trace = void 0;
-    this.debug = void 0;
-    this.log = void 0;
-    this.warn = void 0;
-    this.info = void 0;
-    this.error = void 0;
-    var lb = "[" + label + "]:";
-    this.trace = noop;
-    this.debug = logger.debug.bind(null, lb);
-    this.log = logger.log.bind(null, lb);
-    this.warn = logger.warn.bind(null, lb);
-    this.info = logger.info.bind(null, lb);
-    this.error = logger.error.bind(null, lb);
-  };
-  var noop = function noop() {};
-  var fakeLogger = {
-    trace: noop,
-    debug: noop,
-    log: noop,
-    warn: noop,
-    info: noop,
-    error: noop
-  };
-  function createLogger() {
-    return _extends({}, fakeLogger);
-  }
-
-  // let lastCallTime;
-  // function formatMsgWithTimeInfo(type, msg) {
-  //   const now = Date.now();
-  //   const diff = lastCallTime ? '+' + (now - lastCallTime) : '0';
-  //   lastCallTime = now;
-  //   msg = (new Date(now)).toISOString() + ' | [' +  type + '] > ' + msg + ' ( ' + diff + ' ms )';
-  //   return msg;
-  // }
-
-  function consolePrintFn(type, id) {
-    var func = self.console[type];
-    return func ? func.bind(self.console, ('') + "[" + type + "] >") : noop;
-  }
-  function getLoggerFn(key, debugConfig, id) {
-    return debugConfig[key] ? debugConfig[key].bind(debugConfig) : consolePrintFn(key);
-  }
-  var exportedLogger = createLogger();
-  function enableLogs(debugConfig, context, id) {
-    // check that console is available
-    var newLogger = createLogger();
-    if (typeof console === 'object' && debugConfig === true || typeof debugConfig === 'object') {
-      var keys = [
-      // Remove out from list here to hard-disable a log-level
-      // 'trace',
-      'debug', 'log', 'info', 'warn', 'error'];
-      keys.forEach(function (key) {
-        newLogger[key] = getLoggerFn(key, debugConfig);
-      });
-      // 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.5.12-0.canary.10340");
-      } catch (e) {
-        /* log fn threw an exception. All logger methods are no-ops. */
-        return createLogger();
-      }
-      // global exported logger uses the same functions as new logger without `id`
-      keys.forEach(function (key) {
-        exportedLogger[key] = getLoggerFn(key, debugConfig);
-      });
-    } else {
-      // Reset global exported logger
-      _extends(exportedLogger, newLogger);
-    }
-    return newLogger;
-  }
-  var logger = exportedLogger;
-
   // Avoid exporting const enum so that these values can be inlined
 
+  var CLASS_INTERSTITIAL = 'com.apple.hls.interstitial';
   function isDateRangeCueAttribute(attrName) {
-    return attrName !== "ID" && attrName !== "CLASS" && attrName !== "START-DATE" && attrName !== "DURATION" && attrName !== "END-DATE" && attrName !== "END-ON-NEXT";
+    return attrName !== "ID" && attrName !== "CLASS" && attrName !== "CUE" && attrName !== "START-DATE" && attrName !== "DURATION" && attrName !== "END-DATE" && attrName !== "END-ON-NEXT";
   }
   function isSCTE35Attribute(attrName) {
-    return attrName === "SCTE35-OUT" || attrName === "SCTE35-IN";
+    return attrName === "SCTE35-OUT" || attrName === "SCTE35-IN" || attrName === "SCTE35-CMD";
   }
   var DateRange = /*#__PURE__*/function () {
-    function DateRange(dateRangeAttr, dateRangeWithSameId) {
+    function DateRange(dateRangeAttr, dateRangeWithSameId, tagCount) {
+      var _dateRangeWithSameId$;
+      if (tagCount === void 0) {
+        tagCount = 0;
+      }
       this.attr = void 0;
+      this.tagAnchor = void 0;
+      this.tagOrder = void 0;
       this._startDate = void 0;
       this._endDate = void 0;
+      this._cue = void 0;
       this._badValueForSameId = void 0;
+      this.tagAnchor = (dateRangeWithSameId == null ? void 0 : dateRangeWithSameId.tagAnchor) || null;
+      this.tagOrder = (_dateRangeWithSameId$ = dateRangeWithSameId == null ? void 0 : dateRangeWithSameId.tagOrder) != null ? _dateRangeWithSameId$ : tagCount;
       if (dateRangeWithSameId) {
         var previousAttr = dateRangeWithSameId.attr;
         for (var key in previousAttr) {
@@ -624,9 +695,9 @@
         dateRangeAttr = _extends(new AttrList({}), previousAttr, dateRangeAttr);
       }
       this.attr = dateRangeAttr;
-      this._startDate = new Date(dateRangeAttr["START-DATE"]);
+      this._startDate = dateRangeWithSameId ? dateRangeWithSameId.startDate : new Date(dateRangeAttr["START-DATE"]);
       if ("END-DATE" in this.attr) {
-        var endDate = new Date(this.attr["END-DATE"]);
+        var endDate = (dateRangeWithSameId == null ? void 0 : dateRangeWithSameId.endDate) || new Date(this.attr["END-DATE"]);
         if (isFiniteNumber(endDate.getTime())) {
           this._endDate = endDate;
         }
@@ -642,6 +713,30 @@
       get: function get() {
         return this.attr.CLASS;
       }
+    }, {
+      key: "cue",
+      get: function get() {
+        var _cue = this._cue;
+        if (_cue === undefined) {
+          return this._cue = this.attr.enumeratedStringList(this.attr.CUE ? 'CUE' : 'X-CUE', {
+            pre: false,
+            post: false,
+            once: false
+          });
+        }
+        return _cue;
+      }
+    }, {
+      key: "startTime",
+      get: function get() {
+        var tagAnchor = this.tagAnchor;
+        // eslint-disable-next-line @typescript-eslint/prefer-optional-chain
+        if (tagAnchor === null || tagAnchor.programDateTime === null) {
+          logger.warn("Expected tagAnchor Fragment with PDT set for DateRange \"" + this.id + "\": " + tagAnchor);
+          return NaN;
+        }
+        return tagAnchor.start + (this.startDate.getTime() - tagAnchor.programDateTime) / 1000;
+      }
     }, {
       key: "startDate",
       get: function get() {
@@ -685,10 +780,15 @@
       get: function get() {
         return this.attr.bool("END-ON-NEXT");
       }
+    }, {
+      key: "isInterstitial",
+      get: function get() {
+        return this.class === CLASS_INTERSTITIAL;
+      }
     }, {
       key: "isValid",
       get: function get() {
-        return !!this.id && !this._badValueForSameId && isFiniteNumber(this.startDate.getTime()) && (this.duration === null || this.duration >= 0) && (!this.endOnNext || !!this.class);
+        return !!this.id && !this._badValueForSameId && isFiniteNumber(this.startDate.getTime()) && (this.duration === null || this.duration >= 0) && (!this.endOnNext || !!this.class) && (!this.attr.CUE || !this.cue.pre && !this.cue.post || this.cue.pre !== this.cue.post) && (!this.isInterstitial || 'X-ASSET-URI' in this.attr || 'X-ASSET-LIST' in this.attr);
       }
     }]);
   }();
@@ -780,7 +880,6 @@
       }
     }]);
   }();
-
   /**
    * Object representing parsed data from an HLS Segment. Found in {@link hls.js#LevelDetails.fragments}.
    */
@@ -1011,6 +1110,7 @@
       this.fragmentHint = void 0;
       this.partList = null;
       this.dateRanges = void 0;
+      this.dateRangeTagCount = 0;
       this.live = true;
       this.ageHeader = 0;
       this.advancedDateTime = void 0;
@@ -2659,7 +2759,7 @@
         if (result[1]) {
           var _level$unknownCodecs;
           // '#EXT-X-STREAM-INF' is found, parse level tag  in group 1
-          var attrs = new AttrList(result[1]);
+          var attrs = new AttrList(result[1], parsed);
           var uri = result[2];
           var level = {
             attrs: attrs,
@@ -2684,7 +2784,7 @@
             case 'SESSION-DATA':
               {
                 // #EXT-X-SESSION-DATA
-                var sessionAttrs = new AttrList(attributes);
+                var sessionAttrs = new AttrList(attributes, parsed);
                 var dataId = sessionAttrs['DATA-ID'];
                 if (dataId) {
                   if (parsed.sessionData === null) {
@@ -2697,7 +2797,7 @@
             case 'SESSION-KEY':
               {
                 // #EXT-X-SESSION-KEY
-                var sessionKey = parseKey(attributes, baseurl);
+                var sessionKey = parseKey(attributes, baseurl, parsed);
                 if (sessionKey.encrypted && sessionKey.isSupported()) {
                   if (parsed.sessionKeys === null) {
                     parsed.sessionKeys = [];
@@ -2715,7 +2815,7 @@
             case 'CONTENT-STEERING':
               {
                 // #EXT-X-CONTENT-STEERING
-                var contentSteeringAttributes = new AttrList(attributes);
+                var contentSteeringAttributes = new AttrList(attributes, parsed);
                 parsed.contentSteering = {
                   uri: M3U8Parser.resolve(contentSteeringAttributes['SERVER-URI'], baseurl),
                   pathwayId: contentSteeringAttributes['PATHWAY-ID'] || '.'
@@ -2761,7 +2861,7 @@
       var id = 0;
       MASTER_PLAYLIST_MEDIA_REGEX.lastIndex = 0;
       while ((result = MASTER_PLAYLIST_MEDIA_REGEX.exec(string)) !== null) {
-        var attrs = new AttrList(result[1]);
+        var attrs = new AttrList(result[1], parsed);
         var type = attrs.TYPE;
         if (type) {
           var groups = groupsByType[type];
@@ -2813,6 +2913,7 @@
     M3U8Parser.parseLevelPlaylist = function parseLevelPlaylist(string, baseurl, id, type, levelUrlId, multivariantVariableList) {
       var level = new LevelDetails(baseurl);
       var fragments = level.fragments;
+      var programDateTimes = [];
       // The most recent init segment seen (applies to all subsequent segments)
       var currentInitSegment = null;
       var currentSN = 0;
@@ -2871,7 +2972,7 @@
             // avoid sliced strings    https://github.com/video-dev/hls.js/issues/939
             var uri = (' ' + result[3]).slice(1);
             frag.relurl = uri;
-            assignProgramDateTime(frag, prevFrag);
+            assignProgramDateTime(frag, prevFrag, programDateTimes);
             prevFrag = frag;
             totalduration += frag.duration;
             currentSN++;
@@ -2919,19 +3020,22 @@
               break;
             case 'SKIP':
               {
-                var skipAttrs = new AttrList(value1);
+                if (level.skippedSegments) {
+                  level.playlistParsingError = new Error("#EXT-X-SKIP MUST NOT appear more than once in a Playlist");
+                }
+                var skipAttrs = new AttrList(value1, level);
                 var skippedSegments = skipAttrs.decimalInteger('SKIPPED-SEGMENTS');
                 if (isFiniteNumber(skippedSegments)) {
-                  level.skippedSegments = skippedSegments;
+                  level.skippedSegments += skippedSegments;
                   // This will result in fragments[] containing undefined values, which we will fill in with `mergeDetails`
                   for (var _i = skippedSegments; _i--;) {
-                    fragments.unshift(null);
+                    fragments.push(null);
                   }
                   currentSN += skippedSegments;
                 }
                 var recentlyRemovedDateranges = skipAttrs.enumeratedString('RECENTLY-REMOVED-DATERANGES');
                 if (recentlyRemovedDateranges) {
-                  level.recentlyRemovedDateranges = recentlyRemovedDateranges.split('\t');
+                  level.recentlyRemovedDateranges = (level.recentlyRemovedDateranges || []).concat(recentlyRemovedDateranges.split('\t'));
                 }
                 break;
               }
@@ -2965,8 +3069,9 @@
               break;
             case 'DATERANGE':
               {
-                var dateRangeAttr = new AttrList(value1);
-                var dateRange = new DateRange(dateRangeAttr, level.dateRanges[dateRangeAttr.ID]);
+                var dateRangeAttr = new AttrList(value1, level);
+                var dateRange = new DateRange(dateRangeAttr, level.dateRanges[dateRangeAttr.ID], level.dateRangeTagCount);
+                level.dateRangeTagCount++;
                 if (dateRange.isValid || level.skippedSegments) {
                   level.dateRanges[dateRange.id] = dateRange;
                 } else {
@@ -2985,7 +3090,7 @@
               break;
             case 'KEY':
               {
-                var levelKey = parseKey(value1, baseurl);
+                var levelKey = parseKey(value1, baseurl, level);
                 if (levelKey.isSupported()) {
                   if (levelKey.method === 'NONE') {
                     levelkeys = undefined;
@@ -3008,7 +3113,7 @@
               break;
             case 'MAP':
               {
-                var mapAttrs = new AttrList(value1);
+                var mapAttrs = new AttrList(value1, level);
                 if (frag.duration) {
                   // Initial segment tag is after segment duration tag.
                   //   #EXTINF: 6.0
@@ -3034,6 +3139,7 @@
                   currentInitSegment = frag;
                   createNextFrag = true;
                 }
+                currentInitSegment.cc = discontinuityCounter;
                 break;
               }
             case 'SERVER-CONTROL':
@@ -3060,7 +3166,7 @@
                 }
                 var previousFragmentPart = currentPart > 0 ? partList[partList.length - 1] : undefined;
                 var index = currentPart++;
-                var partAttrs = new AttrList(value1);
+                var partAttrs = new AttrList(value1, level);
                 var part = new Part(partAttrs, frag, baseurl, index, previousFragmentPart);
                 partList.push(part);
                 frag.duration += part.duration;
@@ -3068,13 +3174,13 @@
               }
             case 'PRELOAD-HINT':
               {
-                var preloadHintAttrs = new AttrList(value1);
+                var preloadHintAttrs = new AttrList(value1, level);
                 level.preloadHint = preloadHintAttrs;
                 break;
               }
             case 'RENDITION-REPORT':
               {
-                var renditionReportAttrs = new AttrList(value1);
+                var renditionReportAttrs = new AttrList(value1, level);
                 level.renditionReports = level.renditionReports || [];
                 level.renditionReports.push(renditionReportAttrs);
                 break;
@@ -3092,7 +3198,7 @@
           level.fragmentHint = prevFrag;
         }
       } else if (level.partList) {
-        assignProgramDateTime(frag, prevFrag);
+        assignProgramDateTime(frag, prevFrag, programDateTimes);
         frag.cc = discontinuityCounter;
         level.fragmentHint = frag;
         if (levelkeys) {
@@ -3113,6 +3219,21 @@
         if (firstFragment) {
           level.startCC = firstFragment.cc;
         }
+        /**
+         * Backfill any missing PDT values
+         * "If the first EXT-X-PROGRAM-DATE-TIME tag in a Playlist appears after
+         * one or more Media Segment URIs, the client SHOULD extrapolate
+         * backward from that tag (using EXTINF durations and/or media
+         * timestamps) to associate dates with those segments."
+         * We have already extrapolated forward, but all fragments up to the first instance of PDT do not have their PDTs
+         * computed.
+         */
+        if (firstPdtIndex > 0) {
+          backfillProgramDateTimes(fragments, firstPdtIndex);
+          if (firstFragment) {
+            programDateTimes.unshift(firstFragment);
+          }
+        }
       } else {
         level.endSN = 0;
         level.startCC = 0;
@@ -3121,28 +3242,63 @@
         totalduration += level.fragmentHint.duration;
       }
       level.totalduration = totalduration;
-      level.endCC = discontinuityCounter;
-
-      /**
-       * Backfill any missing PDT values
-       * "If the first EXT-X-PROGRAM-DATE-TIME tag in a Playlist appears after
-       * one or more Media Segment URIs, the client SHOULD extrapolate
-       * backward from that tag (using EXTINF durations and/or media
-       * timestamps) to associate dates with those segments."
-       * We have already extrapolated forward, but all fragments up to the first instance of PDT do not have their PDTs
-       * computed.
-       */
-      if (firstPdtIndex > 0) {
-        backfillProgramDateTimes(fragments, firstPdtIndex);
+      if (programDateTimes.length && level.dateRangeTagCount && firstFragment) {
+        mapDateRanges(programDateTimes, level);
       }
+      level.endCC = discontinuityCounter;
       return level;
     };
     return M3U8Parser;
   }();
+  function mapDateRanges(programDateTimes, details) {
+    // Make sure DateRanges are mapped to a ProgramDateTime tag that applies a date to a segment that overlaps with its start date
+    var programDateTimeCount = programDateTimes.length;
+    var lastProgramDateTime = programDateTimes[programDateTimeCount - 1];
+    var playlistEnd = details.live ? Infinity : details.totalduration;
+    var dateRangeIds = Object.keys(details.dateRanges);
+    for (var i = dateRangeIds.length; i--;) {
+      var dateRange = details.dateRanges[dateRangeIds[i]];
+      var startDateTime = dateRange.startDate.getTime();
+      dateRange.tagAnchor = lastProgramDateTime;
+      for (var j = programDateTimeCount; j--;) {
+        var fragIndex = findFragmentWithStartDate(details, startDateTime, programDateTimes, j, playlistEnd);
+        if (fragIndex !== -1) {
+          dateRange.tagAnchor = details.fragments[fragIndex];
+          break;
+        }
+      }
+    }
+  }
+  function findFragmentWithStartDate(details, startDateTime, programDateTimes, index, endTime) {
+    var pdtFragment = programDateTimes[index];
+    if (pdtFragment) {
+      var _programDateTimes;
+      // find matching range between PDT tags
+      var durationBetweenPdt = (((_programDateTimes = programDateTimes[index + 1]) == null ? void 0 : _programDateTimes.start) || endTime) - pdtFragment.start;
+      var pdtStart = pdtFragment.programDateTime;
+      if ((startDateTime >= pdtStart || index === 0) && startDateTime <= pdtStart + durationBetweenPdt * 1000) {
+        // map to fragment with date-time range
+        var startIndex = programDateTimes[index].sn - details.startSN;
+        var fragments = details.fragments;
+        if (fragments.length > programDateTimes.length) {
+          var endSegment = programDateTimes[index + 1] || fragments[fragments.length - 1];
+          var endIndex = endSegment.sn - details.startSN;
+          for (var i = endIndex; i > startIndex; i--) {
+            var fragStartDateTime = fragments[i].programDateTime;
+            if (startDateTime >= fragStartDateTime && startDateTime < fragStartDateTime + fragments[i].duration * 1000) {
+              return i;
+            }
+          }
+        }
+        return startIndex;
+      }
+    }
+    return -1;
+  }
   function parseKey(keyTagAttributes, baseurl, parsed) {
     var _keyAttrs$METHOD, _keyAttrs$KEYFORMAT;
     // https://tools.ietf.org/html/rfc8216#section-4.3.2.4
-    var keyAttrs = new AttrList(keyTagAttributes);
+    var keyAttrs = new AttrList(keyTagAttributes, parsed);
     var decryptmethod = (_keyAttrs$METHOD = keyAttrs.METHOD) != null ? _keyAttrs$METHOD : '';
     var decrypturi = keyAttrs.URI;
     var decryptiv = keyAttrs.hexadecimalInteger('IV');
@@ -3203,16 +3359,18 @@
       fragPrev = frag;
     }
   }
-  function assignProgramDateTime(frag, prevFrag) {
+  function assignProgramDateTime(frag, prevFrag, programDateTimes) {
     if (frag.rawProgramDateTime) {
       frag.programDateTime = Date.parse(frag.rawProgramDateTime);
+      if (!isFiniteNumber(frag.programDateTime)) {
+        frag.programDateTime = null;
+        frag.rawProgramDateTime = null;
+        return;
+      }
+      programDateTimes.push(frag);
     } else if (prevFrag != null && prevFrag.programDateTime) {
       frag.programDateTime = prevFrag.endProgramDateTime;
     }
-    if (!isFiniteNumber(frag.programDateTime)) {
-      frag.programDateTime = null;
-      frag.rawProgramDateTime = null;
-    }
   }
   function setInitSegment(frag, mapAttrs, id, levelkeys) {
     frag.relurl = mapAttrs.URI;
@@ -4292,9 +4450,6 @@
     }
     return Number.POSITIVE_INFINITY;
   }();
-  function dateRangeDateToTimelineSeconds(date, offset) {
-    return date.getTime() / 1000 - offset;
-  }
   function hexToArrayBuffer(str) {
     return Uint8Array.from(str.replace(/^0x/, '').replace(/([\da-fA-F]{2}) ?/g, '0x$1 ').replace(/ +$/, '').split(' ')).buffer;
   }
@@ -4324,6 +4479,7 @@
       hls.on(Events.FRAG_PARSING_METADATA, this.onFragParsingMetadata, this);
       hls.on(Events.BUFFER_FLUSHING, this.onBufferFlushing, this);
       hls.on(Events.LEVEL_UPDATED, this.onLevelUpdated, this);
+      hls.on(Events.LEVEL_PTS_UPDATED, this.onLevelPtsUpdated, this);
     };
     _proto._unregisterListeners = function _unregisterListeners() {
       var hls = this.hls;
@@ -4333,6 +4489,7 @@
       hls.off(Events.FRAG_PARSING_METADATA, this.onFragParsingMetadata, this);
       hls.off(Events.BUFFER_FLUSHING, this.onBufferFlushing, this);
       hls.off(Events.LEVEL_UPDATED, this.onLevelUpdated, this);
+      hls.off(Events.LEVEL_PTS_UPDATED, this.onLevelPtsUpdated, this);
     }
 
     // Add ID3 metatadata text track.
@@ -4465,8 +4622,16 @@
       }
     };
     _proto.onLevelUpdated = function onLevelUpdated(event, _ref2) {
-      var _this = this;
       var details = _ref2.details;
+      this.updateDateRangeCues(details, true);
+    };
+    _proto.onLevelPtsUpdated = function onLevelPtsUpdated(event, data) {
+      if (Math.abs(data.drift) > 0.01) {
+        this.updateDateRangeCues(data.details);
+      }
+    };
+    _proto.updateDateRangeCues = function updateDateRangeCues(details, removeOldCues) {
+      var _this = this;
       if (!this.media || !details.hasProgramDateTime || !this.hls.config.enableDateRangeMetadataCues) {
         return;
       }
@@ -4475,7 +4640,7 @@
       var dateRanges = details.dateRanges;
       var ids = Object.keys(dateRanges);
       // Remove cues from track not found in details.dateRanges
-      if (id3Track) {
+      if (id3Track && removeOldCues) {
         var idsToRemove = Object.keys(dateRangeCuesAppended).filter(function (id) {
           return !ids.includes(id);
         });
@@ -4498,21 +4663,21 @@
       if (!this.id3Track) {
         this.id3Track = this.createTrack(this.media);
       }
-      var dateTimeOffset = lastFragment.programDateTime / 1000 - lastFragment.start;
       var Cue = getCueClass();
       var _loop2 = function _loop2() {
         var id = ids[_i];
         var dateRange = dateRanges[id];
-        var startTime = dateRangeDateToTimelineSeconds(dateRange.startDate, dateTimeOffset);
+        var startTime = dateRange.startTime;
 
         // Process DateRanges to determine end-time (known DURATION, END-DATE, or END-ON-NEXT)
         var appendedDateRangeCues = dateRangeCuesAppended[id];
         var cues = (appendedDateRangeCues == null ? void 0 : appendedDateRangeCues.cues) || {};
         var durationKnown = (appendedDateRangeCues == null ? void 0 : appendedDateRangeCues.durationKnown) || false;
         var endTime = MAX_CUE_ENDTIME;
-        var endDate = dateRange.endDate;
-        if (endDate) {
-          endTime = dateRangeDateToTimelineSeconds(endDate, dateTimeOffset);
+        var duration = dateRange.duration,
+          endDate = dateRange.endDate;
+        if (endDate && duration !== null) {
+          endTime = startTime + duration;
           durationKnown = true;
         } else if (dateRange.endOnNext && !durationKnown) {
           var nextDateRangeWithSameClass = ids.reduce(function (candidateDateRange, id) {
@@ -4525,7 +4690,7 @@
             return candidateDateRange;
           }, null);
           if (nextDateRangeWithSameClass) {
-            endTime = dateRangeDateToTimelineSeconds(nextDateRangeWithSameClass.startDate, dateTimeOffset);
+            endTime = nextDateRangeWithSameClass.startTime;
             durationKnown = true;
           }
         }
@@ -4542,6 +4707,9 @@
           if (cue) {
             if (durationKnown && !appendedDateRangeCues.durationKnown) {
               cue.endTime = endTime;
+            } else if (Math.abs(cue.startTime - startTime) > 0.01) {
+              cue.startTime = startTime;
+              cue.endTime = endTime;
             }
           } else if (Cue) {
             var data = dateRange.attr[key];
@@ -5072,7 +5240,7 @@
     frag.endPTS = endPTS;
     frag.minEndPTS = minEndPTS;
     frag.endDTS = endDTS;
-    var sn = frag.sn; // 'initSegment'
+    var sn = frag.sn;
     // exit if sn out of range
     if (!details || sn < details.startSN || sn > details.endSN) {
       return 0;
@@ -5150,8 +5318,8 @@
         currentInitSegment = oldFrag.initSegment;
       }
     });
+    var fragmentsToCheck = newDetails.fragmentHint ? newDetails.fragments.concat(newDetails.fragmentHint) : newDetails.fragments;
     if (currentInitSegment) {
-      var fragmentsToCheck = newDetails.fragmentHint ? newDetails.fragments.concat(newDetails.fragmentHint) : newDetails.fragments;
       fragmentsToCheck.forEach(function (frag) {
         var _currentInitSegment;
         if (frag && (!frag.initSegment || frag.initSegment.relurl === ((_currentInitSegment = currentInitSegment) == null ? void 0 : _currentInitSegment.relurl))) {
@@ -5170,15 +5338,28 @@
         }
         newDetails.startSN = newDetails.fragments[0].sn;
         newDetails.startCC = newDetails.fragments[0].cc;
-      } else if (newDetails.canSkipDateRanges) {
-        newDetails.dateRanges = mergeDateRanges(oldDetails.dateRanges, newDetails.dateRanges, newDetails.recentlyRemovedDateranges);
+      } else {
+        if (newDetails.canSkipDateRanges) {
+          newDetails.dateRanges = mergeDateRanges(oldDetails.dateRanges, newDetails);
+        }
+        var programDateTimes = oldDetails.fragments.filter(function (frag) {
+          return frag.rawProgramDateTime;
+        });
+        if (oldDetails.hasProgramDateTime && !newDetails.hasProgramDateTime) {
+          for (var _i2 = 1; _i2 < fragmentsToCheck.length; _i2++) {
+            if (fragmentsToCheck[_i2].programDateTime === null) {
+              assignProgramDateTime(fragmentsToCheck[_i2], fragmentsToCheck[_i2 - 1], programDateTimes);
+            }
+          }
+        }
+        mapDateRanges(programDateTimes, newDetails);
       }
     }
     var newFragments = newDetails.fragments;
     if (ccOffset) {
       logger.warn('discontinuity sliding from playlist, take drift into account');
-      for (var _i2 = 0; _i2 < newFragments.length; _i2++) {
-        newFragments[_i2].cc += ccOffset;
+      for (var _i3 = 0; _i3 < newFragments.length; _i3++) {
+        newFragments[_i3].cc += ccOffset;
       }
     }
     if (newDetails.skippedSegments) {
@@ -5220,21 +5401,31 @@
       newDetails.advancedDateTime = oldDetails.advancedDateTime;
     }
   }
-  function mergeDateRanges(oldDateRanges, deltaDateRanges, recentlyRemovedDateranges) {
+  function mergeDateRanges(oldDateRanges, newDetails) {
+    var deltaDateRanges = newDetails.dateRanges,
+      recentlyRemovedDateranges = newDetails.recentlyRemovedDateranges;
     var dateRanges = _extends({}, oldDateRanges);
     if (recentlyRemovedDateranges) {
       recentlyRemovedDateranges.forEach(function (id) {
         delete dateRanges[id];
       });
     }
-    Object.keys(deltaDateRanges).forEach(function (id) {
-      var dateRange = new DateRange(deltaDateRanges[id].attr, dateRanges[id]);
-      if (dateRange.isValid) {
-        dateRanges[id] = dateRange;
-      } else {
-        logger.warn("Ignoring invalid Playlist Delta Update DATERANGE tag: \"" + JSON.stringify(deltaDateRanges[id].attr) + "\"");
-      }
-    });
+    var mergeIds = Object.keys(dateRanges);
+    var mergeCount = mergeIds.length;
+    if (mergeCount) {
+      Object.keys(deltaDateRanges).forEach(function (id) {
+        var mergedDateRange = dateRanges[id];
+        var dateRange = new DateRange(deltaDateRanges[id].attr, mergedDateRange);
+        if (dateRange.isValid) {
+          dateRanges[id] = dateRange;
+          if (!mergedDateRange) {
+            dateRange.tagOrder += mergeCount;
+          }
+        } else {
+          logger.warn("Ignoring invalid Playlist Delta Update DATERANGE tag: \"" + JSON.stringify(deltaDateRanges[id].attr) + "\"");
+        }
+      });
+    }
     return dateRanges;
   }
   function mapPartIntersection(oldParts, newParts, intersectionFn) {
@@ -5261,7 +5452,7 @@
     for (var i = start; i <= end; i++) {
       var _oldFrag = oldFrags[delta + i];
       var _newFrag = newFrags[i];
-      if (skippedSegments && !_newFrag && i < skippedSegments) {
+      if (skippedSegments && !_newFrag && _oldFrag) {
         // Fill in skipped segments in delta playlist
         _newFrag = newDetails.fragments[i] = _oldFrag;
       }
@@ -5314,19 +5505,19 @@
     return Math.round(reloadInterval);
   }
   function getFragmentWithSN(level, sn, fragCurrent) {
-    if (!(level != null && level.details)) {
+    var details = level == null ? void 0 : level.details;
+    if (!details) {
       return null;
     }
-    var levelDetails = level.details;
-    var fragment = levelDetails.fragments[sn - levelDetails.startSN];
+    var fragment = details.fragments[sn - details.startSN];
     if (fragment) {
       return fragment;
     }
-    fragment = levelDetails.fragmentHint;
+    fragment = details.fragmentHint;
     if (fragment && fragment.sn === sn) {
       return fragment;
     }
-    if (sn < levelDetails.startSN && fragCurrent && fragCurrent.sn === sn) {
+    if (sn < details.startSN && fragCurrent && fragCurrent.sn === sn) {
       return fragCurrent;
     }
     return null;
@@ -10872,11 +11063,10 @@
     _proto.detectPartialFragments = function detectPartialFragments(data) {
       var _this2 = this;
       var timeRanges = this.timeRanges;
-      var frag = data.frag,
-        part = data.part;
-      if (!timeRanges || frag.sn === 'initSegment') {
+      if (!timeRanges || data.frag.sn === 'initSegment') {
         return;
       }
+      var frag = data.frag;
       var fragKey = getFragmentKey(frag);
       var fragmentEntity = this.fragments[fragKey];
       if (!fragmentEntity || fragmentEntity.buffered && frag.gap) {
@@ -10890,7 +11080,7 @@
         }
         var timeRange = timeRanges[elementaryStream];
         var partial = isFragHint || streamInfo.partial === true;
-        fragmentEntity.range[elementaryStream] = _this2.getBufferedTimes(frag, part, partial, timeRange);
+        fragmentEntity.range[elementaryStream] = _this2.getBufferedTimes(frag, data.part, partial, timeRange);
       });
       fragmentEntity.loaded = null;
       if (Object.keys(fragmentEntity.range).length) {
@@ -11043,16 +11233,14 @@
       return false;
     };
     _proto.onFragLoaded = function onFragLoaded(event, data) {
-      var frag = data.frag,
-        part = data.part;
       // don't track initsegment (for which sn is not a number)
       // don't track frags used for bitrateTest, they're irrelevant.
-      if (frag.sn === 'initSegment' || frag.bitrateTest) {
+      if (data.frag.sn === 'initSegment' || data.frag.bitrateTest) {
         return;
       }
-
+      var frag = data.frag;
       // Fragment entity `loaded` FragLoadedData is null when loading parts
-      var loaded = part ? null : data;
+      var loaded = data.part ? null : data;
       var fragKey = getFragmentKey(frag);
       this.fragments[fragKey] = {
         body: frag,
@@ -13184,14 +13372,12 @@
         part.stats.parsing.end = now;
       }
       // See if part loading should be disabled/enabled based on buffer and playback position.
-      if (frag.sn !== 'initSegment') {
-        var levelDetails = this.getLevelDetails();
-        var loadingPartsAtEdge = levelDetails && frag.sn > levelDetails.endSN;
-        var shouldLoadParts = loadingPartsAtEdge || this.shouldLoadParts(levelDetails, frag.end);
-        if (shouldLoadParts !== this.loadingParts) {
-          this.log("LL-Part loading " + (shouldLoadParts ? 'ON' : 'OFF') + " after parsing segment ending @" + frag.end.toFixed(2));
-          this.loadingParts = shouldLoadParts;
-        }
+      var levelDetails = this.getLevelDetails();
+      var loadingPartsAtEdge = levelDetails && frag.sn > levelDetails.endSN;
+      var shouldLoadParts = loadingPartsAtEdge || this.shouldLoadParts(levelDetails, frag.end);
+      if (shouldLoadParts !== this.loadingParts) {
+        this.log("LL-Part loading " + (shouldLoadParts ? 'ON' : 'OFF') + " after parsing segment ending @" + frag.end.toFixed(2));
+        this.loadingParts = shouldLoadParts;
       }
       this.updateLevelTiming(frag, part, level, chunkMeta.partial);
     };
@@ -20199,8 +20385,8 @@
     };
     _proto._handleFragmentLoadProgress = function _handleFragmentLoadProgress(data) {
       var _frag$initSegment;
-      var frag = data.frag,
-        part = data.part,
+      var frag = data.frag;
+      var part = data.part,
         payload = data.payload;
       var levels = this.levels;
       if (!levels) {
@@ -20540,7 +20726,7 @@
       }
 
       // Avoid buffering if backtracking this fragment
-      if (video && details && frag.sn !== 'initSegment') {
+      if (video && details) {
         var prevFrag = details.fragments[frag.sn - 1 - details.startSN];
         var isFirstFragment = frag.sn === details.startSN;
         var isFirstInDiscontinuity = !prevFrag || frag.cc > prevFrag.cc;
@@ -21709,7 +21895,7 @@
        * Get the video-dev/hls.js package version.
        */
       function get() {
-        return "1.5.12-0.canary.10340";
+        return "1.5.12-0.canary.10341";
       }
     }, {
       key: "Events",