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

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

@@ -2,92 +2,59 @@
 import {
   ProdChildToWorkerMessages,
   ProdWorkerToChildMessages,
+  clock,
+  taskCatalog
+} from "@trigger.dev/core/v3";
+import {
   TaskExecutor,
-  ZodIpcConnection,
   DurableClock,
-  clock,
   getEnvVar,
   logLevels,
-  ZodSchemaParsedError
-} from "@trigger.dev/core/v3";
+  OtelTaskLogger,
+  ConsoleInterceptor
+} 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 {
-  ConsoleInterceptor,
-  OtelTaskLogger,
-  ProdRuntimeManager,
   TaskRunErrorCodes,
   TriggerTracer,
   logger,
   runtime
 } from "@trigger.dev/core/v3";
-
-// package.json
-var version = "0.0.0-prerelease-20240410151927";
-
-// 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 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 +69,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 +79,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,6 +95,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;
@@ -145,11 +120,25 @@ var zodIpc = new ZodIpcConnection({
       prodRuntimeManager.resumeTask(completion, execution);
     },
     WAIT_COMPLETED_NOTIFICATION: async () => {
-      prodRuntimeManager.resumeAfterRestore();
+      prodRuntimeManager.resumeAfterDuration();
     },
     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.run.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 +148,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

@@ -1,35 +1,23 @@
+// package.json
+var version = "3.0.0-beta.33";
+
 // 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"
-    }
-  });
-});
+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": "0.0.0-prerelease-20240410151927",
+  "version": "0.0.0-v2-prerelease-20240524135558",
   "description": "A Command-Line Interface for Trigger.dev (v3) projects",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -32,103 +32,57 @@
   "type": "module",
   "exports": "./dist/index.js",
   "bin": {
-    "triggerdev": "./dist/index.js"
+    "trigger-v3-cli": "./dist/index.js"
   },
   "devDependencies": {
     "@types/gradient-string": "^1.1.2",
     "@types/mock-fs": "^4.13.1",
-    "@types/node": "18",
-    "@types/object-hash": "^3.0.6",
-    "@types/react": "^18.2.48",
-    "@types/semver": "^7.3.13",
+    "@types/node": "16",
+    "@types/node-fetch": "^2.6.2",
     "@types/ws": "^8.5.3",
-    "cpy-cli": "^5.0.0",
-    "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",
+    "tsup": "^6.5.0",
     "type-fest": "^3.6.0",
-    "typescript": "^5.3.3",
+    "typescript": "^4.9.5",
     "vitest": "^0.34.4",
     "xdg-app-paths": "^8.3.0",
-    "@trigger.dev/core-apps": "0.0.0-prerelease-20240410151927",
+    "@trigger.dev/core": "0.0.0-v2-prerelease-20240524135558",
     "@trigger.dev/tsconfig": "0.0.0"
   },
-  "watch": {
-    "build:prod-containerfile": "src/Containerfile.prod"
-  },
   "dependencies": {
     "@clack/prompts": "^0.7.0",
-    "@depot/cli": "0.0.1-cli.2.55.0",
-    "@opentelemetry/api": "^1.8.0",
-    "@opentelemetry/api-logs": "^0.49.1",
-    "@opentelemetry/exporter-logs-otlp-http": "^0.49.1",
-    "@opentelemetry/exporter-trace-otlp-http": "^0.49.1",
-    "@opentelemetry/instrumentation": "^0.49.1",
-    "@opentelemetry/instrumentation-fetch": "^0.49.1",
-    "@opentelemetry/resources": "^1.22.0",
-    "@opentelemetry/sdk-logs": "^0.49.1",
-    "@opentelemetry/sdk-node": "^0.49.1",
-    "@opentelemetry/sdk-trace-base": "^1.22.0",
-    "@opentelemetry/sdk-trace-node": "^1.22.0",
-    "@opentelemetry/semantic-conventions": "^1.22.0",
-    "@trigger.dev/core": "0.0.0-prerelease-20240410151927",
     "@types/degit": "^2.8.3",
     "chalk": "^5.2.0",
     "chokidar": "^3.5.3",
     "cli-table3": "^0.6.3",
     "commander": "^9.4.1",
     "degit": "^2.8.4",
-    "dotenv": "^16.4.4",
-    "esbuild": "^0.19.11",
-    "evt": "^2.4.13",
-    "execa": "^8.0.0",
-    "find-up": "^7.0.0",
-    "glob": "^10.3.10",
+    "dotenv": "^16.3.1",
+    "execa": "^7.0.0",
     "gradient-string": "^2.0.2",
-    "import-meta-resolve": "^4.0.0",
-    "ink": "^4.4.1",
-    "jsonc-parser": "^3.2.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",
-    "partysocket": "^0.0.17",
+    "posthog-node": "^3.1.1",
     "proxy-agent": "^6.3.0",
-    "react": "^18.2.0",
-    "react-error-boundary": "^4.0.12",
-    "semver": "^7.5.0",
     "simple-git": "^3.19.0",
-    "socket.io-client": "^4.7.4",
-    "source-map-support": "^0.5.21",
-    "terminal-link": "^3.0.0",
-    "tiny-invariant": "^1.2.0",
-    "tsconfig-paths": "^4.2.0",
     "update-check": "^1.5.4",
     "url": "^0.11.1",
-    "ws": "^8.12.0",
+    "ws": "^8.11.0",
     "zod": "3.22.3",
-    "zod-validation-error": "^1.5.0"
+    "@trigger.dev/core": "0.0.0-v2-prerelease-20240524135558"
   },
   "engines": {
     "node": ">=18.0.0"
   },
   "scripts": {
-    "typecheck": "tsc -p tsconfig.check.json",
-    "build": "npm run clean && run-p build:**",
-    "build:main": "tsup",
-    "build:workers": "tsup --config tsup.workers.config.ts",
-    "build:prod-containerfile": "cpy --flat src/Containerfile.prod dist/",
-    "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",
+    "typecheck": "tsc",
+    "build": "tsup",
+    "dev": "tsup --watch",
     "clean": "rimraf dist",
     "start": "node dist/index.js",
     "test": "vitest"