@opendatalabs/personal-server-ts-server 1.35.4 → 1.35.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.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"import-operations.d.ts","sourceRoot":"","sources":["../../src/storage/import-operations.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAC;AAC3C,OAAO,KAAK,EAGV,aAAa,EACb,mBAAmB,EACpB,MAAM,6CAA6C,CAAC;AACrD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qDAAqD,CAAC;AACxF,OAAO,EAEL,KAAK,uBAAuB,EAC7B,MAAM,yDAAyD,CAAC;AAajE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6CAA6C,CAAC;AAmBhF,wBAAgB,sBAAsB,CACpC,EAAE,EAAE,QAAQ,CAAC,QAAQ,EACrB,KAAK,EAAE,YAAY,EACnB,OAAO,EAAE,uBAAuB;
|
|
1
|
+
{"version":3,"file":"import-operations.d.ts","sourceRoot":"","sources":["../../src/storage/import-operations.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAC;AAC3C,OAAO,KAAK,EAGV,aAAa,EACb,mBAAmB,EACpB,MAAM,6CAA6C,CAAC;AACrD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qDAAqD,CAAC;AACxF,OAAO,EAEL,KAAK,uBAAuB,EAC7B,MAAM,yDAAyD,CAAC;AAajE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6CAA6C,CAAC;AAmBhF,wBAAgB,sBAAsB,CACpC,EAAE,EAAE,QAAQ,CAAC,QAAQ,EACrB,KAAK,EAAE,YAAY,EACnB,OAAO,EAAE,uBAAuB;6BAyJrB,aAAa,KACrB,OAAO,CAAC,mBAAmB,CAAC;uBA8IV,MAAM,GAAG,MAAM;IAqClC;;;;;;OAMG;+BAEM,MAAM,eACA,MAAM,SACZ,YAAY,GAClB,OAAO;IAkBV;;;;;OAKG;wCAEM,MAAM,eACA,MAAM,SACZ,YAAY,GAClB,OAAO;yBAyBD,MAAM,eACA,MAAM,gBACL,MAAM,GACnB,OAAO;4BAqBc,MAAM,GAAG,OAAO;EAS3C"}
|
|
@@ -3,7 +3,7 @@ import { buildDataFilePath, } from "@opendatalabs/personal-server-ts-core/storag
|
|
|
3
3
|
import { ProtocolError } from "@opendatalabs/personal-server-ts-core/errors";
|
|
4
4
|
import { IngestPersistedError } from "@opendatalabs/personal-server-ts-core/contracts";
|
|
5
5
|
import { deleteDataFileSync, deleteFirstSeenLedgerSync, deleteScopeFilesSync, publishDataFile, PublishedDataFileError, snapshotScopeFiles, } from "./hierarchy.js";
|
|
6
|
-
import { relative } from "node:path";
|
|
6
|
+
import { relative, resolve } from "node:path";
|
|
7
7
|
const keyWhere = "authority = @authority AND owner = @owner AND scope = @scope AND operation = @operation";
|
|
8
8
|
export function createImportOperations(db, index, options) {
|
|
9
9
|
const immediate = (run) => db.transaction(run).immediate();
|
|
@@ -27,51 +27,66 @@ export function createImportOperations(db, index, options) {
|
|
|
27
27
|
: undefined);
|
|
28
28
|
}
|
|
29
29
|
}
|
|
30
|
-
function recover() {
|
|
30
|
+
function recover(own, replicaPath) {
|
|
31
31
|
const rows = db
|
|
32
32
|
.prepare("SELECT * FROM owner_import_operations WHERE state = 'prepared' OR (state IN ('deleted', 'cancelled') AND metadata_json IS NOT NULL) ORDER BY rowid")
|
|
33
33
|
.all();
|
|
34
34
|
for (const row of rows) {
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
index.deleteByPath(row.path);
|
|
38
|
-
db.prepare(`UPDATE owner_import_operations SET envelope_bytes = NULL, metadata_json = NULL WHERE ${keyWhere}`).run(row);
|
|
39
|
-
continue;
|
|
35
|
+
try {
|
|
36
|
+
recoverRow(row);
|
|
40
37
|
}
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
schemaId: null,
|
|
50
|
-
path: row.path,
|
|
51
|
-
scope: row.scope,
|
|
52
|
-
collectedAt: row.collected_at,
|
|
53
|
-
sizeBytes: metadata.sizeBytes ?? written.sizeBytes,
|
|
54
|
-
afterTombstoneVersion: metadata.afterTombstoneVersion ?? null,
|
|
55
|
-
});
|
|
56
|
-
if (!inserted.ok) {
|
|
57
|
-
// The index closed this scope for writes (history unknown). Fail
|
|
58
|
-
// closed like an ordinary write: drop the unacknowledged operation
|
|
59
|
-
// so the caller can retry once the scope is repaired.
|
|
60
|
-
deleteDataFileSync(options, row.scope, row.collected_at, row.operation);
|
|
61
|
-
db.prepare(`DELETE FROM owner_import_operations WHERE ${keyWhere}`).run(row);
|
|
62
|
-
continue;
|
|
38
|
+
catch (error) {
|
|
39
|
+
if (row.path === replicaPath ||
|
|
40
|
+
(own &&
|
|
41
|
+
row.scope === own.scope &&
|
|
42
|
+
row.authority === own.authority &&
|
|
43
|
+
row.owner === own.owner &&
|
|
44
|
+
row.operation === own.operation)) {
|
|
45
|
+
throw error;
|
|
63
46
|
}
|
|
64
|
-
entry = inserted.entry;
|
|
65
47
|
}
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
function recoverRow(row) {
|
|
51
|
+
if (row.state !== "prepared") {
|
|
52
|
+
deleteDataFileSync(options, row.scope, row.collected_at, row.operation);
|
|
53
|
+
index.deleteByPath(row.path);
|
|
54
|
+
db.prepare(`UPDATE owner_import_operations SET envelope_bytes = NULL, metadata_json = NULL WHERE ${keyWhere}`).run(row);
|
|
55
|
+
return;
|
|
56
|
+
}
|
|
57
|
+
const bytes = row.envelope_bytes;
|
|
58
|
+
const envelope = JSON.parse(bytes.toString("utf8"));
|
|
59
|
+
const metadata = JSON.parse(row.metadata_json);
|
|
60
|
+
const written = publishDataFile(options, envelope, bytes, row.operation);
|
|
61
|
+
let entry = index.findByPath(row.path);
|
|
62
|
+
if (!entry) {
|
|
63
|
+
const inserted = index.insertIfCurrent({
|
|
64
|
+
fileId: null,
|
|
65
|
+
schemaId: null,
|
|
66
|
+
path: row.path,
|
|
69
67
|
scope: row.scope,
|
|
70
|
-
collectedAt:
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
68
|
+
collectedAt: row.collected_at,
|
|
69
|
+
sizeBytes: metadata.sizeBytes ?? written.sizeBytes,
|
|
70
|
+
afterTombstoneVersion: metadata.afterTombstoneVersion ?? null,
|
|
71
|
+
});
|
|
72
|
+
if (!inserted.ok) {
|
|
73
|
+
// The index closed this scope for writes (history unknown). Fail
|
|
74
|
+
// closed like an ordinary write: drop the unacknowledged operation
|
|
75
|
+
// so the caller can retry once the scope is repaired.
|
|
76
|
+
deleteDataFileSync(options, row.scope, row.collected_at, row.operation);
|
|
77
|
+
db.prepare(`DELETE FROM owner_import_operations WHERE ${keyWhere}`).run(row);
|
|
78
|
+
return;
|
|
79
|
+
}
|
|
80
|
+
entry = inserted.entry;
|
|
74
81
|
}
|
|
82
|
+
const receipt = {
|
|
83
|
+
operation: row.operation,
|
|
84
|
+
bodySha256: row.body_sha256,
|
|
85
|
+
scope: row.scope,
|
|
86
|
+
collectedAt: entry.collectedAt,
|
|
87
|
+
acceptedAt: new Date().toISOString(),
|
|
88
|
+
};
|
|
89
|
+
db.prepare(`UPDATE owner_import_operations SET state = 'accepted', receipt_json = @receipt, envelope_bytes = NULL, metadata_json = NULL WHERE ${keyWhere}`).run({ ...row, receipt: JSON.stringify(receipt) });
|
|
75
90
|
}
|
|
76
91
|
function reserve(envelope) {
|
|
77
92
|
// Ordinary writes keep a scope's collectedAt strictly increasing (see
|
|
@@ -102,7 +117,7 @@ export function createImportOperations(db, index, options) {
|
|
|
102
117
|
const admitted = immediate(() => {
|
|
103
118
|
const prior = find(command.envelope.scope, intent);
|
|
104
119
|
check(prior, intent);
|
|
105
|
-
recover();
|
|
120
|
+
recover(key(command.envelope.scope, intent));
|
|
106
121
|
if (prior)
|
|
107
122
|
return false;
|
|
108
123
|
const envelope = reserve(command.envelope);
|
|
@@ -119,7 +134,7 @@ export function createImportOperations(db, index, options) {
|
|
|
119
134
|
return true;
|
|
120
135
|
});
|
|
121
136
|
const published = immediate(() => {
|
|
122
|
-
recover();
|
|
137
|
+
recover(key(command.envelope.scope, intent));
|
|
123
138
|
const row = find(command.envelope.scope, intent);
|
|
124
139
|
// recover() dropped the operation: the scope is closed for writes.
|
|
125
140
|
// Report it after the drop commits; a throw here would roll it back.
|
|
@@ -154,7 +169,10 @@ export function createImportOperations(db, index, options) {
|
|
|
154
169
|
let publishedPath;
|
|
155
170
|
try {
|
|
156
171
|
return immediate(() => {
|
|
157
|
-
|
|
172
|
+
// A replica cannot reuse a path still owned by failed import cleanup.
|
|
173
|
+
recover(undefined, command.kind === "replica"
|
|
174
|
+
? relative(options.dataDir, buildDataFilePath(options.dataDir, command.envelope.scope, command.envelope.collectedAt))
|
|
175
|
+
: undefined);
|
|
158
176
|
const envelope = command.kind === "append"
|
|
159
177
|
? reserve(command.envelope)
|
|
160
178
|
: command.envelope;
|
|
@@ -219,7 +237,17 @@ export function createImportOperations(db, index, options) {
|
|
|
219
237
|
});
|
|
220
238
|
return immediate(() => {
|
|
221
239
|
recover();
|
|
222
|
-
|
|
240
|
+
// A replica can reuse a captured path between these transactions.
|
|
241
|
+
const captured = new Set(snapshot.entries.map(({ id }) => id));
|
|
242
|
+
const later = new Set(db
|
|
243
|
+
.prepare("SELECT id, path FROM data_files WHERE scope = ?")
|
|
244
|
+
.all(scope)
|
|
245
|
+
.filter(({ id }) => !captured.has(id))
|
|
246
|
+
.map(({ path }) => resolve(options.dataDir, path)));
|
|
247
|
+
deleteScopeFilesSync({
|
|
248
|
+
...snapshot.files,
|
|
249
|
+
files: snapshot.files.files.filter((file) => !later.has(file)),
|
|
250
|
+
});
|
|
223
251
|
const remove = db.prepare("DELETE FROM data_files WHERE id = @id AND path = @path");
|
|
224
252
|
for (const entry of snapshot.entries)
|
|
225
253
|
remove.run(entry);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"import-operations.js","sourceRoot":"","sources":["../../src/storage/import-operations.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"import-operations.js","sourceRoot":"","sources":["../../src/storage/import-operations.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@opendatalabs/personal-server-ts-server",
|
|
3
|
-
"version": "1.35.
|
|
3
|
+
"version": "1.35.5",
|
|
4
4
|
"description": "Hono HTTP server for the Vana Personal Server — routes, middleware, composition root",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"repository": {
|
|
@@ -55,8 +55,8 @@
|
|
|
55
55
|
},
|
|
56
56
|
"dependencies": {
|
|
57
57
|
"@hono/node-server": "^1.19.17",
|
|
58
|
-
"@opendatalabs/personal-server-ts-core": "1.35.
|
|
59
|
-
"@opendatalabs/personal-server-ts-lite": "1.35.
|
|
58
|
+
"@opendatalabs/personal-server-ts-core": "1.35.5",
|
|
59
|
+
"@opendatalabs/personal-server-ts-lite": "1.35.5",
|
|
60
60
|
"@opendatalabs/vana-sdk": "3.23.0-pr.211.36da1d8",
|
|
61
61
|
"ajv": "^8.20.0",
|
|
62
62
|
"better-sqlite3": "^12.11.1",
|