@trigger.dev/core 0.0.0-v3-prerelease-20240923150540 → 0.0.0-v3-prerelease-20241009112547
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/schemas/api.d.ts +8 -8
- package/dist/commonjs/v3/apiClient/core.js +18 -1
- package/dist/commonjs/v3/apiClient/core.js.map +1 -1
- package/dist/commonjs/v3/apiClient/index.d.ts +78 -67
- package/dist/commonjs/v3/apiClient/index.js +7 -2
- package/dist/commonjs/v3/apiClient/index.js.map +1 -1
- package/dist/commonjs/v3/apiClientManager/index.d.ts +5 -0
- package/dist/commonjs/v3/apiClientManager/index.js +28 -1
- package/dist/commonjs/v3/apiClientManager/index.js.map +1 -1
- package/dist/commonjs/v3/apps/duration.d.ts +1 -0
- package/dist/commonjs/v3/apps/duration.js +51 -0
- package/dist/commonjs/v3/apps/duration.js.map +1 -0
- package/dist/commonjs/v3/apps/friendlyId.d.ts +1 -0
- package/dist/commonjs/v3/apps/friendlyId.js +9 -0
- package/dist/commonjs/v3/apps/friendlyId.js.map +1 -0
- package/dist/commonjs/v3/apps/index.d.ts +2 -0
- package/dist/commonjs/v3/apps/index.js +2 -0
- package/dist/commonjs/v3/apps/index.js.map +1 -1
- package/dist/commonjs/v3/config.d.ts +8 -0
- package/dist/commonjs/v3/errors.d.ts +12 -2
- package/dist/commonjs/v3/errors.js +107 -24
- package/dist/commonjs/v3/errors.js.map +1 -1
- package/dist/commonjs/v3/index.d.ts +3 -0
- package/dist/commonjs/v3/index.js +5 -1
- package/dist/commonjs/v3/index.js.map +1 -1
- package/dist/commonjs/v3/links.d.ts +17 -0
- package/dist/commonjs/v3/links.js +21 -0
- package/dist/commonjs/v3/links.js.map +1 -0
- package/dist/commonjs/v3/run-metadata-api.d.ts +2 -0
- package/dist/commonjs/v3/run-metadata-api.js +8 -0
- package/dist/commonjs/v3/run-metadata-api.js.map +1 -0
- package/dist/commonjs/v3/runMetadata/index.d.ts +15 -0
- package/dist/commonjs/v3/runMetadata/index.js +67 -0
- package/dist/commonjs/v3/runMetadata/index.js.map +1 -0
- package/dist/commonjs/v3/schemas/api.d.ts +387 -290
- package/dist/commonjs/v3/schemas/api.js +15 -1
- package/dist/commonjs/v3/schemas/api.js.map +1 -1
- package/dist/commonjs/v3/schemas/build.d.ts +90 -76
- package/dist/commonjs/v3/schemas/common.d.ts +151 -123
- package/dist/commonjs/v3/schemas/common.js +16 -1
- package/dist/commonjs/v3/schemas/common.js.map +1 -1
- package/dist/commonjs/v3/schemas/messages.d.ts +2710 -2442
- package/dist/commonjs/v3/schemas/messages.js +1 -0
- package/dist/commonjs/v3/schemas/messages.js.map +1 -1
- package/dist/commonjs/v3/schemas/resources.d.ts +36 -28
- package/dist/commonjs/v3/schemas/resources.js +1 -0
- package/dist/commonjs/v3/schemas/resources.js.map +1 -1
- package/dist/commonjs/v3/schemas/schemas.d.ts +307 -263
- package/dist/commonjs/v3/schemas/schemas.js +1 -0
- package/dist/commonjs/v3/schemas/schemas.js.map +1 -1
- package/dist/commonjs/v3/timeout/api.d.ts +11 -0
- package/dist/commonjs/v3/timeout/api.js +38 -0
- package/dist/commonjs/v3/timeout/api.js.map +1 -0
- package/dist/commonjs/v3/timeout/types.d.ts +9 -0
- package/dist/commonjs/v3/timeout/types.js +15 -0
- package/dist/commonjs/v3/timeout/types.js.map +1 -0
- package/dist/commonjs/v3/timeout/usageTimeoutManager.d.ts +10 -0
- package/dist/commonjs/v3/timeout/usageTimeoutManager.js +32 -0
- package/dist/commonjs/v3/timeout/usageTimeoutManager.js.map +1 -0
- package/dist/commonjs/v3/timeout-api.d.ts +3 -0
- package/dist/commonjs/v3/timeout-api.js +9 -0
- package/dist/commonjs/v3/timeout-api.js.map +1 -0
- package/dist/commonjs/v3/tracer.d.ts +1 -1
- package/dist/commonjs/v3/tracer.js +28 -14
- package/dist/commonjs/v3/tracer.js.map +1 -1
- package/dist/commonjs/v3/types/index.d.ts +10 -0
- package/dist/commonjs/v3/utils/globals.d.ts +4 -0
- package/dist/commonjs/v3/utils/globals.js.map +1 -1
- package/dist/commonjs/v3/utils/structuredLogger.d.ts +1 -0
- package/dist/commonjs/v3/utils/structuredLogger.js +10 -4
- package/dist/commonjs/v3/utils/structuredLogger.js.map +1 -1
- package/dist/commonjs/v3/workers/index.d.ts +1 -0
- package/dist/commonjs/v3/workers/index.js +3 -1
- package/dist/commonjs/v3/workers/index.js.map +1 -1
- package/dist/commonjs/v3/workers/taskExecutor.d.ts +1 -1
- package/dist/commonjs/v3/workers/taskExecutor.js +53 -43
- package/dist/commonjs/v3/workers/taskExecutor.js.map +1 -1
- package/dist/commonjs/v3/zodNamespace.d.ts +1 -0
- package/dist/commonjs/v3/zodNamespace.js +6 -1
- package/dist/commonjs/v3/zodNamespace.js.map +1 -1
- package/dist/commonjs/v3/zodSocket.d.ts +2 -0
- package/dist/commonjs/v3/zodSocket.js +15 -5
- package/dist/commonjs/v3/zodSocket.js.map +1 -1
- package/dist/commonjs/version.js +1 -1
- package/dist/esm/schemas/api.d.ts +8 -8
- package/dist/esm/v3/apiClient/core.js +18 -1
- package/dist/esm/v3/apiClient/core.js.map +1 -1
- package/dist/esm/v3/apiClient/index.d.ts +78 -67
- package/dist/esm/v3/apiClient/index.js +8 -3
- package/dist/esm/v3/apiClient/index.js.map +1 -1
- package/dist/esm/v3/apiClientManager/index.d.ts +5 -0
- package/dist/esm/v3/apiClientManager/index.js +26 -0
- package/dist/esm/v3/apiClientManager/index.js.map +1 -1
- package/dist/esm/v3/apps/duration.d.ts +1 -0
- package/dist/esm/v3/apps/duration.js +48 -0
- package/dist/esm/v3/apps/duration.js.map +1 -0
- package/dist/esm/v3/apps/friendlyId.d.ts +1 -0
- package/dist/esm/v3/apps/friendlyId.js +6 -0
- package/dist/esm/v3/apps/friendlyId.js.map +1 -0
- package/dist/esm/v3/apps/index.d.ts +2 -0
- package/dist/esm/v3/apps/index.js +2 -0
- package/dist/esm/v3/apps/index.js.map +1 -1
- package/dist/esm/v3/config.d.ts +8 -0
- package/dist/esm/v3/errors.d.ts +12 -2
- package/dist/esm/v3/errors.js +104 -23
- package/dist/esm/v3/errors.js.map +1 -1
- package/dist/esm/v3/index.d.ts +3 -0
- package/dist/esm/v3/index.js +3 -0
- package/dist/esm/v3/index.js.map +1 -1
- package/dist/esm/v3/links.d.ts +17 -0
- package/dist/esm/v3/links.js +18 -0
- package/dist/esm/v3/links.js.map +1 -0
- package/dist/esm/v3/run-metadata-api.d.ts +2 -0
- package/dist/esm/v3/run-metadata-api.js +5 -0
- package/dist/esm/v3/run-metadata-api.js.map +1 -0
- package/dist/esm/v3/runMetadata/index.d.ts +15 -0
- package/dist/esm/v3/runMetadata/index.js +63 -0
- package/dist/esm/v3/runMetadata/index.js.map +1 -0
- package/dist/esm/v3/schemas/api.d.ts +317 -220
- package/dist/esm/v3/schemas/api.js +14 -0
- package/dist/esm/v3/schemas/api.js.map +1 -1
- package/dist/esm/v3/schemas/build.d.ts +160 -146
- package/dist/esm/v3/schemas/common.d.ts +151 -123
- package/dist/esm/v3/schemas/common.js +16 -1
- package/dist/esm/v3/schemas/common.js.map +1 -1
- package/dist/esm/v3/schemas/fetch.d.ts +14 -14
- package/dist/esm/v3/schemas/messages.d.ts +2909 -2641
- package/dist/esm/v3/schemas/messages.js +2 -1
- package/dist/esm/v3/schemas/messages.js.map +1 -1
- package/dist/esm/v3/schemas/resources.d.ts +30 -22
- package/dist/esm/v3/schemas/resources.js +1 -0
- package/dist/esm/v3/schemas/resources.js.map +1 -1
- package/dist/esm/v3/schemas/schemas.d.ts +387 -343
- package/dist/esm/v3/schemas/schemas.js +1 -0
- package/dist/esm/v3/schemas/schemas.js.map +1 -1
- package/dist/esm/v3/timeout/api.d.ts +11 -0
- package/dist/esm/v3/timeout/api.js +34 -0
- package/dist/esm/v3/timeout/api.js.map +1 -0
- package/dist/esm/v3/timeout/types.d.ts +9 -0
- package/dist/esm/v3/timeout/types.js +11 -0
- package/dist/esm/v3/timeout/types.js.map +1 -0
- package/dist/esm/v3/timeout/usageTimeoutManager.d.ts +10 -0
- package/dist/esm/v3/timeout/usageTimeoutManager.js +28 -0
- package/dist/esm/v3/timeout/usageTimeoutManager.js.map +1 -0
- package/dist/esm/v3/timeout-api.d.ts +3 -0
- package/dist/esm/v3/timeout-api.js +6 -0
- package/dist/esm/v3/timeout-api.js.map +1 -0
- package/dist/esm/v3/tracer.d.ts +1 -1
- package/dist/esm/v3/tracer.js +28 -14
- package/dist/esm/v3/tracer.js.map +1 -1
- package/dist/esm/v3/types/index.d.ts +10 -0
- package/dist/esm/v3/utils/globals.d.ts +4 -0
- package/dist/esm/v3/utils/globals.js.map +1 -1
- package/dist/esm/v3/utils/structuredLogger.d.ts +1 -0
- package/dist/esm/v3/utils/structuredLogger.js +10 -4
- package/dist/esm/v3/utils/structuredLogger.js.map +1 -1
- package/dist/esm/v3/workers/index.d.ts +1 -0
- package/dist/esm/v3/workers/index.js +1 -0
- package/dist/esm/v3/workers/index.js.map +1 -1
- package/dist/esm/v3/workers/taskExecutor.d.ts +1 -1
- package/dist/esm/v3/workers/taskExecutor.js +45 -35
- package/dist/esm/v3/workers/taskExecutor.js.map +1 -1
- package/dist/esm/v3/zodNamespace.d.ts +1 -0
- package/dist/esm/v3/zodNamespace.js +6 -1
- package/dist/esm/v3/zodNamespace.js.map +1 -1
- package/dist/esm/v3/zodSocket.d.ts +2 -0
- package/dist/esm/v3/zodSocket.js +15 -5
- package/dist/esm/v3/zodSocket.js.map +1 -1
- package/dist/esm/version.js +1 -1
- package/package.json +2 -1
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { SpanKind } from "@opentelemetry/api";
|
|
2
2
|
import { VERSION } from "../../version.js";
|
|
3
3
|
import { parseError, sanitizeError } from "../errors.js";
|
|
4
|
+
import { runMetadata } from "../index.js";
|
|
4
5
|
import { recordSpanException } from "../otel/index.js";
|
|
5
6
|
import { TaskRunContext, TaskRunErrorCodes, } from "../schemas/index.js";
|
|
6
7
|
import { SemanticInternalAttributes } from "../semanticInternalAttributes.js";
|
|
@@ -22,7 +23,7 @@ export class TaskExecutor {
|
|
|
22
23
|
this._importedConfig = options.config;
|
|
23
24
|
this._handleErrorFn = options.handleErrorFn;
|
|
24
25
|
}
|
|
25
|
-
async execute(execution, worker, traceContext, usage) {
|
|
26
|
+
async execute(execution, worker, traceContext, usage, signal) {
|
|
26
27
|
const ctx = TaskRunContext.parse(execution);
|
|
27
28
|
const attemptMessage = `Attempt ${execution.attempt.number}`;
|
|
28
29
|
const originalPacket = {
|
|
@@ -33,6 +34,9 @@ export class TaskExecutor {
|
|
|
33
34
|
ctx,
|
|
34
35
|
worker,
|
|
35
36
|
});
|
|
37
|
+
if (execution.run.metadata) {
|
|
38
|
+
runMetadata.enterWithMetadata(execution.run.metadata);
|
|
39
|
+
}
|
|
36
40
|
this._tracingSDK.asyncResourceDetector.resolveWithAttributes({
|
|
37
41
|
...taskContext.attributes,
|
|
38
42
|
[SemanticInternalAttributes.SDK_VERSION]: VERSION,
|
|
@@ -46,11 +50,11 @@ export class TaskExecutor {
|
|
|
46
50
|
const payloadPacket = await conditionallyImportPacket(originalPacket, this._tracer);
|
|
47
51
|
parsedPayload = await parsePacket(payloadPacket);
|
|
48
52
|
if (execution.attempt.number === 1) {
|
|
49
|
-
await this.#callOnStartFunctions(parsedPayload, ctx);
|
|
53
|
+
await this.#callOnStartFunctions(parsedPayload, ctx, signal);
|
|
50
54
|
}
|
|
51
|
-
initOutput = await this.#callInitFunctions(parsedPayload, ctx);
|
|
52
|
-
const output = await this.#callRun(parsedPayload, ctx, initOutput);
|
|
53
|
-
await this.#callOnSuccessFunctions(parsedPayload, output, ctx, initOutput);
|
|
55
|
+
initOutput = await this.#callInitFunctions(parsedPayload, ctx, signal);
|
|
56
|
+
const output = await this.#callRun(parsedPayload, ctx, initOutput, signal);
|
|
57
|
+
await this.#callOnSuccessFunctions(parsedPayload, output, ctx, initOutput, signal);
|
|
54
58
|
try {
|
|
55
59
|
const stringifiedOutput = await stringifyIO(output);
|
|
56
60
|
const finalOutput = await conditionallyExportPacket(stringifiedOutput, `${execution.attempt.id}/output`, this._tracer);
|
|
@@ -84,10 +88,10 @@ export class TaskExecutor {
|
|
|
84
88
|
}
|
|
85
89
|
catch (runError) {
|
|
86
90
|
try {
|
|
87
|
-
const handleErrorResult = await this.#handleError(execution, runError, parsedPayload, ctx);
|
|
91
|
+
const handleErrorResult = await this.#handleError(execution, runError, parsedPayload, ctx, signal);
|
|
88
92
|
recordSpanException(span, handleErrorResult.error ?? runError);
|
|
89
93
|
if (handleErrorResult.status !== "retry") {
|
|
90
|
-
await this.#callOnFailureFunctions(parsedPayload, handleErrorResult.error ?? runError, ctx, initOutput);
|
|
94
|
+
await this.#callOnFailureFunctions(parsedPayload, handleErrorResult.error ?? runError, ctx, initOutput, signal);
|
|
91
95
|
}
|
|
92
96
|
return {
|
|
93
97
|
id: execution.run.id,
|
|
@@ -117,7 +121,7 @@ export class TaskExecutor {
|
|
|
117
121
|
}
|
|
118
122
|
}
|
|
119
123
|
finally {
|
|
120
|
-
await this.#callTaskCleanup(parsedPayload, ctx, initOutput);
|
|
124
|
+
await this.#callTaskCleanup(parsedPayload, ctx, initOutput, signal);
|
|
121
125
|
}
|
|
122
126
|
});
|
|
123
127
|
}, {
|
|
@@ -125,58 +129,62 @@ export class TaskExecutor {
|
|
|
125
129
|
attributes: {
|
|
126
130
|
[SemanticInternalAttributes.STYLE_ICON]: "attempt",
|
|
127
131
|
},
|
|
128
|
-
}, this._tracer.extractContext(traceContext));
|
|
132
|
+
}, this._tracer.extractContext(traceContext), signal);
|
|
129
133
|
return { result };
|
|
130
134
|
}
|
|
131
|
-
async #callRun(payload, ctx, init) {
|
|
135
|
+
async #callRun(payload, ctx, init, signal) {
|
|
132
136
|
const runFn = this.task.fns.run;
|
|
133
137
|
const middlewareFn = this.task.fns.middleware;
|
|
134
138
|
if (!runFn) {
|
|
135
139
|
throw new Error("Task does not have a run function");
|
|
136
140
|
}
|
|
137
141
|
if (!middlewareFn) {
|
|
138
|
-
return runFn(payload, { ctx, init });
|
|
142
|
+
return runFn(payload, { ctx, init, signal });
|
|
139
143
|
}
|
|
140
|
-
return middlewareFn(payload, {
|
|
144
|
+
return middlewareFn(payload, {
|
|
145
|
+
ctx,
|
|
146
|
+
signal,
|
|
147
|
+
next: async () => runFn(payload, { ctx, init, signal }),
|
|
148
|
+
});
|
|
141
149
|
}
|
|
142
|
-
async #callInitFunctions(payload, ctx) {
|
|
143
|
-
await this.#callConfigInit(payload, ctx);
|
|
150
|
+
async #callInitFunctions(payload, ctx, signal) {
|
|
151
|
+
await this.#callConfigInit(payload, ctx, signal);
|
|
144
152
|
const initFn = this.task.fns.init;
|
|
145
153
|
if (!initFn) {
|
|
146
154
|
return {};
|
|
147
155
|
}
|
|
148
156
|
return this._tracer.startActiveSpan("init", async (span) => {
|
|
149
|
-
return await initFn(payload, { ctx });
|
|
157
|
+
return await initFn(payload, { ctx, signal });
|
|
150
158
|
}, {
|
|
151
159
|
attributes: {
|
|
152
160
|
[SemanticInternalAttributes.STYLE_ICON]: "function",
|
|
153
161
|
},
|
|
154
162
|
});
|
|
155
163
|
}
|
|
156
|
-
async #callConfigInit(payload, ctx) {
|
|
164
|
+
async #callConfigInit(payload, ctx, signal) {
|
|
157
165
|
const initFn = this._importedConfig?.init;
|
|
158
166
|
if (!initFn) {
|
|
159
167
|
return {};
|
|
160
168
|
}
|
|
161
169
|
return this._tracer.startActiveSpan("config.init", async (span) => {
|
|
162
|
-
return await initFn(payload, { ctx });
|
|
170
|
+
return await initFn(payload, { ctx, signal });
|
|
163
171
|
}, {
|
|
164
172
|
attributes: {
|
|
165
173
|
[SemanticInternalAttributes.STYLE_ICON]: "function",
|
|
166
174
|
},
|
|
167
175
|
});
|
|
168
176
|
}
|
|
169
|
-
async #callOnSuccessFunctions(payload, output, ctx, initOutput) {
|
|
170
|
-
await this.#callOnSuccessFunction(this.task.fns.onSuccess, "task.onSuccess", payload, output, ctx, initOutput);
|
|
171
|
-
await this.#callOnSuccessFunction(this._importedConfig?.onSuccess, "config.onSuccess", payload, output, ctx, initOutput);
|
|
177
|
+
async #callOnSuccessFunctions(payload, output, ctx, initOutput, signal) {
|
|
178
|
+
await this.#callOnSuccessFunction(this.task.fns.onSuccess, "task.onSuccess", payload, output, ctx, initOutput, signal);
|
|
179
|
+
await this.#callOnSuccessFunction(this._importedConfig?.onSuccess, "config.onSuccess", payload, output, ctx, initOutput, signal);
|
|
172
180
|
}
|
|
173
|
-
async #callOnSuccessFunction(onSuccessFn, name, payload, output, ctx, initOutput) {
|
|
181
|
+
async #callOnSuccessFunction(onSuccessFn, name, payload, output, ctx, initOutput, signal) {
|
|
174
182
|
if (!onSuccessFn) {
|
|
175
183
|
return;
|
|
176
184
|
}
|
|
177
185
|
try {
|
|
178
186
|
await this._tracer.startActiveSpan(name, async (span) => {
|
|
179
|
-
return await onSuccessFn(payload, output, { ctx, init: initOutput });
|
|
187
|
+
return await onSuccessFn(payload, output, { ctx, init: initOutput, signal });
|
|
180
188
|
}, {
|
|
181
189
|
attributes: {
|
|
182
190
|
[SemanticInternalAttributes.STYLE_ICON]: "function",
|
|
@@ -187,17 +195,17 @@ export class TaskExecutor {
|
|
|
187
195
|
// Ignore errors from onSuccess functions
|
|
188
196
|
}
|
|
189
197
|
}
|
|
190
|
-
async #callOnFailureFunctions(payload, error, ctx, initOutput) {
|
|
191
|
-
await this.#callOnFailureFunction(this.task.fns.onFailure, "task.onFailure", payload, error, ctx, initOutput);
|
|
192
|
-
await this.#callOnFailureFunction(this._importedConfig?.onFailure, "config.onFailure", payload, error, ctx, initOutput);
|
|
198
|
+
async #callOnFailureFunctions(payload, error, ctx, initOutput, signal) {
|
|
199
|
+
await this.#callOnFailureFunction(this.task.fns.onFailure, "task.onFailure", payload, error, ctx, initOutput, signal);
|
|
200
|
+
await this.#callOnFailureFunction(this._importedConfig?.onFailure, "config.onFailure", payload, error, ctx, initOutput, signal);
|
|
193
201
|
}
|
|
194
|
-
async #callOnFailureFunction(onFailureFn, name, payload, error, ctx, initOutput) {
|
|
202
|
+
async #callOnFailureFunction(onFailureFn, name, payload, error, ctx, initOutput, signal) {
|
|
195
203
|
if (!onFailureFn) {
|
|
196
204
|
return;
|
|
197
205
|
}
|
|
198
206
|
try {
|
|
199
207
|
return await this._tracer.startActiveSpan(name, async (span) => {
|
|
200
|
-
return await onFailureFn(payload, error, { ctx, init: initOutput });
|
|
208
|
+
return await onFailureFn(payload, error, { ctx, init: initOutput, signal });
|
|
201
209
|
}, {
|
|
202
210
|
attributes: {
|
|
203
211
|
[SemanticInternalAttributes.STYLE_ICON]: "function",
|
|
@@ -208,17 +216,17 @@ export class TaskExecutor {
|
|
|
208
216
|
// Ignore errors from onFailure functions
|
|
209
217
|
}
|
|
210
218
|
}
|
|
211
|
-
async #callOnStartFunctions(payload, ctx) {
|
|
212
|
-
await this.#callOnStartFunction(this._importedConfig?.onStart, "config.onStart", payload, ctx, {});
|
|
213
|
-
await this.#callOnStartFunction(this.task.fns.onStart, "task.onStart", payload, ctx, {});
|
|
219
|
+
async #callOnStartFunctions(payload, ctx, signal) {
|
|
220
|
+
await this.#callOnStartFunction(this._importedConfig?.onStart, "config.onStart", payload, ctx, {}, signal);
|
|
221
|
+
await this.#callOnStartFunction(this.task.fns.onStart, "task.onStart", payload, ctx, {}, signal);
|
|
214
222
|
}
|
|
215
|
-
async #callOnStartFunction(onStartFn, name, payload, ctx, initOutput) {
|
|
223
|
+
async #callOnStartFunction(onStartFn, name, payload, ctx, initOutput, signal) {
|
|
216
224
|
if (!onStartFn) {
|
|
217
225
|
return;
|
|
218
226
|
}
|
|
219
227
|
try {
|
|
220
228
|
await this._tracer.startActiveSpan(name, async (span) => {
|
|
221
|
-
return await onStartFn(payload, { ctx });
|
|
229
|
+
return await onStartFn(payload, { ctx, signal });
|
|
222
230
|
}, {
|
|
223
231
|
attributes: {
|
|
224
232
|
[SemanticInternalAttributes.STYLE_ICON]: "function",
|
|
@@ -229,16 +237,16 @@ export class TaskExecutor {
|
|
|
229
237
|
// Ignore errors from onStart functions
|
|
230
238
|
}
|
|
231
239
|
}
|
|
232
|
-
async #callTaskCleanup(payload, ctx, init) {
|
|
240
|
+
async #callTaskCleanup(payload, ctx, init, signal) {
|
|
233
241
|
const cleanupFn = this.task.fns.cleanup;
|
|
234
242
|
if (!cleanupFn) {
|
|
235
243
|
return;
|
|
236
244
|
}
|
|
237
245
|
return this._tracer.startActiveSpan("cleanup", async (span) => {
|
|
238
|
-
return await cleanupFn(payload, { ctx, init });
|
|
246
|
+
return await cleanupFn(payload, { ctx, init, signal });
|
|
239
247
|
});
|
|
240
248
|
}
|
|
241
|
-
async #handleError(execution, error, payload, ctx) {
|
|
249
|
+
async #handleError(execution, error, payload, ctx, signal) {
|
|
242
250
|
const retriesConfig = this._importedConfig?.retries;
|
|
243
251
|
const retry = this.task.retry ?? retriesConfig?.default;
|
|
244
252
|
if (!retry) {
|
|
@@ -270,6 +278,7 @@ export class TaskExecutor {
|
|
|
270
278
|
retry,
|
|
271
279
|
retryDelayInMs: delay,
|
|
272
280
|
retryAt: delay ? new Date(Date.now() + delay) : undefined,
|
|
281
|
+
signal,
|
|
273
282
|
})
|
|
274
283
|
: this._importedConfig
|
|
275
284
|
? await this._handleErrorFn?.(payload, error, {
|
|
@@ -277,6 +286,7 @@ export class TaskExecutor {
|
|
|
277
286
|
retry,
|
|
278
287
|
retryDelayInMs: delay,
|
|
279
288
|
retryAt: delay ? new Date(Date.now() + delay) : undefined,
|
|
289
|
+
signal,
|
|
280
290
|
})
|
|
281
291
|
: undefined;
|
|
282
292
|
// If handleErrorResult
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"taskExecutor.js","sourceRoot":"","sources":["../../../../src/v3/workers/taskExecutor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAG3C,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAEzD,OAAO,EAAE,mBAAmB,EAAc,MAAM,kBAAkB,CAAC;AACnE,OAAO,EAEL,cAAc,EACd,iBAAiB,GAIlB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,0BAA0B,EAAE,MAAM,kCAAkC,CAAC;AAC9E,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAIrD,OAAO,EACL,yBAAyB,EACzB,yBAAyB,EACzB,sBAAsB,EACtB,WAAW,EACX,WAAW,GACZ,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAC;AAW9D,MAAM,OAAO,YAAY;IAQd;IAPD,WAAW,CAAa;IACxB,OAAO,CAAgB;IACvB,mBAAmB,CAAqB;IACxC,eAAe,CAA4B;IAC3C,cAAc,CAAkC;IAExD,YACS,IAA+B,EACtC,OAA4B;QADrB,SAAI,GAAJ,IAAI,CAA2B;QAGtC,IAAI,CAAC,WAAW,GAAG,OAAO,CAAC,UAAU,CAAC;QACtC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC;QAC9B,IAAI,CAAC,mBAAmB,GAAG,OAAO,CAAC,kBAAkB,CAAC;QACtD,IAAI,CAAC,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC;QACtC,IAAI,CAAC,cAAc,GAAG,OAAO,CAAC,aAAa,CAAC;IAC9C,CAAC;IAED,KAAK,CAAC,OAAO,CACX,SAA2B,EAC3B,MAA8B,EAC9B,YAAqC,EACrC,KAAuB;QAEvB,MAAM,GAAG,GAAG,cAAc,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QAC5C,MAAM,cAAc,GAAG,WAAW,SAAS,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;QAE7D,MAAM,cAAc,GAAG;YACrB,IAAI,EAAE,SAAS,CAAC,GAAG,CAAC,OAAO;YAC3B,QAAQ,EAAE,SAAS,CAAC,GAAG,CAAC,WAAW;SACpC,CAAC;QAEF,WAAW,CAAC,oBAAoB,CAAC;YAC/B,GAAG;YACH,MAAM;SACP,CAAC,CAAC;QAEH,IAAI,CAAC,WAAW,CAAC,qBAAqB,CAAC,qBAAqB,CAAC;YAC3D,GAAG,WAAW,CAAC,UAAU;YACzB,CAAC,0BAA0B,CAAC,WAAW,CAAC,EAAE,OAAO;YACjD,CAAC,0BAA0B,CAAC,YAAY,CAAC,EAAE,YAAY;SACxD,CAAC,CAAC;QAEH,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,eAAe,CAC/C,cAAc,EACd,KAAK,EAAE,IAAI,EAAE,EAAE;YACb,OAAO,MAAM,IAAI,CAAC,mBAAmB,CAAC,SAAS,CAAC,OAAO,EAAE,KAAK,IAAI,EAAE;gBAClE,IAAI,aAAkB,CAAC;gBACvB,IAAI,UAAe,CAAC;gBAEpB,IAAI,CAAC;oBACH,MAAM,aAAa,GAAG,MAAM,yBAAyB,CAAC,cAAc,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;oBAEpF,aAAa,GAAG,MAAM,WAAW,CAAC,aAAa,CAAC,CAAC;oBAEjD,IAAI,SAAS,CAAC,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;wBACnC,MAAM,IAAI,CAAC,qBAAqB,CAAC,aAAa,EAAE,GAAG,CAAC,CAAC;oBACvD,CAAC;oBAED,UAAU,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,aAAa,EAAE,GAAG,CAAC,CAAC;oBAE/D,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,aAAa,EAAE,GAAG,EAAE,UAAU,CAAC,CAAC;oBAEnE,MAAM,IAAI,CAAC,uBAAuB,CAAC,aAAa,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,CAAC,CAAC;oBAE3E,IAAI,CAAC;wBACH,MAAM,iBAAiB,GAAG,MAAM,WAAW,CAAC,MAAM,CAAC,CAAC;wBAEpD,MAAM,WAAW,GAAG,MAAM,yBAAyB,CACjD,iBAAiB,EACjB,GAAG,SAAS,CAAC,OAAO,CAAC,EAAE,SAAS,EAChC,IAAI,CAAC,OAAO,CACb,CAAC;wBAEF,MAAM,UAAU,GAAG,MAAM,sBAAsB,CAC7C,WAAW,EACX,0BAA0B,CAAC,MAAM,EACjC,0BAA0B,CAAC,WAAW,CACvC,CAAC;wBAEF,IAAI,UAAU,EAAE,CAAC;4BACf,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;wBACjC,CAAC;wBAED,OAAO;4BACL,EAAE,EAAE,IAAI;4BACR,EAAE,EAAE,SAAS,CAAC,GAAG,CAAC,EAAE;4BACpB,MAAM,EAAE,WAAW,CAAC,IAAI;4BACxB,UAAU,EAAE,WAAW,CAAC,QAAQ;yBACA,CAAC;oBACrC,CAAC;oBAAC,OAAO,cAAc,EAAE,CAAC;wBACxB,mBAAmB,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;wBAE1C,OAAO;4BACL,EAAE,EAAE,KAAK;4BACT,EAAE,EAAE,SAAS,CAAC,GAAG,CAAC,EAAE;4BACpB,KAAK,EAAE;gCACL,IAAI,EAAE,gBAAgB;gCACtB,IAAI,EAAE,iBAAiB,CAAC,iBAAiB;gCACzC,OAAO,EACL,cAAc,YAAY,KAAK;oCAC7B,CAAC,CAAC,cAAc,CAAC,OAAO;oCACxB,CAAC,CAAC,OAAO,cAAc,KAAK,QAAQ;wCACpC,CAAC,CAAC,cAAc;wCAChB,CAAC,CAAC,SAAS;6BAChB;yBAC+B,CAAC;oBACrC,CAAC;gBACH,CAAC;gBAAC,OAAO,QAAQ,EAAE,CAAC;oBAClB,IAAI,CAAC;wBACH,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,YAAY,CAC/C,SAAS,EACT,QAAQ,EACR,aAAa,EACb,GAAG,CACJ,CAAC;wBAEF,mBAAmB,CAAC,IAAI,EAAE,iBAAiB,CAAC,KAAK,IAAI,QAAQ,CAAC,CAAC;wBAE/D,IAAI,iBAAiB,CAAC,MAAM,KAAK,OAAO,EAAE,CAAC;4BACzC,MAAM,IAAI,CAAC,uBAAuB,CAChC,aAAa,EACb,iBAAiB,CAAC,KAAK,IAAI,QAAQ,EACnC,GAAG,EACH,UAAU,CACX,CAAC;wBACJ,CAAC;wBAED,OAAO;4BACL,EAAE,EAAE,SAAS,CAAC,GAAG,CAAC,EAAE;4BACpB,EAAE,EAAE,KAAK;4BACT,KAAK,EAAE,aAAa,CAClB,iBAAiB,CAAC,KAAK;gCACrB,CAAC,CAAC,UAAU,CAAC,iBAAiB,CAAC,KAAK,CAAC;gCACrC,CAAC,CAAC,UAAU,CAAC,QAAQ,CAAC,CACzB;4BACD,KAAK,EAAE,iBAAiB,CAAC,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS;4BACjF,eAAe,EAAE,iBAAiB,CAAC,MAAM,KAAK,SAAS;yBACvB,CAAC;oBACrC,CAAC;oBAAC,OAAO,gBAAgB,EAAE,CAAC;wBAC1B,mBAAmB,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;wBAE5C,OAAO;4BACL,EAAE,EAAE,KAAK;4BACT,EAAE,EAAE,SAAS,CAAC,GAAG,CAAC,EAAE;4BACpB,KAAK,EAAE;gCACL,IAAI,EAAE,gBAAgB;gCACtB,IAAI,EAAE,iBAAiB,CAAC,kBAAkB;gCAC1C,OAAO,EACL,gBAAgB,YAAY,KAAK;oCAC/B,CAAC,CAAC,gBAAgB,CAAC,OAAO;oCAC1B,CAAC,CAAC,OAAO,gBAAgB,KAAK,QAAQ;wCACtC,CAAC,CAAC,gBAAgB;wCAClB,CAAC,CAAC,SAAS;6BAChB;yBAC+B,CAAC;oBACrC,CAAC;gBACH,CAAC;wBAAS,CAAC;oBACT,MAAM,IAAI,CAAC,gBAAgB,CAAC,aAAa,EAAE,GAAG,EAAE,UAAU,CAAC,CAAC;gBAC9D,CAAC;YACH,CAAC,CAAC,CAAC;QACL,CAAC,EACD;YACE,IAAI,EAAE,QAAQ,CAAC,QAAQ;YACvB,UAAU,EAAE;gBACV,CAAC,0BAA0B,CAAC,UAAU,CAAC,EAAE,SAAS;aACnD;SACF,EACD,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,YAAY,CAAC,CAC1C,CAAC;QAEF,OAAO,EAAE,MAAM,EAAE,CAAC;IACpB,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,OAAgB,EAAE,GAAmB,EAAE,IAAa;QACjE,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC;QAChC,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC;QAE9C,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;QACvD,CAAC;QAED,IAAI,CAAC,YAAY,EAAE,CAAC;YAClB,OAAO,KAAK,CAAC,OAAO,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC;QACvC,CAAC;QAED,OAAO,YAAY,CAAC,OAAO,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC;IACzF,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAC,OAAgB,EAAE,GAAmB;QAC5D,MAAM,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;QAEzC,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC;QAElC,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,OAAO,IAAI,CAAC,OAAO,CAAC,eAAe,CACjC,MAAM,EACN,KAAK,EAAE,IAAI,EAAE,EAAE;YACb,OAAO,MAAM,MAAM,CAAC,OAAO,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC;QACxC,CAAC,EACD;YACE,UAAU,EAAE;gBACV,CAAC,0BAA0B,CAAC,UAAU,CAAC,EAAE,UAAU;aACpD;SACF,CACF,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,OAAgB,EAAE,GAAmB;QACzD,MAAM,MAAM,GAAG,IAAI,CAAC,eAAe,EAAE,IAAI,CAAC;QAE1C,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,OAAO,IAAI,CAAC,OAAO,CAAC,eAAe,CACjC,aAAa,EACb,KAAK,EAAE,IAAI,EAAE,EAAE;YACb,OAAO,MAAM,MAAM,CAAC,OAAO,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC;QACxC,CAAC,EACD;YACE,UAAU,EAAE;gBACV,CAAC,0BAA0B,CAAC,UAAU,CAAC,EAAE,UAAU;aACpD;SACF,CACF,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,uBAAuB,CAC3B,OAAgB,EAChB,MAAW,EACX,GAAmB,EACnB,UAAe;QAEf,MAAM,IAAI,CAAC,sBAAsB,CAC/B,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS,EACvB,gBAAgB,EAChB,OAAO,EACP,MAAM,EACN,GAAG,EACH,UAAU,CACX,CAAC;QAEF,MAAM,IAAI,CAAC,sBAAsB,CAC/B,IAAI,CAAC,eAAe,EAAE,SAAS,EAC/B,kBAAkB,EAClB,OAAO,EACP,MAAM,EACN,GAAG,EACH,UAAU,CACX,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,sBAAsB,CAC1B,WAA0D,EAC1D,IAAY,EACZ,OAAgB,EAChB,MAAW,EACX,GAAmB,EACnB,UAAe;QAEf,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,OAAO;QACT,CAAC;QAED,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,OAAO,CAAC,eAAe,CAChC,IAAI,EACJ,KAAK,EAAE,IAAI,EAAE,EAAE;gBACb,OAAO,MAAM,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC,CAAC;YACvE,CAAC,EACD;gBACE,UAAU,EAAE;oBACV,CAAC,0BAA0B,CAAC,UAAU,CAAC,EAAE,UAAU;iBACpD;aACF,CACF,CAAC;QACJ,CAAC;QAAC,MAAM,CAAC;YACP,yCAAyC;QAC3C,CAAC;IACH,CAAC;IAED,KAAK,CAAC,uBAAuB,CAC3B,OAAgB,EAChB,KAAc,EACd,GAAmB,EACnB,UAAe;QAEf,MAAM,IAAI,CAAC,sBAAsB,CAC/B,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS,EACvB,gBAAgB,EAChB,OAAO,EACP,KAAK,EACL,GAAG,EACH,UAAU,CACX,CAAC;QAEF,MAAM,IAAI,CAAC,sBAAsB,CAC/B,IAAI,CAAC,eAAe,EAAE,SAAS,EAC/B,kBAAkB,EAClB,OAAO,EACP,KAAK,EACL,GAAG,EACH,UAAU,CACX,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,sBAAsB,CAC1B,WAA0D,EAC1D,IAAY,EACZ,OAAgB,EAChB,KAAc,EACd,GAAmB,EACnB,UAAe;QAEf,IAAI,CAAC,WAAW,EAAE,CAAC;YACjB,OAAO;QACT,CAAC;QAED,IAAI,CAAC;YACH,OAAO,MAAM,IAAI,CAAC,OAAO,CAAC,eAAe,CACvC,IAAI,EACJ,KAAK,EAAE,IAAI,EAAE,EAAE;gBACb,OAAO,MAAM,WAAW,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC,CAAC;YACtE,CAAC,EACD;gBACE,UAAU,EAAE;oBACV,CAAC,0BAA0B,CAAC,UAAU,CAAC,EAAE,UAAU;iBACpD;aACF,CACF,CAAC;QACJ,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,yCAAyC;QAC3C,CAAC;IACH,CAAC;IAED,KAAK,CAAC,qBAAqB,CAAC,OAAgB,EAAE,GAAmB;QAC/D,MAAM,IAAI,CAAC,oBAAoB,CAC7B,IAAI,CAAC,eAAe,EAAE,OAAO,EAC7B,gBAAgB,EAChB,OAAO,EACP,GAAG,EACH,EAAE,CACH,CAAC;QAEF,MAAM,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,cAAc,EAAE,OAAO,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC;IAC3F,CAAC;IAED,KAAK,CAAC,oBAAoB,CACxB,SAAsD,EACtD,IAAY,EACZ,OAAgB,EAChB,GAAmB,EACnB,UAAe;QAEf,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,OAAO;QACT,CAAC;QAED,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,OAAO,CAAC,eAAe,CAChC,IAAI,EACJ,KAAK,EAAE,IAAI,EAAE,EAAE;gBACb,OAAO,MAAM,SAAS,CAAC,OAAO,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC;YAC3C,CAAC,EACD;gBACE,UAAU,EAAE;oBACV,CAAC,0BAA0B,CAAC,UAAU,CAAC,EAAE,UAAU;iBACpD;aACF,CACF,CAAC;QACJ,CAAC;QAAC,MAAM,CAAC;YACP,uCAAuC;QACzC,CAAC;IACH,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,OAAgB,EAAE,GAAmB,EAAE,IAAa;QACzE,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC;QAExC,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,OAAO;QACT,CAAC;QAED,OAAO,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,SAAS,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;YAC5D,OAAO,MAAM,SAAS,CAAC,OAAO,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC;QACjD,CAAC,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,YAAY,CAChB,SAA2B,EAC3B,KAAc,EACd,OAAY,EACZ,GAAmB;QAMnB,MAAM,aAAa,GAAG,IAAI,CAAC,eAAe,EAAE,OAAO,CAAC;QAEpD,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,IAAI,aAAa,EAAE,OAAO,CAAC;QAExD,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;QAC5B,CAAC;QAED,IAAI,KAAK,YAAY,KAAK,IAAI,KAAK,CAAC,IAAI,KAAK,mBAAmB,EAAE,CAAC;YACjE,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC;QAC/B,CAAC;QAED,IAAI,SAAS,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC;YAC9B,KAAK,CAAC,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC;QAC7D,CAAC;QAED,IAAI,KAAK,GAAG,uBAAuB,CAAC,KAAK,EAAE,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAErE,IACE,KAAK;YACL,KAAK,YAAY,KAAK;YACtB,KAAK,CAAC,IAAI,KAAK,iBAAiB;YAC/B,KAAkB,CAAC,MAAM,KAAK,GAAG,EAClC,CAAC;YACD,MAAM,cAAc,GAAG,KAAuB,CAAC;YAE/C,KAAK,GAAG,cAAc,CAAC,sBAAsB,CAAC;QAChD,CAAC;QAED,IACE,SAAS,CAAC,WAAW,CAAC,IAAI,KAAK,aAAa;YAC5C,OAAO,aAAa,EAAE,YAAY,KAAK,SAAS;YAChD,CAAC,aAAa,CAAC,YAAY,EAC3B,CAAC;YACD,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC;QAC/B,CAAC;QAED,OAAO,IAAI,CAAC,OAAO,CAAC,eAAe,CACjC,eAAe,EACf,KAAK,EAAE,IAAI,EAAE,EAAE;YACb,MAAM,iBAAiB,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,WAAW;gBACjD,CAAC,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,OAAO,EAAE,KAAK,EAAE;oBAC9C,GAAG;oBACH,KAAK;oBACL,cAAc,EAAE,KAAK;oBACrB,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS;iBAC1D,CAAC;gBACJ,CAAC,CAAC,IAAI,CAAC,eAAe;oBACtB,CAAC,CAAC,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC,OAAO,EAAE,KAAK,EAAE;wBAC1C,GAAG;wBACH,KAAK;wBACL,cAAc,EAAE,KAAK;wBACrB,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS;qBAC1D,CAAC;oBACJ,CAAC,CAAC,SAAS,CAAC;YAEd,uBAAuB;YACvB,IAAI,CAAC,iBAAiB,EAAE,CAAC;gBACvB,OAAO,OAAO,KAAK,KAAK,WAAW;oBACjC,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE;oBACpB,CAAC,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,EAAE,KAAK,EAAE,EAAE,CAAC;YAC3E,CAAC;YAED,IAAI,iBAAiB,CAAC,YAAY,EAAE,CAAC;gBACnC,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,iBAAiB,CAAC,KAAK,EAAE,CAAC;YAC/D,CAAC;YAED,IAAI,OAAO,iBAAiB,CAAC,OAAO,KAAK,WAAW,EAAE,CAAC;gBACrD,OAAO;oBACL,MAAM,EAAE,OAAO;oBACf,KAAK,EAAE;wBACL,SAAS,EAAE,iBAAiB,CAAC,OAAO,CAAC,OAAO,EAAE;wBAC9C,KAAK,EAAE,iBAAiB,CAAC,OAAO,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,GAAG,EAAE;qBACxD;oBACD,KAAK,EAAE,iBAAiB,CAAC,KAAK;iBAC/B,CAAC;YACJ,CAAC;YAED,IAAI,OAAO,iBAAiB,CAAC,cAAc,KAAK,QAAQ,EAAE,CAAC;gBACzD,OAAO;oBACL,MAAM,EAAE,OAAO;oBACf,KAAK,EAAE;wBACL,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,iBAAiB,CAAC,cAAc;wBACxD,KAAK,EAAE,iBAAiB,CAAC,cAAc;qBACxC;oBACD,KAAK,EAAE,iBAAiB,CAAC,KAAK;iBAC/B,CAAC;YACJ,CAAC;YAED,IAAI,iBAAiB,CAAC,KAAK,IAAI,OAAO,iBAAiB,CAAC,KAAK,KAAK,QAAQ,EAAE,CAAC;gBAC3E,MAAM,KAAK,GAAG,uBAAuB,CAAC,iBAAiB,CAAC,KAAK,EAAE,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;gBAEzF,OAAO,OAAO,KAAK,KAAK,WAAW;oBACjC,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,iBAAiB,CAAC,KAAK,EAAE;oBACpD,CAAC,CAAC;wBACE,MAAM,EAAE,OAAO;wBACf,KAAK,EAAE,EAAE,SAAS,EAAE,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,EAAE,KAAK,EAAE;wBAC/C,KAAK,EAAE,iBAAiB,CAAC,KAAK;qBAC/B,CAAC;YACR,CAAC;YAED,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,iBAAiB,CAAC,KAAK,EAAE,CAAC;QAC5D,CAAC,EACD;YACE,UAAU,EAAE;gBACV,CAAC,0BAA0B,CAAC,UAAU,CAAC,EAAE,oBAAoB;aAC9D;SACF,CACF,CAAC;IACJ,CAAC;CACF"}
|
|
1
|
+
{"version":3,"file":"taskExecutor.js","sourceRoot":"","sources":["../../../../src/v3/workers/taskExecutor.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,6 +17,7 @@ interface ZodNamespaceOptions<TClientMessages extends ZodSocketMessageCatalogSch
|
|
|
17
17
|
handlers?: ZodSocketMessageHandlers<TClientMessages>;
|
|
18
18
|
authToken?: string;
|
|
19
19
|
logger?: StructuredLogger;
|
|
20
|
+
logHandlerPayloads?: boolean;
|
|
20
21
|
preAuth?: (socket: ZodNamespaceSocket<TClientMessages, TServerMessages, TServerSideEvents, TSocketData>, next: (err?: ExtendedError) => void, logger: StructuredLogger) => Promise<void>;
|
|
21
22
|
postAuth?: (socket: ZodNamespaceSocket<TClientMessages, TServerMessages, TServerSideEvents, TSocketData>, next: (err?: ExtendedError) => void, logger: StructuredLogger) => Promise<void>;
|
|
22
23
|
onConnection?: (socket: ZodNamespaceSocket<TClientMessages, TServerMessages, TServerSideEvents, TSocketData>, handler: ZodSocketMessageHandler<TClientMessages>, sender: ZodMessageSender<TServerMessages>, logger: StructuredLogger) => Promise<void>;
|
|
@@ -8,10 +8,15 @@ export class ZodNamespace {
|
|
|
8
8
|
io;
|
|
9
9
|
namespace;
|
|
10
10
|
constructor(opts) {
|
|
11
|
-
this.#logger =
|
|
11
|
+
this.#logger =
|
|
12
|
+
opts.logger ??
|
|
13
|
+
new SimpleStructuredLogger(`ns-${opts.name}`, undefined, {
|
|
14
|
+
namespace: opts.name,
|
|
15
|
+
});
|
|
12
16
|
this.#handler = new ZodSocketMessageHandler({
|
|
13
17
|
schema: opts.clientMessages,
|
|
14
18
|
handlers: opts.handlers,
|
|
19
|
+
logPayloads: opts.logHandlerPayloads,
|
|
15
20
|
});
|
|
16
21
|
this.io = opts.io;
|
|
17
22
|
this.namespace = this.io.of(opts.name);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"zodNamespace.js","sourceRoot":"","sources":["../../../src/v3/zodNamespace.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAGL,uBAAuB,GAExB,MAAM,gBAAgB,CAAC;AAIxB,OAAO,EAAE,sBAAsB,EAAoB,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"zodNamespace.js","sourceRoot":"","sources":["../../../src/v3/zodNamespace.ts"],"names":[],"mappings":"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"}
|
|
@@ -27,6 +27,7 @@ export type ZodSocketMessageHandlerOptions<TMessageCatalog extends ZodSocketMess
|
|
|
27
27
|
schema: TMessageCatalog;
|
|
28
28
|
handlers?: ZodSocketMessageHandlers<TMessageCatalog>;
|
|
29
29
|
logger?: StructuredLogger;
|
|
30
|
+
logPayloads?: boolean;
|
|
30
31
|
};
|
|
31
32
|
type MessageFromSocketSchema<K extends keyof TMessageCatalog, TMessageCatalog extends ZodSocketMessageCatalogSchema> = {
|
|
32
33
|
type: K;
|
|
@@ -75,6 +76,7 @@ interface ZodSocketConnectionOptions<TClientMessages extends ZodSocketMessageCat
|
|
|
75
76
|
handlers?: ZodSocketMessageHandlers<TServerMessages>;
|
|
76
77
|
authToken?: string;
|
|
77
78
|
ioOptions?: Partial<ManagerOptions & SocketOptions>;
|
|
79
|
+
logHandlerPayloads?: boolean;
|
|
78
80
|
onConnection?: (socket: ZodSocket<TServerMessages, TClientMessages>, handler: ZodSocketMessageHandler<TServerMessages>, sender: ZodSocketMessageSender<TClientMessages>, logger: StructuredLogger) => Promise<void>;
|
|
79
81
|
onDisconnect?: (socket: ZodSocket<TServerMessages, TClientMessages>, reason: Socket.DisconnectReason, description: any, logger: StructuredLogger) => Promise<void>;
|
|
80
82
|
onError?: (socket: ZodSocket<TServerMessages, TClientMessages>, err: Error, logger: StructuredLogger) => Promise<void>;
|
package/dist/esm/v3/zodSocket.js
CHANGED
|
@@ -11,11 +11,13 @@ export class ZodSocketMessageHandler {
|
|
|
11
11
|
#schema;
|
|
12
12
|
#handlers;
|
|
13
13
|
#logger;
|
|
14
|
+
#logPayloads;
|
|
14
15
|
constructor(options) {
|
|
15
16
|
this.#schema = options.schema;
|
|
16
17
|
this.#handlers = options.handlers;
|
|
17
18
|
this.#logger =
|
|
18
19
|
options.logger ?? new SimpleStructuredLogger("socket-message-handler", LogLevel.info);
|
|
20
|
+
this.#logPayloads = options.logPayloads ?? !!process.env.LOG_SOCKET_HANDLER_PAYLOADS ?? false;
|
|
19
21
|
}
|
|
20
22
|
async handleMessage(message) {
|
|
21
23
|
const parseResult = this.parseMessage(message);
|
|
@@ -32,7 +34,7 @@ export class ZodSocketMessageHandler {
|
|
|
32
34
|
const { type, payload } = parseResult.data;
|
|
33
35
|
const handler = this.#handlers[type];
|
|
34
36
|
if (!handler) {
|
|
35
|
-
|
|
37
|
+
this.#logger.error("No handler for message type", { type, payload });
|
|
36
38
|
return;
|
|
37
39
|
}
|
|
38
40
|
const ack = await handler(payload);
|
|
@@ -59,7 +61,7 @@ export class ZodSocketMessageHandler {
|
|
|
59
61
|
};
|
|
60
62
|
const parsedPayload = schema.safeParse(messageWithVersion);
|
|
61
63
|
if (!parsedPayload.success) {
|
|
62
|
-
|
|
64
|
+
this.#logger.error("Failed to parse message payload", {
|
|
63
65
|
message,
|
|
64
66
|
payload: messageWithVersion,
|
|
65
67
|
});
|
|
@@ -84,8 +86,9 @@ export class ZodSocketMessageHandler {
|
|
|
84
86
|
}
|
|
85
87
|
for (const eventName of Object.keys(this.#handlers)) {
|
|
86
88
|
emitter.on(eventName, async (message, callback) => {
|
|
87
|
-
log.info(`
|
|
88
|
-
|
|
89
|
+
log.info(`Incoming event ${eventName}`, {
|
|
90
|
+
eventName,
|
|
91
|
+
...(this.#logPayloads ? { eventMessage: message } : {}),
|
|
89
92
|
hasCallback: !!callback,
|
|
90
93
|
});
|
|
91
94
|
let ack;
|
|
@@ -164,7 +167,13 @@ export class ZodSocketConnection {
|
|
|
164
167
|
#logger;
|
|
165
168
|
constructor(opts) {
|
|
166
169
|
const uri = `${opts.secure ? "wss" : "ws"}://${opts.host}:${opts.port ?? (opts.secure ? "443" : "80")}/${opts.namespace}`;
|
|
167
|
-
const logger = new SimpleStructuredLogger(opts.namespace
|
|
170
|
+
const logger = new SimpleStructuredLogger(`socket-${opts.namespace}`, LogLevel.info, {
|
|
171
|
+
namespace: opts.namespace,
|
|
172
|
+
host: opts.host,
|
|
173
|
+
port: opts.port,
|
|
174
|
+
secure: opts.secure,
|
|
175
|
+
extraHeaders: opts.extraHeaders,
|
|
176
|
+
});
|
|
168
177
|
logger.log("new zod socket", { uri });
|
|
169
178
|
this.socket = io(uri, {
|
|
170
179
|
transports: ["websocket"],
|
|
@@ -182,6 +191,7 @@ export class ZodSocketConnection {
|
|
|
182
191
|
this.#handler = new ZodSocketMessageHandler({
|
|
183
192
|
schema: opts.serverMessages,
|
|
184
193
|
handlers: opts.handlers,
|
|
194
|
+
logPayloads: opts.logHandlerPayloads,
|
|
185
195
|
});
|
|
186
196
|
this.#handler.registerHandlers(this.socket, this.#logger);
|
|
187
197
|
this.#sender = new ZodSocketMessageSender({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"zodSocket.js","sourceRoot":"","sources":["../../../src/v3/zodSocket.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAC;AACtC,OAAO,EAAY,CAAC,EAAE,MAAM,KAAK,CAAC;AAElC,OAAO,EAAE,QAAQ,EAAE,sBAAsB,EAAoB,MAAM,6BAA6B,CAAC;AACjG,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"zodSocket.js","sourceRoot":"","sources":["../../../src/v3/zodSocket.ts"],"names":[],"mappings":"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"}
|
package/dist/esm/version.js
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export const VERSION = "
|
|
1
|
+
export const VERSION = "3.0.2";
|
|
2
2
|
//# sourceMappingURL=version.js.map
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@trigger.dev/core",
|
|
3
|
-
"version": "0.0.0-v3-prerelease-
|
|
3
|
+
"version": "0.0.0-v3-prerelease-20241009112547",
|
|
4
4
|
"description": "Core code used across the Trigger.dev SDK and platform",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"publishConfig": {
|
|
@@ -179,6 +179,7 @@
|
|
|
179
179
|
"@opentelemetry/semantic-conventions": "1.25.1",
|
|
180
180
|
"execa": "^8.0.1",
|
|
181
181
|
"humanize-duration": "^3.27.3",
|
|
182
|
+
"nanoid": "^3.3.4",
|
|
182
183
|
"socket.io-client": "4.7.5",
|
|
183
184
|
"superjson": "^2.2.1",
|
|
184
185
|
"zod": "3.22.3",
|