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

package/package.json

@@ -130,5 +130,5 @@
     "url-toolkit": "2.2.5",
     "wrangler": "3.91.0"
   },
-  "version": "1.6.0-beta.1.0.canary.10817"
+  "version": "1.6.0-beta.1.0.canary.10819"
 }

package/src/controller/base-stream-controller.ts

@@ -445,7 +445,8 @@ export default class BaseStreamController
     if (
       __USE_INTERSTITALS__ &&
       config.interstitialsController &&
-      config.enableInterstitialPlayback !== false
+      config.enableInterstitialPlayback !== false &&
+      frag.type !== PlaylistLevelType.SUBTITLE
     ) {
       // Do not load fragments outside the buffering schedule segment
       const interstitials = this.hls.interstitialsManager;

package/src/controller/id3-track-controller.ts

@@ -106,12 +106,13 @@ class ID3TrackController implements ComponentAPI {
     this.media = null;
     this.dateRangeCuesAppended = {};
     // @ts-ignore
-    this.hls = null;
+    this.hls = this.onEventCueEnter = null;
   }
 
   private _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);
@@ -123,6 +124,7 @@ class ID3TrackController implements ComponentAPI {
   private _unregisterListeners() {
     const { 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);
@@ -131,6 +133,13 @@ class ID3TrackController implements ComponentAPI {
     hls.off(Events.LEVEL_PTS_UPDATED, this.onLevelPtsUpdated, this);
   }
 
+  private onEventCueEnter = () => {
+    if (!this.hls) {
+      return;
+    }
+    this.hls.trigger(Events.EVENT_CUE_ENTER, {});
+  };
+
   // Add ID3 metatadata text track.
   private onMediaAttaching(
     event: Events.MEDIA_ATTACHING,
@@ -142,6 +151,13 @@ class ID3TrackController implements ComponentAPI {
     }
   }
 
+  private onMediaAttached() {
+    const details = this.hls.latestLevelDetails;
+    if (details) {
+      this.updateDateRangeCues(details);
+    }
+  }
+
   private onMediaDetaching(
     event: Events.MEDIA_DETACHING,
     data: MediaDetachingData,
@@ -153,7 +169,7 @@ class ID3TrackController implements ComponentAPI {
     }
     if (this.id3Track) {
       if (this.removeCues) {
-        clearCurrentCues(this.id3Track);
+        clearCurrentCues(this.id3Track, this.onEventCueEnter);
       }
       this.id3Track = null;
     }
@@ -349,7 +365,9 @@ class ID3TrackController implements ComponentAPI {
           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 */
             }
@@ -429,17 +447,26 @@ class ID3TrackController implements ComponentAPI {
           if (isSCTE35Attribute(key)) {
             data = hexToArrayBuffer(data);
           }
+          const payload: any = { key, data };
           const cue = createCueWithDataFields(
             Cue,
             startTime,
             endTime,
-            { key, data },
+            payload,
             MetadataSchema.dateRange,
           );
           if (cue) {
             cue.id = id;
             this.id3Track.addCue(cue);
             cues[key] = cue;
+            if (
+              __USE_INTERSTITALS__ &&
+              this.hls.config.interstitialsController
+            ) {
+              if (key === 'X-ASSET-LIST' || key === 'X-ASSET-URL') {
+                cue.addEventListener('enter', this.onEventCueEnter);
+              }
+            }
           }
         }
       }

package/src/controller/interstitials-controller.ts

@@ -135,6 +135,7 @@ export default class InterstitialsController
     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);
@@ -158,6 +159,7 @@ export default class InterstitialsController
     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);
@@ -822,6 +824,10 @@ MediaSource ${JSON.stringify(attachMediaSourceData)} from ${logFromSource}`,
     }
   };
 
+  private onInterstitialCueEnter() {
+    this.onTimeupdate();
+  }
+
   private onTimeupdate = () => {
     const currentTime = this.currentTime;
     if (currentTime === undefined || this.playbackDisabled) {

package/src/events.ts

@@ -216,6 +216,8 @@ export enum Events {
   INTERSTITIALS_PRIMARY_RESUMED = 'hlsInterstitialsPrimaryResumed',
   // Interstitial players dispatch this event when playout limit is reached
   PLAYOUT_LIMIT_REACHED = 'hlsPlayoutLimitReached',
+  // Event DateRange cue "enter" event dispatched
+  EVENT_CUE_ENTER = 'hlsEventCueEnter',
 }
 
 /**
@@ -490,6 +492,7 @@ export interface HlsListeners {
     event: Events.PLAYOUT_LIMIT_REACHED,
     data: {},
   ) => void;
+  [Events.EVENT_CUE_ENTER]: (event: Events.EVENT_CUE_ENTER, data: {}) => void;
 }
 export interface HlsEventEmitter {
   on<E extends keyof HlsListeners, Context = undefined>(

package/src/utils/texttrack-utils.ts

@@ -49,7 +49,7 @@ export function addCueToTrack(track: TextTrack, cue: VTTCue) {
   }
 }
 
-export function clearCurrentCues(track: TextTrack) {
+export function clearCurrentCues(track: TextTrack, enterHandler?: () => void) {
   // 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
@@ -59,6 +59,9 @@ export function clearCurrentCues(track: TextTrack) {
   }
   if (track.cues) {
     for (let i = track.cues.length; i--; ) {
+      if (enterHandler) {
+        track.cues[i].removeEventListener('enter', enterHandler);
+      }
       track.removeCue(track.cues[i]);
     }
   }