mirror of
https://github.com/Psychotoxical/psysonic.git
synced 2026-07-21 23:05:46 +00:00
45b9229ceb
* refactor(queue): wire queue UI to the track resolver (thin-state phase 3) cucadmuh's phase-3 steps: - Selectors (useQueueTracks) read resolver-first: getCachedTrack → queue: Track[] fallback (until phase 4), F4 star/rating overrides merged on read. - QueueList rows source their track from the resolver (queue fallback); rows show title/artist/duration only, so no override merge there. - pendingStarSync star/rating success → invalidateQueueResolver so the cache reflects the synced value. - queueResolverBridge re-seeds on queueIndex change too — the prefetch window travels with the playing track. Additive: queue: Track[] stays canonical and behaviour is unchanged (rows resolve to the same data). Phase 4 drops queue: Track[] and the fallbacks. * docs(changelog): queue panel reads through track cache (#860) * fix(queue): stop a render loop that froze the UI on long queues A long virtualized queue + a track change could lock the WebView for ~2 min: - useVirtualizer was handed a fresh `initialRect` object literal every render, so it kept re-initializing in a loop. Hoisted it to a stable module constant. - getCachedTrack did an LRU bump (Map delete+set) during render — a render-time side effect. Made it a pure read; recency is set at write time in cacheSet. * perf(mobile): virtualize the mobile player queue drawer The mobile now-playing queue drawer rendered the full queue with .map; a multi-thousand-track queue meant thousands of DOM nodes. Virtualize it with @tanstack/react-virtual (uniform rows, stable initialRect) so the DOM stays at O(visible rows), matching the desktop QueuePanel. Active track is centred on open via scrollToIndex. * perf(mini): virtualize the mini-player queue list The mini-player queue rendered the full MiniSyncPayload queue with .map. Virtualize it against the OverlayScrollArea viewport (stable initialRect) so the mini window's DOM stays at O(visible rows). Drag-reorder is preserved: rows keep data-mq-idx alongside the virtualizer's measureElement. * refactor(queue): add resolveQueueTrack/getQueueTracksView helper (thin-state phase 4) Render-safe ref→Track view for the phase-4 consumer migration off queue: Track[]. Resolver cache → caller fallback (legacy queue[idx] during dual-write) → placeholder; ref queue-only flags carried, F4 overrides merged. Pure synchronous read, no cache mutation (the freeze landmine), so it is safe in render. * refactor(queue): keep queueItems as the canonical in-memory mirror (thin-state phase 4) Step 1b: dual-write the thin queueItems ref list at every queue write site (the 11 mutations, next/radio top-up, playTrack, undo/redo restore, instant-mix, radio, server-queue init, lucky-mix rollback, and hydrate) so it tracks queue: Track[] in memory, not only at persist time. Identity-preserving maps (star/rating overrides) keep the same refs and are intentionally left untouched. Resolves the restore double-role flagged for 1b: queueItemsIndex is now the restore-pending sentinel that gates hydrateQueueFromIndex, while queueItems stays canonical -- rebuilt from the whole queue after a full hydrate instead of cleared. Normal mutations never set the sentinel, so it only fires on a fresh cold-start restore, not on later server switches. No behaviour change; queue: Track[] stays the source consumers read until phase 3. tsc + full vitest suite (1119 tests) green. * refactor(queue): mobile queue drawer reads through the track resolver (thin-state phase 4) Step 2: the mobile now-playing queue drawer resolves each row's track from the resolver cache (→ queue: Track[] fallback until phase 4), matching the desktop QueueList wired in the phase-3 commit. Subscribes to the resolver version so rows re-render as the cache fills. Structure (count, order, keys, the playTrack arg) still comes from queue: Track[] until it is dropped in the final step. The mobile drawer was the last queue display surface still reading track metadata straight off the fat queue. tsc + full vitest suite green. * refactor(queue): ref-native queue mutations + dual-write bridge (thin-state phase 4) Step 3a: the 11 queueMutationActions now splice/filter/reorder QueueItemRef[] (matching by trackId + the ref's queue-only flags) instead of Track[]. `bridgeQueueFromItems` rebuilds the dual-written queue: Track[] from the new refs by id — purely structural (no resolver/override merge), so behaviour is byte-identical and playerStore.queue.test.ts stays unchanged green. The working ref list comes from `itemsOf(state)` (derived from queue: Track[] for now); the final step swaps that one line to state.queueItems once the fat queue is gone. enqueue / enqueueAt / enqueueRadio seed the resolver cache with incoming tracks (seed-before-splice) so they resolve without a network round-trip after the fat queue is dropped. Adds a DEV-only id-parity guardrail (queue vs queueItems); dev-runtime only, silent in vitest and prod. tsc + full vitest suite (1119) green; contract test unchanged. * refactor(queue): ref-native radio/infinite top-ups (thin-state phase 4) Step 3b: nextAction's proactive infinite-queue and radio top-ups build the new queue as QueueItemRef[] and bridge back to queue: Track[] (same as the queue mutations), and seed the resolver cache with the freshly fetched tracks so they resolve without a network round-trip after the fat queue is dropped. The radio top-up keeps its HISTORY_KEEP front-trim, now expressed on refs. The exhausted-queue refill paths hand their new queue to playTrack, which keeps its fat-queue handling until the final step (its no-arg case needs the resolver- derived queue that lands with the queue: Track[] removal). tsc + full vitest (1119) green; contract test unchanged. * refactor(queue): undo snapshots store thin refs, not Track[] (thin-state phase 4) Step 4: QueueUndoSnapshot.queue: Track[] becomes queueItems: QueueItemRef[], killing the undo "hidden multiplier" — 32 snapshots of a 50k queue now cost refs, not 32×50k full tracks. applyQueueHistorySnapshot rebuilds the display queue from the refs via resolveQueueTrack: resolver cache → the live queue by id (covers tracks the edit didn't remove) → placeholder. currentTrack stays a full track in the snapshot and is restored to the engine unchanged. The snapshot refs derive from queue: Track[] for now (so the undo/redo contract cases, which seed only `queue`, stay green); the final step swaps that to [...s.queueItems]. tsc + full vitest suite (1119) green. * perf(mini): cap the mini-player queue snapshot to ±100 around the current track (thin-state phase 4) Step 5: the mini bridge no longer serializes the full queue over IPC on every push — a 50k Artist-Radio queue would otherwise re-encode in full on every track advance. snapshot() sends a window of 100 tracks before/after the playing song; queueIndex is made slice-relative. The mini component stays unchanged (slice- relative); jump/reorder/remove control events are translated back to absolute queue indices via the window offset captured on the last push. tsc + full vitest suite (1119) green. Mini bridge has no unit tests — needs a quick mini-player smoke (queue shows ±100, jump/reorder/remove land correctly). * refactor(queue): make queueItems a required PlayerState field (thin-state phase 4) Foundation for the final consumer migration off queue: Track[]: queueItems has been written at every queue write site since phase 1b, so promoting it from optional to required is a no-op at runtime (tsc confirms zero new errors) and lets the upcoming reader migrations read state.queueItems without `?? []` noise. * refactor(queue): migrate structural queue readers off queue: Track[] (thin-state phase 4) First reader batch toward dropping queue: Track[]: the queue-length selectors (usePlaybackServerId, usePlaybackCoverArt, useQueuePanelDrag, useMiniQueueDrag) now read state.queueItems.length, and FullscreenPlayer's next-track cover prefetch resolves through useQueueTrackAt instead of indexing the fat queue. All behaviour- identical during dual-write (queueItems is in lockstep with queue). tsc + full vitest suite (1119) green. Note: getPlaybackServerId() (playbackServer.ts) deliberately stays on queue for now — it is called from many partially-mocked test stores, so it migrates with the final field removal where the seedQueue helper covers those tests. * refactor(queue): QueuePanel save/share/playlist read queueItems (thin-state phase 4) The id/length reads (save to playlist, share link, create playlist, empty-queue guards, next-tracks divider) now read state.queueItems instead of the fat queue. Behaviour-identical during dual-write; queue: Track[] stays for the rendered QueueList + auto-scroll until the field is dropped. tsc + full suite (1119) green. * refactor(queue): drop queue: Track[] — thin queueItems is the only queue (thin-state phase 4) The store no longer holds the fat queue. `queueItems: QueueItemRef[]` is the sole canonical queue; full `Track`s resolve on demand via the resolver (index batch → getSong fallback, bounded LRU cache); only `currentTrack` stays a full Track. At 50k tracks the store holds ~hundreds of resolved tracks + the refs, not 50k Track objects. - **Persist:** partialize is refs-only (no windowed slice / PERSIST_QUEUE_HALF). A `merge` migrates every historical blob shape → `queueItems` (existing `queueItems` → legacy `queueRefs` → pre-ref windowed `queue: Track[]`) and drops the obsolete `queue` key, so saved queues survive the upgrade. - **Restore (decision B):** `hydrateQueueFromIndex` eager-resolves the whole ref list into the cache on cold start (index → getSong, so an index-off queue still plays), clears the restore sentinel. - **Resolver bridge:** keeps `[idx-50, idx+200]` warm via `resolveVisibleRange`. - **Mutations / actions / playback:** operate on refs; the playing track is `currentTrack`, the next/neighbour tracks resolve from the cache. Navigation (next/previous/row-jump) keeps `queueItems` and only moves the index — no full resolve or queue rebuild per track change. - **Persist tests** cover the three old-blob migrations; `seedQueue` test helper replaces the `setState({ queue })` seeds. tsc + full vitest suite (1115) green. Behaviour-preserving by the test contract; the gapless track change + cold-start restore + mini cap still want a live smoke before merge. * fix(queue): star/rating keeps the queue row resolved instead of blanking to "…" (thin-state) Rating/starring a queue song flashed the row's title to the "…" placeholder until the next track change. Root cause: on sync success pendingStarSync called invalidateQueueResolver, which DROPPED the cached track — and with queue: Track[] gone there's no fat fallback, so the row resolved to a placeholder until the resolver bridge re-fetched the window. Fix: add patchCachedTrack(trackId, patch) and use it on star/rating success to update the cached entry in place (title kept, synced starred/userRating applied) instead of dropping it. No placeholder flash, no re-fetch. tsc + full vitest suite (1115) green. * fix(player): quota-safe persist so a full localStorage can't kill playback A very large queue (~50k refs) overflows the localStorage quota; the persist write then threw QuotaExceededError from inside set(), which aborted playTrack before audio_play — no audio output at all. Back the player persist with a quota-safe storage wrapper so a failed write degrades to a no-op instead of throwing. Restoring the full ref list at that ceiling (vs a windowed cap) is left as a follow-up. * polish(player): throttle the quota-skip persist warning to once per key The quota-safe persist logs a skip on every failed write; on a huge queue that floods the dev console once per mutation. Warn once per key per quota-exceeded streak, re-armed when a write to that key next succeeds. * fix(queue): port new cover-pipeline readers to thin-state Main's cover pipeline (#870) reads s.queue.length and seeds the player store with queue: [track] in its tests. Under thin-state, queue: Track[] no longer exists — the canonical queue is queueItems: QueueItemRef[]. These four files were brought across in the merge but still spoke the old shape; this commit aligns them with the thin-state contract. - src/cover/usePlaybackCoverArt: queueLength = queueItems.length - src/cover/usePlaybackCoverArt.test: seed via toQueueItemRefs - src/api/coverCache.test: same - src/hooks/useNowPlayingPrewarm.test: same (two test cases) * fix(queue): canonicalize thin-state server identity for mixed-server queues `QueueItemRef.serverId` and `PlayerState.queueServerId` are now written as the URL-derived index key on every writer path, matching the library index direction. Mixed-server queues with duplicate `trackId` across servers stay unambiguous because the resolver cache, persistence, and playback bindings all share one key shape. - new `canonicalQueueServerKey()` helper (idempotent UUID-or-key normalizer) - `toQueueItemRefs`, `bindQueueServerForPlayback`, `seedQueueResolver`, and `hydrateQueueFromIndex` emit canonical keys - `getCachedTrack` falls back to the canonical lookup so refs persisted in the legacy UUID shape still resolve through the migration window - persist `merge` rewrites `queueServerId` and every ref `serverId` on rehydrate, so the live store never holds mixed shapes - `removeServer` compares against the resolved id so a profile delete still clears the matching queue binding - the two `playbackServer.test.ts` asserts that hard-coded the UUID shape are updated to the canonical key (existing reader-tolerance is unchanged) * fix(queue-undo): bind snapshot prepend to snapshot-canonical server identity When `applyQueueHistorySnapshot` has to prepend the still-playing track (the snapshot's queue does not contain it), the new ref must follow the snapshot's playback server, not the live `queueServerId`. A server switch racing the undo would otherwise stamp the prepended ref with the new server, mis-resolving the playing track on the very next render. - `QueueUndoSnapshot` now carries `queueServerId` (captured by `queueUndoSnapshotFromState`); older in-memory entries fall back through the snapshot's own refs and finally the live store value - the prepend in `applyQueueHistorySnapshot` plus the post-restore `seedQueueResolver` both source the server identity from this snapshot context, run through `canonicalQueueServerKey` so cache bucket and ref shape stay in lockstep * test(queue): regression cluster for mixed-server queues with duplicate trackId Covers the four invariants the thin-state review called out: - resolver correctness: same `trackId` on two servers maps to two distinct cache entries via canonical keys, and legacy UUID-shaped refs still read the same entries through the compat lookup path - restore/hydrate: persist `merge` forward-migrates UUID-form blobs in three shapes (canonical `queueItems`, legacy `queueRefs`, mixed-server `queueItems`) to canonical keys - undo snapshot application: prepended ref follows the snapshot's playback server even when the live queue has been rebound to a different one, with fallback to snapshot refs and live state for legacy entries - queue sync id emission: `flushPlayQueuePosition` -> `savePlayQueue` passes plain track ids and the playback server out of band, no per-ref `serverId` ever leaks into the request body Also asserts the write helpers (`toQueueItemRefs`, `bindQueueServerForPlayback`) emit canonical keys directly. * perf(queue-header): coalesce resolver burst updates and aggregate in one pass `QueueHeader` recomputed total and remaining queue durations on every resolver cache version bump via two separate full-queue reduces. A mass resolve burst (queue restore, prefetch window slide) bumps the version dozens of times in one frame, and very long queues turned that into visible main-thread stutter. - one pass: a single for-loop produces both total and future-tracks duration; a 50k-track queue costs one walk per recompute, not two - `useDeferredValue(version)` coalesces the burst into a single low-priority commit so the cache version is only sampled once per React frame instead of once per cache write * fix(queue): use stable artist seed for radio top-up The proactive radio top-up in `runNext` seeded `getSimilarSongs2` and `getTopSongs` from `resolveQueueTrack(nextRef)` metadata. When the next ref is still cold in the resolver cache, the placeholder track has empty artist fields, and the top-up would fire `getSimilarSongs2('')` -- silently returning nothing and leaving the queue dry just before the radio rail would have refilled. - prefer the just-played `currentTrack` (always fully resolved in the player store) and the stored radio seed artist id - fall back to the next-track metadata only when those are missing - skip the top-up entirely when no stable seed is available, instead of emitting a non-deterministic empty request * docs(changelog): queue mixed-server routing and quota-safe persist (#872)
508 lines
20 KiB
TypeScript
508 lines
20 KiB
TypeScript
import { reportNowPlaying, scrobbleSong } from '../api/subsonicScrobble';
|
||
import type { Track } from './playerStoreTypes';
|
||
import { resolveQueueTrack } from '../utils/library/queueTrackView';
|
||
import { invoke } from '@tauri-apps/api/core';
|
||
import { lastfmGetTrackLoved, lastfmScrobble, lastfmUpdateNowPlaying } from '../api/lastfm';
|
||
import { setDeferHotCachePrefetch } from '../utils/cache/hotCacheGate';
|
||
import { notifyLibraryPlaybackHint } from './libraryPlaybackHint';
|
||
import {
|
||
playListenSessionFinalize,
|
||
playListenSessionOnProgress,
|
||
playListenSessionOnTrackSwitched,
|
||
playListenSessionOpen,
|
||
} from './playListenSession';
|
||
import { getPerfProbeFlags } from '../utils/perf/perfFlags';
|
||
import { bumpPerfCounter } from '../utils/perf/perfTelemetry';
|
||
import {
|
||
getPlaybackCacheServerKey,
|
||
getPlaybackIndexKey,
|
||
getPlaybackServerId,
|
||
} from '../utils/playback/playbackServer';
|
||
import { resolvePlaybackUrl } from '../utils/playback/resolvePlaybackUrl';
|
||
import { resolveReplayGainDb } from '../utils/audio/resolveReplayGainDb';
|
||
import { showToast } from '../utils/ui/toast';
|
||
import { useAuthStore } from './authStore';
|
||
import { getPlayGeneration, setIsAudioPaused } from './engineState';
|
||
import {
|
||
clearPreloadingIds,
|
||
getBytePreloadingId,
|
||
getGaplessPreloadingId,
|
||
getLastGaplessSwitchTime,
|
||
markGaplessSwitch,
|
||
setBytePreloadingId,
|
||
setGaplessPreloadingId,
|
||
} from './gaplessPreloadState';
|
||
import { touchHotCacheOnPlayback } from './hotCacheTouch';
|
||
import {
|
||
isReplayGainActive,
|
||
loudnessGainDbForEngineBind,
|
||
} from './loudnessGainCache';
|
||
import { refreshLoudnessForTrack } from './loudnessRefresh';
|
||
import { deriveNormalizationSnapshot } from './normalizationSnapshot';
|
||
import { emitNormalizationDebug } from './normalizationDebug';
|
||
import {
|
||
emitPlaybackProgress,
|
||
getPlaybackProgressSnapshot,
|
||
} from './playbackProgress';
|
||
import {
|
||
LIVE_PROGRESS_EMIT_MIN_DELTA_SEC,
|
||
LIVE_PROGRESS_EMIT_MIN_MS,
|
||
STORE_PROGRESS_COMMIT_MIN_DELTA_SEC,
|
||
STORE_PROGRESS_COMMIT_MIN_MS,
|
||
getLastLiveProgressEmitAt,
|
||
getLastStoreProgressCommitAt,
|
||
markLiveProgressEmit,
|
||
markStoreProgressCommit,
|
||
resetProgressEmitThrottles,
|
||
} from './playbackThrottles';
|
||
import {
|
||
playbackSourceHintForResolvedUrl,
|
||
} from './playbackUrlRouting';
|
||
import { usePlayerStore } from './playerStore';
|
||
import { promoteCompletedStreamToHotCache } from './promoteStreamCache';
|
||
import {
|
||
flushQueueSyncToServer,
|
||
getLastQueueHeartbeatAt,
|
||
syncQueueToServer,
|
||
} from './queueSync';
|
||
import { isSeekDebouncePending } from './seekDebounce';
|
||
import {
|
||
SEEK_FALLBACK_VISUAL_GUARD_MS,
|
||
getSeekFallbackVisualTarget,
|
||
setSeekFallbackVisualTarget,
|
||
} from './seekFallbackState';
|
||
import {
|
||
SEEK_TARGET_GUARD_TIMEOUT_MS,
|
||
clearSeekTarget,
|
||
getSeekTarget,
|
||
getSeekTargetSetAt,
|
||
} from './seekTargetState';
|
||
import { refreshWaveformForTrack } from './waveformRefresh';
|
||
|
||
/** Rust-side `audio:normalization-state` event payload. */
|
||
export type NormalizationStatePayload = {
|
||
engine: 'off' | 'replaygain' | 'loudness' | string;
|
||
currentGainDb: number | null;
|
||
targetLufs: number;
|
||
};
|
||
|
||
export function handleAudioPlaying(duration: number): void {
|
||
setDeferHotCachePrefetch(false);
|
||
resetProgressEmitThrottles();
|
||
usePlayerStore.setState({ isPlaying: true, isPlaybackBuffering: false });
|
||
notifyLibraryPlaybackHint('playing');
|
||
const track = usePlayerStore.getState().currentTrack;
|
||
if (track) {
|
||
void playListenSessionOpen(track, getPlaybackServerId(), duration);
|
||
}
|
||
}
|
||
|
||
export function handleAudioProgress(
|
||
current_time: number,
|
||
duration: number,
|
||
buffering = false,
|
||
): void {
|
||
bumpPerfCounter('audioProgressEvents');
|
||
const perfFlags = getPerfProbeFlags();
|
||
const progressUiDisabled = perfFlags.disablePlayerProgressUi;
|
||
// While a seek is pending, the store already holds the optimistic target
|
||
// position. Accepting stale progress from the Rust engine would briefly
|
||
// snap the waveform back to the old position before the seek completes.
|
||
if (isSeekDebouncePending()) return;
|
||
// After the debounce fires, Rust may still emit 1–2 ticks with the old
|
||
// position before the seek takes effect. Block until current_time is
|
||
// within 2 s of the requested target, then clear the guard.
|
||
const activeSeekTarget = getSeekTarget();
|
||
if (activeSeekTarget !== null) {
|
||
if (Math.abs(current_time - activeSeekTarget) > 2.0) {
|
||
// If a seek command hangs while streaming is stalled, do not freeze UI.
|
||
if (Date.now() - getSeekTargetSetAt() <= SEEK_TARGET_GUARD_TIMEOUT_MS) return;
|
||
clearSeekTarget();
|
||
} else {
|
||
clearSeekTarget();
|
||
}
|
||
}
|
||
|
||
const store = usePlayerStore.getState();
|
||
const track = store.currentTrack;
|
||
if (!track) return;
|
||
if (!store.currentRadio && store.isPlaybackBuffering !== buffering) {
|
||
usePlayerStore.setState({ isPlaybackBuffering: buffering });
|
||
}
|
||
// Some backends can emit stale progress ticks shortly after pause/stop.
|
||
// Ignoring them avoids reactivating UI redraw loops while transport is idle.
|
||
const transportActive = store.isPlaying || store.currentRadio != null;
|
||
let visualTarget = getSeekFallbackVisualTarget();
|
||
if (!transportActive && !visualTarget) return;
|
||
if (visualTarget && visualTarget.trackId !== track.id) {
|
||
setSeekFallbackVisualTarget(null);
|
||
visualTarget = null;
|
||
}
|
||
let displayTime = buffering ? 0 : current_time;
|
||
if (visualTarget && visualTarget.trackId === track.id) {
|
||
const nearTarget = Math.abs(current_time - visualTarget.seconds) <= 2.0;
|
||
if (nearTarget) {
|
||
setSeekFallbackVisualTarget(null);
|
||
visualTarget = null;
|
||
} else if (Date.now() - visualTarget.setAtMs <= SEEK_FALLBACK_VISUAL_GUARD_MS) {
|
||
// Keep UI at the requested position while backend catches up.
|
||
displayTime = visualTarget.seconds;
|
||
} else {
|
||
setSeekFallbackVisualTarget(null);
|
||
visualTarget = null;
|
||
}
|
||
}
|
||
const dur = duration > 0 ? duration : track.duration;
|
||
if (dur <= 0) return;
|
||
const progress = displayTime / dur;
|
||
playListenSessionOnProgress(current_time, buffering, dur).catch(() => {});
|
||
if (!progressUiDisabled) {
|
||
const nowLive = Date.now();
|
||
const live = getPlaybackProgressSnapshot();
|
||
const liveTimeDelta = Math.abs(live.currentTime - displayTime);
|
||
if (
|
||
nowLive - getLastLiveProgressEmitAt() >= LIVE_PROGRESS_EMIT_MIN_MS ||
|
||
liveTimeDelta >= LIVE_PROGRESS_EMIT_MIN_DELTA_SEC ||
|
||
visualTarget != null
|
||
) {
|
||
emitPlaybackProgress({
|
||
currentTime: displayTime,
|
||
progress: buffering ? 0 : progress,
|
||
buffered: 0,
|
||
buffering,
|
||
});
|
||
markLiveProgressEmit(nowLive);
|
||
}
|
||
}
|
||
// Heartbeat: push current position to the server every 15 s while playing so
|
||
// cross-device resume works even on a hard close — pause() and the close
|
||
// handler flush on top of this for clean shutdowns.
|
||
if (store.isPlaying && !store.currentRadio) {
|
||
const now = Date.now();
|
||
if (now - getLastQueueHeartbeatAt() >= 15_000) {
|
||
void flushQueueSyncToServer(store.queueItems, track, displayTime);
|
||
}
|
||
}
|
||
|
||
// Scrobble at 50%: Last.fm + Navidrome (updates play_date / recently played)
|
||
if (progress >= 0.5 && !store.scrobbled) {
|
||
usePlayerStore.setState({ scrobbled: true });
|
||
scrobbleSong(track.id, Date.now(), getPlaybackServerId());
|
||
const { scrobblingEnabled, lastfmSessionKey } = useAuthStore.getState();
|
||
if (scrobblingEnabled && lastfmSessionKey) {
|
||
lastfmScrobble(track, Date.now(), lastfmSessionKey);
|
||
}
|
||
}
|
||
if (progressUiDisabled) return;
|
||
// Critical architectural guard: avoid high-frequency writes to the persisted
|
||
// Zustand store (each write serializes queue state). Keep only coarse commits.
|
||
const nowCommit = Date.now();
|
||
const commitDelta = Math.abs(store.currentTime - displayTime);
|
||
const shouldCommitStore =
|
||
visualTarget != null ||
|
||
nowCommit - getLastStoreProgressCommitAt() >= STORE_PROGRESS_COMMIT_MIN_MS ||
|
||
commitDelta >= STORE_PROGRESS_COMMIT_MIN_DELTA_SEC;
|
||
if (shouldCommitStore) {
|
||
usePlayerStore.setState({ currentTime: displayTime, progress, buffered: 0 });
|
||
markStoreProgressCommit(nowCommit);
|
||
}
|
||
|
||
// Pre-buffer / pre-chain next track based on preload mode and crossfade.
|
||
const {
|
||
gaplessEnabled,
|
||
preloadMode,
|
||
preloadCustomSeconds,
|
||
hotCacheEnabled,
|
||
crossfadeEnabled,
|
||
crossfadeSecs,
|
||
} = useAuthStore.getState();
|
||
const remaining = dur - current_time;
|
||
|
||
// Gapless chain: always triggers at 30s regardless of preloadMode.
|
||
const shouldChainGapless = gaplessEnabled && remaining < 30 && remaining > 0;
|
||
// Byte pre-download: skip when Hot Cache is active (it already handles buffering).
|
||
// Even with preload mode OFF, crossfade needs the next track bytes ready before
|
||
// we enter the fade window to avoid a hard gap after track boundary.
|
||
const shouldBytePreloadFromMode = preloadMode !== 'off' && (
|
||
preloadMode === 'early'
|
||
? current_time >= 5
|
||
: preloadMode === 'custom'
|
||
? remaining < preloadCustomSeconds && remaining > 0
|
||
: remaining < 30 && remaining > 0 // balanced (default)
|
||
);
|
||
const crossfadeWindowSecs = Math.max(8, Math.min(30, crossfadeSecs + 6));
|
||
const shouldBytePreloadForCrossfade =
|
||
!gaplessEnabled && crossfadeEnabled && remaining < crossfadeWindowSecs && remaining > 0;
|
||
const shouldBytePreload = !hotCacheEnabled && (
|
||
shouldBytePreloadFromMode ||
|
||
shouldBytePreloadForCrossfade
|
||
);
|
||
// Hot/offline cache: seed enrichment from disk (playback also uses psysonic-local://).
|
||
const shouldPreloadLocalFileAnalysis = preloadMode !== 'off' && (
|
||
preloadMode === 'early'
|
||
? current_time >= 5
|
||
: preloadMode === 'custom'
|
||
? remaining < preloadCustomSeconds && remaining > 0
|
||
: remaining < 30 && remaining > 0
|
||
);
|
||
|
||
if (shouldChainGapless || shouldBytePreload || shouldPreloadLocalFileAnalysis || gaplessEnabled) {
|
||
const { queueItems, queueIndex, repeatMode } = store;
|
||
const nextIdx = queueIndex + 1;
|
||
// Next track for preload/chain. The resolver bridge keeps the window around
|
||
// queueIndex warm, so the next ref is cache-hot; resolveQueueTrack falls
|
||
// back to a placeholder (correct trackId, so URL building still works) on a
|
||
// cold miss. current track = `track` (full) — never resolved.
|
||
const nextRef = repeatMode === 'one'
|
||
? null
|
||
: (nextIdx < queueItems.length ? queueItems[nextIdx] : (repeatMode === 'all' ? queueItems[0] : null));
|
||
const nextTrack = repeatMode === 'one'
|
||
? track
|
||
: (nextRef ? resolveQueueTrack(nextRef) : null);
|
||
if (!nextTrack || nextTrack.id === track.id) return;
|
||
|
||
// Gapless backup: keep next-track bytes ready even if chain/decode misses
|
||
// the boundary. Start earlier for larger files / slower conservative link.
|
||
const estBytes = (() => {
|
||
if (typeof nextTrack.size === 'number' && Number.isFinite(nextTrack.size) && nextTrack.size > 0) {
|
||
return nextTrack.size;
|
||
}
|
||
const kbps = typeof nextTrack.bitRate === 'number' && Number.isFinite(nextTrack.bitRate) && nextTrack.bitRate > 0
|
||
? nextTrack.bitRate
|
||
: 320;
|
||
return Math.max(256 * 1024, Math.ceil((nextTrack.duration || 240) * kbps * 1000 / 8));
|
||
})();
|
||
const conservativeBytesPerSec = 300 * 1024; // ~2.4 Mbps effective throughput
|
||
const estDownloadSecs = estBytes / conservativeBytesPerSec;
|
||
const gaplessBackupWindowSecs = Math.max(15, Math.min(60, Math.ceil(estDownloadSecs * 1.4 + 8)));
|
||
const shouldBytePreloadForGaplessBackup =
|
||
gaplessEnabled && remaining < gaplessBackupWindowSecs && remaining > 0;
|
||
|
||
const serverId = getPlaybackCacheServerKey();
|
||
const analysisServerId = getPlaybackIndexKey();
|
||
const nextUrl = resolvePlaybackUrl(nextTrack.id, serverId);
|
||
const nextIsLocalFile = nextUrl.startsWith('psysonic-local://');
|
||
|
||
// Byte pre-download — runs early so bytes are cached by chain time.
|
||
if (
|
||
(shouldBytePreload || shouldBytePreloadForGaplessBackup || (shouldPreloadLocalFileAnalysis && nextIsLocalFile))
|
||
&& nextTrack.id !== getBytePreloadingId()
|
||
) {
|
||
setBytePreloadingId(nextTrack.id);
|
||
// Loudness cache only — do not call refreshWaveformForTrack(next): it writes global
|
||
// waveformBins and would replace the current track's seekbar while still playing it.
|
||
void refreshLoudnessForTrack(nextTrack.id, { syncPlayingEngine: false });
|
||
if (import.meta.env.DEV) {
|
||
console.info('[psysonic][preload-request]', {
|
||
nextTrackId: nextTrack.id,
|
||
nextUrl,
|
||
shouldBytePreload,
|
||
shouldBytePreloadForGaplessBackup,
|
||
shouldPreloadLocalFileAnalysis,
|
||
nextIsLocalFile,
|
||
remaining,
|
||
gaplessEnabled,
|
||
});
|
||
}
|
||
invoke('audio_preload', {
|
||
url: nextUrl,
|
||
durationHint: nextTrack.duration,
|
||
analysisTrackId: nextTrack.id,
|
||
serverId: analysisServerId || null,
|
||
}).catch(() => {});
|
||
}
|
||
|
||
// Gapless chain — decode + chain into Sink 30s before track boundary.
|
||
if (shouldChainGapless && nextTrack.id !== getGaplessPreloadingId()) {
|
||
setGaplessPreloadingId(nextTrack.id);
|
||
// Ensure loudness gain is already cached for the chained request payload.
|
||
void refreshLoudnessForTrack(nextTrack.id, { syncPlayingEngine: false });
|
||
const authState = useAuthStore.getState();
|
||
// Auto-mode neighbours for the *next* track: current track on its left,
|
||
// queueItems[nextIdx+1] on its right (resolved; placeholder on a cold miss
|
||
// — only its replaygain tags matter, which a placeholder lacks → fallback).
|
||
const nextNeighbourRef = nextIdx + 1 < queueItems.length
|
||
? queueItems[nextIdx + 1]
|
||
: (repeatMode === 'all' && queueItems.length > 0 ? queueItems[0] : null);
|
||
const nextNeighbour = nextNeighbourRef ? resolveQueueTrack(nextNeighbourRef) : null;
|
||
const replayGainDb = resolveReplayGainDb(
|
||
nextTrack, track, nextNeighbour,
|
||
isReplayGainActive(), authState.replayGainMode,
|
||
);
|
||
const replayGainPeak = isReplayGainActive()
|
||
? (nextTrack.replayGainPeak ?? null)
|
||
: null;
|
||
invoke('audio_chain_preload', {
|
||
url: nextUrl,
|
||
volume: store.volume,
|
||
durationHint: nextTrack.duration,
|
||
replayGainDb,
|
||
replayGainPeak,
|
||
loudnessGainDb: loudnessGainDbForEngineBind(nextTrack.id),
|
||
preGainDb: authState.replayGainPreGainDb,
|
||
fallbackDb: authState.replayGainFallbackDb,
|
||
hiResEnabled: authState.enableHiRes,
|
||
analysisTrackId: nextTrack.id,
|
||
serverId: analysisServerId || null,
|
||
}).catch(() => {});
|
||
}
|
||
}
|
||
}
|
||
|
||
export function handleAudioEnded(): void {
|
||
notifyLibraryPlaybackHint('idle');
|
||
|
||
if (Date.now() - getLastGaplessSwitchTime() < 600) {
|
||
return;
|
||
}
|
||
|
||
void playListenSessionFinalize('ended');
|
||
|
||
// Radio stream disconnected — just stop; don't advance queue.
|
||
if (usePlayerStore.getState().currentRadio) {
|
||
setIsAudioPaused(false);
|
||
usePlayerStore.setState({ isPlaying: false, currentRadio: null, progress: 0, currentTime: 0 });
|
||
return;
|
||
}
|
||
|
||
const { repeatMode, currentTrack, queueIndex } = usePlayerStore.getState();
|
||
setIsAudioPaused(false);
|
||
usePlayerStore.setState({
|
||
isPlaying: false,
|
||
isPlaybackBuffering: false,
|
||
progress: 0,
|
||
currentTime: 0,
|
||
buffered: 0,
|
||
});
|
||
setTimeout(() => {
|
||
void (async () => {
|
||
if (repeatMode === 'one' && currentTrack) {
|
||
const authState = useAuthStore.getState();
|
||
const repeatPromoteSid = getPlaybackCacheServerKey();
|
||
if (authState.hotCacheEnabled && repeatPromoteSid) {
|
||
// Same-track repeat never hit `playTrack`'s prev→promote path; flush
|
||
// Rust `stream_completed_cache` to disk so `resolvePlaybackUrl` uses local.
|
||
await promoteCompletedStreamToHotCache(
|
||
currentTrack,
|
||
repeatPromoteSid,
|
||
authState.hotCacheDownloadDir || null,
|
||
);
|
||
}
|
||
// Pin to the current slot — the track may appear elsewhere in the queue.
|
||
// No-arg queue: playTrack keeps the canonical refs and just re-binds.
|
||
usePlayerStore.getState().playTrack(currentTrack, undefined, false, false, queueIndex);
|
||
} else {
|
||
usePlayerStore.getState().next(false);
|
||
}
|
||
})();
|
||
}, 150);
|
||
}
|
||
|
||
/**
|
||
* Handle gapless auto-advance: the Rust engine has already switched to the
|
||
* next source sample-accurately. We just need to update the UI state without
|
||
* touching the audio stream (no playTrack() call!).
|
||
*/
|
||
export function handleAudioTrackSwitched(_duration: number): void {
|
||
markGaplessSwitch();
|
||
clearPreloadingIds(); // allow preloading for the track after this one
|
||
setIsAudioPaused(false);
|
||
|
||
const store = usePlayerStore.getState();
|
||
if (store.currentTrack?.id) {
|
||
useAuthStore.getState().clearSkipStarManualCountForTrack(store.currentTrack.id);
|
||
}
|
||
const { queueItems, queueIndex, repeatMode } = store;
|
||
const nextIdx = queueIndex + 1;
|
||
let nextTrack: Track | null = null;
|
||
let newIndex = queueIndex;
|
||
|
||
if (repeatMode === 'one' && store.currentTrack) {
|
||
nextTrack = store.currentTrack;
|
||
// queueIndex stays the same
|
||
} else if (nextIdx < queueItems.length) {
|
||
// The Rust engine already chained this source sample-accurately, so it must
|
||
// have been preloaded — meaning the resolver had it cached. resolveQueueTrack
|
||
// returns the full Track from cache (placeholder only on an unexpected miss).
|
||
nextTrack = resolveQueueTrack(queueItems[nextIdx]);
|
||
newIndex = nextIdx;
|
||
} else if (repeatMode === 'all' && queueItems.length > 0) {
|
||
nextTrack = resolveQueueTrack(queueItems[0]);
|
||
newIndex = 0;
|
||
}
|
||
|
||
if (!nextTrack) return;
|
||
|
||
void playListenSessionOnTrackSwitched(nextTrack);
|
||
|
||
const switchServerId = getPlaybackCacheServerKey();
|
||
const switchResolvedUrl = resolvePlaybackUrl(nextTrack.id, switchServerId);
|
||
const switchPlaybackSource = playbackSourceHintForResolvedUrl(nextTrack.id, switchServerId, switchResolvedUrl);
|
||
|
||
// Neighbour window for normalization (replaygain album-mode reads prev/next).
|
||
// current track on the left, the track after `nextTrack` on the right.
|
||
const switchPrev = store.currentTrack;
|
||
const switchNextNextRef = newIndex + 1 < queueItems.length ? queueItems[newIndex + 1] : null;
|
||
const switchNeighbourWindow: Track[] = [
|
||
switchPrev ?? nextTrack,
|
||
nextTrack,
|
||
...(switchNextNextRef ? [resolveQueueTrack(switchNextNextRef)] : []),
|
||
];
|
||
|
||
usePlayerStore.setState({
|
||
currentTrack: nextTrack,
|
||
waveformBins: null,
|
||
...deriveNormalizationSnapshot(nextTrack, switchNeighbourWindow, 1),
|
||
normalizationDbgSource: 'track-switched',
|
||
normalizationDbgTrackId: nextTrack.id,
|
||
queueIndex: newIndex,
|
||
isPlaying: true,
|
||
isPlaybackBuffering: switchPlaybackSource === 'stream',
|
||
progress: 0,
|
||
currentTime: 0,
|
||
buffered: 0,
|
||
scrobbled: false,
|
||
lastfmLoved: false,
|
||
currentPlaybackSource: switchPlaybackSource,
|
||
});
|
||
emitNormalizationDebug('track-switched', {
|
||
trackId: nextTrack.id,
|
||
queueIndex: newIndex,
|
||
engineRequested: useAuthStore.getState().normalizationEngine,
|
||
});
|
||
void refreshWaveformForTrack(nextTrack.id);
|
||
void refreshLoudnessForTrack(nextTrack.id);
|
||
usePlayerStore.getState().updateReplayGainForCurrentTrack();
|
||
|
||
// Report Now Playing to Navidrome + Last.fm
|
||
const { nowPlayingEnabled, scrobblingEnabled, lastfmSessionKey } = useAuthStore.getState();
|
||
if (nowPlayingEnabled) reportNowPlaying(nextTrack.id, getPlaybackServerId());
|
||
if (lastfmSessionKey) {
|
||
if (scrobblingEnabled) lastfmUpdateNowPlaying(nextTrack, lastfmSessionKey);
|
||
lastfmGetTrackLoved(nextTrack.title, nextTrack.artist, lastfmSessionKey).then(loved => {
|
||
const cacheKey = `${nextTrack!.title}::${nextTrack!.artist}`;
|
||
usePlayerStore.setState(s => ({
|
||
lastfmLoved: loved,
|
||
lastfmLovedCache: { ...s.lastfmLovedCache, [cacheKey]: loved },
|
||
}));
|
||
});
|
||
}
|
||
syncQueueToServer(queueItems, nextTrack, 0);
|
||
touchHotCacheOnPlayback(nextTrack.id, getPlaybackCacheServerKey());
|
||
}
|
||
|
||
export function handleAudioError(message: string): void {
|
||
console.error('[psysonic] Audio error from backend:', message);
|
||
setIsAudioPaused(false);
|
||
|
||
const detail = message.length > 80 ? message.slice(0, 80) + '…' : message;
|
||
showToast(`Couldn't play track — skipping. ${detail}`, 8000, 'error');
|
||
|
||
const gen = getPlayGeneration();
|
||
usePlayerStore.setState({ isPlaying: false, isPlaybackBuffering: false });
|
||
setTimeout(() => {
|
||
if (getPlayGeneration() !== gen) return;
|
||
usePlayerStore.getState().next(false);
|
||
}, 1500);
|
||
}
|