hls.js 1.6.0-beta.1.0.canary.10763 → 1.6.0-beta.1.0.canary.10765

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.10763"}`);
+      newLogger.log(`Debug logs enabled for "${context}" in hls.js version ${"1.6.0-beta.1.0.canary.10765"}`);
     } catch (e) {
       /* log fn threw an exception. All logger methods are no-ops. */
       return createLogger();
@@ -18608,7 +18608,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 +18619,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 +18657,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 +19082,7 @@ class GapController extends Logger {
   }
 }
 
-const version = "1.6.0-beta.1.0.canary.10763";
+const version = "1.6.0-beta.1.0.canary.10765";
 
 // ensure the worker ends up in the bundle
 // If the worker should not be included this gets aliased to empty.js
@@ -19972,7 +19973,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 +19992,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) {
@@ -21064,6 +21065,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 +21075,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 +21127,8 @@ class PlaylistLoader {
       responseType: 'text',
       type: PlaylistContextType.MANIFEST,
       url,
-      deliveryDirectives: null
+      deliveryDirectives: null,
+      levelOrTrack: null
     });
   }
   onLevelLoading(event, data) {
@@ -21133,7 +21137,8 @@ class PlaylistLoader {
       level,
       pathwayId,
       url,
-      deliveryDirectives
+      deliveryDirectives,
+      levelInfo
     } = data;
     this.load({
       id,
@@ -21142,7 +21147,8 @@ class PlaylistLoader {
       responseType: 'text',
       type: PlaylistContextType.LEVEL,
       url,
-      deliveryDirectives
+      deliveryDirectives,
+      levelOrTrack: levelInfo
     });
   }
   onAudioTrackLoading(event, data) {
@@ -21150,7 +21156,8 @@ class PlaylistLoader {
       id,
       groupId,
       url,
-      deliveryDirectives
+      deliveryDirectives,
+      track
     } = data;
     this.load({
       id,
@@ -21159,7 +21166,8 @@ class PlaylistLoader {
       responseType: 'text',
       type: PlaylistContextType.AUDIO_TRACK,
       url,
-      deliveryDirectives
+      deliveryDirectives,
+      levelOrTrack: track
     });
   }
   onSubtitleTrackLoading(event, data) {
@@ -21167,7 +21175,8 @@ class PlaylistLoader {
       id,
       groupId,
       url,
-      deliveryDirectives
+      deliveryDirectives,
+      track
     } = data;
     this.load({
       id,
@@ -21176,9 +21185,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 +21210,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 +21532,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 +21543,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 +21554,7 @@ class PlaylistLoader {
       case PlaylistContextType.SUBTITLE_TRACK:
         hls.trigger(Events.SUBTITLE_TRACK_LOADED, {
           details: levelDetails,
+          track: context.levelOrTrack,
           id: id || 0,
           groupId: groupId || '',
           stats,