@trigger.dev/core 0.0.0-prerelease-20250329172200 → 0.0.0-prerelease-20250430143421
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/utils.d.ts +1 -1
- package/dist/commonjs/utils.js +3 -0
- package/dist/commonjs/utils.js.map +1 -1
- package/dist/commonjs/v3/apiClient/errors.js +13 -8
- package/dist/commonjs/v3/apiClient/errors.js.map +1 -1
- package/dist/commonjs/v3/apiClient/index.d.ts +42 -39
- package/dist/commonjs/v3/apiClient/index.js +4 -3
- package/dist/commonjs/v3/apiClient/index.js.map +1 -1
- package/dist/commonjs/v3/apiClient/stream.js +51 -30
- package/dist/commonjs/v3/apiClient/stream.js.map +1 -1
- package/dist/commonjs/v3/apps/http.d.ts +1 -1
- package/dist/commonjs/v3/apps/http.js +4 -4
- package/dist/commonjs/v3/apps/http.js.map +1 -1
- package/dist/commonjs/v3/build/flags.js +2 -2
- package/dist/commonjs/v3/build/flags.js.map +1 -1
- package/dist/commonjs/v3/build/flags.test.js +4 -0
- package/dist/commonjs/v3/build/flags.test.js.map +1 -1
- package/dist/commonjs/v3/errors.d.ts +3 -0
- package/dist/commonjs/v3/errors.js +22 -1
- package/dist/commonjs/v3/errors.js.map +1 -1
- package/dist/commonjs/v3/idempotencyKeys.d.ts +11 -0
- package/dist/commonjs/v3/idempotencyKeys.js +6 -1
- package/dist/commonjs/v3/idempotencyKeys.js.map +1 -1
- package/dist/commonjs/v3/index.d.ts +2 -2
- package/dist/commonjs/v3/index.js +5 -2
- package/dist/commonjs/v3/index.js.map +1 -1
- package/dist/commonjs/v3/isomorphic/friendlyId.d.ts +0 -1
- package/dist/commonjs/v3/isomorphic/friendlyId.js +1 -6
- package/dist/commonjs/v3/isomorphic/friendlyId.js.map +1 -1
- package/dist/commonjs/v3/links.d.ts +1 -0
- package/dist/commonjs/v3/links.js +1 -0
- package/dist/commonjs/v3/links.js.map +1 -1
- package/dist/commonjs/v3/logger/taskLogger.js +1 -1
- package/dist/commonjs/v3/logger/taskLogger.js.map +1 -1
- package/dist/commonjs/v3/machines/index.d.ts +7 -7
- package/dist/commonjs/v3/machines/index.js +3 -3
- package/dist/commonjs/v3/machines/index.js.map +1 -1
- package/dist/commonjs/v3/otel/tracingSDK.js +1 -1
- package/dist/commonjs/v3/otel/tracingSDK.js.map +1 -1
- package/dist/commonjs/v3/resource-catalog/standardResourceCatalog.js +20 -0
- package/dist/commonjs/v3/resource-catalog/standardResourceCatalog.js.map +1 -1
- package/dist/commonjs/v3/runEngineWorker/supervisor/http.d.ts +22 -21
- package/dist/commonjs/v3/runEngineWorker/supervisor/http.js +1 -0
- package/dist/commonjs/v3/runEngineWorker/supervisor/http.js.map +1 -1
- package/dist/commonjs/v3/runEngineWorker/supervisor/queueConsumer.d.ts +2 -0
- package/dist/commonjs/v3/runEngineWorker/supervisor/queueConsumer.js +3 -0
- package/dist/commonjs/v3/runEngineWorker/supervisor/queueConsumer.js.map +1 -1
- package/dist/commonjs/v3/runEngineWorker/supervisor/schemas.d.ts +201 -198
- package/dist/commonjs/v3/runEngineWorker/supervisor/schemas.js +3 -2
- package/dist/commonjs/v3/runEngineWorker/supervisor/schemas.js.map +1 -1
- package/dist/commonjs/v3/runEngineWorker/supervisor/session.d.ts +4 -2
- package/dist/commonjs/v3/runEngineWorker/supervisor/session.js +18 -14
- package/dist/commonjs/v3/runEngineWorker/supervisor/session.js.map +1 -1
- package/dist/commonjs/v3/runEngineWorker/workload/http.d.ts +20 -16
- package/dist/commonjs/v3/runEngineWorker/workload/http.js +23 -11
- package/dist/commonjs/v3/runEngineWorker/workload/http.js.map +1 -1
- package/dist/commonjs/v3/runEngineWorker/workload/schemas.d.ts +162 -162
- package/dist/commonjs/v3/runMetadata/manager.js +40 -32
- package/dist/commonjs/v3/runMetadata/manager.js.map +1 -1
- package/dist/commonjs/v3/runMetadata/metadataStream.d.ts +5 -0
- package/dist/commonjs/v3/runMetadata/metadataStream.js +97 -17
- package/dist/commonjs/v3/runMetadata/metadataStream.js.map +1 -1
- package/dist/commonjs/v3/runMetadata/noopManager.js +24 -16
- package/dist/commonjs/v3/runMetadata/noopManager.js.map +1 -1
- package/dist/commonjs/v3/runTimelineMetrics/runTimelineMetricsManager.d.ts +1 -1
- package/dist/commonjs/v3/runTimelineMetrics/runTimelineMetricsManager.js +5 -2
- package/dist/commonjs/v3/runTimelineMetrics/runTimelineMetricsManager.js.map +1 -1
- package/dist/commonjs/v3/runtime/managedRuntimeManager.d.ts +1 -0
- package/dist/commonjs/v3/runtime/managedRuntimeManager.js +15 -10
- package/dist/commonjs/v3/runtime/managedRuntimeManager.js.map +1 -1
- package/dist/commonjs/v3/schemas/api.d.ts +247 -221
- package/dist/commonjs/v3/schemas/api.js +16 -1
- package/dist/commonjs/v3/schemas/api.js.map +1 -1
- package/dist/commonjs/v3/schemas/build.d.ts +64 -64
- package/dist/commonjs/v3/schemas/checkpoints.d.ts +27 -27
- package/dist/commonjs/v3/schemas/common.d.ts +176 -175
- package/dist/commonjs/v3/schemas/common.js.map +1 -1
- package/dist/commonjs/v3/schemas/messages.d.ts +2306 -2300
- package/dist/commonjs/v3/schemas/messages.js +2 -0
- package/dist/commonjs/v3/schemas/messages.js.map +1 -1
- package/dist/commonjs/v3/schemas/openTelemetry.d.ts +18 -18
- package/dist/commonjs/v3/schemas/resources.d.ts +34 -34
- package/dist/commonjs/v3/schemas/runEngine.d.ts +88 -88
- package/dist/commonjs/v3/schemas/runEngine.js +2 -2
- package/dist/commonjs/v3/schemas/runEngine.js.map +1 -1
- package/dist/commonjs/v3/schemas/schemas.d.ts +145 -94
- package/dist/commonjs/v3/schemas/schemas.js +9 -1
- package/dist/commonjs/v3/schemas/schemas.js.map +1 -1
- package/dist/commonjs/v3/schemas/style.d.ts +6 -4
- package/dist/commonjs/v3/schemas/style.js +4 -2
- package/dist/commonjs/v3/schemas/style.js.map +1 -1
- package/dist/commonjs/v3/schemas/webhooks.d.ts +104 -104
- package/dist/commonjs/v3/semanticInternalAttributes.d.ts +2 -0
- package/dist/commonjs/v3/semanticInternalAttributes.js +2 -0
- package/dist/commonjs/v3/semanticInternalAttributes.js.map +1 -1
- package/dist/commonjs/v3/serverOnly/httpServer.d.ts +1 -0
- package/dist/commonjs/v3/serverOnly/httpServer.js +5 -1
- package/dist/commonjs/v3/serverOnly/httpServer.js.map +1 -1
- package/dist/commonjs/v3/serverOnly/k8s.js +1 -0
- package/dist/commonjs/v3/serverOnly/k8s.js.map +1 -1
- package/dist/commonjs/v3/taskContext/index.d.ts +1 -0
- package/dist/commonjs/v3/taskContext/index.js +4 -0
- package/dist/commonjs/v3/taskContext/index.js.map +1 -1
- package/dist/commonjs/v3/taskContext/otelProcessors.d.ts +3 -1
- package/dist/commonjs/v3/taskContext/otelProcessors.js +34 -1
- package/dist/commonjs/v3/taskContext/otelProcessors.js.map +1 -1
- package/dist/commonjs/v3/taskContext/types.d.ts +1 -0
- package/dist/commonjs/v3/tracer.js +14 -16
- package/dist/commonjs/v3/tracer.js.map +1 -1
- package/dist/commonjs/v3/types/schemas.d.ts +3 -0
- package/dist/commonjs/v3/types/schemas.js +16 -0
- package/dist/commonjs/v3/types/schemas.js.map +1 -1
- package/dist/commonjs/v3/types/tasks.d.ts +1 -0
- package/dist/commonjs/v3/usage/api.d.ts +1 -0
- package/dist/commonjs/v3/usage/api.js +3 -0
- package/dist/commonjs/v3/usage/api.js.map +1 -1
- package/dist/commonjs/v3/usage/devUsageManager.d.ts +1 -0
- package/dist/commonjs/v3/usage/devUsageManager.js +1 -0
- package/dist/commonjs/v3/usage/devUsageManager.js.map +1 -1
- package/dist/commonjs/v3/usage/noopUsageManager.d.ts +1 -0
- package/dist/commonjs/v3/usage/noopUsageManager.js +3 -0
- package/dist/commonjs/v3/usage/noopUsageManager.js.map +1 -1
- package/dist/commonjs/v3/usage/types.d.ts +1 -0
- package/dist/commonjs/v3/utils/{heartbeat.d.ts → interval.d.ts} +11 -9
- package/dist/commonjs/v3/utils/interval.js +95 -0
- package/dist/commonjs/v3/utils/interval.js.map +1 -0
- package/dist/commonjs/v3/workers/index.d.ts +1 -0
- package/dist/commonjs/v3/workers/index.js +3 -1
- package/dist/commonjs/v3/workers/index.js.map +1 -1
- package/dist/commonjs/v3/workers/populateEnv.d.ts +23 -0
- package/dist/commonjs/v3/workers/populateEnv.js +33 -0
- package/dist/commonjs/v3/workers/populateEnv.js.map +1 -0
- package/dist/commonjs/v3/workers/taskExecutor.d.ts +3 -1
- package/dist/commonjs/v3/workers/taskExecutor.js +36 -11
- package/dist/commonjs/v3/workers/taskExecutor.js.map +1 -1
- package/dist/commonjs/v3/zodMessageHandler.d.ts +1 -1
- package/dist/esm/utils.d.ts +1 -1
- package/dist/esm/utils.js +3 -0
- package/dist/esm/utils.js.map +1 -1
- package/dist/esm/v3/apiClient/errors.js +13 -8
- package/dist/esm/v3/apiClient/errors.js.map +1 -1
- package/dist/esm/v3/apiClient/index.d.ts +42 -39
- package/dist/esm/v3/apiClient/index.js +5 -4
- package/dist/esm/v3/apiClient/index.js.map +1 -1
- package/dist/esm/v3/apiClient/stream.js +51 -30
- package/dist/esm/v3/apiClient/stream.js.map +1 -1
- package/dist/esm/v3/apps/http.d.ts +1 -1
- package/dist/esm/v3/apps/http.js +4 -4
- package/dist/esm/v3/apps/http.js.map +1 -1
- package/dist/esm/v3/build/flags.js +2 -2
- package/dist/esm/v3/build/flags.js.map +1 -1
- package/dist/esm/v3/build/flags.test.js +4 -0
- package/dist/esm/v3/build/flags.test.js.map +1 -1
- package/dist/esm/v3/errors.d.ts +3 -0
- package/dist/esm/v3/errors.js +20 -0
- package/dist/esm/v3/errors.js.map +1 -1
- package/dist/esm/v3/idempotencyKeys.d.ts +11 -0
- package/dist/esm/v3/idempotencyKeys.js +5 -1
- package/dist/esm/v3/idempotencyKeys.js.map +1 -1
- package/dist/esm/v3/index.d.ts +2 -2
- package/dist/esm/v3/index.js +2 -2
- package/dist/esm/v3/index.js.map +1 -1
- package/dist/esm/v3/isomorphic/friendlyId.d.ts +0 -1
- package/dist/esm/v3/isomorphic/friendlyId.js +0 -5
- package/dist/esm/v3/isomorphic/friendlyId.js.map +1 -1
- package/dist/esm/v3/links.d.ts +1 -0
- package/dist/esm/v3/links.js +1 -0
- package/dist/esm/v3/links.js.map +1 -1
- package/dist/esm/v3/logger/taskLogger.js +1 -1
- package/dist/esm/v3/logger/taskLogger.js.map +1 -1
- package/dist/esm/v3/machines/index.d.ts +7 -7
- package/dist/esm/v3/machines/index.js +3 -3
- package/dist/esm/v3/machines/index.js.map +1 -1
- package/dist/esm/v3/otel/tracingSDK.js +1 -1
- package/dist/esm/v3/otel/tracingSDK.js.map +1 -1
- package/dist/esm/v3/resource-catalog/standardResourceCatalog.js +20 -0
- package/dist/esm/v3/resource-catalog/standardResourceCatalog.js.map +1 -1
- package/dist/esm/v3/runEngineWorker/supervisor/http.d.ts +22 -21
- package/dist/esm/v3/runEngineWorker/supervisor/http.js +1 -0
- package/dist/esm/v3/runEngineWorker/supervisor/http.js.map +1 -1
- package/dist/esm/v3/runEngineWorker/supervisor/queueConsumer.d.ts +2 -0
- package/dist/esm/v3/runEngineWorker/supervisor/queueConsumer.js +3 -0
- package/dist/esm/v3/runEngineWorker/supervisor/queueConsumer.js.map +1 -1
- package/dist/esm/v3/runEngineWorker/supervisor/schemas.d.ts +201 -198
- package/dist/esm/v3/runEngineWorker/supervisor/schemas.js +3 -2
- package/dist/esm/v3/runEngineWorker/supervisor/schemas.js.map +1 -1
- package/dist/esm/v3/runEngineWorker/supervisor/session.d.ts +4 -2
- package/dist/esm/v3/runEngineWorker/supervisor/session.js +18 -14
- package/dist/esm/v3/runEngineWorker/supervisor/session.js.map +1 -1
- package/dist/esm/v3/runEngineWorker/workload/http.d.ts +20 -16
- package/dist/esm/v3/runEngineWorker/workload/http.js +23 -11
- package/dist/esm/v3/runEngineWorker/workload/http.js.map +1 -1
- package/dist/esm/v3/runEngineWorker/workload/schemas.d.ts +162 -162
- package/dist/esm/v3/runMetadata/manager.js +40 -32
- package/dist/esm/v3/runMetadata/manager.js.map +1 -1
- package/dist/esm/v3/runMetadata/metadataStream.d.ts +5 -0
- package/dist/esm/v3/runMetadata/metadataStream.js +97 -17
- package/dist/esm/v3/runMetadata/metadataStream.js.map +1 -1
- package/dist/esm/v3/runMetadata/noopManager.js +24 -16
- package/dist/esm/v3/runMetadata/noopManager.js.map +1 -1
- package/dist/esm/v3/runTimelineMetrics/runTimelineMetricsManager.d.ts +1 -1
- package/dist/esm/v3/runTimelineMetrics/runTimelineMetricsManager.js +5 -2
- package/dist/esm/v3/runTimelineMetrics/runTimelineMetricsManager.js.map +1 -1
- package/dist/esm/v3/runtime/managedRuntimeManager.d.ts +1 -0
- package/dist/esm/v3/runtime/managedRuntimeManager.js +15 -10
- package/dist/esm/v3/runtime/managedRuntimeManager.js.map +1 -1
- package/dist/esm/v3/schemas/api.d.ts +247 -221
- package/dist/esm/v3/schemas/api.js +15 -0
- package/dist/esm/v3/schemas/api.js.map +1 -1
- package/dist/esm/v3/schemas/build.d.ts +64 -64
- package/dist/esm/v3/schemas/checkpoints.d.ts +27 -27
- package/dist/esm/v3/schemas/common.d.ts +176 -175
- package/dist/esm/v3/schemas/common.js.map +1 -1
- package/dist/esm/v3/schemas/messages.d.ts +2306 -2300
- package/dist/esm/v3/schemas/messages.js +2 -0
- package/dist/esm/v3/schemas/messages.js.map +1 -1
- package/dist/esm/v3/schemas/openTelemetry.d.ts +18 -18
- package/dist/esm/v3/schemas/resources.d.ts +34 -34
- package/dist/esm/v3/schemas/runEngine.d.ts +88 -88
- package/dist/esm/v3/schemas/runEngine.js +2 -2
- package/dist/esm/v3/schemas/runEngine.js.map +1 -1
- package/dist/esm/v3/schemas/schemas.d.ts +145 -94
- package/dist/esm/v3/schemas/schemas.js +8 -0
- package/dist/esm/v3/schemas/schemas.js.map +1 -1
- package/dist/esm/v3/schemas/style.d.ts +6 -4
- package/dist/esm/v3/schemas/style.js +3 -1
- package/dist/esm/v3/schemas/style.js.map +1 -1
- package/dist/esm/v3/schemas/webhooks.d.ts +104 -104
- package/dist/esm/v3/semanticInternalAttributes.d.ts +2 -0
- package/dist/esm/v3/semanticInternalAttributes.js +2 -0
- package/dist/esm/v3/semanticInternalAttributes.js.map +1 -1
- package/dist/esm/v3/serverOnly/httpServer.d.ts +1 -0
- package/dist/esm/v3/serverOnly/httpServer.js +5 -1
- package/dist/esm/v3/serverOnly/httpServer.js.map +1 -1
- package/dist/esm/v3/serverOnly/k8s.js +1 -0
- package/dist/esm/v3/serverOnly/k8s.js.map +1 -1
- package/dist/esm/v3/taskContext/index.d.ts +1 -0
- package/dist/esm/v3/taskContext/index.js +4 -0
- package/dist/esm/v3/taskContext/index.js.map +1 -1
- package/dist/esm/v3/taskContext/otelProcessors.d.ts +3 -1
- package/dist/esm/v3/taskContext/otelProcessors.js +34 -1
- package/dist/esm/v3/taskContext/otelProcessors.js.map +1 -1
- package/dist/esm/v3/taskContext/types.d.ts +1 -0
- package/dist/esm/v3/tracer.js +14 -16
- package/dist/esm/v3/tracer.js.map +1 -1
- package/dist/esm/v3/types/schemas.d.ts +3 -0
- package/dist/esm/v3/types/schemas.js +13 -0
- package/dist/esm/v3/types/schemas.js.map +1 -1
- package/dist/esm/v3/types/tasks.d.ts +1 -0
- package/dist/esm/v3/usage/api.d.ts +1 -0
- package/dist/esm/v3/usage/api.js +3 -0
- package/dist/esm/v3/usage/api.js.map +1 -1
- package/dist/esm/v3/usage/devUsageManager.d.ts +1 -0
- package/dist/esm/v3/usage/devUsageManager.js +1 -0
- package/dist/esm/v3/usage/devUsageManager.js.map +1 -1
- package/dist/esm/v3/usage/noopUsageManager.d.ts +1 -0
- package/dist/esm/v3/usage/noopUsageManager.js +3 -0
- package/dist/esm/v3/usage/noopUsageManager.js.map +1 -1
- package/dist/esm/v3/usage/types.d.ts +1 -0
- package/dist/esm/v3/utils/{heartbeat.d.ts → interval.d.ts} +11 -9
- package/dist/esm/v3/utils/interval.js +91 -0
- package/dist/esm/v3/utils/interval.js.map +1 -0
- package/dist/esm/v3/workers/index.d.ts +1 -0
- package/dist/esm/v3/workers/index.js +1 -0
- package/dist/esm/v3/workers/index.js.map +1 -1
- package/dist/esm/v3/workers/populateEnv.d.ts +23 -0
- package/dist/esm/v3/workers/populateEnv.js +30 -0
- package/dist/esm/v3/workers/populateEnv.js.map +1 -0
- package/dist/esm/v3/workers/taskExecutor.d.ts +3 -1
- package/dist/esm/v3/workers/taskExecutor.js +38 -13
- package/dist/esm/v3/workers/taskExecutor.js.map +1 -1
- package/dist/esm/v3/zodMessageHandler.d.ts +1 -1
- package/package.json +2 -2
- package/dist/commonjs/v3/utils/heartbeat.js +0 -79
- package/dist/commonjs/v3/utils/heartbeat.js.map +0 -1
- package/dist/esm/v3/utils/heartbeat.js +0 -75
- package/dist/esm/v3/utils/heartbeat.js.map +0 -1
|
@@ -41,11 +41,12 @@ export const WorkerApiConnectResponseBody = z.object({
|
|
|
41
41
|
});
|
|
42
42
|
export const WorkerApiDequeueRequestBody = z.object({
|
|
43
43
|
maxResources: MachineResources.optional(),
|
|
44
|
+
maxRunCount: z.number().optional(),
|
|
44
45
|
});
|
|
45
46
|
export const WorkerApiDequeueResponseBody = DequeuedMessage.array();
|
|
46
47
|
export const WorkerApiRunHeartbeatRequestBody = z.object({
|
|
47
|
-
cpu: z.number(),
|
|
48
|
-
memory: z.number(),
|
|
48
|
+
cpu: z.number().optional(),
|
|
49
|
+
memory: z.number().optional(),
|
|
49
50
|
});
|
|
50
51
|
export const WorkerApiRunHeartbeatResponseBody = z.object({
|
|
51
52
|
ok: z.literal(true),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schemas.js","sourceRoot":"","sources":["../../../../../src/v3/runEngineWorker/supervisor/schemas.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,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;AAEpC,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,CAAC,CAAC,kBAAkB,CAAC,SAAS,EAAE;IAC5E,CAAC,CAAC,MAAM,CAAC;QACP,OAAO,EAAE,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC;QACxB,UAAU,EAAE,eAAe;KAC5B,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,MAAM,CAAC,MAAM,2BAA2B,GAAG,CAAC,CAAC,MAAM,CAAC;IAClD,QAAQ,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC;CAC5B,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,2BAA2B,GAAG,CAAC,CAAC,MAAM,CAAC;IAClD,YAAY,EAAE,gBAAgB,CAAC,QAAQ,EAAE;
|
|
1
|
+
{"version":3,"file":"schemas.js","sourceRoot":"","sources":["../../../../../src/v3/runEngineWorker/supervisor/schemas.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,6 +9,8 @@ type SupervisorSessionOptions = SupervisorClientCommonOptions & {
|
|
|
9
9
|
dequeueIntervalMs?: number;
|
|
10
10
|
preDequeue?: PreDequeueFn;
|
|
11
11
|
preSkip?: PreSkipFn;
|
|
12
|
+
maxRunCount?: number;
|
|
13
|
+
maxConsumerCount?: number;
|
|
12
14
|
};
|
|
13
15
|
export declare class SupervisorSession extends EventEmitter<WorkerEvents> {
|
|
14
16
|
private opts;
|
|
@@ -16,8 +18,8 @@ export declare class SupervisorSession extends EventEmitter<WorkerEvents> {
|
|
|
16
18
|
private readonly runNotificationsEnabled;
|
|
17
19
|
private runNotificationsSocket?;
|
|
18
20
|
private readonly queueConsumerEnabled;
|
|
19
|
-
private readonly
|
|
20
|
-
private readonly
|
|
21
|
+
private readonly queueConsumers;
|
|
22
|
+
private readonly heartbeat;
|
|
21
23
|
private readonly heartbeatIntervalSeconds;
|
|
22
24
|
constructor(opts: SupervisorSessionOptions);
|
|
23
25
|
private onDequeue;
|
|
@@ -4,15 +4,15 @@ import EventEmitter from "events";
|
|
|
4
4
|
import { VERSION } from "../../../version.js";
|
|
5
5
|
import { io } from "socket.io-client";
|
|
6
6
|
import { getDefaultWorkerHeaders } from "./util.js";
|
|
7
|
-
import {
|
|
7
|
+
import { IntervalService } from "../../utils/interval.js";
|
|
8
8
|
export class SupervisorSession extends EventEmitter {
|
|
9
9
|
opts;
|
|
10
10
|
httpClient;
|
|
11
11
|
runNotificationsEnabled;
|
|
12
12
|
runNotificationsSocket;
|
|
13
13
|
queueConsumerEnabled;
|
|
14
|
-
|
|
15
|
-
|
|
14
|
+
queueConsumers;
|
|
15
|
+
heartbeat;
|
|
16
16
|
heartbeatIntervalSeconds;
|
|
17
17
|
constructor(opts) {
|
|
18
18
|
super();
|
|
@@ -20,17 +20,20 @@ export class SupervisorSession extends EventEmitter {
|
|
|
20
20
|
this.runNotificationsEnabled = opts.runNotificationsEnabled ?? true;
|
|
21
21
|
this.queueConsumerEnabled = opts.queueConsumerEnabled ?? true;
|
|
22
22
|
this.httpClient = new SupervisorHttpClient(opts);
|
|
23
|
-
this.
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
23
|
+
this.queueConsumers = Array.from({ length: opts.maxConsumerCount ?? 1 }, () => {
|
|
24
|
+
return new RunQueueConsumer({
|
|
25
|
+
client: this.httpClient,
|
|
26
|
+
preDequeue: opts.preDequeue,
|
|
27
|
+
preSkip: opts.preSkip,
|
|
28
|
+
onDequeue: this.onDequeue.bind(this),
|
|
29
|
+
intervalMs: opts.dequeueIntervalMs,
|
|
30
|
+
maxRunCount: opts.maxRunCount,
|
|
31
|
+
});
|
|
29
32
|
});
|
|
30
33
|
// TODO: This should be dynamic and set by (or at least overridden by) the platform
|
|
31
34
|
this.heartbeatIntervalSeconds = opts.heartbeatIntervalSeconds || 30;
|
|
32
|
-
this.
|
|
33
|
-
|
|
35
|
+
this.heartbeat = new IntervalService({
|
|
36
|
+
onInterval: async () => {
|
|
34
37
|
console.debug("[SupervisorSession] Sending heartbeat");
|
|
35
38
|
const body = this.getHeartbeatBody();
|
|
36
39
|
const response = await this.httpClient.heartbeatWorker(body);
|
|
@@ -131,8 +134,8 @@ export class SupervisorSession extends EventEmitter {
|
|
|
131
134
|
});
|
|
132
135
|
if (this.queueConsumerEnabled) {
|
|
133
136
|
console.log("[SupervisorSession] Queue consumer enabled");
|
|
134
|
-
this.
|
|
135
|
-
this.
|
|
137
|
+
await Promise.allSettled(this.queueConsumers.map(async (q) => q.start()));
|
|
138
|
+
this.heartbeat.start();
|
|
136
139
|
}
|
|
137
140
|
else {
|
|
138
141
|
console.warn("[SupervisorSession] Queue consumer disabled");
|
|
@@ -146,7 +149,8 @@ export class SupervisorSession extends EventEmitter {
|
|
|
146
149
|
}
|
|
147
150
|
}
|
|
148
151
|
async stop() {
|
|
149
|
-
this.
|
|
152
|
+
await Promise.allSettled(this.queueConsumers.map(async (q) => q.stop()));
|
|
153
|
+
this.heartbeat.stop();
|
|
150
154
|
this.runNotificationsSocket?.disconnect();
|
|
151
155
|
}
|
|
152
156
|
getHeartbeatBody() {
|
|
@@ -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;AAGjD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAEtD,OAAO,YAAY,MAAM,QAAQ,CAAC;AAClC,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAE,EAAE,EAAU,MAAM,kBAAkB,CAAC;AAE9C,OAAO,EAAE,uBAAuB,EAAE,MAAM,WAAW,CAAC;AACpD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../../../../src/v3/runEngineWorker/supervisor/session.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,12 +2,15 @@ import { WorkloadHeartbeatRequestBody, WorkloadRunAttemptCompleteRequestBody, Wo
|
|
|
2
2
|
import { WorkloadClientCommonOptions } from "./types.js";
|
|
3
3
|
type WorkloadHttpClientOptions = WorkloadClientCommonOptions;
|
|
4
4
|
export declare class WorkloadHttpClient {
|
|
5
|
+
private opts;
|
|
5
6
|
private apiUrl;
|
|
7
|
+
private runnerId;
|
|
6
8
|
private readonly deploymentId;
|
|
7
|
-
private readonly defaultHeaders;
|
|
8
9
|
constructor(opts: WorkloadHttpClientOptions);
|
|
9
10
|
updateApiUrl(apiUrl: string): void;
|
|
10
|
-
|
|
11
|
+
updateRunnerId(runnerId: string): void;
|
|
12
|
+
defaultHeaders(): Record<string, string>;
|
|
13
|
+
heartbeatRun(runId: string, snapshotId: string, body?: WorkloadHeartbeatRequestBody): Promise<import("../../zodfetch.js").ApiResult<{
|
|
11
14
|
ok: true;
|
|
12
15
|
}>>;
|
|
13
16
|
suspendRun(runId: string, snapshotId: string): Promise<import("../../zodfetch.js").ApiResult<{
|
|
@@ -60,19 +63,19 @@ export declare class WorkloadHttpClient {
|
|
|
60
63
|
};
|
|
61
64
|
run: {
|
|
62
65
|
id: string;
|
|
66
|
+
startedAt: Date;
|
|
63
67
|
payload: string;
|
|
64
68
|
payloadType: string;
|
|
65
69
|
tags: string[];
|
|
66
70
|
isTest: boolean;
|
|
67
71
|
createdAt: Date;
|
|
68
|
-
startedAt: Date;
|
|
69
72
|
durationMs: number;
|
|
70
73
|
costInCents: number;
|
|
71
74
|
baseCostInCents: number;
|
|
72
|
-
metadata?: Record<string, import("../../../index.js").DeserializedJson> | undefined;
|
|
73
75
|
idempotencyKey?: string | undefined;
|
|
74
76
|
maxAttempts?: number | undefined;
|
|
75
77
|
version?: string | undefined;
|
|
78
|
+
metadata?: Record<string, import("../../../index.js").DeserializedJson> | undefined;
|
|
76
79
|
maxDuration?: number | undefined;
|
|
77
80
|
context?: any;
|
|
78
81
|
priority?: number | undefined;
|
|
@@ -100,9 +103,9 @@ export declare class WorkloadHttpClient {
|
|
|
100
103
|
ref: string;
|
|
101
104
|
};
|
|
102
105
|
machine: {
|
|
106
|
+
name: "micro" | "small-1x" | "small-2x" | "medium-1x" | "medium-2x" | "large-1x" | "large-2x";
|
|
103
107
|
cpu: number;
|
|
104
108
|
memory: number;
|
|
105
|
-
name: "micro" | "small-1x" | "small-2x" | "medium-1x" | "medium-2x" | "large-1x" | "large-2x";
|
|
106
109
|
centsPerMs: number;
|
|
107
110
|
};
|
|
108
111
|
batch?: {
|
|
@@ -148,13 +151,10 @@ export declare class WorkloadHttpClient {
|
|
|
148
151
|
completedWaitpoints: {
|
|
149
152
|
type: import("../../index.js").WaitpointType;
|
|
150
153
|
id: string;
|
|
154
|
+
friendlyId: string;
|
|
151
155
|
completedAt: Date;
|
|
152
156
|
outputIsError: boolean;
|
|
153
|
-
friendlyId: string;
|
|
154
157
|
idempotencyKey?: string | undefined;
|
|
155
|
-
output?: string | undefined;
|
|
156
|
-
outputType?: string | undefined;
|
|
157
|
-
completedAfter?: Date | undefined;
|
|
158
158
|
index?: number | undefined;
|
|
159
159
|
completedByTaskRun?: {
|
|
160
160
|
id: string;
|
|
@@ -164,10 +164,13 @@ export declare class WorkloadHttpClient {
|
|
|
164
164
|
friendlyId: string;
|
|
165
165
|
} | undefined;
|
|
166
166
|
} | undefined;
|
|
167
|
+
completedAfter?: Date | undefined;
|
|
167
168
|
completedByBatch?: {
|
|
168
169
|
id: string;
|
|
169
170
|
friendlyId: string;
|
|
170
171
|
} | undefined;
|
|
172
|
+
output?: string | undefined;
|
|
173
|
+
outputType?: string | undefined;
|
|
171
174
|
}[];
|
|
172
175
|
batch?: {
|
|
173
176
|
id: string;
|
|
@@ -178,12 +181,13 @@ export declare class WorkloadHttpClient {
|
|
|
178
181
|
id: string;
|
|
179
182
|
friendlyId: string;
|
|
180
183
|
location: string;
|
|
181
|
-
imageRef
|
|
184
|
+
imageRef?: string | null | undefined;
|
|
182
185
|
reason?: string | null | undefined;
|
|
183
186
|
} | undefined;
|
|
184
187
|
};
|
|
185
188
|
}>>;
|
|
186
189
|
sendDebugLog(runId: string, body: WorkloadDebugLogRequestBody): Promise<void>;
|
|
190
|
+
/** @deprecated Not currently used */
|
|
187
191
|
dequeue(): Promise<import("../../zodfetch.js").ApiResult<{
|
|
188
192
|
version: "1";
|
|
189
193
|
run: {
|
|
@@ -191,9 +195,9 @@ export declare class WorkloadHttpClient {
|
|
|
191
195
|
isTest: boolean;
|
|
192
196
|
traceContext: Record<string, unknown>;
|
|
193
197
|
machine: {
|
|
198
|
+
name: "micro" | "small-1x" | "small-2x" | "medium-1x" | "medium-2x" | "large-1x" | "large-2x";
|
|
194
199
|
cpu: number;
|
|
195
200
|
memory: number;
|
|
196
|
-
name: "micro" | "small-1x" | "small-2x" | "medium-1x" | "medium-2x" | "large-1x" | "large-2x";
|
|
197
201
|
centsPerMs: number;
|
|
198
202
|
};
|
|
199
203
|
friendlyId: string;
|
|
@@ -219,13 +223,10 @@ export declare class WorkloadHttpClient {
|
|
|
219
223
|
completedWaitpoints: {
|
|
220
224
|
type: import("../../index.js").WaitpointType;
|
|
221
225
|
id: string;
|
|
226
|
+
friendlyId: string;
|
|
222
227
|
completedAt: Date;
|
|
223
228
|
outputIsError: boolean;
|
|
224
|
-
friendlyId: string;
|
|
225
229
|
idempotencyKey?: string | undefined;
|
|
226
|
-
output?: string | undefined;
|
|
227
|
-
outputType?: string | undefined;
|
|
228
|
-
completedAfter?: Date | undefined;
|
|
229
230
|
index?: number | undefined;
|
|
230
231
|
completedByTaskRun?: {
|
|
231
232
|
id: string;
|
|
@@ -235,10 +236,13 @@ export declare class WorkloadHttpClient {
|
|
|
235
236
|
friendlyId: string;
|
|
236
237
|
} | undefined;
|
|
237
238
|
} | undefined;
|
|
239
|
+
completedAfter?: Date | undefined;
|
|
238
240
|
completedByBatch?: {
|
|
239
241
|
id: string;
|
|
240
242
|
friendlyId: string;
|
|
241
243
|
} | undefined;
|
|
244
|
+
output?: string | undefined;
|
|
245
|
+
outputType?: string | undefined;
|
|
242
246
|
}[];
|
|
243
247
|
dequeuedAt: Date;
|
|
244
248
|
backgroundWorker: {
|
|
@@ -254,7 +258,7 @@ export declare class WorkloadHttpClient {
|
|
|
254
258
|
type: import("../../index.js").CheckpointTypeEnum;
|
|
255
259
|
id: string;
|
|
256
260
|
location: string;
|
|
257
|
-
imageRef
|
|
261
|
+
imageRef?: string | null | undefined;
|
|
258
262
|
reason?: string | null | undefined;
|
|
259
263
|
} | undefined;
|
|
260
264
|
image?: string | undefined;
|
|
@@ -3,13 +3,15 @@ import { WorkloadHeartbeatResponseBody, WorkloadRunAttemptCompleteResponseBody,
|
|
|
3
3
|
import { getDefaultWorkloadHeaders } from "./util.js";
|
|
4
4
|
import { wrapZodFetch } from "../../zodfetch.js";
|
|
5
5
|
export class WorkloadHttpClient {
|
|
6
|
+
opts;
|
|
6
7
|
apiUrl;
|
|
8
|
+
runnerId;
|
|
7
9
|
deploymentId;
|
|
8
|
-
defaultHeaders;
|
|
9
10
|
constructor(opts) {
|
|
11
|
+
this.opts = opts;
|
|
10
12
|
this.apiUrl = opts.workerApiUrl.replace(/\/$/, "");
|
|
11
|
-
this.defaultHeaders = getDefaultWorkloadHeaders(opts);
|
|
12
13
|
this.deploymentId = opts.deploymentId;
|
|
14
|
+
this.runnerId = opts.runnerId;
|
|
13
15
|
if (!this.apiUrl) {
|
|
14
16
|
throw new Error("apiURL is required and needs to be a non-empty string");
|
|
15
17
|
}
|
|
@@ -20,21 +22,30 @@ export class WorkloadHttpClient {
|
|
|
20
22
|
updateApiUrl(apiUrl) {
|
|
21
23
|
this.apiUrl = apiUrl.replace(/\/$/, "");
|
|
22
24
|
}
|
|
25
|
+
updateRunnerId(runnerId) {
|
|
26
|
+
this.runnerId = runnerId;
|
|
27
|
+
}
|
|
28
|
+
defaultHeaders() {
|
|
29
|
+
return getDefaultWorkloadHeaders({
|
|
30
|
+
...this.opts,
|
|
31
|
+
runnerId: this.runnerId,
|
|
32
|
+
});
|
|
33
|
+
}
|
|
23
34
|
async heartbeatRun(runId, snapshotId, body) {
|
|
24
35
|
return wrapZodFetch(WorkloadHeartbeatResponseBody, `${this.apiUrl}/api/v1/workload-actions/runs/${runId}/snapshots/${snapshotId}/heartbeat`, {
|
|
25
36
|
method: "POST",
|
|
26
37
|
headers: {
|
|
27
|
-
...this.defaultHeaders,
|
|
38
|
+
...this.defaultHeaders(),
|
|
28
39
|
"Content-Type": "application/json",
|
|
29
40
|
},
|
|
30
|
-
body: JSON.stringify(body),
|
|
41
|
+
body: JSON.stringify(body ?? {}),
|
|
31
42
|
});
|
|
32
43
|
}
|
|
33
44
|
async suspendRun(runId, snapshotId) {
|
|
34
45
|
return wrapZodFetch(WorkloadSuspendRunResponseBody, `${this.apiUrl}/api/v1/workload-actions/runs/${runId}/snapshots/${snapshotId}/suspend`, {
|
|
35
46
|
method: "GET",
|
|
36
47
|
headers: {
|
|
37
|
-
...this.defaultHeaders,
|
|
48
|
+
...this.defaultHeaders(),
|
|
38
49
|
},
|
|
39
50
|
});
|
|
40
51
|
}
|
|
@@ -42,7 +53,7 @@ export class WorkloadHttpClient {
|
|
|
42
53
|
return wrapZodFetch(WorkloadContinueRunExecutionResponseBody, `${this.apiUrl}/api/v1/workload-actions/runs/${runId}/snapshots/${snapshotId}/continue`, {
|
|
43
54
|
method: "GET",
|
|
44
55
|
headers: {
|
|
45
|
-
...this.defaultHeaders,
|
|
56
|
+
...this.defaultHeaders(),
|
|
46
57
|
},
|
|
47
58
|
});
|
|
48
59
|
}
|
|
@@ -50,7 +61,7 @@ export class WorkloadHttpClient {
|
|
|
50
61
|
return wrapZodFetch(WorkloadRunAttemptStartResponseBody, `${this.apiUrl}/api/v1/workload-actions/runs/${runId}/snapshots/${snapshotId}/attempts/start`, {
|
|
51
62
|
method: "POST",
|
|
52
63
|
headers: {
|
|
53
|
-
...this.defaultHeaders,
|
|
64
|
+
...this.defaultHeaders(),
|
|
54
65
|
},
|
|
55
66
|
body: JSON.stringify(body),
|
|
56
67
|
});
|
|
@@ -59,7 +70,7 @@ export class WorkloadHttpClient {
|
|
|
59
70
|
return wrapZodFetch(WorkloadRunAttemptCompleteResponseBody, `${this.apiUrl}/api/v1/workload-actions/runs/${runId}/snapshots/${snapshotId}/attempts/complete`, {
|
|
60
71
|
method: "POST",
|
|
61
72
|
headers: {
|
|
62
|
-
...this.defaultHeaders,
|
|
73
|
+
...this.defaultHeaders(),
|
|
63
74
|
},
|
|
64
75
|
body: JSON.stringify(body),
|
|
65
76
|
});
|
|
@@ -68,7 +79,7 @@ export class WorkloadHttpClient {
|
|
|
68
79
|
return wrapZodFetch(WorkloadRunLatestSnapshotResponseBody, `${this.apiUrl}/api/v1/workload-actions/runs/${runId}/snapshots/latest`, {
|
|
69
80
|
method: "GET",
|
|
70
81
|
headers: {
|
|
71
|
-
...this.defaultHeaders,
|
|
82
|
+
...this.defaultHeaders(),
|
|
72
83
|
},
|
|
73
84
|
});
|
|
74
85
|
}
|
|
@@ -77,7 +88,7 @@ export class WorkloadHttpClient {
|
|
|
77
88
|
const res = await wrapZodFetch(z.unknown(), `${this.apiUrl}/api/v1/workload-actions/runs/${runId}/logs/debug`, {
|
|
78
89
|
method: "POST",
|
|
79
90
|
headers: {
|
|
80
|
-
...this.defaultHeaders,
|
|
91
|
+
...this.defaultHeaders(),
|
|
81
92
|
"Content-Type": "application/json",
|
|
82
93
|
},
|
|
83
94
|
body: JSON.stringify(body),
|
|
@@ -90,11 +101,12 @@ export class WorkloadHttpClient {
|
|
|
90
101
|
console.error("Failed to send debug log", { error });
|
|
91
102
|
}
|
|
92
103
|
}
|
|
104
|
+
/** @deprecated Not currently used */
|
|
93
105
|
async dequeue() {
|
|
94
106
|
return wrapZodFetch(WorkloadDequeueFromVersionResponseBody, `${this.apiUrl}/api/v1/workload-actions/deployments/${this.deploymentId}/dequeue`, {
|
|
95
107
|
method: "GET",
|
|
96
108
|
headers: {
|
|
97
|
-
...this.defaultHeaders,
|
|
109
|
+
...this.defaultHeaders(),
|
|
98
110
|
},
|
|
99
111
|
});
|
|
100
112
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http.js","sourceRoot":"","sources":["../../../../../src/v3/runEngineWorker/workload/http.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAEL,6BAA6B,EAE7B,sCAAsC,EACtC,mCAAmC,EACnC,qCAAqC,EACrC,sCAAsC,EAEtC,8BAA8B,EAC9B,wCAAwC,GAEzC,MAAM,cAAc,CAAC;AAEtB,OAAO,EAAE,yBAAyB,EAAE,MAAM,WAAW,CAAC;AACtD,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAIjD,MAAM,OAAO,kBAAkB;
|
|
1
|
+
{"version":3,"file":"http.js","sourceRoot":"","sources":["../../../../../src/v3/runEngineWorker/workload/http.ts"],"names":[],"mappings":"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"}
|