@thirdweb-dev/service-utils 0.9.14-nightly-6be945936195e6ba41dbdd3a90a28f097e81dbee-20250620000408 → 0.9.14
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/cjs/cf-worker/index.js +25 -25
- package/dist/cjs/cf-worker/index.js.map +1 -1
- package/dist/cjs/cf-worker/usage.js +7 -7
- package/dist/cjs/cf-worker/usage.js.map +1 -1
- package/dist/cjs/cf-worker/usageV2.js +2 -2
- package/dist/cjs/cf-worker/usageV2.js.map +1 -1
- package/dist/cjs/core/api.js +1 -1
- package/dist/cjs/core/api.js.map +1 -1
- package/dist/cjs/core/authorize/client.js +6 -6
- package/dist/cjs/core/authorize/client.js.map +1 -1
- package/dist/cjs/core/authorize/index.js +12 -12
- package/dist/cjs/core/authorize/index.js.map +1 -1
- package/dist/cjs/core/authorize/service.js +7 -7
- package/dist/cjs/core/authorize/service.js.map +1 -1
- package/dist/cjs/core/rateLimit/index.js +7 -7
- package/dist/cjs/core/rateLimit/index.js.map +1 -1
- package/dist/cjs/core/rateLimit/strategies/sliding-window.js +3 -3
- package/dist/cjs/core/rateLimit/strategies/sliding-window.js.map +1 -1
- package/dist/cjs/core/services.js +51 -51
- package/dist/cjs/core/services.js.map +1 -1
- package/dist/cjs/core/usage.js +53 -52
- package/dist/cjs/core/usage.js.map +1 -1
- package/dist/cjs/index.js +5 -5
- package/dist/cjs/index.js.map +1 -1
- package/dist/cjs/mocks.js +60 -60
- package/dist/cjs/mocks.js.map +1 -1
- package/dist/cjs/node/index.js +25 -25
- package/dist/cjs/node/index.js.map +1 -1
- package/dist/cjs/node/kafka.js +6 -6
- package/dist/cjs/node/kafka.js.map +1 -1
- package/dist/cjs/node/usageV2.js +8 -8
- package/dist/cjs/node/usageV2.js.map +1 -1
- package/dist/esm/cf-worker/index.js +25 -25
- package/dist/esm/cf-worker/index.js.map +1 -1
- package/dist/esm/cf-worker/usage.js +7 -7
- package/dist/esm/cf-worker/usage.js.map +1 -1
- package/dist/esm/cf-worker/usageV2.js +2 -2
- package/dist/esm/cf-worker/usageV2.js.map +1 -1
- package/dist/esm/core/api.js +1 -1
- package/dist/esm/core/api.js.map +1 -1
- package/dist/esm/core/authorize/client.js +6 -6
- package/dist/esm/core/authorize/client.js.map +1 -1
- package/dist/esm/core/authorize/index.js +12 -12
- package/dist/esm/core/authorize/index.js.map +1 -1
- package/dist/esm/core/authorize/service.js +7 -7
- package/dist/esm/core/authorize/service.js.map +1 -1
- package/dist/esm/core/rateLimit/index.js +7 -7
- package/dist/esm/core/rateLimit/index.js.map +1 -1
- package/dist/esm/core/rateLimit/strategies/sliding-window.js +3 -3
- package/dist/esm/core/rateLimit/strategies/sliding-window.js.map +1 -1
- package/dist/esm/core/services.js +51 -51
- package/dist/esm/core/services.js.map +1 -1
- package/dist/esm/core/usage.js +53 -52
- package/dist/esm/core/usage.js.map +1 -1
- package/dist/esm/index.js +2 -2
- package/dist/esm/index.js.map +1 -1
- package/dist/esm/mocks.js +60 -60
- package/dist/esm/mocks.js.map +1 -1
- package/dist/esm/node/index.js +25 -25
- package/dist/esm/node/index.js.map +1 -1
- package/dist/esm/node/kafka.js +6 -6
- package/dist/esm/node/kafka.js.map +1 -1
- package/dist/esm/node/usageV2.js +8 -8
- package/dist/esm/node/usageV2.js.map +1 -1
- package/dist/types/cf-worker/index.d.ts +3 -3
- package/dist/types/cf-worker/index.d.ts.map +1 -1
- package/dist/types/cf-worker/usage.d.ts.map +1 -1
- package/dist/types/core/authorize/client.d.ts.map +1 -1
- package/dist/types/core/authorize/index.d.ts.map +1 -1
- package/dist/types/core/services.d.ts +122 -122
- package/dist/types/core/services.d.ts.map +1 -1
- package/dist/types/core/usage.d.ts +143 -141
- package/dist/types/core/usage.d.ts.map +1 -1
- package/dist/types/index.d.ts +3 -3
- package/dist/types/index.d.ts.map +1 -1
- package/dist/types/node/index.d.ts +4 -4
- package/dist/types/node/index.d.ts.map +1 -1
- package/dist/types/node/usageV2.d.ts.map +1 -1
- package/package.json +44 -43
|
@@ -6,11 +6,11 @@ exports.hashSecretKey = hashSecretKey;
|
|
|
6
6
|
exports.logHttpRequest = logHttpRequest;
|
|
7
7
|
const tslib_1 = require("tslib");
|
|
8
8
|
const index_js_1 = require("../core/authorize/index.js");
|
|
9
|
+
tslib_1.__exportStar(require("../core/rateLimit/index.js"), exports);
|
|
10
|
+
tslib_1.__exportStar(require("../core/services.js"), exports);
|
|
11
|
+
tslib_1.__exportStar(require("../core/usageV2.js"), exports);
|
|
9
12
|
tslib_1.__exportStar(require("./usage.js"), exports);
|
|
10
13
|
tslib_1.__exportStar(require("./usageV2.js"), exports);
|
|
11
|
-
tslib_1.__exportStar(require("../core/usageV2.js"), exports);
|
|
12
|
-
tslib_1.__exportStar(require("../core/services.js"), exports);
|
|
13
|
-
tslib_1.__exportStar(require("../core/rateLimit/index.js"), exports);
|
|
14
14
|
const DEFAULT_CACHE_TTL_SECONDS = 60;
|
|
15
15
|
async function authorizeWorker(authInput, serviceConfig) {
|
|
16
16
|
let authData;
|
|
@@ -21,30 +21,30 @@ async function authorizeWorker(authInput, serviceConfig) {
|
|
|
21
21
|
if (e instanceof Error && e.message === "KEY_CONFLICT") {
|
|
22
22
|
return {
|
|
23
23
|
authorized: false,
|
|
24
|
-
status: 400,
|
|
25
|
-
errorMessage: "Please pass either a client id or a secret key.",
|
|
26
24
|
errorCode: "KEY_CONFLICT",
|
|
25
|
+
errorMessage: "Please pass either a client id or a secret key.",
|
|
26
|
+
status: 400,
|
|
27
27
|
};
|
|
28
28
|
}
|
|
29
29
|
return {
|
|
30
30
|
authorized: false,
|
|
31
|
-
status: 500,
|
|
32
|
-
errorMessage: "Internal Server Error",
|
|
33
31
|
errorCode: "INTERNAL_SERVER_ERROR",
|
|
32
|
+
errorMessage: "Internal Server Error",
|
|
33
|
+
status: 500,
|
|
34
34
|
};
|
|
35
35
|
}
|
|
36
36
|
return await (0, index_js_1.authorize)(authData, serviceConfig, {
|
|
37
|
+
cacheTtlSeconds: serviceConfig.cacheTtlSeconds ?? DEFAULT_CACHE_TTL_SECONDS,
|
|
37
38
|
get: async (clientId) => serviceConfig.kvStore.get(clientId),
|
|
38
39
|
put: (clientId, teamAndProjectResponse) => serviceConfig.ctx.waitUntil(serviceConfig.kvStore.put(clientId, JSON.stringify({
|
|
39
|
-
updatedAt: Date.now(),
|
|
40
40
|
teamAndProjectResponse,
|
|
41
|
+
updatedAt: Date.now(),
|
|
41
42
|
}), {
|
|
42
43
|
expirationTtl: serviceConfig.cacheTtlSeconds &&
|
|
43
44
|
serviceConfig.cacheTtlSeconds >= DEFAULT_CACHE_TTL_SECONDS
|
|
44
45
|
? serviceConfig.cacheTtlSeconds
|
|
45
46
|
: DEFAULT_CACHE_TTL_SECONDS,
|
|
46
47
|
})),
|
|
47
|
-
cacheTtlSeconds: serviceConfig.cacheTtlSeconds ?? DEFAULT_CACHE_TTL_SECONDS,
|
|
48
48
|
});
|
|
49
49
|
}
|
|
50
50
|
async function extractAuthorizationData(authInput) {
|
|
@@ -118,19 +118,19 @@ async function extractAuthorizationData(authInput) {
|
|
|
118
118
|
teamId = headers.get("x-team-id");
|
|
119
119
|
}
|
|
120
120
|
return {
|
|
121
|
-
|
|
122
|
-
incomingServiceApiKeyHash,
|
|
123
|
-
jwt,
|
|
124
|
-
hashedJWT: jwt ? await hashSecretKey(jwt) : null,
|
|
125
|
-
secretKey,
|
|
121
|
+
bundleId,
|
|
126
122
|
clientId,
|
|
127
123
|
ecosystemId,
|
|
128
124
|
ecosystemPartnerId,
|
|
125
|
+
hashedJWT: jwt ? await hashSecretKey(jwt) : null,
|
|
126
|
+
incomingServiceApiKey,
|
|
127
|
+
incomingServiceApiKeyHash,
|
|
128
|
+
jwt,
|
|
129
129
|
origin,
|
|
130
|
-
|
|
130
|
+
secretKey,
|
|
131
131
|
secretKeyHash,
|
|
132
|
-
teamId: authInput.teamId ?? teamId ?? undefined,
|
|
133
132
|
targetAddress: authInput.targetAddress,
|
|
133
|
+
teamId: authInput.teamId ?? teamId ?? undefined,
|
|
134
134
|
};
|
|
135
135
|
}
|
|
136
136
|
async function hashSecretKey(secretKey) {
|
|
@@ -143,22 +143,22 @@ function bufferToHex(buffer) {
|
|
|
143
143
|
}
|
|
144
144
|
async function logHttpRequest({ clientId, req, res, isAuthed, statusMessage, latencyMs, }) {
|
|
145
145
|
try {
|
|
146
|
-
const authorizationData = await extractAuthorizationData({
|
|
146
|
+
const authorizationData = await extractAuthorizationData({ clientId, req });
|
|
147
147
|
const headers = req.headers;
|
|
148
148
|
console.log(JSON.stringify({
|
|
149
|
-
|
|
150
|
-
pathname: req.url,
|
|
151
|
-
hasSecretKey: !!authorizationData.secretKey,
|
|
149
|
+
clientId: authorizationData.clientId,
|
|
152
150
|
hasClientId: !!authorizationData.clientId,
|
|
153
151
|
hasJwt: !!authorizationData.jwt,
|
|
154
|
-
|
|
152
|
+
hasSecretKey: !!authorizationData.secretKey,
|
|
155
153
|
isAuthed,
|
|
156
|
-
|
|
154
|
+
latencyMs,
|
|
155
|
+
method: req.method,
|
|
156
|
+
os: headers.get("x-sdk-os") ?? undefined,
|
|
157
|
+
pathname: req.url,
|
|
158
|
+
platform: headers.get("x-sdk-platform") ?? undefined,
|
|
157
159
|
sdkName: headers.get("x-sdk-name") ?? undefined,
|
|
158
160
|
sdkVersion: headers.get("x-sdk-version") ?? undefined,
|
|
159
|
-
|
|
160
|
-
os: headers.get("x-sdk-os") ?? undefined,
|
|
161
|
-
latencyMs,
|
|
161
|
+
status: res.status,
|
|
162
162
|
}));
|
|
163
163
|
if (statusMessage) {
|
|
164
164
|
console.log(`statusMessage=${statusMessage}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/cf-worker/index.ts"],"names":[],"mappings":";;AAiCA,0CA6CC;AAED,4DAkGC;AAED,sCAIC;AAQD,wCAwCC;;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/cf-worker/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -37,19 +37,19 @@ async function publishUsageEvents(usageEvents, config) {
|
|
|
37
37
|
});
|
|
38
38
|
const aws = getAws({
|
|
39
39
|
accessKeyId,
|
|
40
|
-
secretAccessKey,
|
|
41
40
|
region,
|
|
41
|
+
secretAccessKey,
|
|
42
42
|
});
|
|
43
43
|
await aws.fetch(`https://sqs.${region}.amazonaws.com`, {
|
|
44
|
-
headers: {
|
|
45
|
-
"X-Amz-Target": "AmazonSQS.SendMessageBatch",
|
|
46
|
-
"X-Amz-Date": new Date().toISOString(),
|
|
47
|
-
"Content-Type": "application/x-amz-json-1.0",
|
|
48
|
-
},
|
|
49
44
|
body: JSON.stringify({
|
|
50
|
-
QueueUrl: queueUrl,
|
|
51
45
|
Entries: entries,
|
|
46
|
+
QueueUrl: queueUrl,
|
|
52
47
|
}),
|
|
48
|
+
headers: {
|
|
49
|
+
"Content-Type": "application/x-amz-json-1.0",
|
|
50
|
+
"X-Amz-Date": new Date().toISOString(),
|
|
51
|
+
"X-Amz-Target": "AmazonSQS.SendMessageBatch",
|
|
52
|
+
},
|
|
53
53
|
});
|
|
54
54
|
}
|
|
55
55
|
//# sourceMappingURL=usage.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"usage.js","sourceRoot":"","sources":["../../../src/cf-worker/usage.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"usage.js","sourceRoot":"","sources":["../../../src/cf-worker/usage.ts"],"names":[],"mappings":";;AAuES,gDAAkB;AAvE3B,yCAAsC;AACtC,+CAAqE;AAIrE,wCAAwC;AACxC,IAAI,IAA2B,CAAC;AAChC,SAAS,MAAM,CAAC,OAAmD;IACjE,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,IAAI,GAAG,IAAI,qBAAS,CAAC,OAAO,CAAC,CAAC;IAChC,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;;;;;;;;;;;GAaG;AACH,KAAK,UAAU,kBAAkB,CAC/B,WAAyB,EACzB,MAKC;IAED,MAAM,EACJ,QAAQ,EACR,WAAW,EACX,eAAe,EACf,MAAM,GAAG,WAAW,GACrB,GAAG,MAAM,CAAC;IAEX,MAAM,OAAO,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;QACxC,iCAAiC;QACjC,MAAM,MAAM,GAAG,2BAAgB,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAC7C,OAAO;YACL,EAAE,EAAE,MAAM,CAAC,UAAU,EAAE;YACvB,WAAW,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC;SACpC,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,MAAM,GAAG,GAAG,MAAM,CAAC;QACjB,WAAW;QACX,MAAM;QACN,eAAe;KAChB,CAAC,CAAC;IACH,MAAM,GAAG,CAAC,KAAK,CAAC,eAAe,MAAM,gBAAgB,EAAE;QACrD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC;YACnB,OAAO,EAAE,OAAO;YAChB,QAAQ,EAAE,QAAQ;SACnB,CAAC;QACF,OAAO,EAAE;YACP,cAAc,EAAE,4BAA4B;YAC5C,YAAY,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;YACtC,cAAc,EAAE,4BAA4B;SAC7C;KACF,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -46,9 +46,9 @@ async function sendUsageV2Events(events, options) {
|
|
|
46
46
|
throw new Error("[UsageV2] No authentication method provided.");
|
|
47
47
|
}
|
|
48
48
|
const resp = await fetch(url, {
|
|
49
|
-
method: "POST",
|
|
50
|
-
headers,
|
|
51
49
|
body: JSON.stringify({ events }),
|
|
50
|
+
headers,
|
|
51
|
+
method: "POST",
|
|
52
52
|
});
|
|
53
53
|
if (!resp.ok) {
|
|
54
54
|
throw new Error(`[UsageV2] Unexpected response ${resp.status}: ${await resp.text()}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"usageV2.js","sourceRoot":"","sources":["../../../src/cf-worker/usageV2.ts"],"names":[],"mappings":";;AAwBA,8CAmDC;AApED,yCAAsD;AAStD;;;;;;;GAOG;AACI,KAAK,UAAU,iBAAiB,CACrC,MAEwB,EACxB,OAAU;IAEV,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC;IAEhE,gEAAgE;IAChE,IAAI,QAAQ,GAAG,SAAS,CAAC,QAAQ,IAAI,IAAI,CAAC;IAC1C,IAAI,SAAS,GAAkB,IAAI,CAAC;IACpC,IAAI,SAAS,CAAC,GAAG,EAAE,CAAC;QAClB,MAAM,QAAQ,GAAG,MAAM,IAAA,mCAAwB,EAAC;YAC9C,GAAG,SAAS;YACZ,GAAG,EAAE,SAAS,CAAC,GAAG;SACnB,CAAC,CAAC;QACH,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAC;QAC7B,SAAS,GAAG,QAAQ,CAAC,SAAS,CAAC;IACjC,CAAC;IAED,wDAAwD;IACxD,oEAAoE;IACpE,IAAI,GAAW,CAAC;IAChB,MAAM,OAAO,GAAG,SAAS,CAAC,GAAG;QAC3B,CAAC,CAAC,IAAI,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACxD,CAAC,CAAC,IAAI,OAAO,EAAE,CAAC;IAClB,OAAO,CAAC,GAAG,CAAC,cAAc,EAAE,kBAAkB,CAAC,CAAC;IAChD,IAAI,UAAU,EAAE,CAAC;QACf,oEAAoE;QACpE,GAAG,GAAG,GAAG,YAAY,aAAa,MAAM,EAAE,CAAC;QAC3C,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE,UAAU,CAAC,CAAC;IAC/C,CAAC;SAAM,IAAI,QAAQ,EAAE,CAAC;QACpB,GAAG,GAAG,GAAG,YAAY,aAAa,MAAM,SAAS,CAAC;QAClD,OAAO,CAAC,GAAG,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC;IACvC,CAAC;SAAM,IAAI,SAAS,EAAE,CAAC;QACrB,GAAG,GAAG,GAAG,YAAY,aAAa,MAAM,SAAS,CAAC;IACpD,CAAC;SAAM,CAAC;QACN,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;IAClE,CAAC;IAED,MAAM,IAAI,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE;QAC5B,
|
|
1
|
+
{"version":3,"file":"usageV2.js","sourceRoot":"","sources":["../../../src/cf-worker/usageV2.ts"],"names":[],"mappings":";;AAwBA,8CAmDC;AApED,yCAAsD;AAStD;;;;;;;GAOG;AACI,KAAK,UAAU,iBAAiB,CACrC,MAEwB,EACxB,OAAU;IAEV,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC;IAEhE,gEAAgE;IAChE,IAAI,QAAQ,GAAG,SAAS,CAAC,QAAQ,IAAI,IAAI,CAAC;IAC1C,IAAI,SAAS,GAAkB,IAAI,CAAC;IACpC,IAAI,SAAS,CAAC,GAAG,EAAE,CAAC;QAClB,MAAM,QAAQ,GAAG,MAAM,IAAA,mCAAwB,EAAC;YAC9C,GAAG,SAAS;YACZ,GAAG,EAAE,SAAS,CAAC,GAAG;SACnB,CAAC,CAAC;QACH,QAAQ,GAAG,QAAQ,CAAC,QAAQ,CAAC;QAC7B,SAAS,GAAG,QAAQ,CAAC,SAAS,CAAC;IACjC,CAAC;IAED,wDAAwD;IACxD,oEAAoE;IACpE,IAAI,GAAW,CAAC;IAChB,MAAM,OAAO,GAAG,SAAS,CAAC,GAAG;QAC3B,CAAC,CAAC,IAAI,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACxD,CAAC,CAAC,IAAI,OAAO,EAAE,CAAC;IAClB,OAAO,CAAC,GAAG,CAAC,cAAc,EAAE,kBAAkB,CAAC,CAAC;IAChD,IAAI,UAAU,EAAE,CAAC;QACf,oEAAoE;QACpE,GAAG,GAAG,GAAG,YAAY,aAAa,MAAM,EAAE,CAAC;QAC3C,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE,UAAU,CAAC,CAAC;IAC/C,CAAC;SAAM,IAAI,QAAQ,EAAE,CAAC;QACpB,GAAG,GAAG,GAAG,YAAY,aAAa,MAAM,SAAS,CAAC;QAClD,OAAO,CAAC,GAAG,CAAC,aAAa,EAAE,QAAQ,CAAC,CAAC;IACvC,CAAC;SAAM,IAAI,SAAS,EAAE,CAAC;QACrB,GAAG,GAAG,GAAG,YAAY,aAAa,MAAM,SAAS,CAAC;IACpD,CAAC;SAAM,CAAC;QACN,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;IAClE,CAAC;IAED,MAAM,IAAI,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE;QAC5B,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,MAAM,EAAE,CAAC;QAChC,OAAO;QACP,MAAM,EAAE,MAAM;KACf,CAAC,CAAC;IACH,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC;QACb,MAAM,IAAI,KAAK,CACb,iCAAiC,IAAI,CAAC,MAAM,KAAK,MAAM,IAAI,CAAC,IAAI,EAAE,EAAE,CACrE,CAAC;IACJ,CAAC;IACD,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC;AACtB,CAAC"}
|
package/dist/cjs/core/api.js
CHANGED
|
@@ -22,11 +22,11 @@ async function fetchTeamAndProject(authData, config) {
|
|
|
22
22
|
for (let i = 0; i < retryCount; i++) {
|
|
23
23
|
try {
|
|
24
24
|
const response = await fetch(url, {
|
|
25
|
-
method: "GET",
|
|
26
25
|
headers: {
|
|
27
26
|
...authHeaders,
|
|
28
27
|
"content-type": "application/json",
|
|
29
28
|
},
|
|
29
|
+
method: "GET",
|
|
30
30
|
});
|
|
31
31
|
// TODO: if the response is a well understood status code (401, 402, etc), we should skip retry logic
|
|
32
32
|
let text = "";
|
package/dist/cjs/core/api.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../src/core/api.ts"],"names":[],"mappings":";;AAqQA,kDAqDC;AAzTD,+DAAuD;AAoQhD,KAAK,UAAU,mBAAmB,CACvC,QAA4B,EAC5B,MAAyB;IAEzB,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,kBAAkB,EAAE,GAAG,MAAM,CAAC;IAC7D,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,QAAQ,CAAC;IAEtC,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC;IAC5C,IAAI,QAAQ,EAAE,CAAC;QACb,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;IAC7C,CAAC;IACD,IAAI,MAAM,EAAE,CAAC;QACX,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IACzC,CAAC;IACD,IAAI,kBAAkB,EAAE,CAAC;QACvB,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,oBAAoB,EAAE,MAAM,CAAC,CAAC;IACrD,CAAC;IAED,8DAA8D;IAC9D,MAAM,WAAW,GAAG,IAAA,oCAAc,EAAC,QAAQ,EAAE,aAAa,CAAC,CAAC;IAE5D,MAAM,UAAU,GAAG,MAAM,CAAC,UAAU,IAAI,CAAC,CAAC;IAC1C,IAAI,KAA0B,CAAC;IAC/B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,UAAU,EAAE,CAAC,EAAE,EAAE,CAAC;QACpC,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE;gBAChC,
|
|
1
|
+
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../src/core/api.ts"],"names":[],"mappings":";;AAqQA,kDAqDC;AAzTD,+DAAuD;AAoQhD,KAAK,UAAU,mBAAmB,CACvC,QAA4B,EAC5B,MAAyB;IAEzB,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,kBAAkB,EAAE,GAAG,MAAM,CAAC;IAC7D,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,QAAQ,CAAC;IAEtC,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,cAAc,EAAE,MAAM,CAAC,CAAC;IAC5C,IAAI,QAAQ,EAAE,CAAC;QACb,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;IAC7C,CAAC;IACD,IAAI,MAAM,EAAE,CAAC;QACX,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IACzC,CAAC;IACD,IAAI,kBAAkB,EAAE,CAAC;QACvB,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,oBAAoB,EAAE,MAAM,CAAC,CAAC;IACrD,CAAC;IAED,8DAA8D;IAC9D,MAAM,WAAW,GAAG,IAAA,oCAAc,EAAC,QAAQ,EAAE,aAAa,CAAC,CAAC;IAE5D,MAAM,UAAU,GAAG,MAAM,CAAC,UAAU,IAAI,CAAC,CAAC;IAC1C,IAAI,KAA0B,CAAC;IAC/B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,UAAU,EAAE,CAAC,EAAE,EAAE,CAAC;QACpC,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE;gBAChC,OAAO,EAAE;oBACP,GAAG,WAAW;oBACd,cAAc,EAAE,kBAAkB;iBACnC;gBACD,MAAM,EAAE,KAAK;aACd,CAAC,CAAC;YAEH,qGAAqG;YAErG,IAAI,IAAI,GAAG,EAAE,CAAC;YACd,IAAI,CAAC;gBACH,IAAI,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;gBAC7B,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAC1B,CAAC;YAAC,MAAM,CAAC;gBACP,MAAM,IAAI,KAAK,CACb,yCAAyC,QAAQ,CAAC,MAAM,MAAM,IAAI,EAAE,CACrE,CAAC;YACJ,CAAC;QACH,CAAC;QAAC,OAAO,GAAY,EAAE,CAAC;YACtB,KAAK,GAAG,GAAG,CAAC;YACZ,IAAI,CAAC,GAAG,UAAU,GAAG,CAAC,EAAE,CAAC;gBACvB,0DAA0D;gBAC1D,MAAM,aAAa,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;YAC/B,CAAC;QACH,CAAC;IACH,CAAC;IACD,MAAM,KAAK,CAAC;AACd,CAAC;AAED;;GAEG;AACH,SAAS,aAAa,CAAC,GAAW,EAAE,GAAW;IAC7C,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAC7B,UAAU,CAAC,OAAO,EAAE,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,GAAG,GAAG,CAAC,GAAG,GAAG,CAAC,CACvD,CAAC;AACJ,CAAC"}
|
|
@@ -7,10 +7,10 @@ function authorizeClient(authOptions, teamAndProjectResponse) {
|
|
|
7
7
|
const { origin, bundleId, incomingServiceApiKey } = authOptions;
|
|
8
8
|
const { team, project, authMethod } = teamAndProjectResponse;
|
|
9
9
|
const authResult = {
|
|
10
|
+
authMethod,
|
|
10
11
|
authorized: true,
|
|
11
|
-
team,
|
|
12
12
|
project,
|
|
13
|
-
|
|
13
|
+
team,
|
|
14
14
|
};
|
|
15
15
|
if (authMethod === "jwt") {
|
|
16
16
|
// ignore domains and bundleIds for JWT auth, if the token is valid we'll return the authResult
|
|
@@ -43,30 +43,30 @@ function authorizeClient(authOptions, teamAndProjectResponse) {
|
|
|
43
43
|
}
|
|
44
44
|
return {
|
|
45
45
|
authorized: false,
|
|
46
|
-
errorMessage: `Invalid request: Unauthorized domain: ${origin}. You can view the restrictions on this API key at https://thirdweb.com/create-api-key`,
|
|
47
46
|
errorCode: "ORIGIN_UNAUTHORIZED",
|
|
47
|
+
errorMessage: `Invalid request: Unauthorized domain: ${origin}. You can view the restrictions on this API key at https://thirdweb.com/create-api-key`,
|
|
48
48
|
status: 401,
|
|
49
49
|
};
|
|
50
50
|
}
|
|
51
51
|
// validate bundleId
|
|
52
52
|
if (bundleId) {
|
|
53
53
|
if (authorizeBundleId({
|
|
54
|
-
bundleIds: project.bundleIds,
|
|
55
54
|
bundleId,
|
|
55
|
+
bundleIds: project.bundleIds,
|
|
56
56
|
})) {
|
|
57
57
|
return authResult;
|
|
58
58
|
}
|
|
59
59
|
return {
|
|
60
60
|
authorized: false,
|
|
61
|
-
errorMessage: `Invalid request: Unauthorized Bundle ID: ${bundleId}. You can view the restrictions on this API key at https://thirdweb.com/create-api-key`,
|
|
62
61
|
errorCode: "BUNDLE_UNAUTHORIZED",
|
|
62
|
+
errorMessage: `Invalid request: Unauthorized Bundle ID: ${bundleId}. You can view the restrictions on this API key at https://thirdweb.com/create-api-key`,
|
|
63
63
|
status: 401,
|
|
64
64
|
};
|
|
65
65
|
}
|
|
66
66
|
return {
|
|
67
67
|
authorized: false,
|
|
68
|
-
errorMessage: "The keys are invalid. Please check the secret-key/clientId and try again.",
|
|
69
68
|
errorCode: "UNAUTHORIZED",
|
|
69
|
+
errorMessage: "The keys are invalid. Please check the secret-key/clientId and try again.",
|
|
70
70
|
status: 401,
|
|
71
71
|
};
|
|
72
72
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../../src/core/authorize/client.ts"],"names":[],"mappings":";;AAUA,0CAqFC;AAGD,
|
|
1
|
+
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../../src/core/authorize/client.ts"],"names":[],"mappings":"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"}
|
|
@@ -78,55 +78,55 @@ async function authorize(authData, serviceConfig, cacheOptions) {
|
|
|
78
78
|
console.warn("failed to fetch key metadata from api", err);
|
|
79
79
|
return {
|
|
80
80
|
authorized: false,
|
|
81
|
-
status: 500,
|
|
82
|
-
errorMessage: "Failed to fetch key metadata. Please check your secret-key/clientId.",
|
|
83
81
|
errorCode: "FAILED_TO_FETCH_KEY",
|
|
82
|
+
errorMessage: "Failed to fetch key metadata. Please check your secret-key/clientId.",
|
|
83
|
+
status: 500,
|
|
84
84
|
};
|
|
85
85
|
}
|
|
86
86
|
}
|
|
87
87
|
if (!teamAndProjectResponse) {
|
|
88
88
|
return {
|
|
89
89
|
authorized: false,
|
|
90
|
-
status: 401,
|
|
91
|
-
errorMessage: "Key is invalid. Please check your secret-key/clientId.",
|
|
92
90
|
errorCode: "INVALID_KEY",
|
|
91
|
+
errorMessage: "Key is invalid. Please check your secret-key/clientId.",
|
|
92
|
+
status: 401,
|
|
93
93
|
};
|
|
94
94
|
}
|
|
95
95
|
// check if the service is maybe disabled for the team (usually due to a billing issue / exceeding the free plan limit)
|
|
96
96
|
if (!isServiceEnabledForTeam(serviceConfig.serviceScope, teamAndProjectResponse.team.capabilities)) {
|
|
97
97
|
return {
|
|
98
98
|
authorized: false,
|
|
99
|
-
status: 403,
|
|
100
|
-
errorMessage: "You currently do not have access to this service. Please check if your subscription includes this service and is active.",
|
|
101
99
|
errorCode: "SERVICE_TEMPORARILY_DISABLED",
|
|
100
|
+
errorMessage: "You currently do not have access to this service. Please check if your subscription includes this service and is active.",
|
|
101
|
+
status: 403,
|
|
102
102
|
};
|
|
103
103
|
}
|
|
104
104
|
// now we can validate the key itself
|
|
105
105
|
const clientAuth = (0, client_js_1.authorizeClient)(authData, teamAndProjectResponse);
|
|
106
106
|
if (!clientAuth.authorized) {
|
|
107
107
|
return {
|
|
108
|
-
errorCode: clientAuth.errorCode,
|
|
109
108
|
authorized: false,
|
|
110
|
-
|
|
109
|
+
errorCode: clientAuth.errorCode,
|
|
111
110
|
errorMessage: clientAuth.errorMessage,
|
|
111
|
+
status: 401,
|
|
112
112
|
};
|
|
113
113
|
}
|
|
114
114
|
// if we've made it this far we need to check service specific authorization
|
|
115
115
|
const serviceAuth = (0, service_js_1.authorizeService)(teamAndProjectResponse, serviceConfig);
|
|
116
116
|
if (!serviceAuth.authorized) {
|
|
117
117
|
return {
|
|
118
|
-
errorCode: serviceAuth.errorCode,
|
|
119
118
|
authorized: false,
|
|
120
|
-
|
|
119
|
+
errorCode: serviceAuth.errorCode,
|
|
121
120
|
errorMessage: serviceAuth.errorMessage,
|
|
121
|
+
status: 403,
|
|
122
122
|
};
|
|
123
123
|
}
|
|
124
124
|
// if we reach this point we are authorized!
|
|
125
125
|
return {
|
|
126
|
+
authMethod: clientAuth.authMethod,
|
|
126
127
|
authorized: true,
|
|
127
|
-
team: teamAndProjectResponse.team,
|
|
128
128
|
project: teamAndProjectResponse.project,
|
|
129
|
-
|
|
129
|
+
team: teamAndProjectResponse.team,
|
|
130
130
|
};
|
|
131
131
|
}
|
|
132
132
|
function isServiceEnabledForTeam(scope, teamCapabilities) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/core/authorize/index.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/core/authorize/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,25 +6,25 @@ function authorizeService(teamAndProjectResponse, serviceConfig) {
|
|
|
6
6
|
if (serviceConfig.serviceScope === null) {
|
|
7
7
|
// if explicitly set to null, we do not want to check for service level authorization
|
|
8
8
|
return {
|
|
9
|
+
authMethod,
|
|
9
10
|
authorized: true,
|
|
10
11
|
team,
|
|
11
|
-
authMethod,
|
|
12
12
|
};
|
|
13
13
|
}
|
|
14
14
|
if (!team.enabledScopes.includes(serviceConfig.serviceScope)) {
|
|
15
15
|
return {
|
|
16
16
|
authorized: false,
|
|
17
|
-
errorMessage: `Invalid request: Unauthorized service: ${serviceConfig.serviceScope} for team: ${team.name} (${team.id}). You can view the restrictions for this team in your dashboard: https://thirdweb.com`,
|
|
18
17
|
errorCode: "SERVICE_UNAUTHORIZED",
|
|
18
|
+
errorMessage: `Invalid request: Unauthorized service: ${serviceConfig.serviceScope} for team: ${team.name} (${team.id}). You can view the restrictions for this team in your dashboard: https://thirdweb.com`,
|
|
19
19
|
status: 403,
|
|
20
20
|
};
|
|
21
21
|
}
|
|
22
22
|
if (!project) {
|
|
23
23
|
// acting on behalf of the team (ie. coming from dashboard), authorize
|
|
24
24
|
return {
|
|
25
|
+
authMethod,
|
|
25
26
|
authorized: true,
|
|
26
27
|
team,
|
|
27
|
-
authMethod,
|
|
28
28
|
};
|
|
29
29
|
}
|
|
30
30
|
// validate services
|
|
@@ -33,8 +33,8 @@ function authorizeService(teamAndProjectResponse, serviceConfig) {
|
|
|
33
33
|
if (!service) {
|
|
34
34
|
return {
|
|
35
35
|
authorized: false,
|
|
36
|
-
errorMessage: `Invalid request: Unauthorized service: ${serviceConfig.serviceScope} for project: ${project.name} (${project.publishableKey}). You can view the restrictions on this project in your dashboard: https://thirdweb.com`,
|
|
37
36
|
errorCode: "SERVICE_UNAUTHORIZED",
|
|
37
|
+
errorMessage: `Invalid request: Unauthorized service: ${serviceConfig.serviceScope} for project: ${project.name} (${project.publishableKey}). You can view the restrictions on this project in your dashboard: https://thirdweb.com`,
|
|
38
38
|
status: 403,
|
|
39
39
|
};
|
|
40
40
|
}
|
|
@@ -44,17 +44,17 @@ function authorizeService(teamAndProjectResponse, serviceConfig) {
|
|
|
44
44
|
if (!isActionAllowed) {
|
|
45
45
|
return {
|
|
46
46
|
authorized: false,
|
|
47
|
-
errorMessage: `Invalid request: Unauthorized action: ${serviceConfig.serviceScope} ${serviceConfig.serviceAction} for project: ${project.name} (${project.publishableKey}). You can view the restrictions on this API key in your dashboard: https://thirdweb.com/create-api-key`,
|
|
48
47
|
errorCode: "SERVICE_ACTION_UNAUTHORIZED",
|
|
48
|
+
errorMessage: `Invalid request: Unauthorized action: ${serviceConfig.serviceScope} ${serviceConfig.serviceAction} for project: ${project.name} (${project.publishableKey}). You can view the restrictions on this API key in your dashboard: https://thirdweb.com/create-api-key`,
|
|
49
49
|
status: 403,
|
|
50
50
|
};
|
|
51
51
|
}
|
|
52
52
|
}
|
|
53
53
|
return {
|
|
54
|
+
authMethod,
|
|
54
55
|
authorized: true,
|
|
55
|
-
team,
|
|
56
56
|
project,
|
|
57
|
-
|
|
57
|
+
team,
|
|
58
58
|
};
|
|
59
59
|
}
|
|
60
60
|
//# sourceMappingURL=service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service.js","sourceRoot":"","sources":["../../../../src/core/authorize/service.ts"],"names":[],"mappings":";;AAGA,4CAoEC;AApED,SAAgB,gBAAgB,CAC9B,sBAA8C,EAC9C,aAAgC;IAEhC,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,UAAU,EAAE,GAAG,sBAAsB,CAAC;IAE7D,IAAI,aAAa,CAAC,YAAY,KAAK,IAAI,EAAE,CAAC;QACxC,qFAAqF;QACrF,OAAO;YACL,UAAU,EAAE,IAAI;YAChB,IAAI;
|
|
1
|
+
{"version":3,"file":"service.js","sourceRoot":"","sources":["../../../../src/core/authorize/service.ts"],"names":[],"mappings":";;AAGA,4CAoEC;AApED,SAAgB,gBAAgB,CAC9B,sBAA8C,EAC9C,aAAgC;IAEhC,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,UAAU,EAAE,GAAG,sBAAsB,CAAC;IAE7D,IAAI,aAAa,CAAC,YAAY,KAAK,IAAI,EAAE,CAAC;QACxC,qFAAqF;QACrF,OAAO;YACL,UAAU;YACV,UAAU,EAAE,IAAI;YAChB,IAAI;SACL,CAAC;IACJ,CAAC;IAED,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,aAAa,CAAC,YAAY,CAAC,EAAE,CAAC;QAC7D,OAAO;YACL,UAAU,EAAE,KAAK;YACjB,SAAS,EAAE,sBAAsB;YACjC,YAAY,EAAE,0CAA0C,aAAa,CAAC,YAAY,cAAc,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC,EAAE,wFAAwF;YAC7M,MAAM,EAAE,GAAG;SACZ,CAAC;IACJ,CAAC;IAED,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,sEAAsE;QACtE,OAAO;YACL,UAAU;YACV,UAAU,EAAE,IAAI;YAChB,IAAI;SACL,CAAC;IACJ,CAAC;IAED,oBAAoB;IACpB,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;IAClC,MAAM,OAAO,GAAG,QAAQ,CAAC,IAAI,CAC3B,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,KAAK,aAAa,CAAC,YAAY,CACjD,CAAC;IACF,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO;YACL,UAAU,EAAE,KAAK;YACjB,SAAS,EAAE,sBAAsB;YACjC,YAAY,EAAE,0CAA0C,aAAa,CAAC,YAAY,iBAAiB,OAAO,CAAC,IAAI,KAAK,OAAO,CAAC,cAAc,0FAA0F;YACpO,MAAM,EAAE,GAAG;SACZ,CAAC;IACJ,CAAC;IAED,2BAA2B;IAC3B,IAAI,aAAa,CAAC,aAAa,EAAE,CAAC;QAChC,MAAM,eAAe,GAAI,OAAO,CAAC,OAAoB,CAAC,QAAQ,CAC5D,aAAa,CAAC,aAAa,CAC5B,CAAC;QACF,IAAI,CAAC,eAAe,EAAE,CAAC;YACrB,OAAO;gBACL,UAAU,EAAE,KAAK;gBACjB,SAAS,EAAE,6BAA6B;gBACxC,YAAY,EAAE,yCAAyC,aAAa,CAAC,YAAY,IAAI,aAAa,CAAC,aAAa,iBAAiB,OAAO,CAAC,IAAI,KAAK,OAAO,CAAC,cAAc,0GAA0G;gBAClR,MAAM,EAAE,GAAG;aACZ,CAAC;QACJ,CAAC;IACH,CAAC;IAED,OAAO;QACL,UAAU;QACV,UAAU,EAAE,IAAI;QAChB,OAAO;QACP,IAAI;KACL,CAAC;AACJ,CAAC"}
|
|
@@ -13,28 +13,28 @@ async function rateLimit(args) {
|
|
|
13
13
|
const { team, limitPerSecond, serviceConfig, redis, increment = 1 } = args;
|
|
14
14
|
const { serviceScope } = serviceConfig;
|
|
15
15
|
const rateLimitResult = await (0, sliding_window_js_1.rateLimitSlidingWindow)({
|
|
16
|
-
redis,
|
|
17
|
-
limitPerSecond,
|
|
18
|
-
key: `rate-limit:${serviceScope}:${team.id}`,
|
|
19
16
|
increment,
|
|
17
|
+
key: `rate-limit:${serviceScope}:${team.id}`,
|
|
18
|
+
limitPerSecond,
|
|
19
|
+
redis,
|
|
20
20
|
windowSeconds: SLIDING_WINDOW_SECONDS,
|
|
21
21
|
});
|
|
22
22
|
// if the request is rate limited, return the rate limit result.
|
|
23
23
|
if (rateLimitResult.rateLimited) {
|
|
24
24
|
return {
|
|
25
|
+
errorCode: "RATE_LIMIT_EXCEEDED",
|
|
26
|
+
errorMessage: `You've exceeded your ${serviceScope} rate limit at ${limitPerSecond} requests per second. Please upgrade your plan to increase your limits: https://thirdweb.com/team/${team.slug}/~/settings/billing`,
|
|
27
|
+
rateLimit: rateLimitResult.rateLimit,
|
|
25
28
|
rateLimited: true,
|
|
26
29
|
requestCount: rateLimitResult.requestCount,
|
|
27
|
-
rateLimit: rateLimitResult.rateLimit,
|
|
28
30
|
status: 429,
|
|
29
|
-
errorMessage: `You've exceeded your ${serviceScope} rate limit at ${limitPerSecond} requests per second. Please upgrade your plan to increase your limits: https://thirdweb.com/team/${team.slug}/~/settings/billing`,
|
|
30
|
-
errorCode: "RATE_LIMIT_EXCEEDED",
|
|
31
31
|
};
|
|
32
32
|
}
|
|
33
33
|
// otherwise, the request is not rate limited.
|
|
34
34
|
return {
|
|
35
|
+
rateLimit: rateLimitResult.rateLimit,
|
|
35
36
|
rateLimited: false,
|
|
36
37
|
requestCount: rateLimitResult.requestCount,
|
|
37
|
-
rateLimit: rateLimitResult.rateLimit,
|
|
38
38
|
};
|
|
39
39
|
}
|
|
40
40
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/core/rateLimit/index.ts"],"names":[],"mappings":";;AAaA,8BAuCC;AAlDD,sEAAwE;AAGxE,MAAM,sBAAsB,GAAG,EAAE,CAAC;AAElC;;;;;GAKG;AACI,KAAK,UAAU,SAAS,CAAC,IAU/B;IACC,MAAM,EAAE,IAAI,EAAE,cAAc,EAAE,aAAa,EAAE,KAAK,EAAE,SAAS,GAAG,CAAC,EAAE,GAAG,IAAI,CAAC;IAC3E,MAAM,EAAE,YAAY,EAAE,GAAG,aAAa,CAAC;IAEvC,MAAM,eAAe,GAAG,MAAM,IAAA,0CAAsB,EAAC;QACnD,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/core/rateLimit/index.ts"],"names":[],"mappings":";;AAaA,8BAuCC;AAlDD,sEAAwE;AAGxE,MAAM,sBAAsB,GAAG,EAAE,CAAC;AAElC;;;;;GAKG;AACI,KAAK,UAAU,SAAS,CAAC,IAU/B;IACC,MAAM,EAAE,IAAI,EAAE,cAAc,EAAE,aAAa,EAAE,KAAK,EAAE,SAAS,GAAG,CAAC,EAAE,GAAG,IAAI,CAAC;IAC3E,MAAM,EAAE,YAAY,EAAE,GAAG,aAAa,CAAC;IAEvC,MAAM,eAAe,GAAG,MAAM,IAAA,0CAAsB,EAAC;QACnD,SAAS;QACT,GAAG,EAAE,cAAc,YAAY,IAAI,IAAI,CAAC,EAAE,EAAE;QAC5C,cAAc;QACd,KAAK;QACL,aAAa,EAAE,sBAAsB;KACtC,CAAC,CAAC;IAEH,gEAAgE;IAChE,IAAI,eAAe,CAAC,WAAW,EAAE,CAAC;QAChC,OAAO;YACL,SAAS,EAAE,qBAAqB;YAChC,YAAY,EAAE,wBAAwB,YAAY,kBAAkB,cAAc,qGAAqG,IAAI,CAAC,IAAI,qBAAqB;YACrN,SAAS,EAAE,eAAe,CAAC,SAAS;YACpC,WAAW,EAAE,IAAI;YACjB,YAAY,EAAE,eAAe,CAAC,YAAY;YAC1C,MAAM,EAAE,GAAG;SACZ,CAAC;IACJ,CAAC;IACD,8CAA8C;IAC9C,OAAO;QACL,SAAS,EAAE,eAAe,CAAC,SAAS;QACpC,WAAW,EAAE,KAAK;QAClB,YAAY,EAAE,eAAe,CAAC,YAAY;KAC3C,CAAC;AACJ,CAAC"}
|
|
@@ -7,9 +7,9 @@ async function rateLimitSlidingWindow(options) {
|
|
|
7
7
|
// No rate limit is provided. Assume the request is not rate limited.
|
|
8
8
|
if (options.limitPerSecond <= 0) {
|
|
9
9
|
return {
|
|
10
|
+
rateLimit: 0,
|
|
10
11
|
rateLimited: false,
|
|
11
12
|
requestCount: INCREMENT_BY,
|
|
12
|
-
rateLimit: 0,
|
|
13
13
|
};
|
|
14
14
|
}
|
|
15
15
|
// Enforce rate limit: sum the total requests in the last `SLIDING_WINDOW_SECONDS` seconds.
|
|
@@ -20,9 +20,9 @@ async function rateLimitSlidingWindow(options) {
|
|
|
20
20
|
const limitPerWindow = options.limitPerSecond * WINDOW_SIZE;
|
|
21
21
|
if (totalCount > limitPerWindow) {
|
|
22
22
|
return {
|
|
23
|
+
rateLimit: limitPerWindow,
|
|
23
24
|
rateLimited: true,
|
|
24
25
|
requestCount: totalCount,
|
|
25
|
-
rateLimit: limitPerWindow,
|
|
26
26
|
};
|
|
27
27
|
}
|
|
28
28
|
// Non-blocking: increment the request count for the current second.
|
|
@@ -40,9 +40,9 @@ async function rateLimitSlidingWindow(options) {
|
|
|
40
40
|
}
|
|
41
41
|
})();
|
|
42
42
|
return {
|
|
43
|
+
rateLimit: limitPerWindow,
|
|
43
44
|
rateLimited: false,
|
|
44
45
|
requestCount: totalCount + INCREMENT_BY,
|
|
45
|
-
rateLimit: limitPerWindow,
|
|
46
46
|
};
|
|
47
47
|
}
|
|
48
48
|
function getRequestCountAtSecondCacheKey(key, second) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sliding-window.js","sourceRoot":"","sources":["../../../../../src/core/rateLimit/strategies/sliding-window.ts"],"names":[],"mappings":";;AAkBA,wDA0DC;AA1DM,KAAK,UAAU,sBAAsB,CAC1C,OAAsC;IAEtC,MAAM,WAAW,GAAG,OAAO,CAAC,aAAa,IAAI,EAAE,CAAC;IAChD,MAAM,YAAY,GAAG,OAAO,CAAC,SAAS,IAAI,CAAC,CAAC;IAE5C,qEAAqE;IACrE,IAAI,OAAO,CAAC,cAAc,IAAI,CAAC,EAAE,CAAC;QAChC,OAAO;YACL,WAAW,EAAE,KAAK;YAClB,YAAY,EAAE,YAAY;
|
|
1
|
+
{"version":3,"file":"sliding-window.js","sourceRoot":"","sources":["../../../../../src/core/rateLimit/strategies/sliding-window.ts"],"names":[],"mappings":";;AAkBA,wDA0DC;AA1DM,KAAK,UAAU,sBAAsB,CAC1C,OAAsC;IAEtC,MAAM,WAAW,GAAG,OAAO,CAAC,aAAa,IAAI,EAAE,CAAC;IAChD,MAAM,YAAY,GAAG,OAAO,CAAC,SAAS,IAAI,CAAC,CAAC;IAE5C,qEAAqE;IACrE,IAAI,OAAO,CAAC,cAAc,IAAI,CAAC,EAAE,CAAC;QAChC,OAAO;YACL,SAAS,EAAE,CAAC;YACZ,WAAW,EAAE,KAAK;YAClB,YAAY,EAAE,YAAY;SAC3B,CAAC;IACJ,CAAC;IAED,2FAA2F;IAC3F,MAAM,aAAa,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC;IACpD,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,WAAW,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CACxD,+BAA+B,CAAC,OAAO,CAAC,GAAG,EAAE,aAAa,GAAG,CAAC,CAAC,CAChE,CAAC;IACF,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC9C,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAC9B,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE,CAAC,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAC1D,CAAC,CACF,CAAC;IAEF,MAAM,cAAc,GAAG,OAAO,CAAC,cAAc,GAAG,WAAW,CAAC;IAE5D,IAAI,UAAU,GAAG,cAAc,EAAE,CAAC;QAChC,OAAO;YACL,SAAS,EAAE,cAAc;YACzB,WAAW,EAAE,IAAI;YACjB,YAAY,EAAE,UAAU;SACzB,CAAC;IACJ,CAAC;IAED,oEAAoE;IACpE,CAAC,KAAK,IAAI,EAAE;QACV,IAAI,CAAC;YACH,MAAM,OAAO,GAAG,+BAA+B,CAC7C,OAAO,CAAC,GAAG,EACX,aAAa,CACd,CAAC;YACF,MAAM,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;YAClD,0FAA0F;YAC1F,IAAI,MAAM,CAAC,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;gBACvB,MAAM,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,EAAE,WAAW,GAAG,CAAC,CAAC,CAAC;YACvD,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,KAAK,CAAC,gCAAgC,EAAE,KAAK,CAAC,CAAC;QACzD,CAAC;IACH,CAAC,CAAC,EAAE,CAAC;IAEL,OAAO;QACL,SAAS,EAAE,cAAc;QACzB,WAAW,EAAE,KAAK;QAClB,YAAY,EAAE,UAAU,GAAG,YAAY;KACxC,CAAC;AACJ,CAAC;AAED,SAAS,+BAA+B,CAAC,GAAW,EAAE,MAAc;IAClE,OAAO,GAAG,GAAG,MAAM,MAAM,EAAE,CAAC;AAC9B,CAAC"}
|