@backendkit-labs/agent-core 0.44.0 → 0.46.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/README.md +5 -3
- package/dist/engine/AgentEngine.d.ts +5 -0
- package/dist/engine/AgentEngine.d.ts.map +1 -1
- package/dist/engine/AgentEngine.js +56 -3
- package/dist/engine/AgentEngine.js.map +1 -1
- package/dist/engine/toolSearch.d.ts +18 -0
- package/dist/engine/toolSearch.d.ts.map +1 -0
- package/dist/engine/toolSearch.js +72 -0
- package/dist/engine/toolSearch.js.map +1 -0
- package/dist/flow/adapter.d.ts +4 -1
- package/dist/flow/adapter.d.ts.map +1 -1
- package/dist/flow/adapter.js +14 -1
- package/dist/flow/adapter.js.map +1 -1
- package/dist/flow/file-journal.d.ts +12 -0
- package/dist/flow/file-journal.d.ts.map +1 -1
- package/dist/flow/file-journal.js +52 -15
- package/dist/flow/file-journal.js.map +1 -1
- package/dist/flow/host.d.ts +13 -0
- package/dist/flow/host.d.ts.map +1 -1
- package/dist/flow/host.js +56 -6
- package/dist/flow/host.js.map +1 -1
- package/dist/flow/index.d.ts +4 -2
- package/dist/flow/index.d.ts.map +1 -1
- package/dist/flow/index.js +6 -1
- package/dist/flow/index.js.map +1 -1
- package/dist/flow/journal.d.ts +13 -0
- package/dist/flow/journal.d.ts.map +1 -1
- package/dist/flow/journal.js +24 -1
- package/dist/flow/journal.js.map +1 -1
- package/dist/flow/ndjson-journal.d.ts +46 -0
- package/dist/flow/ndjson-journal.d.ts.map +1 -0
- package/dist/flow/ndjson-journal.js +311 -0
- package/dist/flow/ndjson-journal.js.map +1 -0
- package/dist/flow/run.d.ts.map +1 -1
- package/dist/flow/run.js +53 -5
- package/dist/flow/run.js.map +1 -1
- package/dist/flow/tools.d.ts +4 -0
- package/dist/flow/tools.d.ts.map +1 -1
- package/dist/flow/tools.js +25 -0
- package/dist/flow/tools.js.map +1 -1
- package/dist/index.d.ts +2 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +5 -2
- package/dist/index.js.map +1 -1
- package/dist/testing/index.d.ts +3 -0
- package/dist/testing/index.d.ts.map +1 -0
- package/dist/testing/index.js +7 -0
- package/dist/testing/index.js.map +1 -0
- package/dist/testing/journalConformance.d.ts +39 -0
- package/dist/testing/journalConformance.d.ts.map +1 -0
- package/dist/testing/journalConformance.js +286 -0
- package/dist/testing/journalConformance.js.map +1 -0
- package/dist/tools/defineTool.d.ts +2 -0
- package/dist/tools/defineTool.d.ts.map +1 -1
- package/dist/tools/defineTool.js +1 -0
- package/dist/tools/defineTool.js.map +1 -1
- package/dist/types/index.d.ts +11 -0
- package/dist/types/index.d.ts.map +1 -1
- package/package.json +103 -94
package/dist/flow/journal.d.ts
CHANGED
|
@@ -66,6 +66,19 @@ export interface RunJournal {
|
|
|
66
66
|
tenantId?: string;
|
|
67
67
|
}): Promise<JournalRun[]>;
|
|
68
68
|
}
|
|
69
|
+
/** The journal of a run is damaged or was edited: it is not believed (SPEC-0024). The other runs are still served. */
|
|
70
|
+
export declare class JournalCorrupt extends Error {
|
|
71
|
+
readonly runId: string;
|
|
72
|
+
constructor(runId: string, message: string);
|
|
73
|
+
}
|
|
74
|
+
/**
|
|
75
|
+
* Someone else wrote to the run, or it is held by someone else: this writer is no longer the one in charge and must stop without
|
|
76
|
+
* writing more. `runFlow` takes it as the claim lost.
|
|
77
|
+
*/
|
|
78
|
+
export declare class JournalConflict extends Error {
|
|
79
|
+
readonly runId: string;
|
|
80
|
+
constructor(runId: string, message: string);
|
|
81
|
+
}
|
|
69
82
|
export type JournalEvent = {
|
|
70
83
|
kind: 'begin';
|
|
71
84
|
at: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"journal.d.ts","sourceRoot":"","sources":["../../src/flow/journal.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"journal.d.ts","sourceRoot":"","sources":["../../src/flow/journal.ts"],"names":[],"mappings":"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"}
|
package/dist/flow/journal.js
CHANGED
|
@@ -1,8 +1,31 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.MemoryRunJournal = void 0;
|
|
3
|
+
exports.MemoryRunJournal = exports.JournalConflict = exports.JournalCorrupt = void 0;
|
|
4
4
|
exports.foldEvents = foldEvents;
|
|
5
5
|
exports.matches = matches;
|
|
6
|
+
/** The journal of a run is damaged or was edited: it is not believed (SPEC-0024). The other runs are still served. */
|
|
7
|
+
class JournalCorrupt extends Error {
|
|
8
|
+
runId;
|
|
9
|
+
constructor(runId, message) {
|
|
10
|
+
super(`journal of "${runId}": ${message}`);
|
|
11
|
+
this.runId = runId;
|
|
12
|
+
this.name = 'JournalCorrupt';
|
|
13
|
+
}
|
|
14
|
+
}
|
|
15
|
+
exports.JournalCorrupt = JournalCorrupt;
|
|
16
|
+
/**
|
|
17
|
+
* Someone else wrote to the run, or it is held by someone else: this writer is no longer the one in charge and must stop without
|
|
18
|
+
* writing more. `runFlow` takes it as the claim lost.
|
|
19
|
+
*/
|
|
20
|
+
class JournalConflict extends Error {
|
|
21
|
+
runId;
|
|
22
|
+
constructor(runId, message) {
|
|
23
|
+
super(message);
|
|
24
|
+
this.runId = runId;
|
|
25
|
+
this.name = 'JournalConflict';
|
|
26
|
+
}
|
|
27
|
+
}
|
|
28
|
+
exports.JournalConflict = JournalConflict;
|
|
6
29
|
const TERMINAL = ['done', 'failed', 'cancelled'];
|
|
7
30
|
function foldEvents(events) {
|
|
8
31
|
let run;
|
package/dist/flow/journal.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"journal.js","sourceRoot":"","sources":["../../src/flow/journal.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"journal.js","sourceRoot":"","sources":["../../src/flow/journal.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,46 @@
|
|
|
1
|
+
import type { JournalRun, JournalRunStatus, NewJournalRun, RunJournal, RunPatch, StepPatch } from './journal';
|
|
2
|
+
export interface NdjsonRunJournalOptions {
|
|
3
|
+
/** Key of the chain. Without it the chain is a plain SHA-256 (damage is detected, tampering is not). */
|
|
4
|
+
key?: Buffer;
|
|
5
|
+
/** `always` (default): `fsync` after every event. `never`: for tests and for disks where it is too slow. */
|
|
6
|
+
fsync?: 'always' | 'never';
|
|
7
|
+
}
|
|
8
|
+
export declare class NdjsonRunJournal implements RunJournal {
|
|
9
|
+
private readonly dir;
|
|
10
|
+
private readonly tails;
|
|
11
|
+
private readonly chains;
|
|
12
|
+
/** Runs that failed their check, by run id, with why: they are left out of `list`. The people who operate the node should know. */
|
|
13
|
+
readonly problems: Map<string, string>;
|
|
14
|
+
private readonly seen;
|
|
15
|
+
private readonly key?;
|
|
16
|
+
private readonly sync;
|
|
17
|
+
constructor(dir: string, opts?: NdjsonRunJournalOptions);
|
|
18
|
+
begin(run: NewJournalRun): Promise<void>;
|
|
19
|
+
step(runId: string, stepId: string, patch: StepPatch): Promise<void>;
|
|
20
|
+
update(runId: string, patch: RunPatch): Promise<void>;
|
|
21
|
+
claim(runId: string, owner: string, _ttlMs: number): Promise<(() => Promise<void>) | null>;
|
|
22
|
+
get(runId: string): Promise<JournalRun | undefined>;
|
|
23
|
+
list(filter?: {
|
|
24
|
+
status?: JournalRunStatus[];
|
|
25
|
+
flow?: string;
|
|
26
|
+
tenantId?: string;
|
|
27
|
+
}): Promise<JournalRun[]>;
|
|
28
|
+
private file;
|
|
29
|
+
private lockFile;
|
|
30
|
+
private mac;
|
|
31
|
+
/** Reads the file, checks every line and returns the events and where the good part ends. A last line with no newline is dropped. */
|
|
32
|
+
private read;
|
|
33
|
+
private hasAcknowledged;
|
|
34
|
+
/** The writes of one run go one after another in this process (`runFlow` writes from many steps at once), and a failed one does not stop the next. */
|
|
35
|
+
private append;
|
|
36
|
+
private appendNow;
|
|
37
|
+
/** So that a file just created is still there after a power cut. Not every system lets a directory be synced (Windows does not): then it is skipped. */
|
|
38
|
+
private syncDirectory;
|
|
39
|
+
private readLock;
|
|
40
|
+
/**
|
|
41
|
+
* Is the holder of the lock gone? The same pid with another token is the process that ran before this one: gone. Any other pid is asked
|
|
42
|
+
* whether it still exists. A lock nobody can read is not held by anybody.
|
|
43
|
+
*/
|
|
44
|
+
private holderIsGone;
|
|
45
|
+
}
|
|
46
|
+
//# sourceMappingURL=ndjson-journal.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ndjson-journal.d.ts","sourceRoot":"","sources":["../../src/flow/ndjson-journal.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAgB,UAAU,EAAE,gBAAgB,EAAE,aAAa,EAAE,UAAU,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AA0B5H,MAAM,WAAW,uBAAuB;IACpC,wGAAwG;IACxG,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,4GAA4G;IAC5G,KAAK,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC;CAC9B;AAED,qBAAa,gBAAiB,YAAW,UAAU;IASnC,OAAO,CAAC,QAAQ,CAAC,GAAG;IARhC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAA2B;IACjD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAoC;IAC3D,mIAAmI;IACnI,QAAQ,CAAC,QAAQ,sBAA6B;IAC9C,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAwD;IAC7E,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAS;IAC9B,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAU;gBAEF,GAAG,EAAE,MAAM,EAAE,IAAI,GAAE,uBAA4B;IAQtE,KAAK,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAiBxC,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;IAIpE,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAIrD,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC;IAwB1F,GAAG,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC;IAKnD,IAAI,CAAC,MAAM,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,gBAAgB,EAAE,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC;IA4B7G,OAAO,CAAC,IAAI;IAIZ,OAAO,CAAC,QAAQ;IAEhB,OAAO,CAAC,GAAG;IAKX,qIAAqI;IACrI,OAAO,CAAC,IAAI;IA0BZ,OAAO,CAAC,eAAe;IAIvB,sJAAsJ;IACtJ,OAAO,CAAC,MAAM;IAUd,OAAO,CAAC,SAAS;IAwBjB,wJAAwJ;IACxJ,OAAO,CAAC,aAAa;IAKrB,OAAO,CAAC,QAAQ;IAIhB;;;OAGG;IACH,OAAO,CAAC,YAAY;CAQvB"}
|
|
@@ -0,0 +1,311 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.NdjsonRunJournal = void 0;
|
|
4
|
+
const node_crypto_1 = require("node:crypto");
|
|
5
|
+
const node_fs_1 = require("node:fs");
|
|
6
|
+
const node_path_1 = require("node:path");
|
|
7
|
+
const journal_1 = require("./journal");
|
|
8
|
+
/**
|
|
9
|
+
* A run journal with one file per run, `<runId>.ndjson`, one line per event (SPEC-0024). The design of the journal of Steward, in the SDK:
|
|
10
|
+
*
|
|
11
|
+
* - **Append only and chained.** Each line is `{ n, event, mac }` and its `mac` covers the line before it (HMAC-SHA256 with `key`, or a plain
|
|
12
|
+
* SHA-256 without one: that detects damage, not someone who can rewrite the whole file). A line that is removed, changed or inserted breaks the
|
|
13
|
+
* chain and the run is `JournalCorrupt`: it is not believed, and the other runs are still served (`problems` says which).
|
|
14
|
+
* - **Each event is one write** with `O_APPEND` followed by `fsync`: `step` returns when it is on disk. A process that dies in the middle of a write
|
|
15
|
+
* leaves a last line with no newline; it was never acknowledged, so it is ignored when reading and cut off before the next write.
|
|
16
|
+
* - **One writer per run.** The writes of a run go one after another within the process, and before each one the size of the file is compared with
|
|
17
|
+
* what this writer wrote: if it differs, somebody else wrote and this writer stops (`JournalConflict`) instead of interleaving with them.
|
|
18
|
+
* - **The claim is a lock file** (`<runId>.lock`, created exclusively) with the pid of the process and a token that is new in every process. A holder
|
|
19
|
+
* that is gone is relieved at once, with no TTL to wait for; one that is alive is respected, however long it takes. `ttlMs` is ignored and the
|
|
20
|
+
* claim needs no renewal. It needs the processes to share a host: for runs shared across machines use RedisRunJournal.
|
|
21
|
+
*
|
|
22
|
+
* It stores the outputs of the steps as they are: the files are as sensitive as the data, so they are created readable by the owner only.
|
|
23
|
+
*/
|
|
24
|
+
const SAFE_ID = /^[A-Za-z0-9][A-Za-z0-9_-]{0,127}$/;
|
|
25
|
+
const ZERO = '0'.repeat(64);
|
|
26
|
+
/** Who this process is, for the locks. A pid alone is not enough: in a container node is often the same pid every time, so a lock left by the process that ran before would look like ours. */
|
|
27
|
+
const PROCESS_TOKEN = (0, node_crypto_1.randomUUID)();
|
|
28
|
+
class NdjsonRunJournal {
|
|
29
|
+
dir;
|
|
30
|
+
tails = new Map();
|
|
31
|
+
chains = new Map();
|
|
32
|
+
/** Runs that failed their check, by run id, with why: they are left out of `list`. The people who operate the node should know. */
|
|
33
|
+
problems = new Map();
|
|
34
|
+
seen = new Map();
|
|
35
|
+
key;
|
|
36
|
+
sync;
|
|
37
|
+
constructor(dir, opts = {}) {
|
|
38
|
+
this.dir = dir;
|
|
39
|
+
this.key = opts.key;
|
|
40
|
+
this.sync = (opts.fsync ?? 'always') === 'always';
|
|
41
|
+
(0, node_fs_1.mkdirSync)(dir, { recursive: true });
|
|
42
|
+
}
|
|
43
|
+
// ── RunJournal ───────────────────────────────────────────────────────────
|
|
44
|
+
async begin(run) {
|
|
45
|
+
const path = this.file(run.runId);
|
|
46
|
+
const event = { kind: 'begin', at: new Date().toISOString(), run };
|
|
47
|
+
const mac = this.mac(ZERO, 0, event);
|
|
48
|
+
const line = `${JSON.stringify({ n: 0, event, mac })}\n`;
|
|
49
|
+
let fd;
|
|
50
|
+
try {
|
|
51
|
+
fd = (0, node_fs_1.openSync)(path, 'wx', 0o600);
|
|
52
|
+
}
|
|
53
|
+
catch (err) {
|
|
54
|
+
if (err.code !== 'EEXIST')
|
|
55
|
+
throw err;
|
|
56
|
+
// A file with nothing acknowledged in it (the process died between creating it and writing the first line) is not a run.
|
|
57
|
+
if (!this.hasAcknowledged(run.runId)) {
|
|
58
|
+
try {
|
|
59
|
+
(0, node_fs_1.unlinkSync)(path);
|
|
60
|
+
}
|
|
61
|
+
catch { /* taken first by another */ }
|
|
62
|
+
return this.begin(run);
|
|
63
|
+
}
|
|
64
|
+
throw new Error(`run "${run.runId}" already exists`);
|
|
65
|
+
}
|
|
66
|
+
try {
|
|
67
|
+
(0, node_fs_1.writeSync)(fd, line);
|
|
68
|
+
if (this.sync)
|
|
69
|
+
(0, node_fs_1.fsyncSync)(fd);
|
|
70
|
+
}
|
|
71
|
+
finally {
|
|
72
|
+
(0, node_fs_1.closeSync)(fd);
|
|
73
|
+
}
|
|
74
|
+
this.syncDirectory();
|
|
75
|
+
this.tails.set(run.runId, { n: 0, mac, size: Buffer.byteLength(line, 'utf8') });
|
|
76
|
+
}
|
|
77
|
+
async step(runId, stepId, patch) {
|
|
78
|
+
await this.append(runId, () => ({ kind: 'step', at: new Date().toISOString(), stepId, patch }));
|
|
79
|
+
}
|
|
80
|
+
async update(runId, patch) {
|
|
81
|
+
await this.append(runId, () => ({ kind: 'update', at: new Date().toISOString(), patch }));
|
|
82
|
+
}
|
|
83
|
+
async claim(runId, owner, _ttlMs) {
|
|
84
|
+
this.file(runId); // validates the id
|
|
85
|
+
const path = this.lockFile(runId);
|
|
86
|
+
const release = async () => {
|
|
87
|
+
const held = this.readLock(path);
|
|
88
|
+
if (held?.token === PROCESS_TOKEN && held.owner === owner) {
|
|
89
|
+
try {
|
|
90
|
+
(0, node_fs_1.unlinkSync)(path);
|
|
91
|
+
}
|
|
92
|
+
catch { /* already gone */ }
|
|
93
|
+
}
|
|
94
|
+
};
|
|
95
|
+
for (let attempt = 0; attempt < 2; attempt++) {
|
|
96
|
+
try {
|
|
97
|
+
const fd = (0, node_fs_1.openSync)(path, 'wx', 0o600);
|
|
98
|
+
try {
|
|
99
|
+
(0, node_fs_1.writeSync)(fd, JSON.stringify({ owner, pid: process.pid, token: PROCESS_TOKEN, at: new Date().toISOString() }));
|
|
100
|
+
}
|
|
101
|
+
finally {
|
|
102
|
+
(0, node_fs_1.closeSync)(fd);
|
|
103
|
+
}
|
|
104
|
+
return release;
|
|
105
|
+
}
|
|
106
|
+
catch (err) {
|
|
107
|
+
if (err.code !== 'EEXIST')
|
|
108
|
+
throw err;
|
|
109
|
+
const held = this.readLock(path);
|
|
110
|
+
// Ours: the same owner asking again is a renewal (it holds, nothing to write); another owner in this process is refused.
|
|
111
|
+
if (held?.token === PROCESS_TOKEN)
|
|
112
|
+
return held.owner === owner ? release : null;
|
|
113
|
+
if (!this.holderIsGone(held))
|
|
114
|
+
return null;
|
|
115
|
+
try {
|
|
116
|
+
(0, node_fs_1.unlinkSync)(path);
|
|
117
|
+
}
|
|
118
|
+
catch { /* another process relieved it first: look again */ }
|
|
119
|
+
}
|
|
120
|
+
}
|
|
121
|
+
return null;
|
|
122
|
+
}
|
|
123
|
+
async get(runId) {
|
|
124
|
+
const r = this.read(runId);
|
|
125
|
+
return r ? (0, journal_1.foldEvents)(r.events) : undefined;
|
|
126
|
+
}
|
|
127
|
+
async list(filter) {
|
|
128
|
+
const out = [];
|
|
129
|
+
for (const name of (0, node_fs_1.readdirSync)(this.dir)) {
|
|
130
|
+
if (!name.endsWith('.ndjson'))
|
|
131
|
+
continue;
|
|
132
|
+
const id = name.slice(0, -'.ndjson'.length);
|
|
133
|
+
if (!SAFE_ID.test(id))
|
|
134
|
+
continue;
|
|
135
|
+
let run;
|
|
136
|
+
const size = (0, node_fs_1.statSync)((0, node_path_1.join)(this.dir, name)).size;
|
|
137
|
+
const known = this.seen.get(id);
|
|
138
|
+
if (known && known.size === size)
|
|
139
|
+
run = known.run;
|
|
140
|
+
else {
|
|
141
|
+
try {
|
|
142
|
+
const r = this.read(id);
|
|
143
|
+
run = r ? (0, journal_1.foldEvents)(r.events) : undefined;
|
|
144
|
+
this.problems.delete(id);
|
|
145
|
+
if (run)
|
|
146
|
+
this.seen.set(id, { size, run });
|
|
147
|
+
}
|
|
148
|
+
catch (err) {
|
|
149
|
+
if (err instanceof journal_1.JournalCorrupt) {
|
|
150
|
+
this.problems.set(id, err.message);
|
|
151
|
+
continue;
|
|
152
|
+
}
|
|
153
|
+
throw err;
|
|
154
|
+
}
|
|
155
|
+
}
|
|
156
|
+
if (run && (0, journal_1.matches)(run, filter))
|
|
157
|
+
out.push(run);
|
|
158
|
+
}
|
|
159
|
+
return out.sort((a, b) => a.startedAt.localeCompare(b.startedAt));
|
|
160
|
+
}
|
|
161
|
+
// ── internals ────────────────────────────────────────────────────────────
|
|
162
|
+
file(runId) {
|
|
163
|
+
if (!SAFE_ID.test(runId))
|
|
164
|
+
throw new Error(`invalid run id "${runId}"`);
|
|
165
|
+
return (0, node_path_1.join)(this.dir, `${runId}.ndjson`);
|
|
166
|
+
}
|
|
167
|
+
lockFile(runId) { return (0, node_path_1.join)(this.dir, `${runId}.lock`); }
|
|
168
|
+
mac(prev, n, event) {
|
|
169
|
+
const text = `${prev}\n${JSON.stringify({ n, event })}`;
|
|
170
|
+
return this.key ? (0, node_crypto_1.createHmac)('sha256', this.key).update(text).digest('hex') : (0, node_crypto_1.createHash)('sha256').update(text).digest('hex');
|
|
171
|
+
}
|
|
172
|
+
/** Reads the file, checks every line and returns the events and where the good part ends. A last line with no newline is dropped. */
|
|
173
|
+
read(runId) {
|
|
174
|
+
const path = this.file(runId);
|
|
175
|
+
if (!(0, node_fs_1.existsSync)(path))
|
|
176
|
+
return undefined;
|
|
177
|
+
const lines = (0, node_fs_1.readFileSync)(path, 'utf8').split('\n');
|
|
178
|
+
const finalLine = lines.length - 1; // what follows the last newline: empty when the file ended cleanly
|
|
179
|
+
const events = [];
|
|
180
|
+
let prev = ZERO;
|
|
181
|
+
let good = 0;
|
|
182
|
+
let torn = false;
|
|
183
|
+
for (let i = 0; i < lines.length; i++) {
|
|
184
|
+
const row = lines[i];
|
|
185
|
+
if (row === '') {
|
|
186
|
+
if (i < finalLine)
|
|
187
|
+
throw new journal_1.JournalCorrupt(runId, `line ${i + 1} is empty: the journal was damaged or edited`);
|
|
188
|
+
continue;
|
|
189
|
+
}
|
|
190
|
+
if (i === finalLine) {
|
|
191
|
+
torn = true;
|
|
192
|
+
break;
|
|
193
|
+
} // never acknowledged: one write carries the line and its newline
|
|
194
|
+
let parsed;
|
|
195
|
+
try {
|
|
196
|
+
parsed = JSON.parse(row);
|
|
197
|
+
}
|
|
198
|
+
catch {
|
|
199
|
+
throw new journal_1.JournalCorrupt(runId, `line ${i + 1} is not readable: the journal was damaged or edited`);
|
|
200
|
+
}
|
|
201
|
+
if (parsed.n !== events.length || parsed.mac !== this.mac(prev, parsed.n, parsed.event)) {
|
|
202
|
+
throw new journal_1.JournalCorrupt(runId, `line ${i + 1} does not follow the one before it: the journal was altered (a line removed, changed or added)`);
|
|
203
|
+
}
|
|
204
|
+
events.push(parsed.event);
|
|
205
|
+
prev = parsed.mac;
|
|
206
|
+
good += Buffer.byteLength(row, 'utf8') + 1;
|
|
207
|
+
}
|
|
208
|
+
return { events, tail: { n: events.length - 1, mac: prev, size: good }, torn };
|
|
209
|
+
}
|
|
210
|
+
hasAcknowledged(runId) {
|
|
211
|
+
try {
|
|
212
|
+
return (this.read(runId)?.events.length ?? 0) > 0;
|
|
213
|
+
}
|
|
214
|
+
catch {
|
|
215
|
+
return true;
|
|
216
|
+
} // a corrupt file is somebody's evidence: leave it
|
|
217
|
+
}
|
|
218
|
+
/** The writes of one run go one after another in this process (`runFlow` writes from many steps at once), and a failed one does not stop the next. */
|
|
219
|
+
append(runId, make) {
|
|
220
|
+
this.file(runId);
|
|
221
|
+
const previous = this.chains.get(runId) ?? Promise.resolve();
|
|
222
|
+
const result = previous.then(() => this.appendNow(runId, make()));
|
|
223
|
+
const tail = result.catch(() => undefined);
|
|
224
|
+
this.chains.set(runId, tail);
|
|
225
|
+
void tail.then(() => { if (this.chains.get(runId) === tail)
|
|
226
|
+
this.chains.delete(runId); });
|
|
227
|
+
return result;
|
|
228
|
+
}
|
|
229
|
+
appendNow(runId, event) {
|
|
230
|
+
const path = this.file(runId);
|
|
231
|
+
let tail = this.tails.get(runId);
|
|
232
|
+
if (!tail) {
|
|
233
|
+
// First write from this process: read the file, check it and cut off a last line that was left half written (the writer is whoever holds the claim).
|
|
234
|
+
const r = this.read(runId);
|
|
235
|
+
if (!r)
|
|
236
|
+
throw new Error(`run "${runId}" does not exist`);
|
|
237
|
+
if ((0, node_fs_1.statSync)(path).size !== r.tail.size)
|
|
238
|
+
(0, node_fs_1.truncateSync)(path, r.tail.size);
|
|
239
|
+
tail = r.tail;
|
|
240
|
+
this.tails.set(runId, tail);
|
|
241
|
+
}
|
|
242
|
+
if (!(0, node_fs_1.existsSync)(path)) {
|
|
243
|
+
this.tails.delete(runId);
|
|
244
|
+
throw new Error(`run "${runId}" does not exist`);
|
|
245
|
+
}
|
|
246
|
+
if ((0, node_fs_1.statSync)(path).size !== tail.size) {
|
|
247
|
+
this.tails.delete(runId);
|
|
248
|
+
throw new journal_1.JournalConflict(runId, `the journal of "${runId}" changed under this writer: someone else wrote to it`);
|
|
249
|
+
}
|
|
250
|
+
const n = tail.n + 1;
|
|
251
|
+
const mac = this.mac(tail.mac, n, event);
|
|
252
|
+
const line = `${JSON.stringify({ n, event, mac })}\n`;
|
|
253
|
+
const fd = (0, node_fs_1.openSync)(path, 'a');
|
|
254
|
+
try {
|
|
255
|
+
(0, node_fs_1.writeSync)(fd, line);
|
|
256
|
+
if (this.sync)
|
|
257
|
+
(0, node_fs_1.fsyncSync)(fd);
|
|
258
|
+
}
|
|
259
|
+
finally {
|
|
260
|
+
(0, node_fs_1.closeSync)(fd);
|
|
261
|
+
}
|
|
262
|
+
this.tails.set(runId, { n, mac, size: tail.size + Buffer.byteLength(line, 'utf8') });
|
|
263
|
+
}
|
|
264
|
+
/** So that a file just created is still there after a power cut. Not every system lets a directory be synced (Windows does not): then it is skipped. */
|
|
265
|
+
syncDirectory() {
|
|
266
|
+
if (!this.sync)
|
|
267
|
+
return;
|
|
268
|
+
try {
|
|
269
|
+
const fd = (0, node_fs_1.openSync)(this.dir, 'r');
|
|
270
|
+
try {
|
|
271
|
+
(0, node_fs_1.fsyncSync)(fd);
|
|
272
|
+
}
|
|
273
|
+
finally {
|
|
274
|
+
(0, node_fs_1.closeSync)(fd);
|
|
275
|
+
}
|
|
276
|
+
}
|
|
277
|
+
catch { /* not supported here */ }
|
|
278
|
+
}
|
|
279
|
+
readLock(path) {
|
|
280
|
+
try {
|
|
281
|
+
return JSON.parse((0, node_fs_1.readFileSync)(path, 'utf8'));
|
|
282
|
+
}
|
|
283
|
+
catch {
|
|
284
|
+
return undefined;
|
|
285
|
+
}
|
|
286
|
+
}
|
|
287
|
+
/**
|
|
288
|
+
* Is the holder of the lock gone? The same pid with another token is the process that ran before this one: gone. Any other pid is asked
|
|
289
|
+
* whether it still exists. A lock nobody can read is not held by anybody.
|
|
290
|
+
*/
|
|
291
|
+
holderIsGone(held) {
|
|
292
|
+
if (!held)
|
|
293
|
+
return true;
|
|
294
|
+
const pid = held.pid;
|
|
295
|
+
if (typeof pid !== 'number' || !Number.isInteger(pid))
|
|
296
|
+
return true;
|
|
297
|
+
if (held.token === PROCESS_TOKEN)
|
|
298
|
+
return false;
|
|
299
|
+
if (pid === process.pid)
|
|
300
|
+
return true;
|
|
301
|
+
try {
|
|
302
|
+
process.kill(pid, 0);
|
|
303
|
+
return false;
|
|
304
|
+
}
|
|
305
|
+
catch (err) {
|
|
306
|
+
return err.code === 'ESRCH';
|
|
307
|
+
}
|
|
308
|
+
}
|
|
309
|
+
}
|
|
310
|
+
exports.NdjsonRunJournal = NdjsonRunJournal;
|
|
311
|
+
//# sourceMappingURL=ndjson-journal.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ndjson-journal.js","sourceRoot":"","sources":["../../src/flow/ndjson-journal.ts"],"names":[],"mappings":"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"}
|
package/dist/flow/run.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../src/flow/run.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,KAAK,EAAE,cAAc,EAAE,QAAQ,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AACxE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,WAAW,CAAC;AAIpD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAChD,OAAO,KAAK,EAAE,UAAU,EAAc,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../src/flow/run.ts"],"names":[],"mappings":"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"}
|
package/dist/flow/run.js
CHANGED
|
@@ -5,6 +5,7 @@ exports.runFlow = runFlow;
|
|
|
5
5
|
const interpolate_1 = require("./interpolate");
|
|
6
6
|
const approval_1 = require("./approval");
|
|
7
7
|
const condition_1 = require("./condition");
|
|
8
|
+
const journal_1 = require("./journal");
|
|
8
9
|
/** Another process holds the claim of the run. */
|
|
9
10
|
class FlowClaimError extends Error {
|
|
10
11
|
runId;
|
|
@@ -17,6 +18,16 @@ class FlowClaimError extends Error {
|
|
|
17
18
|
exports.FlowClaimError = FlowClaimError;
|
|
18
19
|
const DEFAULT_MAX_CONCURRENCY = 8;
|
|
19
20
|
const DEFAULT_CLAIM_TTL_MS = 10 * 60_000;
|
|
21
|
+
/** How long the end of a run waits for a renewal that is still in flight before it frees the claim anyway. */
|
|
22
|
+
const RENEWAL_SETTLE_MS = 5_000;
|
|
23
|
+
/** Resolves when `p` settles or after `ms`, whichever comes first. */
|
|
24
|
+
function waitAtMost(p, ms) {
|
|
25
|
+
return new Promise(resolve => {
|
|
26
|
+
const t = setTimeout(resolve, ms);
|
|
27
|
+
t.unref?.();
|
|
28
|
+
p.then(() => { clearTimeout(t); resolve(); }, () => { clearTimeout(t); resolve(); });
|
|
29
|
+
});
|
|
30
|
+
}
|
|
20
31
|
const PREVIEW_CHARS = 200;
|
|
21
32
|
async function runFlow(def, opts) {
|
|
22
33
|
const runId = opts.runId ?? `run-${Date.now()}-${Math.random().toString(36).slice(2, 8)}`;
|
|
@@ -40,11 +51,13 @@ async function runFlow(def, opts) {
|
|
|
40
51
|
opts.signal?.addEventListener('abort', forward, { once: true });
|
|
41
52
|
const renewMs = opts.claimRenewMs ?? Math.floor(ttl / 3);
|
|
42
53
|
let renewing = false;
|
|
54
|
+
/** The renewal in flight, if any. It never rejects. */
|
|
55
|
+
let renewal;
|
|
43
56
|
const timer = renewMs > 0 ? setInterval(() => {
|
|
44
57
|
if (renewing)
|
|
45
58
|
return;
|
|
46
59
|
renewing = true;
|
|
47
|
-
journal.claim(runId, owner, ttl)
|
|
60
|
+
renewal = journal.claim(runId, owner, ttl)
|
|
48
61
|
.then(next => { if (next)
|
|
49
62
|
release = next;
|
|
50
63
|
else {
|
|
@@ -55,8 +68,11 @@ async function runFlow(def, opts) {
|
|
|
55
68
|
.finally(() => { renewing = false; });
|
|
56
69
|
}, renewMs) : undefined;
|
|
57
70
|
timer?.unref?.();
|
|
71
|
+
// A write that finds someone else in the journal (JournalConflict) means the run is no longer ours, whatever the claim says: stop at once
|
|
72
|
+
// and write nothing more. This also covers a step that is still in flight when the claim is lost.
|
|
73
|
+
const guarded = guardJournal(journal, () => { state.lost = true; stop.abort(); });
|
|
58
74
|
try {
|
|
59
|
-
const prior = await
|
|
75
|
+
const prior = await guarded.get(runId);
|
|
60
76
|
if (prior && prior.flow !== def.flow)
|
|
61
77
|
throw new Error(`run "${runId}" belongs to flow "${prior.flow}", not "${def.flow}"`);
|
|
62
78
|
if (prior && (prior.status === 'done' || prior.status === 'cancelled'))
|
|
@@ -64,24 +80,56 @@ async function runFlow(def, opts) {
|
|
|
64
80
|
if (!prior) {
|
|
65
81
|
const raw = opts.payload === undefined ? '' : (typeof opts.payload === 'string' ? opts.payload : JSON.stringify(opts.payload));
|
|
66
82
|
const cut = raw.length > PREVIEW_CHARS ? `${raw.slice(0, PREVIEW_CHARS)}…` : raw;
|
|
67
|
-
await
|
|
83
|
+
await guarded.begin({ runId, flow: def.flow, inputPreview: opts.redact ? opts.redact(cut) : cut, ...(opts.tenantId ? { tenantId: opts.tenantId } : {}) });
|
|
68
84
|
}
|
|
69
85
|
else {
|
|
70
|
-
await
|
|
86
|
+
await guarded.update(runId, { status: 'running' });
|
|
71
87
|
}
|
|
72
|
-
const result = await execute(def, { ...opts, signal: stop.signal }, runId, prior, state);
|
|
88
|
+
const result = await execute(def, { ...opts, signal: stop.signal, journal: guarded }, runId, prior, state);
|
|
73
89
|
if (state.lost)
|
|
74
90
|
throw new FlowClaimError(runId);
|
|
75
91
|
return result;
|
|
76
92
|
}
|
|
93
|
+
catch (err) {
|
|
94
|
+
// The conflict surfaced before the flow could run (the first write): same meaning, same error.
|
|
95
|
+
if (err instanceof journal_1.JournalConflict)
|
|
96
|
+
throw new FlowClaimError(runId);
|
|
97
|
+
throw err;
|
|
98
|
+
}
|
|
77
99
|
finally {
|
|
78
100
|
if (timer)
|
|
79
101
|
clearInterval(timer);
|
|
80
102
|
opts.signal?.removeEventListener('abort', forward);
|
|
103
|
+
// A renewal that is still in flight would take the claim again after we freed it, and nobody would free that one: the run
|
|
104
|
+
// would stay held until the TTL. Let it land first, so the release below is the one that matches what the journal holds.
|
|
105
|
+
// The wait is bounded: a journal that does not answer cannot be asked to release either.
|
|
106
|
+
if (renewal)
|
|
107
|
+
await waitAtMost(renewal, Math.min(ttl, RENEWAL_SETTLE_MS));
|
|
81
108
|
if (!state.lost)
|
|
82
109
|
await release().catch(() => undefined);
|
|
83
110
|
}
|
|
84
111
|
}
|
|
112
|
+
/** The journal as `runFlow` uses it: a `JournalConflict` in any write is reported to `onConflict` before it is rethrown. */
|
|
113
|
+
function guardJournal(journal, onConflict) {
|
|
114
|
+
const watch = async (write) => {
|
|
115
|
+
try {
|
|
116
|
+
return await write();
|
|
117
|
+
}
|
|
118
|
+
catch (err) {
|
|
119
|
+
if (err instanceof journal_1.JournalConflict)
|
|
120
|
+
onConflict();
|
|
121
|
+
throw err;
|
|
122
|
+
}
|
|
123
|
+
};
|
|
124
|
+
return {
|
|
125
|
+
begin: run => watch(() => journal.begin(run)),
|
|
126
|
+
step: (runId, stepId, patch) => watch(() => journal.step(runId, stepId, patch)),
|
|
127
|
+
update: (runId, patch) => watch(() => journal.update(runId, patch)),
|
|
128
|
+
claim: (runId, owner, ttlMs) => journal.claim(runId, owner, ttlMs),
|
|
129
|
+
get: runId => journal.get(runId),
|
|
130
|
+
list: filter => journal.list(filter),
|
|
131
|
+
};
|
|
132
|
+
}
|
|
85
133
|
/** A run that already finished, as the result `runFlow` would have returned. */
|
|
86
134
|
function fromJournal(run, def) {
|
|
87
135
|
const steps = {};
|