gsadmin/KoalaSync
1
0
Fork 0
mirror of https://github.com/Shik3i/KoalaSync.git synced 2026-09-02 22:17:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(sync): let newer commands own recovery state

Browse Source
This commit is contained in:
Timo
2026-08-27 00:10:33 +02:00
parent 981776d374
commit 59788e0749
2 changed files with 85 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extension/content.js
+11 -5
View File
@@ -1237,7 +1237,7 @@
return canonicalMediaApplyGeneration;
}
function cancelCanonicalMediaApply(action = null, video = null) {
function cancelCanonicalMediaApply(action = null, video = null, preserveLocalState = false) {
canonicalMediaApplyGeneration++;
if ((action === EVENTS.PLAY || action === EVENTS.PAUSE || action === EVENTS.SEEK) && video) {
canonicalSupersedingLocalState = {
@@ -1246,6 +1246,8 @@
: (action === EVENTS.PAUSE ? 'paused' : (video.paused ? 'paused' : 'playing')),
currentTime: action === EVENTS.SEEK ? getSyncCurrentTime(video) : null
};
} else if (!preserveLocalState) {
canonicalSupersedingLocalState = null;
}
return canonicalMediaApplyGeneration;
}
@@ -1495,7 +1497,10 @@
}
if (message.type === 'CANCEL_CANONICAL_MEDIA_STATE') {
cancelCanonicalMediaApply();
const preserveLocalState = message.reason === `local ${EVENTS.PLAY}`
|| message.reason === `local ${EVENTS.PAUSE}`
|| message.reason === `local ${EVENTS.SEEK}`;
cancelCanonicalMediaApply(null, null, preserveLocalState);
sendResponse({ status: 'cancelled' });
return true;
}
@@ -1512,9 +1517,6 @@
if (message.type === 'SERVER_COMMAND') {
const { action, payload } = message;
let actionCompleted = false;
if ([EVENTS.PLAY, EVENTS.PAUSE, EVENTS.SEEK, EVENTS.FORCE_SYNC_PREPARE, EVENTS.FORCE_SYNC_EXECUTE].includes(action)) {
cancelCanonicalMediaApply();
}
// Host Control Mode: while watching on our own (desynced), don't apply
// host commands. Only ACK FORCE_SYNC_PREPARE — that's the one the host's
@@ -1548,6 +1550,10 @@
return;
}
}
if (syncActions.includes(action)) {
cancelCanonicalMediaApply();
}
if (action === EVENTS.PLAY) {
tryMediaAction(EVENTS.PLAY);