trigger.dev 0.0.0-re2-20250204143529 → 0.0.0-re2-20250312163355
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.
- package/README.md +31 -0
- package/dist/esm/apiClient.d.ts +32 -340
- package/dist/esm/apiClient.js +69 -27
- package/dist/esm/apiClient.js.map +1 -1
- package/dist/esm/build/buildWorker.d.ts +7 -7
- package/dist/esm/build/bundle.js +22 -4
- package/dist/esm/build/bundle.js.map +1 -1
- package/dist/esm/build/entryPoints.d.ts +2 -0
- package/dist/esm/build/entryPoints.js +27 -7
- package/dist/esm/build/entryPoints.js.map +1 -1
- package/dist/esm/build/packageModules.d.ts +0 -5
- package/dist/esm/build/packageModules.js +0 -45
- package/dist/esm/build/packageModules.js.map +1 -1
- package/dist/esm/cli/common.d.ts +2 -2
- package/dist/esm/cli/index.js +2 -0
- package/dist/esm/cli/index.js.map +1 -1
- package/dist/esm/commands/deploy.js +52 -10
- package/dist/esm/commands/deploy.js.map +1 -1
- package/dist/esm/commands/dev.d.ts +11 -2
- package/dist/esm/commands/dev.js +7 -1
- package/dist/esm/commands/dev.js.map +1 -1
- package/dist/esm/commands/list-profiles.d.ts +2 -2
- package/dist/esm/commands/login.d.ts +2 -2
- package/dist/esm/commands/logout.d.ts +2 -2
- package/dist/esm/commands/promote.d.ts +3 -0
- package/dist/esm/commands/promote.js +75 -0
- package/dist/esm/commands/promote.js.map +1 -0
- package/dist/esm/commands/switch.d.ts +2 -2
- package/dist/esm/commands/trigger.d.ts +4 -4
- package/dist/esm/commands/update.d.ts +2 -2
- package/dist/esm/commands/whoami.d.ts +2 -2
- package/dist/esm/config.js +15 -3
- package/dist/esm/config.js.map +1 -1
- package/dist/esm/deploy/buildImage.d.ts +3 -1
- package/dist/esm/deploy/buildImage.js +10 -5
- package/dist/esm/deploy/buildImage.js.map +1 -1
- package/dist/esm/dev/backgroundWorker.d.ts +2 -240
- package/dist/esm/dev/backgroundWorker.js +8 -304
- package/dist/esm/dev/backgroundWorker.js.map +1 -1
- package/dist/esm/dev/devOutput.js +11 -2
- package/dist/esm/dev/devOutput.js.map +1 -1
- package/dist/esm/dev/devSession.js +14 -4
- package/dist/esm/dev/devSession.js.map +1 -1
- package/dist/esm/dev/devSupervisor.js +266 -40
- package/dist/esm/dev/devSupervisor.js.map +1 -1
- package/dist/esm/dev/mcpServer.d.ts +10 -0
- package/dist/esm/dev/mcpServer.js +201 -0
- package/dist/esm/dev/mcpServer.js.map +1 -0
- package/dist/esm/dev/workerRuntime.d.ts +0 -1
- package/dist/esm/dev/workerRuntime.js +1 -270
- package/dist/esm/dev/workerRuntime.js.map +1 -1
- package/dist/esm/entryPoints/dev-run-controller.d.ts +19 -9
- package/dist/esm/entryPoints/dev-run-controller.js +148 -101
- package/dist/esm/entryPoints/dev-run-controller.js.map +1 -1
- package/dist/esm/entryPoints/dev-run-worker.js +39 -20
- package/dist/esm/entryPoints/dev-run-worker.js.map +1 -1
- package/dist/esm/entryPoints/managed-run-controller.js +15 -31
- package/dist/esm/entryPoints/managed-run-controller.js.map +1 -1
- package/dist/esm/entryPoints/managed-run-worker.js +16 -8
- package/dist/esm/entryPoints/managed-run-worker.js.map +1 -1
- package/dist/esm/executions/taskRunProcess.d.ts +1 -69
- package/dist/esm/executions/taskRunProcess.js +7 -10
- package/dist/esm/executions/taskRunProcess.js.map +1 -1
- package/dist/esm/indexing/indexWorkerManifest.d.ts +9 -6
- package/dist/esm/indexing/registerTasks.js +3 -0
- package/dist/esm/indexing/registerTasks.js.map +1 -1
- package/dist/esm/utilities/eventBus.d.ts +8 -5
- package/dist/esm/utilities/eventBus.js.map +1 -1
- package/dist/esm/utilities/githubActions.d.ts +4 -0
- package/dist/esm/utilities/githubActions.js +18 -0
- package/dist/esm/utilities/githubActions.js.map +1 -0
- package/dist/esm/utilities/logger.d.ts +1 -1
- package/dist/esm/version.js +1 -1
- package/package.json +10 -6
- package/dist/esm/dev/backgroundWorkerEngine2.d.ts +0 -21
- package/dist/esm/dev/backgroundWorkerEngine2.js +0 -68
- package/dist/esm/dev/backgroundWorkerEngine2.js.map +0 -1
- package/dist/esm/entryPoints/deploy-index-controller.d.ts +0 -1
- package/dist/esm/entryPoints/deploy-index-controller.js +0 -86
- package/dist/esm/entryPoints/deploy-index-controller.js.map +0 -1
- package/dist/esm/entryPoints/deploy-index-worker.d.ts +0 -1
- package/dist/esm/entryPoints/deploy-index-worker.js +0 -142
- package/dist/esm/entryPoints/deploy-index-worker.js.map +0 -1
- package/dist/esm/entryPoints/deploy-run-controller.d.ts +0 -1
- package/dist/esm/entryPoints/deploy-run-controller.js +0 -1102
- package/dist/esm/entryPoints/deploy-run-controller.js.map +0 -1
- package/dist/esm/entryPoints/deploy-run-worker.d.ts +0 -1
- package/dist/esm/entryPoints/deploy-run-worker.js +0 -367
- package/dist/esm/entryPoints/deploy-run-worker.js.map +0 -1
- package/dist/esm/entryPoints/unmanaged-index-controller.d.ts +0 -1
- package/dist/esm/entryPoints/unmanaged-index-controller.js +0 -86
- package/dist/esm/entryPoints/unmanaged-index-controller.js.map +0 -1
- package/dist/esm/entryPoints/unmanaged-index-worker.d.ts +0 -1
- package/dist/esm/entryPoints/unmanaged-index-worker.js +0 -128
- package/dist/esm/entryPoints/unmanaged-index-worker.js.map +0 -1
- package/dist/esm/entryPoints/unmanaged-run-controller.d.ts +0 -1
- package/dist/esm/entryPoints/unmanaged-run-controller.js +0 -147
- package/dist/esm/entryPoints/unmanaged-run-controller.js.map +0 -1
- package/dist/esm/entryPoints/unmanaged-run-worker.d.ts +0 -1
- package/dist/esm/entryPoints/unmanaged-run-worker.js +0 -360
- package/dist/esm/entryPoints/unmanaged-run-worker.js.map +0 -1
|
@@ -1,151 +1,21 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { Evt } from "evt";
|
|
1
|
+
import { execOptionsForRuntime } from "@trigger.dev/core/v3/build";
|
|
3
2
|
import { join } from "node:path";
|
|
4
|
-
import { SigKillTimeoutProcessError } from "@trigger.dev/core/v3/errors";
|
|
5
|
-
import { TaskRunProcess } from "../executions/taskRunProcess.js";
|
|
6
3
|
import { indexWorkerManifest } from "../indexing/indexWorkerManifest.js";
|
|
7
4
|
import { prettyError } from "../utilities/cliOutput.js";
|
|
8
5
|
import { writeJSONFile } from "../utilities/fileSystem.js";
|
|
9
6
|
import { logger } from "../utilities/logger.js";
|
|
10
|
-
import { execOptionsForRuntime } from "@trigger.dev/core/v3/build";
|
|
11
|
-
import { sanitizeEnvVars } from "../utilities/sanitizeEnvVars.js";
|
|
12
|
-
export class BackgroundWorkerCoordinator {
|
|
13
|
-
onTaskCompleted = new Evt();
|
|
14
|
-
onTaskFailedToRun = new Evt();
|
|
15
|
-
onWorkerRegistered = new Evt();
|
|
16
|
-
/**
|
|
17
|
-
* @deprecated use onWorkerTaskRunHeartbeat instead
|
|
18
|
-
*/
|
|
19
|
-
onWorkerTaskHeartbeat = new Evt();
|
|
20
|
-
onWorkerTaskRunHeartbeat = new Evt();
|
|
21
|
-
onWorkerDeprecated = new Evt();
|
|
22
|
-
_backgroundWorkers = new Map();
|
|
23
|
-
constructor() {
|
|
24
|
-
this.onTaskCompleted.attach(async ({ completion }) => {
|
|
25
|
-
if (!completion.ok && typeof completion.retry !== "undefined") {
|
|
26
|
-
return;
|
|
27
|
-
}
|
|
28
|
-
await this.#notifyWorkersOfTaskCompletion(completion);
|
|
29
|
-
});
|
|
30
|
-
this.onTaskFailedToRun.attach(async ({ completion }) => {
|
|
31
|
-
await this.#notifyWorkersOfTaskCompletion(completion);
|
|
32
|
-
});
|
|
33
|
-
}
|
|
34
|
-
async #notifyWorkersOfTaskCompletion(completion) {
|
|
35
|
-
for (const worker of this._backgroundWorkers.values()) {
|
|
36
|
-
await worker.taskRunCompletedNotification(completion);
|
|
37
|
-
}
|
|
38
|
-
}
|
|
39
|
-
get currentWorkers() {
|
|
40
|
-
return Array.from(this._backgroundWorkers.entries()).map(([id, worker]) => ({
|
|
41
|
-
id,
|
|
42
|
-
worker,
|
|
43
|
-
}));
|
|
44
|
-
}
|
|
45
|
-
async cancelRun(id, taskRunId) {
|
|
46
|
-
const worker = this._backgroundWorkers.get(id);
|
|
47
|
-
if (!worker) {
|
|
48
|
-
logger.error(`Could not find worker ${id}`);
|
|
49
|
-
return;
|
|
50
|
-
}
|
|
51
|
-
await worker.cancelRun(taskRunId);
|
|
52
|
-
}
|
|
53
|
-
async registerWorker(worker) {
|
|
54
|
-
if (!worker.serverWorker) {
|
|
55
|
-
return;
|
|
56
|
-
}
|
|
57
|
-
for (const [workerId, existingWorker] of this._backgroundWorkers.entries()) {
|
|
58
|
-
if (workerId === worker.serverWorker.id) {
|
|
59
|
-
continue;
|
|
60
|
-
}
|
|
61
|
-
existingWorker.deprecate();
|
|
62
|
-
this.onWorkerDeprecated.post({ worker: existingWorker, id: workerId });
|
|
63
|
-
}
|
|
64
|
-
this._backgroundWorkers.set(worker.serverWorker.id, worker);
|
|
65
|
-
this.onWorkerRegistered.post({
|
|
66
|
-
worker,
|
|
67
|
-
id: worker.serverWorker.id,
|
|
68
|
-
record: worker.serverWorker,
|
|
69
|
-
});
|
|
70
|
-
worker.onTaskRunHeartbeat.attach((id) => {
|
|
71
|
-
this.onWorkerTaskRunHeartbeat.post({
|
|
72
|
-
id,
|
|
73
|
-
backgroundWorkerId: worker.serverWorker.id,
|
|
74
|
-
worker,
|
|
75
|
-
});
|
|
76
|
-
});
|
|
77
|
-
}
|
|
78
|
-
async executeTaskRun(id, payload, messageId) {
|
|
79
|
-
const worker = this._backgroundWorkers.get(id);
|
|
80
|
-
if (!worker) {
|
|
81
|
-
logger.error(`Could not find worker ${id}`);
|
|
82
|
-
return;
|
|
83
|
-
}
|
|
84
|
-
try {
|
|
85
|
-
const completion = await worker.executeTaskRun(payload, messageId);
|
|
86
|
-
this.onTaskCompleted.post({
|
|
87
|
-
completion,
|
|
88
|
-
execution: payload.execution,
|
|
89
|
-
worker,
|
|
90
|
-
backgroundWorkerId: id,
|
|
91
|
-
});
|
|
92
|
-
return completion;
|
|
93
|
-
}
|
|
94
|
-
catch (error) {
|
|
95
|
-
this.onTaskFailedToRun.post({
|
|
96
|
-
backgroundWorkerId: id,
|
|
97
|
-
worker,
|
|
98
|
-
completion: {
|
|
99
|
-
ok: false,
|
|
100
|
-
id: payload.execution.run.id,
|
|
101
|
-
retry: undefined,
|
|
102
|
-
error: error instanceof Error
|
|
103
|
-
? {
|
|
104
|
-
type: "BUILT_IN_ERROR",
|
|
105
|
-
name: error.name,
|
|
106
|
-
message: error.message,
|
|
107
|
-
stackTrace: error.stack ?? "",
|
|
108
|
-
}
|
|
109
|
-
: {
|
|
110
|
-
type: "BUILT_IN_ERROR",
|
|
111
|
-
name: "UnknownError",
|
|
112
|
-
message: String(error),
|
|
113
|
-
stackTrace: "",
|
|
114
|
-
},
|
|
115
|
-
},
|
|
116
|
-
});
|
|
117
|
-
}
|
|
118
|
-
return;
|
|
119
|
-
}
|
|
120
|
-
}
|
|
121
7
|
export class BackgroundWorker {
|
|
122
8
|
build;
|
|
123
9
|
params;
|
|
124
|
-
onTaskRunHeartbeat = new Evt();
|
|
125
10
|
deprecated = false;
|
|
126
11
|
manifest;
|
|
127
12
|
serverWorker;
|
|
128
|
-
_taskRunProcesses = new Map();
|
|
129
|
-
_taskRunProcessesBeingKilled = new Map();
|
|
130
13
|
constructor(build, params) {
|
|
131
14
|
this.build = build;
|
|
132
15
|
this.params = params;
|
|
133
16
|
}
|
|
134
17
|
deprecate() {
|
|
135
|
-
if (this.deprecated) {
|
|
136
|
-
return;
|
|
137
|
-
}
|
|
138
18
|
this.deprecated = true;
|
|
139
|
-
this.#tryStopWorker();
|
|
140
|
-
}
|
|
141
|
-
#tryStopWorker() {
|
|
142
|
-
if (this.deprecated && this._taskRunProcesses.size === 0) {
|
|
143
|
-
logger.debug("Worker deprecated, stopping", { outputPath: this.build.outputPath });
|
|
144
|
-
this.params.stop();
|
|
145
|
-
}
|
|
146
|
-
}
|
|
147
|
-
get inProgressRuns() {
|
|
148
|
-
return Array.from(this._taskRunProcesses.keys());
|
|
149
19
|
}
|
|
150
20
|
get workerManifestPath() {
|
|
151
21
|
return join(this.build.outputPath, "index.json");
|
|
@@ -153,6 +23,13 @@ export class BackgroundWorker {
|
|
|
153
23
|
get buildManifestPath() {
|
|
154
24
|
return join(this.build.outputPath, "build.json");
|
|
155
25
|
}
|
|
26
|
+
stop() {
|
|
27
|
+
logger.debug("[BackgroundWorker] Stopping worker", {
|
|
28
|
+
version: this.serverWorker?.version,
|
|
29
|
+
outputPath: this.build.outputPath,
|
|
30
|
+
});
|
|
31
|
+
this.params.stop();
|
|
32
|
+
}
|
|
156
33
|
async initialize() {
|
|
157
34
|
if (this.manifest) {
|
|
158
35
|
throw new Error("Worker already initialized");
|
|
@@ -182,178 +59,5 @@ export class BackgroundWorker {
|
|
|
182
59
|
await writeJSONFile(this.workerManifestPath, this.manifest, true);
|
|
183
60
|
logger.debug("worker manifest indexed", { path: this.build.outputPath });
|
|
184
61
|
}
|
|
185
|
-
// We need to notify all the task run processes that a task run has completed,
|
|
186
|
-
// in case they are waiting for it through triggerAndWait
|
|
187
|
-
async taskRunCompletedNotification(completion) {
|
|
188
|
-
for (const taskRunProcess of this._taskRunProcesses.values()) {
|
|
189
|
-
taskRunProcess.taskRunCompletedNotification(completion);
|
|
190
|
-
}
|
|
191
|
-
}
|
|
192
|
-
#prefixedMessage(payload, message = "") {
|
|
193
|
-
return `[${payload.execution.run.id}.${payload.execution.attempt.number}] ${message}`;
|
|
194
|
-
}
|
|
195
|
-
async #getFreshTaskRunProcess(payload, messageId) {
|
|
196
|
-
logger.debug(this.#prefixedMessage(payload, "getFreshTaskRunProcess()"));
|
|
197
|
-
if (!this.serverWorker) {
|
|
198
|
-
throw new Error("Worker not registered");
|
|
199
|
-
}
|
|
200
|
-
if (!this.manifest) {
|
|
201
|
-
throw new Error("Worker not initialized");
|
|
202
|
-
}
|
|
203
|
-
logger.debug(this.#prefixedMessage(payload, "killing current task run process before attempt"));
|
|
204
|
-
await this.#killCurrentTaskRunProcessBeforeAttempt(payload.execution.run.id);
|
|
205
|
-
logger.debug(this.#prefixedMessage(payload, "creating new task run process"));
|
|
206
|
-
const processOptions = {
|
|
207
|
-
payload,
|
|
208
|
-
env: {
|
|
209
|
-
// TODO: this needs the stripEmptyValues stuff too
|
|
210
|
-
...sanitizeEnvVars(payload.environment ?? {}),
|
|
211
|
-
...sanitizeEnvVars(this.params.env),
|
|
212
|
-
TRIGGER_WORKER_MANIFEST_PATH: this.workerManifestPath,
|
|
213
|
-
},
|
|
214
|
-
serverWorker: this.serverWorker,
|
|
215
|
-
workerManifest: this.manifest,
|
|
216
|
-
messageId,
|
|
217
|
-
};
|
|
218
|
-
const taskRunProcess = new TaskRunProcess(processOptions);
|
|
219
|
-
taskRunProcess.onExit.attach(({ pid }) => {
|
|
220
|
-
logger.debug(this.#prefixedMessage(payload, "onExit()"), { pid });
|
|
221
|
-
const taskRunProcess = this._taskRunProcesses.get(payload.execution.run.id);
|
|
222
|
-
// Only delete the task run process if the pid matches
|
|
223
|
-
if (taskRunProcess?.pid === pid) {
|
|
224
|
-
this._taskRunProcesses.delete(payload.execution.run.id);
|
|
225
|
-
this.#tryStopWorker();
|
|
226
|
-
}
|
|
227
|
-
if (pid) {
|
|
228
|
-
this._taskRunProcessesBeingKilled.delete(pid);
|
|
229
|
-
}
|
|
230
|
-
});
|
|
231
|
-
taskRunProcess.onIsBeingKilled.attach((taskRunProcess) => {
|
|
232
|
-
if (taskRunProcess.pid) {
|
|
233
|
-
this._taskRunProcessesBeingKilled.set(taskRunProcess.pid, taskRunProcess);
|
|
234
|
-
}
|
|
235
|
-
});
|
|
236
|
-
taskRunProcess.onTaskRunHeartbeat.attach((id) => {
|
|
237
|
-
this.onTaskRunHeartbeat.post(id);
|
|
238
|
-
});
|
|
239
|
-
taskRunProcess.onReadyToDispose.attach(async () => {
|
|
240
|
-
await taskRunProcess.kill();
|
|
241
|
-
});
|
|
242
|
-
await taskRunProcess.initialize();
|
|
243
|
-
this._taskRunProcesses.set(payload.execution.run.id, taskRunProcess);
|
|
244
|
-
return taskRunProcess;
|
|
245
|
-
}
|
|
246
|
-
async #killCurrentTaskRunProcessBeforeAttempt(runId) {
|
|
247
|
-
const taskRunProcess = this._taskRunProcesses.get(runId);
|
|
248
|
-
if (!taskRunProcess) {
|
|
249
|
-
logger.debug(`[${runId}] no current task process to kill`);
|
|
250
|
-
return;
|
|
251
|
-
}
|
|
252
|
-
logger.debug(`[${runId}] killing current task process`, {
|
|
253
|
-
pid: taskRunProcess.pid,
|
|
254
|
-
});
|
|
255
|
-
if (taskRunProcess.isBeingKilled) {
|
|
256
|
-
if (this._taskRunProcessesBeingKilled.size > 1) {
|
|
257
|
-
await this.#tryGracefulExit(taskRunProcess);
|
|
258
|
-
}
|
|
259
|
-
else {
|
|
260
|
-
// If there's only one or none being killed, don't do anything so we can create a fresh one in parallel
|
|
261
|
-
}
|
|
262
|
-
}
|
|
263
|
-
else {
|
|
264
|
-
// It's not being killed, so kill it
|
|
265
|
-
if (this._taskRunProcessesBeingKilled.size > 0) {
|
|
266
|
-
await this.#tryGracefulExit(taskRunProcess);
|
|
267
|
-
}
|
|
268
|
-
else {
|
|
269
|
-
// There's none being killed yet, so we can kill it without waiting. We still set a timeout to kill it forcefully just in case it sticks around.
|
|
270
|
-
taskRunProcess.kill("SIGTERM", 5_000).catch(() => { });
|
|
271
|
-
}
|
|
272
|
-
}
|
|
273
|
-
}
|
|
274
|
-
async #tryGracefulExit(taskRunProcess, kill = false, initialSignal = "SIGTERM") {
|
|
275
|
-
try {
|
|
276
|
-
const initialExit = taskRunProcess.onExit.waitFor(5_000);
|
|
277
|
-
if (kill) {
|
|
278
|
-
taskRunProcess.kill(initialSignal);
|
|
279
|
-
}
|
|
280
|
-
await initialExit;
|
|
281
|
-
}
|
|
282
|
-
catch (error) {
|
|
283
|
-
logger.error("TaskRunProcess graceful kill timeout exceeded", error);
|
|
284
|
-
this.#tryForcefulExit(taskRunProcess);
|
|
285
|
-
}
|
|
286
|
-
}
|
|
287
|
-
async #tryForcefulExit(taskRunProcess) {
|
|
288
|
-
try {
|
|
289
|
-
const forcedKill = taskRunProcess.onExit.waitFor(5_000);
|
|
290
|
-
taskRunProcess.kill("SIGKILL");
|
|
291
|
-
await forcedKill;
|
|
292
|
-
}
|
|
293
|
-
catch (error) {
|
|
294
|
-
logger.error("TaskRunProcess forced kill timeout exceeded", error);
|
|
295
|
-
throw new SigKillTimeoutProcessError();
|
|
296
|
-
}
|
|
297
|
-
}
|
|
298
|
-
async cancelRun(taskRunId) {
|
|
299
|
-
const taskRunProcess = this._taskRunProcesses.get(taskRunId);
|
|
300
|
-
if (!taskRunProcess) {
|
|
301
|
-
return;
|
|
302
|
-
}
|
|
303
|
-
await taskRunProcess.cancel();
|
|
304
|
-
}
|
|
305
|
-
// We need to fork the process before we can execute any tasks
|
|
306
|
-
async executeTaskRun(payload, messageId) {
|
|
307
|
-
if (!this.manifest) {
|
|
308
|
-
throw new Error("Worker not initialized");
|
|
309
|
-
}
|
|
310
|
-
if (!this.serverWorker) {
|
|
311
|
-
throw new Error("Worker not registered");
|
|
312
|
-
}
|
|
313
|
-
// eventBus.emit("runStarted", this, payload);
|
|
314
|
-
const now = performance.now();
|
|
315
|
-
const completion = await this.#doExecuteTaskRun(payload, messageId);
|
|
316
|
-
const elapsed = performance.now() - now;
|
|
317
|
-
// eventBus.emit("runCompleted", this, payload, completion, elapsed);
|
|
318
|
-
return completion;
|
|
319
|
-
}
|
|
320
|
-
async #doExecuteTaskRun(payload, messageId) {
|
|
321
|
-
try {
|
|
322
|
-
const taskRunProcess = await this.#getFreshTaskRunProcess(payload, messageId);
|
|
323
|
-
logger.debug(this.#prefixedMessage(payload, "executing task run"), {
|
|
324
|
-
pid: taskRunProcess.pid,
|
|
325
|
-
});
|
|
326
|
-
const result = await taskRunProcess.execute();
|
|
327
|
-
// Always kill the worker
|
|
328
|
-
await taskRunProcess.cleanup(true);
|
|
329
|
-
if (result.ok) {
|
|
330
|
-
return result;
|
|
331
|
-
}
|
|
332
|
-
const error = result.error;
|
|
333
|
-
if (error.type === "BUILT_IN_ERROR") {
|
|
334
|
-
const mappedError = await this.#correctError(error);
|
|
335
|
-
return {
|
|
336
|
-
...result,
|
|
337
|
-
error: mappedError,
|
|
338
|
-
};
|
|
339
|
-
}
|
|
340
|
-
return result;
|
|
341
|
-
}
|
|
342
|
-
catch (e) {
|
|
343
|
-
return {
|
|
344
|
-
id: payload.execution.run.id,
|
|
345
|
-
ok: false,
|
|
346
|
-
retry: undefined,
|
|
347
|
-
error: TaskRunProcess.parseExecuteError(e),
|
|
348
|
-
taskIdentifier: payload.execution.task.id,
|
|
349
|
-
};
|
|
350
|
-
}
|
|
351
|
-
}
|
|
352
|
-
async #correctError(error) {
|
|
353
|
-
return {
|
|
354
|
-
...error,
|
|
355
|
-
stackTrace: correctErrorStackTrace(error.stackTrace, this.params.cwd),
|
|
356
|
-
};
|
|
357
|
-
}
|
|
358
62
|
}
|
|
359
63
|
//# sourceMappingURL=backgroundWorker.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"backgroundWorker.js","sourceRoot":"","sources":["../../../src/dev/backgroundWorker.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"backgroundWorker.js","sourceRoot":"","sources":["../../../src/dev/backgroundWorker.ts"],"names":[],"mappings":"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"}
|
|
@@ -70,8 +70,7 @@ export function startDevOutput(options) {
|
|
|
70
70
|
const runId = chalkRun(`${execution.run.id}.${execution.attempt.number}`);
|
|
71
71
|
logger.log(`${bullet} ${timestampPrefix} ${chalkGrey("->")} ${isLinksSupported ? `${link} ${pipe}` : ""} ${workerPrefix} ${pipe} ${taskPrefix} ${pipe} ${runId}`);
|
|
72
72
|
};
|
|
73
|
-
const runCompleted = (...[worker,
|
|
74
|
-
const { execution } = payload;
|
|
73
|
+
const runCompleted = (...[worker, execution, completion, durationMs]) => {
|
|
75
74
|
const retryingText = chalkGrey(!completion.ok && completion.skippedRetrying
|
|
76
75
|
? " (retrying skipped)"
|
|
77
76
|
: !completion.ok && completion.retry !== undefined
|
|
@@ -100,6 +99,12 @@ export function startDevOutput(options) {
|
|
|
100
99
|
const runId = chalkRun(`${execution.run.id}.${execution.attempt.number}`);
|
|
101
100
|
logger.log(`${bullet} ${timestampPrefix} ${chalkGrey("->")} ${isLinksSupported ? `${link} ${pipe}` : ""} ${workerPrefix} ${pipe} ${taskPrefix} ${pipe} ${runId} ${pipe} ${resultText} ${elapsedText}${errorText}`);
|
|
102
101
|
};
|
|
102
|
+
const socketConnectionDisconnected = (reason) => {
|
|
103
|
+
logger.log(chalkGrey(`○ Connection was lost: ${reason}`));
|
|
104
|
+
};
|
|
105
|
+
const socketConnectionReconnected = (reason) => {
|
|
106
|
+
logger.log(chalkGrey(`○ Connection was restored`));
|
|
107
|
+
};
|
|
103
108
|
eventBus.on("rebuildStarted", rebuildStarted);
|
|
104
109
|
eventBus.on("buildStarted", buildStarted);
|
|
105
110
|
eventBus.on("workerSkipped", workerSkipped);
|
|
@@ -107,6 +112,8 @@ export function startDevOutput(options) {
|
|
|
107
112
|
eventBus.on("runStarted", runStarted);
|
|
108
113
|
eventBus.on("runCompleted", runCompleted);
|
|
109
114
|
eventBus.on("backgroundWorkerIndexingError", backgroundWorkerIndexingError);
|
|
115
|
+
eventBus.on("socketConnectionDisconnected", socketConnectionDisconnected);
|
|
116
|
+
eventBus.on("socketConnectionReconnected", socketConnectionReconnected);
|
|
110
117
|
return () => {
|
|
111
118
|
eventBus.off("rebuildStarted", rebuildStarted);
|
|
112
119
|
eventBus.off("buildStarted", buildStarted);
|
|
@@ -115,6 +122,8 @@ export function startDevOutput(options) {
|
|
|
115
122
|
eventBus.off("runStarted", runStarted);
|
|
116
123
|
eventBus.off("runCompleted", runCompleted);
|
|
117
124
|
eventBus.off("backgroundWorkerIndexingError", backgroundWorkerIndexingError);
|
|
125
|
+
eventBus.off("socketConnectionDisconnected", socketConnectionDisconnected);
|
|
126
|
+
eventBus.off("socketConnectionReconnected", socketConnectionReconnected);
|
|
118
127
|
};
|
|
119
128
|
}
|
|
120
129
|
function formatErrorLog(error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"devOutput.js","sourceRoot":"","sources":["../../../src/dev/devOutput.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,0BAA0B,EAAE,MAAM,sBAAsB,CAAC;AAElE,OAAO,EACL,kCAAkC,EAClC,uBAAuB,EACvB,sBAAsB,GACvB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAgB,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AAE/E,OAAO,EACL,UAAU,EACV,SAAS,EACT,SAAS,EACT,QAAQ,EACR,YAAY,EACZ,SAAS,EACT,YAAY,EACZ,WAAW,EACX,OAAO,EACP,gBAAgB,EAChB,WAAW,EACX,eAAe,GAChB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,QAAQ,EAAqB,MAAM,0BAA0B,CAAC;AACvE,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"devOutput.js","sourceRoot":"","sources":["../../../src/dev/devOutput.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,6 +7,7 @@ import { logger } from "../utilities/logger.js";
|
|
|
7
7
|
import { clearTmpDirs, getTmpDir } from "../utilities/tempDirectories.js";
|
|
8
8
|
import { startDevOutput } from "./devOutput.js";
|
|
9
9
|
import { startWorkerRuntime } from "./devSupervisor.js";
|
|
10
|
+
import { startMcpServer, stopMcpServer } from "./mcpServer.js";
|
|
10
11
|
export async function startDevSession({ rawConfig, name, rawArgs, client, dashboardUrl, keepTmpFiles, }) {
|
|
11
12
|
clearTmpDirs(rawConfig.workingDir);
|
|
12
13
|
const destination = getTmpDir(rawConfig.workingDir, "build", keepTmpFiles);
|
|
@@ -17,6 +18,16 @@ export async function startDevSession({ rawConfig, name, rawArgs, client, dashbo
|
|
|
17
18
|
client,
|
|
18
19
|
dashboardUrl,
|
|
19
20
|
});
|
|
21
|
+
if (rawArgs.mcp) {
|
|
22
|
+
await startMcpServer({
|
|
23
|
+
port: rawArgs.mcpPort,
|
|
24
|
+
cliApiClient: client,
|
|
25
|
+
devSession: {
|
|
26
|
+
dashboardUrl,
|
|
27
|
+
projectRef: rawConfig.project,
|
|
28
|
+
},
|
|
29
|
+
});
|
|
30
|
+
}
|
|
20
31
|
const stopOutput = startDevOutput({
|
|
21
32
|
name,
|
|
22
33
|
dashboardUrl,
|
|
@@ -94,10 +105,8 @@ export async function startDevSession({ rawConfig, name, rawArgs, client, dashbo
|
|
|
94
105
|
// First bundle, no need to update bundle
|
|
95
106
|
bundled = true;
|
|
96
107
|
}
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
await updateBuild(result, workerDir);
|
|
100
|
-
}
|
|
108
|
+
const workerDir = getTmpDir(rawConfig.workingDir, "build", keepTmpFiles);
|
|
109
|
+
await updateBuild(result, workerDir);
|
|
101
110
|
});
|
|
102
111
|
},
|
|
103
112
|
};
|
|
@@ -128,6 +137,7 @@ export async function startDevSession({ rawConfig, name, rawArgs, client, dashbo
|
|
|
128
137
|
stopBundling?.().catch((error) => { });
|
|
129
138
|
runtime.shutdown().catch((error) => { });
|
|
130
139
|
stopOutput();
|
|
140
|
+
stopMcpServer();
|
|
131
141
|
},
|
|
132
142
|
};
|
|
133
143
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"devSession.js","sourceRoot":"","sources":["../../../src/dev/devSession.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAExD,OAAO,EAEL,YAAY,EACZ,6BAA6B,EAC7B,wBAAwB,EACxB,eAAe,EACf,gBAAgB,GACjB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EACL,kBAAkB,EAClB,8BAA8B,EAC9B,2BAA2B,EAC3B,wBAAwB,GACzB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,6BAA6B,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAE7F,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AACpD,OAAO,EAAE,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAChD,OAAO,EAAE,YAAY,EAAsB,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAC9F,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"devSession.js","sourceRoot":"","sources":["../../../src/dev/devSession.ts"],"names":[],"mappings":"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"}
|