trigger.dev 0.0.0-prerelease-20240410151927 → 0.0.0-v2-prerelease-20240524135558

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

@@ -1,36 +1,37 @@
 // src/workers/dev/worker-facade.ts
 import {
-  TaskExecutor,
-  DurableClock,
   clock,
-  logLevels,
-  getEnvVar,
-  ZodSchemaParsedError
+  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";
-
-// package.json
-var version = "0.0.0-prerelease-20240410151927";
-
-// src/workers/dev/worker-facade.ts
+import { DevRuntimeManager } from "@trigger.dev/core/v3/dev";
+import {
+  ZodMessageHandler,
+  ZodSchemaParsedError
+} from "@trigger.dev/core/v3/zodMessageHandler";
 __WORKER_SETUP__;
 __IMPORTED_PROJECT_CONFIG__;
-var otelTracer = tracingSDK.getTracer("trigger-dev-worker", version);
-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,
+  typeof __PROJECT_CONFIG__.enableConsoleLogging === "boolean" ? __PROJECT_CONFIG__.enableConsoleLogging : true
+);
 var devRuntimeManager = new DevRuntimeManager();
 runtime.setGlobalRuntimeManager(devRuntimeManager);
 var triggerLogLevel = getEnvVar("TRIGGER_LOG_LEVEL");
@@ -38,56 +39,27 @@ var configLogLevel = triggerLogLevel ? triggerLogLevel : importedConfig ? import
 var otelTaskLogger = new OtelTaskLogger({
   logger: otelLogger,
   tracer,
-  level: logLevels.includes(configLogLevel) ? configLogLevel : "log"
+  level: logLevels.includes(configLogLevel) ? configLogLevel : "info"
 });
 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({
@@ -100,7 +72,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
@@ -110,14 +82,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
@@ -126,6 +98,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 +137,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

@@ -1,40 +1,34 @@
 // src/workers/dev/worker-setup.ts
-import "source-map-support/register.js";
-import { Resource } from "@opentelemetry/resources";
+import { childToWorkerMessages, taskCatalog } from "@trigger.dev/core/v3";
 import {
-  SemanticInternalAttributes,
-  TracingSDK,
-  ZodMessageSender,
-  childToWorkerMessages
-} from "@trigger.dev/core/v3";
+  StandardTaskCatalog,
+  TracingSDK
+} from "@trigger.dev/core/v3/workers";
+import { ZodMessageSender } from "@trigger.dev/core/v3/zodMessageHandler";
+import "source-map-support/register.js";
+
+// package.json
+var version = "3.0.0-beta.33";
+
+// src/workers/dev/worker-setup.ts
 __SETUP_IMPORTED_PROJECT_CONFIG__;
 var tracingSDK = new TracingSDK({
   url: process.env.OTEL_EXPORTER_OTLP_ENDPOINT ?? "http://0.0.0.0:4318",
-  resource: new Resource({
-    [SemanticInternalAttributes.CLI_VERSION]: "3.0.0"
-  }),
   instrumentations: setupImportedConfig?.instrumentations ?? [],
   diagLogLevel: process.env.OTEL_LOG_LEVEL ?? "none"
 });
+var otelTracer = tracingSDK.getTracer("trigger-dev-worker", version);
+var otelLogger = tracingSDK.getLogger("trigger-dev-worker", version);
 var sender = new ZodMessageSender({
   schema: childToWorkerMessages,
   sender: async (message) => {
     process.send?.(message);
   }
 });
-process.on("uncaughtException", (error, origin) => {
-  sender.send("UNCAUGHT_EXCEPTION", {
-    error: {
-      name: error.name,
-      message: error.message,
-      stack: error.stack
-    },
-    origin
-  }).catch((err) => {
-    console.error("Failed to send UNCAUGHT_EXCEPTION message", err);
-  });
-});
+taskCatalog.setGlobalTaskCatalog(new StandardTaskCatalog());
 export {
+  otelLogger,
+  otelTracer,
   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";
 
@@ -148,6 +148,7 @@ var ProdBackgroundWorker = class {
   onWaitForDuration = new Evt();
   onWaitForTask = new Evt();
   preCheckpointNotification = Evt.create();
+  checkpointCanceledNotification = Evt.create();
   onReadyForCheckpoint = Evt.create();
   onCancelCheckpoint = Evt.create();
   _onClose = new Evt();
@@ -296,6 +297,9 @@ var ProdBackgroundWorker = class {
       this.preCheckpointNotification.attach((message) => {
         taskRunProcess.preCheckpointNotification.post(message);
       });
+      this.checkpointCanceledNotification.attach((message) => {
+        taskRunProcess.checkpointCanceledNotification.post(message);
+      });
       await taskRunProcess.initialize();
       this._taskRunProcess = taskRunProcess;
     }
@@ -394,6 +398,7 @@ var TaskRunProcess = class {
   onWaitForDuration = new Evt();
   onWaitForTask = new Evt();
   preCheckpointNotification = Evt.create();
+  checkpointCanceledNotification = Evt.create();
   onReadyForCheckpoint = Evt.create();
   onCancelCheckpoint = Evt.create();
   async initialize() {
@@ -443,22 +448,49 @@ var TaskRunProcess = class {
         },
         TASKS_READY: async (message) => {
         },
+        WAIT_FOR_TASK: async (message) => {
+          this.onWaitForTask.post(message);
+        },
         WAIT_FOR_BATCH: async (message) => {
           this.onWaitForBatch.post(message);
         },
         WAIT_FOR_DURATION: async (message) => {
           this.onWaitForDuration.post(message);
-          const { willCheckpointAndRestore } = await this.preCheckpointNotification.waitFor();
-          return { willCheckpointAndRestore };
-        },
-        WAIT_FOR_TASK: async (message) => {
-          this.onWaitForTask.post(message);
+          try {
+            const { willCheckpointAndRestore } = await this.preCheckpointNotification.waitFor(
+              3e4
+            );
+            return {
+              willCheckpointAndRestore
+            };
+          } catch (error) {
+            console.error("Error while waiting for pre-checkpoint notification", error);
+            return {
+              willCheckpointAndRestore: false
+            };
+          }
         },
         READY_FOR_CHECKPOINT: async (message) => {
           this.onReadyForCheckpoint.post(message);
         },
         CANCEL_CHECKPOINT: async (message) => {
+          const version = "v2";
           this.onCancelCheckpoint.post(message);
+          try {
+            const { checkpointCanceled } = await this.checkpointCanceledNotification.waitFor(
+              3e4
+            );
+            return {
+              version,
+              checkpointCanceled
+            };
+          } catch (error) {
+            console.error("Error while waiting for checkpoint cancellation", error);
+            return {
+              version,
+              checkpointCanceled: true
+            };
+          }
         }
       }
     });
@@ -577,6 +609,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__,
@@ -592,18 +625,26 @@ var ProdWorker = class {
       this.#coordinatorSocket.socket.emit("TASK_HEARTBEAT", { version: "v1", attemptFriendlyId });
     });
     this.#backgroundWorker.onReadyForCheckpoint.attach(async (message) => {
+      await this.#backgroundWorker.flushTelemetry();
       this.#coordinatorSocket.socket.emit("READY_FOR_CHECKPOINT", { version: "v1" });
     });
     this.#backgroundWorker.onCancelCheckpoint.attach(async (message) => {
