trigger.dev 0.0.0-v3-prerelease-20240628191401 → 0.0.0-v3-prerelease-20240701153550

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

@@ -8,7 +8,7 @@ import { ZodMessageSender } from "@trigger.dev/core/v3/zodMessageHandler";
 import "source-map-support/register.js";
 
 // package.json
-var version = "0.0.0-v3-prerelease-20240628191401";
+var version = "0.0.0-v3-prerelease-20240701153550";
 
 // src/workers/dev/worker-setup.ts
 __SETUP_IMPORTED_PROJECT_CONFIG__;

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

@@ -3,7 +3,8 @@ import {
   CoordinatorToProdWorkerMessages,
   PostStartCauses,
   PreStopCauses,
-  ProdWorkerToCoordinatorMessages
+  ProdWorkerToCoordinatorMessages,
+  TaskRunErrorCodes as TaskRunErrorCodes2
 } from "@trigger.dev/core/v3";
 import { ZodSocketConnection } from "@trigger.dev/core/v3/zodSocket";
 
@@ -65,6 +66,10 @@ var SimpleLogger = class {
   }
 };
 
+// ../core-apps/src/process.ts
+var EXIT_CODE_ALREADY_HANDLED = 111;
+var EXIT_CODE_CHILD_NONZERO = 112;
+
 // src/workers/prod/entry-point.ts
 import { readFile } from "node:fs/promises";
 import { createServer } from "node:http";
@@ -131,7 +136,7 @@ var GracefulExitTimeoutError = class extends Error {
     this.name = "GracefulExitTimeoutError";
   }
 };
-function getFriendlyErrorMessage(code, signal, stderr) {
+function getFriendlyErrorMessage(code, signal, stderr, dockerMode = true) {
   const message = (text) => {
     if (signal) {
       return `[${signal}] ${text}`;
@@ -139,7 +144,18 @@ function getFriendlyErrorMessage(code, signal, stderr) {
       return text;
     }
   };
-  if (code === 137 || stderr?.includes("OOMErrorHandler")) {
+  if (code === 137) {
+    if (dockerMode) {
+      return message(
+        "Process ran out of memory! Try choosing a machine preset with more memory for this task."
+      );
+    } else {
+      return message(
+        "Process most likely ran out of memory, but we can't be certain. Try choosing a machine preset with more memory for this task."
+      );
+    }
+  }
+  if (stderr?.includes("OOMErrorHandler")) {
     return message(
       "Process ran out of memory! Try choosing a machine preset with more memory for this task."
     );
@@ -877,10 +893,10 @@ var ProdWorker = class {
     }
     logger.log("Unhandled signal", { signal });
   }
-  async #exitGracefully(gracefulExitTimeoutElapsed = false) {
+  async #exitGracefully(gracefulExitTimeoutElapsed = false, exitCode = 0) {
     await this.#backgroundWorker.close(gracefulExitTimeoutElapsed);
     if (!gracefulExitTimeoutElapsed) {
-      process.exit(0);
+      process.exit(exitCode);
     }
   }
   async #reconnect(isPostStart = false, reconnectImmediately = false) {
@@ -1043,13 +1059,13 @@ var ProdWorker = class {
       }
     }
   }
-  async #prepareForRetry(willCheckpointAndRestore, shouldExit) {
+  async #prepareForRetry(willCheckpointAndRestore, shouldExit, exitCode) {
     logger.log("prepare for retry", { willCheckpointAndRestore, shouldExit });
     if (shouldExit) {
       if (willCheckpointAndRestore) {
         logger.log("WARNING: Will checkpoint but also requested exit. This won't end well.");
       }
-      await this.#exitGracefully();
+      await this.#exitGracefully(false, exitCode);
       return;
     }
     this.paused = false;
@@ -1195,7 +1211,8 @@ var ProdWorker = class {
               completion
             });
             logger.log("completion acknowledged", { willCheckpointAndRestore, shouldExit });
