trigger.dev 3.0.0-beta.1 → 3.0.0-beta.11

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,7 +1,11 @@
 // src/workers/dev/worker-facade.ts
 import {
   TaskExecutor,
-  preciseDateOriginNow
+  DurableClock,
+  clock,
+  logLevels,
+  getEnvVar,
+  ZodSchemaParsedError
 } from "@trigger.dev/core/v3";
 import {
   ConsoleInterceptor,
@@ -16,23 +20,25 @@ import {
 } from "@trigger.dev/core/v3";
 
 // package.json
-var version = "3.0.0-beta.1";
+var version = "3.0.0-beta.11";
 
 // src/workers/dev/worker-facade.ts
 __WORKER_SETUP__;
 __IMPORTED_PROJECT_CONFIG__;
 var otelTracer = tracingSDK.getTracer("trigger-dev-worker", version);
 var otelLogger = tracingSDK.getLogger("trigger-dev-worker", version);
-var preciseDateOrigin = preciseDateOriginNow();
+var durableClock = new DurableClock();
+clock.setGlobalClock(durableClock);
 var tracer = new TriggerTracer({ tracer: otelTracer, logger: otelLogger });
-var consoleInterceptor = new ConsoleInterceptor(otelLogger, preciseDateOrigin);
+var consoleInterceptor = new ConsoleInterceptor(otelLogger);
 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",
-  preciseDateOrigin
+  level: logLevels.includes(configLogLevel) ? configLogLevel : "log"
 });
 logger.setGlobalTaskLogger(otelTaskLogger);
 var TaskFileImports = {};
@@ -51,6 +57,7 @@ function getTasks() {
           filePath: taskFile.filePath,
           queue: task.__trigger.queue,
           retry: task.__trigger.retry,
+          machine: task.__trigger.machine,
           fns: task.__trigger.fns
         });
       }
@@ -150,8 +157,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 = getTaskMetadata();
+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/prod/entry-point.js

@@ -1,6 +1,8 @@
 // src/workers/prod/entry-point.ts
 import {
   CoordinatorToProdWorkerMessages,
+  PostStartCauses,
+  PreStopCauses,
   ProdWorkerToCoordinatorMessages,
   ZodSocketConnection as ZodSocketConnection2
 } from "@trigger.dev/core/v3";
@@ -78,12 +80,12 @@ var MACHINE_NAME = process.env.MACHINE_NAME || "local";
 var PLATFORM_HOST = process.env.PLATFORM_HOST || "127.0.0.1";
 var PLATFORM_WS_PORT = process.env.PLATFORM_WS_PORT || 3030;
 var PLATFORM_SECRET = process.env.PLATFORM_SECRET || "provider-secret";
+var SECURE_CONNECTION = ["1", "true"].includes(process.env.SECURE_CONNECTION ?? "false");
 var logger = new SimpleLogger(`[${MACHINE_NAME}]`);
 
 // src/workers/prod/entry-point.ts
 import { readFile } from "node:fs/promises";
 import { createServer } from "node:http";
-import { z } from "zod";
 
 // src/workers/prod/backgroundWorker.ts
 import {
@@ -106,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 {
@@ -204,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();
+            }
           }
         }
       });
@@ -245,6 +263,7 @@ var ProdBackgroundWorker = class {
     );
     if (!this._taskRunProcess) {
       const taskRunProcess = new TaskRunProcess(
+        payload.execution,
         this.path,
         {
           ...this.params.env,
@@ -287,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;
       }
@@ -356,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;
@@ -389,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
@@ -416,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);
@@ -648,31 +669,33 @@ var ProdWorker = class {
   #backgroundWorker;
   #httpServer;
   #coordinatorSocket;
-  async #reconnect(isPostStart = false) {
+  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) {
@@ -815,7 +838,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,
@@ -866,30 +888,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,
@@ -910,7 +948,7 @@ var ProdWorker = class {
               });
             }
             await setTimeout2(200);
