@amazon/vinyl 3.1.0 → 3.2.0

package/dist/index.js

@@ -1892,6 +1892,10 @@ var DrmControllerImpl = class extends EventHostImpl5 {
     __publicField(this, "bufferingTrackUri", null);
     __publicField(this, "sessionAbort", null);
     __publicField(this, "pendingMessageProps", null);
+    // Armed per track load; latches on the first session so only the
+    // critical-path session's EME/CDM setup is measured.
+    __publicField(this, "keySetupSpanArmed", true);
+    __publicField(this, "keySetupSpanStart", null);
     __publicField(this, "disposer", /* @__PURE__ */ createDisposer2());
     __publicField(this, "checkIsSupportedCached", /* @__PURE__ */ memoize4(
       async (params) => {
@@ -2057,6 +2061,7 @@ var DrmControllerImpl = class extends EventHostImpl5 {
     if (!hasMimeType(drmInfo)) {
       throw new DrmError("Encrypted content must have a mimeType.");
     }
+    this.markKeySetupStart();
     const mediaKeys = await this.attachMediaKeys(drmInfo);
     this.abortIfDisposed();
     const keySystemOptions = (_a = this.options.keySystems[mediaKeys.keySystem]) != null ? _a : this.options.keySystems["*"];
@@ -2101,6 +2106,28 @@ var DrmControllerImpl = class extends EventHostImpl5 {
     });
     return newSession;
   }
+  /**
+   * Captures the key-setup span start at the top of the session-creation path
+   * (before media keys are attached), latching so only the first session of
+   * the current track load is measured.
+   */
+  markKeySetupStart() {
+    if (!this.keySetupSpanArmed) return;
+    this.keySetupSpanArmed = false;
+    this.keySetupSpanStart = Date.now();
+  }
+  dispatchLoadSpan(kind, startTime, endTime, messageProps) {
+    this.dispatch("loadSpanMeasured", __spreadValues(__spreadValues({
+      kind,
+      startTime,
+      endTime,
+      mimeType: messageProps.mimeType
+    }, messageProps.trackUri != null && {
+      trackUri: messageProps.trackUri
+    }), messageProps.contentType != null && {
+      contentType: messageProps.contentType
+    }));
+  }
   initializeForPlayback(drmInfo, options) {
     var _a;
     logDebug3(this, "initializeForPlayback", drmInfo);
@@ -2124,6 +2151,8 @@ var DrmControllerImpl = class extends EventHostImpl5 {
     this.drmInfo = drmInfo;
     this.bufferingTrackUri = (_a = options == null ? void 0 : options.trackUri) != null ? _a : null;
     this.sessionAbort = (_b = options == null ? void 0 : options.abort) != null ? _b : null;
+    this.keySetupSpanArmed = true;
+    this.keySetupSpanStart = null;
   }
   /**
    * If the drm metadata contains initialization data for the current key system, create a new session.
@@ -2135,6 +2164,7 @@ var DrmControllerImpl = class extends EventHostImpl5 {
       this.handleError(new DrmError("DRM not supported."));
       return;
     }
+    this.markKeySetupStart();
     const mediaKeys = await this.attachMediaKeys(drmInfo);
     const drmProtection = (_a = drmInfo.contentProtections.find((cP) => {
       return cP.keySystem === mediaKeys.keySystem;
@@ -2273,7 +2303,9 @@ var DrmControllerImpl = class extends EventHostImpl5 {
           event,
           // Captured per session, so a concurrent preloaded track's
           // license exchange keeps its own attribution.
-          trackUri
+          trackUri,
+          mimeType: drmInfo.mimeType,
+          contentType: drmInfo.contentType
         }),
         LICENSE_TIMEOUT,
         { message: LICENSE_TIMEOUT_MESSAGE }
@@ -2295,6 +2327,15 @@ var DrmControllerImpl = class extends EventHostImpl5 {
     this.pendingMessageProps = messageProps;
     const keySystem = mediaKeys.keySystem;
     logDebug3(this, "message", keySystem, event.message.byteLength);
+    if (this.keySetupSpanStart != null) {
+      this.dispatchLoadSpan(
+        "keySetup",
+        this.keySetupSpanStart,
+        Date.now(),
+        messageProps
+      );
+      this.keySetupSpanStart = null;
+    }
     const keySystemOptions = (_a = this.options.keySystems[keySystem]) != null ? _a : this.options.keySystems["*"];
     const licenseServerOptionsProvider = keySystemOptions == null ? void 0 : keySystemOptions.licenseServer;
     const licenseServerOptions = (_b = clone(await resolveValueProvider2(licenseServerOptionsProvider))) != null ? _b : {};
@@ -2316,13 +2357,12 @@ var DrmControllerImpl = class extends EventHostImpl5 {
       challenge
     );
     if (this.disposed) return;
-    this.dispatch("loadSpanMeasured", __spreadValues({
-      kind: "license",
-      startTime: licenseSpanStart,
-      endTime: Date.now()
-    }, messageProps.trackUri != null && {
-      trackUri: messageProps.trackUri
-    }));
+    this.dispatchLoadSpan(
+      "license",
+      licenseSpanStart,
+      Date.now(),
+      messageProps
+    );
     this.pendingMessageProps = null;
     if (session.disposed) return;
     logDebug3(this, "update");
@@ -2581,7 +2621,7 @@ function configureVinylGlobal(options) {
 import { parseVersion } from "@amazon/vinyl-util";
 var vinylVersion = /* @__PURE__ */ parseVersion(
   /* istanbul ignore next */
-  "3.1.0"
+  "3.2.0"
 );
 
 // src/global/globalRef.ts
@@ -5013,6 +5053,107 @@ function filterContentTypes(contentTypes, allowedContentTypes) {
 // src/streaming/createDefaultMediaTimelineTransformer.ts
 import { combineData as combineData2 } from "@amazon/vinyl-observable";
 
+// src/streaming/MediaQualityMetadata.ts
+import {
+  createShortUid
+} from "@amazon/vinyl-util";
+import {
+  array as array3,
+  enumOf as enumOf3,
+  isOneOf as isOneOf3,
+  number as number6,
+  object as object9,
+  string as string6,
+  tuple
+} from "@amazon/vinyl-validation";
+
+// src/streaming/DescriptorRecord.ts
+import {
+  array as array2,
+  object as object8,
+  record as record2,
+  string as string5
+} from "@amazon/vinyl-validation";
+import { first } from "@amazon/vinyl-util";
+function getDescriptorValue(record4, uri, id) {
+  var _a, _b;
+  let arr = record4[uri];
+  if (!arr) return null;
+  if (id !== void 0) arr = arr.filter((descriptor) => descriptor.id === id);
+  return (_b = (_a = first(arr)) == null ? void 0 : _a.value) != null ? _b : null;
+}
+var descriptorValidator = /* @__PURE__ */ object8({
+  id: /* @__PURE__ */ string5().maybe().optional(),
+  value: /* @__PURE__ */ string5().maybe().optional()
+});
+var descriptorRecordValidator = /* @__PURE__ */ record2(/* @__PURE__ */ string5(), /* @__PURE__ */ array2(descriptorValidator).readonly().orUndefined());
+
+// src/streaming/MediaQualityMetadata.ts
+var ALL_CONTENT_TYPES = [
+  "video",
+  "audio",
+  "text"
+];
+var RESTRICTABLE_CONTENT_TYPES = [
+  "video",
+  "audio"
+];
+var drmProtectionValidator = /* @__PURE__ */ descriptorValidator.extend({
+  keySystem: /* @__PURE__ */ enumOf3(DrmKeySystem),
+  pro: /* @__PURE__ */ string6().maybe().optional(),
+  pssh: /* @__PURE__ */ string6().maybe().optional()
+});
+var mediaFormatMetadataValidator = /* @__PURE__ */ object9({
+  contentProtections: /* @__PURE__ */ array3(drmProtectionValidator).readonly(),
+  contentType: /* @__PURE__ */ isOneOf3("audio", "video", "text").orNull(),
+  initDataType: /* @__PURE__ */ string6().orNull(),
+  encryptionScheme: /* @__PURE__ */ string6().orNull(),
+  mimeType: /* @__PURE__ */ string6().orNull()
+});
+function createEmptyMediaFormatMetadata() {
+  return {
+    contentType: null,
+    mimeType: null,
+    initDataType: null,
+    encryptionScheme: null,
+    contentProtections: []
+  };
+}
+function createEmptyMediaQualityMetadata() {
+  return __spreadProps(__spreadValues({}, createEmptyMediaFormatMetadata()), {
+    decoderId: createShortUid(),
+    qualityId: createShortUid(),
+    codecs: null,
+    bandwidth: null,
+    bandwidthTotal: null,
+    supplementalProperties: {},
+    audioSamplingRate: null,
+    frameRate: null,
+    height: null,
+    width: null,
+    lang: null,
+    characteristics: [],
+    groupId: createShortUid(),
+    switchingGroupIds: null
+  });
+}
+var mediaQualityMetadataValidator = /* @__PURE__ */ mediaFormatMetadataValidator.extend({
+  audioSamplingRate: /* @__PURE__ */ array3(/* @__PURE__ */ number6()).readonly().orNull(),
+  bandwidth: /* @__PURE__ */ number6().orNull(),
+  bandwidthTotal: /* @__PURE__ */ number6().orNull(),
+  codecs: /* @__PURE__ */ string6().orNull(),
+  decoderId: /* @__PURE__ */ string6(),
+  frameRate: /* @__PURE__ */ tuple(/* @__PURE__ */ number6(), /* @__PURE__ */ number6()).readonly().orNull(),
+  height: /* @__PURE__ */ number6().orNull(),
+  qualityId: /* @__PURE__ */ string6(),
+  supplementalProperties: descriptorRecordValidator,
+  width: /* @__PURE__ */ number6().orNull(),
+  lang: /* @__PURE__ */ string6().orNull(),
+  characteristics: /* @__PURE__ */ array3(/* @__PURE__ */ string6()).readonly(),
+  groupId: /* @__PURE__ */ string6(),
+  switchingGroupIds: /* @__PURE__ */ array3(/* @__PURE__ */ string6()).readonly().orNull()
+});
+
 // src/streaming/mediaTimelineFilter.ts
 import { map, memoize as memoize6 } from "@amazon/vinyl-util";
 
@@ -5301,6 +5442,13 @@ function createLanguageFilter(preferredLanguage, contentType2) {
 }
 
 // src/streaming/mediaTimelineFilter.ts
+function assertMediaStreamsRetained(original, filtered, throwError) {
+  for (const contentType2 of RESTRICTABLE_CONTENT_TYPES) {
+    if (original.some((q) => q.metadata.contentType === contentType2) && !filtered.some((q) => q.metadata.contentType === contentType2)) {
+      throwError();
+    }
+  }
+}
 function filterTimelineQualities(filter, throwError, timeline) {
   if (!filter) return timeline;
   const mapMetadataArray = memoize6(
@@ -5312,11 +5460,9 @@ function filterTimelineQualities(filter, throwError, timeline) {
     const filtered = period.qualities.filter(
       (q, index) => filter(q.metadata, index, mapMetadataArray(period.qualities))
     );
+    assertMediaStreamsRetained(period.qualities, filtered, throwError);
     return __spreadProps(__spreadValues({}, period), { qualities: filtered });
   });
-  if (periods.some((p) => p.qualities.length === 0)) {
-    throwError();
-  }
   return __spreadProps(__spreadValues({}, timeline), { periods });
 }
 async function filterTimelineQualitiesAsync(filter, throwError, timeline) {
@@ -5334,11 +5480,9 @@ async function filterTimelineQualitiesAsync(filter, throwError, timeline) {
         filtered.push(period.qualities[i]);
       }
     }
+    assertMediaStreamsRetained(period.qualities, filtered, throwError);
     periods.push(__spreadProps(__spreadValues({}, period), { qualities: filtered }));
   }
-  if (periods.some((p) => p.qualities.length === 0)) {
-    throwError();
-  }
   return __spreadProps(__spreadValues({}, timeline), { periods });
 }
 
@@ -5412,7 +5556,6 @@ import {
   Browser as Browser2,
   last,
   MediaUnsupportedError as MediaUnsupportedError6,
-  every,
   map as map2,
   max as max2,
   min
@@ -5425,23 +5568,28 @@ function withinAudioSampleRateRange(options, metadata, _index, array6) {
   if (metadata.contentType !== "audio") return true;
   const samplingRate = last(metadata.audioSamplingRate);
   if (!samplingRate) return true;
+  const { minSampleRate } = options;
+  const maxSampleRate = (_a = options.maxSampleRate) != null ? _a : options.capabilities.sampleRate;
   const audioRates = () => map2(
     array6,
     (item) => item.contentType === "audio" ? last(item.audioSamplingRate) : void 0
   ).filter((rate) => rate != null);
-  const { minSampleRate } = options;
+  const outOfBandFallback = () => {
+    const rates = audioRates();
+    const inBand = (rate) => (minSampleRate == null || rate >= minSampleRate) && (!maxSampleRate || rate <= maxSampleRate);
+    if (rates.some(inBand)) return void 0;
+    const decodable = maxSampleRate ? rates.filter((rate) => rate <= maxSampleRate) : rates;
+    return decodable.length ? max2(decodable) : min(rates);
+  };
   if (minSampleRate != null && samplingRate < minSampleRate) {
-    const rates2 = audioRates();
-    return every(rates2, (rate) => rate < minSampleRate) && samplingRate === max2(rates2);
+    return samplingRate === outOfBandFallback();
   }
-  const maxSampleRate = (_a = options.maxSampleRate) != null ? _a : options.capabilities.sampleRate;
   if (!maxSampleRate) return true;
   if (hasBrowser2(Browser2.FIREFOX)) {
     return samplingRate <= 48e3;
   }
   if (samplingRate <= maxSampleRate) return true;
-  const rates = audioRates();
-  return every(rates, (rate) => rate > maxSampleRate) && samplingRate === min(rates);
+  return samplingRate === outOfBandFallback();
 }
 
 // src/util/media/codecOverrides.ts
@@ -5528,27 +5676,6 @@ function createDefaultMediaTimelineTransformer(deps) {
   });
 }
 
-// src/streaming/DescriptorRecord.ts
-import {
-  array as array2,
-  object as object8,
-  record as record2,
-  string as string5
-} from "@amazon/vinyl-validation";
-import { first } from "@amazon/vinyl-util";
-function getDescriptorValue(record4, uri, id) {
-  var _a, _b;
-  let arr = record4[uri];
-  if (!arr) return null;
-  if (id !== void 0) arr = arr.filter((descriptor) => descriptor.id === id);
-  return (_b = (_a = first(arr)) == null ? void 0 : _a.value) != null ? _b : null;
-}
-var descriptorValidator = /* @__PURE__ */ object8({
-  id: /* @__PURE__ */ string5().maybe().optional(),
-  value: /* @__PURE__ */ string5().maybe().optional()
-});
-var descriptorRecordValidator = /* @__PURE__ */ record2(/* @__PURE__ */ string5(), /* @__PURE__ */ array2(descriptorValidator).readonly().orUndefined());
-
 // src/streaming/ManifestControllerImpl.ts
 import { data } from "@amazon/vinyl-observable";
 import {
@@ -5655,84 +5782,6 @@ var ManifestControllerImpl = class {
   }
 };
 
-// src/streaming/MediaQualityMetadata.ts
-import {
-  createShortUid
-} from "@amazon/vinyl-util";
-import {
-  array as array3,
-  enumOf as enumOf3,
-  isOneOf as isOneOf3,
-  number as number6,
-  object as object9,
-  string as string6,
-  tuple
-} from "@amazon/vinyl-validation";
-var ALL_CONTENT_TYPES = [
-  "video",
-  "audio",
-  "text"
-];
-var RESTRICTABLE_CONTENT_TYPES = [
-  "video",
-  "audio"
-];
-var drmProtectionValidator = /* @__PURE__ */ descriptorValidator.extend({
-  keySystem: /* @__PURE__ */ enumOf3(DrmKeySystem),
-  pro: /* @__PURE__ */ string6().maybe().optional(),
-  pssh: /* @__PURE__ */ string6().maybe().optional()
-});
-var mediaFormatMetadataValidator = /* @__PURE__ */ object9({
-  contentProtections: /* @__PURE__ */ array3(drmProtectionValidator).readonly(),
-  contentType: /* @__PURE__ */ isOneOf3("audio", "video", "text").orNull(),
-  initDataType: /* @__PURE__ */ string6().orNull(),
-  encryptionScheme: /* @__PURE__ */ string6().orNull(),
-  mimeType: /* @__PURE__ */ string6().orNull()
-});
-function createEmptyMediaFormatMetadata() {
-  return {
-    contentType: null,
-    mimeType: null,
-    initDataType: null,
-    encryptionScheme: null,
-    contentProtections: []
-  };
-}
-function createEmptyMediaQualityMetadata() {
-  return __spreadProps(__spreadValues({}, createEmptyMediaFormatMetadata()), {
-    decoderId: createShortUid(),
-    qualityId: createShortUid(),
-    codecs: null,
-    bandwidth: null,
-    bandwidthTotal: null,
-    supplementalProperties: {},
-    audioSamplingRate: null,
-    frameRate: null,
-    height: null,
-    width: null,
-    lang: null,
-    characteristics: [],
-    groupId: createShortUid(),
-    switchingGroupIds: null
-  });
-}
-var mediaQualityMetadataValidator = /* @__PURE__ */ mediaFormatMetadataValidator.extend({
-  audioSamplingRate: /* @__PURE__ */ array3(/* @__PURE__ */ number6()).readonly().orNull(),
-  bandwidth: /* @__PURE__ */ number6().orNull(),
-  bandwidthTotal: /* @__PURE__ */ number6().orNull(),
-  codecs: /* @__PURE__ */ string6().orNull(),
-  decoderId: /* @__PURE__ */ string6(),
-  frameRate: /* @__PURE__ */ tuple(/* @__PURE__ */ number6(), /* @__PURE__ */ number6()).readonly().orNull(),
-  height: /* @__PURE__ */ number6().orNull(),
-  qualityId: /* @__PURE__ */ string6(),
-  supplementalProperties: descriptorRecordValidator,
-  width: /* @__PURE__ */ number6().orNull(),
-  lang: /* @__PURE__ */ string6().orNull(),
-  characteristics: /* @__PURE__ */ array3(/* @__PURE__ */ string6()).readonly(),
-  groupId: /* @__PURE__ */ string6(),
-  switchingGroupIds: /* @__PURE__ */ array3(/* @__PURE__ */ string6()).readonly().orNull()
-});
-
 // src/streaming/MediaTimeline.ts
 import { sortedInsertionIndex as sortedInsertionIndex2 } from "@amazon/vinyl-util";
 function getMediaPeriodAtTime(timeline, time) {
@@ -7952,7 +8001,6 @@ import {
   first as first2,
   IntersectionRanges,
   logDebug as logDebug16,
-  MediaUnsupportedError as MediaUnsupportedError7,
   redispatchEvents as redispatchEvents3
 } from "@amazon/vinyl-util";
 import { createContainer as createContainer2 } from "@amazon/vinyl-di";
@@ -7980,10 +8028,7 @@ var MseTrack = class extends TrackBase {
     this.deps = deps;
     add(
       deps.contentTypesValue.onData((contentTypesPromise) => {
-        contentTypesPromise.then((value) => {
-          this.setContentTypes(value);
-          this.validateRequiredContentTypesPlayable();
-        }).catch(this.errorHandler);
+        contentTypesPromise.then((value) => this.setContentTypes(value)).catch(this.errorHandler);
       })
     );
     this.on("streamingQualityChange", (event) => {
@@ -8084,33 +8129,8 @@ var MseTrack = class extends TrackBase {
           });
         }
       }
-      this.validateRequiredContentTypesPlayable();
     });
   }
