Skip to content

An open-source, privacy-first, self-hosted knowledge workspace where humans and AI agents work together 开源、隐私优先、自托管的知识工作空间,让人与智能体在此协作

:bug: Preserve unsaved input during sync reconnects https://github.com/siyuan-note/siyuan/issues/20763

Daniel8d12ed1bfcd9
diff --git a/app/src/sync/checkoutProgress.ts b/app/src/sync/checkoutProgress.ts
index 30d7d43118..d6c5f2e95e 100644
--- a/app/src/sync/checkoutProgress.ts
+++ b/app/src/sync/checkoutProgress.ts
@@ -13,6 +13,7 @@ let previousFocus: HTMLElement | undefined;
let revision = 0;
let connection: {appID: string; clientID: string};
let preparation: string;
+let unsavedPreparation = false;
let refreshing: string;
let refreshTail = Promise.resolve();
let statePoll: number;
@@ -45,6 +46,7 @@ const setEditingGuard = (enabled: boolean) => {
const clear = () => {
state = undefined;
preparation = undefined;
+ unsavedPreparation = false;
refreshing = undefined;
window.clearInterval(statePoll);
statePoll = undefined;
@@ -136,6 +138,8 @@ const prepare = async (task: CheckoutState) => {
const failureVersion = getEditorSaveFailureVersion();
try {
await refreshTail;
+ if (state?.taskID !== task.taskID || preparation !== task.token) return;
+ unsavedPreparation = true;
if (document.activeElement instanceof HTMLElement) document.activeElement.blur();
await Promise.all(getAllEditor().filter(editor => editor?.protyle?.wysiwyg)
.map(editor => {
@@ -144,6 +148,7 @@ const prepare = async (task: CheckoutState) => {
}));
await flushPendingEditorSaves(failureVersion);
saved = true;
+ if (state?.taskID === task.taskID && preparation === task.token) unsavedPreparation = false;
} catch (error) {
console.error("Could not save input before sync checkout", error);
}
@@ -159,7 +164,8 @@ const finish = (task: CheckoutState, resume?: CheckoutState) => {
const refreshID = task.taskID + ":" + task.revision;
if (refreshing === refreshID) return;
refreshing = refreshID;
- if (!task.blocking) {
+ // 未确认保存的准备轮次不会进入落盘,保留当前草稿并直接恢复输入。
+ if (!task.blocking || unsavedPreparation) {
clear();
return;
}
@@ -240,14 +246,14 @@ export const reconcileSyncCheckout = async (clientID?: string, reconnect = false
if (response.code !== 0) return;
if (kernelID && kernelID !== response.data.kernelID) revision = 0;
kernelID = response.data.kernelID;
- if (reconnect && state?.blocking) {
+ if (reconnect && state?.blocking && !unsavedPreparation) {
window.location.reload();
return;
}
if (response.data.revision < revision) return;
if (!response.data.task) {
revision = response.data.revision;
- if (state?.blocking) window.location.reload();
+ if (state?.blocking && !unsavedPreparation) window.location.reload();
else clear();
} else {
syncCheckoutProgress({cmd: "syncProgress", code: response.data.task.phase === "done" ? 2 : 0, msg: "", data: response.data.task});
diff --git a/app/tests/checkoutProgress.test.js b/app/tests/checkoutProgress.test.js
index 82a7506323..4838324df9 100644
--- a/app/tests/checkoutProgress.test.js
+++ b/app/tests/checkoutProgress.test.js
@@ -94,6 +94,9 @@ const run = async () => {
assert.equal(calls.length,0);
saveInput(); await tick();
assert.equal(calls.length,0,"acknowledged before transaction requests completed");
+ snapshot = {kernelID:"kernel-one",revision:2,task:{taskID:"first",revision:2,phase:"preparing",blocking:true,token:"window-token"}};
+ await runtime.reconcileSyncCheckout("secondary",true);
+ assert.equal(reloadCount,0,"reconnect discarded input that was still being saved");
saveRequests(); await tick();
assert.equal(calls.length,1);
assert.deepEqual(calls.shift().data,{taskID:"first",token:"window-token",saved:true});
@@ -152,16 +155,26 @@ const run = async () => {
assert.equal(editor.dispatchEvent(new Event("beforeinput",{bubbles:true,cancelable:true})),true);
progress("first",2,5,"done");
assert.equal(runtime.openSyncCheckoutProgress(),false);
- progress("lost",0,6);
+ editors.forEach(item => item.flushPendingTransactions = () => Promise.reject(new Error("save failed")));
+ editor.value = "unsaved draft";
+ progress("unsaved",0,6,"preparing",{token:"failed-save"}); await tick();
+ assert.equal(calls.at(-1).data.saved,false);
snapshot = {kernelID:"kernel-one",revision:7,task:null};
await runtime.reconcileSyncCheckout("secondary",true);
- assert.equal(reloadCount,1,"reconnect did not recover a lost terminal event");
- progress("lost",2,7,"done"); await tick();
- progress("lost-again",0,8);
+ assert.equal(reloadCount,0,"failed preparation discarded an unsaved draft");
+ assert.equal(editor.value,"unsaved draft");
+ assert.equal(editor.dispatchEvent(new Event("beforeinput",{bubbles:true,cancelable:true})),true);
+ calls.length = 0;
+ progress("lost",0,8);
snapshot = {kernelID:"kernel-one",revision:9,task:null};
+ await runtime.reconcileSyncCheckout("secondary",true);
+ assert.equal(reloadCount,1,"reconnect did not recover a lost terminal event");
+ progress("lost",2,9,"done"); await tick();
+ progress("lost-again",0,10);
+ snapshot = {kernelID:"kernel-one",revision:11,task:null};
poll(); await tick();
assert.equal(reloadCount,2,"polling did not recover a dropped terminal frame");
- progress("lost-again",2,9,"done"); await tick();
+ progress("lost-again",2,11,"done"); await tick();
snapshot = {kernelID:"kernel-two",revision:1,task:{taskID:"restarted",revision:1,phase:"background",blocking:false}};
await runtime.reconcileSyncCheckout();
assert.equal(runtime.openSyncCheckoutProgress(),true,"kernel restart retained an obsolete revision");