@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
package/src/handler/error.ts
DELETED
|
@@ -1,42 +0,0 @@
|
|
|
1
|
-
import { BAD_REQUEST, ERROR_RESPONSE, FORBIDDEN, NOT_FOUND, UNAUTHORIZED, Context, ErrorHandler, METHOD_NOT_IMPLEMENTED } from "./common";
|
|
2
|
-
|
|
3
|
-
export const DefaultErrorHandler = (): ErrorHandler<boolean> => {
|
|
4
|
-
return async (e: any, ctx: Context): Promise<boolean> => {
|
|
5
|
-
if (!e || !e.name || e.name === "Error") {
|
|
6
|
-
if (process.env.NODE_ENV === "development" || process.env.NODE_ENV === "test") {
|
|
7
|
-
ctx.logger.error(e);
|
|
8
|
-
await ctx.end(ERROR_RESPONSE(`${e && e.message ? e.message : String(e)}. You are seeing this message because NODE_ENV === "development" || NODE_ENV === "test"${e && e.stack ? ` ${e.stack}` : ""}`));
|
|
9
|
-
return false;
|
|
10
|
-
}
|
|
11
|
-
} else {
|
|
12
|
-
ctx.logger.error(e);
|
|
13
|
-
const name = e && e.name ? e.name : undefined;
|
|
14
|
-
const message = e && e.message ? e.message : undefined;
|
|
15
|
-
switch (name) {
|
|
16
|
-
case "NotFoundError":
|
|
17
|
-
await ctx.end(NOT_FOUND(e.message));
|
|
18
|
-
break;
|
|
19
|
-
case "MethodNotImplementedError":
|
|
20
|
-
await ctx.end(METHOD_NOT_IMPLEMENTED(message));
|
|
21
|
-
break;
|
|
22
|
-
case "ForbiddenError":
|
|
23
|
-
await ctx.end(FORBIDDEN(message));
|
|
24
|
-
break;
|
|
25
|
-
case "UnAuthorizedError":
|
|
26
|
-
await ctx.end(UNAUTHORIZED(message));
|
|
27
|
-
break;
|
|
28
|
-
case "ParseOptionsError":
|
|
29
|
-
case "SequelizeValidationError":
|
|
30
|
-
case "SequelizeEagerLoadingError":
|
|
31
|
-
case "SequelizeUniqueConstraintError":
|
|
32
|
-
await ctx.end(BAD_REQUEST(message));
|
|
33
|
-
break;
|
|
34
|
-
default:
|
|
35
|
-
await ctx.end(ERROR_RESPONSE(message));
|
|
36
|
-
break;
|
|
37
|
-
}
|
|
38
|
-
return false;
|
|
39
|
-
}
|
|
40
|
-
return true;
|
|
41
|
-
};
|
|
42
|
-
};
|
package/src/handler/router.ts
DELETED
|
@@ -1,127 +0,0 @@
|
|
|
1
|
-
import { Method, Handler, Context, ErrorHandler, } from "./common";
|
|
2
|
-
import { normalizePath, tokenizePath, matchTokenizePath } from "./common/tokenize-match";
|
|
3
|
-
|
|
4
|
-
interface RouterHandler {
|
|
5
|
-
handler: Handler | Router;
|
|
6
|
-
method?: Method;
|
|
7
|
-
path?: string;
|
|
8
|
-
tokens: {
|
|
9
|
-
optional: boolean;
|
|
10
|
-
wild: boolean;
|
|
11
|
-
token: string;
|
|
12
|
-
}[]
|
|
13
|
-
}
|
|
14
|
-
|
|
15
|
-
export class Router {
|
|
16
|
-
protected readonly handlers: RouterHandler[] = [];
|
|
17
|
-
protected readonly errorHandlers: ErrorHandler[] = [];
|
|
18
|
-
public get(path: string, handler: Array<Handler> | Handler | Router): Router {
|
|
19
|
-
return this.use(handler, path, "get");
|
|
20
|
-
}
|
|
21
|
-
public post(path: string, handler: Array<Handler> | Handler | Router): Router {
|
|
22
|
-
return this.use(handler, path, "post");
|
|
23
|
-
}
|
|
24
|
-
public patch(path: string, handler: Array<Handler> | Handler | Router): Router {
|
|
25
|
-
return this.use(handler, path, "patch");
|
|
26
|
-
}
|
|
27
|
-
public delete(path: string, handler: Array<Handler> | Handler | Router): Router {
|
|
28
|
-
return this.use(handler, path, "delete");
|
|
29
|
-
}
|
|
30
|
-
public put(path: string, handler: Array<Handler> | Handler | Router): Router {
|
|
31
|
-
return this.use(handler, path, "put");
|
|
32
|
-
}
|
|
33
|
-
public options(path: string, handler: Array<Handler> | Handler | Router): Router {
|
|
34
|
-
return this.use(handler, path, "options");
|
|
35
|
-
}
|
|
36
|
-
public use(handler: Array<Handler> | Handler | Router, path?: string, method?: Method): Router {
|
|
37
|
-
if (handler instanceof Array) {
|
|
38
|
-
for (const h of handler) {
|
|
39
|
-
const nPath = path !== undefined ? normalizePath(path) : undefined;
|
|
40
|
-
this.handlers.push({
|
|
41
|
-
handler: h,
|
|
42
|
-
method: method ? method.toUpperCase() as Method : method,
|
|
43
|
-
path: nPath,
|
|
44
|
-
tokens: tokenizePath(nPath)
|
|
45
|
-
});
|
|
46
|
-
}
|
|
47
|
-
} else {
|
|
48
|
-
const nPath = path !== undefined ? normalizePath(path) : undefined;
|
|
49
|
-
this.handlers.push({
|
|
50
|
-
handler,
|
|
51
|
-
method: method ? method.toUpperCase() as Method : method,
|
|
52
|
-
path: nPath,
|
|
53
|
-
tokens: tokenizePath(nPath)
|
|
54
|
-
});
|
|
55
|
-
}
|
|
56
|
-
return this;
|
|
57
|
-
}
|
|
58
|
-
public catch(errorHandler: Array<ErrorHandler> | ErrorHandler): Router {
|
|
59
|
-
if (errorHandler instanceof Array) {
|
|
60
|
-
for (const e of errorHandler) {
|
|
61
|
-
this.errorHandlers.push(e);
|
|
62
|
-
}
|
|
63
|
-
} else {
|
|
64
|
-
this.errorHandlers.push(errorHandler);
|
|
65
|
-
}
|
|
66
|
-
return this;
|
|
67
|
-
}
|
|
68
|
-
protected isMatch(ctx: Context, h: RouterHandler, prePath?: string): boolean {
|
|
69
|
-
if ((h.method === undefined || h.method === ctx.method)) {
|
|
70
|
-
|
|
71
|
-
if (h.path === undefined) {
|
|
72
|
-
return true;
|
|
73
|
-
}
|
|
74
|
-
|
|
75
|
-
const ret = typeof h.handler === "function" || h.handler instanceof Array ?
|
|
76
|
-
matchTokenizePath(false, h.tokens, ctx.path, prePath) :
|
|
77
|
-
matchTokenizePath(true, h.tokens, ctx.path, prePath);
|
|
78
|
-
ctx.params = ret.params;
|
|
79
|
-
return ret.match;
|
|
80
|
-
}
|
|
81
|
-
return false;
|
|
82
|
-
}
|
|
83
|
-
protected callHandler = async (ctx: Context, handler: Handler | Router, prePath?: string): Promise<boolean> => {
|
|
84
|
-
const shouldContinue = typeof handler === "function" ?
|
|
85
|
-
await handler(ctx) : await handler.run(ctx, prePath);
|
|
86
|
-
if (shouldContinue === false) {
|
|
87
|
-
// ctx.logger.debug(`avoiding next handlers because handler returned false.`);
|
|
88
|
-
return false;
|
|
89
|
-
} else if (shouldContinue !== true && shouldContinue !== undefined) {
|
|
90
|
-
ctx.logger.trace("pushing to results [%o]", shouldContinue);
|
|
91
|
-
ctx.results.push(shouldContinue);
|
|
92
|
-
} /*else {
|
|
93
|
-
// ctx.logger.debug("NOT pushing to results [%s]", String(shouldContinue));
|
|
94
|
-
}*/
|
|
95
|
-
return true;
|
|
96
|
-
};
|
|
97
|
-
protected async handleError(e: unknown, ctx: Context): Promise<boolean> {
|
|
98
|
-
for (const eH of this.errorHandlers) {
|
|
99
|
-
const ret = await eH(e, ctx);
|
|
100
|
-
if (ret === false || ctx.res.headersSent) {
|
|
101
|
-
return false;
|
|
102
|
-
}
|
|
103
|
-
}
|
|
104
|
-
throw e; // pass the error along
|
|
105
|
-
}
|
|
106
|
-
public async run(ctx: Context, prePath?: string): Promise<boolean> {
|
|
107
|
-
try {
|
|
108
|
-
let shouldContinue = true;
|
|
109
|
-
for (const h of this.handlers) {
|
|
110
|
-
if (!shouldContinue || ctx.res.headersSent) {
|
|
111
|
-
shouldContinue = false;
|
|
112
|
-
break;
|
|
113
|
-
}
|
|
114
|
-
if (this.isMatch(ctx, h, prePath)) {
|
|
115
|
-
shouldContinue = await this.callHandler(
|
|
116
|
-
ctx,
|
|
117
|
-
h.handler,
|
|
118
|
-
`${prePath ? prePath : "/"}${h.path ? h.path.substring(1) : ""}`
|
|
119
|
-
);
|
|
120
|
-
}
|
|
121
|
-
}
|
|
122
|
-
return !ctx.res.headersSent;
|
|
123
|
-
} catch (e: any) {
|
|
124
|
-
return this.handleError(e as Error, ctx);
|
|
125
|
-
}
|
|
126
|
-
}
|
|
127
|
-
}
|