alado 3.2.2 → 3.3.0
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/dto/route.d.ts +1 -0
- package/dist/helpers/parser/body-parser.js +4 -0
- package/dist/helpers/parser/body-parser.js.map +1 -1
- package/dist/helpers/service/clear-route-path.js +4 -0
- package/dist/helpers/service/clear-route-path.js.map +1 -1
- package/dist/helpers/validate/context/validate-request-part.d.ts +4 -2
- package/dist/helpers/validate/context/validate-request-part.js +135 -46
- package/dist/helpers/validate/context/validate-request-part.js.map +1 -1
- package/dist/request-processor/request-processor.d.ts +3 -0
- package/dist/request-processor/request-processor.js +106 -42
- package/dist/request-processor/request-processor.js.map +1 -1
- package/dist/router/router.d.ts +11 -0
- package/dist/router/router.js +79 -16
- package/dist/router/router.js.map +1 -1
- package/package.json +1 -1
- package/d.patch +0 -81
package/dist/dto/route.d.ts
CHANGED
|
@@ -26,6 +26,10 @@ function collectChunks(req, limit, received, reject) {
|
|
|
26
26
|
};
|
|
27
27
|
}
|
|
28
28
|
function concatChunks(received, encoding) {
|
|
29
|
+
// small bodies usually arrive in one chunk: decode it without copying
|
|
30
|
+
if (received.chunks.length === 1) {
|
|
31
|
+
return received.chunks[0].toString(encoding);
|
|
32
|
+
}
|
|
29
33
|
return Buffer.concat(received.chunks, received.bytes).toString(encoding);
|
|
30
34
|
}
|
|
31
35
|
async function bodyParser(req, res, limit) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"body-parser.js","sourceRoot":"","sources":["../../../src/helpers/parser/body-parser.ts"],"names":[],"mappings":";;AAOA,4CAGC;
|
|
1
|
+
{"version":3,"file":"body-parser.js","sourceRoot":"","sources":["../../../src/helpers/parser/body-parser.ts"],"names":[],"mappings":";;AAOA,4CAGC;AAiCD,gCAkHC;AA5JD,mCAAkG;AAClG,mCAAkC;AAElC,6CAAyC;AAEzC,+GAA+G;AAC/G,SAAgB,gBAAgB,CAAC,WAA+B;IAC9D,MAAM,IAAI,GAAW,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;IAC5E,OAAO,IAAI,KAAK,oBAAW,CAAC,GAAG,IAAI,IAAI,KAAK,oBAAW,CAAC,QAAQ,IAAI,8BAA8B,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAChH,CAAC;AAID,SAAS,aAAa,CACpB,GAAoB,EACpB,KAAa,EACb,QAAsB,EACtB,MAAyC;IAEzC,OAAO,CAAC,KAAa,EAAE,EAAE;QACvB,QAAQ,CAAC,KAAK,IAAI,KAAK,CAAC,MAAM,CAAC;QAC/B,IAAI,KAAK,IAAI,QAAQ,CAAC,KAAK,GAAG,KAAK,EAAE,CAAC;YACpC,GAAG,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;YAC/B,GAAG,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC;YAC9B,MAAM,CAAC;gBACL,UAAU,EAAE,GAAG;gBACf,OAAO,EAAE,mBAAmB;aACT,CAAC,CAAC;YACvB,OAAO;QACT,CAAC;QACD,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC9B,CAAC,CAAC;AACJ,CAAC;AAED,SAAS,YAAY,CAAC,QAAsB,EAAE,QAAwB;IACpE,sEAAsE;IACtE,IAAI,QAAQ,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACjC,OAAO,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAC/C,CAAC;IACD,OAAO,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;AAC3E,CAAC;AAEM,KAAK,UAAU,UAAU,CAAC,GAAoB,EAAE,GAAoB,EAAE,KAAa;IACxF,MAAM,WAAW,GAAG,GAAG,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;IAChD,MAAM,MAAM,GAAQ;QAClB,IAAI,EAAE,EAAE;QACR,KAAK,EAAE,EAAE;QACT,OAAO,EAAE,EAAE;KACZ,CAAC;IACF,IAAI,IAAI,GAAW,EAAE,CAAC;IACtB,MAAM,QAAQ,GAAiB,EAAE,MAAM,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC;IACxD,IAAI,WAAW,EAAE,UAAU,CAAC,oBAAW,CAAC,SAAS,CAAC,EAAE,CAAC;QACnD,MAAM,aAAa,GAAG,gBAAgB,CAAC,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,cAAc,CAAW,CAAC,CAAC;QACnF,MAAM,QAAQ,GAAkB,aAAa,IAAI,aAAa,CAAC,CAAC,CAAC,CAAC;QAClE,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAC1C,GAAG,CAAC,EAAE,CAAC,MAAM,EAAE,aAAa,CAAC,GAAG,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC;YAC5D,GAAG,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE;gBACjB,oFAAoF;gBACpF,IAAI,GAAG,YAAY,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;gBACxC,MAAM,CAAC,OAAO,GAAG,IAAI,CAAC;gBACtB,MAAM,QAAQ,GAAQ;oBACpB,KAAK,EAAE,EAAE;oBACT,MAAM,EAAE,EAAE;iBACX,CAAC;gBACF,MAAM,IAAI,GAAG,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;gBACtD,KAAK,MAAM,IAAI,IAAI,IAAI,EAAE,CAAC;oBACxB,MAAM,OAAO,GAAQ,EAAE,CAAC;oBACxB,MAAM,CAAC,OAAO,CAAC,uBAAc,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;wBAC3C,MAAM,CACJ,GAAG,EACH,KAAK,EACN,GAAG,KAAK,CAAC;wBACV,MAAM,gBAAgB,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;wBAC3C,OAAO,CAAC,GAAG,CAAC,GAAG,gBAAgB,IAAI,gBAAgB,CAAC,CAAC,CAAC,IAAI,gBAAgB,CAAC,CAAC,CAAC,CAAC;oBAChF,CAAC,CAAC,CAAC;oBACH,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;oBAC9C,uFAAuF;oBACvF,oEAAoE;oBACpE,MAAM,IAAI,GAAkB,OAAO,CAAC,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;oBACjG,IAAI,CAAC,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;wBACpB,SAAS;oBACX,CAAC;oBACD,IAAI,QAAQ,EAAE,CAAC;wBACb,IAAI,CAAC,QAAQ,EAAE,CAAC;4BACd,SAAS;wBACX,CAAC;wBACD,MAAM,IAAI,GAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;wBACrC,IAAI,CAAC,MAAM,GAAG,IAAI,iBAAQ,EAAE,CAAC;wBAC7B,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC;wBAC/C,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;wBACvB,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;oBAC5B,CAAC;yBAAM,CAAC;wBACN,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;oBACxE,CAAC;gBACH,CAAC;gBACD,KAAK,MAAM,GAAG,IAAI,QAAQ,CAAC,MAAM,EAAE,CAAC;oBAClC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;gBAC1C,CAAC;gBACD,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAS,EAAE,EAAE;oBACnC,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC;oBACxC,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,oBAAW,EAAE,EAAE,CAAC,CAAC;oBAC1C,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG;wBAClB,MAAM,EAAE,MAAM;wBACd,IAAI,EAAE,MAAM,CAAC,cAAc,CAAC,MAAM;wBAClC,QAAQ,EAAE,QAAQ,CAAC,OAAO,CAAC,oBAAW,EAAE,EAAE,CAAC;qBAC5C,CAAC;gBACJ,CAAC,CAAC,CAAC;gBACH,OAAO,EAAE,CAAC;YACZ,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;SAAM,CAAC;QACN,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YAC1C,GAAG,CAAC,EAAE,CAAC,MAAM,EAAE,aAAa,CAAC,GAAG,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC;YAC5D,GAAG,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE;gBACjB,IAAI,GAAG,YAAY,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;gBACtC,MAAM,CAAC,OAAO,GAAG,IAAI,CAAC;gBACtB,IAAI,WAAW,EAAE,UAAU,CAAC,oBAAW,CAAC,IAAI,CAAC,EAAE,CAAC;oBAC9C,IAAI,CAAC;wBACH,gGAAgG;wBAChG,MAAM,CAAC,IAAI,GAAG,uCAA8B,CAAC,IAAI,CAAC,IAAI,CAAC;4BACrD,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,UAAU,GAAG,EAAE,KAAK;gCACnC,IAAI,CAAC,uCAA8B,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;oCAC9C,OAAO,KAAK,CAAC;gCACf,CAAC;4BACH,CAAC,CAAC;4BACJ,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;wBACrB,OAAO,EAAE,CAAC;oBACZ,CAAC;oBAAC,OAAO,CAAC,EAAE,CAAC;wBACX,MAAM,CAAC,EAAE,UAAU,EAAE,GAAG,EAAE,OAAO,EAAE,mBAAmB,EAAE,CAAC,CAAC;oBAC5D,CAAC;gBACH,CAAC;qBAAM,IAAI,WAAW,EAAE,UAAU,CAAC,oBAAW,CAAC,qBAAqB,CAAC,EAAE,CAAC;oBACtE,gFAAgF;oBAChF,KAAK,MAAM,CACT,GAAG,EACH,KAAK,EACN,IAAI,IAAI,eAAe,CAAC,IAAI,CAAC,EAAE,CAAC;wBAC/B,IAAI,GAAG,IAAI,CAAC,uCAA8B,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;4BACrD,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;wBAC3B,CAAC;oBACH,CAAC;oBACD,OAAO,EAAE,CAAC;gBACZ,CAAC;qBAAM,IAAI,gBAAgB,CAAC,WAAW,CAAC,EAAE,CAAC;oBACzC,IAAI,CAAC;wBACH,MAAM,CAAC,IAAI,GAAG,IAAA,sBAAS,EAAC,IAAI,CAAC,CAAC;wBAC9B,OAAO,EAAE,CAAC;oBACZ,CAAC;oBAAC,OAAO,CAAC,EAAE,CAAC;wBACX,MAAM,CAAC,EAAE,UAAU,EAAE,GAAG,EAAE,OAAO,EAAE,qBAAqB,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;oBACzE,CAAC;gBACH,CAAC;qBAAM,CAAC;oBACN,MAAM,CAAC,IAAI,GAAG,IAAI,CAAC;oBACnB,OAAO,EAAE,CAAC;gBACZ,CAAC;YACH,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC"}
|
|
@@ -2,7 +2,11 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.clearRoutePath = clearRoutePath;
|
|
4
4
|
const _const_1 = require("../../constants/index.js");
|
|
5
|
+
const SLASH = 47;
|
|
5
6
|
function clearRoutePath(route) {
|
|
7
|
+
if (route.charCodeAt(0) === SLASH && route.charCodeAt(route.length - 1) !== SLASH && route.indexOf('//') === -1) {
|
|
8
|
+
return route;
|
|
9
|
+
}
|
|
6
10
|
if (!_const_1.startRouteRegexp.test(route)) {
|
|
7
11
|
route = `/${route}`;
|
|
8
12
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"clear-route-path.js","sourceRoot":"","sources":["../../../src/helpers/service/clear-route-path.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"clear-route-path.js","sourceRoot":"","sources":["../../../src/helpers/service/clear-route-path.ts"],"names":[],"mappings":";;AAIA,wCAYC;AAhBD,mCAA6E;AAE7E,MAAM,KAAK,GAAW,EAAE,CAAC;AAEzB,SAAgB,cAAc,CAAC,KAAa;IAC1C,IAAI,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,KAAK,KAAK,IAAI,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,KAAK,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;QAChH,OAAO,KAAK,CAAC;IACf,CAAC;IACD,IAAI,CAAC,yBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;QAClC,KAAK,GAAG,IAAI,KAAK,EAAE,CAAC;IACtB,CAAC;IACD,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,yBAAgB,EAAE,GAAG,CAAC,CAAC;IAC7C,IAAI,wBAAe,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;QAChC,KAAK,GAAG,KAAK,CAAC,OAAO,CAAC,wBAAe,EAAE,EAAE,CAAC,CAAC;IAC7C,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC"}
|
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
import { Context, ContextRequest } from '../../../dto/index.js';
|
|
2
|
-
|
|
2
|
+
type RequestPartError = {
|
|
3
3
|
statusCode: number;
|
|
4
4
|
message: string;
|
|
5
|
-
} | undefined
|
|
5
|
+
} | undefined;
|
|
6
|
+
export declare function validateRequestPart(key: keyof ContextRequest, context: Context<any>, request: any): RequestPartError | Promise<RequestPartError>;
|
|
7
|
+
export {};
|
|
@@ -1,64 +1,153 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.validateRequestPart = validateRequestPart;
|
|
4
|
-
const nonProcessingRequestParts = [
|
|
4
|
+
const nonProcessingRequestParts = new Set([
|
|
5
5
|
'files',
|
|
6
6
|
'auth',
|
|
7
|
-
];
|
|
8
|
-
|
|
9
|
-
|
|
7
|
+
]);
|
|
8
|
+
// parts that keep undeclared fields even when allowUnknownFields is off
|
|
9
|
+
const openRequestParts = new Set([
|
|
10
|
+
'headers',
|
|
11
|
+
'rawBody',
|
|
12
|
+
]);
|
|
13
|
+
const hasOwn = (target, property) => target !== null && target !== undefined && Object.prototype.hasOwnProperty.call(target, property);
|
|
14
|
+
function isThenable(value) {
|
|
15
|
+
return value !== null && typeof value === 'object' && typeof value.then === 'function';
|
|
16
|
+
}
|
|
17
|
+
function validateRequestPart(key, context, request) {
|
|
18
|
+
if (nonProcessingRequestParts.has(key)) {
|
|
19
|
+
return;
|
|
20
|
+
}
|
|
21
|
+
const definitions = context?.request[key];
|
|
22
|
+
let hasDefinitions = false;
|
|
23
|
+
for (const _ in definitions) {
|
|
24
|
+
hasDefinitions = true;
|
|
25
|
+
break;
|
|
26
|
+
}
|
|
27
|
+
if (!hasDefinitions) {
|
|
28
|
+
if (!context.options?.allowUnknownFields && !openRequestParts.has(key)) {
|
|
29
|
+
request[key] = {};
|
|
30
|
+
}
|
|
31
|
+
return;
|
|
32
|
+
}
|
|
33
|
+
return validateDeclaredProperties(key, context, request);
|
|
34
|
+
}
|
|
35
|
+
/**
|
|
36
|
+
* Validates one declared property. Runs synchronously and only returns a Promise
|
|
37
|
+
* when the validation handler or the transform does, so plain validators cost no microtasks.
|
|
38
|
+
*/
|
|
39
|
+
function validateProperty(key, property, definition, request) {
|
|
40
|
+
const { validation, transform, isJSON } = definition;
|
|
41
|
+
const { required, handler, error } = validation;
|
|
42
|
+
const part = request[key];
|
|
43
|
+
const present = hasOwn(part, property);
|
|
44
|
+
if (required && !present) {
|
|
45
|
+
return error;
|
|
46
|
+
}
|
|
47
|
+
if (!handler || !present) {
|
|
10
48
|
return;
|
|
11
49
|
}
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
50
|
+
let value = part[property];
|
|
51
|
+
if (isJSON && typeof value === 'string') {
|
|
52
|
+
try {
|
|
53
|
+
value = JSON.parse(value);
|
|
54
|
+
}
|
|
55
|
+
catch {
|
|
56
|
+
// keep the raw string
|
|
57
|
+
}
|
|
19
58
|
}
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
if (
|
|
59
|
+
// the configured error, never the exception text (it may describe internals)
|
|
60
|
+
const fail = () => error;
|
|
61
|
+
const applyTransform = () => {
|
|
62
|
+
if (!transform) {
|
|
63
|
+
return;
|
|
64
|
+
}
|
|
65
|
+
const transformed = transform.apply(request, [value]);
|
|
66
|
+
if (isThenable(transformed)) {
|
|
67
|
+
return Promise.resolve(transformed).then((v) => {
|
|
68
|
+
request[key][property] = v;
|
|
69
|
+
return undefined;
|
|
70
|
+
}, fail);
|
|
71
|
+
}
|
|
72
|
+
request[key][property] = transformed;
|
|
73
|
+
};
|
|
74
|
+
try {
|
|
75
|
+
const isValid = handler.apply(request, [value]);
|
|
76
|
+
if (isThenable(isValid)) {
|
|
77
|
+
// a rejection or a throwing transform both end up as the configured error
|
|
78
|
+
return Promise.resolve(isValid)
|
|
79
|
+
.then((ok) => (ok ? applyTransform() : error))
|
|
80
|
+
.then(undefined, fail);
|
|
81
|
+
}
|
|
82
|
+
if (!isValid) {
|
|
24
83
|
return error;
|
|
25
84
|
}
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
85
|
+
return applyTransform();
|
|
86
|
+
}
|
|
87
|
+
catch {
|
|
88
|
+
return error;
|
|
89
|
+
}
|
|
90
|
+
}
|
|
91
|
+
function stripUnknownFields(key, context, request) {
|
|
92
|
+
if (context.options?.allowUnknownFields || openRequestParts.has(key)) {
|
|
93
|
+
return;
|
|
94
|
+
}
|
|
95
|
+
const definitions = context.request[key];
|
|
96
|
+
const part = request[key];
|
|
97
|
+
if (part !== null && typeof part === 'object' && !Array.isArray(part) && definitions) {
|
|
98
|
+
// copy instead of `delete`: deleting keys turns the object into a slow dictionary-mode
|
|
99
|
+
// object, which the handler and JSON.stringify then pay for
|
|
100
|
+
let unknown = false;
|
|
101
|
+
for (const prop in part) {
|
|
102
|
+
if (!Object.prototype.hasOwnProperty.call(definitions, prop)) {
|
|
103
|
+
unknown = true;
|
|
104
|
+
break;
|
|
45
105
|
}
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
106
|
+
}
|
|
107
|
+
if (unknown) {
|
|
108
|
+
const known = {};
|
|
109
|
+
for (const prop in part) {
|
|
110
|
+
if (Object.prototype.hasOwnProperty.call(definitions, prop)) {
|
|
111
|
+
known[prop] = part[prop];
|
|
112
|
+
}
|
|
49
113
|
}
|
|
114
|
+
request[key] = known;
|
|
50
115
|
}
|
|
116
|
+
return;
|
|
51
117
|
}
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
118
|
+
for (const prop in request[key]) {
|
|
119
|
+
if (!definitions || !Object.prototype.hasOwnProperty.call(definitions, prop)) {
|
|
120
|
+
delete request[key][prop];
|
|
121
|
+
}
|
|
122
|
+
}
|
|
123
|
+
}
|
|
124
|
+
async function finishAsync(key, context, request, properties, index, pending) {
|
|
125
|
+
let error = await pending;
|
|
126
|
+
if (error) {
|
|
127
|
+
return error;
|
|
128
|
+
}
|
|
129
|
+
for (let i = index + 1; i < properties.length; i++) {
|
|
130
|
+
const property = properties[i];
|
|
131
|
+
error = await validateProperty(key, property, context.request[key][property], request);
|
|
132
|
+
if (error) {
|
|
133
|
+
return error;
|
|
134
|
+
}
|
|
135
|
+
}
|
|
136
|
+
stripUnknownFields(key, context, request);
|
|
137
|
+
}
|
|
138
|
+
function validateDeclaredProperties(key, context, request) {
|
|
139
|
+
const definitions = context.request[key];
|
|
140
|
+
const properties = Object.keys(definitions);
|
|
141
|
+
for (let i = 0; i < properties.length; i++) {
|
|
142
|
+
const property = properties[i];
|
|
143
|
+
const result = validateProperty(key, property, definitions[property], request);
|
|
144
|
+
if (isThenable(result)) {
|
|
145
|
+
return finishAsync(key, context, request, properties, i, result);
|
|
146
|
+
}
|
|
147
|
+
if (result) {
|
|
148
|
+
return result;
|
|
61
149
|
}
|
|
62
150
|
}
|
|
151
|
+
stripUnknownFields(key, context, request);
|
|
63
152
|
}
|
|
64
153
|
//# sourceMappingURL=validate-request-part.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validate-request-part.js","sourceRoot":"","sources":["../../../../src/helpers/validate/context/validate-request-part.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"validate-request-part.js","sourceRoot":"","sources":["../../../../src/helpers/validate/context/validate-request-part.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,9 +16,12 @@ export declare function resolveSwaggerUiFile(url: string, docsRoute: string): st
|
|
|
16
16
|
export declare function toClientError(e: any): AladoServerError;
|
|
17
17
|
export declare class RequestProcessor {
|
|
18
18
|
private readonly options;
|
|
19
|
+
private corsStatic?;
|
|
20
|
+
private corsMethods;
|
|
19
21
|
constructor(requestProcessorOptions: RequestProcessorOptions);
|
|
20
22
|
protected respond(res: ServerResponse, response: Response<any>, backgroundHeaders?: Record<string, string>): void;
|
|
21
23
|
protected respondError(res: ServerResponse, error: AladoServerError, headers?: Record<string, string>): void;
|
|
22
24
|
process(req: IncomingMessage, res: ServerResponse): Promise<void>;
|
|
25
|
+
protected corsHeaders(allowedMethods: string[] | undefined, origin: string): Record<string, string>;
|
|
23
26
|
protected logError(e: Error): void;
|
|
24
27
|
}
|
|
@@ -43,8 +43,24 @@ function toClientError(e) {
|
|
|
43
43
|
}
|
|
44
44
|
return { statusCode: 500, message: 'Internal Server Error' };
|
|
45
45
|
}
|
|
46
|
+
function hasKeys(value) {
|
|
47
|
+
for (const _ in value) {
|
|
48
|
+
return true;
|
|
49
|
+
}
|
|
50
|
+
return false;
|
|
51
|
+
}
|
|
52
|
+
// methods whose request body is read and parsed
|
|
53
|
+
const bodyMethods = new Set([
|
|
54
|
+
_const_1.HttpMethod.PUT,
|
|
55
|
+
_const_1.HttpMethod.PATCH,
|
|
56
|
+
_const_1.HttpMethod.POST,
|
|
57
|
+
_const_1.HttpMethod.QUERY,
|
|
58
|
+
]);
|
|
46
59
|
class RequestProcessor {
|
|
47
60
|
options;
|
|
61
|
+
// CORS header values that do not depend on the request, built on first use
|
|
62
|
+
corsStatic;
|
|
63
|
+
corsMethods = new WeakMap();
|
|
48
64
|
constructor(requestProcessorOptions) {
|
|
49
65
|
this.options = requestProcessorOptions;
|
|
50
66
|
if (requestProcessorOptions.openApiDoc?.enable) {
|
|
@@ -55,22 +71,46 @@ class RequestProcessor {
|
|
|
55
71
|
.map((entry) => entry.name));
|
|
56
72
|
}
|
|
57
73
|
}
|
|
58
|
-
respond(res, response, backgroundHeaders
|
|
74
|
+
respond(res, response, backgroundHeaders) {
|
|
59
75
|
let responseBody;
|
|
60
76
|
const { statusCode, body } = response;
|
|
61
|
-
const
|
|
62
|
-
const
|
|
63
|
-
|
|
64
|
-
|
|
77
|
+
const responseHeaders = response.headers || {};
|
|
78
|
+
const headers = {};
|
|
79
|
+
let contentType;
|
|
80
|
+
let hasContentLength = false;
|
|
81
|
+
for (const source of [
|
|
82
|
+
this.options.headers,
|
|
83
|
+
backgroundHeaders,
|
|
84
|
+
responseHeaders,
|
|
85
|
+
]) {
|
|
86
|
+
for (const name in source) {
|
|
87
|
+
headers[name] = source[name];
|
|
88
|
+
}
|
|
89
|
+
}
|
|
90
|
+
for (const name in responseHeaders) {
|
|
91
|
+
// only names of a matching length are lower-cased
|
|
92
|
+
const lower = name.length === 12 || name.length === 14 || name.length === 17 ? name.toLowerCase() : '';
|
|
93
|
+
if (lower === 'content-type' && contentType === undefined) {
|
|
94
|
+
contentType = responseHeaders[name];
|
|
95
|
+
}
|
|
96
|
+
else if (lower === 'content-length' || lower === 'transfer-encoding') {
|
|
97
|
+
hasContentLength = true;
|
|
98
|
+
}
|
|
99
|
+
}
|
|
100
|
+
// cheapest checks first: most bodies are plain objects, strings or buffers
|
|
65
101
|
const isRawBody = body === undefined ||
|
|
66
102
|
body === null ||
|
|
67
103
|
typeof body === 'string' ||
|
|
68
104
|
Buffer.isBuffer(body) ||
|
|
69
105
|
body instanceof Uint8Array;
|
|
70
|
-
|
|
71
|
-
|
|
106
|
+
const isStreamBody = !isRawBody && typeof body.pipe === 'function' && (0, _helper_1.isReadableStream)(body);
|
|
107
|
+
if (isStreamBody) {
|
|
108
|
+
responseBody = body;
|
|
72
109
|
}
|
|
73
|
-
else if (
|
|
110
|
+
else if (contentType !== undefined && contentType.startsWith(_const_1.ContentType.JSON)) {
|
|
111
|
+
responseBody = JSON.stringify(body);
|
|
112
|
+
}
|
|
113
|
+
else if (!isRawBody) {
|
|
74
114
|
// res.end() only accepts strings and buffers: serialise anything else as JSON
|
|
75
115
|
if (!contentType) {
|
|
76
116
|
headers['Content-Type'] = _const_1.ContentType.JSON;
|
|
@@ -80,7 +120,17 @@ class RequestProcessor {
|
|
|
80
120
|
else {
|
|
81
121
|
responseBody = body;
|
|
82
122
|
}
|
|
83
|
-
|
|
123
|
+
// A known length avoids Transfer-Encoding: chunked (extra framing on every response).
|
|
124
|
+
// 1xx/204/304 must not carry one; streams keep chunked encoding.
|
|
125
|
+
if (!isStreamBody && !hasContentLength && statusCode >= 200 && statusCode !== 204 && statusCode !== 304) {
|
|
126
|
+
headers['Content-Length'] =
|
|
127
|
+
responseBody === undefined || responseBody === null
|
|
128
|
+
? '0'
|
|
129
|
+
: typeof responseBody === 'string'
|
|
130
|
+
? String(Buffer.byteLength(responseBody))
|
|
131
|
+
: String(responseBody.byteLength);
|
|
132
|
+
}
|
|
133
|
+
res.writeHead(statusCode, headers);
|
|
84
134
|
if (isStreamBody) {
|
|
85
135
|
responseBody.pipe(res);
|
|
86
136
|
}
|
|
@@ -150,25 +200,13 @@ class RequestProcessor {
|
|
|
150
200
|
}
|
|
151
201
|
}
|
|
152
202
|
// Process API routes
|
|
153
|
-
const
|
|
154
|
-
const
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
'Access-Control-Expose-Headers': this.options.router.options.cors?.exposeHeaders?.join(', ') || '',
|
|
161
|
-
'Access-Control-Allow-Credentials': this.options.router.options.cors?.allowedCredentials ? 'true' : 'false',
|
|
162
|
-
};
|
|
163
|
-
if (Array.isArray(this.options.router.options.cors.allowedOrigin)) {
|
|
164
|
-
if (this.options.router.options.cors.allowedOrigin.includes(origin)) {
|
|
165
|
-
backgroundHeaders['Access-Control-Allow-Origin'] = origin;
|
|
166
|
-
}
|
|
167
|
-
}
|
|
168
|
-
else {
|
|
169
|
-
backgroundHeaders['Access-Control-Allow-Origin'] =
|
|
170
|
-
this.options.router.options.cors.allowedOrigin || origin;
|
|
171
|
-
}
|
|
203
|
+
const queryIndex = url.indexOf('?');
|
|
204
|
+
const uri = queryIndex === -1 ? url : url.slice(0, queryIndex);
|
|
205
|
+
const queryString = queryIndex === -1 ? '' : url.slice(queryIndex + 1);
|
|
206
|
+
const route = router.match(method, (0, _helper_1.clearRoutePath)(uri));
|
|
207
|
+
let backgroundHeaders;
|
|
208
|
+
if (enableCors) {
|
|
209
|
+
backgroundHeaders = this.corsHeaders(route?.allowedMethods, origin);
|
|
172
210
|
}
|
|
173
211
|
if (!route) {
|
|
174
212
|
// Not Found
|
|
@@ -186,25 +224,16 @@ class RequestProcessor {
|
|
|
186
224
|
let rawBody = '';
|
|
187
225
|
let query = {};
|
|
188
226
|
let files = {};
|
|
189
|
-
if (
|
|
190
|
-
_const_1.HttpMethod.PUT,
|
|
191
|
-
_const_1.HttpMethod.PATCH,
|
|
192
|
-
_const_1.HttpMethod.POST,
|
|
193
|
-
_const_1.HttpMethod.QUERY,
|
|
194
|
-
].includes(method)) {
|
|
227
|
+
if (bodyMethods.has(method)) {
|
|
195
228
|
const r = await (0, _helper_1.bodyParser)(req, res, this.options.maxBodySizeBytes);
|
|
196
229
|
body = r.body;
|
|
197
230
|
rawBody = r.rawBody;
|
|
198
231
|
files = r.files;
|
|
199
232
|
}
|
|
200
|
-
|
|
233
|
+
// without declared query fields the query is dropped by validation anyway
|
|
234
|
+
if (queryString && (context.options?.allowUnknownFields || hasKeys(context.request.query))) {
|
|
201
235
|
query = (0, _helper_1.queryParser)(queryString);
|
|
202
236
|
}
|
|
203
|
-
context.request.headers = context.request.headers || {};
|
|
204
|
-
context.request.query = context.request.query || {};
|
|
205
|
-
context.request.body = context.request.body || {};
|
|
206
|
-
context.request.path = context.request.path || {};
|
|
207
|
-
context.request.files = context.request.files || {};
|
|
208
237
|
const request = {
|
|
209
238
|
request: req,
|
|
210
239
|
ip,
|
|
@@ -241,14 +270,16 @@ class RequestProcessor {
|
|
|
241
270
|
}
|
|
242
271
|
// Validate request
|
|
243
272
|
for (const key in context.request) {
|
|
244
|
-
const
|
|
273
|
+
const result = (0, _helper_1.validateRequestPart)(key, context, request);
|
|
274
|
+
// only await when validators actually ran; a plain value needs no microtask
|
|
275
|
+
const error = result instanceof Promise ? await result : result;
|
|
245
276
|
if (error) {
|
|
246
277
|
return this.respondError(res, error, backgroundHeaders);
|
|
247
278
|
}
|
|
248
279
|
}
|
|
249
280
|
// Validate request (files)
|
|
250
281
|
if (context.request.files) {
|
|
251
|
-
const error =
|
|
282
|
+
const error = (0, _helper_1.validateRequestFiles)(context, request);
|
|
252
283
|
if (error) {
|
|
253
284
|
return this.respondError(res, error, backgroundHeaders);
|
|
254
285
|
}
|
|
@@ -268,6 +299,39 @@ class RequestProcessor {
|
|
|
268
299
|
return this.respondError(res, toClientError(e), {});
|
|
269
300
|
}
|
|
270
301
|
}
|
|
302
|
+
corsHeaders(allowedMethods, origin) {
|
|
303
|
+
const cors = this.options.router.options.cors;
|
|
304
|
+
if (!this.corsStatic) {
|
|
305
|
+
this.corsStatic = {
|
|
306
|
+
'Access-Control-Allow-Headers': cors?.allowedHeaders?.join(', ') || '',
|
|
307
|
+
'Access-Control-Expose-Headers': cors?.exposeHeaders?.join(', ') || '',
|
|
308
|
+
'Access-Control-Allow-Credentials': cors?.allowedCredentials ? 'true' : 'false',
|
|
309
|
+
};
|
|
310
|
+
}
|
|
311
|
+
let methods = '';
|
|
312
|
+
if (allowedMethods) {
|
|
313
|
+
// the array grows while routes are registered, so the cache is keyed on its length too
|
|
314
|
+
let cached = this.corsMethods.get(allowedMethods);
|
|
315
|
+
if (!cached || cached.count !== allowedMethods.length) {
|
|
316
|
+
cached = { count: allowedMethods.length, value: allowedMethods.join(', ') };
|
|
317
|
+
this.corsMethods.set(allowedMethods, cached);
|
|
318
|
+
}
|
|
319
|
+
methods = cached.value;
|
|
320
|
+
}
|
|
321
|
+
const headers = {
|
|
322
|
+
'Access-Control-Allow-Methods': methods,
|
|
323
|
+
...this.corsStatic,
|
|
324
|
+
};
|
|
325
|
+
if (Array.isArray(cors.allowedOrigin)) {
|
|
326
|
+
if (cors.allowedOrigin.includes(origin)) {
|
|
327
|
+
headers['Access-Control-Allow-Origin'] = origin;
|
|
328
|
+
}
|
|
329
|
+
}
|
|
330
|
+
else {
|
|
331
|
+
headers['Access-Control-Allow-Origin'] = cors.allowedOrigin || origin;
|
|
332
|
+
}
|
|
333
|
+
return headers;
|
|
334
|
+
}
|
|
271
335
|
logError(e) {
|
|
272
336
|
if (this.options.verbose) {
|
|
273
337
|
this.options.logger?.error(e);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request-processor.js","sourceRoot":"","sources":["../../src/request-processor/request-processor.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"request-processor.js","sourceRoot":"","sources":["../../src/request-processor/request-processor.ts"],"names":[],"mappings":"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"}
|
package/dist/router/router.d.ts
CHANGED
|
@@ -7,6 +7,9 @@ export declare function toRoutePattern(path: string): {
|
|
|
7
7
|
};
|
|
8
8
|
export declare class Router {
|
|
9
9
|
private routes;
|
|
10
|
+
private staticRoutes;
|
|
11
|
+
private dynamicRoutes;
|
|
12
|
+
private meta;
|
|
10
13
|
readonly options: RouterOptions;
|
|
11
14
|
readonly openApiDocObject: any;
|
|
12
15
|
readonly logger: AladoServerLogger;
|
|
@@ -18,7 +21,15 @@ export declare class Router {
|
|
|
18
21
|
* registration order (Array.prototype.sort is stable).
|
|
19
22
|
*/
|
|
20
23
|
protected sortRoutes(): void;
|
|
24
|
+
protected buildIndex(): void;
|
|
21
25
|
protected getOptionsDataKey(method: string, routeRegEx: RegExp): string;
|
|
22
26
|
getOptionsData(key: string): any;
|
|
23
27
|
parse(method: HttpMethod, uri: string): Route<any> | undefined;
|
|
28
|
+
/**
|
|
29
|
+
* Same as parse(), for a path that already went through clearRoutePath().
|
|
30
|
+
* Param-less routes are a hash lookup; only routes with params are tried as RegExps,
|
|
31
|
+
* and only those registered for the request method.
|
|
32
|
+
*/
|
|
33
|
+
match(method: HttpMethod, uri: string): Route<any> | undefined;
|
|
34
|
+
protected toResult(data: Route<any>, path: Record<string, string>): Route<any>;
|
|
24
35
|
}
|
package/dist/router/router.js
CHANGED
|
@@ -24,6 +24,11 @@ function toRoutePattern(path) {
|
|
|
24
24
|
}
|
|
25
25
|
class Router {
|
|
26
26
|
routes = new Map();
|
|
27
|
+
// per-method lookup tables, rebuilt on every use(): exact (lower-cased) path -> route for
|
|
28
|
+
// routes without params, and an ordered list of pre-compiled matchers for the rest
|
|
29
|
+
staticRoutes = new Map();
|
|
30
|
+
dynamicRoutes = new Map();
|
|
31
|
+
meta = new Map();
|
|
27
32
|
options;
|
|
28
33
|
openApiDocObject;
|
|
29
34
|
logger;
|
|
@@ -60,7 +65,9 @@ class Router {
|
|
|
60
65
|
const pathData = {};
|
|
61
66
|
let openApiRoute = uri;
|
|
62
67
|
const openApiMethod = method.toLowerCase();
|
|
63
|
-
const
|
|
68
|
+
const cleanUri = (0, _helper_1.clearRoutePath)(uri);
|
|
69
|
+
const { pattern, params } = toRoutePattern(cleanUri);
|
|
70
|
+
const literal = params.length ? undefined : cleanUri.toLowerCase();
|
|
64
71
|
const route = `${method}${pattern}`;
|
|
65
72
|
const optionsRoute = `${_const_1.HttpMethod.OPTIONS}${pattern}`;
|
|
66
73
|
params.forEach((variable, i) => {
|
|
@@ -70,6 +77,13 @@ class Router {
|
|
|
70
77
|
if (this.options.openApiDoc?.enable && !context?.options?.isHidden) {
|
|
71
78
|
(0, _factory_1.openApiDocFactory)(openApiMethod, openApiRoute, context, this.openApiDocObject);
|
|
72
79
|
}
|
|
80
|
+
// after the OpenAPI doc is built; done once here rather than on every request
|
|
81
|
+
context.request = context.request || {};
|
|
82
|
+
context.request.headers = context.request.headers || {};
|
|
83
|
+
context.request.query = context.request.query || {};
|
|
84
|
+
context.request.body = context.request.body || {};
|
|
85
|
+
context.request.path = context.request.path || {};
|
|
86
|
+
context.request.files = context.request.files || {};
|
|
73
87
|
const routeRegEx = new RegExp(`^${route.replace(/\//g, '/')}\/?$`, 'i');
|
|
74
88
|
const optionsDataKey = this.getOptionsDataKey(method, routeRegEx);
|
|
75
89
|
if (this.options.cors?.enable) {
|
|
@@ -82,10 +96,12 @@ class Router {
|
|
|
82
96
|
method,
|
|
83
97
|
]);
|
|
84
98
|
const optionsRouteRegEx = new RegExp(`^${optionsRoute.replace(/\//g, '/')}\/?$`, 'i');
|
|
99
|
+
this.meta.set(optionsRouteRegEx, { method: _const_1.HttpMethod.OPTIONS, pattern, literal });
|
|
85
100
|
this.routes.set(optionsRouteRegEx, {
|
|
86
101
|
route: optionsRouteRegEx,
|
|
87
102
|
path: pathData,
|
|
88
103
|
context,
|
|
104
|
+
optionsDataKey: this.getOptionsDataKey(_const_1.HttpMethod.OPTIONS, optionsRouteRegEx),
|
|
89
105
|
handler: (request) => {
|
|
90
106
|
const headers = {
|
|
91
107
|
'Access-Control-Allow-Methods': this.getOptionsData(optionsDataKey).join(', '),
|
|
@@ -111,7 +127,8 @@ class Router {
|
|
|
111
127
|
});
|
|
112
128
|
}
|
|
113
129
|
}
|
|
114
|
-
this.
|
|
130
|
+
this.meta.set(routeRegEx, { method, pattern, literal });
|
|
131
|
+
this.routes.set(routeRegEx, { route: routeRegEx, path: pathData, context, handler, optionsDataKey });
|
|
115
132
|
this.sortRoutes();
|
|
116
133
|
}
|
|
117
134
|
/**
|
|
@@ -122,6 +139,30 @@ class Router {
|
|
|
122
139
|
sortRoutes() {
|
|
123
140
|
const paramCount = (route) => Object.keys(route.path || {}).length;
|
|
124
141
|
this.routes = new Map([...this.routes.entries()].sort(([, a,], [, b,]) => paramCount(a) - paramCount(b)));
|
|
142
|
+
this.buildIndex();
|
|
143
|
+
}
|
|
144
|
+
buildIndex() {
|
|
145
|
+
this.staticRoutes = new Map();
|
|
146
|
+
this.dynamicRoutes = new Map();
|
|
147
|
+
for (const [route, data,] of this.routes) {
|
|
148
|
+
const meta = this.meta.get(route);
|
|
149
|
+
if (meta.literal !== undefined) {
|
|
150
|
+
const table = this.staticRoutes.get(meta.method) || new Map();
|
|
151
|
+
// first registration wins, as with the ordered scan
|
|
152
|
+
if (!table.has(meta.literal)) {
|
|
153
|
+
table.set(meta.literal, data);
|
|
154
|
+
}
|
|
155
|
+
this.staticRoutes.set(meta.method, table);
|
|
156
|
+
continue;
|
|
157
|
+
}
|
|
158
|
+
const list = this.dynamicRoutes.get(meta.method) || [];
|
|
159
|
+
list.push({
|
|
160
|
+
matcher: new RegExp(`^${meta.pattern}\\/?$`, 'i'),
|
|
161
|
+
data,
|
|
162
|
+
params: Object.entries(data.path || {}),
|
|
163
|
+
});
|
|
164
|
+
this.dynamicRoutes.set(meta.method, list);
|
|
165
|
+
}
|
|
125
166
|
}
|
|
126
167
|
getOptionsDataKey(method, routeRegEx) {
|
|
127
168
|
return routeRegEx.toString().replace(`^${method}\\/`, '');
|
|
@@ -130,24 +171,46 @@ class Router {
|
|
|
130
171
|
return this.options.cors?.allowedMethods?.get(key) || [];
|
|
131
172
|
}
|
|
132
173
|
parse(method, uri) {
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
174
|
+
return this.match(method, (0, _helper_1.clearRoutePath)(uri));
|
|
175
|
+
}
|
|
176
|
+
/**
|
|
177
|
+
* Same as parse(), for a path that already went through clearRoutePath().
|
|
178
|
+
* Param-less routes are a hash lookup; only routes with params are tried as RegExps,
|
|
179
|
+
* and only those registered for the request method.
|
|
180
|
+
*/
|
|
181
|
+
match(method, uri) {
|
|
182
|
+
const table = this.staticRoutes.get(method);
|
|
183
|
+
if (table !== undefined) {
|
|
184
|
+
const data = table.get(uri.toLowerCase());
|
|
185
|
+
if (data !== undefined) {
|
|
186
|
+
return this.toResult(data, {});
|
|
187
|
+
}
|
|
188
|
+
}
|
|
189
|
+
const list = this.dynamicRoutes.get(method);
|
|
190
|
+
if (list !== undefined) {
|
|
191
|
+
for (let i = 0; i < list.length; i++) {
|
|
192
|
+
const matches = list[i].matcher.exec(uri);
|
|
193
|
+
if (matches !== null) {
|
|
194
|
+
const path = {};
|
|
195
|
+
const params = list[i].params;
|
|
196
|
+
for (let j = 0; j < params.length; j++) {
|
|
197
|
+
path[params[j][0]] = matches[params[j][1]];
|
|
198
|
+
}
|
|
199
|
+
return this.toResult(list[i].data, path);
|
|
144
200
|
}
|
|
145
|
-
const optionsDataKey = this.getOptionsDataKey(method, keys[i]);
|
|
146
|
-
const allowedMethods = this.options.cors.allowedMethods.get(optionsDataKey);
|
|
147
|
-
return { ...data, path, allowedMethods };
|
|
148
201
|
}
|
|
149
202
|
}
|
|
150
203
|
}
|
|
204
|
+
toResult(data, path) {
|
|
205
|
+
return {
|
|
206
|
+
route: data.route,
|
|
207
|
+
path,
|
|
208
|
+
context: data.context,
|
|
209
|
+
handler: data.handler,
|
|
210
|
+
optionsDataKey: data.optionsDataKey,
|
|
211
|
+
allowedMethods: this.options.cors?.allowedMethods?.get(data.optionsDataKey),
|
|
212
|
+
};
|
|
213
|
+
}
|
|
151
214
|
}
|
|
152
215
|
exports.Router = Router;
|
|
153
216
|
//# sourceMappingURL=router.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"router.js","sourceRoot":"","sources":["../../src/router/router.ts"],"names":[],"mappings":";;;AAYA,wCAYC;AAxBD,mCAAiD;AAGjD,uCAA6C;AAC7C,qCAA0D;AAE1D,MAAM,iBAAiB,GAAG,WAAW,CAAC;AAEtC,SAAS,YAAY,CAAC,KAAa;IACjC,OAAO,KAAK,CAAC,OAAO,CAAC,qBAAqB,EAAE,MAAM,CAAC,CAAC;AACtD,CAAC;AAED,SAAgB,cAAc,CAAC,IAAY;IACzC,MAAM,MAAM,GAAa,EAAE,CAAC;IAC5B,IAAI,OAAO,GAAW,EAAE,CAAC;IACzB,IAAI,IAAI,GAAW,CAAC,CAAC;IACrB,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,QAAQ,CAAC,iBAAiB,CAAC,EAAE,CAAC;QACrD,OAAO,IAAI,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;QACvD,OAAO,IAAI,UAAU,CAAC;QACtB,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QACtB,IAAI,GAAI,KAAK,CAAC,KAAgB,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;IACnD,CAAC;IACD,OAAO,IAAI,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;IAC1C,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC;AAC7B,CAAC;
|
|
1
|
+
{"version":3,"file":"router.js","sourceRoot":"","sources":["../../src/router/router.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/d.patch
DELETED
|
@@ -1,81 +0,0 @@
|
|
|
1
|
-
diff --git a/src/helpers/parser/body-parser.ts b/src/helpers/parser/body-parser.ts
|
|
2
|
-
index e4c74fd..a3dc865 100644
|
|
3
|
-
--- a/src/helpers/parser/body-parser.ts
|
|
4
|
-
+++ b/src/helpers/parser/body-parser.ts
|
|
5
|
-
@@ -113,11 +113,14 @@ export async function bodyParser(req: IncomingMessage, res: OutgoingMessage, lim
|
|
6
|
-
result.rawBody = body;
|
|
7
|
-
if (contentType?.startsWith(ContentType.JSON)) {
|
|
8
|
-
try {
|
|
9
|
-
- result.body = JSON.parse(body, function (key, value) {
|
|
10
|
-
- if (!deprecatedJsonPropertiesRegExp.test(key)) {
|
|
11
|
-
- return value;
|
|
12
|
-
- }
|
|
13
|
-
- });
|
|
14
|
-
+ // A reviver takes V8 off its fast JSON path, so only use it when a forbidden key can be present
|
|
15
|
-
+ result.body = deprecatedJsonPropertiesRegExp.test(body)
|
|
16
|
-
+ ? JSON.parse(body, function (key, value) {
|
|
17
|
-
+ if (!deprecatedJsonPropertiesRegExp.test(key)) {
|
|
18
|
-
+ return value;
|
|
19
|
-
+ }
|
|
20
|
-
+ })
|
|
21
|
-
+ : JSON.parse(body);
|
|
22
|
-
resolve();
|
|
23
|
-
} catch (e) {
|
|
24
|
-
reject({ statusCode: 400, message: `Invalid JSON body` });
|
|
25
|
-
diff --git a/test/unit/parsers.test.ts b/test/unit/parsers.test.ts
|
|
26
|
-
index 79c4095..396539d 100644
|
|
27
|
-
--- a/test/unit/parsers.test.ts
|
|
28
|
-
+++ b/test/unit/parsers.test.ts
|
|
29
|
-
@@ -2,6 +2,8 @@ import { describe, it } from 'node:test';
|
|
30
|
-
import assert from 'node:assert/strict';
|
|
31
|
-
import { queryParser, clearRoutePath, getProperty, setProperty } from '../../src/helpers';
|
|
32
|
-
import { xmlParser } from '../../src/helpers/parser/xml-parser';
|
|
33
|
-
+import { bodyParser } from '../../src/helpers/parser/body-parser';
|
|
34
|
-
+import { Readable } from 'stream';
|
|
35
|
-
|
|
36
|
-
describe('clearRoutePath', () => {
|
|
37
|
-
it('adds a leading slash', () => {
|
|
38
|
-
@@ -295,3 +297,43 @@ describe('xmlParser', () => {
|
|
39
|
-
assert.equal(Object.keys(r).length, 0);
|
|
40
|
-
});
|
|
41
|
-
});
|
|
42
|
-
+
|
|
43
|
-
+describe('bodyParser (JSON)', () => {
|
|
44
|
-
+ const parseJson = async (text: string) => {
|
|
45
|
-
+ const req: any = Readable.from([Buffer.from(text)]);
|
|
46
|
-
+ req.headers = { 'content-type': 'application/json' };
|
|
47
|
-
+ return (await bodyParser(req, {} as any, 0)).body;
|
|
48
|
-
+ };
|
|
49
|
-
+
|
|
50
|
-
+ it('parses a plain JSON body', async () => {
|
|
51
|
-
+ assert.deepEqual(await parseJson('{"a":1,"b":[1,2],"c":{"d":"e"}}'), {
|
|
52
|
-
+ a: 1,
|
|
53
|
-
+ b: [
|
|
54
|
-
+ 1,
|
|
55
|
-
+ 2,
|
|
56
|
-
+ ],
|
|
57
|
-
+ c: { d: 'e' },
|
|
58
|
-
+ });
|
|
59
|
-
+ });
|
|
60
|
-
+
|
|
61
|
-
+ it('drops __proto__ / constructor / prototype / __defineGetter__ / __defineSetter__ keys at any depth', async () => {
|
|
62
|
-
+ const body = await parseJson(
|
|
63
|
-
+ '{"a":1,"__proto__":{"polluted":true},"constructor":{"prototype":{"x":1}},"prototype":1,' +
|
|
64
|
-
+ '"__defineGetter__":1,"__defineSetter__":2,"nested":{"b":2,"__proto__":{"y":1}}}',
|
|
65
|
-
+ );
|
|
66
|
-
+ assert.deepEqual(body, { a: 1, nested: { b: 2 } });
|
|
67
|
-
+ assert.equal(Object.getPrototypeOf(body), Object.prototype);
|
|
68
|
-
+ assert.equal(({} as any).polluted, undefined);
|
|
69
|
-
+ });
|
|
70
|
-
+
|
|
71
|
-
+ it('keeps string values that merely mention a forbidden key', async () => {
|
|
72
|
-
+ assert.deepEqual(await parseJson('{"note":"the constructor of __proto__ chains","list":["prototype"]}'), {
|
|
73
|
-
+ note: 'the constructor of __proto__ chains',
|
|
74
|
-
+ list: ['prototype'],
|
|
75
|
-
+ });
|
|
76
|
-
+ });
|
|
77
|
-
+
|
|
78
|
-
+ it('rejects malformed JSON with an HTTP-mappable 400', async () => {
|
|
79
|
-
+ await assert.rejects(parseJson('{"a":'), { statusCode: 400, message: 'Invalid JSON body' });
|
|
80
|
-
+ });
|
|
81
|
-
+});
|