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

package/dist/hls.d.mts

@@ -327,6 +327,7 @@ export declare class BaseStreamController extends TaskLoop implements NetworkCom
     private _loadFragForPlayback;
     protected clearTrackerIfNeeded(frag: Fragment): void;
     protected checkLiveUpdate(details: LevelDetails): void;
+    protected waitForLive(levelInfo: Level): boolean | undefined;
     protected flushMainBuffer(startOffset: number, endOffset: number, type?: SourceBufferName | null): void;
     protected _loadInitSegment(fragment: Fragment, level: Level): void;
     private completeInitSegmentLoad;
@@ -2584,6 +2585,7 @@ export declare class LevelDetails {
     get age(): number;
     get lastPartIndex(): number;
     get lastPartSn(): number;
+    get expired(): boolean;
 }
 
 export declare class LevelKey implements DecryptData {

package/dist/hls.d.ts

@@ -327,6 +327,7 @@ export declare class BaseStreamController extends TaskLoop implements NetworkCom
     private _loadFragForPlayback;
     protected clearTrackerIfNeeded(frag: Fragment): void;
     protected checkLiveUpdate(details: LevelDetails): void;
+    protected waitForLive(levelInfo: Level): boolean | undefined;
     protected flushMainBuffer(startOffset: number, endOffset: number, type?: SourceBufferName | null): void;
     protected _loadInitSegment(fragment: Fragment, level: Level): void;
     private completeInitSegmentLoad;
@@ -2584,6 +2585,7 @@ export declare class LevelDetails {
     get age(): number;
     get lastPartIndex(): number;
     get lastPartSn(): number;
+    get expired(): boolean;
 }
 
 export declare class LevelKey implements DecryptData {

package/dist/hls.js

@@ -1057,7 +1057,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.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();
@@ -7112,6 +7112,15 @@
         }
         return this.endSN;
       }
+    }, {
+      key: "expired",
+      get: function get() {
+        if (this.live && this.age) {
+          var playlistWindowDuration = this.partEnd - this.fragmentStart;
+          return this.age > Math.max(playlistWindowDuration, this.totalduration) + this.levelTargetDuration;
+        }
+        return false;
+      }
     }]);
   }();
 
@@ -9112,6 +9121,10 @@
         details.deltaUpdateFailed = true;
       }
     };
+    _proto.waitForLive = function waitForLive(levelInfo) {
+      var details = levelInfo.details;
+      return (details == null ? void 0 : details.live) && details.type !== 'EVENT' && (this.levelLastLoaded !== levelInfo || details.expired);
+    };
     _proto.flushMainBuffer = function flushMainBuffer(startOffset, endOffset, type) {
       if (type === void 0) {
         type = null;
@@ -9473,7 +9486,7 @@
         sn = chunkMeta.sn,
         partIndex = chunkMeta.part;
       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;
       }
       var level = levels[levelIndex];
@@ -9847,6 +9860,7 @@
           // 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;
@@ -9867,8 +9881,8 @@
       return pos;
     };
     _proto.handleFragLoadAborted = function 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);
       }
     };
@@ -10019,7 +10033,7 @@
       }
     };
     _proto.resetWhenMissingContext = function 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();
@@ -10064,7 +10078,7 @@
         return result;
       }, false);
       if (!parsed && ((_this$transmuxer = this.transmuxer) == null ? void 0 : _this$transmuxer.error) === null) {
-        var error = new Error("Found no media in fragment " + frag.sn + " of level " + frag.level + " resetting transmuxer to fallback to playlist timing");
+        var 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);
@@ -10076,7 +10090,7 @@
           fatal: false,
           error: error,
           frag: 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;
@@ -16239,7 +16253,7 @@
     return !remuxResult.audio && !remuxResult.video && !remuxResult.text && !remuxResult.id3 && !remuxResult.initSegment;
   }
 
-  var version = "1.6.0-beta.1.0.canary.10767";
+  var 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
@@ -16763,11 +16777,11 @@
           break;
         case State.WAITING_TRACK:
           {
-            var _levels$trackId;
             var levels = this.levels,
               trackId = this.trackId;
-            var details = levels == null ? void 0 : (_levels$trackId = levels[trackId]) == null ? void 0 : _levels$trackId.details;
-            if (details) {
+            var currenTrack = levels == null ? void 0 : levels[trackId];
+            var details = currenTrack == null ? void 0 : currenTrack.details;
+            if (details && !this.waitForLive(currenTrack)) {
               if (this.waitForCdnTuneIn(details)) {
                 break;
               }
@@ -16872,8 +16886,9 @@
       }
       var levelInfo = levels[trackId];
       var 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;
       }
       var bufferable = this.mediaBuffer ? this.mediaBuffer : this.media;
@@ -17941,7 +17956,9 @@
           }
         }
         // 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);
+        var details = audioTrack.details;
+        var 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: url,
@@ -25767,6 +25784,9 @@
         if (!track || !levels.length || !track.details) {
           return;
         }
+        if (this.waitForLive(track)) {
+          return;
+        }
         var config = this.config;
         var currentTime = this.getLoadPosition();
         var bufferedInfo = BufferHelper.bufferedInfo(this.tracksBuffered[this.currentTrackId] || [], currentTime, config.maxBufferHole);
@@ -26308,7 +26328,9 @@
             this.warn("Could not construct new URL with HLS Delivery Directives: " + error);
           }
         }
-        this.log("Loading subtitle playlist for id " + id);
+        var details = currentTrack.details;
+        var 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: url,
           id: id,
@@ -31329,7 +31351,9 @@
           }
         }
         var 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);
+        var details = currentLevel.details;
+        var 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);
@@ -32038,7 +32062,7 @@
           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;
         }
@@ -32063,7 +32087,7 @@
               level = this.level;
             var currentLevel = levels == null ? void 0 : levels[level];
             var 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;
               }
@@ -32153,9 +32177,10 @@
       // 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;
       }
       var bufferLen = bufferInfo.len;
@@ -32399,7 +32424,7 @@
         return;
       }
       var 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;
       }
     };
@@ -33614,13 +33639,18 @@
       // Check if a loader for this context already exists
       var loader = this.getInternalLoader(context);
       if (loader) {
+        var logger = this.hls.logger;
         var 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();
       }
 

package/dist/hls.js.d.ts

@@ -327,6 +327,7 @@ export declare class BaseStreamController extends TaskLoop implements NetworkCom
     private _loadFragForPlayback;
     protected clearTrackerIfNeeded(frag: Fragment): void;
     protected checkLiveUpdate(details: LevelDetails): void;
+    protected waitForLive(levelInfo: Level): boolean | undefined;
     protected flushMainBuffer(startOffset: number, endOffset: number, type?: SourceBufferName | null): void;
     protected _loadInitSegment(fragment: Fragment, level: Level): void;
     private completeInitSegmentLoad;
@@ -2584,6 +2585,7 @@ export declare class LevelDetails {
     get age(): number;
     get lastPartIndex(): number;
     get lastPartSn(): number;
+    get expired(): boolean;
 }
 
 export declare class LevelKey implements DecryptData {