fix(qconnect): harden renderer handoff identity
cx
This commit is contained in:
4 files changed
+283
-37
No files matched your search
+1
-29
@@ -321,7 +321,6 @@
|
||||
evaluateQconnectPlaybackReportSkip,
|
||||
evaluateQconnectSessionPersistence,
|
||||
fetchQconnectRuntimeState,
|
||||
isQconnectPeerRendererActive,
|
||||
isQconnectRemoteModeActive as computeQconnectRemoteModeActive,
|
||||
logQconnectPlaybackReport as appendQconnectPlaybackReport,
|
||||
qconnectAdmissionReasonKey,
|
||||
@@ -1055,37 +1054,10 @@
|
||||
return false;
|
||||
}
|
||||
|
||||
let sessionSnapshot = qobuzConnectSessionSnapshot;
|
||||
let rendererSnapshot = qobuzConnectRendererSnapshot;
|
||||
|
||||
if (!isQconnectPeerRendererActive(sessionSnapshot)) {
|
||||
await refreshQobuzConnectRuntimeState();
|
||||
sessionSnapshot = qobuzConnectSessionSnapshot;
|
||||
rendererSnapshot = qobuzConnectRendererSnapshot;
|
||||
}
|
||||
|
||||
if (!isQconnectPeerRendererActive(sessionSnapshot)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
const nextPlayingState = rendererSnapshot?.playing_state === 2 ? 3 : 2;
|
||||
const diagnosticPayload = {
|
||||
active_renderer_id: sessionSnapshot?.active_renderer_id ?? null,
|
||||
local_renderer_id: sessionSnapshot?.local_renderer_id ?? null,
|
||||
current_playing_state: rendererSnapshot?.playing_state ?? null,
|
||||
requested_playing_state: nextPlayingState
|
||||
};
|
||||
|
||||
pushQobuzConnectDiagnostic('qconnect:toggle_play_handoff', 'info', diagnosticPayload);
|
||||
|
||||
try {
|
||||
await invoke('v2_qconnect_set_player_state', {
|
||||
request: { playing_state: nextPlayingState }
|
||||
});
|
||||
return true;
|
||||
return await invoke<boolean>('v2_qconnect_toggle_play_if_remote');
|
||||
} catch (err) {
|
||||
pushQobuzConnectDiagnostic('qconnect:toggle_play_handoff', 'error', {
|
||||
...diagnosticPayload,
|
||||
error: String(err)
|
||||
});
|
||||
throw err;
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
<script lang="ts">
|
||||
import { onDestroy, onMount } from 'svelte';
|
||||
import { invoke } from '@tauri-apps/api/core';
|
||||
import { getCurrentWindow } from '@tauri-apps/api/window';
|
||||
import { LogicalSize } from '@tauri-apps/api/dpi';
|
||||
import { t } from '$lib/i18n';
|
||||
@@ -309,6 +310,10 @@
|
||||
|
||||
async function handleTogglePlay(): Promise<void> {
|
||||
try {
|
||||
const handledRemotely = await invoke<boolean>('v2_qconnect_toggle_play_if_remote');
|
||||
if (handledRemotely) {
|
||||
return;
|
||||
}
|
||||
await togglePlay();
|
||||
} catch (err) {
|
||||
console.error('[MiniPlayer] togglePlay failed:', err);
|
||||
@@ -385,6 +390,17 @@
|
||||
async function handleSkipBack(): Promise<void> {
|
||||
const state = getPlayerState();
|
||||
if (!state.currentTrack || state.isSkipping) return;
|
||||
|
||||
try {
|
||||
const handledRemotely = await invoke<boolean>('v2_qconnect_skip_previous_if_remote');
|
||||
if (handledRemotely) {
|
||||
return;
|
||||
}
|
||||
} catch (err) {
|
||||
console.error('[MiniPlayer] remote previous handoff failed:', err);
|
||||
return;
|
||||
}
|
||||
|
||||
if (state.currentTime > 3) {
|
||||
playerSeek(0);
|
||||
return;
|
||||
@@ -409,6 +425,16 @@
|
||||
const state = getPlayerState();
|
||||
if (!state.currentTrack || state.isSkipping) return;
|
||||
|
||||
try {
|
||||
const handledRemotely = await invoke<boolean>('v2_qconnect_skip_next_if_remote');
|
||||
if (handledRemotely) {
|
||||
return;
|
||||
}
|
||||
} catch (err) {
|
||||
console.error('[MiniPlayer] remote next handoff failed:', err);
|
||||
return;
|
||||
}
|
||||
|
||||
setIsSkipping(true);
|
||||
try {
|
||||
const next = await nextTrack();
|
||||
|
||||
Reference in new issue
Block a user