feat(qbzd): bifurcate playback and queue stores for remote mode
New commandRouter.ts provides a single bifurcation point for all playback and queue operations. When playbackTarget is 'qbzd', commands route to the daemon HTTP API. When 'local', they use Tauri invoke(). Stores updated: - playerStore.ts: pause, resume, stop, seek, volume, play_track (6 sites) - queueStore.ts: shuffle, repeat, add, add-next, set, clear (8 sites) No behavioral change in local mode — invoke() calls are identical. cc
This commit is contained in:
3 files changed
+188
-22
No files matched your search
@@ -0,0 +1,170 @@
|
||||
/**
|
||||
* Command Router
|
||||
*
|
||||
* Routes commands to either Tauri invoke() or remote HTTP API based on
|
||||
* the current playback target. This is the single point where local vs
|
||||
* remote bifurcation happens — stores and services call these functions
|
||||
* instead of invoke() directly for playback/queue operations.
|
||||
*
|
||||
* Only playback, queue, and favorites operations route remotely.
|
||||
* Everything else (settings, library, integrations) always stays local.
|
||||
*/
|
||||
import { invoke } from '@tauri-apps/api/core';
|
||||
import { getTarget } from '$lib/stores/playbackTargetStore';
|
||||
import { remotePost, remoteGet } from '$lib/services/remoteApi';
|
||||
|
||||
// ==================== Playback ====================
|
||||
|
||||
export async function cmdPause(): Promise<void> {
|
||||
const target = getTarget();
|
||||
if (target.type === 'qbzd') {
|
||||
await remotePost('/api/playback/pause');
|
||||
} else {
|
||||
await invoke('v2_pause_playback');
|
||||
}
|
||||
}
|
||||
|
||||
export async function cmdResume(): Promise<void> {
|
||||
const target = getTarget();
|
||||
if (target.type === 'qbzd') {
|
||||
await remotePost('/api/playback/play');
|
||||
} else {
|
||||
await invoke('v2_resume_playback');
|
||||
}
|
||||
}
|
||||
|
||||
export async function cmdStop(): Promise<void> {
|
||||
const target = getTarget();
|
||||
if (target.type === 'qbzd') {
|
||||
await remotePost('/api/playback/stop');
|
||||
} else {
|
||||
await invoke('v2_stop_playback');
|
||||
}
|
||||
}
|
||||
|
||||
export async function cmdSeek(position: number): Promise<void> {
|
||||
const target = getTarget();
|
||||
if (target.type === 'qbzd') {
|
||||
await remotePost('/api/playback/seek', { position_secs: Math.floor(position) });
|
||||
} else {
|
||||
await invoke('v2_seek', { position: Math.floor(position) });
|
||||
}
|
||||
}
|
||||
|
||||
export async function cmdSetVolume(volume: number): Promise<void> {
|
||||
const target = getTarget();
|
||||
if (target.type === 'qbzd') {
|
||||
await remotePost('/api/playback/volume', { volume });
|
||||
} else {
|
||||
await invoke('v2_set_volume', { volume });
|
||||
}
|
||||
}
|
||||
|
||||
export async function cmdNext(): Promise<unknown> {
|
||||
const target = getTarget();
|
||||
if (target.type === 'qbzd') {
|
||||
return remotePost('/api/playback/next');
|
||||
} else {
|
||||
return invoke('v2_next_track');
|
||||
}
|
||||
}
|
||||
|
||||
export async function cmdPrevious(): Promise<unknown> {
|
||||
const target = getTarget();
|
||||
if (target.type === 'qbzd') {
|
||||
return remotePost('/api/playback/previous');
|
||||
} else {
|
||||
return invoke('v2_previous_track');
|
||||
}
|
||||
}
|
||||
|
||||
export async function cmdPlayTrack(
|
||||
trackId: number,
|
||||
quality?: string,
|
||||
lowQualityFallback?: unknown,
|
||||
): Promise<unknown> {
|
||||
const target = getTarget();
|
||||
if (target.type === 'qbzd') {
|
||||
return remotePost('/api/playback/play-track', { track_id: trackId, quality });
|
||||
} else {
|
||||
return invoke('v2_play_track', { trackId, qualityStr: quality, lowQualityFallback: lowQualityFallback ?? null });
|
||||
}
|
||||
}
|
||||
|
||||
// ==================== Queue ====================
|
||||
|
||||
export async function cmdSetQueue(tracks: unknown[], startIndex: number): Promise<void> {
|
||||
const target = getTarget();
|
||||
if (target.type === 'qbzd') {
|
||||
await remotePost('/api/queue/set', { tracks, start_index: startIndex });
|
||||
} else {
|
||||
await invoke('v2_set_queue', { tracks, startIndex });
|
||||
}
|
||||
}
|
||||
|
||||
export async function cmdAddToQueue(track: unknown): Promise<void> {
|
||||
const target = getTarget();
|
||||
if (target.type === 'qbzd') {
|
||||
await remotePost('/api/queue/add', { tracks: [track] });
|
||||
} else {
|
||||
await invoke('v2_add_to_queue', { track });
|
||||
}
|
||||
}
|
||||
|
||||
export async function cmdAddToQueueNext(track: unknown): Promise<void> {
|
||||
const target = getTarget();
|
||||
if (target.type === 'qbzd') {
|
||||
await remotePost('/api/queue/add-next', { tracks: [track] });
|
||||
} else {
|
||||
await invoke('v2_add_to_queue_next', { track });
|
||||
}
|
||||
}
|
||||
|
||||
export async function cmdAddTracksToQueue(tracks: unknown[]): Promise<void> {
|
||||
const target = getTarget();
|
||||
if (target.type === 'qbzd') {
|
||||
await remotePost('/api/queue/add', { tracks });
|
||||
} else {
|
||||
await invoke('v2_add_tracks_to_queue', { tracks });
|
||||
}
|
||||
}
|
||||
|
||||
export async function cmdAddTracksToQueueNext(tracks: unknown[]): Promise<void> {
|
||||
const target = getTarget();
|
||||
if (target.type === 'qbzd') {
|
||||
await remotePost('/api/queue/add-next', { tracks });
|
||||
} else {
|
||||
await invoke('v2_add_tracks_to_queue_next', { tracks });
|
||||
}
|
||||
}
|
||||
|
||||
export async function cmdClearQueue(): Promise<void> {
|
||||
const target = getTarget();
|
||||
if (target.type === 'qbzd') {
|
||||
await remotePost('/api/queue/clear');
|
||||
} else {
|
||||
await invoke('v2_clear_queue');
|
||||
}
|
||||
}
|
||||
|
||||
export async function cmdToggleShuffle(): Promise<void> {
|
||||
const target = getTarget();
|
||||
if (target.type === 'qbzd') {
|
||||
// Remote: get current state and toggle
|
||||
const queue = await remoteGet<{ shuffle: boolean }>('/api/queue');
|
||||
await remotePost('/api/queue/shuffle', { enabled: !queue.shuffle });
|
||||
} else {
|
||||
await invoke('v2_toggle_shuffle');
|
||||
}
|
||||
}
|
||||
|
||||
export async function cmdSetRepeatMode(mode: string): Promise<void> {
|
||||
const target = getTarget();
|
||||
if (target.type === 'qbzd') {
|
||||
await remotePost('/api/queue/repeat', { mode });
|
||||
} else {
|
||||
// Map frontend mode names to V2 command format
|
||||
const v2Mode = mode === 'one' ? 'One' : mode === 'all' ? 'All' : 'Off';
|
||||
await invoke('v2_set_repeat_mode', { mode: v2Mode });
|
||||
}
|
||||
}
|
||||
@@ -6,6 +6,7 @@
|
||||
*/
|
||||
|
||||
import { invoke } from '@tauri-apps/api/core';
|
||||
import { cmdPause, cmdResume, cmdStop, cmdSeek, cmdSetVolume, cmdPlayTrack } from '$lib/services/commandRouter';
|
||||
import { saveSessionVolume } from '$lib/services/sessionService';
|
||||
import { getUserItem, setUserItem, removeUserItem } from '$lib/utils/userStorage';
|
||||
|
||||
@@ -237,7 +238,7 @@ async function flushPendingSeek(): Promise<void> {
|
||||
|
||||
seekRequestInFlight = true;
|
||||
try {
|
||||
await invoke('v2_seek', { position: Math.floor(targetPosition) });
|
||||
await cmdSeek(targetPosition);
|
||||
} catch (err) {
|
||||
console.error('Failed to seek:', err);
|
||||
} finally {
|
||||
@@ -416,18 +417,14 @@ export async function togglePlay(): Promise<void> {
|
||||
await invoke('v2_library_play_track', { trackId: localTrackId });
|
||||
} else {
|
||||
// Qobuz track - use v2_play_track
|
||||
await invoke('v2_play_track', {
|
||||
trackId: currentTrack.id,
|
||||
quality: getStreamingQuality(),
|
||||
durationSecs: currentTrack.duration ? Math.round(currentTrack.duration) : null
|
||||
});
|
||||
await cmdPlayTrack(currentTrack.id, getStreamingQuality());
|
||||
}
|
||||
|
||||
} else {
|
||||
await invoke('v2_resume_playback');
|
||||
await cmdResume();
|
||||
}
|
||||
} else {
|
||||
await invoke('v2_pause_playback');
|
||||
await cmdPause();
|
||||
}
|
||||
} catch (err) {
|
||||
console.error('Failed to toggle playback:', err);
|
||||
@@ -474,7 +471,7 @@ export async function resyncPersistedVolume(): Promise<void> {
|
||||
volume = persistedVolume;
|
||||
notifyListeners();
|
||||
try {
|
||||
await invoke('v2_set_volume', { volume: persistedVolume / 100 });
|
||||
await cmdSetVolume(persistedVolume / 100);
|
||||
console.log('[Player] Resynced volume after login:', persistedVolume);
|
||||
} catch {
|
||||
console.debug('[Player] Could not resync volume to backend');
|
||||
@@ -500,7 +497,7 @@ export async function setVolume(newVolume: number): Promise<void> {
|
||||
}
|
||||
|
||||
// Try to set volume on backend - will fail silently if no track is loaded
|
||||
await invoke('v2_set_volume', { volume: clampedVolume / 100 });
|
||||
await cmdSetVolume(clampedVolume / 100);
|
||||
} catch (err) {
|
||||
// Ignore errors when nothing is playing - volume is saved and will apply on next play
|
||||
console.debug('Volume set locally (no active playback):', clampedVolume);
|
||||
@@ -542,7 +539,7 @@ export async function stop(): Promise<void> {
|
||||
if (isCasting()) {
|
||||
await castStop();
|
||||
} else {
|
||||
await invoke('v2_stop_playback');
|
||||
await cmdStop();
|
||||
}
|
||||
isPlaying = false;
|
||||
currentTrack = null;
|
||||
@@ -844,7 +841,7 @@ export async function startPolling(): Promise<void> {
|
||||
// the unscoped key. resyncPersistedVolume() is called after login to fix this.
|
||||
const persistedVolume = loadPersistedVolume();
|
||||
try {
|
||||
await invoke('v2_set_volume', { volume: persistedVolume / 100 });
|
||||
await cmdSetVolume(persistedVolume / 100);
|
||||
console.log('[Player] Synced persisted volume to backend:', persistedVolume);
|
||||
} catch {
|
||||
// Backend might not be ready yet, volume will be applied on first interaction
|
||||
|
||||
@@ -6,6 +6,7 @@
|
||||
|
||||
import { invoke } from '@tauri-apps/api/core';
|
||||
import { listen, type UnlistenFn } from '@tauri-apps/api/event';
|
||||
import { cmdToggleShuffle, cmdSetRepeatMode, cmdAddToQueue, cmdAddToQueueNext, cmdAddTracksToQueue, cmdAddTracksToQueueNext, cmdSetQueue, cmdClearQueue } from '$lib/services/commandRouter';
|
||||
|
||||
// ============ Types ============
|
||||
|
||||
@@ -277,7 +278,7 @@ export async function toggleShuffle(): Promise<{ success: boolean; enabled: bool
|
||||
const newState = !isShuffle;
|
||||
|
||||
try {
|
||||
await invoke('v2_toggle_shuffle');
|
||||
await cmdToggleShuffle();
|
||||
return { success: true, enabled: newState };
|
||||
} catch (err) {
|
||||
console.error('Failed to set shuffle:', err);
|
||||
@@ -291,11 +292,9 @@ export async function toggleShuffle(): Promise<{ success: boolean; enabled: bool
|
||||
export async function toggleRepeat(): Promise<{ success: boolean; mode: RepeatMode }> {
|
||||
const currentMode = await resolveAuthoritativeRepeatMode();
|
||||
const nextMode: RepeatMode = currentMode === 'off' ? 'all' : currentMode === 'all' ? 'one' : 'off';
|
||||
// V2 expects capitalized repeat mode: 'Off' | 'All' | 'One'
|
||||
const v2Mode = nextMode.charAt(0).toUpperCase() + nextMode.slice(1);
|
||||
|
||||
try {
|
||||
await invoke('v2_set_repeat_mode', { mode: v2Mode });
|
||||
await cmdSetRepeatMode(nextMode);
|
||||
pendingRepeatMode = nextMode;
|
||||
return { success: true, mode: nextMode };
|
||||
} catch (err) {
|
||||
@@ -310,7 +309,7 @@ export async function toggleRepeat(): Promise<{ success: boolean; mode: RepeatMo
|
||||
*/
|
||||
export async function addToQueueNext(track: BackendQueueTrack, isLocal = false): Promise<boolean> {
|
||||
try {
|
||||
await invoke('v2_add_to_queue_next', { track });
|
||||
await cmdAddToQueueNext(track);
|
||||
if (isLocal) {
|
||||
localTrackIds = new Set([...localTrackIds, track.id]);
|
||||
}
|
||||
@@ -327,7 +326,7 @@ export async function addToQueueNext(track: BackendQueueTrack, isLocal = false):
|
||||
*/
|
||||
export async function addToQueue(track: BackendQueueTrack, isLocal = false): Promise<boolean> {
|
||||
try {
|
||||
await invoke('v2_add_to_queue', { track });
|
||||
await cmdAddToQueue(track);
|
||||
if (isLocal) {
|
||||
localTrackIds = new Set([...localTrackIds, track.id]);
|
||||
}
|
||||
@@ -344,7 +343,7 @@ export async function addToQueue(track: BackendQueueTrack, isLocal = false): Pro
|
||||
*/
|
||||
export async function addTracksToQueue(tracks: BackendQueueTrack[]): Promise<boolean> {
|
||||
try {
|
||||
await invoke('v2_add_tracks_to_queue', { tracks });
|
||||
await cmdAddTracksToQueue(tracks);
|
||||
await syncQueueState();
|
||||
return true;
|
||||
} catch (err) {
|
||||
@@ -359,7 +358,7 @@ export async function addTracksToQueue(tracks: BackendQueueTrack[]): Promise<boo
|
||||
*/
|
||||
export async function addTracksToQueueNext(tracks: BackendQueueTrack[]): Promise<boolean> {
|
||||
try {
|
||||
await invoke('v2_add_tracks_to_queue_next', { tracks });
|
||||
await cmdAddTracksToQueueNext(tracks);
|
||||
await syncQueueState();
|
||||
return true;
|
||||
} catch (err) {
|
||||
@@ -386,7 +385,7 @@ export function getQueueEpoch(): number {
|
||||
export async function setQueue(tracks: BackendQueueTrack[], startIndex: number, clearLocal = true): Promise<boolean> {
|
||||
try {
|
||||
queueEpoch++;
|
||||
await invoke('v2_set_queue', { tracks, startIndex });
|
||||
await cmdSetQueue(tracks, startIndex);
|
||||
if (clearLocal) {
|
||||
localTrackIds = new Set();
|
||||
}
|
||||
@@ -404,7 +403,7 @@ export async function setQueue(tracks: BackendQueueTrack[], startIndex: number,
|
||||
export async function clearQueue(): Promise<boolean> {
|
||||
try {
|
||||
queueEpoch++;
|
||||
await invoke('v2_clear_queue');
|
||||
await cmdClearQueue();
|
||||
return true;
|
||||
} catch (err) {
|
||||
console.error('Failed to clear queue:', err);
|
||||
|
||||
Reference in new issue
Block a user