From 06c0e9735cfa566bd45ac28e1e14aa82ef8b9b03 Mon Sep 17 00:00:00 2001 From: vicrodh <103399283+vicrodh@users.noreply.github.com> Date: Fri, 20 Feb 2026 20:43:35 -0600 Subject: [PATCH] fix(session): use struct return type and proactive saves MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Two fixes for session not persisting: 1. Changed v2_get_all_queue_tracks to return a struct instead of a tuple — Tauri IPC serialization of tuples is unreliable. 2. Added proactive session saves instead of relying on async beforeunload (which races with window close): - Debounced full save on track change (2s after new track starts) - Debounced full save on pause - Reduced periodic save from 60s to 15s during playback - Close handler remains as best-effort backup --- src-tauri/src/commands_v2.rs | 12 ++++++++++-- src/routes/+page.svelte | 29 ++++++++++++++++++++++++++--- 2 files changed, 36 insertions(+), 5 deletions(-) diff --git a/src-tauri/src/commands_v2.rs b/src-tauri/src/commands_v2.rs index a492a1fab..e902cb3e0 100644 --- a/src-tauri/src/commands_v2.rs +++ b/src-tauri/src/commands_v2.rs @@ -4360,13 +4360,21 @@ pub async fn v2_get_queue_state( Ok(bridge.get_queue_state().await) } +/// Full queue snapshot for session persistence (no caps on track count) +#[derive(serde::Serialize)] +pub struct AllQueueTracksResponse { + pub tracks: Vec, + pub current_index: Option, +} + /// Get all queue tracks and current index (for session persistence, no caps) #[tauri::command] pub async fn v2_get_all_queue_tracks( bridge: State<'_, CoreBridgeState>, -) -> Result<(Vec, Option), RuntimeError> { +) -> Result { let bridge = bridge.get().await; - Ok(bridge.get_all_queue_tracks().await) + let (tracks, current_index) = bridge.get_all_queue_tracks().await; + Ok(AllQueueTracksResponse { tracks, current_index }) } /// Get currently selected queue track (V2) diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte index 4472e6ad1..721e0abc5 100644 --- a/src/routes/+page.svelte +++ b/src/routes/+page.svelte @@ -2665,7 +2665,9 @@ } // Get ALL queue tracks from backend (uncapped, for full persistence) - const [tracks, currentIndex] = await invoke<[BackendQueueTrack[], number | null]>('v2_get_all_queue_tracks'); + const snapshot = await invoke<{ tracks: BackendQueueTrack[]; current_index: number | null }>('v2_get_all_queue_tracks'); + const tracks = snapshot.tracks; + const currentIndex = snapshot.current_index; const allTracks: PersistedQueueTrack[] = tracks.map(track => ({ id: track.id, @@ -2720,7 +2722,17 @@ }; }); - // Periodic full session save during playback (every 30 seconds) + // Debounced full session save (coalesces rapid state changes into a single save) + let sessionSaveDebounce: ReturnType | null = null; + function debouncedFullSessionSave() { + if (sessionSaveDebounce) clearTimeout(sessionSaveDebounce); + sessionSaveDebounce = setTimeout(() => { + sessionSaveDebounce = null; + saveSessionBeforeClose(); + }, 2000); + } + + // Periodic full session save during playback let sessionSaveInterval: ReturnType | null = null; $effect(() => { @@ -2729,7 +2741,7 @@ if (!sessionSaveInterval) { sessionSaveInterval = setInterval(() => { saveSessionBeforeClose(); - }, 60000); // Save every 60 seconds (reduced from 30s to lower IPC overhead) + }, 15000); // Save every 15 seconds during playback } } else { if (sessionSaveInterval) { @@ -2921,6 +2933,7 @@ }); // Subscribe to player state changes + let prevTrackId: number | null = null; const unsubscribePlayer = subscribePlayer(() => { const playerState = getPlayerState(); const wasPlaying = isPlaying; @@ -2942,6 +2955,16 @@ flushPositionSave(Math.floor(currentTime)); } + // Full session save on track change or pause (debounced 2s) + const trackId = currentTrack?.id ?? null; + if (trackId !== prevTrackId) { + prevTrackId = trackId; + if (trackId !== null) debouncedFullSessionSave(); + } + if (wasPlaying && !isPlaying && currentTrack) { + debouncedFullSessionSave(); + } + // MiniPlayer IPC - DISABLED: incomplete feature, causes unnecessary IPC overhead // if (currentTrack) { // emitTo('miniplayer', 'miniplayer:track', {