hls.js 1.6.0-beta.1.0.canary.10767 → 1.6.0-beta.1.0.canary.10770

package/dist/hls.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.10767"}`);
+      newLogger.log(`Debug logs enabled for "${context}" in hls.js version ${"1.6.0-beta.1.0.canary.10770"}`);
     } catch (e) {
       /* log fn threw an exception. All logger methods are no-ops. */
       return createLogger();
@@ -6399,6 +6399,13 @@ class LevelDetails {
     }
     return this.endSN;
   }
+  get expired() {
+    if (this.live && this.age) {
+      const playlistWindowDuration = this.partEnd - this.fragmentStart;
+      return this.age > Math.max(playlistWindowDuration, this.totalduration) + this.levelTargetDuration;
+    }
+    return false;
+  }
 }
 
 function isFullSegmentEncryption(method) {
@@ -8378,6 +8385,10 @@ class BaseStreamController extends TaskLoop {
       details.deltaUpdateFailed = true;
     }
   }
+  waitForLive(levelInfo) {
+    const details = levelInfo.details;
+    return (details == null ? void 0 : details.live) && details.type !== 'EVENT' && (this.levelLastLoaded !== levelInfo || details.expired);
+  }
   flushMainBuffer(startOffset, endOffset, type = null) {
     if (!(startOffset - endOffset)) {
       return;
@@ -8734,7 +8745,7 @@ class BaseStreamController extends TaskLoop {
       part: partIndex
     } = chunkMeta;
     if (!(levels != null && levels[levelIndex])) {
-      this.warn(`Levels object was unset while buffering fragment ${sn} of level ${levelIndex}. The current chunk will not be buffered.`);
+      this.warn(`Levels object was unset while buffering fragment ${sn} of ${this.playlistLabel()} ${levelIndex}. The current chunk will not be buffered.`);
       return null;
     }
     const level = levels[levelIndex];
@@ -9123,6 +9134,7 @@ class BaseStreamController extends TaskLoop {
         // Leave this.startPosition at -1, so that we can use `getInitialLiveFragment` logic when startPosition has
         // not been specified via the config or an as an argument to startLoad (#3736).
         startPosition = this.hls.liveSyncPosition || sliding;
+        this.startPosition = -1;
       } else {
         this.log(`setting startPosition to 0 by default`);
         this.startPosition = startPosition = 0;
@@ -9145,8 +9157,8 @@ class BaseStreamController extends TaskLoop {
     return pos;
   }
   handleFragLoadAborted(frag, part) {
-    if (this.transmuxer && isMediaFragment(frag) && frag.stats.aborted) {
-      this.warn(`Fragment ${frag.sn}${part ? ' part ' + part.index : ''} of level ${frag.level} was aborted`);
+    if (this.transmuxer && frag.type === this.playlistType && isMediaFragment(frag) && frag.stats.aborted) {
+      this.warn(`Fragment ${frag.sn}${part ? ' part ' + part.index : ''} of ${this.playlistLabel()} ${frag.level} was aborted`);
       this.resetFragmentLoading(frag);
     }
   }
@@ -9297,7 +9309,7 @@ class BaseStreamController extends TaskLoop {
     }
   }
   resetWhenMissingContext(chunkMeta) {
-    this.warn(`The loading context changed while buffering fragment ${chunkMeta.sn} of level ${chunkMeta.level}. This chunk will not be buffered.`);
+    this.warn(`The loading context changed while buffering fragment ${chunkMeta.sn} of ${this.playlistLabel()} ${chunkMeta.level}. This chunk will not be buffered.`);
     this.removeUnbufferedFrags();
     this.resetStartWhenNotLoaded(this.levelLastLoaded);
     this.resetLoadingState();
@@ -9338,7 +9350,7 @@ class BaseStreamController extends TaskLoop {
       return result;
     }, false);
     if (!parsed && ((_this$transmuxer = this.transmuxer) == null ? void 0 : _this$transmuxer.error) === null) {
-      const error = new Error(`Found no media in fragment ${frag.sn} of level ${frag.level} resetting transmuxer to fallback to playlist timing`);
+      const error = new Error(`Found no media in fragment ${frag.sn} of ${this.playlistLabel()} ${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
         this.treatAsGap(frag, level);
@@ -9350,7 +9362,7 @@ class BaseStreamController extends TaskLoop {
         fatal: false,
         error,
         frag,
-        reason: `Found no media in msn ${frag.sn} of level "${level.url}"`
+        reason: `Found no media in msn ${frag.sn} of ${this.playlistLabel()} "${level.url}"`
       });
       if (!this.hls) {
         return;
@@ -9791,7 +9803,7 @@ var eventemitter3 = {exports: {}};
 var eventemitter3Exports = eventemitter3.exports;
 var EventEmitter = /*@__PURE__*/getDefaultExportFromCjs(eventemitter3Exports);
 
-const version = "1.6.0-beta.1.0.canary.10767";
+const version = "1.6.0-beta.1.0.canary.10770";
 
 // ensure the worker ends up in the bundle
 // If the worker should not be included this gets aliased to empty.js
@@ -16173,13 +16185,13 @@ class AudioStreamController extends BaseStreamController {
         break;
       case State.WAITING_TRACK:
         {
-          var _levels$trackId;
           const {
             levels,
             trackId
           } = this;
-          const details = levels == null ? void 0 : (_levels$trackId = levels[trackId]) == null ? void 0 : _levels$trackId.details;
-          if (details) {
+          const currenTrack = levels == null ? void 0 : levels[trackId];
+          const details = currenTrack == null ? void 0 : currenTrack.details;
+          if (details && !this.waitForLive(currenTrack)) {
             if (this.waitForCdnTuneIn(details)) {
               break;
             }
@@ -16292,8 +16304,9 @@ class AudioStreamController extends BaseStreamController {
     }
     const levelInfo = levels[trackId];
     const trackDetails = levelInfo.details;
-    if (!trackDetails || trackDetails.live && this.levelLastLoaded !== levelInfo || this.waitForCdnTuneIn(trackDetails)) {
+    if (!trackDetails || this.waitForLive(levelInfo) || this.waitForCdnTuneIn(trackDetails)) {
       this.state = State.WAITING_TRACK;
+      this.startFragRequested = false;
       return;
     }
     const bufferable = this.mediaBuffer ? this.mediaBuffer : this.media;
@@ -17395,7 +17408,9 @@ class AudioTrackController extends BasePlaylistController {
         }
       }
       // track not retrieved yet, or live playlist we need to (re)load it
-      this.log(`loading audio-track playlist ${id} "${audioTrack.name}" lang:${audioTrack.lang} group:${groupId}`);
+      const details = audioTrack.details;
+      const age = details == null ? void 0 : details.age;
+      this.log(`Loading audio-track ${id} "${audioTrack.name}" lang:${audioTrack.lang} group:${groupId}${(hlsUrlParameters == null ? void 0 : hlsUrlParameters.msn) !== undefined ? ' at sn ' + hlsUrlParameters.msn + ' part ' + hlsUrlParameters.part : ''}${age && details.live ? ' age ' + age.toFixed(1) + (details.type ? ' ' + details.type || '' : '') : ''} ${url}`);
       this.clearTimer();
       this.hls.trigger(Events.AUDIO_TRACK_LOADING, {
         url,
@@ -22438,7 +22453,9 @@ class SubtitleTrackController extends BasePlaylistController {
           this.warn(`Could not construct new URL with HLS Delivery Directives: ${error}`);
         }
       }
-      this.log(`Loading subtitle playlist for id ${id}`);
+      const details = currentTrack.details;
+      const age = details == null ? void 0 : details.age;
+      this.log(`Loading subtitle ${id} "${currentTrack.name}" lang:${currentTrack.lang} group:${groupId}${(hlsUrlParameters == null ? void 0 : hlsUrlParameters.msn) !== undefined ? ' at sn ' + hlsUrlParameters.msn + ' part ' + hlsUrlParameters.part : ''}${age && details.live ? ' age ' + age.toFixed(1) + (details.type ? ' ' + details.type || '' : '') : ''} ${url}`);
       this.hls.trigger(Events.SUBTITLE_TRACK_LOADING, {
         url,
         id,
@@ -25528,6 +25545,9 @@ class SubtitleStreamController extends BaseStreamController {
       if (!track || !levels.length || !track.details) {
         return;
       }
+      if (this.waitForLive(track)) {
+        return;
+      }
       const {
         config
       } = this;
@@ -30560,7 +30580,9 @@ class LevelController extends BasePlaylistController {
         }
       }
       const pathwayId = currentLevel.attrs['PATHWAY-ID'];
-      this.log(`Loading level index ${currentLevelIndex}${(hlsUrlParameters == null ? void 0 : hlsUrlParameters.msn) !== undefined ? ' at sn ' + hlsUrlParameters.msn + ' part ' + hlsUrlParameters.part : ''} with${pathwayId ? ' Pathway ' + pathwayId : ''} ${url}`);
+      const details = currentLevel.details;
+      const age = details == null ? void 0 : details.age;
+      this.log(`Loading level index ${currentLevelIndex}${(hlsUrlParameters == null ? void 0 : hlsUrlParameters.msn) !== undefined ? ' at sn ' + hlsUrlParameters.msn + ' part ' + hlsUrlParameters.part : ''}${pathwayId ? ' Pathway ' + pathwayId : ''}${age && details.live ? ' age ' + age.toFixed(1) + (details.type ? ' ' + details.type || '' : '') : ''} ${url}`);
 
       // console.log('Current audio track group ID:', this.hls.audioTracks[this.hls.audioTrack].groupId);
       // console.log('New video quality level audio group id:', levelObject.attrs.AUDIO, level);
@@ -31130,7 +31152,7 @@ class StreamController extends BaseStreamController {
         this._hasEnoughToStart = false;
       }
       // if startPosition undefined but lastCurrentTime set, set startPosition to last currentTime
-      if (lastCurrentTime > 0 && startPosition === -1) {
+      if (lastCurrentTime > 0 && startPosition === -1 && !skipSeekToStartPosition) {
         this.log(`Override startPosition with lastCurrentTime @${lastCurrentTime.toFixed(3)}`);
         startPosition = lastCurrentTime;
       }
@@ -31157,7 +31179,7 @@ class StreamController extends BaseStreamController {
           } = this;
           const currentLevel = levels == null ? void 0 : levels[level];
           const details = currentLevel == null ? void 0 : currentLevel.details;
-          if (details && (!details.live || this.levelLastLoaded === currentLevel)) {
+          if (details && (!details.live || this.levelLastLoaded === currentLevel && !this.waitForLive(currentLevel))) {
             if (this.waitForCdnTuneIn(details)) {
               break;
             }
@@ -31251,9 +31273,10 @@ class StreamController extends BaseStreamController {
     // if level info not retrieved yet, switch state and wait for level retrieval
     // if live playlist, ensure that new playlist has been refreshed to avoid loading/try to load
     // a useless and outdated fragment (that might even introduce load error if it is already out of the live playlist)
-    if (!levelDetails || this.state === State.WAITING_LEVEL || levelDetails.live && this.levelLastLoaded !== levelInfo) {
+    if (!levelDetails || this.state === State.WAITING_LEVEL || this.waitForLive(levelInfo)) {
       this.level = level;
       this.state = State.WAITING_LEVEL;
+      this.startFragRequested = false;
       return;
     }
     const bufferLen = bufferInfo.len;
@@ -31503,7 +31526,7 @@ class StreamController extends BaseStreamController {
       return;
     }
     const level = data.levelInfo;
-    if (!level.details || level.details.live && this.levelLastLoaded !== level || this.waitForCdnTuneIn(level.details)) {
+    if (!level.details || level.details.live && (this.levelLastLoaded !== level || level.details.expired) || this.waitForCdnTuneIn(level.details)) {
       this.state = State.WAITING_LEVEL;
     }
   }
@@ -32738,13 +32761,18 @@ class PlaylistLoader {
     // Check if a loader for this context already exists
     let loader = this.getInternalLoader(context);
     if (loader) {
+      const logger = this.hls.logger;
       const loaderContext = loader.context;
-      if (loaderContext && loaderContext.url === context.url && loaderContext.levelOrTrack === context.levelOrTrack) {
-        // same URL can't overlap
-        this.hls.logger.trace('[playlist-loader]: playlist request ongoing');
+      if (loaderContext && loaderContext.levelOrTrack === context.levelOrTrack && (loaderContext.url === context.url || loaderContext.deliveryDirectives && !context.deliveryDirectives)) {
+        // same URL can't overlap, or wait for blocking request
+        if (loaderContext.url === context.url) {
+          logger.log(`[playlist-loader]: playlist request ongoing`);
+        } else {
+          logger.log(`[playlist-loader]: ignore ${context.url} in favor of ${loaderContext.url}`);
+        }
         return;
       }
-      this.hls.logger.log(`[playlist-loader]: aborting previous loader for type: ${context.type}`);
+      logger.log(`[playlist-loader]: aborting previous loader for type: ${context.type}`);
       loader.abort();
     }