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

package/dist/hls.mjs

@@ -144,6 +144,7 @@ let Events = /*#__PURE__*/function (Events) {
   Events["INTERSTITIAL_ENDED"] = "hlsInterstitialEnded";
   Events["INTERSTITIALS_PRIMARY_RESUMED"] = "hlsInterstitialsPrimaryResumed";
   Events["PLAYOUT_LIMIT_REACHED"] = "hlsPlayoutLimitReached";
+  Events["EVENT_CUE_ENTER"] = "hlsEventCueEnter";
   return Events;
 }({});
 
@@ -400,7 +401,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.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();
@@ -8303,7 +8304,7 @@ class BaseStreamController extends TaskLoop {
   }
   loadFragment(frag, level, targetBufferTime) {
     const 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
       const interstitials = this.hls.interstitialsManager;
       const bufferingItem = interstitials == null ? void 0 : interstitials.bufferingItem;
@@ -9835,7 +9836,7 @@ var eventemitter3 = {exports: {}};
 var eventemitter3Exports = eventemitter3.exports;
 var EventEmitter = /*@__PURE__*/getDefaultExportFromCjs(eventemitter3Exports);
 
-const version = "1.6.0-beta.1.0.canary.10817";
+const 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
@@ -22093,7 +22094,7 @@ function addCueToTrack(track, cue) {
     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
@@ -22103,6 +22104,9 @@ function clearCurrentCues(track) {
   }
   if (track.cues) {
     for (let i = track.cues.length; i--;) {
+      if (enterHandler) {
+        track.cues[i].removeEventListener('enter', enterHandler);
+      }
       track.removeCue(track.cues[i]);
     }
   }
@@ -23790,6 +23794,7 @@ Schedule: ${scheduleItems.map(seg => segmentToString(seg))}`);
     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);
@@ -23812,6 +23817,7 @@ Schedule: ${scheduleItems.map(seg => segmentToString(seg))}`);
     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);
@@ -24267,6 +24273,9 @@ MediaSource ${JSON.stringify(attachMediaSourceData)} from ${logFromSource}`);
     }
     player.attachMedia(dataToAttach);
   }
+  onInterstitialCueEnter() {
+    this.onTimeupdate();
+  }
   // Scheduling methods
   checkStart() {
     const schedule = this.schedule;
@@ -29649,6 +29658,12 @@ class ID3TrackController {
     this.media = null;
     this.dateRangeCuesAppended = {};
     this.removeCues = true;
+    this.onEventCueEnter = () => {
+      if (!this.hls) {
+        return;
+      }
+      this.hls.trigger(Events.EVENT_CUE_ENTER, {});
+    };
     this.hls = hls;
     this._registerListeners();
   }
@@ -29658,13 +29673,14 @@ class ID3TrackController {
     this.media = null;
     this.dateRangeCuesAppended = {};
     // @ts-ignore
-    this.hls = null;
+    this.hls = this.onEventCueEnter = null;
   }
   _registerListeners() {
     const {
       hls
     } = this;
     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);
@@ -29677,6 +29693,7 @@ class ID3TrackController {
       hls
     } = this;
     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);
@@ -29684,7 +29701,6 @@ class ID3TrackController {
     hls.off(Events.LEVEL_UPDATED, this.onLevelUpdated, this);
     hls.off(Events.LEVEL_PTS_UPDATED, this.onLevelPtsUpdated, this);
   }
-
   // Add ID3 metatadata text track.
   onMediaAttaching(event, data) {
     var _data$overrides;
@@ -29693,6 +29709,12 @@ class ID3TrackController {
       this.removeCues = false;
     }
   }
+  onMediaAttached() {
+    const details = this.hls.latestLevelDetails;
+    if (details) {
+      this.updateDateRangeCues(details);
+    }
+  }
   onMediaDetaching(event, data) {
     this.media = null;
     const transferringMedia = !!data.transferMedia;
@@ -29701,7 +29723,7 @@ class ID3TrackController {
     }
     if (this.id3Track) {
       if (this.removeCues) {
-        clearCurrentCues(this.id3Track);
+        clearCurrentCues(this.id3Track, this.onEventCueEnter);
       }
       this.id3Track = null;
     }
@@ -29863,7 +29885,9 @@ class ID3TrackController {
           delete dateRangeCuesAppended[id];
           Object.keys(cues).forEach(key => {
             try {
-              id3Track.removeCue(cues[key]);
+              const cue = cues[key];
+              cue.removeEventListener('enter', this.onEventCueEnter);
+              id3Track.removeCue(cue);
             } catch (e) {
               /* no-op */
             }
@@ -29936,14 +29960,20 @@ class ID3TrackController {
           if (isSCTE35Attribute(key)) {
             data = hexToArrayBuffer(data);
           }
-          const _cue = createCueWithDataFields(Cue, startTime, endTime, {
+          const payload = {
             key,
             data
-          }, MetadataSchema.dateRange);
+          };
+          const _cue = createCueWithDataFields(Cue, startTime, endTime, payload, MetadataSchema.dateRange);
           if (_cue) {
             _cue.id = id;
             this.id3Track.addCue(_cue);
             cues[key] = _cue;
+            if (this.hls.config.interstitialsController) {
+              if (key === 'X-ASSET-LIST' || key === 'X-ASSET-URL') {
+                _cue.addEventListener('enter', this.onEventCueEnter);
+              }
+            }
           }
         }
       }