@trigger.dev/core 4.7.2 → 4.7.3
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/commonjs/v3/apiClient/index.d.ts +103 -1
- package/dist/commonjs/v3/apiClient/index.js +42 -0
- package/dist/commonjs/v3/apiClient/index.js.map +1 -1
- package/dist/commonjs/v3/isomorphic/friendlyId.d.ts +5 -0
- package/dist/commonjs/v3/isomorphic/friendlyId.js +8 -0
- package/dist/commonjs/v3/isomorphic/friendlyId.js.map +1 -1
- package/dist/commonjs/v3/resource-catalog/catalog.d.ts +7 -5
- package/dist/commonjs/v3/resource-catalog/index.d.ts +7 -5
- package/dist/commonjs/v3/resource-catalog/index.js +14 -8
- package/dist/commonjs/v3/resource-catalog/index.js.map +1 -1
- package/dist/commonjs/v3/resource-catalog/noopResourceCatalog.d.ts +7 -5
- package/dist/commonjs/v3/resource-catalog/noopResourceCatalog.js +10 -4
- package/dist/commonjs/v3/resource-catalog/noopResourceCatalog.js.map +1 -1
- package/dist/commonjs/v3/resource-catalog/standardResourceCatalog.d.ts +11 -8
- package/dist/commonjs/v3/resource-catalog/standardResourceCatalog.js +29 -20
- package/dist/commonjs/v3/resource-catalog/standardResourceCatalog.js.map +1 -1
- package/dist/commonjs/v3/runEngineWorker/index.d.ts +1 -0
- package/dist/commonjs/v3/runEngineWorker/index.js +1 -0
- package/dist/commonjs/v3/runEngineWorker/index.js.map +1 -1
- package/dist/commonjs/v3/runEngineWorker/supervisor/http.d.ts +6 -1
- package/dist/commonjs/v3/runEngineWorker/supervisor/http.js +12 -0
- package/dist/commonjs/v3/runEngineWorker/supervisor/http.js.map +1 -1
- package/dist/commonjs/v3/runEngineWorker/supervisor/queueConsumer.d.ts +4 -2
- package/dist/commonjs/v3/runEngineWorker/supervisor/queueConsumer.js +11 -4
- package/dist/commonjs/v3/runEngineWorker/supervisor/queueConsumer.js.map +1 -1
- package/dist/commonjs/v3/runEngineWorker/supervisor/schemas.d.ts +40 -1
- package/dist/commonjs/v3/runEngineWorker/supervisor/schemas.js +25 -10
- package/dist/commonjs/v3/runEngineWorker/supervisor/schemas.js.map +1 -1
- package/dist/commonjs/v3/runEngineWorker/supervisor/session.d.ts +2 -1
- package/dist/commonjs/v3/runEngineWorker/supervisor/session.js +1 -1
- package/dist/commonjs/v3/runEngineWorker/supervisor/session.js.map +1 -1
- package/dist/commonjs/v3/runEngineWorker/workerQueue.d.ts +121 -0
- package/dist/commonjs/v3/runEngineWorker/workerQueue.js +121 -0
- package/dist/commonjs/v3/runEngineWorker/workerQueue.js.map +1 -0
- package/dist/commonjs/v3/schemas/api.d.ts +26 -9
- package/dist/commonjs/v3/schemas/build.d.ts +48 -18
- package/dist/commonjs/v3/schemas/build.js +2 -1
- package/dist/commonjs/v3/schemas/build.js.map +1 -1
- package/dist/commonjs/v3/schemas/checkpoints.d.ts +2 -0
- package/dist/commonjs/v3/schemas/messages.d.ts +24 -9
- package/dist/commonjs/v3/schemas/resources.d.ts +50 -19
- package/dist/commonjs/v3/schemas/resources.js +9 -5
- package/dist/commonjs/v3/schemas/resources.js.map +1 -1
- package/dist/commonjs/v3/schemas/runEngine.d.ts +4 -0
- package/dist/commonjs/v3/schemas/runEngine.js +4 -0
- package/dist/commonjs/v3/schemas/runEngine.js.map +1 -1
- package/dist/commonjs/v3/schemas/schemas.d.ts +38 -29
- package/dist/commonjs/v3/schemas/schemas.js +12 -8
- package/dist/commonjs/v3/schemas/schemas.js.map +1 -1
- package/dist/commonjs/v3/schemas/webhookApi.d.ts +199 -8
- package/dist/commonjs/v3/schemas/webhookApi.js +100 -7
- package/dist/commonjs/v3/schemas/webhookApi.js.map +1 -1
- package/dist/commonjs/v3/schemas/webhookConfig.d.ts +64 -0
- package/dist/commonjs/v3/schemas/webhookConfig.js +36 -9
- package/dist/commonjs/v3/schemas/webhookConfig.js.map +1 -1
- package/dist/commonjs/v3/types/webhooks.d.ts +23 -2
- package/dist/commonjs/v3/webhooks/index.d.ts +5 -0
- package/dist/commonjs/v3/webhooks/index.js +29 -1
- package/dist/commonjs/v3/webhooks/index.js.map +1 -1
- package/dist/commonjs/version.js +1 -1
- package/dist/esm/v3/apiClient/index.d.ts +103 -1
- package/dist/esm/v3/apiClient/index.js +43 -1
- package/dist/esm/v3/apiClient/index.js.map +1 -1
- package/dist/esm/v3/isomorphic/friendlyId.d.ts +5 -0
- package/dist/esm/v3/isomorphic/friendlyId.js +7 -0
- package/dist/esm/v3/isomorphic/friendlyId.js.map +1 -1
- package/dist/esm/v3/resource-catalog/catalog.d.ts +7 -5
- package/dist/esm/v3/resource-catalog/index.d.ts +7 -5
- package/dist/esm/v3/resource-catalog/index.js +14 -8
- package/dist/esm/v3/resource-catalog/index.js.map +1 -1
- package/dist/esm/v3/resource-catalog/noopResourceCatalog.d.ts +7 -5
- package/dist/esm/v3/resource-catalog/noopResourceCatalog.js +10 -4
- package/dist/esm/v3/resource-catalog/noopResourceCatalog.js.map +1 -1
- package/dist/esm/v3/resource-catalog/standardResourceCatalog.d.ts +11 -8
- package/dist/esm/v3/resource-catalog/standardResourceCatalog.js +29 -20
- package/dist/esm/v3/resource-catalog/standardResourceCatalog.js.map +1 -1
- package/dist/esm/v3/runEngineWorker/index.d.ts +1 -0
- package/dist/esm/v3/runEngineWorker/index.js +1 -0
- package/dist/esm/v3/runEngineWorker/index.js.map +1 -1
- package/dist/esm/v3/runEngineWorker/supervisor/http.d.ts +6 -1
- package/dist/esm/v3/runEngineWorker/supervisor/http.js +13 -1
- package/dist/esm/v3/runEngineWorker/supervisor/http.js.map +1 -1
- package/dist/esm/v3/runEngineWorker/supervisor/queueConsumer.d.ts +4 -2
- package/dist/esm/v3/runEngineWorker/supervisor/queueConsumer.js +11 -4
- package/dist/esm/v3/runEngineWorker/supervisor/queueConsumer.js.map +1 -1
- package/dist/esm/v3/runEngineWorker/supervisor/schemas.d.ts +40 -1
- package/dist/esm/v3/runEngineWorker/supervisor/schemas.js +24 -9
- package/dist/esm/v3/runEngineWorker/supervisor/schemas.js.map +1 -1
- package/dist/esm/v3/runEngineWorker/supervisor/session.d.ts +2 -1
- package/dist/esm/v3/runEngineWorker/supervisor/session.js +1 -1
- package/dist/esm/v3/runEngineWorker/supervisor/session.js.map +1 -1
- package/dist/esm/v3/runEngineWorker/workerQueue.d.ts +121 -0
- package/dist/esm/v3/runEngineWorker/workerQueue.js +112 -0
- package/dist/esm/v3/runEngineWorker/workerQueue.js.map +1 -0
- package/dist/esm/v3/schemas/api.d.ts +26 -9
- package/dist/esm/v3/schemas/build.d.ts +48 -18
- package/dist/esm/v3/schemas/build.js +3 -2
- package/dist/esm/v3/schemas/build.js.map +1 -1
- package/dist/esm/v3/schemas/checkpoints.d.ts +2 -0
- package/dist/esm/v3/schemas/messages.d.ts +24 -9
- package/dist/esm/v3/schemas/resources.d.ts +50 -19
- package/dist/esm/v3/schemas/resources.js +8 -4
- package/dist/esm/v3/schemas/resources.js.map +1 -1
- package/dist/esm/v3/schemas/runEngine.d.ts +4 -0
- package/dist/esm/v3/schemas/runEngine.js +4 -0
- package/dist/esm/v3/schemas/runEngine.js.map +1 -1
- package/dist/esm/v3/schemas/schemas.d.ts +38 -29
- package/dist/esm/v3/schemas/schemas.js +11 -7
- package/dist/esm/v3/schemas/schemas.js.map +1 -1
- package/dist/esm/v3/schemas/webhookApi.d.ts +199 -8
- package/dist/esm/v3/schemas/webhookApi.js +99 -6
- package/dist/esm/v3/schemas/webhookApi.js.map +1 -1
- package/dist/esm/v3/schemas/webhookConfig.d.ts +64 -0
- package/dist/esm/v3/schemas/webhookConfig.js +35 -8
- package/dist/esm/v3/schemas/webhookConfig.js.map +1 -1
- package/dist/esm/v3/types/webhooks.d.ts +23 -2
- package/dist/esm/v3/webhooks/index.d.ts +5 -0
- package/dist/esm/v3/webhooks/index.js +28 -0
- package/dist/esm/v3/webhooks/index.js.map +1 -1
- package/dist/esm/version.js +1 -1
- package/package.json +1 -1
|
@@ -23,9 +23,10 @@ export class StandardResourceCatalog {
|
|
|
23
23
|
_concurrencyLimitMetadata = new Map();
|
|
24
24
|
_skillMetadata = new Map();
|
|
25
25
|
_skillFileMetadata = new Map();
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
26
|
+
_webhookEndpointMetadata = new Map();
|
|
27
|
+
_webhookEndpointFileMetadata = new Map();
|
|
28
|
+
_webhookEndpointIdCollisions = [];
|
|
29
|
+
_webhookSubscribers = [];
|
|
29
30
|
_declaredSessionWebhooks = new Set();
|
|
30
31
|
_claimedSessionWebhooks = new Set();
|
|
31
32
|
_sentinelContextWarned = new Set();
|
|
@@ -298,33 +299,41 @@ export class StandardResourceCatalog {
|
|
|
298
299
|
...fileMetadata,
|
|
299
300
|
};
|
|
300
301
|
}
|
|
301
|
-
|
|
302
|
+
registerWebhookEndpointMetadata(endpoint) {
|
|
302
303
|
if (!this._currentFileContext) {
|
|
303
304
|
return;
|
|
304
305
|
}
|
|
305
|
-
if (!
|
|
306
|
+
if (!endpoint.id) {
|
|
306
307
|
return;
|
|
307
308
|
}
|
|
308
|
-
if (this.
|
|
309
|
+
if (this._webhookEndpointMetadata.has(endpoint.id) &&
|
|
309
310
|
this._currentFileContext.filePath !== NO_FILE_CONTEXT) {
|
|
310
|
-
const existingFilePath = this.
|
|
311
|
+
const existingFilePath = this._webhookEndpointFileMetadata.get(endpoint.id)?.filePath;
|
|
311
312
|
const currentFilePath = this._currentFileContext.filePath;
|
|
312
|
-
const collision = this.
|
|
313
|
+
const collision = this._webhookEndpointIdCollisions.find((c) => c.id === endpoint.id);
|
|
313
314
|
if (collision) {
|
|
314
315
|
collision.filePaths.push(currentFilePath);
|
|
315
316
|
}
|
|
316
317
|
else {
|
|
317
|
-
this.
|
|
318
|
-
id:
|
|
318
|
+
this._webhookEndpointIdCollisions.push({
|
|
319
|
+
id: endpoint.id,
|
|
319
320
|
filePaths: [existingFilePath ?? currentFilePath, currentFilePath],
|
|
320
321
|
});
|
|
321
322
|
}
|
|
322
323
|
}
|
|
323
|
-
this.
|
|
324
|
-
this.
|
|
324
|
+
this._webhookEndpointFileMetadata.set(endpoint.id, { ...this._currentFileContext });
|
|
325
|
+
this._webhookEndpointMetadata.set(endpoint.id, endpoint);
|
|
325
326
|
}
|
|
326
|
-
|
|
327
|
-
return this.
|
|
327
|
+
listWebhookEndpointIdCollisions() {
|
|
328
|
+
return this._webhookEndpointIdCollisions;
|
|
329
|
+
}
|
|
330
|
+
registerWebhookSubscriber(subscriber) {
|
|
331
|
+
if (!subscriber.endpointId || !subscriber.target.id)
|
|
332
|
+
return;
|
|
333
|
+
this._webhookSubscribers.push(subscriber);
|
|
334
|
+
}
|
|
335
|
+
listWebhookSubscribers() {
|
|
336
|
+
return this._webhookSubscribers;
|
|
328
337
|
}
|
|
329
338
|
registerDeclaredSessionWebhook(id) {
|
|
330
339
|
if (!id)
|
|
@@ -339,19 +348,19 @@ export class StandardResourceCatalog {
|
|
|
339
348
|
listUnclaimedSessionWebhooks() {
|
|
340
349
|
return [...this._declaredSessionWebhooks].filter((id) => !this._claimedSessionWebhooks.has(id));
|
|
341
350
|
}
|
|
342
|
-
|
|
351
|
+
listWebhookEndpointManifests() {
|
|
343
352
|
const result = [];
|
|
344
|
-
for (const [id, metadata] of this.
|
|
345
|
-
const fileMetadata = this.
|
|
353
|
+
for (const [id, metadata] of this._webhookEndpointMetadata) {
|
|
354
|
+
const fileMetadata = this._webhookEndpointFileMetadata.get(id);
|
|
346
355
|
if (!fileMetadata)
|
|
347
356
|
continue;
|
|
348
357
|
result.push({ ...metadata, ...fileMetadata });
|
|
349
358
|
}
|
|
350
359
|
return result;
|
|
351
360
|
}
|
|
352
|
-
|
|
353
|
-
const metadata = this.
|
|
354
|
-
const fileMetadata = this.
|
|
361
|
+
getWebhookEndpointManifest(id) {
|
|
362
|
+
const metadata = this._webhookEndpointMetadata.get(id);
|
|
363
|
+
const fileMetadata = this._webhookEndpointFileMetadata.get(id);
|
|
355
364
|
if (!metadata || !fileMetadata)
|
|
356
365
|
return undefined;
|
|
357
366
|
return { ...metadata, ...fileMetadata };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"standardResourceCatalog.js","sourceRoot":"","sources":["../../../../src/v3/resource-catalog/standardResourceCatalog.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"standardResourceCatalog.js","sourceRoot":"","sources":["../../../../src/v3/resource-catalog/standardResourceCatalog.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/v3/runEngineWorker/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,sBAAsB,CAAC;AACrC,cAAc,yBAAyB,CAAC;AACxC,cAAc,yBAAyB,CAAC;AACxC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,oBAAoB,CAAC;AACnC,cAAc,uBAAuB,CAAC;AACtC,cAAc,YAAY,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/v3/runEngineWorker/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,kBAAkB,CAAC;AACjC,cAAc,sBAAsB,CAAC;AACrC,cAAc,yBAAyB,CAAC;AACxC,cAAc,yBAAyB,CAAC;AACxC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,oBAAoB,CAAC;AACnC,cAAc,uBAAuB,CAAC;AACtC,cAAc,YAAY,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { WorkerApiConnectRequestBody, WorkerApiDequeueRequestBody, WorkerApiHeartbeatRequestBody, WorkerApiRunAttemptCompleteRequestBody, WorkerApiRunAttemptStartRequestBody, WorkerApiRunHeartbeatRequestBody, WorkerApiDebugLogBody, WorkerApiSuspendRunRequestBody } from "./schemas.js";
|
|
1
|
+
import type { WorkerApiConnectRequestBody, WorkerApiDequeueRequestBody, WorkerApiHeartbeatRequestBody, WorkerApiRunAttemptCompleteRequestBody, WorkerApiRunAttemptStartRequestBody, WorkerApiRunHeartbeatRequestBody, WorkerApiRunRestoreOutcomeRequestBody, WorkerApiDebugLogBody, WorkerApiSuspendRunRequestBody } from "./schemas.js";
|
|
2
2
|
import type { SupervisorClientCommonOptions } from "./types.js";
|
|
3
3
|
import { type ApiResult } from "../../zodfetch.js";
|
|
4
4
|
type SupervisorHttpClientOptions = SupervisorClientCommonOptions;
|
|
@@ -100,6 +100,8 @@ export declare class SupervisorHttpClient {
|
|
|
100
100
|
rootScheduleId?: string | undefined;
|
|
101
101
|
taskKind?: "AGENT" | "SCHEDULED" | "STANDARD" | (string & {}) | undefined;
|
|
102
102
|
externalDeploymentId?: string | undefined;
|
|
103
|
+
webhookDeliveryId?: string | undefined;
|
|
104
|
+
webhookEndpointId?: string | undefined;
|
|
103
105
|
} | undefined;
|
|
104
106
|
};
|
|
105
107
|
environment: {
|
|
@@ -396,6 +398,9 @@ export declare class SupervisorHttpClient {
|
|
|
396
398
|
taskEventStore?: string | undefined;
|
|
397
399
|
};
|
|
398
400
|
}>>;
|
|
401
|
+
reportRestoreOutcome(runId: string, snapshotId: string, body: WorkerApiRunRestoreOutcomeRequestBody, runnerId?: string, environmentId?: string): Promise<ApiResult<{
|
|
402
|
+
ok: true;
|
|
403
|
+
}>>;
|
|
399
404
|
submitSuspendCompletion({ runId, snapshotId, runnerId, body, }: {
|
|
400
405
|
runId: string;
|
|
401
406
|
snapshotId: string;
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { z } from "zod/v4";
|
|
2
|
-
import { WorkerApiConnectResponseBody, WorkerApiContinueRunExecutionRequestBody, WorkerApiDequeueResponseBody, WorkerApiHeartbeatResponseBody, WorkerApiRunAttemptCompleteResponseBody, WorkerApiRunAttemptStartResponseBody, WorkerApiRunHeartbeatResponseBody, WorkerApiRunLatestSnapshotResponseBody, WorkerApiSuspendRunResponseBody, WorkerApiRunSnapshotsSinceResponseBody, } from "./schemas.js";
|
|
2
|
+
import { WorkerApiConnectResponseBody, WorkerApiContinueRunExecutionRequestBody, WorkerApiDequeueResponseBody, WorkerApiHeartbeatResponseBody, WorkerApiRunAttemptCompleteResponseBody, WorkerApiRunAttemptStartResponseBody, WorkerApiRunHeartbeatResponseBody, WorkerApiRunLatestSnapshotResponseBody, WorkerApiRunRestoreOutcomeResponseBody, WorkerApiSuspendRunResponseBody, WorkerApiRunSnapshotsSinceResponseBody, } from "./schemas.js";
|
|
3
3
|
import { getDefaultWorkerHeaders } from "./util.js";
|
|
4
4
|
import { wrapZodFetch } from "../../zodfetch.js";
|
|
5
5
|
import { createHeaders } from "../util.js";
|
|
@@ -200,6 +200,18 @@ export class SupervisorHttpClient {
|
|
|
200
200
|
},
|
|
201
201
|
});
|
|
202
202
|
}
|
|
203
|
+
async reportRestoreOutcome(runId, snapshotId, body, runnerId, environmentId) {
|
|
204
|
+
return this.request("report_restore_outcome", WorkerApiRunRestoreOutcomeResponseBody, `${this.apiUrl}/engine/v1/worker-actions/runs/${runId}/snapshots/${snapshotId}/restore-outcome`, {
|
|
205
|
+
method: "POST",
|
|
206
|
+
headers: {
|
|
207
|
+
...this.defaultHeaders,
|
|
208
|
+
...this.runnerIdHeader(runnerId),
|
|
209
|
+
...this.environmentIdHeader(environmentId),
|
|
210
|
+
"Content-Type": "application/json",
|
|
211
|
+
},
|
|
212
|
+
body: JSON.stringify(body),
|
|
213
|
+
});
|
|
214
|
+
}
|
|
203
215
|
async submitSuspendCompletion({ runId, snapshotId, runnerId, body, }) {
|
|
204
216
|
return this.request("submit_suspend_completion", WorkerApiSuspendRunResponseBody, `${this.apiUrl}/engine/v1/worker-actions/runs/${runId}/snapshots/${snapshotId}/suspend`, {
|
|
205
217
|
method: "POST",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http.js","sourceRoot":"","sources":["../../../../../src/v3/runEngineWorker/supervisor/http.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"http.js","sourceRoot":"","sources":["../../../../../src/v3/runEngineWorker/supervisor/http.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import type { SupervisorHttpClient } from "./http.js";
|
|
2
|
+
import type { WeightedWorkerQueueSubscription } from "../workerQueue.js";
|
|
2
3
|
import type { WorkerApiDequeueResponseBody, WorkerQueueClass } from "./schemas.js";
|
|
3
4
|
import type { PreDequeueFn, PreSkipFn } from "./types.js";
|
|
4
5
|
import type { ConsumerPoolMetrics } from "./consumerPoolMetrics.js";
|
|
@@ -12,9 +13,9 @@ export type RunQueueConsumerOptions = {
|
|
|
12
13
|
idleIntervalMs: number;
|
|
13
14
|
preDequeue?: PreDequeueFn;
|
|
14
15
|
preSkip?: PreSkipFn;
|
|
15
|
-
maxRunCount?: number;
|
|
16
16
|
/** Which worker-queue class this consumer pulls from. Defaults to the worker's region queue. */
|
|
17
17
|
queueClass?: WorkerQueueClass;
|
|
18
|
+
subscriptions?: WeightedWorkerQueueSubscription[];
|
|
18
19
|
onDequeue: (messages: WorkerApiDequeueResponseBody, timing?: {
|
|
19
20
|
dequeueResponseMs: number;
|
|
20
21
|
pollingIntervalMs: number;
|
|
@@ -26,8 +27,8 @@ export declare class RunQueueConsumer implements QueueConsumer {
|
|
|
26
27
|
private readonly client;
|
|
27
28
|
private readonly preDequeue?;
|
|
28
29
|
private readonly preSkip?;
|
|
29
|
-
private readonly maxRunCount?;
|
|
30
30
|
private readonly queueClass?;
|
|
31
|
+
private readonly subscriptions?;
|
|
31
32
|
private readonly onDequeue;
|
|
32
33
|
private readonly metrics?;
|
|
33
34
|
private readonly logger;
|
|
@@ -35,6 +36,7 @@ export declare class RunQueueConsumer implements QueueConsumer {
|
|
|
35
36
|
private idleIntervalMs;
|
|
36
37
|
private isEnabled;
|
|
37
38
|
private lastScheduledIntervalMs;
|
|
39
|
+
private rejectionBackoffMs;
|
|
38
40
|
constructor(opts: RunQueueConsumerOptions);
|
|
39
41
|
start(): void;
|
|
40
42
|
stop(): void;
|
|
@@ -1,10 +1,12 @@
|
|
|
1
1
|
import { SimpleStructuredLogger } from "../../utils/structuredLogger.js";
|
|
2
|
+
const DEQUEUE_REJECTION_BACKOFF_MIN_MS = 1_000;
|
|
3
|
+
const DEQUEUE_REJECTION_BACKOFF_MAX_MS = 30_000;
|
|
2
4
|
export class RunQueueConsumer {
|
|
3
5
|
client;
|
|
4
6
|
preDequeue;
|
|
5
7
|
preSkip;
|
|
6
|
-
maxRunCount;
|
|
7
8
|
queueClass;
|
|
9
|
+
subscriptions;
|
|
8
10
|
onDequeue;
|
|
9
11
|
metrics;
|
|
10
12
|
logger = new SimpleStructuredLogger("queue-consumer");
|
|
@@ -12,14 +14,15 @@ export class RunQueueConsumer {
|
|
|
12
14
|
idleIntervalMs;
|
|
13
15
|
isEnabled;
|
|
14
16
|
lastScheduledIntervalMs;
|
|
17
|
+
rejectionBackoffMs = 0;
|
|
15
18
|
constructor(opts) {
|
|
16
19
|
this.isEnabled = false;
|
|
17
20
|
this.intervalMs = opts.intervalMs;
|
|
18
21
|
this.idleIntervalMs = opts.idleIntervalMs;
|
|
19
22
|
this.preDequeue = opts.preDequeue;
|
|
20
23
|
this.preSkip = opts.preSkip;
|
|
21
|
-
this.maxRunCount = opts.maxRunCount;
|
|
22
24
|
this.queueClass = opts.queueClass;
|
|
25
|
+
this.subscriptions = opts.subscriptions;
|
|
23
26
|
this.lastScheduledIntervalMs = opts.idleIntervalMs;
|
|
24
27
|
this.onDequeue = opts.onDequeue;
|
|
25
28
|
this.client = opts.client;
|
|
@@ -43,7 +46,6 @@ export class RunQueueConsumer {
|
|
|
43
46
|
enabled: this.isEnabled,
|
|
44
47
|
intervalMs: this.intervalMs,
|
|
45
48
|
idleIntervalMs: this.idleIntervalMs,
|
|
46
|
-
maxRunCount: this.maxRunCount,
|
|
47
49
|
preDequeue: !!this.preDequeue,
|
|
48
50
|
preSkip: !!this.preSkip,
|
|
49
51
|
});
|
|
@@ -83,16 +85,21 @@ export class RunQueueConsumer {
|
|
|
83
85
|
try {
|
|
84
86
|
const response = await this.client.dequeue({
|
|
85
87
|
maxResources: preDequeueResult?.maxResources,
|
|
86
|
-
maxRunCount: this.maxRunCount,
|
|
87
88
|
queueClass: this.queueClass,
|
|
89
|
+
subscriptions: this.subscriptions,
|
|
88
90
|
});
|
|
89
91
|
const dequeueDurationSeconds = (performance.now() - dequeueStart) / 1000;
|
|
90
92
|
const dequeueResponseMs = Math.round(dequeueDurationSeconds * 1000);
|
|
91
93
|
if (!response.success) {
|
|
92
94
|
this.metrics?.observeDequeueLatency(dequeueDurationSeconds, "error");
|
|
93
95
|
this.logger.error("Failed to dequeue", { error: response.error });
|
|
96
|
+
if (response.statusCode === 403 || response.statusCode === 422) {
|
|
97
|
+
this.rejectionBackoffMs = Math.min(Math.max(DEQUEUE_REJECTION_BACKOFF_MIN_MS, this.rejectionBackoffMs * 2), DEQUEUE_REJECTION_BACKOFF_MAX_MS);
|
|
98
|
+
nextIntervalMs = Math.max(this.idleIntervalMs, this.rejectionBackoffMs);
|
|
99
|
+
}
|
|
94
100
|
}
|
|
95
101
|
else {
|
|
102
|
+
this.rejectionBackoffMs = 0;
|
|
96
103
|
this.metrics?.observeDequeueLatency(dequeueDurationSeconds, response.data.length > 0 ? "success" : "empty");
|
|
97
104
|
try {
|
|
98
105
|
await this.onDequeue(response.data, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"queueConsumer.js","sourceRoot":"","sources":["../../../../../src/v3/runEngineWorker/supervisor/queueConsumer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;
|
|
1
|
+
{"version":3,"file":"queueConsumer.js","sourceRoot":"","sources":["../../../../../src/v3/runEngineWorker/supervisor/queueConsumer.ts"],"names":[],"mappings":"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"}
|
|
@@ -99,6 +99,24 @@ export declare const WorkerApiContinueRunExecutionQueryParams: z.ZodObject<{
|
|
|
99
99
|
}, z.core.$strip>>;
|
|
100
100
|
}, z.core.$strip>;
|
|
101
101
|
export type WorkerApiContinueRunExecutionQueryParams = z.infer<typeof WorkerApiContinueRunExecutionQueryParams>;
|
|
102
|
+
export declare const WorkerApiRunRestoreOutcomeRequestBody: z.ZodObject<{
|
|
103
|
+
outcome: z.ZodEnum<{
|
|
104
|
+
fail: "fail";
|
|
105
|
+
requeue: "requeue";
|
|
106
|
+
}>;
|
|
107
|
+
reason: z.ZodString;
|
|
108
|
+
message: z.ZodOptional<z.ZodString>;
|
|
109
|
+
snapshotRoute: z.ZodOptional<z.ZodPipe<z.ZodUnknown, z.ZodTransform<{
|
|
110
|
+
version: 1;
|
|
111
|
+
residency: "mirrored" | "postgres" | "redis-primary";
|
|
112
|
+
organizationId: string;
|
|
113
|
+
} | undefined, unknown>>>;
|
|
114
|
+
}, z.core.$strip>;
|
|
115
|
+
export type WorkerApiRunRestoreOutcomeRequestBody = z.infer<typeof WorkerApiRunRestoreOutcomeRequestBody>;
|
|
116
|
+
export declare const WorkerApiRunRestoreOutcomeResponseBody: z.ZodObject<{
|
|
117
|
+
ok: z.ZodLiteral<true>;
|
|
118
|
+
}, z.core.$strip>;
|
|
119
|
+
export type WorkerApiRunRestoreOutcomeResponseBody = z.infer<typeof WorkerApiRunRestoreOutcomeResponseBody>;
|
|
102
120
|
export declare const WorkerApiConnectRequestBody: z.ZodObject<{
|
|
103
121
|
metadata: z.ZodRecord<z.ZodString, z.ZodAny>;
|
|
104
122
|
}, z.core.$strip>;
|
|
@@ -121,11 +139,30 @@ export declare const WorkerApiDequeueRequestBody: z.ZodObject<{
|
|
|
121
139
|
cpu: z.ZodNumber;
|
|
122
140
|
memory: z.ZodNumber;
|
|
123
141
|
}, z.core.$strip>>;
|
|
124
|
-
maxRunCount: z.ZodOptional<z.ZodNumber>;
|
|
125
142
|
queueClass: z.ZodOptional<z.ZodEnum<{
|
|
126
143
|
default: "default";
|
|
127
144
|
scheduled: "scheduled";
|
|
128
145
|
}>>;
|
|
146
|
+
subscriptions: z.ZodOptional<z.ZodArray<z.ZodObject<{
|
|
147
|
+
class: z.ZodEnum<{
|
|
148
|
+
ondemand: "ondemand";
|
|
149
|
+
scheduled: "scheduled";
|
|
150
|
+
}>;
|
|
151
|
+
phase: z.ZodEnum<{
|
|
152
|
+
fresh: "fresh";
|
|
153
|
+
restore: "restore";
|
|
154
|
+
}>;
|
|
155
|
+
compat: z.ZodEnum<{
|
|
156
|
+
any: "any";
|
|
157
|
+
compute: "compute";
|
|
158
|
+
container: "container";
|
|
159
|
+
}>;
|
|
160
|
+
channel: z.ZodEnum<{
|
|
161
|
+
canary: "canary";
|
|
162
|
+
stable: "stable";
|
|
163
|
+
}>;
|
|
164
|
+
weight: z.ZodOptional<z.ZodNumber>;
|
|
165
|
+
}, z.core.$strict>>>;
|
|
129
166
|
}, z.core.$strip>;
|
|
130
167
|
export type WorkerApiDequeueRequestBody = z.infer<typeof WorkerApiDequeueRequestBody>;
|
|
131
168
|
export declare const WorkerApiDequeueResponseBody: z.ZodArray<z.ZodObject<{
|
|
@@ -262,6 +299,8 @@ export declare const WorkerApiDequeueResponseBody: z.ZodArray<z.ZodObject<{
|
|
|
262
299
|
STANDARD: "STANDARD";
|
|
263
300
|
}>, z.ZodCustom<string & {}, string & {}>]>>;
|
|
264
301
|
externalDeploymentId: z.ZodOptional<z.ZodString>;
|
|
302
|
+
webhookDeliveryId: z.ZodOptional<z.ZodString>;
|
|
303
|
+
webhookEndpointId: z.ZodOptional<z.ZodString>;
|
|
265
304
|
}, z.core.$strip>>;
|
|
266
305
|
}, z.core.$strip>;
|
|
267
306
|
environment: z.ZodObject<{
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { z } from "zod/v4";
|
|
2
|
+
import { WeightedWorkerQueueSubscriptions } from "../workerQueue.js";
|
|
2
3
|
import { discriminatedUnion } from "../../utils/zod.js";
|
|
3
4
|
import { TaskRunExecutionResult } from "../../schemas/common.js";
|
|
4
5
|
import { MachineResources, DequeuedMessage, StartRunAttemptResult, CompleteRunAttemptResult, RunExecutionData, CheckpointInput, ExecutionResult, } from "../../schemas/runEngine.js";
|
|
@@ -41,6 +42,20 @@ export const WorkerApiContinueRunExecutionRequestBody = ExecutionResult;
|
|
|
41
42
|
export const WorkerApiContinueRunExecutionQueryParams = z.object({
|
|
42
43
|
snapshotRoute: SnapshotRouteWire.optional(),
|
|
43
44
|
});
|
|
45
|
+
export const WorkerApiRunRestoreOutcomeRequestBody = z.object({
|
|
46
|
+
outcome: z.enum(["requeue", "fail"]),
|
|
47
|
+
reason: z.string().max(256),
|
|
48
|
+
// Matches the cap the engine applies to a run error's message.
|
|
49
|
+
message: z
|
|
50
|
+
.string()
|
|
51
|
+
.max(16 * 1024)
|
|
52
|
+
.optional(),
|
|
53
|
+
// See WorkerApiRunAttemptStartRequestBody.snapshotRoute; carries the route to the requeue or fail transition.
|
|
54
|
+
snapshotRoute: SnapshotRouteWireLenient.optional(),
|
|
55
|
+
});
|
|
56
|
+
export const WorkerApiRunRestoreOutcomeResponseBody = z.object({
|
|
57
|
+
ok: z.literal(true),
|
|
58
|
+
});
|
|
44
59
|
export const WorkerApiConnectRequestBody = z.object({
|
|
45
60
|
metadata: z.record(z.string(), z.any()),
|
|
46
61
|
});
|
|
@@ -52,17 +67,17 @@ export const WorkerApiConnectResponseBody = z.object({
|
|
|
52
67
|
}),
|
|
53
68
|
});
|
|
54
69
|
export const WorkerQueueClass = z.enum(["default", "scheduled"]);
|
|
55
|
-
export const WorkerApiDequeueRequestBody = z
|
|
70
|
+
export const WorkerApiDequeueRequestBody = z
|
|
71
|
+
.object({
|
|
56
72
|
maxResources: MachineResources.optional(),
|
|
57
|
-
|
|
58
|
-
/**
|
|
59
|
-
* Which class of worker queue this consumer pulls from. Absent or "default" =
|
|
60
|
-
* the worker group's region queue. "scheduled" targets the dedicated
|
|
61
|
-
* scheduled-lineage queue so a separate fleet can drain it independently. The
|
|
62
|
-
* server derives the actual queue name from the token, so this only ever
|
|
63
|
-
* selects between the authenticated worker's own queues.
|
|
64
|
-
*/
|
|
73
|
+
/** Legacy selection. Absent or "default" targets the worker group's base queue. */
|
|
65
74
|
queueClass: WorkerQueueClass.optional(),
|
|
75
|
+
/** V2 selection. The server derives region from the authenticated worker. */
|
|
76
|
+
subscriptions: WeightedWorkerQueueSubscriptions.optional(),
|
|
77
|
+
})
|
|
78
|
+
.refine((body) => body.queueClass === undefined || body.subscriptions === undefined, {
|
|
79
|
+
message: "queueClass and subscriptions are mutually exclusive",
|
|
80
|
+
path: ["subscriptions"],
|
|
66
81
|
});
|
|
67
82
|
export const WorkerApiDequeueResponseBody = DequeuedMessage.array();
|
|
68
83
|
export const WorkerApiRunHeartbeatRequestBody = z.object({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schemas.js","sourceRoot":"","sources":["../../../../../src/v3/runEngineWorker/supervisor/schemas.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,QAAQ,CAAC;AAC3B,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AACjE,OAAO,EACL,gBAAgB,EAChB,eAAe,EACf,qBAAqB,EACrB,wBAAwB,EACxB,gBAAgB,EAChB,eAAe,EACf,eAAe,GAChB,MAAM,4BAA4B,CAAC;AACpC,2FAA2F;AAC3F,uGAAuG;AACvG,OAAO,EAAE,iBAAiB,EAAE,wBAAwB,EAAE,MAAM,gCAAgC,CAAC;AAE7F,MAAM,CAAC,MAAM,6BAA6B,GAAG,CAAC,CAAC,MAAM,CAAC;IACpD,GAAG,EAAE,CAAC,CAAC,MAAM,CAAC;QACZ,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;QAChB,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE;KACtB,CAAC;IACF,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC;QACf,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;QAChB,SAAS,EAAE,CAAC,CAAC,MAAM,EAAE;KACtB,CAAC;IACF,KAAK,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;CAC3B,CAAC,CAAC;AAGH,MAAM,CAAC,MAAM,8BAA8B,GAAG,CAAC,CAAC,MAAM,CAAC;IACrD,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC;CACpB,CAAC,CAAC;AAGH,MAAM,CAAC,MAAM,8BAA8B,GAAG,kBAAkB,CAAC,SAAS,EAAE;IAC1E,CAAC,CAAC,MAAM,CAAC;QACP,OAAO,EAAE,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC;QACxB,UAAU,EAAE,eAAe;QAC3B,uGAAuG;QACvG,aAAa,EAAE,wBAAwB,CAAC,QAAQ,EAAE;KACnD,CAAC;IACF,CAAC,CAAC,MAAM,CAAC;QACP,OAAO,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC;QACzB,KAAK,EAAE,CAAC,CAAC,MAAM,EAAE;KAClB,CAAC;CACH,CAAC,CAAC;AAGH,MAAM,CAAC,MAAM,+BAA+B,GAAG,CAAC,CAAC,MAAM,CAAC;IACtD,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC;CACpB,CAAC,CAAC;AAGH,MAAM,CAAC,MAAM,wCAAwC,GAAG,eAAe,CAAC;AAKxE,iGAAiG;AACjG,mGAAmG;AACnG,oGAAoG;AACpG,MAAM,CAAC,MAAM,wCAAwC,GAAG,CAAC,CAAC,MAAM,CAAC;IAC/D,aAAa,EAAE,iBAAiB,CAAC,QAAQ,EAAE;CAC5C,CAAC,CAAC;AAKH,MAAM,CAAC,MAAM,2BAA2B,GAAG,CAAC,CAAC,MAAM,CAAC;IAClD,QAAQ,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC;CACxC,CAAC,CAAC;AAGH,MAAM,CAAC,MAAM,4BAA4B,GAAG,CAAC,CAAC,MAAM,CAAC;IACnD,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC;IACnB,WAAW,EAAE,CAAC,CAAC,MAAM,CAAC;QACpB,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;QAChB,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE;KACjB,CAAC;CACH,CAAC,CAAC;AAGH,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC,CAAC;AAGjE,MAAM,CAAC,MAAM,2BAA2B,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"schemas.js","sourceRoot":"","sources":["../../../../../src/v3/runEngineWorker/supervisor/schemas.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { SupervisorHttpClient } from "./http.js";
|
|
2
|
+
import type { WeightedWorkerQueueSubscription } from "../workerQueue.js";
|
|
2
3
|
import type { PreDequeueFn, PreSkipFn, SupervisorClientCommonOptions } from "./types.js";
|
|
3
4
|
import type { WorkerQueueClass } from "./schemas.js";
|
|
4
5
|
import type { ScalingOptions } from "./consumerPool.js";
|
|
@@ -13,9 +14,9 @@ type SupervisorSessionOptions = SupervisorClientCommonOptions & {
|
|
|
13
14
|
dequeueIdleIntervalMs: number;
|
|
14
15
|
preDequeue?: PreDequeueFn;
|
|
15
16
|
preSkip?: PreSkipFn;
|
|
16
|
-
maxRunCount?: number;
|
|
17
17
|
/** Which worker-queue class this supervisor's consumers pull from. Defaults to the region queue. */
|
|
18
18
|
queueClass?: WorkerQueueClass;
|
|
19
|
+
subscriptions?: WeightedWorkerQueueSubscription[];
|
|
19
20
|
sendRunDebugLogs?: boolean;
|
|
20
21
|
scaling: ScalingOptions;
|
|
21
22
|
metricsRegistry?: Registry;
|
|
@@ -29,8 +29,8 @@ export class SupervisorSession extends EventEmitter {
|
|
|
29
29
|
onDequeue: this.onDequeue.bind(this),
|
|
30
30
|
intervalMs: opts.dequeueIntervalMs,
|
|
31
31
|
idleIntervalMs: opts.dequeueIdleIntervalMs,
|
|
32
|
-
maxRunCount: opts.maxRunCount,
|
|
33
32
|
queueClass: opts.queueClass,
|
|
33
|
+
subscriptions: opts.subscriptions,
|
|
34
34
|
},
|
|
35
35
|
scaling: opts.scaling,
|
|
36
36
|
metricsRegistry: opts.metricsRegistry,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../../../../src/v3/runEngineWorker/supervisor/session.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../../../../src/v3/runEngineWorker/supervisor/session.ts"],"names":[],"mappings":"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"}
|