@carloswon/cairn-memory 0.0.0-stage → 0.3.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 +81 -0
- package/LICENSE +21 -0
- package/README.md +158 -2
- package/dist/src/agents/adapters.d.ts +82 -0
- package/dist/src/agents/adapters.js +209 -0
- package/dist/src/agents/adapters.js.map +1 -0
- package/dist/src/agents/config.d.ts +82 -0
- package/dist/src/agents/config.js +603 -0
- package/dist/src/agents/config.js.map +1 -0
- package/dist/src/agents/cordisPatch.d.ts +89 -0
- package/dist/src/agents/cordisPatch.js +201 -0
- package/dist/src/agents/cordisPatch.js.map +1 -0
- package/dist/src/agents/index.d.ts +2 -0
- package/dist/src/agents/index.js +3 -0
- package/dist/src/agents/index.js.map +1 -0
- package/dist/src/core/errors.d.ts +36 -0
- package/dist/src/core/errors.js +74 -0
- package/dist/src/core/errors.js.map +1 -0
- package/dist/src/core/hash.d.ts +14 -0
- package/dist/src/core/hash.js +48 -0
- package/dist/src/core/hash.js.map +1 -0
- package/dist/src/core/ids.d.ts +10 -0
- package/dist/src/core/ids.js +41 -0
- package/dist/src/core/ids.js.map +1 -0
- package/dist/src/core/index.d.ts +6 -0
- package/dist/src/core/index.js +7 -0
- package/dist/src/core/index.js.map +1 -0
- package/dist/src/core/scope.d.ts +78 -0
- package/dist/src/core/scope.js +181 -0
- package/dist/src/core/scope.js.map +1 -0
- package/dist/src/core/secrets.d.ts +13 -0
- package/dist/src/core/secrets.js +122 -0
- package/dist/src/core/secrets.js.map +1 -0
- package/dist/src/core/time.d.ts +7 -0
- package/dist/src/core/time.js +18 -0
- package/dist/src/core/time.js.map +1 -0
- package/dist/src/core/types.d.ts +139 -0
- package/dist/src/core/types.js +30 -0
- package/dist/src/core/types.js.map +1 -0
- package/dist/src/governance/apply.d.ts +64 -0
- package/dist/src/governance/apply.js +160 -0
- package/dist/src/governance/apply.js.map +1 -0
- package/dist/src/governance/archive.d.ts +29 -0
- package/dist/src/governance/archive.js +52 -0
- package/dist/src/governance/archive.js.map +1 -0
- package/dist/src/governance/dedup.d.ts +21 -0
- package/dist/src/governance/dedup.js +23 -0
- package/dist/src/governance/dedup.js.map +1 -0
- package/dist/src/governance/index.d.ts +16 -0
- package/dist/src/governance/index.js +17 -0
- package/dist/src/governance/index.js.map +1 -0
- package/dist/src/governance/propose.d.ts +78 -0
- package/dist/src/governance/propose.js +150 -0
- package/dist/src/governance/propose.js.map +1 -0
- package/dist/src/index.d.ts +15 -0
- package/dist/src/index.js +24 -0
- package/dist/src/index.js.map +1 -0
- package/dist/src/interfaces/app-service.d.ts +292 -0
- package/dist/src/interfaces/app-service.js +743 -0
- package/dist/src/interfaces/app-service.js.map +1 -0
- package/dist/src/interfaces/cli/main.d.ts +2 -0
- package/dist/src/interfaces/cli/main.js +854 -0
- package/dist/src/interfaces/cli/main.js.map +1 -0
- package/dist/src/interfaces/console/assets/page.d.ts +18 -0
- package/dist/src/interfaces/console/assets/page.js +39 -0
- package/dist/src/interfaces/console/assets/page.js.map +1 -0
- package/dist/src/interfaces/console/assets/ui-css.d.ts +11 -0
- package/dist/src/interfaces/console/assets/ui-css.js +119 -0
- package/dist/src/interfaces/console/assets/ui-css.js.map +1 -0
- package/dist/src/interfaces/console/assets/ui-js.d.ts +14 -0
- package/dist/src/interfaces/console/assets/ui-js.js +1098 -0
- package/dist/src/interfaces/console/assets/ui-js.js.map +1 -0
- package/dist/src/interfaces/console/assets/url-state.d.ts +9 -0
- package/dist/src/interfaces/console/assets/url-state.js +45 -0
- package/dist/src/interfaces/console/assets/url-state.js.map +1 -0
- package/dist/src/interfaces/console/export.d.ts +46 -0
- package/dist/src/interfaces/console/export.js +84 -0
- package/dist/src/interfaces/console/export.js.map +1 -0
- package/dist/src/interfaces/console/model.d.ts +372 -0
- package/dist/src/interfaces/console/model.js +731 -0
- package/dist/src/interfaces/console/model.js.map +1 -0
- package/dist/src/interfaces/console/review-store.d.ts +142 -0
- package/dist/src/interfaces/console/review-store.js +342 -0
- package/dist/src/interfaces/console/review-store.js.map +1 -0
- package/dist/src/interfaces/console/security.d.ts +76 -0
- package/dist/src/interfaces/console/security.js +105 -0
- package/dist/src/interfaces/console/security.js.map +1 -0
- package/dist/src/interfaces/console/server.d.ts +45 -0
- package/dist/src/interfaces/console/server.js +476 -0
- package/dist/src/interfaces/console/server.js.map +1 -0
- package/dist/src/interfaces/console/suggestions.d.ts +112 -0
- package/dist/src/interfaces/console/suggestions.js +511 -0
- package/dist/src/interfaces/console/suggestions.js.map +1 -0
- package/dist/src/interfaces/console/text.d.ts +4 -0
- package/dist/src/interfaces/console/text.js +18 -0
- package/dist/src/interfaces/console/text.js.map +1 -0
- package/dist/src/interfaces/mcp/server.d.ts +4 -0
- package/dist/src/interfaces/mcp/server.js +480 -0
- package/dist/src/interfaces/mcp/server.js.map +1 -0
- package/dist/src/jobs/index.d.ts +6 -0
- package/dist/src/jobs/index.js +7 -0
- package/dist/src/jobs/index.js.map +1 -0
- package/dist/src/jobs/remote.d.ts +42 -0
- package/dist/src/jobs/remote.js +34 -0
- package/dist/src/jobs/remote.js.map +1 -0
- package/dist/src/jobs/worker.d.ts +67 -0
- package/dist/src/jobs/worker.js +169 -0
- package/dist/src/jobs/worker.js.map +1 -0
- package/dist/src/onboarding/auto.d.ts +88 -0
- package/dist/src/onboarding/auto.js +399 -0
- package/dist/src/onboarding/auto.js.map +1 -0
- package/dist/src/onboarding/batches.d.ts +103 -0
- package/dist/src/onboarding/batches.js +219 -0
- package/dist/src/onboarding/batches.js.map +1 -0
- package/dist/src/onboarding/discover.d.ts +54 -0
- package/dist/src/onboarding/discover.js +369 -0
- package/dist/src/onboarding/discover.js.map +1 -0
- package/dist/src/onboarding/import.d.ts +69 -0
- package/dist/src/onboarding/import.js +279 -0
- package/dist/src/onboarding/import.js.map +1 -0
- package/dist/src/onboarding/index.d.ts +24 -0
- package/dist/src/onboarding/index.js +22 -0
- package/dist/src/onboarding/index.js.map +1 -0
- package/dist/src/onboarding/judgement.d.ts +50 -0
- package/dist/src/onboarding/judgement.js +121 -0
- package/dist/src/onboarding/judgement.js.map +1 -0
- package/dist/src/onboarding/policy.d.ts +86 -0
- package/dist/src/onboarding/policy.js +249 -0
- package/dist/src/onboarding/policy.js.map +1 -0
- package/dist/src/projection/brief.d.ts +112 -0
- package/dist/src/projection/brief.js +200 -0
- package/dist/src/projection/brief.js.map +1 -0
- package/dist/src/projection/index.d.ts +1 -0
- package/dist/src/projection/index.js +2 -0
- package/dist/src/projection/index.js.map +1 -0
- package/dist/src/projection/markdown.d.ts +82 -0
- package/dist/src/projection/markdown.js +313 -0
- package/dist/src/projection/markdown.js.map +1 -0
- package/dist/src/retrieval/export.d.ts +80 -0
- package/dist/src/retrieval/export.js +215 -0
- package/dist/src/retrieval/export.js.map +1 -0
- package/dist/src/retrieval/index.d.ts +5 -0
- package/dist/src/retrieval/index.js +6 -0
- package/dist/src/retrieval/index.js.map +1 -0
- package/dist/src/retrieval/search.d.ts +37 -0
- package/dist/src/retrieval/search.js +294 -0
- package/dist/src/retrieval/search.js.map +1 -0
- package/dist/src/store/archives.d.ts +94 -0
- package/dist/src/store/archives.js +135 -0
- package/dist/src/store/archives.js.map +1 -0
- package/dist/src/store/audit.d.ts +57 -0
- package/dist/src/store/audit.js +131 -0
- package/dist/src/store/audit.js.map +1 -0
- package/dist/src/store/backup.d.ts +36 -0
- package/dist/src/store/backup.js +90 -0
- package/dist/src/store/backup.js.map +1 -0
- package/dist/src/store/blocks.d.ts +64 -0
- package/dist/src/store/blocks.js +104 -0
- package/dist/src/store/blocks.js.map +1 -0
- package/dist/src/store/conflicts.d.ts +52 -0
- package/dist/src/store/conflicts.js +112 -0
- package/dist/src/store/conflicts.js.map +1 -0
- package/dist/src/store/db.d.ts +44 -0
- package/dist/src/store/db.js +162 -0
- package/dist/src/store/db.js.map +1 -0
- package/dist/src/store/device.d.ts +46 -0
- package/dist/src/store/device.js +111 -0
- package/dist/src/store/device.js.map +1 -0
- package/dist/src/store/index.d.ts +14 -0
- package/dist/src/store/index.js +15 -0
- package/dist/src/store/index.js.map +1 -0
- package/dist/src/store/memories.d.ts +133 -0
- package/dist/src/store/memories.js +442 -0
- package/dist/src/store/memories.js.map +1 -0
- package/dist/src/store/migrate.d.ts +32 -0
- package/dist/src/store/migrate.js +87 -0
- package/dist/src/store/migrate.js.map +1 -0
- package/dist/src/store/open.d.ts +53 -0
- package/dist/src/store/open.js +203 -0
- package/dist/src/store/open.js.map +1 -0
- package/dist/src/store/outbox.d.ts +65 -0
- package/dist/src/store/outbox.js +137 -0
- package/dist/src/store/outbox.js.map +1 -0
- package/dist/src/store/plans.d.ts +137 -0
- package/dist/src/store/plans.js +243 -0
- package/dist/src/store/plans.js.map +1 -0
- package/dist/src/store/schema.d.ts +46 -0
- package/dist/src/store/schema.js +544 -0
- package/dist/src/store/schema.js.map +1 -0
- package/dist/src/store/scopes.d.ts +44 -0
- package/dist/src/store/scopes.js +220 -0
- package/dist/src/store/scopes.js.map +1 -0
- package/dist/src/store/write-guard.d.ts +10 -0
- package/dist/src/store/write-guard.js +10 -0
- package/dist/src/store/write-guard.js.map +1 -0
- package/dist/src/sync/apply.d.ts +24 -0
- package/dist/src/sync/apply.js +130 -0
- package/dist/src/sync/apply.js.map +1 -0
- package/dist/src/sync/cryptoutil.d.ts +86 -0
- package/dist/src/sync/cryptoutil.js +339 -0
- package/dist/src/sync/cryptoutil.js.map +1 -0
- package/dist/src/sync/events.d.ts +69 -0
- package/dist/src/sync/events.js +78 -0
- package/dist/src/sync/events.js.map +1 -0
- package/dist/src/sync/obs-store.d.ts +41 -0
- package/dist/src/sync/obs-store.js +325 -0
- package/dist/src/sync/obs-store.js.map +1 -0
- package/dist/src/sync/orchestrate.d.ts +37 -0
- package/dist/src/sync/orchestrate.js +84 -0
- package/dist/src/sync/orchestrate.js.map +1 -0
- package/dist/src/sync/pull.d.ts +24 -0
- package/dist/src/sync/pull.js +150 -0
- package/dist/src/sync/pull.js.map +1 -0
- package/dist/src/sync/push.d.ts +19 -0
- package/dist/src/sync/push.js +227 -0
- package/dist/src/sync/push.js.map +1 -0
- package/dist/src/sync/syncd-store.d.ts +31 -0
- package/dist/src/sync/syncd-store.js +92 -0
- package/dist/src/sync/syncd-store.js.map +1 -0
- package/dist/src/sync/vault.d.ts +37 -0
- package/dist/src/sync/vault.js +53 -0
- package/dist/src/sync/vault.js.map +1 -0
- package/docs/cairn-security.md +267 -0
- package/docs/cairn-usage.md +919 -0
- package/package.json +71 -4
|
@@ -0,0 +1,104 @@
|
|
|
1
|
+
import { err } from '../core/errors.js';
|
|
2
|
+
import { uuidv7 } from '../core/ids.js';
|
|
3
|
+
import { nowIso } from '../core/time.js';
|
|
4
|
+
import { sha256Hex } from '../core/hash.js';
|
|
5
|
+
import { WriteGuardMixin } from './write-guard.js';
|
|
6
|
+
export class ManagedBlockRepository extends WriteGuardMixin {
|
|
7
|
+
db;
|
|
8
|
+
constructor(db) {
|
|
9
|
+
super();
|
|
10
|
+
this.db = db;
|
|
11
|
+
}
|
|
12
|
+
upsert(input) {
|
|
13
|
+
this.checkWritable();
|
|
14
|
+
const existing = this.db.get('SELECT * FROM managed_block WHERE target_path = ? AND block_id = ?', input.targetPath, input.blockId);
|
|
15
|
+
const hash = sha256Hex(input.content);
|
|
16
|
+
const at = nowIso();
|
|
17
|
+
if (existing) {
|
|
18
|
+
this.db.run(`UPDATE managed_block SET content = ?, content_hash = ?, start_marker = ?, end_marker = ?,
|
|
19
|
+
backup_path = IFNULL(?, backup_path), updated_at = ?, removed_at = NULL WHERE id = ?`, input.content, hash, input.startMarker, input.endMarker, input.backupPath ?? null, at, existing.id);
|
|
20
|
+
return this.require(existing.id);
|
|
21
|
+
}
|
|
22
|
+
const id = uuidv7();
|
|
23
|
+
this.db.run(`INSERT INTO managed_block (id, target_path, block_id, agent_id, content_hash, content, start_marker, end_marker, backup_path, installed_at, updated_at)
|
|
24
|
+
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`, id, input.targetPath, input.blockId, input.agentId, hash, input.content, input.startMarker, input.endMarker, input.backupPath ?? null, at, at);
|
|
25
|
+
return this.require(id);
|
|
26
|
+
}
|
|
27
|
+
require(id) {
|
|
28
|
+
const row = this.db.get('SELECT * FROM managed_block WHERE id = ?', id);
|
|
29
|
+
if (!row)
|
|
30
|
+
throw err('E_NOT_FOUND', `受管区块不存在: ${id}`);
|
|
31
|
+
return mapBlock(row);
|
|
32
|
+
}
|
|
33
|
+
get(targetPath, blockId) {
|
|
34
|
+
const row = this.db.get('SELECT * FROM managed_block WHERE target_path = ? AND block_id = ?', targetPath, blockId);
|
|
35
|
+
return row ? mapBlock(row) : null;
|
|
36
|
+
}
|
|
37
|
+
listActive(targetPath) {
|
|
38
|
+
if (targetPath) {
|
|
39
|
+
return this.db.all('SELECT * FROM managed_block WHERE removed_at IS NULL AND target_path = ?', targetPath).map(mapBlock);
|
|
40
|
+
}
|
|
41
|
+
return this.db.all('SELECT * FROM managed_block WHERE removed_at IS NULL').map(mapBlock);
|
|
42
|
+
}
|
|
43
|
+
markRemoved(id) {
|
|
44
|
+
this.db.run('UPDATE managed_block SET removed_at = ? WHERE id = ?', nowIso(), id);
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
export class DeviceInstallationRepository extends WriteGuardMixin {
|
|
48
|
+
db;
|
|
49
|
+
constructor(db) {
|
|
50
|
+
super();
|
|
51
|
+
this.db = db;
|
|
52
|
+
}
|
|
53
|
+
record(input) {
|
|
54
|
+
this.checkWritable();
|
|
55
|
+
const existing = this.db.get('SELECT * FROM device_installation WHERE agent_kind = ? AND home_root = ? AND config_path = ? AND removed_at IS NULL', input.agentKind, input.homeRoot, input.configPath);
|
|
56
|
+
const at = nowIso();
|
|
57
|
+
if (existing) {
|
|
58
|
+
this.db.run('UPDATE device_installation SET target_hash = ?, backup_path = IFNULL(?, backup_path), plan_id = IFNULL(?, plan_id), installed_at = ? WHERE id = ?', input.targetHash, input.backupPath ?? null, input.planId ?? null, at, existing.id);
|
|
59
|
+
return this.map(this.db.get('SELECT * FROM device_installation WHERE id = ?', existing.id));
|
|
60
|
+
}
|
|
61
|
+
const id = uuidv7();
|
|
62
|
+
this.db.run(`INSERT INTO device_installation (id, agent_kind, home_root, config_path, target_hash, backup_path, plan_id, installed_at)
|
|
63
|
+
VALUES (?, ?, ?, ?, ?, ?, ?, ?)`, id, input.agentKind, input.homeRoot, input.configPath, input.targetHash, input.backupPath ?? null, input.planId ?? null, at);
|
|
64
|
+
return this.map(this.db.get('SELECT * FROM device_installation WHERE id = ?', id));
|
|
65
|
+
}
|
|
66
|
+
activeFor(agentKind, homeRoot) {
|
|
67
|
+
return this.db
|
|
68
|
+
.all('SELECT * FROM device_installation WHERE agent_kind = ? AND home_root = ? AND removed_at IS NULL', agentKind, homeRoot)
|
|
69
|
+
.map((r) => this.map(r));
|
|
70
|
+
}
|
|
71
|
+
markRemoved(id) {
|
|
72
|
+
this.db.run('UPDATE device_installation SET removed_at = ? WHERE id = ?', nowIso(), id);
|
|
73
|
+
}
|
|
74
|
+
map(r) {
|
|
75
|
+
return {
|
|
76
|
+
id: r.id,
|
|
77
|
+
agentKind: r.agent_kind,
|
|
78
|
+
homeRoot: r.home_root,
|
|
79
|
+
configPath: r.config_path,
|
|
80
|
+
targetHash: r.target_hash,
|
|
81
|
+
backupPath: r.backup_path ?? null,
|
|
82
|
+
planId: r.plan_id ?? null,
|
|
83
|
+
installedAt: r.installed_at,
|
|
84
|
+
removedAt: r.removed_at ?? null,
|
|
85
|
+
};
|
|
86
|
+
}
|
|
87
|
+
}
|
|
88
|
+
function mapBlock(r) {
|
|
89
|
+
return {
|
|
90
|
+
id: r.id,
|
|
91
|
+
targetPath: r.target_path,
|
|
92
|
+
blockId: r.block_id,
|
|
93
|
+
agentId: r.agent_id,
|
|
94
|
+
contentHash: r.content_hash,
|
|
95
|
+
content: r.content,
|
|
96
|
+
startMarker: r.start_marker,
|
|
97
|
+
endMarker: r.end_marker,
|
|
98
|
+
backupPath: r.backup_path ?? null,
|
|
99
|
+
installedAt: r.installed_at,
|
|
100
|
+
updatedAt: r.updated_at,
|
|
101
|
+
removedAt: r.removed_at ?? null,
|
|
102
|
+
};
|
|
103
|
+
}
|
|
104
|
+
//# sourceMappingURL=blocks.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"blocks.js","sourceRoot":"","sources":["../../../src/store/blocks.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,52 @@
|
|
|
1
|
+
import { CairnDb } from './db.js';
|
|
2
|
+
import { RevisionRecord } from '../core/types.js';
|
|
3
|
+
import { WriteGuardMixin } from './write-guard.js';
|
|
4
|
+
/**
|
|
5
|
+
* 冲突队列(任务 3.4):并发修订不做字段级 LWW,
|
|
6
|
+
* 保留双方与共同祖先证据;检索明确标记未解决状态。
|
|
7
|
+
*/
|
|
8
|
+
export type ConflictStatus = 'open' | 'resolved_keep_a' | 'resolved_keep_b' | 'resolved_keep_both' | 'resolved_manual';
|
|
9
|
+
export interface ConflictRow {
|
|
10
|
+
id: string;
|
|
11
|
+
memoryId: string;
|
|
12
|
+
baseRevisionId: string | null;
|
|
13
|
+
revisionAId: string;
|
|
14
|
+
revisionBId: string;
|
|
15
|
+
detectedAt: string;
|
|
16
|
+
status: ConflictStatus;
|
|
17
|
+
resolvedAt: string | null;
|
|
18
|
+
resolutionNote: string | null;
|
|
19
|
+
}
|
|
20
|
+
export declare class ConflictRepository extends WriteGuardMixin {
|
|
21
|
+
private readonly db;
|
|
22
|
+
constructor(db: CairnDb);
|
|
23
|
+
/**
|
|
24
|
+
* 记录并发冲突:双方修订必须存在且同属一个 memory。
|
|
25
|
+
* 同一对修订重复记录幂等(UNIQUE 约束)。
|
|
26
|
+
*/
|
|
27
|
+
record(input: {
|
|
28
|
+
memoryId: string;
|
|
29
|
+
baseRevisionId?: string | null;
|
|
30
|
+
revisionAId: string;
|
|
31
|
+
revisionBId: string;
|
|
32
|
+
}): {
|
|
33
|
+
conflict: ConflictRow;
|
|
34
|
+
created: boolean;
|
|
35
|
+
};
|
|
36
|
+
requireById(id: string): ConflictRow;
|
|
37
|
+
/** 检测祖先关系:shared base 且互不为祖先 → 并发冲突。 */
|
|
38
|
+
isConcurrent(revA: RevisionRecord, revB: RevisionRecord, baseId: string | null): boolean;
|
|
39
|
+
ancestryOf(revisionId: string, seen?: Set<string>): Set<string>;
|
|
40
|
+
listOpen(memoryId?: string): ConflictRow[];
|
|
41
|
+
countOpen(): number;
|
|
42
|
+
/**
|
|
43
|
+
* 解决冲突。keep_both:以指定内容新建当前修订(双方证据保留在 conflict 行);
|
|
44
|
+
* keep_a/keep_b:指定修订成为当前;manual:仅标记,不动当前修订。
|
|
45
|
+
*/
|
|
46
|
+
resolve(input: {
|
|
47
|
+
conflictId: string;
|
|
48
|
+
resolution: Exclude<ConflictStatus, 'open'>;
|
|
49
|
+
note?: string;
|
|
50
|
+
currentRevisionId?: string;
|
|
51
|
+
}): ConflictRow;
|
|
52
|
+
}
|
|
@@ -0,0 +1,112 @@
|
|
|
1
|
+
import { err } from '../core/errors.js';
|
|
2
|
+
import { uuidv7 } from '../core/ids.js';
|
|
3
|
+
import { nowIso } from '../core/time.js';
|
|
4
|
+
import { WriteGuardMixin } from './write-guard.js';
|
|
5
|
+
export class ConflictRepository extends WriteGuardMixin {
|
|
6
|
+
db;
|
|
7
|
+
constructor(db) {
|
|
8
|
+
super();
|
|
9
|
+
this.db = db;
|
|
10
|
+
}
|
|
11
|
+
/**
|
|
12
|
+
* 记录并发冲突:双方修订必须存在且同属一个 memory。
|
|
13
|
+
* 同一对修订重复记录幂等(UNIQUE 约束)。
|
|
14
|
+
*/
|
|
15
|
+
record(input) {
|
|
16
|
+
this.checkWritable();
|
|
17
|
+
if (input.revisionAId === input.revisionBId)
|
|
18
|
+
throw err('E_VALIDATION', '冲突双方不能是同一修订');
|
|
19
|
+
for (const rid of [input.revisionAId, input.revisionBId]) {
|
|
20
|
+
const rev = this.db.get('SELECT memory_id FROM memory_revision WHERE id = ?', rid);
|
|
21
|
+
if (!rev)
|
|
22
|
+
throw err('E_NOT_FOUND', `修订不存在: ${rid}`);
|
|
23
|
+
if (rev.memory_id !== input.memoryId)
|
|
24
|
+
throw err('E_VALIDATION', '冲突修订必须属于同一记忆');
|
|
25
|
+
}
|
|
26
|
+
const existing = this.db.get('SELECT * FROM conflict WHERE memory_id = ? AND ((revision_a_id = ? AND revision_b_id = ?) OR (revision_a_id = ? AND revision_b_id = ?))', input.memoryId, input.revisionAId, input.revisionBId, input.revisionBId, input.revisionAId);
|
|
27
|
+
if (existing)
|
|
28
|
+
return { conflict: mapConflict(existing), created: false };
|
|
29
|
+
const id = uuidv7();
|
|
30
|
+
this.db.run(`INSERT INTO conflict (id, memory_id, base_revision_id, revision_a_id, revision_b_id, detected_at, status)
|
|
31
|
+
VALUES (?, ?, ?, ?, ?, ?, 'open')`, id, input.memoryId, input.baseRevisionId ?? null, input.revisionAId, input.revisionBId, nowIso());
|
|
32
|
+
// 记忆进入 conflicted 状态(检索层负责明确标记)
|
|
33
|
+
this.db.run("UPDATE memory SET status = 'conflicted', updated_at = ? WHERE id = ? AND status = 'active'", nowIso(), input.memoryId);
|
|
34
|
+
return { conflict: this.requireById(id), created: true };
|
|
35
|
+
}
|
|
36
|
+
requireById(id) {
|
|
37
|
+
const row = this.db.get('SELECT * FROM conflict WHERE id = ?', id);
|
|
38
|
+
if (!row)
|
|
39
|
+
throw err('E_NOT_FOUND', `冲突不存在: ${id}`);
|
|
40
|
+
return mapConflict(row);
|
|
41
|
+
}
|
|
42
|
+
/** 检测祖先关系:shared base 且互不为祖先 → 并发冲突。 */
|
|
43
|
+
isConcurrent(revA, revB, baseId) {
|
|
44
|
+
if (revA.memoryId !== revB.memoryId)
|
|
45
|
+
return false;
|
|
46
|
+
const inA = baseId != null && revA.parentRevisionIds.includes(baseId);
|
|
47
|
+
const inB = baseId != null && revB.parentRevisionIds.includes(baseId);
|
|
48
|
+
if (inA && inB)
|
|
49
|
+
return true;
|
|
50
|
+
// 双方各自基于同一祖先的新修订,但互相不在对方历史中
|
|
51
|
+
const aAncestry = this.ancestryOf(revA.id);
|
|
52
|
+
const bAncestry = this.ancestryOf(revB.id);
|
|
53
|
+
return !aAncestry.has(revB.id) && !bAncestry.has(revA.id);
|
|
54
|
+
}
|
|
55
|
+
ancestryOf(revisionId, seen = new Set()) {
|
|
56
|
+
if (seen.has(revisionId))
|
|
57
|
+
return seen;
|
|
58
|
+
seen.add(revisionId);
|
|
59
|
+
const row = this.db.get('SELECT parent_revision_ids FROM memory_revision WHERE id = ?', revisionId);
|
|
60
|
+
if (!row)
|
|
61
|
+
return seen;
|
|
62
|
+
try {
|
|
63
|
+
const parents = JSON.parse(row.parent_revision_ids ?? '[]');
|
|
64
|
+
for (const p of parents)
|
|
65
|
+
this.ancestryOf(p, seen);
|
|
66
|
+
}
|
|
67
|
+
catch {
|
|
68
|
+
/* 空历史 */
|
|
69
|
+
}
|
|
70
|
+
return seen;
|
|
71
|
+
}
|
|
72
|
+
listOpen(memoryId) {
|
|
73
|
+
if (memoryId) {
|
|
74
|
+
return this.db.all("SELECT * FROM conflict WHERE status = 'open' AND memory_id = ? ORDER BY detected_at", memoryId).map(mapConflict);
|
|
75
|
+
}
|
|
76
|
+
return this.db.all("SELECT * FROM conflict WHERE status = 'open' ORDER BY detected_at").map(mapConflict);
|
|
77
|
+
}
|
|
78
|
+
countOpen() {
|
|
79
|
+
return Number(this.db.scalar("SELECT COUNT(*) AS n FROM conflict WHERE status = 'open'") ?? 0);
|
|
80
|
+
}
|
|
81
|
+
/**
|
|
82
|
+
* 解决冲突。keep_both:以指定内容新建当前修订(双方证据保留在 conflict 行);
|
|
83
|
+
* keep_a/keep_b:指定修订成为当前;manual:仅标记,不动当前修订。
|
|
84
|
+
*/
|
|
85
|
+
resolve(input) {
|
|
86
|
+
this.checkWritable();
|
|
87
|
+
const conflict = this.requireById(input.conflictId);
|
|
88
|
+
if (conflict.status !== 'open')
|
|
89
|
+
throw err('E_CONFLICT_STATE', `冲突已解决: ${conflict.status}`);
|
|
90
|
+
this.db.transaction(() => {
|
|
91
|
+
this.db.run('UPDATE conflict SET status = ?, resolved_at = ?, resolution_note = ? WHERE id = ?', input.resolution, nowIso(), input.note ?? null, conflict.id);
|
|
92
|
+
if (input.resolution !== 'resolved_manual' && input.currentRevisionId) {
|
|
93
|
+
this.db.run("UPDATE memory SET status = 'active', current_revision_id = ?, updated_at = ? WHERE id = ?", input.currentRevisionId, nowIso(), conflict.memoryId);
|
|
94
|
+
}
|
|
95
|
+
});
|
|
96
|
+
return this.requireById(conflict.id);
|
|
97
|
+
}
|
|
98
|
+
}
|
|
99
|
+
function mapConflict(r) {
|
|
100
|
+
return {
|
|
101
|
+
id: r.id,
|
|
102
|
+
memoryId: r.memory_id,
|
|
103
|
+
baseRevisionId: r.base_revision_id ?? null,
|
|
104
|
+
revisionAId: r.revision_a_id,
|
|
105
|
+
revisionBId: r.revision_b_id,
|
|
106
|
+
detectedAt: r.detected_at,
|
|
107
|
+
status: r.status,
|
|
108
|
+
resolvedAt: r.resolved_at ?? null,
|
|
109
|
+
resolutionNote: r.resolution_note ?? null,
|
|
110
|
+
};
|
|
111
|
+
}
|
|
112
|
+
//# sourceMappingURL=conflicts.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"conflicts.js","sourceRoot":"","sources":["../../../src/store/conflicts.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,44 @@
|
|
|
1
|
+
import { DatabaseSync } from 'node:sqlite';
|
|
2
|
+
/**
|
|
3
|
+
* node:sqlite 适配层(design D2):所有数据库访问经过本类,
|
|
4
|
+
* 集中处理 WAL、外键、忙超时与事务,保留未来替换驱动的边界。
|
|
5
|
+
* 统一约定:SQL 全部使用位置参数 ?;undefined 一律映射为 null。
|
|
6
|
+
*/
|
|
7
|
+
export interface OpenDbOptions {
|
|
8
|
+
readOnly?: boolean;
|
|
9
|
+
busyTimeoutMs?: number;
|
|
10
|
+
}
|
|
11
|
+
export declare class CairnDb {
|
|
12
|
+
readonly raw: DatabaseSync;
|
|
13
|
+
readonly path: string;
|
|
14
|
+
private txDepth;
|
|
15
|
+
private closed;
|
|
16
|
+
private constructor();
|
|
17
|
+
static open(path: string, opts?: OpenDbOptions): CairnDb;
|
|
18
|
+
exec(sql: string): void;
|
|
19
|
+
prepare(sql: string): import("node:sqlite").StatementSync;
|
|
20
|
+
get(sql: string, ...params: unknown[]): Record<string, unknown> | undefined;
|
|
21
|
+
all(sql: string, ...params: unknown[]): Record<string, unknown>[];
|
|
22
|
+
run(sql: string, ...params: unknown[]): {
|
|
23
|
+
changes: number | bigint;
|
|
24
|
+
lastInsertRowid: number | bigint;
|
|
25
|
+
};
|
|
26
|
+
/** 读值便捷方法:单行单列。 */
|
|
27
|
+
scalar(sql: string, ...params: unknown[]): unknown;
|
|
28
|
+
/**
|
|
29
|
+
* 事务:BEGIN IMMEDIATE 立即取写锁,配合 busy_timeout 产生可重试等待而非死锁。
|
|
30
|
+
* 嵌套调用转 SAVEPOINT;异常时回滚并重抛(业务错误保持原类型)。
|
|
31
|
+
*/
|
|
32
|
+
transaction<T>(fn: () => T): T;
|
|
33
|
+
get inTransaction(): boolean;
|
|
34
|
+
integrityCheck(): boolean;
|
|
35
|
+
foreignKeyCheck(): {
|
|
36
|
+
table: string;
|
|
37
|
+
rowid: unknown;
|
|
38
|
+
parent: string;
|
|
39
|
+
fkid: unknown;
|
|
40
|
+
}[];
|
|
41
|
+
close(): void;
|
|
42
|
+
}
|
|
43
|
+
/** 冷启动竞态涉及的三类可重试 SQLite 错误(READONLY/BUSY/LOCKED)。 */
|
|
44
|
+
export declare function isRetryableSqliteError(e: unknown): boolean;
|
|
@@ -0,0 +1,162 @@
|
|
|
1
|
+
import { DatabaseSync } from 'node:sqlite';
|
|
2
|
+
import { err, isCairnError, CairnError } from '../core/errors.js';
|
|
3
|
+
export class CairnDb {
|
|
4
|
+
raw;
|
|
5
|
+
path;
|
|
6
|
+
txDepth = 0;
|
|
7
|
+
closed = false;
|
|
8
|
+
constructor(raw, path) {
|
|
9
|
+
this.raw = raw;
|
|
10
|
+
this.path = path;
|
|
11
|
+
}
|
|
12
|
+
static open(path, opts = {}) {
|
|
13
|
+
// 并发冷启动竞态(第二轮独立验证 P1):多进程同时首建同一库时,
|
|
14
|
+
// journal_mode/pragma 可能落入 SQLITE_READONLY/_busy 状态且 busy_timeout
|
|
15
|
+
// 不吸收,必须重开连接有界重试。
|
|
16
|
+
const maxAttempts = 5;
|
|
17
|
+
let lastError = null;
|
|
18
|
+
for (let attempt = 1; attempt <= maxAttempts; attempt++) {
|
|
19
|
+
try {
|
|
20
|
+
let raw;
|
|
21
|
+
try {
|
|
22
|
+
raw = new DatabaseSync(path, { readOnly: opts.readOnly ?? false });
|
|
23
|
+
}
|
|
24
|
+
catch (e) {
|
|
25
|
+
throw err('E_IO', `无法打开数据库 ${path}: ${e.message}`);
|
|
26
|
+
}
|
|
27
|
+
raw.exec(`PRAGMA busy_timeout = ${opts.busyTimeoutMs ?? 5000}`);
|
|
28
|
+
if (!opts.readOnly) {
|
|
29
|
+
// journal_mode 校验仅对文件库有意义;:memory: 本来就是 'memory'
|
|
30
|
+
if (path !== ':memory:') {
|
|
31
|
+
const modeRow = raw.prepare('PRAGMA journal_mode = WAL').get();
|
|
32
|
+
const mode = modeRow ? String(Object.values(modeRow)[0]).toLowerCase() : '';
|
|
33
|
+
if (mode !== 'wal') {
|
|
34
|
+
raw.close();
|
|
35
|
+
throw new Error(`journal_mode 竞态得到 '${mode}'(期望 wal)`);
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
raw.exec('PRAGMA foreign_keys = ON');
|
|
39
|
+
raw.exec('PRAGMA synchronous = NORMAL');
|
|
40
|
+
}
|
|
41
|
+
else {
|
|
42
|
+
raw.exec('PRAGMA foreign_keys = ON');
|
|
43
|
+
}
|
|
44
|
+
return new CairnDb(raw, path);
|
|
45
|
+
}
|
|
46
|
+
catch (e) {
|
|
47
|
+
lastError = e;
|
|
48
|
+
if (attempt < maxAttempts && isRetryableSqliteError(e)) {
|
|
49
|
+
Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, 50 * attempt);
|
|
50
|
+
continue;
|
|
51
|
+
}
|
|
52
|
+
if (e instanceof CairnError)
|
|
53
|
+
throw e;
|
|
54
|
+
throw err('E_IO', `无法打开数据库 ${path}: ${e.message}`, {
|
|
55
|
+
attempts: attempt,
|
|
56
|
+
});
|
|
57
|
+
}
|
|
58
|
+
}
|
|
59
|
+
throw err('E_IO', `无法打开数据库 ${path}: ${lastError.message}`, { attempts: maxAttempts });
|
|
60
|
+
}
|
|
61
|
+
exec(sql) {
|
|
62
|
+
this.raw.exec(sql);
|
|
63
|
+
}
|
|
64
|
+
prepare(sql) {
|
|
65
|
+
return this.raw.prepare(sql);
|
|
66
|
+
}
|
|
67
|
+
get(sql, ...params) {
|
|
68
|
+
return this.raw.prepare(sql).all(...params.map(toParam))[0];
|
|
69
|
+
}
|
|
70
|
+
all(sql, ...params) {
|
|
71
|
+
return this.raw.prepare(sql).all(...params.map(toParam));
|
|
72
|
+
}
|
|
73
|
+
run(sql, ...params) {
|
|
74
|
+
return this.raw.prepare(sql).run(...params.map(toParam));
|
|
75
|
+
}
|
|
76
|
+
/** 读值便捷方法:单行单列。 */
|
|
77
|
+
scalar(sql, ...params) {
|
|
78
|
+
const row = this.get(sql, ...params);
|
|
79
|
+
if (row == null)
|
|
80
|
+
return undefined;
|
|
81
|
+
const keys = Object.keys(row);
|
|
82
|
+
return keys.length > 0 ? row[keys[0]] : undefined;
|
|
83
|
+
}
|
|
84
|
+
/**
|
|
85
|
+
* 事务:BEGIN IMMEDIATE 立即取写锁,配合 busy_timeout 产生可重试等待而非死锁。
|
|
86
|
+
* 嵌套调用转 SAVEPOINT;异常时回滚并重抛(业务错误保持原类型)。
|
|
87
|
+
*/
|
|
88
|
+
transaction(fn) {
|
|
89
|
+
if (this.txDepth > 0) {
|
|
90
|
+
const sp = `sp_${this.txDepth}`;
|
|
91
|
+
this.exec(`SAVEPOINT ${sp}`);
|
|
92
|
+
this.txDepth++;
|
|
93
|
+
try {
|
|
94
|
+
const out = fn();
|
|
95
|
+
this.txDepth--;
|
|
96
|
+
this.exec(`RELEASE ${sp}`);
|
|
97
|
+
return out;
|
|
98
|
+
}
|
|
99
|
+
catch (e) {
|
|
100
|
+
this.txDepth--;
|
|
101
|
+
this.exec(`ROLLBACK TO ${sp}`);
|
|
102
|
+
this.exec(`RELEASE ${sp}`);
|
|
103
|
+
throw e;
|
|
104
|
+
}
|
|
105
|
+
}
|
|
106
|
+
this.exec('BEGIN IMMEDIATE');
|
|
107
|
+
this.txDepth = 1;
|
|
108
|
+
try {
|
|
109
|
+
const out = fn();
|
|
110
|
+
this.txDepth = 0;
|
|
111
|
+
this.exec('COMMIT');
|
|
112
|
+
return out;
|
|
113
|
+
}
|
|
114
|
+
catch (e) {
|
|
115
|
+
this.txDepth = 0;
|
|
116
|
+
this.exec('ROLLBACK');
|
|
117
|
+
if (isSqliteBusy(e)) {
|
|
118
|
+
throw err('E_DB_LOCKED', '数据库写入忙超时,请稍后重试', { sqlite: e.message });
|
|
119
|
+
}
|
|
120
|
+
throw e;
|
|
121
|
+
}
|
|
122
|
+
}
|
|
123
|
+
get inTransaction() {
|
|
124
|
+
return this.txDepth > 0;
|
|
125
|
+
}
|
|
126
|
+
integrityCheck() {
|
|
127
|
+
const row = this.get('PRAGMA integrity_check');
|
|
128
|
+
return row != null && String(Object.values(row)[0]) === 'ok';
|
|
129
|
+
}
|
|
130
|
+
foreignKeyCheck() {
|
|
131
|
+
return this.all('PRAGMA foreign_key_check');
|
|
132
|
+
}
|
|
133
|
+
close() {
|
|
134
|
+
if (this.closed)
|
|
135
|
+
return;
|
|
136
|
+
this.closed = true;
|
|
137
|
+
this.raw.close();
|
|
138
|
+
}
|
|
139
|
+
}
|
|
140
|
+
function toParam(p) {
|
|
141
|
+
if (p === undefined || p === null)
|
|
142
|
+
return null;
|
|
143
|
+
if (typeof p === 'boolean')
|
|
144
|
+
return p ? 1 : 0;
|
|
145
|
+
if (typeof p === 'string' || typeof p === 'number' || typeof p === 'bigint')
|
|
146
|
+
return p;
|
|
147
|
+
if (p instanceof Uint8Array)
|
|
148
|
+
return p;
|
|
149
|
+
throw err('E_INTERNAL', `不支持的 SQL 参数类型: ${typeof p}`);
|
|
150
|
+
}
|
|
151
|
+
function isSqliteBusy(e) {
|
|
152
|
+
const msg = e.message ?? '';
|
|
153
|
+
return /SQLITE_BUSY|database is locked/i.test(msg) || (isCairnError(e) && e.code === 'E_DB_LOCKED');
|
|
154
|
+
}
|
|
155
|
+
/** 冷启动竞态涉及的三类可重试 SQLite 错误(READONLY/BUSY/LOCKED)。 */
|
|
156
|
+
export function isRetryableSqliteError(e) {
|
|
157
|
+
if (isCairnError(e) && (e.code === 'E_DB_LOCKED' || e.code === 'E_READONLY'))
|
|
158
|
+
return true;
|
|
159
|
+
const msg = `${e.message ?? ''} ${e.errcode ?? ''}`;
|
|
160
|
+
return /SQLITE_READONLY|SQLITE_BUSY|SQLITE_LOCKED|SQLITE_IOERR|attempt to write a readonly|database is locked/i.test(msg);
|
|
161
|
+
}
|
|
162
|
+
//# sourceMappingURL=db.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"db.js","sourceRoot":"","sources":["../../../src/store/db.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,46 @@
|
|
|
1
|
+
import { CairnDb } from './db.js';
|
|
2
|
+
import { CairnError } from '../core/errors.js';
|
|
3
|
+
/**
|
|
4
|
+
* 设备身份(spec memory-store:防克隆)。
|
|
5
|
+
* device.json 保存在数据目录,与数据库分离;整目录克隆会复制同一身份。
|
|
6
|
+
* 打开时比对 DB 内 instance_nonce:不一致 → 判定克隆,暂停旧身份写入。
|
|
7
|
+
*/
|
|
8
|
+
export interface DeviceIdentityFile {
|
|
9
|
+
deviceId: string;
|
|
10
|
+
instanceNonce: string;
|
|
11
|
+
createdAt: string;
|
|
12
|
+
}
|
|
13
|
+
export interface DeviceRow {
|
|
14
|
+
id: string;
|
|
15
|
+
label: string | null;
|
|
16
|
+
instanceNonce: string;
|
|
17
|
+
enrollment: 'pending' | 'active' | 'suspended' | 'revoked';
|
|
18
|
+
enrolledAt: string;
|
|
19
|
+
suspendedReason: string | null;
|
|
20
|
+
}
|
|
21
|
+
export declare function identityPath(dataDir: string): string;
|
|
22
|
+
export declare function loadIdentity(dataDir: string): DeviceIdentityFile | null;
|
|
23
|
+
export declare function createIdentity(dataDir: string): DeviceIdentityFile;
|
|
24
|
+
export declare function loadOrCreateIdentity(dataDir: string): DeviceIdentityFile;
|
|
25
|
+
export declare function getDeviceRow(db: CairnDb, deviceId: string): DeviceRow | null;
|
|
26
|
+
export declare function registerDevice(db: CairnDb, identity: DeviceIdentityFile, label?: string): DeviceRow;
|
|
27
|
+
export interface CloneCheckResult {
|
|
28
|
+
/** true:身份与库一致,可正常写入。 */
|
|
29
|
+
ok: boolean;
|
|
30
|
+
/** 克隆证据:库中 nonce 与身份文件不一致(整目录复制)。 */
|
|
31
|
+
cloned: boolean;
|
|
32
|
+
device: DeviceRow | null;
|
|
33
|
+
}
|
|
34
|
+
export declare function checkCloneState(db: CairnDb, identity: DeviceIdentityFile): CloneCheckResult;
|
|
35
|
+
/**
|
|
36
|
+
* 克隆恢复:为当前副本生成全新设备身份并注册(旧身份保留为 suspended 证据)。
|
|
37
|
+
* 作用域收窄语义:旧设备产生的历史上行不会被撤回,由文档明确提示。
|
|
38
|
+
*/
|
|
39
|
+
export declare function reEnrollDevice(db: CairnDb, dataDir: string): {
|
|
40
|
+
old: DeviceIdentityFile;
|
|
41
|
+
identity: DeviceIdentityFile;
|
|
42
|
+
device: DeviceRow;
|
|
43
|
+
};
|
|
44
|
+
/** 写路径守卫:克隆或暂停状态下拒绝新写入(读不受影响)。 */
|
|
45
|
+
export declare function assertWritable(check: CloneCheckResult): void;
|
|
46
|
+
export declare function isDeviceClonedError(e: unknown): e is CairnError;
|
|
@@ -0,0 +1,111 @@
|
|
|
1
|
+
import { existsSync, readFileSync, writeFileSync, mkdirSync, renameSync } from 'node:fs';
|
|
2
|
+
import { join } from 'node:path';
|
|
3
|
+
import { randomBytes } from 'node:crypto';
|
|
4
|
+
import { err, CairnError } from '../core/errors.js';
|
|
5
|
+
import { nowIso } from '../core/time.js';
|
|
6
|
+
import { uuidv7 } from '../core/ids.js';
|
|
7
|
+
const IDENTITY_FILE = 'device.json';
|
|
8
|
+
export function identityPath(dataDir) {
|
|
9
|
+
return join(dataDir, IDENTITY_FILE);
|
|
10
|
+
}
|
|
11
|
+
export function loadIdentity(dataDir) {
|
|
12
|
+
const p = identityPath(dataDir);
|
|
13
|
+
if (!existsSync(p))
|
|
14
|
+
return null;
|
|
15
|
+
try {
|
|
16
|
+
const parsed = JSON.parse(readFileSync(p, 'utf8'));
|
|
17
|
+
if (typeof parsed.deviceId !== 'string' || typeof parsed.instanceNonce !== 'string')
|
|
18
|
+
return null;
|
|
19
|
+
return parsed;
|
|
20
|
+
}
|
|
21
|
+
catch {
|
|
22
|
+
return null;
|
|
23
|
+
}
|
|
24
|
+
}
|
|
25
|
+
export function createIdentity(dataDir) {
|
|
26
|
+
mkdirSync(dataDir, { recursive: true });
|
|
27
|
+
const identity = {
|
|
28
|
+
deviceId: `dev_${uuidv7()}`,
|
|
29
|
+
instanceNonce: randomBytes(16).toString('hex'),
|
|
30
|
+
createdAt: nowIso(),
|
|
31
|
+
};
|
|
32
|
+
writeFileSync(identityPath(dataDir), JSON.stringify(identity, null, 2), 'utf8');
|
|
33
|
+
return identity;
|
|
34
|
+
}
|
|
35
|
+
export function loadOrCreateIdentity(dataDir) {
|
|
36
|
+
return loadIdentity(dataDir) ?? createIdentity(dataDir);
|
|
37
|
+
}
|
|
38
|
+
export function getDeviceRow(db, deviceId) {
|
|
39
|
+
const row = db.get('SELECT * FROM device WHERE id = ?', deviceId);
|
|
40
|
+
return row ? mapDevice(row) : null;
|
|
41
|
+
}
|
|
42
|
+
function mapDevice(r) {
|
|
43
|
+
return {
|
|
44
|
+
id: r.id,
|
|
45
|
+
label: r.label ?? null,
|
|
46
|
+
instanceNonce: r.instance_nonce,
|
|
47
|
+
enrollment: r.enrollment,
|
|
48
|
+
enrolledAt: r.enrolled_at,
|
|
49
|
+
suspendedReason: r.suspended_reason ?? null,
|
|
50
|
+
};
|
|
51
|
+
}
|
|
52
|
+
export function registerDevice(db, identity, label) {
|
|
53
|
+
const existing = getDeviceRow(db, identity.deviceId);
|
|
54
|
+
if (existing)
|
|
55
|
+
return existing;
|
|
56
|
+
db.run('INSERT INTO device (id, label, instance_nonce, enrollment, enrolled_at) VALUES (?, ?, ?, ?, ?)', identity.deviceId, label ?? null, identity.instanceNonce, 'active', nowIso());
|
|
57
|
+
return getDeviceRow(db, identity.deviceId);
|
|
58
|
+
}
|
|
59
|
+
export function checkCloneState(db, identity) {
|
|
60
|
+
const device = getDeviceRow(db, identity.deviceId);
|
|
61
|
+
if (!device)
|
|
62
|
+
return { ok: true, cloned: false, device: null };
|
|
63
|
+
const cloned = device.instanceNonce !== identity.instanceNonce;
|
|
64
|
+
return { ok: !cloned && device.enrollment === 'active', cloned, device };
|
|
65
|
+
}
|
|
66
|
+
/**
|
|
67
|
+
* 克隆恢复:为当前副本生成全新设备身份并注册(旧身份保留为 suspended 证据)。
|
|
68
|
+
* 作用域收窄语义:旧设备产生的历史上行不会被撤回,由文档明确提示。
|
|
69
|
+
*/
|
|
70
|
+
export function reEnrollDevice(db, dataDir) {
|
|
71
|
+
const old = loadIdentity(dataDir);
|
|
72
|
+
if (!old)
|
|
73
|
+
throw err('E_DEVICE_SUSPENDED', '没有可重新登记的旧身份');
|
|
74
|
+
// 旧身份若还在库中且 nonce 一致,标记 suspended(克隆源暂停写入)
|
|
75
|
+
const oldRow = getDeviceRow(db, old.deviceId);
|
|
76
|
+
db.transaction(() => {
|
|
77
|
+
if (oldRow && oldRow.instanceNonce === old.instanceNonce && oldRow.enrollment === 'active') {
|
|
78
|
+
db.run("UPDATE device SET enrollment = 'suspended', suspended_reason = 're-enrolled: identity cloned or re-registered' WHERE id = ?", old.deviceId);
|
|
79
|
+
}
|
|
80
|
+
});
|
|
81
|
+
const backup = join(dataDir, `device.json.backup-${Date.now()}`);
|
|
82
|
+
if (existsSync(identityPath(dataDir))) {
|
|
83
|
+
try {
|
|
84
|
+
renameSync(identityPath(dataDir), backup);
|
|
85
|
+
}
|
|
86
|
+
catch {
|
|
87
|
+
/* 备份失败不阻塞重新登记 */
|
|
88
|
+
}
|
|
89
|
+
}
|
|
90
|
+
const identity = createIdentity(dataDir);
|
|
91
|
+
const device = registerDevice(db, identity);
|
|
92
|
+
return { old, identity, device };
|
|
93
|
+
}
|
|
94
|
+
/** 写路径守卫:克隆或暂停状态下拒绝新写入(读不受影响)。 */
|
|
95
|
+
export function assertWritable(check) {
|
|
96
|
+
if (check.cloned) {
|
|
97
|
+
throw err('E_DEVICE_CLONED', '检测到设备目录被克隆:旧身份写入已暂停;请运行 device re-enroll 生成独立身份', {
|
|
98
|
+
deviceId: check.device?.id,
|
|
99
|
+
});
|
|
100
|
+
}
|
|
101
|
+
if (check.device && check.device.enrollment === 'suspended') {
|
|
102
|
+
throw err('E_DEVICE_SUSPENDED', '设备处于暂停状态;请运行 device re-enroll 或恢复 enrollment');
|
|
103
|
+
}
|
|
104
|
+
if (check.device && check.device.enrollment === 'revoked') {
|
|
105
|
+
throw err('E_DEVICE_SUSPENDED', '设备登记已被吊销');
|
|
106
|
+
}
|
|
107
|
+
}
|
|
108
|
+
export function isDeviceClonedError(e) {
|
|
109
|
+
return e instanceof CairnError && (e.code === 'E_DEVICE_CLONED' || e.code === 'E_DEVICE_SUSPENDED');
|
|
110
|
+
}
|
|
111
|
+
//# sourceMappingURL=device.js.map
|