trigger.dev 3.0.0-beta.2 → 3.0.0-beta.20

package/dist/templates/trigger.config.ts.template

@@ -2,8 +2,9 @@ import type { TriggerConfig } from "@trigger.dev/sdk/v3";
 
 export const config: TriggerConfig = {
   project: "${projectRef}",
+  logLevel: "log",
   retries: {
-    enabledInDev: false,
+    enabledInDev: true,
     default: {
       maxAttempts: 3,
       minTimeoutInMs: 1000,

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

@@ -1,23 +1,31 @@
 // src/workers/dev/worker-facade.ts
 import {
-  TaskExecutor,
-  DurableClock,
-  clock
+  clock,
+  taskCatalog
 } from "@trigger.dev/core/v3";
 import {
-  ConsoleInterceptor,
-  DevRuntimeManager,
+  TaskExecutor,
+  DurableClock,
+  getEnvVar,
+  logLevels,
   OtelTaskLogger,
+  ConsoleInterceptor
+} from "@trigger.dev/core/v3/workers";
+import {
   TaskRunErrorCodes,
   TriggerTracer,
-  ZodMessageHandler,
   logger,
   runtime,
   workerToChildMessages
 } from "@trigger.dev/core/v3";
+import { DevRuntimeManager } from "@trigger.dev/core/v3/dev";
+import {
+  ZodMessageHandler,
+  ZodSchemaParsedError
+} from "@trigger.dev/core/v3/zodMessageHandler";
 
 // package.json
-var version = "3.0.0-beta.2";
+var version = "3.0.0-beta.20";
 
 // src/workers/dev/worker-facade.ts
 __WORKER_SETUP__;
@@ -27,62 +35,38 @@ var otelLogger = tracingSDK.getLogger("trigger-dev-worker", version);
 var durableClock = new DurableClock();
 clock.setGlobalClock(durableClock);
 var tracer = new TriggerTracer({ tracer: otelTracer, logger: otelLogger });
-var consoleInterceptor = new ConsoleInterceptor(otelLogger);
+var consoleInterceptor = new ConsoleInterceptor(
+  otelLogger,
+  __PROJECT_CONFIG__.enableConsoleLogging ?? false
+);
 var devRuntimeManager = new DevRuntimeManager();
 runtime.setGlobalRuntimeManager(devRuntimeManager);
+var triggerLogLevel = getEnvVar("TRIGGER_LOG_LEVEL");
+var configLogLevel = triggerLogLevel ? triggerLogLevel : importedConfig ? importedConfig.logLevel : __PROJECT_CONFIG__.logLevel;
 var otelTaskLogger = new OtelTaskLogger({
   logger: otelLogger,
   tracer,
-  level: "info"
+  level: logLevels.includes(configLogLevel) ? configLogLevel : "log"
 });
 logger.setGlobalTaskLogger(otelTaskLogger);
 var TaskFileImports = {};
 var TaskFiles = {};
 __TASKS__;
-function getTasks() {
-  const result = [];
+(() => {
   for (const [importName, taskFile] of Object.entries(TaskFiles)) {
     const fileImports = TaskFileImports[importName];
     for (const [exportName, task] of Object.entries(fileImports ?? {})) {
-      if (task.__trigger) {
-        result.push({
-          id: task.__trigger.id,
-          exportName,
-          packageVersion: task.__trigger.packageVersion,
-          filePath: taskFile.filePath,
-          queue: task.__trigger.queue,
-          retry: task.__trigger.retry,
-          machine: task.__trigger.machine,
-          fns: task.__trigger.fns
-        });
+      if (typeof task === "object" && task !== null && "id" in task && typeof task.id === "string") {
+        if (taskCatalog.taskExists(task.id)) {
+          taskCatalog.registerTaskFileMetadata(task.id, {
+            exportName,
+            filePath: taskFile.filePath
+          });
+        }
       }
     }
   }
-  return result;
-}
-function getTaskMetadata() {
-  const result = getTasks();
-  return result.map((task) => {
-    const { fns, ...metadata } = task;
-    return metadata;
-  });
-}
-var tasks = getTasks();
-runtime.registerTasks(tasks);
-var taskExecutors = /* @__PURE__ */ new Map();
-for (const task of tasks) {
-  taskExecutors.set(
-    task.id,
-    new TaskExecutor(task, {
-      tracer,
-      tracingSDK,
-      consoleInterceptor,
-      projectConfig: __PROJECT_CONFIG__,
-      importedConfig,
-      handleErrorFn: handleError
-    })
-  );
-}
+})();
 var _execution;
 var _isRunning = false;
 var handler = new ZodMessageHandler({
@@ -95,7 +79,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
@@ -105,14 +89,14 @@ var handler = new ZodMessageHandler({
         return;
       }
       process.title = `trigger-dev-worker: ${execution.task.id} ${execution.run.id}`;
-      const executor = taskExecutors.get(execution.task.id);
-      if (!executor) {
-        console.error(`Could not find executor for task ${execution.task.id}`);
+      const task = taskCatalog.getTask(execution.task.id);
+      if (!task) {
+        console.error(`Could not find task ${execution.task.id}`);
         await sender.send("TASK_RUN_COMPLETED", {
           execution,
           result: {
             ok: false,
-            id: execution.attempt.id,
+            id: execution.run.id,
             error: {
               type: "INTERNAL_ERROR",
               code: TaskRunErrorCodes.COULD_NOT_FIND_EXECUTOR
@@ -121,6 +105,14 @@ var handler = new ZodMessageHandler({
         });
         return;
       }
+      const executor = new TaskExecutor(task, {
+        tracer,
+        tracingSDK,
+        consoleInterceptor,
+        projectConfig: __PROJECT_CONFIG__,
+        importedConfig,
+        handleErrorFn: handleError
+      });
       try {
         _execution = execution;
         _isRunning = true;
@@ -152,8 +144,13 @@ var handler = new ZodMessageHandler({
 process.on("message", async (msg) => {
   await handler.handleMessage(msg);
 });
-sender.send("TASKS_READY", { tasks: getTaskMetadata() }).catch((err) => {
-  console.error("Failed to send TASKS_READY message", err);
+var TASK_METADATA = taskCatalog.getAllTaskMetadata();
+sender.send("TASKS_READY", { tasks: TASK_METADATA }).catch((err) => {
+  if (err instanceof ZodSchemaParsedError) {
+    sender.send("TASKS_FAILED_TO_PARSE", { zodIssues: err.error.issues, tasks: TASK_METADATA });
+  } else {
+    console.error("Failed to send TASKS_READY message", err);
+  }
 });
 process.title = "trigger-dev-worker";
 async function asyncHeartbeat(initialDelayInSeconds = 30, intervalInSeconds = 5) {

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

@@ -3,10 +3,14 @@ import "source-map-support/register.js";
 import { Resource } from "@opentelemetry/resources";
 import {
   SemanticInternalAttributes,
-  TracingSDK,
-  ZodMessageSender,
-  childToWorkerMessages
+  childToWorkerMessages,
+  taskCatalog
 } from "@trigger.dev/core/v3";
+import {
+  TracingSDK,
+  StandardTaskCatalog
+} from "@trigger.dev/core/v3/workers";
+import { ZodMessageSender } from "@trigger.dev/core/v3/zodMessageHandler";
 __SETUP_IMPORTED_PROJECT_CONFIG__;
 var tracingSDK = new TracingSDK({
   url: process.env.OTEL_EXPORTER_OTLP_ENDPOINT ?? "http://0.0.0.0:4318",
@@ -34,6 +38,7 @@ process.on("uncaughtException", (error, origin) => {
     console.error("Failed to send UNCAUGHT_EXCEPTION message", err);
   });
 });
+taskCatalog.setGlobalTaskCatalog(new StandardTaskCatalog());
 export {
   sender,
   tracingSDK

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

@@ -3,9 +3,9 @@ import {
   CoordinatorToProdWorkerMessages,
   PostStartCauses,
   PreStopCauses,
-  ProdWorkerToCoordinatorMessages,
-  ZodSocketConnection as ZodSocketConnection2
+  ProdWorkerToCoordinatorMessages
 } from "@trigger.dev/core/v3";
+import { ZodSocketConnection as ZodSocketConnection2 } from "@trigger.dev/core/v3/zodSocket";
 
 // ../core-apps/src/http.ts
 var HttpReply = class {
@@ -71,10 +71,10 @@ import {
   clientWebsocketMessages,
   PlatformToProviderMessages,
   ProviderToPlatformMessages,
-  SharedQueueToClientMessages,
-  ZodMessageSender,
-  ZodSocketConnection
+  SharedQueueToClientMessages
 } from "@trigger.dev/core/v3";
+import { ZodMessageSender } from "@trigger.dev/core/v3/zodMessageHandler";
+import { ZodSocketConnection } from "@trigger.dev/core/v3/zodSocket";
 var HTTP_SERVER_PORT = Number(process.env.HTTP_SERVER_PORT || getRandomPortNumber());
 var MACHINE_NAME = process.env.MACHINE_NAME || "local";
 var PLATFORM_HOST = process.env.PLATFORM_HOST || "127.0.0.1";
@@ -93,9 +93,9 @@ import {
   ProdWorkerToChildMessages,
   SemanticInternalAttributes,
   TaskRunErrorCodes,
-  ZodIpcConnection,
   correctErrorStackTrace
 } from "@trigger.dev/core/v3";
+import { ZodIpcConnection } from "@trigger.dev/core/v3/zodIpc";
 import { Evt } from "evt";
 import { fork } from "node:child_process";
 
@@ -108,6 +108,14 @@ var UncaughtExceptionError = class extends Error {
     this.name = "UncaughtExceptionError";
   }
 };
+var TaskMetadataParseError = class extends Error {
+  constructor(zodIssues, tasks) {
+    super(`Failed to parse task metadata`);
+    this.zodIssues = zodIssues;
+    this.tasks = tasks;
+    this.name = "TaskMetadataParseError";
+  }
+};
 
 // src/workers/prod/backgroundWorker.ts
 var UnexpectedExitError = class extends Error {
@@ -206,6 +214,14 @@ var ProdBackgroundWorker = class {
               reject(new UncaughtExceptionError(message.error, message.origin));
               child.kill();
             }
+          },
+          TASKS_FAILED_TO_PARSE: async (message) => {
+            if (!resolved) {
+              clearTimeout(timeout);
+              resolved = true;
+              reject(new TaskMetadataParseError(message.zodIssues, message.tasks));
+              child.kill();
+            }
           }
         }
       });
@@ -247,6 +263,7 @@ var ProdBackgroundWorker = class {
     );
     if (!this._taskRunProcess) {
       const taskRunProcess = new TaskRunProcess(
+        payload.execution,
         this.path,
         {
           ...this.params.env,
@@ -289,7 +306,6 @@ var ProdBackgroundWorker = class {
     try {
       const taskRunProcess = await this.#initializeTaskRunProcess(payload);
       const result = await taskRunProcess.executeTaskRun(payload);
-      await taskRunProcess.cleanup(result.ok || result.retry === void 0);
       if (result.ok) {
         return result;
       }
@@ -358,7 +374,8 @@ var ProdBackgroundWorker = class {
   }
 };
 var TaskRunProcess = class {
-  constructor(path, env, metadata, worker) {
+  constructor(execution, path, env, metadata, worker) {
+    this.execution = execution;
     this.path = path;
     this.env = env;
     this.metadata = metadata;
@@ -391,6 +408,7 @@ var TaskRunProcess = class {
         "ipc"
       ],
       env: {
+        ...this.execution.run.isTest ? { TRIGGER_LOG_LEVEL: "debug" } : {},
         ...this.env,
         OTEL_RESOURCE_ATTRIBUTES: JSON.stringify({
           [SemanticInternalAttributes.PROJECT_DIR]: this.worker.projectConfig.projectDir
@@ -418,6 +436,7 @@ var TaskRunProcess = class {
           resolver(result);
         },
         READY_TO_DISPOSE: async (message) => {
+          process.exit(0);
         },
         TASK_HEARTBEAT: async (message) => {
           this.onTaskHeartbeat.post(message.id);
@@ -558,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__,
@@ -650,31 +670,54 @@ var ProdWorker = class {
   #backgroundWorker;
   #httpServer;
   #coordinatorSocket;
-  async #reconnect(isPostStart = false) {
+  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;
     }
     this.#coordinatorSocket.close();
-    if (!this.runningInKubernetes) {
-      this.#coordinatorSocket.connect();
-      return;
+    if (!reconnectImmediately) {
+      await setTimeout2(1e3);
     }
+    let coordinatorHost = COORDINATOR_HOST;
     try {
-      const coordinatorHost = (await readFile("/etc/taskinfo/coordinator-host", "utf-8")).replace(
-        "\n",
-        ""
-      );
-      logger2.log("reconnecting", {
-        coordinatorHost: {
-          fromEnv: COORDINATOR_HOST,
-          fromVolume: coordinatorHost,
-          current: this.#coordinatorSocket.socket.io.opts.hostname
-        }
-      });
-      this.#coordinatorSocket = this.#createCoordinatorSocket(coordinatorHost);
+      if (this.runningInKubernetes) {
+        coordinatorHost = (await readFile("/etc/taskinfo/coordinator-host", "utf-8")).replace(
+          "\n",
+          ""
+        );
+        logger2.log("reconnecting", {
+          coordinatorHost: {
+            fromEnv: COORDINATOR_HOST,
+            fromVolume: coordinatorHost,
+            current: this.#coordinatorSocket.socket.io.opts.hostname
+          }
+        });
+      }
     } catch (error) {
       logger2.error("taskinfo read error during reconnect", { error });
-      this.#coordinatorSocket.connect();
+    } finally {
+      this.#coordinatorSocket = this.#createCoordinatorSocket(coordinatorHost);
     }
   }
   #prepareForWait(reason, willCheckpointAndRestore) {
@@ -692,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;
@@ -817,7 +859,6 @@ var ProdWorker = class {
           const completion = await this.#backgroundWorker.executeTaskRun(executionPayload);
           logger2.log("completed", completion);
           this.completed.add(executionPayload.execution.attempt.id);
-          await this.#backgroundWorker.flushTelemetry();
           const { willCheckpointAndRestore, shouldExit } = await this.#coordinatorSocket.socket.emitWithAck("TASK_RUN_COMPLETED", {
             version: "v1",
             execution: executionPayload.execution,
@@ -868,30 +909,46 @@ var ProdWorker = class {
               process.exit(1);
             }
           } catch (e) {
-            if (e instanceof UncaughtExceptionError) {
-              logger3.error("uncaught exception", { message: e.originalError.message });
+            if (e instanceof TaskMetadataParseError) {
+              logger3.error("tasks metadata parse error", {
+                zodIssues: e.zodIssues,
+                tasks: e.tasks
+              });
               socket.emit("INDEXING_FAILED", {
                 version: "v1",
                 deploymentId: this.deploymentId,
                 error: {
-                  name: e.originalError.name,
-                  message: e.originalError.message,
-                  stack: e.originalError.stack
+                  name: "TaskMetadataParseError",
+                  message: "There was an error parsing the task metadata",
+                  stack: JSON.stringify({ zodIssues: e.zodIssues, tasks: e.tasks })
                 }
               });
+            } else if (e instanceof UncaughtExceptionError) {
+              const error = {
+                name: e.originalError.name,
+                message: e.originalError.message,
+                stack: e.originalError.stack
+              };
+              logger3.error("uncaught exception", { originalError: error });
+              socket.emit("INDEXING_FAILED", {
+                version: "v1",
+                deploymentId: this.deploymentId,
+                error
+              });
             } else if (e instanceof Error) {
-              logger3.error("error", { message: e.message });
+              const error = {
+                name: e.name,
+                message: e.message,
+                stack: e.stack
+              };
+              logger3.error("error", { error });
               socket.emit("INDEXING_FAILED", {
                 version: "v1",
                 deploymentId: this.deploymentId,
-                error: {
-                  name: e.name,
-                  message: e.message,
-                  stack: e.stack
-                }
+                error
               });
             } else if (typeof e === "string") {
-              logger3.error("string error", { message: e });
+              logger3.error("string error", { error: { message: e } });
               socket.emit("INDEXING_FAILED", {
                 version: "v1",
                 deploymentId: this.deploymentId,
@@ -912,7 +969,7 @@ var ProdWorker = class {
               });
             }
             await setTimeout2(200);
-            process.exit(1);
+            process.exit(111);
           }
         }
         if (this.paused) {
@@ -1008,7 +1065,6 @@ var ProdWorker = class {
                 break;
               }
             }
-            logger2.log("preStop", { url: req.url });
             return reply.text("preStop ok");
           }
           case "/postStart": {
@@ -1025,7 +1081,7 @@ var ProdWorker = class {
                 break;
               }
               case "restore": {
-                await this.#reconnect(true);
+                await this.#reconnect(true, true);
                 break;
               }
               default: {