@rsdk/core 2.6.0-next.8 → 2.6.0-next.9
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 +4 -0
- package/dist/config/context/config.context.js +5 -2
- package/dist/config/context/config.context.js.map +1 -1
- package/dist/config/sources/implementations/json-file.source.js +2 -2
- package/dist/config/sources/implementations/json-file.source.js.map +1 -1
- package/dist/config/sources/implementations/relodable-json-file.source.js +2 -2
- package/dist/config/sources/implementations/relodable-json-file.source.js.map +1 -1
- package/dist/logging/global-logger-provider.generator.d.ts +1 -1
- package/dist/rsdk-metadata/constants.d.ts +1 -1
- package/dist/types/options.d.ts +2 -1
- package/package.json +10 -7
- package/src/config/context/config.context.ts +1 -1
- package/src/config/sources/implementations/json-file.source.ts +1 -1
- package/src/config/sources/implementations/relodable-json-file.source.ts +1 -1
- package/src/logging/global-logger-provider.generator.ts +1 -1
- package/src/rsdk-metadata/constants.ts +2 -1
- package/src/transport/transport.module.ts +1 -1
- package/src/types/options.ts +2 -1
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,10 @@
|
|
|
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
|
+
# [2.6.0-next.9](https://github.com/R-Vision/rsdk/compare/v2.6.0-next.8...v2.6.0-next.9) (2023-07-25)
|
|
7
|
+
|
|
8
|
+
**Note:** Version bump only for package @rsdk/core
|
|
9
|
+
|
|
6
10
|
# [2.6.0-next.8](https://github.com/R-Vision/rsdk/compare/v2.6.0-next.7...v2.6.0-next.8) (2023-07-23)
|
|
7
11
|
|
|
8
12
|
**Note:** Version bump only for package @rsdk/core
|
|
@@ -1,7 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
2
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
6
|
exports.ConfigContext = void 0;
|
|
4
|
-
const
|
|
7
|
+
const dotenv_1 = __importDefault(require("dotenv"));
|
|
5
8
|
const logging_1 = require("@rsdk/logging");
|
|
6
9
|
const exceptions_1 = require("../exceptions");
|
|
7
10
|
const metadata_1 = require("../metadata");
|
|
@@ -116,7 +119,7 @@ class ConfigContext {
|
|
|
116
119
|
}
|
|
117
120
|
readEnvironment() {
|
|
118
121
|
this.logger.info('Loading variables from .env file if exists');
|
|
119
|
-
|
|
122
|
+
dotenv_1.default.config();
|
|
120
123
|
this.logger.info('Initializing raw parameters storage');
|
|
121
124
|
/**
|
|
122
125
|
* Copying parameters from process.env, skipping entries
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.context.js","sourceRoot":"","sources":["../../../src/config/context/config.context.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"config.context.js","sourceRoot":"","sources":["../../../src/config/context/config.context.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,7 +13,7 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
|
13
13
|
};
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
exports.StaticFileSource = void 0;
|
|
16
|
-
const
|
|
16
|
+
const common_node_1 = require("@rsdk/common.node");
|
|
17
17
|
const metadata_1 = require("../../metadata");
|
|
18
18
|
const parsers_1 = require("../../parsers");
|
|
19
19
|
const base_1 = require("../base");
|
|
@@ -31,7 +31,7 @@ let StaticFileSource = exports.StaticFileSource = class StaticFileSource extends
|
|
|
31
31
|
return `Static conf file: ${this.path}`;
|
|
32
32
|
}
|
|
33
33
|
loadRaw() {
|
|
34
|
-
return (0,
|
|
34
|
+
return (0, common_node_1.readObj)(this.path);
|
|
35
35
|
}
|
|
36
36
|
};
|
|
37
37
|
exports.StaticFileSource = StaticFileSource = __decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"json-file.source.js","sourceRoot":"","sources":["../../../../src/config/sources/implementations/json-file.source.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"json-file.source.js","sourceRoot":"","sources":["../../../../src/config/sources/implementations/json-file.source.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,mDAA4C;AAE5C,6CAAiE;AACjE,2CAA6C;AAE7C,kCAAuC;AACvC,wEAAoD;AAM7C,IAAM,gBAAgB,8BAAtB,MAAM,gBAAiB,SAAQ,mBAAY;IACY;IAA5D,YAA4D,IAAY;QACtE,KAAK,EAAE,CAAC;QADkD,SAAI,GAAJ,IAAI,CAAQ;IAExE,CAAC;IAEQ,IAAI;QACX,OAAO,QAAQ,CAAC;IAClB,CAAC;IAEQ,IAAI;QACX,OAAO,qBAAqB,IAAI,CAAC,IAAI,EAAE,CAAC;IAC1C,CAAC;IAEQ,OAAO;QACd,OAAO,IAAA,qBAAO,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC5B,CAAC;CACF,CAAA;2BAhBY,gBAAgB;IAJ5B,IAAA,gCAAM,EAAC,QAAQ,CAAC;IAChB,IAAA,0BAAe,EAAC,aAAa,EAAE,IAAI,sBAAY,CAAC,MAAM,CAAC,EAAE;QACxD,WAAW,EAAE,iCAAiC;KAC/C,CAAC;IAEa,WAAA,IAAA,yBAAc,EAAC,aAAa,CAAC,CAAA;;GAD/B,gBAAgB,CAgB5B"}
|
|
@@ -14,7 +14,7 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
|
14
14
|
var ReloadableFileSource_1;
|
|
15
15
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
16
16
|
exports.ReloadableFileSource = void 0;
|
|
17
|
-
const
|
|
17
|
+
const common_node_1 = require("@rsdk/common.node");
|
|
18
18
|
const logging_1 = require("@rsdk/logging");
|
|
19
19
|
const node_fs_1 = require("node:fs");
|
|
20
20
|
const metadata_1 = require("../../metadata");
|
|
@@ -32,7 +32,7 @@ let ReloadableFileSource = exports.ReloadableFileSource = ReloadableFileSource_1
|
|
|
32
32
|
return `Configuration file: ${this.path}`;
|
|
33
33
|
}
|
|
34
34
|
loadRaw() {
|
|
35
|
-
return (0,
|
|
35
|
+
return (0, common_node_1.readObj)(this.path);
|
|
36
36
|
}
|
|
37
37
|
init() {
|
|
38
38
|
(0, node_fs_1.watch)(this.path, (event) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"relodable-json-file.source.js","sourceRoot":"","sources":["../../../../src/config/sources/implementations/relodable-json-file.source.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"relodable-json-file.source.js","sourceRoot":"","sources":["../../../../src/config/sources/implementations/relodable-json-file.source.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,mDAA4C;AAC5C,2CAA8C;AAC9C,qCAAgC;AAEhC,6CAAiE;AACjE,2CAA6C;AAC7C,yCAA4C;AAC5C,kCAAiD;AACjD,wEAAoD;AAM7C,IAAM,oBAAoB,2DAA1B,MAAM,oBAAqB,SAAQ,6BAAsB;IAEZ;IADlD,YACkD,IAAY,EAC5D,YAA0B;QAE1B,KAAK,CAAC,uBAAa,CAAC,MAAM,CAAC,sBAAoB,CAAC,EAAE,YAAY,CAAC,CAAC;QAHhB,SAAI,GAAJ,IAAI,CAAQ;IAI9D,CAAC;IAEQ,IAAI;QACX,OAAO,uBAAuB,IAAI,CAAC,IAAI,EAAE,CAAC;IAC5C,CAAC;IAEQ,OAAO;QACd,OAAO,IAAA,qBAAO,EAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC5B,CAAC;IAEQ,IAAI;QACX,IAAA,eAAK,EAAC,IAAI,CAAC,IAAI,EAAE,CAAC,KAAK,EAAE,EAAE;YACzB,IAAI,KAAK,KAAK,QAAQ,EAAE;gBACtB,OAAO;aACR;YAED,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,kBAAkB,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;YAE5D,IAAI,CAAC,MAAM,EAAE,CAAC;QAChB,CAAC,CAAC,CAAC;IACL,CAAC;CACF,CAAA;+BA3BY,oBAAoB;IAJhC,IAAA,gCAAM,EAAC,YAAY,CAAC;IACpB,IAAA,0BAAe,EAAC,aAAa,EAAE,IAAI,sBAAY,CAAC,MAAM,CAAC,EAAE;QACxD,WAAW,EAAE,iCAAiC;KAC/C,CAAC;IAGG,WAAA,IAAA,yBAAc,EAAC,aAAa,CAAC,CAAA;6CAChB,qBAAY;GAHjB,oBAAoB,CA2BhC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { NestModuleDefinition } from '@rsdk/common';
|
|
1
|
+
import type { NestModuleDefinition } from '@rsdk/common.nestjs';
|
|
2
2
|
import type { RsdkMetadataProvider } from '@rsdk/metadata';
|
|
3
3
|
declare class GlobalLoggerProvidersGenerator {
|
|
4
4
|
generate(rsdkMetadataProvider: RsdkMetadataProvider): NestModuleDefinition;
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import type { NestModuleDefinition } from '@rsdk/common';
|
|
1
|
+
import type { NestModuleDefinition } from '@rsdk/common.nestjs';
|
|
2
2
|
export declare const PLATFORM_RAW_GLOBAL_METADATA_SCOPE = "PLATFORM_RAW_GLOBAL_RSDK_METADATA_SCOPE";
|
|
3
3
|
export type PlatformRawGlobalMetadata = NestModuleDefinition;
|
package/dist/types/options.d.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { RequiredFields } from '@rsdk/common';
|
|
2
|
+
import type { NestModuleDefinition } from '@rsdk/common.nestjs';
|
|
2
3
|
import type { ConfigModuleOptions } from '../config';
|
|
3
4
|
import type { PlatformAppPlugin } from './plugins';
|
|
4
5
|
import type { IPrimaryTransport, ITransport } from './transports';
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@rsdk/core",
|
|
3
|
-
"version": "2.6.0-next.
|
|
3
|
+
"version": "2.6.0-next.9",
|
|
4
4
|
"description": "Nestjs based microservice chassis",
|
|
5
5
|
"license": "Apache License 2.0",
|
|
6
6
|
"publishConfig": {
|
|
@@ -23,6 +23,7 @@
|
|
|
23
23
|
"@opentelemetry/sdk-node": "^0.39.1",
|
|
24
24
|
"@opentelemetry/sdk-trace-base": "1.13.0",
|
|
25
25
|
"@opentelemetry/semantic-conventions": "1.13.0",
|
|
26
|
+
"dotenv": "^16.3.1",
|
|
26
27
|
"lodash": "^4.17.21",
|
|
27
28
|
"prom-client": "^14.2.0"
|
|
28
29
|
},
|
|
@@ -30,15 +31,17 @@
|
|
|
30
31
|
"@nestjs/common": "^9.0.0",
|
|
31
32
|
"@nestjs/core": "^9.0.0",
|
|
32
33
|
"@nestjs/microservices": "^9.0.0",
|
|
33
|
-
"@rsdk/autodoc.protocol": "^2.6.0-next.
|
|
34
|
-
"@rsdk/common": "^2.6.0-next.
|
|
35
|
-
"@rsdk/
|
|
36
|
-
"@rsdk/
|
|
37
|
-
"@rsdk/
|
|
34
|
+
"@rsdk/autodoc.protocol": "^2.6.0-next.9",
|
|
35
|
+
"@rsdk/common": "^2.6.0-next.9",
|
|
36
|
+
"@rsdk/common.nestjs": "^2.6.0-next.9",
|
|
37
|
+
"@rsdk/common.node": "^2.6.0-next.9",
|
|
38
|
+
"@rsdk/decorators": "^2.6.0-next.9",
|
|
39
|
+
"@rsdk/logging": "^2.6.0-next.9",
|
|
40
|
+
"@rsdk/metadata": "^2.6.0-next.9",
|
|
38
41
|
"@rsdk/nest-tools": "^2.6.0-next.3",
|
|
39
42
|
"axios": "^1.1.3",
|
|
40
43
|
"reflect-metadata": "^0.1.13",
|
|
41
44
|
"rxjs": "^7.0.0"
|
|
42
45
|
},
|
|
43
|
-
"gitHead": "
|
|
46
|
+
"gitHead": "6b0189156dc2873f86056e6c608efecbd2024b24"
|
|
44
47
|
}
|
|
@@ -7,7 +7,7 @@
|
|
|
7
7
|
* 3. динамические source'ы (если сделать последовательно - то в порядке указания)
|
|
8
8
|
*/
|
|
9
9
|
import type { Constructor } from '@rsdk/common';
|
|
10
|
-
import
|
|
10
|
+
import dotenv from 'dotenv';
|
|
11
11
|
import { LoggerFactory } from '@rsdk/logging';
|
|
12
12
|
import type { RsdkMetadataProvider } from '@rsdk/metadata';
|
|
13
13
|
|
|
@@ -1,5 +1,6 @@
|
|
|
1
|
-
import type { NestModuleDefinition } from '@rsdk/common';
|
|
1
|
+
import type { NestModuleDefinition } from '@rsdk/common.nestjs';
|
|
2
2
|
|
|
3
3
|
export const PLATFORM_RAW_GLOBAL_METADATA_SCOPE =
|
|
4
4
|
'PLATFORM_RAW_GLOBAL_RSDK_METADATA_SCOPE';
|
|
5
|
+
|
|
5
6
|
export type PlatformRawGlobalMetadata = NestModuleDefinition;
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { DynamicModule } from '@nestjs/common';
|
|
2
|
-
import type { NestModuleDefinition } from '@rsdk/common';
|
|
2
|
+
import type { NestModuleDefinition } from '@rsdk/common.nestjs';
|
|
3
3
|
import { flatten } from 'lodash';
|
|
4
4
|
|
|
5
5
|
import type { IErrorsFormatter, IErrorsSender } from '../exceptions.handling';
|
package/src/types/options.ts
CHANGED