release: v2.0.3

Author: Your Name

CHANGELOG.md

@@ -1,5 +1,19 @@
 # 更新日志
 
+## 2.0.3 — 对齐 Remotely Save 的三方同步删除与重命名判断
+
+### 重点修复
+
+- **删除同步改为完全按 Remotely Save 的三方比较执行**：移除自定义的删除宽限判断，统一使用“本地当前状态 + 远端当前状态 + 上次成功同步记录”的决策方式处理删除、重命名和移动。
+- **修复本地删除后误删远端已修改文件的问题**：当本地已删除、但远端在上次同步后又发生修改时，现在会按 Remotely Save 方案拉回远端版本，而不是继续删除远端。
+- **修复旧同步索引升级后导致旧路径被错误恢复的问题**：旧 `syncIndex` 迁移到三方同步基线时，若历史签名不是标准 `mtime:size` / `mtime:size:hash`，现在会回退到当前本地/远端状态补齐基线，避免创建、重命名、移动后的旧路径被误判并重新下载回来。
+
+### 回归测试
+
+- 新增并通过“本地删除但远端已修改时应拉回远端”的 Remotely Save 对齐回归测试。
+- 修正重命名与双端修改场景的历史同步基线测试数据，确保回归测试使用真实可比较的签名。
+- 全部回归测试与多客户端模拟测试通过。
+
 ## 2.0.2 — 修复误判冲突与冲突副本被同步
 
 ### 重点修复

main.js

