@trigger.dev/core 4.7.1 → 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/build/runtime.d.ts +2 -1
- package/dist/commonjs/v3/build/runtime.js +8 -2
- package/dist/commonjs/v3/build/runtime.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/build/runtime.d.ts +2 -1
- package/dist/esm/v3/build/runtime.js +7 -1
- package/dist/esm/v3/build/runtime.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
|
@@ -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":"AAAA,OAAO,EAAE,oBAAoB,EAAE,MAAM,WAAW,CAAC;AASjD,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAEzD,OAAO,YAAY,MAAM,QAAQ,CAAC;AAClC,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAE9C,OAAO,EAAE,EAAE,EAAE,MAAM,kBAAkB,CAAC;AAEtC,OAAO,EAAE,uBAAuB,EAAE,MAAM,WAAW,CAAC;AACpD,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AAmBzE,MAAM,OAAO,iBAAkB,SAAQ,YAA0B;IAa3C,IAAI;IAZR,UAAU,CAAuB;IAEhC,MAAM,GAAG,IAAI,sBAAsB,CAAC,oBAAoB,CAAC,CAAC;IAE1D,uBAAuB,CAAU;IAC1C,sBAAsB,CAAkE;IAE/E,oBAAoB,CAAU;IAC9B,YAAY,CAAuB;IAEnC,SAAS,CAAkB;IAE5C,YAAoB,IAA8B;QAChD,KAAK,EAAE,CAAC;oBADU,IAAI;QAGtB,IAAI,CAAC,uBAAuB,GAAG,IAAI,CAAC,uBAAuB,IAAI,IAAI,CAAC;QACpE,IAAI,CAAC,oBAAoB,GAAG,IAAI,CAAC,oBAAoB,IAAI,IAAI,CAAC;QAE9D,IAAI,CAAC,UAAU,GAAG,IAAI,oBAAoB,CAAC,IAAI,CAAC,CAAC;QAEjD,IAAI,CAAC,YAAY,GAAG,IAAI,oBAAoB,CAAC;YAC3C,QAAQ,EAAE;gBACR,MAAM,EAAE,IAAI,CAAC,UAAU;gBACvB,UAAU,EAAE,IAAI,CAAC,UAAU;gBAC3B,OAAO,EAAE,IAAI,CAAC,OAAO;gBACrB,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC;gBACpC,UAAU,EAAE,IAAI,CAAC,iBAAiB;gBAClC,cAAc,EAAE,IAAI,CAAC,qBAAqB;gBAC1C,UAAU,EAAE,IAAI,CAAC,UAAU;gBAC3B,aAAa,EAAE,IAAI,CAAC,aAAa;aAClC;YACD,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,eAAe,EAAE,IAAI,CAAC,eAAe;SACtC,CAAC,CAAC;QAEH,IAAI,CAAC,SAAS,GAAG,IAAI,eAAe,CAAC;YACnC,UAAU,EAAE,KAAK,IAAI,EAAE;gBACrB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC;gBAEvC,MAAM,IAAI,GAAG,IAAI,CAAC,gBAAgB,EAAE,CAAC;gBACrC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;gBAE7D,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC;oBACtB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,kBAAkB,EAAE,EAAE,KAAK,EAAE,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC;gBACnE,CAAC;YACH,CAAC;YACD,UAAU,EAAE,IAAI,CAAC,wBAAwB,GAAG,IAAI;YAChD,WAAW,EAAE,KAAK;YAClB,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE;gBACvB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,0BAA0B,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;YAC3D,CAAC;SACF,CAAC,CAAC;IACL,CAAC;IAEO,KAAK,CAAC,SAAS,CACrB,QAAsC,EACtC,MAAiE;QAEjE,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,iCAAiC,EAAE,EAAE,KAAK,EAAE,QAAQ,CAAC,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;QAE7F,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;YAC/B,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE;gBAC3B,IAAI,EAAE,IAAI,IAAI,EAAE;gBAChB,OAAO;gBACP,iBAAiB,EAAE,MAAM,EAAE,iBAAiB;gBAC5C,iBAAiB,EAAE,MAAM,EAAE,iBAAiB;aAC7C,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,2BAA2B,CAAC,cAAwB;QAClD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,kCAAkC,EAAE,EAAE,cAAc,EAAE,CAAC,CAAC;QAE1E,IAAI,CAAC,IAAI,CAAC,sBAAsB,EAAE,CAAC;YACjC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAC;YAC1C,OAAO;QACT,CAAC;QAED,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,eAAe,EAAE,EAAE,OAAO,EAAE,GAAG,EAAE,cAAc,EAAE,CAAC,CAAC;QAEpF,OAAO,CAAC,UAAU,CAChB,cAAc,CAAC,GAAG,CAAC,CAAC,aAAa,EAAE,EAAE,CACnC,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,aAAa,EAAE;YAC1C,IAAI,EAAE,IAAI,IAAI,EAAE;YAChB,OAAO,EAAE,sCAAsC;SAChD,CAAC,CACH,CACF,CAAC;IACJ,CAAC;IAED,+BAA+B,CAAC,cAAwB;QACtD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,sCAAsC,EAAE,EAAE,cAAc,EAAE,CAAC,CAAC;QAE9E,IAAI,CAAC,IAAI,CAAC,sBAAsB,EAAE,CAAC;YACjC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAC;YAC1C,OAAO;QACT,CAAC;QAED,IAAI,CAAC,sBAAsB,CAAC,IAAI,CAAC,iBAAiB,EAAE,EAAE,OAAO,EAAE,GAAG,EAAE,cAAc,EAAE,CAAC,CAAC;QAEtF,OAAO,CAAC,UAAU,CAChB,cAAc,CAAC,GAAG,CAAC,CAAC,aAAa,EAAE,EAAE,CACnC,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,aAAa,EAAE;YAC1C,IAAI,EAAE,IAAI,IAAI,EAAE;YAChB,OAAO,EAAE,wCAAwC;YACjD,UAAU,EAAE;gBACV,cAAc;aACf;SACF,CAAC,CACH,CACF,CAAC;IACJ,CAAC;IAEO,4BAA4B;QAClC,MAAM,KAAK,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QACxC,KAAK,CAAC,QAAQ,GAAG,SAAS,CAAC;QAE3B,MAAM,MAAM,GAAG,EAAE,CAAC,KAAK,CAAC,IAAI,EAAE;YAC5B,UAAU,EAAE,CAAC,WAAW,CAAC;YACzB,YAAY,EAAE,uBAAuB,CAAC,IAAI,CAAC,IAAI,CAAC;SACjD,CAAC,CAAC;QACH,MAAM,CAAC,EAAE,CAAC,YAAY,EAAE,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,EAAE,EAAE;YAC3C,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,gCAAgC,EAAE,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,CAAC;YACtE,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,EAAE,IAAI,EAAE,IAAI,IAAI,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC;YAExD,IAAI,CAAC,UAAU,CAAC,YAAY,CAAC,GAAG,CAAC,UAAU,EAAE;gBAC3C,IAAI,EAAE,IAAI,IAAI,EAAE;gBAChB,OAAO,EAAE,mCAAmC;aAC7C,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,EAAE,CAAC,SAAS,EAAE,GAAG,EAAE;YACxB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,4BAA4B,CAAC,CAAC;QAChD,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,EAAE,CAAC,eAAe,EAAE,CAAC,KAAK,EAAE,EAAE;YACnC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,uBAAuB,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;QACxD,CAAC,CAAC,CAAC;QACH,MAAM,CAAC,EAAE,CAAC,YAAY,EAAE,CAAC,MAAM,EAAE,WAAW,EAAE,EAAE;YAC9C,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,iCAAiC,EAAE,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC,CAAC;QAC9E,CAAC,CAAC,CAAC;QAEH,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,KAAK;QACT,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC;YAC5C,QAAQ,EAAE;gBACR,aAAa,EAAE,OAAO;aACvB;SACF,CAAC,CAAC;QAEH,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;YACrB,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,mBAAmB,EAAE,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC;YACjE,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAC;QAC3D,CAAC;QAED,MAAM,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;QAErC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,uBAAuB,EAAE;YACvC,IAAI,EAAE,WAAW,CAAC,IAAI;YACtB,IAAI,EAAE,WAAW,CAAC,IAAI;SACvB,CAAC,CAAC;QAEH,IAAI,IAAI,CAAC,oBAAoB,EAAE,CAAC;YAC9B,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,wBAAwB,EAAE;gBACxC,eAAe,EAAE,IAAI,CAAC,YAAY,CAAC,iBAAiB,CAAC;gBACrD,YAAY,EAAE,IAAI,CAAC,YAAY,CAAC,kBAAkB,CAAC;gBACnD,YAAY,EAAE,IAAI,CAAC,YAAY,CAAC,kBAAkB,CAAC;aACpD,CAAC,CAAC;YAEH,MAAM,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC;YAChC,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC;QACzB,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;QAC9C,CAAC;QAED,IAAI,IAAI,CAAC,uBAAuB,EAAE,CAAC;YACjC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,2BAA2B,CAAC,CAAC;YAC7C,IAAI,CAAC,sBAAsB,GAAG,IAAI,CAAC,4BAA4B,EAAE,CAAC;QACpE,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,4BAA4B,CAAC,CAAC;QACjD,CAAC;IACH,CAAC;IAED,KAAK,CAAC,IAAI;QACR,MAAM,IAAI,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC;QAC/B,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;QACtB,IAAI,CAAC,sBAAsB,EAAE,UAAU,EAAE,CAAC;IAC5C,CAAC;IAEO,gBAAgB;QACtB,OAAO;YACL,GAAG,EAAE;gBACH,IAAI,EAAE,GAAG;gBACT,SAAS,EAAE,GAAG;aACf;YACD,MAAM,EAAE;gBACN,IAAI,EAAE,GAAG;gBACT,SAAS,EAAE,GAAG;aACf;YACD,KAAK,EAAE,EAAE;SACV,CAAC;IACJ,CAAC;CACF"}
|
|
@@ -0,0 +1,121 @@
|
|
|
1
|
+
import { z } from "zod/v4";
|
|
2
|
+
export declare const WORKER_QUEUE_VERSION = "v2";
|
|
3
|
+
export declare const SCHEDULED_WORKER_QUEUE_SUFFIX = ":scheduled";
|
|
4
|
+
/** The dispatch class of a v2 worker queue. Kept separate from the legacy dequeue class. */
|
|
5
|
+
export declare const WorkerQueueDispatchClass: z.ZodEnum<{
|
|
6
|
+
ondemand: "ondemand";
|
|
7
|
+
scheduled: "scheduled";
|
|
8
|
+
}>;
|
|
9
|
+
export type WorkerQueueDispatchClass = z.infer<typeof WorkerQueueDispatchClass>;
|
|
10
|
+
export declare const WorkerQueuePhase: z.ZodEnum<{
|
|
11
|
+
fresh: "fresh";
|
|
12
|
+
restore: "restore";
|
|
13
|
+
}>;
|
|
14
|
+
export type WorkerQueuePhase = z.infer<typeof WorkerQueuePhase>;
|
|
15
|
+
export declare const WorkerQueueCompatibility: z.ZodEnum<{
|
|
16
|
+
any: "any";
|
|
17
|
+
compute: "compute";
|
|
18
|
+
container: "container";
|
|
19
|
+
}>;
|
|
20
|
+
export type WorkerQueueCompatibility = z.infer<typeof WorkerQueueCompatibility>;
|
|
21
|
+
export declare const WorkerQueueChannel: z.ZodEnum<{
|
|
22
|
+
canary: "canary";
|
|
23
|
+
stable: "stable";
|
|
24
|
+
}>;
|
|
25
|
+
export type WorkerQueueChannel = z.infer<typeof WorkerQueueChannel>;
|
|
26
|
+
export declare const WorkerQueueSubscription: z.ZodObject<{
|
|
27
|
+
class: z.ZodEnum<{
|
|
28
|
+
ondemand: "ondemand";
|
|
29
|
+
scheduled: "scheduled";
|
|
30
|
+
}>;
|
|
31
|
+
phase: z.ZodEnum<{
|
|
32
|
+
fresh: "fresh";
|
|
33
|
+
restore: "restore";
|
|
34
|
+
}>;
|
|
35
|
+
compat: z.ZodEnum<{
|
|
36
|
+
any: "any";
|
|
37
|
+
compute: "compute";
|
|
38
|
+
container: "container";
|
|
39
|
+
}>;
|
|
40
|
+
channel: z.ZodEnum<{
|
|
41
|
+
canary: "canary";
|
|
42
|
+
stable: "stable";
|
|
43
|
+
}>;
|
|
44
|
+
}, z.core.$strict>;
|
|
45
|
+
export type WorkerQueueSubscription = z.infer<typeof WorkerQueueSubscription>;
|
|
46
|
+
export declare const MAX_WORKER_QUEUE_SUBSCRIPTIONS: number;
|
|
47
|
+
export declare const WorkerQueueSubscriptions: z.ZodArray<z.ZodObject<{
|
|
48
|
+
class: z.ZodEnum<{
|
|
49
|
+
ondemand: "ondemand";
|
|
50
|
+
scheduled: "scheduled";
|
|
51
|
+
}>;
|
|
52
|
+
phase: z.ZodEnum<{
|
|
53
|
+
fresh: "fresh";
|
|
54
|
+
restore: "restore";
|
|
55
|
+
}>;
|
|
56
|
+
compat: z.ZodEnum<{
|
|
57
|
+
any: "any";
|
|
58
|
+
compute: "compute";
|
|
59
|
+
container: "container";
|
|
60
|
+
}>;
|
|
61
|
+
channel: z.ZodEnum<{
|
|
62
|
+
canary: "canary";
|
|
63
|
+
stable: "stable";
|
|
64
|
+
}>;
|
|
65
|
+
}, z.core.$strict>>;
|
|
66
|
+
export declare const WeightedWorkerQueueSubscription: z.ZodObject<{
|
|
67
|
+
class: z.ZodEnum<{
|
|
68
|
+
ondemand: "ondemand";
|
|
69
|
+
scheduled: "scheduled";
|
|
70
|
+
}>;
|
|
71
|
+
phase: z.ZodEnum<{
|
|
72
|
+
fresh: "fresh";
|
|
73
|
+
restore: "restore";
|
|
74
|
+
}>;
|
|
75
|
+
compat: z.ZodEnum<{
|
|
76
|
+
any: "any";
|
|
77
|
+
compute: "compute";
|
|
78
|
+
container: "container";
|
|
79
|
+
}>;
|
|
80
|
+
channel: z.ZodEnum<{
|
|
81
|
+
canary: "canary";
|
|
82
|
+
stable: "stable";
|
|
83
|
+
}>;
|
|
84
|
+
weight: z.ZodOptional<z.ZodNumber>;
|
|
85
|
+
}, z.core.$strict>;
|
|
86
|
+
export type WeightedWorkerQueueSubscription = z.infer<typeof WeightedWorkerQueueSubscription>;
|
|
87
|
+
export declare const WeightedWorkerQueueSubscriptions: z.ZodArray<z.ZodObject<{
|
|
88
|
+
class: z.ZodEnum<{
|
|
89
|
+
ondemand: "ondemand";
|
|
90
|
+
scheduled: "scheduled";
|
|
91
|
+
}>;
|
|
92
|
+
phase: z.ZodEnum<{
|
|
93
|
+
fresh: "fresh";
|
|
94
|
+
restore: "restore";
|
|
95
|
+
}>;
|
|
96
|
+
compat: z.ZodEnum<{
|
|
97
|
+
any: "any";
|
|
98
|
+
compute: "compute";
|
|
99
|
+
container: "container";
|
|
100
|
+
}>;
|
|
101
|
+
channel: z.ZodEnum<{
|
|
102
|
+
canary: "canary";
|
|
103
|
+
stable: "stable";
|
|
104
|
+
}>;
|
|
105
|
+
weight: z.ZodOptional<z.ZodNumber>;
|
|
106
|
+
}, z.core.$strict>>;
|
|
107
|
+
export type WeightedWorkerQueueSubscriptions = z.infer<typeof WeightedWorkerQueueSubscriptions>;
|
|
108
|
+
export type WorkerQueue = {
|
|
109
|
+
region: string;
|
|
110
|
+
version: "legacy";
|
|
111
|
+
class: WorkerQueueDispatchClass;
|
|
112
|
+
} | ({
|
|
113
|
+
region: string;
|
|
114
|
+
version: typeof WORKER_QUEUE_VERSION;
|
|
115
|
+
} & WorkerQueueSubscription);
|
|
116
|
+
export declare function isV2WorkerQueue(name: string): boolean;
|
|
117
|
+
export declare function parseWorkerQueue(name: string): WorkerQueue;
|
|
118
|
+
export declare function formatWorkerQueue(queue: WorkerQueue): string;
|
|
119
|
+
export declare function legacyScheduledWorkerQueue(name: string): string;
|
|
120
|
+
export declare function restoreWorkerQueue(name: string, compat: Exclude<WorkerQueueCompatibility, "any">): string;
|
|
121
|
+
export declare function scheduledWorkerQueue(name: string): string;
|
|
@@ -0,0 +1,112 @@
|
|
|
1
|
+
import { z } from "zod/v4";
|
|
2
|
+
export const WORKER_QUEUE_VERSION = "v2";
|
|
3
|
+
export const SCHEDULED_WORKER_QUEUE_SUFFIX = ":scheduled";
|
|
4
|
+
/** The dispatch class of a v2 worker queue. Kept separate from the legacy dequeue class. */
|
|
5
|
+
export const WorkerQueueDispatchClass = z.enum(["ondemand", "scheduled"]);
|
|
6
|
+
export const WorkerQueuePhase = z.enum(["fresh", "restore"]);
|
|
7
|
+
export const WorkerQueueCompatibility = z.enum(["any", "container", "compute"]);
|
|
8
|
+
export const WorkerQueueChannel = z.enum(["stable", "canary"]);
|
|
9
|
+
export const WorkerQueueSubscription = z.strictObject({
|
|
10
|
+
class: WorkerQueueDispatchClass,
|
|
11
|
+
phase: WorkerQueuePhase,
|
|
12
|
+
compat: WorkerQueueCompatibility,
|
|
13
|
+
channel: WorkerQueueChannel,
|
|
14
|
+
});
|
|
15
|
+
export const MAX_WORKER_QUEUE_SUBSCRIPTIONS = WorkerQueueDispatchClass.options.length *
|
|
16
|
+
WorkerQueuePhase.options.length *
|
|
17
|
+
WorkerQueueCompatibility.options.length *
|
|
18
|
+
WorkerQueueChannel.options.length;
|
|
19
|
+
export const WorkerQueueSubscriptions = z
|
|
20
|
+
.array(WorkerQueueSubscription)
|
|
21
|
+
.min(1)
|
|
22
|
+
.max(MAX_WORKER_QUEUE_SUBSCRIPTIONS);
|
|
23
|
+
export const WeightedWorkerQueueSubscription = WorkerQueueSubscription.extend({
|
|
24
|
+
weight: z.number().finite().min(0).max(1).optional(),
|
|
25
|
+
});
|
|
26
|
+
function subscriptionKey(subscription) {
|
|
27
|
+
return `${subscription.class}:${subscription.phase}:${subscription.compat}:${subscription.channel}`;
|
|
28
|
+
}
|
|
29
|
+
export const WeightedWorkerQueueSubscriptions = z
|
|
30
|
+
.array(WeightedWorkerQueueSubscription)
|
|
31
|
+
.min(1)
|
|
32
|
+
.max(MAX_WORKER_QUEUE_SUBSCRIPTIONS)
|
|
33
|
+
.superRefine((subscriptions, ctx) => {
|
|
34
|
+
const identities = new Set();
|
|
35
|
+
let hasPositiveWeight = false;
|
|
36
|
+
for (const [index, subscription] of subscriptions.entries()) {
|
|
37
|
+
const key = subscriptionKey(subscription);
|
|
38
|
+
if (identities.has(key)) {
|
|
39
|
+
ctx.addIssue({
|
|
40
|
+
code: "custom",
|
|
41
|
+
message: "Worker queue subscriptions must have unique identities",
|
|
42
|
+
path: [index],
|
|
43
|
+
});
|
|
44
|
+
}
|
|
45
|
+
identities.add(key);
|
|
46
|
+
hasPositiveWeight ||= (subscription.weight ?? 1) > 0;
|
|
47
|
+
}
|
|
48
|
+
if (!hasPositiveWeight) {
|
|
49
|
+
ctx.addIssue({
|
|
50
|
+
code: "custom",
|
|
51
|
+
message: "At least one worker queue subscription must have a positive weight",
|
|
52
|
+
});
|
|
53
|
+
}
|
|
54
|
+
});
|
|
55
|
+
const WorkerQueueRegion = z.string().regex(/^[^:\s]+$/);
|
|
56
|
+
export function isV2WorkerQueue(name) {
|
|
57
|
+
return name.split(":")[1] === WORKER_QUEUE_VERSION;
|
|
58
|
+
}
|
|
59
|
+
export function parseWorkerQueue(name) {
|
|
60
|
+
const [rawRegion, versionOrClass, queueClass, phase, compat, channel, ...extra] = name.split(":");
|
|
61
|
+
const region = WorkerQueueRegion.parse(rawRegion);
|
|
62
|
+
if (versionOrClass === undefined) {
|
|
63
|
+
return { region, version: "legacy", class: "ondemand" };
|
|
64
|
+
}
|
|
65
|
+
if (versionOrClass === "scheduled" && queueClass === undefined) {
|
|
66
|
+
return { region, version: "legacy", class: "scheduled" };
|
|
67
|
+
}
|
|
68
|
+
if (versionOrClass !== WORKER_QUEUE_VERSION || extra.length > 0) {
|
|
69
|
+
throw new Error(`Invalid worker queue name: ${name}`);
|
|
70
|
+
}
|
|
71
|
+
const subscription = WorkerQueueSubscription.parse({
|
|
72
|
+
class: queueClass,
|
|
73
|
+
phase,
|
|
74
|
+
compat,
|
|
75
|
+
channel,
|
|
76
|
+
});
|
|
77
|
+
return { region, version: WORKER_QUEUE_VERSION, ...subscription };
|
|
78
|
+
}
|
|
79
|
+
export function formatWorkerQueue(queue) {
|
|
80
|
+
const region = WorkerQueueRegion.parse(queue.region);
|
|
81
|
+
if (queue.version === "legacy") {
|
|
82
|
+
return queue.class === "scheduled" ? `${region}${SCHEDULED_WORKER_QUEUE_SUFFIX}` : region;
|
|
83
|
+
}
|
|
84
|
+
const subscription = WorkerQueueSubscription.parse({
|
|
85
|
+
class: queue.class,
|
|
86
|
+
phase: queue.phase,
|
|
87
|
+
compat: queue.compat,
|
|
88
|
+
channel: queue.channel,
|
|
89
|
+
});
|
|
90
|
+
const { class: queueClass, phase, compat, channel } = subscription;
|
|
91
|
+
return `${region}:${WORKER_QUEUE_VERSION}:${queueClass}:${phase}:${compat}:${channel}`;
|
|
92
|
+
}
|
|
93
|
+
export function legacyScheduledWorkerQueue(name) {
|
|
94
|
+
return name.endsWith(SCHEDULED_WORKER_QUEUE_SUFFIX)
|
|
95
|
+
? name
|
|
96
|
+
: `${name}${SCHEDULED_WORKER_QUEUE_SUFFIX}`;
|
|
97
|
+
}
|
|
98
|
+
export function restoreWorkerQueue(name, compat) {
|
|
99
|
+
if (!isV2WorkerQueue(name)) {
|
|
100
|
+
return name;
|
|
101
|
+
}
|
|
102
|
+
const queue = parseWorkerQueue(name);
|
|
103
|
+
if (queue.version === "legacy") {
|
|
104
|
+
return name;
|
|
105
|
+
}
|
|
106
|
+
return formatWorkerQueue({ ...queue, phase: "restore", compat });
|
|
107
|
+
}
|
|
108
|
+
export function scheduledWorkerQueue(name) {
|
|
109
|
+
const queue = parseWorkerQueue(name);
|
|
110
|
+
return formatWorkerQueue({ ...queue, class: "scheduled" });
|
|
111
|
+
}
|
|
112
|
+
//# sourceMappingURL=workerQueue.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"workerQueue.js","sourceRoot":"","sources":["../../../../src/v3/runEngineWorker/workerQueue.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,QAAQ,CAAC;AAE3B,MAAM,CAAC,MAAM,oBAAoB,GAAG,IAAI,CAAC;AACzC,MAAM,CAAC,MAAM,6BAA6B,GAAG,YAAY,CAAC;AAE1D,4FAA4F;AAC5F,MAAM,CAAC,MAAM,wBAAwB,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC,CAAC;AAG1E,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC,CAAC;AAG7D,MAAM,CAAC,MAAM,wBAAwB,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,WAAW,EAAE,SAAS,CAAC,CAAC,CAAC;AAGhF,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC;AAG/D,MAAM,CAAC,MAAM,uBAAuB,GAAG,CAAC,CAAC,YAAY,CAAC;IACpD,KAAK,EAAE,wBAAwB;IAC/B,KAAK,EAAE,gBAAgB;IACvB,MAAM,EAAE,wBAAwB;IAChC,OAAO,EAAE,kBAAkB;CAC5B,CAAC,CAAC;AAGH,MAAM,CAAC,MAAM,8BAA8B,GACzC,wBAAwB,CAAC,OAAO,CAAC,MAAM;IACvC,gBAAgB,CAAC,OAAO,CAAC,MAAM;IAC/B,wBAAwB,CAAC,OAAO,CAAC,MAAM;IACvC,kBAAkB,CAAC,OAAO,CAAC,MAAM,CAAC;AAEpC,MAAM,CAAC,MAAM,wBAAwB,GAAG,CAAC;KACtC,KAAK,CAAC,uBAAuB,CAAC;KAC9B,GAAG,CAAC,CAAC,CAAC;KACN,GAAG,CAAC,8BAA8B,CAAC,CAAC;AAEvC,MAAM,CAAC,MAAM,+BAA+B,GAAG,uBAAuB,CAAC,MAAM,CAAC;IAC5E,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;CACrD,CAAC,CAAC;AAGH,SAAS,eAAe,CAAC,YAAqC;IAC5D,OAAO,GAAG,YAAY,CAAC,KAAK,IAAI,YAAY,CAAC,KAAK,IAAI,YAAY,CAAC,MAAM,IAAI,YAAY,CAAC,OAAO,EAAE,CAAC;AACtG,CAAC;AAED,MAAM,CAAC,MAAM,gCAAgC,GAAG,CAAC;KAC9C,KAAK,CAAC,+BAA+B,CAAC;KACtC,GAAG,CAAC,CAAC,CAAC;KACN,GAAG,CAAC,8BAA8B,CAAC;KACnC,WAAW,CAAC,CAAC,aAAa,EAAE,GAAG,EAAE,EAAE;IAClC,MAAM,UAAU,GAAG,IAAI,GAAG,EAAU,CAAC;IACrC,IAAI,iBAAiB,GAAG,KAAK,CAAC;IAE9B,KAAK,MAAM,CAAC,KAAK,EAAE,YAAY,CAAC,IAAI,aAAa,CAAC,OAAO,EAAE,EAAE,CAAC;QAC5D,MAAM,GAAG,GAAG,eAAe,CAAC,YAAY,CAAC,CAAC;QAC1C,IAAI,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC;YACxB,GAAG,CAAC,QAAQ,CAAC;gBACX,IAAI,EAAE,QAAQ;gBACd,OAAO,EAAE,wDAAwD;gBACjE,IAAI,EAAE,CAAC,KAAK,CAAC;aACd,CAAC,CAAC;QACL,CAAC;QACD,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACpB,iBAAiB,KAAK,CAAC,YAAY,CAAC,MAAM,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;IACvD,CAAC;IAED,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACvB,GAAG,CAAC,QAAQ,CAAC;YACX,IAAI,EAAE,QAAQ;YACd,OAAO,EAAE,oEAAoE;SAC9E,CAAC,CAAC;IACL,CAAC;AACH,CAAC,CAAC,CAAC;AAGL,MAAM,iBAAiB,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;AAMxD,MAAM,UAAU,eAAe,CAAC,IAAY;IAC1C,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,oBAAoB,CAAC;AACrD,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,IAAY;IAC3C,MAAM,CAAC,SAAS,EAAE,cAAc,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAClG,MAAM,MAAM,GAAG,iBAAiB,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;IAElD,IAAI,cAAc,KAAK,SAAS,EAAE,CAAC;QACjC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC;IAC1D,CAAC;IAED,IAAI,cAAc,KAAK,WAAW,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;QAC/D,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,WAAW,EAAE,CAAC;IAC3D,CAAC;IAED,IAAI,cAAc,KAAK,oBAAoB,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAChE,MAAM,IAAI,KAAK,CAAC,8BAA8B,IAAI,EAAE,CAAC,CAAC;IACxD,CAAC;IAED,MAAM,YAAY,GAAG,uBAAuB,CAAC,KAAK,CAAC;QACjD,KAAK,EAAE,UAAU;QACjB,KAAK;QACL,MAAM;QACN,OAAO;KACR,CAAC,CAAC;IACH,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,oBAAoB,EAAE,GAAG,YAAY,EAAE,CAAC;AACpE,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,KAAkB;IAClD,MAAM,MAAM,GAAG,iBAAiB,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAErD,IAAI,KAAK,CAAC,OAAO,KAAK,QAAQ,EAAE,CAAC;QAC/B,OAAO,KAAK,CAAC,KAAK,KAAK,WAAW,CAAC,CAAC,CAAC,GAAG,MAAM,GAAG,6BAA6B,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC;IAC5F,CAAC;IAED,MAAM,YAAY,GAAG,uBAAuB,CAAC,KAAK,CAAC;QACjD,KAAK,EAAE,KAAK,CAAC,KAAK;QAClB,KAAK,EAAE,KAAK,CAAC,KAAK;QAClB,MAAM,EAAE,KAAK,CAAC,MAAM;QACpB,OAAO,EAAE,KAAK,CAAC,OAAO;KACvB,CAAC,CAAC;IACH,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,YAAY,CAAC;IACnE,OAAO,GAAG,MAAM,IAAI,oBAAoB,IAAI,UAAU,IAAI,KAAK,IAAI,MAAM,IAAI,OAAO,EAAE,CAAC;AACzF,CAAC;AAED,MAAM,UAAU,0BAA0B,CAAC,IAAY;IACrD,OAAO,IAAI,CAAC,QAAQ,CAAC,6BAA6B,CAAC;QACjD,CAAC,CAAC,IAAI;QACN,CAAC,CAAC,GAAG,IAAI,GAAG,6BAA6B,EAAE,CAAC;AAChD,CAAC;AAED,MAAM,UAAU,kBAAkB,CAChC,IAAY,EACZ,MAAgD;IAEhD,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE,CAAC;QAC3B,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,KAAK,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC;IACrC,IAAI,KAAK,CAAC,OAAO,KAAK,QAAQ,EAAE,CAAC;QAC/B,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,iBAAiB,CAAC,EAAE,GAAG,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC,CAAC;AACnE,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,IAAY;IAC/C,MAAM,KAAK,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAC;IACrC,OAAO,iBAAiB,CAAC,EAAE,GAAG,KAAK,EAAE,KAAK,EAAE,WAAW,EAAE,CAAC,CAAC;AAC7D,CAAC"}
|
|
@@ -295,7 +295,7 @@ export declare const CreateBackgroundWorkerRequestBody: z.ZodObject<{
|
|
|
295
295
|
config: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodUnknown>>;
|
|
296
296
|
variableSchema: z.ZodOptional<z.ZodUnknown>;
|
|
297
297
|
}, z.core.$strip>>>;
|
|
298
|
-
|
|
298
|
+
webhookEndpoints: z.ZodOptional<z.ZodArray<z.ZodObject<{
|
|
299
299
|
id: z.ZodString;
|
|
300
300
|
description: z.ZodOptional<z.ZodString>;
|
|
301
301
|
filePath: z.ZodString;
|
|
@@ -493,6 +493,10 @@ export declare const CreateBackgroundWorkerRequestBody: z.ZodObject<{
|
|
|
493
493
|
}, z.core.$strip>>;
|
|
494
494
|
response: z.ZodOptional<z.ZodObject<{
|
|
495
495
|
acceptedStatus: z.ZodOptional<z.ZodUnion<readonly [z.ZodLiteral<200>, z.ZodLiteral<202>, z.ZodLiteral<204>]>>;
|
|
496
|
+
acceptedBody: z.ZodOptional<z.ZodEnum<{
|
|
497
|
+
empty: "empty";
|
|
498
|
+
json: "json";
|
|
499
|
+
}>>;
|
|
496
500
|
rejectedStatus: z.ZodOptional<z.ZodUnion<readonly [z.ZodLiteral<400>, z.ZodLiteral<401>, z.ZodLiteral<403>]>>;
|
|
497
501
|
}, z.core.$strip>>;
|
|
498
502
|
}, z.core.$strip>, z.ZodObject<{
|
|
@@ -688,6 +692,10 @@ export declare const CreateBackgroundWorkerRequestBody: z.ZodObject<{
|
|
|
688
692
|
}, z.core.$strip>>;
|
|
689
693
|
response: z.ZodOptional<z.ZodObject<{
|
|
690
694
|
acceptedStatus: z.ZodOptional<z.ZodUnion<readonly [z.ZodLiteral<200>, z.ZodLiteral<202>, z.ZodLiteral<204>]>>;
|
|
695
|
+
acceptedBody: z.ZodOptional<z.ZodEnum<{
|
|
696
|
+
empty: "empty";
|
|
697
|
+
json: "json";
|
|
698
|
+
}>>;
|
|
691
699
|
rejectedStatus: z.ZodOptional<z.ZodUnion<readonly [z.ZodLiteral<400>, z.ZodLiteral<401>, z.ZodLiteral<403>]>>;
|
|
692
700
|
}, z.core.$strip>>;
|
|
693
701
|
}, z.core.$strip>, z.ZodObject<{
|
|
@@ -695,11 +703,24 @@ export declare const CreateBackgroundWorkerRequestBody: z.ZodObject<{
|
|
|
695
703
|
bundleUrl: z.ZodString;
|
|
696
704
|
hash: z.ZodString;
|
|
697
705
|
}, z.core.$strip>]>;
|
|
698
|
-
|
|
706
|
+
secretProvisioning: z.ZodOptional<z.ZodEnum<{
|
|
707
|
+
either: "either";
|
|
708
|
+
integrator: "integrator";
|
|
709
|
+
provider: "provider";
|
|
710
|
+
}>>;
|
|
711
|
+
setupPrompt: z.ZodOptional<z.ZodString>;
|
|
712
|
+
metadata: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodUnknown>>;
|
|
713
|
+
}, z.core.$strip>>>;
|
|
714
|
+
webhookSubscribers: z.ZodOptional<z.ZodArray<z.ZodObject<{
|
|
715
|
+
endpointId: z.ZodString;
|
|
716
|
+
target: import("../utils/zod.js").CompatibleZodDiscriminatedUnion<readonly [z.ZodObject<{
|
|
699
717
|
type: z.ZodLiteral<"task">;
|
|
718
|
+
id: z.ZodString;
|
|
700
719
|
taskId: z.ZodString;
|
|
720
|
+
filter: z.ZodOptional<z.ZodString>;
|
|
701
721
|
}, z.core.$strip>, z.ZodObject<{
|
|
702
722
|
type: z.ZodLiteral<"session">;
|
|
723
|
+
id: z.ZodString;
|
|
703
724
|
taskIdentifier: z.ZodString;
|
|
704
725
|
keyTemplate: z.ZodString;
|
|
705
726
|
deliverAs: z.ZodEnum<{
|
|
@@ -710,14 +731,8 @@ export declare const CreateBackgroundWorkerRequestBody: z.ZodObject<{
|
|
|
710
731
|
connectorId: z.ZodOptional<z.ZodString>;
|
|
711
732
|
triggerConfigTemplate: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodUnknown>>;
|
|
712
733
|
startOn: z.ZodOptional<z.ZodString>;
|
|
734
|
+
filter: z.ZodOptional<z.ZodString>;
|
|
713
735
|
}, z.core.$strip>]>;
|
|
714
|
-
secretProvisioning: z.ZodOptional<z.ZodEnum<{
|
|
715
|
-
either: "either";
|
|
716
|
-
integrator: "integrator";
|
|
717
|
-
provider: "provider";
|
|
718
|
-
}>>;
|
|
719
|
-
filter: z.ZodOptional<z.ZodString>;
|
|
720
|
-
metadata: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodUnknown>>;
|
|
721
736
|
}, z.core.$strip>>>;
|
|
722
737
|
queues: z.ZodOptional<z.ZodArray<z.ZodObject<{
|
|
723
738
|
name: z.ZodString;
|
|
@@ -2033,6 +2048,8 @@ export declare const DevDequeueResponseBody: z.ZodObject<{
|
|
|
2033
2048
|
STANDARD: "STANDARD";
|
|
2034
2049
|
}>, z.ZodCustom<string & {}, string & {}>]>>;
|
|
2035
2050
|
externalDeploymentId: z.ZodOptional<z.ZodString>;
|
|
2051
|
+
webhookDeliveryId: z.ZodOptional<z.ZodString>;
|
|
2052
|
+
webhookEndpointId: z.ZodOptional<z.ZodString>;
|
|
2036
2053
|
}, z.core.$strip>>;
|
|
2037
2054
|
}, z.core.$strip>;
|
|
2038
2055
|
environment: z.ZodObject<{
|