@trigger.dev/core 0.0.0-prerelease-20250503193704 → 0.0.0-process-keep-alive-20250618160907
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/logger.d.ts +2 -1
- package/dist/commonjs/logger.js +6 -1
- package/dist/commonjs/logger.js.map +1 -1
- package/dist/commonjs/v3/apiClient/core.d.ts +2 -1
- package/dist/commonjs/v3/apiClient/core.js.map +1 -1
- package/dist/commonjs/v3/apiClient/getBranch.d.ts +5 -0
- package/dist/commonjs/v3/apiClient/getBranch.js +25 -0
- package/dist/commonjs/v3/apiClient/getBranch.js.map +1 -0
- package/dist/commonjs/v3/apiClient/index.d.ts +49 -41
- package/dist/commonjs/v3/apiClient/index.js +44 -5
- package/dist/commonjs/v3/apiClient/index.js.map +1 -1
- package/dist/commonjs/v3/apiClient/runStream.d.ts +1 -0
- package/dist/commonjs/v3/apiClient/runStream.js +7 -7
- package/dist/commonjs/v3/apiClient/runStream.js.map +1 -1
- package/dist/commonjs/v3/apiClient/stream.js +9 -3
- package/dist/commonjs/v3/apiClient/stream.js.map +1 -1
- package/dist/commonjs/v3/apiClient/types.d.ts +2 -0
- package/dist/commonjs/v3/apiClientManager/index.d.ts +1 -0
- package/dist/commonjs/v3/apiClientManager/index.js +10 -2
- package/dist/commonjs/v3/apiClientManager/index.js.map +1 -1
- package/dist/commonjs/v3/apiClientManager/types.d.ts +4 -0
- package/dist/commonjs/v3/build/extensions.d.ts +1 -0
- package/dist/commonjs/v3/config.d.ts +70 -0
- package/dist/commonjs/v3/consoleInterceptor.d.ts +2 -1
- package/dist/commonjs/v3/consoleInterceptor.js +6 -1
- package/dist/commonjs/v3/consoleInterceptor.js.map +1 -1
- package/dist/commonjs/v3/isomorphic/duration.d.ts +3 -0
- package/dist/commonjs/v3/isomorphic/duration.js +124 -35
- package/dist/commonjs/v3/isomorphic/duration.js.map +1 -1
- package/dist/commonjs/v3/lifecycleHooks/manager.d.ts +1 -0
- package/dist/commonjs/v3/lifecycleHooks/manager.js +16 -0
- package/dist/commonjs/v3/lifecycleHooks/manager.js.map +1 -1
- package/dist/commonjs/v3/locals/manager.d.ts +1 -0
- package/dist/commonjs/v3/locals/manager.js +3 -1
- package/dist/commonjs/v3/locals/manager.js.map +1 -1
- package/dist/commonjs/v3/otel/tracingSDK.d.ts +3 -1
- package/dist/commonjs/v3/otel/tracingSDK.js +60 -1
- package/dist/commonjs/v3/otel/tracingSDK.js.map +1 -1
- package/dist/commonjs/v3/runEngineWorker/supervisor/http.d.ts +76 -0
- package/dist/commonjs/v3/runEngineWorker/supervisor/http.js +18 -2
- package/dist/commonjs/v3/runEngineWorker/supervisor/http.js.map +1 -1
- package/dist/commonjs/v3/runEngineWorker/supervisor/queueConsumer.d.ts +1 -0
- package/dist/commonjs/v3/runEngineWorker/supervisor/queueConsumer.js +25 -11
- package/dist/commonjs/v3/runEngineWorker/supervisor/queueConsumer.js.map +1 -1
- package/dist/commonjs/v3/runEngineWorker/supervisor/schemas.d.ts +548 -3
- package/dist/commonjs/v3/runEngineWorker/supervisor/schemas.js +16 -7
- package/dist/commonjs/v3/runEngineWorker/supervisor/schemas.js.map +1 -1
- package/dist/commonjs/v3/runEngineWorker/supervisor/session.d.ts +2 -0
- package/dist/commonjs/v3/runEngineWorker/supervisor/session.js +22 -27
- package/dist/commonjs/v3/runEngineWorker/supervisor/session.js.map +1 -1
- package/dist/commonjs/v3/runEngineWorker/supervisor/types.d.ts +1 -0
- package/dist/commonjs/v3/runEngineWorker/workload/http.d.ts +72 -0
- package/dist/commonjs/v3/runEngineWorker/workload/http.js +8 -0
- package/dist/commonjs/v3/runEngineWorker/workload/http.js.map +1 -1
- package/dist/commonjs/v3/runEngineWorker/workload/schemas.d.ts +519 -3
- package/dist/commonjs/v3/runEngineWorker/workload/schemas.js +2 -1
- package/dist/commonjs/v3/runEngineWorker/workload/schemas.js.map +1 -1
- package/dist/commonjs/v3/runMetadata/manager.d.ts +1 -0
- package/dist/commonjs/v3/runMetadata/manager.js +27 -4
- package/dist/commonjs/v3/runMetadata/manager.js.map +1 -1
- package/dist/commonjs/v3/runMetadata/operations.d.ts +38 -0
- package/dist/commonjs/v3/runMetadata/operations.js +96 -0
- package/dist/commonjs/v3/runMetadata/operations.js.map +1 -1
- package/dist/commonjs/v3/runTimelineMetrics/runTimelineMetricsManager.d.ts +2 -1
- package/dist/commonjs/v3/runTimelineMetrics/runTimelineMetricsManager.js +8 -4
- package/dist/commonjs/v3/runTimelineMetrics/runTimelineMetricsManager.js.map +1 -1
- package/dist/commonjs/v3/runtime/{managedRuntimeManager.d.ts → sharedRuntimeManager.d.ts} +14 -6
- package/dist/commonjs/v3/runtime/sharedRuntimeManager.js +280 -0
- package/dist/commonjs/v3/runtime/sharedRuntimeManager.js.map +1 -0
- package/dist/commonjs/v3/schemas/api.d.ts +223 -62
- package/dist/commonjs/v3/schemas/api.js +29 -17
- package/dist/commonjs/v3/schemas/api.js.map +1 -1
- package/dist/commonjs/v3/schemas/build.d.ts +108 -0
- package/dist/commonjs/v3/schemas/build.js +9 -0
- package/dist/commonjs/v3/schemas/build.js.map +1 -1
- package/dist/commonjs/v3/schemas/checkpoints.d.ts +14 -4
- package/dist/commonjs/v3/schemas/common.d.ts +254 -0
- package/dist/commonjs/v3/schemas/common.js +16 -1
- package/dist/commonjs/v3/schemas/common.js.map +1 -1
- package/dist/commonjs/v3/schemas/messages.d.ts +1907 -3717
- package/dist/commonjs/v3/schemas/messages.js +9 -54
- package/dist/commonjs/v3/schemas/messages.js.map +1 -1
- package/dist/commonjs/v3/schemas/resources.d.ts +12 -0
- package/dist/commonjs/v3/schemas/runEngine.d.ts +139 -0
- package/dist/commonjs/v3/schemas/runEngine.js +2 -0
- package/dist/commonjs/v3/schemas/runEngine.js.map +1 -1
- package/dist/commonjs/v3/schemas/schemas.d.ts +301 -23
- package/dist/commonjs/v3/schemas/schemas.js +3 -13
- package/dist/commonjs/v3/schemas/schemas.js.map +1 -1
- package/dist/commonjs/v3/schemas/webhooks.d.ts +42 -0
- package/dist/commonjs/v3/schemas/webhooks.js +4 -0
- package/dist/commonjs/v3/schemas/webhooks.js.map +1 -1
- package/dist/commonjs/v3/serverOnly/httpServer.d.ts +1 -0
- package/dist/commonjs/v3/serverOnly/httpServer.js +14 -4
- package/dist/commonjs/v3/serverOnly/httpServer.js.map +1 -1
- package/dist/commonjs/v3/serverOnly/index.d.ts +1 -0
- package/dist/commonjs/v3/serverOnly/index.js +1 -0
- package/dist/commonjs/v3/serverOnly/index.js.map +1 -1
- package/dist/commonjs/v3/serverOnly/jumpHash.d.ts +1 -0
- package/dist/commonjs/v3/serverOnly/jumpHash.js +48 -0
- package/dist/commonjs/v3/serverOnly/jumpHash.js.map +1 -0
- package/dist/commonjs/v3/taskContext/index.d.ts +1 -0
- package/dist/commonjs/v3/taskContext/index.js +19 -12
- package/dist/commonjs/v3/taskContext/index.js.map +1 -1
- package/dist/commonjs/v3/taskContext/otelProcessors.js +3 -12
- package/dist/commonjs/v3/taskContext/otelProcessors.js.map +1 -1
- package/dist/commonjs/v3/timeout/api.d.ts +1 -0
- package/dist/commonjs/v3/timeout/api.js +5 -0
- package/dist/commonjs/v3/timeout/api.js.map +1 -1
- package/dist/commonjs/v3/timeout/types.d.ts +1 -0
- package/dist/commonjs/v3/timeout/types.js.map +1 -1
- package/dist/commonjs/v3/timeout/usageTimeoutManager.d.ts +1 -0
- package/dist/commonjs/v3/timeout/usageTimeoutManager.js +8 -0
- package/dist/commonjs/v3/timeout/usageTimeoutManager.js.map +1 -1
- package/dist/commonjs/v3/usage/api.d.ts +1 -0
- package/dist/commonjs/v3/usage/api.js +4 -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 +5 -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/prodUsageManager.d.ts +1 -0
- package/dist/commonjs/v3/usage/prodUsageManager.js +19 -4
- package/dist/commonjs/v3/usage/prodUsageManager.js.map +1 -1
- package/dist/commonjs/v3/usage/types.d.ts +1 -0
- package/dist/commonjs/v3/utils/getEnv.d.ts +8 -0
- package/dist/commonjs/v3/utils/getEnv.js +10 -5
- package/dist/commonjs/v3/utils/getEnv.js.map +1 -1
- package/dist/commonjs/v3/utils/interval.d.ts +3 -1
- package/dist/commonjs/v3/utils/interval.js +5 -1
- package/dist/commonjs/v3/utils/interval.js.map +1 -1
- package/dist/commonjs/v3/utils/ioSerialization.d.ts +1 -0
- package/dist/commonjs/v3/utils/ioSerialization.js +21 -0
- package/dist/commonjs/v3/utils/ioSerialization.js.map +1 -1
- package/dist/commonjs/v3/utils/structuredLogger.d.ts +4 -1
- package/dist/commonjs/v3/utils/structuredLogger.js +18 -4
- package/dist/commonjs/v3/utils/structuredLogger.js.map +1 -1
- package/dist/commonjs/v3/waitUntil/manager.d.ts +1 -0
- package/dist/commonjs/v3/waitUntil/manager.js +3 -0
- package/dist/commonjs/v3/waitUntil/manager.js.map +1 -1
- package/dist/commonjs/v3/workers/index.d.ts +1 -1
- package/dist/commonjs/v3/workers/index.js +3 -3
- package/dist/commonjs/v3/workers/index.js.map +1 -1
- package/dist/commonjs/v3/workers/populateEnv.d.ts +5 -0
- package/dist/commonjs/v3/workers/populateEnv.js +9 -1
- package/dist/commonjs/v3/workers/populateEnv.js.map +1 -1
- package/dist/commonjs/v3/workers/taskExecutor.js +13 -8
- package/dist/commonjs/v3/workers/taskExecutor.js.map +1 -1
- package/dist/commonjs/version.js +1 -1
- package/dist/esm/logger.d.ts +2 -1
- package/dist/esm/logger.js +6 -1
- package/dist/esm/logger.js.map +1 -1
- package/dist/esm/v3/apiClient/core.d.ts +2 -1
- package/dist/esm/v3/apiClient/core.js.map +1 -1
- package/dist/esm/v3/apiClient/getBranch.d.ts +5 -0
- package/dist/esm/v3/apiClient/getBranch.js +22 -0
- package/dist/esm/v3/apiClient/getBranch.js.map +1 -0
- package/dist/esm/v3/apiClient/index.d.ts +49 -41
- package/dist/esm/v3/apiClient/index.js +31 -6
- package/dist/esm/v3/apiClient/index.js.map +1 -1
- package/dist/esm/v3/apiClient/runStream.d.ts +1 -0
- package/dist/esm/v3/apiClient/runStream.js +7 -7
- package/dist/esm/v3/apiClient/runStream.js.map +1 -1
- package/dist/esm/v3/apiClient/stream.js +9 -3
- package/dist/esm/v3/apiClient/stream.js.map +1 -1
- package/dist/esm/v3/apiClient/types.d.ts +2 -0
- package/dist/esm/v3/apiClientManager/index.d.ts +1 -0
- package/dist/esm/v3/apiClientManager/index.js +10 -2
- package/dist/esm/v3/apiClientManager/index.js.map +1 -1
- package/dist/esm/v3/apiClientManager/types.d.ts +4 -0
- package/dist/esm/v3/build/extensions.d.ts +1 -0
- package/dist/esm/v3/config.d.ts +70 -0
- package/dist/esm/v3/consoleInterceptor.d.ts +2 -1
- package/dist/esm/v3/consoleInterceptor.js +6 -1
- package/dist/esm/v3/consoleInterceptor.js.map +1 -1
- package/dist/esm/v3/isomorphic/duration.d.ts +3 -0
- package/dist/esm/v3/isomorphic/duration.js +121 -35
- package/dist/esm/v3/isomorphic/duration.js.map +1 -1
- package/dist/esm/v3/lifecycleHooks/manager.d.ts +1 -0
- package/dist/esm/v3/lifecycleHooks/manager.js +16 -0
- package/dist/esm/v3/lifecycleHooks/manager.js.map +1 -1
- package/dist/esm/v3/locals/manager.d.ts +1 -0
- package/dist/esm/v3/locals/manager.js +3 -1
- package/dist/esm/v3/locals/manager.js.map +1 -1
- package/dist/esm/v3/otel/tracingSDK.d.ts +3 -1
- package/dist/esm/v3/otel/tracingSDK.js +60 -1
- package/dist/esm/v3/otel/tracingSDK.js.map +1 -1
- package/dist/esm/v3/runEngineWorker/supervisor/http.d.ts +76 -0
- package/dist/esm/v3/runEngineWorker/supervisor/http.js +19 -3
- package/dist/esm/v3/runEngineWorker/supervisor/http.js.map +1 -1
- package/dist/esm/v3/runEngineWorker/supervisor/queueConsumer.d.ts +1 -0
- package/dist/esm/v3/runEngineWorker/supervisor/queueConsumer.js +25 -11
- package/dist/esm/v3/runEngineWorker/supervisor/queueConsumer.js.map +1 -1
- package/dist/esm/v3/runEngineWorker/supervisor/schemas.d.ts +548 -3
- package/dist/esm/v3/runEngineWorker/supervisor/schemas.js +15 -6
- package/dist/esm/v3/runEngineWorker/supervisor/schemas.js.map +1 -1
- package/dist/esm/v3/runEngineWorker/supervisor/session.d.ts +2 -0
- package/dist/esm/v3/runEngineWorker/supervisor/session.js +22 -27
- package/dist/esm/v3/runEngineWorker/supervisor/session.js.map +1 -1
- package/dist/esm/v3/runEngineWorker/supervisor/types.d.ts +1 -0
- package/dist/esm/v3/runEngineWorker/workload/http.d.ts +72 -0
- package/dist/esm/v3/runEngineWorker/workload/http.js +9 -1
- package/dist/esm/v3/runEngineWorker/workload/http.js.map +1 -1
- package/dist/esm/v3/runEngineWorker/workload/schemas.d.ts +519 -3
- package/dist/esm/v3/runEngineWorker/workload/schemas.js +2 -1
- package/dist/esm/v3/runEngineWorker/workload/schemas.js.map +1 -1
- package/dist/esm/v3/runMetadata/manager.d.ts +1 -0
- package/dist/esm/v3/runMetadata/manager.js +28 -5
- package/dist/esm/v3/runMetadata/manager.js.map +1 -1
- package/dist/esm/v3/runMetadata/operations.d.ts +38 -0
- package/dist/esm/v3/runMetadata/operations.js +95 -0
- package/dist/esm/v3/runMetadata/operations.js.map +1 -1
- package/dist/esm/v3/runTimelineMetrics/runTimelineMetricsManager.d.ts +2 -1
- package/dist/esm/v3/runTimelineMetrics/runTimelineMetricsManager.js +8 -4
- package/dist/esm/v3/runTimelineMetrics/runTimelineMetricsManager.js.map +1 -1
- package/dist/esm/v3/runtime/{managedRuntimeManager.d.ts → sharedRuntimeManager.d.ts} +14 -6
- package/dist/esm/v3/runtime/sharedRuntimeManager.js +276 -0
- package/dist/esm/v3/runtime/sharedRuntimeManager.js.map +1 -0
- package/dist/esm/v3/schemas/api.d.ts +223 -62
- package/dist/esm/v3/schemas/api.js +28 -16
- package/dist/esm/v3/schemas/api.js.map +1 -1
- package/dist/esm/v3/schemas/build.d.ts +108 -0
- package/dist/esm/v3/schemas/build.js +9 -0
- package/dist/esm/v3/schemas/build.js.map +1 -1
- package/dist/esm/v3/schemas/checkpoints.d.ts +14 -4
- package/dist/esm/v3/schemas/common.d.ts +254 -0
- package/dist/esm/v3/schemas/common.js +15 -0
- package/dist/esm/v3/schemas/common.js.map +1 -1
- package/dist/esm/v3/schemas/messages.d.ts +1907 -3717
- package/dist/esm/v3/schemas/messages.js +10 -55
- package/dist/esm/v3/schemas/messages.js.map +1 -1
- package/dist/esm/v3/schemas/resources.d.ts +12 -0
- package/dist/esm/v3/schemas/runEngine.d.ts +139 -0
- package/dist/esm/v3/schemas/runEngine.js +2 -0
- package/dist/esm/v3/schemas/runEngine.js.map +1 -1
- package/dist/esm/v3/schemas/schemas.d.ts +301 -23
- package/dist/esm/v3/schemas/schemas.js +2 -12
- package/dist/esm/v3/schemas/schemas.js.map +1 -1
- package/dist/esm/v3/schemas/webhooks.d.ts +42 -0
- package/dist/esm/v3/schemas/webhooks.js +4 -0
- package/dist/esm/v3/schemas/webhooks.js.map +1 -1
- package/dist/esm/v3/serverOnly/httpServer.d.ts +1 -0
- package/dist/esm/v3/serverOnly/httpServer.js +14 -4
- package/dist/esm/v3/serverOnly/httpServer.js.map +1 -1
- package/dist/esm/v3/serverOnly/index.d.ts +1 -0
- package/dist/esm/v3/serverOnly/index.js +1 -0
- package/dist/esm/v3/serverOnly/index.js.map +1 -1
- package/dist/esm/v3/serverOnly/jumpHash.d.ts +1 -0
- package/dist/esm/v3/serverOnly/jumpHash.js +45 -0
- package/dist/esm/v3/serverOnly/jumpHash.js.map +1 -0
- package/dist/esm/v3/taskContext/index.d.ts +1 -0
- package/dist/esm/v3/taskContext/index.js +19 -12
- package/dist/esm/v3/taskContext/index.js.map +1 -1
- package/dist/esm/v3/taskContext/otelProcessors.js +3 -12
- package/dist/esm/v3/taskContext/otelProcessors.js.map +1 -1
- package/dist/esm/v3/timeout/api.d.ts +1 -0
- package/dist/esm/v3/timeout/api.js +5 -0
- package/dist/esm/v3/timeout/api.js.map +1 -1
- package/dist/esm/v3/timeout/types.d.ts +1 -0
- package/dist/esm/v3/timeout/types.js.map +1 -1
- package/dist/esm/v3/timeout/usageTimeoutManager.d.ts +1 -0
- package/dist/esm/v3/timeout/usageTimeoutManager.js +8 -0
- package/dist/esm/v3/timeout/usageTimeoutManager.js.map +1 -1
- package/dist/esm/v3/usage/api.d.ts +1 -0
- package/dist/esm/v3/usage/api.js +4 -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 +5 -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/prodUsageManager.d.ts +1 -0
- package/dist/esm/v3/usage/prodUsageManager.js +19 -4
- package/dist/esm/v3/usage/prodUsageManager.js.map +1 -1
- package/dist/esm/v3/usage/types.d.ts +1 -0
- package/dist/esm/v3/utils/getEnv.d.ts +8 -0
- package/dist/esm/v3/utils/getEnv.js +10 -5
- package/dist/esm/v3/utils/getEnv.js.map +1 -1
- package/dist/esm/v3/utils/interval.d.ts +3 -1
- package/dist/esm/v3/utils/interval.js +5 -1
- package/dist/esm/v3/utils/interval.js.map +1 -1
- package/dist/esm/v3/utils/ioSerialization.d.ts +1 -0
- package/dist/esm/v3/utils/ioSerialization.js +20 -0
- package/dist/esm/v3/utils/ioSerialization.js.map +1 -1
- package/dist/esm/v3/utils/structuredLogger.d.ts +4 -1
- package/dist/esm/v3/utils/structuredLogger.js +18 -4
- package/dist/esm/v3/utils/structuredLogger.js.map +1 -1
- package/dist/esm/v3/waitUntil/manager.d.ts +1 -0
- package/dist/esm/v3/waitUntil/manager.js +3 -0
- package/dist/esm/v3/waitUntil/manager.js.map +1 -1
- package/dist/esm/v3/workers/index.d.ts +1 -1
- package/dist/esm/v3/workers/index.js +1 -1
- package/dist/esm/v3/workers/index.js.map +1 -1
- package/dist/esm/v3/workers/populateEnv.d.ts +5 -0
- package/dist/esm/v3/workers/populateEnv.js +9 -1
- package/dist/esm/v3/workers/populateEnv.js.map +1 -1
- package/dist/esm/v3/workers/taskExecutor.js +13 -8
- package/dist/esm/v3/workers/taskExecutor.js.map +1 -1
- package/dist/esm/version.js +1 -1
- package/package.json +1 -2
- package/dist/commonjs/v3/runtime/managedRuntimeManager.js +0 -189
- package/dist/commonjs/v3/runtime/managedRuntimeManager.js.map +0 -1
- package/dist/esm/v3/runtime/managedRuntimeManager.js +0 -185
- package/dist/esm/v3/runtime/managedRuntimeManager.js.map +0 -1
|
@@ -175,14 +175,18 @@ declare const AlertWebhookRunFailedObject: z.ZodObject<{
|
|
|
175
175
|
type: z.ZodEnum<[import("@trigger.dev/database").$Enums.RuntimeEnvironmentType]>;
|
|
176
176
|
/** Environment slug */
|
|
177
177
|
slug: z.ZodString;
|
|
178
|
+
/** Environment branch name */
|
|
179
|
+
branchName: z.ZodOptional<z.ZodString>;
|
|
178
180
|
}, "strip", z.ZodTypeAny, {
|
|
179
181
|
type: import("@trigger.dev/database").$Enums.RuntimeEnvironmentType;
|
|
180
182
|
id: string;
|
|
181
183
|
slug: string;
|
|
184
|
+
branchName?: string | undefined;
|
|
182
185
|
}, {
|
|
183
186
|
type: import("@trigger.dev/database").$Enums.RuntimeEnvironmentType;
|
|
184
187
|
id: string;
|
|
185
188
|
slug: string;
|
|
189
|
+
branchName?: string | undefined;
|
|
186
190
|
}>;
|
|
187
191
|
/** Organization information */
|
|
188
192
|
organization: z.ZodObject<{
|
|
@@ -266,6 +270,7 @@ declare const AlertWebhookRunFailedObject: z.ZodObject<{
|
|
|
266
270
|
type: import("@trigger.dev/database").$Enums.RuntimeEnvironmentType;
|
|
267
271
|
id: string;
|
|
268
272
|
slug: string;
|
|
273
|
+
branchName?: string | undefined;
|
|
269
274
|
};
|
|
270
275
|
organization: {
|
|
271
276
|
name: string;
|
|
@@ -322,6 +327,7 @@ declare const AlertWebhookRunFailedObject: z.ZodObject<{
|
|
|
322
327
|
type: import("@trigger.dev/database").$Enums.RuntimeEnvironmentType;
|
|
323
328
|
id: string;
|
|
324
329
|
slug: string;
|
|
330
|
+
branchName?: string | undefined;
|
|
325
331
|
};
|
|
326
332
|
organization: {
|
|
327
333
|
name: string;
|
|
@@ -410,14 +416,18 @@ export declare const AlertWebhookDeploymentSuccessObject: z.ZodObject<{
|
|
|
410
416
|
id: z.ZodString;
|
|
411
417
|
type: z.ZodEnum<[import("@trigger.dev/database").$Enums.RuntimeEnvironmentType]>;
|
|
412
418
|
slug: z.ZodString;
|
|
419
|
+
/** Environment branch name */
|
|
420
|
+
branchName: z.ZodOptional<z.ZodString>;
|
|
413
421
|
}, "strip", z.ZodTypeAny, {
|
|
414
422
|
type: import("@trigger.dev/database").$Enums.RuntimeEnvironmentType;
|
|
415
423
|
id: string;
|
|
416
424
|
slug: string;
|
|
425
|
+
branchName?: string | undefined;
|
|
417
426
|
}, {
|
|
418
427
|
type: import("@trigger.dev/database").$Enums.RuntimeEnvironmentType;
|
|
419
428
|
id: string;
|
|
420
429
|
slug: string;
|
|
430
|
+
branchName?: string | undefined;
|
|
421
431
|
}>;
|
|
422
432
|
/** Organization information */
|
|
423
433
|
organization: z.ZodObject<{
|
|
@@ -455,6 +465,7 @@ export declare const AlertWebhookDeploymentSuccessObject: z.ZodObject<{
|
|
|
455
465
|
type: import("@trigger.dev/database").$Enums.RuntimeEnvironmentType;
|
|
456
466
|
id: string;
|
|
457
467
|
slug: string;
|
|
468
|
+
branchName?: string | undefined;
|
|
458
469
|
};
|
|
459
470
|
organization: {
|
|
460
471
|
name: string;
|
|
@@ -485,6 +496,7 @@ export declare const AlertWebhookDeploymentSuccessObject: z.ZodObject<{
|
|
|
485
496
|
type: import("@trigger.dev/database").$Enums.RuntimeEnvironmentType;
|
|
486
497
|
id: string;
|
|
487
498
|
slug: string;
|
|
499
|
+
branchName?: string | undefined;
|
|
488
500
|
};
|
|
489
501
|
organization: {
|
|
490
502
|
name: string;
|
|
@@ -563,14 +575,18 @@ export declare const AlertWebhookDeploymentFailedObject: z.ZodObject<{
|
|
|
563
575
|
id: z.ZodString;
|
|
564
576
|
type: z.ZodEnum<[import("@trigger.dev/database").$Enums.RuntimeEnvironmentType]>;
|
|
565
577
|
slug: z.ZodString;
|
|
578
|
+
/** Environment branch name */
|
|
579
|
+
branchName: z.ZodOptional<z.ZodString>;
|
|
566
580
|
}, "strip", z.ZodTypeAny, {
|
|
567
581
|
type: import("@trigger.dev/database").$Enums.RuntimeEnvironmentType;
|
|
568
582
|
id: string;
|
|
569
583
|
slug: string;
|
|
584
|
+
branchName?: string | undefined;
|
|
570
585
|
}, {
|
|
571
586
|
type: import("@trigger.dev/database").$Enums.RuntimeEnvironmentType;
|
|
572
587
|
id: string;
|
|
573
588
|
slug: string;
|
|
589
|
+
branchName?: string | undefined;
|
|
574
590
|
}>;
|
|
575
591
|
/** Organization information */
|
|
576
592
|
organization: z.ZodObject<{
|
|
@@ -614,6 +630,7 @@ export declare const AlertWebhookDeploymentFailedObject: z.ZodObject<{
|
|
|
614
630
|
type: import("@trigger.dev/database").$Enums.RuntimeEnvironmentType;
|
|
615
631
|
id: string;
|
|
616
632
|
slug: string;
|
|
633
|
+
branchName?: string | undefined;
|
|
617
634
|
};
|
|
618
635
|
organization: {
|
|
619
636
|
name: string;
|
|
@@ -644,6 +661,7 @@ export declare const AlertWebhookDeploymentFailedObject: z.ZodObject<{
|
|
|
644
661
|
type: import("@trigger.dev/database").$Enums.RuntimeEnvironmentType;
|
|
645
662
|
id: string;
|
|
646
663
|
slug: string;
|
|
664
|
+
branchName?: string | undefined;
|
|
647
665
|
};
|
|
648
666
|
organization: {
|
|
649
667
|
name: string;
|
|
@@ -844,14 +862,18 @@ export declare const Webhook: z.ZodDiscriminatedUnion<"type", [z.ZodObject<{
|
|
|
844
862
|
type: z.ZodEnum<[import("@trigger.dev/database").$Enums.RuntimeEnvironmentType]>;
|
|
845
863
|
/** Environment slug */
|
|
846
864
|
slug: z.ZodString;
|
|
865
|
+
/** Environment branch name */
|
|
866
|
+
branchName: z.ZodOptional<z.ZodString>;
|
|
847
867
|
}, "strip", z.ZodTypeAny, {
|
|
848
868
|
type: import("@trigger.dev/database").$Enums.RuntimeEnvironmentType;
|
|
849
869
|
id: string;
|
|
850
870
|
slug: string;
|
|
871
|
+
branchName?: string | undefined;
|
|
851
872
|
}, {
|
|
852
873
|
type: import("@trigger.dev/database").$Enums.RuntimeEnvironmentType;
|
|
853
874
|
id: string;
|
|
854
875
|
slug: string;
|
|
876
|
+
branchName?: string | undefined;
|
|
855
877
|
}>;
|
|
856
878
|
/** Organization information */
|
|
857
879
|
organization: z.ZodObject<{
|
|
@@ -935,6 +957,7 @@ export declare const Webhook: z.ZodDiscriminatedUnion<"type", [z.ZodObject<{
|
|
|
935
957
|
type: import("@trigger.dev/database").$Enums.RuntimeEnvironmentType;
|
|
936
958
|
id: string;
|
|
937
959
|
slug: string;
|
|
960
|
+
branchName?: string | undefined;
|
|
938
961
|
};
|
|
939
962
|
organization: {
|
|
940
963
|
name: string;
|
|
@@ -991,6 +1014,7 @@ export declare const Webhook: z.ZodDiscriminatedUnion<"type", [z.ZodObject<{
|
|
|
991
1014
|
type: import("@trigger.dev/database").$Enums.RuntimeEnvironmentType;
|
|
992
1015
|
id: string;
|
|
993
1016
|
slug: string;
|
|
1017
|
+
branchName?: string | undefined;
|
|
994
1018
|
};
|
|
995
1019
|
organization: {
|
|
996
1020
|
name: string;
|
|
@@ -1055,6 +1079,7 @@ export declare const Webhook: z.ZodDiscriminatedUnion<"type", [z.ZodObject<{
|
|
|
1055
1079
|
type: import("@trigger.dev/database").$Enums.RuntimeEnvironmentType;
|
|
1056
1080
|
id: string;
|
|
1057
1081
|
slug: string;
|
|
1082
|
+
branchName?: string | undefined;
|
|
1058
1083
|
};
|
|
1059
1084
|
organization: {
|
|
1060
1085
|
name: string;
|
|
@@ -1117,6 +1142,7 @@ export declare const Webhook: z.ZodDiscriminatedUnion<"type", [z.ZodObject<{
|
|
|
1117
1142
|
type: import("@trigger.dev/database").$Enums.RuntimeEnvironmentType;
|
|
1118
1143
|
id: string;
|
|
1119
1144
|
slug: string;
|
|
1145
|
+
branchName?: string | undefined;
|
|
1120
1146
|
};
|
|
1121
1147
|
organization: {
|
|
1122
1148
|
name: string;
|
|
@@ -1187,14 +1213,18 @@ export declare const Webhook: z.ZodDiscriminatedUnion<"type", [z.ZodObject<{
|
|
|
1187
1213
|
id: z.ZodString;
|
|
1188
1214
|
type: z.ZodEnum<[import("@trigger.dev/database").$Enums.RuntimeEnvironmentType]>;
|
|
1189
1215
|
slug: z.ZodString;
|
|
1216
|
+
/** Environment branch name */
|
|
1217
|
+
branchName: z.ZodOptional<z.ZodString>;
|
|
1190
1218
|
}, "strip", z.ZodTypeAny, {
|
|
1191
1219
|
type: import("@trigger.dev/database").$Enums.RuntimeEnvironmentType;
|
|
1192
1220
|
id: string;
|
|
1193
1221
|
slug: string;
|
|
1222
|
+
branchName?: string | undefined;
|
|
1194
1223
|
}, {
|
|
1195
1224
|
type: import("@trigger.dev/database").$Enums.RuntimeEnvironmentType;
|
|
1196
1225
|
id: string;
|
|
1197
1226
|
slug: string;
|
|
1227
|
+
branchName?: string | undefined;
|
|
1198
1228
|
}>;
|
|
1199
1229
|
/** Organization information */
|
|
1200
1230
|
organization: z.ZodObject<{
|
|
@@ -1232,6 +1262,7 @@ export declare const Webhook: z.ZodDiscriminatedUnion<"type", [z.ZodObject<{
|
|
|
1232
1262
|
type: import("@trigger.dev/database").$Enums.RuntimeEnvironmentType;
|
|
1233
1263
|
id: string;
|
|
1234
1264
|
slug: string;
|
|
1265
|
+
branchName?: string | undefined;
|
|
1235
1266
|
};
|
|
1236
1267
|
organization: {
|
|
1237
1268
|
name: string;
|
|
@@ -1262,6 +1293,7 @@ export declare const Webhook: z.ZodDiscriminatedUnion<"type", [z.ZodObject<{
|
|
|
1262
1293
|
type: import("@trigger.dev/database").$Enums.RuntimeEnvironmentType;
|
|
1263
1294
|
id: string;
|
|
1264
1295
|
slug: string;
|
|
1296
|
+
branchName?: string | undefined;
|
|
1265
1297
|
};
|
|
1266
1298
|
organization: {
|
|
1267
1299
|
name: string;
|
|
@@ -1300,6 +1332,7 @@ export declare const Webhook: z.ZodDiscriminatedUnion<"type", [z.ZodObject<{
|
|
|
1300
1332
|
type: import("@trigger.dev/database").$Enums.RuntimeEnvironmentType;
|
|
1301
1333
|
id: string;
|
|
1302
1334
|
slug: string;
|
|
1335
|
+
branchName?: string | undefined;
|
|
1303
1336
|
};
|
|
1304
1337
|
organization: {
|
|
1305
1338
|
name: string;
|
|
@@ -1336,6 +1369,7 @@ export declare const Webhook: z.ZodDiscriminatedUnion<"type", [z.ZodObject<{
|
|
|
1336
1369
|
type: import("@trigger.dev/database").$Enums.RuntimeEnvironmentType;
|
|
1337
1370
|
id: string;
|
|
1338
1371
|
slug: string;
|
|
1372
|
+
branchName?: string | undefined;
|
|
1339
1373
|
};
|
|
1340
1374
|
organization: {
|
|
1341
1375
|
name: string;
|
|
@@ -1419,14 +1453,18 @@ export declare const Webhook: z.ZodDiscriminatedUnion<"type", [z.ZodObject<{
|
|
|
1419
1453
|
id: z.ZodString;
|
|
1420
1454
|
type: z.ZodEnum<[import("@trigger.dev/database").$Enums.RuntimeEnvironmentType]>;
|
|
1421
1455
|
slug: z.ZodString;
|
|
1456
|
+
/** Environment branch name */
|
|
1457
|
+
branchName: z.ZodOptional<z.ZodString>;
|
|
1422
1458
|
}, "strip", z.ZodTypeAny, {
|
|
1423
1459
|
type: import("@trigger.dev/database").$Enums.RuntimeEnvironmentType;
|
|
1424
1460
|
id: string;
|
|
1425
1461
|
slug: string;
|
|
1462
|
+
branchName?: string | undefined;
|
|
1426
1463
|
}, {
|
|
1427
1464
|
type: import("@trigger.dev/database").$Enums.RuntimeEnvironmentType;
|
|
1428
1465
|
id: string;
|
|
1429
1466
|
slug: string;
|
|
1467
|
+
branchName?: string | undefined;
|
|
1430
1468
|
}>;
|
|
1431
1469
|
/** Organization information */
|
|
1432
1470
|
organization: z.ZodObject<{
|
|
@@ -1470,6 +1508,7 @@ export declare const Webhook: z.ZodDiscriminatedUnion<"type", [z.ZodObject<{
|
|
|
1470
1508
|
type: import("@trigger.dev/database").$Enums.RuntimeEnvironmentType;
|
|
1471
1509
|
id: string;
|
|
1472
1510
|
slug: string;
|
|
1511
|
+
branchName?: string | undefined;
|
|
1473
1512
|
};
|
|
1474
1513
|
organization: {
|
|
1475
1514
|
name: string;
|
|
@@ -1500,6 +1539,7 @@ export declare const Webhook: z.ZodDiscriminatedUnion<"type", [z.ZodObject<{
|
|
|
1500
1539
|
type: import("@trigger.dev/database").$Enums.RuntimeEnvironmentType;
|
|
1501
1540
|
id: string;
|
|
1502
1541
|
slug: string;
|
|
1542
|
+
branchName?: string | undefined;
|
|
1503
1543
|
};
|
|
1504
1544
|
organization: {
|
|
1505
1545
|
name: string;
|
|
@@ -1538,6 +1578,7 @@ export declare const Webhook: z.ZodDiscriminatedUnion<"type", [z.ZodObject<{
|
|
|
1538
1578
|
type: import("@trigger.dev/database").$Enums.RuntimeEnvironmentType;
|
|
1539
1579
|
id: string;
|
|
1540
1580
|
slug: string;
|
|
1581
|
+
branchName?: string | undefined;
|
|
1541
1582
|
};
|
|
1542
1583
|
organization: {
|
|
1543
1584
|
name: string;
|
|
@@ -1574,6 +1615,7 @@ export declare const Webhook: z.ZodDiscriminatedUnion<"type", [z.ZodObject<{
|
|
|
1574
1615
|
type: import("@trigger.dev/database").$Enums.RuntimeEnvironmentType;
|
|
1575
1616
|
id: string;
|
|
1576
1617
|
slug: string;
|
|
1618
|
+
branchName?: string | undefined;
|
|
1577
1619
|
};
|
|
1578
1620
|
organization: {
|
|
1579
1621
|
name: string;
|
|
@@ -58,6 +58,8 @@ const AlertWebhookRunFailedObject = zod_1.z.object({
|
|
|
58
58
|
type: common_js_1.RuntimeEnvironmentTypeSchema,
|
|
59
59
|
/** Environment slug */
|
|
60
60
|
slug: zod_1.z.string(),
|
|
61
|
+
/** Environment branch name */
|
|
62
|
+
branchName: zod_1.z.string().optional(),
|
|
61
63
|
}),
|
|
62
64
|
/** Organization information */
|
|
63
65
|
organization: zod_1.z.object({
|
|
@@ -97,6 +99,8 @@ const deploymentCommonProperties = {
|
|
|
97
99
|
id: zod_1.z.string(),
|
|
98
100
|
type: common_js_1.RuntimeEnvironmentTypeSchema,
|
|
99
101
|
slug: zod_1.z.string(),
|
|
102
|
+
/** Environment branch name */
|
|
103
|
+
branchName: zod_1.z.string().optional(),
|
|
100
104
|
}),
|
|
101
105
|
/** Organization information */
|
|
102
106
|
organization: zod_1.z.object({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webhooks.js","sourceRoot":"","sources":["../../../../src/v3/schemas/webhooks.ts"],"names":[],"mappings":";;;AAAA,6BAAwB;AACxB,qCAAqC;AACrC,2CAAyE;AAEzE,oDAAoD;AACpD,MAAM,2BAA2B,GAAG,OAAC,CAAC,MAAM,CAAC;IAC3C,uBAAuB;IACvB,IAAI,EAAE,OAAC,CAAC,MAAM,CAAC;QACb,qCAAqC;QACrC,EAAE,EAAE,OAAC,CAAC,MAAM,EAAE;QACd,0CAA0C;QAC1C,QAAQ,EAAE,OAAC,CAAC,MAAM,EAAE;QACpB,yCAAyC;QACzC,UAAU,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;QACjC,0BAA0B;QAC1B,OAAO,EAAE,OAAC,CAAC,MAAM,EAAE;QACnB,8BAA8B;QAC9B,UAAU,EAAE,OAAC,CAAC,MAAM,EAAE;QACtB,8BAA8B;QAC9B,UAAU,EAAE,OAAC,CAAC,MAAM,EAAE;KACvB,CAAC;IACF,sBAAsB;IACtB,GAAG,EAAE,OAAC,CAAC,MAAM,CAAC;QACZ,oCAAoC;QACpC,EAAE,EAAE,OAAC,CAAC,MAAM,EAAE;QACd,iBAAiB;QACjB,MAAM,EAAE,OAAC,CAAC,MAAM,EAAE;QAClB,gCAAgC;QAChC,MAAM,EAAE,kBAAS;QACjB,+BAA+B;QAC/B,SAAS,EAAE,OAAC,CAAC,MAAM,CAAC,IAAI,EAAE;QAC1B,qCAAqC;QACrC,SAAS,EAAE,OAAC,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,QAAQ,EAAE;QACrC,sCAAsC;QACtC,WAAW,EAAE,OAAC,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,QAAQ,EAAE;QACvC,iCAAiC;QACjC,MAAM,EAAE,OAAC,CAAC,OAAO,EAAE;QACnB,kCAAkC;QAClC,cAAc,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;QACrC,sBAAsB;QACtB,IAAI,EAAE,OAAC,CAAC,KAAK,CAAC,OAAC,CAAC,MAAM,EAAE,CAAC;QACzB,wBAAwB;QACxB,KAAK,EAAE,wBAAY;QACnB,iDAAiD;QACjD,kBAAkB,EAAE,OAAC,CAAC,OAAO,EAAE;QAC/B,sCAAsC;QACtC,OAAO,EAAE,OAAC,CAAC,MAAM,EAAE;QACnB,2CAA2C;QAC3C,YAAY,EAAE,OAAC,CAAC,MAAM,EAAE;KACzB,CAAC;IACF,8BAA8B;IAC9B,WAAW,EAAE,OAAC,CAAC,MAAM,CAAC;QACpB,qBAAqB;QACrB,EAAE,EAAE,OAAC,CAAC,MAAM,EAAE;QACd,uBAAuB;QACvB,IAAI,EAAE,wCAA4B;QAClC,uBAAuB;QACvB,IAAI,EAAE,OAAC,CAAC,MAAM,EAAE;
|
|
1
|
+
{"version":3,"file":"webhooks.js","sourceRoot":"","sources":["../../../../src/v3/schemas/webhooks.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,7 @@ const structuredLogger_js_1 = require("../utils/structuredLogger.js");
|
|
|
7
7
|
const http_js_1 = require("../apps/http.js");
|
|
8
8
|
const prom_client_1 = require("prom-client");
|
|
9
9
|
const utils_js_1 = require("../../utils.js");
|
|
10
|
-
const logger = new structuredLogger_js_1.SimpleStructuredLogger("
|
|
10
|
+
const logger = new structuredLogger_js_1.SimpleStructuredLogger("http-server");
|
|
11
11
|
const HttpMethod = zod_1.z.enum([
|
|
12
12
|
"GET",
|
|
13
13
|
"POST",
|
|
@@ -68,7 +68,7 @@ class HttpServer {
|
|
|
68
68
|
const startTime = process.hrtime();
|
|
69
69
|
try {
|
|
70
70
|
const { url, method } = req;
|
|
71
|
-
logger.
|
|
71
|
+
logger.debug(`${method} ${url?.split("?")[0]}`, { url });
|
|
72
72
|
if (!url) {
|
|
73
73
|
logger.error("Request URL is empty", { method });
|
|
74
74
|
return reply.text("Request URL is empty", 400);
|
|
@@ -125,7 +125,7 @@ class HttpServer {
|
|
|
125
125
|
body: parsedBody.data,
|
|
126
126
|
}));
|
|
127
127
|
if (error) {
|
|
128
|
-
logger.error("Route handler error", { error });
|
|
128
|
+
logger.error("Route handler error", { error: this.formatError(error) });
|
|
129
129
|
return reply.empty(500);
|
|
130
130
|
}
|
|
131
131
|
if (keepConnectionAlive) {
|
|
@@ -134,7 +134,7 @@ class HttpServer {
|
|
|
134
134
|
}
|
|
135
135
|
}
|
|
136
136
|
catch (error) {
|
|
137
|
-
logger.error("Failed to handle request", { error });
|
|
137
|
+
logger.error("Failed to handle request", { error: this.formatError(error) });
|
|
138
138
|
return reply.empty(500);
|
|
139
139
|
}
|
|
140
140
|
finally {
|
|
@@ -239,6 +239,16 @@ class HttpServer {
|
|
|
239
239
|
}
|
|
240
240
|
return null;
|
|
241
241
|
}
|
|
242
|
+
formatError(error) {
|
|
243
|
+
if (error instanceof Error) {
|
|
244
|
+
return {
|
|
245
|
+
name: error.name,
|
|
246
|
+
message: error.message,
|
|
247
|
+
stack: error.stack,
|
|
248
|
+
};
|
|
249
|
+
}
|
|
250
|
+
return String(error);
|
|
251
|
+
}
|
|
242
252
|
}
|
|
243
253
|
exports.HttpServer = HttpServer;
|
|
244
254
|
//# sourceMappingURL=httpServer.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"httpServer.js","sourceRoot":"","sources":["../../../../src/v3/serverOnly/httpServer.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"httpServer.js","sourceRoot":"","sources":["../../../../src/v3/serverOnly/httpServer.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,4 +20,5 @@ __exportStar(require("./httpServer.js"), exports);
|
|
|
20
20
|
__exportStar(require("./singleton.js"), exports);
|
|
21
21
|
__exportStar(require("./shutdownManager.js"), exports);
|
|
22
22
|
__exportStar(require("./k8s.js"), exports);
|
|
23
|
+
__exportStar(require("./jumpHash.js"), exports);
|
|
23
24
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/v3/serverOnly/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,wDAAsC;AACtC,sDAAoC;AACpC,kDAAgC;AAChC,iDAA+B;AAC/B,uDAAqC;AACrC,2CAAyB"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/v3/serverOnly/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,wDAAsC;AACtC,sDAAoC;AACpC,kDAAgC;AAChC,iDAA+B;AAC/B,uDAAqC;AACrC,2CAAyB;AACzB,gDAA8B"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export declare function jumpHash(key: string, buckets: number): number;
|
|
@@ -0,0 +1,48 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.jumpHash = jumpHash;
|
|
4
|
+
const node_crypto_1 = require("node:crypto");
|
|
5
|
+
/**
|
|
6
|
+
* Returns the binary hash of a binary value. Hash function and output length are configurable.
|
|
7
|
+
*/
|
|
8
|
+
function hash(data, outputLength = 32, type = "sha256") {
|
|
9
|
+
const hasher = (0, node_crypto_1.createHash)(type);
|
|
10
|
+
hasher.update(data);
|
|
11
|
+
let hash = new Uint8Array(hasher.digest());
|
|
12
|
+
hash = hash.subarray(0, outputLength);
|
|
13
|
+
return hash;
|
|
14
|
+
}
|
|
15
|
+
function jumpHash(key, buckets) {
|
|
16
|
+
return jumpConsistentHash(hash(Buffer.from(key)), buckets);
|
|
17
|
+
}
|
|
18
|
+
/**
|
|
19
|
+
* Based on Node.js's Buffer implementation: https://github.com/nodejs/node/blob/ed8fc7e11d688cbcdf33d0d149830064758bdcd2/lib/internal/buffer.js#L98
|
|
20
|
+
* @param bytes
|
|
21
|
+
*/
|
|
22
|
+
function bytesToBigInt(bytes) {
|
|
23
|
+
const hi = bytes[0] * 2 ** 24 + bytes[1] * 2 ** 16 + bytes[2] * 2 ** 8 + bytes[3];
|
|
24
|
+
const lo = bytes[4] * 2 ** 24 + bytes[5] * 2 ** 16 + bytes[6] * 2 ** 8 + bytes[7];
|
|
25
|
+
// tslint:disable-next-line:no-bitwise
|
|
26
|
+
return (BigInt(hi) << 32n) + BigInt(lo);
|
|
27
|
+
}
|
|
28
|
+
/**
|
|
29
|
+
* @param {Uint8Array} key 8 bytes (represents uint64 number)
|
|
30
|
+
* @param {number} numBuckets Up to 32-bit number
|
|
31
|
+
*
|
|
32
|
+
* @return {number} Bucket from `[0, numBuckets)` range
|
|
33
|
+
*/
|
|
34
|
+
function jumpConsistentHash(key, numBuckets) {
|
|
35
|
+
let keyBigInt = bytesToBigInt(key);
|
|
36
|
+
let b = -1n;
|
|
37
|
+
let j = 0n;
|
|
38
|
+
while (j < numBuckets) {
|
|
39
|
+
b = j;
|
|
40
|
+
// We fit the number after multiplication within 64-bit range, just like in C++ implementation from paper
|
|
41
|
+
keyBigInt = ((keyBigInt * 2862933555777941757n) % 2n ** 64n) + 1n;
|
|
42
|
+
// Here we need to divide numbers as double (like in C++ implementation from paper), hence converting back to numbers for that
|
|
43
|
+
// tslint:disable-next-line:no-bitwise
|
|
44
|
+
j = BigInt(Math.floor(((Number(b) + 1) * Number(1n << 31n)) / Number((keyBigInt >> 33n) + 1n)));
|
|
45
|
+
}
|
|
46
|
+
return Number(b);
|
|
47
|
+
}
|
|
48
|
+
//# sourceMappingURL=jumpHash.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"jumpHash.js","sourceRoot":"","sources":["../../../../src/v3/serverOnly/jumpHash.ts"],"names":[],"mappings":";;AAaA,4BAEC;AAfD,6CAAyC;AAEzC;;GAEG;AACH,SAAS,IAAI,CAAC,IAAgB,EAAE,YAAY,GAAG,EAAE,EAAE,IAAI,GAAG,QAAQ;IAChE,MAAM,MAAM,GAAG,IAAA,wBAAU,EAAC,IAAI,CAAC,CAAC;IAChC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACpB,IAAI,IAAI,GAAG,IAAI,UAAU,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;IAC3C,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC;IACtC,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAgB,QAAQ,CAAC,GAAW,EAAE,OAAe;IACnD,OAAO,kBAAkB,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;AAC7D,CAAC;AAED;;;GAGG;AACH,SAAS,aAAa,CAAC,KAAiB;IACtC,MAAM,EAAE,GAAG,KAAK,CAAC,CAAC,CAAE,GAAG,CAAC,IAAI,EAAE,GAAG,KAAK,CAAC,CAAC,CAAE,GAAG,CAAC,IAAI,EAAE,GAAG,KAAK,CAAC,CAAC,CAAE,GAAG,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,CAAC,CAAE,CAAC;IACtF,MAAM,EAAE,GAAG,KAAK,CAAC,CAAC,CAAE,GAAG,CAAC,IAAI,EAAE,GAAG,KAAK,CAAC,CAAC,CAAE,GAAG,CAAC,IAAI,EAAE,GAAG,KAAK,CAAC,CAAC,CAAE,GAAG,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,CAAC,CAAE,CAAC;IAEtF,sCAAsC;IACtC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,GAAG,CAAC,GAAG,MAAM,CAAC,EAAE,CAAC,CAAC;AAC1C,CAAC;AAED;;;;;GAKG;AACH,SAAS,kBAAkB,CAAC,GAAe,EAAE,UAAkB;IAC7D,IAAI,SAAS,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC;IACnC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;IACZ,IAAI,CAAC,GAAG,EAAE,CAAC;IACX,OAAO,CAAC,GAAG,UAAU,EAAE,CAAC;QACtB,CAAC,GAAG,CAAC,CAAC;QACN,yGAAyG;QACzG,SAAS,GAAG,CAAC,CAAC,SAAS,GAAG,oBAAoB,CAAC,GAAG,EAAE,IAAI,GAAG,CAAC,GAAG,EAAE,CAAC;QAClE,8HAA8H;QAC9H,sCAAsC;QACtC,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,MAAM,CAAC,EAAE,IAAI,GAAG,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,SAAS,IAAI,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC;IAClG,CAAC;IACD,OAAO,MAAM,CAAC,CAAC,CAAC,CAAC;AACnB,CAAC"}
|
|
@@ -11,6 +11,7 @@ export declare class TaskContextAPI {
|
|
|
11
11
|
get worker(): ServerBackgroundWorker | undefined;
|
|
12
12
|
get isWarmStart(): boolean | undefined;
|
|
13
13
|
get attributes(): Attributes;
|
|
14
|
+
get resourceAttributes(): Attributes;
|
|
14
15
|
get workerAttributes(): Attributes;
|
|
15
16
|
get contextAttributes(): Attributes;
|
|
16
17
|
disable(): void;
|
|
@@ -35,6 +35,25 @@ class TaskContextAPI {
|
|
|
35
35
|
}
|
|
36
36
|
return {};
|
|
37
37
|
}
|
|
38
|
+
get resourceAttributes() {
|
|
39
|
+
if (this.ctx) {
|
|
40
|
+
return {
|
|
41
|
+
[semanticInternalAttributes_js_1.SemanticInternalAttributes.ENVIRONMENT_ID]: this.ctx.environment.id,
|
|
42
|
+
[semanticInternalAttributes_js_1.SemanticInternalAttributes.ENVIRONMENT_TYPE]: this.ctx.environment.type,
|
|
43
|
+
[semanticInternalAttributes_js_1.SemanticInternalAttributes.ORGANIZATION_ID]: this.ctx.organization.id,
|
|
44
|
+
[semanticInternalAttributes_js_1.SemanticInternalAttributes.PROJECT_ID]: this.ctx.project.id,
|
|
45
|
+
[semanticInternalAttributes_js_1.SemanticInternalAttributes.PROJECT_REF]: this.ctx.project.ref,
|
|
46
|
+
[semanticInternalAttributes_js_1.SemanticInternalAttributes.PROJECT_NAME]: this.ctx.project.name,
|
|
47
|
+
[semanticInternalAttributes_js_1.SemanticInternalAttributes.ORGANIZATION_SLUG]: this.ctx.organization.slug,
|
|
48
|
+
[semanticInternalAttributes_js_1.SemanticInternalAttributes.ORGANIZATION_NAME]: this.ctx.organization.name,
|
|
49
|
+
[semanticInternalAttributes_js_1.SemanticInternalAttributes.MACHINE_PRESET_NAME]: this.ctx.machine?.name,
|
|
50
|
+
[semanticInternalAttributes_js_1.SemanticInternalAttributes.MACHINE_PRESET_CPU]: this.ctx.machine?.cpu,
|
|
51
|
+
[semanticInternalAttributes_js_1.SemanticInternalAttributes.MACHINE_PRESET_MEMORY]: this.ctx.machine?.memory,
|
|
52
|
+
[semanticInternalAttributes_js_1.SemanticInternalAttributes.MACHINE_PRESET_CENTS_PER_MS]: this.ctx.machine?.centsPerMs,
|
|
53
|
+
};
|
|
54
|
+
}
|
|
55
|
+
return {};
|
|
56
|
+
}
|
|
38
57
|
get workerAttributes() {
|
|
39
58
|
if (this.worker) {
|
|
40
59
|
return {
|
|
@@ -54,22 +73,10 @@ class TaskContextAPI {
|
|
|
54
73
|
[semanticInternalAttributes_js_1.SemanticInternalAttributes.TASK_EXPORT_NAME]: this.ctx.task.exportName,
|
|
55
74
|
[semanticInternalAttributes_js_1.SemanticInternalAttributes.QUEUE_NAME]: this.ctx.queue.name,
|
|
56
75
|
[semanticInternalAttributes_js_1.SemanticInternalAttributes.QUEUE_ID]: this.ctx.queue.id,
|
|
57
|
-
[semanticInternalAttributes_js_1.SemanticInternalAttributes.ENVIRONMENT_ID]: this.ctx.environment.id,
|
|
58
|
-
[semanticInternalAttributes_js_1.SemanticInternalAttributes.ENVIRONMENT_TYPE]: this.ctx.environment.type,
|
|
59
|
-
[semanticInternalAttributes_js_1.SemanticInternalAttributes.ORGANIZATION_ID]: this.ctx.organization.id,
|
|
60
|
-
[semanticInternalAttributes_js_1.SemanticInternalAttributes.PROJECT_ID]: this.ctx.project.id,
|
|
61
|
-
[semanticInternalAttributes_js_1.SemanticInternalAttributes.PROJECT_REF]: this.ctx.project.ref,
|
|
62
|
-
[semanticInternalAttributes_js_1.SemanticInternalAttributes.PROJECT_NAME]: this.ctx.project.name,
|
|
63
76
|
[semanticInternalAttributes_js_1.SemanticInternalAttributes.RUN_ID]: this.ctx.run.id,
|
|
64
77
|
[semanticInternalAttributes_js_1.SemanticInternalAttributes.RUN_IS_TEST]: this.ctx.run.isTest,
|
|
65
|
-
[semanticInternalAttributes_js_1.SemanticInternalAttributes.ORGANIZATION_SLUG]: this.ctx.organization.slug,
|
|
66
|
-
[semanticInternalAttributes_js_1.SemanticInternalAttributes.ORGANIZATION_NAME]: this.ctx.organization.name,
|
|
67
78
|
[semanticInternalAttributes_js_1.SemanticInternalAttributes.BATCH_ID]: this.ctx.batch?.id,
|
|
68
79
|
[semanticInternalAttributes_js_1.SemanticInternalAttributes.IDEMPOTENCY_KEY]: this.ctx.run.idempotencyKey,
|
|
69
|
-
[semanticInternalAttributes_js_1.SemanticInternalAttributes.MACHINE_PRESET_NAME]: this.ctx.machine?.name,
|
|
70
|
-
[semanticInternalAttributes_js_1.SemanticInternalAttributes.MACHINE_PRESET_CPU]: this.ctx.machine?.cpu,
|
|
71
|
-
[semanticInternalAttributes_js_1.SemanticInternalAttributes.MACHINE_PRESET_MEMORY]: this.ctx.machine?.memory,
|
|
72
|
-
[semanticInternalAttributes_js_1.SemanticInternalAttributes.MACHINE_PRESET_CENTS_PER_MS]: this.ctx.machine?.centsPerMs,
|
|
73
80
|
};
|
|
74
81
|
}
|
|
75
82
|
return {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/v3/taskContext/index.ts"],"names":[],"mappings":";;;AAEA,oFAA8E;AAC9E,oDAAkF;AAGlF,MAAM,QAAQ,GAAG,cAAc,CAAC;AAEhC,MAAa,cAAc;IACjB,MAAM,CAAC,SAAS,CAAkB;IAE1C,gBAAuB,CAAC;IAEjB,MAAM,CAAC,WAAW;QACvB,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;YACpB,IAAI,CAAC,SAAS,GAAG,IAAI,cAAc,EAAE,CAAC;QACxC,CAAC;QAED,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,CAAC;IAED,IAAI,YAAY;QACd,OAAO,IAAI,CAAC,eAAe,EAAE,KAAK,SAAS,CAAC;IAC9C,CAAC;IAED,IAAI,GAAG;QACL,OAAO,IAAI,CAAC,eAAe,EAAE,EAAE,GAAG,CAAC;IACrC,CAAC;IAED,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,eAAe,EAAE,EAAE,MAAM,CAAC;IACxC,CAAC;IAED,IAAI,WAAW;QACb,OAAO,IAAI,CAAC,eAAe,EAAE,EAAE,WAAW,CAAC;IAC7C,CAAC;IAED,IAAI,UAAU;QACZ,IAAI,IAAI,CAAC,GAAG,EAAE,CAAC;YACb,OAAO;gBACL,GAAG,IAAI,CAAC,iBAAiB;gBACzB,GAAG,IAAI,CAAC,gBAAgB;gBACxB,CAAC,0DAA0B,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,WAAW;aAC5D,CAAC;QACJ,CAAC;QAED,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,IAAI,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/v3/taskContext/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,10 +14,7 @@ class TaskContextSpanProcessor {
|
|
|
14
14
|
// Called when a span starts
|
|
15
15
|
onStart(span, parentContext) {
|
|
16
16
|
if (task_context_api_js_1.taskContext.ctx) {
|
|
17
|
-
span.setAttributes((0, flattenAttributes_js_1.flattenAttributes)(
|
|
18
|
-
[semanticInternalAttributes_js_1.SemanticInternalAttributes.ATTEMPT_ID]: task_context_api_js_1.taskContext.ctx.attempt.id,
|
|
19
|
-
[semanticInternalAttributes_js_1.SemanticInternalAttributes.ATTEMPT_NUMBER]: task_context_api_js_1.taskContext.ctx.attempt.number,
|
|
20
|
-
}, semanticInternalAttributes_js_1.SemanticInternalAttributes.METADATA));
|
|
17
|
+
span.setAttributes((0, flattenAttributes_js_1.flattenAttributes)(task_context_api_js_1.taskContext.attributes, semanticInternalAttributes_js_1.SemanticInternalAttributes.METADATA));
|
|
21
18
|
}
|
|
22
19
|
if (!isPartialSpan(span) && !skipPartialSpan(span)) {
|
|
23
20
|
const partialSpan = createPartialSpan(this._tracer, span, parentContext);
|
|
@@ -52,10 +49,7 @@ function createPartialSpan(tracer, span, parentContext) {
|
|
|
52
49
|
},
|
|
53
50
|
}, parentContext);
|
|
54
51
|
if (task_context_api_js_1.taskContext.ctx) {
|
|
55
|
-
partialSpan.setAttributes((0, flattenAttributes_js_1.flattenAttributes)(
|
|
56
|
-
[semanticInternalAttributes_js_1.SemanticInternalAttributes.ATTEMPT_ID]: task_context_api_js_1.taskContext.ctx.attempt.id,
|
|
57
|
-
[semanticInternalAttributes_js_1.SemanticInternalAttributes.ATTEMPT_NUMBER]: task_context_api_js_1.taskContext.ctx.attempt.number,
|
|
58
|
-
}, semanticInternalAttributes_js_1.SemanticInternalAttributes.METADATA));
|
|
52
|
+
partialSpan.setAttributes((0, flattenAttributes_js_1.flattenAttributes)(task_context_api_js_1.taskContext.attributes, semanticInternalAttributes_js_1.SemanticInternalAttributes.METADATA));
|
|
59
53
|
}
|
|
60
54
|
if (span.events) {
|
|
61
55
|
for (const event of span.events) {
|
|
@@ -75,10 +69,7 @@ class TaskContextLogProcessor {
|
|
|
75
69
|
onEmit(logRecord, context) {
|
|
76
70
|
// Adds in the context attributes to the log record
|
|
77
71
|
if (task_context_api_js_1.taskContext.ctx) {
|
|
78
|
-
logRecord.setAttributes((0, flattenAttributes_js_1.flattenAttributes)(
|
|
79
|
-
[semanticInternalAttributes_js_1.SemanticInternalAttributes.ATTEMPT_ID]: task_context_api_js_1.taskContext.ctx.attempt.id,
|
|
80
|
-
[semanticInternalAttributes_js_1.SemanticInternalAttributes.ATTEMPT_NUMBER]: task_context_api_js_1.taskContext.ctx.attempt.number,
|
|
81
|
-
}, semanticInternalAttributes_js_1.SemanticInternalAttributes.METADATA));
|
|
72
|
+
logRecord.setAttributes((0, flattenAttributes_js_1.flattenAttributes)(task_context_api_js_1.taskContext.attributes, semanticInternalAttributes_js_1.SemanticInternalAttributes.METADATA));
|
|
82
73
|
}
|
|
83
74
|
this._innerProcessor.onEmit(logRecord, context);
|
|
84
75
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"otelProcessors.js","sourceRoot":"","sources":["../../../../src/v3/taskContext/otelProcessors.ts"],"names":[],"mappings":";;;AAEA,oFAA8E;AAE9E,wEAAkE;AAClE,gEAAqD;AAGrD,MAAa,wBAAwB;IAC3B,eAAe,CAAgB;IAC/B,OAAO,CAAS;IAExB,YAAY,MAAc,EAAE,cAA6B;QACvD,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QACtB,IAAI,CAAC,eAAe,GAAG,cAAc,CAAC;IACxC,CAAC;IAED,4BAA4B;IAC5B,OAAO,CAAC,IAAU,EAAE,aAAsB;QACxC,IAAI,iCAAW,CAAC,GAAG,EAAE,CAAC;YACpB,IAAI,CAAC,aAAa,CAChB,IAAA,wCAAiB,
|
|
1
|
+
{"version":3,"file":"otelProcessors.js","sourceRoot":"","sources":["../../../../src/v3/taskContext/otelProcessors.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,6 +7,7 @@ class NoopTimeoutManager {
|
|
|
7
7
|
abortAfterTimeout(timeoutInSeconds) {
|
|
8
8
|
return new AbortController();
|
|
9
9
|
}
|
|
10
|
+
reset() { }
|
|
10
11
|
}
|
|
11
12
|
const NOOP_TIMEOUT_MANAGER = new NoopTimeoutManager();
|
|
12
13
|
class TimeoutAPI {
|
|
@@ -30,6 +31,10 @@ class TimeoutAPI {
|
|
|
30
31
|
disable() {
|
|
31
32
|
(0, globals_js_1.unregisterGlobal)(API_NAME);
|
|
32
33
|
}
|
|
34
|
+
reset() {
|
|
35
|
+
this.#getManager().reset();
|
|
36
|
+
this.disable();
|
|
37
|
+
}
|
|
33
38
|
#getManager() {
|
|
34
39
|
return (0, globals_js_1.getGlobal)(API_NAME) ?? NOOP_TIMEOUT_MANAGER;
|
|
35
40
|
}
|