@miqro/core 1.3.6 → 1.3.8
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/README.md +38 -96
- package/dist/handler/api-router-utils.d.ts +12 -1
- package/dist/handler/api-router-utils.js +86 -1
- package/dist/handler/api-router-utils.js.map +1 -1
- package/dist/handler/api-router.d.ts +29 -2
- package/dist/handler/api-router.js +2 -2
- package/dist/handler/api-router.js.map +1 -1
- package/dist/handler/app.d.ts +2 -1
- package/dist/handler/app.js +4 -2
- package/dist/handler/app.js.map +1 -1
- package/dist/handler/common/context.d.ts +1 -1
- package/dist/handler/common/context.js +14 -9
- package/dist/handler/common/context.js.map +1 -1
- package/dist/handler/common/router-utils.js +60 -5
- package/dist/handler/common/router-utils.js.map +1 -1
- package/dist/handler/index.d.ts +0 -3
- package/dist/handler/index.js +0 -3
- package/dist/handler/index.js.map +1 -1
- package/dist/handler/middleware/form.js +7 -1
- package/dist/handler/middleware/form.js.map +1 -1
- package/dist/handler/middleware/group.js +44 -2
- package/dist/handler/middleware/group.js.map +1 -1
- package/dist/handler/middleware/index.js +2 -6
- package/dist/handler/middleware/index.js.map +1 -1
- package/dist/handler/middleware/json.js +8 -2
- package/dist/handler/middleware/json.js.map +1 -1
- package/dist/handler/middleware/text.js +8 -1
- package/dist/handler/middleware/text.js.map +1 -1
- package/dist/handler/proxy.d.ts +2 -5
- package/dist/handler/proxy.js +2 -3
- package/dist/handler/proxy.js.map +1 -1
- package/dist/index.d.ts +1 -0
- package/dist/index.js +1 -0
- package/dist/index.js.map +1 -1
- package/dist/{util/test → test/common}/app.d.ts +2 -2
- package/dist/{util/test → test/common}/app.js +3 -2
- package/dist/test/common/app.js.map +1 -0
- package/dist/{util/test → test/common}/common.d.ts +0 -0
- package/dist/{util/test → test/common}/common.js +0 -0
- package/dist/test/common/common.js.map +1 -0
- package/dist/{util/test → test/common}/index.d.ts +1 -0
- package/dist/{util/test → test/common}/index.js +1 -0
- package/dist/test/common/index.js.map +1 -0
- package/dist/test/common/runner.d.ts +13 -0
- package/dist/test/common/runner.js +92 -0
- package/dist/test/common/runner.js.map +1 -0
- package/dist/test/index.d.ts +1 -0
- package/dist/{handler/response → test}/index.js +1 -3
- package/dist/test/index.js.map +1 -0
- package/dist/test/main.d.ts +1 -0
- package/dist/test/main.js +19 -0
- package/dist/test/main.js.map +1 -0
- package/dist/util/cli/index.d.ts +1 -1
- package/dist/util/error/parsererror.d.ts +2 -1
- package/dist/util/error/parsererror.js +5 -1
- package/dist/util/error/parsererror.js.map +1 -1
- package/dist/util/index.d.ts +0 -1
- package/dist/util/index.js +0 -1
- package/dist/util/index.js.map +1 -1
- package/dist/util/loader/index.d.ts +0 -3
- package/dist/util/loader/index.js +2 -9
- package/dist/util/loader/index.js.map +1 -1
- package/dist/util/request/index.d.ts +1 -1
- package/dist/util/request/index.js +1 -3
- package/dist/util/request/index.js.map +1 -1
- package/dist/util/session/common.d.ts +0 -1
- package/dist/util/session/common.js +0 -46
- package/dist/util/session/common.js.map +1 -1
- package/package.json +6 -11
- package/src/handler/api-router-utils.ts +91 -2
- package/src/handler/api-router.ts +30 -4
- package/src/handler/app.ts +2 -1
- package/src/handler/common/context.ts +14 -10
- package/src/handler/common/router-utils.ts +199 -144
- package/src/handler/index.ts +0 -3
- package/src/handler/middleware/form.ts +8 -2
- package/src/handler/middleware/group.ts +44 -2
- package/src/handler/middleware/index.ts +0 -4
- package/src/handler/middleware/json.ts +9 -3
- package/src/handler/middleware/text.ts +8 -1
- package/src/handler/proxy.ts +3 -8
- package/src/index.ts +1 -0
- package/src/{util/test → test/common}/app.ts +6 -5
- package/src/{util/test → test/common}/common.ts +0 -0
- package/src/{util/test → test/common}/index.ts +1 -0
- package/src/test/common/runner.ts +97 -0
- package/src/test/index.ts +1 -0
- package/src/test/main.ts +17 -0
- package/src/util/cli/index.ts +1 -1
- package/src/util/error/parsererror.ts +6 -1
- package/src/util/index.ts +0 -1
- package/src/util/loader/index.ts +1 -7
- package/src/util/request/index.ts +1 -1
- package/src/util/session/common.ts +0 -43
- package/tsconfig-test.json +13 -0
- package/dist/handler/api-handler.d.ts +0 -29
- package/dist/handler/api-handler.js +0 -42
- package/dist/handler/api-handler.js.map +0 -1
- package/dist/handler/feature-router.d.ts +0 -12
- package/dist/handler/feature-router.js +0 -90
- package/dist/handler/feature-router.js.map +0 -1
- package/dist/handler/response/html.d.ts +0 -10
- package/dist/handler/response/html.js +0 -34
- package/dist/handler/response/html.js.map +0 -1
- package/dist/handler/response/index.d.ts +0 -3
- package/dist/handler/response/index.js.map +0 -1
- package/dist/handler/response/json.d.ts +0 -2
- package/dist/handler/response/json.js +0 -21
- package/dist/handler/response/json.js.map +0 -1
- package/dist/handler/response/result.d.ts +0 -4
- package/dist/handler/response/result.js +0 -46
- package/dist/handler/response/result.js.map +0 -1
- package/dist/util/client.d.ts +0 -17
- package/dist/util/client.js +0 -55
- package/dist/util/client.js.map +0 -1
- package/dist/util/test/app.js.map +0 -1
- package/dist/util/test/common.js.map +0 -1
- package/dist/util/test/index.js.map +0 -1
- package/src/handler/api-handler.ts +0 -55
- package/src/handler/feature-router.ts +0 -92
- package/src/handler/response/html.ts +0 -36
- package/src/handler/response/index.ts +0 -3
- package/src/handler/response/json.ts +0 -19
- package/src/handler/response/result.ts +0 -40
- package/src/util/client.ts +0 -64
package/README.md
CHANGED
|
@@ -1,8 +1,6 @@
|
|
|
1
1
|
# @miqro/core
|
|
2
2
|
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
## async request with http.request
|
|
3
|
+
## async wrapper for http.request
|
|
6
4
|
|
|
7
5
|
```typescript
|
|
8
6
|
import { request } from "@miqro/core";
|
|
@@ -11,124 +9,68 @@ const response = await request({
|
|
|
11
9
|
url: "https://hostname/path",
|
|
12
10
|
followRedirect: true, // defaults to false
|
|
13
11
|
query: {
|
|
14
|
-
|
|
15
|
-
offset: 0,
|
|
16
|
-
q: "search"
|
|
12
|
+
category: "some category"
|
|
17
13
|
},
|
|
18
|
-
method: "
|
|
14
|
+
method: "POST",
|
|
15
|
+
data: {
|
|
16
|
+
some: "text"
|
|
17
|
+
}
|
|
19
18
|
});
|
|
19
|
+
console.log(response.status)
|
|
20
|
+
console.dir(response.headers)
|
|
21
|
+
console.dir(response.data)
|
|
20
22
|
```
|
|
21
23
|
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
```typescript
|
|
25
|
-
interface RequestOptions {
|
|
26
|
-
url: string;
|
|
27
|
-
method?: string;
|
|
28
|
-
query?: ParsedUrlQueryInput;
|
|
29
|
-
socketPath?: string;
|
|
30
|
-
followRedirect?: boolean;
|
|
31
|
-
disableUserAgent?: true;
|
|
32
|
-
maxRedirects?: number;
|
|
33
|
-
maxResponse?: number;
|
|
34
|
-
locations?: string[];
|
|
35
|
-
timeout?: number;
|
|
36
|
-
headers?: http.OutgoingHttpHeaders;
|
|
37
|
-
data?: any;
|
|
38
|
-
}
|
|
39
|
-
```
|
|
40
|
-
|
|
41
|
-
## Logger
|
|
42
|
-
|
|
43
|
-
```typescript
|
|
44
|
-
import { getLogger, Logger } from "@miqro/core";
|
|
45
|
-
|
|
46
|
-
// const logger = new Logger();
|
|
47
|
-
const logger = getLogger("identifier");
|
|
48
|
-
// process.env.LOG_LEVEL="info" will set the default log level for all loggers
|
|
49
|
-
// process.env.LOG_LEVEL_identifier="error" will set the default log level to error
|
|
50
|
-
logger.info("info");
|
|
51
|
-
logger.warn("warn");
|
|
52
|
-
logger.error("error");
|
|
53
|
-
logger.trace("trace");
|
|
54
|
-
```
|
|
55
|
-
|
|
56
|
-
### custom logger factory
|
|
57
|
-
|
|
58
|
-
for example if you want to add default transports or a different formatting for all Loggers created with ***getLogger(....)***
|
|
24
|
+
## get attr from object with default value
|
|
59
25
|
|
|
60
26
|
```typescript
|
|
61
|
-
import {
|
|
62
|
-
// custom factory
|
|
63
|
-
const transports = [
|
|
64
|
-
|
|
65
|
-
];
|
|
66
|
-
setLoggerFactory((args)=>{
|
|
67
|
-
return new Logger(args.identifier, args.level, {
|
|
68
|
-
transports,
|
|
69
|
-
formatter: (args) => `${args.message}`;
|
|
70
|
-
});
|
|
71
|
-
});
|
|
72
|
-
```
|
|
27
|
+
import { get } from "@miqro/core";
|
|
73
28
|
|
|
74
|
-
|
|
29
|
+
const data = {
|
|
30
|
+
user: {
|
|
31
|
+
details: {
|
|
32
|
+
name: "name"
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
};
|
|
75
36
|
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
loadConfig(); // will read .env files located in config/<NODE_ENV>/ folder if exists
|
|
80
|
-
|
|
81
|
-
const [ URL_A, DB_URI ] = checkEnvVariables([
|
|
82
|
-
"URL_A",
|
|
83
|
-
"DB_URI"
|
|
84
|
-
]);
|
|
85
|
-
// to use default values
|
|
86
|
-
const [ URL_A, DB_URI ] = checkEnvVariables([
|
|
87
|
-
"URL_A",
|
|
88
|
-
"DB_URI"
|
|
89
|
-
], [
|
|
90
|
-
"https://hostname/path",
|
|
91
|
-
"mysql://user:password@hostname/db"
|
|
92
|
-
]);
|
|
37
|
+
const name = get(data, "user.details.name", "NO_NAME");
|
|
38
|
+
const loginCount = get(data, "user.details.meta.loginCount", 0); // 0 default
|
|
93
39
|
```
|
|
94
40
|
|
|
95
|
-
##
|
|
41
|
+
## promise based router for native http module
|
|
96
42
|
|
|
97
43
|
```typescript
|
|
98
44
|
import * as http from "http";
|
|
99
45
|
import { App, Router, JSONParser, ReadBuffer } from "@miqro/core";
|
|
100
46
|
|
|
101
47
|
const router = new Router();
|
|
102
|
-
router.use([
|
|
103
|
-
ReadBuffer(), // needed to read the buffer of the request and set ctx.buffer
|
|
104
|
-
JSONParser(), // needed to read the buffer and check if is a valid JSON and set ctx.body
|
|
105
|
-
]);
|
|
106
48
|
|
|
107
|
-
router.post("/echo", async (ctx) => {
|
|
49
|
+
router.post("/echo", [JSONParser(), async (ctx) => {
|
|
108
50
|
// the incomingMessage is in ctx.req
|
|
109
51
|
// the ServerResponse is in ctx.res
|
|
110
|
-
ctx.logger.info("we got a echo request");
|
|
111
|
-
ctx.json({
|
|
52
|
+
ctx.logger.info("we got a echo request hit with query: %o params: %o body: %o", ctx.query, ctx.params, ctx.body);
|
|
53
|
+
await ctx.json({
|
|
112
54
|
body: ctx.body
|
|
113
55
|
}):
|
|
114
|
-
});
|
|
56
|
+
}]);
|
|
115
57
|
router.get("/user/:userId", async (ctx) => {
|
|
116
|
-
ctx.json({
|
|
58
|
+
await ctx.json({
|
|
117
59
|
userId: ctx.params.userId
|
|
118
60
|
}):
|
|
119
61
|
});
|
|
120
|
-
|
|
121
|
-
//
|
|
122
|
-
|
|
123
|
-
http.createServer(new App().use(router).listener).listen(8080);
|
|
62
|
+
// to avoid 404 and default error handling for 503 response
|
|
63
|
+
// const server = http.createServer(router.listener).listen(8080);
|
|
64
|
+
const server = http.createServer(new App().use(router, "/api").listener).listen(8080);
|
|
124
65
|
// or
|
|
125
|
-
//
|
|
66
|
+
// const server = app.listen(8080);
|
|
126
67
|
```
|
|
127
68
|
|
|
69
|
+
|
|
128
70
|
## router.use extended options for request parsing
|
|
129
71
|
|
|
130
72
|
```typescript
|
|
131
|
-
|
|
73
|
+
router.get("/add/:a/:b", {
|
|
132
74
|
request: {
|
|
133
75
|
query: false, // do not allow query params
|
|
134
76
|
body: false, // do not allow body
|
|
@@ -143,14 +85,14 @@ app.get("/add/:a/:b", {
|
|
|
143
85
|
// ctx.params.a and ctx.params.b are numbers and not strings
|
|
144
86
|
const result = ctx.params.a + ctx.params.b;
|
|
145
87
|
ctx.logger.info("adding %s + %s = %s", ctx.params.a, ctx.params.b, result);
|
|
146
|
-
ctx.json({
|
|
88
|
+
await ctx.json({
|
|
147
89
|
result
|
|
148
90
|
});
|
|
149
91
|
}
|
|
150
|
-
});
|
|
92
|
+
});
|
|
151
93
|
// or
|
|
152
94
|
/*
|
|
153
|
-
|
|
95
|
+
router.get("/add/:a/:b", async (ctx) => {
|
|
154
96
|
return {
|
|
155
97
|
result: ctx.params.a + ctx.params.b
|
|
156
98
|
}
|
|
@@ -171,10 +113,10 @@ app.get("/add/:a/:b", async (ctx) => {
|
|
|
171
113
|
## error handling
|
|
172
114
|
|
|
173
115
|
```typescript
|
|
174
|
-
|
|
175
|
-
|
|
116
|
+
router.catch(myFallBackerrorHandler1) // this will catch all throws
|
|
117
|
+
router.catch(myFallBackerrorHandler2) // if myFallBackerrorHandler1 didnt ended the request myFallBackerrorHandler2 will be called
|
|
176
118
|
|
|
177
|
-
|
|
119
|
+
router.use(async (ctx) => {
|
|
178
120
|
throw new Error("");
|
|
179
121
|
});
|
|
180
122
|
```
|
|
@@ -1,3 +1,14 @@
|
|
|
1
1
|
import { Logger } from "../util/logger";
|
|
2
|
-
import {
|
|
2
|
+
import { SimpleMap } from "../util/parser/common";
|
|
3
|
+
import { Router } from "./common/router";
|
|
4
|
+
import { Handler, Method } from "./common/context";
|
|
5
|
+
import { RouterHandlerOptions } from "./common/router-utils";
|
|
3
6
|
export declare const traverseAPIRouteDir: (featureName: string, dirname: string, basePath?: string, features?: FeatureRouterOptions, logger?: Logger | undefined) => FeatureRouterOptions;
|
|
7
|
+
export interface FeatureRouterPathOptions {
|
|
8
|
+
path: string | string[];
|
|
9
|
+
method: Method | Method[];
|
|
10
|
+
handler: Array<Handler> | Handler;
|
|
11
|
+
options?: RouterHandlerOptions;
|
|
12
|
+
}
|
|
13
|
+
export declare type FeatureRouterOptions = SimpleMap<FeatureRouterPathOptions>;
|
|
14
|
+
export declare const FeatureRouter: (options: FeatureRouterOptions, logger?: Logger | undefined) => Router;
|
|
@@ -1,9 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.traverseAPIRouteDir = void 0;
|
|
3
|
+
exports.FeatureRouter = exports.traverseAPIRouteDir = void 0;
|
|
4
4
|
const fs_1 = require("fs");
|
|
5
5
|
const path_1 = require("path");
|
|
6
6
|
const tokenize_match_1 = require("./common/tokenize-match");
|
|
7
|
+
const featuretoggle_1 = require("../util/config/featuretoggle");
|
|
8
|
+
const router_1 = require("./common/router");
|
|
7
9
|
const traverseAPIRouteDir = (featureName, dirname, basePath = "/", features = {}, logger) => {
|
|
8
10
|
if (logger) {
|
|
9
11
|
logger.trace("loading routes from [%s]", dirname);
|
|
@@ -89,4 +91,87 @@ const traverseAPIRouteDir = (featureName, dirname, basePath = "/", features = {}
|
|
|
89
91
|
return features;
|
|
90
92
|
};
|
|
91
93
|
exports.traverseAPIRouteDir = traverseAPIRouteDir;
|
|
94
|
+
const FEATURE_ROUTER_METHODS = ["get", "post", "put", "delete", "patch", "options"];
|
|
95
|
+
const FeatureRouter = (options, logger) => {
|
|
96
|
+
const router = new router_1.Router();
|
|
97
|
+
const toSetup = Object.keys(options);
|
|
98
|
+
const enabled = [];
|
|
99
|
+
const disabled = [];
|
|
100
|
+
const enabledPaths = {};
|
|
101
|
+
for (const featureName of toSetup) {
|
|
102
|
+
const handlerOptions = options[featureName];
|
|
103
|
+
if (!handlerOptions) {
|
|
104
|
+
throw new Error(`no handler options for feature [${featureName}]`);
|
|
105
|
+
}
|
|
106
|
+
else {
|
|
107
|
+
const { path, handler: implementation, method } = handlerOptions;
|
|
108
|
+
if (!method) {
|
|
109
|
+
throw new Error(`no methods for feature [${featureName}]`);
|
|
110
|
+
}
|
|
111
|
+
else if (!implementation) {
|
|
112
|
+
throw new Error(`no implementation for feature [${featureName}]`);
|
|
113
|
+
}
|
|
114
|
+
else if (!path) {
|
|
115
|
+
throw new Error(`no path for feature [${featureName}]`);
|
|
116
|
+
}
|
|
117
|
+
else {
|
|
118
|
+
if (method instanceof Array) {
|
|
119
|
+
for (const m of method) {
|
|
120
|
+
if (FEATURE_ROUTER_METHODS.indexOf(m.toLowerCase()) === -1) {
|
|
121
|
+
throw new Error(`feature [${featureName}] method [${m.toUpperCase()}] not defined! use only [${FEATURE_ROUTER_METHODS.join(",")}]`);
|
|
122
|
+
}
|
|
123
|
+
}
|
|
124
|
+
}
|
|
125
|
+
else if (FEATURE_ROUTER_METHODS.indexOf(method.toLowerCase()) === -1) {
|
|
126
|
+
throw new Error(`feature [${featureName}] method [${method.toUpperCase()}] not defined! use only [${FEATURE_ROUTER_METHODS.join(",")}]`);
|
|
127
|
+
}
|
|
128
|
+
const methods = method instanceof Array ? method : [method];
|
|
129
|
+
if ((0, featuretoggle_1.isFeatureEnabled)(featureName)) {
|
|
130
|
+
if (logger) {
|
|
131
|
+
logger.trace(`feature [${featureName}] enabled`);
|
|
132
|
+
}
|
|
133
|
+
enabled.push(featureName);
|
|
134
|
+
const paths = path instanceof Array ? path : [path];
|
|
135
|
+
for (const nnP of paths) {
|
|
136
|
+
const p = (0, tokenize_match_1.normalizePath)(nnP);
|
|
137
|
+
for (const m of methods) {
|
|
138
|
+
if (logger) {
|
|
139
|
+
logger.info("%s", featureName);
|
|
140
|
+
logger.info("\t%s:%s", m.toUpperCase(), p);
|
|
141
|
+
if (handlerOptions.___filePath) {
|
|
142
|
+
logger.info("\t%s", handlerOptions.___filePath);
|
|
143
|
+
}
|
|
144
|
+
}
|
|
145
|
+
if (enabledPaths[`${p}${m}`] !== undefined) {
|
|
146
|
+
throw new Error(`${featureName} collides with feature ${enabledPaths[`${p}${m}`]} on path ${p} method ${m}`);
|
|
147
|
+
}
|
|
148
|
+
enabledPaths[`${p}${m}`] = featureName;
|
|
149
|
+
router.use(implementation, p, m.toLocaleLowerCase(), handlerOptions.options);
|
|
150
|
+
}
|
|
151
|
+
}
|
|
152
|
+
}
|
|
153
|
+
else {
|
|
154
|
+
if (logger) {
|
|
155
|
+
logger.debug("feature [%s] disabled", featureName);
|
|
156
|
+
}
|
|
157
|
+
disabled.push(featureName);
|
|
158
|
+
}
|
|
159
|
+
}
|
|
160
|
+
}
|
|
161
|
+
}
|
|
162
|
+
if (logger && enabled.length > 0) {
|
|
163
|
+
logger.debug("enabled features [%s]", enabled.join(","));
|
|
164
|
+
}
|
|
165
|
+
if (logger) {
|
|
166
|
+
if (disabled.length > 0) {
|
|
167
|
+
logger.warn("disabled features [%s]", disabled.join(","));
|
|
168
|
+
logger.warn(`to enable them just add the env var <feature>=true`);
|
|
169
|
+
}
|
|
170
|
+
else {
|
|
171
|
+
logger.debug(`no features disabled`);
|
|
172
|
+
}
|
|
173
|
+
}
|
|
174
|
+
return router;
|
|
175
|
+
};
|
|
176
|
+
exports.FeatureRouter = FeatureRouter;
|
|
92
177
|
//# sourceMappingURL=api-router-utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api-router-utils.js","sourceRoot":"","sources":["../../src/handler/api-router-utils.ts"],"names":[],"mappings":";;;AAAA,2BAA4C;AAC5C,+BAA4C;
|
|
1
|
+
{"version":3,"file":"api-router-utils.js","sourceRoot":"","sources":["../../src/handler/api-router-utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,11 +1,37 @@
|
|
|
1
1
|
import { Logger } from "../util";
|
|
2
|
-
import { APIHandlerOptions } from "./api-handler";
|
|
3
2
|
import { Router, Method } from "./common";
|
|
4
|
-
|
|
3
|
+
import { GroupPolicy } from "../util/session";
|
|
4
|
+
import { SessionHandlerOptions } from "./middleware/session";
|
|
5
|
+
import { Parser } from "../util/parser";
|
|
6
|
+
import { ParseOptions } from "../util/parser/common";
|
|
7
|
+
import { Handler } from "./common";
|
|
8
|
+
/**
|
|
9
|
+
* # APIRoute
|
|
10
|
+
*
|
|
11
|
+
* src/api/comment/get.js
|
|
12
|
+
* ```typescript
|
|
13
|
+
*import { APIRouter } from "@miqro/core";
|
|
14
|
+
*const route: APIRoute = {
|
|
15
|
+
* ...
|
|
16
|
+
*};
|
|
17
|
+
*export default route;
|
|
18
|
+
* ```
|
|
19
|
+
*/
|
|
20
|
+
export interface APIRoute {
|
|
5
21
|
name?: string;
|
|
6
22
|
description?: string;
|
|
7
23
|
method?: Method | Method[];
|
|
8
24
|
path?: string | string[];
|
|
25
|
+
parser?: Parser;
|
|
26
|
+
headers?: ParseOptions | ParseOptions[];
|
|
27
|
+
query?: ParseOptions | false | ParseOptions[];
|
|
28
|
+
params?: ParseOptions | false | ParseOptions[];
|
|
29
|
+
body?: ParseOptions | false | ParseOptions[];
|
|
30
|
+
result?: ParseOptions | ParseOptions[];
|
|
31
|
+
handler: Array<Handler> | Handler;
|
|
32
|
+
middleware?: Handler[];
|
|
33
|
+
session?: SessionHandlerOptions | Handler;
|
|
34
|
+
policy?: GroupPolicy;
|
|
9
35
|
}
|
|
10
36
|
/**
|
|
11
37
|
* # APIRouter
|
|
@@ -34,6 +60,7 @@ export interface APIRoute extends APIHandlerOptions {
|
|
|
34
60
|
* };
|
|
35
61
|
* }
|
|
36
62
|
*}
|
|
63
|
+
*export default route;
|
|
37
64
|
* ```
|
|
38
65
|
*/
|
|
39
66
|
export declare const APIRouter: (options: {
|
|
@@ -4,7 +4,6 @@ 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("./api-router-utils");
|
|
7
|
-
const feature_router_1 = require("./feature-router");
|
|
8
7
|
/**
|
|
9
8
|
* # APIRouter
|
|
10
9
|
*
|
|
@@ -32,6 +31,7 @@ const feature_router_1 = require("./feature-router");
|
|
|
32
31
|
* };
|
|
33
32
|
* }
|
|
34
33
|
*}
|
|
34
|
+
*export default route;
|
|
35
35
|
* ```
|
|
36
36
|
*/
|
|
37
37
|
const APIRouter = (options, logger) => {
|
|
@@ -44,7 +44,7 @@ const APIRouter = (options, logger) => {
|
|
|
44
44
|
}
|
|
45
45
|
const apiName = options.apiName !== undefined ? options.apiName : (0, path_1.basename)(dirname);
|
|
46
46
|
const apiPath = options.path !== undefined ? options.path : `/${apiName}`;
|
|
47
|
-
return (0,
|
|
47
|
+
return (0, api_router_utils_1.FeatureRouter)((0, api_router_utils_1.traverseAPIRouteDir)(apiName.toUpperCase(), dirname, apiPath, undefined, logger), logger);
|
|
48
48
|
};
|
|
49
49
|
exports.APIRouter = APIRouter;
|
|
50
50
|
//# sourceMappingURL=api-router.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api-router.js","sourceRoot":"","sources":["../../src/handler/api-router.ts"],"names":[],"mappings":";;;AAAA,2BAA2C;AAC3C,+BAAgC;
|
|
1
|
+
{"version":3,"file":"api-router.js","sourceRoot":"","sources":["../../src/handler/api-router.ts"],"names":[],"mappings":";;;AAAA,2BAA2C;AAC3C,+BAAgC;AAEhC,yDAAwE;AAqCxE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACI,MAAM,SAAS,GAAG,CAAC,OAIzB,EAAE,MAAe,EAAU,EAAE;IAC5B,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;IAC5B,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,CAAC;AAfW,QAAA,SAAS,aAepB"}
|
package/dist/handler/app.d.ts
CHANGED
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
import { RequestListener, Server } from "http";
|
|
3
|
-
import { Router, RouterOptions } from "./common";
|
|
3
|
+
import { Router, ErrorHandler, RouterOptions } from "./common";
|
|
4
4
|
export declare class App extends Router {
|
|
5
5
|
readonly listener: RequestListener;
|
|
6
6
|
constructor(config?: RouterOptions);
|
|
7
7
|
listen(...args: any[]): Server;
|
|
8
8
|
}
|
|
9
|
+
export declare const DefaultErrorHandler: () => ErrorHandler<boolean>;
|
package/dist/handler/app.js
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.App = void 0;
|
|
3
|
+
exports.DefaultErrorHandler = exports.App = void 0;
|
|
4
4
|
const http_1 = require("http");
|
|
5
5
|
const common_1 = require("./common");
|
|
6
6
|
class App extends common_1.Router {
|
|
7
7
|
constructor(config) {
|
|
8
8
|
super(config);
|
|
9
|
-
const errorHandler = DefaultErrorHandler();
|
|
9
|
+
const errorHandler = (0, exports.DefaultErrorHandler)();
|
|
10
10
|
this.listener = async (req, res) => {
|
|
11
11
|
const ctx = this.config && this.config.newContext ?
|
|
12
12
|
this.config.newContext(req, res) :
|
|
@@ -106,6 +106,7 @@ const DefaultErrorHandler = () => {
|
|
|
106
106
|
});
|
|
107
107
|
break;
|
|
108
108
|
case "ParseOptionsError":
|
|
109
|
+
case "BadRequestError":
|
|
109
110
|
case "SequelizeValidationError":
|
|
110
111
|
case "SequelizeEagerLoadingError":
|
|
111
112
|
case "SequelizeUniqueConstraintError":
|
|
@@ -128,4 +129,5 @@ const DefaultErrorHandler = () => {
|
|
|
128
129
|
return true;
|
|
129
130
|
};
|
|
130
131
|
};
|
|
132
|
+
exports.DefaultErrorHandler = DefaultErrorHandler;
|
|
131
133
|
//# sourceMappingURL=app.js.map
|
package/dist/handler/app.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app.js","sourceRoot":"","sources":["../../src/handler/app.ts"],"names":[],"mappings":";;;AAAA,+BAA6D;AAC7D,qCAAwE;AAExE,MAAa,GAAI,SAAQ,eAAM;IAG7B,YAAY,MAAsB;QAChC,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,MAAM,YAAY,GAAG,
|
|
1
|
+
{"version":3,"file":"app.js","sourceRoot":"","sources":["../../src/handler/app.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,7 +19,7 @@ class Context {
|
|
|
19
19
|
this.path = (0, tokenize_match_1.normalizePath)(this.url.pathname); // normalized path
|
|
20
20
|
this.hash = this.url.hash;
|
|
21
21
|
this.query = (0, tokenize_match_1.parseSearchParams)(this.url.searchParams);
|
|
22
|
-
this.buffer = Buffer.from("");
|
|
22
|
+
//this.buffer = Buffer.from("");
|
|
23
23
|
this.remoteAddress = req.socket.remoteAddress;
|
|
24
24
|
this.cookies = {}; // a middleware will fill
|
|
25
25
|
this.headers = req.headers;
|
|
@@ -62,16 +62,21 @@ class Context {
|
|
|
62
62
|
async end({ status, headers, body }) {
|
|
63
63
|
return new Promise((resolve, reject) => {
|
|
64
64
|
try {
|
|
65
|
-
this.res.
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
65
|
+
if (this.res.headersSent) {
|
|
66
|
+
reject(new Error("already ended"));
|
|
67
|
+
}
|
|
68
|
+
else {
|
|
69
|
+
this.res.statusCode = status;
|
|
70
|
+
const keys = Object.keys(headers);
|
|
71
|
+
for (const key of keys) {
|
|
72
|
+
if (headers[key] !== undefined) {
|
|
73
|
+
this.res.setHeader(key, headers[key]);
|
|
74
|
+
}
|
|
70
75
|
}
|
|
76
|
+
this.res.end(body !== undefined ? String(body) : undefined, () => {
|
|
77
|
+
resolve();
|
|
78
|
+
});
|
|
71
79
|
}
|
|
72
|
-
this.res.end(body !== undefined ? String(body) : undefined, () => {
|
|
73
|
-
resolve();
|
|
74
|
-
});
|
|
75
80
|
}
|
|
76
81
|
catch (e) {
|
|
77
82
|
reject(e);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"context.js","sourceRoot":"","sources":["../../../src/handler/common/context.ts"],"names":[],"mappings":";;;AAAA,8CAAsD;AAGtD,qDAAoE;AAEpE,2DAAqE;AACrE,uCAAmC;AACnC,0CAAuC;AACvC,8CAA2C;AAU3C,MAAa,OAAO;IAiBlB,YAA4B,GAAoB,EAAkB,GAAmB,EAAE,MAAe;QAA1E,QAAG,GAAH,GAAG,CAAiB;QAAkB,QAAG,GAAH,GAAG,CAAgB;QAJ9E,WAAM,GAA2C,EAAE,CAAC,CAAC,4BAA4B;QAKtF,IAAI,CAAC,IAAI,GAAG,SAAgB,CAAC;QAC7B,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;QAC9B,IAAI,CAAC,GAAG,GAAG,IAAA,gBAAM,EAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,UAAU,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,CAAQ,CAAC;QAChF,IAAI,CAAC,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,WAAW,EAAY,CAAC,CAAC,CAAC,KAAK,CAAC;QACtE,IAAI,CAAC,IAAI,GAAG,IAAA,8BAAa,EAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,kBAAkB;QAChE,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC;QAC1B,IAAI,CAAC,KAAK,GAAG,IAAA,kCAAiB,EAAC,IAAI,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;QACtD,
|
|
1
|
+
{"version":3,"file":"context.js","sourceRoot":"","sources":["../../../src/handler/common/context.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,10 +4,65 @@ exports.RouterHandler = void 0;
|
|
|
4
4
|
const router_1 = require("./router");
|
|
5
5
|
const tokenize_match_1 = require("./tokenize-match");
|
|
6
6
|
const parse_1 = require("../middleware/parse");
|
|
7
|
+
const parser_1 = require("../../util/parser");
|
|
7
8
|
const session_1 = require("../middleware/session");
|
|
8
9
|
const group_1 = require("../middleware/group");
|
|
9
|
-
const
|
|
10
|
-
|
|
10
|
+
const ResultParser = (options, parser) => async (ctx) => {
|
|
11
|
+
if (!ctx.results || ctx.results.length === 0) {
|
|
12
|
+
ctx.logger.debug(`not parsing results`);
|
|
13
|
+
return undefined;
|
|
14
|
+
}
|
|
15
|
+
else {
|
|
16
|
+
const index = ctx.results.length - 1;
|
|
17
|
+
const lastResult = ctx.results[index];
|
|
18
|
+
ctx.logger.trace(`parsing lastResult[%o]`, lastResult);
|
|
19
|
+
try {
|
|
20
|
+
if (options instanceof Array) {
|
|
21
|
+
for (let i = 0; i < options.length; i++) {
|
|
22
|
+
const o = options[i];
|
|
23
|
+
try {
|
|
24
|
+
const mappedResults = (parser ? parser.parse : parser_1.parse)(`ctx.results[${index}]`, lastResult, o.options, o.mode, o.ignoreUndefined);
|
|
25
|
+
ctx.logger.trace(`ctx.results[%s] mapped to %o`, index, mappedResults);
|
|
26
|
+
return mappedResults;
|
|
27
|
+
}
|
|
28
|
+
catch (e) {
|
|
29
|
+
if (i === options.length - 1) {
|
|
30
|
+
throw e;
|
|
31
|
+
}
|
|
32
|
+
else {
|
|
33
|
+
continue;
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
else {
|
|
39
|
+
const mappedResults = (parser ? parser.parse : parser_1.parse)(`ctx.results[${index}]`, lastResult, options.options, options.mode, options.ignoreUndefined);
|
|
40
|
+
ctx.logger.trace(`ctx.results[%s] mapped to %o`, index, mappedResults);
|
|
41
|
+
return mappedResults;
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
catch (e) {
|
|
45
|
+
ctx.logger.error(`error parsing lastResult[%o]`, lastResult);
|
|
46
|
+
throw e;
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
};
|
|
50
|
+
const ResponseHandler = () => async (ctx) => {
|
|
51
|
+
ctx.logger.trace("results [%o]", ctx.results);
|
|
52
|
+
if (!ctx.results || ctx.results.length === 0) {
|
|
53
|
+
throw new Error(`no response to send. Is your handler returning a value differente than boolean 'true|false' ?`);
|
|
54
|
+
}
|
|
55
|
+
else {
|
|
56
|
+
const lastResult = ctx.results[ctx.results.length - 1];
|
|
57
|
+
ctx.logger.debug("response [%o]", lastResult);
|
|
58
|
+
if (lastResult !== undefined) {
|
|
59
|
+
await ctx.json(lastResult);
|
|
60
|
+
}
|
|
61
|
+
else {
|
|
62
|
+
throw new Error(`no response to send. Is your handler returning a value differente than boolean 'true|false' ?`);
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
};
|
|
11
66
|
class RouterHandler {
|
|
12
67
|
constructor(handler, path, method, options) {
|
|
13
68
|
this.path = path;
|
|
@@ -50,11 +105,11 @@ class RouterHandler {
|
|
|
50
105
|
handlers = handlers.concat(routeHandlers);
|
|
51
106
|
if (this.options && this.options.response) {
|
|
52
107
|
if (typeof this.options.response === "boolean") {
|
|
53
|
-
handlers.push(
|
|
108
|
+
handlers.push(ResponseHandler());
|
|
54
109
|
}
|
|
55
110
|
else {
|
|
56
|
-
handlers.push(
|
|
57
|
-
handlers.push(
|
|
111
|
+
handlers.push(ResultParser(this.options.response, this.options.parser));
|
|
112
|
+
handlers.push(ResponseHandler());
|
|
58
113
|
}
|
|
59
114
|
}
|
|
60
115
|
this.handler = handlers;
|