hls.js 1.6.0-beta.1.0.canary.10764 → 1.6.0-beta.1.0.canary.10766

package/dist/hls.light.js

@@ -1028,7 +1028,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.0-beta.1.0.canary.10764");
+        newLogger.log("Debug logs enabled for \"" + context + "\" in hls.js version " + "1.6.0-beta.1.0.canary.10766");
       } catch (e) {
         /* log fn threw an exception. All logger methods are no-ops. */
         return createLogger();
@@ -3272,6 +3272,10 @@
       }
     }]);
   }();
+  function isMediaFragment(frag) {
+    return frag.sn !== 'initSegment';
+  }
+
   /**
    * Object representing parsed data from an HLS Segment. Found in {@link hls.js#LevelDetails.fragments}.
    */
@@ -3492,7 +3496,7 @@
     }, {
       key: "ref",
       get: function get() {
-        if (this.sn === 'initSegment') {
+        if (!isMediaFragment(this)) {
           return null;
         }
         if (!this._ref) {
@@ -16882,7 +16886,7 @@
       var _data$deliveryDirecti2;
       var level = data.level,
         details = data.details;
-      var curLevel = this._levels[level];
+      var curLevel = data.levelInfo;
       if (!curLevel) {
         var _data$deliveryDirecti;
         this.warn("Invalid level index " + level);
@@ -16893,7 +16897,7 @@
       }
 
       // only process level loaded events matching with expected level
-      if (level === this.currentLevelIndex) {
+      if (curLevel === this.currentLevel) {
         // reset level load error counter on successful level loaded only if there is no issues with fragments
         if (curLevel.fragmentError === 0) {
           curLevel.loadError = 0;
@@ -16931,6 +16935,7 @@
         this.hls.trigger(Events.LEVEL_LOADING, {
           url: url,
           level: currentLevelIndex,
+          levelInfo: currentLevel,
           pathwayId: currentLevel.attrs['PATHWAY-ID'],
           id: 0,
           // Deprecated Level urlId
@@ -18251,7 +18256,7 @@
     _proto.fragBufferedComplete = function fragBufferedComplete(frag, part) {
       var media = this.mediaBuffer ? this.mediaBuffer : this.media;
       this.log("Buffered " + frag.type + " sn: " + frag.sn + (part ? ' part: ' + part.index : '') + " of " + this.fragInfo(frag, false, part) + " > buffer:" + (media ? TimeRanges.toString(BufferHelper.getBuffered(media)) : '(detached)') + ")");
-      if (frag.sn !== 'initSegment') {
+      if (isMediaFragment(frag)) {
         var _this$levels;
         if (frag.type !== PlaylistLevelType.SUBTITLE) {
           var el = frag.elementaryStreams;
@@ -18325,7 +18330,7 @@
         this.keyLoader.loadClear(frag, details.encryptedFragments);
       }
       var fragPrevious = this.fragPrevious;
-      if (frag.sn !== 'initSegment' && (!fragPrevious || frag.sn !== fragPrevious.sn)) {
+      if (isMediaFragment(frag) && (!fragPrevious || frag.sn !== fragPrevious.sn)) {
         var shouldLoadParts = this.shouldLoadParts(level.details, frag.end);
         if (shouldLoadParts !== this.loadingParts) {
           this.log("LL-Part loading " + (shouldLoadParts ? 'ON' : 'OFF') + " loading sn " + (fragPrevious == null ? void 0 : fragPrevious.sn) + "->" + frag.sn);
@@ -18333,7 +18338,7 @@
         }
       }
       targetBufferTime = Math.max(frag.start, targetBufferTime || 0);
-      if (this.loadingParts && frag.sn !== 'initSegment') {
+      if (this.loadingParts && isMediaFragment(frag)) {
         var partList = details.partList;
         if (partList && progressCallback) {
           if (targetBufferTime > frag.end && details.fragmentHint) {
@@ -18376,7 +18381,7 @@
           }
         }
       }
-      if (frag.sn !== 'initSegment' && this.loadingParts) {
+      if (isMediaFragment(frag) && this.loadingParts) {
         this.log("LL-Part loading OFF after next part miss @" + targetBufferTime.toFixed(2));
         this.loadingParts = false;
       } else if (!frag.url) {
@@ -18918,7 +18923,7 @@
       return pos;
     };
     _proto.handleFragLoadAborted = function handleFragLoadAborted(frag, part) {
-      if (this.transmuxer && frag.sn !== 'initSegment' && frag.stats.aborted) {
+      if (this.transmuxer && isMediaFragment(frag) && frag.stats.aborted) {
         this.warn("Fragment " + frag.sn + (part ? ' part ' + part.index : '') + " of level " + frag.level + " was aborted");
         this.resetFragmentLoading(frag);
       }
@@ -18953,10 +18958,18 @@
       var errorAction = data.errorAction;
       var _ref2 = errorAction || {},
         action = _ref2.action,
+        flags = _ref2.flags,
         _ref2$retryCount = _ref2.retryCount,
         retryCount = _ref2$retryCount === void 0 ? 0 : _ref2$retryCount,
         retryConfig = _ref2.retryConfig;
-      if (errorAction && action === NetworkErrorAction.RetryRequest && retryConfig) {
+      var couldRetry = !!errorAction && !!retryConfig;
+      var retry = couldRetry && action === NetworkErrorAction.RetryRequest;
+      var noAlternate = couldRetry && !errorAction.resolved && flags === ErrorActionFlags.MoveAllAlternatesMatchingHost;
+      if (!retry && noAlternate && isMediaFragment(frag) && !frag.endList) {
+        this.resetFragmentErrors(filterType);
+        this.treatAsGap(frag);
+        errorAction.resolved = true;
+      } else if ((retry || noAlternate) && retryCount < retryConfig.maxNumRetry) {
         this.resetStartWhenNotLoaded(this.levelLastLoaded);
         var delay = getRetryDelay(retryConfig, retryCount);
         this.warn("Fragment " + frag.sn + " of " + filterType + " " + frag.level + " errored with " + data.details + ", retrying loading " + (retryCount + 1) + "/" + retryConfig.maxNumRetry + " in " + delay + "ms");
@@ -18974,7 +18987,7 @@
           this.warn(data.details + " reached or exceeded max retry (" + retryCount + ")");
           return;
         }
-      } else if ((errorAction == null ? void 0 : errorAction.action) === NetworkErrorAction.SendAlternateToPenaltyBox) {
+      } else if (action === NetworkErrorAction.SendAlternateToPenaltyBox) {
         this.state = State.WAITING_LEVEL;
       } else {
         this.state = State.ERROR;
@@ -19110,10 +19123,7 @@
         var error = new Error("Found no media in fragment " + frag.sn + " of level " + frag.level + " resetting transmuxer to fallback to playlist timing");
         if (level.fragmentError === 0) {
           // Mark and track the odd empty segment as a gap to avoid reloading
-          level.fragmentError++;
-          frag.gap = true;
-          this.fragmentTracker.removeFragment(frag);
-          this.fragmentTracker.fragBuffered(frag, true);
+          this.treatAsGap(frag, level);
         }
         this.warn(error.message);
         this.hls.trigger(Events.ERROR, {
@@ -19147,6 +19157,14 @@
       }
       return this.playlistLabel() + " " + frag.level + " (" + (part ? 'part' : 'frag') + ":[" + ((_ref3 = pts && !part ? frag.startPTS : (part || frag).start) != null ? _ref3 : NaN).toFixed(3) + "-" + ((_ref4 = pts && !part ? frag.endPTS : (part || frag).end) != null ? _ref4 : NaN).toFixed(3) + "]" + (part && frag.type === 'main' ? 'INDEPENDENT=' + (part.independent ? 'YES' : 'NO') : '');
     };
+    _proto.treatAsGap = function treatAsGap(frag, level) {
+      if (level) {
+        level.fragmentError++;
+      }
+      frag.gap = true;
+      this.fragmentTracker.removeFragment(frag);
+      this.fragmentTracker.fragBuffered(frag, true);
+    };
     _proto.resetTransmuxer = function resetTransmuxer() {
       var _this$transmuxer2;
       (_this$transmuxer2 = this.transmuxer) == null ? void 0 : _this$transmuxer2.reset();
@@ -19691,7 +19709,7 @@
     return !remuxResult.audio && !remuxResult.video && !remuxResult.text && !remuxResult.id3 && !remuxResult.initSegment;
   }
 
-  var version = "1.6.0-beta.1.0.canary.10764";
+  var version = "1.6.0-beta.1.0.canary.10766";
 
   // ensure the worker ends up in the bundle
   // If the worker should not be included this gets aliased to empty.js
@@ -20335,7 +20353,7 @@
       var targetBufferTime = this.backtrackFragment ? this.backtrackFragment.start : bufferInfo.end;
       var frag = this.getNextFragment(targetBufferTime, levelDetails);
       // Avoid backtracking by loading an earlier segment in streams with segments that do not start with a key frame (flagged by `couldBacktrack`)
-      if (this.couldBacktrack && !this.fragPrevious && frag && frag.sn !== 'initSegment' && this.fragmentTracker.getState(frag) !== FragmentState.OK) {
+      if (this.couldBacktrack && !this.fragPrevious && frag && isMediaFragment(frag) && this.fragmentTracker.getState(frag) !== FragmentState.OK) {
         var _this$backtrackFragme;
         var backtrackSn = ((_this$backtrackFragme = this.backtrackFragment) != null ? _this$backtrackFragme : frag).sn;
         var fragIdx = backtrackSn - levelDetails.startSN;
@@ -20372,7 +20390,7 @@
       // Check if fragment is not loaded
       var fragState = this.fragmentTracker.getState(frag);
       if (fragState === FragmentState.NOT_LOADED || fragState === FragmentState.PARTIAL) {
-        if (frag.sn === 'initSegment') {
+        if (!isMediaFragment(frag)) {
           this._loadInitSegment(frag, level);
         } else if (this.bitrateTest) {
           this.log("Fragment " + frag.sn + " of level " + frag.level + " is being downloaded to test bitrate and will not be buffered");
@@ -20560,7 +20578,7 @@
       if (!levels || this.state !== State.IDLE) {
         return;
       }
-      var level = levels[data.level];
+      var level = data.levelInfo;
       if (!level.details || level.details.live && this.levelLastLoaded !== level || this.waitForCdnTuneIn(level.details)) {
         this.state = State.WAITING_LEVEL;
       }
@@ -20577,7 +20595,7 @@
         return;
       }
       this.log("Level " + newLevelId + " loaded [" + newDetails.startSN + "," + newDetails.endSN + "]" + (newDetails.lastPartSn ? "[part-" + newDetails.lastPartSn + "-" + newDetails.lastPartIndex + "]" : '') + ", cc [" + newDetails.startCC + ", " + newDetails.endCC + "] duration:" + duration);
-      var curLevel = levels[newLevelId];
+      var curLevel = data.levelInfo;
       var fragCurrent = this.fragCurrent;
       if (fragCurrent && (this.state === State.FRAG_LOADING || this.state === State.FRAG_LOADING_WAITING_RETRY)) {
         if (fragCurrent.level !== data.level && fragCurrent.loader) {
@@ -20782,7 +20800,7 @@
         }
         var stats = part ? part.stats : frag.stats;
         this.fragLastKbps = Math.round(8 * stats.total / (stats.buffering.end - stats.loading.first));
-        if (frag.sn !== 'initSegment') {
+        if (isMediaFragment(frag)) {
           this.fragPrevious = frag;
         }
         this.fragBufferedComplete(frag, part);
@@ -21639,6 +21657,7 @@
       hls.on(Events.LEVEL_LOADING, this.onLevelLoading, this);
       hls.on(Events.AUDIO_TRACK_LOADING, this.onAudioTrackLoading, this);
       hls.on(Events.SUBTITLE_TRACK_LOADING, this.onSubtitleTrackLoading, this);
+      hls.on(Events.LEVELS_UPDATED, this.onLevelsUpdated, this);
     };
     _proto.unregisterListeners = function unregisterListeners() {
       var hls = this.hls;
@@ -21646,6 +21665,7 @@
       hls.off(Events.LEVEL_LOADING, this.onLevelLoading, this);
       hls.off(Events.AUDIO_TRACK_LOADING, this.onAudioTrackLoading, this);
       hls.off(Events.SUBTITLE_TRACK_LOADING, this.onSubtitleTrackLoading, this);
+      hls.off(Events.LEVELS_UPDATED, this.onLevelsUpdated, this);
     }
 
     /**
@@ -21695,7 +21715,8 @@
         responseType: 'text',
         type: PlaylistContextType.MANIFEST,
         url: url,
-        deliveryDirectives: null
+        deliveryDirectives: null,
+        levelOrTrack: null
       });
     };
     _proto.onLevelLoading = function onLevelLoading(event, data) {
@@ -21703,7 +21724,8 @@
         level = data.level,
         pathwayId = data.pathwayId,
         url = data.url,
-        deliveryDirectives = data.deliveryDirectives;
+        deliveryDirectives = data.deliveryDirectives,
+        levelInfo = data.levelInfo;
       this.load({
         id: id,
         level: level,
@@ -21711,14 +21733,16 @@
         responseType: 'text',
         type: PlaylistContextType.LEVEL,
         url: url,
-        deliveryDirectives: deliveryDirectives
+        deliveryDirectives: deliveryDirectives,
+        levelOrTrack: levelInfo
       });
     };
     _proto.onAudioTrackLoading = function onAudioTrackLoading(event, data) {
       var id = data.id,
         groupId = data.groupId,
         url = data.url,
-        deliveryDirectives = data.deliveryDirectives;
+        deliveryDirectives = data.deliveryDirectives,
+        track = data.track;
       this.load({
         id: id,
         groupId: groupId,
@@ -21726,14 +21750,16 @@
         responseType: 'text',
         type: PlaylistContextType.AUDIO_TRACK,
         url: url,
-        deliveryDirectives: deliveryDirectives
+        deliveryDirectives: deliveryDirectives,
+        levelOrTrack: track
       });
     };
     _proto.onSubtitleTrackLoading = function onSubtitleTrackLoading(event, data) {
       var id = data.id,
         groupId = data.groupId,
         url = data.url,
-        deliveryDirectives = data.deliveryDirectives;
+        deliveryDirectives = data.deliveryDirectives,
+        track = data.track;
       this.load({
         id: id,
         groupId: groupId,
@@ -21741,9 +21767,23 @@
         responseType: 'text',
         type: PlaylistContextType.SUBTITLE_TRACK,
         url: url,
-        deliveryDirectives: deliveryDirectives
+        deliveryDirectives: deliveryDirectives,
+        levelOrTrack: track
       });
     };
+    _proto.onLevelsUpdated = function onLevelsUpdated(event, data) {
+      // abort and delete loader of removed levels
+      var loader = this.loaders[PlaylistContextType.LEVEL];
+      if (loader) {
+        var context = loader.context;
+        if (context && !data.levels.some(function (lvl) {
+          return lvl === context.levelOrTrack;
+        })) {
+          loader.abort();
+          delete this.loaders[PlaylistContextType.LEVEL];
+        }
+      }
+    };
     _proto.load = function load(context) {
       var _context$deliveryDire,
         _this = this;
@@ -21755,7 +21795,7 @@
       var loader = this.getInternalLoader(context);
       if (loader) {
         var loaderContext = loader.context;
-        if (loaderContext && loaderContext.url === context.url && loaderContext.level === context.level) {
+        if (loaderContext && loaderContext.url === context.url && loaderContext.levelOrTrack === context.levelOrTrack) {
           // same URL can't overlap
           this.hls.logger.trace('[playlist-loader]: playlist request ongoing');
           return;
@@ -22076,6 +22116,7 @@
         case PlaylistContextType.LEVEL:
           hls.trigger(Events.LEVEL_LOADED, {
             details: levelDetails,
+            levelInfo: context.levelOrTrack || hls.levels[0],
             level: levelIndex || 0,
             id: id || 0,
             stats: stats,
@@ -22086,6 +22127,7 @@
         case PlaylistContextType.AUDIO_TRACK:
           hls.trigger(Events.AUDIO_TRACK_LOADED, {
             details: levelDetails,
+            track: context.levelOrTrack,
             id: id || 0,
             groupId: groupId || '',
             stats: stats,
@@ -22096,6 +22138,7 @@
         case PlaylistContextType.SUBTITLE_TRACK:
           hls.trigger(Events.SUBTITLE_TRACK_LOADED, {
             details: levelDetails,
+            track: context.levelOrTrack,
             id: id || 0,
             groupId: groupId || '',
             stats: stats,