@amazon/vinyl 3.0.1 → 3.2.0

package/dist/unit/types/current/util/media/mimeType.test.d.ts

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

package/dist/unit/types/current/util/media/mimeType.test.d.ts.map

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

package/dist/unit/types/current/util/media/mimeType.test.js

@@ -0,0 +1,22 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { mimeSubtype } from '@amazon/vinyl';
+describe('mimeSubtype', () => {
+    it('returns the subtype after the slash', () => {
+        expect(mimeSubtype('audio/mp4')).toBe('mp4');
+        expect(mimeSubtype('video/webm')).toBe('webm');
+    });
+    it('ignores codec and other parameters', () => {
+        expect(mimeSubtype('video/webm; codecs="vp9"')).toBe('webm');
+        expect(mimeSubtype('audio/mp4;codecs="mp4a.40.2"')).toBe('mp4');
+    });
+    it('lowercases and trims', () => {
+        expect(mimeSubtype('  VIDEO/MP4 ; codecs="avc1"')).toBe('mp4');
+    });
+    it('returns an empty string when there is no subtype', () => {
+        expect(mimeSubtype('video')).toBe('');
+        expect(mimeSubtype('')).toBe('');
+    });
+});

package/dist/unit/types/current/vinyl/VinylPlayer.test.js

@@ -4,10 +4,10 @@
  */
 import { createEmptyMediaQualityMetadata, createSourceTrackFactory, createTrackFactory, createVinylPlayer, defaultQualitySelectorImplOptions, DrmError, PlaybackNetworkState, PlaybackReadyState, vinylGlobalRef, } from '@amazon/vinyl';
 import { externalDependencies } from '@amazon/vinyl-di';
-import { consoleLogHandler, createArrayLikeIterator, emptyRanges, historyLogHandler, noop, RangesImpl, } from '@amazon/vinyl-util';
+import { consoleLogHandler, createArrayLikeIterator, emptyRanges, historyLogHandler, LogLevel, noop, RangesImpl, } from '@amazon/vinyl-util';
 import { expectIterableEquals, expectNothing, expectTypeStrictlyEquals, mockEvent, MockHTMLAudioElement, polyfillCustomEvent, } from '@amazon/vinyl-util/browserTestUtil';
 import { createMockVinylDependencies, MockCapabilities, MockPlaybackController, MockTrack, MockTrackController, MockTrackFactory, } from '@amazon/vinyl/vinylTestUtil';
-import { createEventSpy } from '@amazon/vinyl-util/testUtil';
+import { createEventSpy, useMockLogger } from '@amazon/vinyl-util/testUtil';
 import { data } from '@amazon/vinyl-observable';
 var any = jasmine.any;
 var createSpy = jasmine.createSpy;
