hls.js 1.6.0-beta.1.0.canary.10817 → 1.6.0-beta.1.0.canary.10819

package/dist/hls.d.mts

@@ -1175,7 +1175,8 @@ export declare enum Events {
     INTERSTITIAL_ASSET_ERROR = "hlsInterstitialAssetError",
     INTERSTITIAL_ENDED = "hlsInterstitialEnded",
     INTERSTITIALS_PRIMARY_RESUMED = "hlsInterstitialsPrimaryResumed",
-    PLAYOUT_LIMIT_REACHED = "hlsPlayoutLimitReached"
+    PLAYOUT_LIMIT_REACHED = "hlsPlayoutLimitReached",
+    EVENT_CUE_ENTER = "hlsEventCueEnter"
 }
 
 export declare class EwmaBandWidthEstimator {
@@ -2034,6 +2035,7 @@ export declare interface HlsListeners {
     [Events.INTERSTITIAL_ENDED]: (event: Events.INTERSTITIAL_ENDED, data: InterstitialEndedData) => void;
     [Events.INTERSTITIALS_PRIMARY_RESUMED]: (event: Events.INTERSTITIALS_PRIMARY_RESUMED, data: InterstitialsPrimaryResumed) => void;
     [Events.PLAYOUT_LIMIT_REACHED]: (event: Events.PLAYOUT_LIMIT_REACHED, data: {}) => void;
+    [Events.EVENT_CUE_ENTER]: (event: Events.EVENT_CUE_ENTER, data: {}) => void;
 }
 
 export declare type HlsLoadPolicies = {
@@ -2299,6 +2301,7 @@ export declare class InterstitialsController extends Logger implements NetworkCo
     private transferMediaTo;
     private onPlay;
     private onSeeking;
+    private onInterstitialCueEnter;
     private onTimeupdate;
     private checkStart;
     private advanceAfterAssetEnded;

package/dist/hls.d.ts

@@ -1175,7 +1175,8 @@ export declare enum Events {
     INTERSTITIAL_ASSET_ERROR = "hlsInterstitialAssetError",
     INTERSTITIAL_ENDED = "hlsInterstitialEnded",
     INTERSTITIALS_PRIMARY_RESUMED = "hlsInterstitialsPrimaryResumed",
-    PLAYOUT_LIMIT_REACHED = "hlsPlayoutLimitReached"
+    PLAYOUT_LIMIT_REACHED = "hlsPlayoutLimitReached",
+    EVENT_CUE_ENTER = "hlsEventCueEnter"
 }
 
 export declare class EwmaBandWidthEstimator {
@@ -2034,6 +2035,7 @@ export declare interface HlsListeners {
     [Events.INTERSTITIAL_ENDED]: (event: Events.INTERSTITIAL_ENDED, data: InterstitialEndedData) => void;
     [Events.INTERSTITIALS_PRIMARY_RESUMED]: (event: Events.INTERSTITIALS_PRIMARY_RESUMED, data: InterstitialsPrimaryResumed) => void;
     [Events.PLAYOUT_LIMIT_REACHED]: (event: Events.PLAYOUT_LIMIT_REACHED, data: {}) => void;
+    [Events.EVENT_CUE_ENTER]: (event: Events.EVENT_CUE_ENTER, data: {}) => void;
 }
 
 export declare type HlsLoadPolicies = {
@@ -2299,6 +2301,7 @@ export declare class InterstitialsController extends Logger implements NetworkCo
     private transferMediaTo;
     private onPlay;
     private onSeeking;
+    private onInterstitialCueEnter;
     private onTimeupdate;
     private checkStart;
     private advanceAfterAssetEnded;

package/dist/hls.js

@@ -852,6 +852,7 @@
     Events["INTERSTITIAL_ENDED"] = "hlsInterstitialEnded";
     Events["INTERSTITIALS_PRIMARY_RESUMED"] = "hlsInterstitialsPrimaryResumed";
     Events["PLAYOUT_LIMIT_REACHED"] = "hlsPlayoutLimitReached";
+    Events["EVENT_CUE_ENTER"] = "hlsEventCueEnter";
     return Events;
   }({});
 
@@ -1057,7 +1058,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.10817");
+        newLogger.log("Debug logs enabled for \"" + context + "\" in hls.js version " + "1.6.0-beta.1.0.canary.10819");
       } catch (e) {
         /* log fn threw an exception. All logger methods are no-ops. */
         return createLogger();
@@ -9044,7 +9045,7 @@
     };
     _proto.loadFragment = function loadFragment(frag, level, targetBufferTime) {
       var config = this.hls.config;
-      if (config.interstitialsController && config.enableInterstitialPlayback !== false) {
+      if (config.interstitialsController && config.enableInterstitialPlayback !== false && frag.type !== PlaylistLevelType.SUBTITLE) {
         // Do not load fragments outside the buffering schedule segment
         var interstitials = this.hls.interstitialsManager;
         var bufferingItem = interstitials == null ? void 0 : interstitials.bufferingItem;
@@ -16296,7 +16297,7 @@
     return !remuxResult.audio && !remuxResult.video && !remuxResult.text && !remuxResult.id3 && !remuxResult.initSegment;
   }
 
-  var version = "1.6.0-beta.1.0.canary.10817";
+  var version = "1.6.0-beta.1.0.canary.10819";
 
   // ensure the worker ends up in the bundle
   // If the worker should not be included this gets aliased to empty.js
@@ -24005,6 +24006,7 @@
       hls.on(Events.AUDIO_TRACK_UPDATED, this.onAudioTrackUpdated, this);
       hls.on(Events.SUBTITLE_TRACK_SWITCH, this.onSubtitleTrackSwitch, this);
       hls.on(Events.SUBTITLE_TRACK_UPDATED, this.onSubtitleTrackUpdated, this);
+      hls.on(Events.EVENT_CUE_ENTER, this.onInterstitialCueEnter, this);
       hls.on(Events.ASSET_LIST_LOADED, this.onAssetListLoaded, this);
       hls.on(Events.BUFFER_APPENDED, this.onBufferAppended, this);
       hls.on(Events.BUFFER_FLUSHED, this.onBufferFlushed, this);
@@ -24027,6 +24029,7 @@
       hls.off(Events.AUDIO_TRACK_UPDATED, this.onAudioTrackUpdated, this);
       hls.off(Events.SUBTITLE_TRACK_SWITCH, this.onSubtitleTrackSwitch, this);
       hls.off(Events.SUBTITLE_TRACK_UPDATED, this.onSubtitleTrackUpdated, this);
+      hls.off(Events.EVENT_CUE_ENTER, this.onInterstitialCueEnter, this);
       hls.off(Events.ASSET_LIST_LOADED, this.onAssetListLoaded, this);
       hls.off(Events.BUFFER_CODECS, this.onBufferCodecs, this);
       hls.off(Events.BUFFER_APPENDED, this.onBufferAppended, this);
@@ -24212,6 +24215,9 @@
       }
       player.attachMedia(dataToAttach);
     };
+    _proto.onInterstitialCueEnter = function onInterstitialCueEnter() {
+      this.onTimeupdate();
+    };
     // Scheduling methods
     _proto.checkStart = function checkStart() {
       var schedule = this.schedule;
@@ -26007,7 +26013,7 @@
       track.mode = mode;
     }
   }
-  function clearCurrentCues(track) {
+  function clearCurrentCues(track, enterHandler) {
     // When track.mode is disabled, track.cues will be null.
     // To guarantee the removal of cues, we need to temporarily
     // change the mode to hidden
@@ -26017,6 +26023,9 @@
     }
     if (track.cues) {
       for (var i = track.cues.length; i--;) {
+        if (enterHandler) {
+          track.cues[i].removeEventListener('enter', enterHandler);
+        }
         track.removeCue(track.cues[i]);
       }
     }
@@ -30553,11 +30562,18 @@
   }
   var ID3TrackController = /*#__PURE__*/function () {
     function ID3TrackController(hls) {
+      var _this = this;
       this.hls = void 0;
       this.id3Track = null;
       this.media = null;
       this.dateRangeCuesAppended = {};
       this.removeCues = true;
+      this.onEventCueEnter = function () {
+        if (!_this.hls) {
+          return;
+        }
+        _this.hls.trigger(Events.EVENT_CUE_ENTER, {});
+      };
       this.hls = hls;
       this._registerListeners();
     }
@@ -30568,11 +30584,12 @@
       this.media = null;
       this.dateRangeCuesAppended = {};
       // @ts-ignore
-      this.hls = null;
+      this.hls = this.onEventCueEnter = null;
     };
     _proto._registerListeners = function _registerListeners() {
       var hls = this.hls;
       hls.on(Events.MEDIA_ATTACHING, this.onMediaAttaching, this);
+      hls.on(Events.MEDIA_ATTACHED, this.onMediaAttached, this);
       hls.on(Events.MEDIA_DETACHING, this.onMediaDetaching, this);
       hls.on(Events.MANIFEST_LOADING, this.onManifestLoading, this);
       hls.on(Events.FRAG_PARSING_METADATA, this.onFragParsingMetadata, this);
@@ -30583,16 +30600,15 @@
     _proto._unregisterListeners = function _unregisterListeners() {
       var hls = this.hls;
       hls.off(Events.MEDIA_ATTACHING, this.onMediaAttaching, this);
+      hls.off(Events.MEDIA_ATTACHED, this.onMediaAttached, this);
       hls.off(Events.MEDIA_DETACHING, this.onMediaDetaching, this);
       hls.off(Events.MANIFEST_LOADING, this.onManifestLoading, this);
       hls.off(Events.FRAG_PARSING_METADATA, this.onFragParsingMetadata, this);
       hls.off(Events.BUFFER_FLUSHING, this.onBufferFlushing, this);
       hls.off(Events.LEVEL_UPDATED, this.onLevelUpdated, this);
       hls.off(Events.LEVEL_PTS_UPDATED, this.onLevelPtsUpdated, this);
-    }
-
+    };
     // Add ID3 metatadata text track.
-    ;
     _proto.onMediaAttaching = function onMediaAttaching(event, data) {
       var _data$overrides;
       this.media = data.media;
@@ -30600,6 +30616,12 @@
         this.removeCues = false;
       }
     };