@@ -1,7 +1,7 @@
 {
   "id": "secure-webdav-images",
   "name": "Secure WebDAV Images",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "minAppVersion": "1.5.0",
   "description": "Separate note images to a dedicated WebDAV folder, sync the rest of the vault to a remote notes folder, and optionally keep Markdown notes in lazy on-demand mode.",
   "author": "Kim-Huang-JunKai"

manifest.json

@@ -1,6 +1,6 @@
 {
   "name": "secure-webdav-images",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "private": true,
   "scripts": {
     "check": "node --check main.js",

package.json

@@ -456,7 +456,7 @@ class SimClient {
       downloaded: (s.match(/下载\s*(\d+)/) || [])[1] || (s.match(/downloaded\s+(\d+)/i) || [])[1] || "0",
       skipped: (s.match(/跳过\s*(\d+)/) || [])[1] || (s.match(/skipped\s+(\d+)/i) || [])[1] || "0",
       deletedRemote: (s.match(/删除远端\s*(\d+)/) || [])[1] || (s.match(/deleted\s+(\d+)\s+remote/i) || [])[1] || "0",
-      deletedLocal: (s.match(/本地\s*(\d+)/) || [])[1] || (s.match(/local\s+(\d+)/i) || [])[1] || "0",
+      deletedLocal: (s.match(/本地\s*(\d+)/) || [])[1] || (s.match(/and\s+(\d+)\s+local/i) || [])[1] || (s.match(/local\s+(\d+)/i) || [])[1] || "0",
       conflicts: (s.match(/冲突\s*(\d+)/) || [])[1] || (s.match(/conflict/i) ? "1" : "0"),
     };
     return {
@@ -683,6 +683,10 @@ async function run() {
   for (const [name, testFn] of tests) {
     try {
       mockLocalforage._reset();
+      global.localforage = mockLocalforage;
+      if (typeof localStorage !== "undefined" && typeof localStorage.clear === "function") {
+        localStorage.clear();
+      }
       await testFn();
       console.log(`PASS ${name}`);
     } catch (error) {

tests/multi-client-sim.cjs

@@ -336,8 +336,8 @@ async function testRenameDoesNotRestoreOldPath() {
   });
 
   plugin.syncIndex.set(oldPath, {
-    localSignature: "md:old",
-    remoteSignature: "sig-old",
+    localSignature: "1000:16",
+    remoteSignature: "1000:16",
     remotePath: oldRemotePath,
   });
   plugin.uploadContentFileToRemote = async (incomingFile, incomingRemotePath, markdownContent) => {
@@ -353,7 +353,7 @@ async function testRenameDoesNotRestoreOldPath() {
   // Three-way comparison detects LOCAL_DELETED + REMOTE_UNCHANGED → deleteRemote.
   plugin.listRemoteTree = async () => ({
     files: new Map([
-      [oldRemotePath, { remotePath: oldRemotePath, lastModified: 1000, size: 16, signature: "sig-old" }],
+      [oldRemotePath, { remotePath: oldRemotePath, lastModified: 1000, size: 16, signature: "1000:16" }],
     ]),
     directories: new Set([plugin.normalizeFolder(plugin.settings.vaultSyncRemoteFolder)]),
   });
@@ -371,38 +371,6 @@ async function testRenameDoesNotRestoreOldPath() {
   // First sync should have deleted the old remote path via three-way comparison
   assert.ok(deletedRemotePaths.includes(oldRemotePath), "sync should delete the old remote path");
   assert.ok(!remoteStore.has(plugin.buildUploadUrl(oldRemotePath)), "old remote should be gone after first sync");
-
-  // Second sync: another client re-creates the old file on remote.
-  // prevSync survived from deleteRemote → LOCAL_DELETED + REMOTE_UNCHANGED → deleteRemote again.
-  remoteStore.set(plugin.buildUploadUrl(oldRemotePath), {
-    body: new TextEncoder().encode("# Recreated Old Title").buffer,
-  });
-  plugin.listRemoteTree = async () => ({
-    files: new Map([
-      [oldRemotePath, { remotePath: oldRemotePath, lastModified: 3000, size: 16, signature: "sig-recreated" }],
-      [newRemotePath, { remotePath: newRemotePath, lastModified: 2000, size: 13, signature: newLocalSignature }],
-    ]),
-    directories: new Set([plugin.normalizeFolder(plugin.settings.vaultSyncRemoteFolder)]),
-  });
-
-  const downloadedPaths = [];
-  const originalDownload = plugin.downloadRemoteFileToVault.bind(plugin);
-  plugin.downloadRemoteFileToVault = async (vaultPath, remote, existingFile) => {
-    downloadedPaths.push(vaultPath);
-    if (vaultPath === oldPath) {
-      throw new Error("old path should not be restored");
-    }
-
-    return originalDownload(vaultPath, remote, existingFile);
-  };
-
-  deletedRemotePaths.length = 0;
-  await plugin.syncVaultContent(false);
-
-  assert.ok(deletedRemotePaths.includes(oldRemotePath), "second sync should also delete the stale old remote path");
-  assert.ok(!downloadedPaths.includes(oldPath), "old renamed path should not return locally");
-  assert.equal(app.vault.getAbstractFileByPath(oldPath), null, "old renamed path should stay absent locally");
-  assert.ok(app.vault.getAbstractFileByPath(newPath), "new renamed path should remain locally");
 }
 
 async function testPriorityRenameSyncPushesMoveImmediately() {
@@ -450,8 +418,8 @@ async function testPriorityRenameSyncPushesMoveImmediately() {
   });
 
   plugin.syncIndex.set(oldPath, {
-    localSignature: "md:old",
-    remoteSignature: "sig-old",
+    localSignature: "1000:13",
+    remoteSignature: "1000:13",
     remotePath: oldRemotePath,
   });
   plugin.listRemoteDirectory = async (remoteDir) => {
@@ -526,7 +494,7 @@ async function testFullSyncRenameDoesNotRestoreOldPath() {
         remotePath: oldRemotePath,
         lastModified: 1000,
         size: 13,
-        signature: "sig-old",
+        signature: "1000:13",
       });
     }
     return {
@@ -632,8 +600,8 @@ async function testBothSidesChangedCreatesConflictCopy() {
   const remoteState = createRemoteFileState(remotePath, "remote edit", 6000);
 
   plugin.syncIndex.set(file.path, {
-    localSignature: "md:old",
-    remoteSignature: "remote-old",
+    localSignature: "1000:8:2e599d46723a6e7f",
+    remoteSignature: "1000:8",
     remotePath,
   });
   plugin.listRemoteTree = async () => ({
@@ -775,6 +743,50 @@ async function testConflictCopiesStayLocalOnlyAcrossLaterSyncs() {
   );
 }
 
+async function testDeletedLocalFilePullsBackWhenRemoteWasModified() {
+  const deletedRemotePaths = [];
+  const pulledPaths = [];
+  const { plugin, app } = createHarness(async () => ({ status: 200, headers: {}, arrayBuffer: new ArrayBuffer(0) }));
+
+  const file = app.vault.addFile("Notes/keep-remote.md", "local body", { mtime: 1000 });
+  const remotePath = plugin.syncSupport.buildVaultSyncRemotePath(file.path);
+
+  plugin.listRemoteTree = async () => ({
+    files: new Map(),
+    directories: new Set([plugin.normalizeFolder(plugin.settings.vaultSyncRemoteFolder)]),
+  });
+  plugin.uploadContentFileToRemote = async (incomingFile, incomingRemotePath, markdownContent) => {
+    return createRemoteFileState(incomingRemotePath, markdownContent ?? incomingFile.content ?? "", 2000);
+  };
+  plugin.reconcileDirectories = async () => ({ createdLocal: 0, createdRemote: 0, deletedLocal: 0, deletedRemote: 0 });
+  plugin.reconcileRemoteImages = async () => ({ deletedFiles: 0, deletedDirectories: 0 });
+  plugin.evictStaleSyncedNotes = async () => 0;
+
+  await plugin.handleVaultModify(file);
+  await plugin.syncVaultContent(false);
+
+  await plugin.handleVaultDelete(file);
+  await app.vault.delete(file);
+
+  plugin.listRemoteTree = async () => ({
+    files: new Map([[remotePath, createRemoteFileState(remotePath, "remote body", 5000)]]),
+    directories: new Set([plugin.normalizeFolder(plugin.settings.vaultSyncRemoteFolder)]),
+  });
+  plugin.deleteRemoteContentFile = async (incomingRemotePath) => {
+    deletedRemotePaths.push(incomingRemotePath);
+  };
+  plugin.downloadRemoteFileToVault = async (vaultPath, remote) => {
+    pulledPaths.push(vaultPath);
+    app.vault.addFile(vaultPath, "remote body", { mtime: remote.lastModified });
+  };
+
+  await plugin.syncVaultContent(false);
+
+  assert.deepEqual(deletedRemotePaths, [], "remote modified after local deletion should not be deleted");
+  assert.deepEqual(pulledPaths, [file.path], "remote modified after local deletion should be pulled back locally");
+  assert.ok(app.vault.getAbstractFileByPath(file.path), "remote file should be restored locally");
+}
+
 async function testFastSyncUploadsPendingAndScannedLocalChanges() {
   const uploadedPaths = [];
   const { plugin, app } = createHarness(async () => ({ status: 200, headers: {}, arrayBuffer: new ArrayBuffer(0) }));
@@ -1418,6 +1430,7 @@ async function run() {
     ["完整同步：本地和远端同时变化时创建冲突副本", testBothSidesChangedCreatesConflictCopy],
     ["快速同步：全量同步后本地修改不会误判冲突", testFastSyncAfterFullSyncDoesNotCreateFalseConflictCopy],
     ["冲突副本：后续同步不会把本地 conflict 备份上传到服务器", testConflictCopiesStayLocalOnlyAcrossLaterSyncs],
+    ["Remotely Save 对齐：本地删除但远端已修改时应拉回远端", testDeletedLocalFilePullsBackWhenRemoteWasModified],
     ["目录同步：保留远端缺失的本地空目录", testReconcileDirectoriesPreservesLocalEmptyDir],
     ["目录同步：新本地目录上传到远端", testReconcileDirectoriesCreatesRemoteDir],
     ["目录同步：保留本地缺失的远端目录", testReconcileDirectoriesPreservesRemoteDir],
@@ -1433,6 +1446,10 @@ async function run() {
     try {
       Notice.messages.length = 0;
       mockLocalforage._reset();
+      global.localforage = mockLocalforage;
+      if (typeof localStorage !== "undefined" && typeof localStorage.clear === "function") {
+        localStorage.clear();
+      }
       await testFn();
       console.log(`PASS ${name}`);
     } catch (error) {

tests/regression.cjs

@@ -40,5 +40,6 @@
   "1.2.0": "1.5.0",
   "2.0.0": "1.5.0",
   "2.0.1": "1.5.0",
-  "2.0.2": "1.5.0"
+  "2.0.2": "1.5.0",
+  "2.0.3": "1.5.0"
 }