trigger.dev 3.0.0-beta.12 → 3.0.0-beta.14

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

@@ -1,11 +1,12 @@
 // src/workers/dev/worker-facade.ts
 import {
-  TaskExecutor,
   DurableClock,
+  TaskExecutor,
+  ZodSchemaParsedError,
   clock,
-  logLevels,
   getEnvVar,
-  ZodSchemaParsedError
+  logLevels,
+  taskCatalog
 } from "@trigger.dev/core/v3";
 import {
   ConsoleInterceptor,
@@ -20,7 +21,7 @@ import {
 } from "@trigger.dev/core/v3";
 
 // package.json
-var version = "3.0.0-beta.12";
+var version = "3.0.0-beta.14";
 
 // src/workers/dev/worker-facade.ts
 __WORKER_SETUP__;
@@ -30,7 +31,10 @@ 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");
@@ -44,50 +48,19 @@ 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,
+      if (typeof task === "object" && task !== null && "id" in task && typeof task.id === "string") {
+        taskCatalog.registerTaskFileMetadata(task.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
+          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({
@@ -110,9 +83,9 @@ 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: {
@@ -126,6 +99,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;
@@ -157,7 +138,7 @@ var handler = new ZodMessageHandler({
 process.on("message", async (msg) => {
   await handler.handleMessage(msg);
 });
-var TASK_METADATA = getTaskMetadata();
+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 });

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

@@ -3,9 +3,11 @@ import "source-map-support/register.js";
 import { Resource } from "@opentelemetry/resources";
 import {
   SemanticInternalAttributes,
+  StandardTaskCatalog,
   TracingSDK,
   ZodMessageSender,
-  childToWorkerMessages
+  childToWorkerMessages,
+  taskCatalog
 } from "@trigger.dev/core/v3";
 __SETUP_IMPORTED_PROJECT_CONFIG__;
 var tracingSDK = new TracingSDK({
@@ -34,6 +36,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

@@ -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

@@ -1,14 +1,15 @@
 // src/workers/prod/worker-facade.ts
 import {
+  DurableClock,
   ProdChildToWorkerMessages,
   ProdWorkerToChildMessages,
   TaskExecutor,
   ZodIpcConnection,
-  DurableClock,
+  ZodSchemaParsedError,
   clock,
   getEnvVar,
   logLevels,
-  ZodSchemaParsedError
+  taskCatalog
 } from "@trigger.dev/core/v3";
 import "source-map-support/register.js";
 import {
@@ -22,7 +23,7 @@ import {
 } from "@trigger.dev/core/v3";
 
 // package.json
-var version = "3.0.0-beta.12";
+var version = "3.0.0-beta.14";
 
 // src/workers/prod/worker-facade.ts
 __WORKER_SETUP__;
@@ -32,7 +33,7 @@ var otelLogger = tracingSDK.getLogger("trigger-prod-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, false);
 var triggerLogLevel = getEnvVar("TRIGGER_LOG_LEVEL");
 var configLogLevel = triggerLogLevel ? triggerLogLevel : importedConfig ? importedConfig.logLevel : __PROJECT_CONFIG__.logLevel;
 var otelTaskLogger = new OtelTaskLogger({
@@ -44,50 +45,19 @@ 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,
+      if (typeof task === "object" && task !== null && "id" in task && typeof task.id === "string") {
+        taskCatalog.registerTaskFileMetadata(task.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
+          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 zodIpc = new ZodIpcConnection({
@@ -112,9 +82,9 @@ var zodIpc = new ZodIpcConnection({
         return;
       }
       process.title = `trigger-prod-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: {
@@ -128,6 +98,14 @@ var zodIpc = new ZodIpcConnection({
         });
         return;
       }
+      const executor = new TaskExecutor(task, {
+        tracer,
+        tracingSDK,
+        consoleInterceptor,
+        projectConfig: __PROJECT_CONFIG__,
+        importedConfig,
+        handleErrorFn: handleError
+      });
       try {
         _execution = execution;
         _isRunning = true;
@@ -150,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.attempt.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) {
@@ -159,11 +151,13 @@ 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)
 });
 runtime.setGlobalRuntimeManager(prodRuntimeManager);
-var TASK_METADATA = getTaskMetadata();
+var TASK_METADATA = taskCatalog.getAllTaskMetadata();
 zodIpc.send("TASKS_READY", { tasks: TASK_METADATA }).catch((err) => {
   if (err instanceof ZodSchemaParsedError) {
     zodIpc.send("TASKS_FAILED_TO_PARSE", { zodIssues: err.error.issues, tasks: TASK_METADATA });

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

@@ -2,7 +2,9 @@
 import { Resource } from "@opentelemetry/resources";
 import {
   SemanticInternalAttributes,
-  TracingSDK
+  StandardTaskCatalog,
+  TracingSDK,
+  taskCatalog
 } from "@trigger.dev/core/v3";
 __SETUP_IMPORTED_PROJECT_CONFIG__;
 var tracingSDK = new TracingSDK({
@@ -30,6 +32,7 @@ process.on("uncaughtException", (error, origin) => {
     }
   });
 });
+taskCatalog.setGlobalTaskCatalog(new StandardTaskCatalog());
 export {
   tracingSDK
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "trigger.dev",
-  "version": "3.0.0-beta.12",
+  "version": "3.0.0-beta.14",
   "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.12",
+    "@trigger.dev/core-apps": "3.0.0-beta.14",
     "@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.12",
+    "@trigger.dev/core": "^3.0.0-beta.14",
     "@types/degit": "^2.8.3",
     "chalk": "^5.2.0",
     "chokidar": "^3.5.3",