@miqro/core 1.5.14 → 1.5.17
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/api-router.d.ts +6 -5
- package/dist/api-router.js +9 -3
- package/dist/api-router.js.map +1 -1
- package/dist/app-utils.d.ts +13 -0
- package/dist/app-utils.js +82 -0
- package/dist/app-utils.js.map +1 -0
- package/dist/app.js +6 -88
- package/dist/app.js.map +1 -1
- package/dist/common/api-router-utils.d.ts +1 -1
- package/dist/common/api-router-utils.js +7 -3
- package/dist/common/api-router-utils.js.map +1 -1
- package/dist/common/config/config.js +12 -0
- package/dist/common/config/config.js.map +1 -1
- package/dist/common/config/loader.js +2 -2
- package/dist/common/config/loader.js.map +1 -1
- package/dist/common/context.js +6 -3
- package/dist/common/context.js.map +1 -1
- package/dist/common/router-handler.d.ts +20 -0
- package/dist/common/router-handler.js +136 -0
- package/dist/common/router-handler.js.map +1 -0
- package/dist/common/router-utils.d.ts +7 -5
- package/dist/common/router-utils.js +37 -47
- package/dist/common/router-utils.js.map +1 -1
- package/dist/common/session/service.js +4 -1
- package/dist/common/session/service.js.map +1 -1
- package/dist/common/tokenize-match.d.ts +13 -20
- package/dist/common/tokenize-match.js +27 -59
- package/dist/common/tokenize-match.js.map +1 -1
- package/dist/middleware/group.js +2 -0
- package/dist/middleware/group.js.map +1 -1
- package/dist/middleware/index.d.ts +1 -0
- package/dist/middleware/index.js +1 -0
- package/dist/middleware/index.js.map +1 -1
- package/dist/middleware/result.d.ts +3 -0
- package/dist/middleware/result.js +51 -0
- package/dist/middleware/result.js.map +1 -0
- package/dist/router.d.ts +3 -30
- package/dist/router.js +5 -167
- package/dist/router.js.map +1 -1
- package/package.json +10 -8
- package/src/api-router.ts +16 -7
- package/src/api-router.unit.test.js +273 -0
- package/src/app-utils.ts +82 -0
- package/src/app-utils.unit.test.js +100 -0
- package/src/app.ts +4 -89
- package/src/app.unit.test.js +334 -0
- package/src/common/api-router-utils.ts +6 -3
- package/src/common/config/config.ts +12 -0
- package/src/common/config/loader.ts +2 -2
- package/src/common/context.ts +7 -3
- package/src/common/context.unit.test.js +286 -0
- package/src/common/router-handler.ts +159 -0
- package/src/common/router-utils.ts +46 -44
- package/src/common/session/service.ts +4 -1
- package/src/common/tokenize-match.ts +32 -54
- package/src/middleware/group.ts +2 -0
- package/src/middleware/index.ts +1 -0
- package/src/middleware/result.ts +43 -0
- package/src/proxy.unit.test.js +157 -0
- package/src/router.ts +7 -196
- package/src/router.unit.test.js +397 -0
- package/src/setup-test.js +5 -0
package/dist/api-router.d.ts
CHANGED
|
@@ -1,4 +1,9 @@
|
|
|
1
1
|
import { Logger } from "./common/logger";
|
|
2
|
+
export interface APIRouterOptions {
|
|
3
|
+
dirname: string;
|
|
4
|
+
apiName?: string;
|
|
5
|
+
path?: string;
|
|
6
|
+
}
|
|
2
7
|
/**
|
|
3
8
|
* # APIRouter
|
|
4
9
|
*
|
|
@@ -29,8 +34,4 @@ import { Logger } from "./common/logger";
|
|
|
29
34
|
*export default route;
|
|
30
35
|
* ```
|
|
31
36
|
*/
|
|
32
|
-
export declare
|
|
33
|
-
dirname: string;
|
|
34
|
-
apiName?: string;
|
|
35
|
-
path?: string;
|
|
36
|
-
}, logger?: Logger | undefined) => import("./router").Router;
|
|
37
|
+
export declare function APIRouter(options: APIRouterOptions, logger?: Logger): import("./router").Router;
|
package/dist/api-router.js
CHANGED
|
@@ -4,6 +4,12 @@ exports.APIRouter = void 0;
|
|
|
4
4
|
const fs_1 = require("fs");
|
|
5
5
|
const path_1 = require("path");
|
|
6
6
|
const api_router_utils_1 = require("./common/api-router-utils");
|
|
7
|
+
const parser_1 = require("@miqro/parser");
|
|
8
|
+
const APIRouterParseOptions = {
|
|
9
|
+
dirname: "string",
|
|
10
|
+
apiName: "string?",
|
|
11
|
+
path: "string?"
|
|
12
|
+
};
|
|
7
13
|
/**
|
|
8
14
|
* # APIRouter
|
|
9
15
|
*
|
|
@@ -34,8 +40,8 @@ const api_router_utils_1 = require("./common/api-router-utils");
|
|
|
34
40
|
*export default route;
|
|
35
41
|
* ```
|
|
36
42
|
*/
|
|
37
|
-
|
|
38
|
-
const { dirname } = options;
|
|
43
|
+
function APIRouter(options, logger) {
|
|
44
|
+
const { dirname } = (0, parser_1.parse)(options, APIRouterParseOptions, "no_extra", "options");
|
|
39
45
|
if (typeof dirname !== "string") {
|
|
40
46
|
throw new Error(`options.dirname must be defined!`);
|
|
41
47
|
}
|
|
@@ -45,6 +51,6 @@ const APIRouter = (options, logger) => {
|
|
|
45
51
|
const apiName = options.apiName !== undefined ? options.apiName : (0, path_1.basename)(dirname);
|
|
46
52
|
const apiPath = options.path !== undefined ? options.path : `/${apiName}`;
|
|
47
53
|
return (0, api_router_utils_1.FeatureRouter)((0, api_router_utils_1.traverseAPIRouteDir)(apiName.toUpperCase(), dirname, apiPath, undefined, logger), logger);
|
|
48
|
-
}
|
|
54
|
+
}
|
|
49
55
|
exports.APIRouter = APIRouter;
|
|
50
56
|
//# sourceMappingURL=api-router.js.map
|
package/dist/api-router.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api-router.js","sourceRoot":"","sources":["../src/api-router.ts"],"names":[],"mappings":";;;AAAA,2BAAyC;AACzC,+BAA8B;AAC9B,gEAA6E;
|
|
1
|
+
{"version":3,"file":"api-router.js","sourceRoot":"","sources":["../src/api-router.ts"],"names":[],"mappings":";;;AAAA,2BAAyC;AACzC,+BAA8B;AAC9B,gEAA6E;AAE7E,0CAAoD;AAQpD,MAAM,qBAAqB,GAAmB;IAC5C,OAAO,EAAE,QAAQ;IACjB,OAAO,EAAE,SAAS;IAClB,IAAI,EAAE,SAAS;CAChB,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,SAAgB,SAAS,CAAC,OAAyB,EAAE,MAAe;IAClE,MAAM,EAAC,OAAO,EAAC,GAAG,IAAA,cAAK,EAAC,OAAO,EAAE,qBAAqB,EAAE,UAAU,EAAE,SAAS,CAAqB,CAAC;IACnG,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE;QAC/B,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;KACrD;IACD,IAAI,CAAC,IAAA,eAAU,EAAC,OAAO,CAAC,IAAI,CAAC,IAAA,cAAS,EAAC,OAAO,CAAC,CAAC,WAAW,EAAE,EAAE;QAC7D,MAAM,IAAI,KAAK,CAAC,GAAG,OAAO,mBAAmB,CAAC,CAAC;KAChD;IACD,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,IAAA,eAAQ,EAAC,OAAO,CAAC,CAAC;IACpF,MAAM,OAAO,GAAG,OAAO,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,OAAO,EAAE,CAAC;IAC1E,OAAO,IAAA,gCAAa,EAAC,IAAA,sCAAmB,EAAC,OAAO,CAAC,WAAW,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,CAAC;AAChH,CAAC;AAXD,8BAWC"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import { ErrorHandler } from "./common";
|
|
2
|
+
export declare const HTML_HEADERS: {
|
|
3
|
+
"Content-Type": string;
|
|
4
|
+
};
|
|
5
|
+
export declare const STATUS: {
|
|
6
|
+
ERROR: number;
|
|
7
|
+
BAD_REQUEST: number;
|
|
8
|
+
NOT_FOUND: number;
|
|
9
|
+
NOT_IMPLEMENTED: number;
|
|
10
|
+
FORBIDDEN: number;
|
|
11
|
+
UNAUTHORIZED: number;
|
|
12
|
+
};
|
|
13
|
+
export declare function defaultAppErrorHandler(): ErrorHandler<void>;
|
|
@@ -0,0 +1,82 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.defaultAppErrorHandler = exports.STATUS = exports.HTML_HEADERS = void 0;
|
|
4
|
+
exports.HTML_HEADERS = {
|
|
5
|
+
["Content-Type"]: "text/html; charset=utf-8"
|
|
6
|
+
};
|
|
7
|
+
exports.STATUS = {
|
|
8
|
+
ERROR: 503,
|
|
9
|
+
BAD_REQUEST: 400,
|
|
10
|
+
NOT_FOUND: 404,
|
|
11
|
+
NOT_IMPLEMENTED: 501,
|
|
12
|
+
FORBIDDEN: 403,
|
|
13
|
+
UNAUTHORIZED: 401,
|
|
14
|
+
};
|
|
15
|
+
function defaultAppErrorHandler() {
|
|
16
|
+
const isTestEnv = (process.env.NODE_ENV === "development" || process.env.NODE_ENV === "test");
|
|
17
|
+
return async (e, ctx) => {
|
|
18
|
+
if (isTestEnv &&
|
|
19
|
+
(!e || !e.name || e.name === "Error")) {
|
|
20
|
+
ctx.logger.error(e);
|
|
21
|
+
await ctx.end({
|
|
22
|
+
headers: exports.HTML_HEADERS,
|
|
23
|
+
status: exports.STATUS.ERROR,
|
|
24
|
+
body: `${e && e.message ? e.message : String(e)}. You are seeing this message because NODE_ENV === "development" || NODE_ENV === "test"${e && e.stack ? ` ${e.stack}` : ""}`
|
|
25
|
+
});
|
|
26
|
+
}
|
|
27
|
+
else {
|
|
28
|
+
ctx.logger.error(e);
|
|
29
|
+
const name = e && e.name ? e.name : undefined;
|
|
30
|
+
switch (name) {
|
|
31
|
+
case "NotFoundError":
|
|
32
|
+
await ctx.end({
|
|
33
|
+
headers: exports.HTML_HEADERS,
|
|
34
|
+
status: exports.STATUS.NOT_FOUND,
|
|
35
|
+
body: e.message ? e.message : "NOT FOUND"
|
|
36
|
+
});
|
|
37
|
+
break;
|
|
38
|
+
case "MethodNotImplementedError":
|
|
39
|
+
await ctx.end({
|
|
40
|
+
headers: exports.HTML_HEADERS,
|
|
41
|
+
status: exports.STATUS.NOT_IMPLEMENTED,
|
|
42
|
+
body: e.message ? e.message : "NOT IMPLEMENTED"
|
|
43
|
+
});
|
|
44
|
+
break;
|
|
45
|
+
case "ForbiddenError":
|
|
46
|
+
await ctx.end({
|
|
47
|
+
headers: exports.HTML_HEADERS,
|
|
48
|
+
status: exports.STATUS.FORBIDDEN,
|
|
49
|
+
body: e.message ? e.message : "FORBIDDEN"
|
|
50
|
+
});
|
|
51
|
+
break;
|
|
52
|
+
case "UnAuthorizedError":
|
|
53
|
+
await ctx.end({
|
|
54
|
+
headers: exports.HTML_HEADERS,
|
|
55
|
+
status: exports.STATUS.UNAUTHORIZED,
|
|
56
|
+
body: e.message ? e.message : "UNAUTHORIZED"
|
|
57
|
+
});
|
|
58
|
+
break;
|
|
59
|
+
case "ParseOptionsError":
|
|
60
|
+
case "BadRequestError":
|
|
61
|
+
case "SequelizeValidationError":
|
|
62
|
+
case "SequelizeEagerLoadingError":
|
|
63
|
+
case "SequelizeUniqueConstraintError":
|
|
64
|
+
await ctx.end({
|
|
65
|
+
headers: exports.HTML_HEADERS,
|
|
66
|
+
status: exports.STATUS.BAD_REQUEST,
|
|
67
|
+
body: e.message ? e.message : "BAD REQUEST"
|
|
68
|
+
});
|
|
69
|
+
break;
|
|
70
|
+
case "ConfigFileNotFoundError":
|
|
71
|
+
await ctx.end({
|
|
72
|
+
headers: exports.HTML_HEADERS,
|
|
73
|
+
status: exports.STATUS.ERROR,
|
|
74
|
+
body: e.message ? e.message : "SERVER ERROR"
|
|
75
|
+
});
|
|
76
|
+
break;
|
|
77
|
+
}
|
|
78
|
+
}
|
|
79
|
+
};
|
|
80
|
+
}
|
|
81
|
+
exports.defaultAppErrorHandler = defaultAppErrorHandler;
|
|
82
|
+
//# sourceMappingURL=app-utils.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"app-utils.js","sourceRoot":"","sources":["../src/app-utils.ts"],"names":[],"mappings":"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"}
|
package/dist/app.js
CHANGED
|
@@ -5,10 +5,11 @@ const http_1 = require("http");
|
|
|
5
5
|
const uuid_1 = require("uuid");
|
|
6
6
|
const common_1 = require("./common");
|
|
7
7
|
const router_1 = require("./router");
|
|
8
|
+
const app_utils_1 = require("./app-utils");
|
|
8
9
|
class App extends router_1.Router {
|
|
9
10
|
constructor(config) {
|
|
10
11
|
super(config);
|
|
11
|
-
const errorHandler =
|
|
12
|
+
const errorHandler = (0, app_utils_1.defaultAppErrorHandler)();
|
|
12
13
|
const loggerFactory = this.config && this.config.loggerFactory ? this.config.loggerFactory : common_1.defaultLoggerFactory;
|
|
13
14
|
this.listener = async (req, res) => {
|
|
14
15
|
const uuid = (0, uuid_1.v4)().toString();
|
|
@@ -19,8 +20,8 @@ class App extends router_1.Router {
|
|
|
19
20
|
await this.run(ctx);
|
|
20
21
|
if (!ctx.res.headersSent) {
|
|
21
22
|
await ctx.end({
|
|
22
|
-
headers: HTML_HEADERS,
|
|
23
|
-
status: STATUS.NOT_FOUND,
|
|
23
|
+
headers: app_utils_1.HTML_HEADERS,
|
|
24
|
+
status: app_utils_1.STATUS.NOT_FOUND,
|
|
24
25
|
body: "NOT FOUND"
|
|
25
26
|
});
|
|
26
27
|
}
|
|
@@ -32,8 +33,8 @@ class App extends router_1.Router {
|
|
|
32
33
|
if (!ctx.res.headersSent) {
|
|
33
34
|
ctx.logger.error(e);
|
|
34
35
|
await ctx.end({
|
|
35
|
-
headers:
|
|
36
|
-
status: STATUS.ERROR,
|
|
36
|
+
headers: app_utils_1.HTML_HEADERS,
|
|
37
|
+
status: app_utils_1.STATUS.ERROR,
|
|
37
38
|
body: "SERVER ERROR"
|
|
38
39
|
});
|
|
39
40
|
}
|
|
@@ -50,87 +51,4 @@ class App extends router_1.Router {
|
|
|
50
51
|
}
|
|
51
52
|
}
|
|
52
53
|
exports.App = App;
|
|
53
|
-
const TEXT_HEADERS = {
|
|
54
|
-
["Content-Type"]: "plain/text; charset=utf-8"
|
|
55
|
-
};
|
|
56
|
-
const HTML_HEADERS = {
|
|
57
|
-
["Content-Type"]: "text/html; charset=utf-8"
|
|
58
|
-
};
|
|
59
|
-
const STATUS = {
|
|
60
|
-
ERROR: 503,
|
|
61
|
-
BAD_REQUEST: 400,
|
|
62
|
-
NOT_FOUND: 404,
|
|
63
|
-
NOT_IMPLEMENTED: 501,
|
|
64
|
-
FORBIDDEN: 403,
|
|
65
|
-
UNAUTHORIZED: 401,
|
|
66
|
-
};
|
|
67
|
-
const DefaultErrorHandler = () => {
|
|
68
|
-
return async (e, ctx) => {
|
|
69
|
-
if (!e || !e.name || e.name === "Error") {
|
|
70
|
-
if (process.env.NODE_ENV === "development" || process.env.NODE_ENV === "test") {
|
|
71
|
-
ctx.logger.error(e);
|
|
72
|
-
await ctx.end({
|
|
73
|
-
headers: TEXT_HEADERS,
|
|
74
|
-
status: STATUS.ERROR,
|
|
75
|
-
body: `${e && e.message ? e.message : String(e)}. You are seeing this message because NODE_ENV === "development" || NODE_ENV === "test"${e && e.stack ? ` ${e.stack}` : ""}`
|
|
76
|
-
});
|
|
77
|
-
return false;
|
|
78
|
-
}
|
|
79
|
-
}
|
|
80
|
-
else {
|
|
81
|
-
ctx.logger.error(e);
|
|
82
|
-
const name = e && e.name ? e.name : undefined;
|
|
83
|
-
switch (name) {
|
|
84
|
-
case "NotFoundError":
|
|
85
|
-
await ctx.end({
|
|
86
|
-
headers: HTML_HEADERS,
|
|
87
|
-
status: STATUS.NOT_FOUND,
|
|
88
|
-
body: e.message ? e.message : "NOT FOUND"
|
|
89
|
-
});
|
|
90
|
-
break;
|
|
91
|
-
case "MethodNotImplementedError":
|
|
92
|
-
await ctx.end({
|
|
93
|
-
headers: HTML_HEADERS,
|
|
94
|
-
status: STATUS.NOT_IMPLEMENTED,
|
|
95
|
-
body: e.message ? e.message : "NOT IMPLEMENTED"
|
|
96
|
-
});
|
|
97
|
-
break;
|
|
98
|
-
case "ForbiddenError":
|
|
99
|
-
await ctx.end({
|
|
100
|
-
headers: HTML_HEADERS,
|
|
101
|
-
status: STATUS.FORBIDDEN,
|
|
102
|
-
body: e.message ? e.message : "FORBIDDEN"
|
|
103
|
-
});
|
|
104
|
-
break;
|
|
105
|
-
case "UnAuthorizedError":
|
|
106
|
-
await ctx.end({
|
|
107
|
-
headers: HTML_HEADERS,
|
|
108
|
-
status: STATUS.UNAUTHORIZED,
|
|
109
|
-
body: e.message ? e.message : "UNAUTHORIZED"
|
|
110
|
-
});
|
|
111
|
-
break;
|
|
112
|
-
case "ParseOptionsError":
|
|
113
|
-
case "BadRequestError":
|
|
114
|
-
case "SequelizeValidationError":
|
|
115
|
-
case "SequelizeEagerLoadingError":
|
|
116
|
-
case "SequelizeUniqueConstraintError":
|
|
117
|
-
await ctx.end({
|
|
118
|
-
headers: HTML_HEADERS,
|
|
119
|
-
status: STATUS.BAD_REQUEST,
|
|
120
|
-
body: e.message ? e.message : "BAD REQUEST"
|
|
121
|
-
});
|
|
122
|
-
break;
|
|
123
|
-
default:
|
|
124
|
-
await ctx.end({
|
|
125
|
-
headers: HTML_HEADERS,
|
|
126
|
-
status: STATUS.ERROR,
|
|
127
|
-
body: e.message ? e.message : "SERVER ERROR"
|
|
128
|
-
});
|
|
129
|
-
break;
|
|
130
|
-
}
|
|
131
|
-
return false;
|
|
132
|
-
}
|
|
133
|
-
return true;
|
|
134
|
-
};
|
|
135
|
-
};
|
|
136
54
|
//# sourceMappingURL=app.js.map
|
package/dist/app.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app.js","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":";;;AAAA,+BAA2D;AAC3D,+BAAwB;AACxB,
|
|
1
|
+
{"version":3,"file":"app.js","sourceRoot":"","sources":["../src/app.ts"],"names":[],"mappings":";;;AAAA,+BAA2D;AAC3D,+BAAwB;AACxB,qCAAuD;AACvD,qCAA+C;AAC/C,2CAAyE;AAEzE,MAAa,GAAI,SAAQ,eAAM;IAG7B,YAAY,MAAsB;QAChC,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,MAAM,YAAY,GAAG,IAAA,kCAAsB,GAAE,CAAC;QAC9C,MAAM,aAAa,GAAG,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC,6BAAoB,CAAC;QAClH,IAAI,CAAC,QAAQ,GAAG,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;YACjC,MAAM,IAAI,GAAG,IAAA,SAAE,GAAE,CAAC,QAAQ,EAAE,CAAC;YAC7B,MAAM,MAAM,GAAG,aAAa,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;YACxC,MAAM,GAAG,GAAG,IAAI,gBAAO,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC;YAChD,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;YACrC,IAAI;gBACF,MAAM,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;gBACpB,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE;oBACxB,MAAM,GAAG,CAAC,GAAG,CAAC;wBACZ,OAAO,EAAE,wBAAY;wBACrB,MAAM,EAAE,kBAAM,CAAC,SAAS;wBACxB,IAAI,EAAE,WAAW;qBAClB,CAAC,CAAC;iBACJ;aACF;YAAC,OAAO,CAAM,EAAE;gBACf,IAAI;oBACF,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE;wBACxB,MAAM,YAAY,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;wBAC3B,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE;4BACxB,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;4BACpB,MAAM,GAAG,CAAC,GAAG,CAAC;gCACZ,OAAO,EAAE,wBAAY;gCACrB,MAAM,EAAE,kBAAM,CAAC,KAAK;gCACpB,IAAI,EAAE,cAAc;6BACrB,CAAC,CAAC;yBACJ;qBACF;iBACF;gBAAC,OAAO,EAAE,EAAE;oBACX,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;iBACtB;aACF;QACH,CAAC,CAAC;IACJ,CAAC;IAEM,MAAM,CAAC,GAAG,IAAW;QAC1B,OAAO,IAAA,mBAAY,EAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,CAAA;IACpD,CAAC;CACF;AA5CD,kBA4CC"}
|
|
@@ -4,7 +4,7 @@ import { Handler, Method } from "./context";
|
|
|
4
4
|
import { RouterHandlerOptions } from "./router-utils";
|
|
5
5
|
import { ParseOptionMap } from "@miqro/parser";
|
|
6
6
|
export declare const APIRouteValidator: ParseOptionMap;
|
|
7
|
-
export declare
|
|
7
|
+
export declare function traverseAPIRouteDir(featureName: string, dirname: string, basePath?: string, features?: FeatureRouterOptions, logger?: Logger): FeatureRouterOptions;
|
|
8
8
|
export interface FeatureRouterPathOptions {
|
|
9
9
|
path: string | string[];
|
|
10
10
|
method: Method | Method[];
|
|
@@ -23,7 +23,7 @@ exports.APIRouteValidator = {
|
|
|
23
23
|
group: "GroupPolicy?",
|
|
24
24
|
handler: "function[]!"
|
|
25
25
|
};
|
|
26
|
-
|
|
26
|
+
function traverseAPIRouteDir(featureName, dirname, basePath = "/", features = {}, logger) {
|
|
27
27
|
if (logger) {
|
|
28
28
|
logger.trace("loading routes from [%s]", dirname);
|
|
29
29
|
}
|
|
@@ -32,7 +32,7 @@ const traverseAPIRouteDir = (featureName, dirname, basePath = "/", features = {}
|
|
|
32
32
|
const methods = files.filter(f => !(0, fs_1.lstatSync)((0, path_1.join)(dirname, f)).isDirectory());
|
|
33
33
|
for (const f of dirs) {
|
|
34
34
|
const { name } = (0, path_1.parse)(f);
|
|
35
|
-
features =
|
|
35
|
+
features = traverseAPIRouteDir(`${featureName}_${name}`.toUpperCase(), (0, path_1.join)(dirname, f), `${basePath}/${name}`, features, logger);
|
|
36
36
|
}
|
|
37
37
|
for (const f of methods) {
|
|
38
38
|
const { name, ext } = (0, path_1.parse)(f);
|
|
@@ -82,6 +82,9 @@ const traverseAPIRouteDir = (featureName, dirname, basePath = "/", features = {}
|
|
|
82
82
|
if (features[newFeatureSubPath]) {
|
|
83
83
|
throw new Error(`${___filePath} feature name collides with ${features[newFeatureSubPath].___filePath}`);
|
|
84
84
|
}
|
|
85
|
+
if (newFeatureSubPath === "__prototype__" || newFeatureSubPath === "__proto__") {
|
|
86
|
+
throw new Error(`invalid feature name ${newFeatureSubPath}`);
|
|
87
|
+
}
|
|
85
88
|
features[newFeatureSubPath] = {
|
|
86
89
|
options: {
|
|
87
90
|
name: route.name,
|
|
@@ -109,8 +112,9 @@ const traverseAPIRouteDir = (featureName, dirname, basePath = "/", features = {}
|
|
|
109
112
|
}
|
|
110
113
|
}
|
|
111
114
|
return features;
|
|
112
|
-
}
|
|
115
|
+
}
|
|
113
116
|
exports.traverseAPIRouteDir = traverseAPIRouteDir;
|
|
117
|
+
;
|
|
114
118
|
const FEATURE_ROUTER_METHODS = ["get", "post", "put", "delete", "patch", "options"];
|
|
115
119
|
const FeatureRouter = (options, logger) => {
|
|
116
120
|
const router = new router_1.Router();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api-router-utils.js","sourceRoot":"","sources":["../../src/common/api-router-utils.ts"],"names":[],"mappings":";;;AAAA,2BAA0C;AAC1C,+BAAuD;AAGvD,qDAA+C;AAC/C,qCAA0C;AAC1C,sCAAiC;AAGjC,0CAAoD;AAEvC,QAAA,iBAAiB,GAAmB;IAC/C,IAAI,EAAE,SAAS;IACf,WAAW,EAAE,SAAS;IACtB,IAAI,EAAE,YAAY;IAClB,MAAM,EAAE,YAAY;IACpB,MAAM,EAAE,kBAAkB;IAC1B,OAAO,EAAE,kBAAkB;IAC3B,KAAK,EAAE,mCAAmC;IAC1C,MAAM,EAAE,mCAAmC;IAC3C,IAAI,EAAE,mCAAmC;IACzC,QAAQ,EAAE,0BAA0B;IACpC,UAAU,EAAE,cAAc;IAC1B,OAAO,EAAE,kCAAkC;IAC3C,KAAK,EAAE,cAAc;IACrB,OAAO,EAAE,aAAa;CACvB,CAAC;
|
|
1
|
+
{"version":3,"file":"api-router-utils.js","sourceRoot":"","sources":["../../src/common/api-router-utils.ts"],"names":[],"mappings":";;;AAAA,2BAA0C;AAC1C,+BAAuD;AAGvD,qDAA+C;AAC/C,qCAA0C;AAC1C,sCAAiC;AAGjC,0CAAoD;AAEvC,QAAA,iBAAiB,GAAmB;IAC/C,IAAI,EAAE,SAAS;IACf,WAAW,EAAE,SAAS;IACtB,IAAI,EAAE,YAAY;IAClB,MAAM,EAAE,YAAY;IACpB,MAAM,EAAE,kBAAkB;IAC1B,OAAO,EAAE,kBAAkB;IAC3B,KAAK,EAAE,mCAAmC;IAC1C,MAAM,EAAE,mCAAmC;IAC3C,IAAI,EAAE,mCAAmC;IACzC,QAAQ,EAAE,0BAA0B;IACpC,UAAU,EAAE,cAAc;IAC1B,OAAO,EAAE,kCAAkC;IAC3C,KAAK,EAAE,cAAc;IACrB,OAAO,EAAE,aAAa;CACvB,CAAC;AAEF,SAAgB,mBAAmB,CACjC,WAAmB,EACnB,OAAe,EACf,QAAQ,GAAG,GAAG,EACd,WAAiC,EAAE,EAAE,MAAe;IACpD,IAAI,MAAM,EAAE;QACV,MAAM,CAAC,KAAK,CAAC,0BAA0B,EAAE,OAAO,CAAC,CAAC;KACnD;IACD,MAAM,KAAK,GAAG,IAAA,gBAAW,EAAC,OAAO,CAAC,CAAC;IACnC,MAAM,IAAI,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,IAAA,cAAS,EAAC,IAAA,WAAI,EAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC;IAC1E,MAAM,OAAO,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,IAAA,cAAS,EAAC,IAAA,WAAI,EAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC;IAC9E,KAAK,MAAM,CAAC,IAAI,IAAI,EAAE;QACpB,MAAM,EAAC,IAAI,EAAC,GAAG,IAAA,YAAS,EAAC,CAAC,CAAC,CAAC;QAC5B,QAAQ,GAAG,mBAAmB,CAAC,GAAG,WAAW,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,EAAE,IAAA,WAAI,EAAC,OAAO,EAAE,CAAC,CAAC,EAAE,GAAG,QAAQ,IAAI,IAAI,EAAE,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC;KACnI;IACD,KAAK,MAAM,CAAC,IAAI,OAAO,EAAE;QACvB,MAAM,EAAC,IAAI,EAAE,GAAG,EAAC,GAAG,IAAA,YAAS,EAAC,CAAC,CAAC,CAAC;QACjC,IAAI,IAAI,KAAK,OAAO,IAAI,CAAC,CAAC,GAAG,KAAK,KAAK,IAAI,GAAG,KAAK,KAAK,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,EAAE;YACrF,MAAM,QAAQ,GAAG,IAAA,WAAI,EAAC,OAAO,EAAE,IAAI,CAAC,CAAC;YACrC,8DAA8D;YAC9D,IAAI,KAAK,GAAa,OAAO,CAAC,QAAQ,CAAC,CAAC;YACxC,IAAK,KAAa,CAAC,OAAO,IAAK,KAAa,CAAC,UAAU,KAAK,IAAI,EAAE;gBAChE,KAAK,GAAI,KAAa,CAAC,OAAO,CAAC;aAChC;YACD,MAAM,WAAW,GAAG,QAAQ,GAAG,GAAG,CAAC;YACnC,IAAI,YAAY,GAAa,CAAC,IAAI,CAAa,CAAC;YAChD,IAAI,OAAO,KAAK,KAAK,UAAU,EAAE;gBAC/B,KAAK,GAAG;oBACN,OAAO,EAAE,KAAK;iBACR,CAAC;aACV;iBAAM;gBACL,IAAI,OAAO,KAAK,CAAC,MAAM,KAAK,WAAW,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,YAAY,KAAK,CAAC,IAAI,CAAC,OAAO,KAAK,CAAC,MAAM,KAAK,QAAQ,CAAC,CAAC,EAAE;oBACnH,MAAM,IAAI,KAAK,CAAC,GAAG,IAAA,cAAO,EAAC,OAAO,EAAE,IAAI,CAAC,mDAAmD,CAAC,CAAC;iBAC/F;qBAAM,IAAI,OAAO,KAAK,CAAC,MAAM,KAAK,WAAW,EAAE;oBAC9C,YAAY,GAAG,KAAK,CAAC,MAAM,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;iBAC9E;gBACD,IAAI,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ,IAAI,OAAO,KAAK,CAAC,IAAI,KAAK,WAAW,IAAI,CAAC,CAAC,KAAK,CAAC,IAAI,YAAY,KAAK,CAAC,EAAE;oBACzG,MAAM,IAAI,KAAK,CAAC,GAAG,IAAA,cAAO,EAAC,OAAO,EAAE,IAAI,CAAC,mDAAmD,CAAC,CAAC;iBAC/F;gBACD,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,YAAY,KAAK,CAAC,IAAI,OAAO,KAAK,CAAC,OAAO,KAAK,UAAU,CAAC,IAAI,OAAO,KAAK,CAAC,OAAO,KAAK,WAAW,EAAE;oBACtH,MAAM,IAAI,KAAK,CAAC,GAAG,IAAA,cAAO,EAAC,OAAO,EAAE,IAAI,CAAC,kDAAkD,CAAC,CAAC;iBAC9F;gBACD,IAAI,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ,IAAI,OAAO,KAAK,CAAC,IAAI,KAAK,WAAW,EAAE;oBACvE,MAAM,IAAI,KAAK,CAAC,GAAG,IAAA,cAAO,EAAC,OAAO,EAAE,IAAI,CAAC,iCAAiC,CAAC,CAAC;iBAC7E;aACF;YACD,KAAK,GAAG,IAAA,cAAK,EAAC,KAAK,EAAE,yBAAiB,EAAE,UAAU,EAAE,WAAW,CAAa,CAAC;YAC7E,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,IAAc,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YACpL,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBACrC,MAAM,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;gBACnB,IAAI,OAAO,CAAC,KAAK,QAAQ,IAAI,CAAC,CAAC,EAAE;oBAC/B,MAAM,IAAI,KAAK,CAAC,GAAG,IAAA,cAAO,EAAC,OAAO,EAAE,IAAI,CAAC,mDAAmD,CAAC,CAAC;iBAC/F;gBACD,MAAM,IAAI,GAAG,IAAA,8BAAa,EAAC,GAAG,QAAQ,GAAG,CAAC,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAA;gBAExE,MAAM,OAAO,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,eAAe,EAAE,GAAG,CAAC,CAAC;gBACzF,MAAM,SAAS,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;gBAEjD,IAAI,iBAAiB,GAAG,GAAG,WAAW,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,GAAG,SAAS,KAAK,OAAO,CAAC,CAAC,CAAC,IAAI,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,WAAW,EAAE,CAAC;gBAEtI,iBAAiB,GAAG,iBAAiB,CAAC,MAAM,GAAG,CAAC,IAAI,iBAAiB,CAAC,MAAM,CAAC,iBAAiB,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC,EAAE,iBAAiB,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,iBAAiB,CAAC;gBACtM,IAAI,QAAQ,CAAC,iBAAiB,CAAC,EAAE;oBAC/B,MAAM,IAAI,KAAK,CAAC,GAAG,WAAW,+BAAgC,QAAQ,CAAC,iBAAiB,CAAS,CAAC,WAAW,EAAE,CAAC,CAAA;iBACjH;gBACD,IAAI,iBAAiB,KAAK,eAAe,IAAI,iBAAiB,KAAK,WAAW,EAAE;oBAC9E,MAAM,IAAI,KAAK,CAAC,wBAAwB,iBAAiB,EAAE,CAAC,CAAC;iBAC9D;gBACD,QAAQ,CAAC,iBAAiB,CAAC,GAAG;oBAC5B,OAAO,EAAE;wBACP,IAAI,EAAE,KAAK,CAAC,IAAI;wBAChB,WAAW,EAAE,KAAK,CAAC,WAAW;wBAC9B,MAAM,EAAE,KAAK,CAAC,MAAM;wBACpB,UAAU,EAAE,KAAK,CAAC,UAAU;wBAC5B,OAAO,EAAE,KAAK,CAAC,OAAO;wBACtB,MAAM,EAAE,KAAK,CAAC,MAAM;wBACpB,OAAO,EAAE;4BACP,OAAO,EAAE,KAAK,CAAC,OAAO;4BACtB,KAAK,EAAE,KAAK,CAAC,KAAK;4BAClB,IAAI,EAAE,KAAK,CAAC,IAAI;4BAChB,MAAM,EAAE,KAAK,CAAC,MAAM;yBACrB;wBACD,QAAQ,EAAE;4BACR,IAAI,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI;yBAC7C;qBACF;oBACD,IAAI;oBACJ,MAAM,EAAE,YAAY;oBACpB,OAAO,EAAE,KAAK,CAAC,OAAO;iBACvB,CAAC;gBACD,QAAQ,CAAC,iBAAiB,CAAS,CAAC,WAAW,GAAG,WAAW,CAAC;aAChE;SACF;KACF;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC;AA9FD,kDA8FC;AAAA,CAAC;AAWF,MAAM,sBAAsB,GAAa,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC;AAEvF,MAAM,aAAa,GAAG,CAAC,OAA6B,EAAE,MAAe,EAAU,EAAE;IACtF,MAAM,MAAM,GAAW,IAAI,eAAM,EAAE,CAAC;IACpC,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACrC,MAAM,OAAO,GAAa,EAAE,CAAC;IAC7B,MAAM,QAAQ,GAAa,EAAE,CAAC;IAC9B,MAAM,YAAY,GAA+B,EAAE,CAAC;IACpD,KAAK,MAAM,WAAW,IAAI,OAAO,EAAE;QACjC,MAAM,cAAc,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC;QAC5C,IAAI,CAAC,cAAc,EAAE;YACnB,MAAM,IAAI,KAAK,CAAC,mCAAmC,WAAW,GAAG,CAAC,CAAC;SACpE;aAAM;YACL,MAAM,EAAC,IAAI,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,EAAC,GAAG,cAAc,CAAC;YAC/D,IAAI,CAAC,MAAM,EAAE;gBACX,MAAM,IAAI,KAAK,CAAC,2BAA2B,WAAW,GAAG,CAAC,CAAC;aAC5D;iBAAM,IAAI,CAAC,cAAc,EAAE;gBAC1B,MAAM,IAAI,KAAK,CAAC,kCAAkC,WAAW,GAAG,CAAC,CAAC;aACnE;iBAAM,IAAI,CAAC,IAAI,EAAE;gBAChB,MAAM,IAAI,KAAK,CAAC,wBAAwB,WAAW,GAAG,CAAC,CAAC;aACzD;iBAAM;gBACL,IAAI,MAAM,YAAY,KAAK,EAAE;oBAC3B,KAAK,MAAM,CAAC,IAAI,MAAM,EAAE;wBACtB,IAAI,sBAAsB,CAAC,OAAO,CAAC,CAAC,CAAC,WAAW,EAAY,CAAC,KAAK,CAAC,CAAC,EAAE;4BACpE,MAAM,IAAI,KAAK,CAAC,YAAY,WAAW,aAAa,CAAC,CAAC,WAAW,EAAE,4BAA4B,sBAAsB,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;yBACrI;qBACF;iBACF;qBAAM,IAAI,sBAAsB,CAAC,OAAO,CAAC,MAAM,CAAC,WAAW,EAAY,CAAC,KAAK,CAAC,CAAC,EAAE;oBAChF,MAAM,IAAI,KAAK,CAAC,YAAY,WAAW,aAAa,MAAM,CAAC,WAAW,EAAE,4BAA4B,sBAAsB,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;iBAC1I;gBACD,MAAM,OAAO,GAAG,MAAM,YAAY,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;gBAC5D,IAAI,IAAA,yBAAgB,EAAC,WAAW,CAAC,EAAE;oBACjC,IAAI,MAAM,EAAE;wBACV,MAAM,CAAC,KAAK,CAAC,YAAY,WAAW,WAAW,CAAC,CAAC;qBAClD;oBACD,OAAO,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;oBAC1B,MAAM,KAAK,GAAG,IAAI,YAAY,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;oBACpD,KAAK,MAAM,GAAG,IAAI,KAAK,EAAE;wBACvB,MAAM,CAAC,GAAG,IAAA,8BAAa,EAAC,GAAG,CAAC,CAAC;wBAC7B,KAAK,MAAM,CAAC,IAAI,OAAO,EAAE;4BACvB,IAAI,MAAM,EAAE;gCACV,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,WAAW,CAAC,CAAC;gCAC/B,MAAM,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC,CAAC;gCAC3C,IAAK,cAAsB,CAAC,WAAW,EAAE;oCACvC,MAAM,CAAC,IAAI,CAAC,MAAM,EAAG,cAAsB,CAAC,WAAW,CAAC,CAAC;iCAC1D;6BACF;4BACD,IAAI,YAAY,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,KAAK,SAAS,EAAE;gCAC1C,MAAM,IAAI,KAAK,CAAC,GAAG,WAAW,0BAA0B,YAAY,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,YAAY,CAAC,WAAW,CAAC,EAAE,CAAC,CAAA;6BAC7G;4BACD,YAAY,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,WAAW,CAAC;4BACvC,MAAM,CAAC,GAAG,CAAC,cAAc,EAAE,CAAC,EAAE,CAAC,CAAC,iBAAiB,EAAY,EAAE,cAAc,CAAC,OAAO,CAAC,CAAC;yBACxF;qBACF;iBACF;qBAAM;oBACL,IAAI,MAAM,EAAE;wBACV,MAAM,CAAC,KAAK,CAAC,uBAAuB,EAAE,WAAW,CAAC,CAAC;qBACpD;oBACD,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;iBAC5B;aACF;SACF;KACF;IACD,IAAI,MAAM,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE;QAChC,MAAM,CAAC,KAAK,CAAC,uBAAuB,EAAE,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;KAC1D;IACD,IAAI,MAAM,EAAE;QACV,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;YACvB,MAAM,CAAC,IAAI,CAAC,wBAAwB,EAAE,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;YAC1D,MAAM,CAAC,IAAI,CAAC,oDAAoD,CAAC,CAAC;SACnE;aAAM;YACL,MAAM,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAC;SACtC;KACF;IACD,OAAO,MAAM,CAAC;AAChB,CAAC,CAAA;AAzEY,QAAA,aAAa,iBAyEzB"}
|
|
@@ -26,8 +26,14 @@ exports.ConfigPathResolver = ConfigPathResolver;
|
|
|
26
26
|
const processEnvDefined = (typeof process !== "undefined" && typeof process.env !== "undefined");
|
|
27
27
|
class ConfigStore {
|
|
28
28
|
static putConfig(key, value) {
|
|
29
|
+
if (key === "__proto__" || key === "__prototype__") {
|
|
30
|
+
throw new Error("invalid key " + key);
|
|
31
|
+
}
|
|
29
32
|
if (processEnvDefined) {
|
|
30
33
|
Object.defineProperty(process.env, key, {
|
|
34
|
+
writable: true,
|
|
35
|
+
enumerable: true,
|
|
36
|
+
configurable: true,
|
|
31
37
|
value
|
|
32
38
|
}); // this is for webpack
|
|
33
39
|
}
|
|
@@ -39,6 +45,9 @@ class ConfigStore {
|
|
|
39
45
|
return this;
|
|
40
46
|
}
|
|
41
47
|
static clear(key) {
|
|
48
|
+
if (key === "__proto__" || key === "__prototype__") {
|
|
49
|
+
throw new Error("invalid key " + key);
|
|
50
|
+
}
|
|
42
51
|
if (processEnvDefined) {
|
|
43
52
|
delete process.env[key];
|
|
44
53
|
}
|
|
@@ -67,6 +76,9 @@ class ConfigStore {
|
|
|
67
76
|
}
|
|
68
77
|
}
|
|
69
78
|
static getConfig(key, defaultValue) {
|
|
79
|
+
if (key === "__proto__" || key === "__prototype__") {
|
|
80
|
+
throw new Error("invalid key " + key);
|
|
81
|
+
}
|
|
70
82
|
if (processEnvDefined) {
|
|
71
83
|
return process.env[key] !== undefined ? process.env[key] : (defaultValue !== undefined ? defaultValue : null);
|
|
72
84
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/common/config/config.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/common/config/config.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,7 +11,7 @@ class ConfigFileNotFoundError extends Error {
|
|
|
11
11
|
}
|
|
12
12
|
}
|
|
13
13
|
const loadConfigString = (envFileContent, combined) => {
|
|
14
|
-
const ret =
|
|
14
|
+
const ret = Object.create(null);
|
|
15
15
|
envFileContent.split("\n")
|
|
16
16
|
.filter(value => value && value.length > 0 && value.substring(0, 1) !== "#")
|
|
17
17
|
.forEach((line) => {
|
|
@@ -46,7 +46,7 @@ exports.loadConfigFile = loadConfigFile;
|
|
|
46
46
|
const MISSED_TO_RUNMIQRO_INIT = (configDirname) => `no config loaded. env files in [${configDirname}] doesnt exist!.`;
|
|
47
47
|
const loadConfig = (configDirname = config_1.ConfigPathResolver.getConfigDirname(), logger) => {
|
|
48
48
|
const outputs = [];
|
|
49
|
-
const combined =
|
|
49
|
+
const combined = Object.create(null);
|
|
50
50
|
if ((0, fs_1.existsSync)(configDirname)) {
|
|
51
51
|
const configFiles = (0, fs_1.readdirSync)(configDirname);
|
|
52
52
|
for (const configFile of configFiles) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loader.js","sourceRoot":"","sources":["../../../src/common/config/loader.ts"],"names":[],"mappings":";;;AAAA,+BAAsC;AACtC,2BAAyD;AACzD,qCAAsF;AAiBtF,MAAM,uBAAwB,SAAQ,KAAK;IACzC,YAAY,IAAS;QACnB,KAAK,CAAC,IAAI,CAAC,CAAC;QACZ,IAAI,CAAC,IAAI,GAAG,yBAAyB,CAAC;IACxC,CAAC;CACF;AAEM,MAAM,gBAAgB,GAAG,CAAC,cAAsB,EAAE,QAAuB,EAAgB,EAAE;IAChG,MAAM,GAAG,GAAiB,
|
|
1
|
+
{"version":3,"file":"loader.js","sourceRoot":"","sources":["../../../src/common/config/loader.ts"],"names":[],"mappings":"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"}
|
package/dist/common/context.js
CHANGED
|
@@ -10,17 +10,17 @@ class Context {
|
|
|
10
10
|
this.req = req;
|
|
11
11
|
this.res = res;
|
|
12
12
|
this.logger = logger;
|
|
13
|
-
this.params = {}; // the router will fill this
|
|
14
13
|
this.body = undefined;
|
|
15
14
|
this.res.removeHeader("Date");
|
|
16
15
|
this.url = (0, helpers_1.newURL)(req.url ? req.url : "/", `http://${req.headers.host}`);
|
|
17
16
|
this.method = req.method ? req.method.toUpperCase() : "GET";
|
|
18
17
|
this.path = (0, tokenize_match_1.normalizePath)(this.url.pathname); // normalized path
|
|
19
18
|
this.hash = this.url.hash;
|
|
19
|
+
this.params = Object.create(null);
|
|
20
20
|
this.query = (0, tokenize_match_1.parseSearchParams)(this.url.searchParams);
|
|
21
21
|
//this.buffer = Buffer.from("");
|
|
22
22
|
this.remoteAddress = req.socket.remoteAddress;
|
|
23
|
-
this.cookies =
|
|
23
|
+
this.cookies = Object.create(null); // a middleware will fill
|
|
24
24
|
this.headers = req.headers;
|
|
25
25
|
this.startMS = Date.now();
|
|
26
26
|
this.results = []; // handlers will fill this
|
|
@@ -38,7 +38,7 @@ class Context {
|
|
|
38
38
|
const current = c ? c instanceof Array ? c.join(", ") : String(c) : "";
|
|
39
39
|
const nV = value instanceof Array ? value.join(", ") : String(value);
|
|
40
40
|
const newValue = current ? `${current}, ${nV}` : nV;
|
|
41
|
-
return this.
|
|
41
|
+
return this.setHeader("Vary", newValue.indexOf("*") !== -1 ? "*" : newValue);
|
|
42
42
|
}
|
|
43
43
|
setHeader(name, value) {
|
|
44
44
|
return this.res.setHeader(name, value);
|
|
@@ -47,6 +47,9 @@ class Context {
|
|
|
47
47
|
return this.setHeader('Set-Cookie', (0, cookie_1.serialize)(name, String(value), options));
|
|
48
48
|
}
|
|
49
49
|
async end({ status, headers, body }) {
|
|
50
|
+
if (this.res.headersSent) {
|
|
51
|
+
return Promise.reject(new Error("already ended"));
|
|
52
|
+
}
|
|
50
53
|
return new Promise((resolve, reject) => {
|
|
51
54
|
try {
|
|
52
55
|
if (this.res.headersSent) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"context.js","sourceRoot":"","sources":["../../src/common/context.ts"],"names":[],"mappings":";;;AAGA,qDAAkE;AAElE,uCAAiC;AACjC,mCAAyD;AAsBzD,MAAa,OAAO;IAelB,YAA4B,IAAY,EAAkB,GAAoB,EAAkB,GAAmB,EAAkB,MAAc;QAAvH,SAAI,GAAJ,IAAI,CAAQ;QAAkB,QAAG,GAAH,GAAG,CAAiB;QAAkB,QAAG,GAAH,GAAG,CAAgB;QAAkB,WAAM,GAAN,MAAM,CAAQ;
|
|
1
|
+
{"version":3,"file":"context.js","sourceRoot":"","sources":["../../src/common/context.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
import { PathPart, PathParams, PathPartToken } from "./tokenize-match";
|
|
2
|
+
import { Context, Handler, Method } from "./context";
|
|
3
|
+
import { Router } from "../router";
|
|
4
|
+
import { HandlerWithOptions, RouterHandlerOptions, RouterJSONDoc } from "./router-utils";
|
|
5
|
+
export declare class RouterHandler {
|
|
6
|
+
private readonly path;
|
|
7
|
+
private readonly method;
|
|
8
|
+
private readonly tokens;
|
|
9
|
+
private readonly handler;
|
|
10
|
+
private readonly isRouter;
|
|
11
|
+
private readonly options?;
|
|
12
|
+
constructor(handler: Array<Handler> | HandlerWithOptions | Handler | Router, path: string | undefined, method: Method | undefined, options?: RouterHandlerOptions);
|
|
13
|
+
getJSONDoc(doc?: RouterJSONDoc, prePath?: string): RouterJSONDoc;
|
|
14
|
+
invoke(ctx: Context, pathTokens: PathPart[], prePathTokens: PathPartToken[]): Promise<boolean>;
|
|
15
|
+
isMatch(method: string, requestParts: PathPart[], prePathTokens: PathPartToken[]): {
|
|
16
|
+
match: boolean;
|
|
17
|
+
params?: PathParams;
|
|
18
|
+
};
|
|
19
|
+
private static pushResults;
|
|
20
|
+
}
|