@amazon/vinyl 3.2.1 → 3.2.3-next.20261001143710

package/dist/index.js

@@ -383,7 +383,11 @@ var AdControllerImpl = class extends EventHostImpl {
       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 {
@@ -517,12 +521,18 @@ var AdControllerImpl = class extends 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;
+        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;
+        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;
+        logDebug(this, "adThirdQuartile", adState.ad);
         this.dispatch("adThirdQuartile", createAdProgressEvent(adState));
       }
     }
@@ -939,6 +949,7 @@ async function resolveHlsAssetList({
   const url = resolveUrl(assetListUrl, baseUrl);
   const response = await requestWithRetry2(url);
   const json = await readResponseBody(response, "json");
+  const assetListBaseUrl = response.url || url;
   const assets = (_a = json.ASSETS) != null ? _a : [];
   const ads = assets.map((asset, i) => {
     var _a2;
@@ -946,7 +957,14 @@ async function resolveHlsAssetList({
       id: `${rangeId}-${i}`,
       startTime,
       duration: (_a2 = asset.DURATION) != null ? _a2 : null,
-      uri: 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: resolveUrl(asset.URI, assetListBaseUrl)
     };
   });
   return { ads, skipControl: parseSkipControl(json["SKIP-CONTROL"]) };
@@ -1152,6 +1170,7 @@ var MediaKeySessionErrorType = /* @__PURE__ */ ((MediaKeySessionErrorType2) => {
 
 // src/drm/commonEme/MsCommonEme.ts
 import {
+  bufferToArrayBuffer,
   bufferToByteArray,
   DisposedError,
   ErrorOrigin as ErrorOrigin5,
@@ -1271,7 +1290,7 @@ var MsCommonMediaKeySession = class extends EventHostImpl2 {
     __publicField(this, "_disposed", false);
     __publicField(this, "messageHandler", (event) => {
       this.dispatch("message", {
-        message: event.message.buffer
+        message: bufferToArrayBuffer(event.message)
       });
     });
     __publicField(this, "errorHandler", () => {
@@ -1422,11 +1441,7 @@ var StandardCommonMediaKeySession = class extends EventHostImpl3 {
     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 DisposedError2();
@@ -1445,6 +1460,7 @@ var StandardCommonMediaKeySession = class extends EventHostImpl3 {
 
 // src/drm/commonEme/WebKitCommonEme.ts
 import {
+  bufferToArrayBuffer as bufferToArrayBuffer2,
   bufferToByteArray as bufferToByteArray2,
   DisposedError as DisposedError3,
   ErrorOrigin as ErrorOrigin7,
@@ -1540,7 +1556,7 @@ var WebKitCommonMediaKeySession = class extends EventHostImpl4 {
     __publicField(this, "_disposed", false);
     __publicField(this, "messageHandler", (event) => {
       this.dispatch("message", {
-        message: event.message.buffer
+        message: bufferToArrayBuffer2(event.message)
       });
     });
     __publicField(this, "errorHandler", () => {
@@ -1636,6 +1652,7 @@ import {
   logDebug as logDebug3,
   logError as logError2,
   logVerbose as logVerbose2,
+  logWarn,
   memoize as memoize4,
   noop as noop3,
   normalizeHeadersInit,
@@ -1841,9 +1858,9 @@ var defaultLicenseProvider = async (keySystem, serverOptions, challenge, abort)
 // src/drm/util/extractContentId.ts
 import { ValidationError as ValidationError2 } from "@amazon/vinyl-util";
 import { ErrorOrigin as ErrorOrigin8 } from "@amazon/vinyl-util";
-import { bufferToUtf16 as bufferToUtf162 } from "@amazon/vinyl-util";
+import { bufferToArrayBuffer as bufferToArrayBuffer3, bufferToUtf16 as bufferToUtf162 } from "@amazon/vinyl-util";
 function extractContentId(initData) {
-  const bufferStr = bufferToUtf162(initData.buffer);
+  const bufferStr = bufferToUtf162(bufferToArrayBuffer3(initData));
   const matches = bufferStr.match(/skd:\/\/(.+)$/);
   if (!matches) {
     throw new ValidationError2("No contentId match", ErrorOrigin8.MEDIA);
@@ -1885,6 +1902,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();
@@ -2101,6 +2119,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
@@ -2530,7 +2555,7 @@ import {
   globalRef as globalRef3,
   globalTarget,
   IllegalStateError,
-  logWarn,
+  logWarn as logWarn2,
   remove as remove2,
   substitute
 } from "@amazon/vinyl-util";
@@ -2552,7 +2577,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 })
       );
@@ -2628,7 +2653,7 @@ function configureVinylGlobal(options) {
 import { parseVersion } from "@amazon/vinyl-util";
 var vinylVersion = /* @__PURE__ */ parseVersion(
   /* istanbul ignore next */
-  "3.2.1"
+  "3.2.2"
 );
 
 // src/global/globalRef.ts
@@ -3176,6 +3201,7 @@ var LIVE_DURATION = 4294967296;
 import {
   Abort,
   AbortError as AbortError2,
+  createAbortSlot,
   Browser,
   clamp,
   closeTo as closeTo2,
@@ -3188,7 +3214,7 @@ import {
   hasBrowser,
   logDebug as logDebug6,
   logInfo,
-  logWarn as logWarn2,
+  logWarn as logWarn3,
   nextEventAsPromise as nextEventAsPromise2,
   noop as noop4,
   onAny,
@@ -3222,15 +3248,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()
@@ -3241,8 +3265,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(
@@ -3655,14 +3678,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, {
@@ -3670,12 +3689,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(
@@ -3683,7 +3715,7 @@ var PlaybackControllerImpl = class extends EventHostImpl7 {
       tolerance
     );
     if (range == null) {
-      logWarn2(
+      logWarn3(
         this,
         `seekTo: seek outside of seekable ranges, seek ignored`,
         seekable.ranges
@@ -3706,7 +3738,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) => {
@@ -3720,7 +3752,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);
@@ -3728,7 +3760,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();
     }
   }
   /**
@@ -3980,7 +4012,7 @@ var audioOptionsValidator = /* @__PURE__ */ object7({
 
 // src/streaming/buffering/BufferingController.ts
 import {
-  createAbortSlot,
+  createAbortSlot as createAbortSlot2,
   createDisposer as createDisposer8,
   createLogPrefix as createLogPrefix5,
   createTaskQueue,
@@ -3991,7 +4023,7 @@ import {
   logDebug as logDebug7,
   LogLevel as LogLevel2,
   logVerbose as logVerbose3,
-  logWarn as logWarn3,
+  logWarn as logWarn4,
   throttle as throttle2
 } from "@amazon/vinyl-util";
 
@@ -4100,7 +4132,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.
      */
@@ -4151,7 +4183,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"
@@ -4323,14 +4355,16 @@ var BufferingControllerImpl = class extends EventHostImpl8 {
       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;
@@ -4339,9 +4373,13 @@ var BufferingControllerImpl = class extends EventHostImpl8 {
         `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();
   }
@@ -4447,7 +4485,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
@@ -4523,7 +4561,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
@@ -4643,10 +4681,11 @@ var MediaSourceControllerImpl = class extends EventHostImpl9 {
     this.activateDisposer.dispose();
     this.activateDisposer = null;
     ++this.durationToken;
+    this.durationSet = false;
     try {
       URL.revokeObjectURL(this.objectUrl);
     } catch (error) {
-      logWarn4(this, "error revoking object url", error);
+      logWarn5(this, "error revoking object url", error);
     }
   }
   get sourceBufferCount() {
@@ -5684,7 +5723,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
@@ -5694,7 +5733,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);
@@ -5820,7 +5859,7 @@ import {
 
 // src/streaming/SegmentDataSlot.ts
 import {
-  createAbortSlot as createAbortSlot3,
+  createAbortSlot as createAbortSlot4,
   isSilentError as isSilentError4
 } from "@amazon/vinyl-util";
 var SegmentStatus = /* @__PURE__ */ ((SegmentStatus2) => {
@@ -5838,7 +5877,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);
   }
   /**
@@ -6539,10 +6578,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;
@@ -6802,7 +6847,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++;
@@ -6987,7 +7032,7 @@ function scoreTextTrack(track, prefs) {
 
 // src/text/SidecarTextTrackController.ts
 import {
-  createAbortSlot as createAbortSlot4,
+  createAbortSlot as createAbortSlot5,
   createDisposer as createDisposer13,
   equalDeep,
   EventHostImpl as EventHostImpl13,
@@ -7168,7 +7213,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()));
@@ -7562,7 +7607,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,
@@ -7592,7 +7637,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'.
      */
@@ -8001,7 +8046,6 @@ import {
 
 // src/track/mse/MseTrack.ts
 import {
-  Abort as Abort3,
   equalDeep as equalDeep3,
   first as first2,
   IntersectionRanges,
@@ -8015,7 +8059,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(
@@ -8040,7 +8083,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
         });
       }
     });
@@ -8048,7 +8091,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(
@@ -8286,7 +8329,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();
@@ -8312,7 +8355,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;
@@ -9635,7 +9678,11 @@ function createHlsQualityData(deps, data3, baseUrl, playlistUri, metadata) {
     async getSegment(time, affordance = 0) {
       var _a;
       const playlist = await data3.getMediaPlaylist(playlistUri);
-      const playlistBaseUrl = resolveUrl8(playlistUri, baseUrl);
+      const playlistBaseUrl = getPlaylistBaseUrl(
+        playlist,
+        playlistUri,
+        baseUrl
+      );
       const segments = buildSegmentTimeline(
         deps,
         playlistBaseUrl,
@@ -9682,9 +9729,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 = resolveUrl8(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 : resolveUrl8(playlistUri, mainBaseUrl);
+}
 
 // src/track/hls/createDefaultHlsManifestTransformer.ts
 function createDefaultHlsManifestTransformer(deps) {
@@ -9835,8 +9886,11 @@ async function fetchMediaPlaylist(options) {
   const variantUrl = resolveUrl9(uri, baseUrl);
   const response = await requestWithRetry7(variantUrl, requestInit, { abort });
   const text = await readResponseBody6(response, "text");
-  const queryParams = parseQueryParams(response.url || variantUrl);
-  return parseMediaPlaylist2(text, defines, queryParams);
+  const playlistUrl = response.url || variantUrl;
+  const queryParams = parseQueryParams(playlistUrl);
+  return __spreadProps(__spreadValues({}, parseMediaPlaylist2(text, defines, queryParams)), {
+    baseUrl: playlistUrl
+  });
 }
 function parseQueryParams(url) {
   const queryStart = url.indexOf("?");
@@ -9919,7 +9973,7 @@ import {
   logError as logError5,
   logInfo as logInfo2,
   logVerbose as logVerbose4,
-  logWarn as logWarn5,
+  logWarn as logWarn6,
   LruCache,
   noop as noop8,
   resolveValueProvider as resolveValueProvider3
@@ -9971,7 +10025,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();
@@ -10304,6 +10358,9 @@ var TrackControllerImpl = class extends EventHostImpl17 {
     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, []);
@@ -10580,7 +10637,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 {
@@ -10682,7 +10739,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
@@ -11253,6 +11310,7 @@ export {
   DrmError,
   DrmKeySystem,
   DrmRobustness,
+  EXCESSIVE_SESSION_COUNT,
   FAIR_PLAY_KEY_SYSTEMS,
   FixedPlaybackQuality,
   HtmlTextTrackRenderer,