Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
102 changes: 102 additions & 0 deletions packages/vidstack/src/core/state/media-request-manager.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,102 @@
import { vi } from 'vitest';

vi.mock('../api/player-controller', () => ({
MediaPlayerController: class extends EventTarget {
$props = {};
$state: any;

createEvent(type: string, init?: EventInit & { detail?: unknown; trigger?: Event }) {
const event = new Event(type, init) as Event & { detail?: unknown; trigger?: Event };
event.detail = init?.detail;
event.trigger = init?.trigger;
return event;
}

dispatch(event: Event | string, init?: EventInit & { detail?: unknown; trigger?: Event }) {
return typeof event === 'string'
? this.dispatchEvent(this.createEvent(event, init))
: this.dispatchEvent(event);
}

listen() {
return () => {};
}
},
}));

import { MediaRequestContext, MediaRequestManager } from './media-request-manager';

it('seeks non-DVR live streams to the live edge even when seeking is disabled', () => {
const { event, manager, provider, request, state } = setup();

manager['media-live-edge-request'](event as any);

expect(provider.setCurrentTime).toHaveBeenCalledWith(100);
expect(state.userBehindLiveEdge.set).toHaveBeenCalledWith(false);
expect(request.queue.peek('media-seek-request')).toBe(event);
});

it('does not bypass normal seek guards for non-DVR live streams', () => {
const { manager, provider, request } = setup();
const event = new CustomEvent('media-seek-request', { detail: 50 });

manager['media-seek-request'](event as any);

expect(provider.setCurrentTime).not.toHaveBeenCalled();
expect(request.queue.peek('media-seek-request')).toBeUndefined();
});

it('keeps seekable live streams at the live edge as a no-op', () => {
const { event, manager, provider } = setup({
canSeek: signal(true),
liveEdge: signal(true),
});

manager['media-live-edge-request'](event as any);

expect(provider.setCurrentTime).not.toHaveBeenCalled();
});

function setup(stateOverrides: Record<string, unknown> = {}) {
const provider = {
setCurrentTime: vi.fn(),
},
request = new MediaRequestContext(),
state = {
bufferedStart: signal(0),
canPlay: signal(true),
canSeek: signal(false),
clipStartTime: signal(0),
ended: signal(false),
isLiveDVR: signal(false),
live: signal(true),
liveDVRWindow: signal(0),
liveEdge: signal(true),
liveSyncPosition: signal(100),
seekableEnd: signal(102),
seekableStart: signal(0),
userBehindLiveEdge: signal(true),
...stateOverrides,
},
media = {
$provider: signal(provider),
},
manager = new MediaRequestManager({ handle: vi.fn() } as any, request, media as any),
event = new Event('media-live-edge-request');

(manager as any).$state = state;

return { event, manager, provider, request, state };
}

function signal<T>(initialValue: T) {
let value = initialValue;

const read = vi.fn(() => value) as unknown as (() => T) & { set: ReturnType<typeof vi.fn> };

read.set = vi.fn((nextValue: T) => {
value = nextValue;
});

return read;
}
16 changes: 9 additions & 7 deletions packages/vidstack/src/core/state/media-request-manager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -247,15 +247,19 @@ export class MediaRequestManager extends MediaPlayerController implements MediaR

userBehindLiveEdge.set(false);

if (peek(() => !live() || liveEdge() || !canSeek())) return;
if (peek(() => !live() || (canSeek() && liveEdge()))) return;

const provider = peek(this.#$provider);
throwIfNotReadyForPlayback(provider, peek(canPlay));

const end = seekableEnd() - 2,
time = Math.min(end, liveSyncPosition() ?? end);

if (!Number.isFinite(time)) return;

if (trigger) this.#request.queue.enqueue('media-seek-request', trigger);

const end = seekableEnd() - 2;
provider!.setCurrentTime(Math.min(end, liveSyncPosition() ?? end));
provider!.setCurrentTime(time);
}

#wasPIPActive = false;
Expand Down Expand Up @@ -673,12 +677,10 @@ export class MediaRequestManager extends MediaPlayerController implements MediaR
['media-live-edge-request'](event: RE.MediaLiveEdgeRequestEvent) {
const { live, liveEdge, canSeek } = this.$state;

if (!live() || liveEdge() || !canSeek()) return;

this.#request.queue.enqueue('media-seek-request', event);
if (!live() || (canSeek() && liveEdge())) return;

try {
this.seekToLiveEdge();
this.seekToLiveEdge(event);
} catch (error) {
this.#request.queue.delete('media-seek-request');
if (__DEV__) {
Expand Down
Loading