@amazon/vinyl 1.2.0 → 2.0.4

package/dist/types/current/track/mse/MseTrack.js

@@ -2,10 +2,19 @@
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
-import { TrackBase, } from '../TrackBase';
-import { Abort, equalDeep, IntersectionRanges, logDebug, redispatchEvents, } from '@amazon/vinyl-util';
+import { TrackBase } from '../TrackBase';
+import { Abort, equalDeep, first, IntersectionRanges, logDebug, noop, redispatchEvents, } from '@amazon/vinyl-util';
 import { createContainer } from '@amazon/vinyl-di';
 import { getMediaPeriodAtTime, } from '../../streaming/MediaTimeline';
+/**
+ * How long to wait after all streams have data before checking whether a seek
+ * is still stuck, in seconds.
+ */
+export const SEEKING_STALL_TIME_CHECK = 0.1;
+/**
+ * How far to nudge the playhead, in seconds, to recover a stuck seek.
+ */
+export const PLAYHEAD_NUDGE = 0.05;
 /**
  * An MseTrack uses media source extensions for streaming.
  */
@@ -13,10 +22,17 @@ export class MseTrack extends TrackBase {
     get [Symbol.toStringTag]() {
         return 'MseTrack';
     }
+    get textTrackController() {
+        // Reading a dep on a disposed track throws DisposedError (its DI
+        // container's lazies are disposed); a stale reference has no controller.
+        if (this.disposed)
+            return null;
+        return this.deps.textTrackController ?? null;
+    }
     streams = [];
+    stallNudgeTimer = null;
     disposeAbort = new Abort();
     lastPreloadOptions = null;
-    activateOptions = null;
     allFetchedRanges = [];
     _fetchedRanges = new IntersectionRanges(this.allFetchedRanges, { useCache: true });
     _contentTypes = new Set();
@@ -34,49 +50,95 @@ export class MseTrack extends TrackBase {
         this.deps = deps;
         add(deps.contentTypesValue.onData((contentTypesPromise) => {
             contentTypesPromise
-                .then((contentTypes) => {
-                if (this.disposer.disposed)
-                    return;
-                if (equalDeep(this.contentTypes, contentTypes))
-                    return; // no-op
-                logDebug(this, 'content types:', contentTypes);
-                this.clearStreams();
-                for (const contentType of contentTypes) {
-                    this.createStream(contentType);
-                }
-                // Sets the content types and dispatches a change event:
-                this.contentTypes = contentTypes;
-            })
+                .then((value) => this.setContentTypes(value))
                 .catch(this.errorHandler);
         }));
         // DRM
         this.on('streamingQualityChange', (event) => {
-            if (this.activateOptions) {
-                this.deps.drmController.initializeForPlayback(event.current, this.disposeAbort);
+            if (this.active) {
+                this.deps.drmController.initializeForPlayback(event.current, {
+                    trackUri: this.uri,
+                    abort: this.disposeAbort,
+                });
             }
         });
         this.on('bufferingQualityChange', (event) => {
-            this.deps.drmController.setBufferingDrmInfo(event.current, this.disposeAbort);
+            // Keep the DRM info while a stream's buffering transiently clears
+            // (a seek or reaching the end): with multiple encrypted streams, an
+            // `encrypted` event from another stream still (re)appending its init
+            // segment needs it. The info is cleared on deactivation instead.
+            if (event.current == null)
+                return;
+            this.deps.drmController.setBufferingDrmInfo(event.current, {
+                trackUri: this.uri,
+                abort: this.disposeAbort,
+            });
         });
-        // Listen for timeline changes to update qualities.
+        // Listen for timeline changes to update qualities seek ranges and ads.
         add(deps.mediaTimelineTransformed.onData(() => {
             this._cachedPeriod = null;
             this.updateQualities();
+            this.updateSeekRanges();
+            this.dispatch('adsChange', {});
         }));
         add(deps.mediaTimeline.onData(() => {
             this._cachedPeriod = null;
             this.updateQualitiesUnfiltered();
         }));
+        // Surface the manifest fetch span alongside the streams' segment spans,
+        // attributing it to this track at the source.
+        add(deps.manifestController.on('loadSpanMeasured', (measurement) => this.dispatchLoadSpan(measurement)));
+        // Audio/stream selection options: a change (never the initial value)
+        // re-filters the timeline, so rebuild this track's streams in place.
+        add(deps.preferredAudioLanguage.onData((_value, previous) => {
+            if (previous !== undefined)
+                this.reloadStreams();
+        }));
+        add(deps.allowedContentTypes.onData((_value, previous) => {
+            if (previous !== undefined)
+                this.reloadStreams();
+        }));
+        add(deps.preferDescriptiveAudio.onData((_value, previous) => {
+            if (previous !== undefined)
+                this.reloadStreams();
+        }));
+        // A resolution-restriction change re-selects a quality from the same
+        // streams, so clearing the buffer is enough — no rebuild is needed.
+        add(deps.abr.onData((value, previous) => {
+            if (previous === undefined)
+                return;
+            if (value.maxHeight !== previous.maxHeight ||
+                value.maxWidth !== previous.maxWidth) {
+                this.clearPrefetch();
+            }
+        }));
+    }
+    /**
+     * Clears this track's buffers and rebuilds its streams so a changed
+     * audio/language/content-type selection applies immediately.
+     * {@link reset} with `hard` safely no-ops the rebuild for an inactive
+     * (cached) track.
+     */
+    reloadStreams() {
+        this.clearPrefetch();
+        this.reset(/* hard */ true);
+    }
+    /**
+     * Re-dispatches a sub-controller's load span stamped with this track's uri,
+     * so the span attributes to the track that owns it at the source.
+     */
+    dispatchLoadSpan(measurement) {
+        this.dispatch('loadSpanMeasured', {
+            ...measurement,
+            trackUri: this.uri,
+        });
     }
     /**
      * Updates the cached qualities list from the transformed timeline for the current period.
      */
     updateQualities() {
-        const time = this.deps.playbackController.currentTime;
-        this.deps.mediaTimelineTransformed.value
-            .then((timeline) => {
-            if (this.disposer.disposed)
-                return;
+        this.withTimeline(this.deps.mediaTimelineTransformed, (timeline) => {
+            const time = this.deps.playbackController.currentTime;
             const period = getMediaPeriodAtTime(timeline, time);
             this._cachedPeriod = period;
             const newQualities = period
@@ -92,18 +154,21 @@ export class MseTrack extends TrackBase {
                     });
                 }
             }
-        })
-            .catch(this.errorHandler);
+        });
+    }
+    async getAds() {
+        const timeline = await this.deps.mediaTimeline.value;
+        return {
+            trackUri: this.uri,
+            adBreaks: await timeline.getAdBreaks(),
+        };
     }
     /**
      * Updates the cached unfiltered qualities list from the raw timeline for the current period.
      */
     updateQualitiesUnfiltered() {
-        const time = this.deps.playbackController.currentTime;
-        this.deps.mediaTimeline.value
-            .then((timeline) => {
-            if (this.disposer.disposed)
-                return;
+        this.withTimeline(this.deps.mediaTimeline, (timeline) => {
+            const time = this.deps.playbackController.currentTime;
             const period = getMediaPeriodAtTime(timeline, time);
             const newQualities = period
                 ? period.qualities.map((q) => q.metadata)
@@ -118,6 +183,38 @@ export class MseTrack extends TrackBase {
                     });
                 }
             }
+        });
+    }
+    updateSeekRanges() {
+        this.withTimeline(this.deps.mediaTimelineTransformed, (timeline, interrupted) => {
+            timeline
+                .getDuration()
+                .then((duration) => {
+                if (interrupted())
+                    return;
+                const start = first(timeline.periods)?.startTime ?? 0;
+                this.setSeekRange({
+                    start,
+                    end: start + duration,
+                });
+            })
+                .catch(this.errorHandler);
+        });
+    }
+    /**
+     * Invokes a callback when the given timeline promise resolves and was not
+     * interrupted by that timeline changing or the track being disposed.
+     *
+     * Pass `mediaTimelineTransformed` for the playable (filtered) view or
+     * `mediaTimeline` for the raw, unfiltered view.
+     */
+    withTimeline(timelineSource, callback) {
+        const timelinePromise = timelineSource.value;
+        const interrupted = () => this.disposed || timelinePromise !== timelineSource.value;
+        timelinePromise
+            .then((timeline) => {
+            if (!interrupted())
+                callback(timeline, interrupted);
         })
             .catch(this.errorHandler);
     }