-            this.#prepareForRetry(willCheckpointAndRestore, shouldExit);
+            const exitCode = !completion.ok && completion.error.type === "INTERNAL_ERROR" && completion.error.code === TaskRunErrorCodes2.TASK_PROCESS_EXITED_WITH_NON_ZERO_CODE ? EXIT_CODE_CHILD_NONZERO : 0;
+            this.#prepareForRetry(willCheckpointAndRestore, shouldExit, exitCode);
           } catch (error) {
             const completion = {
               ok: false,
@@ -1277,6 +1294,13 @@ var ProdWorker = class {
           return;
         }
         if (process.env.INDEX_TASKS === "true") {
+          const failIndex = (error) => {
+            socket.emit("INDEXING_FAILED", {
+              version: "v1",
+              deploymentId: this.deploymentId,
+              error
+            });
+          };
           try {
             const taskResources = await this.#initializeWorker();
             const { success } = await socket.emitWithAck("INDEX_TASKS", {
@@ -1299,15 +1323,11 @@ var ProdWorker = class {
                 zodIssues: e.zodIssues,
                 tasks: e.tasks
               });
-              socket.emit("INDEXING_FAILED", {
-                version: "v1",
-                deploymentId: this.deploymentId,
-                error: {
-                  name: "TaskMetadataParseError",
-                  message: "There was an error parsing the task metadata",
-                  stack: JSON.stringify({ zodIssues: e.zodIssues, tasks: e.tasks }),
-                  stderr
-                }
+              failIndex({
+                name: "TaskMetadataParseError",
+                message: "There was an error parsing the task metadata",
+                stack: JSON.stringify({ zodIssues: e.zodIssues, tasks: e.tasks }),
+                stderr
               });
             } else if (e instanceof UncaughtExceptionError) {
               const error = {
@@ -1317,11 +1337,7 @@ var ProdWorker = class {
                 stderr
               };
               logger2.error("uncaught exception", { originalError: error });
-              socket.emit("INDEXING_FAILED", {
-                version: "v1",
-                deploymentId: this.deploymentId,
-                error
-              });
+              failIndex(error);
             } else if (e instanceof Error) {
               const error = {
                 name: e.name,
@@ -1330,36 +1346,24 @@ var ProdWorker = class {
                 stderr
               };
               logger2.error("error", { error });
-              socket.emit("INDEXING_FAILED", {
-                version: "v1",
-                deploymentId: this.deploymentId,
-                error
-              });
+              failIndex(error);
             } else if (typeof e === "string") {
               logger2.error("string error", { error: { message: e } });
-              socket.emit("INDEXING_FAILED", {
-                version: "v1",
-                deploymentId: this.deploymentId,
-                error: {
-                  name: "Error",
-                  message: e,
-                  stderr
-                }
+              failIndex({
+                name: "Error",
+                message: e,
+                stderr
               });
             } else {
               logger2.error("unknown error", { error: e });
-              socket.emit("INDEXING_FAILED", {
-                version: "v1",
-                deploymentId: this.deploymentId,
-                error: {
-                  name: "Error",
-                  message: "Unknown error",
-                  stderr
-                }
+              failIndex({
+                name: "Error",
+                message: "Unknown error",
+                stderr
               });
             }
             await setTimeout2(200);
-            process.exit(111);
+            process.exit(EXIT_CODE_ALREADY_HANDLED);
           }
         }
         if (this.executing) {

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

@@ -1,5 +1,5 @@
 // package.json
-var version = "0.0.0-v3-prerelease-20240628191401";
+var version = "0.0.0-v3-prerelease-20240701153550";
 
 // src/workers/prod/worker-setup.ts
 import { taskCatalog } from "@trigger.dev/core/v3";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "trigger.dev",
-  "version": "0.0.0-v3-prerelease-20240628191401",
+  "version": "0.0.0-v3-prerelease-20240701153550",
   "description": "A Command-Line Interface for Trigger.dev (v3) projects",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -53,8 +53,8 @@
     "typescript": "^5.3.3",
     "vitest": "^1.6.0",
     "xdg-app-paths": "^8.3.0",
-    "@trigger.dev/tsconfig": "0.0.0",
-    "@trigger.dev/core-apps": "0.0.0-v3-prerelease-20240628191401"
+    "@trigger.dev/core-apps": "0.0.0-v3-prerelease-20240701153550",
+    "@trigger.dev/tsconfig": "0.0.0"
   },
   "dependencies": {
     "@anatine/esbuild-decorators": "^0.2.19",
@@ -72,7 +72,7 @@
     "@opentelemetry/sdk-trace-base": "^1.22.0",
     "@opentelemetry/sdk-trace-node": "^1.22.0",
     "@opentelemetry/semantic-conventions": "^1.22.0",
-    "@trigger.dev/core": "0.0.0-v3-prerelease-20240628191401",
+    "@trigger.dev/core": "0.0.0-v3-prerelease-20240701153550",
     "@types/degit": "^2.8.3",
     "chalk": "^5.2.0",
     "chokidar": "^3.5.3",