trigger.dev 3.0.0-beta.4 → 3.0.0-beta.40

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

@@ -2,92 +2,71 @@
 import {
   ProdChildToWorkerMessages,
   ProdWorkerToChildMessages,
-  TaskExecutor,
-  ZodIpcConnection,
-  DurableClock,
   clock,
-  getEnvVar,
-  logLevels,
-  ZodSchemaParsedError
+  taskCatalog
 } from "@trigger.dev/core/v3";
-import "source-map-support/register.js";
 import {
   ConsoleInterceptor,
+  DevUsageManager,
+  DurableClock,
   OtelTaskLogger,
-  ProdRuntimeManager,
+  ProdUsageManager,
+  TaskExecutor,
+  getEnvVar,
+  logLevels,
+  usage
+} from "@trigger.dev/core/v3/workers";
+import { ZodIpcConnection } from "@trigger.dev/core/v3/zodIpc";
+import { ZodSchemaParsedError } from "@trigger.dev/core/v3/zodMessageHandler";
+import "source-map-support/register.js";
+import {
   TaskRunErrorCodes,
   TriggerTracer,
   logger,
   runtime
 } from "@trigger.dev/core/v3";
-
-// package.json
-var version = "3.0.0-beta.4";
-
-// src/workers/prod/worker-facade.ts
+import { ProdRuntimeManager } from "@trigger.dev/core/v3/prod";
 __WORKER_SETUP__;
 __IMPORTED_PROJECT_CONFIG__;
