@rsdk/core 3.6.0-next.0 → 3.6.0-next.4
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/CHANGELOG.md +10 -0
- package/dist/config/metadata/decorators/config-section.decorator.js +4 -2
- package/dist/config/metadata/decorators/config-section.decorator.js.map +1 -1
- package/dist/health/health.service.js +1 -8
- package/dist/health/health.service.js.map +1 -1
- package/package.json +2 -2
- package/src/config/metadata/decorators/config-section.decorator.ts +10 -7
- package/src/health/health.service.ts +1 -3
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,16 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
## [3.6.0-next.4](https://github.com/R-Vision/rsdk/compare/v3.6.0-next.3...v3.6.0-next.4) (2023-10-19)
|
|
7
|
+
|
|
8
|
+
### Bug Fixes
|
|
9
|
+
|
|
10
|
+
* correctly work with prefix ([b317186](https://github.com/R-Vision/rsdk/commit/b3171865223793335c10477b7c697a3bb48de997))
|
|
11
|
+
|
|
12
|
+
## [3.6.0-next.2](https://github.com/R-Vision/rsdk/compare/v3.6.0-next.1...v3.6.0-next.2) (2023-10-10)
|
|
13
|
+
|
|
14
|
+
**Note:** Version bump only for package @rsdk/core
|
|
15
|
+
|
|
6
16
|
## [3.6.0-next.0](https://github.com/R-Vision/rsdk/compare/v3.5.0...v3.6.0-next.0) (2023-10-06)
|
|
7
17
|
|
|
8
18
|
### Features
|
|
@@ -30,10 +30,12 @@ function getComputedMetadata(sectionMetadata, options) {
|
|
|
30
30
|
const ConfigSection = (options) => function (target) {
|
|
31
31
|
const metadata = (Reflect.getMetadata(property_decorator_1.CONFIG_METADATA_KEY, target) ??
|
|
32
32
|
{});
|
|
33
|
-
|
|
33
|
+
const computedMetadata = getComputedMetadata({
|
|
34
34
|
...metadata,
|
|
35
35
|
...options,
|
|
36
|
-
}, options)
|
|
36
|
+
}, options);
|
|
37
|
+
Reflect.defineMetadata(property_decorator_1.CONFIG_METADATA_KEY, computedMetadata, target);
|
|
38
|
+
config_metadata_registry_1.ConfigMetadataRegistry.registerSection(target, computedMetadata);
|
|
37
39
|
};
|
|
38
40
|
exports.ConfigSection = ConfigSection;
|
|
39
41
|
//# sourceMappingURL=config-section.decorator.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config-section.decorator.js","sourceRoot":"","sources":["../../../../src/config/metadata/decorators/config-section.decorator.ts"],"names":[],"mappings":";;;AAEA,yCAAoC;AAGpC,0EAAqE;AAErE,6DAA2D;AAwB3D,SAAS,mBAAmB,CAC1B,eAAgC,EAChC,OAA8B;IAE9B,IAAI,OAAO,EAAE,MAAM,EAAE;QACnB,MAAM,UAAU,GAAG,MAAM,CAAC,WAAW,CACnC,MAAM,CAAC,OAAO,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,EAAE,QAAQ,CAAC,EAAE,EAAE;YACtE,OAAO;gBACL,QAAQ;gBACR;oBACE,GAAG,QAAQ;oBACX,GAAG,EAAE,aAAI,CAAC,YAAY,CAAC,GAAG,OAAO,CAAC,MAAM,IAAI,QAAQ,CAAC,GAAG,EAAE,CAAC;iBAC5D;aACF,CAAC;QACJ,CAAC,CAAC,CACH,CAAC;QAEF,OAAO;YACL,GAAG,eAAe;YAClB,UAAU;SACX,CAAC;KACH;IACD,OAAO,eAAe,CAAC;AACzB,CAAC;AAED;;;;GAIG;AACI,MAAM,aAAa,GAAG,CAAC,OAA8B,EAAkB,EAAE,CAC9E,UAAU,MAAgB;IACxB,MAAM,QAAQ,GAAG,CAAC,OAAO,CAAC,WAAW,CAAC,wCAAmB,EAAE,MAAM,CAAC;QAChE,EAAE,CAAoB,CAAC;IAEzB,
|
|
1
|
+
{"version":3,"file":"config-section.decorator.js","sourceRoot":"","sources":["../../../../src/config/metadata/decorators/config-section.decorator.ts"],"names":[],"mappings":";;;AAEA,yCAAoC;AAGpC,0EAAqE;AAErE,6DAA2D;AAwB3D,SAAS,mBAAmB,CAC1B,eAAgC,EAChC,OAA8B;IAE9B,IAAI,OAAO,EAAE,MAAM,EAAE;QACnB,MAAM,UAAU,GAAG,MAAM,CAAC,WAAW,CACnC,MAAM,CAAC,OAAO,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,EAAE,QAAQ,CAAC,EAAE,EAAE;YACtE,OAAO;gBACL,QAAQ;gBACR;oBACE,GAAG,QAAQ;oBACX,GAAG,EAAE,aAAI,CAAC,YAAY,CAAC,GAAG,OAAO,CAAC,MAAM,IAAI,QAAQ,CAAC,GAAG,EAAE,CAAC;iBAC5D;aACF,CAAC;QACJ,CAAC,CAAC,CACH,CAAC;QAEF,OAAO;YACL,GAAG,eAAe;YAClB,UAAU;SACX,CAAC;KACH;IACD,OAAO,eAAe,CAAC;AACzB,CAAC;AAED;;;;GAIG;AACI,MAAM,aAAa,GAAG,CAAC,OAA8B,EAAkB,EAAE,CAC9E,UAAU,MAAgB;IACxB,MAAM,QAAQ,GAAG,CAAC,OAAO,CAAC,WAAW,CAAC,wCAAmB,EAAE,MAAM,CAAC;QAChE,EAAE,CAAoB,CAAC;IAEzB,MAAM,gBAAgB,GAAG,mBAAmB,CAC1C;QACE,GAAG,QAAQ;QACX,GAAG,OAAO;KACX,EACD,OAAO,CACR,CAAC;IAEF,OAAO,CAAC,cAAc,CAAC,wCAAmB,EAAE,gBAAgB,EAAE,MAAM,CAAC,CAAC;IACtE,iDAAsB,CAAC,eAAe,CACpC,MAAqB,EACrB,gBAAgB,CACjB,CAAC;AACJ,CAAC,CAAC;AAlBS,QAAA,aAAa,iBAkBtB"}
|
|
@@ -16,7 +16,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
16
16
|
exports.HealthChecksService = void 0;
|
|
17
17
|
const common_1 = require("@nestjs/common");
|
|
18
18
|
const core_1 = require("@nestjs/core");
|
|
19
|
-
const decorators_1 = require("@rsdk/decorators");
|
|
20
19
|
const metadata_1 = require("@rsdk/metadata");
|
|
21
20
|
const logging_1 = require("../logging");
|
|
22
21
|
const constants_1 = require("./metadata/constants");
|
|
@@ -34,7 +33,7 @@ let HealthChecksService = exports.HealthChecksService = HealthChecksService_1 =
|
|
|
34
33
|
this.rsdkMetadataProvider = rsdkMetadataProvider;
|
|
35
34
|
}
|
|
36
35
|
async check(filter) {
|
|
37
|
-
this.logger.
|
|
36
|
+
this.logger.trace('Checking health', { filter });
|
|
38
37
|
const indicators = this.filterIndicators(filter);
|
|
39
38
|
let success = true;
|
|
40
39
|
const summary = { details: {}, status: 'up' };
|
|
@@ -115,12 +114,6 @@ let HealthChecksService = exports.HealthChecksService = HealthChecksService_1 =
|
|
|
115
114
|
});
|
|
116
115
|
}
|
|
117
116
|
};
|
|
118
|
-
__decorate([
|
|
119
|
-
(0, decorators_1.LogTime)(),
|
|
120
|
-
__metadata("design:type", Function),
|
|
121
|
-
__metadata("design:paramtypes", [String]),
|
|
122
|
-
__metadata("design:returntype", Promise)
|
|
123
|
-
], HealthChecksService.prototype, "check", null);
|
|
124
117
|
exports.HealthChecksService = HealthChecksService = HealthChecksService_1 = __decorate([
|
|
125
118
|
(0, common_1.Injectable)(),
|
|
126
119
|
__param(0, (0, logging_1.InjectLogger)(HealthChecksService_1)),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"health.service.js","sourceRoot":"","sources":["../../src/health/health.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AACA,2CAA4C;AAC5C,uCAAyC;
|
|
1
|
+
{"version":3,"file":"health.service.js","sourceRoot":"","sources":["../../src/health/health.service.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@rsdk/core",
|
|
3
|
-
"version": "3.6.0-next.
|
|
3
|
+
"version": "3.6.0-next.4",
|
|
4
4
|
"description": "Nestjs based microservice chassis",
|
|
5
5
|
"license": "Apache License 2.0",
|
|
6
6
|
"publishConfig": {
|
|
@@ -43,5 +43,5 @@
|
|
|
43
43
|
"reflect-metadata": "^0.1.13",
|
|
44
44
|
"rxjs": "^7.0.0"
|
|
45
45
|
},
|
|
46
|
-
"gitHead": "
|
|
46
|
+
"gitHead": "d1364b9fd2d8de474e76d1013f7adbcb5bb48878"
|
|
47
47
|
}
|
|
@@ -64,14 +64,17 @@ export const ConfigSection = (options?: ConfigSectionOptions): ClassDecorator =>
|
|
|
64
64
|
const metadata = (Reflect.getMetadata(CONFIG_METADATA_KEY, target) ??
|
|
65
65
|
{}) as SectionMetadata;
|
|
66
66
|
|
|
67
|
+
const computedMetadata = getComputedMetadata(
|
|
68
|
+
{
|
|
69
|
+
...metadata,
|
|
70
|
+
...options,
|
|
71
|
+
},
|
|
72
|
+
options,
|
|
73
|
+
);
|
|
74
|
+
|
|
75
|
+
Reflect.defineMetadata(CONFIG_METADATA_KEY, computedMetadata, target);
|
|
67
76
|
ConfigMetadataRegistry.registerSection(
|
|
68
77
|
target as Constructor,
|
|
69
|
-
|
|
70
|
-
{
|
|
71
|
-
...metadata,
|
|
72
|
-
...options,
|
|
73
|
-
},
|
|
74
|
-
options,
|
|
75
|
-
),
|
|
78
|
+
computedMetadata,
|
|
76
79
|
);
|
|
77
80
|
};
|
|
@@ -2,7 +2,6 @@ import type { OnModuleInit } from '@nestjs/common';
|
|
|
2
2
|
import { Injectable } from '@nestjs/common';
|
|
3
3
|
import { ModuleRef } from '@nestjs/core';
|
|
4
4
|
import type { Constructor } from '@rsdk/common';
|
|
5
|
-
import { LogTime } from '@rsdk/decorators';
|
|
6
5
|
import { ILogger } from '@rsdk/logging';
|
|
7
6
|
import { RsdkMetadataProvider } from '@rsdk/metadata';
|
|
8
7
|
|
|
@@ -30,9 +29,8 @@ export class HealthChecksService implements OnModuleInit {
|
|
|
30
29
|
private readonly rsdkMetadataProvider: RsdkMetadataProvider,
|
|
31
30
|
) {}
|
|
32
31
|
|
|
33
|
-
@LogTime()
|
|
34
32
|
async check(filter?: '*' | string): Promise<CheckSummary> {
|
|
35
|
-
this.logger.
|
|
33
|
+
this.logger.trace('Checking health', { filter });
|
|
36
34
|
|
|
37
35
|
const indicators = this.filterIndicators(filter);
|
|
38
36
|
|