mirror of
https://github.com/Psychotoxical/psysonic.git
synced 2026-07-21 23:05:46 +00:00
418b25914a
* chore(cover): scaffold cover module and rust cover_cache stub Wave 0: src/cover/ skeleton per contracts.md §12, stub IPC commands in cover_cache/mod.rs (no-op returns until phase B). * feat(cover): add unified cover module and tier resolver (phase A) Wave 1A: tiers, storage keys, resolveJs with cold/sibling races, useCoverArt, CoverArtImage, layoutSizes, playback scope helpers, coverSiblings tier ladder, deprecated shims on subsonicStreamUrl. * feat(cover): rust disk cache and tier-ready events (phase B) Wave 1B: cover_cache module with WebP tier encode, HTTP canonical 800 fetch, cover_cache_* commands, cover:tier-ready / cover:evicted events, disk layout tests. * feat(cover): prefetch hook, tier-ready handoff, library backfill IPC (phase B/C) Wave 2: useCoverArtPrefetch, cover:tier-ready/evicted bridge, one-time IDB cover key clear, prefetch registry drain, MainApp wiring. * feat(cover): migrate dense grids to CoverArtImage and prefetch (phase D) Wave 3A: dense surfaces use layout-native displayCssPx, surface=dense, coverPrefetchRegister on Home/Albums/search; AlbumCard cell width from grid. * feat(cover): migrate sparse surfaces and integrations (phase E sparse) Wave 3B: sparse CoverArtImage/useCoverArt, lightbox tier 2000, ArtistHeroCover, MPRIS/Discord/export integrations, playback chrome and detail heroes. * feat(cover): revalidation scheduler and disk pressure gate (phase E+) Wave 4: coverCacheMaxMb settings (en/ru), StorageTab disk usage, cover_cache_configure, useCoverRevalidateScheduler, playbackServer uses cover fetchUrl; pressure watermarks. * docs: CHANGELOG and credits for cover art pipeline PR #869 * fix(cover): stop webview getCoverArt storm on dense grids (429) Dense surfaces no longer put rotating getCoverArt URLs in img src; load disk via Rust ensure + convertFileSrc. Tier-ready notifies listeners instead of invalidating IDB. Throttle background prefetch and cap Home registry. * fix(cover): omit empty img src until cover URL is ready React 19 warns on src=""; CoverArtImage uses undefined until disk/IDB resolves; queue current track shows placeholder when src is still empty. * fix(cover): disk cache by host index key, parallel ensure, asset protocol Bind cover storage to serverIndexKey (library host), rename cover IPC/events, fix REST base URL and Tauri flat args, enable protocol-asset for disk paths, add prioritized ensure queue, and wipe legacy profile-UUID cache once. Limit Vite dep scan to index.html so research/target HTML is ignored. * fix(cover): WebP tiers, disk peek, home cache, asset URLs for mainstage Encode lossy WebP (~82), write only missing tiers, library cover backfill, and cover_cache_peek_batch for fast paint from disk. diskSrcCache + CSP asset protocol; no IDB fallback when server is up. Session Home feed cache with warm peek on return; BecauseYouLike deduped cover hook and high prefetch. * feat(cover): per-server cache strategy and native library backfill Move cover disk cache settings to Offline & cache with Lazy/Aggressive per server, per-server clear, and no size cap. Run full-catalog backfill on the Rust runtime (sync-idle wake, bounded HTTP, bulk 800px writes without flooding the webview). Drop global prefetch limits from auth store and waveform clear from the offline storage block. * fix(build): CSP connect-src for Subsonic API; quieter prod nix build Prod webview blocked axios ping after cover CSP (missing connect-src). Drop cargo tauri -v in flake build, raise Vite chunk limit, ignore tsbuildinfo. * fix(cover): complete WebP ladder in library bulk backfill Aggressive backfill now writes all derived tiers (128–800), skips IDs only when the full ladder exists (not 800 alone), avoids fetch-failed markers on bulk HTTP errors, and stops the pass when the active server changes. * fix(cover,home): navigation-priority backfill and Because You Like UX Pause library cover backfill while navigating; split peek/ensure traffic so grids and rails win over bulk work. Disk src lookup, grid warm hooks, and non-blocking mainstage prime for faster visible covers. Because You Like: session snapshot, staggered horizontal skeleton row, text hidden until cover is ready, and layout aligned with loaded cards. * feat(random-albums,library): local-first album fetch + cover art pipeline Random Albums теперь запрашивает локальный SQLite-индекс (ORDER BY RANDOM() LIMIT N) вместо сетевого запроса к серверу. При готовом индексе спиннер исчезает практически мгновенно; сеть используется только как фолбэк. - advanced_search.rs: добавляет `("random", _) => RANDOM()` в allowlist сортировок - browseTextSearch.ts: runLocalRandomAlbums — SQLite-рандом для Albums - RandomAlbums.tsx: doFetchRandomAlbums local-first для обоих путей (без жанра и с жанром через runLocalAlbumsByGenres + JS-shuffle); speculative reserve прогревает следующий батч в фоне после каждого Refresh Также: обновление пайплайна обложек (coverTraffic, peekQueue, ensureQueue, diskSrcLookup, warmDiskPeek, prefetchRegistry, useCoverArt, useWarmGridCovers, useCoverNavigationPriority, resolveIntersectionScrollRoot и сопутствующие компоненты/хуки). * fix(random-albums): prevent double-load on Zustand rehydration useEffect([selectedGenres, load]) fired twice on every visit: first with default store values, then again ~50 ms later when Zustand rehydrated mixMinRatingFilterEnabled/minAlbum/minArtist from localStorage. Previously this was invisible because the first network fetch took ~1.5 s, so loadingRef.current was still true on the second fire. With the new local-first SQLite path the first load completes in ~50 ms, leaving the guard cleared before rehydration triggers a second random batch. Fix: ref-pattern — keep loadRef.current fresh on every render, effect depends only on selectedGenres. Manual Refresh and genre-filter changes still call the latest closure correctly. * fix(random-albums): stop warmCoverDiskSrcBatch in fillReserve from causing visual flash fillReserve вызывал warmCoverDiskSrcBatch для обложек резервного батча, что вызывало bumpDiskSrcCache() для каждой новой обложки (~30+ вызовов). Это будило всех подписчиков useCoverArt на текущей странице, провоцируя видимую перерисовку примерно через ~1.5 с после загрузки (когда filterAlbumsByMixRatings делает сетевые запросы к рейтингам артистов). - fillReserve: убран warmCoverDiskSrcBatch — обложки прогреваются лениво при consume резерва через primeAlbumCoversForDisplay - reserve-путь в load(): добавлен primeAlbumCoversForDisplay перед setAlbums (аналогично non-reserve пути; при уже прогретом кэше — мгновенно) * feat(because-you-like): reserve-first pattern — instant display on return visits Каждый визит на Mainstage после первого теперь отдаёт готовую заготовку мгновенно, вместо spinner → сетевые запросы → контент. Архитектура: - resolvePicks / fetchBecauseYouLike вынесены на уровень модуля (выход из замыкания useEffect); читают текущий localStorage, возвращают { anchor, recs, nextAnchorHistory, nextPicksHistory } - fillBecauseReserve — fire-and-forget фоновая функция: запускается сразу после отображения результата, кладёт следующий батч в _becauseReserve. Covers намеренно не прогреваются (bumpDiskSrcCache на текущей странице не нужен); они прогреваются через primeAlbumCoversForDisplay при consume. - useLayoutEffect: если reserve готов — не сбрасывает стейт в skeleton (контент появляется без мигания) - useEffect: reserve-first path — consume → primeCovers → setState → fill; full-fetch path сохранён как fallback при первом визите или промахе Поведение: - Визит 1: full fetch (как раньше) → показ → fillReserve R1 - Визит 2+: consume R1 → мгновенный показ → fillReserve R2 - При сетевом сбое: restore из session cache (как раньше) * fix(because-you-like): initialise state from reserve — no skeleton flash on remount При ремаунте компонент стартовал с refreshing=true/anchor=null/recs=[] и показывал skeleton на один тик до того как useEffect отработает. Теперь useState() использует lazy initializers, которые читают _becauseReserve прямо в первом рендере: если reserve валиден — state сразу refreshing=false, anchor=X, recs=[...] и skeleton не показывается вообще. Covers уже в diskSrcCache (из предыдущего показа) и появляются без дополнительных запросов. useLayoutEffect упрощён: вызывает hasValidReserve() и сбрасывает в skeleton только если reserve отсутствует (для случая navigation без ремаунта). * fix(because-you-like): apply reserve in useLayoutEffect to handle async pool arrival Lazy initializers не могли применить reserve при первом рендере, потому что mostPlayed/recentlyPlayed/starred приходят из Home.tsx асинхронно — pool=[] на первом рендере, poolKey не совпадает с reserve. useLayoutEffect теперь активно ставит стейт из reserve (а не просто не сбрасывает): когда pool обновляется до реальных данных, useLayoutEffect срабатывает синхронно до paint, проверяет reserve и сразу применяет anchor/recs/refreshing=false. При отсутствии reserve — сбрасывает в skeleton как прежде. * fix(because-you-like): reserve > cache > skeleton — eliminate skeleton flash on mount Корневая причина: Home.tsx загружает mostPlayed асинхронно через useEffect, поэтому на первом рендере pool=[], poolKey=''. Reserve хранится с реальным poolKey → mismatch → lazy initializers запускали skeleton. Теперь двухуровневый fallback без зависимости от poolKey: 1. reserve (serverId + poolKey совпадают) → мгновенный новый батч 2. becauseYouLikeCache (только serverId) → stale-while-revalidate, контент доступен сразу с mount, обновляется тихо в фоне 3. skeleton → только при полном отсутствии данных (первый визит) Применяется одинаково в lazy useState initializers, useLayoutEffect и full-fetch path useEffect (не сбрасывать в skeleton пока есть cached контент). * fix(because-you-like): key reserve by serverId only; guard useEffect on empty pool Проблема: reserve хранился с poolKey, но на первом рендере pool=[] → poolKey='' → mismatch → показывался кэш (предыдущий набор) ~500ms пока Home.tsx не загружал mostPlayed. Исправления: - BecauseReserve: убран poolKey — reserve валиден для любого pool-состояния на том же сервере. Pool (топ-артисты) меняется медленно; один раз показать reserve с чуть устаревшим anchor лучше чем показывать предыдущий набор 500ms - hasValidReserve: проверяет только serverId - fillBecauseReserve: убран poolKey из сигнатуры и хранилища - useEffect: guard pool.length === 0 → возврат без fetch/consume; effect перезапустится когда pool заполнится (реальные deps изменятся) → reserve применяется из useLayoutEffect ещё до pool, без стале-флэша Итоговый порядок: reserve (instant, serverId) > cache (stale-while-revalidate) > skeleton (только первый визит) * fix(home): remove mix-rating deps from feed useEffect — prevent Zustand rehydration double-fetch Корень: useAuthStore(mixMinRatingFilterEnabled/Album/Artist) были в deps useEffect. Zustand persist реhydrates асинхронно — сначала activeServerId, потом mix-rating значения. Это вызывало двойной запуск эффекта: - Первый запуск: homeFeedCache hit → показывает набор предыдущего просмотра - Второй запуск (после rehydration): cache miss или повторный fetch с реальными mix-настройками → ~500ms → новый набор Итог: Hero, AlbumRow, BecauseYouLikeRail показывали предыдущий набор первые ~500ms при каждом возврате на Mainstage. Fix: убраны mixMinRatingFilterEnabled/Album/Artist из deps. getMixMinRatingsConfigFromAuth() читается внутри эффекта через getState() — всегда актуальные значения без пересоздания замыкания. Mix-настройки по-прежнему применяются при fetch, но не вызывают двойной запуск при rehydration. * feat(home): local-first discover songs via SQLite ORDER BY RANDOM() Добавлена runLocalRandomSongs (аналог runLocalRandomAlbums для треков) в browseTextSearch.ts — использует libraryAdvancedSearch с sort random, field уже поддерживается Rust-кодом через wildcarded ("random", _) ветку. В Home.tsx: discoverSongs теперь сначала пробует локальный индекс, и только при недоступности (индекс не готов, ошибка) падает обратно на getRandomSongs.view. Ускоряет первую загрузку Mainstage — треки берутся из SSD вместо сети. * fix(home): pre-populate state from cache at mount — eliminate empty-state flash on return visits Причина: Home.tsx размонтируется при навигации. При возврате первый рендер всегда с пустыми массивами (heroAlbums=[], mostPlayed=[] и т.д.), потом useEffect читает homeFeedCache и заполняет state. Даже один кадр с пустым состоянием вызывает перерисовку Hero и BecauseYouLikeRail (pool=[]). Решение: getInitialHomeFeed() читает homeFeedCache синхронно через useAuthStore.getState() (не hook) в lazy useState initializers. К моменту повторного визита store уже rehydrated — все state получают кэшированные данные до первого рендера. Дополнительно: wasPrePopulated предотвращает повторный applyFeedSnapshot в useEffect когда state уже заполнен — иначе новые ссылки на массивы вызывали бы ненужные ре-рендеры дочерних компонентов с теми же данными. * fix(mainstage): keep refresh without return flicker Keep Home and Because You Like visually stable during a single visit while still refreshing data for the next re-enter. Improve mainstage cover warmup by ensuring and pre-decoding above-the-fold artwork so hero and top rails appear instantly after navigation. * fix(mainstage): stabilize because rail and hero background framing Measure Because You Like layout before first paint to avoid width snap flicker, and render hero background as centered cover-fit images so the frame no longer jumps from top to middle on mount. * fix(now-playing): prewarm track data and prevent stale carry-over Warm Now Playing fetch caches and playback cover art on track change so entering the page no longer waits on first-load requests. Gate key-based sections (top songs, tour, Last.fm) by the active track/artist keys to avoid briefly rendering values from the previous track. * fix(cover,test): refresh playback scope and default tauri cover mocks Recompute playback cover scope when queue/server context changes so now-playing art resolves against the correct server after handoffs. Add default cover-cache invoke handlers to the shared Tauri test harness to prevent unhandled rejections in suites that mount cover-aware UI. * fix(cover,now-playing,test): align prewarm scopes and tighten tauri mocks Make cover-cache invoke defaults opt-in for tests, align radio prewarm scope with active rendering scope, and add targeted hook tests for prewarm + playback-scope reactivity. Also harden Rust cover URL building to avoid panic on malformed base URLs. * test(cover): hoist mocked useCoverArt and clean EOF whitespace Fix the new playback-scope hook test to use a hoisted vi.mock-safe stub and keep branch-wide diff checks clean by removing an accidental trailing blank line. * fix(cover): align playback ensure auth and harden backfill retry flow Use playback-server credentials for playback-scoped cover ensures, persist fetch-failed markers for bulk library backfill failures, and avoid advancing backfill cursor when UI-priority hold interrupts a batch. * fix(ci): resolve clippy lint and update frontend node runtime Move fetch helper before the test module to satisfy clippy's items-after-test-module rule, and modernize frontend CI to setup-node v6 with lts/* instead of pinned Node 20. * chore(settings): simplify cover and analytics strategy copy Move strategy summaries below tables, simplify Lazy/Aggressive wording, keep analytics warning always visible, and localize Russian texts to plain language without technical jargon.
318 lines
16 KiB
TypeScript
318 lines
16 KiB
TypeScript
import { useEffect, useState } from 'react';
|
|
import { getArtistForServer, getArtistInfoForServer, getTopSongsForServer } from '../api/subsonicArtists';
|
|
import { getAlbumForServer, getSongForServer } from '../api/subsonicLibrary';
|
|
import type { SubsonicAlbum, SubsonicArtistInfo, SubsonicSong } from '../api/subsonicTypes';
|
|
import { fetchBandsintownEvents, type BandsintownEvent } from '../api/bandsintown';
|
|
import {
|
|
lastfmGetArtistStats, lastfmGetTrackInfo, lastfmIsConfigured,
|
|
type LastfmArtistStats, type LastfmTrackInfo,
|
|
} from '../api/lastfm';
|
|
import { makeCache } from '../utils/cache/nowPlayingCache';
|
|
|
|
// Module-level TTL caches (shared across mounts)
|
|
const songMetaCache = makeCache<SubsonicSong | null>();
|
|
const artistInfoCache = makeCache<SubsonicArtistInfo | null>();
|
|
const albumCache = makeCache<{ album: SubsonicAlbum; songs: SubsonicSong[] } | null>();
|
|
const topSongsCache = makeCache<SubsonicSong[]>();
|
|
const tourCache = makeCache<BandsintownEvent[]>();
|
|
const discographyCache = makeCache<SubsonicAlbum[]>();
|
|
const lfmTrackCache = makeCache<LastfmTrackInfo | null>();
|
|
const lfmArtistCache = makeCache<LastfmArtistStats | null>();
|
|
|
|
export interface NowPlayingFetchersDeps {
|
|
songId: string | undefined;
|
|
artistId: string | undefined;
|
|
albumId: string | undefined;
|
|
artistName: string;
|
|
enableBandsintown: boolean;
|
|
audiomuseNavidromeEnabled: boolean;
|
|
lastfmUsername: string;
|
|
currentTrack: { artist: string; title: string } | null;
|
|
/** Subsonic server for API calls — must match the playing queue server. */
|
|
subsonicServerId: string;
|
|
/** When false, skip network fetches (e.g. no server id). */
|
|
fetchEnabled?: boolean;
|
|
}
|
|
|
|
export interface NowPlayingFetchersResult {
|
|
songMeta: SubsonicSong | null;
|
|
artistInfo: SubsonicArtistInfo | null;
|
|
albumData: { album: SubsonicAlbum; songs: SubsonicSong[] } | null;
|
|
topSongs: SubsonicSong[];
|
|
tourEvents: BandsintownEvent[];
|
|
tourLoading: boolean;
|
|
discography: SubsonicAlbum[];
|
|
lfmTrack: LastfmTrackInfo | null;
|
|
lfmArtist: LastfmArtistStats | null;
|
|
}
|
|
|
|
function subsonicCacheKey(serverId: string, id: string): string {
|
|
return serverId ? `${serverId}:${id}` : id;
|
|
}
|
|
|
|
// id-keyed slots are held as `{ id, value }` tuples and gated on id-match in
|
|
// the return statement. Without the gate, a track switch renders one frame
|
|
// with the previous track's value paired with the new id — consumers that
|
|
// build a cacheKey from the new id (e.g. CachedImage) would persist a
|
|
// mismatched blob in IndexedDB and never recover. See PR #732 for the same
|
|
// fix inside `NowPlayingInfo.tsx`.
|
|
type IdSlot<T> = { id: string; value: T } | null;
|
|
type KeySlot<T> = { key: string; value: T } | null;
|
|
function seedSlot<T>(id: string, lookup: (id: string) => T | undefined): IdSlot<T> {
|
|
if (!id) return null;
|
|
const cached = lookup(id);
|
|
return cached === undefined ? null : { id, value: cached };
|
|
}
|
|
|
|
function seedKeySlot<T>(key: string, lookup: (key: string) => T | undefined): KeySlot<T> {
|
|
if (!key) return null;
|
|
const cached = lookup(key);
|
|
return cached === undefined ? null : { key, value: cached };
|
|
}
|
|
|
|
export async function prewarmNowPlayingFetchers(
|
|
deps: NowPlayingFetchersDeps,
|
|
): Promise<void> {
|
|
const {
|
|
songId, artistId, albumId, artistName, enableBandsintown, audiomuseNavidromeEnabled,
|
|
lastfmUsername, currentTrack, subsonicServerId, fetchEnabled = true,
|
|
} = deps;
|
|
|
|
if (!fetchEnabled || !subsonicServerId) return;
|
|
|
|
const jobs: Array<Promise<unknown>> = [];
|
|
|
|
if (songId) {
|
|
const cacheKey = subsonicCacheKey(subsonicServerId, songId);
|
|
if (songMetaCache.get(cacheKey) === undefined) {
|
|
jobs.push(
|
|
getSongForServer(subsonicServerId, songId)
|
|
.then(v => songMetaCache.set(cacheKey, v ?? null))
|
|
.catch(() => songMetaCache.set(cacheKey, null)),
|
|
);
|
|
}
|
|
}
|
|
|
|
if (artistId) {
|
|
const artistKey = subsonicCacheKey(subsonicServerId, artistId);
|
|
if (artistInfoCache.get(artistKey) === undefined) {
|
|
jobs.push(
|
|
getArtistInfoForServer(subsonicServerId, artistId, {
|
|
similarArtistCount: audiomuseNavidromeEnabled ? 24 : undefined,
|
|
})
|
|
.then(v => artistInfoCache.set(artistKey, v ?? null))
|
|
.catch(() => artistInfoCache.set(artistKey, null)),
|
|
);
|
|
}
|
|
if (discographyCache.get(artistKey) === undefined) {
|
|
jobs.push(
|
|
getArtistForServer(subsonicServerId, artistId)
|
|
.then(v => discographyCache.set(artistKey, v.albums))
|
|
.catch(() => discographyCache.set(artistKey, [])),
|
|
);
|
|
}
|
|
}
|
|
|
|
if (albumId) {
|
|
const cacheKey = subsonicCacheKey(subsonicServerId, albumId);
|
|
if (albumCache.get(cacheKey) === undefined) {
|
|
jobs.push(
|
|
getAlbumForServer(subsonicServerId, albumId)
|
|
.then(v => albumCache.set(cacheKey, v))
|
|
.catch(() => albumCache.set(cacheKey, null)),
|
|
);
|
|
}
|
|
}
|
|
|
|
if (artistName) {
|
|
const cacheKey = subsonicCacheKey(subsonicServerId, artistName);
|
|
if (topSongsCache.get(cacheKey) === undefined) {
|
|
jobs.push(
|
|
getTopSongsForServer(subsonicServerId, artistName)
|
|
.then(v => topSongsCache.set(cacheKey, v))
|
|
.catch(() => topSongsCache.set(cacheKey, [])),
|
|
);
|
|
}
|
|
if (enableBandsintown && tourCache.get(artistName) === undefined) {
|
|
jobs.push(
|
|
fetchBandsintownEvents(artistName)
|
|
.then(v => tourCache.set(artistName, v))
|
|
.catch(() => tourCache.set(artistName, [])),
|
|
);
|
|
}
|
|
}
|
|
|
|
if (lastfmIsConfigured() && currentTrack) {
|
|
const trackKey = `${currentTrack.artist} ${currentTrack.title} ${lastfmUsername}`;
|
|
if (lfmTrackCache.get(trackKey) === undefined) {
|
|
jobs.push(
|
|
lastfmGetTrackInfo(currentTrack.artist, currentTrack.title, lastfmUsername || undefined)
|
|
.then(v => lfmTrackCache.set(trackKey, v))
|
|
.catch(() => lfmTrackCache.set(trackKey, null)),
|
|
);
|
|
}
|
|
const artistKey = `${currentTrack.artist} ${lastfmUsername}`;
|
|
if (lfmArtistCache.get(artistKey) === undefined) {
|
|
jobs.push(
|
|
lastfmGetArtistStats(currentTrack.artist, lastfmUsername || undefined)
|
|
.then(v => lfmArtistCache.set(artistKey, v))
|
|
.catch(() => lfmArtistCache.set(artistKey, null)),
|
|
);
|
|
}
|
|
}
|
|
|
|
await Promise.allSettled(jobs);
|
|
}
|
|
|
|
export function useNowPlayingFetchers(deps: NowPlayingFetchersDeps): NowPlayingFetchersResult {
|
|
const {
|
|
songId, artistId, albumId, artistName, enableBandsintown, audiomuseNavidromeEnabled,
|
|
lastfmUsername, currentTrack, subsonicServerId, fetchEnabled = true,
|
|
} = deps;
|
|
|
|
// id-keyed entity state — seeded from TTL cache so same-artist song switches
|
|
// are instant. Held as `{ id, value }` tuples and gated below.
|
|
const [songMetaEntry, setSongMetaEntry] = useState<IdSlot<SubsonicSong | null>>(() =>
|
|
seedSlot(songId && subsonicServerId ? songId : '', k => songMetaCache.get(subsonicCacheKey(subsonicServerId, k))));
|
|
const [artistInfoEntry, setArtistInfoEntry] = useState<IdSlot<SubsonicArtistInfo | null>>(() =>
|
|
seedSlot(artistId && subsonicServerId ? artistId : '', k => artistInfoCache.get(subsonicCacheKey(subsonicServerId, k))));
|
|
const [albumDataEntry, setAlbumDataEntry] = useState<IdSlot<{ album: SubsonicAlbum; songs: SubsonicSong[] } | null>>(() =>
|
|
seedSlot(albumId && subsonicServerId ? albumId : '', k => albumCache.get(subsonicCacheKey(subsonicServerId, k))));
|
|
const [discographyEntry, setDiscographyEntry] = useState<IdSlot<SubsonicAlbum[]>>(() =>
|
|
seedSlot(artistId && subsonicServerId ? artistId : '', k => discographyCache.get(subsonicCacheKey(subsonicServerId, k))));
|
|
|
|
// Name-keyed / global state — no cacheKey/persistence hazard, kept as plain state.
|
|
const topSongsKey = artistName && subsonicServerId ? subsonicCacheKey(subsonicServerId, artistName) : '';
|
|
const tourKey = enableBandsintown && artistName ? artistName : '';
|
|
const [topSongsEntry, setTopSongsEntry] = useState<KeySlot<SubsonicSong[]>>(() =>
|
|
seedKeySlot(topSongsKey, k => topSongsCache.get(k)));
|
|
const [tourEventsEntry, setTourEventsEntry] = useState<KeySlot<BandsintownEvent[]>>(() =>
|
|
seedKeySlot(tourKey, k => tourCache.get(k)));
|
|
const [tourLoading, setTourLoading] = useState(false);
|
|
const lfmTrackKey = currentTrack ? `${currentTrack.artist} ${currentTrack.title} ${lastfmUsername}` : '';
|
|
const lfmArtistKey = artistName ? `${artistName} ${lastfmUsername}` : '';
|
|
const [lfmTrackEntry, setLfmTrackEntry] = useState<KeySlot<LastfmTrackInfo | null>>(() =>
|
|
seedKeySlot(lfmTrackKey, k => lfmTrackCache.get(k)));
|
|
const [lfmArtistEntry, setLfmArtistEntry] = useState<KeySlot<LastfmArtistStats | null>>(() =>
|
|
seedKeySlot(lfmArtistKey, k => lfmArtistCache.get(k)));
|
|
|
|
// Fetch batch per entity change (not per song switch — same-artist songs share artist/top/tour fetches)
|
|
useEffect(() => {
|
|
if (!fetchEnabled || !subsonicServerId || !songId) { setSongMetaEntry(null); return; }
|
|
const cacheKey = subsonicCacheKey(subsonicServerId, songId);
|
|
const cached = songMetaCache.get(cacheKey);
|
|
if (cached !== undefined) { setSongMetaEntry({ id: songId, value: cached }); return; }
|
|
setSongMetaEntry(null);
|
|
let cancelled = false;
|
|
getSongForServer(subsonicServerId, songId)
|
|
.then(v => { if (!cancelled) { songMetaCache.set(cacheKey, v ?? null); setSongMetaEntry({ id: songId, value: v ?? null }); } })
|
|
.catch(() => { if (!cancelled) { songMetaCache.set(cacheKey, null); setSongMetaEntry({ id: songId, value: null }); } });
|
|
return () => { cancelled = true; };
|
|
}, [fetchEnabled, subsonicServerId, songId]);
|
|
|
|
useEffect(() => {
|
|
if (!fetchEnabled || !subsonicServerId || !artistId) { setArtistInfoEntry(null); return; }
|
|
const cacheKey = subsonicCacheKey(subsonicServerId, artistId);
|
|
const cached = artistInfoCache.get(cacheKey);
|
|
if (cached !== undefined) { setArtistInfoEntry({ id: artistId, value: cached }); return; }
|
|
setArtistInfoEntry(null);
|
|
let cancelled = false;
|
|
getArtistInfoForServer(subsonicServerId, artistId, { similarArtistCount: audiomuseNavidromeEnabled ? 24 : undefined })
|
|
.then(v => { if (!cancelled) { artistInfoCache.set(cacheKey, v ?? null); setArtistInfoEntry({ id: artistId, value: v ?? null }); } })
|
|
.catch(() => { if (!cancelled) { artistInfoCache.set(cacheKey, null); setArtistInfoEntry({ id: artistId, value: null }); } });
|
|
return () => { cancelled = true; };
|
|
}, [fetchEnabled, subsonicServerId, artistId, audiomuseNavidromeEnabled]);
|
|
|
|
useEffect(() => {
|
|
if (!fetchEnabled || !subsonicServerId || !albumId) { setAlbumDataEntry(null); return; }
|
|
const cacheKey = subsonicCacheKey(subsonicServerId, albumId);
|
|
const cached = albumCache.get(cacheKey);
|
|
if (cached !== undefined) { setAlbumDataEntry({ id: albumId, value: cached }); return; }
|
|
setAlbumDataEntry(null);
|
|
let cancelled = false;
|
|
getAlbumForServer(subsonicServerId, albumId)
|
|
.then(v => { if (!cancelled) { albumCache.set(cacheKey, v); setAlbumDataEntry({ id: albumId, value: v }); } })
|
|
.catch(() => { if (!cancelled) { albumCache.set(cacheKey, null); setAlbumDataEntry({ id: albumId, value: null }); } });
|
|
return () => { cancelled = true; };
|
|
}, [fetchEnabled, subsonicServerId, albumId]);
|
|
|
|
useEffect(() => {
|
|
if (!fetchEnabled || !topSongsKey) { setTopSongsEntry(null); return; }
|
|
const cached = topSongsCache.get(topSongsKey);
|
|
if (cached !== undefined) { setTopSongsEntry({ key: topSongsKey, value: cached }); return; }
|
|
setTopSongsEntry(null);
|
|
let cancelled = false;
|
|
getTopSongsForServer(subsonicServerId, artistName)
|
|
.then(v => { if (!cancelled) { topSongsCache.set(topSongsKey, v); setTopSongsEntry({ key: topSongsKey, value: v }); } })
|
|
.catch(() => { if (!cancelled) { topSongsCache.set(topSongsKey, []); setTopSongsEntry({ key: topSongsKey, value: [] }); } });
|
|
return () => { cancelled = true; };
|
|
}, [fetchEnabled, topSongsKey, subsonicServerId, artistName]);
|
|
|
|
useEffect(() => {
|
|
if (!tourKey) { setTourEventsEntry(null); setTourLoading(false); return; }
|
|
const cached = tourCache.get(tourKey);
|
|
if (cached !== undefined) { setTourEventsEntry({ key: tourKey, value: cached }); setTourLoading(false); return; }
|
|
let cancelled = false;
|
|
setTourLoading(true);
|
|
setTourEventsEntry(null);
|
|
fetchBandsintownEvents(artistName)
|
|
.then(v => { if (!cancelled) { tourCache.set(tourKey, v); setTourEventsEntry({ key: tourKey, value: v }); } })
|
|
.finally(() => { if (!cancelled) setTourLoading(false); });
|
|
return () => { cancelled = true; };
|
|
}, [tourKey, artistName]);
|
|
|
|
// Discography via getArtist
|
|
useEffect(() => {
|
|
if (!fetchEnabled || !subsonicServerId || !artistId) { setDiscographyEntry(null); return; }
|
|
const cacheKey = subsonicCacheKey(subsonicServerId, artistId);
|
|
const cached = discographyCache.get(cacheKey);
|
|
if (cached !== undefined) { setDiscographyEntry({ id: artistId, value: cached }); return; }
|
|
setDiscographyEntry(null);
|
|
let cancelled = false;
|
|
getArtistForServer(subsonicServerId, artistId)
|
|
.then(v => { if (!cancelled) { discographyCache.set(cacheKey, v.albums); setDiscographyEntry({ id: artistId, value: v.albums }); } })
|
|
.catch(() => { if (!cancelled) { discographyCache.set(cacheKey, []); setDiscographyEntry({ id: artistId, value: [] }); } });
|
|
return () => { cancelled = true; };
|
|
}, [fetchEnabled, subsonicServerId, artistId]);
|
|
|
|
// Last.fm track info (per-track)
|
|
useEffect(() => {
|
|
if (!lastfmIsConfigured() || !currentTrack || !lfmTrackKey) { setLfmTrackEntry(null); return; }
|
|
const cached = lfmTrackCache.get(lfmTrackKey);
|
|
if (cached !== undefined) { setLfmTrackEntry({ key: lfmTrackKey, value: cached }); return; }
|
|
setLfmTrackEntry(null);
|
|
let cancelled = false;
|
|
lastfmGetTrackInfo(currentTrack.artist, currentTrack.title, lastfmUsername || undefined)
|
|
.then(v => { if (!cancelled) { lfmTrackCache.set(lfmTrackKey, v); setLfmTrackEntry({ key: lfmTrackKey, value: v }); } })
|
|
.catch(() => { if (!cancelled) { lfmTrackCache.set(lfmTrackKey, null); setLfmTrackEntry({ key: lfmTrackKey, value: null }); } });
|
|
return () => { cancelled = true; };
|
|
}, [lfmTrackKey, currentTrack, lastfmUsername]);
|
|
|
|
// Last.fm artist stats (per-artist — shared across same-artist tracks)
|
|
useEffect(() => {
|
|
if (!lastfmIsConfigured() || !artistName || !lfmArtistKey) { setLfmArtistEntry(null); return; }
|
|
const cached = lfmArtistCache.get(lfmArtistKey);
|
|
if (cached !== undefined) { setLfmArtistEntry({ key: lfmArtistKey, value: cached }); return; }
|
|
setLfmArtistEntry(null);
|
|
let cancelled = false;
|
|
lastfmGetArtistStats(artistName, lastfmUsername || undefined)
|
|
.then(v => { if (!cancelled) { lfmArtistCache.set(lfmArtistKey, v); setLfmArtistEntry({ key: lfmArtistKey, value: v }); } })
|
|
.catch(() => { if (!cancelled) { lfmArtistCache.set(lfmArtistKey, null); setLfmArtistEntry({ key: lfmArtistKey, value: null }); } });
|
|
return () => { cancelled = true; };
|
|
}, [lfmArtistKey, artistName, lastfmUsername]);
|
|
|
|
// Gate id-keyed slots on id-match so consumers never see a value paired
|
|
// with the wrong id, even on the single render between an id change and
|
|
// the next effect run.
|
|
const songMeta = songMetaEntry && songMetaEntry.id === songId ? songMetaEntry.value : null;
|
|
const artistInfo = artistInfoEntry && artistInfoEntry.id === artistId ? artistInfoEntry.value : null;
|
|
const albumData = albumDataEntry && albumDataEntry.id === albumId ? albumDataEntry.value : null;
|
|
const discography = discographyEntry && discographyEntry.id === artistId ? discographyEntry.value : [];
|
|
const topSongs = topSongsEntry && topSongsEntry.key === topSongsKey ? topSongsEntry.value : [];
|
|
const tourEvents = tourEventsEntry && tourEventsEntry.key === tourKey ? tourEventsEntry.value : [];
|
|
const lfmTrack = lfmTrackEntry && lfmTrackEntry.key === lfmTrackKey ? lfmTrackEntry.value : null;
|
|
const lfmArtist = lfmArtistEntry && lfmArtistEntry.key === lfmArtistKey ? lfmArtistEntry.value : null;
|
|
|
|
return { songMeta, artistInfo, albumData, topSongs, tourEvents, tourLoading, discography, lfmTrack, lfmArtist };
|
|
}
|