trigger.dev 3.0.0-beta.5 → 3.0.0-beta.6
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/Containerfile.prod +8 -2
- package/dist/index.js +95 -18
- package/dist/index.js.map +1 -1
- package/dist/templates/trigger.config.ts.template +1 -1
- package/dist/workers/dev/worker-facade.js +1 -1
- package/dist/workers/prod/entry-point.js +21 -20
- package/dist/workers/prod/worker-facade.js +1 -1
- package/package.json +3 -4
|
@@ -306,7 +306,6 @@ var ProdBackgroundWorker = class {
|
|
|
306
306
|
try {
|
|
307
307
|
const taskRunProcess = await this.#initializeTaskRunProcess(payload);
|
|
308
308
|
const result = await taskRunProcess.executeTaskRun(payload);
|
|
309
|
-
await taskRunProcess.cleanup(result.ok || result.retry === void 0);
|
|
310
309
|
if (result.ok) {
|
|
311
310
|
return result;
|
|
312
311
|
}
|
|
@@ -437,6 +436,7 @@ var TaskRunProcess = class {
|
|
|
437
436
|
resolver(result);
|
|
438
437
|
},
|
|
439
438
|
READY_TO_DISPOSE: async (message) => {
|
|
439
|
+
process.exit(0);
|
|
440
440
|
},
|
|
441
441
|
TASK_HEARTBEAT: async (message) => {
|
|
442
442
|
this.onTaskHeartbeat.post(message.id);
|
|
@@ -669,31 +669,33 @@ var ProdWorker = class {
|
|
|
669
669
|
#backgroundWorker;
|
|
670
670
|
#httpServer;
|
|
671
671
|
#coordinatorSocket;
|
|
672
|
-
async #reconnect(isPostStart = false) {
|
|
672
|
+
async #reconnect(isPostStart = false, reconnectImmediately = false) {
|
|
673
673
|
if (isPostStart) {
|
|
674
674
|
this.waitForPostStart = false;
|
|
675
675
|
}
|
|
676
676
|
this.#coordinatorSocket.close();
|
|
677
|
-
if (!
|
|
678
|
-
|
|
679
|
-
return;
|
|
677
|
+
if (!reconnectImmediately) {
|
|
678
|
+
await setTimeout2(1e3);
|
|
680
679
|
}
|
|
680
|
+
let coordinatorHost = COORDINATOR_HOST;
|
|
681
681
|
try {
|
|
682
|
-
|
|
683
|
-
"
|
|
684
|
-
|
|
685
|
-
|
|
686
|
-
|
|
687
|
-
|
|
688
|
-
|
|
689
|
-
|
|
690
|
-
|
|
691
|
-
|
|
692
|
-
|
|
693
|
-
|
|
682
|
+
if (this.runningInKubernetes) {
|
|
683
|
+
coordinatorHost = (await readFile("/etc/taskinfo/coordinator-host", "utf-8")).replace(
|
|
684
|
+
"\n",
|
|
685
|
+
""
|
|
686
|
+
);
|
|
687
|
+
logger2.log("reconnecting", {
|
|
688
|
+
coordinatorHost: {
|
|
689
|
+
fromEnv: COORDINATOR_HOST,
|
|
690
|
+
fromVolume: coordinatorHost,
|
|
691
|
+
current: this.#coordinatorSocket.socket.io.opts.hostname
|
|
692
|
+
}
|
|
693
|
+
});
|
|
694
|
+
}
|
|
694
695
|
} catch (error) {
|
|
695
696
|
logger2.error("taskinfo read error during reconnect", { error });
|
|
696
|
-
|
|
697
|
+
} finally {
|
|
698
|
+
this.#coordinatorSocket = this.#createCoordinatorSocket(coordinatorHost);
|
|
697
699
|
}
|
|
698
700
|
}
|
|
699
701
|
#prepareForWait(reason, willCheckpointAndRestore) {
|
|
@@ -836,7 +838,6 @@ var ProdWorker = class {
|
|
|
836
838
|
const completion = await this.#backgroundWorker.executeTaskRun(executionPayload);
|
|
837
839
|
logger2.log("completed", completion);
|
|
838
840
|
this.completed.add(executionPayload.execution.attempt.id);
|
|
839
|
-
await this.#backgroundWorker.flushTelemetry();
|
|
840
841
|
const { willCheckpointAndRestore, shouldExit } = await this.#coordinatorSocket.socket.emitWithAck("TASK_RUN_COMPLETED", {
|
|
841
842
|
version: "v1",
|
|
842
843
|
execution: executionPayload.execution,
|
|
@@ -1055,7 +1056,7 @@ var ProdWorker = class {
|
|
|
1055
1056
|
break;
|
|
1056
1057
|
}
|
|
1057
1058
|
case "restore": {
|
|
1058
|
-
await this.#reconnect(true);
|
|
1059
|
+
await this.#reconnect(true, true);
|
|
1059
1060
|
break;
|
|
1060
1061
|
}
|
|
1061
1062
|
default: {
|
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.6",
|
|
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.6",
|
|
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.6",
|
|
79
79
|
"@types/degit": "^2.8.3",
|
|
80
80
|
"chalk": "^5.2.0",
|
|
81
81
|
"chokidar": "^3.5.3",
|
|
@@ -109,7 +109,6 @@
|
|
|
109
109
|
"simple-git": "^3.19.0",
|
|
110
110
|
"socket.io-client": "^4.7.4",
|
|
111
111
|
"source-map-support": "^0.5.21",
|
|
112
|
-
"supports-color": "^9.4.0",
|
|
113
112
|
"terminal-link": "^3.0.0",
|
|
114
113
|
"tiny-invariant": "^1.2.0",
|
|
115
114
|
"tsconfig-paths": "^4.2.0",
|