itlxrd/psysonic
1
0
Fork 0
mirror of https://github.com/kilyabin/psysonic.git synced 2026-07-22 14:35:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(orbit): keep guest's local pause across host track changes

Browse Source 
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
Psychotoxical
2026-04-24 16:11:05 +02:00
parent 59bae4b545
commit ae053e5314
1 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/hooks/useOrbitGuest.ts
+17 -4
View File
@@ -159,8 +159,11 @@ export function useOrbitGuest(): void {
// Rules: // Rules:
// 1. First tick after activation → mirror host (initial join sync, // 1. First tick after activation → mirror host (initial join sync,
// no need for the guest to click catch-up to get started). // no need for the guest to click catch-up to get started).
// 2. Track changed at host → guest follows. Track-change is the // 2. Track changed at host → guest follows ONLY if they haven't
// "session sync point"; it overrides any local divergence. // locally diverged. A guest who hit pause should stay paused
// even when the host moves to the next song; otherwise their
// pause button silently un-does itself. If diverged, we just
// advance the anchor so Catch Up stays the opt-in path.
// 3. Same track, host flipped play/pause → mirror only if the local // 3. Same track, host flipped play/pause → mirror only if the local
// player still matches our last-applied host state. If the guest // player still matches our last-applied host state. If the guest
// paused/resumed locally, we leave them alone — they have to // paused/resumed locally, we leave them alone — they have to
@@ -184,9 +187,19 @@ export function useOrbitGuest(): void {
lastAppliedRef.current = { trackId: null, isPlaying: hostPlaying }; lastAppliedRef.current = { trackId: null, isPlaying: hostPlaying };
} }
} else if (last.trackId !== hostTrackId) { } else if (last.trackId !== hostTrackId) {
if (hostTrackId) void syncToHost(hostTrackId, state); const diverged = player.isPlaying !== last.isPlaying;
else if (player.isPlaying) player.pause(); if (diverged) {
// Guest is running their own show (typically: paused while host
// kept going). Do not load/start the host's new track — just
// track the host state so the catch-up prompt stays accurate.
lastAppliedRef.current = { trackId: hostTrackId, isPlaying: hostPlaying }; lastAppliedRef.current = { trackId: hostTrackId, isPlaying: hostPlaying };
} else if (hostTrackId) {
void syncToHost(hostTrackId, state);
lastAppliedRef.current = { trackId: hostTrackId, isPlaying: hostPlaying };
} else {
if (player.isPlaying) player.pause();
lastAppliedRef.current = { trackId: hostTrackId, isPlaying: hostPlaying };
}
} else if (last.isPlaying !== hostPlaying) { } else if (last.isPlaying !== hostPlaying) {
// Only mirror when the guest hasn't diverged. We compare against the // Only mirror when the guest hasn't diverged. We compare against the
// *last applied* host state, not the new one — divergence means the // *last applied* host state, not the new one — divergence means the