-            process.exit(1);
+            process.exit(111);
           }
         }
         if (this.paused) {
@@ -992,20 +1030,13 @@ var ProdWorker = class {
             return reply.text("Received ACK from coordinator");
           }
           case "/preStop": {
-            const schema = z.enum(["index", "create", "restore"]);
-            const cause = schema.safeParse(url.searchParams.get("cause"));
+            const cause = PreStopCauses.safeParse(url.searchParams.get("cause"));
             if (!cause.success) {
               logger2.error("Failed to parse cause", { cause });
-              return;
+              return reply.text("Failed to parse cause", 400);
             }
             switch (cause.data) {
-              case "index": {
-                break;
-              }
-              case "create": {
-                break;
-              }
-              case "restore": {
+              case "terminate": {
                 break;
               }
               default: {
@@ -1017,11 +1048,10 @@ var ProdWorker = class {
             return reply.text("preStop ok");
           }
           case "/postStart": {
-            const schema = z.enum(["index", "create", "restore"]);
-            const cause = schema.safeParse(url.searchParams.get("cause"));
+            const cause = PostStartCauses.safeParse(url.searchParams.get("cause"));
             if (!cause.success) {
               logger2.error("Failed to parse cause", { cause });
-              return;
+              return reply.text("Failed to parse cause", 400);
             }
             switch (cause.data) {
               case "index": {
@@ -1031,7 +1061,7 @@ var ProdWorker = class {
                 break;
               }
               case "restore": {
-                await this.#reconnect(true);
+                await this.#reconnect(true, true);
                 break;
               }
               default: {
@@ -1076,11 +1106,7 @@ var ProdWorker = class {
       throw new Error(`Background Worker started without tasks`);
     }
     for (const task of this.#backgroundWorker.tasks) {
-      taskResources.push({
-        id: task.id,
-        filePath: task.filePath,
-        exportName: task.exportName
-      });
+      taskResources.push(task);
       packageVersion = task.packageVersion;
     }
     if (!packageVersion) {

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

@@ -4,7 +4,11 @@ import {
   ProdWorkerToChildMessages,
   TaskExecutor,
   ZodIpcConnection,
-  preciseDateOriginNow
+  DurableClock,
+  clock,
+  getEnvVar,
+  logLevels,
+  ZodSchemaParsedError
 } from "@trigger.dev/core/v3";
 import "source-map-support/register.js";
 import {
@@ -18,21 +22,23 @@ import {
 } from "@trigger.dev/core/v3";
 
 // package.json
-var version = "3.0.0-beta.1";
+var version = "3.0.0-beta.11";
 
 // src/workers/prod/worker-facade.ts
 __WORKER_SETUP__;
 __IMPORTED_PROJECT_CONFIG__;
 var otelTracer = tracingSDK.getTracer("trigger-prod-worker", version);
 var otelLogger = tracingSDK.getLogger("trigger-prod-worker", version);
-var preciseDateOrigin = preciseDateOriginNow();
+var durableClock = new DurableClock();
+clock.setGlobalClock(durableClock);
 var tracer = new TriggerTracer({ tracer: otelTracer, logger: otelLogger });
-var consoleInterceptor = new ConsoleInterceptor(otelLogger, preciseDateOrigin);
+var consoleInterceptor = new ConsoleInterceptor(otelLogger);
+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",
-  preciseDateOrigin
+  level: logLevels.includes(configLogLevel) ? configLogLevel : "log"
 });
 logger.setGlobalTaskLogger(otelTaskLogger);
 var TaskFileImports = {};
@@ -51,6 +57,7 @@ function getTasks() {
           filePath: taskFile.filePath,
           queue: task.__trigger.queue,
           retry: task.__trigger.retry,
+          machine: task.__trigger.machine,
           fns: task.__trigger.fns
         });
       }
@@ -152,10 +159,17 @@ var zodIpc = new ZodIpcConnection({
     }
   }
 });
-var prodRuntimeManager = new ProdRuntimeManager(zodIpc);
+var prodRuntimeManager = new ProdRuntimeManager(zodIpc, {
+  waitThresholdInMs: parseInt(process.env.TRIGGER_RUNTIME_WAIT_THRESHOLD_IN_MS ?? "30000", 10)
+});
 runtime.setGlobalRuntimeManager(prodRuntimeManager);
-zodIpc.send("TASKS_READY", { tasks: getTaskMetadata() }).catch((err) => {
-  console.error("Failed to send TASKS_READY message", err);
+var TASK_METADATA = getTaskMetadata();
+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 });
+  } else {
+    console.error("Failed to send TASKS_READY message", err);
+  }
 });
 process.title = "trigger-prod-worker";
 async function asyncHeartbeat(initialDelayInSeconds = 30, intervalInSeconds = 5) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "trigger.dev",
-  "version": "3.0.0-beta.1",
+  "version": "3.0.0-beta.11",
   "description": "A Command-Line Interface for Trigger.dev (v3) projects",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -32,11 +32,10 @@
   "type": "module",
   "exports": "./dist/index.js",
   "bin": {
-    "trigger.dev": "./dist/index.js"
+    "triggerdev": "./dist/index.js"
   },
   "devDependencies": {
     "@types/gradient-string": "^1.1.2",
-    "@types/jsonlines": "^0.1.5",
     "@types/mock-fs": "^4.13.1",
     "@types/node": "18",
     "@types/object-hash": "^3.0.6",
@@ -54,8 +53,8 @@
     "typescript": "^5.3.3",
     "vitest": "^0.34.4",
     "xdg-app-paths": "^8.3.0",
-    "@trigger.dev/core-apps": "3.0.0-beta.0",
-    "@trigger.dev/tsconfig": "0.0.0"
+    "@trigger.dev/tsconfig": "0.0.0",
+    "@trigger.dev/core-apps": "3.0.0-beta.11"
   },
   "watch": {
     "build:prod-containerfile": "src/Containerfile.prod"
@@ -75,7 +74,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.0",
+    "@trigger.dev/core": "^3.0.0-beta.11",
     "@types/degit": "^2.8.3",
     "chalk": "^5.2.0",
     "chokidar": "^3.5.3",
@@ -92,7 +91,6 @@
     "import-meta-resolve": "^4.0.0",
     "ink": "^4.4.1",
     "jsonc-parser": "^3.2.1",
-    "jsonlines": "^0.1.1",
     "liquidjs": "^10.9.2",
     "mock-fs": "^5.2.0",
     "nanoid": "^4.0.2",
@@ -109,7 +107,6 @@
     "simple-git": "^3.19.0",
     "socket.io-client": "^4.7.4",
     "source-map-support": "^0.5.21",
-    "supports-color": "^9.4.0",
     "terminal-link": "^3.0.0",
     "tiny-invariant": "^1.2.0",
     "tsconfig-paths": "^4.2.0",