@carloswon/cairn-memory 0.4.0 → 0.5.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 +52 -0
- package/README.md +17 -1
- 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 +68 -0
- package/dist/src/interfaces/app-service.js +194 -2
- package/dist/src/interfaces/app-service.js.map +1 -1
- package/dist/src/interfaces/cli/main.js +438 -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.js +113 -0
- 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/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 +37 -0
- package/dist/src/store/projects.js +75 -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 +173 -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/docs/cairn-security.md +14 -0
- package/docs/cairn-usage.md +99 -0
- package/package.json +1 -1
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"project-alias.js","sourceRoot":"","sources":["../../../src/store/project-alias.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
import { CairnDb } from './db.js';
|
|
2
|
+
/**
|
|
3
|
+
* 项目身份仓储(add-stable-project-identity design D1/D4/D6)。
|
|
4
|
+
*
|
|
5
|
+
* 项目的 id 是 uuidv7,路径/仓库地址只作为别名存在;CLI 与 MCP 都只能经由
|
|
6
|
+
* 本模块的三个函数读写,避免「同一判断写两份」。
|
|
7
|
+
* 不校验路径是否存在(D5):跨设备解析时对方目录本就不在本机。
|
|
8
|
+
*/
|
|
9
|
+
export interface ProjectSummary {
|
|
10
|
+
projectId: string;
|
|
11
|
+
name: string;
|
|
12
|
+
aliases: string[];
|
|
13
|
+
createdAt: string;
|
|
14
|
+
}
|
|
15
|
+
export interface ResolveProjectResult {
|
|
16
|
+
projectId: string;
|
|
17
|
+
name: string;
|
|
18
|
+
/** true=本次新建;false=命中已有项目 */
|
|
19
|
+
created: boolean;
|
|
20
|
+
/** 本次用于匹配/登记的归一化别名 */
|
|
21
|
+
matchedAlias: string;
|
|
22
|
+
}
|
|
23
|
+
export interface AddAliasResult {
|
|
24
|
+
projectId: string;
|
|
25
|
+
alias: string;
|
|
26
|
+
/** false 表示该别名本来就属于这个项目(幂等,无写入) */
|
|
27
|
+
added: boolean;
|
|
28
|
+
aliases: string[];
|
|
29
|
+
}
|
|
30
|
+
/** 解析:命中返回原 id,未命中建项目(uuidv7)+ 首别名。 */
|
|
31
|
+
export declare function resolveProject(db: CairnDb, raw: string, opts?: {
|
|
32
|
+
name?: string;
|
|
33
|
+
}): ResolveProjectResult;
|
|
34
|
+
/** 追加别名:被别的项目占用即拒绝并报告归属,不改任何数据(D4)。 */
|
|
35
|
+
export declare function addAlias(db: CairnDb, projectId: string, raw: string): AddAliasResult;
|
|
36
|
+
/** 严格只读:绝不建项目。 */
|
|
37
|
+
export declare function listProjects(db: CairnDb): ProjectSummary[];
|
|
@@ -0,0 +1,75 @@
|
|
|
1
|
+
import { AuditLog } from './audit.js';
|
|
2
|
+
import { normalizeAlias } from './project-alias.js';
|
|
3
|
+
import { uuidv7 } from '../core/ids.js';
|
|
4
|
+
import { nowIso } from '../core/time.js';
|
|
5
|
+
import { err } from '../core/errors.js';
|
|
6
|
+
/** 解析:命中返回原 id,未命中建项目(uuidv7)+ 首别名。 */
|
|
7
|
+
export function resolveProject(db, raw, opts = {}) {
|
|
8
|
+
const alias = normalizeAlias(raw);
|
|
9
|
+
const hit = findOwner(db, alias.value);
|
|
10
|
+
if (hit)
|
|
11
|
+
return { projectId: hit.projectId, name: hit.name, created: false, matchedAlias: alias.value };
|
|
12
|
+
const projectId = uuidv7();
|
|
13
|
+
// 默认显示名用归一化值:原始 URL 可能带凭据,不能落到 project.name。
|
|
14
|
+
const name = opts.name?.trim() || alias.value;
|
|
15
|
+
db.transaction(() => {
|
|
16
|
+
db.run('INSERT INTO project (id, name, aliases, created_at) VALUES (?, ?, ?, ?)', projectId, name, JSON.stringify([alias.value]), nowIso());
|
|
17
|
+
new AuditLog(db).record('project', 'created', { type: 'project', id: projectId }, { alias: alias.value, kind: alias.kind, name });
|
|
18
|
+
});
|
|
19
|
+
return { projectId, name, created: true, matchedAlias: alias.value };
|
|
20
|
+
}
|
|
21
|
+
/** 追加别名:被别的项目占用即拒绝并报告归属,不改任何数据(D4)。 */
|
|
22
|
+
export function addAlias(db, projectId, raw) {
|
|
23
|
+
const alias = normalizeAlias(raw);
|
|
24
|
+
const target = getProject(db, projectId);
|
|
25
|
+
if (!target)
|
|
26
|
+
throw err('E_NOT_FOUND', `项目不存在: ${projectId}`);
|
|
27
|
+
const owner = findOwner(db, alias.value);
|
|
28
|
+
if (owner && owner.projectId !== projectId) {
|
|
29
|
+
throw err('E_CONFLICT_STATE', `别名已属于其他项目: ${alias.value} → ${owner.name}`, {
|
|
30
|
+
alias: alias.value,
|
|
31
|
+
ownerProjectId: owner.projectId,
|
|
32
|
+
ownerName: owner.name,
|
|
33
|
+
});
|
|
34
|
+
}
|
|
35
|
+
if (owner)
|
|
36
|
+
return { projectId, alias: alias.value, added: false, aliases: target.aliases };
|
|
37
|
+
const aliases = [...target.aliases, alias.value];
|
|
38
|
+
db.transaction(() => {
|
|
39
|
+
db.run('UPDATE project SET aliases = ? WHERE id = ?', JSON.stringify(aliases), projectId);
|
|
40
|
+
new AuditLog(db).record('project', 'alias_added', { type: 'project', id: projectId }, { alias: alias.value, kind: alias.kind });
|
|
41
|
+
});
|
|
42
|
+
return { projectId, alias: alias.value, added: true, aliases };
|
|
43
|
+
}
|
|
44
|
+
/** 严格只读:绝不建项目。 */
|
|
45
|
+
export function listProjects(db) {
|
|
46
|
+
return db.all('SELECT id, name, aliases, created_at FROM project ORDER BY created_at, id').map(mapProject);
|
|
47
|
+
}
|
|
48
|
+
function getProject(db, projectId) {
|
|
49
|
+
const row = db.get('SELECT id, name, aliases, created_at FROM project WHERE id = ?', projectId);
|
|
50
|
+
return row ? mapProject(row) : null;
|
|
51
|
+
}
|
|
52
|
+
/** ponytail: 全表扫描。项目数是几十量级;上万时再加别名索引。 */
|
|
53
|
+
function findOwner(db, value) {
|
|
54
|
+
return listProjects(db).find((p) => p.aliases.includes(value)) ?? null;
|
|
55
|
+
}
|
|
56
|
+
function mapProject(r) {
|
|
57
|
+
return {
|
|
58
|
+
projectId: r.id,
|
|
59
|
+
name: r.name,
|
|
60
|
+
aliases: parseAliases(r.aliases),
|
|
61
|
+
createdAt: r.created_at,
|
|
62
|
+
};
|
|
63
|
+
}
|
|
64
|
+
function parseAliases(raw) {
|
|
65
|
+
if (!raw)
|
|
66
|
+
return [];
|
|
67
|
+
try {
|
|
68
|
+
const v = JSON.parse(raw);
|
|
69
|
+
return Array.isArray(v) ? v.map(String) : [];
|
|
70
|
+
}
|
|
71
|
+
catch {
|
|
72
|
+
return [];
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
//# sourceMappingURL=projects.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"projects.js","sourceRoot":"","sources":["../../../src/store/projects.ts"],"names":[],"mappings":"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"}
|
|
@@ -44,3 +44,14 @@ export declare const MIGRATION_004_KIND_LESSON = "\nPRAGMA legacy_alter_table =
|
|
|
44
44
|
* 不回填存量——回填需要判断,而判断需要 LLM(本变更明确不做)。
|
|
45
45
|
*/
|
|
46
46
|
export declare const MIGRATION_005_MEMORY_IMPORTANCE_USAGE = "\nALTER TABLE memory ADD COLUMN importance INTEGER;\nALTER TABLE memory ADD COLUMN usage_count INTEGER NOT NULL DEFAULT 0;\n-- \u6295\u5F71\u6392\u5E8F\u7528\uFF1A\u91CD\u8981\u5EA6\u4F18\u5148\uFF0C\u540C\u6863\u6309\u6700\u8FD1\u4F7F\u7528\u3002\nCREATE INDEX IF NOT EXISTS memory_importance_used ON memory(importance DESC, last_used_at DESC);\n";
|
|
47
|
+
/**
|
|
48
|
+
* 006:迁出通知任务类型(add-scope-migration)。
|
|
49
|
+
*
|
|
50
|
+
* `outbox_job.job_type` 受硬编码 CHECK 约束,加 `sync_scope_exit` 只能重建表。
|
|
51
|
+
* 为什么不改成宽枚举或去掉 CHECK:那是放松约束来省事——001 的枚举是数据库层
|
|
52
|
+
* 拒绝未知任务类型的安全边界,值得为它付一次重建。
|
|
53
|
+
*
|
|
54
|
+
* outbox_job 没有被任何表外键引用(叶子表),但出向 FK(scope_id)与
|
|
55
|
+
* 2 个索引、1 个触发器必须逐字保留;迁移范式与 004 相同(先关外键 + legacy_alter_table)。
|
|
56
|
+
*/
|
|
57
|
+
export declare const MIGRATION_006_OUTBOX_SCOPE_EXIT = "\nPRAGMA legacy_alter_table = ON;\n\nALTER TABLE outbox_job RENAME TO outbox_job_old;\n\nCREATE TABLE outbox_job (\n id TEXT PRIMARY KEY,\n job_type TEXT NOT NULL CHECK (job_type IN\n ('sync_upstream','sync_scope_exit','extract','embed','maintain','projection_rebuild')),\n scope_id TEXT REFERENCES scope(id) ON DELETE RESTRICT,\n entity_type TEXT NOT NULL CHECK (entity_type IN ('memory','revision','plan','archive','system')),\n entity_id TEXT NOT NULL,\n payload TEXT NOT NULL DEFAULT '{}',\n payload_hash TEXT NOT NULL,\n idempotency_key TEXT NOT NULL UNIQUE,\n status TEXT NOT NULL CHECK (status IN\n ('pending','running','done','retry','failed','dead','conflict')),\n attempts INTEGER NOT NULL DEFAULT 0 CHECK (attempts >= 0),\n max_attempts INTEGER NOT NULL DEFAULT 5 CHECK (max_attempts >= 1),\n next_attempt_at TEXT,\n last_error TEXT,\n created_at TEXT NOT NULL,\n updated_at TEXT NOT NULL,\n CHECK (status <> 'dead' OR attempts >= 1)\n);\n\nINSERT INTO outbox_job SELECT * FROM outbox_job_old;\n\nDROP TABLE outbox_job_old;\n\nPRAGMA legacy_alter_table = OFF;\n\n-- \u7D22\u5F15\u4E0E\u89E6\u53D1\u5668\u968F\u65E7\u8868\u4E00\u8D77\u88AB DROP\uFF0C\u5FC5\u987B\u539F\u6837\u91CD\u5EFA\u3002\nCREATE INDEX IF NOT EXISTS outbox_ready ON outbox_job(status, next_attempt_at) WHERE status IN ('pending','retry');\nCREATE INDEX IF NOT EXISTS outbox_entity ON outbox_job(entity_type, entity_id);\n\nCREATE TRIGGER outbox_reject_local_upstream\nBEFORE INSERT ON outbox_job\nWHEN NEW.job_type = 'sync_upstream' AND NEW.scope_id IS NOT NULL\nBEGIN\n SELECT RAISE(ABORT, 'scope_not_upstreamable')\n WHERE (SELECT sync_policy FROM scope WHERE id = NEW.scope_id) <> 'encrypted'\n OR (SELECT device_id FROM scope WHERE id = NEW.scope_id) <> 'all';\nEND;\n";
|
package/dist/src/store/schema.js
CHANGED
|
@@ -541,4 +541,59 @@ ALTER TABLE memory ADD COLUMN usage_count INTEGER NOT NULL DEFAULT 0;
|
|
|
541
541
|
-- 投影排序用:重要度优先,同档按最近使用。
|
|
542
542
|
CREATE INDEX IF NOT EXISTS memory_importance_used ON memory(importance DESC, last_used_at DESC);
|
|
543
543
|
`;
|
|
544
|
+
/**
|
|
545
|
+
* 006:迁出通知任务类型(add-scope-migration)。
|
|
546
|
+
*
|
|
547
|
+
* `outbox_job.job_type` 受硬编码 CHECK 约束,加 `sync_scope_exit` 只能重建表。
|
|
548
|
+
* 为什么不改成宽枚举或去掉 CHECK:那是放松约束来省事——001 的枚举是数据库层
|
|
549
|
+
* 拒绝未知任务类型的安全边界,值得为它付一次重建。
|
|
550
|
+
*
|
|
551
|
+
* outbox_job 没有被任何表外键引用(叶子表),但出向 FK(scope_id)与
|
|
552
|
+
* 2 个索引、1 个触发器必须逐字保留;迁移范式与 004 相同(先关外键 + legacy_alter_table)。
|
|
553
|
+
*/
|
|
554
|
+
export const MIGRATION_006_OUTBOX_SCOPE_EXIT = /* sql */ `
|
|
555
|
+
PRAGMA legacy_alter_table = ON;
|
|
556
|
+
|
|
557
|
+
ALTER TABLE outbox_job RENAME TO outbox_job_old;
|
|
558
|
+
|
|
559
|
+
CREATE TABLE outbox_job (
|
|
560
|
+
id TEXT PRIMARY KEY,
|
|
561
|
+
job_type TEXT NOT NULL CHECK (job_type IN
|
|
562
|
+
('sync_upstream','sync_scope_exit','extract','embed','maintain','projection_rebuild')),
|
|
563
|
+
scope_id TEXT REFERENCES scope(id) ON DELETE RESTRICT,
|
|
564
|
+
entity_type TEXT NOT NULL CHECK (entity_type IN ('memory','revision','plan','archive','system')),
|
|
565
|
+
entity_id TEXT NOT NULL,
|
|
566
|
+
payload TEXT NOT NULL DEFAULT '{}',
|
|
567
|
+
payload_hash TEXT NOT NULL,
|
|
568
|
+
idempotency_key TEXT NOT NULL UNIQUE,
|
|
569
|
+
status TEXT NOT NULL CHECK (status IN
|
|
570
|
+
('pending','running','done','retry','failed','dead','conflict')),
|
|
571
|
+
attempts INTEGER NOT NULL DEFAULT 0 CHECK (attempts >= 0),
|
|
572
|
+
max_attempts INTEGER NOT NULL DEFAULT 5 CHECK (max_attempts >= 1),
|
|
573
|
+
next_attempt_at TEXT,
|
|
574
|
+
last_error TEXT,
|
|
575
|
+
created_at TEXT NOT NULL,
|
|
576
|
+
updated_at TEXT NOT NULL,
|
|
577
|
+
CHECK (status <> 'dead' OR attempts >= 1)
|
|
578
|
+
);
|
|
579
|
+
|
|
580
|
+
INSERT INTO outbox_job SELECT * FROM outbox_job_old;
|
|
581
|
+
|
|
582
|
+
DROP TABLE outbox_job_old;
|
|
583
|
+
|
|
584
|
+
PRAGMA legacy_alter_table = OFF;
|
|
585
|
+
|
|
586
|
+
-- 索引与触发器随旧表一起被 DROP,必须原样重建。
|
|
587
|
+
CREATE INDEX IF NOT EXISTS outbox_ready ON outbox_job(status, next_attempt_at) WHERE status IN ('pending','retry');
|
|
588
|
+
CREATE INDEX IF NOT EXISTS outbox_entity ON outbox_job(entity_type, entity_id);
|
|
589
|
+
|
|
590
|
+
CREATE TRIGGER outbox_reject_local_upstream
|
|
591
|
+
BEFORE INSERT ON outbox_job
|
|
592
|
+
WHEN NEW.job_type = 'sync_upstream' AND NEW.scope_id IS NOT NULL
|
|
593
|
+
BEGIN
|
|
594
|
+
SELECT RAISE(ABORT, 'scope_not_upstreamable')
|
|
595
|
+
WHERE (SELECT sync_policy FROM scope WHERE id = NEW.scope_id) <> 'encrypted'
|
|
596
|
+
OR (SELECT device_id FROM scope WHERE id = NEW.scope_id) <> 'all';
|
|
597
|
+
END;
|
|
598
|
+
`;
|
|
544
599
|
//# sourceMappingURL=schema.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../src/store/schema.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,MAAM,CAAC,MAAM,kBAAkB,GAAG,SAAS,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA+Y3C,CAAC;AAEF,MAAM,CAAC,MAAM,oBAAoB,GAAG,SAAS,CAAC;;;;;;;;;;;;;;;;;;;;;;CAsB7C,CAAC;AAEF;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAG,SAAS,CAAC;;CAE5C,CAAC;AAEF;;;;;;;;;;;;;;GAcG;AACH,MAAM,CAAC,MAAM,yBAAyB,GAAG,SAAS,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAqElD,CAAC;AAEF;;;;;;;;;;GAUG;AACH,MAAM,CAAC,MAAM,qCAAqC,GAAG,SAAS,CAAC;;;;;CAK9D,CAAC"}
|
|
1
|
+
{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../src/store/schema.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,MAAM,CAAC,MAAM,kBAAkB,GAAG,SAAS,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA+Y3C,CAAC;AAEF,MAAM,CAAC,MAAM,oBAAoB,GAAG,SAAS,CAAC;;;;;;;;;;;;;;;;;;;;;;CAsB7C,CAAC;AAEF;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAG,SAAS,CAAC;;CAE5C,CAAC;AAEF;;;;;;;;;;;;;;GAcG;AACH,MAAM,CAAC,MAAM,yBAAyB,GAAG,SAAS,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAqElD,CAAC;AAEF;;;;;;;;;;GAUG;AACH,MAAM,CAAC,MAAM,qCAAqC,GAAG,SAAS,CAAC;;;;;CAK9D,CAAC;AAEF;;;;;;;;;GASG;AACH,MAAM,CAAC,MAAM,+BAA+B,GAAG,SAAS,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA4CxD,CAAC"}
|
package/dist/src/sync/apply.d.ts
CHANGED
|
@@ -7,6 +7,8 @@ import { AuditLog } from '../store/audit.js';
|
|
|
7
7
|
* parentHash 在本地历史中但对不上当前 → 并发,双方保留并入冲突队列;
|
|
8
8
|
* parentHash 完全未知 → 等待依赖(不应用、游标不推进该事件所在链)。
|
|
9
9
|
* tombstone 传播:远端遗忘 → 本地 tombstoned;对已遗忘记忆的迟到 upsert 忽略并审计。
|
|
10
|
+
* scope_exit(add-scope-migration):远端迁出 → 本地标记「不再持有」(archived + meta 标记,
|
|
11
|
+
* 无墓碑不删数据);带 reentry 标记的迁回重推解除标记;迟到修订按 shadowed 跳过。
|
|
10
12
|
*/
|
|
11
13
|
export interface ApplyOutcome {
|
|
12
14
|
applied: number;
|
|
@@ -15,6 +17,8 @@ export interface ApplyOutcome {
|
|
|
15
17
|
waited: number;
|
|
16
18
|
tombstoned: number;
|
|
17
19
|
shadowed: number;
|
|
20
|
+
/** 收到 scope_exit 并标记「不再持有」的条数(add-scope-migration)。 */
|
|
21
|
+
scopeExited: number;
|
|
18
22
|
}
|
|
19
23
|
export declare function applyEvent(store: CairnStore, ev: SyncEvent, spaceKey: string, audit: AuditLog): keyof ApplyOutcome;
|
|
20
24
|
/** 批量应用:parentHash 未知的事件保留在返回值中由调用方决定重试;单事件失败不拖垮整批。 */
|
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,173 @@
|
|
|
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 } 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
|
+
await remote.deleteObject(v.key);
|
|
101
|
+
pruned.push(v.key);
|
|
102
|
+
}
|
|
103
|
+
if (unknownCount > 0) {
|
|
104
|
+
pruneWarning = `本设备前缀下有 ${unknownCount} 个名字不符合备份命名规则的对象,保留清理未触碰`;
|
|
105
|
+
}
|
|
106
|
+
}
|
|
107
|
+
return {
|
|
108
|
+
name,
|
|
109
|
+
key,
|
|
110
|
+
plainBytes: plaintext.byteLength,
|
|
111
|
+
sealedBytes: sealed.byteLength,
|
|
112
|
+
plainSha256: local.sha256,
|
|
113
|
+
localSnapshot: { path: local.path, bytes: local.bytes, sha256: local.sha256 },
|
|
114
|
+
pruned,
|
|
115
|
+
pruneWarning,
|
|
116
|
+
};
|
|
117
|
+
}
|
|
118
|
+
/**
|
|
119
|
+
* 从远端恢复(add-cloud-backup D5):默认还原到**新路径**,绝不覆盖当前库;
|
|
120
|
+
* 覆盖由调用方(CLI)显式 --force 并先自动备份当前库。
|
|
121
|
+
*
|
|
122
|
+
* 校验链:下载 → 解密(Poly1305 / 设备密钥不匹配即失败)→ 明文 sha256 比对名字内嵌值
|
|
123
|
+
* → verifyBackup(integrity + 可打开为库)→ 落盘。任一步失败中止且不产生半还原。
|
|
124
|
+
*/
|
|
125
|
+
export async function restoreRemoteBackup(store, remote, vault, name, opts = {}) {
|
|
126
|
+
const device = store.identity.deviceId;
|
|
127
|
+
const keys = loadKeys(store.paths.dataDir);
|
|
128
|
+
if (!keys)
|
|
129
|
+
throw err('E_VALIDATION', '未找到 vault 密钥(keys.json);无法解密备份');
|
|
130
|
+
const parsed = parseBackupName(name);
|
|
131
|
+
if (parsed.plainSha256 == null) {
|
|
132
|
+
throw err('E_VALIDATION', `备份对象名不合法(期望 <cairn-backup-<ms>.db>-<sha256>.enc): ${name}`);
|
|
133
|
+
}
|
|
134
|
+
const key = backupObjectKey(device, name);
|
|
135
|
+
const sealed = await remote.getObject(key);
|
|
136
|
+
if (sealed == null) {
|
|
137
|
+
throw err('E_NOT_FOUND', `远端没有本设备的备份对象: ${name}(--list-remote 可查看;其他设备的备份不在此列)`);
|
|
138
|
+
}
|
|
139
|
+
const backupKey = deriveBackupKey(keys.vaultKey, device);
|
|
140
|
+
let plaintext;
|
|
141
|
+
try {
|
|
142
|
+
plaintext = decryptObject(sealed, backupKey, {
|
|
143
|
+
vaultId: vault.vaultId,
|
|
144
|
+
spaceId: BACKUP_PREFIX,
|
|
145
|
+
kind: 'backup',
|
|
146
|
+
objectId: name,
|
|
147
|
+
});
|
|
148
|
+
}
|
|
149
|
+
catch {
|
|
150
|
+
throw err('E_VALIDATION', '备份解密失败:密钥材料不匹配或密文已损坏(其他设备的备份在本设备上必然如此)');
|
|
151
|
+
}
|
|
152
|
+
// 明文 sha256 比对(名字内嵌值):密文层认证之外的第二道快照完整性检查
|
|
153
|
+
const actual = sha256Hex(Buffer.from(plaintext));
|
|
154
|
+
if (actual !== parsed.plainSha256) {
|
|
155
|
+
throw err('E_BACKUP_CORRUPT', '备份明文 sha256 与对象名内嵌值不一致,中止恢复', {
|
|
156
|
+
expected: parsed.plainSha256,
|
|
157
|
+
actual,
|
|
158
|
+
});
|
|
159
|
+
}
|
|
160
|
+
const toDir = opts.toDir ?? join(store.paths.home, `restore-${Date.now()}`);
|
|
161
|
+
mkdirSync(toDir, { recursive: true });
|
|
162
|
+
const restoredPath = join(toDir, 'cairn.db');
|
|
163
|
+
rmSync(restoredPath, { force: true });
|
|
164
|
+
writeFileSync(restoredPath, plaintext);
|
|
165
|
+
// 落盘后按快照明细校验(可打开为库 + integrity);失败删除半成品并保留现状
|
|
166
|
+
const check = verifyBackup(restoredPath);
|
|
167
|
+
if (!check.ok) {
|
|
168
|
+
rmSync(restoredPath, { force: true });
|
|
169
|
+
throw err('E_BACKUP_CORRUPT', `恢复的快照未通过校验,已删除半成品: ${check.problems.join('; ')}`);
|
|
170
|
+
}
|
|
171
|
+
return { restoredTo: restoredPath, plainSha256: actual, verified: true };
|
|
172
|
+
}
|
|
173
|
+
//# 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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"}
|