Phase 2C WIP: PreviewOverlay modal + root integration (reel centering bug)
Working: - PreviewOverlay.svelte mounted at app root; opens over a fixture manifest (window.__previewFixture(n) in dev), inert background, player bar hidden, focus trap, keyboard nav, F3 rail, T3 swaps, R1b capsule, accent extraction. - previewSession.svelte.js: store + service wiring (production + fixture). - Root integration in App.svelte; revision-gateway bumps + notePlaybackGeneration threaded through state.svelte.js player entry points; api.win guarded so plain vite browser mounts. - Launcher on the artist page builds a real artist manifest and opens the modal with a play-full starter. - 70 JS tests still green. Two bugs found and fixed during bring-up: - effect_update_depth_exceeded: bleed-crossfade and bump effects read AND wrote the same $state; wrapped writes in untrack(). This loop was breaking Svelte's scheduler globally (even ui.* stopped reacting). - accentFromImage now sets crossOrigin for remote covers. KNOWN BROKEN (handoff): reel vertical centering. The active card stays centred at index 0 but drifts by one stride per step. Root cause isolated — see TODO-Feature-Docs/scrollable-track-previews/HANDOFF-PHASE2C.md.
This commit is contained in:
1 parent
8cb3cd593b
commit
d051f0db28
7 files changed
+1492
-16
No files matched your search
@@ -0,0 +1,173 @@
|
||||
// Svelte-side preview session: one store, one service instance, and the
|
||||
// production wiring (resolver → Tauri, transport → native player, focus →
|
||||
// main player). state.svelte.js hands us its player accessors at init
|
||||
// (dependency injection, deliberately: this module must not import the
|
||||
// 4000-line state module, and the state module needs to import US for
|
||||
// gateway bumps — injection breaks what would otherwise be a cycle).
|
||||
|
||||
import { createPreviewService } from "./service.js";
|
||||
import { createProductionResolver } from "./productionResolver.js";
|
||||
import { createNativeTransport } from "./nativeTransport.js";
|
||||
import { createProductionFocus } from "./focusBridge.js";
|
||||
import { createFixtureResolver } from "./resolver.js";
|
||||
import { createFixtureTransport } from "./transport.js";
|
||||
import { buildFixtureManifest } from "./manifest.js";
|
||||
import { AVAILABILITY } from "./contracts.js";
|
||||
|
||||
/** Reactive mirror of the session for components. `snapshot` is the frozen
|
||||
* reducer state; everything else is presentation-level. */
|
||||
export const previewUi = $state({
|
||||
open: false,
|
||||
snapshot: null,
|
||||
focusWaiting: false,
|
||||
/** element to restore focus to when the modal closes */
|
||||
returnFocusTo: null,
|
||||
/** page-supplied "play this item as a full track" starter */
|
||||
playFull: null,
|
||||
});
|
||||
|
||||
let service = null;
|
||||
let unsubscribe = null;
|
||||
let focusParts = null; // { coordinator, gateway }
|
||||
let demoTicker = null;
|
||||
|
||||
// ------------------------------------------------------------- gateway ----
|
||||
|
||||
/** Bump the main-player revision gateway from state.svelte.js. A no-op
|
||||
* until the bridge is initialised, and a no-op for unknown kinds — the
|
||||
* caller sites stay one-liners. */
|
||||
export function bumpMainRevision(kind, opts) {
|
||||
const g = focusParts?.gateway;
|
||||
if (g && typeof g[kind] === "function") g[kind](opts);
|
||||
}
|
||||
|
||||
let playbackGeneration = 0;
|
||||
/** Called by state.svelte.js on every main "buffering" — each new decode is
|
||||
* a new renderer-side playback generation (the focusBridge invariant). */
|
||||
export function notePlaybackGeneration() {
|
||||
playbackGeneration += 1;
|
||||
}
|
||||
|
||||
/** One-time wiring from state.svelte.js. */
|
||||
export function initPreviewBridge({ readPlayer, resumeMain }) {
|
||||
focusParts = createProductionFocus({
|
||||
readPlayer,
|
||||
readPlaybackGeneration: () => playbackGeneration,
|
||||
resumeMain,
|
||||
});
|
||||
}
|
||||
|
||||
// -------------------------------------------------------------- session ---
|
||||
|
||||
function attach(svc) {
|
||||
service = svc;
|
||||
unsubscribe = svc.subscribe((snapshot, extras) => {
|
||||
previewUi.snapshot = snapshot;
|
||||
previewUi.focusWaiting = extras.focusWaiting;
|
||||
});
|
||||
}
|
||||
|
||||
/** Open a preview session over the production stack. `manifest` comes from
|
||||
* a page adapter (artist page in Phase 3). */
|
||||
export async function openPreview(manifest, { playFull } = {}) {
|
||||
if (!focusParts) throw new Error("preview bridge not initialised");
|
||||
await closePreview(); // one session at a time, always torn down first
|
||||
previewUi.returnFocusTo = document.activeElement;
|
||||
previewUi.playFull = playFull ?? null;
|
||||
attach(
|
||||
createPreviewService({
|
||||
resolver: createProductionResolver(),
|
||||
transportFactory: (dispatch) => createNativeTransport(dispatch),
|
||||
focus: focusParts,
|
||||
})
|
||||
);
|
||||
previewUi.open = true;
|
||||
await service.open({ sessionId: crypto.randomUUID(), manifest });
|
||||
}
|
||||
|
||||
/**
|
||||
* Dev/browser fixture session: deterministic resolver + a fixture transport
|
||||
* driven by a wall-clock ticker, no Tauri and no audio. This is what the
|
||||
* Phase 2 exit gate's 500-item responsiveness check runs against, and what
|
||||
* a plain `vite` browser shows.
|
||||
*/
|
||||
export async function openPreviewFixture(count = 12) {
|
||||
await closePreview();
|
||||
previewUi.returnFocusTo = document.activeElement;
|
||||
const rows = Array.from({ length: count }, (_, i) => ({
|
||||
providerTrackId: String(i + 1),
|
||||
title: `Fixture track ${i + 1}`,
|
||||
artists: ["Fixture Artist"],
|
||||
album: `Fixture Album ${1 + (i % 7)}`,
|
||||
fullDurationMs: 180_000 + (i % 9) * 21_000,
|
||||
initialAvailability: i % 11 === 5 ? AVAILABILITY.NOT_PROVIDED : AVAILABILITY.AVAILABLE,
|
||||
}));
|
||||
const manifest = buildFixtureManifest({
|
||||
kind: "collection",
|
||||
contextKey: `fixture:${count}`,
|
||||
title: `Fixture · ${count} tracks`,
|
||||
rows,
|
||||
createdAtMs: Date.now(),
|
||||
});
|
||||
const plan = {};
|
||||
for (let i = 1; i <= count; i++) plan[i] = { opaqueLeaseId: `fx-${i}` };
|
||||
|
||||
let transport = null;
|
||||
const focus = {
|
||||
coordinator: {
|
||||
async acquirePreview() {
|
||||
return { granted: true, token: { id: "fixture", pausedByPreview: false } };
|
||||
},
|
||||
release: () => ({ restored: false, reason: "fixture" }),
|
||||
handoffToMain: () => ({ restored: false, reason: "fixture" }),
|
||||
},
|
||||
};
|
||||
attach(
|
||||
createPreviewService({
|
||||
resolver: createFixtureResolver(plan),
|
||||
transportFactory: (dispatch) => {
|
||||
transport = createFixtureTransport(dispatch);
|
||||
return transport;
|
||||
},
|
||||
focus,
|
||||
})
|
||||
);
|
||||
// Drive the fixture transport at ~10 fps so progress/auto-advance behave
|
||||
// like real playback in the browser.
|
||||
demoTicker = setInterval(() => transport?.tick(100), 100);
|
||||
previewUi.open = true;
|
||||
await service.open({ sessionId: crypto.randomUUID(), manifest });
|
||||
}
|
||||
|
||||
export async function closePreview() {
|
||||
if (demoTicker) {
|
||||
clearInterval(demoTicker);
|
||||
demoTicker = null;
|
||||
}
|
||||
if (!service) return { restored: false };
|
||||
const out = await service.close();
|
||||
unsubscribe?.();
|
||||
unsubscribe = null;
|
||||
service = null;
|
||||
previewUi.open = false;
|
||||
previewUi.snapshot = null;
|
||||
previewUi.focusWaiting = false;
|
||||
previewUi.playFull = null;
|
||||
const back = previewUi.returnFocusTo;
|
||||
previewUi.returnFocusTo = null;
|
||||
if (back && typeof back.focus === "function" && back.isConnected) {
|
||||
back.focus();
|
||||
}
|
||||
return out;
|
||||
}
|
||||
|
||||
// Thin command pass-throughs for the overlay component.
|
||||
export const previewCommands = {
|
||||
step: (dir) => service?.step(dir),
|
||||
activateKey: (k) => service?.activateKey(k),
|
||||
togglePlay: () => service?.togglePlay(),
|
||||
replay: () => service?.replay(),
|
||||
seek: (ms) => service?.seek(ms),
|
||||
setMuted: (v) => service?.setMuted(v),
|
||||
playFullTrack: (starter) => service?.playFullTrack(starter),
|
||||
};
|
||||
Reference in new issue
Block a user