@miqro/core 1.6.0 → 1.7.1
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 +101 -41
- package/dist/api-router.d.ts +1 -1
- package/dist/app.js +2 -2
- package/dist/app.js.map +1 -1
- package/dist/common/api-router-utils.d.ts +1 -1
- package/dist/common/api-router-utils.js +6 -21
- package/dist/common/api-router-utils.js.map +1 -1
- package/dist/common/api-router.d.ts +3 -16
- package/dist/common/context.d.ts +1 -1
- package/dist/common/logger/constants.d.ts +13 -0
- package/dist/common/logger/constants.js +26 -0
- package/dist/common/logger/constants.js.map +1 -0
- package/dist/common/logger/factory.d.ts +2 -4
- package/dist/common/logger/factory.js +7 -3
- package/dist/common/logger/factory.js.map +1 -1
- package/dist/common/logger/index.d.ts +5 -5
- package/dist/common/logger/index.js +5 -4
- package/dist/common/logger/index.js.map +1 -1
- package/dist/common/logger/{transport.d.ts → interfaces.d.ts} +6 -3
- package/dist/common/logger/interfaces.js +3 -0
- package/dist/common/logger/interfaces.js.map +1 -0
- package/dist/common/logger/logger.d.ts +15 -7
- package/dist/common/logger/logger.js +35 -27
- package/dist/common/logger/logger.js.map +1 -1
- package/dist/common/logger/transport/console.d.ts +5 -0
- package/dist/common/logger/transport/console.js +39 -0
- package/dist/common/logger/transport/console.js.map +1 -0
- package/dist/common/logger/transport/file.d.ts +2 -0
- package/dist/common/logger/transport/file.js +29 -0
- package/dist/common/logger/transport/file.js.map +1 -0
- package/dist/common/router-helpers.d.ts +1 -1
- package/dist/common/router-helpers.js +3 -3
- package/dist/common/router-helpers.js.map +1 -1
- package/dist/proxy.js +1 -0
- package/dist/proxy.js.map +1 -1
- package/dist/router.d.ts +1 -1
- package/dist/router.js +2 -2
- package/dist/router.js.map +1 -1
- package/package.json +4 -6
- package/src/api-router.ts +1 -1
- package/src/app.ts +2 -2
- package/src/app.unit.test.js +6 -7
- package/src/common/api-router-utils.ts +18 -34
- package/src/common/api-router.ts +3 -16
- package/src/common/context.ts +1 -1
- package/src/common/logger/constants.ts +27 -0
- package/src/common/logger/factory.ts +11 -9
- package/src/common/logger/index.ts +5 -5
- package/src/common/logger/interfaces.ts +19 -0
- package/src/common/logger/logger.ts +52 -30
- package/src/common/logger/transport/console.ts +34 -0
- package/src/common/logger/transport/file.ts +26 -0
- package/src/common/router-helpers.ts +2 -2
- package/src/proxy.ts +1 -0
- package/src/router.ts +3 -3
- package/src/router.unit.test.js +3 -4
- package/dist/common/logger/common.d.ts +0 -4
- package/dist/common/logger/common.js +0 -7
- package/dist/common/logger/common.js.map +0 -1
- package/dist/common/logger/formatter.d.ts +0 -7
- package/dist/common/logger/formatter.js +0 -9
- package/dist/common/logger/formatter.js.map +0 -1
- package/dist/common/logger/transport.js +0 -59
- package/dist/common/logger/transport.js.map +0 -1
- package/src/common/logger/common.ts +0 -6
- package/src/common/logger/formatter.ts +0 -9
- package/src/common/logger/transport.ts +0 -71
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
export type LogLevel = "error" | "warn" | "info" | "debug" | "trace";
|
|
2
|
+
|
|
3
|
+
export interface WriteArgs {
|
|
4
|
+
level: LogLevel;
|
|
5
|
+
message?: any;
|
|
6
|
+
optionalParams: any[]
|
|
7
|
+
}
|
|
8
|
+
|
|
9
|
+
export interface LoggerTransportWriteArgs extends WriteArgs {
|
|
10
|
+
out: string;
|
|
11
|
+
}
|
|
12
|
+
|
|
13
|
+
export interface LoggerTransport {
|
|
14
|
+
level?: LogLevel;
|
|
15
|
+
|
|
16
|
+
write(args: LoggerTransportWriteArgs): Promise<void> | void;
|
|
17
|
+
}
|
|
18
|
+
|
|
19
|
+
export type LoggerFormatter = (args: { identifier: string, level: LogLevel, message: string }) => string;
|
|
@@ -1,22 +1,23 @@
|
|
|
1
1
|
import {format} from "util";
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
}
|
|
2
|
+
import {LoggerFormatter, LoggerTransport, LoggerTransportWriteArgs, LogLevel, WriteArgs} from "./interfaces.js";
|
|
3
|
+
import {LoggerEvents, DEFAULT_LOGGER_FORMATTER, DEFAULT_LOGGER_TRANSPORTS, LOG_LEVEL_MAP} 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
|
+
}
|
|
20
21
|
|
|
21
22
|
export interface Logger {
|
|
22
23
|
log(message?: any, ...optionalParams: any[]): void;
|
|
@@ -30,26 +31,41 @@ export interface Logger {
|
|
|
30
31
|
warn(message?: any, ...optionalParams: any[]): void;
|
|
31
32
|
|
|
32
33
|
error(message?: any, ...optionalParams: any[]): void;
|
|
34
|
+
|
|
35
|
+
addTransport(transport: LoggerTransport): void;
|
|
36
|
+
|
|
37
|
+
setLevel(level: LogLevel): void;
|
|
33
38
|
}
|
|
34
39
|
|
|
35
|
-
export class Logger extends
|
|
40
|
+
export class Logger extends EventTarget implements Logger {
|
|
36
41
|
|
|
37
42
|
protected readonly options: { transports: LoggerTransport[]; formatter: LoggerFormatter; };
|
|
38
43
|
|
|
39
|
-
constructor(protected readonly identifier: string, protected
|
|
44
|
+
constructor(protected readonly identifier: string, protected level: LogLevel = "info", options?: { transports?: LoggerTransport[]; formatter?: LoggerFormatter; }) {
|
|
40
45
|
super();
|
|
41
46
|
if (!LOG_LEVEL_MAP[level]) {
|
|
42
47
|
throw new Error(`Unknown level [${level}]`);
|
|
43
48
|
}
|
|
44
|
-
this.
|
|
45
|
-
console.error(
|
|
49
|
+
this.addEventListener(LoggerEvents.error, (ev: any) => {
|
|
50
|
+
console.error((ev as LoggerErrorEvent).error);
|
|
46
51
|
});
|
|
47
52
|
this.options = {
|
|
48
|
-
transports: options && options.transports !== undefined ? options.transports :
|
|
49
|
-
formatter: options && options.formatter !== undefined ? options.formatter :
|
|
53
|
+
transports: options && options.transports !== undefined ? options.transports : DEFAULT_LOGGER_TRANSPORTS(),
|
|
54
|
+
formatter: options && options.formatter !== undefined ? options.formatter : DEFAULT_LOGGER_FORMATTER,
|
|
50
55
|
};
|
|
51
56
|
}
|
|
52
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
|
+
|
|
53
69
|
protected write(args: WriteArgs): void {
|
|
54
70
|
try {
|
|
55
71
|
let eventArgs: LoggerTransportWriteArgs | undefined = undefined;
|
|
@@ -66,16 +82,22 @@ export class Logger extends EventEmitter implements Logger {
|
|
|
66
82
|
...args
|
|
67
83
|
};
|
|
68
84
|
tR.push(transport.write(eventArgs));
|
|
69
|
-
} catch (e2) {
|
|
70
|
-
this.
|
|
85
|
+
} catch (e2: any) {
|
|
86
|
+
this.dispatchEvent(new LoggerErrorEvent(LoggerEvents.error, {
|
|
87
|
+
error: e2
|
|
88
|
+
}));
|
|
71
89
|
}
|
|
72
90
|
}
|
|
73
91
|
}
|
|
74
|
-
Promise.
|
|
75
|
-
this.
|
|
92
|
+
Promise.allSettled(tR).catch((e) => {
|
|
93
|
+
this.dispatchEvent(new LoggerErrorEvent(LoggerEvents.error, {
|
|
94
|
+
error: e
|
|
95
|
+
}));
|
|
76
96
|
});
|
|
77
|
-
} catch (e) {
|
|
78
|
-
this.
|
|
97
|
+
} catch (e: any) {
|
|
98
|
+
this.dispatchEvent(new LoggerErrorEvent(LoggerEvents.error, {
|
|
99
|
+
error: e
|
|
100
|
+
}));
|
|
79
101
|
}
|
|
80
102
|
}
|
|
81
103
|
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
import {LoggerTransportWriteArgs, LogLevel} from "../interfaces.js";
|
|
2
|
+
|
|
3
|
+
export function Console(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
|
+
default:
|
|
22
|
+
console[level](out);
|
|
23
|
+
break;
|
|
24
|
+
}
|
|
25
|
+
} else {
|
|
26
|
+
if(level === "trace" || level === "debug") {
|
|
27
|
+
console.log(out);
|
|
28
|
+
} else {
|
|
29
|
+
console[level](out);
|
|
30
|
+
}
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
};
|
|
34
|
+
}
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
import {createWriteStream} from "fs";
|
|
2
|
+
import {resolve} from "path";
|
|
3
|
+
import {LoggerTransport, LoggerTransportWriteArgs, LogLevel} from "../interfaces.js";
|
|
4
|
+
|
|
5
|
+
const FILE_TRANSPORT_ENVVAR = "LOG_FILE";
|
|
6
|
+
|
|
7
|
+
export const File: (filePath?: string | null, level?: LogLevel) => LoggerTransport = (filePath = process.env[FILE_TRANSPORT_ENVVAR] ? process.env[FILE_TRANSPORT_ENVVAR] : 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
|
+
};
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import {defaultLoggerFormatter, getLogger, Logger} from "./logger";
|
|
2
1
|
import {IncomingMessage} from "http";
|
|
3
2
|
import {URL} from "url";
|
|
4
3
|
import {newURL} from "./helpers";
|
|
5
4
|
import {normalizePath} from "./tokenize-match";
|
|
5
|
+
import {DEFAULT_LOGGER_FORMATTER, getLogger, Logger} from "./logger/index.js";
|
|
6
6
|
|
|
7
7
|
export const defaultLoggerFactory = (uuid: string, req: IncomingMessage): Logger => {
|
|
8
8
|
const url = newURL(req.url ? req.url : "/", `http://${req.headers.host}`) as URL;
|
|
@@ -14,7 +14,7 @@ export const defaultLoggerFactory = (uuid: string, req: IncomingMessage): Logger
|
|
|
14
14
|
return getLogger(identifier, {
|
|
15
15
|
formatter: (args) => {
|
|
16
16
|
args.message = `${method} ${url}${uuid ? ` [${uuid}]` : ""}${remoteAddress ? ` (${remoteAddress})` : ""} ${args.message}`;
|
|
17
|
-
return
|
|
17
|
+
return DEFAULT_LOGGER_FORMATTER(args);
|
|
18
18
|
}
|
|
19
19
|
}, false);
|
|
20
20
|
}
|
package/src/proxy.ts
CHANGED
package/src/router.ts
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
import {IncomingMessage, RequestListener} from "http";
|
|
2
|
-
import {
|
|
3
|
-
import {Logger} from "./common/logger";
|
|
2
|
+
import {Logger} from "./common/logger/index.js";
|
|
4
3
|
import {Context, ErrorHandler, Handler, Method} from "./common/context";
|
|
5
4
|
import {HandlerWithOptions, RouterHandlerOptions, RouterJSONDoc} from "./common/router-utils";
|
|
6
5
|
import {normalizePath, PathPart, PathPartToken, splitPath} from "./common/tokenize-match";
|
|
7
6
|
import {defaultLoggerFactory} from "./common/router-helpers";
|
|
8
7
|
import {RouterHandler} from "./common/router-handler";
|
|
8
|
+
import {randomUUID} from "crypto";
|
|
9
9
|
|
|
10
10
|
|
|
11
11
|
export interface RouterOptions {
|
|
@@ -20,7 +20,7 @@ export class Router {
|
|
|
20
20
|
constructor(protected config?: RouterOptions) {
|
|
21
21
|
const loggerFactory = this.config && this.config.loggerFactory ? this.config.loggerFactory : defaultLoggerFactory;
|
|
22
22
|
this.listener = async (req, res) => {
|
|
23
|
-
const uuid =
|
|
23
|
+
const uuid = randomUUID();
|
|
24
24
|
const logger = loggerFactory(uuid, req);
|
|
25
25
|
const ctx = new Context(uuid, req, res, logger);
|
|
26
26
|
ctx.logger.trace(`request received`);
|
package/src/router.unit.test.js
CHANGED
|
@@ -60,7 +60,7 @@ describe("router unit tests", () => {
|
|
|
60
60
|
splitPath.reset();
|
|
61
61
|
const {Router} = requireMock(testFilePath, {
|
|
62
62
|
"http": {},
|
|
63
|
-
|
|
63
|
+
|
|
64
64
|
"./common/logger": {},
|
|
65
65
|
"./common/context": {},
|
|
66
66
|
"./common/router-utils": {},
|
|
@@ -219,7 +219,7 @@ describe("router unit tests", () => {
|
|
|
219
219
|
before(() => {
|
|
220
220
|
const {Router} = requireMock(testFilePath, {
|
|
221
221
|
"http": {},
|
|
222
|
-
|
|
222
|
+
|
|
223
223
|
"./common/logger": {},
|
|
224
224
|
"./common/context": {},
|
|
225
225
|
"./common/router-utils": {},
|
|
@@ -250,7 +250,7 @@ describe("router unit tests", () => {
|
|
|
250
250
|
before(() => {
|
|
251
251
|
const {Router} = requireMock(testFilePath, {
|
|
252
252
|
"http": {},
|
|
253
|
-
|
|
253
|
+
|
|
254
254
|
"./common/logger": {},
|
|
255
255
|
"./common/context": {},
|
|
256
256
|
"./common/router-utils": {},
|
|
@@ -331,7 +331,6 @@ describe("router unit tests", () => {
|
|
|
331
331
|
|
|
332
332
|
const {Router} = requireMock(testFilePath, {
|
|
333
333
|
"http": {},
|
|
334
|
-
"uuid": {},
|
|
335
334
|
"./common/logger": {},
|
|
336
335
|
"./common/context": {},
|
|
337
336
|
"./common/router-utils": {},
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"common.js","sourceRoot":"","sources":["../../../src/common/logger/common.ts"],"names":[],"mappings":";;;AAGa,QAAA,YAAY,GAAG;IAC1B,KAAK,EAAE,OAAO;CACf,CAAC"}
|
|
@@ -1,9 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.defaultLoggerFormatter = void 0;
|
|
4
|
-
const defaultLoggerFormatter = ({ identifier, level, message }) => `${new Date().toISOString()} ${process.pid} ` +
|
|
5
|
-
`${identifier ? `[${identifier}] ` : ""}` +
|
|
6
|
-
`${level !== "info" ? (level === "error" || level === "warn" ? `[${level.toUpperCase()}] ` : `[${level}] `) : ""}` +
|
|
7
|
-
`${message}`;
|
|
8
|
-
exports.defaultLoggerFormatter = defaultLoggerFormatter;
|
|
9
|
-
//# sourceMappingURL=formatter.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"formatter.js","sourceRoot":"","sources":["../../../src/common/logger/formatter.ts"],"names":[],"mappings":";;;AAIO,MAAM,sBAAsB,GACjC,CAAC,EAAC,UAAU,EAAE,KAAK,EAAE,OAAO,EAAC,EAAE,EAAE,CAAC,GAAG,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,IAAI,OAAO,CAAC,GAAG,GAAG;IAC7E,GAAG,UAAU,CAAC,CAAC,CAAC,IAAI,UAAU,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE;IACzC,GAAG,KAAK,KAAK,MAAM,CAAC,CAAC,CAAC,CAAC,KAAK,KAAK,OAAO,IAAI,KAAK,KAAK,MAAM,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE;IAClH,GAAG,OAAO,EAAE,CAAC;AAJJ,QAAA,sBAAsB,0BAIlB"}
|
|
@@ -1,59 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.FileTransport = exports.ConsoleTransport = void 0;
|
|
4
|
-
const fs_1 = require("fs");
|
|
5
|
-
const path_1 = require("path");
|
|
6
|
-
const ConsoleTransport = (color = true, level) => {
|
|
7
|
-
return {
|
|
8
|
-
level,
|
|
9
|
-
write: async ({ level, out }) => {
|
|
10
|
-
if (color) {
|
|
11
|
-
switch (level) {
|
|
12
|
-
case "warn":
|
|
13
|
-
console.warn("\x1b[33m%s\x1b[0m", out);
|
|
14
|
-
break;
|
|
15
|
-
case "error":
|
|
16
|
-
console.error("\x1b[31m%s\x1b[0m", out);
|
|
17
|
-
break;
|
|
18
|
-
case "trace":
|
|
19
|
-
console.log("\x1b[34m%s\x1b[0m", out);
|
|
20
|
-
break;
|
|
21
|
-
case "debug":
|
|
22
|
-
console.log("\x1b[36m%s\x1b[0m", out);
|
|
23
|
-
break;
|
|
24
|
-
default:
|
|
25
|
-
console[level](out);
|
|
26
|
-
break;
|
|
27
|
-
}
|
|
28
|
-
}
|
|
29
|
-
else {
|
|
30
|
-
console[level](out);
|
|
31
|
-
}
|
|
32
|
-
}
|
|
33
|
-
};
|
|
34
|
-
};
|
|
35
|
-
exports.ConsoleTransport = ConsoleTransport;
|
|
36
|
-
const FILE_TRANSPORT_ENVVAR = "LOG_FILE";
|
|
37
|
-
const FileTransport = (filePath = process.env[FILE_TRANSPORT_ENVVAR] ? process.env[FILE_TRANSPORT_ENVVAR] : null, level) => {
|
|
38
|
-
const fileHandler = filePath ? (0, fs_1.createWriteStream)((0, path_1.resolve)(filePath), { flags: "a" }) : null;
|
|
39
|
-
return {
|
|
40
|
-
level,
|
|
41
|
-
write: async ({ out }) => {
|
|
42
|
-
if (fileHandler) {
|
|
43
|
-
return new Promise((resolve, reject) => {
|
|
44
|
-
fileHandler.write(`${out}\n`, (err) => {
|
|
45
|
-
if (err) {
|
|
46
|
-
reject(err);
|
|
47
|
-
}
|
|
48
|
-
else {
|
|
49
|
-
resolve();
|
|
50
|
-
}
|
|
51
|
-
});
|
|
52
|
-
});
|
|
53
|
-
}
|
|
54
|
-
return;
|
|
55
|
-
}
|
|
56
|
-
};
|
|
57
|
-
};
|
|
58
|
-
exports.FileTransport = FileTransport;
|
|
59
|
-
//# sourceMappingURL=transport.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"transport.js","sourceRoot":"","sources":["../../../src/common/logger/transport.ts"],"names":[],"mappings":";;;AAAA,2BAAqC;AACrC,+BAA6B;AAmBtB,MAAM,gBAAgB,GAA2D,CAAC,KAAK,GAAG,IAAI,EAAE,KAAgB,EAAE,EAAE;IACzH,OAAO;QACL,KAAK;QACL,KAAK,EAAE,KAAK,EAAE,EAAC,KAAK,EAAE,GAAG,EAA2B,EAAiB,EAAE;YACrE,IAAI,KAAK,EAAE;gBACT,QAAQ,KAAK,EAAE;oBACb,KAAK,MAAM;wBACT,OAAO,CAAC,IAAI,CAAC,mBAAmB,EAAE,GAAG,CAAC,CAAC;wBACvC,MAAM;oBACR,KAAK,OAAO;wBACV,OAAO,CAAC,KAAK,CAAC,mBAAmB,EAAE,GAAG,CAAC,CAAC;wBACxC,MAAM;oBACR,KAAK,OAAO;wBACV,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE,GAAG,CAAC,CAAC;wBACtC,MAAM;oBACR,KAAK,OAAO;wBACV,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE,GAAG,CAAC,CAAC;wBACtC,MAAM;oBACR;wBACE,OAAO,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC;wBACpB,MAAM;iBACT;aACF;iBAAM;gBACL,OAAO,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC;aACrB;QACH,CAAC;KACF,CAAC;AACJ,CAAC,CAAC;AA3BW,QAAA,gBAAgB,oBA2B3B;AAEF,MAAM,qBAAqB,GAAG,UAAU,CAAC;AAElC,MAAM,aAAa,GAAoE,CAAC,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,KAAgB,EAAE,EAAE;IAC5M,MAAM,WAAW,GAAG,QAAQ,CAAC,CAAC,CAAC,IAAA,sBAAiB,EAAC,IAAA,cAAO,EAAC,QAAQ,CAAC,EAAE,EAAC,KAAK,EAAE,GAAG,EAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IACzF,OAAO;QACL,KAAK;QACL,KAAK,EAAE,KAAK,EAAE,EAAC,GAAG,EAA2B,EAAiB,EAAE;YAC9D,IAAI,WAAW,EAAE;gBACf,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;oBACrC,WAAW,CAAC,KAAK,CAAC,GAAG,GAAG,IAAI,EAAE,CAAC,GAAG,EAAE,EAAE;wBACpC,IAAI,GAAG,EAAE;4BACP,MAAM,CAAC,GAAG,CAAC,CAAC;yBACb;6BAAM;4BACL,OAAO,EAAE,CAAC;yBACX;oBACH,CAAC,CAAC,CAAC;gBACL,CAAC,CAAC,CAAC;aACJ;YACD,OAAO;QACT,CAAC;KACF,CAAC;AACJ,CAAC,CAAC;AAnBW,QAAA,aAAa,iBAmBxB"}
|
|
@@ -1,9 +0,0 @@
|
|
|
1
|
-
import {LogLevel} from "./common";
|
|
2
|
-
|
|
3
|
-
export type LoggerFormatter = (args: { identifier: string, level: LogLevel, message: string }) => string;
|
|
4
|
-
|
|
5
|
-
export const defaultLoggerFormatter: LoggerFormatter =
|
|
6
|
-
({identifier, level, message}) => `${new Date().toISOString()} ${process.pid} ` +
|
|
7
|
-
`${identifier ? `[${identifier}] ` : ""}` +
|
|
8
|
-
`${level !== "info" ? (level === "error" || level === "warn" ? `[${level.toUpperCase()}] ` : `[${level}] `) : ""}` +
|
|
9
|
-
`${message}`;
|
|
@@ -1,71 +0,0 @@
|
|
|
1
|
-
import {createWriteStream} from "fs";
|
|
2
|
-
import {resolve} from "path";
|
|
3
|
-
import {LogLevel} from "./common";
|
|
4
|
-
|
|
5
|
-
export interface WriteArgs {
|
|
6
|
-
level: LogLevel;
|
|
7
|
-
message?: any;
|
|
8
|
-
optionalParams: any[]
|
|
9
|
-
}
|
|
10
|
-
|
|
11
|
-
export interface LoggerTransportWriteArgs extends WriteArgs {
|
|
12
|
-
out: string;
|
|
13
|
-
}
|
|
14
|
-
|
|
15
|
-
export interface LoggerTransport {
|
|
16
|
-
level?: LogLevel;
|
|
17
|
-
|
|
18
|
-
write(args: LoggerTransportWriteArgs): Promise<void> | void;
|
|
19
|
-
}
|
|
20
|
-
|
|
21
|
-
export const ConsoleTransport: (color?: boolean, level?: LogLevel) => LoggerTransport = (color = true, level?: LogLevel) => {
|
|
22
|
-
return {
|
|
23
|
-
level,
|
|
24
|
-
write: async ({level, out}: LoggerTransportWriteArgs): Promise<void> => {
|
|
25
|
-
if (color) {
|
|
26
|
-
switch (level) {
|
|
27
|
-
case "warn":
|
|
28
|
-
console.warn("\x1b[33m%s\x1b[0m", out);
|
|
29
|
-
break;
|
|
30
|
-
case "error":
|
|
31
|
-
console.error("\x1b[31m%s\x1b[0m", out);
|
|
32
|
-
break;
|
|
33
|
-
case "trace":
|
|
34
|
-
console.log("\x1b[34m%s\x1b[0m", out);
|
|
35
|
-
break;
|
|
36
|
-
case "debug":
|
|
37
|
-
console.log("\x1b[36m%s\x1b[0m", out);
|
|
38
|
-
break;
|
|
39
|
-
default:
|
|
40
|
-
console[level](out);
|
|
41
|
-
break;
|
|
42
|
-
}
|
|
43
|
-
} else {
|
|
44
|
-
console[level](out);
|
|
45
|
-
}
|
|
46
|
-
}
|
|
47
|
-
};
|
|
48
|
-
};
|
|
49
|
-
|
|
50
|
-
const FILE_TRANSPORT_ENVVAR = "LOG_FILE";
|
|
51
|
-
|
|
52
|
-
export const FileTransport: (filePath?: string | null, level?: LogLevel) => LoggerTransport = (filePath = process.env[FILE_TRANSPORT_ENVVAR] ? process.env[FILE_TRANSPORT_ENVVAR] : null, level?: LogLevel) => {
|
|
53
|
-
const fileHandler = filePath ? createWriteStream(resolve(filePath), {flags: "a"}) : null;
|
|
54
|
-
return {
|
|
55
|
-
level,
|
|
56
|
-
write: async ({out}: LoggerTransportWriteArgs): Promise<void> => {
|
|
57
|
-
if (fileHandler) {
|
|
58
|
-
return new Promise((resolve, reject) => {
|
|
59
|
-
fileHandler.write(`${out}\n`, (err) => {
|
|
60
|
-
if (err) {
|
|
61
|
-
reject(err);
|
|
62
|
-
} else {
|
|
63
|
-
resolve();
|
|
64
|
-
}
|
|
65
|
-
});
|
|
66
|
-
});
|
|
67
|
-
}
|
|
68
|
-
return;
|
|
69
|
-
}
|
|
70
|
-
};
|
|
71
|
-
};
|