@miqro/core 1.3.1 → 1.3.5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/handler/api-handler.d.ts +2 -2
- package/dist/handler/api-handler.js +7 -6
- package/dist/handler/api-handler.js.map +1 -1
- package/dist/handler/api-router-utils.d.ts +1 -8
- package/dist/handler/api-router-utils.js +16 -14
- package/dist/handler/api-router-utils.js.map +1 -1
- package/dist/handler/api-router.d.ts +1 -2
- package/dist/handler/api-router.js.map +1 -1
- package/dist/handler/app.d.ts +1 -2
- package/dist/handler/app.js +95 -13
- package/dist/handler/app.js.map +1 -1
- package/dist/handler/common/context.d.ts +57 -0
- package/dist/handler/common/context.js +123 -0
- package/dist/handler/common/context.js.map +1 -0
- package/dist/handler/common/index.d.ts +2 -55
- package/dist/handler/common/index.js +12 -127
- package/dist/handler/common/index.js.map +1 -1
- package/dist/handler/common/router-utils.d.ts +51 -0
- package/dist/handler/common/router-utils.js +107 -0
- package/dist/handler/common/router-utils.js.map +1 -0
- package/dist/handler/common/router.d.ts +20 -0
- package/dist/handler/common/router.js +82 -0
- package/dist/handler/common/router.js.map +1 -0
- package/dist/handler/common/tokenize-match.d.ts +18 -9
- package/dist/handler/common/tokenize-match.js +35 -28
- package/dist/handler/common/tokenize-match.js.map +1 -1
- package/dist/handler/feature-router.d.ts +3 -2
- package/dist/handler/feature-router.js +3 -3
- package/dist/handler/feature-router.js.map +1 -1
- package/dist/handler/index.d.ts +1 -4
- package/dist/handler/index.js +1 -5
- package/dist/handler/index.js.map +1 -1
- package/dist/{middleware → handler/middleware}/buffer.d.ts +1 -1
- package/dist/{middleware → handler/middleware}/buffer.js +2 -2
- package/dist/handler/middleware/buffer.js.map +1 -0
- package/dist/{middleware → handler/middleware}/cookie.d.ts +1 -1
- package/dist/{middleware → handler/middleware}/cookie.js +1 -1
- package/dist/handler/middleware/cookie.js.map +1 -0
- package/dist/{middleware → handler/middleware}/cors.d.ts +1 -1
- package/dist/{middleware → handler/middleware}/cors.js +2 -2
- package/dist/handler/middleware/cors.js.map +1 -0
- package/dist/{middleware → handler/middleware}/form.d.ts +1 -1
- package/dist/{middleware → handler/middleware}/form.js +2 -2
- package/dist/handler/middleware/form.js.map +1 -0
- package/dist/handler/middleware/group.d.ts +3 -0
- package/dist/{middleware → handler/middleware}/group.js +2 -2
- package/dist/handler/middleware/group.js.map +1 -0
- package/dist/{middleware → handler/middleware}/index.d.ts +1 -1
- package/dist/{middleware → handler/middleware}/index.js +1 -1
- package/dist/handler/middleware/index.js.map +1 -0
- package/dist/{middleware → handler/middleware}/json.d.ts +1 -1
- package/dist/{middleware → handler/middleware}/json.js +2 -2
- package/dist/handler/middleware/json.js.map +1 -0
- package/dist/{middleware → handler/middleware}/logger.d.ts +1 -1
- package/dist/{middleware → handler/middleware}/logger.js +0 -0
- package/dist/handler/middleware/logger.js.map +1 -0
- package/dist/{middleware → handler/middleware}/parse.d.ts +4 -3
- package/dist/{middleware → handler/middleware}/parse.js +11 -1
- package/dist/handler/middleware/parse.js.map +1 -0
- package/dist/{middleware → handler/middleware}/session.d.ts +2 -2
- package/dist/{middleware → handler/middleware}/session.js +3 -3
- package/dist/handler/middleware/session.js.map +1 -0
- package/dist/{middleware → handler/middleware}/tag.d.ts +1 -1
- package/dist/{middleware → handler/middleware}/tag.js +0 -0
- package/dist/handler/middleware/tag.js.map +1 -0
- package/dist/{middleware → handler/middleware}/text.d.ts +1 -1
- package/dist/{middleware → handler/middleware}/text.js +2 -2
- package/dist/handler/middleware/text.js.map +1 -0
- package/dist/handler/{html.d.ts → response/html.d.ts} +1 -1
- package/dist/handler/{html.js → response/html.js} +0 -0
- package/dist/handler/response/html.js.map +1 -0
- package/dist/handler/response/index.d.ts +3 -0
- package/dist/handler/response/index.js +16 -0
- package/dist/handler/response/index.js.map +1 -0
- package/dist/handler/{response.d.ts → response/json.d.ts} +1 -1
- package/dist/handler/{response.js → response/json.js} +1 -1
- package/dist/handler/response/json.js.map +1 -0
- package/dist/handler/response/result.d.ts +4 -0
- package/dist/handler/{result.js → response/result.js} +1 -1
- package/dist/handler/response/result.js.map +1 -0
- package/dist/index.d.ts +0 -2
- package/dist/index.js +0 -2
- package/dist/index.js.map +1 -1
- package/dist/util/cookie/cookie.d.ts +0 -1
- package/dist/util/request/common.d.ts +9 -0
- package/dist/util/request/common.js +99 -1
- package/dist/util/request/common.js.map +1 -1
- package/dist/util/request/index.js +136 -209
- package/dist/util/request/index.js.map +1 -1
- package/dist/util/session/common.d.ts +16 -0
- package/dist/util/session/common.js +49 -0
- package/dist/util/session/common.js.map +1 -0
- package/dist/util/session/index.d.ts +2 -16
- package/dist/util/session/index.js +12 -46
- package/dist/util/session/index.js.map +1 -1
- package/dist/{service/index.d.ts → util/session/service.d.ts} +3 -3
- package/dist/{service/index.js → util/session/service.js} +6 -6
- package/dist/util/session/service.js.map +1 -0
- package/package.json +1 -2
- package/src/handler/api-handler.ts +8 -7
- package/src/handler/api-router-utils.ts +17 -20
- package/src/handler/api-router.ts +1 -2
- package/src/handler/app.ts +95 -10
- package/src/handler/common/context.ts +161 -0
- package/src/handler/common/index.ts +2 -157
- package/src/handler/common/router-utils.ts +140 -0
- package/src/handler/common/router.ts +76 -0
- package/src/handler/common/tokenize-match.ts +42 -40
- package/src/handler/feature-router.ts +4 -3
- package/src/handler/index.ts +1 -5
- package/src/{middleware → handler/middleware}/buffer.ts +3 -3
- package/src/{middleware → handler/middleware}/cookie.ts +2 -2
- package/src/{middleware → handler/middleware}/cors.ts +3 -3
- package/src/{middleware → handler/middleware}/form.ts +3 -3
- package/src/{middleware → handler/middleware}/group.ts +3 -3
- package/src/{middleware → handler/middleware}/index.ts +2 -2
- package/src/{middleware → handler/middleware}/json.ts +3 -3
- package/src/{middleware → handler/middleware}/logger.ts +1 -1
- package/src/{middleware → handler/middleware}/parse.ts +14 -4
- package/src/{middleware → handler/middleware}/session.ts +5 -5
- package/src/{middleware → handler/middleware}/tag.ts +1 -1
- package/src/{middleware → handler/middleware}/text.ts +3 -3
- package/src/handler/{html.ts → response/html.ts} +1 -1
- package/src/handler/response/index.ts +3 -0
- package/src/handler/{response.ts → response/json.ts} +1 -1
- package/src/handler/{result.ts → response/result.ts} +3 -3
- package/src/index.ts +0 -2
- package/src/util/request/common.ts +110 -0
- package/src/util/request/index.ts +141 -211
- package/src/util/session/common.ts +63 -0
- package/src/util/session/index.ts +2 -63
- package/src/{service/index.ts → util/session/service.ts} +7 -7
- package/tsconfig.json +2 -2
- package/dist/handler/common/response.d.ts +0 -13
- package/dist/handler/common/response.js +0 -55
- package/dist/handler/common/response.js.map +0 -1
- package/dist/handler/error.d.ts +0 -2
- package/dist/handler/error.js +0 -47
- package/dist/handler/error.js.map +0 -1
- package/dist/handler/html.js.map +0 -1
- package/dist/handler/response.js.map +0 -1
- package/dist/handler/result.d.ts +0 -4
- package/dist/handler/result.js.map +0 -1
- package/dist/handler/router.d.ts +0 -28
- package/dist/handler/router.js +0 -119
- package/dist/handler/router.js.map +0 -1
- package/dist/middleware/buffer.js.map +0 -1
- package/dist/middleware/cookie.js.map +0 -1
- package/dist/middleware/cors.js.map +0 -1
- package/dist/middleware/form.js.map +0 -1
- package/dist/middleware/group.d.ts +0 -3
- package/dist/middleware/group.js.map +0 -1
- package/dist/middleware/index.js.map +0 -1
- package/dist/middleware/json.js.map +0 -1
- package/dist/middleware/logger.js.map +0 -1
- package/dist/middleware/parse.js.map +0 -1
- package/dist/middleware/session.js.map +0 -1
- package/dist/middleware/tag.js.map +0 -1
- package/dist/middleware/text.js.map +0 -1
- package/dist/service/index.js.map +0 -1
- package/src/handler/common/response.ts +0 -59
- package/src/handler/error.ts +0 -42
- package/src/handler/router.ts +0 -127
|
@@ -0,0 +1,49 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.policyCheck = void 0;
|
|
4
|
+
const error_1 = require("../error");
|
|
5
|
+
const policyCheck = (session, options) => {
|
|
6
|
+
switch (options.groupPolicy) {
|
|
7
|
+
case "at_least_one":
|
|
8
|
+
for (const group of options.groups) {
|
|
9
|
+
if (group instanceof Array) {
|
|
10
|
+
let ret = true;
|
|
11
|
+
for (const g of group) {
|
|
12
|
+
if (session.groups.indexOf(g) === -1) {
|
|
13
|
+
ret = false;
|
|
14
|
+
break;
|
|
15
|
+
}
|
|
16
|
+
}
|
|
17
|
+
if (ret) {
|
|
18
|
+
return true;
|
|
19
|
+
}
|
|
20
|
+
}
|
|
21
|
+
else {
|
|
22
|
+
if (session.groups.indexOf(group) !== -1) {
|
|
23
|
+
return true;
|
|
24
|
+
}
|
|
25
|
+
}
|
|
26
|
+
}
|
|
27
|
+
return false;
|
|
28
|
+
case "all":
|
|
29
|
+
for (const group of options.groups) {
|
|
30
|
+
if (group instanceof Array) {
|
|
31
|
+
for (const g of group) {
|
|
32
|
+
if (session.groups.indexOf(g) === -1) {
|
|
33
|
+
return false;
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
else {
|
|
38
|
+
if (session.groups.indexOf(group) === -1) {
|
|
39
|
+
return false;
|
|
40
|
+
}
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
return true;
|
|
44
|
+
default:
|
|
45
|
+
throw new error_1.ParseOptionsError(`policy [${options.groupPolicy}] not implemented!!`);
|
|
46
|
+
}
|
|
47
|
+
};
|
|
48
|
+
exports.policyCheck = policyCheck;
|
|
49
|
+
//# sourceMappingURL=common.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../src/util/session/common.ts"],"names":[],"mappings":";;;AAAA,oCAA6C;AAsBtC,MAAM,WAAW,GAAG,CAAC,OAAgB,EAAE,OAAoB,EAAW,EAAE;IAC7E,QAAQ,OAAO,CAAC,WAAW,EAAE;QAC3B,KAAK,cAAc;YACjB,KAAK,MAAM,KAAK,IAAI,OAAO,CAAC,MAAM,EAAE;gBAClC,IAAI,KAAK,YAAY,KAAK,EAAE;oBAC1B,IAAI,GAAG,GAAG,IAAI,CAAC;oBACf,KAAK,MAAM,CAAC,IAAI,KAAK,EAAE;wBACrB,IAAI,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE;4BACpC,GAAG,GAAG,KAAK,CAAC;4BACZ,MAAM;yBACP;qBACF;oBACD,IAAI,GAAG,EAAE;wBACP,OAAO,IAAI,CAAC;qBACb;iBACF;qBAAM;oBACL,IAAI,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE;wBACxC,OAAO,IAAI,CAAC;qBACb;iBACF;aACF;YACD,OAAO,KAAK,CAAC;QACf,KAAK,KAAK;YACR,KAAK,MAAM,KAAK,IAAI,OAAO,CAAC,MAAM,EAAE;gBAClC,IAAI,KAAK,YAAY,KAAK,EAAE;oBAC1B,KAAK,MAAM,CAAC,IAAI,KAAK,EAAE;wBACrB,IAAI,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE;4BACpC,OAAO,KAAK,CAAC;yBACd;qBACF;iBACF;qBAAM;oBACL,IAAI,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE;wBACxC,OAAO,KAAK,CAAC;qBACd;iBACF;aACF;YACD,OAAO,IAAI,CAAC;QACd;YACE,MAAM,IAAI,yBAAiB,CAAC,WAAW,OAAO,CAAC,WAAW,qBAAqB,CAAC,CAAC;KACpF;AACH,CAAC,CAAC;AAxCW,QAAA,WAAW,eAwCtB"}
|
|
@@ -1,16 +1,2 @@
|
|
|
1
|
-
|
|
2
|
-
export
|
|
3
|
-
account: string;
|
|
4
|
-
username: string;
|
|
5
|
-
groups: string[];
|
|
6
|
-
}
|
|
7
|
-
export interface Session extends NoTokenSession {
|
|
8
|
-
token: string;
|
|
9
|
-
}
|
|
10
|
-
export declare type GroupPolicyType = "at_least_one" | "all";
|
|
11
|
-
export declare type GroupPolicyGroups = string | string[];
|
|
12
|
-
export interface GroupPolicy {
|
|
13
|
-
groups: GroupPolicyGroups[];
|
|
14
|
-
groupPolicy: GroupPolicyType;
|
|
15
|
-
}
|
|
16
|
-
export declare const policyCheck: (session: Session, options: GroupPolicy) => boolean;
|
|
1
|
+
export * from "./common";
|
|
2
|
+
export * from "./service";
|
|
@@ -1,49 +1,15 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
Object.
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
for (const g of group) {
|
|
12
|
-
if (session.groups.indexOf(g) === -1) {
|
|
13
|
-
ret = false;
|
|
14
|
-
break;
|
|
15
|
-
}
|
|
16
|
-
}
|
|
17
|
-
if (ret) {
|
|
18
|
-
return true;
|
|
19
|
-
}
|
|
20
|
-
}
|
|
21
|
-
else {
|
|
22
|
-
if (session.groups.indexOf(group) !== -1) {
|
|
23
|
-
return true;
|
|
24
|
-
}
|
|
25
|
-
}
|
|
26
|
-
}
|
|
27
|
-
return false;
|
|
28
|
-
case "all":
|
|
29
|
-
for (const group of options.groups) {
|
|
30
|
-
if (group instanceof Array) {
|
|
31
|
-
for (const g of group) {
|
|
32
|
-
if (session.groups.indexOf(g) === -1) {
|
|
33
|
-
return false;
|
|
34
|
-
}
|
|
35
|
-
}
|
|
36
|
-
}
|
|
37
|
-
else {
|
|
38
|
-
if (session.groups.indexOf(group) === -1) {
|
|
39
|
-
return false;
|
|
40
|
-
}
|
|
41
|
-
}
|
|
42
|
-
}
|
|
43
|
-
return true;
|
|
44
|
-
default:
|
|
45
|
-
throw new error_1.ParseOptionsError(`policy [${options.groupPolicy}] not implemented!!`);
|
|
46
|
-
}
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
|
|
5
|
+
}) : (function(o, m, k, k2) {
|
|
6
|
+
if (k2 === undefined) k2 = k;
|
|
7
|
+
o[k2] = m[k];
|
|
8
|
+
}));
|
|
9
|
+
var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
10
|
+
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
47
11
|
};
|
|
48
|
-
exports
|
|
12
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
13
|
+
__exportStar(require("./common"), exports);
|
|
14
|
+
__exportStar(require("./service"), exports);
|
|
49
15
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/util/session/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/util/session/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAAyB;AACzB,4CAA0B"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import { Session, NoTokenSession } from "
|
|
2
|
-
import { Context } from "
|
|
3
|
-
import { RequestOptions, RequestResponse } from "../
|
|
1
|
+
import { Session, NoTokenSession } from "./common";
|
|
2
|
+
import { Context } from "../../handler/common";
|
|
3
|
+
import { RequestOptions, RequestResponse } from "../request";
|
|
4
4
|
export interface VerifyTokenService {
|
|
5
5
|
verify(args: {
|
|
6
6
|
token: string;
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.VerifyEndpointService = void 0;
|
|
4
|
-
const config_1 = require("../
|
|
5
|
-
const error_1 = require("../
|
|
6
|
-
const request_1 = require("../
|
|
7
|
-
const parser_1 = require("../
|
|
8
|
-
const cookie_1 = require("../
|
|
4
|
+
const config_1 = require("../config");
|
|
5
|
+
const error_1 = require("../error");
|
|
6
|
+
const request_1 = require("../request");
|
|
7
|
+
const parser_1 = require("../parser");
|
|
8
|
+
const cookie_1 = require("../cookie");
|
|
9
9
|
const DEFAULT_TOKEN_LOCATION = "header";
|
|
10
10
|
const DEFAULT_TOKEN_HEADER = "Authorization";
|
|
11
11
|
const DEFAULT_TOKEN_QUERY = "token";
|
|
@@ -140,4 +140,4 @@ class VerifyEndpointService {
|
|
|
140
140
|
}
|
|
141
141
|
}
|
|
142
142
|
exports.VerifyEndpointService = VerifyEndpointService;
|
|
143
|
-
//# sourceMappingURL=
|
|
143
|
+
//# sourceMappingURL=service.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"service.js","sourceRoot":"","sources":["../../../src/util/session/service.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@miqro/core",
|
|
3
|
-
"version": "1.3.
|
|
3
|
+
"version": "1.3.5",
|
|
4
4
|
"description": "",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -18,7 +18,6 @@
|
|
|
18
18
|
"author": "claukers",
|
|
19
19
|
"license": "ISC",
|
|
20
20
|
"devDependencies": {
|
|
21
|
-
"@types/mocha": "^9.0.0",
|
|
22
21
|
"@types/node": "^16.7.10",
|
|
23
22
|
"@typescript-eslint/eslint-plugin": "^5.3.0",
|
|
24
23
|
"@typescript-eslint/parser": "^5.3.0",
|
|
@@ -1,15 +1,16 @@
|
|
|
1
1
|
import { GroupPolicy } from "../util/session";
|
|
2
|
-
import { SessionHandler, SessionHandlerOptions } from "
|
|
3
|
-
import { GroupPolicyHandler } from "
|
|
2
|
+
import { SessionHandler, SessionHandlerOptions } from "./middleware/session";
|
|
3
|
+
import { GroupPolicyHandler } from "./middleware/group";
|
|
4
4
|
import { Parser } from "../util/parser";
|
|
5
5
|
import { ParseOptions } from "../util/parser/common";
|
|
6
6
|
import { Handler } from "./common";
|
|
7
|
-
import { ParseRequest } from "
|
|
8
|
-
import { ResponseHandler } from "./response";
|
|
9
|
-
import { ResultParser } from "./result";
|
|
7
|
+
import { ParseRequest } from "./middleware/parse";
|
|
8
|
+
import { ResponseHandler } from "./response/json";
|
|
9
|
+
import { ResultParser } from "./response/result";
|
|
10
10
|
|
|
11
11
|
export interface APIHandlerOptions {
|
|
12
12
|
parser?: Parser;
|
|
13
|
+
headers?: ParseOptions | ParseOptions[];
|
|
13
14
|
query?: ParseOptions | false | ParseOptions[];
|
|
14
15
|
params?: ParseOptions | false | ParseOptions[];
|
|
15
16
|
body?: ParseOptions | false | ParseOptions[];
|
|
@@ -18,7 +19,6 @@ export interface APIHandlerOptions {
|
|
|
18
19
|
middleware?: Handler[];
|
|
19
20
|
session?: SessionHandlerOptions | Handler;
|
|
20
21
|
policy?: GroupPolicy;
|
|
21
|
-
responseHandler?: Handler;
|
|
22
22
|
}
|
|
23
23
|
|
|
24
24
|
/**
|
|
@@ -41,6 +41,7 @@ export const APIHandler = (options: APIHandlerOptions): Array<Handler> =>
|
|
|
41
41
|
.concat(options.policy ? [GroupPolicyHandler(options.policy)] : [])
|
|
42
42
|
// setup request parse
|
|
43
43
|
.concat([ParseRequest({
|
|
44
|
+
headers: options.headers,
|
|
44
45
|
query: options.query,
|
|
45
46
|
params: options.params,
|
|
46
47
|
body: options.body,
|
|
@@ -51,4 +52,4 @@ export const APIHandler = (options: APIHandlerOptions): Array<Handler> =>
|
|
|
51
52
|
// setup response parse
|
|
52
53
|
.concat(options.result ? ResultParser(options.result, options.parser) : [])
|
|
53
54
|
// setup response handler
|
|
54
|
-
.concat(
|
|
55
|
+
.concat(ResponseHandler());
|
|
@@ -1,22 +1,16 @@
|
|
|
1
1
|
import { lstatSync, readdirSync } from "fs";
|
|
2
2
|
import { join, parse, resolve } from "path";
|
|
3
3
|
import { Logger } from "../util/logger";
|
|
4
|
-
import { APIHandler } from "./api-handler";
|
|
5
4
|
import { APIRoute } from "./api-router";
|
|
6
5
|
import { Method } from "./common";
|
|
7
6
|
import { normalizePath } from "./common/tokenize-match";
|
|
8
7
|
import { FeatureRouterOptions } from "./feature-router";
|
|
9
8
|
|
|
10
|
-
interface TraversedAPIRoute extends APIRoute {
|
|
11
|
-
method: Method | Method[];
|
|
12
|
-
path: string | string[];
|
|
13
|
-
}
|
|
14
|
-
|
|
15
9
|
export const traverseAPIRouteDir = (
|
|
16
10
|
featureName: string,
|
|
17
11
|
dirname: string,
|
|
18
12
|
basePath = "/",
|
|
19
|
-
features: FeatureRouterOptions
|
|
13
|
+
features: FeatureRouterOptions = {}, logger?: Logger): FeatureRouterOptions => {
|
|
20
14
|
if (logger) {
|
|
21
15
|
logger.trace("loading routes from [%s]", dirname);
|
|
22
16
|
}
|
|
@@ -77,21 +71,24 @@ export const traverseAPIRouteDir = (
|
|
|
77
71
|
throw new Error(`${___filePath} feature name collides with ${(features[newFeatureSubPath] as any).___filePath}`)
|
|
78
72
|
}
|
|
79
73
|
features[newFeatureSubPath] = {
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
74
|
+
options: {
|
|
75
|
+
name: route.name,
|
|
76
|
+
description: route.description,
|
|
77
|
+
parser: route.parser,
|
|
78
|
+
middleware: route.middleware,
|
|
84
79
|
session: route.session,
|
|
85
80
|
policy: route.policy,
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
81
|
+
request: {
|
|
82
|
+
headers: route.headers,
|
|
83
|
+
query: route.query,
|
|
84
|
+
body: route.body,
|
|
85
|
+
params: route.params,
|
|
86
|
+
},
|
|
87
|
+
response: route.result ? route.result : true
|
|
88
|
+
},
|
|
89
|
+
path,
|
|
90
|
+
method: routeMethods,
|
|
91
|
+
handler: route.handler
|
|
95
92
|
};
|
|
96
93
|
(features[newFeatureSubPath] as any).___filePath = ___filePath;
|
|
97
94
|
}
|
|
@@ -3,9 +3,8 @@ import { basename } from "path";
|
|
|
3
3
|
import { Logger } from "../util";
|
|
4
4
|
import { APIHandlerOptions } from "./api-handler";
|
|
5
5
|
import { traverseAPIRouteDir } from "./api-router-utils";
|
|
6
|
-
import { Method } from "./common";
|
|
6
|
+
import { Router, Method } from "./common";
|
|
7
7
|
import { FeatureRouter } from "./feature-router";
|
|
8
|
-
import { Router } from "./router";
|
|
9
8
|
|
|
10
9
|
export interface APIRoute extends APIHandlerOptions {
|
|
11
10
|
name?: string;
|
package/src/handler/app.ts
CHANGED
|
@@ -1,8 +1,6 @@
|
|
|
1
1
|
import { createServer, IncomingMessage, RequestListener, Server, ServerResponse } from "http";
|
|
2
2
|
import { Logger } from "../util";
|
|
3
|
-
import {
|
|
4
|
-
import { DefaultErrorHandler } from "./error";
|
|
5
|
-
import { Router } from "./router";
|
|
3
|
+
import { Router, Context, ErrorHandler } from "./common";
|
|
6
4
|
|
|
7
5
|
export interface AppOptions {
|
|
8
6
|
newRequestLogger?: (req: IncomingMessage) => Logger;
|
|
@@ -28,21 +26,27 @@ export class App extends Router {
|
|
|
28
26
|
try {
|
|
29
27
|
await this.run(ctx);
|
|
30
28
|
if (!ctx.res.headersSent) {
|
|
31
|
-
ctx.end(
|
|
29
|
+
ctx.end({
|
|
30
|
+
headers: TEXT_HEADERS,
|
|
31
|
+
status: STATUS.NOT_FOUND,
|
|
32
|
+
body: "NOT FOUND"
|
|
33
|
+
});
|
|
32
34
|
}
|
|
33
35
|
} catch (e: any) {
|
|
34
36
|
try {
|
|
35
|
-
|
|
36
|
-
} catch (e2) {
|
|
37
|
-
try {
|
|
37
|
+
if (!ctx.res.headersSent) {
|
|
38
38
|
await errorHandler(e, ctx);
|
|
39
39
|
if (!ctx.res.headersSent) {
|
|
40
40
|
ctx.logger.error(e);
|
|
41
|
-
ctx.end(
|
|
41
|
+
ctx.end({
|
|
42
|
+
headers: TEXT_HEADERS,
|
|
43
|
+
status: STATUS.ERROR,
|
|
44
|
+
body: "SERVER ERROR"
|
|
45
|
+
});
|
|
42
46
|
}
|
|
43
|
-
} catch (e3) {
|
|
44
|
-
ctx.logger.error(e3);
|
|
45
47
|
}
|
|
48
|
+
} catch (e3) {
|
|
49
|
+
ctx.logger.error(e3);
|
|
46
50
|
}
|
|
47
51
|
}
|
|
48
52
|
};
|
|
@@ -51,3 +55,84 @@ export class App extends Router {
|
|
|
51
55
|
return createServer(this.listener).listen(...args)
|
|
52
56
|
}
|
|
53
57
|
}
|
|
58
|
+
|
|
59
|
+
const TEXT_HEADERS = {
|
|
60
|
+
["Content-Type"]: "plain/text; charset=utf-8"
|
|
61
|
+
}
|
|
62
|
+
|
|
63
|
+
const STATUS = {
|
|
64
|
+
ERROR: 503,
|
|
65
|
+
BAD_REQUEST: 400,
|
|
66
|
+
NOT_FOUND: 404,
|
|
67
|
+
NOT_IMPLEMENTED: 501,
|
|
68
|
+
FORBIDDEN: 403,
|
|
69
|
+
UNAUTHORIZED: 401,
|
|
70
|
+
};
|
|
71
|
+
|
|
72
|
+
const DefaultErrorHandler = (): ErrorHandler<boolean> => {
|
|
73
|
+
return async (e: any, ctx: Context): Promise<boolean> => {
|
|
74
|
+
if (!e || !e.name || e.name === "Error") {
|
|
75
|
+
if (process.env.NODE_ENV === "development" || process.env.NODE_ENV === "test") {
|
|
76
|
+
ctx.logger.error(e);
|
|
77
|
+
await ctx.end({
|
|
78
|
+
headers: TEXT_HEADERS,
|
|
79
|
+
status: STATUS.ERROR,
|
|
80
|
+
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}` : ""}`
|
|
81
|
+
});
|
|
82
|
+
return false;
|
|
83
|
+
}
|
|
84
|
+
} else {
|
|
85
|
+
ctx.logger.error(e);
|
|
86
|
+
const name = e && e.name ? e.name : undefined;
|
|
87
|
+
switch (name) {
|
|
88
|
+
case "NotFoundError":
|
|
89
|
+
await ctx.end({
|
|
90
|
+
headers: TEXT_HEADERS,
|
|
91
|
+
status: STATUS.NOT_FOUND,
|
|
92
|
+
body: e.message ? e.message : "NOT FOUND"
|
|
93
|
+
});
|
|
94
|
+
break;
|
|
95
|
+
case "MethodNotImplementedError":
|
|
96
|
+
await ctx.end({
|
|
97
|
+
headers: TEXT_HEADERS,
|
|
98
|
+
status: STATUS.NOT_IMPLEMENTED,
|
|
99
|
+
body: e.message ? e.message : "NOT IMPLEMENTED"
|
|
100
|
+
});
|
|
101
|
+
break;
|
|
102
|
+
case "ForbiddenError":
|
|
103
|
+
await ctx.end({
|
|
104
|
+
headers: TEXT_HEADERS,
|
|
105
|
+
status: STATUS.FORBIDDEN,
|
|
106
|
+
body: e.message ? e.message : "FORBIDDEN"
|
|
107
|
+
});
|
|
108
|
+
break;
|
|
109
|
+
case "UnAuthorizedError":
|
|
110
|
+
await ctx.end({
|
|
111
|
+
headers: TEXT_HEADERS,
|
|
112
|
+
status: STATUS.UNAUTHORIZED,
|
|
113
|
+
body: e.message ? e.message : "UNAUTHORIZED"
|
|
114
|
+
});
|
|
115
|
+
break;
|
|
116
|
+
case "ParseOptionsError":
|
|
117
|
+
case "SequelizeValidationError":
|
|
118
|
+
case "SequelizeEagerLoadingError":
|
|
119
|
+
case "SequelizeUniqueConstraintError":
|
|
120
|
+
await ctx.end({
|
|
121
|
+
headers: TEXT_HEADERS,
|
|
122
|
+
status: STATUS.BAD_REQUEST,
|
|
123
|
+
body: e.message ? e.message : "BAD REQUEST"
|
|
124
|
+
});
|
|
125
|
+
break;
|
|
126
|
+
default:
|
|
127
|
+
await ctx.end({
|
|
128
|
+
headers: TEXT_HEADERS,
|
|
129
|
+
status: STATUS.ERROR,
|
|
130
|
+
body: e.message ? e.message : "SERVER ERROR"
|
|
131
|
+
});
|
|
132
|
+
break;
|
|
133
|
+
}
|
|
134
|
+
return false;
|
|
135
|
+
}
|
|
136
|
+
return true;
|
|
137
|
+
};
|
|
138
|
+
};
|
|
@@ -0,0 +1,161 @@
|
|
|
1
|
+
import { getLogger, Logger } from "../../util/logger";
|
|
2
|
+
import { Session } from "../../util/session";
|
|
3
|
+
import { IncomingHttpHeaders, IncomingMessage, OutgoingHttpHeaders, ServerResponse } from "http";
|
|
4
|
+
import { normalizePath, parseSearchParams } from "./tokenize-match";
|
|
5
|
+
import { URL } from "url";
|
|
6
|
+
import { defaultLoggerFormatter } from "../../util/logger/formatter";
|
|
7
|
+
import { newURL } from "./helpers";
|
|
8
|
+
import { UUID } from "../../util/uuid";
|
|
9
|
+
import { COOKIE } from "../../util/cookie";
|
|
10
|
+
|
|
11
|
+
export type Method = "get" | "post" | "put" | "delete" | "patch" | "options" | "GET" | "POST" | "PUT" | "DELETE" | "PATCH" | "OPTIONS";
|
|
12
|
+
|
|
13
|
+
//export { BAD_REQUEST, METHOD_NOT_IMPLEMENTED, NOT_FOUND, ERROR_RESPONSE, FORBIDDEN, Response, UNAUTHORIZED } from "./response";
|
|
14
|
+
|
|
15
|
+
export type Handler<T = boolean | void | any> = ((ctx: Context) => Promise<T>) | ((ctx: Context) => T);
|
|
16
|
+
|
|
17
|
+
export type ErrorHandler<T = boolean | void | any> = ((e: unknown, ctx: Context) => Promise<T>) | ((e: unknown, ctx: Context) => T);
|
|
18
|
+
|
|
19
|
+
export class Context {
|
|
20
|
+
public readonly url: URL; // new URL(req.url ? req.url : "/", `http://${req.headers.host}`)
|
|
21
|
+
public readonly logger: Logger; // new Logger(...)
|
|
22
|
+
public readonly startMS: number; // Date.now()
|
|
23
|
+
public uuid: string; // a middleware will fill this
|
|
24
|
+
public session?: Session; // a middleware will fill this
|
|
25
|
+
public results: any[]; // handlers will fill this
|
|
26
|
+
public readonly path: string; // normalized path
|
|
27
|
+
public readonly hash: string; // from this.url.hash
|
|
28
|
+
public readonly method: string; // from this.url.method
|
|
29
|
+
public headers: IncomingHttpHeaders; // from this.req.headers
|
|
30
|
+
public readonly cookies: { [name: string]: string }; // a middleware will fill this
|
|
31
|
+
public query: { [name: string]: string | string[] }; // parseSearchParams will fill this with this.url.searchParams
|
|
32
|
+
public params: { [name: string]: string | undefined } = {}; // the router will fill this
|
|
33
|
+
public buffer: Buffer; // empty buffer. middleware must read it
|
|
34
|
+
public readonly remoteAddress?: string;
|
|
35
|
+
public body: any; // a middleware will fill this reading the buffer
|
|
36
|
+
constructor(public readonly req: IncomingMessage, public readonly res: ServerResponse, logger?: Logger) {
|
|
37
|
+
this.body = undefined as any;
|
|
38
|
+
this.res.removeHeader("Date");
|
|
39
|
+
this.url = newURL(req.url ? req.url : "/", `http://${req.headers.host}`) as URL;
|
|
40
|
+
this.method = req.method ? req.method.toUpperCase() as string : "GET";
|
|
41
|
+
this.path = normalizePath(this.url.pathname); // normalized path
|
|
42
|
+
this.hash = this.url.hash;
|
|
43
|
+
this.query = parseSearchParams(this.url.searchParams);
|
|
44
|
+
this.buffer = Buffer.from("");
|
|
45
|
+
this.remoteAddress = req.socket.remoteAddress;
|
|
46
|
+
this.cookies = {}; // a middleware will fill
|
|
47
|
+
this.headers = req.headers;
|
|
48
|
+
this.startMS = Date.now();
|
|
49
|
+
this.uuid = UUID.v4().toString("utf-8");
|
|
50
|
+
this.results = []; // handlers will fill this
|
|
51
|
+
const pathToEnv = this.path.replace(/\//ig, "_").toUpperCase();
|
|
52
|
+
const identifier = `${pathToEnv === "_" ? "" : pathToEnv.substring(1)}${this.method.toUpperCase()}`;
|
|
53
|
+
this.logger = logger ? logger : getLogger(identifier, {
|
|
54
|
+
formatter: ({
|
|
55
|
+
identifier,
|
|
56
|
+
level,
|
|
57
|
+
message,
|
|
58
|
+
}) => defaultLoggerFormatter({
|
|
59
|
+
identifier,
|
|
60
|
+
level,
|
|
61
|
+
message: `${this.method} ${this.url}${this.uuid ? ` [${this.uuid}]` : ""}${this.remoteAddress ? ` (${this.remoteAddress})` : ""}${this.session ?
|
|
62
|
+
` session[${this.session.username}:${this.session.account}]` :
|
|
63
|
+
""
|
|
64
|
+
} ${message}`
|
|
65
|
+
})
|
|
66
|
+
}, false);
|
|
67
|
+
}
|
|
68
|
+
public async close(): Promise<void> {
|
|
69
|
+
return this.end({
|
|
70
|
+
status: 400,
|
|
71
|
+
headers: {
|
|
72
|
+
connection: "close"
|
|
73
|
+
}
|
|
74
|
+
});
|
|
75
|
+
}
|
|
76
|
+
public addVaryHeader(value: number | string | ReadonlyArray<string>): ServerResponse {
|
|
77
|
+
const c = this.res.getHeader("Vary");
|
|
78
|
+
const current = c ? c instanceof Array ? c.join(", ") : String(c) : "";
|
|
79
|
+
const nV = value instanceof Array ? value.join(", ") : String(value);
|
|
80
|
+
const newValue = current ? `${current}, ${nV}` : nV;
|
|
81
|
+
return this.res.setHeader("Vary", newValue.indexOf("*") !== -1 ? "*" : newValue);
|
|
82
|
+
}
|
|
83
|
+
public setHeader(name: string, value: number | string | ReadonlyArray<string>): ServerResponse {
|
|
84
|
+
return this.res.setHeader(name, value);
|
|
85
|
+
}
|
|
86
|
+
public setCookie(name: string, value: string, options?: {
|
|
87
|
+
encode?: (uriComponent: string | number | boolean) => string;
|
|
88
|
+
maxAge?: number | null;
|
|
89
|
+
domain?: string;
|
|
90
|
+
httpOnly?: boolean;
|
|
91
|
+
secure?: boolean;
|
|
92
|
+
path?: string;
|
|
93
|
+
expires?: Date;
|
|
94
|
+
sameSite?: "lax" | "strict" | "none" | true;
|
|
95
|
+
}): ServerResponse {
|
|
96
|
+
return this.setHeader('Set-Cookie', COOKIE.serialize(name, String(value), options));
|
|
97
|
+
}
|
|
98
|
+
public async end({ status, headers, body }: {
|
|
99
|
+
body?: any;
|
|
100
|
+
status: number;
|
|
101
|
+
headers: OutgoingHttpHeaders;
|
|
102
|
+
}): Promise<void> {
|
|
103
|
+
return new Promise<void>((resolve, reject) => {
|
|
104
|
+
try {
|
|
105
|
+
this.res.statusCode = status;
|
|
106
|
+
const keys = Object.keys(headers);
|
|
107
|
+
for (const key of keys) {
|
|
108
|
+
if (headers[key] !== undefined) {
|
|
109
|
+
this.res.setHeader(key, headers[key] as any);
|
|
110
|
+
}
|
|
111
|
+
}
|
|
112
|
+
this.res.end(body !== undefined ? String(body) : undefined, () => {
|
|
113
|
+
resolve();
|
|
114
|
+
});
|
|
115
|
+
} catch (e) {
|
|
116
|
+
reject(e);
|
|
117
|
+
}
|
|
118
|
+
});
|
|
119
|
+
}
|
|
120
|
+
/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
|
|
121
|
+
public async json(body: any, headers?: OutgoingHttpHeaders, status?: number): Promise<void> {
|
|
122
|
+
return this.end({
|
|
123
|
+
status: status !== undefined ? status : 200,
|
|
124
|
+
headers: {
|
|
125
|
+
['Content-Type']: 'application/json; charset=utf-8',
|
|
126
|
+
...headers,
|
|
127
|
+
},
|
|
128
|
+
body: JSON.stringify(body)
|
|
129
|
+
})
|
|
130
|
+
}
|
|
131
|
+
public async text(text: string, headers?: OutgoingHttpHeaders, status?: number): Promise<void> {
|
|
132
|
+
return this.end({
|
|
133
|
+
status: status !== undefined ? status : 200,
|
|
134
|
+
headers: {
|
|
135
|
+
['Content-Type']: 'plain/text; charset=utf-8',
|
|
136
|
+
...headers
|
|
137
|
+
},
|
|
138
|
+
body: text
|
|
139
|
+
});
|
|
140
|
+
}
|
|
141
|
+
public async html(html: string, headers?: OutgoingHttpHeaders, status?: number): Promise<void> {
|
|
142
|
+
return this.end({
|
|
143
|
+
status: status !== undefined ? status : 200,
|
|
144
|
+
headers: {
|
|
145
|
+
['Content-Type']: 'text/html; charset=utf-8',
|
|
146
|
+
...headers
|
|
147
|
+
},
|
|
148
|
+
body: html
|
|
149
|
+
})
|
|
150
|
+
}
|
|
151
|
+
public async redirect(url: string, headers?: OutgoingHttpHeaders, status?: number): Promise<void> {
|
|
152
|
+
return this.end({
|
|
153
|
+
status: status !== undefined ? status : 302,
|
|
154
|
+
headers: {
|
|
155
|
+
['Location']: url,
|
|
156
|
+
...headers
|
|
157
|
+
}
|
|
158
|
+
})
|
|
159
|
+
}
|
|
160
|
+
}
|
|
161
|
+
|