hls.js 1.6.3-0.canary.11232 → 1.6.3-0.canary.11234

package/dist/hls.mjs

@@ -523,7 +523,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.3-0.canary.11232"}`);
+      newLogger.log(`Debug logs enabled for "${context}" in hls.js version ${"1.6.3-0.canary.11234"}`);
     } catch (e) {
       /* log fn threw an exception. All logger methods are no-ops. */
       return createLogger();
@@ -10237,7 +10237,7 @@ function requireEventemitter3 () {
 var eventemitter3Exports = requireEventemitter3();
 var EventEmitter = /*@__PURE__*/getDefaultExportFromCjs(eventemitter3Exports);
 
-const version = "1.6.3-0.canary.11232";
+const version = "1.6.3-0.canary.11234";
 
 // ensure the worker ends up in the bundle
 // If the worker should not be included this gets aliased to empty.js
@@ -23458,7 +23458,7 @@ class HlsAssetPlayer {
     this.assetItem = assetItem;
     let uri = assetItem.uri;
     try {
-      uri = getInterstitialUrl(uri, hls.sessionId).href;
+      uri = getInterstitialUrl(uri, userConfig.primarySessionId).href;
     } catch (error) {
       // Ignore error parsing ASSET_URI or adding _HLS_primary_id to it. The
       // issue should surface as an INTERSTITIAL_ASSET_ERROR loading the asset.
@@ -24411,7 +24411,7 @@ class InterstitialsController extends Logger {
       const interstitialsUpdated = !!(interstitialEvents.length || removedIds.length);
       if (interstitialsUpdated) {
         this.log(`INTERSTITIALS_UPDATED (${interstitialEvents.length}): ${interstitialEvents}
-Schedule: ${scheduleItems.map(seg => segmentToString(seg))}`);
+Schedule: ${scheduleItems.map(seg => segmentToString(seg))} pos: ${this.timelinePos}`);
       }
       if (removedIds.length) {
         this.log(`Removed events ${removedIds}`);
@@ -24434,11 +24434,13 @@ Schedule: ${scheduleItems.map(seg => segmentToString(seg))}`);
 
       // Update schedule item references
       // Do not replace Interstitial playingItem without a match - used for INTERSTITIAL_ASSET_ENDED and INTERSTITIAL_ENDED
+      let trimInPlaceForPlayout = null;
       if (playingItem) {
         const updatedPlayingItem = this.updateItem(playingItem, this.timelinePos);
         if (this.itemsMatch(playingItem, updatedPlayingItem)) {
           this.playingItem = updatedPlayingItem;
           this.waitingItem = this.endedItem = null;
+          trimInPlaceForPlayout = () => this.trimInPlace(updatedPlayingItem, playingItem);
         }
       } else {
         // Clear waitingItem if it has been removed from the schedule
@@ -24451,6 +24453,7 @@ Schedule: ${scheduleItems.map(seg => segmentToString(seg))}`);
         const updatedBufferingItem = this.updateItem(bufferingItem, this.bufferedPos);
         if (this.itemsMatch(bufferingItem, updatedBufferingItem)) {
           this.bufferingItem = updatedBufferingItem;
+          trimInPlaceForPlayout || (trimInPlaceForPlayout = () => this.trimInPlace(updatedBufferingItem, bufferingItem));
         } else if (bufferingItem.event) {
           // Interstitial removed from schedule (Live -> VOD or other scenario where Start Date is outside the range of VOD Playlist)
           this.bufferingItem = this.playingItem;
@@ -24474,6 +24477,9 @@ Schedule: ${scheduleItems.map(seg => segmentToString(seg))}`);
           this.primaryFallback(playingItem.event);
           return;
         }
+        if (trimInPlaceForPlayout) {
+          trimInPlaceForPlayout();
+        }
 
         // Check is buffered to new Interstitial event boundary
         // (Live update publishes Interstitial with new segment)
@@ -25486,6 +25492,21 @@ Schedule: ${scheduleItems.map(seg => segmentToString(seg))}`);
     }
     return null;
   }
+  trimInPlace(updatedItem, itemBeforeUpdate) {
+    if (this.isInterstitial(updatedItem) && updatedItem.event.appendInPlace && itemBeforeUpdate.end - updatedItem.end > 0.25) {
+      updatedItem.event.assetList.forEach((asset, index) => {
+        if (updatedItem.event.isAssetPastPlayoutLimit(index)) {
+          this.clearAssetPlayer(asset.identifier, null);
+        }
+      });
+      const flushStart = updatedItem.end + 0.25;
+      const bufferInfo = BufferHelper.bufferInfo(this.primaryMedia, flushStart, 0);
+      if (bufferInfo.end > flushStart || (bufferInfo.nextStart || 0) > flushStart) {
+        this.attachPrimary(flushStart, null);
+        this.flushFrontBuffer(flushStart);
+      }
+    }
+  }
   itemsMatch(a, b) {
     return !!b && (a === b || a.event && b.event && this.eventItemsMatch(a, b) || !a.event && !b.event && this.findItemIndex(a) === this.findItemIndex(b));
   }
@@ -26094,10 +26115,6 @@ Schedule: ${scheduleItems.map(seg => segmentToString(seg))}`);
     this.updateSchedule();
     if (playingItem) {
       this.log(`Fallback to primary from event "${interstitial.identifier}" start: ${flushStart} pos: ${this.timelinePos} playing: ${playingItem ? segmentToString(playingItem) : '<none>'} error: ${interstitial.error}`);
-      if (interstitial.appendInPlace) {
-        this.attachPrimary(flushStart, null);
-        this.flushFrontBuffer(flushStart);
-      }
       let timelinePos = this.timelinePos;
       if (timelinePos === -1) {
         timelinePos = this.hls.startPosition;
@@ -26109,6 +26126,10 @@ Schedule: ${scheduleItems.map(seg => segmentToString(seg))}`);
       } else {
         this.clearInterstitial(interstitial, null);
       }
+      if (interstitial.appendInPlace) {
+        this.attachPrimary(flushStart, null);
+        this.flushFrontBuffer(flushStart);
+      }
     } else {
       this.checkStart();
     }