@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
|
@@ -38,7 +38,7 @@ function currentRunToken() {
|
|
|
38
38
|
throw new OIDCTokenError("OIDC_RUN_TOKEN_EXPIRED", "The internal run token has expired. The runner must refresh it before requesting an OIDC token.");
|
|
39
39
|
}
|
|
40
40
|
if (reason !== "selected") {
|
|
41
|
-
throw new OIDCTokenError("OIDC_RUN_TOKEN_INVALID", "OIDC requires a valid internal run token
|
|
41
|
+
throw new OIDCTokenError("OIDC_RUN_TOKEN_INVALID", "OIDC requires a valid internal run token.");
|
|
42
42
|
}
|
|
43
43
|
return token;
|
|
44
44
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oidc.js","sourceRoot":"","sources":["../../../../src/v3/apiClient/oidc.ts"],"names":[],"mappings":";;;;AAAA,+BAA2B;AAC3B,gDAAyD;AACzD,gEAAqD;AACrD,kDAA+C;AAC/C,uCAA6D;AAC7D,2CAAuC;AAQvC,MAAM,iBAAiB,GAAG,MAAC,CAAC,MAAM,CAAC;IACjC,KAAK,EAAE,MAAC,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC;IACxB,SAAS,EAAE,MAAC;SACT,MAAM,EAAE;SACR,QAAQ,EAAE;SACV,SAAS,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC;CACzC,CAAC,CAAC;AAEH,oBAA4B,SAAQ,oBAAQ;IACxB,KAAK,CAAY;IAEnC,YAAY,IAAY,EAAE,OAAe,EAAE,KAAgB;QACzD,KAAK,CACH,KAAK,EAAE,MAAM,EACb,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,EACzD,SAAS,EACT,KAAK,EAAE,OAAO,EACd,KAAK,EAAE,IAAI,CACZ,CAAC;QACF,IAAI,CAAC,IAAI,GAAG,gBAAgB,CAAC;QAC7B,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACrB,CAAC;CACF;;AAED,SAAS,eAAe;IACtB,IAAI,CAAC,iCAAW,CAAC,YAAY,IAAI,iCAAW,CAAC,GAAG,EAAE,WAAW,CAAC,IAAI,KAAK,aAAa,EAAE,CAAC;QACrF,MAAM,IAAI,cAAc,CACtB,0BAA0B,EAC1B,qGAAqG,CACtG,CAAC;IACJ,CAAC;IAED,MAAM,KAAK,GAAG,IAAA,qBAAS,EAAC,mBAAmB,CAAC,CAAC;IAC7C,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,MAAM,IAAI,cAAc,CACtB,wBAAwB,EACxB,gMAAgM,CACjM,CAAC;IACJ,CAAC;IAED,iFAAiF;IACjF,MAAM,MAAM,GAAG,IAAA,qCAAuB,EAAC,KAAK,EAAE,CAAC,CAAC,CAAC;IACjD,IAAI,MAAM,KAAK,eAAe,EAAE,CAAC;QAC/B,MAAM,IAAI,cAAc,CACtB,wBAAwB,EACxB,iGAAiG,CAClG,CAAC;IACJ,CAAC;IACD,IAAI,MAAM,KAAK,UAAU,EAAE,CAAC;QAC1B,MAAM,IAAI,cAAc,
|
|
1
|
+
{"version":3,"file":"oidc.js","sourceRoot":"","sources":["../../../../src/v3/apiClient/oidc.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export declare function canFallbackToLocalPublicToken(accessToken: string, scopes: string[], status: number | undefined, responseBody?: unknown): boolean;
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.canFallbackToLocalPublicToken = canFallbackToLocalPublicToken;
|
|
4
|
+
const v4_1 = require("zod/v4");
|
|
5
|
+
// Existing root keys have 20 characters of entropy; newer root keys have 24.
|
|
6
|
+
const ROOT_API_KEY_PATTERN = /^tr_(dev|stg|prod|preview)_[0-9a-zA-Z]{20}(?:[0-9a-zA-Z]{4})?$/;
|
|
7
|
+
const LegacyEmptyScopesError = v4_1.z.object({
|
|
8
|
+
error: v4_1.z.literal("Invalid request body"),
|
|
9
|
+
issues: v4_1.z.tuple([
|
|
10
|
+
v4_1.z.object({
|
|
11
|
+
code: v4_1.z.literal("too_small"),
|
|
12
|
+
minimum: v4_1.z.literal(1),
|
|
13
|
+
inclusive: v4_1.z.literal(true),
|
|
14
|
+
path: v4_1.z.tuple([v4_1.z.literal("scopes")]),
|
|
15
|
+
}),
|
|
16
|
+
]),
|
|
17
|
+
});
|
|
18
|
+
function canFallbackToLocalPublicToken(accessToken, scopes, status, responseBody) {
|
|
19
|
+
if (!ROOT_API_KEY_PATTERN.test(accessToken))
|
|
20
|
+
return false;
|
|
21
|
+
if (status === 404)
|
|
22
|
+
return true;
|
|
23
|
+
// Before v4.8.4, the mint endpoint required at least one scope.
|
|
24
|
+
return (status === 400 && scopes.length === 0 && LegacyEmptyScopesError.safeParse(responseBody).success);
|
|
25
|
+
}
|
|
26
|
+
//# sourceMappingURL=publicTokenCompatibility.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"publicTokenCompatibility.js","sourceRoot":"","sources":["../../../../src/v3/apiClient/publicTokenCompatibility.ts"],"names":[],"mappings":";;;AAAA,+BAA2B;AAE3B,6EAA6E;AAC7E,MAAM,oBAAoB,GAAG,gEAAgE,CAAC;AAE9F,MAAM,sBAAsB,GAAG,MAAC,CAAC,MAAM,CAAC;IACtC,KAAK,EAAE,MAAC,CAAC,OAAO,CAAC,sBAAsB,CAAC;IACxC,MAAM,EAAE,MAAC,CAAC,KAAK,CAAC;QACd,MAAC,CAAC,MAAM,CAAC;YACP,IAAI,EAAE,MAAC,CAAC,OAAO,CAAC,WAAW,CAAC;YAC5B,OAAO,EAAE,MAAC,CAAC,OAAO,CAAC,CAAC,CAAC;YACrB,SAAS,EAAE,MAAC,CAAC,OAAO,CAAC,IAAI,CAAC;YAC1B,IAAI,EAAE,MAAC,CAAC,KAAK,CAAC,CAAC,MAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC;SACrC,CAAC;KACH,CAAC;CACH,CAAC,CAAC;AAEH,uCACE,WAAmB,EACnB,MAAgB,EAChB,MAA0B,EAC1B,YAAsB;IAEtB,IAAI,CAAC,oBAAoB,CAAC,IAAI,CAAC,WAAW,CAAC;QAAE,OAAO,KAAK,CAAC;IAC1D,IAAI,MAAM,KAAK,GAAG;QAAE,OAAO,IAAI,CAAC;IAEhC,gEAAgE;IAChE,OAAO,CACL,MAAM,KAAK,GAAG,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,IAAI,sBAAsB,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,OAAO,CAChG,CAAC;AACJ,CAAC"}
|
|
@@ -20,5 +20,5 @@ export declare class APIClientManagerAPI {
|
|
|
20
20
|
}>;
|
|
21
21
|
runWithConfig<R extends (...args: any[]) => Promise<any>>(config: ApiClientConfiguration, fn: R): Promise<ReturnType<R>>;
|
|
22
22
|
setGlobalAPIClientConfiguration(config: ApiClientConfiguration): boolean;
|
|
23
|
-
apiClientMissingError(): "
|
|
23
|
+
apiClientMissingError(): "Configure the SDK with configure({ accessToken }) before making API calls. See https://trigger.dev/docs/management/overview#authentication" | "Configure the SDK with configure({ baseURL, accessToken }) before making API calls. See https://trigger.dev/docs/management/overview#authentication" | "Unknown error" | "You need to set the TRIGGER_API_URL environment variable. See https://trigger.dev/docs/management/overview#authentication";
|
|
24
24
|
}
|
|
@@ -178,13 +178,13 @@ class APIClientManagerAPI {
|
|
|
178
178
|
const hasBaseUrl = !!this.baseURL;
|
|
179
179
|
const hasAccessToken = !!this.accessToken;
|
|
180
180
|
if (!hasBaseUrl && !hasAccessToken) {
|
|
181
|
-
return `
|
|
181
|
+
return `Configure the SDK with configure({ baseURL, accessToken }) before making API calls. See https://trigger.dev/docs/management/overview#authentication`;
|
|
182
182
|
}
|
|
183
183
|
else if (!hasBaseUrl) {
|
|
184
184
|
return `You need to set the TRIGGER_API_URL environment variable. See https://trigger.dev/docs/management/overview#authentication`;
|
|
185
185
|
}
|
|
186
186
|
else if (!hasAccessToken) {
|
|
187
|
-
return `
|
|
187
|
+
return `Configure the SDK with configure({ accessToken }) before making API calls. See https://trigger.dev/docs/management/overview#authentication`;
|
|
188
188
|
}
|
|
189
189
|
return `Unknown error`;
|
|
190
190
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/v3/apiClientManager/index.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/v3/apiClientManager/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,20 @@
|
|
|
1
1
|
import type { IncomingMessage, RequestListener } from "node:http";
|
|
2
|
-
export declare
|
|
2
|
+
export declare const DEFAULT_MAX_JSON_BODY_BYTES: number;
|
|
3
|
+
export declare class RequestBodyTooLargeError extends Error {
|
|
4
|
+
readonly maxBytes: number;
|
|
5
|
+
constructor(maxBytes: number);
|
|
6
|
+
}
|
|
7
|
+
export type GetJsonBodyOptions = {
|
|
8
|
+
/** Maximum request body size in bytes. Defaults to 1 MiB. */
|
|
9
|
+
maxBytes?: number;
|
|
10
|
+
/** Called with the body size in bytes once the whole body has been read. */
|
|
11
|
+
onBodyRead?: (bytes: number) => void;
|
|
12
|
+
};
|
|
13
|
+
/**
|
|
14
|
+
* Reads and parses a JSON request body. Rejects with a `RequestBodyTooLargeError`
|
|
15
|
+
* once the body is larger than `maxBytes`, and stops reading the request.
|
|
16
|
+
*/
|
|
17
|
+
export declare function getJsonBody(req: IncomingMessage, options?: GetJsonBodyOptions): Promise<any>;
|
|
3
18
|
export declare class HttpReply {
|
|
4
19
|
private response;
|
|
5
20
|
constructor(response: Parameters<RequestListener>[1]);
|
|
@@ -1,17 +1,68 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.HttpReply = void 0;
|
|
3
|
+
exports.HttpReply = exports.RequestBodyTooLargeError = exports.DEFAULT_MAX_JSON_BODY_BYTES = void 0;
|
|
4
4
|
exports.getJsonBody = getJsonBody;
|
|
5
5
|
exports.getRandomPortNumber = getRandomPortNumber;
|
|
6
|
-
|
|
6
|
+
exports.DEFAULT_MAX_JSON_BODY_BYTES = 1024 * 1024;
|
|
7
|
+
class RequestBodyTooLargeError extends Error {
|
|
8
|
+
maxBytes;
|
|
9
|
+
constructor(maxBytes) {
|
|
10
|
+
super(`Request body exceeds the limit of ${maxBytes} bytes`);
|
|
11
|
+
this.maxBytes = maxBytes;
|
|
12
|
+
this.name = "RequestBodyTooLargeError";
|
|
13
|
+
}
|
|
14
|
+
}
|
|
15
|
+
exports.RequestBodyTooLargeError = RequestBodyTooLargeError;
|
|
16
|
+
/**
|
|
17
|
+
* Reads and parses a JSON request body. Rejects with a `RequestBodyTooLargeError`
|
|
18
|
+
* once the body is larger than `maxBytes`, and stops reading the request.
|
|
19
|
+
*/
|
|
20
|
+
async function getJsonBody(req, options = {}) {
|
|
21
|
+
const maxBytes = options.maxBytes ?? exports.DEFAULT_MAX_JSON_BODY_BYTES;
|
|
7
22
|
return new Promise((resolve, reject) => {
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
23
|
+
const contentLength = Number(req.headers["content-length"]);
|
|
24
|
+
if (Number.isFinite(contentLength) && contentLength > maxBytes) {
|
|
25
|
+
req.pause();
|
|
26
|
+
reject(new RequestBodyTooLargeError(maxBytes));
|
|
27
|
+
return;
|
|
28
|
+
}
|
|
29
|
+
const chunks = [];
|
|
30
|
+
let receivedBytes = 0;
|
|
31
|
+
const cleanup = () => {
|
|
32
|
+
req.off("data", onData);
|
|
33
|
+
req.off("end", onEnd);
|
|
34
|
+
req.off("error", onError);
|
|
35
|
+
req.off("close", onClose);
|
|
36
|
+
};
|
|
37
|
+
const onData = (chunk) => {
|
|
38
|
+
const buffer = typeof chunk === "string" ? Buffer.from(chunk) : chunk;
|
|
39
|
+
receivedBytes += buffer.byteLength;
|
|
40
|
+
if (receivedBytes > maxBytes) {
|
|
41
|
+
cleanup();
|
|
42
|
+
chunks.length = 0;
|
|
43
|
+
req.pause();
|
|
44
|
+
reject(new RequestBodyTooLargeError(maxBytes));
|
|
45
|
+
return;
|
|
46
|
+
}
|
|
47
|
+
chunks.push(buffer);
|
|
48
|
+
};
|
|
49
|
+
const onEnd = () => {
|
|
50
|
+
cleanup();
|
|
51
|
+
options.onBodyRead?.(receivedBytes);
|
|
52
|
+
resolve(safeJsonParse(Buffer.concat(chunks).toString("utf8")));
|
|
53
|
+
};
|
|
54
|
+
const onError = (error) => {
|
|
55
|
+
cleanup();
|
|
56
|
+
reject(error);
|
|
57
|
+
};
|
|
58
|
+
const onClose = () => {
|
|
59
|
+
cleanup();
|
|
60
|
+
reject(new Error("Request closed before the body was fully read"));
|
|
61
|
+
};
|
|
62
|
+
req.on("data", onData);
|
|
63
|
+
req.on("end", onEnd);
|
|
64
|
+
req.on("error", onError);
|
|
65
|
+
req.on("close", onClose);
|
|
15
66
|
});
|
|
16
67
|
}
|
|
17
68
|
function safeJsonParse(text) {
|
|
@@ -22,7 +73,7 @@ function safeJsonParse(text) {
|
|
|
22
73
|
return JSON.parse(text);
|
|
23
74
|
}
|
|
24
75
|
catch (error) {
|
|
25
|
-
console.error("Failed to parse JSON", { error, text });
|
|
76
|
+
console.error("Failed to parse JSON", { error, length: text.length });
|
|
26
77
|
return null;
|
|
27
78
|
}
|
|
28
79
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"http.js","sourceRoot":"","sources":["../../../../src/v3/apps/http.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"http.js","sourceRoot":"","sources":["../../../../src/v3/apps/http.ts"],"names":[],"mappings":"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"}
|
|
@@ -27,6 +27,19 @@ export declare const isExperimentalConfigRuntime: typeof isDeprecatedConfigRunti
|
|
|
27
27
|
export declare function resolveBuildRuntime(runtime: unknown): BuildRuntime;
|
|
28
28
|
export declare function binaryForRuntime(runtime: BuildRuntime): string;
|
|
29
29
|
export declare function execPathForRuntime(runtime: BuildRuntime): string;
|
|
30
|
+
/**
|
|
31
|
+
* Node 24 and 26 can share a compile cache between the image build and the runtime. Node 22 is
|
|
32
|
+
* left out: its cache key includes --max-old-space-size, which the run worker sets per machine, so
|
|
33
|
+
* a cache built in the image would never be read.
|
|
34
|
+
*/
|
|
35
|
+
export declare function supportsNodeCompileCache(runtime: BuildRuntime): boolean;
|
|
36
|
+
/**
|
|
37
|
+
* The env that points Node at the compile cache. The image build writes it and the run worker reads
|
|
38
|
+
* it from the same /app path, so entries are keyed by absolute path (portable mode drops the query
|
|
39
|
+
* that instrumented module wrappers use, so a wrapper and its module would share one entry). Node 24
|
|
40
|
+
* has no read-only mode, so it also writes entries the build missed.
|
|
41
|
+
*/
|
|
42
|
+
export declare function nodeCompileCacheEnv(runtime: BuildRuntime, compileCacheDir: string, mode: "write" | "read"): Record<string, string>;
|
|
30
43
|
export type ExecOptions = {
|
|
31
44
|
loaderEntryPoint?: string;
|
|
32
45
|
customConditions?: string[];
|
|
@@ -9,6 +9,8 @@ exports.deprecatedRuntimeReplacement = deprecatedRuntimeReplacement;
|
|
|
9
9
|
exports.resolveBuildRuntime = resolveBuildRuntime;
|
|
10
10
|
exports.binaryForRuntime = binaryForRuntime;
|
|
11
11
|
exports.execPathForRuntime = execPathForRuntime;
|
|
12
|
+
exports.supportsNodeCompileCache = supportsNodeCompileCache;
|
|
13
|
+
exports.nodeCompileCacheEnv = nodeCompileCacheEnv;
|
|
12
14
|
exports.execOptionsForRuntime = execOptionsForRuntime;
|
|
13
15
|
exports.detectRuntimeVersion = detectRuntimeVersion;
|
|
14
16
|
const node_path_1 = require("node:path");
|
|
@@ -16,6 +18,7 @@ const url_1 = require("url");
|
|
|
16
18
|
const build_js_1 = require("../schemas/build.js");
|
|
17
19
|
const flags_js_1 = require("./flags.js");
|
|
18
20
|
const node_os_1 = require("node:os");
|
|
21
|
+
const node_fs_1 = require("node:fs");
|
|
19
22
|
exports.CURRENT_NODE_LTS_RUNTIME = "node-24";
|
|
20
23
|
exports.DEFAULT_RUNTIME = exports.CURRENT_NODE_LTS_RUNTIME;
|
|
21
24
|
function isDeprecatedConfigRuntime(runtime) {
|
|
@@ -97,18 +100,41 @@ function execPathForRuntime(runtime) {
|
|
|
97
100
|
return process.execPath;
|
|
98
101
|
case "bun":
|
|
99
102
|
case "bun-legacy":
|
|
100
|
-
case "bun-1.4":
|
|
103
|
+
case "bun-1.4": {
|
|
101
104
|
if (typeof process.env.BUN_INSTALL === "string") {
|
|
102
105
|
return (0, node_path_1.join)(process.env.BUN_INSTALL, "bin", "bun");
|
|
103
106
|
}
|
|
104
107
|
if (typeof process.env.BUN_INSTALL_BIN === "string") {
|
|
105
108
|
return (0, node_path_1.join)(process.env.BUN_INSTALL_BIN, "bun");
|
|
106
109
|
}
|
|
107
|
-
|
|
110
|
+
const defaultPath = (0, node_path_1.join)((0, node_os_1.homedir)(), ".bun", "bin", "bun");
|
|
111
|
+
// Bun installed some other way (Homebrew, mise, a distro package) is found on PATH
|
|
112
|
+
return (0, node_fs_1.existsSync)(defaultPath) ? defaultPath : "bun";
|
|
113
|
+
}
|
|
108
114
|
default:
|
|
109
115
|
throw new Error(`Unsupported runtime ${runtime}`);
|
|
110
116
|
}
|
|
111
117
|
}
|
|
118
|
+
/**
|
|
119
|
+
* Node 24 and 26 can share a compile cache between the image build and the runtime. Node 22 is
|
|
120
|
+
* left out: its cache key includes --max-old-space-size, which the run worker sets per machine, so
|
|
121
|
+
* a cache built in the image would never be read.
|
|
122
|
+
*/
|
|
123
|
+
function supportsNodeCompileCache(runtime) {
|
|
124
|
+
return runtime === "node" || runtime === "node-24" || runtime === "node-26";
|
|
125
|
+
}
|
|
126
|
+
/**
|
|
127
|
+
* The env that points Node at the compile cache. The image build writes it and the run worker reads
|
|
128
|
+
* it from the same /app path, so entries are keyed by absolute path (portable mode drops the query
|
|
129
|
+
* that instrumented module wrappers use, so a wrapper and its module would share one entry). Node 24
|
|
130
|
+
* has no read-only mode, so it also writes entries the build missed.
|
|
131
|
+
*/
|
|
132
|
+
function nodeCompileCacheEnv(runtime, compileCacheDir, mode) {
|
|
133
|
+
return {
|
|
134
|
+
NODE_COMPILE_CACHE: compileCacheDir,
|
|
135
|
+
...(mode === "read" && runtime === "node-26" ? { NODE_COMPILE_CACHE_READONLY: "1" } : {}),
|
|
136
|
+
};
|
|
137
|
+
}
|
|
112
138
|
function execOptionsForRuntime(runtime, options, additionalNodeOptions) {
|
|
113
139
|
switch (runtime) {
|
|
114
140
|
case "node":
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runtime.js","sourceRoot":"","sources":["../../../../src/v3/build/runtime.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"runtime.js","sourceRoot":"","sources":["../../../../src/v3/build/runtime.ts"],"names":[],"mappings":"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"}
|
|
@@ -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,38 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.triggerConcurrencyKeyBody = triggerConcurrencyKeyBody;
|
|
4
|
+
/**
|
|
5
|
+
* The trigger-time `concurrencyKey`. Anything but a key map is sent as given. A key
|
|
6
|
+
* map needs a `default`, and every entry needs a non-empty string or finite number, which
|
|
7
|
+
* is sent as a string.
|
|
8
|
+
*/
|
|
9
|
+
function triggerConcurrencyKeyBody(concurrencyKey) {
|
|
10
|
+
if (!isKeyMap(concurrencyKey)) {
|
|
11
|
+
return { concurrencyKey };
|
|
12
|
+
}
|
|
13
|
+
const keys = {};
|
|
14
|
+
for (const [name, key] of Object.entries(concurrencyKey)) {
|
|
15
|
+
const usable = (typeof key === "string" && key !== "") || (typeof key === "number" && Number.isFinite(key));
|
|
16
|
+
if (name === "__proto__" || (name !== "default" && !usable)) {
|
|
17
|
+
throw new Error(`concurrencyKey entry "${name}" needs a limit name and a key that is a non-empty string or number.`);
|
|
18
|
+
}
|
|
19
|
+
if (usable) {
|
|
20
|
+
keys[name] = String(key);
|
|
21
|
+
}
|
|
22
|
+
}
|
|
23
|
+
if (!keys.default) {
|
|
24
|
+
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.");
|
|
25
|
+
}
|
|
26
|
+
return { concurrencyKey: keys };
|
|
27
|
+
}
|
|
28
|
+
/**
|
|
29
|
+
* Any object that serialises as an object. Arrays and objects with a `toJSON` (dates, id
|
|
30
|
+
* objects) serialise to something else, so they are sent as given.
|
|
31
|
+
*/
|
|
32
|
+
function isKeyMap(value) {
|
|
33
|
+
return (typeof value === "object" &&
|
|
34
|
+
value !== null &&
|
|
35
|
+
!Array.isArray(value) &&
|
|
36
|
+
typeof value.toJSON !== "function");
|
|
37
|
+
}
|
|
38
|
+
//# 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,mCACE,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"}
|
|
@@ -25,4 +25,5 @@ __exportStar(require("./consts.js"), exports);
|
|
|
25
25
|
__exportStar(require("./traceContext.js"), exports);
|
|
26
26
|
__exportStar(require("./dates.js"), exports);
|
|
27
27
|
__exportStar(require("./deploymentVersions.js"), exports);
|
|
28
|
+
__exportStar(require("./concurrencyKey.js"), exports);
|
|
28
29
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/v3/isomorphic/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,kDAAgC;AAChC,gEAA8C;AAC9C,uDAAqC;AACrC,qDAAmC;AACnC,gDAA8B;AAC9B,mDAAiC;AACjC,iDAA+B;AAC/B,8CAA4B;AAC5B,oDAAkC;AAClC,6CAA2B;AAC3B,0DAAwC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/v3/isomorphic/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,kDAAgC;AAChC,gEAA8C;AAC9C,uDAAqC;AACrC,qDAAmC;AACnC,gDAA8B;AAC9B,mDAAiC;AACjC,iDAA+B;AAC/B,8CAA4B;AAC5B,oDAAkC;AAClC,6CAA2B;AAC3B,0DAAwC;AACxC,sDAAoC"}
|
|
@@ -1,8 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.CONCURRENCY_LIMIT_NAME_PATTERN = void 0;
|
|
3
4
|
exports.sanitizeQueueName = sanitizeQueueName;
|
|
4
5
|
// Only allow alphanumeric characters, underscores, hyphens, and slashes (and only the first 128 characters)
|
|
5
6
|
function sanitizeQueueName(queueName) {
|
|
6
7
|
return queueName.replace(/[^a-zA-Z0-9_\-/]/g, "").substring(0, 128);
|
|
7
8
|
}
|
|
9
|
+
/** The names a concurrency limit can have: what `concurrencyLimit()` accepts for `name`. */
|
|
10
|
+
exports.CONCURRENCY_LIMIT_NAME_PATTERN = /^[a-zA-Z0-9_-]{1,122}$/;
|
|
8
11
|
//# sourceMappingURL=queueName.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"queueName.js","sourceRoot":"","sources":["../../../../src/v3/isomorphic/queueName.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"queueName.js","sourceRoot":"","sources":["../../../../src/v3/isomorphic/queueName.ts"],"names":[],"mappings":";;;;AAAA,4GAA4G;AAC5G,2BAAkC,SAAiB;IACjD,OAAO,SAAS,CAAC,OAAO,CAAC,mBAAmB,EAAE,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;AACtE,CAAC;AAED,4FAA4F;AAC/E,QAAA,8BAA8B,GAAG,wBAAwB,CAAC"}
|
|
@@ -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/commonjs/v3/jwt.js
CHANGED
|
@@ -43,7 +43,7 @@ async function generateJWT(options) {
|
|
|
43
43
|
const secret = new TextEncoder().encode(options.secretKey);
|
|
44
44
|
const jwt = new SignJWT(options.payload)
|
|
45
45
|
.setIssuer(exports.JWT_ISSUER)
|
|
46
|
-
.setAudience(exports.JWT_AUDIENCE)
|
|
46
|
+
.setAudience(options.audience ?? exports.JWT_AUDIENCE)
|
|
47
47
|
.setProtectedHeader({ alg: exports.JWT_ALGORITHM })
|
|
48
48
|
.setExpirationTime(options.expirationTime ?? "15m");
|
|
49
49
|
if (!options.omitIssuedAt) {
|
|
@@ -51,13 +51,16 @@ async function generateJWT(options) {
|
|
|
51
51
|
}
|
|
52
52
|
return jwt.sign(secret);
|
|
53
53
|
}
|
|
54
|
-
async function validateJWT(token, apiKey) {
|
|
54
|
+
async function validateJWT(token, apiKey, audience = exports.JWT_AUDIENCE) {
|
|
55
|
+
// jose skips the audience check for a falsy value.
|
|
56
|
+
if (!audience)
|
|
57
|
+
throw new Error("validateJWT: audience must not be empty");
|
|
55
58
|
const { jwtVerify, errors } = await import("jose");
|
|
56
59
|
const secret = new TextEncoder().encode(apiKey);
|
|
57
60
|
try {
|
|
58
61
|
const { payload } = await jwtVerify(token, secret, {
|
|
59
62
|
issuer: exports.JWT_ISSUER,
|
|
60
|
-
audience
|
|
63
|
+
audience,
|
|
61
64
|
});
|
|
62
65
|
return { ok: true, payload };
|
|
63
66
|
}
|
|
@@ -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,7 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.
|
|
3
|
+
exports.getMachineId = getMachineId;
|
|
4
4
|
const friendlyId_js_1 = require("../isomorphic/friendlyId.js");
|
|
5
5
|
const getEnv_js_1 = require("../utils/getEnv.js");
|
|
6
|
-
|
|
6
|
+
let machineId;
|
|
7
|
+
// Generated on first use, not at import, so importing draws no randomness.
|
|
8
|
+
function getMachineId() {
|
|
9
|
+
return (machineId ??= (0, getEnv_js_1.getEnvVar)("TRIGGER_MACHINE_ID") ?? (0, friendlyId_js_1.generateFriendlyId)("machine"));
|
|
10
|
+
}
|
|
7
11
|
//# sourceMappingURL=machineId.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"machineId.js","sourceRoot":"","sources":["../../../../src/v3/otel/machineId.ts"],"names":[],"mappings":";;;AAAA,+DAAiE;AACjE,kDAA+C;AAElC,
|
|
1
|
+
{"version":3,"file":"machineId.js","sourceRoot":"","sources":["../../../../src/v3/otel/machineId.ts"],"names":[],"mappings":";;;AAAA,+DAAiE;AACjE,kDAA+C;AAE/C,IAAI,SAA6B,CAAC;AAElC,2EAA2E;AAC3E;IACE,OAAO,CAAC,SAAS,KAAK,IAAA,qBAAS,EAAC,oBAAoB,CAAC,IAAI,IAAA,kCAAkB,EAAC,SAAS,CAAC,CAAC,CAAC;AAC1F,CAAC"}
|
|
@@ -54,7 +54,7 @@ class TracingSDK {
|
|
|
54
54
|
[semanticInternalAttributes_js_1.SemanticInternalAttributes.CLI_VERSION]: version_js_1.VERSION,
|
|
55
55
|
[semanticInternalAttributes_js_1.SemanticInternalAttributes.SDK_VERSION]: version_js_1.VERSION,
|
|
56
56
|
[semanticInternalAttributes_js_1.SemanticInternalAttributes.SDK_LANGUAGE]: "typescript",
|
|
57
|
-
[semanticInternalAttributes_js_1.SemanticInternalAttributes.MACHINE_ID]: machineId_js_1.
|
|
57
|
+
[semanticInternalAttributes_js_1.SemanticInternalAttributes.MACHINE_ID]: (0, machineId_js_1.getMachineId)(),
|
|
58
58
|
}))
|
|
59
59
|
.merge((0, resources_1.resourceFromAttributes)(envResourceAttributes))
|
|
60
60
|
.merge((0, resources_1.resourceFromAttributes)(customEnvResourceAttributes))
|