@amazon/vinyl 3.2.0 → 3.2.1

package/dist/index.cjs

@@ -84,6 +84,7 @@ __export(index_exports, {
   MsCommonMediaKeySystemAccess: () => MsCommonMediaKeySystemAccess,
   MsCommonMediaKeys: () => MsCommonMediaKeys,
   MseTrack: () => MseTrack,
+  PLAYOUT_LIMIT_TOLERANCE: () => PLAYOUT_LIMIT_TOLERANCE,
   PLAY_READY_KEY_SYSTEMS: () => PLAY_READY_KEY_SYSTEMS,
   POLL_BUFFER_THROTTLE: () => POLL_BUFFER_THROTTLE,
   PREFETCH_POLL_THROTTLE: () => PREFETCH_POLL_THROTTLE,
@@ -353,6 +354,7 @@ var AdError = class _AdError extends import_vinyl_util.ReportableError {
 
 // src/ad/AdControllerImpl.ts
 var AD_START_TOLERANCE = 0.05;
+var PLAYOUT_LIMIT_TOLERANCE = 1;
 var defaultAdControllerImplOptions = {
   adLoadTimeout: 15,
   preloadAheadTime: 10
@@ -843,23 +845,29 @@ var AdControllerImpl = class extends import_vinyl_util2.EventHostImpl {
     });
   }
   /**
-   * Ads breaks can have a playout limit that may cut off ad playback.
-   * End the ad if that limit is reached.
+   * Enforces the break-level playout limit (X-PLAYOUT-LIMIT): a budget shared
+   * across all of the break's ads. When cumulative playout reaches it, the
+   * whole break ends, dropping any ads that have not started.
+   *
+   * This is deliberately NOT a per-ad cap. Each ad asset is its own source and
+   * ends on its media `ended` (see the 'ended' handler), which is what advances
+   * a multi-ad break. Ending an ad at its declared per-ad DURATION instead would
+   * truncate the real asset whenever a packager under-declares it — e.g. rounds
+   * a 6.732s asset down to a whole-second 6 — cutting off the fractional tail.
    */
   enforcePlayoutLimits(adState) {
+    if (!adState.started) return;
+    const { parentBreak } = adState;
+    const limit = parentBreak.adBreak.playoutLimit;
+    if (limit == null) return;
     const pC = this.deps.playbackController;
-    const { ad, parentBreak } = adState;
-    if (adState.started) {
-      const elapsed = Math.max(0, pC.currentTime - adState.timeStart);
-      const adBreak = parentBreak.adBreak;
-      const limit = adBreak.playoutLimit;
-      if (limit != null && parentBreak.playoutElapsed + elapsed >= limit) {
-        parentBreak.clear();
-        this.endAd(adState);
-      } else if (ad.duration != null && elapsed >= ad.duration) {
-        this.endAd(adState);
-      }
+    const elapsed = Math.max(0, pC.currentTime - adState.timeStart);
+    if (parentBreak.playoutElapsed + elapsed < limit) return;
+    if (isFinite(pC.duration) && pC.duration > 0 && pC.duration - pC.currentTime <= PLAYOUT_LIMIT_TOLERANCE) {
+      return;
     }
+    parentBreak.clear();
+    this.endAd(adState);
   }
   setPendingBreaks(newPending) {
     this.pendingAdBreaks = newPending.filter(
@@ -2817,7 +2825,7 @@ function configureVinylGlobal(options) {
 var import_vinyl_util27 = require("@amazon/vinyl-util");
 var vinylVersion = /* @__PURE__ */ (0, import_vinyl_util27.parseVersion)(
   /* istanbul ignore next */
-  "3.2.0"
+  "3.2.1"
 );
 
 // src/global/globalRef.ts
@@ -3016,6 +3024,7 @@ var PlaybackNetworkState = /* @__PURE__ */ ((PlaybackNetworkState2) => {
 })(PlaybackNetworkState || {});
 
 // src/playback/createStallMonitor.ts
+var PROGRESS_EPSILON = 1e-6;
 function createStallMonitor(controller, callbacks, options = {}) {
   var _a, _b;
   const stallThresholdMs = ((_a = options.stallThreshold) != null ? _a : 1) * 1e3;
@@ -3024,6 +3033,7 @@ function createStallMonitor(controller, callbacks, options = {}) {
   let lastProgressAt = Date.now();
   let inStall = false;
   let pollId = null;
+  const { add, dispose } = (0, import_vinyl_util30.createDisposer)();
   const endStall = (reason) => {
     if (!inStall) return;
     inStall = false;
@@ -3040,6 +3050,7 @@ function createStallMonitor(controller, callbacks, options = {}) {
     clearInterval(pollId);
     pollId = null;
   };
+  add(stopPoll);
   const startPoll = () => {
     if (pollId != null) return;
     pollId = setInterval(() => {
@@ -3055,17 +3066,18 @@ function createStallMonitor(controller, callbacks, options = {}) {
     observedPlaying = false;
     stopPoll();
   };
-  const { add, dispose } = (0, import_vinyl_util30.createDisposer)();
   add(
     controller.on("playing", () => {
       if (inStall) endStall("playing" /* PLAYING */);
-      else lastProgressAt = Date.now();
+      lastProgressAt = Date.now();
       observedPlaying = true;
       startPoll();
     })
   );
   add(
-    controller.on("timeUpdate", () => {
+    controller.on("timeUpdate", ({ previous, current }) => {
+      if (previous != null && current - previous <= PROGRESS_EPSILON)
+        return;
       if (inStall) endStall("playing" /* PLAYING */);
       lastProgressAt = Date.now();
     })
@@ -3073,13 +3085,7 @@ function createStallMonitor(controller, callbacks, options = {}) {
   add(controller.on("pause", () => suspend("pause" /* PAUSE */)));
   add(controller.on("seeking", () => suspend("seeking" /* SEEKING */)));
   add(controller.on("emptied", () => suspend("emptied" /* EMPTIED */)));
-  let stopped = false;
-  return () => {
-    if (stopped) return;
-    stopped = true;
-    stopPoll();
-    dispose();
-  };
+  return dispose;
 }
 
 // src/playback/error/InvalidSeekError.ts