@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
|
@@ -1,130 +1,15 @@
|
|
|
1
1
|
"use strict";
|
|
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);
|
|
11
|
+
};
|
|
2
12
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
const tokenize_match_1 = require("./tokenize-match");
|
|
6
|
-
const formatter_1 = require("../../util/logger/formatter");
|
|
7
|
-
const helpers_1 = require("./helpers");
|
|
8
|
-
const uuid_1 = require("../../util/uuid");
|
|
9
|
-
const cookie_1 = require("../../util/cookie");
|
|
10
|
-
var response_1 = require("./response");
|
|
11
|
-
Object.defineProperty(exports, "BAD_REQUEST", { enumerable: true, get: function () { return response_1.BAD_REQUEST; } });
|
|
12
|
-
Object.defineProperty(exports, "METHOD_NOT_IMPLEMENTED", { enumerable: true, get: function () { return response_1.METHOD_NOT_IMPLEMENTED; } });
|
|
13
|
-
Object.defineProperty(exports, "NOT_FOUND", { enumerable: true, get: function () { return response_1.NOT_FOUND; } });
|
|
14
|
-
Object.defineProperty(exports, "ERROR_RESPONSE", { enumerable: true, get: function () { return response_1.ERROR_RESPONSE; } });
|
|
15
|
-
Object.defineProperty(exports, "FORBIDDEN", { enumerable: true, get: function () { return response_1.FORBIDDEN; } });
|
|
16
|
-
Object.defineProperty(exports, "UNAUTHORIZED", { enumerable: true, get: function () { return response_1.UNAUTHORIZED; } });
|
|
17
|
-
class Context {
|
|
18
|
-
constructor(req, res, logger) {
|
|
19
|
-
this.req = req;
|
|
20
|
-
this.res = res;
|
|
21
|
-
this.params = {}; // the router will fill this
|
|
22
|
-
this.body = undefined;
|
|
23
|
-
this.res.removeHeader("Date");
|
|
24
|
-
this.url = (0, helpers_1.newURL)(req.url ? req.url : "/", `http://${req.headers.host}`);
|
|
25
|
-
this.method = req.method ? req.method.toUpperCase() : "GET";
|
|
26
|
-
this.path = (0, tokenize_match_1.normalizePath)(this.url.pathname); // normalized path
|
|
27
|
-
this.hash = this.url.hash;
|
|
28
|
-
this.query = (0, tokenize_match_1.parseSearchParams)(this.url.searchParams);
|
|
29
|
-
this.buffer = Buffer.from("");
|
|
30
|
-
this.remoteAddress = req.socket.remoteAddress;
|
|
31
|
-
this.cookies = {}; // a middleware will fill
|
|
32
|
-
this.headers = req.headers;
|
|
33
|
-
this.startMS = Date.now();
|
|
34
|
-
this.uuid = uuid_1.UUID.v4().toString("utf-8");
|
|
35
|
-
this.results = []; // handlers will fill this
|
|
36
|
-
const pathToEnv = this.path.replace(/\//ig, "_").toUpperCase();
|
|
37
|
-
const identifier = `${pathToEnv === "_" ? "" : pathToEnv.substring(1)}${this.method.toUpperCase()}`;
|
|
38
|
-
this.logger = logger ? logger : (0, logger_1.getLogger)(identifier, {
|
|
39
|
-
formatter: ({ identifier, level, message, }) => (0, formatter_1.defaultLoggerFormatter)({
|
|
40
|
-
identifier,
|
|
41
|
-
level,
|
|
42
|
-
message: `${this.method} ${this.url}${this.uuid ? ` [${this.uuid}]` : ""}${this.remoteAddress ? ` (${this.remoteAddress})` : ""}${this.session ?
|
|
43
|
-
` session[${this.session.username}:${this.session.account}]` :
|
|
44
|
-
""} ${message}`
|
|
45
|
-
})
|
|
46
|
-
}, false);
|
|
47
|
-
}
|
|
48
|
-
async close() {
|
|
49
|
-
return this.end({
|
|
50
|
-
status: 400,
|
|
51
|
-
headers: {
|
|
52
|
-
connection: "close"
|
|
53
|
-
}
|
|
54
|
-
});
|
|
55
|
-
}
|
|
56
|
-
addVaryHeader(value) {
|
|
57
|
-
const c = this.res.getHeader("Vary");
|
|
58
|
-
const current = c ? c instanceof Array ? c.join(", ") : String(c) : "";
|
|
59
|
-
const nV = value instanceof Array ? value.join(", ") : String(value);
|
|
60
|
-
const newValue = current ? `${current}, ${nV}` : nV;
|
|
61
|
-
return this.res.setHeader("Vary", newValue.indexOf("*") !== -1 ? "*" : newValue);
|
|
62
|
-
}
|
|
63
|
-
setHeader(name, value) {
|
|
64
|
-
return this.res.setHeader(name, value);
|
|
65
|
-
}
|
|
66
|
-
setCookie(name, value, options) {
|
|
67
|
-
return this.setHeader('Set-Cookie', cookie_1.COOKIE.serialize(name, String(value), options));
|
|
68
|
-
}
|
|
69
|
-
async end({ status, headers, body }) {
|
|
70
|
-
return new Promise((resolve, reject) => {
|
|
71
|
-
try {
|
|
72
|
-
this.res.statusCode = status;
|
|
73
|
-
const keys = Object.keys(headers);
|
|
74
|
-
for (const key of keys) {
|
|
75
|
-
if (headers[key] !== undefined) {
|
|
76
|
-
this.res.setHeader(key, headers[key]);
|
|
77
|
-
}
|
|
78
|
-
}
|
|
79
|
-
this.res.end(body !== undefined ? String(body) : undefined, () => {
|
|
80
|
-
resolve();
|
|
81
|
-
});
|
|
82
|
-
}
|
|
83
|
-
catch (e) {
|
|
84
|
-
reject(e);
|
|
85
|
-
}
|
|
86
|
-
});
|
|
87
|
-
}
|
|
88
|
-
/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
|
|
89
|
-
async json(body, headers, status) {
|
|
90
|
-
return this.end({
|
|
91
|
-
status: status !== undefined ? status : 200,
|
|
92
|
-
headers: {
|
|
93
|
-
['Content-Type']: 'application/json; charset=utf-8',
|
|
94
|
-
...headers,
|
|
95
|
-
},
|
|
96
|
-
body: JSON.stringify(body)
|
|
97
|
-
});
|
|
98
|
-
}
|
|
99
|
-
async text(text, headers, status) {
|
|
100
|
-
return this.end({
|
|
101
|
-
status: status !== undefined ? status : 200,
|
|
102
|
-
headers: {
|
|
103
|
-
['Content-Type']: 'plain/text; charset=utf-8',
|
|
104
|
-
...headers
|
|
105
|
-
},
|
|
106
|
-
body: text
|
|
107
|
-
});
|
|
108
|
-
}
|
|
109
|
-
async html(html, headers, status) {
|
|
110
|
-
return this.end({
|
|
111
|
-
status: status !== undefined ? status : 200,
|
|
112
|
-
headers: {
|
|
113
|
-
['Content-Type']: 'text/html; charset=utf-8',
|
|
114
|
-
...headers
|
|
115
|
-
},
|
|
116
|
-
body: html
|
|
117
|
-
});
|
|
118
|
-
}
|
|
119
|
-
async redirect(url, headers, status) {
|
|
120
|
-
return this.end({
|
|
121
|
-
status: status !== undefined ? status : 302,
|
|
122
|
-
headers: {
|
|
123
|
-
['Location']: url,
|
|
124
|
-
...headers
|
|
125
|
-
}
|
|
126
|
-
});
|
|
127
|
-
}
|
|
128
|
-
}
|
|
129
|
-
exports.Context = Context;
|
|
13
|
+
__exportStar(require("./router"), exports);
|
|
14
|
+
__exportStar(require("./context"), exports);
|
|
130
15
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/handler/common/index.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/handler/common/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,2CAAyB;AACzB,4CAA0B"}
|
|
@@ -0,0 +1,51 @@
|
|
|
1
|
+
import { Router } from "./router";
|
|
2
|
+
import { Context, Handler } from "./context";
|
|
3
|
+
import { Method } from "./context";
|
|
4
|
+
import { PathPartToken } from "./tokenize-match";
|
|
5
|
+
import { Parser, ParseOptions } from "../../util/parser";
|
|
6
|
+
import { SessionHandlerOptions } from "../middleware/session";
|
|
7
|
+
import { GroupPolicy } from "../../util/session";
|
|
8
|
+
export interface RouterJSONDoc {
|
|
9
|
+
[path: string]: {
|
|
10
|
+
[method: string]: RouterHandlerOptions;
|
|
11
|
+
};
|
|
12
|
+
}
|
|
13
|
+
export interface RouterHandlerOptions {
|
|
14
|
+
name?: string;
|
|
15
|
+
description?: string;
|
|
16
|
+
parser?: Parser;
|
|
17
|
+
middleware?: Handler | Handler[];
|
|
18
|
+
session?: SessionHandlerOptions | Handler;
|
|
19
|
+
policy?: GroupPolicy;
|
|
20
|
+
request?: {
|
|
21
|
+
headers?: ParseOptions | ParseOptions[];
|
|
22
|
+
query?: ParseOptions | false | ParseOptions[];
|
|
23
|
+
params?: ParseOptions | false | ParseOptions[];
|
|
24
|
+
body?: ParseOptions | false | ParseOptions[];
|
|
25
|
+
};
|
|
26
|
+
response?: true | ParseOptions | ParseOptions[];
|
|
27
|
+
}
|
|
28
|
+
export declare class RouterHandler {
|
|
29
|
+
private readonly path;
|
|
30
|
+
private readonly method;
|
|
31
|
+
private readonly options?;
|
|
32
|
+
private readonly tokens;
|
|
33
|
+
private readonly handler;
|
|
34
|
+
private readonly isRouter;
|
|
35
|
+
constructor(handler: Array<Handler> | Handler | Router, path: string | undefined, method: Method | undefined, options?: RouterHandlerOptions | undefined);
|
|
36
|
+
getJSONDoc(doc?: RouterJSONDoc, prePath?: string): RouterJSONDoc;
|
|
37
|
+
invoke(ctx: Context, pathTokens: {
|
|
38
|
+
value: string;
|
|
39
|
+
lower: string;
|
|
40
|
+
}[], prePathTokens: PathPartToken[]): Promise<boolean>;
|
|
41
|
+
isMatch(method: string, pathTokens: {
|
|
42
|
+
value: string;
|
|
43
|
+
lower: string;
|
|
44
|
+
}[], prePathTokens: PathPartToken[]): {
|
|
45
|
+
match: boolean;
|
|
46
|
+
params?: {
|
|
47
|
+
[name: string]: string | undefined;
|
|
48
|
+
};
|
|
49
|
+
};
|
|
50
|
+
private pushResults;
|
|
51
|
+
}
|
|
@@ -0,0 +1,107 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.RouterHandler = void 0;
|
|
4
|
+
const router_1 = require("./router");
|
|
5
|
+
const tokenize_match_1 = require("./tokenize-match");
|
|
6
|
+
const parse_1 = require("../middleware/parse");
|
|
7
|
+
const session_1 = require("../middleware/session");
|
|
8
|
+
const group_1 = require("../middleware/group");
|
|
9
|
+
const result_1 = require("../response/result");
|
|
10
|
+
const json_1 = require("../response/json");
|
|
11
|
+
class RouterHandler {
|
|
12
|
+
constructor(handler, path, method, options) {
|
|
13
|
+
this.path = path;
|
|
14
|
+
this.method = method;
|
|
15
|
+
this.options = options;
|
|
16
|
+
this.tokens = (0, tokenize_match_1.tokenizePath)(path);
|
|
17
|
+
const routeHandlers = handler instanceof Array ? handler : [handler];
|
|
18
|
+
let handlers = [];
|
|
19
|
+
this.isRouter = handler instanceof router_1.Router;
|
|
20
|
+
if ((!this.isRouter && routeHandlers.length !== routeHandlers.filter(h => typeof h === "function").length) || (this.isRouter && options)) {
|
|
21
|
+
throw new Error("bad arguments");
|
|
22
|
+
}
|
|
23
|
+
if (this.options && this.options.middleware) {
|
|
24
|
+
handlers = handlers.concat(this.options.middleware);
|
|
25
|
+
}
|
|
26
|
+
if (this.options && this.options.session) {
|
|
27
|
+
handlers.push(typeof this.options.session !== "function" ? (0, session_1.SessionHandler)(this.options.session) : this.options.session);
|
|
28
|
+
}
|
|
29
|
+
if (this.options && this.options.policy) {
|
|
30
|
+
handlers.push((0, group_1.GroupPolicyHandler)(this.options.policy));
|
|
31
|
+
}
|
|
32
|
+
if (this.options && this.options.request) {
|
|
33
|
+
handlers.push((0, parse_1.ParseRequest)(this.options.request));
|
|
34
|
+
}
|
|
35
|
+
handlers = handlers.concat(routeHandlers);
|
|
36
|
+
if (this.options && this.options.response) {
|
|
37
|
+
if (typeof this.options.response === "boolean") {
|
|
38
|
+
handlers.push((0, json_1.ResponseHandler)());
|
|
39
|
+
}
|
|
40
|
+
else {
|
|
41
|
+
handlers.push((0, result_1.ResultParser)(this.options.response, this.options.parser));
|
|
42
|
+
handlers.push((0, json_1.ResponseHandler)());
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
this.handler = handlers;
|
|
46
|
+
}
|
|
47
|
+
getJSONDoc(doc = {}, prePath = "/") {
|
|
48
|
+
const nPath = this.path && this.path.length > 1 ? this.path.substring(1) : "";
|
|
49
|
+
const nMethod = this.method ? this.method : "";
|
|
50
|
+
if (this.isRouter) {
|
|
51
|
+
const router = this.handler[0];
|
|
52
|
+
router.getJSONDoc(doc, nPath);
|
|
53
|
+
}
|
|
54
|
+
else if (this.options) {
|
|
55
|
+
if (!doc[`${prePath}${nPath}`]) {
|
|
56
|
+
doc[`${prePath}${nPath}`] = {};
|
|
57
|
+
}
|
|
58
|
+
if (doc[`${prePath}${nPath}`][nMethod]) {
|
|
59
|
+
throw new Error("cannot create doc routes override each other");
|
|
60
|
+
}
|
|
61
|
+
doc[`${prePath}${nPath}`][nMethod] = this.options;
|
|
62
|
+
}
|
|
63
|
+
return doc;
|
|
64
|
+
}
|
|
65
|
+
async invoke(ctx, pathTokens, prePathTokens) {
|
|
66
|
+
for (let i = 0; i < this.handler.length; i++) {
|
|
67
|
+
const h = this.handler[i];
|
|
68
|
+
if (h instanceof router_1.Router) {
|
|
69
|
+
if (!this.pushResults(await h.run(ctx, pathTokens, prePathTokens.concat(this.tokens)), ctx)) {
|
|
70
|
+
return false;
|
|
71
|
+
}
|
|
72
|
+
}
|
|
73
|
+
else {
|
|
74
|
+
if (!this.pushResults(await h(ctx), ctx)) {
|
|
75
|
+
return false;
|
|
76
|
+
}
|
|
77
|
+
}
|
|
78
|
+
}
|
|
79
|
+
return true;
|
|
80
|
+
}
|
|
81
|
+
isMatch(method, pathTokens, prePathTokens) {
|
|
82
|
+
if ((this.method === undefined || this.method === method)) {
|
|
83
|
+
if (this.path === undefined) {
|
|
84
|
+
return {
|
|
85
|
+
match: true
|
|
86
|
+
};
|
|
87
|
+
}
|
|
88
|
+
return (0, tokenize_match_1.matchTokenizePath)(this.isRouter, prePathTokens.concat(this.tokens), pathTokens);
|
|
89
|
+
}
|
|
90
|
+
return {
|
|
91
|
+
match: false
|
|
92
|
+
};
|
|
93
|
+
}
|
|
94
|
+
pushResults(shouldContinue, ctx) {
|
|
95
|
+
if (shouldContinue === false) {
|
|
96
|
+
// ctx.logger.debug(`avoiding next handlers because handler returned false.`);
|
|
97
|
+
return false;
|
|
98
|
+
}
|
|
99
|
+
else if (shouldContinue !== true && shouldContinue !== undefined) {
|
|
100
|
+
ctx.logger.trace("pushing to results [%o]", shouldContinue);
|
|
101
|
+
ctx.results.push(shouldContinue);
|
|
102
|
+
}
|
|
103
|
+
return true;
|
|
104
|
+
}
|
|
105
|
+
}
|
|
106
|
+
exports.RouterHandler = RouterHandler;
|
|
107
|
+
//# sourceMappingURL=router-utils.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"router-utils.js","sourceRoot":"","sources":["../../../src/handler/common/router-utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
import { Method, Handler, Context, ErrorHandler } from "./context";
|
|
2
|
+
import { RouterHandler, RouterJSONDoc, RouterHandlerOptions } from "./router-utils";
|
|
3
|
+
import { PathPartToken } from "./tokenize-match";
|
|
4
|
+
export declare class Router {
|
|
5
|
+
protected readonly handlers: RouterHandler[];
|
|
6
|
+
protected readonly errorHandlers: ErrorHandler[];
|
|
7
|
+
get(path: string, handler: Array<Handler> | Handler | Router, options?: RouterHandlerOptions): Router;
|
|
8
|
+
post(path: string, handler: Array<Handler> | Handler | Router, options?: RouterHandlerOptions): Router;
|
|
9
|
+
patch(path: string, handler: Array<Handler> | Handler | Router, options?: RouterHandlerOptions): Router;
|
|
10
|
+
delete(path: string, handler: Array<Handler> | Handler | Router, options?: RouterHandlerOptions): Router;
|
|
11
|
+
put(path: string, handler: Array<Handler> | Handler | Router, options?: RouterHandlerOptions): Router;
|
|
12
|
+
options(path: string, handler: Array<Handler> | Handler | Router, options?: RouterHandlerOptions): Router;
|
|
13
|
+
use(handler: Array<Handler> | Handler | Router, path?: string, method?: Method, options?: RouterHandlerOptions): Router;
|
|
14
|
+
catch(errorHandler: Array<ErrorHandler> | ErrorHandler): Router;
|
|
15
|
+
run(ctx: Context, pathTokens?: {
|
|
16
|
+
value: string;
|
|
17
|
+
lower: string;
|
|
18
|
+
}[], prePathTokens?: PathPartToken[]): Promise<boolean>;
|
|
19
|
+
getJSONDoc(doc?: RouterJSONDoc, prePath?: string): RouterJSONDoc;
|
|
20
|
+
}
|
|
@@ -0,0 +1,82 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.Router = void 0;
|
|
4
|
+
const router_utils_1 = require("./router-utils");
|
|
5
|
+
const tokenize_match_1 = require("./tokenize-match");
|
|
6
|
+
class Router {
|
|
7
|
+
constructor() {
|
|
8
|
+
this.handlers = [];
|
|
9
|
+
this.errorHandlers = [];
|
|
10
|
+
}
|
|
11
|
+
get(path, handler, options) {
|
|
12
|
+
return this.use(handler, path, "get", options);
|
|
13
|
+
}
|
|
14
|
+
post(path, handler, options) {
|
|
15
|
+
return this.use(handler, path, "post", options);
|
|
16
|
+
}
|
|
17
|
+
patch(path, handler, options) {
|
|
18
|
+
return this.use(handler, path, "patch", options);
|
|
19
|
+
}
|
|
20
|
+
delete(path, handler, options) {
|
|
21
|
+
return this.use(handler, path, "delete", options);
|
|
22
|
+
}
|
|
23
|
+
put(path, handler, options) {
|
|
24
|
+
return this.use(handler, path, "put", options);
|
|
25
|
+
}
|
|
26
|
+
options(path, handler, options) {
|
|
27
|
+
return this.use(handler, path, "options", options);
|
|
28
|
+
}
|
|
29
|
+
use(handler, path, method, options) {
|
|
30
|
+
const nPath = path !== undefined ? (0, tokenize_match_1.normalizePath)(path) : undefined;
|
|
31
|
+
const nMethod = method ? method.toUpperCase() : method;
|
|
32
|
+
this.handlers.push(new router_utils_1.RouterHandler(handler, nPath, nMethod, options));
|
|
33
|
+
return this;
|
|
34
|
+
}
|
|
35
|
+
catch(errorHandler) {
|
|
36
|
+
const errorHandlers = errorHandler instanceof Array ? errorHandler : [errorHandler];
|
|
37
|
+
for (const e of errorHandlers) {
|
|
38
|
+
this.errorHandlers.push(e);
|
|
39
|
+
}
|
|
40
|
+
return this;
|
|
41
|
+
}
|
|
42
|
+
async run(ctx, pathTokens, prePathTokens = []) {
|
|
43
|
+
pathTokens = pathTokens ? pathTokens : (0, tokenize_match_1.splitPath)(ctx.path);
|
|
44
|
+
try {
|
|
45
|
+
let shouldContinue = true;
|
|
46
|
+
for (const h of this.handlers) {
|
|
47
|
+
if (!shouldContinue || ctx.res.headersSent) {
|
|
48
|
+
shouldContinue = false;
|
|
49
|
+
break;
|
|
50
|
+
}
|
|
51
|
+
const isMatch = h.isMatch(ctx.method, pathTokens, prePathTokens);
|
|
52
|
+
if (isMatch.match) {
|
|
53
|
+
if (isMatch.params) {
|
|
54
|
+
ctx.params = ctx.params ? {
|
|
55
|
+
...ctx.params,
|
|
56
|
+
...isMatch.params
|
|
57
|
+
} : isMatch.params;
|
|
58
|
+
}
|
|
59
|
+
shouldContinue = await h.invoke(ctx, pathTokens, prePathTokens);
|
|
60
|
+
}
|
|
61
|
+
}
|
|
62
|
+
return !ctx.res.headersSent;
|
|
63
|
+
}
|
|
64
|
+
catch (e) {
|
|
65
|
+
for (const eH of this.errorHandlers) {
|
|
66
|
+
const ret = await eH(e, ctx);
|
|
67
|
+
if (ret === false || ctx.res.headersSent) {
|
|
68
|
+
return false;
|
|
69
|
+
}
|
|
70
|
+
}
|
|
71
|
+
throw e; // pass the error along
|
|
72
|
+
}
|
|
73
|
+
}
|
|
74
|
+
getJSONDoc(doc = {}, prePath = "/") {
|
|
75
|
+
for (const h of this.handlers) {
|
|
76
|
+
doc = h.getJSONDoc(doc, prePath);
|
|
77
|
+
}
|
|
78
|
+
return doc;
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
exports.Router = Router;
|
|
82
|
+
//# sourceMappingURL=router.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"router.js","sourceRoot":"","sources":["../../../src/handler/common/router.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,18 +6,27 @@ export declare const mergeSearchParams: (search: URLSearchParams, append?: {
|
|
|
6
6
|
[name: string]: string | number | boolean | string[] | number[] | boolean[];
|
|
7
7
|
} | undefined) => URLSearchParams;
|
|
8
8
|
export declare const normalizePath: (path: string) => string;
|
|
9
|
-
export
|
|
9
|
+
export interface PathPartToken {
|
|
10
10
|
optional: boolean;
|
|
11
|
-
wild
|
|
11
|
+
wild?: string;
|
|
12
12
|
token: string;
|
|
13
|
+
lower: string;
|
|
14
|
+
}
|
|
15
|
+
export declare const pathPartTokenize: (token: {
|
|
16
|
+
value: string;
|
|
17
|
+
lower: string;
|
|
18
|
+
}) => PathPartToken;
|
|
19
|
+
export declare const splitPath: (path?: string | undefined) => {
|
|
20
|
+
value: string;
|
|
21
|
+
lower: string;
|
|
13
22
|
}[];
|
|
14
|
-
export declare const
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
}[]
|
|
23
|
+
export declare const tokenizePath: (path?: string | undefined) => PathPartToken[];
|
|
24
|
+
export declare const matchTokenizePath: (checkAsRouter: boolean, tokens: PathPartToken[], ctxTokens: {
|
|
25
|
+
value: string;
|
|
26
|
+
lower: string;
|
|
27
|
+
}[]) => {
|
|
19
28
|
match: boolean;
|
|
20
|
-
params
|
|
29
|
+
params?: {
|
|
21
30
|
[name: string]: string | undefined;
|
|
22
|
-
};
|
|
31
|
+
} | undefined;
|
|
23
32
|
};
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.matchTokenizePath = exports.tokenizePath = exports.normalizePath = exports.mergeSearchParams = exports.parseSearchParams = void 0;
|
|
3
|
+
exports.matchTokenizePath = exports.tokenizePath = exports.splitPath = exports.pathPartTokenize = exports.normalizePath = exports.mergeSearchParams = exports.parseSearchParams = void 0;
|
|
4
4
|
const helpers_1 = require("./helpers");
|
|
5
5
|
const parseSearchParams = (search) => {
|
|
6
6
|
const query = {};
|
|
@@ -10,6 +10,7 @@ const parseSearchParams = (search) => {
|
|
|
10
10
|
return query;
|
|
11
11
|
};
|
|
12
12
|
exports.parseSearchParams = parseSearchParams;
|
|
13
|
+
// appends query params to URLSearchParams and returns a copy
|
|
13
14
|
const mergeSearchParams = (search, append) => {
|
|
14
15
|
const copy = (0, helpers_1.newURLSearchParams)(search.toString());
|
|
15
16
|
if (!append) {
|
|
@@ -64,19 +65,30 @@ const normalizePath = (path) => {
|
|
|
64
65
|
}
|
|
65
66
|
};
|
|
66
67
|
exports.normalizePath = normalizePath;
|
|
68
|
+
const pathPartTokenize = (token) => {
|
|
69
|
+
const isWild = token.value[0] === ":";
|
|
70
|
+
const optional = token.value[token.value.length - 1] === "?";
|
|
71
|
+
const wild = isWild ? token.value.substring(1, token.value.length - (optional ? 1 : 0)) : undefined;
|
|
72
|
+
return {
|
|
73
|
+
optional,
|
|
74
|
+
wild,
|
|
75
|
+
token: token.value,
|
|
76
|
+
lower: token.lower
|
|
77
|
+
};
|
|
78
|
+
};
|
|
79
|
+
exports.pathPartTokenize = pathPartTokenize;
|
|
80
|
+
const splitPath = (path) => path === undefined ? [] : path.split("/").filter(p => p).map(p => {
|
|
81
|
+
return {
|
|
82
|
+
value: p,
|
|
83
|
+
lower: p.toLocaleLowerCase()
|
|
84
|
+
};
|
|
85
|
+
});
|
|
86
|
+
exports.splitPath = splitPath;
|
|
67
87
|
const tokenizePath = (path) => {
|
|
68
88
|
if (path === undefined) {
|
|
69
89
|
return [];
|
|
70
90
|
}
|
|
71
|
-
const tokens =
|
|
72
|
-
const wild = token[0] === ":";
|
|
73
|
-
const optional = token[token.length - 1] === "?";
|
|
74
|
-
return {
|
|
75
|
-
optional,
|
|
76
|
-
wild,
|
|
77
|
-
token
|
|
78
|
-
};
|
|
79
|
-
});
|
|
91
|
+
const tokens = (0, exports.splitPath)(path).map(token => (0, exports.pathPartTokenize)(token));
|
|
80
92
|
for (let i = 0; i < tokens.length; i++) {
|
|
81
93
|
if (tokens[i].optional && i != tokens.length - 1) {
|
|
82
94
|
throw new Error("cannot set a path token as optional that's not the last one");
|
|
@@ -85,34 +97,29 @@ const tokenizePath = (path) => {
|
|
|
85
97
|
return tokens;
|
|
86
98
|
};
|
|
87
99
|
exports.tokenizePath = tokenizePath;
|
|
88
|
-
const matchTokenizePath = (
|
|
89
|
-
|
|
90
|
-
tokens
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
token: s,
|
|
94
|
-
wild: false
|
|
95
|
-
};
|
|
96
|
-
}).concat(tokens);
|
|
100
|
+
const matchTokenizePath = (checkAsRouter, tokens, ctxTokens) => {
|
|
101
|
+
for (let i = 0; i < tokens.length; i++) {
|
|
102
|
+
if (tokens[i].optional && i != tokens.length - 1) {
|
|
103
|
+
throw new Error("cannot set a path token as optional that's not the last one");
|
|
104
|
+
}
|
|
97
105
|
}
|
|
98
|
-
const ctxTokens = normalizePath.split("/").filter(p => p);
|
|
99
106
|
const lastTokenIsOptional = tokens.length > 0 ? tokens[tokens.length - 1].optional : false;
|
|
100
107
|
const couldBeUsingOptional = (lastTokenIsOptional &&
|
|
101
|
-
((!
|
|
102
|
-
(
|
|
108
|
+
((!checkAsRouter && tokens.length - 1 === ctxTokens.length) ||
|
|
109
|
+
(checkAsRouter && tokens.length - 1 <= ctxTokens.length)));
|
|
103
110
|
const params = {};
|
|
104
|
-
if ((!
|
|
111
|
+
if ((!checkAsRouter && tokens.length === ctxTokens.length) || couldBeUsingOptional || (checkAsRouter && tokens.length <= ctxTokens.length)) {
|
|
105
112
|
// similiar count of tokens
|
|
106
113
|
for (let i = 0; i < ctxTokens.length; i++) {
|
|
107
114
|
const ctxToken = ctxTokens[i];
|
|
108
|
-
if (
|
|
115
|
+
if (checkAsRouter && i >= tokens.length) {
|
|
109
116
|
break;
|
|
110
117
|
}
|
|
111
|
-
if (tokens[i].wild || ctxToken.
|
|
118
|
+
if (tokens[i].wild || ctxToken.lower === tokens[i].lower) {
|
|
112
119
|
// check pass
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
params[
|
|
120
|
+
const wild = tokens[i].wild;
|
|
121
|
+
if (wild) {
|
|
122
|
+
params[wild] = ctxToken.value;
|
|
116
123
|
}
|
|
117
124
|
continue;
|
|
118
125
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tokenize-match.js","sourceRoot":"","sources":["../../../src/handler/common/tokenize-match.ts"],"names":[],"mappings":";;;AACA,uCAA+C;AAExC,MAAM,iBAAiB,GAAG,CAAC,MAAuB,EAAyC,EAAE;IAClG,MAAM,KAAK,GAA0C,EAAE,CAAC;IACxD,MAAM,CAAC,OAAO,CAAC,CAAC,KAAa,EAAE,GAAW,EAAE,EAAE;QAC5C,KAAK,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,GAAG,CAAC,YAAY,KAAK,CAAC,CAAC,CAAE,KAAK,CAAC,GAAG,CAAc,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAW,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;IAC3I,CAAC,CAAC,CAAC;IACH,OAAO,KAAK,CAAC;AACf,CAAC,CAAC;AANW,QAAA,iBAAiB,qBAM5B;
|
|
1
|
+
{"version":3,"file":"tokenize-match.js","sourceRoot":"","sources":["../../../src/handler/common/tokenize-match.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,12 @@
|
|
|
1
1
|
import { SimpleMap } from "../util/parser/common";
|
|
2
2
|
import { Logger } from "../util/logger";
|
|
3
|
-
import { Handler, Method } from "./common";
|
|
4
|
-
import {
|
|
3
|
+
import { Router, Handler, Method } from "./common";
|
|
4
|
+
import { RouterHandlerOptions } from "./common/router-utils";
|
|
5
5
|
export interface FeatureRouterPathOptions {
|
|
6
6
|
path: string | string[];
|
|
7
7
|
method: Method | Method[];
|
|
8
8
|
handler: Array<Handler> | Handler;
|
|
9
|
+
options?: RouterHandlerOptions;
|
|
9
10
|
}
|
|
10
11
|
export declare type FeatureRouterOptions<T extends FeatureRouterPathOptions = FeatureRouterPathOptions> = SimpleMap<T>;
|
|
11
12
|
export declare const FeatureRouter: (options: FeatureRouterOptions<FeatureRouterPathOptions>, logger?: Logger | undefined) => Router;
|
|
@@ -3,10 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.FeatureRouter = void 0;
|
|
4
4
|
const featuretoggle_1 = require("../util/config/featuretoggle");
|
|
5
5
|
const tokenize_match_1 = require("./common/tokenize-match");
|
|
6
|
-
const
|
|
6
|
+
const common_1 = require("./common");
|
|
7
7
|
const FEATURE_ROUTER_METHODS = ["get", "post", "put", "delete", "patch", "options"];
|
|
8
8
|
const FeatureRouter = (options, logger) => {
|
|
9
|
-
const router = new
|
|
9
|
+
const router = new common_1.Router();
|
|
10
10
|
const toSetup = Object.keys(options);
|
|
11
11
|
const enabled = [];
|
|
12
12
|
const disabled = [];
|
|
@@ -59,7 +59,7 @@ const FeatureRouter = (options, logger) => {
|
|
|
59
59
|
throw new Error(`${featureName} collides with feature ${enabledPaths[`${p}${m}`]} on path ${p} method ${m}`);
|
|
60
60
|
}
|
|
61
61
|
enabledPaths[`${p}${m}`] = featureName;
|
|
62
|
-
router.use(implementation, p, m.toLocaleLowerCase());
|
|
62
|
+
router.use(implementation, p, m.toLocaleLowerCase(), handlerOptions.options);
|
|
63
63
|
}
|
|
64
64
|
}
|
|
65
65
|
}
|