@zorionapp/gg-core 5.0.28 → 5.0.29-structured-logging.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/package.json +1 -1
- package/src/gg-auth/services/gg-bearer-auth.service.js +4 -4
- package/src/gg-auth/services/gg-bearer-auth.service.js.map +1 -1
- package/src/gg-auth/services/gg-merchant-auth.service.js +1 -1
- package/src/gg-auth/services/gg-merchant-auth.service.js.map +1 -1
- package/src/gg-cache/gg-cache.module.js +2 -1
- package/src/gg-cache/gg-cache.module.js.map +1 -1
- package/src/gg-cache/gg-cache.service.js +4 -11
- package/src/gg-cache/gg-cache.service.js.map +1 -1
- package/src/gg-config/validate-config.js +8 -3
- package/src/gg-config/validate-config.js.map +1 -1
- package/src/gg-database/database.adapter.d.ts +0 -1
- package/src/gg-database/database.adapter.js +0 -4
- package/src/gg-database/database.adapter.js.map +1 -1
- package/src/gg-database/database.connector.js +1 -1
- package/src/gg-database/database.connector.js.map +1 -1
- package/src/gg-errors/gg-exception.service.js +3 -4
- package/src/gg-errors/gg-exception.service.js.map +1 -1
- package/src/gg-kernel/kernel.js +5 -1
- package/src/gg-kernel/kernel.js.map +1 -1
- package/src/gg-kernel/service-providers/base-service-provider.js +2 -2
- package/src/gg-kernel/service-providers/base-service-provider.js.map +1 -1
- package/src/gg-kernel/service-providers/swagger.service-provider.js +1 -1
- package/src/gg-kernel/service-providers/swagger.service-provider.js.map +1 -1
- package/src/gg-logger/gg-logger.module.d.ts +5 -0
- package/src/gg-logger/gg-logger.module.js +82 -37
- package/src/gg-logger/gg-logger.module.js.map +1 -1
- package/src/gg-micro/gg-server-rmq.js +9 -9
- package/src/gg-micro/gg-server-rmq.js.map +1 -1
- package/src/gg-micro/micro.client.js +3 -4
- package/src/gg-micro/micro.client.js.map +1 -1
- package/src/gg-redlock/redlock.module.js +2 -1
- package/src/gg-redlock/redlock.module.js.map +1 -1
package/package.json
CHANGED
|
@@ -56,7 +56,7 @@ let GgBearerAuthService = GgBearerAuthService_1 = class GgBearerAuthService {
|
|
|
56
56
|
*/
|
|
57
57
|
fetchAndCacheUserDto(accessToken, cacheKey) {
|
|
58
58
|
const onSuccess = async (value) => {
|
|
59
|
-
this.logger.log({ msg: `User queried successfully`, userId: value
|
|
59
|
+
this.logger.log({ msg: `User queried successfully`, userId: value?.data?.user?.ggId });
|
|
60
60
|
await this.ggCache.set(cacheKey, value.data.user, {
|
|
61
61
|
namespaced: false,
|
|
62
62
|
ttl: luxon_1.Duration.fromObject({ seconds: this.authCacheTtlSeconds }),
|
|
@@ -64,18 +64,18 @@ let GgBearerAuthService = GgBearerAuthService_1 = class GgBearerAuthService {
|
|
|
64
64
|
};
|
|
65
65
|
const onError = async (error) => {
|
|
66
66
|
if (error.code === 'ECONNREFUSED') {
|
|
67
|
-
this.logger.error(
|
|
67
|
+
this.logger.error({ msg: 'User service unreachable; check network connection or port mapping', err: error });
|
|
68
68
|
return error;
|
|
69
69
|
}
|
|
70
70
|
if (error.code === 'ERR_BAD_REQUEST') {
|
|
71
|
-
this.logger.warn({ msg: `User authentication declined with given JWT`,
|
|
71
|
+
this.logger.warn({ msg: `User authentication declined with given JWT`, err: error });
|
|
72
72
|
await this.ggCache.set(cacheKey, new dto_1.UserDto(), {
|
|
73
73
|
namespaced: false,
|
|
74
74
|
ttl: luxon_1.Duration.fromObject({ seconds: this.authCacheTtlSeconds }),
|
|
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":";;;;;AAAA,mDAAoD;AACpD,yCAA4C;AAC5C,2CAA4D;AAE5D,yDAAoD;AACpD,qDAAwC;AAGxC,iCAAiC;AACjC,2CAAqC;AACrC,+BAAgD;AAChD,6CAAgD;AAChD,sEAAwF;AAMjF,IAAM,mBAAmB,2BAAzB,MAAM,mBAAmB;IAM9B,YACwC,OAAuC,EAC5D,OAAiC,EACjC,IAAiB,EACjB,OAAuB;QAHe,YAAO,GAAP,OAAO,CAAe;QAC3C,YAAO,GAAP,OAAO,CAAS;QACjC,SAAI,GAAJ,IAAI,CAAa;QACjB,YAAO,GAAP,OAAO,CAAgB;QARzB,WAAM,GAAG,IAAI,eAAM,CAAC,qBAAmB,CAAC,IAAI,CAAC,CAAC;QAU7D,IAAI,CAAC,OAAO,GAAG,UAAU,IAAI,CAAC,OAAO,CAAC,WAAW,eAAe,CAAC;QACjE,IAAI,CAAC,mBAAmB,GAAG,IAAI,CAAC,2BAA2B,CAAC,IAAI,CAAC,OAAO,CAAC,mBAAmB,EAAE,EAAE,CAAC,CAAC;QAClG,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,2BAA2B,CAAC,IAAI,CAAC,OAAO,CAAC,iBAAiB,EAAE,IAAI,CAAC,CAAC;IAClG,CAAC;IAED;;OAEG;IACI,KAAK,CAAC,SAAS,CAAC,cAAsB,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC;QAClF,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,WAAW,CAAC,CAAC;QAE/C,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,GAAG,CAAU,QAAQ,EAAE,KAAK,CAAC,CAAC;QAEnE,IAAI,SAAS;YAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC;QAE1C,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAC;QAEpE,OAAO,EAAE,IAAI,EAAE,CAAC;IAClB,CAAC;IAED;;;OAGG;IACO,YAAY,CAAC,OAA4B;QACjD,MAAM,GAAG,GAAG,OAAO,CAAC,eAAe,CAAC,EAAE,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;QAE7D,OAAO,IAAA,uBAAK,EAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC;IACjC,CAAC;IAEO,WAAW,CAAC,WAAmB;QACrC,OAAO,QAAQ,WAAW,EAAE,CAAC;IAC/B,CAAC;IAED;;;;;;;OAOG;IACO,oBAAoB,CAAC,WAAmB,EAAE,QAAgB;QAClE,MAAM,SAAS,GAAG,KAAK,EAAE,KAAuC,EAAE,EAAE;YAClE,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,2BAA2B,EAAE,MAAM,EAAE,KAAK,
|
|
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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"}
|
|
@@ -11,7 +11,7 @@ let GgMerchantAuthService = GgMerchantAuthService_1 = class GgMerchantAuthServic
|
|
|
11
11
|
this.logger = new common_1.Logger(GgMerchantAuthService_1.name);
|
|
12
12
|
}
|
|
13
13
|
async authorize() {
|
|
14
|
-
this.logger.log(
|
|
14
|
+
this.logger.log({ msg: 'Attempt to authenticate', authType: gg_auth_module_options_1.AuthType.Merchant });
|
|
15
15
|
throw new common_1.NotImplementedException(`Merchant auth-service not implemented. Add code here if it needed for other services (except gg-wallets) for default auth`);
|
|
16
16
|
}
|
|
17
17
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gg-merchant-auth.service.js","sourceRoot":"","sources":["../../../../../../libs/gg-core/src/gg-auth/services/gg-merchant-auth.service.ts"],"names":[],"mappings":";;;;;AAAA,2CAAqF;AACrF,sEAAkG;AAI3F,IAAM,qBAAqB,6BAA3B,MAAM,qBAAqB;IAGhC,YAAyD,OAAuC;QAAtB,YAAO,GAAP,OAAO,CAAe;QAF/E,WAAM,GAAG,IAAI,eAAM,CAAC,uBAAqB,CAAC,IAAI,CAAC,CAAC;IAEkC,CAAC;IAE7F,KAAK,CAAC,SAAS;QACpB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,yBAAyB,iCAAQ,CAAC,QAAQ,
|
|
1
|
+
{"version":3,"file":"gg-merchant-auth.service.js","sourceRoot":"","sources":["../../../../../../libs/gg-core/src/gg-auth/services/gg-merchant-auth.service.ts"],"names":[],"mappings":";;;;;AAAA,2CAAqF;AACrF,sEAAkG;AAI3F,IAAM,qBAAqB,6BAA3B,MAAM,qBAAqB;IAGhC,YAAyD,OAAuC;QAAtB,YAAO,GAAP,OAAO,CAAe;QAF/E,WAAM,GAAG,IAAI,eAAM,CAAC,uBAAqB,CAAC,IAAI,CAAC,CAAC;IAEkC,CAAC;IAE7F,KAAK,CAAC,SAAS;QACpB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,yBAAyB,EAAE,QAAQ,EAAE,iCAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC;QAEjF,MAAM,IAAI,gCAAuB,CAC/B,2HAA2H,CAC5H,CAAC;IACJ,CAAC;CACF,CAAA;AAZY,sDAAqB;gCAArB,qBAAqB;IADjC,IAAA,mBAAU,GAAE;IAIS,mBAAA,IAAA,eAAM,EAAC,qDAA4B,CAAC,CAAA;;GAH7C,qBAAqB,CAYjC"}
|
|
@@ -9,6 +9,7 @@ const cache_manager_ioredis_yet_1 = require("cache-manager-ioredis-yet");
|
|
|
9
9
|
const luxon_1 = require("luxon");
|
|
10
10
|
const gg_redis_1 = require("../gg-redis");
|
|
11
11
|
const gg_cache_service_1 = require("./gg-cache.service");
|
|
12
|
+
const logger = new common_1.Logger('GgCacheModule');
|
|
12
13
|
let GgCacheModule = GgCacheModule_1 = class GgCacheModule {
|
|
13
14
|
static forRoot() {
|
|
14
15
|
return {
|
|
@@ -28,7 +29,7 @@ let GgCacheModule = GgCacheModule_1 = class GgCacheModule {
|
|
|
28
29
|
maxRetriesPerRequest: 2,
|
|
29
30
|
connectTimeout: 5000,
|
|
30
31
|
});
|
|
31
|
-
client.on('error', (err) =>
|
|
32
|
+
client.on('error', (err) => logger.error({ msg: 'Redis cache client error', err }));
|
|
32
33
|
return {
|
|
33
34
|
store: (0, cache_manager_ioredis_yet_1.redisInsStore)(client, {
|
|
34
35
|
ttl: luxon_1.Duration.fromObject({ minute: 1 }).as('milliseconds'),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gg-cache.module.js","sourceRoot":"","sources":["../../../../../libs/gg-core/src/gg-cache/gg-cache.module.ts"],"names":[],"mappings":";;;;;AAAA,yDAAoD;AACpD,
|
|
1
|
+
{"version":3,"file":"gg-cache.module.js","sourceRoot":"","sources":["../../../../../libs/gg-core/src/gg-cache/gg-cache.module.ts"],"names":[],"mappings":";;;;;AAAA,yDAAoD;AACpD,2CAA+D;AAE/D,yEAA0D;AAC1D,iCAAiC;AACjC,0CAA6D;AAC7D,yDAAoD;AAEpD,MAAM,MAAM,GAAG,IAAI,eAAM,CAAC,eAAe,CAAC,CAAC;AAGpC,IAAM,aAAa,qBAAnB,MAAM,aAAa;IACjB,MAAM,CAAC,OAAO;QACnB,OAAO;YACL,MAAM,EAAE,eAAa;YACrB,MAAM,EAAE,IAAI;YACZ,SAAS,EAAE,CAAC,iCAAc,CAAC;YAC3B,OAAO,EAAE,CAAC,iCAAc,CAAC;YACzB,OAAO,EAAE;gBACP,2BAAW,CAAC,aAAa,CAAC;oBACxB,MAAM,EAAE,CAAC,sBAAW,CAAC,GAAG,CAAC;oBACzB,QAAQ,EAAE,IAAI;oBACd,UAAU,EAAE,CAAC,SAAyC,EAAE,EAAE;wBACxD,MAAM,MAAM,GAAG,IAAA,4BAAiB,EAAC,SAAS,EAAE;4BAC1C,SAAS,EAAE,CAAC;4BACZ,kBAAkB,EAAE,KAAK;4BACzB,cAAc,EAAE,IAAI;4BACpB,oBAAoB,EAAE,CAAC;4BACvB,cAAc,EAAE,IAAI;yBACrB,CAAC,CAAC;wBACH,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,GAAG,EAAE,0BAA0B,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC;wBACpF,OAAO;4BACL,KAAK,EAAE,IAAA,yCAAa,EAAC,MAAM,EAAE;gCAC3B,GAAG,EAAE,gBAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,cAAc,CAAC;6BAC3D,CAAC;yBACH,CAAC;oBACJ,CAAC;iBACF,CAAC;aACH;SACF,CAAC;IACJ,CAAC;CACF,CAAA;AA9BY,sCAAa;wBAAb,aAAa;IADzB,IAAA,eAAM,EAAC,EAAE,CAAC;GACE,aAAa,CA8BzB"}
|
|
@@ -20,43 +20,36 @@ let GgCacheService = GgCacheService_1 = class GgCacheService {
|
|
|
20
20
|
}
|
|
21
21
|
async get(key, namespaced = true) {
|
|
22
22
|
key = this.getPrefix(key, namespaced);
|
|
23
|
-
this.logger.debug({ message: `Attempt to get value`, key });
|
|
24
23
|
try {
|
|
25
24
|
const value = await this.cacheManager.get(key);
|
|
26
|
-
if (value)
|
|
27
|
-
this.logger.debug({ message: 'Cache hit', key });
|
|
28
|
-
if (!value)
|
|
29
|
-
this.logger.debug({ message: 'Cache miss', key });
|
|
30
25
|
return value;
|
|
31
26
|
}
|
|
32
27
|
catch (err) {
|
|
33
|
-
this.logger.warn({
|
|
28
|
+
this.logger.warn({ msg: 'Cache get failed, treating as miss', key: this.safeKey(key), err: err });
|
|
34
29
|
return undefined;
|
|
35
30
|
}
|
|
36
31
|
}
|
|
37
32
|
async set(key, value, options) {
|
|
38
33
|
options = { ...defaultCacheOptions, ...options };
|
|
39
34
|
key = this.getPrefix(key, options.namespaced);
|
|
40
|
-
this.logger.debug({ message: `Set cache value`, key });
|
|
41
35
|
try {
|
|
42
36
|
await this.cacheManager.set(key, value, options.ttl.as('milliseconds'));
|
|
43
37
|
}
|
|
44
38
|
catch (err) {
|
|
45
|
-
this.logger.warn({
|
|
39
|
+
this.logger.warn({ msg: 'Cache set failed, skipping', key: this.safeKey(key), err: err });
|
|
46
40
|
}
|
|
47
41
|
}
|
|
48
42
|
async del(key, namespaced = true) {
|
|
49
43
|
key = this.getPrefix(key, namespaced);
|
|
50
|
-
this.logger.debug({ message: 'Cache value deleted', key });
|
|
51
44
|
try {
|
|
52
45
|
await this.cacheManager.del(key);
|
|
53
46
|
}
|
|
54
47
|
catch (err) {
|
|
55
|
-
this.logger.warn({
|
|
48
|
+
this.logger.warn({ msg: 'Cache del failed, skipping', key: this.safeKey(key), err: err });
|
|
56
49
|
}
|
|
57
50
|
}
|
|
58
51
|
reset() {
|
|
59
|
-
this.logger.warn('
|
|
52
|
+
this.logger.warn({ msg: 'All cache data has been deleted' });
|
|
60
53
|
return this.cacheManager.reset();
|
|
61
54
|
}
|
|
62
55
|
getPrefix(key, namespaced) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gg-cache.service.js","sourceRoot":"","sources":["../../../../../libs/gg-core/src/gg-cache/gg-cache.service.ts"],"names":[],"mappings":";;;;;AAAA,mCAAoC;AACpC,yDAAsD;AACtD,2CAA4D;AAG5D,iCAAiC;AACjC,4CAAyC;AAOzC,MAAM,mBAAmB,GAAiB,EAAE,UAAU,EAAE,IAAI,EAAE,GAAG,EAAE,gBAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC;AAEzG;;GAEG;AAEI,IAAM,cAAc,sBAApB,MAAM,cAAc;IAGzB,YACyB,OAAsD,EACtD,YAA2B;QADV,YAAO,GAAP,OAAO,CAA8B;QAC9C,iBAAY,GAAZ,YAAY,CAAO;QAJnC,WAAM,GAAG,IAAI,eAAM,CAAC,gBAAc,CAAC,IAAI,CAAC,CAAC;IAKvD,CAAC;IAEG,KAAK,CAAC,GAAG,CAAI,GAAW,EAAE,UAAU,GAAG,IAAI;QAChD,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;QAEtC,IAAI,CAAC
|
|
1
|
+
{"version":3,"file":"gg-cache.service.js","sourceRoot":"","sources":["../../../../../libs/gg-core/src/gg-cache/gg-cache.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,17 +11,22 @@ const validateConfig = async (configClass) => {
|
|
|
11
11
|
const validated = await (0, class_transformer_validator_1.transformAndValidate)(configClass, process.env, {
|
|
12
12
|
validator: { whitelist: true },
|
|
13
13
|
});
|
|
14
|
-
logger.log(
|
|
14
|
+
logger.log({ msg: 'Config validated successfully', config: configClass.name });
|
|
15
15
|
return validated;
|
|
16
16
|
}
|
|
17
17
|
catch (e) {
|
|
18
18
|
if (Array.isArray(e)) {
|
|
19
19
|
e.forEach((err) => {
|
|
20
|
-
logger.error(
|
|
20
|
+
logger.error({
|
|
21
|
+
msg: 'Config property failed validation',
|
|
22
|
+
config: configClass.name,
|
|
23
|
+
property: err.property,
|
|
24
|
+
constraints: Object.values(err.constraints ?? {}).join('; '),
|
|
25
|
+
});
|
|
21
26
|
});
|
|
22
27
|
}
|
|
23
28
|
else {
|
|
24
|
-
logger.error(
|
|
29
|
+
logger.error({ msg: 'Config failed validation', config: configClass.name, err: e });
|
|
25
30
|
}
|
|
26
31
|
throw new exceptions_1.RuntimeException(e);
|
|
27
32
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validate-config.js","sourceRoot":"","sources":["../../../../../libs/gg-core/src/gg-config/validate-config.ts"],"names":[],"mappings":";;;AAAA,2CAAyD;AACzD,2CAA4C;AAC5C,+DAAkE;AAClE,6EAA8E;AAE9E,MAAM,MAAM,GAAG,IAAI,eAAM,CAAC,iBAAiB,CAAC,CAAC;AAE7C,MAAM,cAAc,GAAG,KAAK,EAAoB,WAAyB,EAAE,EAAE;IAC3E,IAAI,CAAC;QACH,MAAM,SAAS,GAAG,MAAM,IAAA,kDAAoB,EAAC,WAAW,EAAE,OAAO,CAAC,GAAG,EAAE;YACrE,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE;SAC/B,CAAC,CAAC;QACH,MAAM,CAAC,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"validate-config.js","sourceRoot":"","sources":["../../../../../libs/gg-core/src/gg-config/validate-config.ts"],"names":[],"mappings":";;;AAAA,2CAAyD;AACzD,2CAA4C;AAC5C,+DAAkE;AAClE,6EAA8E;AAE9E,MAAM,MAAM,GAAG,IAAI,eAAM,CAAC,iBAAiB,CAAC,CAAC;AAE7C,MAAM,cAAc,GAAG,KAAK,EAAoB,WAAyB,EAAE,EAAE;IAC3E,IAAI,CAAC;QACH,MAAM,SAAS,GAAG,MAAM,IAAA,kDAAoB,EAAC,WAAW,EAAE,OAAO,CAAC,GAAG,EAAE;YACrE,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE;SAC/B,CAAC,CAAC;QACH,MAAM,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,+BAA+B,EAAE,MAAM,EAAE,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC;QAE/E,OAAO,SAAS,CAAC;IACnB,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;YACrB,CAAC,CAAC,OAAO,CAAC,CAAC,GAAoB,EAAE,EAAE;gBACjC,MAAM,CAAC,KAAK,CAAC;oBACX,GAAG,EAAE,mCAAmC;oBACxC,MAAM,EAAE,WAAW,CAAC,IAAI;oBACxB,QAAQ,EAAE,GAAG,CAAC,QAAQ;oBACtB,WAAW,EAAE,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;iBAC7D,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;QACL,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,KAAK,CAAC,EAAE,GAAG,EAAE,0BAA0B,EAAE,MAAM,EAAE,WAAW,CAAC,IAAI,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC;QACtF,CAAC;QAED,MAAM,IAAI,6BAAgB,CAAC,CAAC,CAAC,CAAC;IAChC,CAAC;AACH,CAAC,CAAC;AAEK,MAAM,cAAc,GAAG,CAAmB,WAAyB,EAAE,EAAE,CAC5E,IAAA,mBAAU,EAAC,WAAW,CAAC,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC,MAAM,cAAc,CAAC,WAAW,CAAC,CAAC,CAAC;AADjE,QAAA,cAAc,kBACmD"}
|
|
@@ -11,7 +11,6 @@ export interface RedisCacheAdapterOptions {
|
|
|
11
11
|
*/
|
|
12
12
|
export declare class DbCacheAdapter implements CacheAdapter {
|
|
13
13
|
private readonly expiration;
|
|
14
|
-
private readonly logger;
|
|
15
14
|
private readonly keyPrefix;
|
|
16
15
|
private readonly cacheService;
|
|
17
16
|
constructor(options: RedisCacheAdapterOptions);
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.DbCacheAdapter = void 0;
|
|
4
|
-
const common_1 = require("@nestjs/common");
|
|
5
4
|
const luxon_1 = require("luxon");
|
|
6
5
|
/**
|
|
7
6
|
* Minimized and refactored cache adapter for mikroorm
|
|
@@ -12,12 +11,10 @@ const luxon_1 = require("luxon");
|
|
|
12
11
|
class DbCacheAdapter {
|
|
13
12
|
constructor(options) {
|
|
14
13
|
this.expiration = luxon_1.Duration.fromObject({ minute: 1 });
|
|
15
|
-
this.logger = new common_1.Logger(DbCacheAdapter.name);
|
|
16
14
|
this.keyPrefix = 'mikroorm';
|
|
17
15
|
this.getKey = (name) => `${this.keyPrefix}:${name}`;
|
|
18
16
|
if (options)
|
|
19
17
|
this.cacheService = options.client;
|
|
20
|
-
this.logger.debug(`The DB cache adapter has been created! | Cache expiration: ${this.expiration.as('millisecond')}ms`);
|
|
21
18
|
}
|
|
22
19
|
async get(key) {
|
|
23
20
|
const completeKey = this.getKey(key);
|
|
@@ -38,7 +35,6 @@ class DbCacheAdapter {
|
|
|
38
35
|
return this.cacheService.del(completeKey);
|
|
39
36
|
}
|
|
40
37
|
async clear() {
|
|
41
|
-
this.logger.debug('Clearing cache by mikroorm...');
|
|
42
38
|
return this.cacheService.reset();
|
|
43
39
|
}
|
|
44
40
|
async close() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"database.adapter.js","sourceRoot":"","sources":["../../../../../libs/gg-core/src/gg-database/database.adapter.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"database.adapter.js","sourceRoot":"","sources":["../../../../../libs/gg-core/src/gg-database/database.adapter.ts"],"names":[],"mappings":";;;AACA,iCAAiC;AAQjC;;;;;GAKG;AACH,MAAa,cAAc;IAKzB,YAAmB,OAAiC;QAJnC,eAAU,GAAG,gBAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC;QAChD,cAAS,GAAG,UAAU,CAAC;QA0ChC,WAAM,GAAG,CAAC,IAAY,EAAE,EAAE,CAAC,GAAG,IAAI,CAAC,SAAS,IAAI,IAAI,EAAE,CAAC;QAtC7D,IAAI,OAAO;YAAE,IAAI,CAAC,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC;IAClD,CAAC;IAEM,KAAK,CAAC,GAAG,CAAc,GAAW;QACvC,MAAM,WAAW,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAErC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QAEtD,IAAI,CAAC,IAAI;YAAE,OAAO,SAAS,CAAC;QAE5B,OAAO,IAAS,CAAC;IACnB,CAAC;IAEM,KAAK,CAAC,GAAG,CAAC,GAAW,EAAE,IAAa,EAAE,OAAe,EAAE,UAAmB;QAC/E,MAAM,WAAW,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAErC,IAAI,UAAU,EAAE,CAAC;YACf,OAAO,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,WAAW,EAAE,IAAI,EAAE,EAAE,GAAG,EAAE,gBAAQ,CAAC,UAAU,CAAC,EAAE,WAAW,EAAE,UAAU,EAAE,CAAC,EAAE,CAAC,CAAC;QAC7G,CAAC;QAED,OAAO,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,WAAW,EAAE,IAAI,EAAE,EAAE,GAAG,EAAE,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC;IAC5E,CAAC;IAEM,MAAM,CAAC,IAAY;QACxB,MAAM,WAAW,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAEtC,OAAO,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IAC5C,CAAC;IAEM,KAAK,CAAC,KAAK;QAChB,OAAO,IAAI,CAAC,YAAY,CAAC,KAAK,EAAE,CAAC;IACnC,CAAC;IAEM,KAAK,CAAC,KAAK;QAChB,oDAAoD;QACpD,OAAO;IACT,CAAC;CAGF;AA7CD,wCA6CC"}
|
|
@@ -33,7 +33,7 @@ let DatabaseConnector = DatabaseConnector_1 = class DatabaseConnector {
|
|
|
33
33
|
*/
|
|
34
34
|
async onModuleDestroy() {
|
|
35
35
|
await this.orm.close();
|
|
36
|
-
this.logger.log('
|
|
36
|
+
this.logger.log({ msg: 'Database connection closed' });
|
|
37
37
|
}
|
|
38
38
|
/**
|
|
39
39
|
* Performs database migration using the Umzug library.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"database.connector.js","sourceRoot":"","sources":["../../../../../libs/gg-core/src/gg-database/database.connector.ts"],"names":[],"mappings":";;;;;AAAA,0CAA2C;AAE3C,2CAAmF;AACnF,+DAAkE;AAG3D,IAAM,iBAAiB,yBAAvB,MAAM,iBAAiB;IAG5B,YAAoC,GAAa;QAAb,QAAG,GAAH,GAAG,CAAU;QAFhC,WAAM,GAAG,IAAI,eAAM,CAAC,mBAAiB,CAAC,IAAI,CAAC,CAAC;IAET,CAAC;IAErD;;;;;OAKG;IACI,KAAK,CAAC,YAAY;QACvB,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC;QAEjD,IAAI,CAAC,WAAW;YAAE,MAAM,IAAI,6BAAgB,CAAC,+BAA+B,CAAC,CAAC;QAE9E,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;QACzC,MAAM,IAAI,GAAG,gBAAgB,OAAO,CAAC,IAAI,UAAU,OAAO,CAAC,IAAI,IAAI,OAAO,CAAC,IAAI,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;QAEpG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,8CAA8C,EAAE,IAAI,EAAE,CAAC,CAAC;QAE/E,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;IACvB,CAAC;IAED;;;;OAIG;IACI,KAAK,CAAC,eAAe;QAC1B,MAAM,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC;QAEvB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"database.connector.js","sourceRoot":"","sources":["../../../../../libs/gg-core/src/gg-database/database.connector.ts"],"names":[],"mappings":";;;;;AAAA,0CAA2C;AAE3C,2CAAmF;AACnF,+DAAkE;AAG3D,IAAM,iBAAiB,yBAAvB,MAAM,iBAAiB;IAG5B,YAAoC,GAAa;QAAb,QAAG,GAAH,GAAG,CAAU;QAFhC,WAAM,GAAG,IAAI,eAAM,CAAC,mBAAiB,CAAC,IAAI,CAAC,CAAC;IAET,CAAC;IAErD;;;;;OAKG;IACI,KAAK,CAAC,YAAY;QACvB,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC;QAEjD,IAAI,CAAC,WAAW;YAAE,MAAM,IAAI,6BAAgB,CAAC,+BAA+B,CAAC,CAAC;QAE9E,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;QACzC,MAAM,IAAI,GAAG,gBAAgB,OAAO,CAAC,IAAI,UAAU,OAAO,CAAC,IAAI,IAAI,OAAO,CAAC,IAAI,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;QAEpG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,8CAA8C,EAAE,IAAI,EAAE,CAAC,CAAC;QAE/E,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;IACvB,CAAC;IAED;;;;OAIG;IACI,KAAK,CAAC,eAAe;QAC1B,MAAM,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC;QAEvB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,4BAA4B,EAAE,CAAC,CAAC;IACzD,CAAC;IAED;;;;;OAKG;IACK,KAAK,CAAC,OAAO;QACnB,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC;QAExC,OAAO,QAAQ,CAAC,EAAE,EAAE,CAAC;IACvB,CAAC;CACF,CAAA;AA9CY,8CAAiB;4BAAjB,iBAAiB;IAD7B,IAAA,mBAAU,GAAE;6CAI8B,eAAQ;GAHtC,iBAAiB,CA8C7B"}
|
|
@@ -25,7 +25,6 @@ let GgExceptionService = GgExceptionService_1 = class GgExceptionService {
|
|
|
25
25
|
let statusCode;
|
|
26
26
|
let domainCode;
|
|
27
27
|
if ((0, lodash_1.isPlainObject)(exception)) {
|
|
28
|
-
this.logger.debug({ msg: 'Extracting RPC error...' });
|
|
29
28
|
body = exception.error;
|
|
30
29
|
statusCode = (0, lodash_1.get)(exception, 'error.statusCode', common_1.HttpStatus.INTERNAL_SERVER_ERROR);
|
|
31
30
|
}
|
|
@@ -57,13 +56,13 @@ let GgExceptionService = GgExceptionService_1 = class GgExceptionService {
|
|
|
57
56
|
statusCode = common_1.HttpStatus.INTERNAL_SERVER_ERROR;
|
|
58
57
|
domainCode = `${this.errorsOptions.domain}-${exception_domain_codes_1.ExceptionDomainCodes.General}`;
|
|
59
58
|
body = this.getBodyForBaseError(domainCode, request, statusCode, exception);
|
|
60
|
-
this.logger.error(exception, exception
|
|
59
|
+
this.logger.error({ msg: exception.message, err: exception });
|
|
61
60
|
}
|
|
62
61
|
if ((0, lodash_1.isString)(exception)) {
|
|
63
62
|
statusCode = common_1.HttpStatus.FAILED_DEPENDENCY;
|
|
64
63
|
domainCode = `${this.errorsOptions.domain}-${exception_domain_codes_1.ExceptionDomainCodes.General}`;
|
|
65
64
|
body = this.getBodyForBaseError(domainCode, request, statusCode, exception);
|
|
66
|
-
this.logger.error(exception
|
|
65
|
+
this.logger.error({ msg: exception });
|
|
67
66
|
}
|
|
68
67
|
return response.status(statusCode).json(body);
|
|
69
68
|
}
|
|
@@ -92,7 +91,7 @@ let GgExceptionService = GgExceptionService_1 = class GgExceptionService {
|
|
|
92
91
|
const domainCode = `${this.errorsOptions.domain}-${this.getRPCDomainCode(exception)}`;
|
|
93
92
|
const requestId = (0, lodash_1.get)(rpcArgumentsHost.getContext().getMessage(), 'properties.headers.request-id', (0, uuid_1.v4)());
|
|
94
93
|
const rpcMethod = (0, lodash_1.get)(rpcArgumentsHost.getContext(), 'args[2]', 'RPC');
|
|
95
|
-
this.logger.error(
|
|
94
|
+
this.logger.error({ msg: 'RPC Exception caught', err: exception });
|
|
96
95
|
const body = this.getBodyForRPCError(domainCode, statusCode, requestId, rpcMethod, exception);
|
|
97
96
|
return new microservices_1.RpcException(body);
|
|
98
97
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gg-exception.service.js","sourceRoot":"","sources":["../../../../../libs/gg-core/src/gg-errors/gg-exception.service.ts"],"names":[],"mappings":";;;;;AAAA,2CAUwB;AAGxB,yDAAqD;AAGrD,mCAA2D;AAC3D,+BAA0B;AAE1B,0CAAkD;AAClD,wCAA4C;AAC5C,qEAAgE;AAChE,4DAAwD;AACxD,yEAA6F;AAKtF,IAAM,kBAAkB,0BAAxB,MAAM,kBAAkB;IAG7B,YAC0C,aAA+C,EACtE,IAAoB;QADoB,kBAAa,GAAb,aAAa,CAAiB;QACtE,SAAI,GAAJ,IAAI,CAAgB;QAJtB,WAAM,GAAG,IAAI,eAAM,CAAC,oBAAkB,CAAC,IAAI,CAAC,CAAC;IAK3D,CAAC;IAEG,UAAU,CAAC,iBAAoC,EAAE,SAAS;QAC/D,MAAM,QAAQ,GAAG,iBAAiB,CAAC,WAAW,EAAY,CAAC;QAC3D,MAAM,OAAO,GAAG,iBAAiB,CAAC,UAAU,EAAW,CAAC;QAExD,IAAI,IAA6B,CAAC;QAClC,IAAI,UAAsB,CAAC;QAC3B,IAAI,UAAkB,CAAC;QAEvB,IAAI,IAAA,sBAAa,EAAC,SAAS,CAAC,EAAE,CAAC;YAC7B,IAAI,
|
|
1
|
+
{"version":3,"file":"gg-exception.service.js","sourceRoot":"","sources":["../../../../../libs/gg-core/src/gg-errors/gg-exception.service.ts"],"names":[],"mappings":"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"}
|
package/src/gg-kernel/kernel.js
CHANGED
|
@@ -78,7 +78,11 @@ class Kernel {
|
|
|
78
78
|
* Start the server
|
|
79
79
|
*/
|
|
80
80
|
async runApi() {
|
|
81
|
-
await this.app.listen(this.appConf.port, () => this.logger.log(
|
|
81
|
+
await this.app.listen(this.appConf.port, () => this.logger.log({
|
|
82
|
+
msg: 'API server started',
|
|
83
|
+
name: this.appConf.name,
|
|
84
|
+
url: `http://127.0.0.1:${this.appConf.port}/${this.appConf.prefix}/api`,
|
|
85
|
+
}));
|
|
82
86
|
}
|
|
83
87
|
}
|
|
84
88
|
exports.Kernel = Kernel;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"kernel.js","sourceRoot":"","sources":["../../../../../libs/gg-core/src/gg-kernel/kernel.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"kernel.js","sourceRoot":"","sources":["../../../../../libs/gg-core/src/gg-kernel/kernel.ts"],"names":[],"mappings":";;;AAAA,2CAAwC;AAExC,uCAA2C;AAE3C,+DAAkF;AAClF,mCAAiC;AACjC,4CAAyC;AACzC,wFAAkF;AAClF,0CAA2E;AAC3E,2DAU6B;AAE7B,MAAa,MAAM;IAIjB,YACmB,GAA2B,EAC3B,OAAqC;QADrC,QAAG,GAAH,GAAG,CAAwB;QAC3B,YAAO,GAAP,OAAO,CAA8B;QAJvC,WAAM,GAAG,IAAI,eAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAK/C,CAAC;IAEJ;;OAEG;IACI,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,MAAe;QACtC,MAAM,GAAG,GAAG,MAAM,kBAAW,CAAC,MAAM,CAAyB,MAAM,EAAE,IAAI,iCAAc,EAAE,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;QAEhI,MAAM,MAAM,GAAG,GAAG,CAAC,GAAG,CAA+B,qBAAS,CAAC,GAAG,CAAC,CAAC;QAEpE,MAAM,IAAI,CAAC,wBAAwB,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;QAEjD,OAAO,IAAI,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IACjC,CAAC;IAQM,MAAM,CAAC,GAAG,CAAuC,QAAW;QACjE,MAAM,gBAAgB,GAAG,IAAA,gBAAO,EAAC,QAAQ,CAAC,CAAC;QAE3C,IAAI,gBAAgB;YAAE,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;QAC7E,IAAI,CAAC,gBAAgB;YAAE,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAE5D,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,MAAM,CAAC,uBAAuB;QACnC,OAAO,IAAI,CAAC,GAAG,CAAC;YACd,yCAAqB;YACrB,gDAA4B;YAC5B,6CAAyB;YACzB,+CAA2B;YAC3B,6CAAyB;YACzB,0CAAsB;YACtB,yCAAqB;SACtB,CAAC,CAAC;IACL,CAAC;IAED;;;OAGG;IACO,MAAM,CAAC,KAAK,CAAC,wBAAwB,CAAC,GAA2B,EAAE,OAAqC;QAChH,MAAM,SAAS,GAAG,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE;YACvD,MAAM,QAAQ,GAAG,IAAI,EAAE,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;YAEtC,MAAM,QAAQ,CAAC,sBAAsB,EAAE,CAAC;YACxC,MAAM,QAAQ,CAAC,QAAQ,EAAE,CAAC;YAC1B,MAAM,QAAQ,CAAC,qBAAqB,EAAE,CAAC;QACzC,CAAC,CAAC,CAAC;QAEH,MAAM,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAC/B,CAAC;IAEM,cAAc;QACnB,OAAO,IAAI,CAAC,GAAG,CAAC;IAClB,CAAC;IAEM,KAAK,CAAC,eAAe,CAAC,MAAwB;QACnD,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAA+B,oBAAS,CAAC,GAAG,CAAC,CAAC;QAEzE,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;YACvB,MAAM,eAAe,GAAG,IAAI,4BAAiB,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;YAC7D,IAAI,CAAC,GAAG,CAAC,mBAAmB,CAAsB,eAAe,CAAC,gBAAgB,EAAE,EAAE,EAAE,gBAAgB,EAAE,IAAI,EAAE,CAAC,CAAC;QACpH,CAAC,CAAC,CAAC;QAEH,MAAM,IAAI,CAAC,GAAG,CAAC,qBAAqB,EAAE,CAAC;QAEvC,MAAM,eAAe,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,oDAAuB,CAAC,CAAC;QAE9D,MAAM,aAAa,GAAG,IAAI,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC;QAElD,KAAK,MAAM,YAAY,IAAI,aAAa,EAAE,CAAC;YACzC,YAAY,CAAC,gBAAgB,CAAC,eAAe,CAAC,CAAC;QACjD,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,4BAA4B,EAAE,CAAC,CAAC;QAEvD,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;OAEG;IACI,KAAK,CAAC,MAAM;QACjB,MAAM,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,EAAE,CAC5C,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC;YACd,GAAG,EAAE,oBAAoB;YACzB,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI;YACvB,GAAG,EAAE,oBAAoB,IAAI,CAAC,OAAO,CAAC,IAAI,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,MAAM;SACxE,CAAC,CACH,CAAC;IACJ,CAAC;;AAvGH,wBAwGC;AAvGyB,uBAAgB,GAAwB,EAAE,AAA1B,CAA2B"}
|
|
@@ -12,10 +12,10 @@ class BaseServiceProvider {
|
|
|
12
12
|
this.logger = new common_1.Logger(this.constructor.name);
|
|
13
13
|
}
|
|
14
14
|
async beforeRegistrationHook() {
|
|
15
|
-
this.logger.log(
|
|
15
|
+
this.logger.log({ msg: 'Service provider initialization started', provider: this.constructor.name });
|
|
16
16
|
}
|
|
17
17
|
async afterRegistrationHook() {
|
|
18
|
-
this.logger.log(
|
|
18
|
+
this.logger.log({ msg: 'Service provider initialized', provider: this.constructor.name });
|
|
19
19
|
}
|
|
20
20
|
async register() {
|
|
21
21
|
throw new common_1.NotImplementedException(`Method "register()" not implemented for ${this.constructor.name}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base-service-provider.js","sourceRoot":"","sources":["../../../../../../libs/gg-core/src/gg-kernel/service-providers/base-service-provider.ts"],"names":[],"mappings":";;;AAAA,2CAAiE;AAOjE,MAAa,mBAAmB;IAG9B,YACqB,GAA2B,EAC3B,OAAqC;QADrC,QAAG,GAAH,GAAG,CAAwB;QAC3B,YAAO,GAAP,OAAO,CAA8B;QAExD,IAAI,CAAC,WAAW,EAAE,CAAC;IACrB,CAAC;IAEO,WAAW;QACjB,IAAI,CAAC,MAAM,GAAG,IAAI,eAAM,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;IAClD,CAAC;IAEM,KAAK,CAAC,sBAAsB;QACjC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"base-service-provider.js","sourceRoot":"","sources":["../../../../../../libs/gg-core/src/gg-kernel/service-providers/base-service-provider.ts"],"names":[],"mappings":";;;AAAA,2CAAiE;AAOjE,MAAa,mBAAmB;IAG9B,YACqB,GAA2B,EAC3B,OAAqC;QADrC,QAAG,GAAH,GAAG,CAAwB;QAC3B,YAAO,GAAP,OAAO,CAA8B;QAExD,IAAI,CAAC,WAAW,EAAE,CAAC;IACrB,CAAC;IAEO,WAAW;QACjB,IAAI,CAAC,MAAM,GAAG,IAAI,eAAM,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;IAClD,CAAC;IAEM,KAAK,CAAC,sBAAsB;QACjC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,yCAAyC,EAAE,QAAQ,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC;IACvG,CAAC;IAEM,KAAK,CAAC,qBAAqB;QAChC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,8BAA8B,EAAE,QAAQ,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC;IAC5F,CAAC;IAEM,KAAK,CAAC,QAAQ;QACnB,MAAM,IAAI,gCAAuB,CAAC,2CAA2C,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC;IACxG,CAAC;CACF;AAzBD,kDAyBC"}
|
|
@@ -24,7 +24,7 @@ class SwaggerServiceProvider extends base_service_provider_1.BaseServiceProvider
|
|
|
24
24
|
{ operationIdFactory: (cKey, mKey) => mKey, deepScanRoutes: true });
|
|
25
25
|
this.toYAML(document);
|
|
26
26
|
swagger_1.SwaggerModule.setup(this.path, this.app, document);
|
|
27
|
-
this.logger.log(
|
|
27
|
+
this.logger.log({ msg: 'Swagger is running', url: `http://127.0.0.1:${this.appConf.port}${this.path}` });
|
|
28
28
|
}
|
|
29
29
|
toYAML(document) {
|
|
30
30
|
const yamlString = yaml.stringify(document, {});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"swagger.service-provider.js","sourceRoot":"","sources":["../../../../../../libs/gg-core/src/gg-kernel/service-providers/swagger.service-provider.ts"],"names":[],"mappings":";;;AAEA,6CAAgF;AAChF,yBAAyB;AACzB,iDAAgD;AAChD,6BAA6B;AAC7B,6BAA6B;AAE7B,mEAA8D;AAE9D,MAAa,sBAAuB,SAAQ,2CAAmB;IAC7D,YACqB,GAA2B,EAC3B,OAAqC;QAExD,KAAK,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QAHD,QAAG,GAAH,GAAG,CAAwB;QAC3B,YAAO,GAAP,OAAO,CAA8B;QAKzC,SAAI,GAAG,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,OAAO,CAAC;IAFvD,CAAC;IAIM,KAAK,CAAC,QAAQ;QACnB,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,CAAC;YACjC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,6BAA6B,EAAE,CAAC,CAAC;YAExD,OAAO;QACT,CAAC;QAED,MAAM,QAAQ,GAAG,uBAAa,CAAC,cAAc,CAC3C,IAAI,CAAC,GAAG,EAER,IAAI,yBAAe,EAAE,CAAC,aAAa,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,KAAK,EAAE;QAE7G,uEAAuE;QACvE,EAAE,kBAAkB,EAAE,CAAC,IAAY,EAAE,IAAY,EAAE,EAAE,CAAC,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,CACnF,CAAC;QAEF,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QAEtB,uBAAa,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QAEnD,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"swagger.service-provider.js","sourceRoot":"","sources":["../../../../../../libs/gg-core/src/gg-kernel/service-providers/swagger.service-provider.ts"],"names":[],"mappings":";;;AAEA,6CAAgF;AAChF,yBAAyB;AACzB,iDAAgD;AAChD,6BAA6B;AAC7B,6BAA6B;AAE7B,mEAA8D;AAE9D,MAAa,sBAAuB,SAAQ,2CAAmB;IAC7D,YACqB,GAA2B,EAC3B,OAAqC;QAExD,KAAK,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QAHD,QAAG,GAAH,GAAG,CAAwB;QAC3B,YAAO,GAAP,OAAO,CAA8B;QAKzC,SAAI,GAAG,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,OAAO,CAAC;IAFvD,CAAC;IAIM,KAAK,CAAC,QAAQ;QACnB,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,CAAC;YACjC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,6BAA6B,EAAE,CAAC,CAAC;YAExD,OAAO;QACT,CAAC;QAED,MAAM,QAAQ,GAAG,uBAAa,CAAC,cAAc,CAC3C,IAAI,CAAC,GAAG,EAER,IAAI,yBAAe,EAAE,CAAC,aAAa,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,KAAK,EAAE;QAE7G,uEAAuE;QACvE,EAAE,kBAAkB,EAAE,CAAC,IAAY,EAAE,IAAY,EAAE,EAAE,CAAC,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,CACnF,CAAC;QAEF,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QAEtB,uBAAa,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QAEnD,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,oBAAoB,EAAE,GAAG,EAAE,oBAAoB,IAAI,CAAC,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IAC3G,CAAC;IAES,MAAM,CAAC,QAAuB;QACtC,MAAM,UAAU,GAAW,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;QAExD,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,IAAA,+BAAe,GAAE,EAAE,gBAAgB,CAAC,EAAE,UAAU,CAAC,CAAC;IAC/E,CAAC;CACF;AAtCD,wDAsCC"}
|
|
@@ -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,86 @@ const PINO_LEVEL_TO_GCP_SEVERITY = {
|
|
|
14
14
|
error: 'ERROR',
|
|
15
15
|
fatal: 'CRITICAL',
|
|
16
16
|
};
|
|
17
|
+
// Pino's numeric level for `error` (fatal is 60). Error Reporting should ingest real faults only —
|
|
18
|
+
// never the 4xx rejections that the exception filter routes to `warn` (level 40).
|
|
19
|
+
const PINO_ERROR_LEVEL = 50;
|
|
20
|
+
exports.REDACT_PATHS = [
|
|
21
|
+
// Request config. `data` is the request body — redacted because callers (e.g. the auth
|
|
22
|
+
// `/jwt/check` POST) put raw JWTs there; `*` over header values is casing-agnostic.
|
|
23
|
+
'err.config.headers.*',
|
|
24
|
+
'err.config.auth',
|
|
25
|
+
'err.config.data',
|
|
26
|
+
'err.request._header',
|
|
27
|
+
// Response mirror — defense-in-depth for HTTP wrappers that rebuild `response.config`/
|
|
28
|
+
// `response.request` as separate objects, breaking axios's aliasing onto the request config.
|
|
29
|
+
'err.response.config.headers.*',
|
|
30
|
+
'err.response.config.auth',
|
|
31
|
+
'err.response.config.data',
|
|
32
|
+
'err.response.request._header',
|
|
33
|
+
'err.response.headers["set-cookie"]',
|
|
34
|
+
];
|
|
35
|
+
/**
|
|
36
|
+
* Pino `mixin` that surfaces the fields GCP Error Reporting needs to detect and group an error.
|
|
37
|
+
*
|
|
38
|
+
* ER groups by the exception stack trace, which it reads from a top-level `stack_trace` field;
|
|
39
|
+
* pino's `err` serializer keeps the stack nested at `err.stack`, where ER's scanner does not look.
|
|
40
|
+
* `serviceContext` lets ER group occurrences per service + version. The `severity` mapped by the
|
|
41
|
+
* level formatter completes the picture (no `@type` needed once `stack_trace` is present).
|
|
42
|
+
*/
|
|
43
|
+
function buildErrorReportingMixin(service, version) {
|
|
44
|
+
return (mergeObject, level) => {
|
|
45
|
+
const err = mergeObject?.err;
|
|
46
|
+
if (level < PINO_ERROR_LEVEL || !(err instanceof Error) || !err.stack) {
|
|
47
|
+
return {};
|
|
48
|
+
}
|
|
49
|
+
return {
|
|
50
|
+
stack_trace: err.stack,
|
|
51
|
+
serviceContext: { service, version },
|
|
52
|
+
};
|
|
53
|
+
};
|
|
54
|
+
}
|
|
55
|
+
function buildLoggerOptions(appConf) {
|
|
56
|
+
const name = appConf.name;
|
|
57
|
+
const appVersion = appConf.appVersion;
|
|
58
|
+
const level = appConf.logLevel;
|
|
59
|
+
const autoLogging = false;
|
|
60
|
+
const isPrettyMode = appConf.logFormat === 'pretty';
|
|
61
|
+
const transport = isPrettyMode
|
|
62
|
+
? {
|
|
63
|
+
target: 'pino-pretty',
|
|
64
|
+
options: { singleLine: true, colorize: true, colorizeObjects: true, levelFirst: true },
|
|
65
|
+
}
|
|
66
|
+
: undefined;
|
|
67
|
+
// GCP Cloud Logging promotes a top-level `severity` string to the entry severity;
|
|
68
|
+
// without it every record shows as DEFAULT. Skip in pretty mode to avoid duplicating
|
|
69
|
+
// the level that pino-pretty already prints.
|
|
70
|
+
const formatters = isPrettyMode
|
|
71
|
+
? undefined
|
|
72
|
+
: {
|
|
73
|
+
level: (label, number) => ({
|
|
74
|
+
severity: PINO_LEVEL_TO_GCP_SEVERITY[label] ?? 'DEFAULT',
|
|
75
|
+
level: number,
|
|
76
|
+
}),
|
|
77
|
+
};
|
|
78
|
+
// Error Reporting plumbing is JSON-only — in pretty mode (local dev) it's noise, not for humans.
|
|
79
|
+
const mixin = isPrettyMode ? undefined : buildErrorReportingMixin(name, appVersion);
|
|
80
|
+
return {
|
|
81
|
+
exclude: ['/health', '/metrics'],
|
|
82
|
+
pinoHttp: {
|
|
83
|
+
name,
|
|
84
|
+
level,
|
|
85
|
+
transport,
|
|
86
|
+
autoLogging,
|
|
87
|
+
formatters,
|
|
88
|
+
mixin,
|
|
89
|
+
redact: exports.REDACT_PATHS,
|
|
90
|
+
serializers: {
|
|
91
|
+
req: (req) => ({ id: req.id, method: req.method, url: req.url }),
|
|
92
|
+
},
|
|
93
|
+
},
|
|
94
|
+
};
|
|
95
|
+
}
|
|
96
|
+
exports.buildLoggerOptions = buildLoggerOptions;
|
|
17
97
|
let GgLoggerModule = GgLoggerModule_1 = class GgLoggerModule {
|
|
18
98
|
static forRoot() {
|
|
19
99
|
return {
|
|
@@ -21,42 +101,7 @@ let GgLoggerModule = GgLoggerModule_1 = class GgLoggerModule {
|
|
|
21
101
|
imports: [
|
|
22
102
|
nestjs_pino_1.LoggerModule.forRootAsync({
|
|
23
103
|
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
|
-
},
|
|
104
|
+
useFactory: buildLoggerOptions,
|
|
60
105
|
}),
|
|
61
106
|
],
|
|
62
107
|
};
|
|
@@ -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":"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"}
|
|
@@ -98,7 +98,7 @@ class GgServerRmq extends server_rmq_1.ServerRMQ {
|
|
|
98
98
|
const message = context.getMessage();
|
|
99
99
|
const handler = this.getHandlerByPattern(pattern);
|
|
100
100
|
if (!handler) {
|
|
101
|
-
this.logger.warn(
|
|
101
|
+
this.logger.warn({ msg: 'No event handler for pattern; rejecting to DLQ', pattern });
|
|
102
102
|
this.safeNack(channel, message, false); // requeue: false → immediate dead-letter
|
|
103
103
|
return;
|
|
104
104
|
}
|
|
@@ -114,7 +114,7 @@ class GgServerRmq extends server_rmq_1.ServerRMQ {
|
|
|
114
114
|
catch (error) {
|
|
115
115
|
stopTimer({ status: 'error' });
|
|
116
116
|
const deliveryCount = message.properties?.headers?.['x-delivery-count'] ?? 0;
|
|
117
|
-
this.logger.error(
|
|
117
|
+
this.logger.error({ msg: 'Event handler error', pattern, deliveryCount, err: error });
|
|
118
118
|
this.safeNack(channel, message, true); // requeue: true → RMQ handles retry/DLQ
|
|
119
119
|
}
|
|
120
120
|
}
|
|
@@ -127,7 +127,7 @@ class GgServerRmq extends server_rmq_1.ServerRMQ {
|
|
|
127
127
|
async handleRpcMessage(message, channel, packet, properties, rmqContext) {
|
|
128
128
|
const handler = this.getHandlerByPattern(rmqContext.getPattern());
|
|
129
129
|
if (!handler) {
|
|
130
|
-
this.logger.warn(
|
|
130
|
+
this.logger.warn({ msg: 'No message handler for pattern', pattern: rmqContext.getPattern() });
|
|
131
131
|
const noHandlerPacket = {
|
|
132
132
|
id: packet.id,
|
|
133
133
|
err: 'There is no matching message handler defined in the remote service.',
|
|
@@ -137,7 +137,7 @@ class GgServerRmq extends server_rmq_1.ServerRMQ {
|
|
|
137
137
|
this.sendMessage(noHandlerPacket, properties.replyTo, properties.correlationId);
|
|
138
138
|
}
|
|
139
139
|
catch (err) {
|
|
140
|
-
this.logger.error(
|
|
140
|
+
this.logger.error({ msg: 'Failed to send RPC no-handler response', pattern: rmqContext.getPattern(), err });
|
|
141
141
|
}
|
|
142
142
|
this.safeAck(channel, message);
|
|
143
143
|
return;
|
|
@@ -170,12 +170,12 @@ class GgServerRmq extends server_rmq_1.ServerRMQ {
|
|
|
170
170
|
this.sendMessage({ id: packet.id, isDisposed: true }, properties.replyTo, properties.correlationId);
|
|
171
171
|
}
|
|
172
172
|
catch (sendError) {
|
|
173
|
-
this.logger.error(
|
|
173
|
+
this.logger.error({ msg: 'Failed to send RPC response', pattern: rmqContext.getPattern(), err: sendError });
|
|
174
174
|
}
|
|
175
175
|
this.safeAck(channel, message);
|
|
176
176
|
}
|
|
177
177
|
catch (error) {
|
|
178
|
-
this.logger.error(
|
|
178
|
+
this.logger.error({ msg: 'RPC handler error', pattern: rmqContext.getPattern(), err: error });
|
|
179
179
|
const errorPacket = {
|
|
180
180
|
id: packet.id,
|
|
181
181
|
status: 'error',
|
|
@@ -188,7 +188,7 @@ class GgServerRmq extends server_rmq_1.ServerRMQ {
|
|
|
188
188
|
this.sendMessage(errorPacket, properties.replyTo, properties.correlationId);
|
|
189
189
|
}
|
|
190
190
|
catch (sendError) {
|
|
191
|
-
this.logger.error(
|
|
191
|
+
this.logger.error({ msg: 'Failed to send RPC error response', pattern: rmqContext.getPattern(), err: sendError });
|
|
192
192
|
}
|
|
193
193
|
this.safeAck(channel, message);
|
|
194
194
|
}
|
|
@@ -205,7 +205,7 @@ class GgServerRmq extends server_rmq_1.ServerRMQ {
|
|
|
205
205
|
channel.ack(message);
|
|
206
206
|
}
|
|
207
207
|
catch (err) {
|
|
208
|
-
this.logger.error(
|
|
208
|
+
this.logger.error({ msg: 'Failed to ack; message will be requeued on channel close', err });
|
|
209
209
|
}
|
|
210
210
|
}
|
|
211
211
|
safeNack(channel, message, requeue) {
|
|
@@ -213,7 +213,7 @@ class GgServerRmq extends server_rmq_1.ServerRMQ {
|
|
|
213
213
|
channel.nack(message, false, requeue);
|
|
214
214
|
}
|
|
215
215
|
catch (err) {
|
|
216
|
-
this.logger.error(
|
|
216
|
+
this.logger.error({ msg: 'Failed to nack; message will be requeued on channel close', err });
|
|
217
217
|
}
|
|
218
218
|
}
|
|
219
219
|
/** Duplicated from parent (private in ServerRMQ, can't be inherited) */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gg-server-rmq.js","sourceRoot":"","sources":["../../../../../libs/gg-core/src/gg-micro/gg-server-rmq.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"gg-server-rmq.js","sourceRoot":"","sources":["../../../../../libs/gg-core/src/gg-micro/gg-server-rmq.ts"],"names":[],"mappings":"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"}
|
|
@@ -43,10 +43,9 @@ class MicroClient {
|
|
|
43
43
|
.send(pattern, this.toRmqRecord(command, options.priority, options.customHeaders))
|
|
44
44
|
.pipe((0, rxjs_1.tap)(() => {
|
|
45
45
|
this.recordRpcSend(pattern, 'success');
|
|
46
|
-
this.logger.debug({ msg: 'RMQ command response received', pattern });
|
|
47
46
|
}), (0, rxjs_1.timeout)(options.timeout.as('milliseconds')), (0, rxjs_1.catchError)((e) => {
|
|
48
47
|
this.recordRpcSend(pattern, 'error');
|
|
49
|
-
this.logger.error({ msg: 'RMQ command error', pattern,
|
|
48
|
+
this.logger.error({ msg: 'RMQ command error', pattern, err: e });
|
|
50
49
|
return (0, rxjs_1.throwError)(() => e);
|
|
51
50
|
}));
|
|
52
51
|
});
|
|
@@ -74,8 +73,8 @@ class MicroClient {
|
|
|
74
73
|
emit(event, options) {
|
|
75
74
|
options = this.mergeWithDefaultOptions(options);
|
|
76
75
|
const pattern = event.constructor.pattern;
|
|
77
|
-
return this.clientProxy.emit(pattern, event.data).pipe((0, rxjs_1.
|
|
78
|
-
this.logger.error({ msg: 'RMQ event error', pattern,
|
|
76
|
+
return this.clientProxy.emit(pattern, event.data).pipe((0, rxjs_1.timeout)(options.timeout.as('milliseconds')), (0, rxjs_1.catchError)((e) => {
|
|
77
|
+
this.logger.error({ msg: 'RMQ event error', pattern, err: e });
|
|
79
78
|
return (0, rxjs_1.throwError)(() => e);
|
|
80
79
|
}));
|
|
81
80
|
}
|
|
@@ -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;
|
|
1
|
+
{"version":3,"file":"micro.client.js","sourceRoot":"","sources":["../../../../../libs/gg-core/src/gg-micro/micro.client.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,6 +7,7 @@ const common_1 = require("@nestjs/common");
|
|
|
7
7
|
const gg_redis_1 = require("../gg-redis");
|
|
8
8
|
const redlock_options_1 = require("./redlock.options");
|
|
9
9
|
const redlock_service_1 = require("./redlock.service");
|
|
10
|
+
const logger = new common_1.Logger('RedlockModule');
|
|
10
11
|
let RedlockModule = RedlockModule_1 = class RedlockModule {
|
|
11
12
|
static register() {
|
|
12
13
|
return {
|
|
@@ -28,7 +29,7 @@ let RedlockModule = RedlockModule_1 = class RedlockModule {
|
|
|
28
29
|
retryStrategy: (times) => Math.min(times * 50, 1000),
|
|
29
30
|
reconnectOnError: (err) => err.message.includes('READONLY') || err.message.includes('ECONNRESET'),
|
|
30
31
|
});
|
|
31
|
-
client.on('error', (err) =>
|
|
32
|
+
client.on('error', (err) => logger.error({ msg: 'Redis lock client error', err }));
|
|
32
33
|
return client;
|
|
33
34
|
},
|
|
34
35
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"redlock.module.js","sourceRoot":"","sources":["../../../../../libs/gg-core/src/gg-redlock/redlock.module.ts"],"names":[],"mappings":";;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"redlock.module.js","sourceRoot":"","sources":["../../../../../libs/gg-core/src/gg-redlock/redlock.module.ts"],"names":[],"mappings":";;;;;AAAA,2CAA+D;AAE/D,0CAA6D;AAC7D,uDAAsD;AACtD,uDAAmD;AAEnD,MAAM,MAAM,GAAG,IAAI,eAAM,CAAC,eAAe,CAAC,CAAC;AAGpC,IAAM,aAAa,qBAAnB,MAAM,aAAa;IACjB,MAAM,CAAC,QAAQ;QACpB,OAAO;YACL,MAAM,EAAE,eAAa;YACrB,SAAS,EAAE;gBACT;oBACE,OAAO,EAAE,mCAAiB;oBAC1B,MAAM,EAAE,CAAC,sBAAW,CAAC,GAAG,CAAC;oBACzB,UAAU,EAAE,CAAC,IAAoC,EAAE,EAAE;wBACnD,MAAM,MAAM,GAAG,IAAA,4BAAiB,EAAC,IAAI,EAAE;4BACrC,kBAAkB,EAAE,KAAK;4BACzB,gBAAgB,EAAE,KAAK;4BACvB,oBAAoB,EAAE,KAAK;4BAC3B,6BAA6B,EAAE,IAAI;4BACnC,cAAc,EAAE,IAAI;4BACpB,aAAa,EAAE,KAAK;4BACpB,cAAc,EAAE,IAAI;4BACpB,SAAS,EAAE,CAAC;4BACZ,aAAa,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,GAAG,EAAE,EAAE,IAAI,CAAC;4BACpD,gBAAgB,EAAE,CAAC,GAAG,EAAE,EAAE,CACxB,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC;yBACzE,CAAC,CAAC;wBACH,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,GAAG,EAAE,yBAAyB,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC;wBACnF,OAAO,MAAM,CAAC;oBAChB,CAAC;iBACF;gBACD,gCAAc;aACf;YACD,OAAO,EAAE,CAAC,gCAAc,CAAC;SAC1B,CAAC;IACJ,CAAC;CACF,CAAA;AA/BY,sCAAa;wBAAb,aAAa;IADzB,IAAA,eAAM,EAAC,EAAE,CAAC;GACE,aAAa,CA+BzB"}
|