@amazon/vinyl 3.2.0 → 3.2.2

package/dist/index.cjs

@@ -67,6 +67,7 @@ __export(index_exports, {
   DrmError: () => DrmError,
   DrmKeySystem: () => DrmKeySystem,
   DrmRobustness: () => DrmRobustness,
+  EXCESSIVE_SESSION_COUNT: () => EXCESSIVE_SESSION_COUNT,
   FAIR_PLAY_KEY_SYSTEMS: () => FAIR_PLAY_KEY_SYSTEMS,
   FixedPlaybackQuality: () => FixedPlaybackQuality,
   HtmlTextTrackRenderer: () => HtmlTextTrackRenderer,
@@ -84,6 +85,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 +355,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 +846,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(
@@ -2090,6 +2099,7 @@ function createFairPlaySessionInitData(initData, contentId, certificateData) {
 // src/drm/DrmControllerImpl.ts
 var LICENSE_TIMEOUT = 90;
 var LICENSE_TIMEOUT_MESSAGE = "License provider timed out after {time}s";
+var EXCESSIVE_SESSION_COUNT = 20;
 var DrmControllerImpl = class extends import_vinyl_util24.EventHostImpl {
   constructor(deps, options) {
     super();
@@ -2306,6 +2316,13 @@ var DrmControllerImpl = class extends import_vinyl_util24.EventHostImpl {
       trackUri
     });
     this.sessions.push(newSession);
+    (0, import_vinyl_util24.logVerbose)(this, `total sessions: ${this.sessions.length}`);
+    if (this.sessions.length === EXCESSIVE_SESSION_COUNT + 1) {
+      (0, import_vinyl_util24.logWarn)(
+        this,
+        `${this.sessions.length} open key sessions exceeds ${EXCESSIVE_SESSION_COUNT}; sessions may be leaking (not closing on track deactivation)`
+      );
+    }
     this.dispatch("sessionCreate", {
       initDataType: newSession.initDataType,
       mimeType: newSession.mimeType
@@ -2817,7 +2834,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.2"
 );
 
 // src/global/globalRef.ts
@@ -3016,6 +3033,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 +3042,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 +3059,7 @@ function createStallMonitor(controller, callbacks, options = {}) {
     clearInterval(pollId);
     pollId = null;
   };
+  add(stopPoll);
   const startPoll = () => {
     if (pollId != null) return;
     pollId = setInterval(() => {
@@ -3055,17 +3075,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 +3094,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
@@ -3372,15 +3387,13 @@ var PlaybackControllerImpl = class extends import_vinyl_util42.EventHostImpl {
     __publicField(this, "_playing", false);
     __publicField(this, "_seeking", false);
     __publicField(this, "_waiting", false);
-    // Monotonic counter identifying the most recent seekTo call.
-    __publicField(this, "_seekId", 0);
+    __publicField(this, "seekAbortSlot", /* @__PURE__ */ (0, import_vinyl_util42.createAbortSlot)());
     // Stops the stall detector started after the last seek, if any.
     __publicField(this, "stopStallDetection", null);
     // default user volume (0.0 to 1.0 scale)
     __publicField(this, "userVolume", 1);
     __publicField(this, "_pendingPlay", null);
     __publicField(this, "playAbort", null);
-    __publicField(this, "disposeAbort", /* @__PURE__ */ new import_vinyl_util42.Abort());
     __publicField(this, "options");
     this.options = __spreadValues(__spreadProps(__spreadValues({}, defaultPlaybackControllerImplOptions), {
       minSeekableBuffer: getMinSeekableBufferDefault()
@@ -3391,8 +3404,7 @@ var PlaybackControllerImpl = class extends import_vinyl_util42.EventHostImpl {
     const { add } = this.disposer;
     add(() => {
       var _a;
-      this.disposeAbort.abort();
-      this.disposeAbort.dispose();
+      this.seekAbortSlot.abort();
       (_a = this.stopStallDetection) == null ? void 0 : _a.call(this);
     });
     this.domEvents = add(
@@ -3805,14 +3817,10 @@ var PlaybackControllerImpl = class extends import_vinyl_util42.EventHostImpl {
   async seekTo(time, tolerance = 0.5) {
     var _a;
     (0, import_vinyl_util42.logDebug)(this, `seekTo: ${time}`);
-    const seekId = ++this._seekId;
     (_a = this.stopStallDetection) == null ? void 0 : _a.call(this);
     this.stopStallDetection = null;
-    const superseded = () => {
-      if (this._seekId === seekId) return false;
-      (0, import_vinyl_util42.logDebug)(this, `seekTo: ${time} superseded by a newer seek`);
-      return true;
-    };
+    this.seekAbortSlot.abort();
+    const seekAbort = this.seekAbortSlot.value;
     const nextEvent = (type, options) => {
       var _a2;
       return (0, import_vinyl_util42.nextEventAsPromise)(this, type, {
@@ -3820,12 +3828,25 @@ var PlaybackControllerImpl = class extends import_vinyl_util42.EventHostImpl {
         timeoutMessage: `seek timed out on ${type} event after {time}s`,
         timeoutOrigin: import_vinyl_util42.ErrorOrigin.INTERNAL,
         timeoutLevel: import_vinyl_util42.ErrorLevel.WARN,
-        abort: this.disposeAbort
+        abort: seekAbort
       });
     };
+    try {
+      await this.doSeek(time, tolerance, seekAbort, nextEvent);
+    } catch (error) {
+      if (seekAbort.aborted() && !this.disposed) return;
+      throw error;
+    }
+  }
+  /**
+   * The body of a single {@link seekTo} attempt. Extracted so {@link seekTo}
+   * can wrap it with per-seek abort/supersession handling. `seekAbort` is
+   * aborted when a newer seek supersedes this one (or on dispose).
+   * @private
+   */
+  async doSeek(time, tolerance, seekAbort, nextEvent) {
     if (!this.hasMetadata) {
       await nextEvent("loadedMetadata");
-      if (superseded()) return;
     }
     const seekable = this.seekable;
     const range = seekable.getRangeAt(
@@ -3856,7 +3877,7 @@ var PlaybackControllerImpl = class extends import_vinyl_util42.EventHostImpl {
       );
     } else {
       const nullIfStuck = (error) => {
-        if (this.disposeAbort.aborted()) throw error;
+        if (this.disposed) throw error;
         return null;
       };
       const seekOnce = async (reSeeking) => {
@@ -3870,7 +3891,7 @@ var PlaybackControllerImpl = class extends import_vinyl_util42.EventHostImpl {
         }).catch(nullIfStuck);
       };
       let seekedEvent = await seekOnce(false);
-      for (let attempt = 0; !superseded() && attempt < SEEK_RETRY_LIMIT && (seekedEvent === null || seekedEvent.reason === "seeked" && !(0, import_vinyl_util42.closeTo)(clampedTime, this.currentTime, tolerance)); attempt++) {
+      for (let attempt = 0; !seekAbort.aborted() && attempt < SEEK_RETRY_LIMIT && (seekedEvent === null || seekedEvent.reason === "seeked" && !(0, import_vinyl_util42.closeTo)(clampedTime, this.currentTime, tolerance)); attempt++) {
         if (seekedEvent === null) void this.media.play().catch(import_vinyl_util42.noop);
         (0, import_vinyl_util42.logDebug)(this, `seekTo: re-seeking to ${clampedTime}`);
         seekedEvent = await seekOnce(true);
@@ -3878,7 +3899,7 @@ var PlaybackControllerImpl = class extends import_vinyl_util42.EventHostImpl {
       if ((seekedEvent == null ? void 0 : seekedEvent.reason) === "emptied") {
         throw new import_vinyl_util42.AbortError();
       }
-      if (!this.paused) this.startStallDetection();
+      if (!this.paused && !seekAbort.aborted()) this.startStallDetection();
     }
   }
   /**
@@ -7987,7 +8008,6 @@ var MseTrack = class extends TrackBase {
     const deps = depsContainer.dependencies;
     super(uri, type, deps);
     __publicField(this, "streams", []);
-    __publicField(this, "disposeAbort", /* @__PURE__ */ new import_vinyl_util80.Abort());
     __publicField(this, "lastPreloadOptions", null);
     __publicField(this, "allFetchedRanges", []);
     __publicField(this, "_fetchedRanges", /* @__PURE__ */ new import_vinyl_util80.IntersectionRanges(
@@ -8012,7 +8032,7 @@ var MseTrack = class extends TrackBase {
       if (this.active) {
         this.deps.drmController.initializeForPlayback(event.current, {
           trackUri: this.uri,
-          abort: this.disposeAbort
+          abort: this.drmSessionAbort.value
         });
       }
     });
@@ -8020,7 +8040,7 @@ var MseTrack = class extends TrackBase {
       if (event.current == null) return;
       this.deps.drmController.setBufferingDrmInfo(event.current, {
         trackUri: this.uri,
-        abort: this.disposeAbort
+        abort: this.drmSessionAbort.value
       });
     });
     add(
@@ -8258,7 +8278,7 @@ var MseTrack = class extends TrackBase {
     this.streams.forEach((stream) => {
       this.deps.drmController.initializeForPlayback(
         stream.streamingQuality,
-        { trackUri: this.uri, abort: this.disposeAbort }
+        { trackUri: this.uri, abort: this.drmSessionAbort.value }
       );
     });
     this.deps.playbackSource.src = this.deps.mediaSourceController.activate();
@@ -8284,7 +8304,7 @@ var MseTrack = class extends TrackBase {
     this.callOnStreams("deactivate");
     this.deps.drmController.setBufferingDrmInfo(null, {
       trackUri: this.uri,
-      abort: this.disposeAbort
+      abort: this.drmSessionAbort.value
     });
     (_b = this.deps.textTrackController) == null ? void 0 : _b.deactivate();
     this.deps.playbackSource.src = null;