@zorionapp/gg-core 5.0.28 → 5.0.29
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/package.json +1 -1
- package/src/gg-auth/services/gg-bearer-auth.service.js +1 -1
- package/src/gg-auth/services/gg-bearer-auth.service.js.map +1 -1
- package/src/gg-logger/gg-logger.module.d.ts +5 -0
- package/src/gg-logger/gg-logger.module.js +55 -37
- package/src/gg-logger/gg-logger.module.js.map +1 -1
- package/src/gg-micro/micro.client.js +2 -2
- package/src/gg-micro/micro.client.js.map +1 -1
package/package.json
CHANGED
|
@@ -75,7 +75,7 @@ let GgBearerAuthService = GgBearerAuthService_1 = class GgBearerAuthService {
|
|
|
75
75
|
});
|
|
76
76
|
return error;
|
|
77
77
|
}
|
|
78
|
-
this.logger.error({ msg: `Internal server error`, error });
|
|
78
|
+
this.logger.error({ msg: `Internal server error`, err: error });
|
|
79
79
|
};
|
|
80
80
|
return (0, rxjs_1.firstValueFrom)(this.http.post(`${this.baseUrl}/jwt/check`, { accessToken }, { timeout: this.jwtCheckTimeoutMs }).pipe((0, rxjs_1.tap)({ next: onSuccess, error: onError }), (0, rxjs_1.map)((res) => (0, class_transformer_1.plainToInstance)(dto_1.UserDto, res.data.user))));
|
|
81
81
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gg-bearer-auth.service.js","sourceRoot":"","sources":["../../../../../../libs/gg-core/src/gg-auth/services/gg-bearer-auth.service.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"gg-bearer-auth.service.js","sourceRoot":"","sources":["../../../../../../libs/gg-core/src/gg-auth/services/gg-bearer-auth.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,9 @@
|
|
|
1
1
|
import { DynamicModule } from '@nestjs/common';
|
|
2
|
+
import { ConfigType } from '@nestjs/config';
|
|
3
|
+
import { Params } from 'nestjs-pino';
|
|
4
|
+
import { appConfig } from '../gg-config';
|
|
5
|
+
export declare const REDACT_PATHS: string[];
|
|
6
|
+
export declare function buildLoggerOptions(appConf: ConfigType<typeof appConfig>): Params;
|
|
2
7
|
export declare class GgLoggerModule {
|
|
3
8
|
static forRoot(): DynamicModule;
|
|
4
9
|
}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
var GgLoggerModule_1;
|
|
3
3
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
4
|
-
exports.GgLoggerModule = void 0;
|
|
4
|
+
exports.GgLoggerModule = exports.buildLoggerOptions = exports.REDACT_PATHS = void 0;
|
|
5
5
|
const tslib_1 = require("tslib");
|
|
6
6
|
const common_1 = require("@nestjs/common");
|
|
7
7
|
const nestjs_pino_1 = require("nestjs-pino");
|
|
@@ -14,6 +14,59 @@ const PINO_LEVEL_TO_GCP_SEVERITY = {
|
|
|
14
14
|
error: 'ERROR',
|
|
15
15
|
fatal: 'CRITICAL',
|
|
16
16
|
};
|
|
17
|
+
exports.REDACT_PATHS = [
|
|
18
|
+
// Request config. `data` is the request body — redacted because callers (e.g. the auth
|
|
19
|
+
// `/jwt/check` POST) put raw JWTs there; `*` over header values is casing-agnostic.
|
|
20
|
+
'err.config.headers.*',
|
|
21
|
+
'err.config.auth',
|
|
22
|
+
'err.config.data',
|
|
23
|
+
'err.request._header',
|
|
24
|
+
// Response mirror — defense-in-depth for HTTP wrappers that rebuild `response.config`/
|
|
25
|
+
// `response.request` as separate objects, breaking axios's aliasing onto the request config.
|
|
26
|
+
'err.response.config.headers.*',
|
|
27
|
+
'err.response.config.auth',
|
|
28
|
+
'err.response.config.data',
|
|
29
|
+
'err.response.request._header',
|
|
30
|
+
'err.response.headers["set-cookie"]',
|
|
31
|
+
];
|
|
32
|
+
function buildLoggerOptions(appConf) {
|
|
33
|
+
const name = appConf.name;
|
|
34
|
+
const level = appConf.logLevel;
|
|
35
|
+
const autoLogging = false;
|
|
36
|
+
const isPrettyMode = appConf.logFormat === 'pretty';
|
|
37
|
+
const transport = isPrettyMode
|
|
38
|
+
? {
|
|
39
|
+
target: 'pino-pretty',
|
|
40
|
+
options: { singleLine: true, colorize: true, colorizeObjects: true, levelFirst: true },
|
|
41
|
+
}
|
|
42
|
+
: undefined;
|
|
43
|
+
// GCP Cloud Logging promotes a top-level `severity` string to the entry severity;
|
|
44
|
+
// without it every record shows as DEFAULT. Skip in pretty mode to avoid duplicating
|
|
45
|
+
// the level that pino-pretty already prints.
|
|
46
|
+
const formatters = isPrettyMode
|
|
47
|
+
? undefined
|
|
48
|
+
: {
|
|
49
|
+
level: (label, number) => ({
|
|
50
|
+
severity: PINO_LEVEL_TO_GCP_SEVERITY[label] ?? 'DEFAULT',
|
|
51
|
+
level: number,
|
|
52
|
+
}),
|
|
53
|
+
};
|
|
54
|
+
return {
|
|
55
|
+
exclude: ['/health', '/metrics'],
|
|
56
|
+
pinoHttp: {
|
|
57
|
+
name,
|
|
58
|
+
level,
|
|
59
|
+
transport,
|
|
60
|
+
autoLogging,
|
|
61
|
+
formatters,
|
|
62
|
+
redact: exports.REDACT_PATHS,
|
|
63
|
+
serializers: {
|
|
64
|
+
req: (req) => ({ id: req.id, method: req.method, url: req.url }),
|
|
65
|
+
},
|
|
66
|
+
},
|
|
67
|
+
};
|
|
68
|
+
}
|
|
69
|
+
exports.buildLoggerOptions = buildLoggerOptions;
|
|
17
70
|
let GgLoggerModule = GgLoggerModule_1 = class GgLoggerModule {
|
|
18
71
|
static forRoot() {
|
|
19
72
|
return {
|
|
@@ -21,42 +74,7 @@ let GgLoggerModule = GgLoggerModule_1 = class GgLoggerModule {
|
|
|
21
74
|
imports: [
|
|
22
75
|
nestjs_pino_1.LoggerModule.forRootAsync({
|
|
23
76
|
inject: [gg_config_1.appConfig.KEY],
|
|
24
|
-
useFactory:
|
|
25
|
-
const name = appConf.name;
|
|
26
|
-
const level = appConf.logLevel;
|
|
27
|
-
const autoLogging = false;
|
|
28
|
-
const isPrettyMode = appConf.logFormat === 'pretty';
|
|
29
|
-
const transport = isPrettyMode
|
|
30
|
-
? {
|
|
31
|
-
target: 'pino-pretty',
|
|
32
|
-
options: { singleLine: true, colorize: true, colorizeObjects: true, levelFirst: true },
|
|
33
|
-
}
|
|
34
|
-
: undefined;
|
|
35
|
-
// GCP Cloud Logging promotes a top-level `severity` string to the entry severity;
|
|
36
|
-
// without it every record shows as DEFAULT. Skip in pretty mode to avoid duplicating
|
|
37
|
-
// the level that pino-pretty already prints.
|
|
38
|
-
const formatters = isPrettyMode
|
|
39
|
-
? undefined
|
|
40
|
-
: {
|
|
41
|
-
level: (label, number) => ({
|
|
42
|
-
severity: PINO_LEVEL_TO_GCP_SEVERITY[label] ?? 'DEFAULT',
|
|
43
|
-
level: number,
|
|
44
|
-
}),
|
|
45
|
-
};
|
|
46
|
-
return {
|
|
47
|
-
exclude: ['/health', '/metrics'],
|
|
48
|
-
pinoHttp: {
|
|
49
|
-
name,
|
|
50
|
-
level,
|
|
51
|
-
transport,
|
|
52
|
-
autoLogging,
|
|
53
|
-
formatters,
|
|
54
|
-
serializers: {
|
|
55
|
-
req: (req) => ({ id: req.id, method: req.method, url: req.url }),
|
|
56
|
-
},
|
|
57
|
-
},
|
|
58
|
-
};
|
|
59
|
-
},
|
|
77
|
+
useFactory: buildLoggerOptions,
|
|
60
78
|
}),
|
|
61
79
|
],
|
|
62
80
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gg-logger.module.js","sourceRoot":"","sources":["../../../../../libs/gg-core/src/gg-logger/gg-logger.module.ts"],"names":[],"mappings":";;;;;AAAA,2CAAuD;AAEvD,
|
|
1
|
+
{"version":3,"file":"gg-logger.module.js","sourceRoot":"","sources":["../../../../../libs/gg-core/src/gg-logger/gg-logger.module.ts"],"names":[],"mappings":";;;;;AAAA,2CAAuD;AAEvD,6CAAmD;AACnD,4CAAyC;AAEzC,MAAM,0BAA0B,GAA2B;IACzD,KAAK,EAAE,OAAO;IACd,KAAK,EAAE,OAAO;IACd,IAAI,EAAE,MAAM;IACZ,IAAI,EAAE,SAAS;IACf,KAAK,EAAE,OAAO;IACd,KAAK,EAAE,UAAU;CAClB,CAAC;AAEW,QAAA,YAAY,GAAG;IAC1B,uFAAuF;IACvF,oFAAoF;IACpF,sBAAsB;IACtB,iBAAiB;IACjB,iBAAiB;IACjB,qBAAqB;IACrB,uFAAuF;IACvF,6FAA6F;IAC7F,+BAA+B;IAC/B,0BAA0B;IAC1B,0BAA0B;IAC1B,8BAA8B;IAC9B,oCAAoC;CACrC,CAAC;AAEF,SAAgB,kBAAkB,CAAC,OAAqC;IACtE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAC1B,MAAM,KAAK,GAAG,OAAO,CAAC,QAAQ,CAAC;IAC/B,MAAM,WAAW,GAAG,KAAK,CAAC;IAC1B,MAAM,YAAY,GAAG,OAAO,CAAC,SAAS,KAAK,QAAQ,CAAC;IAEpD,MAAM,SAAS,GAAG,YAAY;QAC5B,CAAC,CAAC;YACE,MAAM,EAAE,aAAa;YACrB,OAAO,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE;SACvF;QACH,CAAC,CAAC,SAAS,CAAC;IAEd,kFAAkF;IAClF,qFAAqF;IACrF,6CAA6C;IAC7C,MAAM,UAAU,GAAG,YAAY;QAC7B,CAAC,CAAC,SAAS;QACX,CAAC,CAAC;YACE,KAAK,EAAE,CAAC,KAAa,EAAE,MAAc,EAAE,EAAE,CAAC,CAAC;gBACzC,QAAQ,EAAE,0BAA0B,CAAC,KAAK,CAAC,IAAI,SAAS;gBACxD,KAAK,EAAE,MAAM;aACd,CAAC;SACH,CAAC;IAEN,OAAO;QACL,OAAO,EAAE,CAAC,SAAS,EAAE,UAAU,CAAC;QAChC,QAAQ,EAAE;YACR,IAAI;YACJ,KAAK;YACL,SAAS;YACT,WAAW;YACX,UAAU;YACV,MAAM,EAAE,oBAAY;YACpB,WAAW,EAAE;gBACX,GAAG,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,GAAG,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,EAAE,GAAG,CAAC,GAAG,EAAE,CAAC;aACjE;SACF;KACF,CAAC;AACJ,CAAC;AAvCD,gDAuCC;AAGM,IAAM,cAAc,sBAApB,MAAM,cAAc;IAClB,MAAM,CAAC,OAAO;QACnB,OAAO;YACL,MAAM,EAAE,gBAAc;YACtB,OAAO,EAAE;gBACP,0BAAY,CAAC,YAAY,CAAC;oBACxB,MAAM,EAAE,CAAC,qBAAS,CAAC,GAAG,CAAC;oBACvB,UAAU,EAAE,kBAAkB;iBAC/B,CAAC;aACH;SACF,CAAC;IACJ,CAAC;CACF,CAAA;AAZY,wCAAc;yBAAd,cAAc;IAD1B,IAAA,eAAM,EAAC,EAAE,CAAC;GACE,cAAc,CAY1B"}
|
|
@@ -46,7 +46,7 @@ class MicroClient {
|
|
|
46
46
|
this.logger.debug({ msg: 'RMQ command response received', pattern });
|
|
47
47
|
}), (0, rxjs_1.timeout)(options.timeout.as('milliseconds')), (0, rxjs_1.catchError)((e) => {
|
|
48
48
|
this.recordRpcSend(pattern, 'error');
|
|
49
|
-
this.logger.error({ msg: 'RMQ command error', pattern, payload: command,
|
|
49
|
+
this.logger.error({ msg: 'RMQ command error', pattern, payload: command, err: e });
|
|
50
50
|
return (0, rxjs_1.throwError)(() => e);
|
|
51
51
|
}));
|
|
52
52
|
});
|
|
@@ -75,7 +75,7 @@ class MicroClient {
|
|
|
75
75
|
options = this.mergeWithDefaultOptions(options);
|
|
76
76
|
const pattern = event.constructor.pattern;
|
|
77
77
|
return this.clientProxy.emit(pattern, event.data).pipe((0, rxjs_1.tap)(() => this.logger.debug({ msg: 'RMQ event sent', pattern })), (0, rxjs_1.timeout)(options.timeout.as('milliseconds')), (0, rxjs_1.catchError)((e) => {
|
|
78
|
-
this.logger.error({ msg: 'RMQ event error', pattern, payload: event,
|
|
78
|
+
this.logger.error({ msg: 'RMQ event error', pattern, payload: event, err: e });
|
|
79
79
|
return (0, rxjs_1.throwError)(() => e);
|
|
80
80
|
}));
|
|
81
81
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"micro.client.js","sourceRoot":"","sources":["../../../../../libs/gg-core/src/gg-micro/micro.client.ts"],"names":[],"mappings":";;;AAAA,2CAAwC;AACxC,yDAAiF;AACjF,mDAAoD;AAEpD,yDAAoD;AACpD,mCAA6B;AAC7B,iCAAiC;AAEjC,6CAAgD;AAChD,+BAAoF;AAWpF,MAAM,eAAe,GAAG,uBAAuB,CAAC;AAEhD,MAAa,WAAW;IAOtB,YACmB,WAAwB,EACxB,IAAY,EACZ,UAAsB,EACtB,IAAqB;QAHrB,gBAAW,GAAX,WAAW,CAAa;QACxB,SAAI,GAAJ,IAAI,CAAQ;QACZ,eAAU,GAAV,UAAU,CAAY;QACtB,SAAI,GAAJ,IAAI,CAAiB;QARvB,WAAM,GAAG,IAAI,eAAM,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QACtC,mBAAc,GAAsB,EAAE,QAAQ,EAAE,CAAC,EAAE,OAAO,EAAE,gBAAQ,CAAC,UAAU,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC;QASlH,IAAI,CAAC,MAAM,GAAG,IAAI,eAAM,CAAC,GAAG,WAAW,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;QAC7D,IAAI,CAAC,cAAc;YAChB,sBAAQ,CAAC,eAAe,CAAC,eAAe,CAAa;gBACtD,IAAI,qBAAO,CAAC;oBACV,IAAI,EAAE,eAAe;oBACrB,IAAI,EAAE,kEAAkE;oBACxE,UAAU,EAAE,CAAC,SAAS,EAAE,SAAS,EAAE,QAAQ,CAAU;iBACtD,CAAC,CAAC;IACP,CAAC;IAED;;;;;OAKG;IACI,IAAI,CAAW,OAA6B,EAAE,OAA2B;QAC9E,OAAO,GAAG,IAAI,CAAC,uBAAuB,CAAC,OAAO,CAAC,CAAC;QAEhD,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;QAEzC,MAAM,CAAC,GAAG,IAAA,YAAK,EAAC,GAAG,EAAE;YACnB,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;YACzC,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;YAEnC,OAAO,IAAI,CAAC,WAAW;iBACpB,IAAI,CAAkB,OAAO,EAAE,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC;iBAClG,IAAI,CACH,IAAA,UAAG,EAAC,GAAG,EAAE;gBACP,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;gBACvC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,GAAG,EAAE,+BAA+B,EAAE,OAAO,EAAE,CAAC,CAAC;YACvE,CAAC,CAAC,EACF,IAAA,cAAO,EAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,cAAc,CAAC,CAAC,EAC3C,IAAA,iBAAU,EAAC,CAAC,CAAC,EAAE,EAAE;gBACf,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;gBACrC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,GAAG,EAAE,mBAAmB,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"micro.client.js","sourceRoot":"","sources":["../../../../../libs/gg-core/src/gg-micro/micro.client.ts"],"names":[],"mappings":"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"}
|