@carloswon/cairn-memory 0.6.1 → 0.6.3
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/README.md +2 -2
- package/dist/src/core/types.d.ts +6 -0
- package/dist/src/core/types.js.map +1 -1
- package/dist/src/governance/apply.js +3 -12
- package/dist/src/governance/apply.js.map +1 -1
- package/dist/src/interfaces/app-service.d.ts +19 -0
- package/dist/src/interfaces/app-service.js +107 -67
- package/dist/src/interfaces/app-service.js.map +1 -1
- package/dist/src/interfaces/cli/main.js +25 -6
- package/dist/src/interfaces/cli/main.js.map +1 -1
- package/dist/src/interfaces/console/assets/ui-js.js +53 -5
- package/dist/src/interfaces/console/assets/ui-js.js.map +1 -1
- package/dist/src/interfaces/console/assets/url-state.d.ts +1 -1
- package/dist/src/interfaces/console/assets/url-state.js +2 -2
- package/dist/src/interfaces/console/assets/url-state.js.map +1 -1
- package/dist/src/interfaces/console/model.d.ts +23 -0
- package/dist/src/interfaces/console/model.js +41 -1
- package/dist/src/interfaces/console/model.js.map +1 -1
- package/dist/src/interfaces/console/server.js +14 -2
- package/dist/src/interfaces/console/server.js.map +1 -1
- package/dist/src/interfaces/mcp/server.js +3 -0
- package/dist/src/interfaces/mcp/server.js.map +1 -1
- package/dist/src/store/memories.d.ts +6 -1
- package/dist/src/store/memories.js +9 -3
- 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/open.js +1 -1
- package/dist/src/store/open.js.map +1 -1
- package/dist/src/store/outbox.d.ts +8 -7
- package/dist/src/store/outbox.js +34 -1
- package/dist/src/store/outbox.js.map +1 -1
- package/dist/src/store/schema.d.ts +17 -0
- package/dist/src/store/schema.js +65 -0
- package/dist/src/store/schema.js.map +1 -1
- package/dist/src/sync/apply.d.ts +12 -2
- package/dist/src/sync/apply.js +109 -19
- package/dist/src/sync/apply.js.map +1 -1
- package/dist/src/sync/backfill.d.ts +48 -5
- package/dist/src/sync/backfill.js +70 -10
- package/dist/src/sync/backfill.js.map +1 -1
- package/dist/src/sync/events.d.ts +18 -0
- package/dist/src/sync/events.js.map +1 -1
- package/dist/src/sync/orchestrate.d.ts +4 -0
- package/dist/src/sync/orchestrate.js +24 -10
- package/dist/src/sync/orchestrate.js.map +1 -1
- package/dist/src/sync/pull.d.ts +8 -3
- package/dist/src/sync/pull.js +95 -79
- package/dist/src/sync/pull.js.map +1 -1
- package/dist/src/sync/push.d.ts +16 -0
- package/dist/src/sync/push.js +146 -38
- package/dist/src/sync/push.js.map +1 -1
- package/dist/src/sync/route.d.ts +44 -0
- package/dist/src/sync/route.js +88 -0
- package/dist/src/sync/route.js.map +1 -0
- package/dist/src/sync/vault.d.ts +27 -1
- package/dist/src/sync/vault.js +41 -1
- package/dist/src/sync/vault.js.map +1 -1
- package/docs/cairn-security.md +25 -18
- package/package.json +74 -74
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"backfill.js","sourceRoot":"","sources":["../../../src/sync/backfill.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"backfill.js","sourceRoot":"","sources":["../../../src/sync/backfill.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AACrE,OAAO,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAyDjE,MAAM,CAAC,MAAM,sBAAsB,GAAG,GAAG,CAAC;AAE1C,MAAM,UAAU,eAAe,CAAC,KAAiB;IAC/C,MAAM,QAAQ,GAAG,KAAK,CAAC,EAAE;SACtB,GAAG,CACF;;;;;mCAK6B,CAC9B;SACA,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,UAAmB,EAAE,CAAC,CAAC,CAAC;IAC1G,IAAI,CAAC,mBAAmB,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC;QAAE,OAAO,QAAQ,CAAC;IAC/D,uCAAuC;IACvC,MAAM,QAAQ,GAAG,KAAK,CAAC,EAAE;SACtB,GAAG,CACF;;;;;mCAK6B,CAC9B;SACA,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,UAAmB,EAAE,CAAC,CAAC,CAAC;IAC1G,OAAO,CAAC,GAAG,QAAQ,EAAE,GAAG,QAAQ,CAAC,CAAC;AACpC,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,gBAAgB,CAAC,KAAiB;IAChD,OAAO,KAAK,CAAC,EAAE;SACZ,GAAG,CACF;;kCAE4B,cAAc,GAAG,kBAAkB,GAAG,GAAG;;;;mCAIxC,CAC9B;SACA,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC;AAChF,CAAC;AAED,qDAAqD;AACrD,MAAM,UAAU,qBAAqB,CAAC,KAAiB;IACrD,MAAM,IAAI,GAAG,eAAe,CAAC,KAAK,CAAC,CAAC;IACpC,OAAO;QACL,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,UAAU,CAAC,CAAC,MAAM;QAC3D,QAAQ,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,UAAU,CAAC,CAAC,MAAM;KAC5D,CAAC;AACJ,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,gBAAgB,CAAC,KAAiB,EAAE,IAAwC;IAC1F,MAAM,GAAG,GAAG,eAAe,CAAC,KAAK,CAAC,CAAC;IACnC,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC,KAAK,IAAI,sBAAsB,CAAC,CAAC;IACjE,MAAM,QAAQ,GAAG,gBAAgB,CAAC,KAAK,CAAC,CAAC;IACzC,MAAM,MAAM,GAAmB;QAC7B,UAAU,EAAE,GAAG,CAAC,MAAM;QACtB,QAAQ,EAAE,CAAC;QACX,QAAQ,EAAE,CAAC;QACX,QAAQ,EAAE,CAAC;QACX,SAAS,EAAE,EAAE;QACb,MAAM,EAAE;YACN,QAAQ,EAAE,EAAE,UAAU,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE;YAClE,QAAQ,EAAE,EAAE,UAAU,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE;SACnE;QACD,UAAU,EAAE,EAAE,UAAU,EAAE,QAAQ,CAAC,MAAM,EAAE,QAAQ,EAAE,CAAC,EAAE,SAAS,EAAE,EAAE,EAAE;KACxE,CAAC;IACF,KAAK,MAAM,CAAC,IAAI,GAAG;QAAE,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,UAAU,EAAE,CAAC;IACzD,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;QAChB,MAAM,CAAC,SAAS,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;QAChD,OAAO,MAAM,CAAC;IAChB,CAAC;IACD,KAAK,CAAC,EAAE,CAAC,WAAW,CAAC,GAAG,EAAE;QACxB,KAAK,MAAM,CAAC,IAAI,KAAK,EAAE,CAAC;YACtB,MAAM,CAAC,GAAG,iBAAiB,CAAC,KAAK,EAAE;gBACjC,QAAQ,EAAE,CAAC,CAAC,QAAQ;gBACpB,OAAO,EAAE,CAAC,CAAC,OAAO;gBAClB,EAAE,EAAE,eAAe;gBACnB,cAAc,EAAE,UAAU,CAAC,CAAC,QAAQ,EAAE;aACvC,CAAC,CAAC;YACH,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC;gBACf,MAAM,CAAC,QAAQ,EAAE,CAAC;gBAClB,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;gBAClC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,QAAQ,EAAE,CAAC;YACpC,CAAC;iBAAM,IAAI,CAAC,CAAC,MAAM,KAAK,WAAW,EAAE,CAAC;gBACpC,MAAM,CAAC,QAAQ,EAAE,CAAC;gBAClB,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,QAAQ,EAAE,CAAC;YACpC,CAAC;iBAAM,CAAC;gBACN,MAAM,CAAC,QAAQ,EAAE,CAAC;gBAClB,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,QAAQ,EAAE,CAAC;YACpC,CAAC;QACH,CAAC;QACD,KAAK,MAAM,CAAC,IAAI,QAAQ,EAAE,CAAC;YACzB,MAAM,CAAC,GAAG,gBAAgB,CAAC,KAAK,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC;YAC9C,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC;gBACf,MAAM,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC;gBAC7B,MAAM,CAAC,UAAU,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;YAC/C,CAAC;QACH,CAAC;IACH,CAAC,CAAC,CAAC;IACH,OAAO,MAAM,CAAC;AAChB,CAAC"}
|
|
@@ -5,6 +5,20 @@ import { MemoryKind, Authority, Sensitivity } from '../core/types.js';
|
|
|
5
5
|
* 因为修订 id 在各设备本地生成、不可跨设备引用。
|
|
6
6
|
*/
|
|
7
7
|
export declare const SYNC_EVENT_VERSION = 1;
|
|
8
|
+
/**
|
|
9
|
+
* 作用域描述符(add-cloud-preserve-mode D3):upsert 事件携带的「内容属于哪类作用域」
|
|
10
|
+
* 声明。拉取侧物化过滤的依据:个人链事件按链语义物化(personal-global);
|
|
11
|
+
* 本设备保管链事件按描述符物化。旧版本事件没有该字段——物化按现状处理(向后兼容)。
|
|
12
|
+
*/
|
|
13
|
+
export interface SyncScopeDescriptor {
|
|
14
|
+
preset: string;
|
|
15
|
+
/** project-global / project-device 的稳定项目身份(add-stable-project-identity 的 UUID)。 */
|
|
16
|
+
projectId?: string;
|
|
17
|
+
/** 项目显示名(物化端重建 project 行时使用;缺省回落 projectId)。 */
|
|
18
|
+
spaceName?: string;
|
|
19
|
+
/** 设备限定作用域绑定的设备。 */
|
|
20
|
+
deviceId?: string;
|
|
21
|
+
}
|
|
8
22
|
export interface SyncUpsertPayload {
|
|
9
23
|
revisionId: string;
|
|
10
24
|
content: string;
|
|
@@ -21,6 +35,8 @@ export interface SyncUpsertPayload {
|
|
|
21
35
|
sourceAgent: string | null;
|
|
22
36
|
createdBy: string;
|
|
23
37
|
reason: string | null;
|
|
38
|
+
/** 作用域描述符(D3):旧版本事件缺省——按链语义物化。 */
|
|
39
|
+
scope?: SyncScopeDescriptor;
|
|
24
40
|
/**
|
|
25
41
|
* 迁回重推标记(add-scope-migration):这条 upsert 来自「迁出后重新迁回」的强制重发。
|
|
26
42
|
* 对端据此解除「不再持有」标记;没有该标记的普通 upsert 在标记存在时按迟到修订跳过。
|
|
@@ -36,6 +52,8 @@ export interface SyncTombstonePayload {
|
|
|
36
52
|
/**
|
|
37
53
|
* 迁出通知 payload(add-scope-migration D3):一条已同步的记忆迁出了可同步作用域。
|
|
38
54
|
* 对端语义是「本设备不再持有」——不是遗忘(无墓碑),不是删除(数据保留)。
|
|
55
|
+
* (来源链固化在 outbox 任务的 payload.fromSpace,由 push 据此选择发布链;
|
|
56
|
+
* 事件本身不带 fromSpace——对端只关心「这条链上的记忆不再持有」。)
|
|
39
57
|
*/
|
|
40
58
|
export interface SyncScopeExitPayload {
|
|
41
59
|
/** 推送端最后已知(已推送)的内容哈希。 */
|
|
@@ -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":"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;AAwEpC,qCAAqC;AACrC,MAAM,UAAU,mBAAmB,CAAC,EAAa;IAC/C,IAAI,EAAE,CAAC,IAAI,KAAK,eAAe,IAAI,CAAC,EAAE,CAAC,OAAO,IAAI,CAAC,CAAC,SAAS,IAAI,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC;QAC7E,MAAM,GAAG,CAAC,cAAc,EAAE,MAAM,EAAE,CAAC,QAAQ,IAAI,EAAE,CAAC,GAAG,qBAAqB,CAAC,CAAC;IAC9E,CAAC;IACD,MAAM,MAAM,GAAG,aAAa,CAAC,EAAE,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IACjD,IAAI,MAAM,KAAK,EAAE,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC;QACtC,MAAM,GAAG,CAAC,cAAc,EAAE,MAAM,EAAE,CAAC,QAAQ,IAAI,EAAE,CAAC,GAAG,UAAU,EAAE;YAC/D,QAAQ,EAAE,EAAE,CAAC,OAAO,CAAC,WAAW;YAChC,MAAM;SACP,CAAC,CAAC;IACL,CAAC;AACH,CAAC;AAED,SAAS,aAAa,CAAC,IAAY;IACjC,OAAO,SAAS,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC;AAC3C,CAAC;AAcD,yCAAyC;AACzC,MAAM,UAAU,QAAQ,CAAC,QAAgB,EAAE,OAAe,EAAE,eAAuB;IACjF,OAAO,WAAW,QAAQ,WAAW,OAAO,IAAI,eAAe,MAAM,CAAC;AACxE,CAAC;AAED,MAAM,UAAU,SAAS,CAAC,QAAgB,EAAE,MAAmB;IAC7D,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC;QAAE,MAAM,GAAG,CAAC,cAAc,EAAE,YAAY,CAAC,CAAC;IACjE,MAAM,IAAI,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;IACtC,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC;IAClC,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC;IAChC,MAAM,GAAG,GAAG,EAAE,CAAC,EAAE,kBAAkB,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC;IACxD,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,CAAC;IACtD,MAAM,SAAS,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;IACjC,MAAM,eAAe,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC;IACxC,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,EAAE,GAAG,EAAE,QAAQ,CAAC,QAAQ,EAAE,OAAO,EAAE,eAAe,CAAC,EAAE,OAAO,EAAE,KAAK,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC;AAChJ,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,SAAqB,EAAE,QAAgB,EAAE,IAAe;IAClF,MAAM,IAAI,GAAG,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;IAChD,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAyD,CAAC;IACtG,IAAI,GAAG,CAAC,CAAC,KAAK,kBAAkB;QAAE,MAAM,GAAG,CAAC,cAAc,EAAE,gBAAgB,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC;IACrF,IAAI,GAAG,CAAC,QAAQ,KAAK,QAAQ;QAAE,MAAM,GAAG,CAAC,cAAc,EAAE,gBAAgB,GAAG,CAAC,QAAQ,MAAM,QAAQ,EAAE,CAAC,CAAC;IACvG,IAAI,SAAS,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,eAAe;QAAE,MAAM,GAAG,CAAC,cAAc,EAAE,eAAe,CAAC,CAAC;IACzF,OAAO,GAAG,CAAC,MAAM,CAAC;AACpB,CAAC;AAiBD,MAAM,UAAU,aAAa,CAAC,OAAe,EAAE,QAAgB,EAAE,QAAgB;IAC/E,OAAO,EAAE,CAAC,EAAE,kBAAkB,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,SAAS,EAAE,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC;AAC7I,CAAC;AAED,qCAAqC;AACrC,MAAM,UAAU,YAAY,CAAC,OAAoB,EAAE,WAAwB;IACzE,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC;QAAE,MAAM,GAAG,CAAC,cAAc,EAAE,eAAe,CAAC,CAAC;IACzE,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;IAC9E,IAAI,OAAO,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;QAC/B,MAAM,GAAG,CAAC,cAAc,EAAE,eAAe,OAAO,CAAC,OAAO,MAAM,OAAO,EAAE,CAAC,CAAC;IAC3E,CAAC;IACD,OAAO;QACL,CAAC,EAAE,kBAAkB;QACrB,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,QAAQ,EAAE,OAAO,CAAC,QAAQ;QAC1B,QAAQ,EAAE,OAAO,CAAC,QAAQ;QAC1B,UAAU,EAAE,OAAO,CAAC,UAAU,GAAG,CAAC;QAClC,OAAO;QACP,MAAM,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,GAAG,WAAW,CAAC;QAC3C,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;KACpC,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,QAAgB;IAC1C,OAAO,WAAW,QAAQ,0BAA0B,CAAC;AACvD,CAAC"}
|
|
@@ -30,8 +30,12 @@ export declare function initRemote(store: CairnStore, input: {
|
|
|
30
30
|
syncd?: {
|
|
31
31
|
baseUrl: string;
|
|
32
32
|
};
|
|
33
|
+
/** 保管模式(add-cloud-preserve-mode D1):init 时即可开启,默认关闭。 */
|
|
34
|
+
preserveDeviceBound?: boolean;
|
|
33
35
|
}): {
|
|
34
36
|
vault: VaultConfig;
|
|
35
37
|
recovery: string;
|
|
36
38
|
};
|
|
39
|
+
/** 切换保管模式(vault config 子命令)。写审计——模式是安全姿态的一部分。 */
|
|
40
|
+
export declare function setPreserveMode(store: CairnStore, enabled: boolean): VaultConfig;
|
|
37
41
|
export { syncPush, syncPull, exportRecoveryMaterial, PERSONAL_SPACE_KEY };
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { err } from '../core/errors.js';
|
|
2
|
-
import { loadVaultConfig, saveVaultConfig, ENV } from './vault.js';
|
|
2
|
+
import { loadVaultConfig, saveVaultConfig, updateVaultConfig, ENV } from './vault.js';
|
|
3
3
|
import { generateVaultKeys, saveKeys, loadKeys, exportRecoveryMaterial } from './cryptoutil.js';
|
|
4
4
|
import { registerHandler } from '../jobs/worker.js';
|
|
5
5
|
import { syncPush } from './push.js';
|
|
@@ -52,14 +52,15 @@ export function syncContext(store) {
|
|
|
52
52
|
}
|
|
53
53
|
/** 注册 worker 的真实上行 handler(configured 时调用;未配置保持诚实失败 handler)。 */
|
|
54
54
|
export function registerSyncWorker(store, remote, vault) {
|
|
55
|
-
|
|
56
|
-
// worker 已 claim 单个任务;push
|
|
57
|
-
void syncPush(store, remote, vault, { preclaimedJobs: [{ id: job.id, entityId: job.entityId, payload: job.payload }] });
|
|
58
|
-
}
|
|
55
|
+
const pushWith = (job) => {
|
|
56
|
+
// worker 已 claim 单个任务;push 以该任务触发批量发布(按链路由;幂等:已推送修订跳过)
|
|
57
|
+
void syncPush(store, remote, vault, { preclaimedJobs: [{ id: job.id, entityId: job.entityId, payload: job.payload, jobTypeHint: job.jobType }] });
|
|
58
|
+
};
|
|
59
|
+
registerHandler('sync_upstream', (job) => pushWith({ ...job, jobType: 'sync_upstream' }));
|
|
59
60
|
// 迁出通知任务走同一条 push 链(add-scope-migration):生成 scope_exit 控制事件。
|
|
60
|
-
registerHandler('sync_scope_exit', (job) => {
|
|
61
|
-
|
|
62
|
-
});
|
|
61
|
+
registerHandler('sync_scope_exit', (job) => pushWith({ ...job, jobType: 'sync_scope_exit' }));
|
|
62
|
+
// 保管链上行任务(add-cloud-preserve-mode):同一条 push,按链路由到 preserve/<deviceId>。
|
|
63
|
+
registerHandler('sync_preserve', (job) => pushWith({ ...job, jobType: 'sync_preserve' }));
|
|
63
64
|
}
|
|
64
65
|
/** 初始化远端:生成/复用密钥 + 写 vault.json + 确保 personal-global 为 encrypted。 */
|
|
65
66
|
export function initRemote(store, input) {
|
|
@@ -80,9 +81,22 @@ export function initRemote(store, input) {
|
|
|
80
81
|
}
|
|
81
82
|
// vault 前缀并入 store prefix(OBS store 的 space/device 必须是单路径段)
|
|
82
83
|
const obs = input.obs ? { endpoint: input.obs.endpoint, bucket: input.obs.bucket, prefix: `${input.obs.prefix}vaults/${keys.vaultId}/` } : undefined;
|
|
83
|
-
const vault = saveVaultConfig(store.paths.dataDir, {
|
|
84
|
-
|
|
84
|
+
const vault = saveVaultConfig(store.paths.dataDir, {
|
|
85
|
+
provider: input.provider,
|
|
86
|
+
obs,
|
|
87
|
+
syncd: input.syncd,
|
|
88
|
+
vaultId: keys.vaultId,
|
|
89
|
+
preserveDeviceBound: input.preserveDeviceBound === true,
|
|
90
|
+
});
|
|
91
|
+
store.audit.record('sync', 'remote_initialized', { type: 'system', id: vault.vaultId }, { provider: vault.provider, preserveDeviceBound: input.preserveDeviceBound === true });
|
|
85
92
|
return { vault, recovery: exportRecoveryMaterial(keys) };
|
|
86
93
|
}
|
|
94
|
+
/** 切换保管模式(vault config 子命令)。写审计——模式是安全姿态的一部分。 */
|
|
95
|
+
export function setPreserveMode(store, enabled) {
|
|
96
|
+
store.assertWritable();
|
|
97
|
+
const vault = updateVaultConfig(store.paths.dataDir, { preserveDeviceBound: enabled });
|
|
98
|
+
store.audit.record('sync', 'preserve_mode_changed', { type: 'system', id: vault.vaultId }, { preserveDeviceBound: enabled });
|
|
99
|
+
return vault;
|
|
100
|
+
}
|
|
87
101
|
export { syncPush, syncPull, exportRecoveryMaterial, PERSONAL_SPACE_KEY };
|
|
88
102
|
//# sourceMappingURL=orchestrate.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"orchestrate.js","sourceRoot":"","sources":["../../../src/sync/orchestrate.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAe,eAAe,EAAE,eAAe,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"orchestrate.js","sourceRoot":"","sources":["../../../src/sync/orchestrate.ts"],"names":[],"mappings":"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"}
|
package/dist/src/sync/pull.d.ts
CHANGED
|
@@ -3,12 +3,17 @@ import { RemoteStore } from '../jobs/remote.js';
|
|
|
3
3
|
import { VaultConfig } from './vault.js';
|
|
4
4
|
import { ApplyOutcome } from './apply.js';
|
|
5
5
|
/**
|
|
6
|
-
* 同步拉取(design D4
|
|
7
|
-
*
|
|
8
|
-
*
|
|
6
|
+
* 同步拉取(design D4 + add-cloud-preserve-mode D2/tasks 3.1):
|
|
7
|
+
* 拉取范围 = syncableChains()——个人链恒在;保管模式开启时加本设备保管链。
|
|
8
|
+
* 他人保管链对象完全不被下载(前缀隔离:`preserve/<别的设备>/` 不在任何列举范围内)。
|
|
9
|
+
* 每条链:列举其他设备 → 读 manifest(密文)→ 按 headSeq 对本地游标取差量 chunk
|
|
10
|
+
* → 解密 → 按事件序幂等应用 → 推进游标(单事务)。中断可重入:游标只在一个
|
|
11
|
+
* chunk 全部事件应用成功后推进。
|
|
9
12
|
*/
|
|
10
13
|
export interface PullDeviceResult {
|
|
11
14
|
deviceId: string;
|
|
15
|
+
/** 事件链空间键(个人链或保管链)。 */
|
|
16
|
+
spaceKey: string;
|
|
12
17
|
headSeq: number;
|
|
13
18
|
appliedBefore: number;
|
|
14
19
|
outcome: ApplyOutcome | null;
|
package/dist/src/sync/pull.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { err } from '../core/errors.js';
|
|
2
2
|
import { manifestKey, unpackChunk, } from './events.js';
|
|
3
3
|
import { deriveSpaceKey, loadKeys, decryptObject } from './cryptoutil.js';
|
|
4
|
-
import {
|
|
4
|
+
import { isPreserveSpaceKey, syncableChains } from './vault.js';
|
|
5
5
|
import { applyEvents } from './apply.js';
|
|
6
6
|
export function pullCursorKey(spaceKey, remoteDevice) {
|
|
7
7
|
return `sync_pull:${spaceKey}:${remoteDevice}`;
|
|
@@ -43,14 +43,39 @@ function decryptChunk(sealed, vaultKey, vaultId, spaceKey, meta, deviceId) {
|
|
|
43
43
|
});
|
|
44
44
|
return unpackChunk(plain, deviceId, meta);
|
|
45
45
|
}
|
|
46
|
+
function chunkObjectKey(spaceKey, meta) {
|
|
47
|
+
return `${spaceKey}/${meta.key}`;
|
|
48
|
+
}
|
|
46
49
|
export async function syncPull(store, remote, vault) {
|
|
47
50
|
store.assertWritable();
|
|
48
|
-
const spaceKey = PERSONAL_SPACE_KEY;
|
|
49
51
|
const keys = loadKeys(store.paths.dataDir);
|
|
50
52
|
if (!keys)
|
|
51
53
|
throw err('E_VALIDATION', '未找到 vault 密钥(keys.json);请先 cairn vault init-remote 或导入恢复材料');
|
|
52
54
|
const myDevice = store.identity.deviceId;
|
|
53
|
-
|
|
55
|
+
const results = [];
|
|
56
|
+
let totalApplied = 0;
|
|
57
|
+
for (const spaceKey of syncableChains(vault, myDevice)) {
|
|
58
|
+
// 个人链:消费链上全部设备的 manifest(含自己——找回场景);
|
|
59
|
+
// 保管链:单写者,只有自己的 manifest。
|
|
60
|
+
const sourceDeviceIds = isPreserveSpaceKey(spaceKey) ? [myDevice] : await listRemoteDevices(remote, spaceKey, myDevice);
|
|
61
|
+
for (const deviceId of sourceDeviceIds) {
|
|
62
|
+
const r = await pullFromDevice(store, remote, vault, keys, spaceKey, deviceId);
|
|
63
|
+
if (r) {
|
|
64
|
+
results.push(r);
|
|
65
|
+
totalApplied += r.appliedBefore;
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
void manifestKey;
|
|
70
|
+
return { devices: results, totalApplied };
|
|
71
|
+
}
|
|
72
|
+
/**
|
|
73
|
+
* 发现某条链上的远端设备:列举 <spaceKey>/devices/<id>/manifest.json。
|
|
74
|
+
* 包含自己(add-cloud-preserve-mode 找回场景):本地数据目录丢失后,个人链与保管链
|
|
75
|
+
* 的恢复都靠重放自己的 manifest。游标机制保证幂等且增量——健康设备首次自拉取
|
|
76
|
+
* 只是「全部跳过 + 游标推进到头」,之后每轮只看新增。
|
|
77
|
+
*/
|
|
78
|
+
async function listRemoteDevices(remote, spaceKey, _myDevice) {
|
|
54
79
|
const listing = await remote.list(`${spaceKey}/devices/`);
|
|
55
80
|
const manifestSuffix = '/manifest.json';
|
|
56
81
|
const deviceIds = new Set();
|
|
@@ -59,92 +84,83 @@ export async function syncPull(store, remote, vault) {
|
|
|
59
84
|
continue;
|
|
60
85
|
const rel = k.slice(`${spaceKey}/devices/`.length);
|
|
61
86
|
const d = rel.slice(0, rel.indexOf('/'));
|
|
62
|
-
if (d
|
|
87
|
+
if (d)
|
|
63
88
|
deviceIds.add(d);
|
|
64
89
|
}
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
90
|
+
return [...deviceIds];
|
|
91
|
+
}
|
|
92
|
+
async function pullFromDevice(store, remote, vault, keys, spaceKey, deviceId) {
|
|
93
|
+
const sealed = await remote.getManifest(spaceKey, deviceId);
|
|
94
|
+
if (!sealed)
|
|
95
|
+
return null; // 该设备在此链上没有 manifest(含健康设备的自链):无行可报
|
|
96
|
+
if (!(sealed instanceof Uint8Array))
|
|
97
|
+
throw err('E_VALIDATION', '远端 manifest 不是字节对象');
|
|
98
|
+
// 第三轮验证 P1:外来 vault / 密钥不匹配的 manifest 解密必然失败——
|
|
99
|
+
// 降级为跳过 + 审计(不是密钥损坏,不能让本 vault 的同步停摆)
|
|
100
|
+
let manifest;
|
|
101
|
+
try {
|
|
102
|
+
manifest = decryptManifestDoc(sealed, keys.vaultKey, vault.vaultId, spaceKey, deviceId);
|
|
103
|
+
}
|
|
104
|
+
catch (e) {
|
|
105
|
+
const code = e.code;
|
|
106
|
+
if (code === 'E_VALIDATION') {
|
|
107
|
+
store.audit.record('sync', 'manifest_skipped', { type: 'system', id: deviceId }, { reason: 'foreign_vault_or_undecryptable', spaceKey });
|
|
108
|
+
return { deviceId, spaceKey, headSeq: 0, appliedBefore: 0, outcome: null, waited: 0, skippedReason: 'foreign_vault_or_undecryptable' };
|
|
109
|
+
}
|
|
110
|
+
throw e;
|
|
111
|
+
}
|
|
112
|
+
const cursor = getCursor(store, spaceKey, deviceId);
|
|
113
|
+
if (manifest.headSeq <= cursor) {
|
|
114
|
+
return { deviceId, spaceKey, headSeq: manifest.headSeq, appliedBefore: 0, outcome: null, waited: 0 };
|
|
115
|
+
}
|
|
116
|
+
// 取 (cursor, headSeq] 覆盖的 chunk
|
|
117
|
+
const chunks = manifest.chunks.filter((c) => c.seqTo > cursor && c.seqFrom <= manifest.headSeq).sort((a, b) => a.seqFrom - b.seqFrom);
|
|
118
|
+
const events = [];
|
|
119
|
+
let chunkSkip = false;
|
|
120
|
+
for (const meta of chunks) {
|
|
121
|
+
const sealedChunk = await remote.getObject(chunkObjectKey(spaceKey, meta));
|
|
122
|
+
if (!sealedChunk) {
|
|
123
|
+
// chunk 缺失(上传中断于 manifest 之前的孤儿引用):跳过该 chunk,游标不越过它
|
|
124
|
+
store.audit.record('sync', 'chunk_missing', { type: 'system', id: meta.key }, { device: deviceId, spaceKey });
|
|
125
|
+
break;
|
|
126
|
+
}
|
|
76
127
|
try {
|
|
77
|
-
|
|
128
|
+
events.push(...decryptChunk(sealedChunk, keys.vaultKey, vault.vaultId, spaceKey, meta, deviceId));
|
|
78
129
|
}
|
|
79
130
|
catch (e) {
|
|
80
131
|
const code = e.code;
|
|
81
132
|
if (code === 'E_VALIDATION') {
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
}
|
|
86
|
-
throw e;
|
|
87
|
-
}
|
|
88
|
-
const cursor = getCursor(store, spaceKey, deviceId);
|
|
89
|
-
if (manifest.headSeq <= cursor) {
|
|
90
|
-
results.push({ deviceId, headSeq: manifest.headSeq, appliedBefore: 0, outcome: null, waited: 0 });
|
|
91
|
-
continue;
|
|
92
|
-
}
|
|
93
|
-
// 取 (cursor, headSeq] 覆盖的 chunk
|
|
94
|
-
const chunks = manifest.chunks.filter((c) => c.seqTo > cursor && c.seqFrom <= manifest.headSeq).sort((a, b) => a.seqFrom - b.seqFrom);
|
|
95
|
-
const events = [];
|
|
96
|
-
let chunkSkip = false;
|
|
97
|
-
for (const meta of chunks) {
|
|
98
|
-
const sealedChunk = await remote.getObject(chunkObjectKey(spaceKey, meta));
|
|
99
|
-
if (!sealedChunk) {
|
|
100
|
-
// chunk 缺失(上传中断于 manifest 之前的孤儿引用):跳过该 chunk,游标不越过它
|
|
101
|
-
store.audit.record('sync', 'chunk_missing', { type: 'system', id: meta.key }, { device: deviceId });
|
|
133
|
+
// 单个 chunk 不可解密(外来/损坏):跳过该设备本轮,不拖垮整链
|
|
134
|
+
store.audit.record('sync', 'chunk_skipped', { type: 'system', id: meta.key }, { device: deviceId, spaceKey, reason: 'undecryptable' });
|
|
135
|
+
chunkSkip = true;
|
|
102
136
|
break;
|
|
103
137
|
}
|
|
104
|
-
|
|
105
|
-
events.push(...decryptChunk(sealedChunk, keys.vaultKey, vault.vaultId, spaceKey, meta, deviceId));
|
|
106
|
-
}
|
|
107
|
-
catch (e) {
|
|
108
|
-
const code = e.code;
|
|
109
|
-
if (code === 'E_VALIDATION') {
|
|
110
|
-
// 单个 chunk 不可解密(外来/损坏):跳过该设备本轮,不拖垮整链
|
|
111
|
-
store.audit.record('sync', 'chunk_skipped', { type: 'system', id: meta.key }, { device: deviceId, reason: 'undecryptable' });
|
|
112
|
-
chunkSkip = true;
|
|
113
|
-
break;
|
|
114
|
-
}
|
|
115
|
-
throw e;
|
|
116
|
-
}
|
|
117
|
-
}
|
|
118
|
-
if (chunkSkip) {
|
|
119
|
-
results.push({ deviceId, headSeq: manifest.headSeq, appliedBefore: 0, outcome: null, waited: 0, skippedReason: 'undecryptable_chunk' });
|
|
120
|
-
continue;
|
|
121
|
-
}
|
|
122
|
-
// 按序应用
|
|
123
|
-
events.sort((a, b) => a.seq - b.seq);
|
|
124
|
-
const { outcome, waitEvents } = applyEvents(store, events, spaceKey);
|
|
125
|
-
// 游标推进到最后一个成功应用的事件序(等待依赖的事件不推进——下次重试)
|
|
126
|
-
let appliedThrough = cursor;
|
|
127
|
-
for (const ev of events) {
|
|
128
|
-
if (waitEvents.some((w) => w.seq === ev.seq && w.memoryId === ev.memoryId))
|
|
129
|
-
break;
|
|
130
|
-
appliedThrough = ev.seq;
|
|
138
|
+
throw e;
|
|
131
139
|
}
|
|
132
|
-
if (appliedThrough > cursor)
|
|
133
|
-
setCursor(store, spaceKey, deviceId, appliedThrough);
|
|
134
|
-
const applied = (outcome?.applied ?? 0) + (outcome?.tombstoned ?? 0) + (outcome?.conflicted ?? 0) + (outcome?.scopeExited ?? 0);
|
|
135
|
-
totalApplied += applied;
|
|
136
|
-
results.push({
|
|
137
|
-
deviceId,
|
|
138
|
-
headSeq: manifest.headSeq,
|
|
139
|
-
appliedBefore: applied,
|
|
140
|
-
outcome,
|
|
141
|
-
waited: waitEvents.length,
|
|
142
|
-
});
|
|
143
140
|
}
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
}
|
|
147
|
-
|
|
148
|
-
|
|
141
|
+
if (chunkSkip) {
|
|
142
|
+
return { deviceId, spaceKey, headSeq: manifest.headSeq, appliedBefore: 0, outcome: null, waited: 0, skippedReason: 'undecryptable_chunk' };
|
|
143
|
+
}
|
|
144
|
+
// 按序应用(物化过滤在 applyEvent 内按链角色执行)
|
|
145
|
+
events.sort((a, b) => a.seq - b.seq);
|
|
146
|
+
const { outcome, waitEvents } = applyEvents(store, events, spaceKey);
|
|
147
|
+
// 游标推进到最后一个成功应用的事件序(等待依赖的事件不推进——下次重试)
|
|
148
|
+
let appliedThrough = cursor;
|
|
149
|
+
for (const ev of events) {
|
|
150
|
+
if (waitEvents.some((w) => w.seq === ev.seq && w.memoryId === ev.memoryId))
|
|
151
|
+
break;
|
|
152
|
+
appliedThrough = ev.seq;
|
|
153
|
+
}
|
|
154
|
+
if (appliedThrough > cursor)
|
|
155
|
+
setCursor(store, spaceKey, deviceId, appliedThrough);
|
|
156
|
+
const applied = (outcome?.applied ?? 0) + (outcome?.tombstoned ?? 0) + (outcome?.conflicted ?? 0) + (outcome?.scopeExited ?? 0);
|
|
157
|
+
return {
|
|
158
|
+
deviceId,
|
|
159
|
+
spaceKey,
|
|
160
|
+
headSeq: manifest.headSeq,
|
|
161
|
+
appliedBefore: applied,
|
|
162
|
+
outcome,
|
|
163
|
+
waited: waitEvents.length,
|
|
164
|
+
};
|
|
149
165
|
}
|
|
150
166
|
//# sourceMappingURL=pull.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pull.js","sourceRoot":"","sources":["../../../src/sync/pull.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAIL,WAAW,EACX,WAAW,GACZ,MAAM,aAAa,CAAC;AACrB,OAAO,EAAE,cAAc,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAC1E,OAAO,
|
|
1
|
+
{"version":3,"file":"pull.js","sourceRoot":"","sources":["../../../src/sync/pull.ts"],"names":[],"mappings":"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"}
|
package/dist/src/sync/push.d.ts
CHANGED
|
@@ -2,17 +2,33 @@ import { CairnStore } from '../store/open.js';
|
|
|
2
2
|
import { RemoteStore } from '../jobs/remote.js';
|
|
3
3
|
import { ChunkMeta } from './events.js';
|
|
4
4
|
import { VaultConfig } from './vault.js';
|
|
5
|
+
export interface ChainPushResult {
|
|
6
|
+
spaceKey: string;
|
|
7
|
+
/** personal = 个人链;preserve = 本设备保管链。 */
|
|
8
|
+
role: 'personal' | 'preserve';
|
|
9
|
+
publishedChunks: ChunkMeta[];
|
|
10
|
+
headSeq: number;
|
|
11
|
+
eventCount: number;
|
|
12
|
+
/** 该链完成的任务数(含事件为空被幂等完成的)。 */
|
|
13
|
+
jobs: number;
|
|
14
|
+
}
|
|
5
15
|
export interface PushResult {
|
|
6
16
|
publishedChunks: ChunkMeta[];
|
|
7
17
|
headSeq: number;
|
|
8
18
|
eventCount: number;
|
|
9
19
|
jobs: number;
|
|
20
|
+
/** 按链分列(tasks 2.4);单链场景与顶层字段一致。 */
|
|
21
|
+
chains: ChainPushResult[];
|
|
22
|
+
/** 因不可路由而完成并审计的任务数(add-cloud-preserve-mode:消灭静默完成)。 */
|
|
23
|
+
unroutable: number;
|
|
10
24
|
}
|
|
11
25
|
interface PendingJob {
|
|
12
26
|
id: string;
|
|
13
27
|
entityId: string;
|
|
14
28
|
/** 完整任务行才带 payload;worker preclaim 路径会传入。op=scope_exit / force 用于控制事件。 */
|
|
15
29
|
payload?: Record<string, unknown>;
|
|
30
|
+
/** 任务类型(路由判定用);worker preclaim 路径由调用方传入。 */
|
|
31
|
+
jobTypeHint?: string;
|
|
16
32
|
}
|
|
17
33
|
export declare function syncPush(store: CairnStore, remote: RemoteStore, vault: VaultConfig, opts?: {
|
|
18
34
|
maxJobs?: number;
|