pastilhas
0a55964db5
officerdev/src/MusicPlayer/ → plugins/music/web/. Engine, state, bar, favourites, lyrics toggle and the library vocabulary — ten files. The barrel stops exporting a player it no longer has, and DashboardLayout stops rendering one. The reasoning that kept it was removed rather than refuted. It stayed because the dashboard widget imported useMusicPlayer from officerdev and the platform cannot import from a plugin, so the state had to stay whatever was decided about the UI. The owner moved the widget into the plugin in the previous commit, and the constraint went with it: the whole remaining dependency became one line, DashboardLayout.tsx:66. MusicPlayerHost is mounted inside the MusicDetail panel. That reads odd until you notice it already returned null on /music — the mini bar is the transport there, and the host existed purely to own the GaplessEngine. In the panel it does exactly that, and the bar code stays intact for whenever there is a slot. [phase 2] Leaving /music unmounts the host and playback stops. Deferred on the owner's call; the bar was "navigating away must not break the application", and that holds: seekPlayer is optional-chained so a call with no host registered is a no-op, registerPlayerSeek clears only its own registration, the host's cleanup destroys the engine and nulls its ref, and the queue is global state so returning to /music remounts and reloads. Solving it properly needs either a shell slot a plugin can contribute to — which reopens "there is no way to export a component" — or the engine hoisted to module scope, which keeps the rule and loses only the off-route controls. Also: the parked widget now imports the player as a sibling rather than through officerdev, and shared.ts stopped being a re-export shim now that the real file is in the plugin. Verified: tsgo clean, 797 tests / 787 pass / same 7. Server restarts, mounts /example /music /offscale, / and /music both 200, and the player is in the built bundle (music.volume, music:lyrics, now-playing?device=web all present — GaplessEngine is a class name and the production build is minified, so grepping for it proves nothing). Not verified by me: what it looks like in a browser. That needs your eyes.
79 lines
3.0 KiB
TypeScript
79 lines
3.0 KiB
TypeScript
import { useEffect, useState } from 'react';
|
|
import type { LyricLine } from './lyrics';
|
|
import { activeLineIndex, parseLyrics } from './lyrics';
|
|
import { getPlayerTime, subscribePlayerTime } from './player-time';
|
|
|
|
export type UseLyrics = {
|
|
loading: boolean;
|
|
/** null while loading, and when the track has none. */
|
|
lines: LyricLine[] | null;
|
|
synced: boolean;
|
|
};
|
|
|
|
/**
|
|
* Fetch + parse the current track's lyrics. Gated on `enabled` so nothing is requested until the pane
|
|
* is actually open — the dock lives on every screen and most listening happens with it closed.
|
|
*
|
|
* Deliberately NOT gated on an index "has lyrics" flag the way the mobile app does: the web player's
|
|
* queue carries only what it needs to stream, and a 404 for a track without lyrics is cheaper than
|
|
* threading that flag through every producer of a queue.
|
|
*
|
|
* Auth goes in the query string rather than a header, matching how this component already builds its
|
|
* /stream and /cover URLs.
|
|
*/
|
|
export const useLyrics = (albumRel: string, file: string, enabled: boolean, token: string | null): UseLyrics => {
|
|
const [state, setState] = useState<UseLyrics>({ loading: false, lines: null, synced: false });
|
|
|
|
useEffect(() => {
|
|
if (!enabled || !albumRel || !file) {
|
|
setState({ loading: false, lines: null, synced: false });
|
|
return;
|
|
}
|
|
const url =
|
|
`/api/music/lyrics?path=${encodeURIComponent(albumRel)}&file=${encodeURIComponent(file)}` +
|
|
(token ? `&token=${encodeURIComponent(token)}` : '');
|
|
|
|
const ctrl = new AbortController();
|
|
setState({ loading: true, lines: null, synced: false });
|
|
fetch(url, { signal: ctrl.signal })
|
|
.then(async (res) => {
|
|
// 404 is the ordinary "this track has no lyrics" answer, not an error worth surfacing.
|
|
if (!res.ok) return setState({ loading: false, lines: null, synced: false });
|
|
const { synced, lines } = parseLyrics(await res.text());
|
|
setState({ loading: false, lines, synced });
|
|
})
|
|
.catch(() => {
|
|
if (!ctrl.signal.aborted) setState({ loading: false, lines: null, synced: false });
|
|
});
|
|
|
|
return () => ctrl.abort();
|
|
}, [albumRel, file, enabled, token]);
|
|
|
|
return state;
|
|
};
|
|
|
|
/**
|
|
* Index of the line to highlight, driven by the engine's position feed.
|
|
*
|
|
* The feed ticks every animation frame; this re-renders only when the index actually moves — React bails
|
|
* out of an identical setState — so a synced sheet repaints about once a line instead of sixty times a
|
|
* second, even though it lives nowhere near the component that owns the clock.
|
|
*/
|
|
export const useActiveLyricIndex = (lines: LyricLine[] | null, synced: boolean): number => {
|
|
const [index, setIndex] = useState(-1);
|
|
|
|
useEffect(() => {
|
|
if (!synced || !lines) {
|
|
setIndex(-1);
|
|
return;
|
|
}
|
|
setIndex(activeLineIndex(lines, getPlayerTime()));
|
|
return subscribePlayerTime((sec) => {
|
|
const next = activeLineIndex(lines, sec);
|
|
setIndex((prev) => (prev === next ? prev : next));
|
|
});
|
|
}, [lines, synced]);
|
|
|
|
return index;
|
|
};
|