@gaias/basenode 1.3.9 → 1.4.0
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/libs/cache/CacheService.d.ts +1 -1
- package/dist/libs/cache/CacheService.d.ts.map +1 -1
- package/dist/libs/leader/Leader.d.ts +1 -1
- package/dist/libs/leader/Leader.d.ts.map +1 -1
- package/dist/libs/logger/Logger.d.ts +24 -1
- package/dist/libs/logger/Logger.d.ts.map +1 -1
- package/dist/libs/logger/Logger.js +231 -5
- package/dist/libs/logger/Logger.js.map +1 -1
- package/dist/libs/openapi/OpenAPIHelpers.d.ts +1 -1
- package/package.json +1 -1
|
@@ -26,7 +26,7 @@ export declare const CacheServiceEvents: {
|
|
|
26
26
|
};
|
|
27
27
|
export declare class CacheService {
|
|
28
28
|
private redisClient;
|
|
29
|
-
logger: import("
|
|
29
|
+
logger: import("../logger").EnhancedLogger;
|
|
30
30
|
constructor(redisClient: RedisClient);
|
|
31
31
|
startCacheService(redisSub: Redis, redis: Redis): void;
|
|
32
32
|
reset<P>(param: P): Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CacheService.d.ts","sourceRoot":"","sources":["../../../../src/libs/cache/CacheService.ts"],"names":[],"mappings":"AAwFA,OAAO,KAAK,MAAM,SAAS,CAAC;AAI5B,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AAEvC,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAUpC,MAAM,MAAM,YAAY,CAAC,CAAC,EAAE,CAAC,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;AAOrE,MAAM,MAAM,iBAAiB,GAAG;IAAE,EAAE,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAOhE,MAAM,MAAM,qBAAqB,GAAG;IAAE,EAAE,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC;AAOnE,MAAM,MAAM,KAAK,GAAG;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,CAAC;AAOvD,MAAM,MAAM,iBAAiB,GAAG;IAE9B,KAAK,EAAE,MAAM,CAAC;IAEd,KAAK,EAAE,GAAG,CAAC;IAEX,KAAK,CAAC,EAAE,GAAG,CAAC;CACb,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC;AAOnB,MAAM,MAAM,eAAe,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,KAAK,GAAG,CAAC;AAKlF,eAAO,MAAM,kBAAkB;;;CAK9B,CAAC;AA6DF,qBACa,YAAY;IAiBX,OAAO,CAAC,WAAW;IAf/B,MAAM,
|
|
1
|
+
{"version":3,"file":"CacheService.d.ts","sourceRoot":"","sources":["../../../../src/libs/cache/CacheService.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,7 +17,7 @@ export declare const LeaderEvents: {
|
|
|
17
17
|
error: string;
|
|
18
18
|
};
|
|
19
19
|
export declare class Leader extends EventEmitter {
|
|
20
|
-
logger: import("
|
|
20
|
+
logger: import("../logger").EnhancedLogger;
|
|
21
21
|
readonly id: string;
|
|
22
22
|
readonly redis: Redis;
|
|
23
23
|
key: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Leader.d.ts","sourceRoot":"","sources":["../../../../src/libs/leader/Leader.ts"],"names":[],"mappings":"AA6DA,OAAO,YAAY,MAAM,eAAe,CAAC;AACzC,OAAO,KAAK,MAAM,SAAS,CAAC;AAK5B,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AACvC,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAiBhD,cAAM,YAAY;IAoBJ,OAAO,CAAC,MAAM;IAd1B,GAAG,SAAS;IAMZ,IAAI,SAAQ;IAMZ,IAAI,SAAa;gBAEG,MAAM,EAAE,MAAM;IAKlC,IAAI,OAAO,IAQM,MAAM,CANtB;IAMD,IAAI,OAAO,CAAC,GAAG,EAAE,MAAM,EAGtB;CACF;AAMD,eAAO,MAAM,YAAY;;;;CASxB,CAAC;AAMF,qBACa,MAAO,SAAQ,YAAY;IAEtC,MAAM,
|
|
1
|
+
{"version":3,"file":"Leader.d.ts","sourceRoot":"","sources":["../../../../src/libs/leader/Leader.ts"],"names":[],"mappings":"AA6DA,OAAO,YAAY,MAAM,eAAe,CAAC;AACzC,OAAO,KAAK,MAAM,SAAS,CAAC;AAK5B,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AACvC,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAiBhD,cAAM,YAAY;IAoBJ,OAAO,CAAC,MAAM;IAd1B,GAAG,SAAS;IAMZ,IAAI,SAAQ;IAMZ,IAAI,SAAa;gBAEG,MAAM,EAAE,MAAM;IAKlC,IAAI,OAAO,IAQM,MAAM,CANtB;IAMD,IAAI,OAAO,CAAC,GAAG,EAAE,MAAM,EAGtB;CACF;AAMD,eAAO,MAAM,YAAY;;;;CASxB,CAAC;AAMF,qBACa,MAAO,SAAQ,YAAY;IAEtC,MAAM,qCAA4B;IAMlC,QAAQ,CAAC,EAAE,SAAkB;IAK7B,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC;IAMtB,GAAG,EAAE,MAAM,CAAC;IAKZ,OAAO,eAA0B;IAMjC,OAAO,CAAC,OAAO,CAAiB;IAMhC,OAAO,CAAC,OAAO,CAAiB;gBAMpB,WAAW,EAAE,WAAW;IA0BpC,MAAM,CAAC,OAAO,EAAE,aAAa;IAavB,QAAQ;IAsBR,KAAK;IAkCL,KAAK;IAiCL,IAAI;CAgBX"}
|
|
@@ -7,8 +7,31 @@ export interface LoggerConfig {
|
|
|
7
7
|
};
|
|
8
8
|
prettyPrint?: any;
|
|
9
9
|
}
|
|
10
|
+
export declare class EnhancedLogger {
|
|
11
|
+
private readonly pinoLogger;
|
|
12
|
+
constructor(pinoLogger: pino.Logger);
|
|
13
|
+
private formatMessage;
|
|
14
|
+
trace(msg: string, ...args: any[]): void;
|
|
15
|
+
trace(obj: object, msg?: string, ...args: any[]): void;
|
|
16
|
+
debug(msg: string, ...args: any[]): void;
|
|
17
|
+
debug(obj: object, msg?: string, ...args: any[]): void;
|
|
18
|
+
info(msg: string, ...args: any[]): void;
|
|
19
|
+
info(obj: object, msg?: string, ...args: any[]): void;
|
|
20
|
+
warn(msg: string, ...args: any[]): void;
|
|
21
|
+
warn(obj: object, msg?: string, ...args: any[]): void;
|
|
22
|
+
warn(error: unknown): void;
|
|
23
|
+
error(msg: string, ...args: any[]): void;
|
|
24
|
+
error(obj: object, msg?: string, ...args: any[]): void;
|
|
25
|
+
error(error: unknown): void;
|
|
26
|
+
fatal(msg: string, ...args: any[]): void;
|
|
27
|
+
fatal(obj: object, msg?: string, ...args: any[]): void;
|
|
28
|
+
fatal(error: unknown): void;
|
|
29
|
+
child(bindings: pino.Bindings): EnhancedLogger;
|
|
30
|
+
get raw(): pino.Logger;
|
|
31
|
+
}
|
|
10
32
|
export declare class Logger {
|
|
11
|
-
static getLogger<T>(owner: (new (...args: any[]) => T) | string):
|
|
33
|
+
static getLogger<T>(owner: (new (...args: any[]) => T) | string): EnhancedLogger;
|
|
34
|
+
static formatError(error: unknown): string;
|
|
12
35
|
private static transformConfig;
|
|
13
36
|
}
|
|
14
37
|
//# sourceMappingURL=Logger.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Logger.d.ts","sourceRoot":"","sources":["../../../../src/libs/logger/Logger.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Logger.d.ts","sourceRoot":"","sources":["../../../../src/libs/logger/Logger.ts"],"names":[],"mappings":"AAsEA,OAAO,IAAI,MAAM,MAAM,CAAC;AAUxB,MAAM,WAAW,YAAY;IAM3B,KAAK,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC;IAOnB,SAAS,CAAC,EAAE;QAKV,MAAM,EAAE,MAAM,CAAC;QAMf,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;KAC/B,CAAC;IAQF,WAAW,CAAC,EAAE,GAAG,CAAC;CACnB;AAeD,qBAAa,cAAc;IACb,OAAO,CAAC,QAAQ,CAAC,UAAU;gBAAV,UAAU,EAAE,IAAI,CAAC,MAAM;IAapD,OAAO,CAAC,aAAa;IAmBrB,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI;IAExC,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI;IAuBtD,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI;IAExC,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI;IAuBtD,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI;IAEvC,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI;IAwBrD,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI;IAEvC,IAAI,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI;IAErD,IAAI,CAAC,KAAK,EAAE,OAAO,GAAG,IAAI;IAuG1B,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI;IAExC,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI;IAEtD,KAAK,CAAC,KAAK,EAAE,OAAO,GAAG,IAAI;IA8F3B,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI;IAExC,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI;IAEtD,KAAK,CAAC,KAAK,EAAE,OAAO,GAAG,IAAI;IAuE3B,KAAK,CAAC,QAAQ,EAAE,IAAI,CAAC,QAAQ,GAAG,cAAc;IAS9C,IAAI,GAAG,IAAI,IAAI,CAAC,MAAM,CAErB;CACF;AAKD,qBAAa,MAAM;IAqCjB,MAAM,CAAC,SAAS,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,KAAK,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC,GAAG,MAAM,GAAG,cAAc;IAkFhF,MAAM,CAAC,WAAW,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM;IA0B1C,OAAO,CAAC,MAAM,CAAC,eAAe;CA0C/B"}
|
|
@@ -3,9 +3,230 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.Logger = void 0;
|
|
6
|
+
exports.Logger = exports.EnhancedLogger = void 0;
|
|
7
7
|
const pino_1 = __importDefault(require("pino"));
|
|
8
8
|
const configure_1 = require("../configure");
|
|
9
|
+
class EnhancedLogger {
|
|
10
|
+
constructor(pinoLogger) {
|
|
11
|
+
this.pinoLogger = pinoLogger;
|
|
12
|
+
}
|
|
13
|
+
formatMessage(message, args) {
|
|
14
|
+
let index = 0;
|
|
15
|
+
return message.replace(/\{\}/g, () => {
|
|
16
|
+
if (index < args.length) {
|
|
17
|
+
const value = args[index++];
|
|
18
|
+
if (value instanceof Error) {
|
|
19
|
+
return value.message;
|
|
20
|
+
}
|
|
21
|
+
return String(value);
|
|
22
|
+
}
|
|
23
|
+
return '{}';
|
|
24
|
+
});
|
|
25
|
+
}
|
|
26
|
+
trace(...args) {
|
|
27
|
+
if (args.length >= 2 && typeof args[0] === 'string' && args[0].includes('{}')) {
|
|
28
|
+
const [message, ...params] = args;
|
|
29
|
+
const formattedMessage = this.formatMessage(message, params);
|
|
30
|
+
this.pinoLogger.trace(formattedMessage);
|
|
31
|
+
return;
|
|
32
|
+
}
|
|
33
|
+
if (args.length === 2 && typeof args[0] === 'string' && typeof args[1] === 'object') {
|
|
34
|
+
this.pinoLogger.trace(args[1], args[0]);
|
|
35
|
+
return;
|
|
36
|
+
}
|
|
37
|
+
this.pinoLogger.trace(...args);
|
|
38
|
+
}
|
|
39
|
+
debug(...args) {
|
|
40
|
+
if (args.length >= 2 && typeof args[0] === 'string' && args[0].includes('{}')) {
|
|
41
|
+
const [message, ...params] = args;
|
|
42
|
+
const formattedMessage = this.formatMessage(message, params);
|
|
43
|
+
this.pinoLogger.debug(formattedMessage);
|
|
44
|
+
return;
|
|
45
|
+
}
|
|
46
|
+
if (args.length === 2 && typeof args[0] === 'string' && typeof args[1] === 'object') {
|
|
47
|
+
this.pinoLogger.debug(args[1], args[0]);
|
|
48
|
+
return;
|
|
49
|
+
}
|
|
50
|
+
this.pinoLogger.debug(...args);
|
|
51
|
+
}
|
|
52
|
+
info(...args) {
|
|
53
|
+
if (args.length >= 2 && typeof args[0] === 'string' && args[0].includes('{}')) {
|
|
54
|
+
const [message, ...params] = args;
|
|
55
|
+
const formattedMessage = this.formatMessage(message, params);
|
|
56
|
+
this.pinoLogger.info(formattedMessage);
|
|
57
|
+
return;
|
|
58
|
+
}
|
|
59
|
+
if (args.length === 2 && typeof args[0] === 'string' && typeof args[1] === 'object') {
|
|
60
|
+
this.pinoLogger.info(args[1], args[0]);
|
|
61
|
+
return;
|
|
62
|
+
}
|
|
63
|
+
this.pinoLogger.info(...args);
|
|
64
|
+
}
|
|
65
|
+
warn(...args) {
|
|
66
|
+
if (args.length >= 2 && typeof args[0] === 'string' && args[0].includes('{}')) {
|
|
67
|
+
const [message, ...params] = args;
|
|
68
|
+
const formattedMessage = this.formatMessage(message, params);
|
|
69
|
+
const errorParam = params.find(p => p instanceof Error);
|
|
70
|
+
if (errorParam) {
|
|
71
|
+
this.pinoLogger.warn({ err: errorParam }, formattedMessage);
|
|
72
|
+
}
|
|
73
|
+
else {
|
|
74
|
+
this.pinoLogger.warn(formattedMessage);
|
|
75
|
+
}
|
|
76
|
+
return;
|
|
77
|
+
}
|
|
78
|
+
if (args.length === 1 && args[0] instanceof Error) {
|
|
79
|
+
this.pinoLogger.warn({ err: args[0] }, args[0].message);
|
|
80
|
+
return;
|
|
81
|
+
}
|
|
82
|
+
if (args.length === 2 && typeof args[0] === 'string' && args[1] instanceof Error) {
|
|
83
|
+
const message = args[0];
|
|
84
|
+
const error = args[1];
|
|
85
|
+
if (message.includes('{error}')) {
|
|
86
|
+
const formattedMessage = message.replace('{error}', error.message);
|
|
87
|
+
this.pinoLogger.warn({ err: error }, formattedMessage);
|
|
88
|
+
}
|
|
89
|
+
else {
|
|
90
|
+
this.pinoLogger.warn({ err: error }, message);
|
|
91
|
+
}
|
|
92
|
+
return;
|
|
93
|
+
}
|
|
94
|
+
if (args.length === 2 && typeof args[0] === 'string' && typeof args[1] === 'object' && !(args[1] instanceof Error)) {
|
|
95
|
+
this.pinoLogger.warn(args[1], args[0]);
|
|
96
|
+
return;
|
|
97
|
+
}
|
|
98
|
+
if (args.length === 3 && typeof args[0] === 'object' && typeof args[1] === 'string' && args[2] instanceof Error) {
|
|
99
|
+
const message = args[1];
|
|
100
|
+
const error = args[2];
|
|
101
|
+
if (message.includes('{error}')) {
|
|
102
|
+
const formattedMessage = message.replace('{error}', error.message);
|
|
103
|
+
this.pinoLogger.warn({ ...args[0], err: error }, formattedMessage);
|
|
104
|
+
}
|
|
105
|
+
else {
|
|
106
|
+
this.pinoLogger.warn({ ...args[0], err: error }, message);
|
|
107
|
+
}
|
|
108
|
+
return;
|
|
109
|
+
}
|
|
110
|
+
if (args.length === 2 && typeof args[0] === 'object' && args[1] instanceof Error) {
|
|
111
|
+
this.pinoLogger.warn({ ...args[0], err: args[1] }, args[1].message);
|
|
112
|
+
return;
|
|
113
|
+
}
|
|
114
|
+
this.pinoLogger.warn(...args);
|
|
115
|
+
}
|
|
116
|
+
error(...args) {
|
|
117
|
+
if (args.length >= 2 && typeof args[0] === 'string' && args[0].includes('{}')) {
|
|
118
|
+
const [message, ...params] = args;
|
|
119
|
+
const formattedMessage = this.formatMessage(message, params);
|
|
120
|
+
const errorParam = params.find(p => p instanceof Error);
|
|
121
|
+
if (errorParam) {
|
|
122
|
+
this.pinoLogger.error({ err: errorParam }, formattedMessage);
|
|
123
|
+
}
|
|
124
|
+
else {
|
|
125
|
+
this.pinoLogger.error(formattedMessage);
|
|
126
|
+
}
|
|
127
|
+
return;
|
|
128
|
+
}
|
|
129
|
+
if (args.length === 1 && args[0] instanceof Error) {
|
|
130
|
+
this.pinoLogger.error({ err: args[0] }, args[0].message);
|
|
131
|
+
return;
|
|
132
|
+
}
|
|
133
|
+
if (args.length === 1 && args[0] !== null && typeof args[0] !== 'object') {
|
|
134
|
+
this.pinoLogger.error(String(args[0]));
|
|
135
|
+
return;
|
|
136
|
+
}
|
|
137
|
+
if (args.length === 2 && typeof args[0] === 'string' && args[1] instanceof Error) {
|
|
138
|
+
const message = args[0];
|
|
139
|
+
const error = args[1];
|
|
140
|
+
if (message.includes('{error}')) {
|
|
141
|
+
const formattedMessage = message.replace('{error}', error.message);
|
|
142
|
+
this.pinoLogger.error({ err: error }, formattedMessage);
|
|
143
|
+
}
|
|
144
|
+
else {
|
|
145
|
+
this.pinoLogger.error({ err: error }, message);
|
|
146
|
+
}
|
|
147
|
+
return;
|
|
148
|
+
}
|
|
149
|
+
if (args.length === 2 && typeof args[0] === 'string' && typeof args[1] === 'object' && !(args[1] instanceof Error)) {
|
|
150
|
+
this.pinoLogger.error(args[1], args[0]);
|
|
151
|
+
return;
|
|
152
|
+
}
|
|
153
|
+
if (args.length === 3 && typeof args[0] === 'object' && typeof args[1] === 'string' && args[2] instanceof Error) {
|
|
154
|
+
const message = args[1];
|
|
155
|
+
const error = args[2];
|
|
156
|
+
if (message.includes('{error}')) {
|
|
157
|
+
const formattedMessage = message.replace('{error}', error.message);
|
|
158
|
+
this.pinoLogger.error({ ...args[0], err: error }, formattedMessage);
|
|
159
|
+
}
|
|
160
|
+
else {
|
|
161
|
+
this.pinoLogger.error({ ...args[0], err: error }, message);
|
|
162
|
+
}
|
|
163
|
+
return;
|
|
164
|
+
}
|
|
165
|
+
if (args.length === 2 && typeof args[0] === 'object' && args[1] instanceof Error) {
|
|
166
|
+
this.pinoLogger.error({ ...args[0], err: args[1] }, args[1].message);
|
|
167
|
+
return;
|
|
168
|
+
}
|
|
169
|
+
this.pinoLogger.error(...args);
|
|
170
|
+
}
|
|
171
|
+
fatal(...args) {
|
|
172
|
+
if (args.length >= 2 && typeof args[0] === 'string' && args[0].includes('{}')) {
|
|
173
|
+
const [message, ...params] = args;
|
|
174
|
+
const formattedMessage = this.formatMessage(message, params);
|
|
175
|
+
const errorParam = params.find(p => p instanceof Error);
|
|
176
|
+
if (errorParam) {
|
|
177
|
+
this.pinoLogger.fatal({ err: errorParam }, formattedMessage);
|
|
178
|
+
}
|
|
179
|
+
else {
|
|
180
|
+
this.pinoLogger.fatal(formattedMessage);
|
|
181
|
+
}
|
|
182
|
+
return;
|
|
183
|
+
}
|
|
184
|
+
if (args.length === 1 && args[0] instanceof Error) {
|
|
185
|
+
this.pinoLogger.fatal({ err: args[0] }, args[0].message);
|
|
186
|
+
return;
|
|
187
|
+
}
|
|
188
|
+
if (args.length === 2 && typeof args[0] === 'string' && args[1] instanceof Error) {
|
|
189
|
+
const message = args[0];
|
|
190
|
+
const error = args[1];
|
|
191
|
+
if (message.includes('{error}')) {
|
|
192
|
+
const formattedMessage = message.replace('{error}', error.message);
|
|
193
|
+
this.pinoLogger.fatal({ err: error }, formattedMessage);
|
|
194
|
+
}
|
|
195
|
+
else {
|
|
196
|
+
this.pinoLogger.fatal({ err: error }, message);
|
|
197
|
+
}
|
|
198
|
+
return;
|
|
199
|
+
}
|
|
200
|
+
if (args.length === 2 && typeof args[0] === 'string' && typeof args[1] === 'object' && !(args[1] instanceof Error)) {
|
|
201
|
+
this.pinoLogger.fatal(args[1], args[0]);
|
|
202
|
+
return;
|
|
203
|
+
}
|
|
204
|
+
if (args.length === 3 && typeof args[0] === 'object' && typeof args[1] === 'string' && args[2] instanceof Error) {
|
|
205
|
+
const message = args[1];
|
|
206
|
+
const error = args[2];
|
|
207
|
+
if (message.includes('{error}')) {
|
|
208
|
+
const formattedMessage = message.replace('{error}', error.message);
|
|
209
|
+
this.pinoLogger.fatal({ ...args[0], err: error }, formattedMessage);
|
|
210
|
+
}
|
|
211
|
+
else {
|
|
212
|
+
this.pinoLogger.fatal({ ...args[0], err: error }, message);
|
|
213
|
+
}
|
|
214
|
+
return;
|
|
215
|
+
}
|
|
216
|
+
if (args.length === 2 && typeof args[0] === 'object' && args[1] instanceof Error) {
|
|
217
|
+
this.pinoLogger.fatal({ ...args[0], err: args[1] }, args[1].message);
|
|
218
|
+
return;
|
|
219
|
+
}
|
|
220
|
+
this.pinoLogger.fatal(...args);
|
|
221
|
+
}
|
|
222
|
+
child(bindings) {
|
|
223
|
+
return new EnhancedLogger(this.pinoLogger.child(bindings));
|
|
224
|
+
}
|
|
225
|
+
get raw() {
|
|
226
|
+
return this.pinoLogger;
|
|
227
|
+
}
|
|
228
|
+
}
|
|
229
|
+
exports.EnhancedLogger = EnhancedLogger;
|
|
9
230
|
class Logger {
|
|
10
231
|
static getLogger(owner) {
|
|
11
232
|
let tag = 'Logger';
|
|
@@ -26,18 +247,23 @@ class Logger {
|
|
|
26
247
|
const pretty = require('pino-pretty');
|
|
27
248
|
const prettyOptions = transformedConfig.transport.options || {};
|
|
28
249
|
const prettyStream = pretty(prettyOptions);
|
|
29
|
-
|
|
250
|
+
const pinoLogger = (0, pino_1.default)(options, prettyStream);
|
|
251
|
+
return new EnhancedLogger(pinoLogger);
|
|
30
252
|
}
|
|
31
253
|
catch (err) {
|
|
32
254
|
console.error('Pino-pretty failed to load as stream. Falling back to raw JSON logs.', err);
|
|
33
|
-
|
|
255
|
+
const pinoLogger = (0, pino_1.default)(options);
|
|
256
|
+
return new EnhancedLogger(pinoLogger);
|
|
34
257
|
}
|
|
35
258
|
}
|
|
36
259
|
if (transformedConfig.transport) {
|
|
37
260
|
options.transport = transformedConfig.transport;
|
|
38
261
|
}
|
|
39
|
-
const
|
|
40
|
-
return
|
|
262
|
+
const pinoLogger = (0, pino_1.default)(options);
|
|
263
|
+
return new EnhancedLogger(pinoLogger);
|
|
264
|
+
}
|
|
265
|
+
static formatError(error) {
|
|
266
|
+
return error instanceof Error ? error.message : String(error);
|
|
41
267
|
}
|
|
42
268
|
static transformConfig(config) {
|
|
43
269
|
const newConfig = { ...config };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Logger.js","sourceRoot":"","sources":["../../../../src/libs/logger/Logger.ts"],"names":[],"mappings":";;;;;;AAyDA,gDAAwB;AACxB,4CAA6C;AAgD7C,MAAa,MAAM;IA4BjB,MAAM,CAAC,SAAS,CAAI,KAA2C;QAE7D,IAAI,GAAG,GAAG,QAAQ,CAAC;QACnB,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;YAC9B,GAAG,GAAG,KAAK,CAAC;QACd,CAAC;aAAM,CAAC;YACN,GAAG,GAAG,KAAK,CAAC,IAAI,CAAC;QACnB,CAAC;QAGD,MAAM,SAAS,GAAG,yBAAa,CAAC,SAAS,CAAe,QAAQ,CAAC,CAAC;QAClE,MAAM,iBAAiB,GAAG,MAAM,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;QAG5D,MAAM,OAAO,GAAwB;YACnC,IAAI,EAAE,GAAG;YACT,KAAK,EAAE,iBAAiB,CAAC,KAAK,IAAI,MAAM;SACzC,CAAC;QAIF,IAAI,iBAAiB,CAAC,SAAS,IAAI,iBAAiB,CAAC,SAAS,CAAC,MAAM,KAAK,aAAa,EAAE,CAAC;YACxF,IAAI,CAAC;gBAMH,MAAM,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;gBAEtC,MAAM,aAAa,GAAG,iBAAiB,CAAC,SAAS,CAAC,OAAO,IAAI,EAAE,CAAC;gBAGhE,MAAM,YAAY,GAAG,MAAM,CAAC,aAAa,CAAC,CAAC;gBAM3C,OAAO,IAAA,cAAI,EAAC,OAAO,EAAE,YAAY,CAAC,CAAC;YACrC,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBAGb,OAAO,CAAC,KAAK,CAAC,sEAAsE,EAAE,GAAG,CAAC,CAAC;gBAG3F,OAAO,IAAA,cAAI,EAAC,OAAO,CAAC,CAAC;YACvB,CAAC;QACH,CAAC;QAKD,IAAI,iBAAiB,CAAC,SAAS,EAAE,CAAC;YAChC,OAAO,CAAC,SAAS,GAAG,iBAAiB,CAAC,SAAS,CAAC;QAClD,CAAC;QAED,MAAM,MAAM,GAAG,IAAA,cAAI,EAAC,OAAO,CAAC,CAAC;QAC7B,OAAO,MAAM,CAAC;IAChB,CAAC;IAwBO,MAAM,CAAC,eAAe,CAAC,MAAoB;QACjD,MAAM,SAAS,GAAG,EAAE,GAAG,MAAM,EAAE,CAAC;QAGhC,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC;YACrB,SAAS,CAAC,KAAK,GAAG,MAAM,CAAC;QAC3B,CAAC;QAID,IAAI,SAAS,CAAC,SAAS,EAAE,CAAC;YACxB,OAAO,SAAS,CAAC;QACnB,CAAC;QAID,IAAI,SAAS,CAAC,WAAW,EAAE,CAAC;YAC1B,SAAS,CAAC,SAAS,GAAG;gBACpB,MAAM,EAAE,aAAa;gBACrB,OAAO,EAAE,EAAE;aACZ,CAAC;YAGF,IAAI,OAAO,SAAS,CAAC,WAAW,KAAK,QAAQ,EAAE,CAAC;gBAC9C,SAAS,CAAC,SAAS,CAAC,OAAO,GAAG;oBAC5B,GAAG,SAAS,CAAC,WAAW;oBACxB,QAAQ,EAAE,SAAS,CAAC,WAAW,CAAC,QAAQ,KAAK,KAAK;iBACnD,CAAC;YACJ,CAAC;iBAAM,CAAC;gBAEN,SAAS,CAAC,SAAS,CAAC,OAAO,GAAG;oBAC5B,QAAQ,EAAE,IAAI;oBACd,aAAa,EAAE,cAAc;iBAC9B,CAAC;YACJ,CAAC;YAGD,OAAO,SAAS,CAAC,WAAW,CAAC;QAC/B,CAAC;QAED,OAAO,SAAS,CAAC;IACnB,CAAC;CACF;AAzJD,wBAyJC"}
|
|
1
|
+
{"version":3,"file":"Logger.js","sourceRoot":"","sources":["../../../../src/libs/logger/Logger.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { MetadataArgsStorage } from 'routing-controllers';
|
|
2
2
|
import { ClassType } from '../type';
|
|
3
3
|
export declare const BUILT_IN_TYPES: readonly ["String", "Number", "Boolean", "Date", "Array", "Object"];
|
|
4
|
-
export declare const BUILT_IN_TYPE_CONSTRUCTORS: Set<ObjectConstructor | ArrayConstructor | DateConstructor | BooleanConstructor | NumberConstructor
|
|
4
|
+
export declare const BUILT_IN_TYPE_CONSTRUCTORS: Set<ObjectConstructor | StringConstructor | ArrayConstructor | DateConstructor | BooleanConstructor | NumberConstructor>;
|
|
5
5
|
export interface BaseSchema {
|
|
6
6
|
type: string;
|
|
7
7
|
properties?: Record<string, any>;
|