@amazon/vinyl 3.2.2 → 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", () => {
@@ -1842,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);
@@ -4339,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;
@@ -4355,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();
   }
@@ -4659,6 +4681,7 @@ var MediaSourceControllerImpl = class extends EventHostImpl9 {
     this.activateDisposer.dispose();
     this.activateDisposer = null;
     ++this.durationToken;
+    this.durationSet = false;
     try {
       URL.revokeObjectURL(this.objectUrl);
     } catch (error) {
@@ -6555,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;
@@ -6818,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++;
@@ -9649,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,
@@ -9696,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) {
@@ -9849,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("?");
@@ -10318,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, []);