@amazon/vinyl 1.2.0 → 2.0.0

package/dist/types/current/ad/AdError.d.ts

@@ -0,0 +1,6 @@
+import { ErrorLevel, ReportableError } from '@amazon/vinyl-util';
+export declare class AdError extends ReportableError {
+    get [Symbol.toStringTag](): string;
+    constructor(message: string, origin?: string, level?: ErrorLevel);
+}
+//# sourceMappingURL=AdError.d.ts.map

package/dist/types/current/ad/AdError.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"AdError.d.ts","sourceRoot":"","sources":["../../../../src/ad/AdError.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,UAAU,EAAe,eAAe,EAAE,MAAM,oBAAoB,CAAA;AAE7E,qBAAa,OAAQ,SAAQ,eAAe;IACxC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,MAAM,CAEjC;gBAGG,OAAO,EAAE,MAAM,EACf,MAAM,GAAE,MAA0B,EAClC,KAAK,GAAE,UAA6B;CAK3C"}

package/dist/types/current/ad/AdError.js

@@ -0,0 +1,14 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { ErrorLevel, ErrorOrigin, ReportableError } from '@amazon/vinyl-util';
+export class AdError extends ReportableError {
+    get [Symbol.toStringTag]() {
+        return 'AdError';
+    }
+    constructor(message, origin = ErrorOrigin.MEDIA, level = ErrorLevel.FATAL) {
+        super(message, origin, level);
+        Object.setPrototypeOf(this, AdError.prototype);
+    }
+}

package/dist/types/current/ad/AdsProvider.d.ts

@@ -0,0 +1,28 @@
+import type { AnyRecord, ReadonlyEventHost } from '@amazon/vinyl-util';
+import type { TrackAds } from './AdBreakInfo';
+/**
+ * Events dispatched by an {@link AdsProvider}.
+ */
+export interface AdsProviderEventMap {
+    /**
+     * The set of ads has changed; consumers should re-read via
+     * {@link AdsProvider.getAds}.
+     */
+    readonly adsChange: AnyRecord;
+}
+/**
+ * The minimal surface an {@link AdController} needs to source its ad breaks:
+ * a resolver for the current break list, plus an `adsChange` event to signal
+ * when that list changes. A {@link ReadonlyTrack} satisfies this directly, so
+ * the current playing track can be passed as-is; applications may also
+ * implement it to supply ads out of band (e.g. from an external ad server).
+ */
+export interface AdsProvider extends ReadonlyEventHost<AdsProviderEventMap> {
+    /**
+     * Resolves to the provider's current ad breaks. The result may change over
+     * the provider's lifetime; each `adsChange` event indicates that a
+     * subsequent call may return different breaks.
+     */
+    getAds(): Promise<TrackAds>;
+}
+//# sourceMappingURL=AdsProvider.d.ts.map

package/dist/types/current/ad/AdsProvider.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"AdsProvider.d.ts","sourceRoot":"","sources":["../../../../src/ad/AdsProvider.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,SAAS,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAA;AACtE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AAE7C;;GAEG;AACH,MAAM,WAAW,mBAAmB;IAChC;;;OAGG;IACH,QAAQ,CAAC,SAAS,EAAE,SAAS,CAAA;CAChC;AAED;;;;;;GAMG;AACH,MAAM,WAAW,WAAY,SAAQ,iBAAiB,CAAC,mBAAmB,CAAC;IACvE;;;;OAIG;IACH,MAAM,IAAI,OAAO,CAAC,QAAQ,CAAC,CAAA;CAC9B"}

package/dist/types/current/ad/AdsProvider.js

@@ -0,0 +1,5 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+export {};

package/dist/types/current/ad/defaultAdLoadOptionsResolver.d.ts