-  /**
-   * Fails fast when a media content type the manifest declared (audio/video)
-   * has no playable qualities left after timeline filtering. Its stream can
-   * never create a source buffer, so without this the track waits forever for
-   * a source buffer that never arrives, surfacing only as an opaque
-   * `readyToAppend` timeout. Runs once both the required content types and the
-   * filtered timeline qualities are known (either order).
-   */
-  validateRequiredContentTypesPlayable() {
-    const qualities = this._qualities;
-    if (!qualities) return;
-    const present = new Set(qualities.map((q) => q.contentType));
-    for (const contentType2 of this._contentTypes) {
-      if (!present.has(contentType2)) {
-        this.errorHandler(
-          new MediaUnsupportedError7(
-            `No playable ${contentType2} rendition`,
-            `no-playable-${contentType2}`
-          )
-        );
-        return;
-      }
-    }
-  }
   async getAds() {
     const timeline = await this.deps.mediaTimeline.value;
     return {
@@ -10550,8 +10570,11 @@ import {
   emptyRanges as emptyRanges3,
   equalDeep as equalDeep4,
   EventHostImpl as EventHostImpl18,
+  getLogLevel as getLogLevel2,
   logDebug as logDebug18,
   logInfo as logInfo3,
+  LogLevel as LogLevel3,
+  logVerbose as logVerbose5,
   logWarn as logWarn6,
   redispatchEvents as redispatchEvents4
 } from "@amazon/vinyl-util";
@@ -10584,6 +10607,7 @@ var VinylPlayer = class extends EventHostImpl18 {
     playerRegistryRef.value.addPlayer(this);
     this.redispatchSubControllerEvents();
     this.redispatchCurrentTrackEvents();
+    this.initializeLoadSpanLogging();
     this.initializeAutoResetHandling();
   }
   get [Symbol.toStringTag]() {
@@ -10601,6 +10625,26 @@ var VinylPlayer = class extends EventHostImpl18 {
   get autoResetController() {
     return this.deps.autoResetController;
   }
+  /**
+   * Logs each republished load span once at the verbose level, formatting its
+   * bounds as ISO date strings and its duration in milliseconds.
+   */
+  initializeLoadSpanLogging() {
+    this.disposer.add(
+      this.on("loadSpan", (span) => {
+        if (getLogLevel2() > LogLevel3.VERBOSE) return;
+        logVerbose5(this, "loadSpan", {
+          kind: span.kind,
+          trackUri: span.trackUri,
+          mimeType: span.mimeType,
+          contentType: span.contentType,
+          startTime: new Date(span.startTime).toISOString(),
+          endTime: new Date(span.endTime).toISOString(),
+          durationMs: (span.endTime - span.startTime).toFixed(2)
+        });
+      })
+    );
+  }
   redispatchSubControllerEvents() {
     const add = this.disposer.add;
     add(