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

package/dist/hls.light.mjs

@@ -400,7 +400,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.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();
@@ -2856,6 +2856,10 @@ class BaseSegment {
     elementaryStreams[ElementaryStreamTypes.AUDIOVIDEO] = null;
   }
 }
+function isMediaFragment(frag) {
+  return frag.sn !== 'initSegment';
+}
+
 /**
  * Object representing parsed data from an HLS Segment. Found in {@link hls.js#LevelDetails.fragments}.
  */
@@ -3009,7 +3013,7 @@ class Fragment extends BaseSegment {
     this._programDateTime = value;
   }
   get ref() {
-    if (this.sn === 'initSegment') {
+    if (!isMediaFragment(this)) {
       return null;
     }
     if (!this._ref) {
@@ -7924,7 +7928,7 @@ class BaseStreamController extends TaskLoop {
   fragBufferedComplete(frag, part) {
     const 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) {
         const el = frag.elementaryStreams;
@@ -7993,7 +7997,7 @@ class BaseStreamController extends TaskLoop {
       this.keyLoader.loadClear(frag, details.encryptedFragments);
     }
     const fragPrevious = this.fragPrevious;
-    if (frag.sn !== 'initSegment' && (!fragPrevious || frag.sn !== fragPrevious.sn)) {
+    if (isMediaFragment(frag) && (!fragPrevious || frag.sn !== fragPrevious.sn)) {
       const 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}`);
@@ -8001,7 +8005,7 @@ class BaseStreamController extends TaskLoop {
       }
     }
     targetBufferTime = Math.max(frag.start, targetBufferTime || 0);
-    if (this.loadingParts && frag.sn !== 'initSegment') {
+    if (this.loadingParts && isMediaFragment(frag)) {
       const partList = details.partList;
       if (partList && progressCallback) {
         if (targetBufferTime > frag.end && details.fragmentHint) {
@@ -8040,7 +8044,7 @@ class BaseStreamController extends TaskLoop {
         }
       }
     }
-    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) {
@@ -8599,7 +8603,7 @@ class BaseStreamController extends TaskLoop {
     return pos;
   }
   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);
     }
@@ -8634,10 +8638,18 @@ class BaseStreamController extends TaskLoop {
     const errorAction = data.errorAction;
     const {
       action,
+      flags,
       retryCount = 0,
       retryConfig
     } = errorAction || {};
-    if (errorAction && action === NetworkErrorAction.RetryRequest && retryConfig) {
+    const couldRetry = !!errorAction && !!retryConfig;
+    const retry = couldRetry && action === NetworkErrorAction.RetryRequest;
+    const 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);
       const 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`);
@@ -8655,7 +8667,7 @@ class BaseStreamController extends TaskLoop {
         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;
@@ -8787,10 +8799,7 @@ class BaseStreamController extends TaskLoop {
       const 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, {
@@ -8821,6 +8830,14 @@ class BaseStreamController extends TaskLoop {
     var _ref, _ref2;
     return `${this.playlistLabel()} ${frag.level} (${part ? 'part' : 'frag'}:[${((_ref = pts && !part ? frag.startPTS : (part || frag).start) != null ? _ref : NaN).toFixed(3)}-${((_ref2 = pts && !part ? frag.endPTS : (part || frag).end) != null ? _ref2 : NaN).toFixed(3)}]${part && frag.type === 'main' ? 'INDEPENDENT=' + (part.independent ? 'YES' : 'NO') : ''}`;
   }
+  treatAsGap(frag, level) {
+    if (level) {
+      level.fragmentError++;
+    }
+    frag.gap = true;
+    this.fragmentTracker.removeFragment(frag);
+    this.fragmentTracker.fragBuffered(frag, true);
+  }
   resetTransmuxer() {
     var _this$transmuxer2;
     (_this$transmuxer2 = this.transmuxer) == null ? void 0 : _this$transmuxer2.reset();
@@ -18608,7 +18625,7 @@ class LevelController extends BasePlaylistController {
       level,
       details
     } = data;
-    const curLevel = this._levels[level];
+    const curLevel = data.levelInfo;
     if (!curLevel) {
       var _data$deliveryDirecti;
       this.warn(`Invalid level index ${level}`);
@@ -18619,7 +18636,7 @@ class LevelController extends BasePlaylistController {
     }
 
     // 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;
@@ -18657,6 +18674,7 @@ class LevelController extends BasePlaylistController {
       this.hls.trigger(Events.LEVEL_LOADING, {
         url,
         level: currentLevelIndex,
+        levelInfo: currentLevel,
         pathwayId: currentLevel.attrs['PATHWAY-ID'],
         id: 0,
         // Deprecated Level urlId
@@ -19081,7 +19099,7 @@ class GapController extends Logger {
   }
 }
 
-const version = "1.6.0-beta.1.0.canary.10764";
+const 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
@@ -19741,7 +19759,7 @@ class StreamController extends BaseStreamController {
     const targetBufferTime = this.backtrackFragment ? this.backtrackFragment.start : bufferInfo.end;
     let 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;
       const backtrackSn = ((_this$backtrackFragme = this.backtrackFragment) != null ? _this$backtrackFragme : frag).sn;
       const fragIdx = backtrackSn - levelDetails.startSN;
@@ -19778,7 +19796,7 @@ class StreamController extends BaseStreamController {
     // Check if fragment is not loaded
     const 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`);
@@ -19972,7 +19990,7 @@ class StreamController extends BaseStreamController {
     if (!levels || this.state !== State.IDLE) {
       return;
     }
-    const level = levels[data.level];
+    const level = data.levelInfo;
     if (!level.details || level.details.live && this.levelLastLoaded !== level || this.waitForCdnTuneIn(level.details)) {
       this.state = State.WAITING_LEVEL;
     }
@@ -19991,7 +20009,7 @@ class StreamController extends BaseStreamController {
       return;
     }
     this.log(`Level ${newLevelId} loaded [${newDetails.startSN},${newDetails.endSN}]${newDetails.lastPartSn ? `[part-${newDetails.lastPartSn}-${newDetails.lastPartIndex}]` : ''}, cc [${newDetails.startCC}, ${newDetails.endCC}] duration:${duration}`);
-    const curLevel = levels[newLevelId];
+    const curLevel = data.levelInfo;
     const fragCurrent = this.fragCurrent;
     if (fragCurrent && (this.state === State.FRAG_LOADING || this.state === State.FRAG_LOADING_WAITING_RETRY)) {
       if (fragCurrent.level !== data.level && fragCurrent.loader) {
@@ -20204,7 +20222,7 @@ class StreamController extends BaseStreamController {
       }
       const 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);
@@ -21064,6 +21082,7 @@ class PlaylistLoader {
     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);
   }
   unregisterListeners() {
     const {
@@ -21073,6 +21092,7 @@ class PlaylistLoader {
     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);
   }
 
   /**
@@ -21124,7 +21144,8 @@ class PlaylistLoader {
       responseType: 'text',
       type: PlaylistContextType.MANIFEST,
       url,
-      deliveryDirectives: null
+      deliveryDirectives: null,
+      levelOrTrack: null
     });
   }
   onLevelLoading(event, data) {
@@ -21133,7 +21154,8 @@ class PlaylistLoader {
       level,
       pathwayId,
       url,
-      deliveryDirectives
+      deliveryDirectives,
+      levelInfo
     } = data;
     this.load({
       id,
@@ -21142,7 +21164,8 @@ class PlaylistLoader {
       responseType: 'text',
       type: PlaylistContextType.LEVEL,
       url,
-      deliveryDirectives
+      deliveryDirectives,
+      levelOrTrack: levelInfo
     });
   }
   onAudioTrackLoading(event, data) {
@@ -21150,7 +21173,8 @@ class PlaylistLoader {
       id,
       groupId,
       url,
-      deliveryDirectives
+      deliveryDirectives,
+      track
     } = data;
     this.load({
       id,
@@ -21159,7 +21183,8 @@ class PlaylistLoader {
       responseType: 'text',
       type: PlaylistContextType.AUDIO_TRACK,
       url,
-      deliveryDirectives
+      deliveryDirectives,
+      levelOrTrack: track
     });
   }
   onSubtitleTrackLoading(event, data) {
@@ -21167,7 +21192,8 @@ class PlaylistLoader {
       id,
       groupId,
       url,
-      deliveryDirectives
+      deliveryDirectives,
+      track
     } = data;
     this.load({
       id,
@@ -21176,9 +21202,21 @@ class PlaylistLoader {
       responseType: 'text',
       type: PlaylistContextType.SUBTITLE_TRACK,
       url,
-      deliveryDirectives
+      deliveryDirectives,
+      levelOrTrack: track
     });
   }
+  onLevelsUpdated(event, data) {
+    // abort and delete loader of removed levels
+    const loader = this.loaders[PlaylistContextType.LEVEL];
+    if (loader) {
+      const context = loader.context;
+      if (context && !data.levels.some(lvl => lvl === context.levelOrTrack)) {
+        loader.abort();
+        delete this.loaders[PlaylistContextType.LEVEL];
+      }
+    }
+  }
   load(context) {
     var _context$deliveryDire;
     const config = this.hls.config;
@@ -21189,7 +21227,7 @@ class PlaylistLoader {
     let loader = this.getInternalLoader(context);
     if (loader) {
       const 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;
@@ -21511,6 +21549,7 @@ class PlaylistLoader {
       case PlaylistContextType.LEVEL:
         hls.trigger(Events.LEVEL_LOADED, {
           details: levelDetails,
+          levelInfo: context.levelOrTrack || hls.levels[0],
           level: levelIndex || 0,
           id: id || 0,
           stats,
@@ -21521,6 +21560,7 @@ class PlaylistLoader {
       case PlaylistContextType.AUDIO_TRACK:
         hls.trigger(Events.AUDIO_TRACK_LOADED, {
           details: levelDetails,
+          track: context.levelOrTrack,
           id: id || 0,
           groupId: groupId || '',
           stats,
@@ -21531,6 +21571,7 @@ class PlaylistLoader {
       case PlaylistContextType.SUBTITLE_TRACK:
         hls.trigger(Events.SUBTITLE_TRACK_LOADED, {
           details: levelDetails,
+          track: context.levelOrTrack,
           id: id || 0,
           groupId: groupId || '',
           stats,