@@ -0,0 +1,12 @@
+import type { AdInfo } from './AdBreakInfo';
+import type { VinylTrackLoadOptions } from '../track/createVinylTrackFactories';
+import { ReportableError } from '@amazon/vinyl-util';
+export declare function defaultAdLoadOptionsResolver(adInfo: AdInfo): Promise<VinylTrackLoadOptions>;
+/**
+ * An error indicating that a method was called with illegal arguments.
+ */
+export declare class UnresolvableAdError extends ReportableError {
+    get [Symbol.toStringTag](): string;
+    constructor(message: string);
+}
+//# sourceMappingURL=defaultAdLoadOptionsResolver.d.ts.map

package/dist/types/current/ad/defaultAdLoadOptionsResolver.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"defaultAdLoadOptionsResolver.d.ts","sourceRoot":"","sources":["../../../../src/ad/defaultAdLoadOptionsResolver.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,eAAe,CAAA;AAE3C,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAA;AAC/E,OAAO,EAAe,eAAe,EAAE,MAAM,oBAAoB,CAAA;AAEjE,wBAAsB,4BAA4B,CAC9C,MAAM,EAAE,MAAM,GACf,OAAO,CAAC,qBAAqB,CAAC,CAShC;AAED;;GAEG;AACH,qBAAa,mBAAoB,SAAQ,eAAe;IACpD,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,MAAM,CAEjC;gBAEW,OAAO,EAAE,MAAM;CAI9B"}

package/dist/types/current/ad/defaultAdLoadOptionsResolver.js

@@ -0,0 +1,26 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { createTrackLoadOptionsFromUrl } from '../track/inferLoadOptionsFromUri';
+import { ErrorOrigin, ReportableError } from '@amazon/vinyl-util';
+export async function defaultAdLoadOptionsResolver(adInfo) {
+    if (!adInfo.uri)
+        throw new UnresolvableAdError('Ad with no URI cannot be played');
+    const loadOptions = await createTrackLoadOptionsFromUrl(adInfo.uri);
+    if (!loadOptions)
+        throw new UnresolvableAdError(`could not infer ad track type from uri ${adInfo.uri}`);
+    return loadOptions;
+}
+/**
+ * An error indicating that a method was called with illegal arguments.
+ */
+export class UnresolvableAdError extends ReportableError {
+    get [Symbol.toStringTag]() {
+        return 'UnresolvableAdError';
+    }
+    constructor(message) {
+        super(message, ErrorOrigin.MEDIA);
+        Object.setPrototypeOf(this, UnresolvableAdError.prototype);
+    }
+}

package/dist/types/current/ad/discoverHlsInterstitials.d.ts

@@ -0,0 +1,22 @@
+import type { HlsMediaPlaylist } from '@amazon/vinyl-hls-parser';
+import type { AdBreakList } from './AdBreakInfo';
+/**
+ * Discovers HLS Interstitial ad breaks from a parsed media playlist and maps
+ * them to the provider-agnostic {@link AdBreakInfo} model.
+ *
+ * HLS Interstitials (Apple's SGAI primitive) are carried as EXT-X-DATERANGE
+ * tags with `CLASS="com.apple.hls.interstitial"`. Each such range is anchored
+ * to a wall-clock `START-DATE`; this function converts that to a media-timeline
+ * start time by correlating it with the playlist's EXT-X-PROGRAM-DATE-TIME
+ * anchor. When the playlist carries no program date-time, and the range's
+ * start-date is not otherwise resolvable, the break is anchored to the start of
+ * the timeline (pre-roll) as a best effort.
+ *
+ * @param playlist The parsed HLS media playlist.
+ * @param baseUrl  The URL of the media playlist, used to resolve relative
+ *   `X-ASSET-URI` values.
+ * @param contentDuration The total content duration in seconds, if known, used
+ *   to classify post-rolls. Pass null/undefined for live or unknown durations.
+ */
+export declare function discoverHlsInterstitials(playlist: HlsMediaPlaylist, baseUrl: string, contentDuration?: number | null): Promise<AdBreakList>;
+//# sourceMappingURL=discoverHlsInterstitials.d.ts.map

