@adaptivestone/framework 5.5.1 → 5.6.1
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/CHANGELOG.md +129 -76
- package/README.md +41 -1
- package/dist/clusterRunner.js +7 -3
- package/dist/clusterRunner.js.map +1 -1
- package/dist/codegen/appTypes.js +9 -6
- package/dist/codegen/appTypes.js.map +1 -1
- package/dist/commands/CreateUser.d.ts +1 -0
- package/dist/commands/CreateUser.js +1 -0
- package/dist/commands/CreateUser.js.map +1 -1
- package/dist/commands/SyncIndexes.js +4 -12
- package/dist/commands/SyncIndexes.js.map +1 -1
- package/dist/commands/migration/Migrate.js +3 -2
- package/dist/commands/migration/Migrate.js.map +1 -1
- package/dist/config/http.d.ts +1 -0
- package/dist/config/http.js +8 -0
- package/dist/config/http.js.map +1 -1
- package/dist/controllers/Auth.js +33 -4
- package/dist/controllers/Auth.js.map +1 -1
- package/dist/controllers/index.js +129 -83
- package/dist/controllers/index.js.map +1 -1
- package/dist/helpers/crypto.js +3 -0
- package/dist/helpers/crypto.js.map +1 -1
- package/dist/models/Lock.d.ts +2 -2
- package/dist/models/Lock.js +64 -15
- package/dist/models/Lock.js.map +1 -1
- package/dist/models/User.d.ts +18 -6
- package/dist/models/User.js +24 -7
- package/dist/models/User.js.map +1 -1
- package/dist/modules/BaseCli.d.ts +5 -0
- package/dist/modules/BaseCli.js +10 -1
- package/dist/modules/BaseCli.js.map +1 -1
- package/dist/server.js +53 -8
- package/dist/server.js.map +1 -1
- package/dist/services/cache/Cache.js +20 -10
- package/dist/services/cache/Cache.js.map +1 -1
- package/dist/services/cache/drivers/MemoryDriver.js +3 -1
- package/dist/services/cache/drivers/MemoryDriver.js.map +1 -1
- package/dist/services/cache/drivers/RedisDriver.js +15 -11
- package/dist/services/cache/drivers/RedisDriver.js.map +1 -1
- package/dist/services/http/HttpServer.d.ts +2 -2
- package/dist/services/http/HttpServer.js.map +1 -1
- package/dist/services/http/builtinErrorHandlers.d.ts +9 -3
- package/dist/services/http/builtinErrorHandlers.js.map +1 -1
- package/dist/services/http/middleware/Cors.js +5 -0
- package/dist/services/http/middleware/Cors.js.map +1 -1
- package/dist/services/http/middleware/IpDetector.js +23 -4
- package/dist/services/http/middleware/IpDetector.js.map +1 -1
- package/dist/services/http/middleware/Pagination.js +4 -2
- package/dist/services/http/middleware/Pagination.js.map +1 -1
- package/dist/services/http/middleware/RateLimiter.js +8 -1
- package/dist/services/http/middleware/RateLimiter.js.map +1 -1
- package/dist/services/http/middleware/RequestParser.d.ts +4 -1
- package/dist/services/http/middleware/RequestParser.js +74 -20
- package/dist/services/http/middleware/RequestParser.js.map +1 -1
- package/dist/services/http/routing/RouteNode.d.ts +4 -3
- package/dist/services/http/routing/RouteRegistry.js +21 -10
- package/dist/services/http/routing/RouteRegistry.js.map +1 -1
- package/dist/services/http/routing/match.d.ts +7 -2
- package/dist/services/http/routing/match.js +58 -41
- package/dist/services/http/routing/match.js.map +1 -1
- package/dist/services/i18n/I18n.js.map +1 -1
- package/dist/services/i18n/types.d.ts +4 -2
- package/dist/services/validate/ValidateService.d.ts +2 -0
- package/dist/services/validate/ValidateService.js +2 -0
- package/dist/services/validate/ValidateService.js.map +1 -1
- package/dist/services/validate/ValidationError.d.ts +12 -1
- package/dist/services/validate/ValidationError.js +16 -3
- package/dist/services/validate/ValidationError.js.map +1 -1
- package/dist/tests/setupFramework.d.ts +4 -1
- package/dist/tests/setupFramework.js +15 -9
- package/dist/tests/setupFramework.js.map +1 -1
- package/package.json +5 -5
|
@@ -12,31 +12,35 @@
|
|
|
12
12
|
*/
|
|
13
13
|
class RedisDriver {
|
|
14
14
|
whenReady;
|
|
15
|
-
#
|
|
15
|
+
#getRedisClientSync;
|
|
16
16
|
constructor() {
|
|
17
17
|
this.whenReady = this.#init();
|
|
18
18
|
}
|
|
19
19
|
async #init() {
|
|
20
|
-
//
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
20
|
+
// Connect in the background; node-redis retries indefinitely when down.
|
|
21
|
+
const { getRedisClientSync } = await import('../../../helpers/redis/redisConnection.js');
|
|
22
|
+
this.#getRedisClientSync = getRedisClientSync;
|
|
23
|
+
}
|
|
24
|
+
#readyClient() {
|
|
25
|
+
const client = this.#getRedisClientSync();
|
|
26
|
+
if (!client.isReady) {
|
|
27
|
+
throw new Error('Redis cache is not ready');
|
|
28
|
+
}
|
|
29
|
+
return client;
|
|
26
30
|
}
|
|
27
31
|
async get(key) {
|
|
28
32
|
await this.whenReady;
|
|
29
|
-
const client =
|
|
33
|
+
const client = this.#readyClient();
|
|
30
34
|
return client.get(key);
|
|
31
35
|
}
|
|
32
36
|
async set(key, value, ttlSeconds) {
|
|
33
37
|
await this.whenReady;
|
|
34
|
-
const client =
|
|
35
|
-
await client.set(key, value, {
|
|
38
|
+
const client = this.#readyClient();
|
|
39
|
+
await client.set(key, value, { PX: Math.ceil(ttlSeconds * 1000) });
|
|
36
40
|
}
|
|
37
41
|
async del(key) {
|
|
38
42
|
await this.whenReady;
|
|
39
|
-
const client =
|
|
43
|
+
const client = this.#readyClient();
|
|
40
44
|
return client.del(key);
|
|
41
45
|
}
|
|
42
46
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RedisDriver.js","sourceRoot":"","sources":["../../../../src/services/cache/drivers/RedisDriver.ts"],"names":[],"mappings":"AAGA;;;;;;;;;;;GAWG;AACH,MAAM,WAAW;IACf,SAAS,CAAgB;IAEzB,
|
|
1
|
+
{"version":3,"file":"RedisDriver.js","sourceRoot":"","sources":["../../../../src/services/cache/drivers/RedisDriver.ts"],"names":[],"mappings":"AAGA;;;;;;;;;;;GAWG;AACH,MAAM,WAAW;IACf,SAAS,CAAgB;IAEzB,mBAAmB,CAAyB;IAE5C;QACE,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC;IAChC,CAAC;IAED,KAAK,CAAC,KAAK;QACT,wEAAwE;QACxE,MAAM,EAAE,kBAAkB,EAAE,GAAG,MAAM,MAAM,CACzC,2CAA2C,CAC5C,CAAC;QACF,IAAI,CAAC,mBAAmB,GAAG,kBAAkB,CAAC;IAChD,CAAC;IAED,YAAY;QACV,MAAM,MAAM,GAAG,IAAI,CAAC,mBAAmB,EAAE,CAAC;QAC1C,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;YACpB,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;QAC9C,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,GAAW;QACnB,MAAM,IAAI,CAAC,SAAS,CAAC;QACrB,MAAM,MAAM,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;QACnC,OAAO,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,GAAW,EAAE,KAAa,EAAE,UAAkB;QACtD,MAAM,IAAI,CAAC,SAAS,CAAC;QACrB,MAAM,MAAM,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;QACnC,MAAM,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,IAAI,CAAC,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,EAAE,CAAC,CAAC;IACrE,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,GAAW;QACnB,MAAM,IAAI,CAAC,SAAS,CAAC;QACrB,MAAM,MAAM,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;QACnC,OAAO,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACzB,CAAC;CACF;AAED,eAAe,WAAW,CAAC"}
|
|
@@ -3,7 +3,7 @@ import type { Express, Request } from 'express';
|
|
|
3
3
|
import Base from '../../modules/Base.ts';
|
|
4
4
|
import type { IApp } from '../../server.ts';
|
|
5
5
|
import type { TI18n } from '../i18n/types.ts';
|
|
6
|
-
import { type ErrorHandlerFn, type ErrorHandlerResult, type ErrorLogLevel } from './builtinErrorHandlers.ts';
|
|
6
|
+
import { type ErrorHandlerFn, type ErrorHandlerResult, type ErrorLogLevel, type RegistrableError } from './builtinErrorHandlers.ts';
|
|
7
7
|
import { RouteRegistry } from './routing/RouteRegistry.ts';
|
|
8
8
|
export interface FrameworkRequest extends Request {
|
|
9
9
|
appInfo: {
|
|
@@ -44,7 +44,7 @@ declare class HttpServer extends Base {
|
|
|
44
44
|
* validation and middleware (the final sink, `addErrorHandler`, resolves
|
|
45
45
|
* through the same registry).
|
|
46
46
|
*/
|
|
47
|
-
registerErrorHandler<E extends
|
|
47
|
+
registerErrorHandler<E extends RegistrableError>(errorClass: abstract new (...args: never[]) => E, handler: ErrorHandlerFn<E>, opts?: {
|
|
48
48
|
logLevel?: ErrorLogLevel;
|
|
49
49
|
}): () => void;
|
|
50
50
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HttpServer.js","sourceRoot":"","sources":["../../../src/services/http/HttpServer.ts"],"names":[],"mappings":"AACA,OAAO,IAAI,MAAM,WAAW,CAAC;AAQ7B,OAAO,OAAO,MAAM,SAAS,CAAC;AAE9B,OAAO,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAClE,OAAO,IAAI,MAAM,uBAAuB,CAAC;AAGzC,OAAO,EACL,oBAAoB,
|
|
1
|
+
{"version":3,"file":"HttpServer.js","sourceRoot":"","sources":["../../../src/services/http/HttpServer.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,11 +16,17 @@ export interface ErrorHandlerResult {
|
|
|
16
16
|
}
|
|
17
17
|
/** Answer a resolved error: its headers, status and JSON body. */
|
|
18
18
|
export declare function sendErrorResult(res: Response, { status, body, headers }: ErrorHandlerResult): Response<any, Record<string, any>>;
|
|
19
|
-
|
|
19
|
+
/**
|
|
20
|
+
* What `registerErrorHandler` accepts: any `Error` subclass, including one that
|
|
21
|
+
* widens `message` (the framework's `ValidationError` carries its field
|
|
22
|
+
* payload there). Structural, so the core declarations need not import it.
|
|
23
|
+
*/
|
|
24
|
+
export type RegistrableError = Omit<Error, 'message'>;
|
|
25
|
+
export type ErrorHandlerFn<E extends RegistrableError = Error> = (err: E, req: FrameworkRequest) => ErrorHandlerResult | null | undefined | Promise<ErrorHandlerResult | null | undefined>;
|
|
20
26
|
/** A registered (class, handler, level) triple as stored by the registry. */
|
|
21
27
|
export interface RegisteredErrorHandler {
|
|
22
|
-
errorClass: abstract new (...args: never[]) =>
|
|
23
|
-
handler: ErrorHandlerFn
|
|
28
|
+
errorClass: abstract new (...args: never[]) => RegistrableError;
|
|
29
|
+
handler: ErrorHandlerFn<RegistrableError>;
|
|
24
30
|
logLevel: ErrorLogLevel;
|
|
25
31
|
}
|
|
26
32
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"builtinErrorHandlers.js","sourceRoot":"","sources":["../../../src/services/http/builtinErrorHandlers.ts"],"names":[],"mappings":"AACA,OAAO,QAAQ,MAAM,UAAU,CAAC;AAChC,OAAO,EAAE,oBAAoB,EAAE,MAAM,4BAA4B,CAAC;AAClE,OAAO,EACL,eAAe,EACf,eAAe,EACf,eAAe,GAChB,MAAM,gCAAgC,CAAC;AAExC,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAE5C,qDAAqD;AACrD,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,GAAqB,EAAE,EAAE,CAC1D,oBAAoB,CAClB,GAAG,EACH,kBAAkB,EAClB,+CAA+C,CAChD,CAAC;AAEJ,mEAAmE;AACnE,MAAM,CAAC,MAAM,uBAAuB,GAAG,CAAC,GAAqB,EAAE,EAAE,CAC/D,oBAAoB,CAAC,GAAG,EAAE,uBAAuB,EAAE,mBAAmB,CAAC,CAAC;AAoB1E,kEAAkE;AAClE,MAAM,UAAU,eAAe,CAC7B,GAAa,EACb,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAsB;IAE7C,KAAK,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,IAAI,EAAE,CAAC,EAAE,CAAC;QAC1D,GAAG,CAAC,SAAS,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IAC7B,CAAC;IACD,OAAO,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACvC,CAAC;
|
|
1
|
+
{"version":3,"file":"builtinErrorHandlers.js","sourceRoot":"","sources":["../../../src/services/http/builtinErrorHandlers.ts"],"names":[],"mappings":"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"}
|
|
@@ -28,6 +28,11 @@ class Cors extends AbstractMiddleware {
|
|
|
28
28
|
// response varies by it. `vary` appends instead of replacing other values.
|
|
29
29
|
res.vary('Origin');
|
|
30
30
|
for (const host of origins) {
|
|
31
|
+
// Global/sticky regexes update lastIndex on test(), making the result
|
|
32
|
+
// depend on which request used this middleware instance most recently.
|
|
33
|
+
if (host instanceof RegExp) {
|
|
34
|
+
host.lastIndex = 0;
|
|
35
|
+
}
|
|
31
36
|
if ((typeof host === 'string' && req.headers.origin === host) ||
|
|
32
37
|
(host instanceof RegExp && host.test(req.headers.origin ?? ''))) {
|
|
33
38
|
res.set('Access-Control-Allow-Origin', req.headers.origin);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Cors.js","sourceRoot":"","sources":["../../../../src/services/http/middleware/Cors.ts"],"names":[],"mappings":"AAGA,OAAO,kBAAkB,MAAM,yBAAyB,CAAC;AAEzD,MAAM,IAAK,SAAQ,kBAAkB;IACnC,YACE,GAAS,EACT,MAIC;QAED,KAAK,CAAC,GAAG,CAAC,CAAC;QACX,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;YAC9D,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;QACvD,CAAC;QACD,yEAAyE;QACzE,0EAA0E;QAC1E,sBAAsB;QACtB,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;YACpC,IACE,MAAM,YAAY,MAAM;gBACxB,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,EAChE,CAAC;gBACD,IAAI,CAAC,MAAM,EAAE,IAAI,CACf,eAAe,MAAM,CAAC,MAAM,kGAAkG,CAC/H,CAAC;YACJ,CAAC;QACH,CAAC;IACH,CAAC;IAED,MAAM,KAAK,WAAW;QACpB,OAAO,6BAA6B,CAAC;IACvC,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,GAAqB,EAAE,GAAa,EAAE,IAAkB;QACvE,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC;QACrC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;YAC5B,OAAO,IAAI,EAAE,CAAC;QAChB,CAAC;QACD,sEAAsE;QACtE,2EAA2E;QAC3E,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACnB,KAAK,MAAM,IAAI,IAAI,OAA8B,EAAE,CAAC;YAClD,IACE,CAAC,OAAO,IAAI,KAAK,QAAQ,IAAI,GAAG,CAAC,OAAO,CAAC,MAAM,KAAK,IAAI,CAAC;gBACzD,CAAC,IAAI,YAAY,MAAM,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,EAC/D,CAAC;gBACD,GAAG,CAAC,GAAG,CAAC,6BAA6B,EAAE,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;gBAE3D,IAAI,GAAG,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;oBAC7B,GAAG,CAAC,GAAG,CACL,8BAA8B,EAC9B,gCAAgC,CACjC,CAAC;oBACF,GAAG,CAAC,IAAI,CAAC,gCAAgC,CAAC,CAAC;oBAE3C,MAAM,cAAc,GAAG,GAAG,CAAC,OAAO,CAAC,gCAAgC,CAAC,CAAC;oBACrE,IAAI,cAAc,EAAE,CAAC;wBACnB,GAAG,CAAC,GAAG,CAAC,8BAA8B,EAAE,cAAc,CAAC,CAAC;oBAC1D,CAAC;oBACD,GAAG,CAAC,GAAG,CAAC,gBAAgB,EAAE,GAAG,CAAC,CAAC;oBAC/B,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;oBAChB,OAAO,GAAG,CAAC,GAAG,EAAE,CAAC;gBACnB,CAAC;gBAED,6DAA6D;gBAC7D,MAAM,cAAc,GAAG,IAAI,CAAC,MAAM,EAAE,cAEvB,CAAC;gBACd,IAAI,cAAc,EAAE,MAAM,EAAE,CAAC;oBAC3B,GAAG,CAAC,GAAG,CAAC,+BAA+B,EAAE,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;gBACtE,CAAC;YACH,CAAC;QACH,CAAC;QACD,OAAO,IAAI,EAAE,CAAC;IAChB,CAAC;CACF;AAED,eAAe,IAAI,CAAC"}
|
|
1
|
+
{"version":3,"file":"Cors.js","sourceRoot":"","sources":["../../../../src/services/http/middleware/Cors.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,23 @@
|
|
|
1
1
|
import { BlockList, isIP } from 'node:net';
|
|
2
2
|
import AbstractMiddleware from './AbstractMiddleware.js';
|
|
3
|
+
/** Accept standard IPs plus the common IPv4:port and [IPv6]:port proxy forms. */
|
|
4
|
+
function forwardedIpAddress(value) {
|
|
5
|
+
if (isIP(value)) {
|
|
6
|
+
return value;
|
|
7
|
+
}
|
|
8
|
+
const ipv4WithPort = /^(\d{1,3}(?:\.\d{1,3}){3}):(\d{1,5})$/.exec(value);
|
|
9
|
+
const ipv6WithPort = /^\[([^\]]+)\]:(\d{1,5})$/.exec(value);
|
|
10
|
+
const address = ipv4WithPort?.[1] ?? ipv6WithPort?.[1];
|
|
11
|
+
const port = Number(ipv4WithPort?.[2] ?? ipv6WithPort?.[2]);
|
|
12
|
+
if (address &&
|
|
13
|
+
Number.isInteger(port) &&
|
|
14
|
+
port >= 0 &&
|
|
15
|
+
port <= 65535 &&
|
|
16
|
+
isIP(address) > 0) {
|
|
17
|
+
return address;
|
|
18
|
+
}
|
|
19
|
+
return null;
|
|
20
|
+
}
|
|
3
21
|
class IpDetector extends AbstractMiddleware {
|
|
4
22
|
static get description() {
|
|
5
23
|
return 'Detect real user IP address. Support proxy and load balancer';
|
|
@@ -52,14 +70,15 @@ class IpDetector extends AbstractMiddleware {
|
|
|
52
70
|
const candidate = entries[i];
|
|
53
71
|
// A non-IP entry means the left part of the chain is attacker-
|
|
54
72
|
// controlled garbage — stop and keep the last trustworthy value.
|
|
55
|
-
|
|
73
|
+
const address = forwardedIpAddress(candidate);
|
|
74
|
+
if (!address) {
|
|
56
75
|
break;
|
|
57
76
|
}
|
|
58
|
-
ip =
|
|
77
|
+
ip = address;
|
|
59
78
|
// addressType must be per-candidate: an IPv6 socket can still carry
|
|
60
79
|
// IPv4 entries in the header (and vice versa).
|
|
61
|
-
const type =
|
|
62
|
-
if (!this.blockList.check(
|
|
80
|
+
const type = address.includes(':') ? 'ipv6' : 'ipv4';
|
|
81
|
+
if (!this.blockList.check(address, type)) {
|
|
63
82
|
// first untrusted hop = the client
|
|
64
83
|
break;
|
|
65
84
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"IpDetector.js","sourceRoot":"","sources":["../../../../src/services/http/middleware/IpDetector.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"IpDetector.js","sourceRoot":"","sources":["../../../../src/services/http/middleware/IpDetector.ts"],"names":[],"mappings":"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"}
|
|
@@ -58,7 +58,7 @@ class Pagination extends AbstractMiddleware {
|
|
|
58
58
|
// configured default — never 0, which Mongoose treats as "no limit" and
|
|
59
59
|
// would bypass `maxLimit`. Then clamp to `maxLimit`.
|
|
60
60
|
const requestedLimit = typeof req?.query?.limit === 'string'
|
|
61
|
-
?
|
|
61
|
+
? Math.trunc(Number(req.query.limit))
|
|
62
62
|
: limit;
|
|
63
63
|
let effectiveLimit = Number.isFinite(requestedLimit) && requestedLimit > 0
|
|
64
64
|
? requestedLimit
|
|
@@ -66,7 +66,9 @@ class Pagination extends AbstractMiddleware {
|
|
|
66
66
|
if (effectiveLimit > maxLimit) {
|
|
67
67
|
effectiveLimit = maxLimit;
|
|
68
68
|
}
|
|
69
|
-
const requestedPage = typeof req?.query?.page === 'string'
|
|
69
|
+
const requestedPage = typeof req?.query?.page === 'string'
|
|
70
|
+
? Math.trunc(Number(req.query.page))
|
|
71
|
+
: 1;
|
|
70
72
|
// A malformed, non-positive or absurdly large page (hundreds of digits
|
|
71
73
|
// parse to Infinity) falls back to 1, so `skip` is always a safe integer.
|
|
72
74
|
let page = Number.isSafeInteger(requestedPage) && requestedPage > 0
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Pagination.js","sourceRoot":"","sources":["../../../../src/services/http/middleware/Pagination.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAG9D,OAAO,kBAAkB,MAAM,yBAAyB,CAAC;AAYzD,MAAM,yBAAyB,GAAG,YAAY,CAI5C,CAAC,KAAK,EAAE,EAAE;IACR,MAAM,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE,CAA4B,CAAC;IACnD,MAAM,MAAM,GAA6B,EAAE,CAAC;IAC5C,MAAM,GAAG,GAAsC,EAAE,CAAC;IAClD,KAAK,MAAM,GAAG,IAAI,CAAC,MAAM,EAAE,OAAO,CAAU,EAAE,CAAC;QAC7C,IAAI,CAAC,CAAC,GAAG,CAAC,KAAK,SAAS,IAAI,CAAC,CAAC,GAAG,CAAC,KAAK,IAAI,IAAI,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,CAAC;YAC7D,SAAS;QACX,CAAC;QACD,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;QACzB,0EAA0E;QAC1E,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC;YACxB,MAAM,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,GAAG,GAAG,mBAAmB,EAAE,IAAI,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QACnE,CAAC;aAAM,CAAC;YACN,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACf,CAAC;IACH,CAAC;IACD,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;QAClB,OAAO,EAAE,MAAM,EAAE,CAAC;IACpB,CAAC;IACD,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC;AACxB,CAAC,EACD;IACE,UAAU,EAAE;QACV,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE;YACV,IAAI,EAAE;gBACJ,IAAI,EAAE,QAAQ;gBACd,WAAW,EAAE,wBAAwB;aACtC;YACD,KAAK,EAAE;gBACL,IAAI,EAAE,QAAQ;gBACd,WAAW,EAAE,+CAA+C;aAC7D;SACF;KACF;CACF,CACF,CAAC;AAEF;;GAEG;AACH,MAAM,UAAW,SAAQ,kBAAkB;IACzC,MAAM,KAAK,WAAW;QACpB,OAAO,yEAAyE,CAAC;IACnF,CAAC;IAED,MAAM,KAAK,QAAQ;QACjB,OAAO,EAA4C,CAAC;IACtD,CAAC;IAED,MAAM,KAAK,sBAAsB;QAC/B,OAAO,yBAAyB,CAAC;IACnC,CAAC;IAED,KAAK,CAAC,UAAU,CACd,GAAmD,EACnD,IAAc,EACd,IAAkB;QAElB,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC,MAG9B,CAAC;QAEF,KAAK,GAAG,CAAC,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;QACxE,QAAQ;YACN,CAAC,OAAO,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,GAAG,CAAC;QAE5E,wEAAwE;QACxE,wEAAwE;QACxE,qDAAqD;QACrD,MAAM,cAAc,GAClB,OAAO,GAAG,EAAE,KAAK,EAAE,KAAK,KAAK,QAAQ;YACnC,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"Pagination.js","sourceRoot":"","sources":["../../../../src/services/http/middleware/Pagination.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,7 +22,13 @@ class RateLimiter extends AbstractMiddleware {
|
|
|
22
22
|
constructor(app, params) {
|
|
23
23
|
super(app, params);
|
|
24
24
|
const limiterOptions = this.app.getConfig('rateLimiter');
|
|
25
|
-
|
|
25
|
+
// Per-mount params override the config. Arrays replace rather than
|
|
26
|
+
// concatenate (deepmerge's default), matching the config loader: otherwise
|
|
27
|
+
// `consumeKeyComponents.request: ['phone']` on top of a config `['email']`
|
|
28
|
+
// keys on both, and `[]` can never switch the component off.
|
|
29
|
+
this.finalOptions = merge(limiterOptions, params || {}, {
|
|
30
|
+
arrayMerge: (_destinationArray, sourceArray) => sourceArray,
|
|
31
|
+
});
|
|
26
32
|
switch (this.finalOptions.driver) {
|
|
27
33
|
case 'memory':
|
|
28
34
|
this.limiter = new RateLimiterMemory(this.finalOptions.limiterOptions);
|
|
@@ -59,6 +65,7 @@ class RateLimiter extends AbstractMiddleware {
|
|
|
59
65
|
this.limiter = new RateLimiterRedis({
|
|
60
66
|
storeClient: redisClient,
|
|
61
67
|
useRedisPackage: true,
|
|
68
|
+
rejectIfRedisNotReady: true,
|
|
62
69
|
// Memory fallback so a Redis outage doesn't drop limiting entirely; the
|
|
63
70
|
// library serves from this when the store errors, and doc-10's fail-open
|
|
64
71
|
// in `consumeResult` is the last resort.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RateLimiter.js","sourceRoot":"","sources":["../../../../src/services/http/middleware/RateLimiter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,KAAK,MAAM,WAAW,CAAC;AAE9B,OAAO,QAAQ,MAAM,UAAU,CAAC;AAKhC,OAAO,EACL,iBAAiB,EACjB,gBAAgB,EAChB,gBAAgB,GACjB,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AAGzE,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,kBAAkB,MAAM,yBAAyB,CAAC;AAGzD,MAAM,yBAAyB,GAAG,sBAAsB,CACtD,iCAAiC,EACjC,CAAC,IAAI,EAAE,EAAE,CACP,eAAe,IAAI,+IAA+I,CACrK,CAAC;AAEF,MAAM,WAAY,SAAQ,kBAAkB;IAC1C,MAAM,KAAK,WAAW;QACpB,OAAO,iFAAiF,CAAC;IAC3F,CAAC;IAED,YAAY,CAA2B;IACvC,OAAO,CAAuB;IAE9B;;;;;OAKG;IACH,SAAS,GAAkB,OAAO,CAAC,OAAO,EAAE,CAAC;IAE7C,YAAY,GAAS,EAAE,MAAgC;QACrD,KAAK,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;QACnB,MAAM,cAAc,GAAG,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC;QACzD,IAAI,CAAC,YAAY,GAAG,KAAK,
|
|
1
|
+
{"version":3,"file":"RateLimiter.js","sourceRoot":"","sources":["../../../../src/services/http/middleware/RateLimiter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,KAAK,MAAM,WAAW,CAAC;AAE9B,OAAO,QAAQ,MAAM,UAAU,CAAC;AAKhC,OAAO,EACL,iBAAiB,EACjB,gBAAgB,EAChB,gBAAgB,GACjB,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AAGzE,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,kBAAkB,MAAM,yBAAyB,CAAC;AAGzD,MAAM,yBAAyB,GAAG,sBAAsB,CACtD,iCAAiC,EACjC,CAAC,IAAI,EAAE,EAAE,CACP,eAAe,IAAI,+IAA+I,CACrK,CAAC;AAEF,MAAM,WAAY,SAAQ,kBAAkB;IAC1C,MAAM,KAAK,WAAW;QACpB,OAAO,iFAAiF,CAAC;IAC3F,CAAC;IAED,YAAY,CAA2B;IACvC,OAAO,CAAuB;IAE9B;;;;;OAKG;IACH,SAAS,GAAkB,OAAO,CAAC,OAAO,EAAE,CAAC;IAE7C,YAAY,GAAS,EAAE,MAAgC;QACrD,KAAK,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;QACnB,MAAM,cAAc,GAAG,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC;QACzD,mEAAmE;QACnE,2EAA2E;QAC3E,2EAA2E;QAC3E,6DAA6D;QAC7D,IAAI,CAAC,YAAY,GAAG,KAAK,CAAC,cAAc,EAAE,MAAM,IAAI,EAAE,EAAE;YACtD,UAAU,EAAE,CAAC,iBAAiB,EAAE,WAAW,EAAE,EAAE,CAAC,WAAW;SAC5D,CAA6B,CAAC;QAE/B,QAAQ,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,CAAC;YACjC,KAAK,QAAQ;gBACX,IAAI,CAAC,OAAO,GAAG,IAAI,iBAAiB,CAAC,IAAI,CAAC,YAAY,CAAC,cAAc,CAAC,CAAC;gBACvE,MAAM;YAER,KAAK,OAAO;gBACV,uEAAuE;gBACvE,yEAAyE;gBACzE,wEAAwE;gBACxE,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,gBAAgB,EAAE,CAAC;gBACzC,MAAM;YAER,KAAK,OAAO;gBACV,IAAI,CAAC,OAAO,GAAG,IAAI,gBAAgB,CAAC;oBAClC,WAAW,EAAE,QAAQ,CAAC,UAAU;oBAChC,sBAAsB,EAAE,OAAO,CAAC,GAAG,CAAC,IAAI,KAAK,MAAM,EAAE,0DAA0D;oBAC/G,oEAAoE;oBACpE,gBAAgB,EAAE,IAAI,iBAAiB,CACrC,IAAI,CAAC,YAAY,CAAC,cAAc,CACjC;oBACD,GAAG,IAAI,CAAC,YAAY,CAAC,cAAc;iBACpC,CAAC,CAAC;gBACH,MAAM;YAER;gBACE,IAAI,CAAC,MAAM,EAAE,KAAK,CAChB,6BAA6B,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,CACxD,CAAC;gBACF,MAAM;QACV,CAAC;IACH,CAAC;IAED,KAAK,CAAC,gBAAgB;QACpB,IAAI,CAAC;YACH,uEAAuE;YACvE,sEAAsE;YACtE,0EAA0E;YAC1E,uEAAuE;YACvE,8CAA8C;YAC9C,MAAM,EAAE,kBAAkB,EAAE,GAAG,MAAM,MAAM,CACzC,2CAA2C,CAC5C,CAAC;YACF,MAAM,WAAW,GAAG,kBAAkB,EAAE,CAAC;YACzC,IAAI,CAAC,OAAO,GAAG,IAAI,gBAAgB,CAAC;gBAClC,WAAW,EAAE,WAAW;gBACxB,eAAe,EAAE,IAAI;gBACrB,qBAAqB,EAAE,IAAI;gBAC3B,wEAAwE;gBACxE,yEAAyE;gBACzE,yCAAyC;gBACzC,gBAAgB,EAAE,IAAI,iBAAiB,CACrC,IAAI,CAAC,YAAY,CAAC,cAAc,CACjC;gBACD,GAAG,IAAI,CAAC,YAAY,CAAC,cAAc;aACpC,CAAC,CAAC;QACL,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,2EAA2E;YAC3E,6EAA6E;YAC7E,IAAI,CAAC,MAAM,EAAE,KAAK,CAChB,kEAAkE,CAAC,EAAE,CACtE,CAAC;QACJ,CAAC;IACH,CAAC;IAED,kBAAkB,CAAC,GAA6C;QAC9D,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC,YAAY,CAAC,oBAAoB,CAAC;QAE5E,MAAM,GAAG,GAAG,EAAE,CAAC;QACf,IAAI,EAAE,EAAE,CAAC;YACP,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC;gBACpB,IAAI,CAAC,MAAM,EAAE,KAAK,CAChB,wHAAwH,CACzH,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACN,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;YAC3B,CAAC;QACH,CAAC;QACD,IAAI,KAAK,EAAE,CAAC;YACV,mEAAmE;YACnE,yEAAyE;YACzE,kEAAkE;YAClE,MAAM,MAAM,GACV,GAAG,CAAC,MAAM,KAAK,MAAM;gBACrB,GAAG,CAAC,KAAK,EAAE,OAAO,EAAE,GAAG;gBACvB,CAAC,GAAG,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI;gBACvB,CAAC,CAAC,KAAK;gBACP,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,IAAI,KAAK,CAAC,CAAC;YAC5B,GAAG,CAAC,IAAI,CAAC,GAAG,MAAM,IAAI,GAAG,CAAC,KAAK,EAAE,IAAI,IAAI,WAAW,EAAE,CAAC,CAAC;QAC1D,CAAC;QACD,IAAI,IAAI,IAAI,GAAG,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC;YAC9B,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;QACjC,CAAC;QAED,IAAI,OAAO,EAAE,MAAM,EAAE,CAAC;YACpB,uEAAuE;YACvE,yEAAyE;YACzE,uCAAuC;YACvC,MAAM,MAAM,GAAuB,EAAE,CAAC;YACtC,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;gBAC5B,MAAM,KAAK,GAAG,GAAG,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC;gBAChC,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;oBAC3D,SAAS;gBACX,CAAC;gBACD,MAAM,UAAU,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;gBACxE,IAAI,UAAU,EAAE,CAAC;oBACf,MAAM,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC;gBACnC,CAAC;YACH,CAAC;YACD,uEAAuE;YACvE,2CAA2C;YAC3C,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;gBAClB,GAAG,CAAC,IAAI,CACN,UAAU,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAClE,CAAC;YACJ,CAAC;QACH,CAAC;QAED,OAAO,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACvB,CAAC;IAED,6EAA6E;IAC7E,kBAAkB,CAAC,GAA6C;QAC9D,OAAO,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC;IACtC,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,UAAkB,EAAE,aAAa,GAAG,CAAC;QACvD,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CACvC,UAAU,EACV,aAAa,IAAI,IAAI,CAAC,YAAY,CAAC,aAAa,CACjD,CAAC;YACF,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC,EAAE,GAAG,MAAM,EAAE,CAAC;QACvD,CAAC;QAAC,OAAO,CAAU,EAAE,CAAC;YACpB,yEAAyE;YACzE,oEAAoE;YACpE,yEAAyE;YACzE,2EAA2E;YAC3E,yEAAyE;YACzE,+BAA+B;YAC/B,IAAI,CAAC,YAAY,KAAK,EAAE,CAAC;gBACvB,IAAI,CAAC,MAAM,EAAE,KAAK,CAChB,sCAAsC,UAAU,MAAM,CAAC,EAAE,CAC1D,CAAC;gBACF,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,UAAU,EAAE,CAAC,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC;YAChE,CAAC;YACD,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,mCAAmC,UAAU,EAAE,CAAC,CAAC;YACnE,MAAM,MAAM,GAAG,CAAmB,CAAC;YACnC,MAAM,UAAU,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC;YAE/D,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,GAAG,MAAM,EAAE,CAAC;QACrD,CAAC;IACH,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,GAAqB,EAAE,GAAa,EAAE,IAAkB;QACvE,4EAA4E;QAC5E,0BAA0B;QAC1B,MAAM,IAAI,CAAC,SAAS,CAAC;QACrB,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;YAClB,IAAI,CAAC,MAAM,EAAE,IAAI,CACf,2DAA2D,CAC5D,CAAC;YACF,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,mBAAmB,EAAE,CAAC,CAAC;QAChE,CAAC;QAED,sEAAsE;QACtE,wEAAwE;QACxE,mEAAmE;QACnE,MAAM,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;QAElD,wEAAwE;QACxE,IAAI,GAAW,CAAC;QAChB,IAAI,IAAI,CAAC,kBAAkB,KAAK,WAAW,CAAC,SAAS,CAAC,kBAAkB,EAAE,CAAC;YACzE,yBAAyB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YAC5C,GAAG,GAAG,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC;QACrC,CAAC;aAAM,CAAC;YACN,GAAG,GAAG,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC;QACrC,CAAC;QACD,MAAM,UAAU,GAAG,GAAG,SAAS,IAAI,GAAG,EAAE,CAAC;QAEzC,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;QAC3D,IAAI,aAAa,CAAC,SAAS,EAAE,CAAC;YAC5B,OAAO,IAAI,EAAE,CAAC;QAChB,CAAC;QAED,MAAM,IAAI,SAAS,CAAC,GAAG,EAAE;YACvB,IAAI,EAAE,mBAAmB;YACzB,OAAO,EAAE,wCAAwC;YACjD,OAAO,EAAE,mBAAmB;YAC5B,OAAO,EAAE,EAAE,aAAa,EAAE,MAAM,CAAC,aAAa,CAAC,UAAU,CAAC,EAAE;SAC7D,CAAC,CAAC;IACL,CAAC;CACF;AAED,eAAe,WAAW,CAAC"}
|
|
@@ -1,10 +1,13 @@
|
|
|
1
1
|
import type { NextFunction, Response } from 'express';
|
|
2
2
|
import type { FrameworkRequest } from '../HttpServer.ts';
|
|
3
3
|
import AbstractMiddleware from './AbstractMiddleware.ts';
|
|
4
|
+
/** Built-in body formats that other media types can be parsed as. */
|
|
5
|
+
export type RequestBodyFormat = 'json' | 'urlencoded';
|
|
4
6
|
/**
|
|
5
7
|
* Parses multipart / urlencoded / json request bodies (via formidable) into
|
|
6
8
|
* `req.body`. Size and count limits come from `config.http.requestParser`
|
|
7
|
-
* (explicit per-mount params override them)
|
|
9
|
+
* (explicit per-mount params override them), and so do extra media types to
|
|
10
|
+
* parse as JSON or urlencoded (`mediaTypes`). Spooled upload temp files are
|
|
8
11
|
* unlinked once the response finishes — a handler that needs to keep an upload
|
|
9
12
|
* MUST move or copy it (e.g. `fs.rename`) before responding.
|
|
10
13
|
*/
|
|
@@ -2,10 +2,53 @@ import { unlink } from 'node:fs/promises';
|
|
|
2
2
|
import formidable, { json, multipart, octetstream, querystring, } from 'formidable';
|
|
3
3
|
import { normalizeContentType } from '../../validate/contentType.js';
|
|
4
4
|
import AbstractMiddleware from './AbstractMiddleware.js';
|
|
5
|
+
const bodyFormats = {
|
|
6
|
+
json: { plugin: json, mediaType: 'application/json' },
|
|
7
|
+
urlencoded: {
|
|
8
|
+
plugin: querystring,
|
|
9
|
+
mediaType: 'application/x-www-form-urlencoded',
|
|
10
|
+
},
|
|
11
|
+
};
|
|
12
|
+
/**
|
|
13
|
+
* The body format `config.http.requestParser.mediaTypes` assigns to a media
|
|
14
|
+
* type. Keys match case-insensitively; unknown formats are ignored.
|
|
15
|
+
*/
|
|
16
|
+
function findBodyFormat(mediaType, mediaTypes) {
|
|
17
|
+
if (!mediaType || typeof mediaTypes !== 'object' || mediaTypes === null) {
|
|
18
|
+
return undefined;
|
|
19
|
+
}
|
|
20
|
+
let format;
|
|
21
|
+
for (const [key, value] of Object.entries(mediaTypes)) {
|
|
22
|
+
if (key.toLowerCase() === mediaType) {
|
|
23
|
+
format = value;
|
|
24
|
+
}
|
|
25
|
+
}
|
|
26
|
+
return typeof format === 'string' && Object.hasOwn(bodyFormats, format)
|
|
27
|
+
? bodyFormats[format]
|
|
28
|
+
: undefined;
|
|
29
|
+
}
|
|
30
|
+
/**
|
|
31
|
+
* Formidable's plugins check the `Content-Type` header themselves. Show the
|
|
32
|
+
* plugin its own media type so a mapped type reaches that parser.
|
|
33
|
+
*/
|
|
34
|
+
function asMediaType(plugin, mediaType) {
|
|
35
|
+
return (form, options) => {
|
|
36
|
+
const target = form;
|
|
37
|
+
const { headers } = target;
|
|
38
|
+
target.headers = { ...headers, 'content-type': mediaType };
|
|
39
|
+
try {
|
|
40
|
+
plugin(form, options);
|
|
41
|
+
}
|
|
42
|
+
finally {
|
|
43
|
+
target.headers = headers;
|
|
44
|
+
}
|
|
45
|
+
};
|
|
46
|
+
}
|
|
5
47
|
/**
|
|
6
48
|
* Parses multipart / urlencoded / json request bodies (via formidable) into
|
|
7
49
|
* `req.body`. Size and count limits come from `config.http.requestParser`
|
|
8
|
-
* (explicit per-mount params override them)
|
|
50
|
+
* (explicit per-mount params override them), and so do extra media types to
|
|
51
|
+
* parse as JSON or urlencoded (`mediaTypes`). Spooled upload temp files are
|
|
9
52
|
* unlinked once the response finishes — a handler that needs to keep an upload
|
|
10
53
|
* MUST move or copy it (e.g. `fs.rename`) before responding.
|
|
11
54
|
*/
|
|
@@ -18,31 +61,41 @@ class RequestParser extends AbstractMiddleware {
|
|
|
18
61
|
this.logger?.verbose(`Parsing request`);
|
|
19
62
|
const { requestParser } = this.app.getConfig('http');
|
|
20
63
|
// Config defaults bound unauthenticated uploads; explicit per-mount params win.
|
|
21
|
-
const
|
|
64
|
+
const { mediaTypes, ...parserOptions } = {
|
|
65
|
+
...requestParser,
|
|
66
|
+
...this.params,
|
|
67
|
+
};
|
|
22
68
|
const mediaType = normalizeContentType(req.headers?.['content-type']);
|
|
23
|
-
const
|
|
69
|
+
const mapped = findBodyFormat(mediaType, mediaTypes);
|
|
70
|
+
const isMultipart = !mapped &&
|
|
71
|
+
(mediaType === 'multipart/form-data' ||
|
|
72
|
+
mediaType === 'multipart/related');
|
|
73
|
+
const isOctetStream = !mapped && mediaType === 'application/octet-stream';
|
|
24
74
|
// Formidable's default plugins inspect the entire header. Select one for
|
|
25
75
|
// known media types so parameter text cannot switch the parser.
|
|
26
|
-
const plugin =
|
|
27
|
-
?
|
|
28
|
-
:
|
|
29
|
-
?
|
|
30
|
-
: mediaType === 'application/
|
|
31
|
-
?
|
|
32
|
-
: mediaType === 'application/
|
|
33
|
-
?
|
|
34
|
-
:
|
|
76
|
+
const plugin = mapped
|
|
77
|
+
? asMediaType(mapped.plugin, mapped.mediaType)
|
|
78
|
+
: isMultipart
|
|
79
|
+
? multipart
|
|
80
|
+
: mediaType === 'application/json' || mediaType?.endsWith('+json')
|
|
81
|
+
? json
|
|
82
|
+
: mediaType === 'application/x-www-form-urlencoded'
|
|
83
|
+
? querystring
|
|
84
|
+
: isOctetStream
|
|
85
|
+
? octetstream
|
|
86
|
+
: undefined;
|
|
35
87
|
const form = formidable({
|
|
36
88
|
...parserOptions,
|
|
37
89
|
...(plugin ? { enabledPlugins: [plugin] } : {}),
|
|
38
90
|
});
|
|
39
|
-
// JSON/urlencoded parsing buffers the body; multipart
|
|
40
|
-
//
|
|
91
|
+
// JSON/urlencoded parsing buffers the body; multipart and octet-stream
|
|
92
|
+
// uploads use Formidable's file limits instead. Unknown media types retain
|
|
93
|
+
// the v5 fallback, bounded below.
|
|
41
94
|
const maxBodySize = typeof parserOptions.maxFieldsSize === 'number'
|
|
42
95
|
? parserOptions.maxFieldsSize
|
|
43
96
|
: 2 * 1024 * 1024;
|
|
44
97
|
let bodyTooLarge = false;
|
|
45
|
-
if (!isMultipart) {
|
|
98
|
+
if (!isMultipart && !isOctetStream) {
|
|
46
99
|
const declaredLength = Number(req.headers?.['content-length']);
|
|
47
100
|
if (Number.isFinite(declaredLength) && declaredLength > maxBodySize) {
|
|
48
101
|
this.logger?.error(`Request body ${declaredLength}B exceeds maxFieldsSize ${maxBodySize}B`);
|
|
@@ -53,17 +106,18 @@ class RequestParser extends AbstractMiddleware {
|
|
|
53
106
|
});
|
|
54
107
|
}
|
|
55
108
|
}
|
|
56
|
-
// Also guard chunked bodies.
|
|
57
|
-
//
|
|
58
|
-
//
|
|
59
|
-
//
|
|
109
|
+
// Also guard chunked buffered bodies. Upload parsers enforce their own file
|
|
110
|
+
// limits. Pausing (not destroying) the request keeps the socket writable,
|
|
111
|
+
// so the client receives the 413; its `Connection: close` then ends the
|
|
112
|
+
// connection.
|
|
60
113
|
let rejectOversized = () => { };
|
|
61
114
|
const oversized = new Promise((_resolve, reject) => {
|
|
62
115
|
rejectOversized = reject;
|
|
63
116
|
});
|
|
64
117
|
form.on('progress', (bytesReceived) => {
|
|
65
118
|
if (!bodyTooLarge &&
|
|
66
|
-
|
|
119
|
+
!isMultipart &&
|
|
120
|
+
!isOctetStream &&
|
|
67
121
|
bytesReceived > maxBodySize) {
|
|
68
122
|
bodyTooLarge = true;
|
|
69
123
|
req.pause();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RequestParser.js","sourceRoot":"","sources":["../../../../src/services/http/middleware/RequestParser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"RequestParser.js","sourceRoot":"","sources":["../../../../src/services/http/middleware/RequestParser.ts"],"names":[],"mappings":"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"}
|
|
@@ -84,9 +84,10 @@ export interface RouteNode {
|
|
|
84
84
|
/**
|
|
85
85
|
* Match outcome:
|
|
86
86
|
* - `entry !== null` → success; adapter runs middlewares then handler.
|
|
87
|
-
* - `entry === null` → path matched
|
|
88
|
-
*
|
|
89
|
-
*
|
|
87
|
+
* - `entry === null` → the path matched but no matching route has the method
|
|
88
|
+
* (405); `allowedMethods` lists the methods of every route matching the
|
|
89
|
+
* path, for the `Allow` header. `middlewares` and `params` come from the most
|
|
90
|
+
* specific of them — adapter chooses whether to run the middlewares.
|
|
90
91
|
*
|
|
91
92
|
* `match()` returns `null` when nothing matches (404).
|
|
92
93
|
*/
|
|
@@ -36,7 +36,10 @@ export class RouteRegistry {
|
|
|
36
36
|
}
|
|
37
37
|
// A handler's `paramNames` only covers params in its OWN path, not in the
|
|
38
38
|
// mount prefix. `match()` zips paramNames against ALL collected values by
|
|
39
|
-
// index, so prefix params must be prepended or the values mis-align.
|
|
39
|
+
// index, so prefix params must be prepended or the values mis-align. When a
|
|
40
|
+
// handler has no explicit per-method names, derive its local names from the
|
|
41
|
+
// subtree path before prepending; relying on tree names fails when sibling
|
|
42
|
+
// subtrees with different prefix names merge onto the same param node.
|
|
40
43
|
if (prefixParamNames.length > 0) {
|
|
41
44
|
prependParamNames(subtree, prefixParamNames);
|
|
42
45
|
}
|
|
@@ -132,29 +135,37 @@ export function ensureChildBySegment(node, segment) {
|
|
|
132
135
|
return child;
|
|
133
136
|
}
|
|
134
137
|
/**
|
|
135
|
-
*
|
|
136
|
-
*
|
|
137
|
-
*
|
|
138
|
+
* Give every handler the full parameter sequence. Explicit handler names take
|
|
139
|
+
* precedence for its local path; otherwise derive local names from the source
|
|
140
|
+
* subtree so merged sibling prefixes cannot leak their node's first name.
|
|
138
141
|
*/
|
|
139
|
-
function prependParamNames(node, prefixNames) {
|
|
142
|
+
function prependParamNames(node, prefixNames, localParamNames = []) {
|
|
140
143
|
if (node.methods) {
|
|
141
144
|
for (const m of Object.keys(node.methods)) {
|
|
142
145
|
const handler = node.methods[m];
|
|
143
|
-
if (handler
|
|
144
|
-
handler.paramNames = [
|
|
146
|
+
if (handler) {
|
|
147
|
+
handler.paramNames = [
|
|
148
|
+
...prefixNames,
|
|
149
|
+
...(handler.paramNames ?? localParamNames),
|
|
150
|
+
];
|
|
145
151
|
}
|
|
146
152
|
}
|
|
147
153
|
}
|
|
148
154
|
for (const child of node.children.values()) {
|
|
149
|
-
prependParamNames(child, prefixNames);
|
|
155
|
+
prependParamNames(child, prefixNames, localParamNamesForChild(child, localParamNames));
|
|
150
156
|
}
|
|
151
157
|
if (node.paramChild) {
|
|
152
|
-
prependParamNames(node.paramChild, prefixNames);
|
|
158
|
+
prependParamNames(node.paramChild, prefixNames, localParamNamesForChild(node.paramChild, localParamNames));
|
|
153
159
|
}
|
|
154
160
|
if (node.splatChild) {
|
|
155
|
-
prependParamNames(node.splatChild, prefixNames);
|
|
161
|
+
prependParamNames(node.splatChild, prefixNames, localParamNamesForChild(node.splatChild, localParamNames));
|
|
156
162
|
}
|
|
157
163
|
}
|
|
164
|
+
function localParamNamesForChild(child, names) {
|
|
165
|
+
return child.segment.startsWith(':') || child.segment.startsWith('*')
|
|
166
|
+
? [...names, child.segment.slice(1)]
|
|
167
|
+
: names;
|
|
168
|
+
}
|
|
158
169
|
function mergeNode(target, source) {
|
|
159
170
|
target.middlewares.push(...source.middlewares);
|
|
160
171
|
if (source.methods) {
|