@trigger.dev/core 4.8.5 → 4.8.7
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 +15 -4
- package/dist/commonjs/v3/apiClient/index.js +81 -59
- package/dist/commonjs/v3/apiClient/index.js.map +1 -1
- package/dist/commonjs/v3/apiClient/oidc.js +1 -1
- package/dist/commonjs/v3/apiClient/oidc.js.map +1 -1
- package/dist/commonjs/v3/apiClient/publicTokenCompatibility.d.ts +1 -0
- package/dist/commonjs/v3/apiClient/publicTokenCompatibility.js +26 -0
- package/dist/commonjs/v3/apiClient/publicTokenCompatibility.js.map +1 -0
- package/dist/commonjs/v3/apiClientManager/index.d.ts +1 -1
- package/dist/commonjs/v3/apiClientManager/index.js +2 -2
- package/dist/commonjs/v3/apiClientManager/index.js.map +1 -1
- package/dist/commonjs/v3/apps/http.d.ts +16 -1
- package/dist/commonjs/v3/apps/http.js +61 -10
- package/dist/commonjs/v3/apps/http.js.map +1 -1
- package/dist/commonjs/v3/build/runtime.d.ts +13 -0
- package/dist/commonjs/v3/build/runtime.js +28 -2
- package/dist/commonjs/v3/build/runtime.js.map +1 -1
- package/dist/commonjs/v3/config.d.ts +12 -0
- package/dist/commonjs/v3/isomorphic/concurrencyKey.d.ts +8 -0
- package/dist/commonjs/v3/isomorphic/concurrencyKey.js +38 -0
- package/dist/commonjs/v3/isomorphic/concurrencyKey.js.map +1 -0
- package/dist/commonjs/v3/isomorphic/index.d.ts +1 -0
- package/dist/commonjs/v3/isomorphic/index.js +1 -0
- package/dist/commonjs/v3/isomorphic/index.js.map +1 -1
- package/dist/commonjs/v3/isomorphic/queueName.d.ts +2 -0
- package/dist/commonjs/v3/isomorphic/queueName.js +3 -0
- package/dist/commonjs/v3/isomorphic/queueName.js.map +1 -1
- package/dist/commonjs/v3/jwt.d.ts +2 -1
- package/dist/commonjs/v3/jwt.js +6 -3
- package/dist/commonjs/v3/jwt.js.map +1 -1
- package/dist/commonjs/v3/otel/machineId.d.ts +1 -1
- package/dist/commonjs/v3/otel/machineId.js +6 -2
- package/dist/commonjs/v3/otel/machineId.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/runEngineWorker/consts.d.ts +1 -0
- package/dist/commonjs/v3/runEngineWorker/consts.js +3 -0
- package/dist/commonjs/v3/runEngineWorker/consts.js.map +1 -1
- package/dist/commonjs/v3/runEngineWorker/supervisor/http.d.ts +20 -4
- package/dist/commonjs/v3/runEngineWorker/supervisor/http.js +17 -13
- package/dist/commonjs/v3/runEngineWorker/supervisor/http.js.map +1 -1
- package/dist/commonjs/v3/runEngineWorker/supervisor/schemas.d.ts +80 -0
- package/dist/commonjs/v3/runEngineWorker/supervisor/schemas.js +15 -1
- package/dist/commonjs/v3/runEngineWorker/supervisor/schemas.js.map +1 -1
- package/dist/commonjs/v3/runEngineWorker/workerQueue.d.ts +5 -0
- package/dist/commonjs/v3/runEngineWorker/workerQueue.js +1 -1
- package/dist/commonjs/v3/runEngineWorker/workerQueue.js.map +1 -1
- package/dist/commonjs/v3/runEngineWorker/workload/http.d.ts +6 -0
- package/dist/commonjs/v3/runEngineWorker/workload/schemas.d.ts +8 -0
- package/dist/commonjs/v3/runToken.d.ts +1 -1
- package/dist/commonjs/v3/runToken.js +6 -3
- package/dist/commonjs/v3/runToken.js.map +1 -1
- package/dist/commonjs/v3/runTokenOperations.d.ts +1 -0
- package/dist/commonjs/v3/runTokenOperations.js +1 -0
- package/dist/commonjs/v3/runTokenOperations.js.map +1 -1
- package/dist/commonjs/v3/runtime/sharedRuntimeManager.js +1 -0
- package/dist/commonjs/v3/runtime/sharedRuntimeManager.js.map +1 -1
- package/dist/commonjs/v3/schemas/api.d.ts +36 -13
- package/dist/commonjs/v3/schemas/api.js +48 -5
- package/dist/commonjs/v3/schemas/api.js.map +1 -1
- package/dist/commonjs/v3/schemas/build.d.ts +26 -0
- package/dist/commonjs/v3/schemas/build.js +6 -0
- package/dist/commonjs/v3/schemas/build.js.map +1 -1
- package/dist/commonjs/v3/schemas/checkpoints.d.ts +11 -0
- package/dist/commonjs/v3/schemas/executionPolicy.d.ts +41 -0
- package/dist/commonjs/v3/schemas/executionPolicy.js +83 -0
- package/dist/commonjs/v3/schemas/executionPolicy.js.map +1 -0
- package/dist/commonjs/v3/schemas/index.d.ts +1 -0
- package/dist/commonjs/v3/schemas/index.js +1 -0
- package/dist/commonjs/v3/schemas/index.js.map +1 -1
- package/dist/commonjs/v3/schemas/messages.d.ts +11 -0
- package/dist/commonjs/v3/schemas/resources.d.ts +19 -0
- package/dist/commonjs/v3/schemas/resources.js +7 -0
- package/dist/commonjs/v3/schemas/resources.js.map +1 -1
- package/dist/commonjs/v3/schemas/runEngine.d.ts +22 -0
- package/dist/commonjs/v3/schemas/runEngine.js +6 -0
- package/dist/commonjs/v3/schemas/runEngine.js.map +1 -1
- package/dist/commonjs/v3/schemas/schemas.d.ts +18 -0
- package/dist/commonjs/v3/schemas/schemas.js +2 -0
- package/dist/commonjs/v3/schemas/schemas.js.map +1 -1
- package/dist/commonjs/v3/schemas/webhookConfig.d.ts +16 -0
- package/dist/commonjs/v3/schemas/webhookConfig.js +13 -1
- package/dist/commonjs/v3/schemas/webhookConfig.js.map +1 -1
- package/dist/commonjs/v3/sdkCredentialTelemetry.d.ts +1 -1
- package/dist/commonjs/v3/sdkCredentialTelemetry.js +1 -0
- package/dist/commonjs/v3/sdkCredentialTelemetry.js.map +1 -1
- package/dist/commonjs/v3/serverOnly/httpServer.d.ts +15 -0
- package/dist/commonjs/v3/serverOnly/httpServer.js +37 -3
- package/dist/commonjs/v3/serverOnly/httpServer.js.map +1 -1
- package/dist/commonjs/v3/types/tasks.d.ts +19 -1
- package/dist/commonjs/v3/utils/ioSerialization.d.ts +4 -0
- package/dist/commonjs/v3/utils/ioSerialization.js +5 -3
- package/dist/commonjs/v3/utils/ioSerialization.js.map +1 -1
- package/dist/commonjs/v3/webhooks/index.d.ts +20 -9
- package/dist/commonjs/v3/webhooks/index.js +43 -9
- package/dist/commonjs/v3/webhooks/index.js.map +1 -1
- package/dist/commonjs/v3/workers/taskExecutor.js +1 -1
- package/dist/commonjs/v3/workers/taskExecutor.js.map +1 -1
- package/dist/commonjs/v3/workloadDeploymentToken.d.ts +9 -6
- package/dist/commonjs/v3/workloadDeploymentToken.js +9 -6
- package/dist/commonjs/v3/workloadDeploymentToken.js.map +1 -1
- package/dist/commonjs/version.js +1 -1
- package/dist/esm/v3/apiClient/index.d.ts +15 -4
- package/dist/esm/v3/apiClient/index.js +79 -58
- package/dist/esm/v3/apiClient/index.js.map +1 -1
- package/dist/esm/v3/apiClient/oidc.js +1 -1
- package/dist/esm/v3/apiClient/oidc.js.map +1 -1
- package/dist/esm/v3/apiClient/publicTokenCompatibility.d.ts +1 -0
- package/dist/esm/v3/apiClient/publicTokenCompatibility.js +23 -0
- package/dist/esm/v3/apiClient/publicTokenCompatibility.js.map +1 -0
- package/dist/esm/v3/apiClientManager/index.d.ts +1 -1
- package/dist/esm/v3/apiClientManager/index.js +2 -2
- package/dist/esm/v3/apiClientManager/index.js.map +1 -1
- package/dist/esm/v3/apps/http.d.ts +16 -1
- package/dist/esm/v3/apps/http.js +59 -9
- package/dist/esm/v3/apps/http.js.map +1 -1
- package/dist/esm/v3/build/runtime.d.ts +13 -0
- package/dist/esm/v3/build/runtime.js +26 -2
- package/dist/esm/v3/build/runtime.js.map +1 -1
- package/dist/esm/v3/config.d.ts +12 -0
- package/dist/esm/v3/isomorphic/concurrencyKey.d.ts +8 -0
- package/dist/esm/v3/isomorphic/concurrencyKey.js +35 -0
- package/dist/esm/v3/isomorphic/concurrencyKey.js.map +1 -0
- package/dist/esm/v3/isomorphic/index.d.ts +1 -0
- package/dist/esm/v3/isomorphic/index.js +1 -0
- package/dist/esm/v3/isomorphic/index.js.map +1 -1
- package/dist/esm/v3/isomorphic/queueName.d.ts +2 -0
- package/dist/esm/v3/isomorphic/queueName.js +2 -0
- package/dist/esm/v3/isomorphic/queueName.js.map +1 -1
- package/dist/esm/v3/jwt.d.ts +2 -1
- package/dist/esm/v3/jwt.js +6 -3
- package/dist/esm/v3/jwt.js.map +1 -1
- package/dist/esm/v3/otel/machineId.d.ts +1 -1
- package/dist/esm/v3/otel/machineId.js +5 -1
- package/dist/esm/v3/otel/machineId.js.map +1 -1
- package/dist/esm/v3/otel/tracingSDK.js +2 -2
- package/dist/esm/v3/otel/tracingSDK.js.map +1 -1
- package/dist/esm/v3/runEngineWorker/consts.d.ts +1 -0
- package/dist/esm/v3/runEngineWorker/consts.js +3 -0
- package/dist/esm/v3/runEngineWorker/consts.js.map +1 -1
- package/dist/esm/v3/runEngineWorker/supervisor/http.d.ts +20 -4
- package/dist/esm/v3/runEngineWorker/supervisor/http.js +18 -14
- package/dist/esm/v3/runEngineWorker/supervisor/http.js.map +1 -1
- package/dist/esm/v3/runEngineWorker/supervisor/schemas.d.ts +80 -0
- package/dist/esm/v3/runEngineWorker/supervisor/schemas.js +14 -0
- package/dist/esm/v3/runEngineWorker/supervisor/schemas.js.map +1 -1
- package/dist/esm/v3/runEngineWorker/workerQueue.d.ts +5 -0
- package/dist/esm/v3/runEngineWorker/workerQueue.js +1 -1
- package/dist/esm/v3/runEngineWorker/workerQueue.js.map +1 -1
- package/dist/esm/v3/runEngineWorker/workload/http.d.ts +6 -0
- package/dist/esm/v3/runEngineWorker/workload/schemas.d.ts +8 -0
- package/dist/esm/v3/runToken.d.ts +1 -1
- package/dist/esm/v3/runToken.js +6 -3
- package/dist/esm/v3/runToken.js.map +1 -1
- package/dist/esm/v3/runTokenOperations.d.ts +1 -0
- package/dist/esm/v3/runTokenOperations.js +1 -0
- package/dist/esm/v3/runTokenOperations.js.map +1 -1
- package/dist/esm/v3/runtime/sharedRuntimeManager.js +1 -0
- package/dist/esm/v3/runtime/sharedRuntimeManager.js.map +1 -1
- package/dist/esm/v3/schemas/api.d.ts +36 -13
- package/dist/esm/v3/schemas/api.js +48 -5
- package/dist/esm/v3/schemas/api.js.map +1 -1
- package/dist/esm/v3/schemas/build.d.ts +26 -0
- package/dist/esm/v3/schemas/build.js +6 -0
- package/dist/esm/v3/schemas/build.js.map +1 -1
- package/dist/esm/v3/schemas/checkpoints.d.ts +11 -0
- package/dist/esm/v3/schemas/executionPolicy.d.ts +41 -0
- package/dist/esm/v3/schemas/executionPolicy.js +75 -0
- package/dist/esm/v3/schemas/executionPolicy.js.map +1 -0
- package/dist/esm/v3/schemas/index.d.ts +1 -0
- package/dist/esm/v3/schemas/index.js +1 -0
- package/dist/esm/v3/schemas/index.js.map +1 -1
- package/dist/esm/v3/schemas/messages.d.ts +11 -0
- package/dist/esm/v3/schemas/resources.d.ts +19 -0
- package/dist/esm/v3/schemas/resources.js +7 -0
- package/dist/esm/v3/schemas/resources.js.map +1 -1
- package/dist/esm/v3/schemas/runEngine.d.ts +22 -0
- package/dist/esm/v3/schemas/runEngine.js +6 -0
- package/dist/esm/v3/schemas/runEngine.js.map +1 -1
- package/dist/esm/v3/schemas/schemas.d.ts +18 -0
- package/dist/esm/v3/schemas/schemas.js +2 -0
- package/dist/esm/v3/schemas/schemas.js.map +1 -1
- package/dist/esm/v3/schemas/webhookConfig.d.ts +16 -0
- package/dist/esm/v3/schemas/webhookConfig.js +12 -0
- package/dist/esm/v3/schemas/webhookConfig.js.map +1 -1
- package/dist/esm/v3/sdkCredentialTelemetry.d.ts +1 -1
- package/dist/esm/v3/sdkCredentialTelemetry.js +1 -0
- package/dist/esm/v3/sdkCredentialTelemetry.js.map +1 -1
- package/dist/esm/v3/serverOnly/httpServer.d.ts +15 -0
- package/dist/esm/v3/serverOnly/httpServer.js +37 -3
- package/dist/esm/v3/serverOnly/httpServer.js.map +1 -1
- package/dist/esm/v3/types/tasks.d.ts +19 -1
- package/dist/esm/v3/utils/ioSerialization.d.ts +4 -0
- package/dist/esm/v3/utils/ioSerialization.js +5 -3
- package/dist/esm/v3/utils/ioSerialization.js.map +1 -1
- package/dist/esm/v3/webhooks/index.d.ts +20 -9
- package/dist/esm/v3/webhooks/index.js +43 -9
- package/dist/esm/v3/webhooks/index.js.map +1 -1
- package/dist/esm/v3/workers/taskExecutor.js +1 -1
- package/dist/esm/v3/workers/taskExecutor.js.map +1 -1
- package/dist/esm/v3/workloadDeploymentToken.d.ts +9 -6
- package/dist/esm/v3/workloadDeploymentToken.js +9 -6
- package/dist/esm/v3/workloadDeploymentToken.js.map +1 -1
- package/dist/esm/version.js +1 -1
- package/package.json +2 -2
|
@@ -3,6 +3,7 @@ import { pathToFileURL } from "url";
|
|
|
3
3
|
import { ConfigRuntime } from "../schemas/build.js";
|
|
4
4
|
import { dedupFlags } from "./flags.js";
|
|
5
5
|
import { homedir } from "node:os";
|
|
6
|
+
import { existsSync } from "node:fs";
|
|
6
7
|
export const CURRENT_NODE_LTS_RUNTIME = "node-24";
|
|
7
8
|
export const DEFAULT_RUNTIME = CURRENT_NODE_LTS_RUNTIME;
|
|
8
9
|
export function isDeprecatedConfigRuntime(runtime) {
|
|
@@ -84,18 +85,41 @@ export function execPathForRuntime(runtime) {
|
|
|
84
85
|
return process.execPath;
|
|
85
86
|
case "bun":
|
|
86
87
|
case "bun-legacy":
|
|
87
|
-
case "bun-1.4":
|
|
88
|
+
case "bun-1.4": {
|
|
88
89
|
if (typeof process.env.BUN_INSTALL === "string") {
|
|
89
90
|
return join(process.env.BUN_INSTALL, "bin", "bun");
|
|
90
91
|
}
|
|
91
92
|
if (typeof process.env.BUN_INSTALL_BIN === "string") {
|
|
92
93
|
return join(process.env.BUN_INSTALL_BIN, "bun");
|
|
93
94
|
}
|
|
94
|
-
|
|
95
|
+
const defaultPath = join(homedir(), ".bun", "bin", "bun");
|
|
96
|
+
// Bun installed some other way (Homebrew, mise, a distro package) is found on PATH
|
|
97
|
+
return existsSync(defaultPath) ? defaultPath : "bun";
|
|
98
|
+
}
|
|
95
99
|
default:
|
|
96
100
|
throw new Error(`Unsupported runtime ${runtime}`);
|
|
97
101
|
}
|
|
98
102
|
}
|
|
103
|
+
/**
|
|
104
|
+
* Node 24 and 26 can share a compile cache between the image build and the runtime. Node 22 is
|
|
105
|
+
* left out: its cache key includes --max-old-space-size, which the run worker sets per machine, so
|
|
106
|
+
* a cache built in the image would never be read.
|
|
107
|
+
*/
|
|
108
|
+
export function supportsNodeCompileCache(runtime) {
|
|
109
|
+
return runtime === "node" || runtime === "node-24" || runtime === "node-26";
|
|
110
|
+
}
|
|
111
|
+
/**
|
|
112
|
+
* The env that points Node at the compile cache. The image build writes it and the run worker reads
|
|
113
|
+
* it from the same /app path, so entries are keyed by absolute path (portable mode drops the query
|
|
114
|
+
* that instrumented module wrappers use, so a wrapper and its module would share one entry). Node 24
|
|
115
|
+
* has no read-only mode, so it also writes entries the build missed.
|
|
116
|
+
*/
|
|
117
|
+
export function nodeCompileCacheEnv(runtime, compileCacheDir, mode) {
|
|
118
|
+
return {
|
|
119
|
+
NODE_COMPILE_CACHE: compileCacheDir,
|
|
120
|
+
...(mode === "read" && runtime === "node-26" ? { NODE_COMPILE_CACHE_READONLY: "1" } : {}),
|
|
121
|
+
};
|
|
122
|
+
}
|
|
99
123
|
export function execOptionsForRuntime(runtime, options, additionalNodeOptions) {
|
|
100
124
|
switch (runtime) {
|
|
101
125
|
case "node":
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runtime.js","sourceRoot":"","sources":["../../../../src/v3/build/runtime.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AACpC,OAAO,EAAgB,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAClE,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AACxC,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"runtime.js","sourceRoot":"","sources":["../../../../src/v3/build/runtime.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AACpC,OAAO,EAAgB,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAClE,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AACxC,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAErC,MAAM,CAAC,MAAM,wBAAwB,GAAG,SAAgC,CAAC;AACzE,MAAM,CAAC,MAAM,eAAe,GAAG,wBAAwB,CAAC;AAIxD,MAAM,UAAU,yBAAyB,CAAC,OAAgB;IACxD,OAAO,OAAO,KAAK,sBAAsB,IAAI,OAAO,KAAK,sBAAsB,CAAC;AAClF,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,YAAY,CAAC,OAAgB;IAC3C,OAAO,OAAO,OAAO,KAAK,QAAQ,IAAI,CAAC,OAAO,KAAK,KAAK,IAAI,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC;AAC1F,CAAC;AAED,kFAAkF;AAClF,MAAM,CAAC,MAAM,uBAAuB,GAAG,YAAY,CAAC;AAEpD,iGAAiG;AACjG,MAAM,UAAU,kBAAkB,CAAC,OAAgB;IACjD,OAAO,OAAO,KAAK,KAAK,IAAI,OAAO,KAAK,YAAY,CAAC;AACvD,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,oBAAoB,CAAC,OAAgB;IACnD,OAAO,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC;AAC/D,CAAC;AAED,kFAAkF;AAClF,MAAM,UAAU,4BAA4B,CAAC,OAAgC;IAC3E,QAAQ,OAAO,EAAE,CAAC;QAChB,KAAK,sBAAsB;YACzB,OAAO,SAAS,CAAC;QACnB,KAAK,sBAAsB;YACzB,OAAO,SAAS,CAAC;IACrB,CAAC;AACH,CAAC;AAKD,gEAAgE;AAChE,MAAM,CAAC,MAAM,2BAA2B,GAAG,yBAAyB,CAAC;AAErE,MAAM,UAAU,mBAAmB,CAAC,OAAgB;IAClD,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;QAC1B,OAAO,eAAe,CAAC;IACzB,CAAC;IAED,MAAM,aAAa,GAAG,aAAa,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;IAEvD,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,CAAC;QAC3B,MAAM,KAAK,GAAG,OAAO,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,OAAO,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QAE7E,MAAM,IAAI,KAAK,CACb,uBAAuB,KAAK,2CAA2C,aAAa,CAAC,OAAO,CAAC,IAAI,CAC/F,IAAI,CACL,GAAG,CACL,CAAC;IACJ,CAAC;IAED,QAAQ,aAAa,CAAC,IAAI,EAAE,CAAC;QAC3B,KAAK,MAAM;YACT,OAAO,wBAAwB,CAAC;QAClC,KAAK,sBAAsB;YACzB,OAAO,SAAS,CAAC;QACnB,KAAK,sBAAsB;YACzB,OAAO,SAAS,CAAC;QACnB;YACE,OAAO,aAAa,CAAC,IAAI,CAAC;IAC9B,CAAC;AACH,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,OAAqB;IACpD,QAAQ,OAAO,EAAE,CAAC;QAChB,KAAK,MAAM,CAAC;QACZ,KAAK,SAAS,CAAC;QACf,KAAK,SAAS,CAAC;QACf,KAAK,SAAS;YACZ,OAAO,MAAM,CAAC;QAChB,KAAK,KAAK,CAAC;QACX,KAAK,YAAY,CAAC;QAClB,KAAK,SAAS;YACZ,OAAO,KAAK,CAAC;QACf;YACE,MAAM,IAAI,KAAK,CAAC,uBAAuB,OAAO,EAAE,CAAC,CAAC;IACtD,CAAC;AACH,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,OAAqB;IACtD,QAAQ,OAAO,EAAE,CAAC;QAChB,KAAK,MAAM,CAAC;QACZ,KAAK,SAAS,CAAC;QACf,KAAK,SAAS,CAAC;QACf,KAAK,SAAS;YACZ,OAAO,OAAO,CAAC,QAAQ,CAAC;QAC1B,KAAK,KAAK,CAAC;QACX,KAAK,YAAY,CAAC;QAClB,KAAK,SAAS,EAAE,CAAC;YACf,IAAI,OAAO,OAAO,CAAC,GAAG,CAAC,WAAW,KAAK,QAAQ,EAAE,CAAC;gBAChD,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,WAAW,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;YACrD,CAAC;YAED,IAAI,OAAO,OAAO,CAAC,GAAG,CAAC,eAAe,KAAK,QAAQ,EAAE,CAAC;gBACpD,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,KAAK,CAAC,CAAC;YAClD,CAAC;YAED,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;YAC1D,mFAAmF;YACnF,OAAO,UAAU,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,KAAK,CAAC;QACvD,CAAC;QACD;YACE,MAAM,IAAI,KAAK,CAAC,uBAAuB,OAAO,EAAE,CAAC,CAAC;IACtD,CAAC;AACH,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,wBAAwB,CAAC,OAAqB;IAC5D,OAAO,OAAO,KAAK,MAAM,IAAI,OAAO,KAAK,SAAS,IAAI,OAAO,KAAK,SAAS,CAAC;AAC9E,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,mBAAmB,CACjC,OAAqB,EACrB,eAAuB,EACvB,IAAsB;IAEtB,OAAO;QACL,kBAAkB,EAAE,eAAe;QACnC,GAAG,CAAC,IAAI,KAAK,MAAM,IAAI,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,2BAA2B,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KAC1F,CAAC;AACJ,CAAC;AAOD,MAAM,UAAU,qBAAqB,CACnC,OAAqB,EACrB,OAAoB,EACpB,qBAA8B;IAE9B,QAAQ,OAAO,EAAE,CAAC;QAChB,KAAK,MAAM,CAAC;QACZ,KAAK,SAAS,CAAC;QACf,KAAK,SAAS,CAAC;QACf,KAAK,SAAS,EAAE,CAAC;YACf,MAAM,gBAAgB,GAAG,OAAO,CAAC,gBAAgB;gBAC/C,CAAC,CAAC,YAAY,aAAa,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,IAAI,EAAE;gBAC5D,CAAC,CAAC,SAAS,CAAC;YAEd,MAAM,UAAU,GAAG,OAAO,CAAC,gBAAgB,EAAE,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,gBAAgB,SAAS,EAAE,CAAC,CAAC;YAE7F,yCAAyC;YACzC,MAAM,KAAK,GAAG;gBACZ,OAAO,CAAC,GAAG,CAAC,YAAY;gBACxB,qBAAqB;gBACrB,gBAAgB;gBAChB,UAAU;gBACV,mCAAmC,EAAE,CAAC,CAAC,CAAC,iCAAiC,CAAC,CAAC,CAAC,SAAS;aACtF;iBACE,MAAM,CAAC,OAAO,CAAC;iBACf,IAAI,EAAE;iBACN,IAAI,CAAC,GAAG,CAAC,CAAC;YAEb,OAAO,UAAU,CAAC,KAAK,CAAC,CAAC;QAC3B,CAAC;QACD,KAAK,KAAK,CAAC;QACX,KAAK,YAAY,CAAC;QAClB,KAAK,SAAS,EAAE,CAAC;YACf,OAAO,EAAE,CAAC;QACZ,CAAC;IACH,CAAC;AACH,CAAC;AAED,qHAAqH;AACrH,SAAS,mCAAmC;IAC1C,IAAI,CAAC;QACH,OAAO,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;IACjD,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED,MAAM,UAAU,oBAAoB;IAClC,IAAI,CAAC;QACH,mCAAmC;QACnC,MAAM,KAAK,GAAG,OAAO,OAAO,CAAC,QAAQ,CAAC,GAAG,KAAK,QAAQ,CAAC;QAEvD,IAAI,KAAK,EAAE,CAAC;YACV,OAAO,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC;QAC9B,CAAC;QAED,oCAAoC;QACpC,OAAO,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC;IAC/B,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,SAAS,CAAC;IACnB,CAAC;AACH,CAAC"}
|
package/dist/esm/v3/config.d.ts
CHANGED
|
@@ -277,6 +277,18 @@ export type TriggerConfig = {
|
|
|
277
277
|
* @default false
|
|
278
278
|
*/
|
|
279
279
|
minify?: boolean;
|
|
280
|
+
/**
|
|
281
|
+
* Compile the deployed worker to a Bun executable with bytecode, so runs start faster. Applies to
|
|
282
|
+
* deploys on the `bun-1.4` runtime only; `trigger dev` and other runtimes are unchanged.
|
|
283
|
+
*
|
|
284
|
+
* `import.meta.url`, `import.meta.dirname` and `__dirname` point at your bundled files under
|
|
285
|
+
* `/app`, as they do without compilation. Files you read next to your code (e.g. with
|
|
286
|
+
* `new URL("./file", import.meta.url)`) and worker files still load from disk, so they must be in
|
|
287
|
+
* the image, for example with `additionalFiles`. Set this to `false` to turn compilation off.
|
|
288
|
+
*
|
|
289
|
+
* @default true
|
|
290
|
+
*/
|
|
291
|
+
bunBytecode?: boolean;
|
|
280
292
|
jsx?: {
|
|
281
293
|
/**
|
|
282
294
|
* @default "React.createElement"
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* The trigger-time `concurrencyKey`. Anything but a key map is sent as given. A key
|
|
3
|
+
* map needs a `default`, and every entry needs a non-empty string or finite number, which
|
|
4
|
+
* is sent as a string.
|
|
5
|
+
*/
|
|
6
|
+
export declare function triggerConcurrencyKeyBody(concurrencyKey: string | Record<string, string> | undefined): {
|
|
7
|
+
concurrencyKey?: string | Record<string, string>;
|
|
8
|
+
};
|
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* The trigger-time `concurrencyKey`. Anything but a key map is sent as given. A key
|
|
3
|
+
* map needs a `default`, and every entry needs a non-empty string or finite number, which
|
|
4
|
+
* is sent as a string.
|
|
5
|
+
*/
|
|
6
|
+
export function triggerConcurrencyKeyBody(concurrencyKey) {
|
|
7
|
+
if (!isKeyMap(concurrencyKey)) {
|
|
8
|
+
return { concurrencyKey };
|
|
9
|
+
}
|
|
10
|
+
const keys = {};
|
|
11
|
+
for (const [name, key] of Object.entries(concurrencyKey)) {
|
|
12
|
+
const usable = (typeof key === "string" && key !== "") || (typeof key === "number" && Number.isFinite(key));
|
|
13
|
+
if (name === "__proto__" || (name !== "default" && !usable)) {
|
|
14
|
+
throw new Error(`concurrencyKey entry "${name}" needs a limit name and a key that is a non-empty string or number.`);
|
|
15
|
+
}
|
|
16
|
+
if (usable) {
|
|
17
|
+
keys[name] = String(key);
|
|
18
|
+
}
|
|
19
|
+
}
|
|
20
|
+
if (!keys.default) {
|
|
21
|
+
throw new Error("concurrencyKey needs a `default` key: runs are queued and scheduled fairly per default key, and limits without their own entry use it.");
|
|
22
|
+
}
|
|
23
|
+
return { concurrencyKey: keys };
|
|
24
|
+
}
|
|
25
|
+
/**
|
|
26
|
+
* Any object that serialises as an object. Arrays and objects with a `toJSON` (dates, id
|
|
27
|
+
* objects) serialise to something else, so they are sent as given.
|
|
28
|
+
*/
|
|
29
|
+
function isKeyMap(value) {
|
|
30
|
+
return (typeof value === "object" &&
|
|
31
|
+
value !== null &&
|
|
32
|
+
!Array.isArray(value) &&
|
|
33
|
+
typeof value.toJSON !== "function");
|
|
34
|
+
}
|
|
35
|
+
//# sourceMappingURL=concurrencyKey.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"concurrencyKey.js","sourceRoot":"","sources":["../../../../src/v3/isomorphic/concurrencyKey.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AACH,MAAM,UAAU,yBAAyB,CACvC,cAA2D;IAE3D,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC;QAC9B,OAAO,EAAE,cAAc,EAAE,CAAC;IAC5B,CAAC;IACD,MAAM,IAAI,GAA2B,EAAE,CAAC;IACxC,KAAK,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,cAAyC,CAAC,EAAE,CAAC;QACpF,MAAM,MAAM,GACV,CAAC,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,KAAK,EAAE,CAAC,IAAI,CAAC,OAAO,GAAG,KAAK,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;QAC/F,IAAI,IAAI,KAAK,WAAW,IAAI,CAAC,IAAI,KAAK,SAAS,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;YAC5D,MAAM,IAAI,KAAK,CACb,yBAAyB,IAAI,sEAAsE,CACpG,CAAC;QACJ,CAAC;QACD,IAAI,MAAM,EAAE,CAAC;YACX,IAAI,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;QAC3B,CAAC;IACH,CAAC;IACD,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;QAClB,MAAM,IAAI,KAAK,CACb,wIAAwI,CACzI,CAAC;IACJ,CAAC;IACD,OAAO,EAAE,cAAc,EAAE,IAAI,EAAE,CAAC;AAClC,CAAC;AAED;;;GAGG;AACH,SAAS,QAAQ,CAAC,KAAc;IAC9B,OAAO,CACL,OAAO,KAAK,KAAK,QAAQ;QACzB,KAAK,KAAK,IAAI;QACd,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;QACrB,OAAQ,KAA8B,CAAC,MAAM,KAAK,UAAU,CAC7D,CAAC;AACJ,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/v3/isomorphic/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,sBAAsB,CAAC;AACrC,cAAc,oBAAoB,CAAC;AACnC,cAAc,eAAe,CAAC;AAC9B,cAAc,kBAAkB,CAAC;AACjC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,aAAa,CAAC;AAC5B,cAAc,mBAAmB,CAAC;AAClC,cAAc,YAAY,CAAC;AAC3B,cAAc,yBAAyB,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/v3/isomorphic/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,sBAAsB,CAAC;AACrC,cAAc,oBAAoB,CAAC;AACnC,cAAc,eAAe,CAAC;AAC9B,cAAc,kBAAkB,CAAC;AACjC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,aAAa,CAAC;AAC5B,cAAc,mBAAmB,CAAC;AAClC,cAAc,YAAY,CAAC;AAC3B,cAAc,yBAAyB,CAAC;AACxC,cAAc,qBAAqB,CAAC"}
|
|
@@ -2,4 +2,6 @@
|
|
|
2
2
|
export function sanitizeQueueName(queueName) {
|
|
3
3
|
return queueName.replace(/[^a-zA-Z0-9_\-/]/g, "").substring(0, 128);
|
|
4
4
|
}
|
|
5
|
+
/** The names a concurrency limit can have: what `concurrencyLimit()` accepts for `name`. */
|
|
6
|
+
export const CONCURRENCY_LIMIT_NAME_PATTERN = /^[a-zA-Z0-9_-]{1,122}$/;
|
|
5
7
|
//# sourceMappingURL=queueName.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"queueName.js","sourceRoot":"","sources":["../../../../src/v3/isomorphic/queueName.ts"],"names":[],"mappings":"AAAA,4GAA4G;AAC5G,MAAM,UAAU,iBAAiB,CAAC,SAAiB;IACjD,OAAO,SAAS,CAAC,OAAO,CAAC,mBAAmB,EAAE,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;AACtE,CAAC"}
|
|
1
|
+
{"version":3,"file":"queueName.js","sourceRoot":"","sources":["../../../../src/v3/isomorphic/queueName.ts"],"names":[],"mappings":"AAAA,4GAA4G;AAC5G,MAAM,UAAU,iBAAiB,CAAC,SAAiB;IACjD,OAAO,SAAS,CAAC,OAAO,CAAC,mBAAmB,EAAE,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;AACtE,CAAC;AAED,4FAA4F;AAC5F,MAAM,CAAC,MAAM,8BAA8B,GAAG,wBAAwB,CAAC"}
|
package/dist/esm/v3/jwt.d.ts
CHANGED
|
@@ -4,6 +4,7 @@ export type GenerateJWTOptions = {
|
|
|
4
4
|
payload: Record<string, any>;
|
|
5
5
|
expirationTime?: number | Date | string;
|
|
6
6
|
omitIssuedAt?: boolean;
|
|
7
|
+
audience?: string;
|
|
7
8
|
};
|
|
8
9
|
export declare const JWT_ALGORITHM = "HS256";
|
|
9
10
|
export declare const JWT_ISSUER = "https://id.trigger.dev";
|
|
@@ -19,4 +20,4 @@ export type ValidationResult = {
|
|
|
19
20
|
error: string;
|
|
20
21
|
code: string;
|
|
21
22
|
};
|
|
22
|
-
export declare function validateJWT(token: string, apiKey: string): Promise<ValidationResult>;
|
|
23
|
+
export declare function validateJWT(token: string, apiKey: string, audience?: string): Promise<ValidationResult>;
|
package/dist/esm/v3/jwt.js
CHANGED
|
@@ -36,7 +36,7 @@ export async function generateJWT(options) {
|
|
|
36
36
|
const secret = new TextEncoder().encode(options.secretKey);
|
|
37
37
|
const jwt = new SignJWT(options.payload)
|
|
38
38
|
.setIssuer(JWT_ISSUER)
|
|
39
|
-
.setAudience(JWT_AUDIENCE)
|
|
39
|
+
.setAudience(options.audience ?? JWT_AUDIENCE)
|
|
40
40
|
.setProtectedHeader({ alg: JWT_ALGORITHM })
|
|
41
41
|
.setExpirationTime(options.expirationTime ?? "15m");
|
|
42
42
|
if (!options.omitIssuedAt) {
|
|
@@ -44,13 +44,16 @@ export async function generateJWT(options) {
|
|
|
44
44
|
}
|
|
45
45
|
return jwt.sign(secret);
|
|
46
46
|
}
|
|
47
|
-
export async function validateJWT(token, apiKey) {
|
|
47
|
+
export async function validateJWT(token, apiKey, audience = JWT_AUDIENCE) {
|
|
48
|
+
// jose skips the audience check for a falsy value.
|
|
49
|
+
if (!audience)
|
|
50
|
+
throw new Error("validateJWT: audience must not be empty");
|
|
48
51
|
const { jwtVerify, errors } = await import("jose");
|
|
49
52
|
const secret = new TextEncoder().encode(apiKey);
|
|
50
53
|
try {
|
|
51
54
|
const { payload } = await jwtVerify(token, secret, {
|
|
52
55
|
issuer: JWT_ISSUER,
|
|
53
|
-
audience
|
|
56
|
+
audience,
|
|
54
57
|
});
|
|
55
58
|
return { ok: true, payload };
|
|
56
59
|
}
|
package/dist/esm/v3/jwt.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jwt.js","sourceRoot":"","sources":["../../../src/v3/jwt.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"jwt.js","sourceRoot":"","sources":["../../../src/v3/jwt.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
export declare
|
|
1
|
+
export declare function getMachineId(): string;
|
|
@@ -1,4 +1,8 @@
|
|
|
1
1
|
import { generateFriendlyId } from "../isomorphic/friendlyId.js";
|
|
2
2
|
import { getEnvVar } from "../utils/getEnv.js";
|
|
3
|
-
|
|
3
|
+
let machineId;
|
|
4
|
+
// Generated on first use, not at import, so importing draws no randomness.
|
|
5
|
+
export function getMachineId() {
|
|
6
|
+
return (machineId ??= getEnvVar("TRIGGER_MACHINE_ID") ?? generateFriendlyId("machine"));
|
|
7
|
+
}
|
|
4
8
|
//# sourceMappingURL=machineId.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"machineId.js","sourceRoot":"","sources":["../../../../src/v3/otel/machineId.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAE/C,
|
|
1
|
+
{"version":3,"file":"machineId.js","sourceRoot":"","sources":["../../../../src/v3/otel/machineId.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAE/C,IAAI,SAA6B,CAAC;AAElC,2EAA2E;AAC3E,MAAM,UAAU,YAAY;IAC1B,OAAO,CAAC,SAAS,KAAK,SAAS,CAAC,oBAAoB,CAAC,IAAI,kBAAkB,CAAC,SAAS,CAAC,CAAC,CAAC;AAC1F,CAAC"}
|
|
@@ -18,7 +18,7 @@ import { taskContext } from "../task-context-api.js";
|
|
|
18
18
|
import { BufferingMetricExporter, TaskContextLogProcessor, TaskContextMetricExporter, TaskContextSpanProcessor, } from "../taskContext/otelProcessors.js";
|
|
19
19
|
import { traceContext } from "../trace-context-api.js";
|
|
20
20
|
import { getEnvVar } from "../utils/getEnv.js";
|
|
21
|
-
import {
|
|
21
|
+
import { getMachineId } from "./machineId.js";
|
|
22
22
|
import { UserSpanProcessorWrapper } from "./userSpanProcessor.js";
|
|
23
23
|
import { startDiskIoMetrics } from "./diskIoMetrics.js";
|
|
24
24
|
import { startFilesystemMetrics } from "./filesystemMetrics.js";
|
|
@@ -51,7 +51,7 @@ export class TracingSDK {
|
|
|
51
51
|
[SemanticInternalAttributes.CLI_VERSION]: VERSION,
|
|
52
52
|
[SemanticInternalAttributes.SDK_VERSION]: VERSION,
|
|
53
53
|
[SemanticInternalAttributes.SDK_LANGUAGE]: "typescript",
|
|
54
|
-
[SemanticInternalAttributes.MACHINE_ID]:
|
|
54
|
+
[SemanticInternalAttributes.MACHINE_ID]: getMachineId(),
|
|
55
55
|
}))
|
|
56
56
|
.merge(resourceFromAttributes(envResourceAttributes))
|
|
57
57
|
.merge(resourceFromAttributes(customEnvResourceAttributes))
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tracingSDK.js","sourceRoot":"","sources":["../../../../src/v3/otel/tracingSDK.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"tracingSDK.js","sourceRoot":"","sources":["../../../../src/v3/otel/tracingSDK.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,9 @@ export const WORKER_HEADERS = {
|
|
|
6
6
|
// Verified environment id recovered from the deployment token. Set by the supervisor only when
|
|
7
7
|
// enforcing; the platform scopes the worker-action's snapshot read by it.
|
|
8
8
|
ENVIRONMENT_ID: "x-trigger-worker-environment-id",
|
|
9
|
+
// Run claim of a verified sandbox deployment token. Set by the supervisor only when enforcing;
|
|
10
|
+
// the platform starts a pinned run, or refreshes its token, only for its own sandbox token.
|
|
11
|
+
SANDBOX_RUN_ID: "x-trigger-worker-sandbox-run-id",
|
|
9
12
|
};
|
|
10
13
|
export const WORKLOAD_HEADERS = {
|
|
11
14
|
DEPLOYMENT_ID: "x-trigger-workload-deployment-id",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"consts.js","sourceRoot":"","sources":["../../../../src/v3/runEngineWorker/consts.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,cAAc,GAAG;IAC5B,aAAa,EAAE,gCAAgC;IAC/C,aAAa,EAAE,gCAAgC;IAC/C,cAAc,EAAE,iCAAiC;IACjD,SAAS,EAAE,4BAA4B;IACvC,+FAA+F;IAC/F,0EAA0E;IAC1E,cAAc,EAAE,iCAAiC;CAClD,CAAC;AAEF,MAAM,CAAC,MAAM,gBAAgB,GAAG;IAC9B,aAAa,EAAE,kCAAkC;IACjD,SAAS,EAAE,8BAA8B;IACzC,kBAAkB,EAAE,uCAAuC;IAC3D,WAAW,EAAE,gCAAgC;CAC9C,CAAC"}
|
|
1
|
+
{"version":3,"file":"consts.js","sourceRoot":"","sources":["../../../../src/v3/runEngineWorker/consts.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,cAAc,GAAG;IAC5B,aAAa,EAAE,gCAAgC;IAC/C,aAAa,EAAE,gCAAgC;IAC/C,cAAc,EAAE,iCAAiC;IACjD,SAAS,EAAE,4BAA4B;IACvC,+FAA+F;IAC/F,0EAA0E;IAC1E,cAAc,EAAE,iCAAiC;IACjD,+FAA+F;IAC/F,4FAA4F;IAC5F,cAAc,EAAE,iCAAiC;CAClD,CAAC;AAEF,MAAM,CAAC,MAAM,gBAAgB,GAAG;IAC9B,aAAa,EAAE,kCAAkC;IACjD,SAAS,EAAE,8BAA8B;IACzC,kBAAkB,EAAE,uCAAuC;IAC3D,WAAW,EAAE,gCAAgC;CAC9C,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { WorkerApiConnectRequestBody, WorkerApiDequeueRequestBody, WorkerApiHeartbeatRequestBody, WorkerApiRunAttemptCompleteRequestBody, WorkerApiRunAttemptStartRequestBody, WorkerApiRunHeartbeatRequestBody, WorkerApiRunReleaseRequestBody, WorkerApiRunRestoreOutcomeRequestBody, WorkerApiDebugLogBody, WorkerApiSuspendRunRequestBody } from "./schemas.js";
|
|
2
|
-
import {
|
|
2
|
+
import { WorkerApiContinueRunExecutionResponseBody, WorkerApiRunReleaseResponseBody } from "./schemas.js";
|
|
3
3
|
import type { SupervisorClientCommonOptions } from "./types.js";
|
|
4
4
|
import { type ContinueRetryBudget, type ContinueRetrySummary } from "./continueRetry.js";
|
|
5
5
|
import { type ApiResult } from "../../zodfetch.js";
|
|
@@ -103,6 +103,14 @@ export declare class SupervisorHttpClient {
|
|
|
103
103
|
webhookEndpointId?: string | undefined;
|
|
104
104
|
workerCell?: string | undefined;
|
|
105
105
|
workerLane?: string | undefined;
|
|
106
|
+
executionMode?: "SANDBOX" | "STANDARD" | undefined;
|
|
107
|
+
executionPolicy?: {
|
|
108
|
+
version: 1;
|
|
109
|
+
rootKey: boolean;
|
|
110
|
+
scopes: string[];
|
|
111
|
+
envVars: "all" | string[];
|
|
112
|
+
} | undefined;
|
|
113
|
+
sessionId?: string | undefined;
|
|
106
114
|
} | undefined;
|
|
107
115
|
};
|
|
108
116
|
environment: {
|
|
@@ -124,11 +132,11 @@ export declare class SupervisorHttpClient {
|
|
|
124
132
|
heartbeatWorker(body: WorkerApiHeartbeatRequestBody): Promise<ApiResult<{
|
|
125
133
|
ok: true;
|
|
126
134
|
}>>;
|
|
127
|
-
heartbeatRun(runId: string, snapshotId: string, body: WorkerApiRunHeartbeatRequestBody, runnerId?: string, environmentId?: string): Promise<ApiResult<{
|
|
135
|
+
heartbeatRun(runId: string, snapshotId: string, body: WorkerApiRunHeartbeatRequestBody, runnerId?: string, environmentId?: string, sandboxRunId?: string): Promise<ApiResult<{
|
|
128
136
|
ok: true;
|
|
129
137
|
runToken?: string | undefined;
|
|
130
138
|
}>>;
|
|
131
|
-
startRunAttempt(runId: string, snapshotId: string, body: WorkerApiRunAttemptStartRequestBody, runnerId?: string, environmentId?: string): Promise<ApiResult<{
|
|
139
|
+
startRunAttempt(runId: string, snapshotId: string, body: WorkerApiRunAttemptStartRequestBody, runnerId?: string, environmentId?: string, sandboxRunId?: string): Promise<ApiResult<{
|
|
132
140
|
snapshot: {
|
|
133
141
|
id: string;
|
|
134
142
|
friendlyId: string;
|
|
@@ -252,6 +260,12 @@ export declare class SupervisorHttpClient {
|
|
|
252
260
|
};
|
|
253
261
|
} & {
|
|
254
262
|
envVars: Record<string, string>;
|
|
263
|
+
secretProxy?: {
|
|
264
|
+
runId: string;
|
|
265
|
+
attempt: number;
|
|
266
|
+
expiresAtMs: number;
|
|
267
|
+
allowedHosts: string[];
|
|
268
|
+
} | undefined;
|
|
255
269
|
}>>;
|
|
256
270
|
completeRunAttempt(runId: string, snapshotId: string, body: WorkerApiRunAttemptCompleteRequestBody, runnerId?: string, environmentId?: string): Promise<ApiResult<{
|
|
257
271
|
result: {
|
|
@@ -388,7 +402,9 @@ export declare class SupervisorHttpClient {
|
|
|
388
402
|
sendDebugLog(runId: string, body: WorkerApiDebugLogBody, runnerId?: string): Promise<void>;
|
|
389
403
|
continueRunExecution(runId: string, snapshotId: string, runnerId?: string, environmentId?: string, options?: {
|
|
390
404
|
retryBudget?: ContinueRetryBudget;
|
|
391
|
-
|
|
405
|
+
supportsSecretProxy?: boolean;
|
|
406
|
+
sandboxRunId?: string;
|
|
407
|
+
}): Promise<ApiResult<WorkerApiContinueRunExecutionResponseBody> & {
|
|
392
408
|
retry?: ContinueRetrySummary;
|
|
393
409
|
}>;
|
|
394
410
|
reportRestoreOutcome(runId: string, snapshotId: string, body: WorkerApiRunRestoreOutcomeRequestBody, runnerId?: string, environmentId?: string): Promise<ApiResult<{
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { z } from "zod/v4";
|
|
2
|
-
import { WorkerApiConnectResponseBody,
|
|
2
|
+
import { WorkerApiConnectResponseBody, WorkerApiContinueRunExecutionResponseBody, WorkerApiDequeueResponseBody, WorkerApiHeartbeatResponseBody, WorkerApiRunAttemptCompleteResponseBody, WorkerApiRunAttemptStartResponseBody, WorkerApiRunHeartbeatResponseBody, WorkerApiRunLatestSnapshotResponseBody, WorkerApiRunReleaseResponseBody, WorkerApiRunRestoreOutcomeResponseBody, WorkerApiSuspendRunResponseBody, WorkerApiRunSnapshotsSinceResponseBody, } from "./schemas.js";
|
|
3
3
|
import { retryContinueWithinBudget, } from "./continueRetry.js";
|
|
4
4
|
import { getDefaultWorkerHeaders } from "./util.js";
|
|
5
5
|
import { wrapZodFetch } from "../../zodfetch.js";
|
|
@@ -102,31 +102,33 @@ export class SupervisorHttpClient {
|
|
|
102
102
|
body: JSON.stringify(body),
|
|
103
103
|
});
|
|
104
104
|
}
|
|
105
|
-
async heartbeatRun(runId, snapshotId, body, runnerId, environmentId) {
|
|
106
|
-
return this.request("heartbeat_run", WorkerApiRunHeartbeatResponseBody, `${this.apiUrl}/engine/v1/worker-actions/runs/${runId}/snapshots/${snapshotId}/heartbeat`, {
|
|
105
|
+
async heartbeatRun(runId, snapshotId, body, runnerId, environmentId, sandboxRunId) {
|
|
106
|
+
return this.request("heartbeat_run", WorkerApiRunHeartbeatResponseBody, `${this.apiUrl}/engine/v1/worker-actions/runs/${encodeURIComponent(runId)}/snapshots/${encodeURIComponent(snapshotId)}/heartbeat`, {
|
|
107
107
|
method: "POST",
|
|
108
108
|
headers: {
|
|
109
109
|
...this.defaultHeaders,
|
|
110
110
|
...this.runnerIdHeader(runnerId),
|
|
111
111
|
...this.environmentIdHeader(environmentId),
|
|
112
|
+
...createHeaders({ [WORKER_HEADERS.SANDBOX_RUN_ID]: sandboxRunId }),
|
|
112
113
|
"Content-Type": "application/json",
|
|
113
114
|
},
|
|
114
115
|
body: JSON.stringify(body),
|
|
115
116
|
});
|
|
116
117
|
}
|
|
117
|
-
async startRunAttempt(runId, snapshotId, body, runnerId, environmentId) {
|
|
118
|
-
return this.request("start_run_attempt", WorkerApiRunAttemptStartResponseBody, `${this.apiUrl}/engine/v1/worker-actions/runs/${runId}/snapshots/${snapshotId}/attempts/start`, {
|
|
118
|
+
async startRunAttempt(runId, snapshotId, body, runnerId, environmentId, sandboxRunId) {
|
|
119
|
+
return this.request("start_run_attempt", WorkerApiRunAttemptStartResponseBody, `${this.apiUrl}/engine/v1/worker-actions/runs/${encodeURIComponent(runId)}/snapshots/${encodeURIComponent(snapshotId)}/attempts/start`, {
|
|
119
120
|
method: "POST",
|
|
120
121
|
headers: {
|
|
121
122
|
...this.defaultHeaders,
|
|
122
123
|
...this.runnerIdHeader(runnerId),
|
|
123
124
|
...this.environmentIdHeader(environmentId),
|
|
125
|
+
...createHeaders({ [WORKER_HEADERS.SANDBOX_RUN_ID]: sandboxRunId }),
|
|
124
126
|
},
|
|
125
127
|
body: JSON.stringify(body),
|
|
126
128
|
});
|
|
127
129
|
}
|
|
128
130
|
async completeRunAttempt(runId, snapshotId, body, runnerId, environmentId) {
|
|
129
|
-
return this.request("complete_run_attempt", WorkerApiRunAttemptCompleteResponseBody, `${this.apiUrl}/engine/v1/worker-actions/runs/${runId}/snapshots/${snapshotId}/attempts/complete`, {
|
|
131
|
+
return this.request("complete_run_attempt", WorkerApiRunAttemptCompleteResponseBody, `${this.apiUrl}/engine/v1/worker-actions/runs/${encodeURIComponent(runId)}/snapshots/${encodeURIComponent(snapshotId)}/attempts/complete`, {
|
|
130
132
|
method: "POST",
|
|
131
133
|
headers: {
|
|
132
134
|
...this.defaultHeaders,
|
|
@@ -137,7 +139,7 @@ export class SupervisorHttpClient {
|
|
|
137
139
|
});
|
|
138
140
|
}
|
|
139
141
|
async getLatestSnapshot(runId, runnerId, environmentId) {
|
|
140
|
-
return this.request("get_latest_snapshot", WorkerApiRunLatestSnapshotResponseBody, `${this.apiUrl}/engine/v1/worker-actions/runs/${runId}/snapshots/latest`, {
|
|
142
|
+
return this.request("get_latest_snapshot", WorkerApiRunLatestSnapshotResponseBody, `${this.apiUrl}/engine/v1/worker-actions/runs/${encodeURIComponent(runId)}/snapshots/latest`, {
|
|
141
143
|
method: "GET",
|
|
142
144
|
headers: {
|
|
143
145
|
...this.defaultHeaders,
|
|
@@ -147,7 +149,7 @@ export class SupervisorHttpClient {
|
|
|
147
149
|
});
|
|
148
150
|
}
|
|
149
151
|
async getSnapshotsSince(runId, snapshotId, runnerId, environmentId) {
|
|
150
|
-
return this.request("get_snapshots_since", WorkerApiRunSnapshotsSinceResponseBody, `${this.apiUrl}/engine/v1/worker-actions/runs/${runId}/snapshots/since/${snapshotId}`, {
|
|
152
|
+
return this.request("get_snapshots_since", WorkerApiRunSnapshotsSinceResponseBody, `${this.apiUrl}/engine/v1/worker-actions/runs/${encodeURIComponent(runId)}/snapshots/since/${encodeURIComponent(snapshotId)}`, {
|
|
151
153
|
method: "GET",
|
|
152
154
|
headers: {
|
|
153
155
|
...this.defaultHeaders,
|
|
@@ -161,7 +163,7 @@ export class SupervisorHttpClient {
|
|
|
161
163
|
return;
|
|
162
164
|
}
|
|
163
165
|
try {
|
|
164
|
-
const res = await this.request("send_debug_log", z.unknown(), `${this.apiUrl}/engine/v1/worker-actions/runs/${runId}/logs/debug`, {
|
|
166
|
+
const res = await this.request("send_debug_log", z.unknown(), `${this.apiUrl}/engine/v1/worker-actions/runs/${encodeURIComponent(runId)}/logs/debug`, {
|
|
165
167
|
method: "POST",
|
|
166
168
|
headers: {
|
|
167
169
|
...this.defaultHeaders,
|
|
@@ -179,12 +181,14 @@ export class SupervisorHttpClient {
|
|
|
179
181
|
}
|
|
180
182
|
}
|
|
181
183
|
async continueRunExecution(runId, snapshotId, runnerId, environmentId, options) {
|
|
182
|
-
const
|
|
184
|
+
const query = options?.supportsSecretProxy ? "?supportsSecretProxy=1" : "";
|
|
185
|
+
const continueRun = (retry, signal) => this.request("continue_run_execution", WorkerApiContinueRunExecutionResponseBody, `${this.apiUrl}/engine/v1/worker-actions/runs/${encodeURIComponent(runId)}/snapshots/${encodeURIComponent(snapshotId)}/continue${query}`, {
|
|
183
186
|
method: "GET",
|
|
184
187
|
headers: {
|
|
185
188
|
...this.defaultHeaders,
|
|
186
189
|
...this.runnerIdHeader(runnerId),
|
|
187
190
|
...this.environmentIdHeader(environmentId),
|
|
191
|
+
...createHeaders({ [WORKER_HEADERS.SANDBOX_RUN_ID]: options?.sandboxRunId }),
|
|
188
192
|
},
|
|
189
193
|
signal,
|
|
190
194
|
}, { retry });
|
|
@@ -207,7 +211,7 @@ export class SupervisorHttpClient {
|
|
|
207
211
|
});
|
|
208
212
|
}
|
|
209
213
|
async reportRestoreOutcome(runId, snapshotId, body, runnerId, environmentId) {
|
|
210
|
-
return this.request("report_restore_outcome", WorkerApiRunRestoreOutcomeResponseBody, `${this.apiUrl}/engine/v1/worker-actions/runs/${runId}/snapshots/${snapshotId}/restore-outcome`, {
|
|
214
|
+
return this.request("report_restore_outcome", WorkerApiRunRestoreOutcomeResponseBody, `${this.apiUrl}/engine/v1/worker-actions/runs/${encodeURIComponent(runId)}/snapshots/${encodeURIComponent(snapshotId)}/restore-outcome`, {
|
|
211
215
|
method: "POST",
|
|
212
216
|
headers: {
|
|
213
217
|
...this.defaultHeaders,
|
|
@@ -224,7 +228,7 @@ export class SupervisorHttpClient {
|
|
|
224
228
|
* would; once that budget is spent the run fails instead, and `requeued` is false.
|
|
225
229
|
*/
|
|
226
230
|
async releaseRun(runId, snapshotId, body, runnerId, environmentId) {
|
|
227
|
-
return this.request("release_run", WorkerApiRunReleaseResponseBody, `${this.apiUrl}/engine/v1/worker-actions/runs/${runId}/snapshots/${snapshotId}/release`, {
|
|
231
|
+
return this.request("release_run", WorkerApiRunReleaseResponseBody, `${this.apiUrl}/engine/v1/worker-actions/runs/${encodeURIComponent(runId)}/snapshots/${encodeURIComponent(snapshotId)}/release`, {
|
|
228
232
|
method: "POST",
|
|
229
233
|
headers: {
|
|
230
234
|
...this.defaultHeaders,
|
|
@@ -236,7 +240,7 @@ export class SupervisorHttpClient {
|
|
|
236
240
|
});
|
|
237
241
|
}
|
|
238
242
|
async preflightSuspend(runId, snapshotId, runnerId, environmentId) {
|
|
239
|
-
return this.request("preflight_suspend", WorkerApiSuspendRunResponseBody, `${this.apiUrl}/engine/v1/worker-actions/runs/${runId}/snapshots/${snapshotId}/suspend/preflight`, {
|
|
243
|
+
return this.request("preflight_suspend", WorkerApiSuspendRunResponseBody, `${this.apiUrl}/engine/v1/worker-actions/runs/${encodeURIComponent(runId)}/snapshots/${encodeURIComponent(snapshotId)}/suspend/preflight`, {
|
|
240
244
|
method: "POST",
|
|
241
245
|
headers: {
|
|
242
246
|
...this.defaultHeaders,
|
|
@@ -246,7 +250,7 @@ export class SupervisorHttpClient {
|
|
|
246
250
|
});
|
|
247
251
|
}
|
|
248
252
|
async submitSuspendCompletion({ runId, snapshotId, runnerId, environmentId, body, }) {
|
|
249
|
-
return this.request("submit_suspend_completion", WorkerApiSuspendRunResponseBody, `${this.apiUrl}/engine/v1/worker-actions/runs/${runId}/snapshots/${snapshotId}/suspend`, {
|
|
253
|
+
return this.request("submit_suspend_completion", WorkerApiSuspendRunResponseBody, `${this.apiUrl}/engine/v1/worker-actions/runs/${encodeURIComponent(runId)}/snapshots/${encodeURIComponent(snapshotId)}/suspend`, {
|
|
250
254
|
method: "POST",
|
|
251
255
|
headers: {
|
|
252
256
|
...this.defaultHeaders,
|