@trigger.dev/core 4.0.0-v4-beta.15 → 4.0.0-v4-beta.17
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/commonjs/v3/config.d.ts +38 -0
- package/dist/commonjs/v3/runEngineWorker/supervisor/http.d.ts +1 -0
- package/dist/commonjs/v3/runEngineWorker/supervisor/http.js +4 -2
- package/dist/commonjs/v3/runEngineWorker/supervisor/http.js.map +1 -1
- package/dist/commonjs/v3/runEngineWorker/supervisor/queueConsumer.d.ts +1 -0
- package/dist/commonjs/v3/runEngineWorker/supervisor/queueConsumer.js +25 -11
- package/dist/commonjs/v3/runEngineWorker/supervisor/queueConsumer.js.map +1 -1
- package/dist/commonjs/v3/runEngineWorker/supervisor/session.d.ts +1 -0
- package/dist/commonjs/v3/runEngineWorker/supervisor/session.js +22 -27
- package/dist/commonjs/v3/runEngineWorker/supervisor/session.js.map +1 -1
- package/dist/commonjs/v3/schemas/common.d.ts +6 -0
- package/dist/commonjs/v3/schemas/common.js +2 -0
- package/dist/commonjs/v3/schemas/common.js.map +1 -1
- package/dist/commonjs/v3/serverOnly/httpServer.js +2 -2
- package/dist/commonjs/v3/serverOnly/httpServer.js.map +1 -1
- package/dist/commonjs/v3/utils/ioSerialization.d.ts +1 -0
- package/dist/commonjs/v3/utils/ioSerialization.js +21 -0
- package/dist/commonjs/v3/utils/ioSerialization.js.map +1 -1
- package/dist/commonjs/v3/utils/structuredLogger.d.ts +4 -1
- package/dist/commonjs/v3/utils/structuredLogger.js +18 -4
- package/dist/commonjs/v3/utils/structuredLogger.js.map +1 -1
- package/dist/commonjs/version.js +1 -1
- package/dist/esm/v3/config.d.ts +38 -0
- package/dist/esm/v3/runEngineWorker/supervisor/http.d.ts +1 -0
- package/dist/esm/v3/runEngineWorker/supervisor/http.js +4 -2
- package/dist/esm/v3/runEngineWorker/supervisor/http.js.map +1 -1
- package/dist/esm/v3/runEngineWorker/supervisor/queueConsumer.d.ts +1 -0
- package/dist/esm/v3/runEngineWorker/supervisor/queueConsumer.js +25 -11
- package/dist/esm/v3/runEngineWorker/supervisor/queueConsumer.js.map +1 -1
- package/dist/esm/v3/runEngineWorker/supervisor/session.d.ts +1 -0
- package/dist/esm/v3/runEngineWorker/supervisor/session.js +22 -27
- package/dist/esm/v3/runEngineWorker/supervisor/session.js.map +1 -1
- package/dist/esm/v3/schemas/common.d.ts +6 -0
- package/dist/esm/v3/schemas/common.js +2 -0
- package/dist/esm/v3/schemas/common.js.map +1 -1
- package/dist/esm/v3/serverOnly/httpServer.js +2 -2
- package/dist/esm/v3/serverOnly/httpServer.js.map +1 -1
- package/dist/esm/v3/utils/ioSerialization.d.ts +1 -0
- package/dist/esm/v3/utils/ioSerialization.js +20 -0
- package/dist/esm/v3/utils/ioSerialization.js.map +1 -1
- package/dist/esm/v3/utils/structuredLogger.d.ts +4 -1
- package/dist/esm/v3/utils/structuredLogger.js +18 -4
- package/dist/esm/v3/utils/structuredLogger.js.map +1 -1
- package/dist/esm/version.js +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ioSerialization.js","sourceRoot":"","sources":["../../../../src/v3/utils/ioSerialization.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"ioSerialization.js","sourceRoot":"","sources":["../../../../src/v3/utils/ioSerialization.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,13 +12,15 @@ export declare enum LogLevel {
|
|
|
12
12
|
"error" = 1,
|
|
13
13
|
"warn" = 2,
|
|
14
14
|
"info" = 3,
|
|
15
|
-
"debug" = 4
|
|
15
|
+
"debug" = 4,
|
|
16
|
+
"verbose" = 5
|
|
16
17
|
}
|
|
17
18
|
export declare class SimpleStructuredLogger implements StructuredLogger {
|
|
18
19
|
#private;
|
|
19
20
|
private name;
|
|
20
21
|
private level;
|
|
21
22
|
private fields?;
|
|
23
|
+
private prettyPrint;
|
|
22
24
|
constructor(name: string, level?: LogLevel, fields?: Record<string, unknown> | undefined);
|
|
23
25
|
child(fields: Record<string, unknown>, level?: LogLevel): SimpleStructuredLogger;
|
|
24
26
|
log(message: string, ...args: StructuredArgs): void;
|
|
@@ -26,6 +28,7 @@ export declare class SimpleStructuredLogger implements StructuredLogger {
|
|
|
26
28
|
warn(message: string, ...args: StructuredArgs): void;
|
|
27
29
|
info(message: string, ...args: StructuredArgs): void;
|
|
28
30
|
debug(message: string, ...args: StructuredArgs): void;
|
|
31
|
+
verbose(message: string, ...args: StructuredArgs): void;
|
|
29
32
|
addFields(fields: Record<string, unknown>): void;
|
|
30
33
|
}
|
|
31
34
|
export {};
|
|
@@ -8,14 +8,18 @@ var LogLevel;
|
|
|
8
8
|
LogLevel[LogLevel["warn"] = 2] = "warn";
|
|
9
9
|
LogLevel[LogLevel["info"] = 3] = "info";
|
|
10
10
|
LogLevel[LogLevel["debug"] = 4] = "debug";
|
|
11
|
+
LogLevel[LogLevel["verbose"] = 5] = "verbose";
|
|
11
12
|
})(LogLevel || (exports.LogLevel = LogLevel = {}));
|
|
12
13
|
class SimpleStructuredLogger {
|
|
13
14
|
name;
|
|
14
15
|
level;
|
|
15
16
|
fields;
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
17
|
+
prettyPrint = ["1", "true"].includes(process.env.PRETTY_LOGS ?? "");
|
|
18
|
+
constructor(name, level = ["1", "true"].includes(process.env.VERBOSE ?? "")
|
|
19
|
+
? LogLevel.verbose
|
|
20
|
+
: ["1", "true"].includes(process.env.DEBUG ?? "")
|
|
21
|
+
? LogLevel.debug
|
|
22
|
+
: LogLevel.info, fields) {
|
|
19
23
|
this.name = name;
|
|
20
24
|
this.level = level;
|
|
21
25
|
this.fields = fields;
|
|
@@ -48,6 +52,11 @@ class SimpleStructuredLogger {
|
|
|
48
52
|
return;
|
|
49
53
|
this.#structuredLog(console.debug, message, "debug", ...args);
|
|
50
54
|
}
|
|
55
|
+
verbose(message, ...args) {
|
|
56
|
+
if (this.level < LogLevel.verbose)
|
|
57
|
+
return;
|
|
58
|
+
this.#structuredLog(console.debug, message, "verbose", ...args);
|
|
59
|
+
}
|
|
51
60
|
addFields(fields) {
|
|
52
61
|
this.fields = {
|
|
53
62
|
...this.fields,
|
|
@@ -63,7 +72,12 @@ class SimpleStructuredLogger {
|
|
|
63
72
|
...this.fields,
|
|
64
73
|
...(args.length === 1 ? args[0] : args),
|
|
65
74
|
};
|
|
66
|
-
|
|
75
|
+
if (this.prettyPrint) {
|
|
76
|
+
loggerFunction(JSON.stringify(structuredLog, null, 2));
|
|
77
|
+
}
|
|
78
|
+
else {
|
|
79
|
+
loggerFunction(JSON.stringify(structuredLog));
|
|
80
|
+
}
|
|
67
81
|
}
|
|
68
82
|
}
|
|
69
83
|
exports.SimpleStructuredLogger = SimpleStructuredLogger;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"structuredLogger.js","sourceRoot":"","sources":["../../../../src/v3/utils/structuredLogger.ts"],"names":[],"mappings":";;;AAWA,IAAY,
|
|
1
|
+
{"version":3,"file":"structuredLogger.js","sourceRoot":"","sources":["../../../../src/v3/utils/structuredLogger.ts"],"names":[],"mappings":"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"}
|
package/dist/commonjs/version.js
CHANGED
package/dist/esm/v3/config.d.ts
CHANGED
|
@@ -142,6 +142,44 @@ export type TriggerConfig = {
|
|
|
142
142
|
* @see https://trigger.dev/docs/config/config-file#external
|
|
143
143
|
*/
|
|
144
144
|
external?: string[];
|
|
145
|
+
/**
|
|
146
|
+
* **WARNING: This is an experimental feature and might be removed in a future version.**
|
|
147
|
+
*
|
|
148
|
+
* Automatically detect dependencies that shouldn't be bundled and mark them as external. For example, native modules.
|
|
149
|
+
*
|
|
150
|
+
* Turning this on will not affect dependencies that were manually added to the `external` array.
|
|
151
|
+
*
|
|
152
|
+
* @default false
|
|
153
|
+
*
|
|
154
|
+
* @deprecated (experimental)
|
|
155
|
+
*/
|
|
156
|
+
experimental_autoDetectExternal?: boolean;
|
|
157
|
+
/**
|
|
158
|
+
* **WARNING: This is an experimental feature and might be removed in a future version.**
|
|
159
|
+
*
|
|
160
|
+
* Preserve the original names of functions and classes in the bundle. This can fix issues with frameworks that rely on the original names for registration and binding, for example MikroORM.
|
|
161
|
+
*
|
|
162
|
+
* @link https://esbuild.github.io/api/#keep-names
|
|
163
|
+
*
|
|
164
|
+
* @default false
|
|
165
|
+
*
|
|
166
|
+
* @deprecated (experimental)
|
|
167
|
+
*/
|
|
168
|
+
experimental_keepNames?: boolean;
|
|
169
|
+
/**
|
|
170
|
+
* **WARNING: This is an experimental feature and might be removed in a future version.**
|
|
171
|
+
*
|
|
172
|
+
* "Minification is not safe for 100% of all JavaScript code" - esbuild docs
|
|
173
|
+
*
|
|
174
|
+
* Minify the generated code to help decrease bundle size. This may break stuff.
|
|
175
|
+
*
|
|
176
|
+
* @link https://esbuild.github.io/api/#minify
|
|
177
|
+
*
|
|
178
|
+
* @default false
|
|
179
|
+
*
|
|
180
|
+
* @deprecated (experimental)
|
|
181
|
+
*/
|
|
182
|
+
experimental_minify?: boolean;
|
|
145
183
|
jsx?: {
|
|
146
184
|
/**
|
|
147
185
|
* @default "React.createElement"
|
|
@@ -6,6 +6,7 @@ export declare class SupervisorHttpClient {
|
|
|
6
6
|
private readonly workerToken;
|
|
7
7
|
private readonly instanceName;
|
|
8
8
|
private readonly defaultHeaders;
|
|
9
|
+
private readonly logger;
|
|
9
10
|
constructor(opts: SupervisorHttpClientOptions);
|
|
10
11
|
connect(body: WorkerApiConnectRequestBody): Promise<import("../../zodfetch.js").ApiResult<{
|
|
11
12
|
ok: true;
|
|
@@ -4,11 +4,13 @@ import { getDefaultWorkerHeaders } from "./util.js";
|
|
|
4
4
|
import { wrapZodFetch } from "../../zodfetch.js";
|
|
5
5
|
import { createHeaders } from "../util.js";
|
|
6
6
|
import { WORKER_HEADERS } from "../consts.js";
|
|
7
|
+
import { SimpleStructuredLogger } from "../../utils/structuredLogger.js";
|
|
7
8
|
export class SupervisorHttpClient {
|
|
8
9
|
apiUrl;
|
|
9
10
|
workerToken;
|
|
10
11
|
instanceName;
|
|
11
12
|
defaultHeaders;
|
|
13
|
+
logger = new SimpleStructuredLogger("supervisor-http-client");
|
|
12
14
|
constructor(opts) {
|
|
13
15
|
this.apiUrl = opts.apiUrl.replace(/\/$/, "");
|
|
14
16
|
this.workerToken = opts.workerToken;
|
|
@@ -124,11 +126,11 @@ export class SupervisorHttpClient {
|
|
|
124
126
|
body: JSON.stringify(body),
|
|
125
127
|
});
|
|
126
128
|
if (!res.success) {
|
|
127
|
-
|
|
129
|
+
this.logger.error("Failed to send debug log", { error: res.error });
|
|
128
130
|
}
|
|
129
131
|
}
|
|
130
132
|
catch (error) {
|
|
131
|
-
|
|
133
|
+
this.logger.error("Failed to send debug log (caught error)", { error });
|
|
132
134
|
}
|
|
133
135
|
}
|
|
134
136
|
async continueRunExecution(runId, snapshotId, runnerId) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http.js","sourceRoot":"","sources":["../../../../../src/v3/runEngineWorker/supervisor/http.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAEL,4BAA4B,EAC5B,wCAAwC,EAExC,4BAA4B,EAE5B,8BAA8B,EAE9B,uCAAuC,EAEvC,oCAAoC,EAEpC,iCAAiC,EACjC,sCAAsC,EAGtC,+BAA+B,EAC/B,sCAAsC,GACvC,MAAM,cAAc,CAAC;AAEtB,OAAO,EAAE,uBAAuB,EAAE,MAAM,WAAW,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"http.js","sourceRoot":"","sources":["../../../../../src/v3/runEngineWorker/supervisor/http.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAEL,4BAA4B,EAC5B,wCAAwC,EAExC,4BAA4B,EAE5B,8BAA8B,EAE9B,uCAAuC,EAEvC,oCAAoC,EAEpC,iCAAiC,EACjC,sCAAsC,EAGtC,+BAA+B,EAC/B,sCAAsC,GACvC,MAAM,cAAc,CAAC;AAEtB,OAAO,EAAE,uBAAuB,EAAE,MAAM,WAAW,CAAC;AACpD,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACjD,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AAIzE,MAAM,OAAO,oBAAoB;IACd,MAAM,CAAS;IACf,WAAW,CAAS;IACpB,YAAY,CAAS;IACrB,cAAc,CAAyB;IAEvC,MAAM,GAAG,IAAI,sBAAsB,CAAC,wBAAwB,CAAC,CAAC;IAE/E,YAAY,IAAiC;QAC3C,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QAC7C,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC;QACpC,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,YAAY,CAAC;QACtC,IAAI,CAAC,cAAc,GAAG,uBAAuB,CAAC,IAAI,CAAC,CAAC;QAEpD,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YACjB,MAAM,IAAI,KAAK,CAAC,uDAAuD,CAAC,CAAC;QAC3E,CAAC;QAED,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;YACtB,MAAM,IAAI,KAAK,CAAC,4DAA4D,CAAC,CAAC;QAChF,CAAC;QAED,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;YACvB,MAAM,IAAI,KAAK,CAAC,6DAA6D,CAAC,CAAC;QACjF,CAAC;IACH,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,IAAiC;QAC7C,OAAO,YAAY,CACjB,4BAA4B,EAC5B,GAAG,IAAI,CAAC,MAAM,mCAAmC,EACjD;YACE,MAAM,EAAE,MAAM;YACd,OAAO,EAAE;gBACP,GAAG,IAAI,CAAC,cAAc;gBACtB,cAAc,EAAE,kBAAkB;aACnC;YACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;SAC3B,CACF,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,IAAiC;QAC7C,OAAO,YAAY,CACjB,4BAA4B,EAC5B,GAAG,IAAI,CAAC,MAAM,mCAAmC,EACjD;YACE,MAAM,EAAE,MAAM;YACd,OAAO,EAAE;gBACP,GAAG,IAAI,CAAC,cAAc;gBACtB,cAAc,EAAE,kBAAkB;aACnC;YACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;SAC3B,CACF,CAAC;IACJ,CAAC;IAED,qCAAqC;IACrC,KAAK,CAAC,kBAAkB,CAAC,YAAoB,EAAE,WAAW,GAAG,CAAC,EAAE,QAAiB;QAC/E,OAAO,YAAY,CACjB,4BAA4B,EAC5B,GAAG,IAAI,CAAC,MAAM,yCAAyC,YAAY,wBAAwB,WAAW,EAAE,EACxG;YACE,OAAO,EAAE;gBACP,GAAG,IAAI,CAAC,cAAc;gBACtB,GAAG,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC;aACjC;SACF,CACF,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,IAAmC;QACvD,OAAO,YAAY,CACjB,8BAA8B,EAC9B,GAAG,IAAI,CAAC,MAAM,qCAAqC,EACnD;YACE,MAAM,EAAE,MAAM;YACd,OAAO,EAAE;gBACP,GAAG,IAAI,CAAC,cAAc;gBACtB,cAAc,EAAE,kBAAkB;aACnC;YACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;SAC3B,CACF,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,YAAY,CAChB,KAAa,EACb,UAAkB,EAClB,IAAsC,EACtC,QAAiB;QAEjB,OAAO,YAAY,CACjB,iCAAiC,EACjC,GAAG,IAAI,CAAC,MAAM,kCAAkC,KAAK,cAAc,UAAU,YAAY,EACzF;YACE,MAAM,EAAE,MAAM;YACd,OAAO,EAAE;gBACP,GAAG,IAAI,CAAC,cAAc;gBACtB,GAAG,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC;gBAChC,cAAc,EAAE,kBAAkB;aACnC;YACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;SAC3B,CACF,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,eAAe,CACnB,KAAa,EACb,UAAkB,EAClB,IAAyC,EACzC,QAAiB;QAEjB,OAAO,YAAY,CACjB,oCAAoC,EACpC,GAAG,IAAI,CAAC,MAAM,kCAAkC,KAAK,cAAc,UAAU,iBAAiB,EAC9F;YACE,MAAM,EAAE,MAAM;YACd,OAAO,EAAE;gBACP,GAAG,IAAI,CAAC,cAAc;gBACtB,GAAG,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC;aACjC;YACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;SAC3B,CACF,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,kBAAkB,CACtB,KAAa,EACb,UAAkB,EAClB,IAA4C,EAC5C,QAAiB;QAEjB,OAAO,YAAY,CACjB,uCAAuC,EACvC,GAAG,IAAI,CAAC,MAAM,kCAAkC,KAAK,cAAc,UAAU,oBAAoB,EACjG;YACE,MAAM,EAAE,MAAM;YACd,OAAO,EAAE;gBACP,GAAG,IAAI,CAAC,cAAc;gBACtB,GAAG,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC;aACjC;YACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;SAC3B,CACF,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,KAAa,EAAE,QAAiB;QACtD,OAAO,YAAY,CACjB,sCAAsC,EACtC,GAAG,IAAI,CAAC,MAAM,kCAAkC,KAAK,mBAAmB,EACxE;YACE,MAAM,EAAE,KAAK;YACb,OAAO,EAAE;gBACP,GAAG,IAAI,CAAC,cAAc;gBACtB,GAAG,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC;aACjC;SACF,CACF,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,KAAa,EAAE,UAAkB,EAAE,QAAiB;QAC1E,OAAO,YAAY,CACjB,sCAAsC,EACtC,GAAG,IAAI,CAAC,MAAM,kCAAkC,KAAK,oBAAoB,UAAU,EAAE,EACrF;YACE,MAAM,EAAE,KAAK;YACb,OAAO,EAAE;gBACP,GAAG,IAAI,CAAC,cAAc;gBACtB,GAAG,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC;aACjC;SACF,CACF,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,KAAa,EAAE,IAA2B,EAAE,QAAiB;QAC9E,IAAI,CAAC;YACH,MAAM,GAAG,GAAG,MAAM,YAAY,CAC5B,CAAC,CAAC,OAAO,EAAE,EACX,GAAG,IAAI,CAAC,MAAM,kCAAkC,KAAK,aAAa,EAClE;gBACE,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE;oBACP,GAAG,IAAI,CAAC,cAAc;oBACtB,GAAG,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC;oBAChC,cAAc,EAAE,kBAAkB;iBACnC;gBACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;aAC3B,CACF,CAAC;YAEF,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;gBACjB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,0BAA0B,EAAE,EAAE,KAAK,EAAE,GAAG,CAAC,KAAK,EAAE,CAAC,CAAC;YACtE,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,yCAAyC,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;QAC1E,CAAC;IACH,CAAC;IAED,KAAK,CAAC,oBAAoB,CAAC,KAAa,EAAE,UAAkB,EAAE,QAAiB;QAC7E,OAAO,YAAY,CACjB,wCAAwC,EACxC,GAAG,IAAI,CAAC,MAAM,kCAAkC,KAAK,cAAc,UAAU,WAAW,EACxF;YACE,MAAM,EAAE,KAAK;YACb,OAAO,EAAE;gBACP,GAAG,IAAI,CAAC,cAAc;gBACtB,GAAG,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC;aACjC;SACF,CACF,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,uBAAuB,CAAC,EAC5B,KAAK,EACL,UAAU,EACV,QAAQ,EACR,IAAI,GAML;QACC,OAAO,YAAY,CACjB,+BAA+B,EAC/B,GAAG,IAAI,CAAC,MAAM,kCAAkC,KAAK,cAAc,UAAU,UAAU,EACvF;YACE,MAAM,EAAE,MAAM;YACd,OAAO,EAAE;gBACP,GAAG,IAAI,CAAC,cAAc;gBACtB,GAAG,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC;gBAChC,cAAc,EAAE,kBAAkB;aACnC;YACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;SAC3B,CACF,CAAC;IACJ,CAAC;IAEO,cAAc,CAAC,QAAiB;QACtC,OAAO,aAAa,CAAC;YACnB,CAAC,cAAc,CAAC,SAAS,CAAC,EAAE,QAAQ;SACrC,CAAC,CAAC;IACL,CAAC;CACF"}
|
|
@@ -1,9 +1,11 @@
|
|
|
1
|
+
import { SimpleStructuredLogger } from "../../utils/structuredLogger.js";
|
|
1
2
|
export class RunQueueConsumer {
|
|
2
3
|
client;
|
|
3
4
|
preDequeue;
|
|
4
5
|
preSkip;
|
|
5
6
|
maxRunCount;
|
|
6
7
|
onDequeue;
|
|
8
|
+
logger = new SimpleStructuredLogger("queue-consumer");
|
|
7
9
|
intervalMs;
|
|
8
10
|
idleIntervalMs;
|
|
9
11
|
isEnabled;
|
|
@@ -31,35 +33,44 @@ export class RunQueueConsumer {
|
|
|
31
33
|
this.isEnabled = false;
|
|
32
34
|
}
|
|
33
35
|
async dequeue() {
|
|
34
|
-
|
|
35
|
-
|
|
36
|
+
this.logger.verbose("dequeue()", {
|
|
37
|
+
enabled: this.isEnabled,
|
|
38
|
+
intervalMs: this.intervalMs,
|
|
39
|
+
idleIntervalMs: this.idleIntervalMs,
|
|
40
|
+
maxRunCount: this.maxRunCount,
|
|
41
|
+
preDequeue: !!this.preDequeue,
|
|
42
|
+
preSkip: !!this.preSkip,
|
|
43
|
+
});
|
|
36
44
|
if (!this.isEnabled) {
|
|
45
|
+
this.logger.warn("dequeue() - not enabled");
|
|
37
46
|
return;
|
|
38
47
|
}
|
|
39
48
|
let preDequeueResult;
|
|
40
49
|
if (this.preDequeue) {
|
|
41
|
-
|
|
50
|
+
this.logger.verbose("preDequeue()");
|
|
42
51
|
try {
|
|
43
52
|
preDequeueResult = await this.preDequeue();
|
|
44
53
|
}
|
|
45
54
|
catch (preDequeueError) {
|
|
46
|
-
|
|
55
|
+
this.logger.error("preDequeue error", { error: preDequeueError });
|
|
47
56
|
}
|
|
48
57
|
}
|
|
49
|
-
|
|
58
|
+
this.logger.verbose("preDequeueResult", { preDequeueResult });
|
|
50
59
|
if (preDequeueResult?.skipDequeue ||
|
|
51
60
|
preDequeueResult?.maxResources?.cpu === 0 ||
|
|
52
61
|
preDequeueResult?.maxResources?.memory === 0) {
|
|
62
|
+
this.logger.debug("skipping dequeue", { preDequeueResult });
|
|
53
63
|
if (this.preSkip) {
|
|
54
|
-
|
|
64
|
+
this.logger.debug("preSkip()");
|
|
55
65
|
try {
|
|
56
66
|
await this.preSkip();
|
|
57
67
|
}
|
|
58
68
|
catch (preSkipError) {
|
|
59
|
-
|
|
69
|
+
this.logger.error("preSkip error", { error: preSkipError });
|
|
60
70
|
}
|
|
61
71
|
}
|
|
62
|
-
|
|
72
|
+
this.scheduleNextDequeue(this.idleIntervalMs);
|
|
73
|
+
return;
|
|
63
74
|
}
|
|
64
75
|
let nextIntervalMs = this.idleIntervalMs;
|
|
65
76
|
try {
|
|
@@ -68,7 +79,7 @@ export class RunQueueConsumer {
|
|
|
68
79
|
maxRunCount: this.maxRunCount,
|
|
69
80
|
});
|
|
70
81
|
if (!response.success) {
|
|
71
|
-
|
|
82
|
+
this.logger.error("Failed to dequeue", { error: response.error });
|
|
72
83
|
}
|
|
73
84
|
else {
|
|
74
85
|
try {
|
|
@@ -78,16 +89,19 @@ export class RunQueueConsumer {
|
|
|
78
89
|
}
|
|
79
90
|
}
|
|
80
91
|
catch (handlerError) {
|
|
81
|
-
|
|
92
|
+
this.logger.error("onDequeue error", { error: handlerError });
|
|
82
93
|
}
|
|
83
94
|
}
|
|
84
95
|
}
|
|
85
96
|
catch (clientError) {
|
|
86
|
-
|
|
97
|
+
this.logger.error("client.dequeue error", { error: clientError });
|
|
87
98
|
}
|
|
88
99
|
this.scheduleNextDequeue(nextIntervalMs);
|
|
89
100
|
}
|
|
90
101
|
scheduleNextDequeue(delayMs) {
|
|
102
|
+
if (delayMs === this.idleIntervalMs && this.idleIntervalMs !== this.intervalMs) {
|
|
103
|
+
this.logger.verbose("scheduled dequeue with idle interval", { delayMs });
|
|
104
|
+
}
|
|
91
105
|
setTimeout(this.dequeue.bind(this), delayMs);
|
|
92
106
|
}
|
|
93
107
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"queueConsumer.js","sourceRoot":"","sources":["../../../../../src/v3/runEngineWorker/supervisor/queueConsumer.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"queueConsumer.js","sourceRoot":"","sources":["../../../../../src/v3/runEngineWorker/supervisor/queueConsumer.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,6 +16,7 @@ type SupervisorSessionOptions = SupervisorClientCommonOptions & {
|
|
|
16
16
|
export declare class SupervisorSession extends EventEmitter<WorkerEvents> {
|
|
17
17
|
private opts;
|
|
18
18
|
readonly httpClient: SupervisorHttpClient;
|
|
19
|
+
private readonly logger;
|
|
19
20
|
private readonly runNotificationsEnabled;
|
|
20
21
|
private runNotificationsSocket?;
|
|
21
22
|
private readonly queueConsumerEnabled;
|
|
@@ -5,9 +5,11 @@ import { VERSION } from "../../../version.js";
|
|
|
5
5
|
import { io } from "socket.io-client";
|
|
6
6
|
import { getDefaultWorkerHeaders } from "./util.js";
|
|
7
7
|
import { IntervalService } from "../../utils/interval.js";
|
|
8
|
+
import { SimpleStructuredLogger } from "../../utils/structuredLogger.js";
|
|
8
9
|
export class SupervisorSession extends EventEmitter {
|
|
9
10
|
opts;
|
|
10
11
|
httpClient;
|
|
12
|
+
logger = new SimpleStructuredLogger("supervisor-session");
|
|
11
13
|
runNotificationsEnabled;
|
|
12
14
|
runNotificationsSocket;
|
|
13
15
|
queueConsumerEnabled;
|
|
@@ -32,26 +34,23 @@ export class SupervisorSession extends EventEmitter {
|
|
|
32
34
|
});
|
|
33
35
|
this.heartbeat = new IntervalService({
|
|
34
36
|
onInterval: async () => {
|
|
35
|
-
|
|
37
|
+
this.logger.debug("Sending heartbeat");
|
|
36
38
|
const body = this.getHeartbeatBody();
|
|
37
39
|
const response = await this.httpClient.heartbeatWorker(body);
|
|
38
40
|
if (!response.success) {
|
|
39
|
-
|
|
41
|
+
this.logger.error("Heartbeat failed", { error: response.error });
|
|
40
42
|
}
|
|
41
43
|
},
|
|
42
44
|
intervalMs: opts.heartbeatIntervalSeconds * 1000,
|
|
43
45
|
leadingEdge: false,
|
|
44
46
|
onError: async (error) => {
|
|
45
|
-
|
|
47
|
+
this.logger.error("Failed to send heartbeat", { error });
|
|
46
48
|
},
|
|
47
49
|
});
|
|
48
50
|
}
|
|
49
51
|
async onDequeue(messages) {
|
|
50
|
-
|
|
51
|
-
// console.log("[SupervisorSession] Dequeued messages", { count: messages.length });
|
|
52
|
-
// console.debug("[SupervisorSession] Dequeued messages with contents", messages);
|
|
52
|
+
this.logger.verbose("Dequeued messages with contents", { count: messages.length, messages });
|
|
53
53
|
for (const message of messages) {
|
|
54
|
-
console.log("[SupervisorSession] Emitting message", { message });
|
|
55
54
|
this.emit("runQueueMessage", {
|
|
56
55
|
time: new Date(),
|
|
57
56
|
message,
|
|
@@ -59,9 +58,9 @@ export class SupervisorSession extends EventEmitter {
|
|
|
59
58
|
}
|
|
60
59
|
}
|
|
61
60
|
subscribeToRunNotifications(runFriendlyIds) {
|
|
62
|
-
|
|
61
|
+
this.logger.debug("Subscribing to run notifications", { runFriendlyIds });
|
|
63
62
|
if (!this.runNotificationsSocket) {
|
|
64
|
-
|
|
63
|
+
this.logger.error("Socket not connected");
|
|
65
64
|
return;
|
|
66
65
|
}
|
|
67
66
|
this.runNotificationsSocket.emit("run:subscribe", { version: "1", runFriendlyIds });
|
|
@@ -71,9 +70,9 @@ export class SupervisorSession extends EventEmitter {
|
|
|
71
70
|
})));
|
|
72
71
|
}
|
|
73
72
|
unsubscribeFromRunNotifications(runFriendlyIds) {
|
|
74
|
-
|
|
73
|
+
this.logger.debug("Unsubscribing from run notifications", { runFriendlyIds });
|
|
75
74
|
if (!this.runNotificationsSocket) {
|
|
76
|
-
|
|
75
|
+
this.logger.error("Socket not connected");
|
|
77
76
|
return;
|
|
78
77
|
}
|
|
79
78
|
this.runNotificationsSocket.emit("run:unsubscribe", { version: "1", runFriendlyIds });
|
|
@@ -93,25 +92,21 @@ export class SupervisorSession extends EventEmitter {
|
|
|
93
92
|
extraHeaders: getDefaultWorkerHeaders(this.opts),
|
|
94
93
|
});
|
|
95
94
|
socket.on("run:notify", ({ version, run }) => {
|
|
96
|
-
|
|
95
|
+
this.logger.debug("[WS] Received run notification", { version, run });
|
|
97
96
|
this.emit("runNotification", { time: new Date(), run });
|
|
98
|
-
this.httpClient
|
|
99
|
-
.sendDebugLog(run.friendlyId, {
|
|
97
|
+
this.httpClient.sendDebugLog(run.friendlyId, {
|
|
100
98
|
time: new Date(),
|
|
101
99
|
message: "run:notify received by supervisor",
|
|
102
|
-
})
|
|
103
|
-
.catch((error) => {
|
|
104
|
-
console.error("[SupervisorSession] Failed to send debug log", { error });
|
|
105
100
|
});
|
|
106
101
|
});
|
|
107
102
|
socket.on("connect", () => {
|
|
108
|
-
|
|
103
|
+
this.logger.log("[WS] Connected to platform");
|
|
109
104
|
});
|
|
110
105
|
socket.on("connect_error", (error) => {
|
|
111
|
-
|
|
106
|
+
this.logger.error("[WS] Connection error", { error });
|
|
112
107
|
});
|
|
113
108
|
socket.on("disconnect", (reason, description) => {
|
|
114
|
-
|
|
109
|
+
this.logger.log("[WS] Disconnected from platform", { reason, description });
|
|
115
110
|
});
|
|
116
111
|
return socket;
|
|
117
112
|
}
|
|
@@ -122,28 +117,28 @@ export class SupervisorSession extends EventEmitter {
|
|
|
122
117
|
},
|
|
123
118
|
});
|
|
124
119
|
if (!connect.success) {
|
|
125
|
-
|
|
126
|
-
throw new Error("[SupervisorSession]
|
|
120
|
+
this.logger.error("Failed to connect", { error: connect.error });
|
|
121
|
+
throw new Error("[SupervisorSession]Failed to connect");
|
|
127
122
|
}
|
|
128
123
|
const { workerGroup } = connect.data;
|
|
129
|
-
|
|
124
|
+
this.logger.log("Connected to platform", {
|
|
130
125
|
type: workerGroup.type,
|
|
131
126
|
name: workerGroup.name,
|
|
132
127
|
});
|
|
133
128
|
if (this.queueConsumerEnabled) {
|
|
134
|
-
|
|
129
|
+
this.logger.log("Queue consumer enabled");
|
|
135
130
|
await Promise.allSettled(this.queueConsumers.map(async (q) => q.start()));
|
|
136
131
|
this.heartbeat.start();
|
|
137
132
|
}
|
|
138
133
|
else {
|
|
139
|
-
|
|
134
|
+
this.logger.warn("Queue consumer disabled");
|
|
140
135
|
}
|
|
141
136
|
if (this.runNotificationsEnabled) {
|
|
142
|
-
|
|
137
|
+
this.logger.log("Run notifications enabled");
|
|
143
138
|
this.runNotificationsSocket = this.createRunNotificationsSocket();
|
|
144
139
|
}
|
|
145
140
|
else {
|
|
146
|
-
|
|
141
|
+
this.logger.warn("Run notifications disabled");
|
|
147
142
|
}
|
|
148
143
|
}
|
|
149
144
|
async stop() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../../../../src/v3/runEngineWorker/supervisor/session.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,WAAW,CAAC;AAGjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAEtD,OAAO,YAAY,MAAM,QAAQ,CAAC;AAClC,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAE,EAAE,EAAU,MAAM,kBAAkB,CAAC;AAE9C,OAAO,EAAE,uBAAuB,EAAE,MAAM,WAAW,CAAC;AACpD,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../../../../src/v3/runEngineWorker/supervisor/session.ts"],"names":[],"mappings":"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"}
|
|
@@ -517,7 +517,9 @@ export declare const MachineConfig: z.ZodObject<{
|
|
|
517
517
|
export type MachineConfig = z.infer<typeof MachineConfig>;
|
|
518
518
|
export declare const MachinePreset: z.ZodObject<{
|
|
519
519
|
name: z.ZodEnum<["micro", "small-1x", "small-2x", "medium-1x", "medium-2x", "large-1x", "large-2x"]>;
|
|
520
|
+
/** unit: vCPU */
|
|
520
521
|
cpu: z.ZodNumber;
|
|
522
|
+
/** unit: GB */
|
|
521
523
|
memory: z.ZodNumber;
|
|
522
524
|
centsPerMs: z.ZodNumber;
|
|
523
525
|
}, "strip", z.ZodTypeAny, {
|
|
@@ -991,7 +993,9 @@ export declare const TaskRunExecution: z.ZodObject<{
|
|
|
991
993
|
}>>;
|
|
992
994
|
machine: z.ZodObject<{
|
|
993
995
|
name: z.ZodEnum<["micro", "small-1x", "small-2x", "medium-1x", "medium-2x", "large-1x", "large-2x"]>;
|
|
996
|
+
/** unit: vCPU */
|
|
994
997
|
cpu: z.ZodNumber;
|
|
998
|
+
/** unit: GB */
|
|
995
999
|
memory: z.ZodNumber;
|
|
996
1000
|
centsPerMs: z.ZodNumber;
|
|
997
1001
|
}, "strip", z.ZodTypeAny, {
|
|
@@ -1295,7 +1299,9 @@ export declare const TaskRunContext: z.ZodObject<{
|
|
|
1295
1299
|
}>>;
|
|
1296
1300
|
machine: z.ZodOptional<z.ZodObject<{
|
|
1297
1301
|
name: z.ZodEnum<["micro", "small-1x", "small-2x", "medium-1x", "medium-2x", "large-1x", "large-2x"]>;
|
|
1302
|
+
/** unit: vCPU */
|
|
1298
1303
|
cpu: z.ZodNumber;
|
|
1304
|
+
/** unit: GB */
|
|
1299
1305
|
memory: z.ZodNumber;
|
|
1300
1306
|
centsPerMs: z.ZodNumber;
|
|
1301
1307
|
}, "strip", z.ZodTypeAny, {
|