@lobu/connector-worker 7.0.0 → 7.1.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/dist/compile-connector.d.ts +25 -0
- package/dist/compile-connector.d.ts.map +1 -0
- package/dist/compile-connector.js +162 -0
- package/dist/compile-connector.js.map +1 -0
- package/dist/daemon/client.d.ts +11 -1
- package/dist/daemon/client.d.ts.map +1 -1
- package/dist/daemon/client.js +7 -16
- package/dist/daemon/client.js.map +1 -1
- package/dist/daemon/executor.d.ts.map +1 -1
- package/dist/daemon/executor.js +83 -30
- package/dist/daemon/executor.js.map +1 -1
- package/dist/daemon/worker.d.ts.map +1 -1
- package/dist/daemon/worker.js +14 -4
- package/dist/daemon/worker.js.map +1 -1
- package/dist/executor/child-runner.js +42 -23
- package/dist/executor/child-runner.js.map +1 -1
- package/dist/executor/subprocess.d.ts.map +1 -1
- package/dist/executor/subprocess.js +56 -29
- package/dist/executor/subprocess.js.map +1 -1
- package/package.json +15 -5
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Worker-side connector compiler.
|
|
3
|
+
*
|
|
4
|
+
* Until lobu#771's perf brainstorm, the gateway compiled connector bundles
|
|
5
|
+
* via esbuild and shipped the ~13 MB output inline in every `/api/workers/poll`
|
|
6
|
+
* response. The gateway pod held all ~29 connector bundles in its
|
|
7
|
+
* compile cache (~384 MB, dominant heap occupant under the 1 GiB limit;
|
|
8
|
+
* see lobu#771 for the heap-snapshot trail).
|
|
9
|
+
*
|
|
10
|
+
* For fleet workers (and embedded mode where worker + gateway share a host),
|
|
11
|
+
* the bundled connector .ts source is on disk in both pods — the gateway
|
|
12
|
+
* doesn't need to compile or ship it. The gateway now sends
|
|
13
|
+
* `connector_source_path` (the absolute path that `findBundledConnectorFile`
|
|
14
|
+
* resolved) and this module compiles locally in the worker process.
|
|
15
|
+
*
|
|
16
|
+
* Device workers (Lobu Mac Bridge, etc.) keep getting `compiled_code` inline
|
|
17
|
+
* — they don't have the connectors directory on disk.
|
|
18
|
+
*
|
|
19
|
+
* This file mirrors the server's `utils/connector-catalog.ts` compile pipeline.
|
|
20
|
+
* Kept here (rather than shared) so the connector-worker package doesn't take
|
|
21
|
+
* a runtime dep on the server package's bundle layout.
|
|
22
|
+
*/
|
|
23
|
+
export declare function findBundledConnectorFile(key: string): string | null;
|
|
24
|
+
export declare function compileConnectorFromFile(filePath: string): Promise<string>;
|
|
25
|
+
//# sourceMappingURL=compile-connector.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"compile-connector.d.ts","sourceRoot":"","sources":["../src/compile-connector.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;AAkCH,wBAAgB,wBAAwB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAwBnE;AA6CD,wBAAsB,wBAAwB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAyChF"}
|
|
@@ -0,0 +1,162 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Worker-side connector compiler.
|
|
3
|
+
*
|
|
4
|
+
* Until lobu#771's perf brainstorm, the gateway compiled connector bundles
|
|
5
|
+
* via esbuild and shipped the ~13 MB output inline in every `/api/workers/poll`
|
|
6
|
+
* response. The gateway pod held all ~29 connector bundles in its
|
|
7
|
+
* compile cache (~384 MB, dominant heap occupant under the 1 GiB limit;
|
|
8
|
+
* see lobu#771 for the heap-snapshot trail).
|
|
9
|
+
*
|
|
10
|
+
* For fleet workers (and embedded mode where worker + gateway share a host),
|
|
11
|
+
* the bundled connector .ts source is on disk in both pods — the gateway
|
|
12
|
+
* doesn't need to compile or ship it. The gateway now sends
|
|
13
|
+
* `connector_source_path` (the absolute path that `findBundledConnectorFile`
|
|
14
|
+
* resolved) and this module compiles locally in the worker process.
|
|
15
|
+
*
|
|
16
|
+
* Device workers (Lobu Mac Bridge, etc.) keep getting `compiled_code` inline
|
|
17
|
+
* — they don't have the connectors directory on disk.
|
|
18
|
+
*
|
|
19
|
+
* This file mirrors the server's `utils/connector-catalog.ts` compile pipeline.
|
|
20
|
+
* Kept here (rather than shared) so the connector-worker package doesn't take
|
|
21
|
+
* a runtime dep on the server package's bundle layout.
|
|
22
|
+
*/
|
|
23
|
+
import { existsSync } from 'node:fs';
|
|
24
|
+
import { mkdtemp, readFile, rm, stat } from 'node:fs/promises';
|
|
25
|
+
import { createRequire } from 'node:module';
|
|
26
|
+
import { tmpdir } from 'node:os';
|
|
27
|
+
import { join, resolve } from 'node:path';
|
|
28
|
+
import { fileURLToPath } from 'node:url';
|
|
29
|
+
import { build } from 'esbuild';
|
|
30
|
+
import { EXTERNAL_RUNTIME_DEPS } from './runtime-deps.js';
|
|
31
|
+
// Worker-side resolver for the bundled connectors directory. The gateway's
|
|
32
|
+
// `findBundledConnectorFile` resolves to paths that exist in the gateway
|
|
33
|
+
// image (e.g. /app/packages/server/dist/connectors); those paths do not
|
|
34
|
+
// exist in the worker image, which has the sources at
|
|
35
|
+
// /app/packages/connectors. Each side resolves locally instead of trusting
|
|
36
|
+
// gateway-supplied absolute paths.
|
|
37
|
+
const HERE = fileURLToPath(new URL('.', import.meta.url));
|
|
38
|
+
const WORKER_CONNECTOR_DIR_CANDIDATES = [
|
|
39
|
+
resolve(HERE, '../../../connectors/src'),
|
|
40
|
+
resolve(HERE, '../../../connectors/dist'),
|
|
41
|
+
resolve(HERE, '../../connectors/src'),
|
|
42
|
+
resolve(HERE, '../../connectors/dist'),
|
|
43
|
+
resolve(HERE, '../connectors/src'),
|
|
44
|
+
resolve(process.cwd(), 'packages/connectors/src'),
|
|
45
|
+
resolve(process.cwd(), 'connectors'),
|
|
46
|
+
];
|
|
47
|
+
// Strict regex for connector_key: lowercase letters/digits, optional dots
|
|
48
|
+
// for namespacing, underscores for word separators. Defense-in-depth even
|
|
49
|
+
// though keys come from a trusted DB column — we're about to use the value
|
|
50
|
+
// to construct a filesystem path.
|
|
51
|
+
const CONNECTOR_KEY_RE = /^[a-z][a-z0-9]*(?:[._][a-z0-9]+)*$/;
|
|
52
|
+
export function findBundledConnectorFile(key) {
|
|
53
|
+
if (!CONNECTOR_KEY_RE.test(key))
|
|
54
|
+
return null;
|
|
55
|
+
// Two filename conventions:
|
|
56
|
+
// - Subdirectory layout (preferred for grouped primitives): the dot in
|
|
57
|
+
// `browser.evaluate` maps to `browser/evaluate.ts`. Lets us co-locate
|
|
58
|
+
// related connectors without renaming the key.
|
|
59
|
+
// - Flat-with-underscores (existing convention): `chrome.tabs` →
|
|
60
|
+
// `chrome_tabs.ts`, `apple_health` → `apple_health.ts`.
|
|
61
|
+
// Try subdirectory first so newer primitives win when both happen to exist.
|
|
62
|
+
const candidates = [
|
|
63
|
+
`${key.replace(/\./g, '/')}.ts`,
|
|
64
|
+
`${key.replace(/\./g, '_')}.ts`,
|
|
65
|
+
];
|
|
66
|
+
for (const dir of WORKER_CONNECTOR_DIR_CANDIDATES) {
|
|
67
|
+
for (const fileName of candidates) {
|
|
68
|
+
const filePath = resolve(dir, fileName);
|
|
69
|
+
// Belt-and-braces: the resolved path must stay under the candidate
|
|
70
|
+
// dir. CONNECTOR_KEY_RE already forbids `..`, but the regex doesn't
|
|
71
|
+
// know about our path-joining choices.
|
|
72
|
+
if (!filePath.startsWith(`${dir}/`))
|
|
73
|
+
continue;
|
|
74
|
+
if (existsSync(filePath))
|
|
75
|
+
return filePath;
|
|
76
|
+
}
|
|
77
|
+
}
|
|
78
|
+
return null;
|
|
79
|
+
}
|
|
80
|
+
const require_ = createRequire(import.meta.url);
|
|
81
|
+
const SDK_ENTRY = require_.resolve('@lobu/connector-sdk');
|
|
82
|
+
// Connectors declare runtime npm deps via `import x from 'npm:foo@1.2.3'`.
|
|
83
|
+
// Strip the prefix so esbuild resolves the bare name against node_modules;
|
|
84
|
+
// when the package isn't installed here, mark it external so the bundle
|
|
85
|
+
// still emits. The worker image is expected to provide it.
|
|
86
|
+
const npmSpecifierPlugin = {
|
|
87
|
+
name: 'npm-specifier',
|
|
88
|
+
setup(b) {
|
|
89
|
+
b.onResolve({ filter: /^npm:/ }, async (args) => {
|
|
90
|
+
const bare = args.path
|
|
91
|
+
.slice(4)
|
|
92
|
+
.replace(/^(@[^/]+\/[^/@]+)@[^/]*/, '$1')
|
|
93
|
+
.replace(/^([^/@]+)@[^/]*/, '$1');
|
|
94
|
+
const resolved = await b.resolve(bare, {
|
|
95
|
+
resolveDir: args.resolveDir,
|
|
96
|
+
kind: args.kind,
|
|
97
|
+
});
|
|
98
|
+
if (resolved.errors.length > 0) {
|
|
99
|
+
return { path: bare, external: true, errors: [], warnings: [] };
|
|
100
|
+
}
|
|
101
|
+
return resolved;
|
|
102
|
+
});
|
|
103
|
+
},
|
|
104
|
+
};
|
|
105
|
+
// LRU-capped cache. Worker daemon is long-lived; one entry per recently-used
|
|
106
|
+
// connector. See the matching cache in
|
|
107
|
+
// `packages/server/src/utils/connector-catalog.ts` for the cap rationale.
|
|
108
|
+
const COMPILED_FILE_CACHE_MAX = 8;
|
|
109
|
+
const compiledFileCache = new Map();
|
|
110
|
+
function touchCacheEntry(filePath, entry) {
|
|
111
|
+
compiledFileCache.delete(filePath);
|
|
112
|
+
compiledFileCache.set(filePath, entry);
|
|
113
|
+
while (compiledFileCache.size > COMPILED_FILE_CACHE_MAX) {
|
|
114
|
+
const oldest = compiledFileCache.keys().next().value;
|
|
115
|
+
if (oldest === undefined)
|
|
116
|
+
break;
|
|
117
|
+
compiledFileCache.delete(oldest);
|
|
118
|
+
}
|
|
119
|
+
}
|
|
120
|
+
export async function compileConnectorFromFile(filePath) {
|
|
121
|
+
let mtimeMs = null;
|
|
122
|
+
try {
|
|
123
|
+
mtimeMs = (await stat(filePath)).mtimeMs;
|
|
124
|
+
const cached = compiledFileCache.get(filePath);
|
|
125
|
+
if (cached && cached.mtimeMs === mtimeMs) {
|
|
126
|
+
touchCacheEntry(filePath, cached);
|
|
127
|
+
return cached.code;
|
|
128
|
+
}
|
|
129
|
+
}
|
|
130
|
+
catch {
|
|
131
|
+
// stat failed — let the build surface the real error.
|
|
132
|
+
}
|
|
133
|
+
const tmpDir = await mkdtemp(join(tmpdir(), 'lobu-connector-worker-'));
|
|
134
|
+
const outPath = join(tmpDir, 'out.mjs');
|
|
135
|
+
try {
|
|
136
|
+
await build({
|
|
137
|
+
entryPoints: [filePath],
|
|
138
|
+
outfile: outPath,
|
|
139
|
+
bundle: true,
|
|
140
|
+
format: 'esm',
|
|
141
|
+
platform: 'node',
|
|
142
|
+
target: 'node20',
|
|
143
|
+
alias: { lobu: SDK_ENTRY, '@lobu/connector-sdk': SDK_ENTRY },
|
|
144
|
+
banner: {
|
|
145
|
+
js: `import { createRequire as __createRequire } from 'module'; const require = __createRequire(import.meta.url);`,
|
|
146
|
+
},
|
|
147
|
+
plugins: [npmSpecifierPlugin],
|
|
148
|
+
external: [...EXTERNAL_RUNTIME_DEPS],
|
|
149
|
+
write: true,
|
|
150
|
+
minify: false,
|
|
151
|
+
sourcemap: false,
|
|
152
|
+
});
|
|
153
|
+
const code = await readFile(outPath, 'utf-8');
|
|
154
|
+
if (mtimeMs !== null)
|
|
155
|
+
touchCacheEntry(filePath, { mtimeMs, code });
|
|
156
|
+
return code;
|
|
157
|
+
}
|
|
158
|
+
finally {
|
|
159
|
+
await rm(tmpDir, { recursive: true, force: true });
|
|
160
|
+
}
|
|
161
|
+
}
|
|
162
|
+
//# sourceMappingURL=compile-connector.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"compile-connector.js","sourceRoot":"","sources":["../src/compile-connector.ts"],"names":[],"mappings":"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"}
|
package/dist/daemon/client.d.ts
CHANGED
|
@@ -64,7 +64,16 @@ export interface PollResponse {
|
|
|
64
64
|
connection_id?: number;
|
|
65
65
|
/** Feed ID (for sync runs) */
|
|
66
66
|
feed_id?: number;
|
|
67
|
-
/**
|
|
67
|
+
/**
|
|
68
|
+
* Compiled connector code, shipped inline. Used for device workers and
|
|
69
|
+
* DB-only user-uploaded connectors that don't have the connector source
|
|
70
|
+
* on disk. Fleet workers receive a bare `connector_key` only (no
|
|
71
|
+
* inline code) and resolve + compile the source from their own
|
|
72
|
+
* filesystem to keep poll responses small — see worker-api.ts handler
|
|
73
|
+
* comment + lobu#772 review for why we send the key and not an absolute
|
|
74
|
+
* path (gateway and worker images have different paths to the same
|
|
75
|
+
* sources).
|
|
76
|
+
*/
|
|
68
77
|
compiled_code?: string;
|
|
69
78
|
/** Connection session state (browser cookies, etc.) */
|
|
70
79
|
session_state?: Record<string, unknown>;
|
|
@@ -201,6 +210,7 @@ export declare class WorkerClient implements ExecutorClient {
|
|
|
201
210
|
version?: string;
|
|
202
211
|
});
|
|
203
212
|
private authHeaders;
|
|
213
|
+
private post;
|
|
204
214
|
private requestJson;
|
|
205
215
|
private requestVoid;
|
|
206
216
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/daemon/client.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAYH;;;;GAIG;AACH,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,IAAI,IAAI,OAAO,CAAC,YAAY,CAAC,CAAC;IAC9B,SAAS,CACP,KAAK,EAAE,MAAM,EACb,QAAQ,CAAC,EAAE;QACT,sBAAsB,CAAC,EAAE,MAAM,CAAC;QAChC,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,UAAU,CAAC,EAAE,MAAM,CAAC;KACrB,GACA,OAAO,CAAC,IAAI,CAAC,CAAC;IACjB,MAAM,CAAC,KAAK,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1C,QAAQ,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9C,cAAc,CAAC,GAAG,EAAE,qBAAqB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1D,uBAAuB,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC;IACnE,kBAAkB,CAAC,GAAG,EAAE,yBAAyB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAClE,gBAAgB,CAAC,GAAG,EAAE,uBAAuB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9D,cAAc,CAAC,GAAG,EAAE,qBAAqB,GAAG,OAAO,CAAC,sBAAsB,CAAC,CAAC;IAC5E,YAAY,CAAC,GAAG,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACvD;AAMD,MAAM,WAAW,kBAAkB;IACjC,OAAO,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,WAAW,gBAAgB;IAC/B,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACvB;AAED,MAAM,WAAW,YAAY;IAC3B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,qCAAqC;IACrC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,yEAAyE;IACzE,QAAQ,CAAC,EAAE,MAAM,GAAG,QAAQ,GAAG,SAAS,GAAG,gBAAgB,GAAG,MAAM,CAAC;IACrE,sCAAsC;IACtC,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,mEAAmE;IACnE,oBAAoB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;IACtD,yCAAyC;IACzC,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,6CAA6C;IAC7C,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,kBAAkB;IAClB,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACjC,sBAAsB;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACrC,2BAA2B;IAC3B,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IACtB,wBAAwB;IACxB,WAAW,CAAC,EAAE,gBAAgB,GAAG,IAAI,CAAC;IACtC,0CAA0C;IAC1C,sBAAsB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACjD,oBAAoB;IACpB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,8BAA8B;IAC9B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB
|
|
1
|
+
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/daemon/client.ts"],"names":[],"mappings":"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"}
|
package/dist/daemon/client.js
CHANGED
|
@@ -27,11 +27,9 @@ export class WorkerClient {
|
|
|
27
27
|
this.version = config.version ?? '1.0.0';
|
|
28
28
|
}
|
|
29
29
|
authHeaders() {
|
|
30
|
-
|
|
31
|
-
return {};
|
|
32
|
-
return { Authorization: `Bearer ${this.authToken}` };
|
|
30
|
+
return this.authToken ? { Authorization: `Bearer ${this.authToken}` } : {};
|
|
33
31
|
}
|
|
34
|
-
async
|
|
32
|
+
async post(path, body) {
|
|
35
33
|
const response = await fetch(`${this.apiUrl}${path}`, {
|
|
36
34
|
method: 'POST',
|
|
37
35
|
headers: {
|
|
@@ -44,21 +42,14 @@ export class WorkerClient {
|
|
|
44
42
|
const responseText = await response.text();
|
|
45
43
|
throw new Error(`${path} failed: ${response.status} ${response.statusText} ${responseText}`);
|
|
46
44
|
}
|
|
45
|
+
return response;
|
|
46
|
+
}
|
|
47
|
+
async requestJson(path, body) {
|
|
48
|
+
const response = await this.post(path, body);
|
|
47
49
|
return response.json();
|
|
48
50
|
}
|
|
49
51
|
async requestVoid(path, body) {
|
|
50
|
-
|
|
51
|
-
method: 'POST',
|
|
52
|
-
headers: {
|
|
53
|
-
'Content-Type': 'application/json',
|
|
54
|
-
...this.authHeaders(),
|
|
55
|
-
},
|
|
56
|
-
body: JSON.stringify(body),
|
|
57
|
-
});
|
|
58
|
-
if (!response.ok) {
|
|
59
|
-
const responseText = await response.text();
|
|
60
|
-
throw new Error(`${path} failed: ${response.status} ${response.statusText} ${responseText}`);
|
|
61
|
-
}
|
|
52
|
+
await this.post(path, body);
|
|
62
53
|
}
|
|
63
54
|
/**
|
|
64
55
|
* Poll for available runs
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/daemon/client.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,SAAS,mBAAmB,CAAC,KAAa;IACxC,IAAI,GAAG,GAAG,KAAK,CAAC,MAAM,CAAC;IACvB,OAAO,GAAG,GAAG,CAAC,IAAI,KAAK,CAAC,UAAU,CAAC,GAAG,GAAG,CAAC,CAAC,KAAK,EAAE;QAAE,GAAG,EAAE,CAAC;IAC1D,OAAO,GAAG,KAAK,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;AAC5D,CAAC;
|
|
1
|
+
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../src/daemon/client.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executor.d.ts","sourceRoot":"","sources":["../../src/daemon/executor.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAuB,GAAG,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"executor.d.ts","sourceRoot":"","sources":["../../src/daemon/executor.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAuB,GAAG,EAAE,MAAM,qBAAqB,CAAC;AASpE,OAAO,KAAK,EAAe,cAAc,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AA8C7E,MAAM,WAAW,cAAc;IAC7B,SAAS,EAAE,MAAM,CAAC;IAClB,mBAAmB,EAAE,MAAM,CAAC;IAC5B,kBAAkB,EAAE,OAAO,CAAC;IAC5B,SAAS,EAAE,MAAM,CAAC;IAClB,eAAe,EAAE,MAAM,CAAC;CACzB;AAUD;;;;GAIG;AACH,wBAAsB,UAAU,CAC9B,MAAM,EAAE,cAAc,EACtB,GAAG,EAAE,YAAY,EACjB,GAAG,EAAE,GAAG,EACR,MAAM,GAAE,OAAO,CAAC,cAAc,CAAM,GACnC,OAAO,CAAC;IAAE,cAAc,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAqBrD"}
|
package/dist/daemon/executor.js
CHANGED
|
@@ -4,9 +4,33 @@
|
|
|
4
4
|
* Executes sync and action runs via subprocess execution with compiled connector code.
|
|
5
5
|
* Generates embeddings and streams results.
|
|
6
6
|
*/
|
|
7
|
+
import { compileConnectorFromFile, findBundledConnectorFile } from '../compile-connector.js';
|
|
7
8
|
import { batchGenerateEmbeddings, generateEmbedding } from '../embeddings.js';
|
|
8
9
|
import { executeCompiledConnector, getActionOutput, normalizeEventEnvelope, } from '../executor/runtime.js';
|
|
9
10
|
import { SubprocessExecutor } from '../executor/subprocess.js';
|
|
11
|
+
async function resolveJobCode(job) {
|
|
12
|
+
if (job.compiled_code)
|
|
13
|
+
return { ok: true, code: job.compiled_code };
|
|
14
|
+
if (!job.connector_key) {
|
|
15
|
+
return { ok: false, error: 'No compiled_code and no connector_key — gateway sent neither.' };
|
|
16
|
+
}
|
|
17
|
+
const localPath = findBundledConnectorFile(job.connector_key);
|
|
18
|
+
if (!localPath) {
|
|
19
|
+
return {
|
|
20
|
+
ok: false,
|
|
21
|
+
error: `connector_key '${job.connector_key}' did not resolve to a local source file. ` +
|
|
22
|
+
`Either the connector isn't bundled in this worker image, or the key is malformed.`,
|
|
23
|
+
};
|
|
24
|
+
}
|
|
25
|
+
try {
|
|
26
|
+
const code = await compileConnectorFromFile(localPath);
|
|
27
|
+
return { ok: true, code };
|
|
28
|
+
}
|
|
29
|
+
catch (err) {
|
|
30
|
+
const msg = err instanceof Error ? err.message : String(err);
|
|
31
|
+
return { ok: false, error: `esbuild failed for '${job.connector_key}' (${localPath}): ${msg}` };
|
|
32
|
+
}
|
|
33
|
+
}
|
|
10
34
|
const DEFAULT_CONFIG = {
|
|
11
35
|
batchSize: 10,
|
|
12
36
|
heartbeatIntervalMs: 30000,
|
|
@@ -21,25 +45,23 @@ const DEFAULT_CONFIG = {
|
|
|
21
45
|
*/
|
|
22
46
|
export async function executeRun(client, job, env, config = {}) {
|
|
23
47
|
const cfg = { ...DEFAULT_CONFIG, ...config };
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
48
|
+
switch (job.run_type) {
|
|
49
|
+
case 'action':
|
|
50
|
+
return executeActionRun(client, job, env, cfg);
|
|
51
|
+
case 'watcher':
|
|
52
|
+
// Watcher reactions execute inline in the API process (complete_window) and
|
|
53
|
+
// the poll endpoint's run_type allowlist should never hand a watcher run to
|
|
54
|
+
// this daemon. If one slips through (deploy skew, regression), do NOT mark
|
|
55
|
+
// it success — that would stomp a live watcher run and prevent any retry.
|
|
56
|
+
console.error(`[executor] Refusing to handle watcher run ${job.run_id} — watcher runs must not reach the connector-worker daemon`);
|
|
57
|
+
return { itemsCollected: 0, error: 'watcher run not handled by daemon' };
|
|
58
|
+
case 'embed_backfill':
|
|
59
|
+
return executeEmbedBackfillRun(client, job, env);
|
|
60
|
+
case 'auth':
|
|
61
|
+
return executeAuthRun(client, job, env, cfg);
|
|
62
|
+
default:
|
|
63
|
+
return executeSyncRun(client, job, env, cfg);
|
|
35
64
|
}
|
|
36
|
-
if (job.run_type === 'embed_backfill') {
|
|
37
|
-
return executeEmbedBackfillRun(client, job, env);
|
|
38
|
-
}
|
|
39
|
-
if (job.run_type === 'auth') {
|
|
40
|
-
return executeAuthRun(client, job, env, cfg);
|
|
41
|
-
}
|
|
42
|
-
return executeSyncRun(client, job, env, cfg);
|
|
43
65
|
}
|
|
44
66
|
/**
|
|
45
67
|
* Execute a sync run (feed data ingestion)
|
|
@@ -49,14 +71,24 @@ async function executeSyncRun(client, job, env, cfg) {
|
|
|
49
71
|
timeoutMs: cfg.timeoutMs,
|
|
50
72
|
maxOldSpaceSize: cfg.maxOldSpaceSize,
|
|
51
73
|
});
|
|
52
|
-
const { run_id, connector_key, feed_key, config: feedConfig, checkpoint, credentials,
|
|
74
|
+
const { run_id, connector_key, feed_key, config: feedConfig, checkpoint, credentials, } = job;
|
|
53
75
|
if (!run_id || !connector_key) {
|
|
54
76
|
throw new Error('Invalid run: missing run_id or connector_key');
|
|
55
77
|
}
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
78
|
+
const codeResult = await resolveJobCode(job);
|
|
79
|
+
if (!codeResult.ok) {
|
|
80
|
+
const errorMessage = `Run ${run_id} (${connector_key}): ${codeResult.error}`;
|
|
81
|
+
console.error('[executor]', errorMessage);
|
|
82
|
+
await client.complete({
|
|
83
|
+
run_id,
|
|
84
|
+
worker_id: client.id,
|
|
85
|
+
status: 'failed',
|
|
86
|
+
error_message: errorMessage,
|
|
87
|
+
items_collected: 0,
|
|
88
|
+
});
|
|
89
|
+
return { itemsCollected: 0, error: errorMessage };
|
|
59
90
|
}
|
|
91
|
+
const compiled_code = codeResult.code;
|
|
60
92
|
console.error(`[executor] Starting sync run ${run_id} (${connector_key}/${feed_key})`);
|
|
61
93
|
// Set up heartbeat interval
|
|
62
94
|
let heartbeatInterval;
|
|
@@ -202,13 +234,23 @@ async function executeActionRun(client, job, env, cfg) {
|
|
|
202
234
|
timeoutMs: cfg.timeoutMs,
|
|
203
235
|
maxOldSpaceSize: cfg.maxOldSpaceSize,
|
|
204
236
|
});
|
|
205
|
-
const { run_id, connector_key, action_key, action_input, credentials
|
|
237
|
+
const { run_id, connector_key, action_key, action_input, credentials } = job;
|
|
206
238
|
if (!run_id || !connector_key || !action_key) {
|
|
207
239
|
throw new Error('Invalid action run: missing run_id, connector_key, or action_key');
|
|
208
240
|
}
|
|
209
|
-
|
|
210
|
-
|
|
241
|
+
const codeResult = await resolveJobCode(job);
|
|
242
|
+
if (!codeResult.ok) {
|
|
243
|
+
const errorMessage = `Action run ${run_id} (${connector_key}): ${codeResult.error}`;
|
|
244
|
+
console.error('[executor]', errorMessage);
|
|
245
|
+
await client.completeAction({
|
|
246
|
+
run_id,
|
|
247
|
+
worker_id: client.id,
|
|
248
|
+
status: 'failed',
|
|
249
|
+
error_message: errorMessage,
|
|
250
|
+
});
|
|
251
|
+
return { itemsCollected: 0, error: errorMessage };
|
|
211
252
|
}
|
|
253
|
+
const compiled_code = codeResult.code;
|
|
212
254
|
console.error(`[executor] Starting action run ${run_id} (${connector_key}/${action_key})`);
|
|
213
255
|
try {
|
|
214
256
|
const result = await executeCompiledConnector({
|
|
@@ -258,13 +300,23 @@ async function executeAuthRun(client, job, env, cfg) {
|
|
|
258
300
|
timeoutMs: 0,
|
|
259
301
|
maxOldSpaceSize: cfg.maxOldSpaceSize,
|
|
260
302
|
});
|
|
261
|
-
const { run_id, connector_key,
|
|
303
|
+
const { run_id, connector_key, previous_credentials } = job;
|
|
262
304
|
if (!run_id || !connector_key) {
|
|
263
305
|
throw new Error('Invalid auth run: missing run_id or connector_key');
|
|
264
306
|
}
|
|
265
|
-
|
|
266
|
-
|
|
307
|
+
const codeResult = await resolveJobCode(job);
|
|
308
|
+
if (!codeResult.ok) {
|
|
309
|
+
const errorMessage = `Auth run ${run_id} (${connector_key}): ${codeResult.error}`;
|
|
310
|
+
console.error('[executor]', errorMessage);
|
|
311
|
+
await client.completeAuth({
|
|
312
|
+
run_id,
|
|
313
|
+
worker_id: client.id,
|
|
314
|
+
status: 'failed',
|
|
315
|
+
error_message: errorMessage,
|
|
316
|
+
});
|
|
317
|
+
return { itemsCollected: 0, error: errorMessage };
|
|
267
318
|
}
|
|
319
|
+
const compiled_code = codeResult.code;
|
|
268
320
|
console.error(`[executor] Starting auth run ${run_id} (${connector_key})`);
|
|
269
321
|
// Heartbeat so the API doesn't time us out while the user is scanning.
|
|
270
322
|
const heartbeatInterval = setInterval(async () => {
|
|
@@ -374,14 +426,15 @@ async function executeEmbedBackfillRun(client, job, _env) {
|
|
|
374
426
|
}
|
|
375
427
|
catch (err) {
|
|
376
428
|
const msg = err instanceof Error ? err.message : String(err);
|
|
429
|
+
const errorMessage = `Invalid action_input JSON: ${msg}`;
|
|
377
430
|
console.error(`[executor] Embed backfill run ${run_id}: invalid action_input JSON:`, msg);
|
|
378
431
|
await client.complete({
|
|
379
432
|
run_id,
|
|
380
433
|
worker_id: client.id,
|
|
381
434
|
status: 'failed',
|
|
382
|
-
error_message:
|
|
435
|
+
error_message: errorMessage,
|
|
383
436
|
});
|
|
384
|
-
return { itemsCollected: 0, error:
|
|
437
|
+
return { itemsCollected: 0, error: errorMessage };
|
|
385
438
|
}
|
|
386
439
|
}
|
|
387
440
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../src/daemon/executor.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../src/daemon/executor.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worker.d.ts","sourceRoot":"","sources":["../../src/daemon/worker.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,qBAAqB,CAAC;AAC/C,OAAO,EAAE,KAAK,kBAAkB,EAAgB,MAAM,aAAa,CAAC;AACpE,OAAO,EAAE,KAAK,cAAc,EAAc,MAAM,eAAe,CAAC;AAEhE,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,YAAY,CAAC,EAAE,kBAAkB,CAAC;IAClC,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,EAAE,OAAO,CAAC,cAAc,CAAC,CAAC;IACnC,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAKD;;;;GAIG;AACH,qBAAa,YAAY;IACvB,OAAO,CAAC,MAAM,CAAe;IAC7B,OAAO,CAAC,GAAG,CAAM;IACjB,OAAO,CAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"worker.d.ts","sourceRoot":"","sources":["../../src/daemon/worker.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,qBAAqB,CAAC;AAC/C,OAAO,EAAE,KAAK,kBAAkB,EAAgB,MAAM,aAAa,CAAC;AACpE,OAAO,EAAE,KAAK,cAAc,EAAc,MAAM,eAAe,CAAC;AAEhE,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,YAAY,CAAC,EAAE,kBAAkB,CAAC;IAClC,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,EAAE,OAAO,CAAC,cAAc,CAAC,CAAC;IACnC,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAKD;;;;GAIG;AACH,qBAAa,YAAY;IACvB,OAAO,CAAC,MAAM,CAAe;IAC7B,OAAO,CAAC,GAAG,CAAM;IACjB,OAAO,CAAC,MAAM,CAIZ;IACF,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,UAAU,CAAK;gBAEX,YAAY,EAAE,YAAY,EAAE,GAAG,EAAE,GAAG;IAoBhD;;OAEG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IA8B5B;;OAEG;IACH,IAAI,IAAI,IAAI;IAKZ;;;OAGG;IACG,iBAAiB,CAAC,SAAS,SAAQ,EAAE,MAAM,SAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAqB1E;;OAEG;YACW,cAAc;IA2B5B,OAAO,CAAC,KAAK;CAGd;AAED;;GAEG;AACH,wBAAsB,WAAW,CAAC,MAAM,EAAE,YAAY,EAAE,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,YAAY,CAAC,CA8BvF"}
|
package/dist/daemon/worker.js
CHANGED
|
@@ -19,12 +19,11 @@ export class WorkerDaemon {
|
|
|
19
19
|
running = false;
|
|
20
20
|
activeJobs = 0;
|
|
21
21
|
constructor(daemonConfig, env) {
|
|
22
|
-
const capabilities = daemonConfig.capabilities ?? DEFAULT_CAPABILITIES;
|
|
23
22
|
this.client = new WorkerClient({
|
|
24
23
|
apiUrl: daemonConfig.apiUrl,
|
|
25
24
|
workerId: daemonConfig.workerId,
|
|
26
25
|
authToken: daemonConfig.workerApiToken ?? env.WORKER_API_TOKEN,
|
|
27
|
-
capabilities,
|
|
26
|
+
capabilities: daemonConfig.capabilities ?? DEFAULT_CAPABILITIES,
|
|
28
27
|
version: daemonConfig.version,
|
|
29
28
|
});
|
|
30
29
|
this.env = env;
|
|
@@ -126,7 +125,14 @@ export class WorkerDaemon {
|
|
|
126
125
|
*/
|
|
127
126
|
export async function startDaemon(config, env) {
|
|
128
127
|
const daemon = new WorkerDaemon(config, env);
|
|
128
|
+
let shuttingDown = false;
|
|
129
129
|
const gracefulShutdown = async (signal) => {
|
|
130
|
+
if (shuttingDown) {
|
|
131
|
+
// Second signal — operator wants out now. Hard exit.
|
|
132
|
+
console.error(`[daemon] Received ${signal} during shutdown, forcing exit`);
|
|
133
|
+
process.exit(130);
|
|
134
|
+
}
|
|
135
|
+
shuttingDown = true;
|
|
130
136
|
console.error(`\n[daemon] Received ${signal}, shutting down...`);
|
|
131
137
|
daemon.stop();
|
|
132
138
|
const allDone = await daemon.waitForActiveJobs();
|
|
@@ -136,8 +142,12 @@ export async function startDaemon(config, env) {
|
|
|
136
142
|
process.exit(allDone ? 0 : 1);
|
|
137
143
|
};
|
|
138
144
|
// Handle shutdown signals
|
|
139
|
-
process.on('SIGINT', () =>
|
|
140
|
-
|
|
145
|
+
process.on('SIGINT', () => {
|
|
146
|
+
void gracefulShutdown('SIGINT');
|
|
147
|
+
});
|
|
148
|
+
process.on('SIGTERM', () => {
|
|
149
|
+
void gracefulShutdown('SIGTERM');
|
|
150
|
+
});
|
|
141
151
|
await daemon.start();
|
|
142
152
|
return daemon;
|
|
143
153
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worker.js","sourceRoot":"","sources":["../../src/daemon/worker.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,EAA2B,YAAY,EAAE,MAAM,aAAa,CAAC;AACpE,OAAO,EAAuB,UAAU,EAAE,MAAM,eAAe,CAAC;AAahE,MAAM,oBAAoB,GAAuB,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC;AACpE,MAAM,2BAA2B,GAAG,MAAM,CAAC;AAE3C;;;;GAIG;AACH,MAAM,OAAO,YAAY;IACf,MAAM,CAAe;IACrB,GAAG,CAAM;IACT,MAAM,
|
|
1
|
+
{"version":3,"file":"worker.js","sourceRoot":"","sources":["../../src/daemon/worker.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,6 +5,7 @@
|
|
|
5
5
|
* dynamically imports the ConnectorRuntime class, and executes sync()/execute().
|
|
6
6
|
* Streams normalized content chunks and checkpoint updates back via IPC.
|
|
7
7
|
*/
|
|
8
|
+
import { randomBytes } from 'node:crypto';
|
|
8
9
|
import { rm, writeFile } from 'node:fs/promises';
|
|
9
10
|
import { join } from 'node:path';
|
|
10
11
|
import { pathToFileURL } from 'node:url';
|
|
@@ -40,29 +41,27 @@ const authAbortController = new AbortController();
|
|
|
40
41
|
function awaitAuthSignal(name, options) {
|
|
41
42
|
return new Promise((resolve, reject) => {
|
|
42
43
|
const requestId = nextSignalRequestId++;
|
|
43
|
-
pendingSignalWaiters.set(requestId, { resolve, reject });
|
|
44
44
|
let timer;
|
|
45
|
+
const clearTimer = () => {
|
|
46
|
+
if (timer)
|
|
47
|
+
clearTimeout(timer);
|
|
48
|
+
};
|
|
49
|
+
pendingSignalWaiters.set(requestId, {
|
|
50
|
+
resolve: (v) => {
|
|
51
|
+
clearTimer();
|
|
52
|
+
resolve(v);
|
|
53
|
+
},
|
|
54
|
+
reject: (e) => {
|
|
55
|
+
clearTimer();
|
|
56
|
+
reject(e);
|
|
57
|
+
},
|
|
58
|
+
});
|
|
45
59
|
if (options?.timeoutMs && options.timeoutMs > 0) {
|
|
46
60
|
timer = setTimeout(() => {
|
|
47
61
|
pendingSignalWaiters.delete(requestId);
|
|
48
62
|
reject(new Error(`awaitSignal('${name}') timed out after ${options.timeoutMs}ms`));
|
|
49
63
|
}, options.timeoutMs);
|
|
50
64
|
}
|
|
51
|
-
const wrap = pendingSignalWaiters.get(requestId);
|
|
52
|
-
if (wrap) {
|
|
53
|
-
pendingSignalWaiters.set(requestId, {
|
|
54
|
-
resolve: (v) => {
|
|
55
|
-
if (timer)
|
|
56
|
-
clearTimeout(timer);
|
|
57
|
-
wrap.resolve(v);
|
|
58
|
-
},
|
|
59
|
-
reject: (e) => {
|
|
60
|
-
if (timer)
|
|
61
|
-
clearTimeout(timer);
|
|
62
|
-
wrap.reject(e);
|
|
63
|
-
},
|
|
64
|
-
});
|
|
65
|
-
}
|
|
66
65
|
void sendIPC({
|
|
67
66
|
type: 'await_signal_request',
|
|
68
67
|
requestId,
|
|
@@ -135,7 +134,7 @@ async function executeConnectorRuntime(instance, context) {
|
|
|
135
134
|
return result;
|
|
136
135
|
}
|
|
137
136
|
const emitEvents = async (events) => {
|
|
138
|
-
const normalized =
|
|
137
|
+
const normalized = events.map((event) => normalizeEventEnvelope(event));
|
|
139
138
|
for (let index = 0; index < normalized.length; index += CONTENT_CHUNK_SIZE) {
|
|
140
139
|
await sendIPC({
|
|
141
140
|
type: 'content_chunk',
|
|
@@ -174,9 +173,6 @@ async function executeConnectorRuntime(instance, context) {
|
|
|
174
173
|
};
|
|
175
174
|
return result;
|
|
176
175
|
}
|
|
177
|
-
function normalizeEvents(events) {
|
|
178
|
-
return events.map((event) => normalizeEventEnvelope(event));
|
|
179
|
-
}
|
|
180
176
|
/** Send an IPC message and wait for it to be flushed to the parent. */
|
|
181
177
|
function sendIPC(msg) {
|
|
182
178
|
return new Promise((resolve, reject) => {
|
|
@@ -234,8 +230,20 @@ function installUncaughtHandlers() {
|
|
|
234
230
|
void handle(reason);
|
|
235
231
|
});
|
|
236
232
|
}
|
|
233
|
+
/**
|
|
234
|
+
* If the parent dies without sending SIGKILL, the IPC channel disconnects
|
|
235
|
+
* but the child keeps running connector code (especially a chatty HTTP loop
|
|
236
|
+
* or a Playwright session) — leaving zombie subprocesses behind that nothing
|
|
237
|
+
* cleans up until OOM. Exit promptly on parent disconnect so the OS reaps us.
|
|
238
|
+
*/
|
|
239
|
+
function installParentDeathHandlers() {
|
|
240
|
+
// Best-effort: don't bother flushing IPC, the channel is already gone.
|
|
241
|
+
// Exit code 143 = 128 + SIGTERM, conventional for "killed externally".
|
|
242
|
+
process.on('disconnect', () => process.exit(143));
|
|
243
|
+
}
|
|
237
244
|
async function main() {
|
|
238
245
|
installUncaughtHandlers();
|
|
246
|
+
installParentDeathHandlers();
|
|
239
247
|
let started = false;
|
|
240
248
|
// Wait for message from parent
|
|
241
249
|
process.on('message', async (msg) => {
|
|
@@ -265,11 +273,22 @@ async function main() {
|
|
|
265
273
|
return;
|
|
266
274
|
started = true;
|
|
267
275
|
// Keep temp module under cwd so bare imports (e.g. lobu) resolve via local node_modules.
|
|
268
|
-
|
|
276
|
+
// Use a cryptographically random suffix (not pid+Date.now()) so a co-tenant
|
|
277
|
+
// can't pre-create or guess the path. Combined with the `wx` open flag below
|
|
278
|
+
// this prevents both symlink-swap (pointing tmpFile at another file the
|
|
279
|
+
// worker can write) and pre-creation of a malicious .mjs that the worker
|
|
280
|
+
// would otherwise overwrite then import.
|
|
281
|
+
const tmpFile = join(process.cwd(), `.connector-child-${process.pid}-${randomBytes(16).toString('hex')}.mjs`);
|
|
269
282
|
try {
|
|
270
283
|
const { compiledCode, context } = msg;
|
|
271
|
-
// Write compiled code to temp file for dynamic import
|
|
272
|
-
|
|
284
|
+
// Write compiled code to temp file for dynamic import.
|
|
285
|
+
// - `flag: 'wx'` fails if the file already exists (no symlink follow,
|
|
286
|
+
// no clobber of an attacker-planted file under cwd).
|
|
287
|
+
// - `mode: 0o600` keeps the compiled bundle (which can contain
|
|
288
|
+
// connector-baked secrets and the freshly-decrypted credentials in
|
|
289
|
+
// process memory referenced by the bundle) unreadable by other
|
|
290
|
+
// local users on shared hosts. Umask cannot widen this.
|
|
291
|
+
await writeFile(tmpFile, compiledCode, { encoding: 'utf-8', flag: 'wx', mode: 0o600 });
|
|
273
292
|
// Import the compiled module
|
|
274
293
|
const mod = await import(pathToFileURL(tmpFile).href);
|
|
275
294
|
const RuntimeClass = findRuntimeClass(mod);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"child-runner.js","sourceRoot":"","sources":["../../src/executor/child-runner.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,EAAE,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAGzC,OAAO,EAAE,sBAAsB,EAAE,MAAM,cAAc,CAAC;AAEtD,MAAM,kBAAkB,GAAG,GAAG,CAAC;AAa/B,SAAS,oBAAoB,CAAC,OAA4B;IACxD,MAAM,MAAM,GAA4B,EAAE,CAAC;IAC3C,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;QACnD,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;YAC1B,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;QACtB,CAAC;IACH,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,gBAAgB,CAAC,GAA4B;IACpD,MAAM,uBAAuB,GAAG,CAAC,GAAY,EAAwB,EAAE,CACrE,OAAO,GAAG,KAAK,UAAU;QACzB,CAAC,CAAE,GAAW,CAAC,SAAS,EAAE,IAAI;QAC9B,CAAC,CAAE,GAAW,CAAC,SAAS,EAAE,OAAO,CAAC;IAEpC,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;IACnE,IAAI,SAAS;QAAE,OAAO,SAAS,CAAC;IAEhC,IAAI,uBAAuB,CAAE,GAAW,CAAC,OAAO,CAAC;QAAE,OAAQ,GAAW,CAAC,OAAO,CAAC;IAE/E,OAAO,IAAI,CAAC;AACd,CAAC;AAED,8EAA8E;AAC9E,2EAA2E;AAC3E,yEAAyE;AACzE,8EAA8E;AAE9E,IAAI,mBAAmB,GAAG,CAAC,CAAC;AAC5B,MAAM,oBAAoB,GAAG,IAAI,GAAG,EAGjC,CAAC;AACJ,MAAM,mBAAmB,GAAG,IAAI,eAAe,EAAE,CAAC;AAElD,SAAS,eAAe,CACtB,IAAY,EACZ,OAAgC;IAEhC,OAAO,IAAI,OAAO,CAA0B,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QAC9D,MAAM,SAAS,GAAG,mBAAmB,EAAE,CAAC;QACxC,
|
|
1
|
+
{"version":3,"file":"child-runner.js","sourceRoot":"","sources":["../../src/executor/child-runner.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"subprocess.d.ts","sourceRoot":"","sources":["../../src/executor/subprocess.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAOH,OAAO,KAAK,EAAE,cAAc,EAAE,cAAc,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAGhG;;;;;;;GAOG;AACH,MAAM,MAAM,oBAAoB,GAAG,IAAI,GAAG,eAAe,GAAG,SAAS,GAAG,KAAK,GAAG,OAAO,CAAC;AAExF,mEAAmE;AACnE,MAAM,WAAW,qBAAqB;IACpC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,oBAAoB,CAAC;CAClC;AAED,qBAAa,eAAgB,SAAQ,KAAM,YAAW,qBAAqB;IACzE,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,oBAAoB,CAAC;gBAG/B,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,qBAAqB,EAClC,OAAO,CAAC,EAAE;QAAE,KAAK,CAAC,EAAE,OAAO,CAAA;KAAE;CAShC;AAqDD,UAAU,yBAAyB;IACjC,kEAAkE;IAClE,SAAS,EAAE,MAAM,CAAC;IAClB,oEAAoE;IACpE,eAAe,EAAE,MAAM,CAAC;CACzB;AAOD,qBAAa,kBAAmB,YAAW,YAAY;IACrD,OAAO,CAAC,OAAO,CAA4B;gBAE/B,OAAO,CAAC,EAAE,OAAO,CAAC,yBAAyB,CAAC;IAIlD,OAAO,CACX,YAAY,EAAE,MAAM,EACpB,OAAO,EAAE,WAAW,EACpB,KAAK,CAAC,EAAE,cAAc,GACrB,OAAO,CAAC,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"subprocess.d.ts","sourceRoot":"","sources":["../../src/executor/subprocess.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAOH,OAAO,KAAK,EAAE,cAAc,EAAE,cAAc,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAGhG;;;;;;;GAOG;AACH,MAAM,MAAM,oBAAoB,GAAG,IAAI,GAAG,eAAe,GAAG,SAAS,GAAG,KAAK,GAAG,OAAO,CAAC;AAExF,mEAAmE;AACnE,MAAM,WAAW,qBAAqB;IACpC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,oBAAoB,CAAC;CAClC;AAED,qBAAa,eAAgB,SAAQ,KAAM,YAAW,qBAAqB;IACzE,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,oBAAoB,CAAC;gBAG/B,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,qBAAqB,EAClC,OAAO,CAAC,EAAE;QAAE,KAAK,CAAC,EAAE,OAAO,CAAA;KAAE;CAShC;AAqDD,UAAU,yBAAyB;IACjC,kEAAkE;IAClE,SAAS,EAAE,MAAM,CAAC;IAClB,oEAAoE;IACpE,eAAe,EAAE,MAAM,CAAC;CACzB;AAOD,qBAAa,kBAAmB,YAAW,YAAY;IACrD,OAAO,CAAC,OAAO,CAA4B;gBAE/B,OAAO,CAAC,EAAE,OAAO,CAAC,yBAAyB,CAAC;IAIlD,OAAO,CACX,YAAY,EAAE,MAAM,EACpB,OAAO,EAAE,WAAW,EACpB,KAAK,CAAC,EAAE,cAAc,GACrB,OAAO,CAAC,cAAc,CAAC;CAmW3B"}
|
|
@@ -116,19 +116,8 @@ export class SubprocessExecutor {
|
|
|
116
116
|
}
|
|
117
117
|
}
|
|
118
118
|
// Node subprocess execution is process isolation, not a security sandbox.
|
|
119
|
-
//
|
|
120
|
-
|
|
121
|
-
const nodeVersion = parseInt(process.versions.node.split('.')[0], 10);
|
|
122
|
-
if (nodeVersion >= 20) {
|
|
123
|
-
// Uncomment only when the connector runtime is compatible with Node permissions:
|
|
124
|
-
// execArgv.push('--experimental-permission');
|
|
125
|
-
// execArgv.push(`--allow-fs-read=/tmp/*,${__dirname}/*`);
|
|
126
|
-
// execArgv.push('--allow-fs-write=/tmp/*');
|
|
127
|
-
}
|
|
128
|
-
}
|
|
129
|
-
catch {
|
|
130
|
-
// Ignore - permissions are best-effort
|
|
131
|
-
}
|
|
119
|
+
// Node --experimental-permission flags intentionally NOT enabled — the
|
|
120
|
+
// connector runtime isn't compatible. Revisit if that changes.
|
|
132
121
|
const child = fork(childRunnerPath, [], {
|
|
133
122
|
stdio: ['pipe', 'pipe', 'pipe', 'ipc'],
|
|
134
123
|
execArgv,
|
|
@@ -194,13 +183,12 @@ export class SubprocessExecutor {
|
|
|
194
183
|
const combinedTail = () => {
|
|
195
184
|
const out = stdoutTail.toString();
|
|
196
185
|
const err = stderrTail.toString();
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
return `[stdout]\n${out}\n[stderr]\n${err}`;
|
|
186
|
+
const parts = [];
|
|
187
|
+
if (out)
|
|
188
|
+
parts.push(`[stdout]\n${out}`);
|
|
189
|
+
if (err)
|
|
190
|
+
parts.push(`[stderr]\n${err}`);
|
|
191
|
+
return parts.join('\n');
|
|
204
192
|
};
|
|
205
193
|
const computeExitReason = (tail) => {
|
|
206
194
|
if (timedOut)
|
|
@@ -209,8 +197,11 @@ export class SubprocessExecutor {
|
|
|
209
197
|
return 'oom';
|
|
210
198
|
return 'crash';
|
|
211
199
|
};
|
|
212
|
-
// Handle messages from child
|
|
200
|
+
// Handle messages from child. The child runs untrusted connector code,
|
|
201
|
+
// so validate shape at this trust boundary before dereferencing fields.
|
|
213
202
|
const onMessage = (msg) => {
|
|
203
|
+
if (!msg || typeof msg !== 'object' || typeof msg.type !== 'string')
|
|
204
|
+
return;
|
|
214
205
|
if (msg.type === 'content_chunk') {
|
|
215
206
|
const items = Array.isArray(msg.items) ? msg.items : [];
|
|
216
207
|
queueTask(async () => {
|
|
@@ -256,14 +247,24 @@ export class SubprocessExecutor {
|
|
|
256
247
|
const signal = await hooks.onAwaitAuthSignal(name, {
|
|
257
248
|
timeoutMs: timeoutMs ?? undefined,
|
|
258
249
|
});
|
|
259
|
-
|
|
250
|
+
try {
|
|
251
|
+
child.send({ type: 'await_signal_response', requestId, signal });
|
|
252
|
+
}
|
|
253
|
+
catch {
|
|
254
|
+
/* IPC closed — child already exited. */
|
|
255
|
+
}
|
|
260
256
|
}
|
|
261
257
|
catch (err) {
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
|
|
258
|
+
try {
|
|
259
|
+
child.send({
|
|
260
|
+
type: 'await_signal_response',
|
|
261
|
+
requestId,
|
|
262
|
+
error: err instanceof Error ? err.message : String(err),
|
|
263
|
+
});
|
|
264
|
+
}
|
|
265
|
+
catch {
|
|
266
|
+
/* IPC closed — child already exited. */
|
|
267
|
+
}
|
|
267
268
|
}
|
|
268
269
|
});
|
|
269
270
|
return;
|
|
@@ -308,7 +309,9 @@ export class SubprocessExecutor {
|
|
|
308
309
|
// (which is also written to gateway logs by upstream callers).
|
|
309
310
|
const rawMessage = msg.error?.message ?? 'Subprocess reported error';
|
|
310
311
|
const error = new SubprocessError(redactOutput(rawMessage), diagnostics);
|
|
311
|
-
|
|
312
|
+
// Redact `name` too — connector code can throw `class Err extends Error { name = '<secret>' }`
|
|
313
|
+
// and Error.toString() / log formatters print `${name}: ${message}`.
|
|
314
|
+
error.name = msg.error?.name ? redactOutput(String(msg.error.name)) : 'SubprocessError';
|
|
312
315
|
if (msg.error?.stack)
|
|
313
316
|
error.stack = redactOutput(msg.error.stack);
|
|
314
317
|
settle(() => reject(error));
|
|
@@ -377,7 +380,10 @@ export class SubprocessExecutor {
|
|
|
377
380
|
child.on('exit', onExit);
|
|
378
381
|
child.stdout?.on('data', onStdout);
|
|
379
382
|
child.stderr?.on('data', onStderr);
|
|
380
|
-
// Send the compiled code and context to the child
|
|
383
|
+
// Send the compiled code and context to the child. Use the callback
|
|
384
|
+
// form so a failed send (e.g. child died before IPC handshake, or fork
|
|
385
|
+
// resolved to a non-existent file) rejects the executor promise
|
|
386
|
+
// instead of going unhandled on the IPC channel.
|
|
381
387
|
child.send({
|
|
382
388
|
compiledCode,
|
|
383
389
|
context: {
|
|
@@ -387,6 +393,27 @@ export class SubprocessExecutor {
|
|
|
387
393
|
sessionState: context.sessionState,
|
|
388
394
|
apiType: context.apiType,
|
|
389
395
|
},
|
|
396
|
+
}, (err) => {
|
|
397
|
+
if (err) {
|
|
398
|
+
const tail = redactOutput(combinedTail());
|
|
399
|
+
const diagnostics = {
|
|
400
|
+
exitCode: null,
|
|
401
|
+
exitSignal: null,
|
|
402
|
+
outputTail: tail,
|
|
403
|
+
exitReason: 'crash',
|
|
404
|
+
};
|
|
405
|
+
settle(() => {
|
|
406
|
+
try {
|
|
407
|
+
child.kill('SIGKILL');
|
|
408
|
+
}
|
|
409
|
+
catch {
|
|
410
|
+
/* already dead */
|
|
411
|
+
}
|
|
412
|
+
reject(new SubprocessError(`Subprocess IPC send failed: ${err.message}`, diagnostics, {
|
|
413
|
+
cause: err,
|
|
414
|
+
}));
|
|
415
|
+
});
|
|
416
|
+
}
|
|
390
417
|
});
|
|
391
418
|
});
|
|
392
419
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"subprocess.js","sourceRoot":"","sources":["../../src/executor/subprocess.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"subprocess.js","sourceRoot":"","sources":["../../src/executor/subprocess.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@lobu/connector-worker",
|
|
3
|
-
"version": "7.
|
|
3
|
+
"version": "7.1.0",
|
|
4
4
|
"description": "Self-hosted worker for Lobu memory — connectors and embedding generation",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"bin": {
|
|
@@ -15,7 +15,15 @@
|
|
|
15
15
|
"import": "./dist/embeddings.js",
|
|
16
16
|
"types": "./dist/embeddings.d.ts"
|
|
17
17
|
},
|
|
18
|
-
"./executor/child-runner": "./dist/executor/child-runner.js"
|
|
18
|
+
"./executor/child-runner": "./dist/executor/child-runner.js",
|
|
19
|
+
"./executor/runtime": {
|
|
20
|
+
"import": "./dist/executor/runtime.js",
|
|
21
|
+
"types": "./dist/executor/runtime.d.ts"
|
|
22
|
+
},
|
|
23
|
+
"./executor/interface": {
|
|
24
|
+
"import": "./dist/executor/interface.js",
|
|
25
|
+
"types": "./dist/executor/interface.d.ts"
|
|
26
|
+
}
|
|
19
27
|
},
|
|
20
28
|
"files": [
|
|
21
29
|
"dist",
|
|
@@ -30,12 +38,14 @@
|
|
|
30
38
|
"clean": "rm -rf dist"
|
|
31
39
|
},
|
|
32
40
|
"dependencies": {
|
|
33
|
-
"@lobu/connector-sdk": "7.
|
|
34
|
-
"@lobu/embeddings": "7.
|
|
35
|
-
"@lobu/worker": "7.
|
|
41
|
+
"@lobu/connector-sdk": "7.1.0",
|
|
42
|
+
"@lobu/embeddings": "7.1.0",
|
|
43
|
+
"@lobu/worker": "7.1.0",
|
|
36
44
|
"@xenova/transformers": "^2.17.2",
|
|
45
|
+
"esbuild": "^0.25.0",
|
|
37
46
|
"jimp": "^1.6.0",
|
|
38
47
|
"playwright": "npm:patchright@^1.57.0",
|
|
48
|
+
"playwright-vanilla": "npm:playwright@^1.60.0",
|
|
39
49
|
"sharp": "^0.34.4"
|
|
40
50
|
},
|
|
41
51
|
"devDependencies": {
|