refactor(auth): E.44 — extract server-profile + lastfm + audio-settings factories (#609)

Three action-factories peel ~25 setters out of the authStore body,
following the playerStore action-factory pattern from Phase E:

- `createServerProfileActions` — `addServer`, `updateServer`,
  `removeServer` (the non-trivial one — drops every per-server map
  entry for the removed id), `setServers`, `setActiveServer`,
  `setLoggedIn`, `setConnecting`, `setConnectionError`, `logout`.
- `createAuthLastfmActions` — credentials + session connect/disconnect
  + error flag + master scrobbling toggle. Network calls (love /
  scrobble) stay in the playerStore-side `lastfmActions.ts`.
- `createAudioSettingsActions` — replay-gain / normalization /
  loudness mode toggles (each calls `usePlayerStore.getState()
  .updateReplayGainForCurrentTrack()` so a running track catches up),
  plus crossfade / gapless / hi-res / audio-output (no engine
  callback needed).

Pure code-move; no behaviour change. authStore.ts: 518 → 428 LOC (−90).
This commit is contained in:
Frank Stellmacher
2026-05-12 23:30:28 +02:00
committed by GitHub
parent 4d564e5016
commit b8ddb09b78
4 changed files with 184 additions and 96 deletions
+74
View File
@@ -0,0 +1,74 @@
import { clampStoredLoudnessPreAnalysisAttenuationRefDb } from '../utils/loudnessPreAnalysisSlider';
import { DEFAULT_LOUDNESS_PRE_ANALYSIS_ATTENUATION_DB } from './authStoreDefaults';
import { usePlayerStore } from './playerStore';
import type { AuthState } from './authStoreTypes';
type SetState = (
partial: Partial<AuthState> | ((state: AuthState) => Partial<AuthState>),
) => void;
/**
* Audio/playback settings. ReplayGain/normalization/loudness mode
* toggles call `usePlayerStore.getState().updateReplayGainForCurrentTrack()`
* so a running track's engine state catches up to the new mode without
* waiting for the next play. The plain crossfade/gapless/hi-res/output
* setters skip that — they don't change the gain state, only the
* neighbouring transitions or device routing.
*/
export function createAudioSettingsActions(set: SetState): Pick<
AuthState,
| 'setReplayGainEnabled'
| 'setNormalizationEngine'
| 'setLoudnessTargetLufs'
| 'setLoudnessPreAnalysisAttenuationDb'
| 'resetLoudnessPreAnalysisAttenuationDbDefault'
| 'setReplayGainMode'
| 'setReplayGainPreGainDb'
| 'setReplayGainFallbackDb'
| 'setCrossfadeEnabled'
| 'setCrossfadeSecs'
| 'setGaplessEnabled'
| 'setEnableHiRes'
| 'setAudioOutputDevice'
> {
return {
setReplayGainEnabled: (v) => {
set({ replayGainEnabled: v });
usePlayerStore.getState().updateReplayGainForCurrentTrack();
},
setNormalizationEngine: (v) => {
set({ normalizationEngine: v });
usePlayerStore.getState().updateReplayGainForCurrentTrack();
},
setLoudnessTargetLufs: (v) => {
set({ loudnessTargetLufs: v });
usePlayerStore.getState().updateReplayGainForCurrentTrack();
},
setLoudnessPreAnalysisAttenuationDb: (v) => {
const n = typeof v === 'number' ? v : Number(v);
if (!Number.isFinite(n)) return;
set({ loudnessPreAnalysisAttenuationDb: clampStoredLoudnessPreAnalysisAttenuationRefDb(n) });
},
resetLoudnessPreAnalysisAttenuationDbDefault: () => {
set({ loudnessPreAnalysisAttenuationDb: DEFAULT_LOUDNESS_PRE_ANALYSIS_ATTENUATION_DB });
usePlayerStore.getState().updateReplayGainForCurrentTrack();
},
setReplayGainMode: (v) => {
set({ replayGainMode: v });
usePlayerStore.getState().updateReplayGainForCurrentTrack();
},
setReplayGainPreGainDb: (v) => {
set({ replayGainPreGainDb: v });
usePlayerStore.getState().updateReplayGainForCurrentTrack();
},
setReplayGainFallbackDb: (v) => {
set({ replayGainFallbackDb: v });
usePlayerStore.getState().updateReplayGainForCurrentTrack();
},
setCrossfadeEnabled: (v) => set({ crossfadeEnabled: v }),
setCrossfadeSecs: (v) => set({ crossfadeSecs: v }),
setGaplessEnabled: (v) => set({ gaplessEnabled: v }),
setEnableHiRes: (v) => set({ enableHiRes: v }),
setAudioOutputDevice: (v) => set({ audioOutputDevice: v }),
};
}
+35
View File
@@ -0,0 +1,35 @@
import type { AuthState } from './authStoreTypes';
type SetState = (
partial: Partial<AuthState> | ((state: AuthState) => Partial<AuthState>),
) => void;
/**
* Last.fm account settings on the auth side: credentials, session
* connect/disconnect, error flag, and the master scrobbling toggle.
* The actual scrobble/love network calls live in `lastfmActions.ts`
* inside the playerStore — these here only manage the persisted
* account state.
*/
export function createAuthLastfmActions(set: SetState): Pick<
AuthState,
| 'setLastfm'
| 'connectLastfm'
| 'disconnectLastfm'
| 'setLastfmSessionError'
| 'setScrobblingEnabled'
> {
return {
setLastfm: (apiKey, apiSecret, sessionKey, username) =>
set({ lastfmApiKey: apiKey, lastfmApiSecret: apiSecret, lastfmSessionKey: sessionKey, lastfmUsername: username }),
connectLastfm: (sessionKey, username) =>
set({ lastfmSessionKey: sessionKey, lastfmUsername: username }),
disconnectLastfm: () =>
set({ lastfmSessionKey: '', lastfmUsername: '', lastfmSessionError: false }),
setLastfmSessionError: (v) => set({ lastfmSessionError: v }),
setScrobblingEnabled: (v) => set({ scrobblingEnabled: v }),
};
}
+69
View File
@@ -0,0 +1,69 @@
import type { AuthState } from './authStoreTypes';
import { generateId } from './authStoreHelpers';
type SetState = (
partial: Partial<AuthState> | ((state: AuthState) => Partial<AuthState>),
) => void;
/**
* Server profile + connection lifecycle. `removeServer` is the
* non-trivial one: when the active server is the one being removed it
* also drops every per-server map entry tied to that id and switches
* the active id to the next available server (or null) so the rest of
* the app doesn't end up reading stale state.
*/
export function createServerProfileActions(set: SetState): Pick<
AuthState,
| 'addServer'
| 'updateServer'
| 'removeServer'
| 'setServers'
| 'setActiveServer'
| 'setLoggedIn'
| 'setConnecting'
| 'setConnectionError'
| 'logout'
> {
return {
addServer: (profile) => {
const id = generateId();
set(s => ({ servers: [...s.servers, { ...profile, id }] }));
return id;
},
updateServer: (id, data) => {
set(s => ({
servers: s.servers.map(srv => srv.id === id ? { ...srv, ...data } : srv),
}));
},
removeServer: (id) => {
set(s => {
const newServers = s.servers.filter(srv => srv.id !== id);
const switchedAway = s.activeServerId === id;
const { [id]: _r, ...entityRatingRest } = s.entityRatingSupportByServer;
const { [id]: _a, ...audiomuseRest } = s.audiomuseNavidromeByServer;
const { [id]: _idn, ...identityRest } = s.subsonicServerIdentityByServer;
const { [id]: _iss, ...issueRest } = s.audiomuseNavidromeIssueByServer;
const { [id]: _pr, ...probeRest } = s.instantMixProbeByServer;
return {
servers: newServers,
activeServerId: switchedAway ? (newServers[0]?.id ?? null) : s.activeServerId,
isLoggedIn: switchedAway ? false : s.isLoggedIn,
entityRatingSupportByServer: entityRatingRest,
audiomuseNavidromeByServer: audiomuseRest,
subsonicServerIdentityByServer: identityRest,
audiomuseNavidromeIssueByServer: issueRest,
instantMixProbeByServer: probeRest,
};
});
},
setServers: (servers) => set({ servers }),
setActiveServer: (id) => set({ activeServerId: id, musicFolders: [] }),
setLoggedIn: (v) => set({ isLoggedIn: v }),
setConnecting: (v) => set({ isConnecting: v }),
setConnectionError: (e) => set({ connectionError: e }),
logout: () => set({ isLoggedIn: false, musicFolders: [] }),
};
}
+6 -96
View File
@@ -1,15 +1,16 @@
import { create } from 'zustand'; import { create } from 'zustand';
import { persist, createJSONStorage } from 'zustand/middleware'; import { persist, createJSONStorage } from 'zustand/middleware';
import { invoke } from '@tauri-apps/api/core';
import { import {
isNavidromeAudiomuseSoftwareEligible, isNavidromeAudiomuseSoftwareEligible,
} from '../utils/subsonicServerIdentity'; } from '../utils/subsonicServerIdentity';
import { usePlayerStore } from './playerStore';
import { IS_LINUX } from '../utils/platform'; import { IS_LINUX } from '../utils/platform';
import { import {
LOUDNESS_PRE_ANALYSIS_REF_TARGET_LUFS, LOUDNESS_PRE_ANALYSIS_REF_TARGET_LUFS,
clampStoredLoudnessPreAnalysisAttenuationRefDb, clampStoredLoudnessPreAnalysisAttenuationRefDb,
} from '../utils/loudnessPreAnalysisSlider'; } from '../utils/loudnessPreAnalysisSlider';
import { createAudioSettingsActions } from './authAudioSettingsActions';
import { createAuthLastfmActions } from './authLastfmActions';
import { createServerProfileActions } from './authServerProfileActions';
import { import {
DEFAULT_LOUDNESS_PRE_ANALYSIS_ATTENUATION_DB, DEFAULT_LOUDNESS_PRE_ANALYSIS_ATTENUATION_DB,
DEFAULT_LYRICS_SOURCES, DEFAULT_LYRICS_SOURCES,
@@ -19,7 +20,6 @@ import {
clampMixFilterMinStars, clampMixFilterMinStars,
clampRandomMixSize, clampRandomMixSize,
clampSkipStarThreshold, clampSkipStarThreshold,
generateId,
sanitizeLoudnessLufsPreset, sanitizeLoudnessLufsPreset,
sanitizeLoudnessPreAnalysisFromStorage, sanitizeLoudnessPreAnalysisFromStorage,
sanitizeSkipStarCounts, sanitizeSkipStarCounts,
@@ -126,101 +126,15 @@ export const useAuthStore = create<AuthState>()(
connectionError: null, connectionError: null,
lastfmSessionError: false, lastfmSessionError: false,
addServer: (profile) => { ...createServerProfileActions(set),
const id = generateId(); ...createAuthLastfmActions(set),
set(s => ({ servers: [...s.servers, { ...profile, id }] })); ...createAudioSettingsActions(set),
return id;
},
updateServer: (id, data) => {
set(s => ({
servers: s.servers.map(srv => srv.id === id ? { ...srv, ...data } : srv),
}));
},
removeServer: (id) => {
set(s => {
const newServers = s.servers.filter(srv => srv.id !== id);
const switchedAway = s.activeServerId === id;
const { [id]: _r, ...entityRatingRest } = s.entityRatingSupportByServer;
const { [id]: _a, ...audiomuseRest } = s.audiomuseNavidromeByServer;
const { [id]: _idn, ...identityRest } = s.subsonicServerIdentityByServer;
const { [id]: _iss, ...issueRest } = s.audiomuseNavidromeIssueByServer;
const { [id]: _pr, ...probeRest } = s.instantMixProbeByServer;
return {
servers: newServers,
activeServerId: switchedAway ? (newServers[0]?.id ?? null) : s.activeServerId,
isLoggedIn: switchedAway ? false : s.isLoggedIn,
entityRatingSupportByServer: entityRatingRest,
audiomuseNavidromeByServer: audiomuseRest,
subsonicServerIdentityByServer: identityRest,
audiomuseNavidromeIssueByServer: issueRest,
instantMixProbeByServer: probeRest,
};
});
},
setServers: (servers) => set({ servers }),
setActiveServer: (id) => set({ activeServerId: id, musicFolders: [] }),
setLoggedIn: (v) => set({ isLoggedIn: v }),
setConnecting: (v) => set({ isConnecting: v }),
setConnectionError: (e) => set({ connectionError: e }),
setLastfm: (apiKey, apiSecret, sessionKey, username) =>
set({ lastfmApiKey: apiKey, lastfmApiSecret: apiSecret, lastfmSessionKey: sessionKey, lastfmUsername: username }),
connectLastfm: (sessionKey, username) =>
set({ lastfmSessionKey: sessionKey, lastfmUsername: username }),
disconnectLastfm: () =>
set({ lastfmSessionKey: '', lastfmUsername: '', lastfmSessionError: false }),
setLastfmSessionError: (v) => set({ lastfmSessionError: v }),
setScrobblingEnabled: (v) => set({ scrobblingEnabled: v }),
setMaxCacheMb: (v) => set({ maxCacheMb: v }), setMaxCacheMb: (v) => set({ maxCacheMb: v }),
setDownloadFolder: (v) => set({ downloadFolder: v }), setDownloadFolder: (v) => set({ downloadFolder: v }),
setOfflineDownloadDir: (v) => set({ offlineDownloadDir: v }), setOfflineDownloadDir: (v) => set({ offlineDownloadDir: v }),
setExcludeAudiobooks: (v) => set({ excludeAudiobooks: v }), setExcludeAudiobooks: (v) => set({ excludeAudiobooks: v }),
setCustomGenreBlacklist: (v) => set({ customGenreBlacklist: v }), setCustomGenreBlacklist: (v) => set({ customGenreBlacklist: v }),
setReplayGainEnabled: (v) => {
set({ replayGainEnabled: v });
usePlayerStore.getState().updateReplayGainForCurrentTrack();
},
setNormalizationEngine: (v) => {
set({ normalizationEngine: v });
usePlayerStore.getState().updateReplayGainForCurrentTrack();
},
setLoudnessTargetLufs: (v) => {
set({ loudnessTargetLufs: v });
usePlayerStore.getState().updateReplayGainForCurrentTrack();
},
setLoudnessPreAnalysisAttenuationDb: (v) => {
const n = typeof v === 'number' ? v : Number(v);
if (!Number.isFinite(n)) return;
set({ loudnessPreAnalysisAttenuationDb: clampStoredLoudnessPreAnalysisAttenuationRefDb(n) });
},
resetLoudnessPreAnalysisAttenuationDbDefault: () => {
set({ loudnessPreAnalysisAttenuationDb: DEFAULT_LOUDNESS_PRE_ANALYSIS_ATTENUATION_DB });
usePlayerStore.getState().updateReplayGainForCurrentTrack();
},
setReplayGainMode: (v) => {
set({ replayGainMode: v });
usePlayerStore.getState().updateReplayGainForCurrentTrack();
},
setReplayGainPreGainDb: (v) => {
set({ replayGainPreGainDb: v });
usePlayerStore.getState().updateReplayGainForCurrentTrack();
},
setReplayGainFallbackDb: (v) => {
set({ replayGainFallbackDb: v });
usePlayerStore.getState().updateReplayGainForCurrentTrack();
},
setCrossfadeEnabled: (v) => set({ crossfadeEnabled: v }),
setCrossfadeSecs: (v) => set({ crossfadeSecs: v }),
setGaplessEnabled: (v) => set({ gaplessEnabled: v }),
setTrackPreviewsEnabled: (v) => set({ trackPreviewsEnabled: !!v }), setTrackPreviewsEnabled: (v) => set({ trackPreviewsEnabled: !!v }),
setTrackPreviewLocation: (location, enabled) => set(state => ({ setTrackPreviewLocation: (location, enabled) => set(state => ({
trackPreviewLocations: { ...state.trackPreviewLocations, [location]: !!enabled }, trackPreviewLocations: { ...state.trackPreviewLocations, [location]: !!enabled },
@@ -261,8 +175,6 @@ export const useAuthStore = create<AuthState>()(
setSeekbarStyle: (v) => set({ seekbarStyle: v }), setSeekbarStyle: (v) => set({ seekbarStyle: v }),
setQueueNowPlayingCollapsed: (v: boolean) => set({ queueNowPlayingCollapsed: v }), setQueueNowPlayingCollapsed: (v: boolean) => set({ queueNowPlayingCollapsed: v }),
setEnableHiRes: (v) => set({ enableHiRes: v }),
setAudioOutputDevice: (v) => set({ audioOutputDevice: v }),
setHotCacheEnabled: (v) => set({ hotCacheEnabled: v }), setHotCacheEnabled: (v) => set({ hotCacheEnabled: v }),
setHotCacheMaxMb: (v) => set({ hotCacheMaxMb: v }), setHotCacheMaxMb: (v) => set({ hotCacheMaxMb: v }),
setHotCacheDebounceSec: (v) => set({ hotCacheDebounceSec: v }), setHotCacheDebounceSec: (v) => set({ hotCacheDebounceSec: v }),
@@ -391,8 +303,6 @@ export const useAuthStore = create<AuthState>()(
})(), })(),
), ),
logout: () => set({ isLoggedIn: false, musicFolders: [] }),
getBaseUrl: () => { getBaseUrl: () => {
const s = get(); const s = get();
const server = s.servers.find(srv => srv.id === s.activeServerId); const server = s.servers.find(srv => srv.id === s.activeServerId);