@amazon/vinyl 3.2.0 → 3.2.2

package/dist/index.js

@@ -68,6 +68,7 @@ var AdError = class _AdError extends ReportableError {
 
 // src/ad/AdControllerImpl.ts
 var AD_START_TOLERANCE = 0.05;
+var PLAYOUT_LIMIT_TOLERANCE = 1;
 var defaultAdControllerImplOptions = {
   adLoadTimeout: 15,
   preloadAheadTime: 10
@@ -558,23 +559,29 @@ var AdControllerImpl = class extends 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(
@@ -1629,6 +1636,7 @@ import {
   logDebug as logDebug3,
   logError as logError2,
   logVerbose as logVerbose2,
+  logWarn,
   memoize as memoize4,
   noop as noop3,
   normalizeHeadersInit,
@@ -1878,6 +1886,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 EventHostImpl5 {
   constructor(deps, options) {
     super();
@@ -2094,6 +2103,13 @@ var DrmControllerImpl = class extends EventHostImpl5 {
       trackUri
     });
     this.sessions.push(newSession);
+    logVerbose2(this, `total sessions: ${this.sessions.length}`);
+    if (this.sessions.length === EXCESSIVE_SESSION_COUNT + 1) {
+      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
@@ -2523,7 +2539,7 @@ import {
   globalRef as globalRef3,
   globalTarget,
   IllegalStateError,
-  logWarn,
+  logWarn as logWarn2,
   remove as remove2,
   substitute
 } from "@amazon/vinyl-util";
@@ -2545,7 +2561,7 @@ var PlayerRegistryImpl = class {
     const n = this._players.length;
     if (n > this.maxPlayersWarning && !this.gaveMaxPlayersWarning) {
       this.gaveMaxPlayersWarning = true;
-      logWarn(
+      logWarn2(
         globalTarget,
         substitute(locale.maxPlayersWarning, { count: n })
       );
@@ -2621,7 +2637,7 @@ function configureVinylGlobal(options) {
 import { parseVersion } from "@amazon/vinyl-util";
 var vinylVersion = /* @__PURE__ */ parseVersion(
   /* istanbul ignore next */
-  "3.2.0"
+  "3.2.2"
 );
 
 // src/global/globalRef.ts
@@ -2826,6 +2842,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;
@@ -2834,6 +2851,7 @@ function createStallMonitor(controller, callbacks, options = {}) {
   let lastProgressAt = Date.now();
   let inStall = false;
   let pollId = null;
+  const { add, dispose } = createDisposer3();
   const endStall = (reason) => {
     if (!inStall) return;
     inStall = false;
@@ -2850,6 +2868,7 @@ function createStallMonitor(controller, callbacks, options = {}) {
     clearInterval(pollId);
     pollId = null;
   };
+  add(stopPoll);
   const startPoll = () => {
     if (pollId != null) return;
     pollId = setInterval(() => {
@@ -2865,17 +2884,18 @@ function createStallMonitor(controller, callbacks, options = {}) {
     observedPlaying = false;
     stopPoll();
   };
-  const { add, dispose } = createDisposer3();
   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();
     })
@@ -2883,13 +2903,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
@@ -3171,6 +3185,7 @@ var LIVE_DURATION = 4294967296;
 import {
   Abort,
   AbortError as AbortError2,
+  createAbortSlot,
   Browser,
   clamp,
   closeTo as closeTo2,
@@ -3183,7 +3198,7 @@ import {
   hasBrowser,
   logDebug as logDebug6,
   logInfo,
-  logWarn as logWarn2,
+  logWarn as logWarn3,
   nextEventAsPromise as nextEventAsPromise2,
   noop as noop4,
   onAny,
@@ -3217,15 +3232,13 @@ var PlaybackControllerImpl = class extends EventHostImpl7 {
     __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__ */ 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 Abort());
     __publicField(this, "options");
     this.options = __spreadValues(__spreadProps(__spreadValues({}, defaultPlaybackControllerImplOptions), {
       minSeekableBuffer: getMinSeekableBufferDefault()
@@ -3236,8 +3249,7 @@ var PlaybackControllerImpl = class extends EventHostImpl7 {
     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(
@@ -3650,14 +3662,10 @@ var PlaybackControllerImpl = class extends EventHostImpl7 {
   async seekTo(time, tolerance = 0.5) {
     var _a;
     logDebug6(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;
-      logDebug6(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 nextEventAsPromise2(this, type, {
@@ -3665,12 +3673,25 @@ var PlaybackControllerImpl = class extends EventHostImpl7 {
         timeoutMessage: `seek timed out on ${type} event after {time}s`,
         timeoutOrigin: ErrorOrigin12.INTERNAL,
         timeoutLevel: ErrorLevel7.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(
@@ -3678,7 +3699,7 @@ var PlaybackControllerImpl = class extends EventHostImpl7 {
       tolerance
     );
     if (range == null) {
-      logWarn2(
+      logWarn3(
         this,
         `seekTo: seek outside of seekable ranges, seek ignored`,
         seekable.ranges
@@ -3701,7 +3722,7 @@ var PlaybackControllerImpl = class extends EventHostImpl7 {
       );
     } else {
       const nullIfStuck = (error) => {
-        if (this.disposeAbort.aborted()) throw error;
+        if (this.disposed) throw error;
         return null;
       };
       const seekOnce = async (reSeeking) => {
@@ -3715,7 +3736,7 @@ var PlaybackControllerImpl = class extends EventHostImpl7 {
         }).catch(nullIfStuck);
       };
       let seekedEvent = await seekOnce(false);
-      for (let attempt = 0; !superseded() && attempt < SEEK_RETRY_LIMIT && (seekedEvent === null || seekedEvent.reason === "seeked" && !closeTo2(clampedTime, this.currentTime, tolerance)); attempt++) {
+      for (let attempt = 0; !seekAbort.aborted() && attempt < SEEK_RETRY_LIMIT && (seekedEvent === null || seekedEvent.reason === "seeked" && !closeTo2(clampedTime, this.currentTime, tolerance)); attempt++) {
         if (seekedEvent === null) void this.media.play().catch(noop4);
         logDebug6(this, `seekTo: re-seeking to ${clampedTime}`);
         seekedEvent = await seekOnce(true);
@@ -3723,7 +3744,7 @@ var PlaybackControllerImpl = class extends EventHostImpl7 {
       if ((seekedEvent == null ? void 0 : seekedEvent.reason) === "emptied") {
         throw new AbortError2();
       }
-      if (!this.paused) this.startStallDetection();
+      if (!this.paused && !seekAbort.aborted()) this.startStallDetection();
     }
   }
   /**
@@ -3975,7 +3996,7 @@ var audioOptionsValidator = /* @__PURE__ */ object7({
 
 // src/streaming/buffering/BufferingController.ts
 import {
-  createAbortSlot,
+  createAbortSlot as createAbortSlot2,
   createDisposer as createDisposer8,
   createLogPrefix as createLogPrefix5,
   createTaskQueue,
@@ -3986,7 +4007,7 @@ import {
   logDebug as logDebug7,
   LogLevel as LogLevel2,
   logVerbose as logVerbose3,
-  logWarn as logWarn3,
+  logWarn as logWarn4,
   throttle as throttle2
 } from "@amazon/vinyl-util";
 
@@ -4095,7 +4116,7 @@ var BufferingControllerImpl = class extends EventHostImpl8 {
     __publicField(this, "disposer", /* @__PURE__ */ createDisposer8());
     __publicField(this, "_active", false);
     __publicField(this, "activateDisposer", null);
-    __publicField(this, "segmentAbort", /* @__PURE__ */ createAbortSlot());
+    __publicField(this, "segmentAbort", /* @__PURE__ */ createAbortSlot2());
     /**
      * Resets the throttle and polls the buffer on the next frame.
      */
@@ -4146,7 +4167,7 @@ var BufferingControllerImpl = class extends EventHostImpl8 {
           const newAppendSize = this.getMaxAppendSize(contentType2) * QUOTA_REACHED_SCALE;
           if (newAppendSize >= MIN_APPEND_SIZE) {
             sourceBufferQuotas.set(contentType2, newAppendSize);
-            logWarn3(
+            logWarn4(
               this,
               "QuotaExceededError, new source buffer limit:",
               (newAppendSize / 1024 / 1024).toFixed(1) + " MiB"
@@ -4442,7 +4463,7 @@ var BufferingControllerImpl = class extends EventHostImpl8 {
     const contentType2 = quality == null ? void 0 : quality.contentType;
     if (!mimeType || !contentType2) return false;
     if (!denylistCodecsFromMimeType(mimeType)) return false;
-    logWarn3(
+    logWarn4(
       this,
       "SourceBuffer append failed; denylisting codec and requesting reload:",
       mimeType
@@ -4518,7 +4539,7 @@ import {
   IllegalStateError as IllegalStateError2,
   isSilentError as isSilentError3,
   logDebug as logDebug8,
-  logWarn as logWarn4,
+  logWarn as logWarn5,
   ReportableError as ReportableError8,
   toJson as toJson2,
   toLowerCase as toLowerCase2
@@ -4641,7 +4662,7 @@ var MediaSourceControllerImpl = class extends EventHostImpl9 {
     try {
       URL.revokeObjectURL(this.objectUrl);
     } catch (error) {
-      logWarn4(this, "error revoking object url", error);
+      logWarn5(this, "error revoking object url", error);
     }
   }
   get sourceBufferCount() {
@@ -5679,7 +5700,7 @@ function createDefaultMediaTimelineTransformer(deps) {
 // src/streaming/ManifestControllerImpl.ts
 import { data } from "@amazon/vinyl-observable";
 import {
-  createAbortSlot as createAbortSlot2,
+  createAbortSlot as createAbortSlot3,
   createDisposer as createDisposer11,
   EventHostImpl as EventHostImpl11,
   logDebug as logDebug11
@@ -5689,7 +5710,7 @@ var ManifestControllerImpl = class {
     __publicField(this, "deps", deps);
     __publicField(this, "_data");
     __publicField(this, "_error", null);
-    __publicField(this, "abortSlot", /* @__PURE__ */ createAbortSlot2());
+    __publicField(this, "abortSlot", /* @__PURE__ */ createAbortSlot3());
     __publicField(this, "disposer", /* @__PURE__ */ createDisposer11());
     __publicField(this, "events", /* @__PURE__ */ new EventHostImpl11());
     __publicField(this, "manifestSpanArmed", true);
@@ -5815,7 +5836,7 @@ import {
 
 // src/streaming/SegmentDataSlot.ts
 import {
-  createAbortSlot as createAbortSlot3,
+  createAbortSlot as createAbortSlot4,
   isSilentError as isSilentError4
 } from "@amazon/vinyl-util";
 var SegmentStatus = /* @__PURE__ */ ((SegmentStatus2) => {
@@ -5833,7 +5854,7 @@ var SegmentDataSlot = class {
      */
     __publicField(this, "onStatusChange", null);
     __publicField(this, "_status", "inactive" /* INACTIVE */);
-    __publicField(this, "abortSlot", /* @__PURE__ */ createAbortSlot3());
+    __publicField(this, "abortSlot", /* @__PURE__ */ createAbortSlot4());
     __publicField(this, "bufferPromise", null);
   }
   /**
@@ -6982,7 +7003,7 @@ function scoreTextTrack(track, prefs) {
 
 // src/text/SidecarTextTrackController.ts
 import {
-  createAbortSlot as createAbortSlot4,
+  createAbortSlot as createAbortSlot5,
   createDisposer as createDisposer13,
   equalDeep,
   EventHostImpl as EventHostImpl13,
@@ -7163,7 +7184,7 @@ var SidecarTextTrackController = class extends EventHostImpl13 {
     // The DOM text track currently rendering cues, or null when hidden. Owned by
     // the provider (never created/removed here).
     __publicField(this, "_ref", null);
-    __publicField(this, "loadAbort", /* @__PURE__ */ createAbortSlot4());
+    __publicField(this, "loadAbort", /* @__PURE__ */ createAbortSlot5());
     __publicField(this, "disposer", /* @__PURE__ */ createDisposer13());
     const { add } = this.disposer;
     add(deps.options.onData(() => this.refreshSelection()));
@@ -7557,7 +7578,7 @@ import { func as func2, isOneOf as isOneOf7 } from "@amazon/vinyl-validation";
 
 // src/track/TrackBase.ts
 import {
-  createAbortSlot as createAbortSlot5,
+  createAbortSlot as createAbortSlot6,
   createDisposer as createDisposer15,
   emptyRanges as emptyRanges2,
   equalDeep as equalDeep2,
@@ -7587,7 +7608,7 @@ var TrackBase = class extends EventHostImpl15 {
       }
     });
     __publicField(this, "disposer", /* @__PURE__ */ createDisposer15());
-    __publicField(this, "drmSessionAbort", /* @__PURE__ */ createAbortSlot5());
+    __publicField(this, "drmSessionAbort", /* @__PURE__ */ createAbortSlot6());
     /**
      * Sets on handleError, cleared on 'reset'.
      */
@@ -7996,7 +8017,6 @@ import {
 
 // src/track/mse/MseTrack.ts
 import {
-  Abort as Abort3,
   equalDeep as equalDeep3,
   first as first2,
   IntersectionRanges,
@@ -8010,7 +8030,6 @@ var MseTrack = class extends TrackBase {
     const deps = depsContainer.dependencies;
     super(uri, type, deps);
     __publicField(this, "streams", []);
-    __publicField(this, "disposeAbort", /* @__PURE__ */ new Abort3());
     __publicField(this, "lastPreloadOptions", null);
     __publicField(this, "allFetchedRanges", []);
     __publicField(this, "_fetchedRanges", /* @__PURE__ */ new IntersectionRanges(
@@ -8035,7 +8054,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
         });
       }
     });
@@ -8043,7 +8062,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(
@@ -8281,7 +8300,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();
@@ -8307,7 +8326,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;
@@ -9914,7 +9933,7 @@ import {
   logError as logError5,
   logInfo as logInfo2,
   logVerbose as logVerbose4,
-  logWarn as logWarn5,
+  logWarn as logWarn6,
   LruCache,
   noop as noop8,
   resolveValueProvider as resolveValueProvider3
@@ -9966,7 +9985,7 @@ var TrackControllerImpl = class extends EventHostImpl17 {
       if (this.currentTrackIsAdTrack) return;
       const track = this._current;
       if (!track) {
-        logWarn5(this, "an ended event was received with no current track");
+        logWarn6(this, "an ended event was received with no current track");
         return;
       }
       const interrupted = this.getQueueInterrupted();
@@ -10575,7 +10594,7 @@ import {
   logInfo as logInfo3,
   LogLevel as LogLevel3,
   logVerbose as logVerbose5,
-  logWarn as logWarn6,
+  logWarn as logWarn7,
   redispatchEvents as redispatchEvents4
 } from "@amazon/vinyl-util";
 import {
@@ -10677,7 +10696,7 @@ var VinylPlayer = class extends EventHostImpl18 {
     add(
       this.on("codecUnsupported", (event) => {
         if (this.deps.adController.currentAdBreak) return;
-        logWarn6(
+        logWarn7(
           this,
           "codec unsupported, reloading track:",
           event.mimeType
@@ -11248,6 +11267,7 @@ export {
   DrmError,
   DrmKeySystem,
   DrmRobustness,
+  EXCESSIVE_SESSION_COUNT,
   FAIR_PLAY_KEY_SYSTEMS,
   FixedPlaybackQuality,
   HtmlTextTrackRenderer,
@@ -11265,6 +11285,7 @@ export {
   MsCommonMediaKeySystemAccess,
   MsCommonMediaKeys,
   MseTrack,
+  PLAYOUT_LIMIT_TOLERANCE,
   PLAY_READY_KEY_SYSTEMS,
   POLL_BUFFER_THROTTLE,
   PREFETCH_POLL_THROTTLE,