-var otelTracer = tracingSDK.getTracer("trigger-prod-worker", version);
-var otelLogger = tracingSDK.getLogger("trigger-prod-worker", version);
+var heartbeatIntervalMs = getEnvVar("USAGE_HEARTBEAT_INTERVAL_MS");
+var usageEventUrl = getEnvVar("USAGE_EVENT_URL");
+var triggerJWT = getEnvVar("TRIGGER_JWT");
+var prodUsageManager = new ProdUsageManager(new DevUsageManager(), {
+  heartbeatIntervalMs: heartbeatIntervalMs ? parseInt(heartbeatIntervalMs, 10) : void 0,
+  url: usageEventUrl,
+  jwt: triggerJWT
+});
+usage.setGlobalUsageManager(prodUsageManager);
 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, true);
 var triggerLogLevel = getEnvVar("TRIGGER_LOG_LEVEL");
 var configLogLevel = triggerLogLevel ? triggerLogLevel : importedConfig ? importedConfig.logLevel : __PROJECT_CONFIG__.logLevel;
 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 zodIpc = new ZodIpcConnection({
@@ -102,7 +81,7 @@ var zodIpc = new ZodIpcConnection({
           execution,
           result: {
             ok: false,
-            id: execution.attempt.id,
+            id: execution.run.id,
             error: {
               type: "INTERNAL_ERROR",
               code: TaskRunErrorCodes.TASK_ALREADY_RUNNING
@@ -112,14 +91,14 @@ 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: {
             ok: false,
-            id: execution.attempt.id,
+            id: execution.run.id,
             error: {
               type: "INTERNAL_ERROR",
               code: TaskRunErrorCodes.COULD_NOT_FIND_EXECUTOR
@@ -128,51 +107,102 @@ var zodIpc = new ZodIpcConnection({
         });
         return;
       }
+      const executor = new TaskExecutor(task, {
+        tracer,
+        tracingSDK,
+        consoleInterceptor,
+        projectConfig: __PROJECT_CONFIG__,
+        importedConfig,
+        handleErrorFn: handleError
+      });
       try {
         _execution = execution;
         _isRunning = true;
-        const result = await executor.execute(execution, metadata, traceContext);
-        return sender.send("TASK_RUN_COMPLETED", {
+        const measurement = usage.start();
+        const { result } = await executor.execute(execution, metadata, traceContext, measurement);
+        const usageSample = usage.stop(measurement);
+        return await sender.send("TASK_RUN_COMPLETED", {
           execution,
-          result
+          result: {
+            ...result,
+            usage: {
+              durationMs: usageSample.cpuTime
+            }
+          }
         });
       } finally {
         _execution = void 0;
         _isRunning = false;
       }
     },
-    TASK_RUN_COMPLETED_NOTIFICATION: async ({ completion, execution }) => {
-      prodRuntimeManager.resumeTask(completion, execution);
+    TASK_RUN_COMPLETED_NOTIFICATION: async ({ completion }) => {
+      prodRuntimeManager.resumeTask(completion);
     },
     WAIT_COMPLETED_NOTIFICATION: async () => {
-      prodRuntimeManager.resumeAfterRestore();
+      prodRuntimeManager.resumeAfterDuration();
     },
     CLEANUP: async ({ flush, kill }, sender) => {
       if (kill) {
-        await tracingSDK.flush();
+        await flushAll();
         await sender.send("READY_TO_DISPOSE", void 0);
       } else {
         if (flush) {
-          await tracingSDK.flush();
+          await flushAll();
         }
       }
     }
   }
 });
+async function flushAll(timeoutInMs = 1e4) {
+  const now = performance.now();
+  console.log(`Flushing at ${now}`);
+  await Promise.all([flushUsage(), flushTracingSDK()]);
+  const duration = performance.now() - now;
+  console.log(`Flushed in ${duration}ms`);
+}
+async function flushUsage() {
+  const now = performance.now();
+  console.log(`Flushing usage at ${now}`);
+  await prodUsageManager.flush();
+  const duration = performance.now() - now;
+  console.log(`Flushed usage in ${duration}ms`);
+}
+async function flushTracingSDK() {
+  const now = performance.now();
+  console.log(`Flushing tracingSDK at ${now}`);
+  await tracingSDK.flush();
+  const duration = performance.now() - now;
+  console.log(`Flushed tracingSDK in ${duration}ms`);
+}
+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();
-zodIpc.send("TASKS_READY", { tasks: TASK_METADATA }).catch((err) => {
+var taskMetadata = taskCatalog.getAllTaskMetadata();
+if (typeof importedConfig?.machine === "string") {
+  taskMetadata = taskMetadata.map((task) => {
+    if (typeof task.machine?.preset !== "string") {
+      return {
+        ...task,
+        machine: {
+          preset: importedConfig.machine
+        }
+      };
+    }
+    return task;
+  });
+}
+zodIpc.send("TASKS_READY", { tasks: taskMetadata }).catch((err) => {
   if (err instanceof ZodSchemaParsedError) {
-    zodIpc.send("TASKS_FAILED_TO_PARSE", { zodIssues: err.error.issues, tasks: TASK_METADATA });
+    zodIpc.send("TASKS_FAILED_TO_PARSE", { zodIssues: err.error.issues, tasks: taskMetadata });
   } else {
     console.error("Failed to send TASKS_READY message", err);
   }
 });
 process.title = "trigger-prod-worker";
-async function asyncHeartbeat(initialDelayInSeconds = 30, intervalInSeconds = 5) {
+async function asyncHeartbeat(initialDelayInSeconds = 30, intervalInSeconds = 20) {
   async function _doHeartbeat() {
     while (true) {
       if (_isRunning && _execution) {

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

@@ -1,35 +1,24 @@
+// package.json
+var version = "3.0.0-beta.40";
+
 // src/workers/prod/worker-setup.ts
-import { Resource } from "@opentelemetry/resources";
+import { taskCatalog } from "@trigger.dev/core/v3";
 import {
-  SemanticInternalAttributes,
-  TracingSDK
-} from "@trigger.dev/core/v3";
+  TracingSDK,
+  StandardTaskCatalog
+} from "@trigger.dev/core/v3/workers";
 __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"
-});
-process.on("uncaughtException", (error, origin) => {
-  process.send?.({
-    type: "EVENT",
-    message: {
-      type: "UNCAUGHT_EXCEPTION",
-      payload: {
-        error: {
-          name: error.name,
-          message: error.message,
-          stack: error.stack
-        },
-        origin
-      },
-      version: "v1"
-    }
-  });
+  diagLogLevel: process.env.OTEL_LOG_LEVEL ?? "none",
+  forceFlushTimeoutMillis: process.env.OTEL_FORCE_FLUSH_TIMEOUT ? parseInt(process.env.OTEL_FORCE_FLUSH_TIMEOUT, 10) : 5e3
 });
+var otelTracer = tracingSDK.getTracer("trigger-prod-worker", version);
+var otelLogger = tracingSDK.getLogger("trigger-prod-worker", version);
+taskCatalog.setGlobalTaskCatalog(new StandardTaskCatalog());
 export {
+  otelLogger,
+  otelTracer,
   tracingSDK
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "trigger.dev",
-  "version": "3.0.0-beta.4",
+  "version": "3.0.0-beta.40",
   "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",
@@ -44,23 +43,21 @@
     "@types/semver": "^7.3.13",
     "@types/ws": "^8.5.3",
     "cpy-cli": "^5.0.0",
+    "nodemon": "^3.0.1",
     "npm-run-all": "^4.1.5",
-    "npm-watch": "^0.11.0",
     "open": "^10.0.3",
     "p-retry": "^6.1.0",
     "rimraf": "^3.0.2",
     "tsup": "^8.0.1",
     "type-fest": "^3.6.0",
     "typescript": "^5.3.3",
-    "vitest": "^0.34.4",
+    "vitest": "^1.6.0",
     "xdg-app-paths": "^8.3.0",
-    "@trigger.dev/tsconfig": "0.0.0",
-    "@trigger.dev/core-apps": "3.0.0-beta.3"
-  },
-  "watch": {
-    "build:prod-containerfile": "src/Containerfile.prod"
+    "@trigger.dev/core-apps": "3.0.0-beta.40",
+    "@trigger.dev/tsconfig": "0.0.0"
   },
   "dependencies": {
+    "@anatine/esbuild-decorators": "^0.2.19",
     "@clack/prompts": "^0.7.0",
     "@depot/cli": "0.0.1-cli.2.55.0",
     "@opentelemetry/api": "^1.8.0",
@@ -75,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": "^3.0.0-beta.3",
+    "@trigger.dev/core": "3.0.0-beta.40",
     "@types/degit": "^2.8.3",
     "chalk": "^5.2.0",
     "chokidar": "^3.5.3",
@@ -85,19 +82,17 @@
     "dotenv": "^16.4.4",
     "esbuild": "^0.19.11",
     "evt": "^2.4.13",
-    "execa": "^8.0.0",
+    "execa": "^9.1.0",
     "find-up": "^7.0.0",
     "glob": "^10.3.10",
     "gradient-string": "^2.0.2",
     "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",
     "node-fetch": "^3.3.0",
-    "npm-check-updates": "^16.12.2",
     "object-hash": "^3.0.0",
     "p-debounce": "^4.0.0",
     "p-throttle": "^6.1.0",
@@ -109,7 +104,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",
@@ -117,7 +111,8 @@
     "url": "^0.11.1",
     "ws": "^8.12.0",
     "zod": "3.22.3",
-    "zod-validation-error": "^1.5.0"
+    "zod-validation-error": "^1.5.0",
+    "typescript": "^5.4.0"
   },
   "engines": {
     "node": ">=18.0.0"
@@ -131,9 +126,10 @@
     "dev": "npm run clean && run-p dev:**",
     "dev:main": "tsup --watch",
     "dev:workers": "tsup --config tsup.workers.config.ts --watch",
-    "dev:prod-containerfile": "npm-watch",
+    "dev:test": "nodemon -w src/Containerfile.prod -x npm run build:prod-containerfile",
     "clean": "rimraf dist",
     "start": "node dist/index.js",
-    "test": "vitest"
+    "test": "vitest",
+    "test:e2e": "vitest --run -c e2e/vite.config.js"
   }
 }