@rsdk/core 3.5.0 → 3.6.0-next.2
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/config.abstract.d.ts +1 -0
- package/dist/config/config.abstract.js +5 -0
- package/dist/config/config.abstract.js.map +1 -1
- package/dist/health/health.service.js +1 -8
- package/dist/health/health.service.js.map +1 -1
- package/dist/rsdk-metadata/config-metadata.extractor.js +7 -4
- package/dist/rsdk-metadata/config-metadata.extractor.js.map +1 -1
- package/package.json +5 -5
- package/src/config/config.abstract.ts +8 -0
- package/src/health/health.service.ts +1 -3
- package/src/rsdk-metadata/config-metadata.extractor.ts +8 -6
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.2](https://github.com/R-Vision/rsdk/compare/v3.6.0-next.1...v3.6.0-next.2) (2023-10-10)
|
|
7
|
+
|
|
8
|
+
**Note:** Version bump only for package @rsdk/core
|
|
9
|
+
|
|
10
|
+
## [3.6.0-next.0](https://github.com/R-Vision/rsdk/compare/v3.5.0...v3.6.0-next.0) (2023-10-06)
|
|
11
|
+
|
|
12
|
+
### Features
|
|
13
|
+
|
|
14
|
+
* discover config from inject section in dynamic provider ([b20c41c](https://github.com/R-Vision/rsdk/commit/b20c41c08802c2ece7c3fe24614959722cae12b4))
|
|
15
|
+
|
|
6
16
|
## [3.5.0](https://github.com/R-Vision/rsdk/compare/v3.5.0-next.9...v3.5.0) (2023-10-03)
|
|
7
17
|
|
|
8
18
|
**Note:** Version bump only for package @rsdk/core
|
|
@@ -14,6 +14,7 @@ export declare class Config {
|
|
|
14
14
|
*/
|
|
15
15
|
private readonly propertiesMetadata;
|
|
16
16
|
constructor(events: ReloadEvents);
|
|
17
|
+
static isConfigSection(value: Function): value is typeof Config;
|
|
17
18
|
onUpdate(fn: (keys: string[]) => void): void;
|
|
18
19
|
read(vars: Vars): string[];
|
|
19
20
|
tryUpdate(vars: Vars): void;
|
|
@@ -22,6 +22,11 @@ class Config {
|
|
|
22
22
|
const metadata = Reflect.getMetadata(metadata_1.CONFIG_METADATA_KEY, this.constructor);
|
|
23
23
|
this.propertiesMetadata = metadata.properties;
|
|
24
24
|
}
|
|
25
|
+
// eslint-disable-next-line @typescript-eslint/ban-types
|
|
26
|
+
static isConfigSection(value) {
|
|
27
|
+
return (Reflect.getMetadata(metadata_1.CONFIG_METADATA_KEY, value) &&
|
|
28
|
+
value.prototype instanceof Config);
|
|
29
|
+
}
|
|
25
30
|
onUpdate(fn) {
|
|
26
31
|
this.events.on('update', (_, updatedKeys) => {
|
|
27
32
|
const prefixedKeys = Object.keys(this.propertiesMetadata).map((x) => `${this.constructor.name}/${x}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.abstract.js","sourceRoot":"","sources":["../../src/config/config.abstract.ts"],"names":[],"mappings":";;;AAAA,mCAA+C;AAE/C,4BAA0B;AAE1B,yCAAiD;AAKjD;;;;;GAKG;AACH,MAAa,MAAM;IAOY;IAN7B;;OAEG;IACc,kBAAkB,CAAmC;IAEtE,qDAAqD;IACrD,YAA6B,MAAoB;QAApB,WAAM,GAAN,MAAM,CAAc;QAC/C,MAAM,QAAQ,GAAG,OAAO,CAAC,WAAW,CAClC,8BAAmB,EACnB,IAAI,CAAC,WAAW,CACE,CAAC;QAErB,IAAI,CAAC,kBAAkB,GAAG,QAAQ,CAAC,UAAU,CAAC;IAChD,CAAC;IAED,QAAQ,CAAC,EAA4B;QACnC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAS,EAAE,WAAqB,EAAE,EAAE;YAC5D,MAAM,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,GAAG,CAC3D,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,IAAI,CAAC,EAAE,CACvC,CAAC;YACF,IAAI,IAAA,qBAAY,EAAC,YAAY,EAAE,WAAW,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE;gBACtD,EAAE,CAAC,WAAW,CAAC,CAAC;aACjB;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAED,IAAI,CAAC,IAAU;QACb,MAAM,OAAO,GAAa,EAAE,CAAC;QAE7B,KAAK,MAAM,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,kBAAkB,CAAC,EAAE;YACtE,MAAM,KAAK,GAAI,IAAY,CAAC,IAAI,CAAC,CAAC;YAClC,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;YAExC,yCAAyC;YACzC,IAAI,CAAC,IAAA,gBAAO,EAAC,QAAQ,EAAE,KAAK,CAAC,EAAE;gBAC5B,IAAY,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC;gBAC/B,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,IAAI,IAAI,EAAE,CAAC,CAAC;aAClD;SACF;QAED,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,SAAS,CAAC,IAAU;QAClB,IAAI;YACF,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAEhC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;SAC3C;QAAC,OAAO,KAAU,EAAE;YACnB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,gBAAgB,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;SACjD;IACH,CAAC;CACF;
|
|
1
|
+
{"version":3,"file":"config.abstract.js","sourceRoot":"","sources":["../../src/config/config.abstract.ts"],"names":[],"mappings":";;;AAAA,mCAA+C;AAE/C,4BAA0B;AAE1B,yCAAiD;AAKjD;;;;;GAKG;AACH,MAAa,MAAM;IAOY;IAN7B;;OAEG;IACc,kBAAkB,CAAmC;IAEtE,qDAAqD;IACrD,YAA6B,MAAoB;QAApB,WAAM,GAAN,MAAM,CAAc;QAC/C,MAAM,QAAQ,GAAG,OAAO,CAAC,WAAW,CAClC,8BAAmB,EACnB,IAAI,CAAC,WAAW,CACE,CAAC;QAErB,IAAI,CAAC,kBAAkB,GAAG,QAAQ,CAAC,UAAU,CAAC;IAChD,CAAC;IAED,wDAAwD;IACxD,MAAM,CAAC,eAAe,CAAC,KAAe;QACpC,OAAO,CACL,OAAO,CAAC,WAAW,CAAC,8BAAmB,EAAE,KAAK,CAAC;YAC/C,KAAK,CAAC,SAAS,YAAY,MAAM,CAClC,CAAC;IACJ,CAAC;IAED,QAAQ,CAAC,EAA4B;QACnC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAS,EAAE,WAAqB,EAAE,EAAE;YAC5D,MAAM,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,GAAG,CAC3D,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,IAAI,CAAC,EAAE,CACvC,CAAC;YACF,IAAI,IAAA,qBAAY,EAAC,YAAY,EAAE,WAAW,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE;gBACtD,EAAE,CAAC,WAAW,CAAC,CAAC;aACjB;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAED,IAAI,CAAC,IAAU;QACb,MAAM,OAAO,GAAa,EAAE,CAAC;QAE7B,KAAK,MAAM,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,kBAAkB,CAAC,EAAE;YACtE,MAAM,KAAK,GAAI,IAAY,CAAC,IAAI,CAAC,CAAC;YAClC,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;YAExC,yCAAyC;YACzC,IAAI,CAAC,IAAA,gBAAO,EAAC,QAAQ,EAAE,KAAK,CAAC,EAAE;gBAC5B,IAAY,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAC;gBAC/B,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,IAAI,IAAI,EAAE,CAAC,CAAC;aAClD;SACF;QAED,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,SAAS,CAAC,IAAU;QAClB,IAAI;YACF,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAEhC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;SAC3C;QAAC,OAAO,KAAU,EAAE;YACnB,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,gBAAgB,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;SACjD;IACH,CAAC;CACF;AA7DD,wBA6DC"}
|
|
@@ -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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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.ConfigMetadataExtractor = void 0;
|
|
4
|
+
const nest_tools_1 = require("@rsdk/nest-tools");
|
|
4
5
|
const config_1 = require("../config");
|
|
5
6
|
const constants_1 = require("./constants");
|
|
6
7
|
/**
|
|
@@ -8,10 +9,13 @@ const constants_1 = require("./constants");
|
|
|
8
9
|
*/
|
|
9
10
|
class ConfigMetadataExtractor {
|
|
10
11
|
extract(value) {
|
|
12
|
+
if (!nest_tools_1.Assert.isObjectOrCtor(value)) {
|
|
13
|
+
return [];
|
|
14
|
+
}
|
|
11
15
|
/**
|
|
12
16
|
* Получаем аргументы конструктора
|
|
13
17
|
*/
|
|
14
|
-
const args =
|
|
18
|
+
const args = nest_tools_1.NestDefinition.extractDeps(value);
|
|
15
19
|
/**
|
|
16
20
|
* Если их нет, просто возвращаем пустой массив
|
|
17
21
|
*/
|
|
@@ -20,11 +24,10 @@ class ConfigMetadataExtractor {
|
|
|
20
24
|
}
|
|
21
25
|
const resources = [];
|
|
22
26
|
for (const arg of args) {
|
|
23
|
-
if (!
|
|
27
|
+
if (!nest_tools_1.Assert.isObjectOrCtor(arg)) {
|
|
24
28
|
continue;
|
|
25
29
|
}
|
|
26
|
-
const isConfigSection =
|
|
27
|
-
arg.prototype instanceof config_1.Config;
|
|
30
|
+
const isConfigSection = config_1.Config.isConfigSection(arg);
|
|
28
31
|
if (!isConfigSection) {
|
|
29
32
|
continue;
|
|
30
33
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config-metadata.extractor.js","sourceRoot":"","sources":["../../src/rsdk-metadata/config-metadata.extractor.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"config-metadata.extractor.js","sourceRoot":"","sources":["../../src/rsdk-metadata/config-metadata.extractor.ts"],"names":[],"mappings":";;;AASA,iDAA0D;AAE1D,sCAAyD;AAEzD,2CAAiE;AAEjE;;GAEG;AACH,MAAa,uBAAuB;IAClC,OAAO,CACL,KAMkB;QAElB,IAAI,CAAC,mBAAM,CAAC,cAAc,CAAC,KAAK,CAAC,EAAE;YACjC,OAAO,EAAE,CAAC;SACX;QACD;;WAEG;QACH,MAAM,IAAI,GAAG,2BAAc,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;QAC/C;;WAEG;QACH,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YACxB,OAAO,EAAE,CAAC;SACX;QACD,MAAM,SAAS,GAA8B,EAAE,CAAC;QAEhD,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE;YACtB,IAAI,CAAC,mBAAM,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE;gBAC/B,SAAS;aACV;YACD,MAAM,eAAe,GAAG,eAAM,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC;YAEpD,IAAI,CAAC,eAAe,EAAE;gBACpB,SAAS;aACV;YACD,SAAS,CAAC,IAAI,CAAC;gBACb,KAAK,EAAE,6BAAoB,CAAC,UAAU,CAAC,GAAG,CAAC;gBAC3C,GAAG,EAAE,GAAG;gBACR,KAAK,EAAE,8CAAkC;aAC1C,CAAC,CAAC;SACJ;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;CACF;AA1CD,0DA0CC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@rsdk/core",
|
|
3
|
-
"version": "3.
|
|
3
|
+
"version": "3.6.0-next.2",
|
|
4
4
|
"description": "Nestjs based microservice chassis",
|
|
5
5
|
"license": "Apache License 2.0",
|
|
6
6
|
"publishConfig": {
|
|
@@ -31,17 +31,17 @@
|
|
|
31
31
|
"@nestjs/common": "^10.1.3",
|
|
32
32
|
"@nestjs/core": "^10.1.3",
|
|
33
33
|
"@nestjs/microservices": "^10.1.3",
|
|
34
|
-
"@rsdk/autodoc.protocol": "^3.
|
|
34
|
+
"@rsdk/autodoc.protocol": "^3.6.0-next.0",
|
|
35
35
|
"@rsdk/common": "^3.5.0",
|
|
36
36
|
"@rsdk/common.nestjs": "^3.5.0",
|
|
37
37
|
"@rsdk/common.node": "^3.5.0",
|
|
38
38
|
"@rsdk/decorators": "^3.5.0",
|
|
39
39
|
"@rsdk/logging": "^3.5.0",
|
|
40
|
-
"@rsdk/metadata": "^3.
|
|
41
|
-
"@rsdk/nest-tools": "^3.
|
|
40
|
+
"@rsdk/metadata": "^3.6.0-next.0",
|
|
41
|
+
"@rsdk/nest-tools": "^3.6.0-next.0",
|
|
42
42
|
"axios": "^1.1.3",
|
|
43
43
|
"reflect-metadata": "^0.1.13",
|
|
44
44
|
"rxjs": "^7.0.0"
|
|
45
45
|
},
|
|
46
|
-
"gitHead": "
|
|
46
|
+
"gitHead": "9852255e942109015c5e47acaf73ae3c00c703cd"
|
|
47
47
|
}
|
|
@@ -29,6 +29,14 @@ export class Config {
|
|
|
29
29
|
this.propertiesMetadata = metadata.properties;
|
|
30
30
|
}
|
|
31
31
|
|
|
32
|
+
// eslint-disable-next-line @typescript-eslint/ban-types
|
|
33
|
+
static isConfigSection(value: Function): value is typeof Config {
|
|
34
|
+
return (
|
|
35
|
+
Reflect.getMetadata(CONFIG_METADATA_KEY, value) &&
|
|
36
|
+
value.prototype instanceof Config
|
|
37
|
+
);
|
|
38
|
+
}
|
|
39
|
+
|
|
32
40
|
onUpdate(fn: (keys: string[]) => void): void {
|
|
33
41
|
this.events.on('update', (_: Config, updatedKeys: string[]) => {
|
|
34
42
|
const prefixedKeys = Object.keys(this.propertiesMetadata).map(
|
|
@@ -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
|
|
|
@@ -7,8 +7,9 @@ import type {
|
|
|
7
7
|
ValueProvider,
|
|
8
8
|
} from '@nestjs/common';
|
|
9
9
|
import type { Resource, ResourceExtractor } from '@rsdk/metadata';
|
|
10
|
+
import { Assert, NestDefinition } from '@rsdk/nest-tools';
|
|
10
11
|
|
|
11
|
-
import { Config,
|
|
12
|
+
import { Config, PlatformConfigModule } from '../config';
|
|
12
13
|
|
|
13
14
|
import { PLATFORM_RAW_GLOBAL_METADATA_SCOPE } from './constants';
|
|
14
15
|
|
|
@@ -25,10 +26,13 @@ export class ConfigMetadataExtractor implements ResourceExtractor {
|
|
|
25
26
|
| ExistingProvider<any>
|
|
26
27
|
| InjectionToken,
|
|
27
28
|
): Resource<unknown>[] {
|
|
29
|
+
if (!Assert.isObjectOrCtor(value)) {
|
|
30
|
+
return [];
|
|
31
|
+
}
|
|
28
32
|
/**
|
|
29
33
|
* Получаем аргументы конструктора
|
|
30
34
|
*/
|
|
31
|
-
const args =
|
|
35
|
+
const args = NestDefinition.extractDeps(value);
|
|
32
36
|
/**
|
|
33
37
|
* Если их нет, просто возвращаем пустой массив
|
|
34
38
|
*/
|
|
@@ -38,12 +42,10 @@ export class ConfigMetadataExtractor implements ResourceExtractor {
|
|
|
38
42
|
const resources: Resource<DynamicModule>[] = [];
|
|
39
43
|
|
|
40
44
|
for (const arg of args) {
|
|
41
|
-
if (!
|
|
45
|
+
if (!Assert.isObjectOrCtor(arg)) {
|
|
42
46
|
continue;
|
|
43
47
|
}
|
|
44
|
-
const isConfigSection =
|
|
45
|
-
Reflect.getMetadata(CONFIG_METADATA_KEY, arg) &&
|
|
46
|
-
arg.prototype instanceof Config;
|
|
48
|
+
const isConfigSection = Config.isConfigSection(arg);
|
|
47
49
|
|
|
48
50
|
if (!isConfigSection) {
|
|
49
51
|
continue;
|