feat(sync): add convergent sync migration (#2254)

* feat(sync): add convergent sync migration

* fix(sync): address convergent migration review

* fix(sync): normalize CRDT payload entities

* fix(sync): invalidate stale provider baselines

* fix(sync): harden convergent migration recovery

* fix(sync): close migration concurrency gaps

* fix(sync): guard seeded provider shrink

* fix(sync): preserve undefined legacy fields

* fix(sync): guard legacy v2 migration shrink

* fix(sync): harden migration apply transaction

* fix(sync): reject locked migration initialization

* fix(sync): block unbased divergent v1 migration
This commit is contained in:
ryan-wong-coder authored and GitHub committed 2026-07-16 20:03:32 +08:00
1 parent 929456a231
commit 6e55d2d498
33 files changed
+3536 -71

No files matched your search

@@ -2,9 +2,13 @@ import test from "node:test";
import assert from "node:assert/strict";
import { EncryptionService } from "../EncryptionService.ts";
import { commitRemoteInspectionImpl } from "./authMethods.ts";
import {
clearProviderMergeStateImpl,
commitRemoteInspectionImpl,
} from "./authMethods.ts";
import { syncToProviderImpl, uploadToProviderImpl } from "./providerSyncMethods.ts";
import {
clearSyncBaseImpl,
loadSyncSnapshotsImpl,
saveSyncBaseImpl,
syncAllProvidersImpl,
@@ -57,6 +61,38 @@ function remoteFile(provider: CloudProvider, version: number, updatedAt: number)
};
}
test("provider identity changes clear v1 base, v2 baseline, and remote anchor together", () => {
const removed: string[] = [];
const manager = {
syncBaseKey: (provider: CloudProvider) => `base:${provider}`,
convergentProviderBaselineKey: (provider: CloudProvider) => `convergent:${provider}`,
removeFromStorage: (key: string) => removed.push(key),
clearSyncAnchor: (provider: CloudProvider) => removed.push(`anchor:${provider}`),
};
clearProviderMergeStateImpl.call(manager, "github");
assert.deepEqual(removed, ["base:github", "convergent:github", "anchor:github"]);
});
test("clearing all merge bases also removes every convergent provider baseline", () => {
const removed = new Set<string>();
const providers: CloudProvider[] = ["github", "google", "onedrive", "webdav", "s3"];
const manager = {
removeFromStorage: (key: string) => removed.add(key),
syncBaseKey: (provider?: CloudProvider) => `base:${provider ?? "default"}`,
syncSnapshotsKey: (provider?: CloudProvider) => `snapshots:${provider ?? "default"}`,
convergentProviderBaselineKey: (provider: CloudProvider) => `convergent:${provider}`,
clearSyncAnchor: () => {},
};
clearSyncBaseImpl.call(manager);
for (const provider of providers) {
assert.equal(removed.has(`convergent:${provider}`), true);
}
});
test("syncAllProviders uses the newest cloud payload without merging other remotes when cloud wins", async () => {
const originalDecryptPayload = EncryptionService.decryptPayload;
const originalEncryptPayload = EncryptionService.encryptPayload;
@@ -193,6 +229,46 @@ test("syncToProvider uses the checked remote as metadata base when no stored bas
}
});
test("syncToProvider refuses to downgrade a checked convergent remote", async () => {
const checkedRemote = remoteFile("github", 3, 300);
checkedRemote.meta.syncSchemaVersion = 2;
let encrypted = false;
const originalEncryptPayload = EncryptionService.encryptPayload;
EncryptionService.encryptPayload = async () => {
encrypted = true;
return checkedRemote;
};
try {
const manager = {
masterPassword: "pw",
adapters: new Map(),
state: {
securityState: "UNLOCKED",
providers: { github: { status: "connected" } },
lastError: null,
syncState: "IDLE",
syncStrategy: "smartMerge",
localVersion: 1,
deviceId: "local-device",
deviceName: "Local",
},
getConnectedAdapter: async () => ({ provider: "github" }),
updateProviderStatus: () => {},
emit: () => {},
checkProviderConflict: async () => ({ conflict: false, remoteFile: checkedRemote }),
addSyncHistoryEntry: () => {},
};
const result = await syncToProviderImpl.call(manager, "github", payload("local"));
assert.equal(result.success, false);
assert.equal(encrypted, false);
assert.match(result.error ?? "", /Enable or migrate convergent sync/);
} finally {
EncryptionService.encryptPayload = originalEncryptPayload;
}
});
test("syncToProvider aborts an upload when the master key changes after encryption", async () => {
const originalEncryptPayload = EncryptionService.encryptPayload;
const localPayload = payload("local");