-      logger2.log("onCancelCheckpoint() clearing paused state, don't wait for post start hook", {
-        paused: this.paused,
-        nextResumeAfter: this.nextResumeAfter,
-        waitForPostStart: this.waitForPostStart
-      });
-      this.paused = false;
-      this.nextResumeAfter = void 0;
-      this.waitForPostStart = false;
-      this.#coordinatorSocket.socket.emit("CANCEL_CHECKPOINT", { version: "v1" });
+      logger2.log("onCancelCheckpoint", { message });
+      const { checkpointCanceled } = await this.#coordinatorSocket.socket.emitWithAck(
+        "CANCEL_CHECKPOINT",
+        {
+          version: "v2",
+          reason: message.reason
+        }
+      );
+      if (checkpointCanceled) {
+        if (message.reason === "WAIT_FOR_DURATION") {
+          this.paused = false;
+          this.nextResumeAfter = void 0;
+          this.waitForPostStart = false;
+        }
+      }
+      this.#backgroundWorker.checkpointCanceledNotification.post({ checkpointCanceled });
     });
     this.#backgroundWorker.onWaitForDuration.attach(async (message) => {
       if (!this.attemptFriendlyId) {
@@ -669,6 +710,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;
@@ -698,13 +760,16 @@ var ProdWorker = class {
       this.#coordinatorSocket = this.#createCoordinatorSocket(coordinatorHost);
     }
   }
