trigger.dev 3.0.0-beta.1 → 3.0.0-beta.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
// src/workers/dev/worker-facade.ts
|
|
2
2
|
import {
|
|
3
3
|
TaskExecutor,
|
|
4
|
-
|
|
4
|
+
DurableClock,
|
|
5
|
+
clock
|
|
5
6
|
} from "@trigger.dev/core/v3";
|
|
6
7
|
import {
|
|
7
8
|
ConsoleInterceptor,
|
|
@@ -16,23 +17,23 @@ import {
|
|
|
16
17
|
} from "@trigger.dev/core/v3";
|
|
17
18
|
|
|
18
19
|
// package.json
|
|
19
|
-
var version = "3.0.0-beta.
|
|
20
|
+
var version = "3.0.0-beta.2";
|
|
20
21
|
|
|
21
22
|
// src/workers/dev/worker-facade.ts
|
|
22
23
|
__WORKER_SETUP__;
|
|
23
24
|
__IMPORTED_PROJECT_CONFIG__;
|
|
24
25
|
var otelTracer = tracingSDK.getTracer("trigger-dev-worker", version);
|
|
25
26
|
var otelLogger = tracingSDK.getLogger("trigger-dev-worker", version);
|
|
26
|
-
var
|
|
27
|
+
var durableClock = new DurableClock();
|
|
28
|
+
clock.setGlobalClock(durableClock);
|
|
27
29
|
var tracer = new TriggerTracer({ tracer: otelTracer, logger: otelLogger });
|
|
28
|
-
var consoleInterceptor = new ConsoleInterceptor(otelLogger
|
|
30
|
+
var consoleInterceptor = new ConsoleInterceptor(otelLogger);
|
|
29
31
|
var devRuntimeManager = new DevRuntimeManager();
|
|
30
32
|
runtime.setGlobalRuntimeManager(devRuntimeManager);
|
|
31
33
|
var otelTaskLogger = new OtelTaskLogger({
|
|
32
34
|
logger: otelLogger,
|
|
33
35
|
tracer,
|
|
34
|
-
level: "info"
|
|
35
|
-
preciseDateOrigin
|
|
36
|
+
level: "info"
|
|
36
37
|
});
|
|
37
38
|
logger.setGlobalTaskLogger(otelTaskLogger);
|
|
38
39
|
var TaskFileImports = {};
|
|
@@ -51,6 +52,7 @@ function getTasks() {
|
|
|
51
52
|
filePath: taskFile.filePath,
|
|
52
53
|
queue: task.__trigger.queue,
|
|
53
54
|
retry: task.__trigger.retry,
|
|
55
|
+
machine: task.__trigger.machine,
|
|
54
56
|
fns: task.__trigger.fns
|
|
55
57
|
});
|
|
56
58
|
}
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
// src/workers/prod/entry-point.ts
|
|
2
2
|
import {
|
|
3
3
|
CoordinatorToProdWorkerMessages,
|
|
4
|
+
PostStartCauses,
|
|
5
|
+
PreStopCauses,
|
|
4
6
|
ProdWorkerToCoordinatorMessages,
|
|
5
7
|
ZodSocketConnection as ZodSocketConnection2
|
|
6
8
|
} from "@trigger.dev/core/v3";
|
|
@@ -78,12 +80,12 @@ var MACHINE_NAME = process.env.MACHINE_NAME || "local";
|
|
|
78
80
|
var PLATFORM_HOST = process.env.PLATFORM_HOST || "127.0.0.1";
|
|
79
81
|
var PLATFORM_WS_PORT = process.env.PLATFORM_WS_PORT || 3030;
|
|
80
82
|
var PLATFORM_SECRET = process.env.PLATFORM_SECRET || "provider-secret";
|
|
83
|
+
var SECURE_CONNECTION = ["1", "true"].includes(process.env.SECURE_CONNECTION ?? "false");
|
|
81
84
|
var logger = new SimpleLogger(`[${MACHINE_NAME}]`);
|
|
82
85
|
|
|
83
86
|
// src/workers/prod/entry-point.ts
|
|
84
87
|
import { readFile } from "node:fs/promises";
|
|
85
88
|
import { createServer } from "node:http";
|
|
86
|
-
import { z } from "zod";
|
|
87
89
|
|
|
88
90
|
// src/workers/prod/backgroundWorker.ts
|
|
89
91
|
import {
|
|
@@ -992,20 +994,13 @@ var ProdWorker = class {
|
|
|
992
994
|
return reply.text("Received ACK from coordinator");
|
|
993
995
|
}
|
|
994
996
|
case "/preStop": {
|
|
995
|
-
const
|
|
996
|
-
const cause = schema.safeParse(url.searchParams.get("cause"));
|
|
997
|
+
const cause = PreStopCauses.safeParse(url.searchParams.get("cause"));
|
|
997
998
|
if (!cause.success) {
|
|
998
999
|
logger2.error("Failed to parse cause", { cause });
|
|
999
|
-
return;
|
|
1000
|
+
return reply.text("Failed to parse cause", 400);
|
|
1000
1001
|
}
|
|
1001
1002
|
switch (cause.data) {
|
|
1002
|
-
case "
|
|
1003
|
-
break;
|
|
1004
|
-
}
|
|
1005
|
-
case "create": {
|
|
1006
|
-
break;
|
|
1007
|
-
}
|
|
1008
|
-
case "restore": {
|
|
1003
|
+
case "terminate": {
|
|
1009
1004
|
break;
|
|
1010
1005
|
}
|
|
1011
1006
|
default: {
|
|
@@ -1017,11 +1012,10 @@ var ProdWorker = class {
|
|
|
1017
1012
|
return reply.text("preStop ok");
|
|
1018
1013
|
}
|
|
1019
1014
|
case "/postStart": {
|
|
1020
|
-
const
|
|
1021
|
-
const cause = schema.safeParse(url.searchParams.get("cause"));
|
|
1015
|
+
const cause = PostStartCauses.safeParse(url.searchParams.get("cause"));
|
|
1022
1016
|
if (!cause.success) {
|
|
1023
1017
|
logger2.error("Failed to parse cause", { cause });
|
|
1024
|
-
return;
|
|
1018
|
+
return reply.text("Failed to parse cause", 400);
|
|
1025
1019
|
}
|
|
1026
1020
|
switch (cause.data) {
|
|
1027
1021
|
case "index": {
|
|
@@ -1076,11 +1070,7 @@ var ProdWorker = class {
|
|
|
1076
1070
|
throw new Error(`Background Worker started without tasks`);
|
|
1077
1071
|
}
|
|
1078
1072
|
for (const task of this.#backgroundWorker.tasks) {
|
|
1079
|
-
taskResources.push(
|
|
1080
|
-
id: task.id,
|
|
1081
|
-
filePath: task.filePath,
|
|
1082
|
-
exportName: task.exportName
|
|
1083
|
-
});
|
|
1073
|
+
taskResources.push(task);
|
|
1084
1074
|
packageVersion = task.packageVersion;
|
|
1085
1075
|
}
|
|
1086
1076
|
if (!packageVersion) {
|
|
@@ -4,7 +4,8 @@ import {
|
|
|
4
4
|
ProdWorkerToChildMessages,
|
|
5
5
|
TaskExecutor,
|
|
6
6
|
ZodIpcConnection,
|
|
7
|
-
|
|
7
|
+
DurableClock,
|
|
8
|
+
clock
|
|
8
9
|
} from "@trigger.dev/core/v3";
|
|
9
10
|
import "source-map-support/register.js";
|
|
10
11
|
import {
|
|
@@ -18,21 +19,21 @@ import {
|
|
|
18
19
|
} from "@trigger.dev/core/v3";
|
|
19
20
|
|
|
20
21
|
// package.json
|
|
21
|
-
var version = "3.0.0-beta.
|
|
22
|
+
var version = "3.0.0-beta.2";
|
|
22
23
|
|
|
23
24
|
// src/workers/prod/worker-facade.ts
|
|
24
25
|
__WORKER_SETUP__;
|
|
25
26
|
__IMPORTED_PROJECT_CONFIG__;
|
|
26
27
|
var otelTracer = tracingSDK.getTracer("trigger-prod-worker", version);
|
|
27
28
|
var otelLogger = tracingSDK.getLogger("trigger-prod-worker", version);
|
|
28
|
-
var
|
|
29
|
+
var durableClock = new DurableClock();
|
|
30
|
+
clock.setGlobalClock(durableClock);
|
|
29
31
|
var tracer = new TriggerTracer({ tracer: otelTracer, logger: otelLogger });
|
|
30
|
-
var consoleInterceptor = new ConsoleInterceptor(otelLogger
|
|
32
|
+
var consoleInterceptor = new ConsoleInterceptor(otelLogger);
|
|
31
33
|
var otelTaskLogger = new OtelTaskLogger({
|
|
32
34
|
logger: otelLogger,
|
|
33
35
|
tracer,
|
|
34
|
-
level: "info"
|
|
35
|
-
preciseDateOrigin
|
|
36
|
+
level: "info"
|
|
36
37
|
});
|
|
37
38
|
logger.setGlobalTaskLogger(otelTaskLogger);
|
|
38
39
|
var TaskFileImports = {};
|
|
@@ -51,6 +52,7 @@ function getTasks() {
|
|
|
51
52
|
filePath: taskFile.filePath,
|
|
52
53
|
queue: task.__trigger.queue,
|
|
53
54
|
retry: task.__trigger.retry,
|
|
55
|
+
machine: task.__trigger.machine,
|
|
54
56
|
fns: task.__trigger.fns
|
|
55
57
|
});
|
|
56
58
|
}
|
|
@@ -152,7 +154,9 @@ var zodIpc = new ZodIpcConnection({
|
|
|
152
154
|
}
|
|
153
155
|
}
|
|
154
156
|
});
|
|
155
|
-
var prodRuntimeManager = new ProdRuntimeManager(zodIpc
|
|
157
|
+
var prodRuntimeManager = new ProdRuntimeManager(zodIpc, {
|
|
158
|
+
waitThresholdInMs: parseInt(process.env.TRIGGER_RUNTIME_WAIT_THRESHOLD_IN_MS ?? "30000", 10)
|
|
159
|
+
});
|
|
156
160
|
runtime.setGlobalRuntimeManager(prodRuntimeManager);
|
|
157
161
|
zodIpc.send("TASKS_READY", { tasks: getTaskMetadata() }).catch((err) => {
|
|
158
162
|
console.error("Failed to send TASKS_READY message", err);
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "trigger.dev",
|
|
3
|
-
"version": "3.0.0-beta.
|
|
3
|
+
"version": "3.0.0-beta.2",
|
|
4
4
|
"description": "A Command-Line Interface for Trigger.dev (v3) projects",
|
|
5
5
|
"main": "./dist/index.js",
|
|
6
6
|
"types": "./dist/index.d.ts",
|
|
@@ -54,7 +54,7 @@
|
|
|
54
54
|
"typescript": "^5.3.3",
|
|
55
55
|
"vitest": "^0.34.4",
|
|
56
56
|
"xdg-app-paths": "^8.3.0",
|
|
57
|
-
"@trigger.dev/core-apps": "3.0.0-beta.
|
|
57
|
+
"@trigger.dev/core-apps": "3.0.0-beta.1",
|
|
58
58
|
"@trigger.dev/tsconfig": "0.0.0"
|
|
59
59
|
},
|
|
60
60
|
"watch": {
|
|
@@ -75,7 +75,7 @@
|
|
|
75
75
|
"@opentelemetry/sdk-trace-base": "^1.22.0",
|
|
76
76
|
"@opentelemetry/sdk-trace-node": "^1.22.0",
|
|
77
77
|
"@opentelemetry/semantic-conventions": "^1.22.0",
|
|
78
|
-
"@trigger.dev/core": "^3.0.0-beta.
|
|
78
|
+
"@trigger.dev/core": "^3.0.0-beta.1",
|
|
79
79
|
"@types/degit": "^2.8.3",
|
|
80
80
|
"chalk": "^5.2.0",
|
|
81
81
|
"chokidar": "^3.5.3",
|