+    _proto.onMediaAttached = function onMediaAttached() {
+      var details = this.hls.latestLevelDetails;
+      if (details) {
+        this.updateDateRangeCues(details);
+      }
+    };
     _proto.onMediaDetaching = function onMediaDetaching(event, data) {
       this.media = null;
       var transferringMedia = !!data.transferMedia;
@@ -30608,7 +30630,7 @@
       }
       if (this.id3Track) {
         if (this.removeCues) {
-          clearCurrentCues(this.id3Track);
+          clearCurrentCues(this.id3Track, this.onEventCueEnter);
         }
         this.id3Track = null;
       }
@@ -30740,7 +30762,7 @@
       }
     };
     _proto.updateDateRangeCues = function updateDateRangeCues(details, removeOldCues) {
-      var _this = this;
+      var _this2 = this;
       if (!this.media || !details.hasProgramDateTime || !this.hls.config.enableDateRangeMetadataCues) {
         return;
       }
@@ -30761,7 +30783,9 @@
             delete dateRangeCuesAppended[id];
             Object.keys(cues).forEach(function (key) {
               try {
-                id3Track.removeCue(cues[key]);
+                var cue = cues[key];
+                cue.removeEventListener('enter', _this2.onEventCueEnter);
+                id3Track.removeCue(cue);
               } catch (e) {
                 /* no-op */
               }
@@ -30835,14 +30859,20 @@
             if (isSCTE35Attribute(key)) {
               data = hexToArrayBuffer(data);
             }
-            var _cue = createCueWithDataFields(Cue, startTime, endTime, {
+            var payload = {
               key: key,
               data: data
-            }, MetadataSchema.dateRange);
+            };
+            var _cue = createCueWithDataFields(Cue, startTime, endTime, payload, MetadataSchema.dateRange);
             if (_cue) {
               _cue.id = id;
-              _this.id3Track.addCue(_cue);
+              _this2.id3Track.addCue(_cue);
               cues[key] = _cue;
+              if (_this2.hls.config.interstitialsController) {
+                if (key === 'X-ASSET-LIST' || key === 'X-ASSET-URL') {
+                  _cue.addEventListener('enter', _this2.onEventCueEnter);
+                }
+              }
             }
           }
         }

package/dist/hls.js.d.ts

@@ -1175,7 +1175,8 @@ export declare enum Events {
     INTERSTITIAL_ASSET_ERROR = "hlsInterstitialAssetError",
     INTERSTITIAL_ENDED = "hlsInterstitialEnded",
     INTERSTITIALS_PRIMARY_RESUMED = "hlsInterstitialsPrimaryResumed",
-    PLAYOUT_LIMIT_REACHED = "hlsPlayoutLimitReached"
+    PLAYOUT_LIMIT_REACHED = "hlsPlayoutLimitReached",
+    EVENT_CUE_ENTER = "hlsEventCueEnter"
 }
 
 export declare class EwmaBandWidthEstimator {
@@ -2034,6 +2035,7 @@ export declare interface HlsListeners {
     [Events.INTERSTITIAL_ENDED]: (event: Events.INTERSTITIAL_ENDED, data: InterstitialEndedData) => void;
     [Events.INTERSTITIALS_PRIMARY_RESUMED]: (event: Events.INTERSTITIALS_PRIMARY_RESUMED, data: InterstitialsPrimaryResumed) => void;
     [Events.PLAYOUT_LIMIT_REACHED]: (event: Events.PLAYOUT_LIMIT_REACHED, data: {}) => void;
+    [Events.EVENT_CUE_ENTER]: (event: Events.EVENT_CUE_ENTER, data: {}) => void;
 }
 
 export declare type HlsLoadPolicies = {
@@ -2299,6 +2301,7 @@ export declare class InterstitialsController extends Logger implements NetworkCo
     private transferMediaTo;
     private onPlay;
     private onSeeking;
+    private onInterstitialCueEnter;
     private onTimeupdate;
     private checkStart;
     private advanceAfterAssetEnded;