-  #prepareForWait(reason, willCheckpointAndRestore) {
+  async #prepareForWait(reason, willCheckpointAndRestore) {
     logger2.log(`prepare for ${reason}`, { willCheckpointAndRestore });
     this.#backgroundWorker.preCheckpointNotification.post({ willCheckpointAndRestore });
     if (willCheckpointAndRestore) {
       this.paused = true;
       this.nextResumeAfter = reason;
       this.waitForPostStart = true;
+      if (reason === "WAIT_FOR_TASK" || reason === "WAIT_FOR_BATCH") {
+        await this.#backgroundWorker.flushTelemetry();
+      }
     }
   }
   async #prepareForRetry(willCheckpointAndRestore, shouldExit) {
@@ -713,8 +778,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;
@@ -727,6 +791,7 @@ var ProdWorker = class {
   #resumeAfterDuration() {
     this.paused = false;
     this.nextResumeAfter = void 0;
+    this.waitForPostStart = false;
     this.#backgroundWorker.waitCompletedNotification();
   }
   #returnValidatedExtraHeaders(headers) {
@@ -737,6 +802,7 @@ var ProdWorker = class {
     }
     return headers;
   }
+  // FIXME: If the the worker can't connect for a while, this runs MANY times - it should only run once
   #createCoordinatorSocket(host) {
     const extraHeaders = this.#returnValidatedExtraHeaders({
       "x-machine-name": MACHINE_NAME2,
@@ -801,6 +867,7 @@ var ProdWorker = class {
           }
           this.paused = false;
           this.nextResumeAfter = void 0;
+          this.waitForPostStart = false;
           for (let i = 0; i < message.completions.length; i++) {
             const completion = message.completions[i];
             const execution = message.executions[i];
@@ -872,6 +939,21 @@ var ProdWorker = class {
           logger3.log("skip connection handler, waiting for post start hook");
           return;
         }
+        if (this.paused) {
+          if (!this.nextResumeAfter) {
+            return;
+          }
+          if (!this.attemptFriendlyId) {
+            logger3.error("Missing friendly ID");
+            return;
+          }
+          socket.emit("READY_FOR_RESUME", {
+            version: "v1",
+            attemptFriendlyId: this.attemptFriendlyId,
+            type: this.nextResumeAfter
+          });
+          return;
+        }
         if (process.env.INDEX_TASKS === "true") {
           try {
             const taskResources = await this.#initializeWorker();
@@ -889,7 +971,10 @@ var ProdWorker = class {
             }
           } catch (e) {
             if (e instanceof TaskMetadataParseError) {
-              logger3.error("tasks metadata parse error", { message: e.zodIssues, tasks: e.tasks });
+              logger3.error("tasks metadata parse error", {
+                zodIssues: e.zodIssues,
+                tasks: e.tasks
+              });
               socket.emit("INDEXING_FAILED", {
                 version: "v1",
                 deploymentId: this.deploymentId,
@@ -900,29 +985,31 @@ var ProdWorker = class {
                 }
               });
             } else if (e instanceof UncaughtExceptionError) {
-              logger3.error("uncaught exception", { message: e.originalError.message });
+              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: {
-                  name: e.originalError.name,
-                  message: e.originalError.message,
-                  stack: e.originalError.stack
-                }
+                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,
@@ -943,28 +1030,9 @@ var ProdWorker = class {
               });
             }
             await setTimeout2(200);
-            process.exit(1);
+            process.exit(111);
           }
         }
-        if (this.paused) {
-          if (!this.nextResumeAfter) {
-            return;
-          }
-          if (!this.attemptFriendlyId) {
-            logger3.error("Missing friendly ID");
-            return;
-          }
-          if (this.nextResumeAfter === "WAIT_FOR_DURATION") {
-            this.#resumeAfterDuration();
-            return;
-          }
-          socket.emit("READY_FOR_RESUME", {
-            version: "v1",
-            attemptFriendlyId: this.attemptFriendlyId,
-            type: this.nextResumeAfter
-          });
-          return;
-        }
         if (this.executing) {
           return;
         }
@@ -1001,7 +1069,8 @@ var ProdWorker = class {
           case "/status": {
             return reply.json({
               executing: this.executing,
-              pause: this.paused,
+              paused: this.paused,
+              completed: this.completed.size,
               nextResumeAfter: this.nextResumeAfter
             });
           }
@@ -1039,7 +1108,6 @@ var ProdWorker = class {
                 break;
               }
             }
-            logger2.log("preStop", { url: req.url });
             return reply.text("preStop ok");
           }
           case "/postStart": {