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
23 changes: 13 additions & 10 deletions bun.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions packages/player/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,12 @@
"script": "./dist/hyperframes-player.global.js",
"import": "./dist/hyperframes-player.js",
"require": "./dist/hyperframes-player.cjs"
},
"./slideshow": {
"types": "./dist/slideshow/hyperframes-slideshow.d.ts",
"script": "./dist/slideshow/hyperframes-slideshow.global.js",
"import": "./dist/slideshow/hyperframes-slideshow.js",
"require": "./dist/slideshow/hyperframes-slideshow.cjs"
}
},
"scripts": {
Expand All @@ -27,6 +33,9 @@
"test": "vitest run",
"perf": "bun run tests/perf/index.ts"
},
"dependencies": {
"@hyperframes/core": "workspace:*"
},
"devDependencies": {
"@types/bun": "^1.1.0",
"gsap": "^3.12.5",
Expand Down
10 changes: 10 additions & 0 deletions packages/player/src/hyperframes-player.ts
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ class HyperframesPlayer extends HTMLElement {
private _directTimelineClock: DirectTimelineClock;
private _parentTickRaf: number | null = null;
private _media: ParentMediaManager;
private _scenes: { id: string; start: number; duration: number }[] = [];

constructor() {
super();
Expand Down Expand Up @@ -261,6 +262,12 @@ class HyperframesPlayer extends HTMLElement {
return this.iframe;
}

/** Scene list from the last-received runtime timeline message. Empty until
* the composition runtime fires its first "timeline" postMessage. */
get scenes(): { id: string; start: number; duration: number }[] {
return this._scenes;
}

play() {
this.posterEl?.remove();
this.posterEl = null;
Expand Down Expand Up @@ -586,6 +593,9 @@ class HyperframesPlayer extends HTMLElement {
sendControl: (action, extra) => this._sendControl(action, extra),
getIframeDoc: () => this.iframe.contentDocument,
onRuntimeReady: () => this._replayBridgeState(),
setScenes: (scenes) => {
this._scenes = scenes;
},
updateControlsTime: (t, d) => this.controlsApi?.updateTime(t, d),
updateControlsPlaying: (p) => this.controlsApi?.updatePlaying(p),
dispatchEvent: (ev) => this.dispatchEvent(ev),
Expand Down
1 change: 1 addition & 0 deletions packages/player/src/runtime-message-handler.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ const makeCallbacks = (): MessageHandlerCallbacks => ({
media: { mirrorTime: vi.fn(), promoteToParentProxy: vi.fn() } as unknown as ParentMediaManager,
getPlaybackState: vi.fn(() => ({ currentTime: 0, duration: 0, paused: true, lastUpdateMs: 0 })),
setPlaybackState: vi.fn(),
setScenes: vi.fn(),
getShaderLoadingMode: vi.fn(() => "auto"),
shaderLoader: { update: vi.fn() } as unknown as ShaderLoaderState,
setCompositionSize: vi.fn(),
Expand Down
14 changes: 14 additions & 0 deletions packages/player/src/runtime-message-handler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,16 @@ import type { ShaderTransitionState } from "./shader-options.js";

const FPS = 30;

type SceneRecord = { id: string; start: number; duration: number };

function extractScenes(raw: unknown): SceneRecord[] {
if (!Array.isArray(raw)) return [];
return (raw as SceneRecord[]).filter(
(s) =>
typeof s.id === "string" && typeof s.start === "number" && typeof s.duration === "number",
);
}

export interface MessageHandlerCallbacks extends PlaybackStateCallbacks {
getPlaybackState: () => PlaybackState;
setPlaybackState: (next: PlaybackState) => void;
Expand All @@ -27,8 +37,11 @@ export interface MessageHandlerCallbacks extends PlaybackStateCallbacks {
* uses it to replay current bridge state (mute, volume, playback rate) so
* control messages sent before the iframe's listener registered aren't lost. */
onRuntimeReady: () => void;
/** Called with the scene list whenever a "timeline" message is received. */
setScenes: (scenes: SceneRecord[]) => void;
}

// fallow-ignore-next-line complexity
export function handleRuntimeMessage(
event: MessageEvent,
frameWindow: Window | null,
Expand Down Expand Up @@ -90,6 +103,7 @@ export function handleRuntimeMessage(
callbacks.setPlaybackState({ ...pb, duration });
callbacks.updateControlsTime(pb.currentTime, duration);
}
callbacks.setScenes(extractScenes(data["scenes"]));
return;
}

Expand Down
Loading
Loading