@miqro/core 4.0.1 → 5.0.3
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/build/app.d.ts +15 -11
- package/build/app.js +22 -20
- package/build/app.js.map +1 -1
- package/build/common.d.ts +106 -0
- package/build/common.js +477 -0
- package/build/common.js.map +1 -0
- package/build/lib.d.ts +7 -38
- package/build/lib.js +6 -33
- package/build/lib.js.map +1 -1
- package/build/middleware/body-parser.d.ts +78 -0
- package/build/middleware/body-parser.js +548 -0
- package/build/middleware/body-parser.js.map +1 -0
- package/build/middleware/router.d.ts +114 -0
- package/build/middleware/router.js +704 -0
- package/build/middleware/router.js.map +1 -0
- package/build/middleware/session.d.ts +27 -3
- package/build/middleware/session.js +238 -18
- package/build/middleware/session.js.map +1 -1
- package/build/types.d.ts +309 -0
- package/build/types.js +455 -0
- package/build/types.js.map +1 -0
- package/build/{websocket/cluster.d.ts → websocket.d.ts} +13 -2
- package/build/websocket.js +316 -0
- package/build/websocket.js.map +1 -0
- package/package.json +7 -7
- package/src/app.ts +36 -32
- package/src/common.ts +528 -0
- package/src/lib.ts +63 -101
- package/src/middleware/body-parser.ts +593 -0
- package/src/middleware/router.ts +840 -0
- package/src/middleware/session.ts +249 -19
- package/src/types.ts +785 -0
- package/src/websocket.ts +356 -0
- package/build/api-router.d.ts +0 -34
- package/build/api-router.js +0 -48
- package/build/api-router.js.map +0 -1
- package/build/app-utils.d.ts +0 -13
- package/build/app-utils.js +0 -78
- package/build/app-utils.js.map +0 -1
- package/build/common/api-router-types.d.ts +0 -28
- package/build/common/api-router-types.js +0 -24
- package/build/common/api-router-types.js.map +0 -1
- package/build/common/api-router-utils.d.ts +0 -3
- package/build/common/api-router-utils.js +0 -118
- package/build/common/api-router-utils.js.map +0 -1
- package/build/common/config/config.d.ts +0 -15
- package/build/common/config/config.js +0 -38
- package/build/common/config/config.js.map +0 -1
- package/build/common/config/featuretoggle.d.ts +0 -1
- package/build/common/config/featuretoggle.js +0 -6
- package/build/common/config/featuretoggle.js.map +0 -1
- package/build/common/config/loader.d.ts +0 -13
- package/build/common/config/loader.js +0 -64
- package/build/common/config/loader.js.map +0 -1
- package/build/common/context.d.ts +0 -57
- package/build/common/context.js +0 -137
- package/build/common/context.js.map +0 -1
- package/build/common/error/badrequesterror.d.ts +0 -3
- package/build/common/error/badrequesterror.js +0 -7
- package/build/common/error/badrequesterror.js.map +0 -1
- package/build/common/error/configfilenotfound.d.ts +0 -3
- package/build/common/error/configfilenotfound.js +0 -7
- package/build/common/error/configfilenotfound.js.map +0 -1
- package/build/common/error/forbiddenerror.d.ts +0 -3
- package/build/common/error/forbiddenerror.js +0 -7
- package/build/common/error/forbiddenerror.js.map +0 -1
- package/build/common/error/notfound.d.ts +0 -3
- package/build/common/error/notfound.js +0 -7
- package/build/common/error/notfound.js.map +0 -1
- package/build/common/error/notimplemented.d.ts +0 -3
- package/build/common/error/notimplemented.js +0 -7
- package/build/common/error/notimplemented.js.map +0 -1
- package/build/common/error/unauthorizederror.d.ts +0 -3
- package/build/common/error/unauthorizederror.js +0 -7
- package/build/common/error/unauthorizederror.js.map +0 -1
- package/build/common/logger/constants.d.ts +0 -14
- package/build/common/logger/constants.js +0 -22
- package/build/common/logger/constants.js.map +0 -1
- package/build/common/logger/factory.d.ts +0 -16
- package/build/common/logger/factory.js +0 -47
- package/build/common/logger/factory.js.map +0 -1
- package/build/common/logger/interfaces.d.ts +0 -18
- package/build/common/logger/interfaces.js +0 -2
- package/build/common/logger/interfaces.js.map +0 -1
- package/build/common/logger/logger.d.ts +0 -35
- package/build/common/logger/logger.js +0 -95
- package/build/common/logger/logger.js.map +0 -1
- package/build/common/logger/transport/console.d.ts +0 -5
- package/build/common/logger/transport/console.js +0 -37
- package/build/common/logger/transport/console.js.map +0 -1
- package/build/common/logger/transport/file.d.ts +0 -2
- package/build/common/logger/transport/file.js +0 -25
- package/build/common/logger/transport/file.js.map +0 -1
- package/build/common/parser.d.ts +0 -7
- package/build/common/parser.js +0 -44
- package/build/common/parser.js.map +0 -1
- package/build/common/router-default-logger-factory.d.ts +0 -4
- package/build/common/router-default-logger-factory.js +0 -38
- package/build/common/router-default-logger-factory.js.map +0 -1
- package/build/common/router-handler.d.ts +0 -20
- package/build/common/router-handler.js +0 -154
- package/build/common/router-handler.js.map +0 -1
- package/build/common/router-types.d.ts +0 -63
- package/build/common/router-types.js +0 -86
- package/build/common/router-types.js.map +0 -1
- package/build/common/router-utils.d.ts +0 -3
- package/build/common/router-utils.js +0 -46
- package/build/common/router-utils.js.map +0 -1
- package/build/common/session/common.d.ts +0 -37
- package/build/common/session/common.js +0 -2
- package/build/common/session/common.js.map +0 -1
- package/build/common/session/service.d.ts +0 -26
- package/build/common/session/service.js +0 -154
- package/build/common/session/service.js.map +0 -1
- package/build/common/tokenize-match.d.ts +0 -19
- package/build/common/tokenize-match.js +0 -73
- package/build/common/tokenize-match.js.map +0 -1
- package/build/common/url-utils.d.ts +0 -6
- package/build/common/url-utils.js +0 -48
- package/build/common/url-utils.js.map +0 -1
- package/build/middleware/buffer.d.ts +0 -6
- package/build/middleware/buffer.js +0 -78
- package/build/middleware/buffer.js.map +0 -1
- package/build/middleware/cookie.d.ts +0 -4
- package/build/middleware/cookie.js +0 -15
- package/build/middleware/cookie.js.map +0 -1
- package/build/middleware/cors.d.ts +0 -8
- package/build/middleware/cors.js +0 -89
- package/build/middleware/cors.js.map +0 -1
- package/build/middleware/form.d.ts +0 -6
- package/build/middleware/form.js +0 -58
- package/build/middleware/form.js.map +0 -1
- package/build/middleware/group.d.ts +0 -3
- package/build/middleware/group.js +0 -77
- package/build/middleware/group.js.map +0 -1
- package/build/middleware/json.d.ts +0 -6
- package/build/middleware/json.js +0 -55
- package/build/middleware/json.js.map +0 -1
- package/build/middleware/logger.d.ts +0 -4
- package/build/middleware/logger.js +0 -16
- package/build/middleware/logger.js.map +0 -1
- package/build/middleware/parse.d.ts +0 -14
- package/build/middleware/parse.js +0 -88
- package/build/middleware/parse.js.map +0 -1
- package/build/middleware/result.d.ts +0 -9
- package/build/middleware/result.js +0 -62
- package/build/middleware/result.js.map +0 -1
- package/build/middleware/tag.d.ts +0 -4
- package/build/middleware/tag.js +0 -10
- package/build/middleware/tag.js.map +0 -1
- package/build/middleware/text.d.ts +0 -5
- package/build/middleware/text.js +0 -46
- package/build/middleware/text.js.map +0 -1
- package/build/proxy.d.ts +0 -19
- package/build/proxy.js +0 -74
- package/build/proxy.js.map +0 -1
- package/build/router.d.ts +0 -26
- package/build/router.js +0 -116
- package/build/router.js.map +0 -1
- package/build/static.d.ts +0 -14
- package/build/static.js +0 -211
- package/build/static.js.map +0 -1
- package/build/websocket/cluster.js +0 -114
- package/build/websocket/cluster.js.map +0 -1
- package/build/websocket/server.d.ts +0 -15
- package/build/websocket/server.js +0 -127
- package/build/websocket/server.js.map +0 -1
- package/build/websocket/types.d.ts +0 -39
- package/build/websocket/types.js +0 -2
- package/build/websocket/types.js.map +0 -1
- package/build/websocket/utils.d.ts +0 -8
- package/build/websocket/utils.js +0 -77
- package/build/websocket/utils.js.map +0 -1
- package/src/api-router.ts +0 -50
- package/src/app-utils.ts +0 -82
- package/src/common/api-router-types.ts +0 -52
- package/src/common/api-router-utils.ts +0 -126
- package/src/common/config/config.ts +0 -49
- package/src/common/config/featuretoggle.ts +0 -6
- package/src/common/config/loader.ts +0 -81
- package/src/common/context.ts +0 -192
- package/src/common/error/badrequesterror.ts +0 -6
- package/src/common/error/configfilenotfound.ts +0 -6
- package/src/common/error/forbiddenerror.ts +0 -6
- package/src/common/error/notfound.ts +0 -6
- package/src/common/error/notimplemented.ts +0 -6
- package/src/common/error/unauthorizederror.ts +0 -6
- package/src/common/logger/constants.ts +0 -28
- package/src/common/logger/factory.ts +0 -53
- package/src/common/logger/interfaces.ts +0 -19
- package/src/common/logger/logger.ts +0 -136
- package/src/common/logger/transport/console.ts +0 -36
- package/src/common/logger/transport/file.ts +0 -26
- package/src/common/parser.ts +0 -50
- package/src/common/router-default-logger-factory.ts +0 -44
- package/src/common/router-handler.ts +0 -186
- package/src/common/router-types.ts +0 -153
- package/src/common/router-utils.ts +0 -47
- package/src/common/session/common.ts +0 -40
- package/src/common/session/service.ts +0 -175
- package/src/common/tokenize-match.ts +0 -98
- package/src/common/url-utils.ts +0 -46
- package/src/middleware/buffer.ts +0 -82
- package/src/middleware/cookie.ts +0 -20
- package/src/middleware/cors.ts +0 -98
- package/src/middleware/form.ts +0 -61
- package/src/middleware/group.ts +0 -74
- package/src/middleware/json.ts +0 -57
- package/src/middleware/logger.ts +0 -18
- package/src/middleware/parse.ts +0 -105
- package/src/middleware/result.ts +0 -73
- package/src/middleware/tag.ts +0 -15
- package/src/middleware/text.ts +0 -47
- package/src/proxy.ts +0 -99
- package/src/router.ts +0 -140
- package/src/static.ts +0 -242
- package/src/websocket/cluster.ts +0 -128
- package/src/websocket/server.ts +0 -135
- package/src/websocket/types.ts +0 -41
- package/src/websocket/utils.ts +0 -95
|
@@ -1,136 +0,0 @@
|
|
|
1
|
-
import { format } from "util";
|
|
2
|
-
import { LoggerFormatter, LoggerTransport, LoggerTransportWriteArgs, LogLevel, WriteArgs } from "./interfaces.js";
|
|
3
|
-
import { DEFAULT_LOGGER_FORMATTER, DEFAULT_LOGGER_TRANSPORTS, LOG_LEVEL_MAP, LoggerEvents } from "./constants.js";
|
|
4
|
-
|
|
5
|
-
export interface LoggerErrorEventInit {
|
|
6
|
-
error: any;
|
|
7
|
-
}
|
|
8
|
-
|
|
9
|
-
// @types/node doesnt include Event and EventTarget
|
|
10
|
-
declare var Event: any;
|
|
11
|
-
declare var EventTarget: any;
|
|
12
|
-
|
|
13
|
-
export class LoggerErrorEvent extends Event {
|
|
14
|
-
public error: any;
|
|
15
|
-
|
|
16
|
-
constructor(event: string, init: LoggerErrorEventInit) {
|
|
17
|
-
super(event, init);
|
|
18
|
-
this.error = init.error;
|
|
19
|
-
}
|
|
20
|
-
}
|
|
21
|
-
|
|
22
|
-
export interface Logger {
|
|
23
|
-
log(message?: any, ...optionalParams: any[]): void;
|
|
24
|
-
|
|
25
|
-
info(message?: any, ...optionalParams: any[]): void;
|
|
26
|
-
|
|
27
|
-
trace(message?: any, ...optionalParams: any[]): void;
|
|
28
|
-
|
|
29
|
-
debug(message?: any, ...optionalParams: any[]): void;
|
|
30
|
-
|
|
31
|
-
warn(message?: any, ...optionalParams: any[]): void;
|
|
32
|
-
|
|
33
|
-
error(message?: any, ...optionalParams: any[]): void;
|
|
34
|
-
|
|
35
|
-
addTransport(transport: LoggerTransport): void;
|
|
36
|
-
|
|
37
|
-
setLevel(level: LogLevel): void;
|
|
38
|
-
}
|
|
39
|
-
|
|
40
|
-
export class Logger extends EventTarget implements Logger {
|
|
41
|
-
|
|
42
|
-
protected readonly options: { transports: LoggerTransport[]; formatter: LoggerFormatter; };
|
|
43
|
-
|
|
44
|
-
constructor(protected readonly identifier: string, protected level: LogLevel = "info", options?: { transports?: LoggerTransport[]; formatter?: LoggerFormatter; }) {
|
|
45
|
-
super();
|
|
46
|
-
if (LOG_LEVEL_MAP[level] === undefined) {
|
|
47
|
-
throw new Error(`Unknown level [${level}]`);
|
|
48
|
-
}
|
|
49
|
-
this.addEventListener(LoggerEvents.error, (ev: any) => {
|
|
50
|
-
console.error((ev as LoggerErrorEvent).error);
|
|
51
|
-
});
|
|
52
|
-
this.options = {
|
|
53
|
-
transports: options && options.transports !== undefined ? options.transports : DEFAULT_LOGGER_TRANSPORTS(),
|
|
54
|
-
formatter: options && options.formatter !== undefined ? options.formatter : DEFAULT_LOGGER_FORMATTER,
|
|
55
|
-
};
|
|
56
|
-
}
|
|
57
|
-
|
|
58
|
-
public setLevel(level: LogLevel): void {
|
|
59
|
-
if (!LOG_LEVEL_MAP[level]) {
|
|
60
|
-
throw new Error(`Unknown level [${level}]`);
|
|
61
|
-
}
|
|
62
|
-
this.level = level;
|
|
63
|
-
}
|
|
64
|
-
|
|
65
|
-
public addTransport(transport: LoggerTransport): void {
|
|
66
|
-
this.options.transports.push(transport);
|
|
67
|
-
}
|
|
68
|
-
|
|
69
|
-
protected write(args: WriteArgs): void {
|
|
70
|
-
try {
|
|
71
|
-
let eventArgs: LoggerTransportWriteArgs | undefined = undefined;
|
|
72
|
-
const tR = [];
|
|
73
|
-
for (const transport of this.options.transports) {
|
|
74
|
-
if (LOG_LEVEL_MAP[transport.level ? transport.level : this.level] >= LOG_LEVEL_MAP[args.level]) {
|
|
75
|
-
try {
|
|
76
|
-
eventArgs = eventArgs ? eventArgs : {
|
|
77
|
-
out: this.options.formatter({
|
|
78
|
-
identifier: this.identifier,
|
|
79
|
-
level: args.level,
|
|
80
|
-
message: format(args.message, ...args.optionalParams)
|
|
81
|
-
}),
|
|
82
|
-
...args
|
|
83
|
-
};
|
|
84
|
-
tR.push(transport.write(eventArgs));
|
|
85
|
-
} catch (e2: any) {
|
|
86
|
-
this.dispatchEvent(new LoggerErrorEvent(LoggerEvents.error, {
|
|
87
|
-
error: e2
|
|
88
|
-
}));
|
|
89
|
-
}
|
|
90
|
-
}
|
|
91
|
-
}
|
|
92
|
-
Promise.allSettled(tR).catch((e) => {
|
|
93
|
-
this.dispatchEvent(new LoggerErrorEvent(LoggerEvents.error, {
|
|
94
|
-
error: e
|
|
95
|
-
}));
|
|
96
|
-
});
|
|
97
|
-
} catch (e: any) {
|
|
98
|
-
this.dispatchEvent(new LoggerErrorEvent(LoggerEvents.error, {
|
|
99
|
-
error: e
|
|
100
|
-
}));
|
|
101
|
-
}
|
|
102
|
-
}
|
|
103
|
-
|
|
104
|
-
/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
|
|
105
|
-
public debug(message?: any, ...optionalParams: any[]): void {
|
|
106
|
-
return this.write({level: "debug", message, optionalParams});
|
|
107
|
-
}
|
|
108
|
-
|
|
109
|
-
/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
|
|
110
|
-
public error(message?: any, ...optionalParams: any[]): void {
|
|
111
|
-
return this.write({level: "error", message, optionalParams});
|
|
112
|
-
}
|
|
113
|
-
|
|
114
|
-
/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
|
|
115
|
-
public info(message?: any, ...optionalParams: any[]): void {
|
|
116
|
-
return this.write({level: "info", message, optionalParams});
|
|
117
|
-
}
|
|
118
|
-
|
|
119
|
-
/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
|
|
120
|
-
public log(message?: any, ...optionalParams: any[]): void {
|
|
121
|
-
return this.write({level: "info", message, optionalParams});
|
|
122
|
-
}
|
|
123
|
-
|
|
124
|
-
/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
|
|
125
|
-
public trace(message?: any, ...optionalParams: any[]): void {
|
|
126
|
-
return this.write({level: "trace", message, optionalParams});
|
|
127
|
-
}
|
|
128
|
-
|
|
129
|
-
/* eslint-disable @typescript-eslint/explicit-module-boundary-types */
|
|
130
|
-
public warn(message?: any, ...optionalParams: any[]): void {
|
|
131
|
-
return this.write({level: "warn", message, optionalParams});
|
|
132
|
-
}
|
|
133
|
-
}
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
@@ -1,36 +0,0 @@
|
|
|
1
|
-
import { LoggerTransportWriteArgs, LogLevel } from "../interfaces.js";
|
|
2
|
-
|
|
3
|
-
export function ConsoleTransport(color: boolean = true, level?: LogLevel) {
|
|
4
|
-
return {
|
|
5
|
-
level,
|
|
6
|
-
write: async ({ level, out }: LoggerTransportWriteArgs): Promise<void> => {
|
|
7
|
-
if (color) {
|
|
8
|
-
switch (level) {
|
|
9
|
-
case "warn":
|
|
10
|
-
console.warn("\x1b[33m%s\x1b[0m", out);
|
|
11
|
-
break;
|
|
12
|
-
case "error":
|
|
13
|
-
console.error("\x1b[31m%s\x1b[0m", out);
|
|
14
|
-
break;
|
|
15
|
-
case "trace":
|
|
16
|
-
console.log("\x1b[34m%s\x1b[0m", out);
|
|
17
|
-
break;
|
|
18
|
-
case "debug":
|
|
19
|
-
console.log("\x1b[36m%s\x1b[0m", out);
|
|
20
|
-
break;
|
|
21
|
-
case "none":
|
|
22
|
-
break;
|
|
23
|
-
default:
|
|
24
|
-
console[level](out);
|
|
25
|
-
break;
|
|
26
|
-
}
|
|
27
|
-
} else {
|
|
28
|
-
if (level === "trace" || level === "debug") {
|
|
29
|
-
console.log(out);
|
|
30
|
-
} else if (level !== "none") {
|
|
31
|
-
console[level](out);
|
|
32
|
-
}
|
|
33
|
-
}
|
|
34
|
-
}
|
|
35
|
-
};
|
|
36
|
-
}
|
|
@@ -1,26 +0,0 @@
|
|
|
1
|
-
import { createWriteStream } from "fs";
|
|
2
|
-
import { resolve } from "path";
|
|
3
|
-
import { LoggerTransport, LoggerTransportWriteArgs, LogLevel } from "../interfaces.js";
|
|
4
|
-
|
|
5
|
-
const FILE_TRANSPORT_ENV_VARIABLE = "LOG_FILE";
|
|
6
|
-
|
|
7
|
-
export const FileTransport: (filePath?: string | null, level?: LogLevel) => LoggerTransport = (filePath = process.env[FILE_TRANSPORT_ENV_VARIABLE] ? process.env[FILE_TRANSPORT_ENV_VARIABLE] : null, level?: LogLevel) => {
|
|
8
|
-
const fileHandler = filePath ? createWriteStream(resolve(filePath), {flags: "a"}) : null;
|
|
9
|
-
return {
|
|
10
|
-
level,
|
|
11
|
-
write: async ({out}: LoggerTransportWriteArgs): Promise<void> => {
|
|
12
|
-
if (fileHandler) {
|
|
13
|
-
return new Promise((resolve, reject) => {
|
|
14
|
-
fileHandler.write(`${out}\n`, (err) => {
|
|
15
|
-
if (err) {
|
|
16
|
-
reject(err);
|
|
17
|
-
} else {
|
|
18
|
-
resolve();
|
|
19
|
-
}
|
|
20
|
-
});
|
|
21
|
-
});
|
|
22
|
-
}
|
|
23
|
-
return;
|
|
24
|
-
}
|
|
25
|
-
};
|
|
26
|
-
};
|
package/src/common/parser.ts
DELETED
|
@@ -1,50 +0,0 @@
|
|
|
1
|
-
import { Schema } from "@miqro/parser";
|
|
2
|
-
import { GroupPolicy, SessionHandlerOptions } from "./session/common.js";
|
|
3
|
-
import { Parser } from "@miqro/parser";
|
|
4
|
-
|
|
5
|
-
export const SessionHandlerOptionsSchema: Schema<SessionHandlerOptions> = {
|
|
6
|
-
type: "object",
|
|
7
|
-
properties: {
|
|
8
|
-
tokenLocation: {
|
|
9
|
-
type: "enum",
|
|
10
|
-
enumValues: ["header", "query", "cookie"]
|
|
11
|
-
},
|
|
12
|
-
tokenLocationName: "string|function",
|
|
13
|
-
setCookieOptions: {
|
|
14
|
-
type: "object?",
|
|
15
|
-
properties: {
|
|
16
|
-
httpOnly: "boolean",
|
|
17
|
-
secure: "boolean",
|
|
18
|
-
path: "string|function",
|
|
19
|
-
sameSite: {
|
|
20
|
-
type: "enum",
|
|
21
|
-
enumValues: ["lax", "strict", "none"]
|
|
22
|
-
}
|
|
23
|
-
}
|
|
24
|
-
}
|
|
25
|
-
}
|
|
26
|
-
};
|
|
27
|
-
|
|
28
|
-
export const GroupPolicySchema: Schema<GroupPolicy> = {
|
|
29
|
-
type: "object",
|
|
30
|
-
properties: {
|
|
31
|
-
groups: {
|
|
32
|
-
type: "array",
|
|
33
|
-
arrayType: "string|string[]"
|
|
34
|
-
},
|
|
35
|
-
groupPolicy: {
|
|
36
|
-
type: "enum",
|
|
37
|
-
enumValues: ["at_least_one", "all"]
|
|
38
|
-
}
|
|
39
|
-
}
|
|
40
|
-
}
|
|
41
|
-
|
|
42
|
-
export function assertNotUndefined<T = any>(arg?: T, message?: string): T {
|
|
43
|
-
|
|
44
|
-
if (arg === undefined) {
|
|
45
|
-
throw new Error(message ? message : "arg undefined");
|
|
46
|
-
}
|
|
47
|
-
return arg;
|
|
48
|
-
}
|
|
49
|
-
|
|
50
|
-
export const DEFAULT_PARSER = new Parser();
|
|
@@ -1,44 +0,0 @@
|
|
|
1
|
-
import { IncomingMessage } from "http";
|
|
2
|
-
import { URL } from "url";
|
|
3
|
-
import { newURL, normalizePath } from "./url-utils.js";
|
|
4
|
-
import { Logger } from "./logger/logger.js";
|
|
5
|
-
import { getLogger } from "./logger/factory.js";
|
|
6
|
-
import { DEFAULT_LOGGER_FORMATTER } from "./logger/constants.js";
|
|
7
|
-
|
|
8
|
-
export const defaultLoggerFactory = (uuid: string, req: IncomingMessage): Logger => {
|
|
9
|
-
let path = "";
|
|
10
|
-
let query = "";
|
|
11
|
-
let urlParsingError;
|
|
12
|
-
let method = "GET";
|
|
13
|
-
let remoteAddress: string | undefined = "";
|
|
14
|
-
try {
|
|
15
|
-
const url = newURL(req.url ? req.url : "/") as URL;
|
|
16
|
-
query = url.searchParams.toString();
|
|
17
|
-
path = normalizePath(url.pathname); // normalized path
|
|
18
|
-
method = req.method ? req.method.toUpperCase() as string : "GET";
|
|
19
|
-
remoteAddress = req.socket.remoteAddress;
|
|
20
|
-
} catch (e) {
|
|
21
|
-
urlParsingError = e;
|
|
22
|
-
}
|
|
23
|
-
const pathToEnv = path.replace(/\//ig, "_").toUpperCase();
|
|
24
|
-
const identifier = `${pathToEnv === "_" ? "" : pathToEnv.substring(1)}${method.toUpperCase()}`;
|
|
25
|
-
|
|
26
|
-
const logger = getLogger(identifier, {
|
|
27
|
-
formatter: (args) => {
|
|
28
|
-
args.message = `${method} ${path}${query ? `?${query}` : ""}${uuid ? ` [${uuid}]` : ""}${remoteAddress ? ` (${remoteAddress})` : ""} ${args.message}`;
|
|
29
|
-
return DEFAULT_LOGGER_FORMATTER(args);
|
|
30
|
-
}
|
|
31
|
-
}, false);
|
|
32
|
-
|
|
33
|
-
if (urlParsingError) {
|
|
34
|
-
logger.error(urlParsingError);
|
|
35
|
-
}
|
|
36
|
-
|
|
37
|
-
return logger;
|
|
38
|
-
}
|
|
39
|
-
|
|
40
|
-
export function getPathIdentifier(path: string, method: string) {
|
|
41
|
-
const pathToEnv = path.replace(/[^a-z0-9+]+/gi, '_').toUpperCase();
|
|
42
|
-
const identifier = `${pathToEnv === "_" ? "" : pathToEnv.substring(1)}${method.toUpperCase()}`;
|
|
43
|
-
return identifier;
|
|
44
|
-
}
|
|
@@ -1,186 +0,0 @@
|
|
|
1
|
-
import { matchTokenizePath, PathParams, PathPart, PathPartToken, tokenizePath } from "./tokenize-match.js";
|
|
2
|
-
import { Context, Handler, Method } from "./context.js";
|
|
3
|
-
import {
|
|
4
|
-
HandlerWithOptions,
|
|
5
|
-
HandlerWithOptionsSchema,
|
|
6
|
-
isMinimalRouter,
|
|
7
|
-
MinimalRouter,
|
|
8
|
-
RouterHandlerOptions,
|
|
9
|
-
RouterHandlerOptionsSchema,
|
|
10
|
-
RouterJSONDoc
|
|
11
|
-
} from "./router-types.js";
|
|
12
|
-
import { assertNotUndefined, DEFAULT_PARSER } from "./parser.js";
|
|
13
|
-
import { SessionHandler } from "../middleware/session.js";
|
|
14
|
-
import { GroupPolicyHandler } from "../middleware/group.js";
|
|
15
|
-
import { ParseRequest } from "../middleware/parse.js";
|
|
16
|
-
import { ResponseHandler } from "./router-utils.js";
|
|
17
|
-
import { ResultParser } from "../middleware/result.js";
|
|
18
|
-
|
|
19
|
-
export class RouterHandler {
|
|
20
|
-
|
|
21
|
-
private readonly tokens: PathPartToken[];
|
|
22
|
-
private readonly handler: Array<Handler | MinimalRouter>;
|
|
23
|
-
private readonly isRouter: boolean;
|
|
24
|
-
private readonly options?: RouterHandlerOptions;
|
|
25
|
-
|
|
26
|
-
public constructor(
|
|
27
|
-
private readonly originalHandler: Array<Handler> | HandlerWithOptions | Handler | MinimalRouter,
|
|
28
|
-
private readonly path: string | undefined,
|
|
29
|
-
private readonly method: Method | undefined,
|
|
30
|
-
options?: RouterHandlerOptions) {
|
|
31
|
-
this.tokens = tokenizePath(path);
|
|
32
|
-
|
|
33
|
-
if (options) {
|
|
34
|
-
options = assertNotUndefined(DEFAULT_PARSER.parse(options, RouterHandlerOptionsSchema, "options"), "bad options");
|
|
35
|
-
}
|
|
36
|
-
|
|
37
|
-
let handlers: Array<Handler | MinimalRouter> = []
|
|
38
|
-
this.isRouter = isMinimalRouter(originalHandler); //handler instanceof Router;
|
|
39
|
-
|
|
40
|
-
if (!this.isRouter && !(originalHandler instanceof Array) && typeof originalHandler === "object") {
|
|
41
|
-
// HandlerWithOptions
|
|
42
|
-
if (options) {
|
|
43
|
-
throw new Error("bad arguments. cannot send options with HandlerWithOptions");
|
|
44
|
-
}
|
|
45
|
-
//console.dir(handler);
|
|
46
|
-
const handlerWithOptions = assertNotUndefined(DEFAULT_PARSER.parse(originalHandler, HandlerWithOptionsSchema, "handler"), "bad options");
|
|
47
|
-
this.originalHandler = handlerWithOptions.handler;
|
|
48
|
-
this.options = handlerWithOptions;
|
|
49
|
-
} else {
|
|
50
|
-
this.options = options;
|
|
51
|
-
}
|
|
52
|
-
const routeHandlers = this.originalHandler instanceof Array ? this.originalHandler : [this.originalHandler] as Array<Handler | MinimalRouter>;
|
|
53
|
-
|
|
54
|
-
//if ((!this.isRouter && routeHandlers.length !== routeHandlers.filter(h => typeof h === "function").length) || (this.isRouter && this.options)) {
|
|
55
|
-
if ((!this.isRouter && routeHandlers.length !== routeHandlers.filter(h => typeof h === "function").length)) {
|
|
56
|
-
throw new Error(`bad arguments isRouter[${this.isRouter}]`);
|
|
57
|
-
}
|
|
58
|
-
|
|
59
|
-
if (this.options && this.options.middleware) {
|
|
60
|
-
handlers = handlers.concat(this.options.middleware);
|
|
61
|
-
}
|
|
62
|
-
if (this.options && this.options.session) {
|
|
63
|
-
handlers.push(typeof this.options.session !== "function" ? SessionHandler(this.options.session) : this.options.session);
|
|
64
|
-
}
|
|
65
|
-
if (this.options && this.options.policy) {
|
|
66
|
-
handlers.push(GroupPolicyHandler(this.options.policy));
|
|
67
|
-
}
|
|
68
|
-
if (this.options && this.options.request) {
|
|
69
|
-
handlers.push(ParseRequest(this.options.request, this.options.parser));
|
|
70
|
-
}
|
|
71
|
-
|
|
72
|
-
handlers = handlers.concat(routeHandlers);
|
|
73
|
-
|
|
74
|
-
if (this.options && this.options.response) {
|
|
75
|
-
|
|
76
|
-
const responseMiddleware = this.options.response.middleware ? (
|
|
77
|
-
this.options.response.middleware instanceof Array ?
|
|
78
|
-
this.options.response.middleware :
|
|
79
|
-
[this.options.response.middleware]
|
|
80
|
-
) :
|
|
81
|
-
[ResponseHandler()];
|
|
82
|
-
|
|
83
|
-
if (typeof this.options.response.body === "boolean" && this.options.response.body) {
|
|
84
|
-
//(handlers as Handler[]).push(ResponseHandler());
|
|
85
|
-
handlers = handlers.concat(responseMiddleware);
|
|
86
|
-
} else if (this.options.response.body) {
|
|
87
|
-
(handlers as Handler[]).push(ResultParser(this.options.response, this.options.parser));
|
|
88
|
-
//(handlers as Handler[]).push(ResponseHandler());
|
|
89
|
-
handlers = handlers.concat(responseMiddleware);
|
|
90
|
-
}
|
|
91
|
-
}
|
|
92
|
-
this.handler = handlers;
|
|
93
|
-
}
|
|
94
|
-
|
|
95
|
-
public getJSONDoc(doc: RouterJSONDoc = {}, prePath = "/"): RouterJSONDoc {
|
|
96
|
-
const nPath = this.path && this.path.length > 1 ? this.path.substring(1) : "";
|
|
97
|
-
const nMethod = this.method ? this.method : "";
|
|
98
|
-
|
|
99
|
-
if (this.isRouter) {
|
|
100
|
-
const router: MinimalRouter = this.originalHandler as MinimalRouter;
|
|
101
|
-
router.getJSONDoc(doc, `${prePath}${nPath}`);
|
|
102
|
-
} else {
|
|
103
|
-
if (!doc[`${prePath}${nPath}`]) {
|
|
104
|
-
doc[`${prePath}${nPath}`] = Object.create(null);
|
|
105
|
-
}
|
|
106
|
-
if (doc[`${prePath}${nPath}`][nMethod]) {
|
|
107
|
-
throw new Error("cannot create doc routes override each other");
|
|
108
|
-
}
|
|
109
|
-
if (this.options) {
|
|
110
|
-
doc[`${prePath}${nPath}`][nMethod] = {
|
|
111
|
-
description: this.options.description,
|
|
112
|
-
name: this.options.name,
|
|
113
|
-
identifier: this.options.identifier ? this.options.identifier : `${prePath}${nPath}${this.options.name ? this.options.name : ""}${nMethod ? `_${nMethod}` : ""}`.replace(/[^a-z0-9+]+/gi, '_').split("_").map(s => s.trim()).filter(s => s).join("_").toUpperCase(),
|
|
114
|
-
policy: this.options.policy,
|
|
115
|
-
request: this.options.request ? {
|
|
116
|
-
body: this.options.request.body,
|
|
117
|
-
headers: this.options.request.headers,
|
|
118
|
-
params: this.options.request.params,
|
|
119
|
-
query: this.options.request.query,
|
|
120
|
-
} : undefined,
|
|
121
|
-
response: this.options.response ? {
|
|
122
|
-
body: this.options.response.body
|
|
123
|
-
} : undefined
|
|
124
|
-
};
|
|
125
|
-
} else {
|
|
126
|
-
doc[`${prePath}${nPath}`][nMethod] = {
|
|
127
|
-
description: undefined,
|
|
128
|
-
name: undefined,
|
|
129
|
-
identifier: `${prePath}${nPath}${nMethod ? `_${nMethod}` : ""}`.replace(/[^a-z0-9+]+/gi, '_').split("_").map(s => s.trim()).filter(s => s).join("_").toUpperCase(),
|
|
130
|
-
policy: undefined,
|
|
131
|
-
request: undefined,
|
|
132
|
-
response: undefined
|
|
133
|
-
};
|
|
134
|
-
}
|
|
135
|
-
}
|
|
136
|
-
return doc;
|
|
137
|
-
}
|
|
138
|
-
|
|
139
|
-
public async invoke(ctx: Context, pathTokens: PathPart[], prePathTokens: PathPartToken[]): Promise<boolean> {
|
|
140
|
-
for (let i = 0; i < this.handler.length; i++) {
|
|
141
|
-
const h = this.handler[i];
|
|
142
|
-
if (isMinimalRouter(h)) {
|
|
143
|
-
//if (h instanceof Router) {
|
|
144
|
-
if (!RouterHandler.pushResults(await (h as MinimalRouter).run(ctx, pathTokens, prePathTokens.concat(this.tokens)), ctx)) {
|
|
145
|
-
return false;
|
|
146
|
-
}
|
|
147
|
-
} else {
|
|
148
|
-
if (!RouterHandler.pushResults(await (h as Handler)(ctx), ctx)) {
|
|
149
|
-
return false;
|
|
150
|
-
}
|
|
151
|
-
}
|
|
152
|
-
}
|
|
153
|
-
return true;
|
|
154
|
-
}
|
|
155
|
-
|
|
156
|
-
public isMatch(
|
|
157
|
-
method: string,
|
|
158
|
-
requestParts: PathPart[],
|
|
159
|
-
prePathTokens: PathPartToken[]): {
|
|
160
|
-
match: boolean;
|
|
161
|
-
params?: PathParams
|
|
162
|
-
} {
|
|
163
|
-
if ((this.method === undefined || this.method === method)) {
|
|
164
|
-
if (this.path === undefined) {
|
|
165
|
-
return {
|
|
166
|
-
match: true
|
|
167
|
-
};
|
|
168
|
-
}
|
|
169
|
-
return matchTokenizePath(this.isRouter, prePathTokens.concat(this.tokens), requestParts);
|
|
170
|
-
}
|
|
171
|
-
return {
|
|
172
|
-
match: false
|
|
173
|
-
};
|
|
174
|
-
}
|
|
175
|
-
|
|
176
|
-
private static pushResults(result: any, ctx: Context): boolean {
|
|
177
|
-
if (result === false) {
|
|
178
|
-
// ctx.logger.debug(`avoiding next handlers because handler returned false.`);
|
|
179
|
-
return false;
|
|
180
|
-
} else if (result !== true && result !== undefined) {
|
|
181
|
-
ctx.logger.trace("pushing to results [%o]", result);
|
|
182
|
-
ctx.results.push(result);
|
|
183
|
-
}
|
|
184
|
-
return true;
|
|
185
|
-
}
|
|
186
|
-
}
|
|
@@ -1,153 +0,0 @@
|
|
|
1
|
-
import { ParserInterface, Schema } from "@miqro/parser";
|
|
2
|
-
import { GroupPolicy, SessionHandlerOptions } from "./session/common.js";
|
|
3
|
-
import { Context, Handler } from "./context.js";
|
|
4
|
-
import { IncomingMessage } from "http";
|
|
5
|
-
import { PathPart, PathPartToken } from "./tokenize-match.js";
|
|
6
|
-
import { GroupPolicySchema, SessionHandlerOptionsSchema } from "./parser.js";
|
|
7
|
-
import { Logger } from "./logger/logger.js";
|
|
8
|
-
|
|
9
|
-
export type SchemaProperties = { [key: string]: Schema | string; };
|
|
10
|
-
const OptionalSchema: Schema<SchemaProperties> = {
|
|
11
|
-
type: "string?|dict[]!?",
|
|
12
|
-
dictType: "Schema|string"
|
|
13
|
-
}
|
|
14
|
-
const OptionalSchemaWithBoolean: Schema<SchemaProperties> = {
|
|
15
|
-
type: "boolean?|string?|dict[]!?",
|
|
16
|
-
dictType: "Schema|string"
|
|
17
|
-
}
|
|
18
|
-
export type ParserMode = "remove_extra" | "add_extra" | "no_extra";
|
|
19
|
-
const OptionalParserModeSchema: Schema<ParserMode> = {
|
|
20
|
-
type: "enum?",
|
|
21
|
-
enumValues: ["remove_extra", "add_extra", "no_extra"]
|
|
22
|
-
}
|
|
23
|
-
|
|
24
|
-
export const RouteOptionsSchema: Schema<RouteOptions> = {
|
|
25
|
-
type: "object",
|
|
26
|
-
properties: {
|
|
27
|
-
name: "string?",
|
|
28
|
-
description: "string?",
|
|
29
|
-
identifier: "string?",
|
|
30
|
-
apiName: "string?",
|
|
31
|
-
policy: {
|
|
32
|
-
type: "object?",
|
|
33
|
-
properties: GroupPolicySchema.properties
|
|
34
|
-
},
|
|
35
|
-
response: {
|
|
36
|
-
type: "object?",
|
|
37
|
-
properties: {
|
|
38
|
-
headers: OptionalSchema,
|
|
39
|
-
headersMode: OptionalParserModeSchema,
|
|
40
|
-
body: OptionalSchemaWithBoolean,
|
|
41
|
-
bodyMode: OptionalParserModeSchema,
|
|
42
|
-
middleware: "function[]!?"
|
|
43
|
-
}
|
|
44
|
-
},
|
|
45
|
-
request: {
|
|
46
|
-
type: "object?",
|
|
47
|
-
properties: {
|
|
48
|
-
headers: OptionalSchema,
|
|
49
|
-
headersMode: OptionalParserModeSchema,
|
|
50
|
-
query: OptionalSchemaWithBoolean,
|
|
51
|
-
queryMode: OptionalParserModeSchema,
|
|
52
|
-
params: OptionalSchemaWithBoolean,
|
|
53
|
-
paramsMode: OptionalParserModeSchema,
|
|
54
|
-
body: OptionalSchemaWithBoolean,
|
|
55
|
-
bodyMode: OptionalParserModeSchema
|
|
56
|
-
}
|
|
57
|
-
}
|
|
58
|
-
}
|
|
59
|
-
};
|
|
60
|
-
|
|
61
|
-
export interface RouteOptions {
|
|
62
|
-
name?: string;
|
|
63
|
-
identifier?: string;
|
|
64
|
-
apiName?: string;
|
|
65
|
-
description?: string;
|
|
66
|
-
policy?: GroupPolicy;
|
|
67
|
-
request?: {
|
|
68
|
-
headers?: string | SchemaProperties[] | SchemaProperties;
|
|
69
|
-
headersMode?: ParserMode;
|
|
70
|
-
query?: boolean | string | SchemaProperties[] | SchemaProperties;
|
|
71
|
-
queryMode?: ParserMode;
|
|
72
|
-
params?: string | SchemaProperties | boolean | SchemaProperties[];
|
|
73
|
-
paramsMode?: ParserMode;
|
|
74
|
-
body?: string | SchemaProperties | boolean | SchemaProperties[];
|
|
75
|
-
bodyMode?: ParserMode;
|
|
76
|
-
};
|
|
77
|
-
response?: {
|
|
78
|
-
headers?: string | SchemaProperties | SchemaProperties[];
|
|
79
|
-
headersMode?: ParserMode;
|
|
80
|
-
body?: boolean | string | SchemaProperties | SchemaProperties[];
|
|
81
|
-
bodyMode?: ParserMode;
|
|
82
|
-
middleware?: Handler | Handler[];
|
|
83
|
-
}
|
|
84
|
-
}
|
|
85
|
-
|
|
86
|
-
export interface RouteJSONDoc extends RouteOptions {
|
|
87
|
-
identifier: string;
|
|
88
|
-
}
|
|
89
|
-
|
|
90
|
-
export interface RouterJSONDoc {
|
|
91
|
-
[path: string]: {
|
|
92
|
-
[method: string]: RouteJSONDoc
|
|
93
|
-
}
|
|
94
|
-
}
|
|
95
|
-
|
|
96
|
-
export const RouterHandlerOptionsSchema: Schema<RouterHandlerOptions> = {
|
|
97
|
-
type: "object",
|
|
98
|
-
properties: {
|
|
99
|
-
...RouteOptionsSchema.properties,
|
|
100
|
-
parser: {
|
|
101
|
-
type: "object?",
|
|
102
|
-
properties: {
|
|
103
|
-
parse: "function"
|
|
104
|
-
},
|
|
105
|
-
mode: "add_extra"
|
|
106
|
-
},
|
|
107
|
-
middleware: "function[]!?",
|
|
108
|
-
session: {
|
|
109
|
-
type: "object?|function?",
|
|
110
|
-
properties: SessionHandlerOptionsSchema.properties
|
|
111
|
-
}
|
|
112
|
-
}
|
|
113
|
-
};
|
|
114
|
-
|
|
115
|
-
export interface RouterHandlerOptions extends RouteOptions {
|
|
116
|
-
parser?: ParserInterface;
|
|
117
|
-
middleware?: Handler | Handler[];
|
|
118
|
-
session?: SessionHandlerOptions | Handler;
|
|
119
|
-
}
|
|
120
|
-
|
|
121
|
-
export const HandlerWithOptionsSchema: Schema<HandlerWithOptions> = {
|
|
122
|
-
type: "object",
|
|
123
|
-
properties: {
|
|
124
|
-
...RouterHandlerOptionsSchema.properties,
|
|
125
|
-
handler: "function[]!"
|
|
126
|
-
}
|
|
127
|
-
};
|
|
128
|
-
|
|
129
|
-
export interface HandlerWithOptions extends RouterHandlerOptions {
|
|
130
|
-
handler: Handler | Array<Handler>;
|
|
131
|
-
}
|
|
132
|
-
|
|
133
|
-
export interface RouterOptions {
|
|
134
|
-
loggerFactory?: (uuid: string, req: IncomingMessage) => Logger;
|
|
135
|
-
}
|
|
136
|
-
|
|
137
|
-
export interface MinimalRouter {
|
|
138
|
-
run: (ctx: Context, pathTokens?: PathPart[], prePathTokens?: PathPartToken[]) => Promise<boolean>;
|
|
139
|
-
getJSONDoc: (doc?: RouterJSONDoc, prePath?: string) => RouterJSONDoc;
|
|
140
|
-
}
|
|
141
|
-
|
|
142
|
-
export const MinimalRouterSchema: Schema<MinimalRouter> = {
|
|
143
|
-
type: "object",
|
|
144
|
-
properties: {
|
|
145
|
-
run: "function",
|
|
146
|
-
getJSONDoc: "function"
|
|
147
|
-
},
|
|
148
|
-
mode: "add_extra"
|
|
149
|
-
}
|
|
150
|
-
|
|
151
|
-
export function isMinimalRouter(obj: any) {
|
|
152
|
-
return typeof obj === "object" && typeof obj.run === "function" && typeof obj.getJSONDoc === "function";
|
|
153
|
-
}
|
|
@@ -1,47 +0,0 @@
|
|
|
1
|
-
import { Context, Handler } from "./context.js";
|
|
2
|
-
|
|
3
|
-
export const OldResponseHandler = (): Handler<void> => async (ctx: Context): Promise<void> => {
|
|
4
|
-
ctx.logger.trace("results [%o]", ctx.results);
|
|
5
|
-
if (!ctx.results || ctx.results.length === 0) {
|
|
6
|
-
throw new Error(`no response to send. Is your handler returning a value differente than boolean 'true|false' ?`);
|
|
7
|
-
} else {
|
|
8
|
-
const lastResult = ctx.results[ctx.results.length - 1];
|
|
9
|
-
ctx.logger.debug("response [%o]", lastResult);
|
|
10
|
-
if (lastResult !== undefined) {
|
|
11
|
-
await ctx.json(lastResult);
|
|
12
|
-
} else {
|
|
13
|
-
throw new Error(`no response to send. Is your handler returning a value differente than boolean 'true|false' ?`);
|
|
14
|
-
}
|
|
15
|
-
}
|
|
16
|
-
};
|
|
17
|
-
|
|
18
|
-
export const ResponseHandler = (): Handler<void> => async (ctx: Context): Promise<void> => {
|
|
19
|
-
ctx.logger.trace("results [%o]", ctx.results);
|
|
20
|
-
if (!ctx.results || ctx.results.length === 0) {
|
|
21
|
-
throw new Error(`no response to send. Is your handler returning a value differente than boolean 'true|false' ?`);
|
|
22
|
-
} else {
|
|
23
|
-
const lastResult = ctx.results[ctx.results.length - 1];
|
|
24
|
-
ctx.logger.debug("response [%o]", lastResult);
|
|
25
|
-
if (lastResult !== undefined) {
|
|
26
|
-
const headers = lastResult.headers;
|
|
27
|
-
const body = lastResult.body;
|
|
28
|
-
const status = lastResult.status;
|
|
29
|
-
|
|
30
|
-
const noContentType = (headers && !headers["Content-Type"]) || !headers;
|
|
31
|
-
|
|
32
|
-
if (noContentType) {
|
|
33
|
-
await ctx.json(body, headers, status);
|
|
34
|
-
} else {
|
|
35
|
-
await ctx.end({
|
|
36
|
-
body,
|
|
37
|
-
headers,
|
|
38
|
-
status
|
|
39
|
-
});
|
|
40
|
-
}
|
|
41
|
-
} else {
|
|
42
|
-
throw new Error(`no response to send. Is your handler returning a value differente than boolean 'true|false' ?`);
|
|
43
|
-
}
|
|
44
|
-
}
|
|
45
|
-
};
|
|
46
|
-
|
|
47
|
-
|