@carloswon/cairn-memory 0.4.0 → 0.6.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +77 -0
- package/README.md +17 -1
- package/dist/src/core/types.d.ts +4 -0
- package/dist/src/governance/revision-proposal.d.ts +80 -0
- package/dist/src/governance/revision-proposal.js +243 -0
- package/dist/src/governance/revision-proposal.js.map +1 -0
- package/dist/src/interfaces/app-service.d.ts +82 -1
- package/dist/src/interfaces/app-service.js +249 -7
- package/dist/src/interfaces/app-service.js.map +1 -1
- package/dist/src/interfaces/cli/main.js +470 -45
- package/dist/src/interfaces/cli/main.js.map +1 -1
- package/dist/src/interfaces/console/annotations.d.ts +96 -0
- package/dist/src/interfaces/console/annotations.js +274 -0
- package/dist/src/interfaces/console/annotations.js.map +1 -0
- package/dist/src/interfaces/console/assets/ui-js.js +289 -4
- package/dist/src/interfaces/console/assets/ui-js.js.map +1 -1
- package/dist/src/interfaces/console/server.js +66 -0
- package/dist/src/interfaces/console/server.js.map +1 -1
- package/dist/src/interfaces/mcp/server.d.ts +8 -0
- package/dist/src/interfaces/mcp/server.js +178 -22
- package/dist/src/interfaces/mcp/server.js.map +1 -1
- package/dist/src/jobs/remote.d.ts +6 -0
- package/dist/src/jobs/remote.js.map +1 -1
- package/dist/src/retrieval/preview.d.ts +22 -0
- package/dist/src/retrieval/preview.js +61 -0
- package/dist/src/retrieval/preview.js.map +1 -0
- package/dist/src/retrieval/search.js +5 -1
- package/dist/src/retrieval/search.js.map +1 -1
- package/dist/src/store/index.d.ts +2 -0
- package/dist/src/store/index.js +2 -0
- package/dist/src/store/index.js.map +1 -1
- package/dist/src/store/memories.d.ts +13 -0
- package/dist/src/store/memories.js +29 -2
- package/dist/src/store/memories.js.map +1 -1
- package/dist/src/store/migrate.js +10 -1
- package/dist/src/store/migrate.js.map +1 -1
- package/dist/src/store/outbox.d.ts +1 -1
- package/dist/src/store/outbox.js.map +1 -1
- package/dist/src/store/project-alias.d.ts +13 -0
- package/dist/src/store/project-alias.js +55 -0
- package/dist/src/store/project-alias.js.map +1 -0
- package/dist/src/store/projects.d.ts +43 -0
- package/dist/src/store/projects.js +84 -0
- package/dist/src/store/projects.js.map +1 -0
- package/dist/src/store/schema.d.ts +11 -0
- package/dist/src/store/schema.js +55 -0
- package/dist/src/store/schema.js.map +1 -1
- package/dist/src/sync/apply.d.ts +4 -0
- package/dist/src/sync/apply.js +65 -3
- package/dist/src/sync/apply.js.map +1 -1
- package/dist/src/sync/backup-store.d.ts +63 -0
- package/dist/src/sync/backup-store.js +184 -0
- package/dist/src/sync/backup-store.js.map +1 -0
- package/dist/src/sync/cryptoutil.d.ts +10 -2
- package/dist/src/sync/cryptoutil.js +22 -1
- package/dist/src/sync/cryptoutil.js.map +1 -1
- package/dist/src/sync/events.d.ts +17 -2
- package/dist/src/sync/events.js.map +1 -1
- package/dist/src/sync/orchestrate.js +5 -1
- package/dist/src/sync/orchestrate.js.map +1 -1
- package/dist/src/sync/pull.js +1 -1
- package/dist/src/sync/pull.js.map +1 -1
- package/dist/src/sync/push.d.ts +2 -0
- package/dist/src/sync/push.js +28 -2
- package/dist/src/sync/push.js.map +1 -1
- package/dist/src/sync/syncd-store.d.ts +7 -0
- package/dist/src/sync/syncd-store.js +18 -0
- package/dist/src/sync/syncd-store.js.map +1 -1
- package/docs/cairn-security.md +14 -0
- package/docs/cairn-usage.md +127 -0
- package/package.json +2 -2
package/dist/src/sync/apply.js
CHANGED
|
@@ -1,11 +1,45 @@
|
|
|
1
1
|
import { err } from '../core/errors.js';
|
|
2
2
|
import { nowIso } from '../core/time.js';
|
|
3
|
+
/** 「不再持有」标记:meta 行(不加表列;与 sync_pushed/sync_seq 同一 meta 键空间)。 */
|
|
4
|
+
function scopeExitKey(memoryId) {
|
|
5
|
+
return `scope_exit:${memoryId}`;
|
|
6
|
+
}
|
|
7
|
+
function hasScopeExitMarker(store, memoryId) {
|
|
8
|
+
return store.db.get('SELECT value FROM meta WHERE key = ?', scopeExitKey(memoryId)) != null;
|
|
9
|
+
}
|
|
10
|
+
function clearScopeExitMarker(store, memoryId) {
|
|
11
|
+
store.db.run('DELETE FROM meta WHERE key = ?', scopeExitKey(memoryId));
|
|
12
|
+
}
|
|
3
13
|
export function applyEvent(store, ev, spaceKey, audit) {
|
|
4
14
|
const memories = store.memories;
|
|
5
15
|
// 跨设备记忆身份对齐:id 命中 → 直接用;否则按修订内容哈希血统匹配
|
|
6
16
|
// (记忆 id 在各设备本地生成,不可跨设备引用——第一版实现的教训)
|
|
7
|
-
|
|
17
|
+
let mem = memories.get(ev.memoryId) ??
|
|
8
18
|
memories.get(matchByLineage(store, ev) ?? '');
|
|
19
|
+
if (ev.type === 'scope_exit') {
|
|
20
|
+
if (!mem) {
|
|
21
|
+
// 未知记忆的迁出通知:无对象可标(与 tombstone_unknown_memory 同姿势,如实审计)
|
|
22
|
+
audit.record('sync', 'scope_exit_unknown_memory', { type: 'memory', id: ev.memoryId }, { from: ev.deviceId, seq: ev.seq });
|
|
23
|
+
return 'shadowed';
|
|
24
|
+
}
|
|
25
|
+
if (mem.status === 'tombstoned') {
|
|
26
|
+
// 本地已遗忘:遗忘比「不再持有」更彻底,标记无意义
|
|
27
|
+
audit.record('sync', 'scope_exit_shadowed_by_tombstone', { type: 'memory', id: mem.id }, { from: ev.deviceId, seq: ev.seq });
|
|
28
|
+
return 'skipped';
|
|
29
|
+
}
|
|
30
|
+
const alreadyMarked = hasScopeExitMarker(store, mem.id);
|
|
31
|
+
if (alreadyMarked && mem.status === 'archived')
|
|
32
|
+
return 'skipped'; // 幂等:重复事件不再改动
|
|
33
|
+
store.db.transaction(() => {
|
|
34
|
+
// 「本设备不再持有」= meta 标记 + archived 状态:检索不再返回(statuses 默认 active)、
|
|
35
|
+
// 无墓碑记录、不删数据(spec memory-store「迁出事件的通知语义」)。
|
|
36
|
+
if (!alreadyMarked)
|
|
37
|
+
store.db.run('INSERT INTO meta (key, value) VALUES (?, ?)', scopeExitKey(mem.id), nowIso());
|
|
38
|
+
store.db.run("UPDATE memory SET status = 'archived', updated_at = ? WHERE id = ?", nowIso(), mem.id);
|
|
39
|
+
});
|
|
40
|
+
audit.record('sync', 'scope_exit_applied', { type: 'memory', id: mem.id }, { from: ev.deviceId, seq: ev.seq });
|
|
41
|
+
return 'scopeExited';
|
|
42
|
+
}
|
|
9
43
|
if (ev.type === 'memory_tombstone') {
|
|
10
44
|
if (!mem) {
|
|
11
45
|
// 未知记忆的遗忘:无对象可标(首版边界,如实审计)
|
|
@@ -18,7 +52,17 @@ export function applyEvent(store, ev, spaceKey, audit) {
|
|
|
18
52
|
audit.record('sync', 'tombstone_propagated', { type: 'memory', id: mem.id }, { from: ev.deviceId, seq: ev.seq });
|
|
19
53
|
return 'tombstoned';
|
|
20
54
|
}
|
|
21
|
-
if (ev.type !== 'memory_upsert'
|
|
55
|
+
if (ev.type !== 'memory_upsert') {
|
|
56
|
+
// 未知事件类型(未来版本写入的事件):跳过 + 审计,游标照常推进——
|
|
57
|
+
// 不能因单个新类型事件卡死整条链(spec memory-store「未知事件降级」)。
|
|
58
|
+
audit.record('sync', 'unknown_event_skipped', { type: 'memory', id: ev.memoryId }, {
|
|
59
|
+
from: ev.deviceId,
|
|
60
|
+
seq: ev.seq,
|
|
61
|
+
eventType: String(ev.type),
|
|
62
|
+
});
|
|
63
|
+
return 'skipped';
|
|
64
|
+
}
|
|
65
|
+
if (!ev.payload || !('content' in ev.payload)) {
|
|
22
66
|
throw err('E_VALIDATION', `upsert 事件缺 upsert payload: ${ev.memoryId}#${ev.seq}`);
|
|
23
67
|
}
|
|
24
68
|
const payload = ev.payload;
|
|
@@ -45,6 +89,20 @@ export function applyEvent(store, ev, spaceKey, audit) {
|
|
|
45
89
|
audit.record('sync', 'upsert_shadowed_by_tombstone', { type: 'memory', id: mem.id }, { from: ev.deviceId, seq: ev.seq });
|
|
46
90
|
return 'shadowed';
|
|
47
91
|
}
|
|
92
|
+
// 迁回重推(add-scope-migration):先解除「不再持有」并恢复活动,再走正常修订链。
|
|
93
|
+
// 内容相同也会走到这里(先解除再判定 skipped),所以对端迁回后即使没有新修订也能重新持有。
|
|
94
|
+
if (payload.reentry === true && hasScopeExitMarker(store, mem.id)) {
|
|
95
|
+
clearScopeExitMarker(store, mem.id);
|
|
96
|
+
if (mem.status === 'archived') {
|
|
97
|
+
store.db.run("UPDATE memory SET status = 'active', updated_at = ? WHERE id = ?", nowIso(), mem.id);
|
|
98
|
+
}
|
|
99
|
+
audit.record('sync', 'scope_reheld', { type: 'memory', id: mem.id }, { from: ev.deviceId, seq: ev.seq });
|
|
100
|
+
}
|
|
101
|
+
else if (payload.reentry !== true && hasScopeExitMarker(store, mem.id)) {
|
|
102
|
+
// 迁出后的迟到修订:不再作为活动内容呈现,也不解除标记(spec「迁出事件的通知语义」)
|
|
103
|
+
audit.record('sync', 'upsert_shadowed_by_scope_exit', { type: 'memory', id: mem.id }, { from: ev.deviceId, seq: ev.seq });
|
|
104
|
+
return 'shadowed';
|
|
105
|
+
}
|
|
48
106
|
if (mem.contentHash === payload.contentHash)
|
|
49
107
|
return 'skipped';
|
|
50
108
|
// 快进:远端事件的父哈希 == 本地当前内容哈希 → 远端是本地历史的孩子
|
|
@@ -93,6 +151,10 @@ function matchByLineage(store, ev) {
|
|
|
93
151
|
const p = ev.payload;
|
|
94
152
|
return store.memories.findMemoryIdByRevisionHashes(p.knownHashes ?? []);
|
|
95
153
|
}
|
|
154
|
+
if (ev.type === 'scope_exit' && ev.payload) {
|
|
155
|
+
const p = ev.payload;
|
|
156
|
+
return store.memories.findMemoryIdByRevisionHashes([p.lastContentHash, ...(p.knownHashes ?? [])].filter((h) => h.length > 0));
|
|
157
|
+
}
|
|
96
158
|
return null;
|
|
97
159
|
}
|
|
98
160
|
function scopeScopeId(store, spaceKey) {
|
|
@@ -104,7 +166,7 @@ function scopeScopeId(store, spaceKey) {
|
|
|
104
166
|
/** 批量应用:parentHash 未知的事件保留在返回值中由调用方决定重试;单事件失败不拖垮整批。 */
|
|
105
167
|
export function applyEvents(store, events, spaceKey) {
|
|
106
168
|
const audit = store.audit;
|
|
107
|
-
const outcome = { applied: 0, skipped: 0, conflicted: 0, waited: 0, tombstoned: 0, shadowed: 0 };
|
|
169
|
+
const outcome = { applied: 0, skipped: 0, conflicted: 0, waited: 0, tombstoned: 0, shadowed: 0, scopeExited: 0 };
|
|
108
170
|
const waitEvents = [];
|
|
109
171
|
for (const ev of events) {
|
|
110
172
|
try {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apply.js","sourceRoot":"","sources":["../../../src/sync/apply.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAExC,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"apply.js","sourceRoot":"","sources":["../../../src/sync/apply.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,63 @@
|
|
|
1
|
+
import { CairnStore } from '../store/open.js';
|
|
2
|
+
import { RemoteStore } from '../jobs/remote.js';
|
|
3
|
+
import { VaultConfig } from './vault.js';
|
|
4
|
+
/** 备份对象相对 key:`backups/<deviceId>/<name>`(远端实例自带 vault 前缀)。 */
|
|
5
|
+
export declare function backupObjectKey(deviceId: string, name: string): string;
|
|
6
|
+
export interface RemoteBackupInfo {
|
|
7
|
+
name: string;
|
|
8
|
+
key: string;
|
|
9
|
+
/** 密文字节(list 只有 key,逐个拉一次算大小;份数 ≤10,量级无压力)。 */
|
|
10
|
+
sealedBytes: number;
|
|
11
|
+
/** 从对象名解析的上传时间(名字里带时间戳,不是远端 mtime)。 */
|
|
12
|
+
uploadedAt: string | null;
|
|
13
|
+
/** 内嵌的明文 sha256(恢复时校验用)。 */
|
|
14
|
+
plainSha256: string | null;
|
|
15
|
+
}
|
|
16
|
+
/**
|
|
17
|
+
* 列举**本设备**的备份:只扫自己的前缀,绝不触碰其他设备或事件链(task 4.3)。
|
|
18
|
+
* 密文字节与时间从对象内容/名字里取——远端 list 只有 key。
|
|
19
|
+
*/
|
|
20
|
+
export declare function listRemoteBackups(remote: RemoteStore, deviceId: string): Promise<RemoteBackupInfo[]>;
|
|
21
|
+
/**
|
|
22
|
+
* 对象名 = `<本地快照文件名>-<plainSha256>.enc`;本地快照文件名自带 `cairn-backup-<ms>`。
|
|
23
|
+
* 名字即元数据:恢复与列举不需要额外的 sidecar 对象。
|
|
24
|
+
*/
|
|
25
|
+
export declare function backupObjectName(snapshotFileName: string, plainSha256: string): string;
|
|
26
|
+
export interface UploadResult {
|
|
27
|
+
name: string;
|
|
28
|
+
key: string;
|
|
29
|
+
plainBytes: number;
|
|
30
|
+
sealedBytes: number;
|
|
31
|
+
plainSha256: string;
|
|
32
|
+
localSnapshot: {
|
|
33
|
+
path: string;
|
|
34
|
+
bytes: number;
|
|
35
|
+
sha256: string;
|
|
36
|
+
};
|
|
37
|
+
/** 保留清理实际删除的对象(不支持删除的后端为空,且带 pruneWarning)。 */
|
|
38
|
+
pruned: string[];
|
|
39
|
+
pruneWarning: string | null;
|
|
40
|
+
}
|
|
41
|
+
/**
|
|
42
|
+
* 上传备份:本地一致性快照 → 设备密钥加密 → 独立前缀上传 → 保留清理。
|
|
43
|
+
* 不改本地库状态(VACUUM INTO 是只读快照);vault 未配置时明确拒绝(不产生弱加密产物)。
|
|
44
|
+
*/
|
|
45
|
+
export declare function uploadRemoteBackup(store: CairnStore, remote: RemoteStore, vault: VaultConfig, opts?: {
|
|
46
|
+
keep?: number;
|
|
47
|
+
targetPath?: string;
|
|
48
|
+
}): Promise<UploadResult>;
|
|
49
|
+
export interface RestoreResult {
|
|
50
|
+
restoredTo: string;
|
|
51
|
+
plainSha256: string;
|
|
52
|
+
verified: boolean;
|
|
53
|
+
}
|
|
54
|
+
/**
|
|
55
|
+
* 从远端恢复(add-cloud-backup D5):默认还原到**新路径**,绝不覆盖当前库;
|
|
56
|
+
* 覆盖由调用方(CLI)显式 --force 并先自动备份当前库。
|
|
57
|
+
*
|
|
58
|
+
* 校验链:下载 → 解密(Poly1305 / 设备密钥不匹配即失败)→ 明文 sha256 比对名字内嵌值
|
|
59
|
+
* → verifyBackup(integrity + 可打开为库)→ 落盘。任一步失败中止且不产生半还原。
|
|
60
|
+
*/
|
|
61
|
+
export declare function restoreRemoteBackup(store: CairnStore, remote: RemoteStore, vault: VaultConfig, name: string, opts?: {
|
|
62
|
+
toDir?: string;
|
|
63
|
+
}): Promise<RestoreResult>;
|
|
@@ -0,0 +1,184 @@
|
|
|
1
|
+
import { mkdirSync, readFileSync, writeFileSync, rmSync } from 'node:fs';
|
|
2
|
+
import { join } from 'node:path';
|
|
3
|
+
import { backupDatabase, verifyBackup } from '../store/backup.js';
|
|
4
|
+
import { err, isCairnError } from '../core/errors.js';
|
|
5
|
+
import { sha256Hex } from '../core/hash.js';
|
|
6
|
+
import { deriveBackupKey, encryptObject, decryptObject, loadKeys } from './cryptoutil.js';
|
|
7
|
+
/**
|
|
8
|
+
* 设备备份通道(add-cloud-backup):与同步事件链互不干扰的整库快照上传。
|
|
9
|
+
*
|
|
10
|
+
* - 前缀隔离:`backups/<deviceId>/...`,与事件链 `<spaceKey>/devices/...` 无交集;
|
|
11
|
+
* 同步 list 只扫空间前缀,备份 list 只扫备份前缀,互不进入对方视野(spec)。
|
|
12
|
+
* - 密钥隔离:deriveBackupKey(vaultKey, deviceId),与 space 密钥不同域、混入设备维度
|
|
13
|
+
* ——只有生成备份的设备能解开(spec:按设备隔离)。
|
|
14
|
+
* - 对象名内嵌明文 sha256:恢复时解密后重算比对(Poly1305 之外的第二道快照完整性检查)。
|
|
15
|
+
* - 不进 outbox、不碰本地库状态:上传只是「读库 + 写远端」,失败不影响任何记忆读写。
|
|
16
|
+
*/
|
|
17
|
+
const BACKUP_PREFIX = 'backups';
|
|
18
|
+
/** 备份对象相对 key:`backups/<deviceId>/<name>`(远端实例自带 vault 前缀)。 */
|
|
19
|
+
export function backupObjectKey(deviceId, name) {
|
|
20
|
+
return `${BACKUP_PREFIX}/${deviceId}/${name}`;
|
|
21
|
+
}
|
|
22
|
+
/**
|
|
23
|
+
* 列举**本设备**的备份:只扫自己的前缀,绝不触碰其他设备或事件链(task 4.3)。
|
|
24
|
+
* 密文字节与时间从对象内容/名字里取——远端 list 只有 key。
|
|
25
|
+
*/
|
|
26
|
+
export async function listRemoteBackups(remote, deviceId) {
|
|
27
|
+
const prefix = `${BACKUP_PREFIX}/${deviceId}/`;
|
|
28
|
+
const { keys } = await remote.list(prefix);
|
|
29
|
+
const out = [];
|
|
30
|
+
for (const key of keys.sort()) {
|
|
31
|
+
const name = key.slice(prefix.length);
|
|
32
|
+
if (name.length === 0 || name.includes('/'))
|
|
33
|
+
continue;
|
|
34
|
+
const sealed = await remote.getObject(key);
|
|
35
|
+
if (sealed == null)
|
|
36
|
+
continue; // 列举与读取之间的窗口(被保留策略删掉):跳过不报错
|
|
37
|
+
out.push({
|
|
38
|
+
name,
|
|
39
|
+
key,
|
|
40
|
+
sealedBytes: sealed.byteLength,
|
|
41
|
+
uploadedAt: parseBackupName(name).uploadedAt,
|
|
42
|
+
plainSha256: parseBackupName(name).plainSha256,
|
|
43
|
+
});
|
|
44
|
+
}
|
|
45
|
+
return out.sort((a, b) => (a.uploadedAt ?? '') < (b.uploadedAt ?? '') ? 1 : -1);
|
|
46
|
+
}
|
|
47
|
+
/**
|
|
48
|
+
* 对象名 = `<本地快照文件名>-<plainSha256>.enc`;本地快照文件名自带 `cairn-backup-<ms>`。
|
|
49
|
+
* 名字即元数据:恢复与列举不需要额外的 sidecar 对象。
|
|
50
|
+
*/
|
|
51
|
+
export function backupObjectName(snapshotFileName, plainSha256) {
|
|
52
|
+
return `${snapshotFileName}-${plainSha256}.enc`;
|
|
53
|
+
}
|
|
54
|
+
function parseBackupName(name) {
|
|
55
|
+
const m = /^(cairn-backup-(\d+)\.db)-([0-9a-f]{64})\.enc$/.exec(name);
|
|
56
|
+
if (!m || !m[2] || !m[3])
|
|
57
|
+
return { uploadedAt: null, plainSha256: null };
|
|
58
|
+
return { uploadedAt: new Date(Number(m[2])).toISOString(), plainSha256: m[3] };
|
|
59
|
+
}
|
|
60
|
+
/**
|
|
61
|
+
* 上传备份:本地一致性快照 → 设备密钥加密 → 独立前缀上传 → 保留清理。
|
|
62
|
+
* 不改本地库状态(VACUUM INTO 是只读快照);vault 未配置时明确拒绝(不产生弱加密产物)。
|
|
63
|
+
*/
|
|
64
|
+
export async function uploadRemoteBackup(store, remote, vault, opts = {}) {
|
|
65
|
+
const device = store.identity.deviceId;
|
|
66
|
+
const keys = loadKeys(store.paths.dataDir);
|
|
67
|
+
if (!keys) {
|
|
68
|
+
throw err('E_VALIDATION', '未找到 vault 密钥(keys.json);请先 cairn vault init-remote——备份必须端到端加密,不产生明文或弱加密产物');
|
|
69
|
+
}
|
|
70
|
+
// 本地一致性快照(复用既有 backupDatabase:VACUUM INTO + sha256)
|
|
71
|
+
const target = opts.targetPath ?? join(store.paths.backupsDir, `cairn-backup-${Date.now()}.db`);
|
|
72
|
+
const local = backupDatabase(store.db, target);
|
|
73
|
+
const plaintext = readFileSync(local.path);
|
|
74
|
+
const backupKey = deriveBackupKey(keys.vaultKey, device);
|
|
75
|
+
const name = backupObjectName(local.path.split(/[\\/]/).pop() ?? 'cairn-backup.db', local.sha256);
|
|
76
|
+
const key = backupObjectKey(device, name);
|
|
77
|
+
const sealed = encryptObject(plaintext, backupKey, {
|
|
78
|
+
vaultId: vault.vaultId,
|
|
79
|
+
spaceId: BACKUP_PREFIX,
|
|
80
|
+
kind: 'backup',
|
|
81
|
+
objectId: name,
|
|
82
|
+
});
|
|
83
|
+
await remote.putImmutable(key, sealed, sha256Hex(Buffer.from(sealed)));
|
|
84
|
+
// 保留清理:只看本设备前缀;按名字内嵌时间排序(新→旧),超出 keep 的淘汰。
|
|
85
|
+
// 名字解析不出的对象一律不动(不是本机制的产物,删错不可逆),如实警告。
|
|
86
|
+
const keep = Math.max(1, opts.keep ?? 5);
|
|
87
|
+
const pruned = [];
|
|
88
|
+
let pruneWarning = null;
|
|
89
|
+
if (typeof remote.deleteObject !== 'function') {
|
|
90
|
+
pruneWarning = '当前远端不支持删除(syncd 无 DELETE 路由),保留策略跳过;超出保留份数的旧备份需手动清理';
|
|
91
|
+
}
|
|
92
|
+
else {
|
|
93
|
+
const prefix = `${BACKUP_PREFIX}/${device}/`;
|
|
94
|
+
const all = (await remote.list(prefix)).keys;
|
|
95
|
+
const parsed = all.map((k) => ({ key: k, uploadedAt: parseBackupName(k.slice(prefix.length)).uploadedAt }));
|
|
96
|
+
const known = parsed.filter((x) => x.uploadedAt != null).sort((a, b) => (a.uploadedAt < b.uploadedAt ? 1 : -1));
|
|
97
|
+
const unknownCount = parsed.length - known.length;
|
|
98
|
+
const victims = known.slice(keep);
|
|
99
|
+
for (const v of victims) {
|
|
100
|
+
try {
|
|
101
|
+
await remote.deleteObject(v.key);
|
|
102
|
+
}
|
|
103
|
+
catch (e) {
|
|
104
|
+
// 旧版 syncd 的 DELETE 落 404(新版对不存在的备份也回 200):诚实降级,
|
|
105
|
+
// 不把「没删掉」记进 pruned——spec 要求如实报告「保留策略未生效」。
|
|
106
|
+
if (isCairnError(e) && e.message === 'syncd_delete_unsupported') {
|
|
107
|
+
pruneWarning = '保留策略未生效:远端不支持删除(旧版 syncd 无 DELETE 路由),旧备份仍在,需手动清理';
|
|
108
|
+
break;
|
|
109
|
+
}
|
|
110
|
+
throw e;
|
|
111
|
+
}
|
|
112
|
+
pruned.push(v.key);
|
|
113
|
+
}
|
|
114
|
+
if (unknownCount > 0) {
|
|
115
|
+
pruneWarning = `本设备前缀下有 ${unknownCount} 个名字不符合备份命名规则的对象,保留清理未触碰`;
|
|
116
|
+
}
|
|
117
|
+
}
|
|
118
|
+
return {
|
|
119
|
+
name,
|
|
120
|
+
key,
|
|
121
|
+
plainBytes: plaintext.byteLength,
|
|
122
|
+
sealedBytes: sealed.byteLength,
|
|
123
|
+
plainSha256: local.sha256,
|
|
124
|
+
localSnapshot: { path: local.path, bytes: local.bytes, sha256: local.sha256 },
|
|
125
|
+
pruned,
|
|
126
|
+
pruneWarning,
|
|
127
|
+
};
|
|
128
|
+
}
|
|
129
|
+
/**
|
|
130
|
+
* 从远端恢复(add-cloud-backup D5):默认还原到**新路径**,绝不覆盖当前库;
|
|
131
|
+
* 覆盖由调用方(CLI)显式 --force 并先自动备份当前库。
|
|
132
|
+
*
|
|
133
|
+
* 校验链:下载 → 解密(Poly1305 / 设备密钥不匹配即失败)→ 明文 sha256 比对名字内嵌值
|
|
134
|
+
* → verifyBackup(integrity + 可打开为库)→ 落盘。任一步失败中止且不产生半还原。
|
|
135
|
+
*/
|
|
136
|
+
export async function restoreRemoteBackup(store, remote, vault, name, opts = {}) {
|
|
137
|
+
const device = store.identity.deviceId;
|
|
138
|
+
const keys = loadKeys(store.paths.dataDir);
|
|
139
|
+
if (!keys)
|
|
140
|
+
throw err('E_VALIDATION', '未找到 vault 密钥(keys.json);无法解密备份');
|
|
141
|
+
const parsed = parseBackupName(name);
|
|
142
|
+
if (parsed.plainSha256 == null) {
|
|
143
|
+
throw err('E_VALIDATION', `备份对象名不合法(期望 <cairn-backup-<ms>.db>-<sha256>.enc): ${name}`);
|
|
144
|
+
}
|
|
145
|
+
const key = backupObjectKey(device, name);
|
|
146
|
+
const sealed = await remote.getObject(key);
|
|
147
|
+
if (sealed == null) {
|
|
148
|
+
throw err('E_NOT_FOUND', `远端没有本设备的备份对象: ${name}(--list-remote 可查看;其他设备的备份不在此列)`);
|
|
149
|
+
}
|
|
150
|
+
const backupKey = deriveBackupKey(keys.vaultKey, device);
|
|
151
|
+
let plaintext;
|
|
152
|
+
try {
|
|
153
|
+
plaintext = decryptObject(sealed, backupKey, {
|
|
154
|
+
vaultId: vault.vaultId,
|
|
155
|
+
spaceId: BACKUP_PREFIX,
|
|
156
|
+
kind: 'backup',
|
|
157
|
+
objectId: name,
|
|
158
|
+
});
|
|
159
|
+
}
|
|
160
|
+
catch {
|
|
161
|
+
throw err('E_VALIDATION', '备份解密失败:密钥材料不匹配或密文已损坏(其他设备的备份在本设备上必然如此)');
|
|
162
|
+
}
|
|
163
|
+
// 明文 sha256 比对(名字内嵌值):密文层认证之外的第二道快照完整性检查
|
|
164
|
+
const actual = sha256Hex(Buffer.from(plaintext));
|
|
165
|
+
if (actual !== parsed.plainSha256) {
|
|
166
|
+
throw err('E_BACKUP_CORRUPT', '备份明文 sha256 与对象名内嵌值不一致,中止恢复', {
|
|
167
|
+
expected: parsed.plainSha256,
|
|
168
|
+
actual,
|
|
169
|
+
});
|
|
170
|
+
}
|
|
171
|
+
const toDir = opts.toDir ?? join(store.paths.home, `restore-${Date.now()}`);
|
|
172
|
+
mkdirSync(toDir, { recursive: true });
|
|
173
|
+
const restoredPath = join(toDir, 'cairn.db');
|
|
174
|
+
rmSync(restoredPath, { force: true });
|
|
175
|
+
writeFileSync(restoredPath, plaintext);
|
|
176
|
+
// 落盘后按快照明细校验(可打开为库 + integrity);失败删除半成品并保留现状
|
|
177
|
+
const check = verifyBackup(restoredPath);
|
|
178
|
+
if (!check.ok) {
|
|
179
|
+
rmSync(restoredPath, { force: true });
|
|
180
|
+
throw err('E_BACKUP_CORRUPT', `恢复的快照未通过校验,已删除半成品: ${check.problems.join('; ')}`);
|
|
181
|
+
}
|
|
182
|
+
return { restoredTo: restoredPath, plainSha256: actual, verified: true };
|
|
183
|
+
}
|
|
184
|
+
//# sourceMappingURL=backup-store.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"backup-store.js","sourceRoot":"","sources":["../../../src/sync/backup-store.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,8 +21,8 @@
|
|
|
21
21
|
*/
|
|
22
22
|
/** 密文格式版本号(线格式首字节)。未来算法更换/密钥轮换时递增并引入 keyId(design D3)。 */
|
|
23
23
|
export declare const CIPHER_VERSION = 1;
|
|
24
|
-
/** AAD 对象类型:chunk
|
|
25
|
-
export type EncryptedObjectKind = 'chunk' | 'manifest';
|
|
24
|
+
/** AAD 对象类型:chunk(一批同步事件)、manifest(设备 manifest)、backup(设备备份快照)。 */
|
|
25
|
+
export type EncryptedObjectKind = 'chunk' | 'manifest' | 'backup';
|
|
26
26
|
/**
|
|
27
27
|
* AAD 绑定字段:协议版本、vault、space、对象类型与对象 ID 全部入册
|
|
28
28
|
* (spec:认证加密 AAD 绑定协议版本、vault、space、对象标识)。
|
|
@@ -47,6 +47,14 @@ export declare function generateVaultKeys(): VaultKeys;
|
|
|
47
47
|
* 确定性:同 vaultKey + 同 spaceId 永远得到同一 spaceKey(跨设备无需协商)。
|
|
48
48
|
*/
|
|
49
49
|
export declare function deriveSpaceKey(vaultKey: Uint8Array, spaceId: string): Uint8Array;
|
|
50
|
+
/**
|
|
51
|
+
* 派生设备备份密钥(add-cloud-backup D2):HKDF-SHA256(vaultKey, salt='cairn-backup-key', info=`v1|${deviceId}`)。
|
|
52
|
+
* 与 deriveSpaceKey 平行但不同域(不同 salt):
|
|
53
|
+
* - 复用 vaultKey → 用户不需要多抄一份恢复材料;
|
|
54
|
+
* - 混入 deviceId → 备份只能由生成它的设备解开(其他设备拿到密文也无密钥材料);
|
|
55
|
+
* - 密文不可被当 chunk 解开、反之亦然(spec:两类对象密文不可互相替换)。
|
|
56
|
+
*/
|
|
57
|
+
export declare function deriveBackupKey(vaultKey: Uint8Array, deviceId: string): Uint8Array;
|
|
50
58
|
/**
|
|
51
59
|
* 加密一个同步对象。输出 = [versionByte(1)] + [nonce(24)] + [ciphertext+tag]。
|
|
52
60
|
* AAD = UTF8(`v1|${vaultId}|${spaceId}|${kind}|${objectId}`)。
|
|
@@ -42,6 +42,8 @@ const KEY_LEN = 32;
|
|
|
42
42
|
const MIN_BLOB_LEN = VERSION_LEN + NONCE_LEN + TAG_LEN;
|
|
43
43
|
/** HKDF salt 固定串。info 携带协议版本与 spaceId;tests/sync 有字面量锚定测试防止无意变更。 */
|
|
44
44
|
const SPACE_KEY_SALT = 'cairn-space-key';
|
|
45
|
+
/** 备份派生路径的独立 salt:与 space 密钥不同域,两类密文不可互换(add-cloud-backup D2)。 */
|
|
46
|
+
const BACKUP_KEY_SALT = 'cairn-backup-key';
|
|
45
47
|
const KEYS_FILE = 'keys.json';
|
|
46
48
|
const KEYS_FORMAT = 'cairn-vault-keys';
|
|
47
49
|
const KEYS_VERSION = 1;
|
|
@@ -75,6 +77,25 @@ export function deriveSpaceKey(vaultKey, spaceId) {
|
|
|
75
77
|
}
|
|
76
78
|
return hkdf(sha256, vaultKey, textEncoder.encode(SPACE_KEY_SALT), textEncoder.encode(`v1|${spaceId}`), KEY_LEN);
|
|
77
79
|
}
|
|
80
|
+
/**
|
|
81
|
+
* 派生设备备份密钥(add-cloud-backup D2):HKDF-SHA256(vaultKey, salt='cairn-backup-key', info=`v1|${deviceId}`)。
|
|
82
|
+
* 与 deriveSpaceKey 平行但不同域(不同 salt):
|
|
83
|
+
* - 复用 vaultKey → 用户不需要多抄一份恢复材料;
|
|
84
|
+
* - 混入 deviceId → 备份只能由生成它的设备解开(其他设备拿到密文也无密钥材料);
|
|
85
|
+
* - 密文不可被当 chunk 解开、反之亦然(spec:两类对象密文不可互相替换)。
|
|
86
|
+
*/
|
|
87
|
+
export function deriveBackupKey(vaultKey, deviceId) {
|
|
88
|
+
if (!(vaultKey instanceof Uint8Array) || vaultKey.length !== KEY_LEN) {
|
|
89
|
+
throw err('E_VALIDATION', 'vault_key_invalid_length', {
|
|
90
|
+
expected: KEY_LEN,
|
|
91
|
+
got: vaultKey instanceof Uint8Array ? vaultKey.length : null,
|
|
92
|
+
});
|
|
93
|
+
}
|
|
94
|
+
if (typeof deviceId !== 'string' || deviceId.length === 0) {
|
|
95
|
+
throw err('E_VALIDATION', 'device_id_invalid');
|
|
96
|
+
}
|
|
97
|
+
return hkdf(sha256, vaultKey, textEncoder.encode(BACKUP_KEY_SALT), textEncoder.encode(`v1|${deviceId}`), KEY_LEN);
|
|
98
|
+
}
|
|
78
99
|
/**
|
|
79
100
|
* 加密一个同步对象。输出 = [versionByte(1)] + [nonce(24)] + [ciphertext+tag]。
|
|
80
101
|
* AAD = UTF8(`v1|${vaultId}|${spaceId}|${kind}|${objectId}`)。
|
|
@@ -288,7 +309,7 @@ function assertAad(aad) {
|
|
|
288
309
|
aad.spaceId.length === 0 ||
|
|
289
310
|
typeof aad.objectId !== 'string' ||
|
|
290
311
|
aad.objectId.length === 0 ||
|
|
291
|
-
(aad.kind !== 'chunk' && aad.kind !== 'manifest')) {
|
|
312
|
+
(aad.kind !== 'chunk' && aad.kind !== 'manifest' && aad.kind !== 'backup')) {
|
|
292
313
|
throw err('E_VALIDATION', 'aad_invalid');
|
|
293
314
|
}
|
|
294
315
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cryptoutil.js","sourceRoot":"","sources":["../../../src/sync/cryptoutil.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAEH,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,SAAS,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AACxF,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAC7D,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAC;AAC7C,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAC/C,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAEzC,0DAA0D;AAC1D,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,CAAC;AAEhC,MAAM,WAAW,GAAG,CAAC,CAAC;AACtB,6BAA6B;AAC7B,MAAM,SAAS,GAAG,EAAE,CAAC;AACrB,uBAAuB;AACvB,MAAM,OAAO,GAAG,EAAE,CAAC;AACnB,oCAAoC;AACpC,MAAM,OAAO,GAAG,EAAE,CAAC;AACnB,0DAA0D;AAC1D,MAAM,YAAY,GAAG,WAAW,GAAG,SAAS,GAAG,OAAO,CAAC;AAEvD,oEAAoE;AACpE,MAAM,cAAc,GAAG,iBAAiB,CAAC;AAEzC,MAAM,SAAS,GAAG,WAAW,CAAC;AAC9B,MAAM,WAAW,GAAG,kBAAkB,CAAC;AACvC,MAAM,YAAY,GAAG,CAAC,CAAC;AAEvB,iDAAiD;AACjD,MAAM,eAAe,GAAG,SAAS,CAAC;AAClC,MAAM,eAAe,GAAG,sBAAsB,CAAC;AAC/C,MAAM,gBAAgB,GAAG,CAAC,CAAC;AAE3B,MAAM,WAAW,GAAG,IAAI,WAAW,EAAE,CAAC;AAwBtC,sEAAsE;AACtE,MAAM,UAAU,iBAAiB;IAC/B,0DAA0D;IAC1D,OAAO;QACL,OAAO,EAAE,MAAM,EAAE;QACjB,QAAQ,EAAE,UAAU,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;QAC/C,SAAS,EAAE,MAAM,EAAE;KACpB,CAAC;AACJ,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,cAAc,CAAC,QAAoB,EAAE,OAAe;IAClE,IAAI,CAAC,CAAC,QAAQ,YAAY,UAAU,CAAC,IAAI,QAAQ,CAAC,MAAM,KAAK,OAAO,EAAE,CAAC;QACrE,MAAM,GAAG,CAAC,cAAc,EAAE,0BAA0B,EAAE;YACpD,QAAQ,EAAE,OAAO;YACjB,GAAG,EAAE,QAAQ,YAAY,UAAU,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI;SAC7D,CAAC,CAAC;IACL,CAAC;IACD,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACxD,MAAM,GAAG,CAAC,cAAc,EAAE,kBAAkB,CAAC,CAAC;IAChD,CAAC;IACD,OAAO,IAAI,CAAC,MAAM,EAAE,QAAQ,EAAE,WAAW,CAAC,MAAM,CAAC,cAAc,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC,MAAM,OAAO,EAAE,CAAC,EAAE,OAAO,CAAC,CAAC;AAClH,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,aAAa,CAAC,SAAqB,EAAE,QAAoB,EAAE,GAAc;IACvF,SAAS,CAAC,GAAG,CAAC,CAAC;IACf,cAAc,CAAC,QAAQ,CAAC,CAAC;IACzB,IAAI,CAAC,CAAC,SAAS,YAAY,UAAU,CAAC,EAAE,CAAC;QACvC,MAAM,GAAG,CAAC,cAAc,EAAE,mBAAmB,CAAC,CAAC;IACjD,CAAC;IACD,MAAM,KAAK,GAAG,WAAW,CAAC,SAAS,CAAC,CAAC;IACrC,MAAM,UAAU,GAAG,iBAAiB,CAAC,QAAQ,EAAE,KAAK,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IACxF,MAAM,GAAG,GAAG,IAAI,UAAU,CAAC,WAAW,GAAG,SAAS,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC;IACxE,GAAG,CAAC,CAAC,CAAC,GAAG,cAAc,CAAC;IACxB,GAAG,CAAC,GAAG,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;IAC5B,GAAG,CAAC,GAAG,CAAC,UAAU,EAAE,WAAW,GAAG,SAAS,CAAC,CAAC;IAC7C,OAAO,GAAG,CAAC;AACb,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,aAAa,CAAC,IAAgB,EAAE,QAAoB,EAAE,GAAc;IAClF,SAAS,CAAC,GAAG,CAAC,CAAC;IACf,cAAc,CAAC,QAAQ,CAAC,CAAC;IACzB,IAAI,CAAC,CAAC,IAAI,YAAY,UAAU,CAAC,IAAI,IAAI,CAAC,MAAM,GAAG,YAAY,EAAE,CAAC;QAChE,MAAM,GAAG,CAAC,cAAc,EAAE,uBAAuB,EAAE;YACjD,GAAG,EAAE,IAAI,YAAY,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI;YACpD,SAAS,EAAE,YAAY;SACxB,CAAC,CAAC;IACL,CAAC;IACD,MAAM,OAAO,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;IACxB,IAAI,OAAO,KAAK,cAAc,EAAE,CAAC;QAC/B,MAAM,GAAG,CAAC,cAAc,EAAE,yBAAyB,EAAE,EAAE,GAAG,EAAE,OAAO,EAAE,QAAQ,EAAE,cAAc,EAAE,CAAC,CAAC;IACnG,CAAC;IACD,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAC,WAAW,EAAE,WAAW,GAAG,SAAS,CAAC,CAAC;IAClE,MAAM,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC,WAAW,GAAG,SAAS,CAAC,CAAC;IAC1D,IAAI,CAAC;QACH,OAAO,iBAAiB,CAAC,QAAQ,EAAE,KAAK,EAAE,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IAC/E,CAAC;IAAC,MAAM,CAAC;QACP,qDAAqD;QACrD,gCAAgC;QAChC,MAAM,GAAG,CAAC,cAAc,EAAE,kBAAkB,CAAC,CAAC;IAChD,CAAC;AACH,CAAC;AAED;;;;;;;;;;GAUG;AACH,MAAM,UAAU,QAAQ,CAAC,OAAe,EAAE,IAAe;IACvD,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACxD,MAAM,GAAG,CAAC,cAAc,EAAE,kBAAkB,CAAC,CAAC;IAChD,CAAC;IACD,eAAe,CAAC,IAAI,CAAC,CAAC;IACtB,SAAS,CAAC,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IACxC,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;IACtC,IAAI,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;QACrB,MAAM,GAAG,CAAC,MAAM,EAAE,oBAAoB,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC;IACpD,CAAC;IACD,MAAM,IAAI,GAAG,aAAa,CAAC;QACzB,SAAS,EAAE,IAAI,CAAC,SAAS;QACzB,MAAM,EAAE,WAAW;QACnB,OAAO,EAAE,IAAI,CAAC,OAAO;QACrB,QAAQ,EAAE,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC;QACjC,OAAO,EAAE,YAAY;KACtB,CAAC,CAAC;IACH,IAAI,CAAC;QACH,aAAa,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;IAClF,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,MAAM,IAAI,GAAI,CAAkC,EAAE,IAAI,CAAC;QACvD,IAAI,IAAI,KAAK,QAAQ,EAAE,CAAC;YACtB,MAAM,GAAG,CAAC,MAAM,EAAE,oBAAoB,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC;QACpD,CAAC;QACD,MAAM,GAAG,CAAC,MAAM,EAAE,mBAAmB,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,IAAI,IAAI,EAAE,CAAC,CAAC;IACxE,CAAC;IACD,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;QACjC,SAAS,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IACzB,CAAC;AACH,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,QAAQ,CAAC,OAAe;IACtC,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;IACtC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;QACtB,OAAO,IAAI,CAAC;IACd,CAAC;IACD,IAAI,IAAY,CAAC;IACjB,IAAI,CAAC;QACH,IAAI,GAAG,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IACpC,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;IACD,IAAI,GAAY,CAAC;IACjB,IAAI,CAAC;QACH,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACzB,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;IACD,IAAI,GAAG,KAAK,IAAI,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE,CAAC;QAC5C,OAAO,IAAI,CAAC;IACd,CAAC;IACD,MAAM,GAAG,GAAG,GAA8B,CAAC;IAC3C,IAAI,GAAG,CAAC,QAAQ,CAAC,KAAK,WAAW,IAAI,GAAG,CAAC,SAAS,CAAC,KAAK,YAAY,EAAE,CAAC;QACrE,OAAO,IAAI,CAAC;IACd,CAAC;IACD,MAAM,OAAO,GAAG,GAAG,CAAC,SAAS,CAAC,CAAC;IAC/B,MAAM,QAAQ,GAAG,GAAG,CAAC,UAAU,CAAC,CAAC;IACjC,MAAM,SAAS,GAAG,GAAG,CAAC,WAAW,CAAC,CAAC;IACnC,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC;QACpD,OAAO,IAAI,CAAC;IACd,CAAC;IACD,IAAI,OAAO,QAAQ,KAAK,QAAQ,IAAI,OAAO,SAAS,KAAK,QAAQ,EAAE,CAAC;QAClE,OAAO,IAAI,CAAC;IACd,CAAC;IACD,MAAM,QAAQ,GAAG,eAAe,CAAC,QAAQ,CAAC,CAAC;IAC3C,IAAI,QAAQ,KAAK,IAAI,IAAI,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC;QAC7D,OAAO,IAAI,CAAC;IACd,CAAC;IACD,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC;AACpD,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,sBAAsB,CAAC,IAAe;IACpD,eAAe,CAAC,IAAI,CAAC,CAAC;IACtB,MAAM,IAAI,GAAG,aAAa,CAAC;QACzB,SAAS,EAAE,IAAI,CAAC,SAAS;QACzB,MAAM,EAAE,eAAe;QACvB,OAAO,EAAE,IAAI,CAAC,OAAO;QACrB,QAAQ,EAAE,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC;QACjC,OAAO,EAAE,gBAAgB;KAC1B,CAAC,CAAC;IACH,OAAO,eAAe,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;AAC3E,CAAC;AAED,4EAA4E;AAC5E,MAAM,UAAU,sBAAsB,CAAC,IAAY;IACjD,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;QAC7B,oBAAoB,EAAE,CAAC;IACzB,CAAC;IACD,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;IAC5B,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,eAAe,CAAC,EAAE,CAAC;QACzC,oBAAoB,EAAE,CAAC;IACzB,CAAC;IACD,MAAM,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;IACtD,mDAAmD;IACnD,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;QACtC,oBAAoB,EAAE,CAAC;IACzB,CAAC;IACD,IAAI,IAAY,CAAC;IACjB,IAAI,CAAC;QACH,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IAC5D,CAAC;IAAC,MAAM,CAAC;QACP,oBAAoB,EAAE,CAAC;IACzB,CAAC;IACD,IAAI,GAAY,CAAC;IACjB,IAAI,CAAC;QACH,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACzB,CAAC;IAAC,MAAM,CAAC;QACP,oBAAoB,EAAE,CAAC;IACzB,CAAC;IACD,IAAI,GAAG,KAAK,IAAI,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE,CAAC;QAC5C,oBAAoB,EAAE,CAAC;IACzB,CAAC;IACD,MAAM,GAAG,GAAG,GAA8B,CAAC;IAC3C,IAAI,GAAG,CAAC,QAAQ,CAAC,KAAK,eAAe,IAAI,GAAG,CAAC,SAAS,CAAC,KAAK,gBAAgB,EAAE,CAAC;QAC7E,oBAAoB,EAAE,CAAC;IACzB,CAAC;IACD,MAAM,OAAO,GAAG,GAAG,CAAC,SAAS,CAAC,CAAC;IAC/B,MAAM,QAAQ,GAAG,GAAG,CAAC,UAAU,CAAC,CAAC;IACjC,MAAM,SAAS,GAAG,GAAG,CAAC,WAAW,CAAC,CAAC;IACnC,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC;QACpD,oBAAoB,EAAE,CAAC;IACzB,CAAC;IACD,IAAI,OAAO,QAAQ,KAAK,QAAQ,IAAI,OAAO,SAAS,KAAK,QAAQ,EAAE,CAAC;QAClE,oBAAoB,EAAE,CAAC;IACzB,CAAC;IACD,MAAM,QAAQ,GAAG,eAAe,CAAC,QAAQ,CAAC,CAAC;IAC3C,IAAI,QAAQ,KAAK,IAAI,IAAI,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC;QAC7D,oBAAoB,EAAE,CAAC;IACzB,CAAC;IACD,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC;AACpD,CAAC;AAED,8EAA8E;AAC9E,OAAO;AACP,8EAA8E;AAE9E,SAAS,SAAS,CAAC,GAAc;IAC/B,IACE,GAAG,KAAK,IAAI;QACZ,OAAO,GAAG,KAAK,QAAQ;QACvB,OAAO,GAAG,CAAC,OAAO,KAAK,QAAQ;QAC/B,GAAG,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC;QACxB,OAAO,GAAG,CAAC,OAAO,KAAK,QAAQ;QAC/B,GAAG,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC;QACxB,OAAO,GAAG,CAAC,QAAQ,KAAK,QAAQ;QAChC,GAAG,CAAC,QAAQ,CAAC,MAAM,KAAK,CAAC;QACzB,CAAC,GAAG,CAAC,IAAI,KAAK,OAAO,IAAI,GAAG,CAAC,IAAI,KAAK,UAAU,CAAC,EACjD,CAAC;QACD,MAAM,GAAG,CAAC,cAAc,EAAE,aAAa,CAAC,CAAC;IAC3C,CAAC;AACH,CAAC;AAED,SAAS,cAAc,CAAC,QAAoB;IAC1C,IAAI,CAAC,CAAC,QAAQ,YAAY,UAAU,CAAC,IAAI,QAAQ,CAAC,MAAM,KAAK,OAAO,EAAE,CAAC;QACrE,MAAM,GAAG,CAAC,cAAc,EAAE,0BAA0B,EAAE;YACpD,QAAQ,EAAE,OAAO;YACjB,GAAG,EAAE,QAAQ,YAAY,UAAU,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI;SAC7D,CAAC,CAAC;IACL,CAAC;AACH,CAAC;AAED,SAAS,eAAe,CAAC,IAAe;IACtC,IACE,IAAI,KAAK,IAAI;QACb,OAAO,IAAI,KAAK,QAAQ;QACxB,OAAO,IAAI,CAAC,OAAO,KAAK,QAAQ;QAChC,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC;QACrB,CAAC,CAAC,IAAI,CAAC,QAAQ,YAAY,UAAU,CAAC;QACtC,IAAI,CAAC,QAAQ,CAAC,MAAM,KAAK,OAAO;QAChC,OAAO,IAAI,CAAC,SAAS,KAAK,QAAQ;QAClC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,EACxC,CAAC;QACD,MAAM,GAAG,CAAC,cAAc,EAAE,oBAAoB,CAAC,CAAC;IAClD,CAAC;AACH,CAAC;AAED,SAAS,QAAQ,CAAC,GAAc;IAC9B,OAAO,WAAW,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,OAAO,IAAI,GAAG,CAAC,OAAO,IAAI,GAAG,CAAC,IAAI,IAAI,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;AAC5F,CAAC;AAED,SAAS,QAAQ,CAAC,KAAiB;IACjC,OAAO,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;AAC/C,CAAC;AAED;;;GAGG;AACH,SAAS,eAAe,CAAC,CAAS;IAChC,MAAM,GAAG,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC;IACrC,IAAI,GAAG,CAAC,MAAM,KAAK,OAAO,EAAE,CAAC;QAC3B,OAAO,IAAI,CAAC;IACd,CAAC;IACD,MAAM,SAAS,GAAG,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IACzC,IAAI,CAAC,KAAK,SAAS,IAAI,CAAC,KAAK,SAAS,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,EAAE,CAAC;QAC1D,OAAO,IAAI,CAAC;IACd,CAAC;IACD,OAAO,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC9B,CAAC;AAED,SAAS,oBAAoB;IAC3B,MAAM,GAAG,CAAC,cAAc,EAAE,2BAA2B,CAAC,CAAC;AACzD,CAAC"}
|
|
1
|
+
{"version":3,"file":"cryptoutil.js","sourceRoot":"","sources":["../../../src/sync/cryptoutil.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,6 +21,11 @@ export interface SyncUpsertPayload {
|
|
|
21
21
|
sourceAgent: string | null;
|
|
22
22
|
createdBy: string;
|
|
23
23
|
reason: string | null;
|
|
24
|
+
/**
|
|
25
|
+
* 迁回重推标记(add-scope-migration):这条 upsert 来自「迁出后重新迁回」的强制重发。
|
|
26
|
+
* 对端据此解除「不再持有」标记;没有该标记的普通 upsert 在标记存在时按迟到修订跳过。
|
|
27
|
+
*/
|
|
28
|
+
reentry?: boolean;
|
|
24
29
|
}
|
|
25
30
|
export interface SyncTombstonePayload {
|
|
26
31
|
/** 遗忘时的内容哈希(tombstone 行记录)。 */
|
|
@@ -28,14 +33,24 @@ export interface SyncTombstonePayload {
|
|
|
28
33
|
/** 推送端已知的全部修订内容哈希——跨设备记忆身份对齐(本地 id 不可跨设备引用)。 */
|
|
29
34
|
knownHashes: string[];
|
|
30
35
|
}
|
|
36
|
+
/**
|
|
37
|
+
* 迁出通知 payload(add-scope-migration D3):一条已同步的记忆迁出了可同步作用域。
|
|
38
|
+
* 对端语义是「本设备不再持有」——不是遗忘(无墓碑),不是删除(数据保留)。
|
|
39
|
+
*/
|
|
40
|
+
export interface SyncScopeExitPayload {
|
|
41
|
+
/** 推送端最后已知(已推送)的内容哈希。 */
|
|
42
|
+
lastContentHash: string;
|
|
43
|
+
/** 推送端已知的全部修订内容哈希——与 tombstone 同一血统对齐机制。 */
|
|
44
|
+
knownHashes: string[];
|
|
45
|
+
}
|
|
31
46
|
export interface SyncEvent {
|
|
32
47
|
deviceId: string;
|
|
33
48
|
seq: number;
|
|
34
|
-
type: 'memory_upsert' | 'memory_tombstone';
|
|
49
|
+
type: 'memory_upsert' | 'memory_tombstone' | 'scope_exit';
|
|
35
50
|
/** 推送端本地记忆 id;跨设备对账以内容哈希血统为准(见 SyncTombstonePayload)。 */
|
|
36
51
|
memoryId: string;
|
|
37
52
|
occurredAt: string;
|
|
38
|
-
payload: SyncUpsertPayload | SyncTombstonePayload | null;
|
|
53
|
+
payload: SyncUpsertPayload | SyncTombstonePayload | SyncScopeExitPayload | null;
|
|
39
54
|
}
|
|
40
55
|
/** 打包前校验:内容哈希必须与正文一致(传输完整性内建于事件)。 */
|
|
41
56
|
export declare function validateUpsertEvent(ev: SyncEvent): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"events.js","sourceRoot":"","sources":["../../../src/sync/events.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAEjD,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAC9D,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AAExC;;;;GAIG;AAEH,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"events.js","sourceRoot":"","sources":["../../../src/sync/events.ts"],"names":[],"mappings":"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"}
|
|
@@ -54,7 +54,11 @@ export function syncContext(store) {
|
|
|
54
54
|
export function registerSyncWorker(store, remote, vault) {
|
|
55
55
|
registerHandler('sync_upstream', (job) => {
|
|
56
56
|
// worker 已 claim 单个任务;push 以该任务触发批量发布(幂等:已推送修订跳过)
|
|
57
|
-
void syncPush(store, remote, vault, { preclaimedJobs: [{ id: job.id, entityId: job.entityId }] });
|
|
57
|
+
void syncPush(store, remote, vault, { preclaimedJobs: [{ id: job.id, entityId: job.entityId, payload: job.payload }] });
|
|
58
|
+
});
|
|
59
|
+
// 迁出通知任务走同一条 push 链(add-scope-migration):生成 scope_exit 控制事件。
|
|
60
|
+
registerHandler('sync_scope_exit', (job) => {
|
|
61
|
+
void syncPush(store, remote, vault, { preclaimedJobs: [{ id: job.id, entityId: job.entityId, payload: job.payload }] });
|
|
58
62
|
});
|
|
59
63
|
}
|
|
60
64
|
/** 初始化远端:生成/复用密钥 + 写 vault.json + 确保 personal-global 为 encrypted。 */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"orchestrate.js","sourceRoot":"","sources":["../../../src/sync/orchestrate.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"orchestrate.js","sourceRoot":"","sources":["../../../src/sync/orchestrate.ts"],"names":[],"mappings":"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"}
|
package/dist/src/sync/pull.js
CHANGED
|
@@ -131,7 +131,7 @@ export async function syncPull(store, remote, vault) {
|
|
|
131
131
|
}
|
|
132
132
|
if (appliedThrough > cursor)
|
|
133
133
|
setCursor(store, spaceKey, deviceId, appliedThrough);
|
|
134
|
-
const applied = (outcome?.applied ?? 0) + (outcome?.tombstoned ?? 0) + (outcome?.conflicted ?? 0);
|
|
134
|
+
const applied = (outcome?.applied ?? 0) + (outcome?.tombstoned ?? 0) + (outcome?.conflicted ?? 0) + (outcome?.scopeExited ?? 0);
|
|
135
135
|
totalApplied += applied;
|
|
136
136
|
results.push({
|
|
137
137
|
deviceId,
|