@@ -16,6 +16,7 @@ describe('VinylPlayer', () => {
     let depFactories;
     let player;
     let mockOptions;
+    const loggerRef = useMockLogger();
     polyfillCustomEvent();
     beforeEach(() => {
         mockOptions = { media: new MockHTMLAudioElement() };
@@ -247,6 +248,36 @@ describe('VinylPlayer', () => {
             });
             expect(spy).not.toHaveBeenCalled();
         });
+        it('logs each republished span at the verbose level with formatted times', () => {
+            loggerRef.value.logLevel = LogLevel.VERBOSE;
+            deps.drmController.dispatch('loadSpanMeasured', {
+                kind: 'license',
+                startTime: 1000,
+                endTime: 3500,
+                trackUri: 'track-a',
+                mimeType: 'audio/mp4',
+                contentType: 'audio',
+            });
+            expect(loggerRef.value.verbose).toHaveBeenCalledOnceWith(player, 'loadSpan', {
+                kind: 'license',
+                trackUri: 'track-a',
+                mimeType: 'audio/mp4',
+                contentType: 'audio',
+                startTime: new Date(1000).toISOString(),
+                endTime: new Date(3500).toISOString(),
+                durationMs: '2500.00',
+            });
+        });
+        it('does not format or log a span when the verbose level is off', () => {
+            loggerRef.value.logLevel = LogLevel.DEBUG;
+            deps.drmController.dispatch('loadSpanMeasured', {
+                kind: 'license',
+                startTime: 1000,
+                endTime: 3500,
+                trackUri: 'track-a',
+            });
+            expect(loggerRef.value.verbose).not.toHaveBeenCalled();
+        });
     });
     it('reloads the current track on a codecUnsupported event', () => {
         const trackController = deps.trackController;

package/dist/unit/types/current/vinyl/createVinylFactories.test.js

@@ -2,17 +2,12 @@
  * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
-import { CapabilitiesImpl, createVinylFactories, defaultMediaElementPatchOptions, defaultPatchOptions, DrmKeySystem, LoudnessNormalizationControllerImpl, PlaybackControllerImpl, PlaybackSourceImpl, TrackControllerImpl, } from '@amazon/vinyl';
+import { CapabilitiesImpl, createVinylFactories, DrmKeySystem, LoudnessNormalizationControllerImpl, PlaybackControllerImpl, PlaybackSourceImpl, TrackControllerImpl, } from '@amazon/vinyl';
 import { createContainer, } from '@amazon/vinyl-di';
-import { expectTypeExtends, expectTypeStrictlyEquals, MockHTMLAudioElement, polyfillCustomEvent, } from '@amazon/vinyl-util/browserTestUtil';
-import { useMockLogger } from '@amazon/vinyl-util/testUtil';
+import { expectTypeExtends, expectTypeStrictlyEquals, MockHTMLAudioElement, } from '@amazon/vinyl-util/browserTestUtil';
 var any = jasmine.any;
 var objectContaining = jasmine.objectContaining;
 describe('createVinylFactories', () => {
-    const loggerRef = useMockLogger();
-    afterEach(() => {
-        defaultMediaElementPatchOptions.clear();
-    });
     it('delivers all essential dependency providers', () => {
         const playerDependencies = createVinylFactories({
             media: new MockHTMLAudioElement(),
@@ -41,34 +36,6 @@ describe('createVinylFactories', () => {
         }));
         container.dispose();
     });
-    describe('when patch override flags are provided', () => {
-        polyfillCustomEvent();
-        beforeEach(() => {
-            defaultPatchOptions.value = {
-                media: {
-                    unreliablePlaybackEvents: true,
-                    preventStalls: false,
-                },
-            };
-        });
-        afterEach(() => {
-            defaultPatchOptions.clear();
-        });
-        it('merges those flags with the defaults', () => {
-            const playerDependencies = createVinylFactories({
-                media: new MockHTMLAudioElement(),
-                patches: {
-                    media: {
-                        preventStalls: true,
-                    },
-                },
-            });
-            const patched = playerDependencies.patchedMedia();
-            expect(loggerRef.value.debug).toHaveBeenCalledWith(any(Object), `Applying 'preventStalls' patch`);
-            expect(loggerRef.value.debug).toHaveBeenCalledWith(any(Object), `Applying 'unreliablePlaybackEvents' patch`);
-            patched.dispose();
-        });
-    });
     it('can be used in a dependency container', () => {
         const container = createContainer(createVinylFactories({
             media: new MockHTMLAudioElement(),
@@ -79,7 +46,6 @@ describe('createVinylFactories', () => {
             },
         }));
         expect(container.dependencies).toEqual(objectContaining({
-            patchedMedia: any(Object),
             media: any(Object),
             textTrackProvider: any(Object),
             textTrackRenderer: null,

package/dist/vinylTestUtil/index.js

@@ -1552,6 +1552,7 @@ var vinylTestAssets = {
   dash: {
     live_static_aac_opus_flac_60s_segmentTemplate: `https://assets.dev.vinyl.music.amazon.dev/dash/live_static_aac_opus_flac_60s_segmentTemplate/manifest.mpd`,
     live_static_aac_opus_flac_60s_segmentBase: `https://assets.dev.vinyl.music.amazon.dev/dash/live_static_aac_opus_flac_60s_segmentBase/manifest.mpd`,
+    live_static_webm_vp9_opus_60s_segmentBase: `https://assets.dev.vinyl.music.amazon.dev/dash/live_static_webm_vp9_opus_60s_segmentBase/manifest.mpd`,
     live_static_video_audio_60s_2s_segmentTemplate: `https://assets.dev.vinyl.music.amazon.dev/dash/live_static_video_audio_60s_2s_segmentTemplate/manifest.mpd`,
     live_static_video_audio_60s_4s_segmentTemplate: `https://assets.dev.vinyl.music.amazon.dev/dash/live_static_video_audio_60s_4s_segmentTemplate/manifest.mpd`,
     live_static_video_audio_60s_2s_segmentTemplate_widevine_cl10: `https://assets.dev.vinyl.music.amazon.dev/dash/live_static_video_audio_60s_2s_segmentTemplate_widevine_cl10/manifest.mpd`,
@@ -2474,7 +2475,6 @@ var MockContentStream = class extends MockEventHost8 {
     __publicField(this, "playbackQuality", null);
     __publicField(this, "streamingQuality", null);
     __publicField(this, "bufferingEnded", false);
-    __publicField(this, "hasData", false);
     __publicField(this, "clearPrefetch", spyFactory20("clearPrefetch"));
     __publicField(this, "activate", spyFactory20("activate"));
     __publicField(this, "deactivate", spyFactory20("deactivate"));
@@ -2617,7 +2617,6 @@ var MockBufferingController = class extends MockEventHost11 {
     __publicField(this, "error", null);
     __publicField(this, "active", false);
     __publicField(this, "bufferingEnded", false);
-    __publicField(this, "hasData", false);
     __publicField(this, "playbackQuality", null);
     __publicField(this, "bufferingQuality", null);
     __publicField(this, "activate", spyFactory25("activate"));
@@ -2882,7 +2881,7 @@ import {
   nextHasMetadata
 } from "@amazon/vinyl";
 import { nextEventAsPromise } from "@amazon/vinyl-util";
-async function onPlaying(playbackController, timeout = 10) {
+async function onPlaying(playbackController, timeout = 30) {
   if (playbackController.playing) return Promise.resolve();
   return nextEventAsPromise(playbackController, "playing", {
     timeout,
@@ -2973,6 +2972,9 @@ async function expectTrackCanSeekTo(player, time) {
   const playedSpy = add(createEventSpy(player, "played"));
   const seekingSpy = add(createEventSpy(player, "seeking"));
   const seekedSpy = add(createEventSpy(player, "seeked"));
+  const eventOrder = [];
+  add(player.on("seeking", () => eventOrder.push("seeking")));
+  add(player.on("seeked", () => eventOrder.push("seeked")));
   const wasPaused = player.paused;
   if (player.playing) {
     seekingSpy.next().then(() => {
@@ -2991,7 +2993,7 @@ async function expectTrackCanSeekTo(player, time) {
     expect(seekingSpy).not.toHaveBeenCalled();
     expect(seekedSpy).not.toHaveBeenCalled();
   } else {
-    expect(seekingSpy).toHaveBeenCalledBefore(seekedSpy);
+    expect(eventOrder[0]).withContext("first seek event").toBe("seeking");
     expect(player.paused).withContext("paused").toBe(wasPaused);
     if (wasPaused) {
       expectPausedState(player);