@amazon/vinyl 3.2.1 → 3.2.3-next.20261001143710

package/dist/unit/types/current/drm/util/extractContentId.test.js

@@ -14,6 +14,13 @@ describe('extractContentId', () => {
             expect(extractContentId(createContentIdByteArray('skd://example0'))).toBe('example0');
         });
     });
+    describe('with an offset view', () => {
+        it('reads only the bytes the view spans', () => {
+            const padded = createContentIdByteArray('\0\0skd://example0\0\0');
+            const view = padded.subarray(4, padded.byteLength - 4);
+            expect(extractContentId(view)).toBe('example0');
+        });
+    });
     describe('without match', () => {
         it('throws ValidationError', () => {
             expect(() => {

package/dist/unit/types/current/index.d.ts

@@ -67,6 +67,7 @@ import './text/parseWebVtt.test';
 import './text/pickPreferredTextTrack.test';
 import './text/SidecarTextTrackController.test';
 import './text/SidecarTextTrackLoader.test';
+import './text/TextTrack.test';
 import './text/VttCueStyle.test';
 import './track/AutoResetController.test';
 import './track/createSegmentDataProvider.test';

package/dist/unit/types/current/index.d.ts.map

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

package/dist/unit/types/current/index.js

@@ -67,6 +67,7 @@ import './text/parseWebVtt.test';
 import './text/pickPreferredTextTrack.test';
 import './text/SidecarTextTrackController.test';
 import './text/SidecarTextTrackLoader.test';
+import './text/TextTrack.test';
 import './text/VttCueStyle.test';
 import './track/AutoResetController.test';
 import './track/createSegmentDataProvider.test';

package/dist/unit/types/current/playback/PlaybackControllerImpl.test.js

@@ -496,6 +496,21 @@ describe('PlaybackController', () => {
                     await clock.tick(controller.options.seekTimeout);
                     await seekExpectation;
                 });
+                it('resolves a superseded seek at once when its seeking event never fires', async () => {
+                    // A source swap can leave the original seek's `seeking`
+                    // event unfired (the default mock never emits it). A newer
+                    // seek supersedes it; the stale one must resolve immediately
+                    // rather than hang for the full seekTimeout.
+                    setSeekable([[0, 100]]);
+                    const first = controller.seekTo(50);
+                    const second = controller.seekTo(60);
+                    // No clock tick: the newer seek's abort resolves `first` now.
+                    // (A full-timeout hang would require clock.tick(seekTimeout).)
+                    await expectAsync(first).toBeResolved();
+                    // `second`'s own `seeking` never fires either; park its
+                    // rejection (settled on dispose) so it isn't unhandled.
+                    second.catch(() => undefined);
+                });
                 it('times out pending seeks after seekTimeout', async () => {
                     const pendingSeekExpectation = expectAsync(controller.seekTo(60)).toBeRejectedWithError('seek timed out on seeking event after 30s');
                     setSeekable([[0, 100]]);

package/dist/unit/types/current/streaming/MediaQualityMetadata.test.js

@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import { DrmKeySystem, drmProtectionValidator } from '@amazon/vinyl';
+import { expectTypeStrictlyEquals } from '@amazon/vinyl-util/browserTestUtil';
 describe('drmProtectionValidator', () => {
     it('validates a complete DrmProtection', () => {
         expect(drmProtectionValidator.isValid({
@@ -37,3 +38,10 @@ describe('drmProtectionValidator', () => {
         expect(drmProtectionValidator.isValid({ keySystem: 123 })).toBeFalse();
     });
 });
+describe('ALL_CONTENT_TYPES', () => {
+    it('provides a comprehensive list of all content types', () => {
+        // The player emits quality-change events per entry; a missing type
+        // silently emits none, and `satisfies` alone does not catch it.
+        expectTypeStrictlyEquals(true);
+    });
+});

package/dist/unit/types/current/streaming/MseTrack.test.js

@@ -224,6 +224,21 @@ describe('MseTrack', () => {
                 abort: any(Abort),
             });
         });
+        it('aborts the drm session abort so key sessions close', async () => {
+            // Regression: MSE key sessions must be tied to the per-activation
+            // drmSessionAbort (fired by closeDrmSessions on deactivate), not a
+            // separate abort that never fires — otherwise sessions leak.
+            track = createTrack();
+            await awaitContentTypes();
+            getAudioStream().streamingQuality =
+                createEmptyMediaQualityMetadata();
+            track.activate({});
+            const { abort } = deps.drmController.initializeForPlayback.calls.mostRecent()
+                .args[1];
+            expect(abort.aborted()).toBeFalse();
+            track.deactivate();
+            expect(abort.aborted()).toBeTrue();
+        });
     });
     describe('error', () => {
         it('returns the first emitted error', async () => {

package/dist/unit/types/current/streaming/buffering/BufferingController.test.js

@@ -286,6 +286,32 @@ describe('BufferingControllerImpl', () => {
                 expect(sourceBufferController.append).toHaveBeenCalledTimes(1);
             });
         });
+        describe('when the append budget grows while a segment is partly appended', () => {
+            it('appends only the bytes remaining in the segment', async () => {
+                // A budget wide enough to hold a whole segment, so draining the
+                // buffer can lift it back above the segment size mid-append.
+                bufferingController.dispose();
+                bufferingController = createBufferingController({
+                    maxAppendSize: { audio: 500 },
+                    minBuffer: 6,
+                });
+                bufferingController.activate();
+                setSegmentList([200, 400]);
+                await open(); // segment 0 appends whole, buffering 0-10s
+                await setTime(5); // segment 1 partly appends: 300 of 400 bytes
+                expect(getMostRecentAppendData().byteLength).toBe(300);
+                sourceBufferController.append.calls.reset();
+                // The playhead drains the buffer, widening the budget past the
+                // segment's full size.
+                await setTime(15.5);
+                const appended = sourceBufferController.append.calls
+                    .allArgs()
+                    .map(([data]) => data.byteLength);
+                // Only the 100 unappended bytes; re-appending all 400 would
+                // duplicate the 300 already buffered.
+                expect(appended[0]).toBe(100);
+            });
+        });
         describe('when contentType is undefined', () => {
             it('uses DEFAULT_MAX_APPEND_SIZE for max byte length', async () => {
                 setSegmentList([DEFAULT_MAX_APPEND_SIZE * 2], 0, 'unknown');

package/dist/unit/types/current/streaming/buffering/MediaSourceController.test.js

@@ -89,6 +89,35 @@ describe('MediaSourceControllerImpl', () => {
             URL.revokeObjectURL.and.throwError(new Error('revoke failed'));
             expect(() => controller.deactivate()).not.toThrow();
         });
+        it('does not report a re-activated media source as ready to append', async () => {
+            // A track is deactivated and reactivated whenever an ad plays over
+            // it, and each activation builds its own media source, whose
+            // duration has not been set yet.
+            open();
+            await flushPromises();
+            const firstRef = controller.createSourceBuffer('audio', 'audio/mp4');
+            expect(controller.readyToAppend)
+                .withContext('ready on the first media source')
+                .toBeTrue();
+            firstRef.dispose(); // the buffering controller drops its buffers
+            controller.deactivate();
+            const secondSource = new MockMediaSource();
+            implementEventFakes(secondSource);
+            secondSource.addSourceBuffer.and.callFake(() => new MockSourceBuffer());
+            mediaSourceFactory.and.returnValue(secondSource);
+            controller.activate();
+            await flushPromises();
+            controller.createSourceBuffer('audio', 'audio/mp4');
+            expect(controller.readyToAppend)
+                .withContext('duration not yet set on the new media source')
+                .toBeFalse();
+            secondSource.readyState = 'open';
+            secondSource.dispatchEvent(mockEvent('sourceopen'));
+            await flushPromises();
+            expect(controller.readyToAppend)
+                .withContext('ready once the new duration is set')
+                .toBeTrue();
+        });
     });
     describe('duration', () => {
         it('sets media source duration after sourceopen', async () => {

package/dist/unit/types/current/text/TextTrack.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=TextTrack.test.d.ts.map

package/dist/unit/types/current/text/TextTrack.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"TextTrack.test.d.ts","sourceRoot":"","sources":["../../../../../test/unit/text/TextTrack.test.ts"],"names":[],"mappings":""}

package/dist/unit/types/current/text/TextTrack.test.js

@@ -0,0 +1,12 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { expectTypeStrictlyEquals } from '@amazon/vinyl-util/browserTestUtil';
+describe('ALL_TEXT_TRACK_EVENTS', () => {
+    it('provides a comprehensive list of all text track events', () => {
+        // The player redispatches exactly these; an omission silently stops an
+        // event reaching consumers, and `satisfies` alone does not catch it.
+        expectTypeStrictlyEquals(true);
+    });
+});

package/dist/unit/types/current/text/discoverDashTextTracks.test.js

@@ -42,6 +42,19 @@ describe('discoverDashTextTracks', () => {
         expect(result.length).toBe(1);
         expect(result[0].language).toBe('es');
     });
+    it('discovers a text AdaptationSet by its Representation mimeType', () => {
+        // DASH allows @mimeType on the Representation instead of the set.
+        const m = manifest(`
+            <AdaptationSet lang="fr">
+              <Representation id="fr-sub" mimeType="text/vtt" bandwidth="100">
+                <BaseURL>fr.vtt</BaseURL>
+              </Representation>
+            </AdaptationSet>`);
+        const result = discoverDashTextTracks(m, baseUrl);
+        expect(result.length).toBe(1);
+        expect(result[0].language).toBe('fr');
+        expect(result[0].uri).toBe('https://example.com/dash/fr.vtt');
+    });
     it('classifies kind=captions when role=caption is set', () => {
         const m = manifest(`
             <AdaptationSet contentType="text" lang="en" mimeType="text/vtt">
@@ -96,6 +109,10 @@ describe('discoverDashTextTracks', () => {
             </AdaptationSet>`);
         expect(discoverDashTextTracks(m, baseUrl)).toEqual([]);
     });
+    it('skips a non-text AdaptationSet with no Representation', () => {
+        const m = manifest(`<AdaptationSet contentType="audio"/>`);
+        expect(discoverDashTextTracks(m, baseUrl)).toEqual([]);
+    });
     it('skips text AdaptationSets carrying segmented codecs (stpp/wvtt)', () => {
         const m = manifest(`
             <AdaptationSet contentType="text" mimeType="application/mp4" codecs="stpp">

package/dist/unit/types/current/text/parseWebVtt.test.js

@@ -382,6 +382,32 @@ hi`;
         expect(cues.length).toBe(1);
         expect(cues[0].text).toBe('hi');
     });
+    it('parses a cue that follows the signature with no blank line', () => {
+        // The header block ends at a timing line as well as at a blank line
+        // (WebVTT file parsing breaks out of the header loop on `-->`), so a
+        // document omitting the blank line still yields its cues.
+        const text = `WEBVTT
+00:00:01.000 --> 00:00:02.000
+hi
+
+00:00:03.000 --> 00:00:04.000
+there`;
+        const cues = parseWebVtt(text).cues;
+        expect(cues.length).toBe(2);
+        expect(cues[0].startTime).toBe(1);
+        expect(cues[0].text).toBe('hi');
+        expect(cues[1].text).toBe('there');
+    });
+    it('keeps header lines as header when a cue follows with no blank line', () => {
+        const text = `WEBVTT
+Kind: captions
+00:00:01.000 --> 00:00:02.000
+hi`;
+        const cues = parseWebVtt(text).cues;
+        expect(cues.length).toBe(1);
+        expect(cues[0].id).toBeNull();
+        expect(cues[0].text).toBe('hi');
+    });
     it('handles trailing identifier without timing line', () => {
         // Identifier with no following timing line - cue is dropped, parser
         // breaks out cleanly without throwing.

package/dist/unit/types/current/track/TrackController.test.js

@@ -597,49 +597,6 @@ describe('TrackControllerImpl', () => {
                 expect(track.clearPrefetch).toHaveBeenCalledTimes(1);
             }
         });
-        it('also clears prefetch on preloaded ad tracks', async () => {
-            pending('REVIEW: the refactor no longer proactively preloads ad tracks ' +
-                'discovered on the current track (ad tracks are created on ' +
-                'adEntered only). Decide: intended removal (delete this spec) ' +
-                'or regression (restore discovery-time ad preloading).');
-            const [main] = createLoadOptionsList(1);
-            trackController.load(main);
-            const track = trackController.activeTrack;
-            const ads = {
-                trackUri: main.uri,
-                adBreaks: [
-                    {
-                        id: 'b1',
-                        startTime: 5,
-                        duration: 10,
-                        placement: 'midroll',
-                        restrict: {},
-                        once: false,
-                        resumeOffset: null,
-                        playoutLimit: null,
-                        resolutionTimeOffset: null,
-                        skipControl: () => null,
-                        ads: () => Promise.resolve([
-                            {
-                                id: 'a1',
-                                startTime: 5,
-                                duration: 10,
-                                uri: 'https://ads/a.m3u8',
-                            },
-                        ]),
-                    },
-                ],
-            };
-            track.ads = ads;
-            track.dispatch('adsChange', { previous: null, current: ads });
-            // Ad resolution runs on microtasks.
-            await Promise.resolve();
-            await Promise.resolve();
-            await Promise.resolve();
-            const adTrack = trackController.getCachedTrack('https://ads/a.m3u8');
-            trackController.clearPrefetch();
-            expect(adTrack.clearPrefetch).toHaveBeenCalled();
-        });
     });
     describe('clearQueue', () => {
         it('clears the queue without unloading the current track', async () => {
@@ -1124,6 +1081,21 @@ describe('TrackControllerImpl', () => {
             expect(adTrack).withContext('midroll ad track warmed').toBeDefined();
             expect(adTrack.preload).toHaveBeenCalled();
         });
+        it('clears prefetch on a preloaded ad track', async () => {
+            const [main] = createLoadOptionsList(1);
+            factoryGivingBreak(main.uri, []); // records created tracks; no preroll
+            trackController.load(main);
+            await flushAds();
+            deps.adController.dispatch('adPreload', {
+                adBreak: midrollBreak('https://ads/mid.m3u8'),
+            });
+            await flushAds();
+            const adTrack = created.get('https://ads/mid.m3u8');
+            // Ad tracks are not in the content cache, so this only holds if
+            // clearPrefetch reaches the per-parent ad track store too.
+            trackController.clearPrefetch();
+            expect(adTrack.clearPrefetch).toHaveBeenCalledTimes(1);
+        });
         it('ignores adPreload when there is no parent track', () => {
             expect(() => deps.adController.dispatch('adPreload', {
                 adBreak: midrollBreak('https://ads/mid.m3u8'),
@@ -1307,23 +1279,6 @@ describe('TrackControllerImpl', () => {
             const track = trackController.activeTrack;
             expect(track.activate).toHaveBeenCalledWith(objectContaining({ startTime: 3 }));
         });
-        it('skips the deferred resume if interrupted before the frame', async () => {
-            pending('REVIEW: content resume on adBreakCompleted is now synchronous ' +
-                '(no deferred/interruptible frame), so this interruption ' +
-                'guard no longer applies. Decide: intended or restore deferral.');
-            const [main] = createLoadOptionsList(1);
-            trackController.load(main);
-            const changeSpy = createEventSpy(trackController, 'trackActivated');
-            deps.adController.dispatch('adBreakCompleted', {
-                adBreak: adBreak('midroll'),
-                resumePosition: 5,
-            });
-            // Interrupt: a new ad becomes current before the deferred resume runs.
-            deps.adController.currentAd = { ...ad, id: 'other' };
-            await clock.tick();
-            // The deferred setQueue was skipped; no track change occurred.
-            expect(changeSpy).not.toHaveBeenCalled();
-        });
         it('advances to the next track after a postroll ad when one exists', async () => {
             const list = createLoadOptionsList(2);
             trackController.load(...list);

package/dist/unit/types/current/track/hls/buildHlsMediaTimeline.test.js

@@ -542,6 +542,28 @@ describe('buildHlsMediaTimeline', () => {
         expect(initCall[1]?.headers).toEqual(jasmine.objectContaining({ Range: 'bytes=0-499' }));
         fetchSpy.and.callThrough();
     });
+    it('resolves segment and map URIs against the media playlist baseUrl', async () => {
+        const variant = createVariant('v1.m3u8', 128000);
+        const playlist = {
+            ...createMediaPlaylist([10]),
+            // The media playlist was redirected away from the main playlist's
+            // directory.
+            baseUrl: 'https://redirect.example.net/hls/v1.m3u8',
+        };
+        const manifestData = createManifestData([variant], playlist);
+        const fetchSpy = spyOn(globalThis, 'fetch').and.callFake(() => Promise.resolve(new Response(new ArrayBuffer(100))));
+        const timeline = buildHlsMediaTimeline(deps, manifestData);
+        const quality = timeline.periods[0].qualities[0];
+        const segment = await quality.getSegment(5);
+        await segment.initData();
+        await segment.data();
+        const urls = fetchSpy.calls.allArgs().map(([input]) => String(input));
+        expect(urls).toEqual([
+            'https://redirect.example.net/hls/init.mp4',
+            'https://redirect.example.net/hls/seg0.m4s',
+        ]);
+        fetchSpy.and.callThrough();
+    });
     it('getDuration throws when no variants', async () => {
         const manifestData = createManifestData([], createMediaPlaylist([]));
         const timeline = buildHlsMediaTimeline(deps, manifestData);

package/dist/unit/types/current/track/hls/createUrlHlsManifestProvider.test.js

@@ -113,6 +113,29 @@ describe('fetchMediaPlaylist', () => {
         expect(playlist.segments.length).toBe(1);
         expect(String(mockRequester.request.calls.argsFor(0)[0])).toBe('https://example.com/path/audio.m3u8');
     });
+    it('sets the baseUrl from the response URL', async () => {
+        mockRequester.request.and.callFake(() => {
+            const resp = new Response(mediaM3u8);
+            Object.defineProperty(resp, 'url', {
+                value: 'https://redirected.com/hls/audio.m3u8',
+            });
+            return Promise.resolve(resp);
+        });
+        const playlist = await fetchMediaPlaylist({
+            uri: 'audio.m3u8',
+            baseUrl: 'https://example.com/path/main.m3u8',
+            defines: undefined,
+        });
+        expect(playlist.baseUrl).toBe('https://redirected.com/hls/audio.m3u8');
+    });
+    it('falls back to the requested URL when the response has no URL', async () => {
+        const playlist = await fetchMediaPlaylist({
+            uri: 'audio.m3u8',
+            baseUrl: 'https://example.com/path/main.m3u8',
+            defines: undefined,
+        });
+        expect(playlist.baseUrl).toBe('https://example.com/path/audio.m3u8');
+    });
     it('resolves EXT-X-DEFINE:QUERYPARAM from the playlist URL query string', async () => {
         mockRequester.request.and.callFake(() => Promise.resolve(new Response([
             '#EXTM3U',