@amazon/vinyl 3.2.1 → 3.2.3-next.20261001143710

package/README.md

@@ -40,8 +40,8 @@ player.load({
   PlayReady setup.
 - [DRM Controller](./docs/DRM_CONTROLLER.md) — implementing custom license
   acquisition.
-- [DASH Manifest Transforms](./docs/DASH_MANIFEST_TRANSFORM_GUIDE.md) —
-  rewriting manifests before parsing.
+- [Customization Guide](./docs/CUSTOMIZATION_GUIDE.md) — timeline / DASH / HLS
+  transforms and parser rule extensions.
 - [Auto Reset](./docs/AUTO_RESET.md) — recovering from terminal playback errors.
 
 Browse the full docs and TypeDoc API reference at

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,
@@ -669,7 +670,11 @@ var AdControllerImpl = class extends import_vinyl_util2.EventHostImpl {
       (0, import_vinyl_util2.logVerbose)(this, "nextAd");
       try {
         const ad = await adBreakState2.nextAd();
-        if (this.disposed || adBreakState2.completedReason) return;
+        if (this.disposed) return;
+        if (adBreakState2.completedReason) {
+          if (!this.adBreakState) await nextBreak();
+          return;
+        }
         if (ad) {
           this.startAd(ad);
         } else {
@@ -803,12 +808,18 @@ var AdControllerImpl = class extends import_vinyl_util2.EventHostImpl {
       const currProgress = pC.currentTimePercent;
       const progressStart = adState.timeStart / pC.duration;
       if (!adState.quartile.first && currProgress > 0.25 && progressStart < AD_START_TOLERANCE) {
+        adState.quartile.first = true;
+        (0, import_vinyl_util2.logDebug)(this, "adFirstQuartile", adState.ad);
         this.dispatch("adFirstQuartile", createAdProgressEvent(adState));
       }
       if (!adState.quartile.midpoint && currProgress > 0.5 && progressStart < 0.25 + AD_START_TOLERANCE) {
+        adState.quartile.midpoint = true;
+        (0, import_vinyl_util2.logDebug)(this, "adMidpoint", adState.ad);
         this.dispatch("adMidpoint", createAdProgressEvent(adState));
       }
       if (!adState.quartile.third && currProgress > 0.75 && progressStart < 0.5 + AD_START_TOLERANCE) {
+        adState.quartile.third = true;
+        (0, import_vinyl_util2.logDebug)(this, "adThirdQuartile", adState.ad);
         this.dispatch("adThirdQuartile", createAdProgressEvent(adState));
       }
     }
@@ -1220,6 +1231,7 @@ async function resolveHlsAssetList({
   const url = (0, import_vinyl_util5.resolveUrl)(assetListUrl, baseUrl);
   const response = await (0, import_vinyl_util5.requestWithRetry)(url);
   const json = await (0, import_vinyl_util5.readResponseBody)(response, "json");
+  const assetListBaseUrl = response.url || url;
   const assets = (_a = json.ASSETS) != null ? _a : [];
   const ads = assets.map((asset, i) => {
     var _a2;
@@ -1227,7 +1239,14 @@ async function resolveHlsAssetList({
       id: `${rangeId}-${i}`,
       startTime,
       duration: (_a2 = asset.DURATION) != null ? _a2 : null,
-      uri: (0, import_vinyl_util5.resolveUrl)(asset.URI, baseUrl)
+      // Each Asset-Description "URI" MUST be an absolute URI, so the base
+      // only applies to non-conforming lists. As a leniency (not a spec
+      // rule), resolve against the asset list the URI was read from, as
+      // for any relative reference in a retrieved document (RFC 3986
+      // §5.1.3): asset lists are commonly served by an ad server rather
+      // than alongside the playlist.
+      // @see https://datatracker.ietf.org/doc/html/draft-pantos-hls-rfc8216bis-22#appendix-D.2
+      uri: (0, import_vinyl_util5.resolveUrl)(asset.URI, assetListBaseUrl)
     };
   });
   return { ads, skipControl: parseSkipControl(json["SKIP-CONTROL"]) };
@@ -1545,7 +1564,7 @@ var MsCommonMediaKeySession = class extends import_vinyl_util13.EventHostImpl {
     __publicField(this, "_disposed", false);
     __publicField(this, "messageHandler", (event) => {
       this.dispatch("message", {
-        message: event.message.buffer
+        message: (0, import_vinyl_util13.bufferToArrayBuffer)(event.message)
       });
     });
     __publicField(this, "errorHandler", () => {
@@ -1692,11 +1711,7 @@ var StandardCommonMediaKeySession = class extends import_vinyl_util15.EventHostI
     return "StandardCommonMediaKeySession";
   }
   generateRequest() {
-    const initData = this.initData;
-    return this.session.generateRequest(
-      this.initDataType,
-      initData instanceof ArrayBuffer ? initData : initData.buffer
-    ).catch(createDrmErrorHandler());
+    return this.session.generateRequest(this.initDataType, this.initData).catch(createDrmErrorHandler());
   }
   update(key) {
     if (this.disposed) throw new import_vinyl_util15.DisposedError();
@@ -1805,7 +1820,7 @@ var WebKitCommonMediaKeySession = class extends import_vinyl_util16.EventHostImp
     __publicField(this, "_disposed", false);
     __publicField(this, "messageHandler", (event) => {
       this.dispatch("message", {
-        message: event.message.buffer
+        message: (0, import_vinyl_util16.bufferToArrayBuffer)(event.message)
       });
     });
     __publicField(this, "errorHandler", () => {
@@ -2056,7 +2071,7 @@ var import_vinyl_util20 = require("@amazon/vinyl-util");
 var import_vinyl_util21 = require("@amazon/vinyl-util");
 var import_vinyl_util22 = require("@amazon/vinyl-util");
 function extractContentId(initData) {
-  const bufferStr = (0, import_vinyl_util22.bufferToUtf16)(initData.buffer);
+  const bufferStr = (0, import_vinyl_util22.bufferToUtf16)((0, import_vinyl_util22.bufferToArrayBuffer)(initData));
   const matches = bufferStr.match(/skd:\/\/(.+)$/);
   if (!matches) {
     throw new import_vinyl_util20.ValidationError("No contentId match", import_vinyl_util21.ErrorOrigin.MEDIA);
@@ -2098,6 +2113,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();
@@ -2314,6 +2330,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
@@ -2825,7 +2848,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.1"
+  "3.2.2"
 );
 
 // src/global/globalRef.ts
@@ -3378,15 +3401,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()
@@ -3397,8 +3418,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(
@@ -3811,14 +3831,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, {
@@ -3826,12 +3842,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(
@@ -3862,7 +3891,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) => {
@@ -3876,7 +3905,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);
@@ -3884,7 +3913,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();
     }
   }
   /**
@@ -4448,14 +4477,16 @@ var BufferingControllerImpl = class extends import_vinyl_util46.EventHostImpl {
       return;
     }
     const byteLength = streamingSegment.data.byteLength;
-    if (byteLength > appendSize) {
+    const remaining = byteLength - this.appendOffset;
+    const firstAppend = this.appendOffset === 0;
+    if (remaining > appendSize) {
       const newOffset = this.appendOffset + appendSize;
       const chunk = streamingSegment.data.slice(
         this.appendOffset,
         newOffset
       );
       await sourceBufferController.append(chunk);
-      if (this.appendOffset === 0) {
+      if (firstAppend) {
         this.buffered.push(streamingSegment);
       }
       this.appendOffset = newOffset;
@@ -4464,9 +4495,13 @@ var BufferingControllerImpl = class extends import_vinyl_util46.EventHostImpl {
         `appended chunk, this.appendOffset: ${this.appendOffset}`
       );
     } else {
-      await sourceBufferController.append(streamingSegment.data);
-      this.appendOffset = streamingSegment.data.byteLength;
-      this.buffered.push(streamingSegment);
+      await sourceBufferController.append(
+        firstAppend ? streamingSegment.data : streamingSegment.data.slice(this.appendOffset)
+      );
+      this.appendOffset = byteLength;
+      if (firstAppend) {
+        this.buffered.push(streamingSegment);
+      }
     }
     if (!tail) this.refreshHead();
   }
@@ -4754,6 +4789,7 @@ var MediaSourceControllerImpl = class extends import_vinyl_util49.EventHostImpl
     this.activateDisposer.dispose();
     this.activateDisposer = null;
     ++this.durationToken;
+    this.durationSet = false;
     try {
       URL.revokeObjectURL(this.objectUrl);
     } catch (error) {
@@ -6583,10 +6619,16 @@ function discoverDashTextTracks(manifest, baseUrl) {
   return out;
 }
 function isTextAdaptationSet(adaptationSet) {
+  var _a;
   if (adaptationSet.contentType === "text") return true;
   const mt = adaptationSet.mimeType;
   if (mt && mt.startsWith("text/")) return true;
-  return false;
+  return ((_a = adaptationSet.Representation) != null ? _a : []).some(
+    (representation) => {
+      var _a2;
+      return (_a2 = representation.mimeType) == null ? void 0 : _a2.startsWith("text/");
+    }
+  );
 }
 function isSidecarTextMime(mimeType) {
   if (mimeType == null) return true;
@@ -6846,7 +6888,7 @@ function parseWebVtt(input) {
   const cues = [];
   const styles = [];
   let i = 1;
-  while (i < lines.length && lines[i] !== "") i++;
+  while (i < lines.length && lines[i] !== "" && !lines[i].includes("-->")) i++;
   while (i < lines.length) {
     if (lines[i] === "") {
       i++;
@@ -7993,7 +8035,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(
@@ -8018,7 +8059,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
         });
       }
     });
@@ -8026,7 +8067,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(
@@ -8264,7 +8305,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();
@@ -8290,7 +8331,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;
@@ -9579,7 +9620,11 @@ function createHlsQualityData(deps, data3, baseUrl, playlistUri, metadata) {
     async getSegment(time, affordance = 0) {
       var _a;
       const playlist = await data3.getMediaPlaylist(playlistUri);
-      const playlistBaseUrl = (0, import_vinyl_util94.resolveUrl)(playlistUri, baseUrl);
+      const playlistBaseUrl = getPlaylistBaseUrl(
+        playlist,
+        playlistUri,
+        baseUrl
+      );
       const segments = buildSegmentTimeline(
         deps,
         playlistBaseUrl,
@@ -9626,9 +9671,13 @@ async function discoverAdsFromManifest(data3) {
   const variant = data3.mainPlaylist.variants[0];
   const media = await data3.getMediaPlaylist(variant.uri);
   const contentDuration = media.ended ? media.segments.reduce((sum, s) => sum + s.duration, 0) : null;
-  const playlistBaseUrl = (0, import_vinyl_util94.resolveUrl)(variant.uri, data3.baseUrl);
+  const playlistBaseUrl = getPlaylistBaseUrl(media, variant.uri, data3.baseUrl);
   return discoverHlsInterstitials(media, playlistBaseUrl, contentDuration);
 }
+function getPlaylistBaseUrl(playlist, playlistUri, mainBaseUrl) {
+  var _a;
+  return (_a = playlist.baseUrl) != null ? _a : (0, import_vinyl_util94.resolveUrl)(playlistUri, mainBaseUrl);
+}
 
 // src/track/hls/createDefaultHlsManifestTransformer.ts
 function createDefaultHlsManifestTransformer(deps) {
@@ -9768,8 +9817,11 @@ async function fetchMediaPlaylist(options) {
   const variantUrl = (0, import_vinyl_util96.resolveUrl)(uri, baseUrl);
   const response = await (0, import_vinyl_util96.requestWithRetry)(variantUrl, requestInit, { abort });
   const text = await (0, import_vinyl_util96.readResponseBody)(response, "text");
-  const queryParams = parseQueryParams(response.url || variantUrl);
-  return (0, import_vinyl_hls_parser3.parseMediaPlaylist)(text, defines, queryParams);
+  const playlistUrl = response.url || variantUrl;
+  const queryParams = parseQueryParams(playlistUrl);
+  return __spreadProps(__spreadValues({}, (0, import_vinyl_hls_parser3.parseMediaPlaylist)(text, defines, queryParams)), {
+    baseUrl: playlistUrl
+  });
 }
 function parseQueryParams(url) {
   const queryStart = url.indexOf("?");
@@ -10222,6 +10274,9 @@ var TrackControllerImpl = class extends import_vinyl_util97.EventHostImpl {
     for (const cachedTrack of this.trackCache.values()) {
       cachedTrack.clearPrefetch();
     }
+    for (const adTracks of this.adTracksByParent.values()) {
+      for (const adTrack of adTracks.values()) adTrack.clearPrefetch();
+    }
   }
   clearQueue() {
     this.setQueue(this._current, []);