trigger.dev 3.0.0-beta.13 → 3.0.0-beta.15

package/dist/workers/dev/worker-facade.js

@@ -21,7 +21,7 @@ import {
 } from "@trigger.dev/core/v3";
 
 // package.json
-var version = "3.0.0-beta.13";
+var version = "3.0.0-beta.15";
 
 // src/workers/dev/worker-facade.ts
 __WORKER_SETUP__;
@@ -73,7 +73,7 @@ var handler = new ZodMessageHandler({
           execution,
           result: {
             ok: false,
-            id: execution.attempt.id,
+            id: execution.run.id,
             error: {
               type: "INTERNAL_ERROR",
               code: TaskRunErrorCodes.TASK_ALREADY_RUNNING
@@ -90,7 +90,7 @@ var handler = new ZodMessageHandler({
           execution,
           result: {
             ok: false,
-            id: execution.attempt.id,
+            id: execution.run.id,
             error: {
               type: "INTERNAL_ERROR",
               code: TaskRunErrorCodes.COULD_NOT_FIND_EXECUTOR

package/dist/workers/prod/entry-point.js

@@ -577,6 +577,7 @@ var logger2 = new SimpleLogger(`[${MACHINE_NAME2}][${SHORT_HASH}]`);
 var ProdWorker = class {
   constructor(port, host = "0.0.0.0") {
     this.host = host;
+    process.on("SIGTERM", this.#handleSignal.bind(this, "SIGTERM"));
     this.#coordinatorSocket = this.#createCoordinatorSocket(COORDINATOR_HOST);
     this.#backgroundWorker = new ProdBackgroundWorker("worker.js", {
       projectConfig: __PROJECT_CONFIG__,
@@ -669,6 +670,27 @@ var ProdWorker = class {
   #backgroundWorker;
   #httpServer;
   #coordinatorSocket;
+  async #handleSignal(signal) {
+    logger2.log("Received signal", { signal });
+    if (signal === "SIGTERM") {
+      if (this.executing) {
+        const terminationGracePeriodSeconds = 60 * 60;
+        logger2.log("Waiting for attempt to complete before exiting", {
+          terminationGracePeriodSeconds
+        });
+        await setTimeout2(terminationGracePeriodSeconds * 1e3 - 5e3);
+        logger2.log("Termination timeout reached, exiting gracefully.");
+      } else {
+        logger2.log("Not executing, exiting immediately.");
+      }
+      await this.#exitGracefully();
+    }
+    logger2.log("Unhandled signal", { signal });
+  }
+  async #exitGracefully() {
+    await this.#backgroundWorker.close();
+    process.exit(0);
+  }
   async #reconnect(isPostStart = false, reconnectImmediately = false) {
     if (isPostStart) {
       this.waitForPostStart = false;
@@ -713,8 +735,7 @@ var ProdWorker = class {
       if (willCheckpointAndRestore) {
         logger2.log("WARNING: Will checkpoint but also requested exit. This won't end well.");
       }
-      await this.#backgroundWorker.close();
-      process.exit(0);
+      await this.#exitGracefully();
     }
     this.executing = false;
     this.attemptFriendlyId = void 0;
@@ -1044,7 +1065,6 @@ var ProdWorker = class {
                 break;
               }
             }
-            logger2.log("preStop", { url: req.url });
             return reply.text("preStop ok");
           }
           case "/postStart": {

package/dist/workers/prod/worker-facade.js

@@ -23,7 +23,7 @@ import {
 } from "@trigger.dev/core/v3";
 
 // package.json
-var version = "3.0.0-beta.13";
+var version = "3.0.0-beta.15";
 
 // src/workers/prod/worker-facade.ts
 __WORKER_SETUP__;
@@ -72,7 +72,7 @@ var zodIpc = new ZodIpcConnection({
           execution,
           result: {
             ok: false,
-            id: execution.attempt.id,
+            id: execution.run.id,
             error: {
               type: "INTERNAL_ERROR",
               code: TaskRunErrorCodes.TASK_ALREADY_RUNNING
@@ -89,7 +89,7 @@ var zodIpc = new ZodIpcConnection({
           execution,
           result: {
             ok: false,
-            id: execution.attempt.id,
+            id: execution.run.id,
             error: {
               type: "INTERNAL_ERROR",
               code: TaskRunErrorCodes.COULD_NOT_FIND_EXECUTOR
@@ -128,6 +128,20 @@ var zodIpc = new ZodIpcConnection({
     CLEANUP: async ({ flush, kill }, sender) => {
       if (kill) {
         await tracingSDK.flush();
+        if (_execution) {
+          await sender.send("TASK_RUN_COMPLETED", {
+            execution: _execution,
+            result: {
+              ok: false,
+              id: _execution.run.id,
+              error: {
+                type: "INTERNAL_ERROR",
+                code: TaskRunErrorCodes.GRACEFUL_EXIT_TIMEOUT,
+                message: "Worker process killed while attempt in progress."
+              }
+            }
+          });
+        }
         await sender.send("READY_TO_DISPOSE", void 0);
       } else {
         if (flush) {
@@ -137,6 +151,8 @@ var zodIpc = new ZodIpcConnection({
     }
   }
 });
+process.on("SIGTERM", async () => {
+});
 var prodRuntimeManager = new ProdRuntimeManager(zodIpc, {
   waitThresholdInMs: parseInt(process.env.TRIGGER_RUNTIME_WAIT_THRESHOLD_IN_MS ?? "30000", 10)
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "trigger.dev",
-  "version": "3.0.0-beta.13",
+  "version": "3.0.0-beta.15",
   "description": "A Command-Line Interface for Trigger.dev (v3) projects",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -53,7 +53,7 @@
     "typescript": "^5.3.3",
     "vitest": "^0.34.4",
     "xdg-app-paths": "^8.3.0",
-    "@trigger.dev/core-apps": "3.0.0-beta.13",
+    "@trigger.dev/core-apps": "3.0.0-beta.15",
     "@trigger.dev/tsconfig": "0.0.0"
   },
   "dependencies": {
@@ -71,7 +71,7 @@
     "@opentelemetry/sdk-trace-base": "^1.22.0",
     "@opentelemetry/sdk-trace-node": "^1.22.0",
     "@opentelemetry/semantic-conventions": "^1.22.0",
-    "@trigger.dev/core": "^3.0.0-beta.13",
+    "@trigger.dev/core": "^3.0.0-beta.15",
     "@types/degit": "^2.8.3",
     "chalk": "^5.2.0",
     "chokidar": "^3.5.3",