refactor(waveform): move waveform data pipeline back to audio-core

The M0 pilot mis-membered the waveform data pipeline into features/waveform,
creating a core->feature inversion: ~12 audio-core files in store/ imported
refreshWaveformForTrack / fetchWaveformBins / bumpWaveformRefreshGen from the
feature barrel. These are playback coordination (write waveformBins into
playerStore on track change, last-write-wins gen guard), not seekbar rendering.

Move waveformRefresh + waveformRefreshGen (+ tests) to src/store/ and
waveformParse (+ test) to src/utils/waveform/ (beside waveformSilence). The
feature now holds only the seekbar UI (WaveformSeek/SeekbarPreview + their
hooks/render utils); its barrel exports UI only. Core consumers import the
pipeline directly from @/store/*. Restores the no-core->feature-inversion rule.
This commit is contained in:
Psychotoxical
2026-06-30 00:07:34 +02:00
parent e945da693a
commit 70c145db06
19 changed files with 32 additions and 28 deletions
+11 -7
View File
@@ -1,11 +1,15 @@
/** /**
* Waveform seekbar feature — the canvas seekbar, its waveform-bin loading, and * Waveform seekbar feature — the canvas seekbar (rendering only). Co-located
* the per-track refresh generation guard. Co-located mirror of `cover/` / * mirror of `cover/` / `music-network/`.
* `music-network/`. `waveformSilence` stays in `utils/waveform/` (crossfade / *
* auto-dj concern, not seekbar rendering). * The waveform DATA pipeline is audio-core, NOT this feature: the audio engine
* calls it on track change to write `waveformBins` into the player store. It
* therefore lives in core, consumed directly (never via this barrel):
* - `@/store/waveformRefresh` — `refreshWaveformForTrack` / `fetchWaveformBins`
* - `@/store/waveformRefreshGen` — `bumpWaveformRefreshGen` / `getWaveformRefreshGen`
* - `@/utils/waveform/waveformParse` — bin coercion (alongside `waveformSilence`,
* the crossfade / auto-dj silence helper)
* Keeping these in core preserves the iron rule (no core→feature inversion).
*/ */
export { default as WaveformSeek } from './components/WaveformSeek'; export { default as WaveformSeek } from './components/WaveformSeek';
export { SeekbarPreview } from './components/WaveformSeekPreview'; export { SeekbarPreview } from './components/WaveformSeekPreview';
export { fetchWaveformBins, refreshWaveformForTrack } from './store/waveformRefresh';
export type { WaveformCachePayload } from './store/waveformRefresh';
export { bumpWaveformRefreshGen, getWaveformRefreshGen } from './store/waveformRefreshGen';
+1 -1
View File
@@ -20,7 +20,7 @@ import {
type QueueUndoSnapshot, type QueueUndoSnapshot,
} from './queueUndo'; } from './queueUndo';
import { refreshLoudnessForTrack } from './loudnessRefresh'; import { refreshLoudnessForTrack } from './loudnessRefresh';
import { refreshWaveformForTrack } from '@/features/waveform'; import { refreshWaveformForTrack } from '@/store/waveformRefresh';
import { stopRadio } from './radioPlayer'; import { stopRadio } from './radioPlayer';
import { clearAllPlaybackScheduleTimers } from './scheduleTimers'; import { clearAllPlaybackScheduleTimers } from './scheduleTimers';
import { syncUserQueueMutationToServer } from './queueSync'; import { syncUserQueueMutationToServer } from './queueSync';
+1 -1
View File
@@ -27,7 +27,7 @@ vi.mock('./pausedRestorePrepare', () => ({
preparePausedRestoreOnStartup: vi.fn(), preparePausedRestoreOnStartup: vi.fn(),
})); }));
vi.mock('@/features/waveform', () => ({ vi.mock('@/store/waveformRefresh', () => ({
refreshWaveformForTrack: vi.fn(), refreshWaveformForTrack: vi.fn(),
})); }));
+1 -1
View File
@@ -9,7 +9,7 @@ import { useAuthStore } from './authStore';
import { usePlayerStore } from './playerStore'; import { usePlayerStore } from './playerStore';
import { preparePausedRestoreOnStartup } from './pausedRestorePrepare'; import { preparePausedRestoreOnStartup } from './pausedRestorePrepare';
import { pushQueueUndoFromGetter } from './queueUndo'; import { pushQueueUndoFromGetter } from './queueUndo';
import { refreshWaveformForTrack } from '@/features/waveform'; import { refreshWaveformForTrack } from '@/store/waveformRefresh';
import { import {
getIdlePullGeneration, getIdlePullGeneration,
isIdleQueuePullSuspended, isIdleQueuePullSuspended,
+1 -1
View File
@@ -87,7 +87,7 @@ import {
getSeekTarget, getSeekTarget,
getSeekTargetSetAt, getSeekTargetSetAt,
} from './seekTargetState'; } from './seekTargetState';
import { refreshWaveformForTrack } from '@/features/waveform'; import { refreshWaveformForTrack } from '@/store/waveformRefresh';
import { analyzeBoundary, computeWaveformSilence } from '../utils/waveform/waveformSilence'; import { analyzeBoundary, computeWaveformSilence } from '../utils/waveform/waveformSilence';
import { autodjMaxOverlapCapSec } from '../utils/playback/autodjOverlapCap'; import { autodjMaxOverlapCapSec } from '../utils/playback/autodjOverlapCap';
import { import {
@@ -24,8 +24,8 @@ import {
markNormalizationUiUpdate, markNormalizationUiUpdate,
} from '../playbackThrottles'; } from '../playbackThrottles';
import { usePlayerStore } from '../playerStore'; import { usePlayerStore } from '../playerStore';
import { refreshWaveformForTrack } from '@/features/waveform'; import { refreshWaveformForTrack } from '@/store/waveformRefresh';
import { bumpWaveformRefreshGen } from '@/features/waveform'; import { bumpWaveformRefreshGen } from '@/store/waveformRefreshGen';
import { setBytePreloadingId } from '../gaplessPreloadState'; import { setBytePreloadingId } from '../gaplessPreloadState';
type PreloadEventPayload = { type PreloadEventPayload = {
@@ -7,8 +7,8 @@ import { invokeAudioSetNormalizationDeduped } from '../normalizationIpcDedupe';
import { usePlayerStore } from '../playerStore'; import { usePlayerStore } from '../playerStore';
import { clearLoudnessCacheStateForTrackId } from '../loudnessGainCache'; import { clearLoudnessCacheStateForTrackId } from '../loudnessGainCache';
import { refreshLoudnessForTrack } from '../loudnessRefresh'; import { refreshLoudnessForTrack } from '../loudnessRefresh';
import { refreshWaveformForTrack } from '@/features/waveform'; import { refreshWaveformForTrack } from '@/store/waveformRefresh';
import { bumpWaveformRefreshGen } from '@/features/waveform'; import { bumpWaveformRefreshGen } from '@/store/waveformRefreshGen';
/** /**
* Keeps the Rust audio engine in sync whenever the auth store changes * Keeps the Rust audio engine in sync whenever the auth store changes
@@ -5,7 +5,7 @@ import { emitNormalizationDebug } from '../normalizationDebug';
import { invokeAudioSetNormalizationDeduped } from '../normalizationIpcDedupe'; import { invokeAudioSetNormalizationDeduped } from '../normalizationIpcDedupe';
import { usePlayerStore } from '../playerStore'; import { usePlayerStore } from '../playerStore';
import { refreshLoudnessForTrack } from '../loudnessRefresh'; import { refreshLoudnessForTrack } from '../loudnessRefresh';
import { refreshWaveformForTrack } from '@/features/waveform'; import { refreshWaveformForTrack } from '@/store/waveformRefresh';
/** /**
* One-shot startup sync: pushes the persisted audio settings to the Rust engine * One-shot startup sync: pushes the persisted audio settings to the Rust engine
+1 -1
View File
@@ -15,7 +15,7 @@ import {
import { getBytePreloadingId, setBytePreloadingId } from './gaplessPreloadState'; import { getBytePreloadingId, setBytePreloadingId } from './gaplessPreloadState';
import { refreshLoudnessForTrack } from './loudnessRefresh'; import { refreshLoudnessForTrack } from './loudnessRefresh';
import { usePlayerStore } from './playerStore'; import { usePlayerStore } from './playerStore';
import { fetchWaveformBins } from '@/features/waveform'; import { fetchWaveformBins } from '@/store/waveformRefresh';
// Crossfade pre-buffer budget: begin downloading the next track this many // Crossfade pre-buffer budget: begin downloading the next track this many
// seconds before it needs to play (the crossfade start), so a large lossless // seconds before it needs to play (the crossfade start), so a large lossless
+1 -1
View File
@@ -39,7 +39,7 @@ vi.mock('./playerStore', () => ({
setState: hoisted.playerSetStateMock, setState: hoisted.playerSetStateMock,
}, },
})); }));
vi.mock('@/features/waveform', () => ({ vi.mock('@/store/waveformRefreshGen', () => ({
bumpWaveformRefreshGen: hoisted.bumpWaveformRefreshGenMock, bumpWaveformRefreshGen: hoisted.bumpWaveformRefreshGenMock,
})); }));
vi.mock('./loudnessGainCache', () => ({ vi.mock('./loudnessGainCache', () => ({
+1 -1
View File
@@ -3,7 +3,7 @@ import { invoke } from '@tauri-apps/api/core';
import { getPlaybackIndexKey } from '../utils/playback/playbackServer'; import { getPlaybackIndexKey } from '../utils/playback/playbackServer';
import { useAuthStore } from './authStore'; import { useAuthStore } from './authStore';
import { usePlayerStore } from './playerStore'; import { usePlayerStore } from './playerStore';
import { bumpWaveformRefreshGen } from '@/features/waveform'; import { bumpWaveformRefreshGen } from '@/store/waveformRefreshGen';
import { clearLoudnessCacheStateForTrackId } from './loudnessGainCache'; import { clearLoudnessCacheStateForTrackId } from './loudnessGainCache';
import { resetLoudnessBackfillStateForTrackId } from './loudnessBackfillState'; import { resetLoudnessBackfillStateForTrackId } from './loudnessBackfillState';
+1 -1
View File
@@ -51,7 +51,7 @@ import {
loudnessGainDbForEngineBind, loudnessGainDbForEngineBind,
} from './loudnessGainCache'; } from './loudnessGainCache';
import { refreshLoudnessForTrack } from './loudnessRefresh'; import { refreshLoudnessForTrack } from './loudnessRefresh';
import { fetchWaveformBins, refreshWaveformForTrack } from '@/features/waveform'; import { fetchWaveformBins, refreshWaveformForTrack } from '@/store/waveformRefresh';
import { deriveNormalizationSnapshot } from './normalizationSnapshot'; import { deriveNormalizationSnapshot } from './normalizationSnapshot';
import { useOrbitStore } from './orbitStore'; import { useOrbitStore } from './orbitStore';
import { import {
+1 -1
View File
@@ -11,7 +11,7 @@ import { clearSeekDebounce } from './seekDebounce';
import { clearSeekFallbackRetry } from './seekFallbackState'; import { clearSeekFallbackRetry } from './seekFallbackState';
import { clearSeekTarget } from './seekTargetState'; import { clearSeekTarget } from './seekTargetState';
import { tryAcquireTogglePlayLock } from './togglePlayLock'; import { tryAcquireTogglePlayLock } from './togglePlayLock';
import { refreshWaveformForTrack } from '@/features/waveform'; import { refreshWaveformForTrack } from '@/store/waveformRefresh';
import { clearAutodjTransitionUi } from './autodjTransitionUi'; import { clearAutodjTransitionUi } from './autodjTransitionUi';
type SetState = ( type SetState = (
@@ -22,18 +22,18 @@ const hoisted = vi.hoisted(() => ({
})); }));
vi.mock('@tauri-apps/api/core', () => ({ invoke: hoisted.invokeMock })); vi.mock('@tauri-apps/api/core', () => ({ invoke: hoisted.invokeMock }));
vi.mock('@/features/waveform/utils/waveformParse', () => ({ coerceWaveformBins: hoisted.coerceWaveformBinsMock })); vi.mock('@/utils/waveform/waveformParse', () => ({ coerceWaveformBins: hoisted.coerceWaveformBinsMock }));
vi.mock('@/store/playerStore', () => ({ vi.mock('@/store/playerStore', () => ({
usePlayerStore: { usePlayerStore: {
getState: () => hoisted.playerSnapshot, getState: () => hoisted.playerSnapshot,
setState: hoisted.playerSetStateMock, setState: hoisted.playerSetStateMock,
}, },
})); }));
vi.mock('@/features/waveform/store/waveformRefreshGen', () => ({ vi.mock('@/store/waveformRefreshGen', () => ({
getWaveformRefreshGen: hoisted.getGenMock, getWaveformRefreshGen: hoisted.getGenMock,
})); }));
import { refreshWaveformForTrack } from '@/features/waveform/store/waveformRefresh'; import { refreshWaveformForTrack } from '@/store/waveformRefresh';
beforeEach(() => { beforeEach(() => {
hoisted.invokeMock.mockReset(); hoisted.invokeMock.mockReset();
@@ -1,8 +1,8 @@
import { invoke } from '@tauri-apps/api/core'; import { invoke } from '@tauri-apps/api/core';
import { coerceWaveformBins } from '@/features/waveform/utils/waveformParse'; import { coerceWaveformBins } from '@/utils/waveform/waveformParse';
import { getPlaybackIndexKey } from '@/utils/playback/playbackServer'; import { getPlaybackIndexKey } from '@/utils/playback/playbackServer';
import { usePlayerStore } from '@/store/playerStore'; import { usePlayerStore } from '@/store/playerStore';
import { getWaveformRefreshGen } from '@/features/waveform/store/waveformRefreshGen'; import { getWaveformRefreshGen } from '@/store/waveformRefreshGen';
/** Subsonic-server waveform-cache row as Rust hands it back. */ /** Subsonic-server waveform-cache row as Rust hands it back. */
export type WaveformCachePayload = { export type WaveformCachePayload = {
@@ -3,7 +3,7 @@ import {
_resetWaveformRefreshGenForTest, _resetWaveformRefreshGenForTest,
bumpWaveformRefreshGen, bumpWaveformRefreshGen,
getWaveformRefreshGen, getWaveformRefreshGen,
} from '@/features/waveform/store/waveformRefreshGen'; } from '@/store/waveformRefreshGen';
afterEach(() => { afterEach(() => {
_resetWaveformRefreshGenForTest(); _resetWaveformRefreshGenForTest();
@@ -1,5 +1,5 @@
import { describe, expect, it } from 'vitest'; import { describe, expect, it } from 'vitest';
import { coerceWaveformBins, waveformBlobLenOk } from '@/features/waveform/utils/waveformParse'; import { coerceWaveformBins, waveformBlobLenOk } from '@/utils/waveform/waveformParse';
describe('waveformBlobLenOk', () => { describe('waveformBlobLenOk', () => {
it('accepts the legacy single-curve length (500)', () => { it('accepts the legacy single-curve length (500)', () => {