package/dist/types/current/ad/discoverHlsInterstitials.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"discoverHlsInterstitials.d.ts","sourceRoot":"","sources":["../../../../src/ad/discoverHlsInterstitials.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAgB,gBAAgB,EAAE,MAAM,0BAA0B,CAAA;AAS9E,OAAO,KAAK,EAER,WAAW,EAMd,MAAM,eAAe,CAAA;AActB;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,wBAAwB,CACpC,QAAQ,EAAE,gBAAgB,EAC1B,OAAO,EAAE,MAAM,EACf,eAAe,CAAC,EAAE,MAAM,GAAG,IAAI,GAChC,OAAO,CAAC,WAAW,CAAC,CAmDtB"}

package/dist/types/current/ad/discoverHlsInterstitials.js

@@ -0,0 +1,246 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { HLS_INTERSTITIAL_CLASS } from '@amazon/vinyl-hls-parser';
+import { memoize, requestWithRetry, resolveUrl, } from '@amazon/vinyl-util';
+/**
+ * How close to the start or end of content a break must be to be classified as
+ * a pre-roll or post-roll rather than a mid-roll, in seconds.
+ */
+const ROLL_EPSILON = 0.5;
+/**
+ * Discovers HLS Interstitial ad breaks from a parsed media playlist and maps
+ * them to the provider-agnostic {@link AdBreakInfo} model.
+ *
+ * HLS Interstitials (Apple's SGAI primitive) are carried as EXT-X-DATERANGE
+ * tags with `CLASS="com.apple.hls.interstitial"`. Each such range is anchored
+ * to a wall-clock `START-DATE`; this function converts that to a media-timeline
+ * start time by correlating it with the playlist's EXT-X-PROGRAM-DATE-TIME
+ * anchor. When the playlist carries no program date-time, and the range's
+ * start-date is not otherwise resolvable, the break is anchored to the start of
+ * the timeline (pre-roll) as a best effort.
+ *
+ * @param playlist The parsed HLS media playlist.
+ * @param baseUrl  The URL of the media playlist, used to resolve relative
+ *   `X-ASSET-URI` values.
+ * @param contentDuration The total content duration in seconds, if known, used
+ *   to classify post-rolls. Pass null/undefined for live or unknown durations.
+ */
+export function discoverHlsInterstitials(playlist, baseUrl, contentDuration) {
+    const anchor = findProgramDateTimeAnchor(playlist);
+    const breaks = [];
+    for (const range of playlist.dateRanges) {
+        if (range.classId !== HLS_INTERSTITIAL_CLASS)
+            continue;
+        const startTime = resolveStartTime(range, anchor);
+        if (startTime == null)
+            continue;
+        const playoutLimit = resolvePlayoutLimit(range);
+        let duration = resolveDuration(range);
+        if (playoutLimit != null && duration != null)
+            duration = Math.min(playoutLimit, duration);
+        const cues = parseCues(range);
+        const placement = classifyPlacement(startTime, contentDuration, cues);
+        const effectiveStartTime = placement === 'preroll' ? 0 : startTime;
+        const restrictStr = range.clientAttributes['X-RESTRICT'] ?? '';
+        const restrict = parseRestrict(restrictStr);
+        // The ads and skip window share one (memoized) asset-list resolution.
+        const resolveContent = memoize(() => resolveHlsAssetContent({
+            range,
+            startTime: effectiveStartTime,
+            duration,
+            baseUrl,
+        }));
+        breaks.push({
+            id: range.id,
+            startTime: effectiveStartTime,
+            duration,
+            placement,
+            once: cues.has('ONCE'),
+            resumeOffset: parseResumeOffset(range),
+            resolutionTimeOffset: parseResolutionTimeOffset(range),
+            playoutLimit,
+            ads: async () => (await resolveContent()).ads,
+            skipControl: async () => (await resolveContent()).skipControl,
+            restrict,
+        });
+    }
+    breaks.sort((a, b) => a.startTime - b.startTime);
+    // Discovery is synchronous; ad assets resolve lazily via each break's
+    // `ads` ValueProvider. The Promise return keeps the provider-agnostic
+    // contract stable for future async discovery (e.g. DASH).
+    return Promise.resolve(breaks);
+}
+function findProgramDateTimeAnchor(playlist) {
+    let mediaTime = 0;
+    for (const seg of playlist.segments) {
+        if (seg.programDateTime) {
+            const epochMs = Date.parse(seg.programDateTime);
+            if (!Number.isNaN(epochMs)) {
+                return { epochMs, mediaTime };
+            }
+        }
+        mediaTime += seg.duration;
+    }
+    return null;
+}
+/**
+ * Converts a range's wall-clock START-DATE to a media-timeline start time.
+ * Returns 0 when there is no program-date-time anchor but the start-date is
+ * present (best-effort pre-roll), or null when the start-date is unusable.
+ */
+function resolveStartTime(range, anchor) {
+    if (!range.startDate) {
+        // END-ON-NEXT ranges may omit START-DATE; without an anchor we cannot
+        // place them, so skip.
+        return null;
+    }
+    const epochMs = Date.parse(range.startDate);
+    if (Number.isNaN(epochMs))
+        return null;
+    if (!anchor) {
+        // No program-date-time to correlate against. Treat as a pre-roll.
+        return 0;
+    }
+    const startTime = anchor.mediaTime + (epochMs - anchor.epochMs) / 1000;
+    // Clamp tiny negatives from clock rounding to 0.
+    return startTime < 0 && startTime > -ROLL_EPSILON ? 0 : startTime;
+}
+/**
+ * Determines a break's duration in seconds. Uses DURATION, else END-DATE span, else
+ * PLANNED-DURATION, else null.
+ */
+function resolveDuration(range) {
+    if (range.duration != null && !Number.isNaN(range.duration)) {
+        return range.duration;
+    }
+    if (range.endDate && range.startDate) {
+        const start = Date.parse(range.startDate);
+        const end = Date.parse(range.endDate);
+        if (!Number.isNaN(start) && !Number.isNaN(end) && end >= start) {
+            return (end - start) / 1000;
+        }
+    }
+    if (range.plannedDuration != null && !Number.isNaN(range.plannedDuration)) {
+        return range.plannedDuration;
+    }
+    return null;
+}
+function resolvePlayoutLimit(range) {
+    const playoutLimit = parseFloat(range.clientAttributes['X-PLAYOUT-LIMIT'] ?? '');
+    if (Number.isFinite(playoutLimit) && playoutLimit > 0) {
+        return playoutLimit;
+    }
+    return null;
+}
+/**
+ * Tokenizes the DATERANGE `CUE` attribute, an enumerated-string list of trigger
+ * identifiers (e.g. `"PRE,ONCE"`), into an uppercased, trimmed Set. Unknown
+ * tokens are preserved but ignored by callers.
+ */
+function parseCues(range) {
+    return new Set((range.clientAttributes['CUE'] ?? '')
+        .split(',')
+        .map((token) => token.trim().toUpperCase())
+        .filter(Boolean));
+}
+/**
+ * Parses the signed `X-RESUME-OFFSET` (seconds). Returns null when the attribute
+ * is absent (so the controller substitutes the actual playout duration) — a
+ * present value of 0 is distinct from absent and is returned as 0.
+ */
+function parseResumeOffset(range) {
+    if (!('X-RESUME-OFFSET' in range.clientAttributes))
+        return null;
+    const value = parseFloat(range.clientAttributes['X-RESUME-OFFSET']);
+    return Number.isFinite(value) ? value : null;
+}
+/**
+ * Parses the `X-RESOLUTION-TIME-OFFSET` (seconds) — how far ahead of the break
+ * the client should resolve/preload its assets. Returns null when absent or not
+ * a finite non-negative number, so the controller falls back to its configured
+ * `preloadAheadTime`.
+ */
+function parseResolutionTimeOffset(range) {
+    if (!('X-RESOLUTION-TIME-OFFSET' in range.clientAttributes))
+        return null;
+    const value = parseFloat(range.clientAttributes['X-RESOLUTION-TIME-OFFSET']);
+    return Number.isFinite(value) && value >= 0 ? value : null;
+}
+function classifyPlacement(startTime, contentDuration, cues) {
+    // PRE/POST trigger identifiers are authoritative over the proximity
+    // heuristic (they may fire outside the range's START-DATE/duration). PRE
+    // wins the illegal PRE+POST combination.
+    if (cues.has('PRE'))
+        return 'preroll';
+    if (cues.has('POST'))
+        return 'postroll';
+    if (startTime <= ROLL_EPSILON)
+        return 'preroll';
+    if (contentDuration != null &&
+        Number.isFinite(contentDuration) &&
+        startTime >= contentDuration - ROLL_EPSILON) {
+        return 'postroll';
+    }
+    return 'midroll';
+}
+function resolveHlsAssetContent({ range, startTime, duration, baseUrl, }) {
+    const assetUri = range.clientAttributes['X-ASSET-URI'];
+    if (assetUri) {
+        // A single inline asset carries no skip window.
+        return {
+            ads: [
+                {
+                    id: `${range.id}-0`,
+                    startTime,
+                    duration,
+                    uri: resolveUrl(assetUri, baseUrl),
+                },
+            ],
+            skipControl: null,
+        };
+    }
+    const assetListUrl = range.clientAttributes['X-ASSET-LIST'];
+    if (assetListUrl) {
+        return resolveHlsAssetList({
+            assetListUrl,
+            rangeId: range.id,
+            startTime,
+            baseUrl,
+        });
+    }
+    return { ads: [], skipControl: null };
+}
+async function resolveHlsAssetList({ assetListUrl, rangeId, startTime, baseUrl, }) {
+    const url = resolveUrl(assetListUrl, baseUrl);
+    const response = await requestWithRetry(url);
+    const json = await response.json();
+    const assets = json.ASSETS ?? [];
+    const ads = assets.map((asset, i) => {
+        return {
+            id: `${rangeId}-${i}`,
+            startTime,
+            duration: asset.DURATION ?? null,
+            uri: resolveUrl(asset.URI, baseUrl),
+        };
+    });
+    return { ads, skipControl: parseSkipControl(json['SKIP-CONTROL']) };
+}
+/**
+ * Maps an X-ASSET-LIST `SKIP-CONTROL` object to a {@link SkipControl}, or null
+ * when absent or missing a usable offset.
+ */
+function parseSkipControl(control) {
+    if (!control)
+        return null;
+    const offset = Number(control.OFFSET);
+    if (!Number.isFinite(offset) || offset < 0)
+        return null;
+    return { offset, duration: control.DURATION ?? null };
+}
+function parseRestrict(str) {
+    const skip = str.includes('SKIP');
+    const jump = str.includes('JUMP');
+    return { skip, jump };
+}

