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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. package/dist/index.js +16 -6
  2. package/dist/index.js.map +1 -1
  3. package/dist/workers/dev/worker-facade.js +26 -45
  4. package/dist/workers/dev/worker-setup.js +4 -1
  5. package/dist/workers/prod/worker-facade.js +22 -44
  6. package/dist/workers/prod/worker-setup.js +4 -1
  7. package/package.json +3 -3
package/dist/workers/dev/worker-facade.js CHANGED
@@ -1,11 +1,12 @@
1
1
  // src/workers/dev/worker-facade.ts
2
2
  import {
3
- TaskExecutor,
4
3
  DurableClock,
4
+ TaskExecutor,
5
+ ZodSchemaParsedError,
5
6
  clock,
6
- logLevels,
7
7
  getEnvVar,
8
- ZodSchemaParsedError
8
+ logLevels,
9
+ taskCatalog
9
10
  } from "@trigger.dev/core/v3";
10
11
  import {
11
12
  ConsoleInterceptor,
@@ -20,7 +21,7 @@ import {
20
21
  } from "@trigger.dev/core/v3";
21
22
 
22
23
  // package.json
23
- var version = "3.0.0-beta.12";
24
+ var version = "3.0.0-beta.13";
24
25
 
25
26
  // src/workers/dev/worker-facade.ts
26
27
  __WORKER_SETUP__;
@@ -30,7 +31,10 @@ var otelLogger = tracingSDK.getLogger("trigger-dev-worker", version);
30
31
  var durableClock = new DurableClock();
31
32
  clock.setGlobalClock(durableClock);
32
33
  var tracer = new TriggerTracer({ tracer: otelTracer, logger: otelLogger });
33
- var consoleInterceptor = new ConsoleInterceptor(otelLogger);
34
+ var consoleInterceptor = new ConsoleInterceptor(
35
+ otelLogger,
36
+ __PROJECT_CONFIG__.enableConsoleLogging ?? false
37
+ );
34
38
  var devRuntimeManager = new DevRuntimeManager();
35
39
  runtime.setGlobalRuntimeManager(devRuntimeManager);
36
40
  var triggerLogLevel = getEnvVar("TRIGGER_LOG_LEVEL");
@@ -44,50 +48,19 @@ logger.setGlobalTaskLogger(otelTaskLogger);
44
48
  var TaskFileImports = {};
45
49
  var TaskFiles = {};
46
50
  __TASKS__;
47
- function getTasks() {
48
- const result = [];
51
+ (() => {
49
52
  for (const [importName, taskFile] of Object.entries(TaskFiles)) {
50
53
  const fileImports = TaskFileImports[importName];
51
54
  for (const [exportName, task] of Object.entries(fileImports ?? {})) {
52
- if (task.__trigger) {
53
- result.push({
54
- id: task.__trigger.id,
55
+ if (typeof task === "object" && task !== null && "id" in task && typeof task.id === "string") {
56
+ taskCatalog.registerTaskFileMetadata(task.id, {
55
57
  exportName,
56
- packageVersion: task.__trigger.packageVersion,
57
- filePath: taskFile.filePath,
58
- queue: task.__trigger.queue,
59
- retry: task.__trigger.retry,
60
- machine: task.__trigger.machine,
61
- fns: task.__trigger.fns
58
+ filePath: taskFile.filePath
62
59
  });
63
60
  }
64
61
  }
65
62
  }
66
- return result;
67
- }
68
- function getTaskMetadata() {
69
- const result = getTasks();
70
- return result.map((task) => {
71
- const { fns, ...metadata } = task;
72
- return metadata;
73
- });
74
- }
75
- var tasks = getTasks();
76
- runtime.registerTasks(tasks);
77
- var taskExecutors = /* @__PURE__ */ new Map();
78
- for (const task of tasks) {
79
- taskExecutors.set(
80
- task.id,
81
- new TaskExecutor(task, {
82
- tracer,
83
- tracingSDK,
84
- consoleInterceptor,
85
- projectConfig: __PROJECT_CONFIG__,
86
- importedConfig,
87
- handleErrorFn: handleError
88
- })
89
- );
90
- }
63
+ })();
91
64
  var _execution;
92
65
  var _isRunning = false;
93
66
  var handler = new ZodMessageHandler({
@@ -110,9 +83,9 @@ var handler = new ZodMessageHandler({
110
83
  return;
111
84
  }
112
85
  process.title = `trigger-dev-worker: ${execution.task.id} ${execution.run.id}`;
113
- const executor = taskExecutors.get(execution.task.id);
114
- if (!executor) {
115
- console.error(`Could not find executor for task ${execution.task.id}`);
86
+ const task = taskCatalog.getTask(execution.task.id);
87
+ if (!task) {
88
+ console.error(`Could not find task ${execution.task.id}`);
116
89
  await sender.send("TASK_RUN_COMPLETED", {
117
90
  execution,
118
91
  result: {
@@ -126,6 +99,14 @@ var handler = new ZodMessageHandler({
126
99
  });
127
100
  return;
128
101
  }
102
+ const executor = new TaskExecutor(task, {
103
+ tracer,
104
+ tracingSDK,
105
+ consoleInterceptor,
106
+ projectConfig: __PROJECT_CONFIG__,
107
+ importedConfig,
108
+ handleErrorFn: handleError
109
+ });
129
110
  try {
130
111
  _execution = execution;
131
112
  _isRunning = true;
@@ -157,7 +138,7 @@ var handler = new ZodMessageHandler({
157
138
  process.on("message", async (msg) => {
158
139
  await handler.handleMessage(msg);
159
140
  });
160
- var TASK_METADATA = getTaskMetadata();
141
+ var TASK_METADATA = taskCatalog.getAllTaskMetadata();
161
142
  sender.send("TASKS_READY", { tasks: TASK_METADATA }).catch((err) => {
162
143
  if (err instanceof ZodSchemaParsedError) {
163
144
  sender.send("TASKS_FAILED_TO_PARSE", { zodIssues: err.error.issues, tasks: TASK_METADATA });
package/dist/workers/dev/worker-setup.js CHANGED
@@ -3,9 +3,11 @@ import "source-map-support/register.js";
3
3
  import { Resource } from "@opentelemetry/resources";
4
4
  import {
5
5
  SemanticInternalAttributes,
6
+ StandardTaskCatalog,
6
7
  TracingSDK,
7
8
  ZodMessageSender,
8
- childToWorkerMessages
9
+ childToWorkerMessages,
10
+ taskCatalog
9
11
  } from "@trigger.dev/core/v3";
10
12
  __SETUP_IMPORTED_PROJECT_CONFIG__;
11
13
  var tracingSDK = new TracingSDK({
@@ -34,6 +36,7 @@ process.on("uncaughtException", (error, origin) => {
34
36
  console.error("Failed to send UNCAUGHT_EXCEPTION message", err);
35
37
  });
36
38
  });
39
+ taskCatalog.setGlobalTaskCatalog(new StandardTaskCatalog());
37
40
  export {
38
41
  sender,
39
42
  tracingSDK
package/dist/workers/prod/worker-facade.js CHANGED
@@ -1,14 +1,15 @@
1
1
  // src/workers/prod/worker-facade.ts
2
2
  import {
3
+ DurableClock,
3
4
  ProdChildToWorkerMessages,
4
5
  ProdWorkerToChildMessages,
5
6
  TaskExecutor,
6
7
  ZodIpcConnection,
7
- DurableClock,
8
+ ZodSchemaParsedError,
8
9
  clock,
9
10
  getEnvVar,
10
11
  logLevels,
11
- ZodSchemaParsedError
12
+ taskCatalog
12
13
  } from "@trigger.dev/core/v3";
13
14
  import "source-map-support/register.js";
14
15
  import {
@@ -22,7 +23,7 @@ import {
22
23
  } from "@trigger.dev/core/v3";
23
24
 
24
25
  // package.json
25
- var version = "3.0.0-beta.12";
26
+ var version = "3.0.0-beta.13";
26
27
 
27
28
  // src/workers/prod/worker-facade.ts
28
29
  __WORKER_SETUP__;
@@ -32,7 +33,7 @@ var otelLogger = tracingSDK.getLogger("trigger-prod-worker", version);
32
33
  var durableClock = new DurableClock();
33
34
  clock.setGlobalClock(durableClock);
34
35
  var tracer = new TriggerTracer({ tracer: otelTracer, logger: otelLogger });
35
- var consoleInterceptor = new ConsoleInterceptor(otelLogger);
36
+ var consoleInterceptor = new ConsoleInterceptor(otelLogger, false);
36
37
  var triggerLogLevel = getEnvVar("TRIGGER_LOG_LEVEL");
37
38
  var configLogLevel = triggerLogLevel ? triggerLogLevel : importedConfig ? importedConfig.logLevel : __PROJECT_CONFIG__.logLevel;
38
39
  var otelTaskLogger = new OtelTaskLogger({
@@ -44,50 +45,19 @@ logger.setGlobalTaskLogger(otelTaskLogger);
44
45
  var TaskFileImports = {};
45
46
  var TaskFiles = {};
46
47
  __TASKS__;
47
- function getTasks() {
48
- const result = [];
48
+ (() => {
49
49
  for (const [importName, taskFile] of Object.entries(TaskFiles)) {
50
50
  const fileImports = TaskFileImports[importName];
51
51
  for (const [exportName, task] of Object.entries(fileImports ?? {})) {
52
- if (task.__trigger) {
53
- result.push({
54
- id: task.__trigger.id,
52
+ if (typeof task === "object" && task !== null && "id" in task && typeof task.id === "string") {
53
+ taskCatalog.registerTaskFileMetadata(task.id, {
55
54
  exportName,
56
- packageVersion: task.__trigger.packageVersion,
57
- filePath: taskFile.filePath,
58
- queue: task.__trigger.queue,
59
- retry: task.__trigger.retry,
60
- machine: task.__trigger.machine,
61
- fns: task.__trigger.fns
55
+ filePath: taskFile.filePath
62
56
  });
63
57
  }
64
58
  }
65
59
  }
66
- return result;
67
- }
68
- function getTaskMetadata() {
69
- const result = getTasks();
70
- return result.map((task) => {
71
- const { fns, ...metadata } = task;
72
- return metadata;
73
- });
74
- }
75
- var tasks = getTasks();
76
- runtime.registerTasks(tasks);
77
- var taskExecutors = /* @__PURE__ */ new Map();
78
- for (const task of tasks) {
79
- taskExecutors.set(
80
- task.id,
81
- new TaskExecutor(task, {
82
- tracer,
83
- tracingSDK,
84
- consoleInterceptor,
85
- projectConfig: __PROJECT_CONFIG__,
86
- importedConfig,
87
- handleErrorFn: handleError
88
- })
89
- );
90
- }
60
+ })();
91
61
  var _execution;
92
62
  var _isRunning = false;
93
63
  var zodIpc = new ZodIpcConnection({
@@ -112,9 +82,9 @@ var zodIpc = new ZodIpcConnection({
112
82
  return;
113
83
  }
114
84
  process.title = `trigger-prod-worker: ${execution.task.id} ${execution.run.id}`;
115
- const executor = taskExecutors.get(execution.task.id);
116
- if (!executor) {
117
- console.error(`Could not find executor for task ${execution.task.id}`);
85
+ const task = taskCatalog.getTask(execution.task.id);
86
+ if (!task) {
87
+ console.error(`Could not find task ${execution.task.id}`);
118
88
  await sender.send("TASK_RUN_COMPLETED", {
119
89
  execution,
120
90
  result: {
@@ -128,6 +98,14 @@ var zodIpc = new ZodIpcConnection({
128
98
  });
129
99
  return;
130
100
  }
101
+ const executor = new TaskExecutor(task, {
102
+ tracer,
103
+ tracingSDK,
104
+ consoleInterceptor,
105
+ projectConfig: __PROJECT_CONFIG__,
106
+ importedConfig,
107
+ handleErrorFn: handleError
108
+ });
131
109
  try {
132
110
  _execution = execution;
133
111
  _isRunning = true;
@@ -163,7 +141,7 @@ var prodRuntimeManager = new ProdRuntimeManager(zodIpc, {
163
141
  waitThresholdInMs: parseInt(process.env.TRIGGER_RUNTIME_WAIT_THRESHOLD_IN_MS ?? "30000", 10)
164
142
  });
165
143
  runtime.setGlobalRuntimeManager(prodRuntimeManager);
166
- var TASK_METADATA = getTaskMetadata();
144
+ var TASK_METADATA = taskCatalog.getAllTaskMetadata();
167
145
  zodIpc.send("TASKS_READY", { tasks: TASK_METADATA }).catch((err) => {
168
146
  if (err instanceof ZodSchemaParsedError) {
169
147
  zodIpc.send("TASKS_FAILED_TO_PARSE", { zodIssues: err.error.issues, tasks: TASK_METADATA });
package/dist/workers/prod/worker-setup.js CHANGED
@@ -2,7 +2,9 @@
2
2
  import { Resource } from "@opentelemetry/resources";
3
3
  import {
4
4
  SemanticInternalAttributes,
5
- TracingSDK
5
+ StandardTaskCatalog,
6
+ TracingSDK,
7
+ taskCatalog
6
8
  } from "@trigger.dev/core/v3";
7
9
  __SETUP_IMPORTED_PROJECT_CONFIG__;
8
10
  var tracingSDK = new TracingSDK({
@@ -30,6 +32,7 @@ process.on("uncaughtException", (error, origin) => {
30
32
  }
31
33
  });
32
34
  });
35
+ taskCatalog.setGlobalTaskCatalog(new StandardTaskCatalog());
33
36
  export {
34
37
  tracingSDK
35
38
  };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "trigger.dev",
3
- "version": "3.0.0-beta.12",
3
+ "version": "3.0.0-beta.13",
4
4
  "description": "A Command-Line Interface for Trigger.dev (v3) projects",
5
5
  "main": "./dist/index.js",
6
6
  "types": "./dist/index.d.ts",
@@ -53,7 +53,7 @@
53
53
  "typescript": "^5.3.3",
54
54
  "vitest": "^0.34.4",
55
55
  "xdg-app-paths": "^8.3.0",
56
- "@trigger.dev/core-apps": "3.0.0-beta.12",
56
+ "@trigger.dev/core-apps": "3.0.0-beta.13",
57
57
  "@trigger.dev/tsconfig": "0.0.0"
58
58
  },
59
59
  "dependencies": {
@@ -71,7 +71,7 @@
71
71
  "@opentelemetry/sdk-trace-base": "^1.22.0",
72
72
  "@opentelemetry/sdk-trace-node": "^1.22.0",
73
73
  "@opentelemetry/semantic-conventions": "^1.22.0",
74
- "@trigger.dev/core": "^3.0.0-beta.12",
74
+ "@trigger.dev/core": "^3.0.0-beta.13",
75
75
  "@types/degit": "^2.8.3",
76
76
  "chalk": "^5.2.0",
77
77
  "chokidar": "^3.5.3",