@carloswon/cairn-memory 0.6.4 → 0.6.5
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/dist/src/sync/apply.d.ts
CHANGED
|
@@ -34,8 +34,11 @@ export interface ApplyOutcome {
|
|
|
34
34
|
shadowed: number;
|
|
35
35
|
/** 收到 scope_exit 并标记「不再持有」的条数(add-scope-migration)。 */
|
|
36
36
|
scopeExited: number;
|
|
37
|
+
/** 本次因项目链/保管链 upsert 解除「不再持有」标记并恢复活动的条数。
|
|
38
|
+
* 追加维度:这些事件同时仍按其返回结果计入 skipped/applied(不改变既有语义)。 */
|
|
39
|
+
revived: number;
|
|
37
40
|
}
|
|
38
|
-
export declare function applyEvent(store: CairnStore, ev: SyncEvent, spaceKey: string, audit: AuditLog): keyof ApplyOutcome;
|
|
41
|
+
export declare function applyEvent(store: CairnStore, ev: SyncEvent, spaceKey: string, audit: AuditLog, tally?: ApplyOutcome): keyof ApplyOutcome;
|
|
39
42
|
/** 批量应用:parentHash 未知的事件保留在返回值中由调用方决定重试;单事件失败不拖垮整批。 */
|
|
40
43
|
export declare function applyEvents(store: CairnStore, events: SyncEvent[], spaceKey: string): {
|
|
41
44
|
outcome: ApplyOutcome;
|
package/dist/src/sync/apply.js
CHANGED
|
@@ -73,7 +73,7 @@ function materializeScope(store, role, descriptor, ownDeviceId) {
|
|
|
73
73
|
}
|
|
74
74
|
return store.scopes.resolvePreset('project-global', opts);
|
|
75
75
|
}
|
|
76
|
-
export function applyEvent(store, ev, spaceKey, audit) {
|
|
76
|
+
export function applyEvent(store, ev, spaceKey, audit, tally) {
|
|
77
77
|
const memories = store.memories;
|
|
78
78
|
const role = chainRole(spaceKey);
|
|
79
79
|
// 跨设备记忆身份对齐:id 命中 → 直接用;否则按修订内容哈希血统匹配
|
|
@@ -213,6 +213,8 @@ export function applyEvent(store, ev, spaceKey, audit) {
|
|
|
213
213
|
store.memories.migrateScope(mem.id, matScope.id, `sync:${ev.deviceId}`);
|
|
214
214
|
}
|
|
215
215
|
audit.record('sync', 'project_reheld', { type: 'memory', id: mem.id }, { from: ev.deviceId, seq: ev.seq });
|
|
216
|
+
if (tally)
|
|
217
|
+
tally.revived++;
|
|
216
218
|
}
|
|
217
219
|
// 保管链 upsert 落在带标记的记忆上:这是自设备重放(恢复场景)——设备仍以
|
|
218
220
|
// 描述符作用域持有它。解除归档并按描述符落位;保留个人链标记(个人链持有确实已离开,
|
|
@@ -226,6 +228,8 @@ export function applyEvent(store, ev, spaceKey, audit) {
|
|
|
226
228
|
store.memories.migrateScope(mem.id, matScope.id, `sync:${ev.deviceId}`);
|
|
227
229
|
}
|
|
228
230
|
audit.record('sync', 'preserve_reheld', { type: 'memory', id: mem.id }, { from: ev.deviceId, seq: ev.seq });
|
|
231
|
+
if (tally)
|
|
232
|
+
tally.revived++;
|
|
229
233
|
}
|
|
230
234
|
if (mem.contentHash === payload.contentHash)
|
|
231
235
|
return 'skipped';
|
|
@@ -300,11 +304,11 @@ function matchByLineage(store, ev) {
|
|
|
300
304
|
/** 批量应用:parentHash 未知的事件保留在返回值中由调用方决定重试;单事件失败不拖垮整批。 */
|
|
301
305
|
export function applyEvents(store, events, spaceKey) {
|
|
302
306
|
const audit = store.audit;
|
|
303
|
-
const outcome = { applied: 0, skipped: 0, conflicted: 0, waited: 0, tombstoned: 0, shadowed: 0, scopeExited: 0 };
|
|
307
|
+
const outcome = { applied: 0, skipped: 0, conflicted: 0, waited: 0, tombstoned: 0, shadowed: 0, scopeExited: 0, revived: 0 };
|
|
304
308
|
const waitEvents = [];
|
|
305
309
|
for (const ev of events) {
|
|
306
310
|
try {
|
|
307
|
-
const r = applyEvent(store, ev, spaceKey, audit);
|
|
311
|
+
const r = applyEvent(store, ev, spaceKey, audit, outcome);
|
|
308
312
|
outcome[r]++;
|
|
309
313
|
if (r === 'waited')
|
|
310
314
|
waitEvents.push(ev);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apply.js","sourceRoot":"","sources":["../../../src/sync/apply.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"apply.js","sourceRoot":"","sources":["../../../src/sync/apply.ts"],"names":[],"mappings":"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"}
|
|
@@ -25,6 +25,12 @@ import { CairnStore } from '../store/index.js';
|
|
|
25
25
|
* - 迁出通知缺口:曾推送到个人链、现已不在个人链、但从未有过任何 sync_scope_exit
|
|
26
26
|
* 任务的活动记忆——本变更之前迁移到 project-global(可上行目的地)不产生迁出通知
|
|
27
27
|
* (2026-11 双设备事故的 27 条就在这个形状里),对端残缺副本靠补发的通知收敛。
|
|
28
|
+
*
|
|
29
|
+
* 三条链的缺口判据都必须排除「本机不是发布者」的副本(2026-11-16 真机对端 upstreamGap=27):
|
|
30
|
+
* `sync_pushed` 元数据只在 push.ts 写入,接收方永远没有它——不排除的话,**每一台接收设备**
|
|
31
|
+
* 上拉下来的每条记忆都恒被判缺口,且自身永不消解(发布方本机看不出来)。
|
|
32
|
+
* 依据是 `memory.origin_device_id`(本机创建 = 本机 deviceId;同步到达 = 事件来源设备)。
|
|
33
|
+
* `NULL` 视为「可能由本机创建」(历史记忆),仍算缺口,避免把真缺口一刀切漏掉。
|
|
28
34
|
*/
|
|
29
35
|
export interface UpstreamGap {
|
|
30
36
|
memoryId: string;
|
|
@@ -73,6 +79,8 @@ export declare function findUpstreamGap(store: CairnStore): UpstreamGap[];
|
|
|
73
79
|
* 存量迁出通知缺口(add-cloud-preserve-mode):曾推个人链、已离开、从未通知过。
|
|
74
80
|
* 曾推 = sync_pushed 元数据存在;从未通知 = 无任何 sync_scope_exit 任务(不论状态——
|
|
75
81
|
* 0.6.x 对 device-local 目标的迁出已正确产生过任务,不重发)。
|
|
82
|
+
* 接收方副本没有 `sync_pushed:personal-global:<id>`(该元数据只由 push 写),因此
|
|
83
|
+
* 不会被误判为「曾推」——本函数不需要 origin_device_id 条件。
|
|
76
84
|
*/
|
|
77
85
|
export declare function findScopeExitGap(store: CairnStore): ScopeExitGap[];
|
|
78
86
|
/** 按链统计缺口(doctor / status 用;同一判定口径,不在可观测层另写 SQL)。
|
|
@@ -2,25 +2,28 @@ import { PERSONAL_SPACE_KEY, PROJECT_CHAIN_PREFIX, preserveModeEnabled } from '.
|
|
|
2
2
|
import { enqueueMemorySync, enqueueScopeExit } from './route.js';
|
|
3
3
|
export const BACKFILL_DEFAULT_LIMIT = 500;
|
|
4
4
|
export function findUpstreamGap(store) {
|
|
5
|
+
const ownDeviceId = store.identity.deviceId;
|
|
5
6
|
const personal = store.db
|
|
6
7
|
.all(`SELECT m.id AS memoryId, m.scope_id AS scopeId
|
|
7
8
|
FROM memory m JOIN scope s ON s.id = m.scope_id
|
|
8
9
|
WHERE m.status = 'active' AND s.sync_policy = 'encrypted' AND s.device_id = 'all' AND s.preset = 'personal-global'
|
|
10
|
+
AND (m.origin_device_id IS NULL OR m.origin_device_id = ?)
|
|
9
11
|
AND NOT EXISTS (SELECT 1 FROM outbox_job j
|
|
10
12
|
WHERE j.job_type = 'sync_upstream' AND j.entity_id = m.id)
|
|
11
|
-
ORDER BY m.created_at, m.id
|
|
13
|
+
ORDER BY m.created_at, m.id`, ownDeviceId)
|
|
12
14
|
.map((r) => ({ memoryId: String(r.memoryId), scopeId: String(r.scopeId), chain: 'personal' }));
|
|
13
15
|
const project = store.db
|
|
14
16
|
.all(`SELECT m.id AS memoryId, m.scope_id AS scopeId, s.project_id AS projectId
|
|
15
17
|
FROM memory m JOIN scope s ON s.id = m.scope_id
|
|
16
18
|
WHERE m.status = 'active' AND s.preset = 'project-global' AND s.project_id IS NOT NULL
|
|
17
19
|
AND s.sync_policy = 'encrypted' AND s.device_id = 'all'
|
|
20
|
+
AND (m.origin_device_id IS NULL OR m.origin_device_id = ?)
|
|
18
21
|
AND NOT EXISTS (SELECT 1 FROM meta
|
|
19
22
|
WHERE meta.key = ? || s.project_id || ':' || m.id)
|
|
20
23
|
AND NOT EXISTS (SELECT 1 FROM outbox_job j
|
|
21
24
|
WHERE j.job_type = 'sync_upstream' AND j.entity_id = m.id
|
|
22
25
|
AND j.status IN ('pending','running','retry'))
|
|
23
|
-
ORDER BY m.created_at, m.id`, 'sync_pushed:' + PROJECT_CHAIN_PREFIX)
|
|
26
|
+
ORDER BY m.created_at, m.id`, ownDeviceId, 'sync_pushed:' + PROJECT_CHAIN_PREFIX)
|
|
24
27
|
.map((r) => ({
|
|
25
28
|
memoryId: String(r.memoryId),
|
|
26
29
|
scopeId: String(r.scopeId),
|
|
@@ -38,9 +41,10 @@ export function findUpstreamGap(store) {
|
|
|
38
41
|
WHERE m.status = 'active'
|
|
39
42
|
AND (s.preset IN ('device-local','project-device')
|
|
40
43
|
OR (s.preset = 'project-global' AND s.project_id IS NULL))
|
|
44
|
+
AND (m.origin_device_id IS NULL OR m.origin_device_id = ?)
|
|
41
45
|
AND NOT EXISTS (SELECT 1 FROM outbox_job j
|
|
42
46
|
WHERE j.job_type = 'sync_preserve' AND j.entity_id = m.id)
|
|
43
|
-
ORDER BY m.created_at, m.id
|
|
47
|
+
ORDER BY m.created_at, m.id`, ownDeviceId)
|
|
44
48
|
.map((r) => ({ memoryId: String(r.memoryId), scopeId: String(r.scopeId), chain: 'preserve' }));
|
|
45
49
|
return [...upstream, ...preserve];
|
|
46
50
|
}
|
|
@@ -48,6 +52,8 @@ export function findUpstreamGap(store) {
|
|
|
48
52
|
* 存量迁出通知缺口(add-cloud-preserve-mode):曾推个人链、已离开、从未通知过。
|
|
49
53
|
* 曾推 = sync_pushed 元数据存在;从未通知 = 无任何 sync_scope_exit 任务(不论状态——
|
|
50
54
|
* 0.6.x 对 device-local 目标的迁出已正确产生过任务,不重发)。
|
|
55
|
+
* 接收方副本没有 `sync_pushed:personal-global:<id>`(该元数据只由 push 写),因此
|
|
56
|
+
* 不会被误判为「曾推」——本函数不需要 origin_device_id 条件。
|
|
51
57
|
*/
|
|
52
58
|
export function findScopeExitGap(store) {
|
|
53
59
|
return store.db
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"backfill.js","sourceRoot":"","sources":["../../../src/sync/backfill.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAC3F,OAAO,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"backfill.js","sourceRoot":"","sources":["../../../src/sync/backfill.ts"],"names":[],"mappings":"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"}
|