package/dist/types/current/drm/DrmController.d.ts

@@ -4,6 +4,8 @@ import type { DrmKeySystem } from './DrmKeySystem';
 import type { MediaFormatMetadata } from '../streaming/MediaQualityMetadata';
 import type { BasicErrorEvent } from '../event/BasicErrorEvent';
 import type { DrmOptions } from './DrmOptions';
+import type { LoadSpanMeasurement } from '../streaming/LoadMetric';
+import type { TrackUri } from '../track/Track';
 export interface DrmControllerEventMap {
     /**
      * A DRM error occurred.
@@ -27,6 +29,14 @@ export interface DrmControllerEventMap {
      * Dispatched after a key session has been closed.
      */
     readonly sessionClose: KeySessionEvent;
+    /**
+     * A license exchange completed. The span is attributed at the source to the
+     * track that initiated the license request (via the key session that
+     * produced the message), so concurrent exchanges for the active and a
+     * preloaded track do not cross-attribute. The player republishes it as
+     * `loadSpan` using the carried `trackUri`.
+     */
+    readonly loadSpanMeasured: LoadSpanMeasurement;
 }
 export interface MediaKeysSetEvent {
     readonly keySystem: DrmKeySystem;
@@ -35,6 +45,21 @@ export interface KeySessionEvent {
     readonly mimeType: string;
     readonly initDataType: DrmInitDataType;
 }
+/**
+ * Options for {@link DrmController.initializeForPlayback} and
+ * {@link DrmController.setBufferingDrmInfo}.
+ */
+export interface DrmPlaybackOptions {
+    /**
+     * The track initiating playback/buffering. Stamped onto any created key
+     * session so its license `loadSpanMeasured` attributes to the correct track.
+     */
+    readonly trackUri?: TrackUri | null;
+    /**
+     * If aborted, the created session will be closed.
+     */
+    readonly abort?: ReadonlyAbort;
+}
 /**
  * DrmController manages media keys and sessions, provides tracks a way to declare their content protections.
  */
@@ -68,18 +93,18 @@ export interface DrmController extends ReadonlyEventHost<DrmControllerEventMap>
      * expected to contain the supported key system.
      *
      * @param drmInfo Format metadata for the representation. May contain content protections.
-     * @param abort If aborted, the created session will be closed.
+     * @param options Playback options ({@link DrmPlaybackOptions}).
      */
-    initializeForPlayback(drmInfo: MediaFormatMetadata | null, abort?: ReadonlyAbort): void;
+    initializeForPlayback(drmInfo: MediaFormatMetadata | null, options?: DrmPlaybackOptions): void;
     /**
      * Sets content protection data on drm controller for the currently buffering media.
      *
      * The key session will be created on the 'encrypted' event when the decoder has been initialized.
      *
      * @param drmInfo Format metadata for the representation. May contain content protections.
-     * @param abort If aborted, the created session from an 'encrypted' event will be closed.
+     * @param options Buffering options ({@link DrmPlaybackOptions}).
      */
-    setBufferingDrmInfo(drmInfo: MediaFormatMetadata | null, abort?: ReadonlyAbort): void;
+    setBufferingDrmInfo(drmInfo: MediaFormatMetadata | null, options?: DrmPlaybackOptions): void;
     /**
      * Clears all active DRM sessions.
      * This should not be called unless the audio source has been cleared.

package/dist/types/current/drm/DrmController.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DrmController.d.ts","sourceRoot":"","sources":["../../../../src/drm/DrmController.ts"],"names":[],"mappings":"AAKA,OAAO,EACH,KAAK,SAAS,EACd,KAAK,KAAK,EACV,KAAK,aAAa,EAClB,KAAK,iBAAiB,EACzB,MAAM,oBAAoB,CAAA;AAC3B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAA;AACnE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAClD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAA;AAC5E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAA;AAC/D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAE9C,MAAM,WAAW,qBAAqB;IAClC;;OAEG;IACH,QAAQ,CAAC,KAAK,EAAE,eAAe,CAAA;IAE/B;;OAEG;IACH,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAA;IAEzB;;;;OAIG;IACH,QAAQ,CAAC,YAAY,EAAE,iBAAiB,CAAA;IAExC;;OAEG;IACH,QAAQ,CAAC,aAAa,EAAE,eAAe,CAAA;IAEvC;;OAEG;IACH,QAAQ,CAAC,YAAY,EAAE,eAAe,CAAA;CACzC;AAED,MAAM,WAAW,iBAAiB;IAC9B,QAAQ,CAAC,SAAS,EAAE,YAAY,CAAA;CACnC;AAED,MAAM,WAAW,eAAe;IAC5B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;IACzB,QAAQ,CAAC,YAAY,EAAE,eAAe,CAAA;CACzC;AAED;;GAEG;AACH,MAAM,WAAW,aAAc,SAAQ,iBAAiB,CAAC,qBAAqB,CAAC;IAC3E;;;OAGG;IACH,QAAQ,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI,CAAA;IAE5B;;;;OAIG;IACH,SAAS,CAAC,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,GAAG,IAAI,CAAA;IAEpD;;OAEG;IACH,cAAc,IAAI,OAAO,CAAA;IAEzB;;;OAGG;IACH,WAAW,CAAC,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAA;IAEvE;;;;;;;;;;OAUG;IACH,qBAAqB,CACjB,OAAO,EAAE,mBAAmB,GAAG,IAAI,EACnC,KAAK,CAAC,EAAE,aAAa,GACtB,IAAI,CAAA;IAEP;;;;;;;OAOG;IACH,mBAAmB,CACf,OAAO,EAAE,mBAAmB,GAAG,IAAI,EACnC,KAAK,CAAC,EAAE,aAAa,GACtB,IAAI,CAAA;IAEP;;;OAGG;IACH,aAAa,IAAI,IAAI,CAAA;IAErB;;OAEG;IACH,KAAK,IAAI,IAAI,CAAA;CAChB;AAED,MAAM,MAAM,mBAAmB,GAAG;IAC9B;;OAEG;IACH,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAA;IAE3B;;OAEG;IACH,QAAQ,CAAC,eAAe,EAAE,OAAO,CAAA;CACpC,CAAA"}
+{"version":3,"file":"DrmController.d.ts","sourceRoot":"","sources":["../../../../src/drm/DrmController.ts"],"names":[],"mappings":"AAKA,OAAO,EACH,KAAK,SAAS,EACd,KAAK,KAAK,EACV,KAAK,aAAa,EAClB,KAAK,iBAAiB,EACzB,MAAM,oBAAoB,CAAA;AAC3B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAA;AACnE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAClD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAA;AAC5E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAA;AAC/D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAC9C,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAA;AAClE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAE9C,MAAM,WAAW,qBAAqB;IAClC;;OAEG;IACH,QAAQ,CAAC,KAAK,EAAE,eAAe,CAAA;IAE/B;;OAEG;IACH,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAA;IAEzB;;;;OAIG;IACH,QAAQ,CAAC,YAAY,EAAE,iBAAiB,CAAA;IAExC;;OAEG;IACH,QAAQ,CAAC,aAAa,EAAE,eAAe,CAAA;IAEvC;;OAEG;IACH,QAAQ,CAAC,YAAY,EAAE,eAAe,CAAA;IAEtC;;;;;;OAMG;IACH,QAAQ,CAAC,gBAAgB,EAAE,mBAAmB,CAAA;CACjD;AAED,MAAM,WAAW,iBAAiB;IAC9B,QAAQ,CAAC,SAAS,EAAE,YAAY,CAAA;CACnC;AAED,MAAM,WAAW,eAAe;IAC5B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;IACzB,QAAQ,CAAC,YAAY,EAAE,eAAe,CAAA;CACzC;AAED;;;GAGG;AACH,MAAM,WAAW,kBAAkB;IAC/B;;;OAGG;IACH,QAAQ,CAAC,QAAQ,CAAC,EAAE,QAAQ,GAAG,IAAI,CAAA;IAEnC;;OAEG;IACH,QAAQ,CAAC,KAAK,CAAC,EAAE,aAAa,CAAA;CACjC;AAED;;GAEG;AACH,MAAM,WAAW,aAAc,SAAQ,iBAAiB,CAAC,qBAAqB,CAAC;IAC3E;;;OAGG;IACH,QAAQ,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI,CAAA;IAE5B;;;;OAIG;IACH,SAAS,CAAC,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,GAAG,IAAI,CAAA;IAEpD;;OAEG;IACH,cAAc,IAAI,OAAO,CAAA;IAEzB;;;OAGG;IACH,WAAW,CAAC,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAA;IAEvE;;;;;;;;;;OAUG;IACH,qBAAqB,CACjB,OAAO,EAAE,mBAAmB,GAAG,IAAI,EACnC,OAAO,CAAC,EAAE,kBAAkB,GAC7B,IAAI,CAAA;IAEP;;;;;;;OAOG;IACH,mBAAmB,CACf,OAAO,EAAE,mBAAmB,GAAG,IAAI,EACnC,OAAO,CAAC,EAAE,kBAAkB,GAC7B,IAAI,CAAA;IAEP;;;OAGG;IACH,aAAa,IAAI,IAAI,CAAA;IAErB;;OAEG;IACH,KAAK,IAAI,IAAI,CAAA;CAChB;AAED,MAAM,MAAM,mBAAmB,GAAG;IAC9B;;OAEG;IACH,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAA;IAE3B;;OAEG;IACH,QAAQ,CAAC,eAAe,EAAE,OAAO,CAAA;CACpC,CAAA"}

package/dist/types/current/drm/DrmControllerImpl.d.ts

@@ -1,8 +1,9 @@
-import { EventHostImpl, type Maybe, type ReadonlyAbort } from '@amazon/vinyl-util';
+import { EventHostImpl, type Maybe } from '@amazon/vinyl-util';
 import { type DrmOptions } from './DrmOptions';
-import type { DrmController, DrmControllerEventMap, DrmKeySystemSupport } from './DrmController';
+import type { DrmController, DrmControllerEventMap, DrmKeySystemSupport, DrmPlaybackOptions } from './DrmController';
 import type { CommonEme, CommonMediaKeyMessageEvent, CommonMediaKeys, CommonMediaKeySession } from './commonEme/CommonEme';
 import type { MediaFormatMetadata } from '../streaming/MediaQualityMetadata';
+import type { TrackUri } from '../track/Track';
 /**
  * The number of seconds a license request will be allowed before timing out.
  * This should be higher than the network timeout.
@@ -22,6 +23,13 @@ export interface DrmControllerMessageProps {
     readonly mediaKeys: CommonMediaKeys;
     readonly session: CommonMediaKeySession;
     readonly event: CommonMediaKeyMessageEvent;
+    /**
+     * The track that initiated this session, captured when the session was
+     * created. Carried on the props (not read from controller state at message
+     * time) so concurrent license exchanges for different tracks each attribute
+     * to their own track.
+     */
+    readonly trackUri: TrackUri | null;
 }
 export declare class DrmControllerImpl extends EventHostImpl<DrmControllerEventMap> implements DrmController {
     private readonly deps;
@@ -33,6 +41,7 @@ export declare class DrmControllerImpl extends EventHostImpl<DrmControllerEventM
     private readonly sessions;
     private _error;
     private drmInfo;
+    private bufferingTrackUri;
     private sessionAbort;
     private pendingMessageProps;
     private readonly disposer;
@@ -55,8 +64,8 @@ export declare class DrmControllerImpl extends EventHostImpl<DrmControllerEventM
      * The new session will be added to the current sessions list.
      */
     private maybeCreateSession;
-    initializeForPlayback(drmInfo: MediaFormatMetadata | null, abort?: ReadonlyAbort): void;
-    setBufferingDrmInfo(drmInfo: MediaFormatMetadata | null, abort?: ReadonlyAbort): void;
+    initializeForPlayback(drmInfo: MediaFormatMetadata | null, options?: DrmPlaybackOptions): void;
+    setBufferingDrmInfo(drmInfo: MediaFormatMetadata | null, options?: DrmPlaybackOptions): void;
     /**
      * If the drm metadata contains initialization data for the current key system, create a new session.
      * Otherwise, wait for the 'encrypted' event for the initialization data.

package/dist/types/current/drm/DrmControllerImpl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DrmControllerImpl.d.ts","sourceRoot":"","sources":["../../../../src/drm/DrmControllerImpl.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"DrmControllerImpl.d.ts","sourceRoot":"","sources":["../../../../src/drm/DrmControllerImpl.ts"],"names":[],"mappings":"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"}