@creator.co/wapi 1.8.3 → 1.8.5
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/README.md +2 -0
- package/dist/index.d.ts +9 -4
- package/dist/index.js +7 -2
- package/dist/index.js.map +1 -1
- package/dist/package-lock.json +31 -2
- package/dist/package.json +4 -2
- package/dist/src/Logger/Logger.js +18 -7
- package/dist/src/Logger/Logger.js.map +1 -1
- package/dist/src/Server/Router.d.ts +51 -0
- package/dist/src/Server/Router.js.map +1 -1
- package/dist/src/Server/lib/container/Proxy.d.ts +14 -0
- package/dist/src/Server/lib/container/Proxy.js +70 -0
- package/dist/src/Server/lib/container/Proxy.js.map +1 -1
- package/dist/src/Util/Utils.d.ts +6 -0
- package/dist/src/Util/Utils.js +11 -0
- package/dist/src/Util/Utils.js.map +1 -1
- package/index.ts +17 -3
- package/package.json +4 -2
- package/src/Logger/Logger.ts +25 -5
- package/src/Server/Router.ts +54 -0
- package/src/Server/lib/container/Proxy.ts +83 -1
- package/src/Util/Utils.ts +12 -0
- package/tests/Logger/Logger.test.ts +52 -11
- package/tests/Server/lib/container/RateLimit.test.ts +772 -0
package/README.md
CHANGED
|
@@ -44,6 +44,8 @@ AWS Lambda Functionality: Deploy your code as AWS Lambda functions with ease, pr
|
|
|
44
44
|
|
|
45
45
|
Hybrid HTTP Servers: Create hybrid HTTP servers that seamlessly combine serverless and container-based architectures, allowing deployment in various environments.
|
|
46
46
|
|
|
47
|
+
**Rate Limiting:** Built-in support for request rate limiting to prevent API abuse and protect downstream services. Supports both in-memory and Redis-backed stores for distributed deployments.
|
|
48
|
+
|
|
47
49
|
Crypto Utilities: WAPI provides utility classes for cryptographic operations, including encryption and decryption using AWS KMS. Securely manage sensitive data with ease.
|
|
48
50
|
|
|
49
51
|
Email Sending: The Mailer class simplifies sending emails using AWS SES. Send both raw and templated emails with customizable parameters, enhancing communication capabilities.
|
package/dist/index.d.ts
CHANGED
|
@@ -10,14 +10,14 @@ import Crypto from './src/Crypto/Crypto.js';
|
|
|
10
10
|
import JWT from './src/Crypto/JWT.js';
|
|
11
11
|
import * as Database from './src/Database/index.js';
|
|
12
12
|
import Mailer from './src/Mailer/Mailer.js';
|
|
13
|
-
import Router, { Route } from './src/Server/Router.js';
|
|
13
|
+
import Router, { Route, RateLimitConfig, GlobalRateLimitConfig, RouterConfig } from './src/Server/Router.js';
|
|
14
14
|
import AsyncSingleton from './src/Util/AsyncSingleton.js';
|
|
15
15
|
import Utils from './src/Util/Utils.js';
|
|
16
16
|
/**
|
|
17
17
|
* This module exports various classes and utilities for handling transactions, processes, events,
|
|
18
18
|
* DynamoDB transactions, routing, mailing, cryptography, JWT, configuration, Redis, responses,
|
|
19
19
|
* utilities, asynchronous singletons, routes, transaction configurations, response error types,
|
|
20
|
-
* HTTP methods, and
|
|
20
|
+
* HTTP methods, database operations, and rate limiting configurations.
|
|
21
21
|
*
|
|
22
22
|
* Classes:
|
|
23
23
|
* - Transaction
|
|
@@ -35,10 +35,15 @@ import Utils from './src/Util/Utils.js';
|
|
|
35
35
|
* - AsyncSingleton
|
|
36
36
|
* - Route
|
|
37
37
|
* - TransactionConfig
|
|
38
|
+
* - RouterConfig
|
|
38
39
|
* - Database
|
|
39
40
|
*
|
|
41
|
+
* Types:
|
|
42
|
+
* - RateLimitConfig - Route-level rate limiting configuration
|
|
43
|
+
* - GlobalRateLimitConfig - Global rate limiting configuration
|
|
44
|
+
*
|
|
40
45
|
* Enums:
|
|
41
46
|
* - ResponseErrorType
|
|
42
|
-
* -
|
|
47
|
+
* - HttpMethod
|
|
43
48
|
*/
|
|
44
|
-
export { Transaction, Process, EventProcessor, DynamoTransaction, Router, Mailer, Crypto, JWT, Configuration, Redis, Response, Utils, AsyncSingleton, Route, TransactionConfig, ResponseErrorType, HttpMethod, Database, };
|
|
49
|
+
export { Transaction, Process, EventProcessor, DynamoTransaction, Router, Mailer, Crypto, JWT, Configuration, Redis, Response, Utils, AsyncSingleton, Route, TransactionConfig, RouterConfig, RateLimitConfig, GlobalRateLimitConfig, ResponseErrorType, HttpMethod, Database, };
|
package/dist/index.js
CHANGED
|
@@ -17,7 +17,7 @@ import Utils from './src/Util/Utils.js';
|
|
|
17
17
|
* This module exports various classes and utilities for handling transactions, processes, events,
|
|
18
18
|
* DynamoDB transactions, routing, mailing, cryptography, JWT, configuration, Redis, responses,
|
|
19
19
|
* utilities, asynchronous singletons, routes, transaction configurations, response error types,
|
|
20
|
-
* HTTP methods, and
|
|
20
|
+
* HTTP methods, database operations, and rate limiting configurations.
|
|
21
21
|
*
|
|
22
22
|
* Classes:
|
|
23
23
|
* - Transaction
|
|
@@ -35,11 +35,16 @@ import Utils from './src/Util/Utils.js';
|
|
|
35
35
|
* - AsyncSingleton
|
|
36
36
|
* - Route
|
|
37
37
|
* - TransactionConfig
|
|
38
|
+
* - RouterConfig
|
|
38
39
|
* - Database
|
|
39
40
|
*
|
|
41
|
+
* Types:
|
|
42
|
+
* - RateLimitConfig - Route-level rate limiting configuration
|
|
43
|
+
* - GlobalRateLimitConfig - Global rate limiting configuration
|
|
44
|
+
*
|
|
40
45
|
* Enums:
|
|
41
46
|
* - ResponseErrorType
|
|
42
|
-
* -
|
|
47
|
+
* - HttpMethod
|
|
43
48
|
*/
|
|
44
49
|
export {
|
|
45
50
|
// Base Events
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,QAA+B,MAAM,uBAAuB,CAAA;AACnE,OAAO,iBAAiB,MAAM,sCAAsC,CAAA;AACpE,OAAO,cAAc,MAAM,mCAAmC,CAAA;AAC9D,OAAO,OAAO,MAAM,4BAA4B,CAAA;AAChD,OAAO,WAAkC,MAAM,gCAAgC,CAAA;AAC/E,OAAO,KAAK,MAAM,sBAAsB,CAAA;AACxC,OAAO,aAAa,MAAM,+BAA+B,CAAA;AACzD,OAAO,MAAM,MAAM,wBAAwB,CAAA;AAC3C,OAAO,GAAG,MAAM,qBAAqB,CAAA;AACrC,OAAO,KAAK,QAAQ,MAAM,yBAAyB,CAAA;AACnD,OAAO,MAAM,MAAM,wBAAwB,CAAA;AAC3C,OAAO,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,QAA+B,MAAM,uBAAuB,CAAA;AACnE,OAAO,iBAAiB,MAAM,sCAAsC,CAAA;AACpE,OAAO,cAAc,MAAM,mCAAmC,CAAA;AAC9D,OAAO,OAAO,MAAM,4BAA4B,CAAA;AAChD,OAAO,WAAkC,MAAM,gCAAgC,CAAA;AAC/E,OAAO,KAAK,MAAM,sBAAsB,CAAA;AACxC,OAAO,aAAa,MAAM,+BAA+B,CAAA;AACzD,OAAO,MAAM,MAAM,wBAAwB,CAAA;AAC3C,OAAO,GAAG,MAAM,qBAAqB,CAAA;AACrC,OAAO,KAAK,QAAQ,MAAM,yBAAyB,CAAA;AACnD,OAAO,MAAM,MAAM,wBAAwB,CAAA;AAC3C,OAAO,MAKN,MAAM,wBAAwB,CAAA;AAC/B,OAAO,cAAc,MAAM,8BAA8B,CAAA;AACzD,OAAO,KAAK,MAAM,qBAAqB,CAAA;AAEvC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgCG;AACH,OAAO;AACL,cAAc;AACd,WAAW,EACX,OAAO,EACP,cAAc,EACd,iBAAiB,EACjB,MAAM;AACN,iCAAiC;AACjC,MAAM,EACN,MAAM,EACN,GAAG,EACH,aAAa,EACb,KAAK;AACL,MAAM;AACN,QAAQ;AACR,UAAU;AACV,KAAK,EACL,cAAc,EASd,UAAU,EACV,QAAQ,GACT,CAAA"}
|
package/dist/package-lock.json
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@creator.co/wapi",
|
|
3
|
-
"version": "1.8.
|
|
3
|
+
"version": "1.8.5",
|
|
4
4
|
"lockfileVersion": 3,
|
|
5
5
|
"requires": true,
|
|
6
6
|
"packages": {
|
|
7
7
|
"": {
|
|
8
8
|
"name": "@creator.co/wapi",
|
|
9
|
-
"version": "1.8.
|
|
9
|
+
"version": "1.8.5",
|
|
10
10
|
"license": "ISC",
|
|
11
11
|
"dependencies": {
|
|
12
12
|
"@aws-sdk/client-dynamodb": "^3.651.1",
|
|
@@ -27,6 +27,7 @@
|
|
|
27
27
|
"dotenv": "^16.4.1",
|
|
28
28
|
"email-templates": "^12.0.2",
|
|
29
29
|
"express": "^4.22.0",
|
|
30
|
+
"express-rate-limit": "^7.5.0",
|
|
30
31
|
"json-stringify-safe": "^5.0.1",
|
|
31
32
|
"jsonwebtoken": "^9.0.2",
|
|
32
33
|
"knex": "^3.0.1",
|
|
@@ -37,6 +38,7 @@
|
|
|
37
38
|
"parse-duration": "^2.1.3",
|
|
38
39
|
"path-to-regexp": "^8.1.0",
|
|
39
40
|
"pg": "^8.11.3",
|
|
41
|
+
"rate-limit-redis": "^4.2.0",
|
|
40
42
|
"redis": "^4.7.0",
|
|
41
43
|
"sha1": "^1.1.1",
|
|
42
44
|
"stack-trace": "0.0.10",
|
|
@@ -6619,6 +6621,21 @@
|
|
|
6619
6621
|
"url": "https://opencollective.com/express"
|
|
6620
6622
|
}
|
|
6621
6623
|
},
|
|
6624
|
+
"node_modules/express-rate-limit": {
|
|
6625
|
+
"version": "7.5.1",
|
|
6626
|
+
"resolved": "https://registry.npmjs.org/express-rate-limit/-/express-rate-limit-7.5.1.tgz",
|
|
6627
|
+
"integrity": "sha512-7iN8iPMDzOMHPUYllBEsQdWVB6fPDMPqwjBaFrgr4Jgr/+okjvzAy+UHlYYL/Vs0OsOrMkwS6PJDkFlJwoxUnw==",
|
|
6628
|
+
"license": "MIT",
|
|
6629
|
+
"engines": {
|
|
6630
|
+
"node": ">= 16"
|
|
6631
|
+
},
|
|
6632
|
+
"funding": {
|
|
6633
|
+
"url": "https://github.com/sponsors/express-rate-limit"
|
|
6634
|
+
},
|
|
6635
|
+
"peerDependencies": {
|
|
6636
|
+
"express": ">= 4.11"
|
|
6637
|
+
}
|
|
6638
|
+
},
|
|
6622
6639
|
"node_modules/express/node_modules/debug": {
|
|
6623
6640
|
"version": "2.6.9",
|
|
6624
6641
|
"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
|
|
@@ -11080,6 +11097,18 @@
|
|
|
11080
11097
|
"node": ">= 0.6"
|
|
11081
11098
|
}
|
|
11082
11099
|
},
|
|
11100
|
+
"node_modules/rate-limit-redis": {
|
|
11101
|
+
"version": "4.3.1",
|
|
11102
|
+
"resolved": "https://registry.npmjs.org/rate-limit-redis/-/rate-limit-redis-4.3.1.tgz",
|
|
11103
|
+
"integrity": "sha512-+a1zU8+D7L8siDK9jb14refQXz60vq427VuiplgnaLk9B2LnvGe/APLTfhwb4uNIL7eWVknh8GnRp/unCj+lMA==",
|
|
11104
|
+
"license": "MIT",
|
|
11105
|
+
"engines": {
|
|
11106
|
+
"node": ">= 16"
|
|
11107
|
+
},
|
|
11108
|
+
"peerDependencies": {
|
|
11109
|
+
"express-rate-limit": ">= 6"
|
|
11110
|
+
}
|
|
11111
|
+
},
|
|
11083
11112
|
"node_modules/raw-body": {
|
|
11084
11113
|
"version": "2.5.2",
|
|
11085
11114
|
"resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz",
|
package/dist/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@creator.co/wapi",
|
|
3
|
-
"version": "1.8.
|
|
3
|
+
"version": "1.8.5",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -50,7 +50,9 @@
|
|
|
50
50
|
"redis": "^4.7.0",
|
|
51
51
|
"sha1": "^1.1.1",
|
|
52
52
|
"stack-trace": "0.0.10",
|
|
53
|
-
"zod": "^3.23.4"
|
|
53
|
+
"zod": "^3.23.4",
|
|
54
|
+
"express-rate-limit": "^7.5.0",
|
|
55
|
+
"rate-limit-redis": "^4.2.0"
|
|
54
56
|
},
|
|
55
57
|
"devDependencies": {
|
|
56
58
|
"@go-task/cli": "^3.39.0",
|
|
@@ -36,7 +36,7 @@ const DEFAULT_LOG_FUNCTION = PURE_CONSOLE.log.bind(PURE_CONSOLE);
|
|
|
36
36
|
* @type {string[]} blacklist - An array of strings to be converted to lowercase and used as a blacklist.
|
|
37
37
|
* @returns {string[]} - An array of lowercase strings representing the blacklist.
|
|
38
38
|
*/
|
|
39
|
-
const blacklist = ['password', 'token', 'accounts'].map(s => s.toLowerCase());
|
|
39
|
+
const blacklist = ['password', 'token', 'accounts', 'authorization', 'key'].map(s => s.toLowerCase());
|
|
40
40
|
/**
|
|
41
41
|
* Logger class for logging messages with different log levels.
|
|
42
42
|
*/
|
|
@@ -291,14 +291,25 @@ export default class Logger {
|
|
|
291
291
|
}
|
|
292
292
|
suppressSensitiveObject(value, push) {
|
|
293
293
|
Object.entries(value).forEach(([k, v]) => {
|
|
294
|
-
var _a;
|
|
295
294
|
const lower = k.toLowerCase();
|
|
296
|
-
|
|
297
|
-
if (match) {
|
|
298
|
-
value[k] = `**SUPPRESSED_SENSITIVE_DATA** (${((_a = String(v)) === null || _a === void 0 ? void 0 : _a.length) || 0} len)`;
|
|
299
|
-
}
|
|
300
|
-
else {
|
|
295
|
+
if (!v || !this.filterBlacklist.includes(lower)) {
|
|
301
296
|
push({ value: v, parent: value, key: k });
|
|
297
|
+
return;
|
|
298
|
+
}
|
|
299
|
+
switch (lower) {
|
|
300
|
+
case 'password':
|
|
301
|
+
value[k] = '[MASKED]';
|
|
302
|
+
break;
|
|
303
|
+
case 'authorization':
|
|
304
|
+
value[k] = `Bearer [HASHED: ${Utils.hashValue(v)}]`;
|
|
305
|
+
break;
|
|
306
|
+
case 'token':
|
|
307
|
+
case 'key':
|
|
308
|
+
;
|
|
309
|
+
value[k] = `[HASHED: ${Utils.hashValue(v)}]`;
|
|
310
|
+
break;
|
|
311
|
+
default:
|
|
312
|
+
value[k] = `**SUPPRESSED_SENSITIVE_DATA** (${String(v).length} len)`;
|
|
302
313
|
}
|
|
303
314
|
});
|
|
304
315
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Logger.js","sourceRoot":"","sources":["../../../src/Logger/Logger.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,SAAS,MAAM,qBAAqB,CAAA;AAC3C,OAAO,UAAU,MAAM,aAAa,CAAA;AAEpC,OAAO,KAAK,MAAM,kBAAkB,CAAA;AAEpC;;;;;;;GAOG;AACH,MAAM,CAAN,IAAY,UAKX;AALD,WAAY,UAAU;IACpB,6BAAe,CAAA;IACf,2BAAa,CAAA;IACb,2BAAa,CAAA;IACb,6BAAe,CAAA;AACjB,CAAC,EALW,UAAU,KAAV,UAAU,QAKrB;AACD;;;;;;GAMG;AACH,MAAM,YAAY,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,OAAO,CAAA;AAC7E;;;GAGG;AACH,MAAM,oBAAoB,GAAG,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;AAEhE;;;;;GAKG;AACH,MAAM,SAAS,GAAG,CAAC,UAAU,EAAE,OAAO,EAAE,UAAU,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,
|
|
1
|
+
{"version":3,"file":"Logger.js","sourceRoot":"","sources":["../../../src/Logger/Logger.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,48 @@
|
|
|
1
1
|
import { Server as HTTPServer } from 'http';
|
|
2
2
|
import express from 'express';
|
|
3
|
+
import type { RedisClientType } from 'redis';
|
|
3
4
|
import { z } from 'zod';
|
|
4
5
|
import { HttpMethod } from '../API/Request.js';
|
|
5
6
|
import { ResponseErrorType } from '../API/Response.js';
|
|
6
7
|
import Transaction, { TransactionConfig, TransactionExecution, StringMap } from '../BaseEvent/Transaction.js';
|
|
8
|
+
/**
|
|
9
|
+
* Configuration options for rate limiting on a specific route.
|
|
10
|
+
* @property {number} [windowMs] - Time window in milliseconds for rate limiting (default: 60000 - 1 minute)
|
|
11
|
+
* @property {number} [limit] - Maximum number of requests allowed per window (default: 60)
|
|
12
|
+
* @property {string} [message] - Custom error message for rate limit exceeded
|
|
13
|
+
* @property {'ip' | 'userId' | ((req: express.Request) => string)} [keyGenerator] - Strategy for generating rate limit keys
|
|
14
|
+
*/
|
|
15
|
+
export interface RateLimitConfig {
|
|
16
|
+
windowMs?: number;
|
|
17
|
+
limit?: number;
|
|
18
|
+
message?: string;
|
|
19
|
+
keyGenerator?: 'ip' | 'userId' | ((req: express.Request) => string);
|
|
20
|
+
skip?: (req: express.Request) => boolean;
|
|
21
|
+
}
|
|
22
|
+
/**
|
|
23
|
+
* Global rate limiting configuration for the router.
|
|
24
|
+
* @property {boolean} [enabled] - Whether rate limiting is enabled (default: true if config provided)
|
|
25
|
+
* @property {number} [windowMs] - Time window in milliseconds (default: 60000 - 1 minute)
|
|
26
|
+
* @property {number} [limit] - Maximum requests per window per key (default: 60)
|
|
27
|
+
* @property {(req: express.Request) => string} [keyGenerator] - Function to generate rate limit key (default: IP-based)
|
|
28
|
+
* @property {(req: express.Request, res: express.Response) => void} [handler] - Custom handler for rate limit exceeded
|
|
29
|
+
* @property {(req: express.Request) => boolean} [skip] - Function to skip rate limiting for certain requests
|
|
30
|
+
* @property {'memory' | 'redis'} [store] - Storage backend for rate limit data
|
|
31
|
+
* @property {object} [redis] - Redis configuration when using Redis store
|
|
32
|
+
*/
|
|
33
|
+
export interface GlobalRateLimitConfig {
|
|
34
|
+
enabled?: boolean;
|
|
35
|
+
windowMs?: number;
|
|
36
|
+
limit?: number;
|
|
37
|
+
keyGenerator?: (req: express.Request) => string;
|
|
38
|
+
handler?: (req: express.Request, res: express.Response) => void;
|
|
39
|
+
skip?: (req: express.Request) => boolean;
|
|
40
|
+
store?: 'memory' | 'redis';
|
|
41
|
+
redis?: {
|
|
42
|
+
client: RedisClientType;
|
|
43
|
+
prefix?: string;
|
|
44
|
+
};
|
|
45
|
+
}
|
|
7
46
|
/**
|
|
8
47
|
* Represents a route in an API.
|
|
9
48
|
* @template InputType - The type of the input data for the route.
|
|
@@ -64,6 +103,12 @@ export interface Route<InputType = never, OutputType = never, PathParamsType = S
|
|
|
64
103
|
[key: string]: string[] | never[];
|
|
65
104
|
}[];
|
|
66
105
|
};
|
|
106
|
+
/**
|
|
107
|
+
* Optional rate limiting configuration for this specific route.
|
|
108
|
+
* Set to `false` to disable global rate limiting for this route.
|
|
109
|
+
* @type {RateLimitConfig | false}
|
|
110
|
+
*/
|
|
111
|
+
rateLimit?: RateLimitConfig | false;
|
|
67
112
|
}
|
|
68
113
|
export type AnyRoute = Route<any | never, any | never, any | never, any | never>;
|
|
69
114
|
/**
|
|
@@ -115,6 +160,12 @@ export type RouterConfig = TransactionConfig & {
|
|
|
115
160
|
* @type {string | undefined}
|
|
116
161
|
*/
|
|
117
162
|
healthCheckRoute?: string;
|
|
163
|
+
/**
|
|
164
|
+
* Global rate limiting configuration for all routes.
|
|
165
|
+
* Individual routes can override this with their own rateLimit config.
|
|
166
|
+
* @type {GlobalRateLimitConfig | undefined}
|
|
167
|
+
*/
|
|
168
|
+
rateLimit?: GlobalRateLimitConfig;
|
|
118
169
|
containerSetupHook?: (server: HTTPServer, app: express.Express) => Promise<void>;
|
|
119
170
|
};
|
|
120
171
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Router.js","sourceRoot":"","sources":["../../../src/Server/Router.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Router.js","sourceRoot":"","sources":["../../../src/Server/Router.ts"],"names":[],"mappings":"AAMA,OAAO,eAAe,MAAM,0BAA0B,CAAA;AACtD,OAAO,MAAM,MAAM,iBAAiB,CAAA;AAQpC,OAAO,KAAK,MAAM,kBAAkB,CAAA;AA+LpC;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,MAAM;IAUzB;;;;OAIG;IACH,YAAY,MAAoB;QAC9B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,IAAI,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,MAAM,CAAC,MAAM,CAAC,CAAA;IACrF,CAAC;IAED;;;OAGG;IACI,SAAS;QACd,OAAO,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,CAAA;IAChC,CAAC;IAED;;;OAGG;IACK,WAAW;QACjB,OAAO,KAAK,CAAC,qBAAqB,EAAE,CAAA;IACtC,CAAC;CACF"}
|
|
@@ -64,4 +64,18 @@ export default class Proxy {
|
|
|
64
64
|
* @returns None
|
|
65
65
|
*/
|
|
66
66
|
private installRoutes;
|
|
67
|
+
/**
|
|
68
|
+
* Creates rate limiting middleware based on the provided configuration.
|
|
69
|
+
* @param {GlobalRateLimitConfig} config - The rate limit configuration
|
|
70
|
+
* @returns {express.RequestHandler} Express middleware for rate limiting
|
|
71
|
+
* @private
|
|
72
|
+
*/
|
|
73
|
+
private createRateLimitMiddleware;
|
|
74
|
+
/**
|
|
75
|
+
* Creates the appropriate store for rate limiting based on configuration.
|
|
76
|
+
* @param {GlobalRateLimitConfig} config - The rate limit configuration
|
|
77
|
+
* @returns {RedisStore | undefined} Redis store if configured, undefined for in-memory
|
|
78
|
+
* @private
|
|
79
|
+
*/
|
|
80
|
+
private createRateLimitStore;
|
|
67
81
|
}
|
|
@@ -11,6 +11,8 @@ import fs from 'fs';
|
|
|
11
11
|
import { createServer } from 'http';
|
|
12
12
|
import cors from 'cors';
|
|
13
13
|
import express from 'express';
|
|
14
|
+
import { rateLimit } from 'express-rate-limit';
|
|
15
|
+
import { RedisStore } from 'rate-limit-redis';
|
|
14
16
|
import GenericHandler from './GenericHandler.js';
|
|
15
17
|
import HealthHandler from './HealthHandler.js';
|
|
16
18
|
import Globals from '../../../Globals.js';
|
|
@@ -47,6 +49,12 @@ export default class Proxy {
|
|
|
47
49
|
credentials: !!corsConfig.allowCredentials,
|
|
48
50
|
}
|
|
49
51
|
: {}));
|
|
52
|
+
// Apply global rate limiting if configured
|
|
53
|
+
if (this.config.rateLimit && this.config.rateLimit.enabled !== false) {
|
|
54
|
+
console.log('[Proxy] - [RATE-LIMIT] - Global rate limiting enabled');
|
|
55
|
+
const rateLimitMiddleware = this.createRateLimitMiddleware(this.config.rateLimit);
|
|
56
|
+
this.app.use(rateLimitMiddleware);
|
|
57
|
+
}
|
|
50
58
|
// //This supposedly fix some 502 codes where nodejs socket would hang during
|
|
51
59
|
// //a request and if behind ALB, it would cause 502 codes. Had experiencied this
|
|
52
60
|
// //and 502 codes reduced dramastically, but still some appearances. Maybe this
|
|
@@ -143,5 +151,67 @@ export default class Proxy {
|
|
|
143
151
|
//load balancer and we just foward everything we have to the function.
|
|
144
152
|
this.app.route(Globals.Listener_HTTP_ProxyRoute).all(GenericHandler(this.serverlessHandler));
|
|
145
153
|
}
|
|
154
|
+
/**
|
|
155
|
+
* Creates rate limiting middleware based on the provided configuration.
|
|
156
|
+
* @param {GlobalRateLimitConfig} config - The rate limit configuration
|
|
157
|
+
* @returns {express.RequestHandler} Express middleware for rate limiting
|
|
158
|
+
* @private
|
|
159
|
+
*/
|
|
160
|
+
createRateLimitMiddleware(config) {
|
|
161
|
+
const store = this.createRateLimitStore(config);
|
|
162
|
+
return rateLimit({
|
|
163
|
+
windowMs: config.windowMs || 60000, // Default: 1 minute
|
|
164
|
+
limit: config.limit || 60, // Default: 60 requests per windowMs
|
|
165
|
+
standardHeaders: true, // Return rate limit info in `RateLimit-*` headers
|
|
166
|
+
legacyHeaders: false, // Disable `X-RateLimit-*` headers
|
|
167
|
+
// Key generator - how to identify unique clients
|
|
168
|
+
keyGenerator: config.keyGenerator ||
|
|
169
|
+
((req) => {
|
|
170
|
+
var _a, _b;
|
|
171
|
+
// Use IP address from proxy-aware sources
|
|
172
|
+
return (req.ip ||
|
|
173
|
+
((_b = (_a = req.headers['x-forwarded-for']) === null || _a === void 0 ? void 0 : _a.split(',')[0]) === null || _b === void 0 ? void 0 : _b.trim()) ||
|
|
174
|
+
req.socket.remoteAddress ||
|
|
175
|
+
'unknown');
|
|
176
|
+
}),
|
|
177
|
+
// Custom handler when rate limit is exceeded
|
|
178
|
+
handler: config.handler ||
|
|
179
|
+
((req, res) => {
|
|
180
|
+
// Log rate limit violation
|
|
181
|
+
console.warn('[Proxy] - [RATE-LIMIT] - Limit exceeded', {
|
|
182
|
+
ip: req.ip,
|
|
183
|
+
path: req.path,
|
|
184
|
+
method: req.method,
|
|
185
|
+
timestamp: new Date().toISOString(),
|
|
186
|
+
});
|
|
187
|
+
res.status(429).json({
|
|
188
|
+
error: 'rate_limit_exceeded',
|
|
189
|
+
message: 'Too many requests. Please try again later.',
|
|
190
|
+
});
|
|
191
|
+
}),
|
|
192
|
+
// Skip function - allows bypassing rate limiting for certain requests
|
|
193
|
+
skip: config.skip,
|
|
194
|
+
// Store - use Redis if configured, otherwise in-memory
|
|
195
|
+
store: store,
|
|
196
|
+
});
|
|
197
|
+
}
|
|
198
|
+
/**
|
|
199
|
+
* Creates the appropriate store for rate limiting based on configuration.
|
|
200
|
+
* @param {GlobalRateLimitConfig} config - The rate limit configuration
|
|
201
|
+
* @returns {RedisStore | undefined} Redis store if configured, undefined for in-memory
|
|
202
|
+
* @private
|
|
203
|
+
*/
|
|
204
|
+
createRateLimitStore(config) {
|
|
205
|
+
var _a;
|
|
206
|
+
if (config.store === 'redis' && ((_a = config.redis) === null || _a === void 0 ? void 0 : _a.client)) {
|
|
207
|
+
console.log('[Proxy] - [RATE-LIMIT] - Using Redis store');
|
|
208
|
+
return new RedisStore({
|
|
209
|
+
sendCommand: (...args) => config.redis.client.sendCommand(args),
|
|
210
|
+
prefix: config.redis.prefix || 'wapi:rl:',
|
|
211
|
+
});
|
|
212
|
+
}
|
|
213
|
+
console.log('[Proxy] - [RATE-LIMIT] - Using in-memory store');
|
|
214
|
+
return undefined; // express-rate-limit uses MemoryStore by default
|
|
215
|
+
}
|
|
146
216
|
}
|
|
147
217
|
//# sourceMappingURL=Proxy.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Proxy.js","sourceRoot":"","sources":["../../../../../src/Server/lib/container/Proxy.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,MAAM,IAAI,CAAA;AACnB,OAAO,EAAwB,YAAY,EAAE,MAAM,MAAM,CAAA;AAEzD,OAAO,IAAI,MAAM,MAAM,CAAA;AACvB,OAAO,OAAO,MAAM,SAAS,CAAA;
|
|
1
|
+
{"version":3,"file":"Proxy.js","sourceRoot":"","sources":["../../../../../src/Server/lib/container/Proxy.ts"],"names":[],"mappings":"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"}
|
package/dist/src/Util/Utils.d.ts
CHANGED
|
@@ -58,4 +58,10 @@ export default class Utils {
|
|
|
58
58
|
* @returns {any} The unmarshalled JavaScript object.
|
|
59
59
|
*/
|
|
60
60
|
static ddbUnmarshall(item: any): any;
|
|
61
|
+
/**
|
|
62
|
+
* helper that hashes values using SHA-256.
|
|
63
|
+
* @param {unknown} raw - The raw item for conversion.
|
|
64
|
+
* @returns {string} The hashed string.
|
|
65
|
+
*/
|
|
66
|
+
static hashValue(raw: unknown): string;
|
|
61
67
|
}
|
package/dist/src/Util/Utils.js
CHANGED
|
@@ -8,7 +8,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
8
8
|
});
|
|
9
9
|
};
|
|
10
10
|
import child_process from 'child_process';
|
|
11
|
+
import { createHash } from 'crypto';
|
|
11
12
|
import { convertToAttr, marshall, unmarshall } from '@aws-sdk/util-dynamodb';
|
|
13
|
+
import stringify from 'json-stringify-safe';
|
|
12
14
|
/**
|
|
13
15
|
* Utility class containing various static methods for common operations.
|
|
14
16
|
*/
|
|
@@ -143,5 +145,14 @@ export default class Utils {
|
|
|
143
145
|
}
|
|
144
146
|
return item;
|
|
145
147
|
}
|
|
148
|
+
/**
|
|
149
|
+
* helper that hashes values using SHA-256.
|
|
150
|
+
* @param {unknown} raw - The raw item for conversion.
|
|
151
|
+
* @returns {string} The hashed string.
|
|
152
|
+
*/
|
|
153
|
+
static hashValue(raw) {
|
|
154
|
+
const s = typeof raw === 'string' ? raw : stringify(raw);
|
|
155
|
+
return createHash('sha256').update(s).digest('hex');
|
|
156
|
+
}
|
|
146
157
|
}
|
|
147
158
|
//# sourceMappingURL=Utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Utils.js","sourceRoot":"","sources":["../../../src/Util/Utils.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,aAAa,MAAM,eAAe,CAAA;
|
|
1
|
+
{"version":3,"file":"Utils.js","sourceRoot":"","sources":["../../../src/Util/Utils.ts"],"names":[],"mappings":"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"}
|
package/index.ts
CHANGED
|
@@ -10,7 +10,12 @@ import Crypto from './src/Crypto/Crypto.js'
|
|
|
10
10
|
import JWT from './src/Crypto/JWT.js'
|
|
11
11
|
import * as Database from './src/Database/index.js'
|
|
12
12
|
import Mailer from './src/Mailer/Mailer.js'
|
|
13
|
-
import Router, {
|
|
13
|
+
import Router, {
|
|
14
|
+
Route,
|
|
15
|
+
RateLimitConfig,
|
|
16
|
+
GlobalRateLimitConfig,
|
|
17
|
+
RouterConfig,
|
|
18
|
+
} from './src/Server/Router.js'
|
|
14
19
|
import AsyncSingleton from './src/Util/AsyncSingleton.js'
|
|
15
20
|
import Utils from './src/Util/Utils.js'
|
|
16
21
|
|
|
@@ -18,7 +23,7 @@ import Utils from './src/Util/Utils.js'
|
|
|
18
23
|
* This module exports various classes and utilities for handling transactions, processes, events,
|
|
19
24
|
* DynamoDB transactions, routing, mailing, cryptography, JWT, configuration, Redis, responses,
|
|
20
25
|
* utilities, asynchronous singletons, routes, transaction configurations, response error types,
|
|
21
|
-
* HTTP methods, and
|
|
26
|
+
* HTTP methods, database operations, and rate limiting configurations.
|
|
22
27
|
*
|
|
23
28
|
* Classes:
|
|
24
29
|
* - Transaction
|
|
@@ -36,11 +41,16 @@ import Utils from './src/Util/Utils.js'
|
|
|
36
41
|
* - AsyncSingleton
|
|
37
42
|
* - Route
|
|
38
43
|
* - TransactionConfig
|
|
44
|
+
* - RouterConfig
|
|
39
45
|
* - Database
|
|
40
46
|
*
|
|
47
|
+
* Types:
|
|
48
|
+
* - RateLimitConfig - Route-level rate limiting configuration
|
|
49
|
+
* - GlobalRateLimitConfig - Global rate limiting configuration
|
|
50
|
+
*
|
|
41
51
|
* Enums:
|
|
42
52
|
* - ResponseErrorType
|
|
43
|
-
* -
|
|
53
|
+
* - HttpMethod
|
|
44
54
|
*/
|
|
45
55
|
export {
|
|
46
56
|
// Base Events
|
|
@@ -62,6 +72,10 @@ export {
|
|
|
62
72
|
AsyncSingleton,
|
|
63
73
|
Route,
|
|
64
74
|
TransactionConfig,
|
|
75
|
+
RouterConfig,
|
|
76
|
+
// Rate Limiting
|
|
77
|
+
RateLimitConfig,
|
|
78
|
+
GlobalRateLimitConfig,
|
|
65
79
|
// Misc types
|
|
66
80
|
ResponseErrorType,
|
|
67
81
|
HttpMethod,
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@creator.co/wapi",
|
|
3
|
-
"version": "1.8.
|
|
3
|
+
"version": "1.8.5",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -50,7 +50,9 @@
|
|
|
50
50
|
"redis": "^4.7.0",
|
|
51
51
|
"sha1": "^1.1.1",
|
|
52
52
|
"stack-trace": "0.0.10",
|
|
53
|
-
"zod": "^3.23.4"
|
|
53
|
+
"zod": "^3.23.4",
|
|
54
|
+
"express-rate-limit": "^7.5.0",
|
|
55
|
+
"rate-limit-redis": "^4.2.0"
|
|
54
56
|
},
|
|
55
57
|
"devDependencies": {
|
|
56
58
|
"@go-task/cli": "^3.39.0",
|
package/src/Logger/Logger.ts
CHANGED
|
@@ -38,7 +38,9 @@ const DEFAULT_LOG_FUNCTION = PURE_CONSOLE.log.bind(PURE_CONSOLE)
|
|
|
38
38
|
* @type {string[]} blacklist - An array of strings to be converted to lowercase and used as a blacklist.
|
|
39
39
|
* @returns {string[]} - An array of lowercase strings representing the blacklist.
|
|
40
40
|
*/
|
|
41
|
-
const blacklist = ['password', 'token', 'accounts'].map(s =>
|
|
41
|
+
const blacklist = ['password', 'token', 'accounts', 'authorization', 'key'].map(s =>
|
|
42
|
+
s.toLowerCase()
|
|
43
|
+
)
|
|
42
44
|
|
|
43
45
|
/**
|
|
44
46
|
* Configuration options for the logger.
|
|
@@ -350,17 +352,35 @@ export default class Logger {
|
|
|
350
352
|
if (this.filterBlacklist.some(f => lower == f))
|
|
351
353
|
modifiedValue = `**SUPPRESSED_SENSITIVE_DATA** (${String(modifiedValue)?.length || 0} len)`
|
|
352
354
|
}
|
|
355
|
+
|
|
353
356
|
parent[key] = modifiedValue
|
|
354
357
|
}
|
|
355
358
|
|
|
356
359
|
private suppressSensitiveObject(value: object, push: (e: SupressableItem) => void) {
|
|
357
360
|
Object.entries(value).forEach(([k, v]) => {
|
|
358
361
|
const lower = k.toLowerCase()
|
|
359
|
-
|
|
360
|
-
if (
|
|
361
|
-
value[k] = `**SUPPRESSED_SENSITIVE_DATA** (${String(v)?.length || 0} len)`
|
|
362
|
-
} else {
|
|
362
|
+
|
|
363
|
+
if (!v || !this.filterBlacklist.includes(lower)) {
|
|
363
364
|
push({ value: v, parent: value, key: k })
|
|
365
|
+
return
|
|
366
|
+
}
|
|
367
|
+
|
|
368
|
+
switch (lower) {
|
|
369
|
+
case 'password':
|
|
370
|
+
value[k] = '[MASKED]'
|
|
371
|
+
break
|
|
372
|
+
|
|
373
|
+
case 'authorization':
|
|
374
|
+
value[k] = `Bearer [HASHED: ${Utils.hashValue(v)}]`
|
|
375
|
+
break
|
|
376
|
+
|
|
377
|
+
case 'token':
|
|
378
|
+
case 'key':
|
|
379
|
+
;(value as any)[k] = `[HASHED: ${Utils.hashValue(v)}]`
|
|
380
|
+
break
|
|
381
|
+
|
|
382
|
+
default:
|
|
383
|
+
value[k] = `**SUPPRESSED_SENSITIVE_DATA** (${String(v).length} len)`
|
|
364
384
|
}
|
|
365
385
|
})
|
|
366
386
|
}
|