@@ -133,13 +230,18 @@ export class MseTrack extends TrackBase {
             'streamingQualityChange',
             'bufferingQualityChange',
             'playbackQualityChange',
+            'codecUnsupported',
         ]);
+        // Stamp the segment spans with this track's uri at the source rather
+        // than blindly redispatching the unattributed measurement.
+        stream.on('loadSpanMeasured', (measurement) => this.dispatchLoadSpan(measurement));
         stream.on('bufferingEnded', () => {
             if (this.bufferingEnded) {
                 this.deps.mediaSourceController.endOfStream();
                 this.dispatch('bufferingEnded', {});
             }
         });
+        stream.on('hasDataChange', () => this.checkStalledSeek());
         stream.on('fetchedRangesChange', () => {
             this._fetchedRanges.invalidate();
         });
@@ -157,13 +259,13 @@ export class MseTrack extends TrackBase {
         if (this.lastPreloadOptions) {
             stream.preload(this.lastPreloadOptions);
         }
-        if (this.activateOptions) {
-            stream.activate(this.activateOptions);
+        if (this.loadOptions) {
+            stream.activate(this.loadOptions);
         }
     }
     preload(trackOptions, loadOptions) {
         const options = {
-            startTime: loadOptions.startTime,
+            startTime: loadOptions?.startTime,
             prefetchPriority: trackOptions.prefetchPriority,
         };
         this.lastPreloadOptions = options;
@@ -172,14 +274,6 @@ export class MseTrack extends TrackBase {
     get contentTypes() {
         return this._contentTypes;
     }
-    set contentTypes(value) {
-        const previous = this._contentTypes;
-        this._contentTypes = value;
-        this.dispatch('contentTypesChange', {
-            previous,
-            current: value,
-        });
-    }
     get qualities() {
         return this._qualities;
     }
@@ -202,24 +296,30 @@ export class MseTrack extends TrackBase {
      * Resets the track to recover from error states.
      * Resets both the segment controller and buffering controller to clear failed segments and error conditions.
      */
-    reset() {
-        if (!this.error) {
+    reset(hard = false) {
+        if (!hard && !this.error) {
             logDebug(this, 'reset no-op');
             return;
         }
+        super.reset(hard);
         this.deps.manifestController.reset();
         this.callOnStreams('reset');
-        super.reset();
     }
     onActivated(loadOptions) {
-        this.activateOptions = loadOptions;
+        // A disposed track's deps throw DisposedError on access; never touch them.
+        if (this.disposed)
+            return;
+        // Rebuild the DOM text track. The element's added TextTracks are
+        // dropped when the source is reset on deactivation (e.g. suspended for
+        // an ad), so the active selection must be re-rendered on reactivation.
+        this.deps.textTrackController?.resume();
         // AirPlay not supported using managed media sources
         this.deps.playbackSource.disableRemotePlayback = true;
         this.streams.forEach((stream) => {
-            this.deps.drmController.initializeForPlayback(stream.streamingQuality, this.disposeAbort);
+            this.deps.drmController.initializeForPlayback(stream.streamingQuality, { trackUri: this.uri, abort: this.disposeAbort });
         });
         this.deps.playbackSource.src =
-            this.deps.mediaSourceController.createUrl();
+            this.deps.mediaSourceController.activate();
         this.callOnStreams('activate', loadOptions);
         // Listen for timeUpdate to detect period changes.
         this.timeUpdateSub = this.deps.playbackController.on('timeUpdate', () => {
@@ -228,6 +328,7 @@ export class MseTrack extends TrackBase {
             if (cached &&
                 time >= cached.startTime &&
                 time < cached.endTime) {
+                // The period hasn't changed
                 return;
             }
             this.updateQualities();
@@ -235,12 +336,25 @@ export class MseTrack extends TrackBase {
         });
     }
     onDeactivated() {
-        this.activateOptions = null;
+        // A disposed track's deps throw DisposedError on access; never touch them.
+        if (this.disposed)
+            return;
         this.timeUpdateSub?.();
         this.timeUpdateSub = null;
         this.callOnStreams('deactivate');
+        // Streams' transient buffering clears no longer clear the DRM info, so
+        // clear it here now that the track is no longer buffering.
+        this.deps.drmController.setBufferingDrmInfo(null, {
+            trackUri: this.uri,
+            abort: this.disposeAbort,
+        });
+        // Tear down the DOM text track so its cues stop showing while this
+        // track is suspended (e.g. an ad playing over it). The selection is
+        // retained and re-rendered on reactivation via resume().
+        this.deps.textTrackController?.suspend();
         this.deps.playbackSource.src = null;
         this.deps.playbackSource.load();
+        this.deps.mediaSourceController.deactivate();
     }
     getStreamingQuality(contentType) {
         return this.getStream(contentType)?.streamingQuality ?? null;
@@ -272,10 +386,60 @@ export class MseTrack extends TrackBase {
     get bufferingEnded() {
         return this.streams.every((stream) => stream.bufferingEnded);
     }
+    /**
+     * A seek only completes once every stream has data at the target, but on
+     * some platforms the element can stay stuck `seeking` even after that. Once
+     * all streams hold data, if we're still seeking a moment later, nudge the
+     * playhead to prod the element into completing the seek.
+     */
+    checkStalledSeek() {
+        const { playbackController } = this.deps;
+        if (this.stallNudgeTimer !== null || !playbackController.seeking)
+            return;
+        if (!this.streams.length || !this.streams.every((s) => s.hasData)) {
+            return;
+        }
+        this.stallNudgeTimer = setTimeout(() => {
+            this.stallNudgeTimer = null;
+            if (this.disposed || !playbackController.seeking)
+                return;
+            if (!this.streams.every((s) => s.hasData))
+                return;
+            const from = playbackController.currentTime;
+            const to = from + PLAYHEAD_NUDGE;
+            // An internal recovery seek, not a user seek — logged so the two
+            // are distinguishable in playback traces.
+            logDebug(this, 'nudging playhead to recover a stalled seek', from, '->', to);
+            playbackController.seekTo(to, 0).catch(noop);
+        }, SEEKING_STALL_TIME_CHECK * 1000);
+    }
+    setContentTypes(contentTypes) {
+        if (this.disposed)
+            return;
+        const previous = this.contentTypes;
+        if (equalDeep(previous, contentTypes))
+            return; // no-op
+        logDebug(this, 'content types:', contentTypes);
+        if (previous.size) {
+            // Content types were previously set, hard reset this track
+            // so the media source is recreated
+            this.reset(/* hard */ true);
+        }
+        this.clearStreams();
+        for (const contentType of contentTypes) {
+            this.createStream(contentType);
+        }
+        // Sets the content types and dispatches a change event:
+        this._contentTypes = contentTypes;
+        this.dispatch('contentTypesChange', {
+            previous,
+            current: contentTypes,
+        });
+    }
     dispose() {
         logDebug(this, 'dispose');
-        this.timeUpdateSub?.();
-        this.timeUpdateSub = null;
+        if (this.stallNudgeTimer !== null)
+            clearTimeout(this.stallNudgeTimer);
         this.clearStreams();
         super.dispose();
     }

package/dist/types/current/track/source/SourceObjectTrack.d.ts

@@ -3,7 +3,7 @@ import type { TrackTypeId, TrackUri } from '../Track';
 import { type TrackBaseDeps } from '../TrackBase';
 import { type TrackFactory, type TrackLoadOptions } from '../TrackFactory';
 import { type Maybe } from '@amazon/vinyl-util';
-import { SourceTrackBase, type SourceTrackBaseOptions } from './SourceTrackBase';
+import { SourceTrackBase, type SourceTrackConfigOptions } from './SourceTrackBase';
 /**
  * Dependencies for a SourceObjectTrack.
  */
@@ -20,7 +20,7 @@ export interface SourceObjectTrackLoadOptions extends TrackLoadOptions {
      * Configuration options for the SourceObjectTrack.
      * Will be provided on preload and activate.
      */
-    readonly config?: Maybe<SourceTrackBaseOptions>;
+    readonly config?: Maybe<SourceTrackConfigOptions>;
 }
 export declare function createSourceObjectTrackFactory(deps: SourceObjectTrackDeps): TrackFactory<SourceObjectTrackLoadOptions>;
 export declare class SourceObjectTrack extends SourceTrackBase<MediaStream> {

package/dist/types/current/track/source/SourceObjectTrack.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SourceObjectTrack.d.ts","sourceRoot":"","sources":["../../../../../src/track/source/SourceObjectTrack.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAA;AACnE,OAAO,KAAK,EAAS,WAAW,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAA;AAC5D,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,cAAc,CAAA;AACjD,OAAO,EACH,KAAK,YAAY,EACjB,KAAK,gBAAgB,EAExB,MAAM,iBAAiB,CAAA;AACxB,OAAO,EAAe,KAAK,KAAK,EAAE,MAAM,oBAAoB,CAAA;AAE5D,OAAO,EACH,eAAe,EACf,KAAK,sBAAsB,EAE9B,MAAM,mBAAmB,CAAA;AAE1B;;GAEG;AACH,MAAM,WAAW,qBAAsB,SAAQ,aAAa;IACxD,QAAQ,CAAC,cAAc,EAAE,cAAc,CAAA;CAC1C;AAED,MAAM,WAAW,4BAA6B,SAAQ,gBAAgB;IAClE,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAA;IAE1B;;OAEG;IACH,QAAQ,CAAC,iBAAiB,EAAE,CACxB,GAAG,EAAE,QAAQ,KACZ,OAAO,CAAC,WAAW,CAAC,GAAG,WAAW,CAAA;IAEvC;;;OAGG;IACH,QAAQ,CAAC,MAAM,CAAC,EAAE,KAAK,CAAC,sBAAsB,CAAC,CAAA;CAClD;AASD,wBAAgB,8BAA8B,CAC1C,IAAI,EAAE,qBAAqB,GAC5B,YAAY,CAAC,4BAA4B,CAAC,CAe5C;AAGD,qBAAa,iBAAkB,SAAQ,eAAe,CAAC,WAAW,CAAC;IAS3D,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,qBAAqB;IARlD,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,MAAM,CAEjC;gBAGG,GAAG,EAAE,QAAQ,EACb,IAAI,EAAE,WAAW,EACjB,SAAS,EAAE,OAAO,CAAC,WAAW,CAAC,EACZ,IAAI,EAAE,qBAAqB;IAKlD,SAAS,CAAC,MAAM,CAAC,GAAG,EAAE,WAAW;IAIjC,SAAS,CAAC,QAAQ,IAAI,IAAI;CAI7B"}
+{"version":3,"file":"SourceObjectTrack.d.ts","sourceRoot":"","sources":["../../../../../src/track/source/SourceObjectTrack.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAA;AACnE,OAAO,KAAK,EAAS,WAAW,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAA;AAC5D,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,cAAc,CAAA;AACjD,OAAO,EACH,KAAK,YAAY,EACjB,KAAK,gBAAgB,EAExB,MAAM,iBAAiB,CAAA;AACxB,OAAO,EAAe,KAAK,KAAK,EAAE,MAAM,oBAAoB,CAAA;AAE5D,OAAO,EACH,eAAe,EACf,KAAK,wBAAwB,EAEhC,MAAM,mBAAmB,CAAA;AAE1B;;GAEG;AACH,MAAM,WAAW,qBAAsB,SAAQ,aAAa;IACxD,QAAQ,CAAC,cAAc,EAAE,cAAc,CAAA;CAC1C;AAED,MAAM,WAAW,4BAA6B,SAAQ,gBAAgB;IAClE,QAAQ,CAAC,IAAI,EAAE,WAAW,CAAA;IAE1B;;OAEG;IACH,QAAQ,CAAC,iBAAiB,EAAE,CACxB,GAAG,EAAE,QAAQ,KACZ,OAAO,CAAC,WAAW,CAAC,GAAG,WAAW,CAAA;IAEvC;;;OAGG;IACH,QAAQ,CAAC,MAAM,CAAC,EAAE,KAAK,CAAC,wBAAwB,CAAC,CAAA;CACpD;AASD,wBAAgB,8BAA8B,CAC1C,IAAI,EAAE,qBAAqB,GAC5B,YAAY,CAAC,4BAA4B,CAAC,CAe5C;AAGD,qBAAa,iBAAkB,SAAQ,eAAe,CAAC,WAAW,CAAC;IAS3D,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,qBAAqB;IARlD,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,MAAM,CAEjC;gBAGG,GAAG,EAAE,QAAQ,EACb,IAAI,EAAE,WAAW,EACjB,SAAS,EAAE,OAAO,CAAC,WAAW,CAAC,EACZ,IAAI,EAAE,qBAAqB;IAKlD,SAAS,CAAC,MAAM,CAAC,GAAG,EAAE,WAAW;IAIjC,SAAS,CAAC,QAAQ,IAAI,IAAI;CAI7B"}

package/dist/types/current/track/source/SourceTrack.d.ts

@@ -2,7 +2,7 @@ import type { TrackTypeId, TrackUri } from '../Track';
 import { type TrackBaseDeps } from '../TrackBase';
 import { type TrackFactory, type TrackLoadOptions } from '../TrackFactory';
 import { type Maybe } from '@amazon/vinyl-util';
-import { SourceTrackBase, type SourceTrackBaseOptions } from './SourceTrackBase';
+import { SourceTrackBase, type SourceTrackConfigOptions } from './SourceTrackBase';
 import type { PlaybackSource } from '../../playback/PlaybackSource';
 /**
  * Dependencies for a SourceTrack.
@@ -21,7 +21,7 @@ export interface SourceTrackLoadOptions extends TrackLoadOptions {
      * Configuration options for the SourceTrack.
      * Will be provided on preload and activate.
      */
-    readonly config?: Maybe<SourceTrackBaseOptions>;
+    readonly config?: Maybe<SourceTrackConfigOptions>;
 }
 export declare function createSourceTrackFactory(deps: SourceTrackDeps): TrackFactory<SourceTrackLoadOptions>;
 export declare class SourceTrack extends SourceTrackBase<string> {

package/dist/types/current/track/source/SourceTrack.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SourceTrack.d.ts","sourceRoot":"","sources":["../../../../../src/track/source/SourceTrack.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAS,WAAW,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAA;AAC5D,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,cAAc,CAAA;AACjD,OAAO,EACH,KAAK,YAAY,EACjB,KAAK,gBAAgB,EAExB,MAAM,iBAAiB,CAAA;AACxB,OAAO,EAAe,KAAK,KAAK,EAAE,MAAM,oBAAoB,CAAA;AAO5D,OAAO,EACH,eAAe,EACf,KAAK,sBAAsB,EAE9B,MAAM,mBAAmB,CAAA;AAC1B,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAA;AAEnE;;GAEG;AACH,MAAM,WAAW,eAAgB,SAAQ,aAAa;IAClD,QAAQ,CAAC,cAAc,EAAE,cAAc,CAAA;CAC1C;AAED,MAAM,WAAW,sBAAuB,SAAQ,gBAAgB;IAC5D,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAA;IAEpB;;;OAGG;IACH,QAAQ,CAAC,WAAW,CAAC,EAAE,KAAK,CAAC,CAAC,GAAG,EAAE,QAAQ,KAAK,OAAO,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC,CAAA;IAEzE;;;OAGG;IACH,QAAQ,CAAC,MAAM,CAAC,EAAE,KAAK,CAAC,sBAAsB,CAAC,CAAA;CAClD;AAUD,wBAAgB,wBAAwB,CACpC,IAAI,EAAE,eAAe,GACtB,YAAY,CAAC,sBAAsB,CAAC,CAiBtC;AAGD,qBAAa,WAAY,SAAQ,eAAe,CAAC,MAAM,CAAC;IAShD,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,eAAe;IAR5C,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,MAAM,CAEjC;gBAGG,GAAG,EAAE,QAAQ,EACb,IAAI,EAAE,WAAW,EACjB,GAAG,EAAE,OAAO,CAAC,MAAM,CAAC,EACD,IAAI,EAAE,eAAe;IAK5C,SAAS,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM;IAI5B,SAAS,CAAC,QAAQ;CAIrB"}
+{"version":3,"file":"SourceTrack.d.ts","sourceRoot":"","sources":["../../../../../src/track/source/SourceTrack.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAS,WAAW,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAA;AAC5D,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,cAAc,CAAA;AACjD,OAAO,EACH,KAAK,YAAY,EACjB,KAAK,gBAAgB,EAExB,MAAM,iBAAiB,CAAA;AACxB,OAAO,EAAe,KAAK,KAAK,EAAE,MAAM,oBAAoB,CAAA;AAE5D,OAAO,EACH,eAAe,EAEf,KAAK,wBAAwB,EAChC,MAAM,mBAAmB,CAAA;AAC1B,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAA;AAEnE;;GAEG;AACH,MAAM,WAAW,eAAgB,SAAQ,aAAa;IAClD,QAAQ,CAAC,cAAc,EAAE,cAAc,CAAA;CAC1C;AAED,MAAM,WAAW,sBAAuB,SAAQ,gBAAgB;IAC5D,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAA;IAEpB;;;OAGG;IACH,QAAQ,CAAC,WAAW,CAAC,EAAE,KAAK,CAAC,CAAC,GAAG,EAAE,QAAQ,KAAK,OAAO,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC,CAAA;IAEzE;;;OAGG;IACH,QAAQ,CAAC,MAAM,CAAC,EAAE,KAAK,CAAC,wBAAwB,CAAC,CAAA;CACpD;AASD,wBAAgB,wBAAwB,CACpC,IAAI,EAAE,eAAe,GACtB,YAAY,CAAC,sBAAsB,CAAC,CAiBtC;AAGD,qBAAa,WAAY,SAAQ,eAAe,CAAC,MAAM,CAAC;IAShD,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,eAAe;IAR5C,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,MAAM,CAEjC;gBAGG,GAAG,EAAE,QAAQ,EACb,IAAI,EAAE,WAAW,EACjB,GAAG,EAAE,OAAO,CAAC,MAAM,CAAC,EACD,IAAI,EAAE,eAAe;IAK5C,SAAS,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM;IAI5B,SAAS,CAAC,QAAQ;CAIrB"}

package/dist/types/current/track/source/SourceTrack.js

@@ -4,13 +4,12 @@
  */
 import { trackLoadOptionsValidator, } from '../TrackFactory';
 import { ErrorOrigin } from '@amazon/vinyl-util';
-import { func, isOneOf, string, } from '@amazon/vinyl-validation';
+import { func, isOneOf } from '@amazon/vinyl-validation';
 import { SourceTrackBase, sourceTrackBaseOptionsValidator, } from './SourceTrackBase';
 const loadOptionsValidator = trackLoadOptionsValidator.extend({
     config: sourceTrackBaseOptionsValidator.maybe().optional(),
     srcProvider: func().maybe().optional(),
     type: isOneOf('src'),
-    uri: string().notEmpty(),
 });
 export function createSourceTrackFactory(deps) {
     return {

package/dist/types/current/track/source/SourceTrackBase.d.ts

@@ -1,23 +1,25 @@
-import { TrackBase, type TrackBaseDeps, type TrackBaseOptions } from '../TrackBase';
+import { TrackBase, type TrackBaseDeps } from '../TrackBase';
 import type { TrackEventMap, TrackPreloadOptions, TrackTypeId, TrackUri } from '../Track';
 import { type Maybe, type ReadonlySet } from '@amazon/vinyl-util';
 import { type ContentType, type MediaQualityMetadata } from '../../streaming/MediaQualityMetadata';
 import type { ObjectSchema } from '@amazon/vinyl-validation';
-export interface SourceTrackBaseOptions extends TrackBaseOptions {
+import { type TrackConfigOptions } from '../TrackFactory';
+export interface SourceTrackConfigOptions extends TrackConfigOptions {
     /**
      * Quality metadata.
      * May be used to configure DRM (for native HLS), codec, or other track metadata.
      */
     readonly qualityMetadata?: Maybe<Partial<MediaQualityMetadata>>;
 }
-export declare const sourceTrackBaseOptionsValidator: ObjectSchema<SourceTrackBaseOptions>;
-export declare abstract class SourceTrackBase<SrcType, EventMap extends TrackEventMap = TrackEventMap, LoadOptionsType extends SourceTrackBaseOptions = SourceTrackBaseOptions> extends TrackBase<EventMap, LoadOptionsType> {
+export declare const sourceTrackBaseOptionsValidator: ObjectSchema<SourceTrackConfigOptions>;
+export declare abstract class SourceTrackBase<SrcType, EventMap extends TrackEventMap = TrackEventMap, TrackConfigOptions extends SourceTrackConfigOptions = SourceTrackConfigOptions> extends TrackBase<EventMap, TrackConfigOptions> {
     readonly src: Promise<SrcType>;
     protected readonly deps: TrackBaseDeps;
     private readonly fixedPlaybackQuality;
     private _resolvedSrc;
+    private activeSub;
     protected constructor(uri: TrackUri, type: TrackTypeId, src: Promise<SrcType>, deps: TrackBaseDeps);
-    preload(trackOptions: TrackPreloadOptions, loadOptions: LoadOptionsType): void;
+    preload(trackOptions: TrackPreloadOptions, loadOptions: Maybe<TrackConfigOptions>): void;
     get contentTypes(): ReadonlySet<ContentType>;
     get qualities(): readonly MediaQualityMetadata[] | null;
     get qualitiesUnfiltered(): readonly MediaQualityMetadata[] | null;

package/dist/types/current/track/source/SourceTrackBase.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SourceTrackBase.d.ts","sourceRoot":"","sources":["../../../../../src/track/source/SourceTrackBase.ts"],"names":[],"mappings":"AAKA,OAAO,EACH,SAAS,EACT,KAAK,aAAa,EAClB,KAAK,gBAAgB,EAExB,MAAM,cAAc,CAAA;AACrB,OAAO,KAAK,EACR,aAAa,EACb,mBAAmB,EACnB,WAAW,EACX,QAAQ,EACX,MAAM,UAAU,CAAA;AAEjB,OAAO,EAEH,KAAK,KAAK,EACV,KAAK,WAAW,EAEnB,MAAM,oBAAoB,CAAA;AAC3B,OAAO,EACH,KAAK,WAAW,EAEhB,KAAK,oBAAoB,EAE5B,MAAM,sCAAsC,CAAA;AAC7C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAA;AAE5D,MAAM,WAAW,sBAAuB,SAAQ,gBAAgB;IAC5D;;;OAGG;IACH,QAAQ,CAAC,eAAe,CAAC,EAAE,KAAK,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC,CAAA;CAClE;AAED,eAAO,MAAM,+BAA+B,EAAE,YAAY,CAAC,sBAAsB,CAM3E,CAAA;AAKN,8BAAsB,eAAe,CACjC,OAAO,EACP,QAAQ,SAAS,aAAa,GAAG,aAAa,EAC9C,eAAe,SAAS,sBAAsB,GAAG,sBAAsB,CACzE,SAAQ,SAAS,CAAC,QAAQ,EAAE,eAAe,CAAC;aAOtB,GAAG,EAAE,OAAO,CAAC,OAAO,CAAC;IACrC,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,aAAa;IAP1C,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAsB;IAC3D,OAAO,CAAC,YAAY,CAAuB;IAE3C,SAAS,aACL,GAAG,EAAE,QAAQ,EACb,IAAI,EAAE,WAAW,EACD,GAAG,EAAE,OAAO,CAAC,OAAO,CAAC,EAClB,IAAI,EAAE,aAAa;IA0B1C,OAAO,CAAC,YAAY,EAAE,mBAAmB,EAAE,WAAW,EAAE,eAAe;IAQvE,IAAI,YAAY,IAAI,WAAW,CAAC,WAAW,CAAC,CAE3C;IAED,IAAI,SAAS,IAAI,SAAS,oBAAoB,EAAE,GAAG,IAAI,CAEtD;IAED,IAAI,mBAAmB,IAAI,SAAS,oBAAoB,EAAE,GAAG,IAAI,CAEhE;IAED,mBAAmB,CAAC,WAAW,EAAE,WAAW,GAAG,oBAAoB,GAAG,IAAI;IAI1E,mBAAmB,CAAC,WAAW,EAAE,WAAW,GAAG,oBAAoB,GAAG,IAAI;IAI1E,kBAAkB,CAAC,WAAW,EAAE,WAAW,GAAG,oBAAoB,GAAG,IAAI;IAIzE,WAAW,IAAI,IAAI;IASnB,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,EAAE,OAAO,GAAG,IAAI;IAC7C,SAAS,CAAC,QAAQ,CAAC,QAAQ,IAAI,IAAI;IAEnC,aAAa,IAAI,IAAI;IAKrB,aAAa;CAIhB"}
+{"version":3,"file":"SourceTrackBase.d.ts","sourceRoot":"","sources":["../../../../../src/track/source/SourceTrackBase.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,SAAS,EAAE,KAAK,aAAa,EAAE,MAAM,cAAc,CAAA;AAC5D,OAAO,KAAK,EACR,aAAa,EACb,mBAAmB,EACnB,WAAW,EACX,QAAQ,EACX,MAAM,UAAU,CAAA;AAEjB,OAAO,EAGH,KAAK,KAAK,EACV,KAAK,WAAW,EAGnB,MAAM,oBAAoB,CAAA;AAC3B,OAAO,EACH,KAAK,WAAW,EAEhB,KAAK,oBAAoB,EAE5B,MAAM,sCAAsC,CAAA;AAC7C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAA;AAC5D,OAAO,EACH,KAAK,kBAAkB,EAE1B,MAAM,iBAAiB,CAAA;AAExB,MAAM,WAAW,wBAAyB,SAAQ,kBAAkB;IAChE;;;OAGG;IACH,QAAQ,CAAC,eAAe,CAAC,EAAE,KAAK,CAAC,OAAO,CAAC,oBAAoB,CAAC,CAAC,CAAA;CAClE;AAED,eAAO,MAAM,+BAA+B,EAAE,YAAY,CAAC,wBAAwB,CAM7E,CAAA;AAKN,8BAAsB,eAAe,CACjC,OAAO,EACP,QAAQ,SAAS,aAAa,GAAG,aAAa,EAC9C,kBAAkB,SAAS,wBAAwB,GAC/C,wBAAwB,CAC9B,SAAQ,SAAS,CAAC,QAAQ,EAAE,kBAAkB,CAAC;aAQzB,GAAG,EAAE,OAAO,CAAC,OAAO,CAAC;IACrC,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,aAAa;IAR1C,OAAO,CAAC,QAAQ,CAAC,oBAAoB,CAAsB;IAC3D,OAAO,CAAC,YAAY,CAAuB;IAC3C,OAAO,CAAC,SAAS,CAA2B;IAE5C,SAAS,aACL,GAAG,EAAE,QAAQ,EACb,IAAI,EAAE,WAAW,EACD,GAAG,EAAE,OAAO,CAAC,OAAO,CAAC,EAClB,IAAI,EAAE,aAAa;IA0B1C,OAAO,CACH,YAAY,EAAE,mBAAmB,EACjC,WAAW,EAAE,KAAK,CAAC,kBAAkB,CAAC;IAS1C,IAAI,YAAY,IAAI,WAAW,CAAC,WAAW,CAAC,CAE3C;IAED,IAAI,SAAS,IAAI,SAAS,oBAAoB,EAAE,GAAG,IAAI,CAEtD;IAED,IAAI,mBAAmB,IAAI,SAAS,oBAAoB,EAAE,GAAG,IAAI,CAEhE;IAED,mBAAmB,CAAC,WAAW,EAAE,WAAW,GAAG,oBAAoB,GAAG,IAAI;IAI1E,mBAAmB,CAAC,WAAW,EAAE,WAAW,GAAG,oBAAoB,GAAG,IAAI;IAI1E,kBAAkB,CAAC,WAAW,EAAE,WAAW,GAAG,oBAAoB,GAAG,IAAI;IAIzE,WAAW,IAAI,IAAI;IAuBnB,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,EAAE,OAAO,GAAG,IAAI;IAC7C,SAAS,CAAC,QAAQ,CAAC,QAAQ,IAAI,IAAI;IAEnC,aAAa,IAAI,IAAI;IAKrB,aAAa;CAIhB"}

package/dist/types/current/track/source/SourceTrackBase.js

@@ -2,11 +2,12 @@
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
-import { TrackBase, trackBaseOptionsValidator, } from '../TrackBase';
+import { TrackBase } from '../TrackBase';
 import { FixedPlaybackQuality } from './FixedPlaybackQuality';
-import { logDebug, redispatchEvents, } from '@amazon/vinyl-util';
+import { createDisposer, logDebug, redispatchEvents, } from '@amazon/vinyl-util';
 import { createEmptyMediaQualityMetadata, mediaQualityMetadataValidator, } from '../../streaming/MediaQualityMetadata';
-export const sourceTrackBaseOptionsValidator = trackBaseOptionsValidator.extend({
+import { trackConfigOptionsValidator, } from '../TrackFactory';
+export const sourceTrackBaseOptionsValidator = trackConfigOptionsValidator.extend({
     qualityMetadata: mediaQualityMetadataValidator
         .partial()
         .maybe()
@@ -18,6 +19,7 @@ export class SourceTrackBase extends TrackBase {
     deps;
     fixedPlaybackQuality;
     _resolvedSrc = null;
+    activeSub = null;
     constructor(uri, type, src, deps) {
         super(uri, type, deps);
         this.src = src;
@@ -32,7 +34,10 @@ export class SourceTrackBase extends TrackBase {
             .catch(this.errorHandler);
         this.fixedPlaybackQuality = add(new FixedPlaybackQuality(emptyMediaQualityMetadata, deps));
         this.fixedPlaybackQuality.on('bufferingQualityChange', (event) => {
-            this.deps.drmController.setBufferingDrmInfo(event.current, this.drmSessionAbort.value);
+            this.deps.drmController.setBufferingDrmInfo(event.current, {
+                trackUri: this.uri,
+                abort: this.drmSessionAbort.value,
+            });
         });
         redispatchEvents(this, this.fixedPlaybackQuality, [
             'streamingQualityChange',
@@ -44,7 +49,7 @@ export class SourceTrackBase extends TrackBase {
         super.preload(trackOptions, loadOptions);
         this.fixedPlaybackQuality.fixedQuality = {
             ...emptyMediaQualityMetadata,
-            ...loadOptions.qualityMetadata,
+            ...loadOptions?.qualityMetadata,
         };
     }
     get contentTypes() {
@@ -66,15 +71,27 @@ export class SourceTrackBase extends TrackBase {
         return this.fixedPlaybackQuality.getPlaybackQuality(contentType);
     }
     onActivated() {
+        const { add, dispose } = createDisposer();
+        this.activeSub = dispose;
+        add(this.deps.playbackController.on('durationChange', (event) => {
+            this.setSeekRange({
+                start: 0,
+                end: event.current,
+            });
+        }));
         this.fixedPlaybackQuality.activate();
-        this.deps.drmController.initializeForPlayback(this.fixedPlaybackQuality.fixedQuality, this.drmSessionAbort.value);
+        this.deps.drmController.initializeForPlayback(this.fixedPlaybackQuality.fixedQuality, { trackUri: this.uri, abort: this.drmSessionAbort.value });
         if (this._resolvedSrc != null)
             this.setSrc(this._resolvedSrc);
+        add(() => {
+            if (this._resolvedSrc != null)
+                this.clearSrc();
+            this.fixedPlaybackQuality.deactivate();
+        });
     }
     onDeactivated() {
-        if (this._resolvedSrc != null)
-            this.clearSrc();
-        this.fixedPlaybackQuality.deactivate();
+        this.activeSub?.();
+        this.activeSub = null;
     }
     clearPrefetch() {
         // Source tracks do not prefetch