trigger.dev 0.0.0-re2-20250502115816 → 0.0.0-re2-20250503165707
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/dist/esm/commands/deploy.js +25 -44
- package/dist/esm/commands/deploy.js.map +1 -1
- package/dist/esm/entryPoints/dev-run-worker.js +51 -13
- package/dist/esm/entryPoints/dev-run-worker.js.map +1 -1
- package/dist/esm/entryPoints/managed/controller.d.ts +1 -0
- package/dist/esm/entryPoints/managed/controller.js +31 -74
- package/dist/esm/entryPoints/managed/controller.js.map +1 -1
- package/dist/esm/entryPoints/managed/env.d.ts +5 -0
- package/dist/esm/entryPoints/managed/env.js +4 -0
- package/dist/esm/entryPoints/managed/env.js.map +1 -1
- package/dist/esm/entryPoints/managed/execution.d.ts +14 -24
- package/dist/esm/entryPoints/managed/execution.js +210 -270
- package/dist/esm/entryPoints/managed/execution.js.map +1 -1
- package/dist/esm/entryPoints/managed/logger.d.ts +5 -15
- package/dist/esm/entryPoints/managed/logger.js +6 -19
- package/dist/esm/entryPoints/managed/logger.js.map +1 -1
- package/dist/esm/entryPoints/managed/poller.js +1 -5
- package/dist/esm/entryPoints/managed/poller.js.map +1 -1
- package/dist/esm/entryPoints/managed-run-worker.js +50 -12
- package/dist/esm/entryPoints/managed-run-worker.js.map +1 -1
- package/dist/esm/executions/taskRunProcess.d.ts +13 -9
- package/dist/esm/executions/taskRunProcess.js +76 -39
- package/dist/esm/executions/taskRunProcess.js.map +1 -1
- package/dist/esm/version.js +1 -1
- package/package.json +3 -7
- package/dist/esm/entryPoints/managed/snapshot.d.ts +0 -48
- package/dist/esm/entryPoints/managed/snapshot.js +0 -237
- package/dist/esm/entryPoints/managed/snapshot.js.map +0 -1
|
@@ -1,10 +1,9 @@
|
|
|
1
|
-
import { intro,
|
|
1
|
+
import { intro, outro } from "@clack/prompts";
|
|
2
2
|
import { prepareDeploymentError } from "@trigger.dev/core/v3";
|
|
3
3
|
import { Option as CommandOption } from "commander";
|
|
4
4
|
import { resolve } from "node:path";
|
|
5
5
|
import { x } from "tinyexec";
|
|
6
6
|
import { z } from "zod";
|
|
7
|
-
import { isCI } from "std-env";
|
|
8
7
|
import { buildWorker } from "../build/buildWorker.js";
|
|
9
8
|
import { resolveAlwaysExternal } from "../build/externals.js";
|
|
10
9
|
import { CommonCommandOptions, commonOptions, handleTelemetry, SkipLoggingError, wrapCommandAction, } from "../cli/common.js";
|
|
@@ -21,6 +20,7 @@ import { spinner } from "../utilities/windows.js";
|
|
|
21
20
|
import { login } from "./login.js";
|
|
22
21
|
import { updateTriggerPackages } from "./update.js";
|
|
23
22
|
import { setGithubActionsOutputAndEnvVars } from "../utilities/githubActions.js";
|
|
23
|
+
import { isDirectory } from "../utilities/fileSystem.js";
|
|
24
24
|
const DeployCommandOptions = CommonCommandOptions.extend({
|
|
25
25
|
dryRun: z.boolean().default(false),
|
|
26
26
|
skipSyncEnvVars: z.boolean().default(false),
|
|
@@ -82,7 +82,20 @@ async function _deployCommand(dir, options) {
|
|
|
82
82
|
if (!options.skipUpdateCheck) {
|
|
83
83
|
await updateTriggerPackages(dir, { ...options }, true, true);
|
|
84
84
|
}
|
|
85
|
-
const
|
|
85
|
+
const cwd = process.cwd();
|
|
86
|
+
const projectPath = resolve(cwd, dir);
|
|
87
|
+
if (dir !== "." && !isDirectory(projectPath)) {
|
|
88
|
+
if (dir === "staging" || dir === "prod") {
|
|
89
|
+
throw new Error(`To deploy to ${dir}, you need to pass "--env ${dir}", not just "${dir}".`);
|
|
90
|
+
}
|
|
91
|
+
if (dir === "production") {
|
|
92
|
+
throw new Error(`To deploy to production, you need to pass "--env prod", not "production".`);
|
|
93
|
+
}
|
|
94
|
+
if (dir === "stg") {
|
|
95
|
+
throw new Error(`To deploy to staging, you need to pass "--env staging", not "stg".`);
|
|
96
|
+
}
|
|
97
|
+
throw new Error(`Directory "${dir}" not found at ${projectPath}`);
|
|
98
|
+
}
|
|
86
99
|
const authorization = await login({
|
|
87
100
|
embedded: true,
|
|
88
101
|
defaultApiUrl: options.apiUrl,
|
|
@@ -189,21 +202,14 @@ async function _deployCommand(dir, options) {
|
|
|
189
202
|
}
|
|
190
203
|
}
|
|
191
204
|
const version = deployment.version;
|
|
192
|
-
const
|
|
193
|
-
const
|
|
194
|
-
const deploymentLink = cliLink("View deployment", rawDeploymentLink);
|
|
195
|
-
const testLink = cliLink("Test tasks", rawTestLink);
|
|
205
|
+
const deploymentLink = cliLink("View deployment", `${authorization.dashboardUrl}/projects/v3/${resolvedConfig.project}/deployments/${deployment.shortCode}`);
|
|
206
|
+
const testLink = cliLink("Test tasks", `${authorization.dashboardUrl}/projects/v3/${resolvedConfig.project}/test?environment=${options.env === "prod" ? "prod" : "stg"}`);
|
|
196
207
|
const $spinner = spinner();
|
|
197
|
-
if (
|
|
198
|
-
|
|
208
|
+
if (isLinksSupported) {
|
|
209
|
+
$spinner.start(`Building version ${version} ${deploymentLink}`);
|
|
199
210
|
}
|
|
200
211
|
else {
|
|
201
|
-
|
|
202
|
-
$spinner.start(`Building version ${version} ${deploymentLink}`);
|
|
203
|
-
}
|
|
204
|
-
else {
|
|
205
|
-
$spinner.start(`Building version ${version}`);
|
|
206
|
-
}
|
|
212
|
+
$spinner.start(`Building version ${version}`);
|
|
207
213
|
}
|
|
208
214
|
const selfHostedRegistryHost = deployment.registryHost ?? options.registry;
|
|
209
215
|
const registryHost = selfHostedRegistryHost ?? "registry.trigger.dev";
|
|
@@ -231,10 +237,6 @@ async function _deployCommand(dir, options) {
|
|
|
231
237
|
buildEnvVars: buildManifest.build.env,
|
|
232
238
|
network: options.network,
|
|
233
239
|
onLog: (logMessage) => {
|
|
234
|
-
if (isCI) {
|
|
235
|
-
console.log(logMessage);
|
|
236
|
-
return;
|
|
237
|
-
}
|
|
238
240
|
if (isLinksSupported) {
|
|
239
241
|
$spinner.message(`Building version ${version} ${deploymentLink}: ${logMessage}`);
|
|
240
242
|
}
|
|
@@ -266,26 +268,17 @@ async function _deployCommand(dir, options) {
|
|
|
266
268
|
const imageReference = options.selfHosted
|
|
267
269
|
? `${selfHostedRegistryHost ? `${selfHostedRegistryHost}/` : ""}${buildResult.image}${buildResult.digest ? `@${buildResult.digest}` : ""}`
|
|
268
270
|
: `${buildResult.image}${buildResult.digest ? `@${buildResult.digest}` : ""}`;
|
|
269
|
-
if (
|
|
270
|
-
|
|
271
|
+
if (isLinksSupported) {
|
|
272
|
+
$spinner.message(`Deploying version ${version} ${deploymentLink}`);
|
|
271
273
|
}
|
|
272
274
|
else {
|
|
273
|
-
|
|
274
|
-
$spinner.message(`Deploying version ${version} ${deploymentLink}`);
|
|
275
|
-
}
|
|
276
|
-
else {
|
|
277
|
-
$spinner.message(`Deploying version ${version}`);
|
|
278
|
-
}
|
|
275
|
+
$spinner.message(`Deploying version ${version}`);
|
|
279
276
|
}
|
|
280
277
|
const finalizeResponse = await projectClient.client.finalizeDeployment(deployment.id, {
|
|
281
278
|
imageReference,
|
|
282
279
|
selfHosted: options.selfHosted,
|
|
283
280
|
skipPromotion: options.skipPromotion,
|
|
284
281
|
}, (logMessage) => {
|
|
285
|
-
if (isCI) {
|
|
286
|
-
console.log(logMessage);
|
|
287
|
-
return;
|
|
288
|
-
}
|
|
289
282
|
if (isLinksSupported) {
|
|
290
283
|
$spinner.message(`Deploying version ${version} ${deploymentLink}: ${logMessage}`);
|
|
291
284
|
}
|
|
@@ -297,21 +290,9 @@ async function _deployCommand(dir, options) {
|
|
|
297
290
|
await failDeploy(projectClient.client, deployment, { name: "FinalizeError", message: finalizeResponse.error }, buildResult.logs, $spinner);
|
|
298
291
|
throw new SkipLoggingError("Failed to finalize deployment");
|
|
299
292
|
}
|
|
300
|
-
|
|
301
|
-
log.step(`Successfully deployed version ${version}`);
|
|
302
|
-
}
|
|
303
|
-
else {
|
|
304
|
-
$spinner.stop(`Successfully deployed version ${version}`);
|
|
305
|
-
}
|
|
293
|
+
$spinner.stop(`Successfully deployed version ${version}`);
|
|
306
294
|
const taskCount = deploymentWithWorker.worker?.tasks.length ?? 0;
|
|
307
295
|
outro(`Version ${version} deployed with ${taskCount} detected task${taskCount === 1 ? "" : "s"} ${isLinksSupported ? `| ${deploymentLink} | ${testLink}` : ""}`);
|
|
308
|
-
if (!isLinksSupported) {
|
|
309
|
-
console.log("View deployment");
|
|
310
|
-
console.log(rawDeploymentLink);
|
|
311
|
-
console.log(); // new line
|
|
312
|
-
console.log("Test tasks");
|
|
313
|
-
console.log(rawTestLink);
|
|
314
|
-
}
|
|
315
296
|
setGithubActionsOutputAndEnvVars({
|
|
316
297
|
envVars: {
|
|
317
298
|
TRIGGER_DEPLOYMENT_VERSION: version,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../../src/commands/deploy.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"deploy.js","sourceRoot":"","sources":["../../../src/commands/deploy.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { apiClientManager, attemptKey, clock, ExecutorToWorkerMessageCatalog, lifecycleHooks, localsAPI, logger, resourceCatalog, runMetadata, runtime, runTimelineMetrics, TaskRunErrorCodes, timeout, waitUntil, WorkerManifest, WorkerToExecutorMessageCatalog, } from "@trigger.dev/core/v3";
|
|
2
2
|
import { TriggerTracer } from "@trigger.dev/core/v3/tracer";
|
|
3
|
-
import { ConsoleInterceptor, DevUsageManager, DurableClock, getEnvVar, getNumberEnvVar, logLevels,
|
|
3
|
+
import { ConsoleInterceptor, DevUsageManager, DurableClock, getEnvVar, getNumberEnvVar, logLevels, ManagedRuntimeManager, OtelTaskLogger, populateEnv, StandardLifecycleHooksManager, StandardLocalsManager, StandardMetadataManager, StandardResourceCatalog, StandardRunTimelineMetricsManager, StandardWaitUntilManager, TaskExecutor, TracingSDK, usage, UsageTimeoutManager, } from "@trigger.dev/core/v3/workers";
|
|
4
4
|
import { ZodIpcConnection } from "@trigger.dev/core/v3/zodIpc";
|
|
5
5
|
import { readFile } from "node:fs/promises";
|
|
6
6
|
import { setInterval, setTimeout } from "node:timers/promises";
|
|
@@ -146,7 +146,10 @@ async function bootstrap() {
|
|
|
146
146
|
}
|
|
147
147
|
let _execution;
|
|
148
148
|
let _isRunning = false;
|
|
149
|
+
let _isCancelled = false;
|
|
149
150
|
let _tracingSDK;
|
|
151
|
+
let _executionMeasurement;
|
|
152
|
+
const cancelController = new AbortController();
|
|
150
153
|
const zodIpc = new ZodIpcConnection({
|
|
151
154
|
listenSchema: WorkerToExecutorMessageCatalog,
|
|
152
155
|
emitSchema: ExecutorToWorkerMessageCatalog,
|
|
@@ -281,14 +284,21 @@ const zodIpc = new ZodIpcConnection({
|
|
|
281
284
|
_execution = execution;
|
|
282
285
|
_isRunning = true;
|
|
283
286
|
runMetadataManager.startPeriodicFlush(getNumberEnvVar("TRIGGER_RUN_METADATA_FLUSH_INTERVAL", 1000));
|
|
284
|
-
|
|
287
|
+
_executionMeasurement = usage.start();
|
|
285
288
|
// This lives outside of the executor because this will eventually be moved to the controller level
|
|
286
|
-
const
|
|
287
|
-
|
|
288
|
-
|
|
289
|
-
|
|
290
|
-
|
|
291
|
-
|
|
289
|
+
const timeoutController = timeout.abortAfterTimeout(execution.run.maxDuration);
|
|
290
|
+
timeoutController.signal.addEventListener("abort", () => {
|
|
291
|
+
if (_isCancelled) {
|
|
292
|
+
return;
|
|
293
|
+
}
|
|
294
|
+
if (cancelController.signal.aborted) {
|
|
295
|
+
return;
|
|
296
|
+
}
|
|
297
|
+
cancelController.abort(timeoutController.signal.reason);
|
|
298
|
+
});
|
|
299
|
+
const { result } = await executor.execute(execution, metadata, traceContext, cancelController.signal);
|
|
300
|
+
if (_isRunning && !_isCancelled) {
|
|
301
|
+
const usageSample = usage.stop(_executionMeasurement);
|
|
292
302
|
return sender.send("TASK_RUN_COMPLETED", {
|
|
293
303
|
execution,
|
|
294
304
|
result: {
|
|
@@ -327,14 +337,42 @@ const zodIpc = new ZodIpcConnection({
|
|
|
327
337
|
});
|
|
328
338
|
}
|
|
329
339
|
},
|
|
330
|
-
|
|
340
|
+
TASK_RUN_COMPLETED_NOTIFICATION: async () => {
|
|
341
|
+
await managedWorkerRuntime.completeWaitpoints([]);
|
|
342
|
+
},
|
|
343
|
+
WAIT_COMPLETED_NOTIFICATION: async () => {
|
|
344
|
+
await managedWorkerRuntime.completeWaitpoints([]);
|
|
345
|
+
},
|
|
346
|
+
CANCEL: async ({ timeoutInMs }) => {
|
|
347
|
+
_isCancelled = true;
|
|
348
|
+
cancelController.abort("run cancelled");
|
|
349
|
+
await callCancelHooks(timeoutInMs);
|
|
350
|
+
if (_executionMeasurement) {
|
|
351
|
+
usage.stop(_executionMeasurement);
|
|
352
|
+
}
|
|
331
353
|
await flushAll(timeoutInMs);
|
|
332
354
|
},
|
|
333
|
-
|
|
334
|
-
|
|
355
|
+
FLUSH: async ({ timeoutInMs }) => {
|
|
356
|
+
await flushAll(timeoutInMs);
|
|
357
|
+
},
|
|
358
|
+
WAITPOINT_CREATED: async ({ wait, waitpoint }) => {
|
|
359
|
+
managedWorkerRuntime.associateWaitWithWaitpoint(wait.id, waitpoint.id);
|
|
360
|
+
},
|
|
361
|
+
WAITPOINT_COMPLETED: async ({ waitpoint }) => {
|
|
362
|
+
managedWorkerRuntime.completeWaitpoints([waitpoint]);
|
|
335
363
|
},
|
|
336
364
|
},
|
|
337
365
|
});
|
|
366
|
+
async function callCancelHooks(timeoutInMs = 10_000) {
|
|
367
|
+
const now = performance.now();
|
|
368
|
+
try {
|
|
369
|
+
await Promise.race([lifecycleHooks.callOnCancelHookListeners(), setTimeout(timeoutInMs)]);
|
|
370
|
+
}
|
|
371
|
+
finally {
|
|
372
|
+
const duration = performance.now() - now;
|
|
373
|
+
log(`Called cancel hooks in ${duration}ms`);
|
|
374
|
+
}
|
|
375
|
+
}
|
|
338
376
|
async function flushAll(timeoutInMs = 10_000) {
|
|
339
377
|
const now = performance.now();
|
|
340
378
|
const results = await Promise.allSettled([
|
|
@@ -380,8 +418,8 @@ async function flushMetadata(timeoutInMs = 10_000) {
|
|
|
380
418
|
durationMs: duration,
|
|
381
419
|
};
|
|
382
420
|
}
|
|
383
|
-
const
|
|
384
|
-
runtime.setGlobalRuntimeManager(
|
|
421
|
+
const managedWorkerRuntime = new ManagedRuntimeManager(zodIpc, showInternalLogs);
|
|
422
|
+
runtime.setGlobalRuntimeManager(managedWorkerRuntime);
|
|
385
423
|
process.title = "trigger-managed-worker";
|
|
386
424
|
const heartbeatInterval = parseInt(heartbeatIntervalMs ?? "30000", 10);
|
|
387
425
|
for await (const _ of setInterval(heartbeatInterval)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dev-run-worker.js","sourceRoot":"","sources":["../../../src/entryPoints/dev-run-worker.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"dev-run-worker.js","sourceRoot":"","sources":["../../../src/entryPoints/dev-run-worker.ts"],"names":[],"mappings":"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"}
|
|
@@ -42,6 +42,7 @@ export declare class ManagedRunController {
|
|
|
42
42
|
private waitForNextRun;
|
|
43
43
|
private exitProcess;
|
|
44
44
|
createSupervisorSocket(): SupervisorSocket;
|
|
45
|
+
cancelAttempt(runId: string): Promise<void>;
|
|
45
46
|
start(): void;
|
|
46
47
|
stop(): Promise<void>;
|
|
47
48
|
sendDebugLog(opts: SendDebugLogOptions): void;
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { WarmStartClient, WORKLOAD_HEADERS, WorkloadHttpClient, } from "@trigger.dev/core/v3/workers";
|
|
2
2
|
import { io } from "socket.io-client";
|
|
3
3
|
import { RunnerEnv } from "./env.js";
|
|
4
|
-
import {
|
|
4
|
+
import { RunLogger } from "./logger.js";
|
|
5
5
|
import { RunExecution } from "./execution.js";
|
|
6
6
|
import { tryCatch } from "@trigger.dev/core/utils";
|
|
7
7
|
export class ManagedRunController {
|
|
@@ -25,7 +25,7 @@ export class ManagedRunController {
|
|
|
25
25
|
deploymentVersion: env.TRIGGER_DEPLOYMENT_VERSION,
|
|
26
26
|
projectRef: env.TRIGGER_PROJECT_REF,
|
|
27
27
|
});
|
|
28
|
-
this.logger = new
|
|
28
|
+
this.logger = new RunLogger({
|
|
29
29
|
httpClient: this.httpClient,
|
|
30
30
|
env,
|
|
31
31
|
});
|
|
@@ -298,7 +298,7 @@ export class ManagedRunController {
|
|
|
298
298
|
message: "Exiting process",
|
|
299
299
|
properties: { code },
|
|
300
300
|
});
|
|
301
|
-
this.currentExecution?.
|
|
301
|
+
this.currentExecution?.exit();
|
|
302
302
|
process.exit(code);
|
|
303
303
|
}
|
|
304
304
|
createSupervisorSocket() {
|
|
@@ -311,57 +311,42 @@ export class ManagedRunController {
|
|
|
311
311
|
},
|
|
312
312
|
});
|
|
313
313
|
socket.on("run:notify", async ({ version, run }) => {
|
|
314
|
-
// Generate a unique ID for the notification
|
|
315
|
-
const notificationId = Math.random().toString(36).substring(2, 15);
|
|
316
|
-
// Use this to track the notification incl. any processing
|
|
317
|
-
const notification = {
|
|
318
|
-
id: notificationId,
|
|
319
|
-
runId: run.friendlyId,
|
|
320
|
-
version,
|
|
321
|
-
};
|
|
322
|
-
// Lock this to the current run and snapshot IDs
|
|
323
|
-
const controller = {
|
|
324
|
-
runFriendlyId: this.runFriendlyId,
|
|
325
|
-
snapshotFriendlyId: this.snapshotFriendlyId,
|
|
326
|
-
};
|
|
327
314
|
this.sendDebugLog({
|
|
328
315
|
runId: run.friendlyId,
|
|
329
316
|
message: "run:notify received by runner",
|
|
330
|
-
properties: {
|
|
331
|
-
notification,
|
|
332
|
-
controller,
|
|
333
|
-
},
|
|
317
|
+
properties: { version, runId: run.friendlyId },
|
|
334
318
|
});
|
|
335
|
-
if (!
|
|
319
|
+
if (!this.runFriendlyId) {
|
|
336
320
|
this.sendDebugLog({
|
|
337
321
|
runId: run.friendlyId,
|
|
338
322
|
message: "run:notify: ignoring notification, no local run ID",
|
|
339
323
|
properties: {
|
|
340
|
-
|
|
341
|
-
|
|
324
|
+
currentRunId: this.runFriendlyId,
|
|
325
|
+
currentSnapshotId: this.snapshotFriendlyId,
|
|
342
326
|
},
|
|
343
327
|
});
|
|
344
328
|
return;
|
|
345
329
|
}
|
|
346
|
-
if (run.friendlyId !==
|
|
330
|
+
if (run.friendlyId !== this.runFriendlyId) {
|
|
347
331
|
this.sendDebugLog({
|
|
348
332
|
runId: run.friendlyId,
|
|
349
333
|
message: "run:notify: ignoring notification for different run",
|
|
350
334
|
properties: {
|
|
351
|
-
|
|
352
|
-
|
|
335
|
+
currentRunId: this.runFriendlyId,
|
|
336
|
+
currentSnapshotId: this.snapshotFriendlyId,
|
|
337
|
+
notificationRunId: run.friendlyId,
|
|
353
338
|
},
|
|
354
339
|
});
|
|
355
340
|
return;
|
|
356
341
|
}
|
|
357
|
-
const latestSnapshot = await this.httpClient.getRunExecutionData(
|
|
342
|
+
const latestSnapshot = await this.httpClient.getRunExecutionData(this.runFriendlyId);
|
|
358
343
|
if (!latestSnapshot.success) {
|
|
359
344
|
this.sendDebugLog({
|
|
360
|
-
runId:
|
|
345
|
+
runId: this.runFriendlyId,
|
|
361
346
|
message: "run:notify: failed to get latest snapshot data",
|
|
362
347
|
properties: {
|
|
363
|
-
|
|
364
|
-
|
|
348
|
+
currentRunId: this.runFriendlyId,
|
|
349
|
+
currentSnapshotId: this.snapshotFriendlyId,
|
|
365
350
|
error: latestSnapshot.error,
|
|
366
351
|
},
|
|
367
352
|
});
|
|
@@ -370,25 +355,17 @@ export class ManagedRunController {
|
|
|
370
355
|
const runExecutionData = latestSnapshot.data.execution;
|
|
371
356
|
if (!this.currentExecution) {
|
|
372
357
|
this.sendDebugLog({
|
|
373
|
-
runId: run.friendlyId,
|
|
374
|
-
message: "
|
|
375
|
-
properties: {
|
|
376
|
-
notification,
|
|
377
|
-
controller,
|
|
378
|
-
},
|
|
358
|
+
runId: runExecutionData.run.friendlyId,
|
|
359
|
+
message: "handleSnapshotChange: no current execution",
|
|
379
360
|
});
|
|
380
361
|
return;
|
|
381
362
|
}
|
|
382
|
-
const [error] = await tryCatch(this.currentExecution.
|
|
363
|
+
const [error] = await tryCatch(this.currentExecution.handleSnapshotChange(runExecutionData));
|
|
383
364
|
if (error) {
|
|
384
365
|
this.sendDebugLog({
|
|
385
|
-
runId: run.friendlyId,
|
|
386
|
-
message: "
|
|
387
|
-
properties: {
|
|
388
|
-
notification,
|
|
389
|
-
controller,
|
|
390
|
-
error: error.message,
|
|
391
|
-
},
|
|
366
|
+
runId: runExecutionData.run.friendlyId,
|
|
367
|
+
message: "handleSnapshotChange: unexpected error",
|
|
368
|
+
properties: { error: error.message },
|
|
392
369
|
});
|
|
393
370
|
}
|
|
394
371
|
});
|
|
@@ -415,7 +392,7 @@ export class ManagedRunController {
|
|
|
415
392
|
properties: { error: error instanceof Error ? error.message : String(error) },
|
|
416
393
|
});
|
|
417
394
|
});
|
|
418
|
-
socket.on("disconnect",
|
|
395
|
+
socket.on("disconnect", (reason, description) => {
|
|
419
396
|
const parseDescription = () => {
|
|
420
397
|
if (!description) {
|
|
421
398
|
return undefined;
|
|
@@ -430,25 +407,6 @@ export class ManagedRunController {
|
|
|
430
407
|
context: description.context ? String(description.context) : undefined,
|
|
431
408
|
};
|
|
432
409
|
};
|
|
433
|
-
if (this.currentExecution) {
|
|
434
|
-
const currentEnv = {
|
|
435
|
-
workerInstanceName: this.env.TRIGGER_WORKER_INSTANCE_NAME,
|
|
436
|
-
runnerId: this.env.TRIGGER_RUNNER_ID,
|
|
437
|
-
supervisorApiUrl: this.env.TRIGGER_SUPERVISOR_API_URL,
|
|
438
|
-
};
|
|
439
|
-
await this.currentExecution.processEnvOverrides("socket disconnected");
|
|
440
|
-
const newEnv = {
|
|
441
|
-
workerInstanceName: this.env.TRIGGER_WORKER_INSTANCE_NAME,
|
|
442
|
-
runnerId: this.env.TRIGGER_RUNNER_ID,
|
|
443
|
-
supervisorApiUrl: this.env.TRIGGER_SUPERVISOR_API_URL,
|
|
444
|
-
};
|
|
445
|
-
this.sendDebugLog({
|
|
446
|
-
runId: this.runFriendlyId,
|
|
447
|
-
message: "Socket disconnected from supervisor - processed env overrides",
|
|
448
|
-
properties: { reason, ...parseDescription(), currentEnv, newEnv },
|
|
449
|
-
});
|
|
450
|
-
return;
|
|
451
|
-
}
|
|
452
410
|
this.sendDebugLog({
|
|
453
411
|
runId: this.runFriendlyId,
|
|
454
412
|
message: "Socket disconnected from supervisor",
|
|
@@ -457,6 +415,14 @@ export class ManagedRunController {
|
|
|
457
415
|
});
|
|
458
416
|
return socket;
|
|
459
417
|
}
|
|
418
|
+
async cancelAttempt(runId) {
|
|
419
|
+
this.sendDebugLog({
|
|
420
|
+
runId,
|
|
421
|
+
message: "cancelling attempt",
|
|
422
|
+
properties: { runId },
|
|
423
|
+
});
|
|
424
|
+
await this.currentExecution?.cancel();
|
|
425
|
+
}
|
|
460
426
|
start() {
|
|
461
427
|
this.sendDebugLog({
|
|
462
428
|
runId: this.runFriendlyId,
|
|
@@ -481,16 +447,7 @@ export class ManagedRunController {
|
|
|
481
447
|
runId: this.runFriendlyId,
|
|
482
448
|
message: "Shutting down",
|
|
483
449
|
});
|
|
484
|
-
|
|
485
|
-
const [error] = await tryCatch(this.currentExecution?.cancel());
|
|
486
|
-
if (error) {
|
|
487
|
-
this.sendDebugLog({
|
|
488
|
-
runId: this.runFriendlyId,
|
|
489
|
-
message: "Error during shutdown",
|
|
490
|
-
properties: { error: String(error) },
|
|
491
|
-
});
|
|
492
|
-
}
|
|
493
|
-
// Close the socket
|
|
450
|
+
await this.currentExecution?.cancel();
|
|
494
451
|
this.socket.close();
|
|
495
452
|
}
|
|
496
453
|
sendDebugLog(opts) {
|