@rsdk/core 2.0.0 → 2.1.0
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/context.aggregator.d.ts +4 -0
- package/dist/context.aggregator.js +8 -0
- package/dist/context.aggregator.js.map +1 -1
- package/dist/platform.context.d.ts +1 -0
- package/dist/platform.context.js +7 -6
- package/dist/platform.context.js.map +1 -1
- package/package.json +2 -2
- package/src/context.aggregator.ts +13 -0
- package/src/platform.context.ts +9 -9
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.1.0](https://github.com/R-Vision/rsdk/compare/v2.0.0...v2.1.0) (2023-06-06)
|
|
7
|
+
|
|
8
|
+
**Note:** Version bump only for package @rsdk/core
|
|
9
|
+
|
|
6
10
|
# [2.0.0](https://github.com/R-Vision/rsdk/compare/v1.0.12...v2.0.0) (2023-06-06)
|
|
7
11
|
|
|
8
12
|
### Bug Fixes
|
|
@@ -1,3 +1,5 @@
|
|
|
1
|
+
import type { DynamicModule } from '@nestjs/common';
|
|
2
|
+
import { RsdkMetadataProvider } from '@rsdk/metadata';
|
|
1
3
|
import type { ContextAggregated } from './types/context-aggregated';
|
|
2
4
|
import { ConfigContext } from './config';
|
|
3
5
|
import type { PlatformContext } from './platform.context';
|
|
@@ -18,4 +20,6 @@ export declare class ContextAggregator {
|
|
|
18
20
|
* Просто алиас чтобы везде не писать такую конструкцию
|
|
19
21
|
*/
|
|
20
22
|
getConfigContext(): Promise<ConfigContext>;
|
|
23
|
+
getRsdkMetadataProvider(): Promise<RsdkMetadataProvider>;
|
|
24
|
+
getRoot(): Promise<DynamicModule>;
|
|
21
25
|
}
|
|
@@ -48,6 +48,14 @@ class ContextAggregator {
|
|
|
48
48
|
async getConfigContext() {
|
|
49
49
|
return (await this.getAggregated()).configContext;
|
|
50
50
|
}
|
|
51
|
+
async getRsdkMetadataProvider() {
|
|
52
|
+
const aggregated = await this.getAggregated();
|
|
53
|
+
return aggregated.rsdkMetadataProvider;
|
|
54
|
+
}
|
|
55
|
+
async getRoot() {
|
|
56
|
+
const { root } = await this.getAggregated();
|
|
57
|
+
return root;
|
|
58
|
+
}
|
|
51
59
|
}
|
|
52
60
|
exports.ContextAggregator = ContextAggregator;
|
|
53
61
|
//# sourceMappingURL=context.aggregator.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"context.aggregator.js","sourceRoot":"","sources":["../src/context.aggregator.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"context.aggregator.js","sourceRoot":"","sources":["../src/context.aggregator.ts"],"names":[],"mappings":";;;AACA,6CAAsD;AAEtD,oDAA8D;AAC9D,6FAAuF;AAEvF,qCAAyC;AAEzC,uDAAmD;AAEnD,MAAa,iBAAiB;IAGR;IAFZ,WAAW,CAAoB;IAEvC,YAAoB,eAAgC;QAAhC,oBAAe,GAAf,eAAe,CAAiB;IAAG,CAAC;IAExD;;;;;;;OAOG;IACH,KAAK,CAAC,aAAa;QACjB,IAAI,IAAI,CAAC,WAAW,EAAE;YACpB,OAAO,IAAI,CAAC,WAAW,CAAC;SACzB;QACD,MAAM,YAAY,GAAG,gCAAc,CAAC,OAAO,CACzC,IAAI,CAAC,eAAe,CAAC,eAAe,CACrC,CAAC;QACF,MAAM,wBAAwB,GAAG,MAAM,sDAAwB,CAAC,GAAG,CACjE,YAAY,CACb,CAAC;QACF,MAAM,oBAAoB,GAAG,MAAM,+BAAoB,CAAC,MAAM,CAC5D,wBAAwB,EACxB,YAAY,CACb,CAAC;QAEF,MAAM,aAAa,GAAG,IAAI,sBAAa,CAAC,oBAAoB,EAAE;YAC5D,GAAG,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,MAAM;YACtC,OAAO,EAAE,IAAI,CAAC,eAAe,CAAC,eAAe,CAAC,IAAI;SACnD,CAAC,CAAC;QAEH,MAAM,IAAI,GAAG;YACX,OAAO,EAAE;gBACP,YAAY;gBACZ,wBAAwB;gBACxB,4BAAmB,CAAC,OAAO,CAAC,aAAa,CAAC;aAC3C;YACD,MAAM,EAAE,iBAAiB;SAC1B,CAAC;QAEF,IAAI,CAAC,WAAW,GAAG,EAAE,IAAI,EAAE,oBAAoB,EAAE,aAAa,EAAE,CAAC;QACjE,OAAO,IAAI,CAAC,WAAW,CAAC;IAC1B,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,gBAAgB;QACpB,OAAO,CAAC,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC,CAAC,aAAa,CAAC;IACpD,CAAC;IAED,KAAK,CAAC,uBAAuB;QAC3B,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;QAE9C,OAAO,UAAU,CAAC,oBAAoB,CAAC;IACzC,CAAC;IAED,KAAK,CAAC,OAAO;QACX,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;QAE5C,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AAhED,8CAgEC"}
|
package/dist/platform.context.js
CHANGED
|
@@ -76,12 +76,10 @@ class PlatformContext {
|
|
|
76
76
|
}
|
|
77
77
|
}
|
|
78
78
|
async getRsdkMetadataProvider() {
|
|
79
|
-
|
|
80
|
-
return aggregated.rsdkMetadataProvider;
|
|
79
|
+
return await this.aggregator.getRsdkMetadataProvider();
|
|
81
80
|
}
|
|
82
81
|
async getRoot() {
|
|
83
|
-
|
|
84
|
-
return root;
|
|
82
|
+
return await this.aggregator.getRoot();
|
|
85
83
|
}
|
|
86
84
|
/**
|
|
87
85
|
* Get all important information about PlatformApp instance
|
|
@@ -113,7 +111,7 @@ class PlatformContext {
|
|
|
113
111
|
* Производит все необходимые проверки и инициализации транспортов, не запускает приложение
|
|
114
112
|
*/
|
|
115
113
|
async configureApp(app) {
|
|
116
|
-
const configContext = await this.
|
|
114
|
+
const configContext = await this.getConfigContext();
|
|
117
115
|
const awaiter = this.httpTransport?.configure(app, configContext);
|
|
118
116
|
if (awaiter instanceof Promise) {
|
|
119
117
|
await awaiter;
|
|
@@ -136,7 +134,7 @@ class PlatformContext {
|
|
|
136
134
|
*/
|
|
137
135
|
async runConfiguredApplication(app) {
|
|
138
136
|
try {
|
|
139
|
-
const configContext = await this.
|
|
137
|
+
const configContext = await this.getConfigContext();
|
|
140
138
|
this.logger.info('Mapping controllers...');
|
|
141
139
|
if (this.httpTransport) {
|
|
142
140
|
const { host, port } = this.httpTransport.createHttpOptions(configContext);
|
|
@@ -175,6 +173,9 @@ class PlatformContext {
|
|
|
175
173
|
},
|
|
176
174
|
];
|
|
177
175
|
}
|
|
176
|
+
getConfigContext() {
|
|
177
|
+
return this.aggregator.getConfigContext();
|
|
178
|
+
}
|
|
178
179
|
}
|
|
179
180
|
exports.PlatformContext = PlatformContext;
|
|
180
181
|
//# sourceMappingURL=platform.context.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"platform.context.js","sourceRoot":"","sources":["../src/platform.context.ts"],"names":[],"mappings":";;;AAKA,2CAA8C;AAE9C,mCAA+C;AAE/C,yFAAoF;AACpF,kDAA+C;AAE/C,6DAAyD;AACzD,6CAGsB;AACtB,uCAA8C;AAC9C,2DAAsD;AAQtD,mCAMiB;AAEjB;;GAEG;AACH,MAAa,eAAe;IAgBL;IAfZ,MAAM,GAAG,uBAAa,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACtC,aAAa,CAAiD;IACrD,aAAa,CAA6B;IAC1C,WAAW,CAAsB;IAC1C,UAAU,CAAoB;IAC9B,gBAAgB,CAA0B;IAElD;;;;;;;OAOG;IACH,YAAqB,OAAwB;QAAxB,YAAO,GAAP,OAAO,CAAiB;QAC3C,eAAe,CAAC,4BAA4B,CAAC,OAAO,CAAC,CAAC;QACtD,eAAe,CAAC,yBAAyB,CAAC,OAAO,CAAC,CAAC;QAEnD,IAAI,CAAC,aAAa,GAAG,OAAO,CAAC,UAAU,EAAE,IAAI,EAAE,CAAC,uBAAe,CAAC,CAAC;QACjE,IAAI,CAAC,WAAW;YACd,IAAI,CAAC,aAAa,EAAE,UAAU,EAAE,IAAI,IAAI,mCAAe,EAAE,CAAC;QAC5D,IAAI,CAAC,UAAU,GAAG,IAAI,sCAAiB,CAAC,IAAI,CAAC,CAAC;IAChD,CAAC;IAED,IAAI,eAAe;QACjB,IAAI,IAAI,CAAC,gBAAgB,EAAE;YACzB,OAAO,IAAI,CAAC,gBAAgB,CAAC;SAC9B;QACD,MAAM,YAAY,GAAG,mBAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;QACjE,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,GAAG,YAAY,CAAC;QAEpD,MAAM,eAAe,GAA4B;YAC/C,WAAW;YACX,IAAI;YACJ,OAAO;YACP,GAAG,IAAI,CAAC,OAAO;SAChB,CAAC;QAEF,IAAI,CAAC,gBAAgB,GAAG,eAAe,CAAC;QACxC,OAAO,IAAI,CAAC,gBAAgB,CAAC;IAC/B,CAAC;IAEO,MAAM,CAAC,yBAAyB,CAAC,OAAwB;QAC/D,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE;YACpB,OAAO;SACR;QACD,MAAM,SAAS,GAAG,CAAC,OAAO,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC;QAEzE,KAAK,MAAM,MAAM,IAAI,OAAO,CAAC,OAAO,EAAE;YACpC,IAAI,CAAC,IAAA,8BAAsB,EAAC,MAAM,CAAC,EAAE;gBACnC,SAAS;aACV;YAED,IAAI,IAAA,qBAAY,EAAC,MAAM,CAAC,aAAa,EAAE,EAAE,SAAS,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE;gBAChE,MAAM,IAAI,yCAA4B,CAAC,MAAM,CAAC,CAAC;aAChD;SACF;IACH,CAAC;IAEO,MAAM,CAAC,4BAA4B,CAAC,OAAwB;QAClE,MAAM,OAAO,GAAG,IAAA,gBAAO,EAAC,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC;QAEpE,KAAK,MAAM,CAAC,QAAQ,EAAE,eAAe,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;YACjE,IAAI,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE;gBAC9B,MAAM,IAAI,uCAA0B,CAAC,QAAQ,EAAE,eAAe,CAAC,MAAM,CAAC,CAAC;aACxE;SACF;IACH,CAAC;IAED,KAAK,CAAC,uBAAuB;QAC3B,
|
|
1
|
+
{"version":3,"file":"platform.context.js","sourceRoot":"","sources":["../src/platform.context.ts"],"names":[],"mappings":";;;AAKA,2CAA8C;AAE9C,mCAA+C;AAE/C,yFAAoF;AACpF,kDAA+C;AAE/C,6DAAyD;AACzD,6CAGsB;AACtB,uCAA8C;AAC9C,2DAAsD;AAQtD,mCAMiB;AAEjB;;GAEG;AACH,MAAa,eAAe;IAgBL;IAfZ,MAAM,GAAG,uBAAa,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACtC,aAAa,CAAiD;IACrD,aAAa,CAA6B;IAC1C,WAAW,CAAsB;IAC1C,UAAU,CAAoB;IAC9B,gBAAgB,CAA0B;IAElD;;;;;;;OAOG;IACH,YAAqB,OAAwB;QAAxB,YAAO,GAAP,OAAO,CAAiB;QAC3C,eAAe,CAAC,4BAA4B,CAAC,OAAO,CAAC,CAAC;QACtD,eAAe,CAAC,yBAAyB,CAAC,OAAO,CAAC,CAAC;QAEnD,IAAI,CAAC,aAAa,GAAG,OAAO,CAAC,UAAU,EAAE,IAAI,EAAE,CAAC,uBAAe,CAAC,CAAC;QACjE,IAAI,CAAC,WAAW;YACd,IAAI,CAAC,aAAa,EAAE,UAAU,EAAE,IAAI,IAAI,mCAAe,EAAE,CAAC;QAC5D,IAAI,CAAC,UAAU,GAAG,IAAI,sCAAiB,CAAC,IAAI,CAAC,CAAC;IAChD,CAAC;IAED,IAAI,eAAe;QACjB,IAAI,IAAI,CAAC,gBAAgB,EAAE;YACzB,OAAO,IAAI,CAAC,gBAAgB,CAAC;SAC9B;QACD,MAAM,YAAY,GAAG,mBAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;QACjE,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,GAAG,YAAY,CAAC;QAEpD,MAAM,eAAe,GAA4B;YAC/C,WAAW;YACX,IAAI;YACJ,OAAO;YACP,GAAG,IAAI,CAAC,OAAO;SAChB,CAAC;QAEF,IAAI,CAAC,gBAAgB,GAAG,eAAe,CAAC;QACxC,OAAO,IAAI,CAAC,gBAAgB,CAAC;IAC/B,CAAC;IAEO,MAAM,CAAC,yBAAyB,CAAC,OAAwB;QAC/D,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE;YACpB,OAAO;SACR;QACD,MAAM,SAAS,GAAG,CAAC,OAAO,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC;QAEzE,KAAK,MAAM,MAAM,IAAI,OAAO,CAAC,OAAO,EAAE;YACpC,IAAI,CAAC,IAAA,8BAAsB,EAAC,MAAM,CAAC,EAAE;gBACnC,SAAS;aACV;YAED,IAAI,IAAA,qBAAY,EAAC,MAAM,CAAC,aAAa,EAAE,EAAE,SAAS,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE;gBAChE,MAAM,IAAI,yCAA4B,CAAC,MAAM,CAAC,CAAC;aAChD;SACF;IACH,CAAC;IAEO,MAAM,CAAC,4BAA4B,CAAC,OAAwB;QAClE,MAAM,OAAO,GAAG,IAAA,gBAAO,EAAC,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC;QAEpE,KAAK,MAAM,CAAC,QAAQ,EAAE,eAAe,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE;YACjE,IAAI,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE;gBAC9B,MAAM,IAAI,uCAA0B,CAAC,QAAQ,EAAE,eAAe,CAAC,MAAM,CAAC,CAAC;aACxE;SACF;IACH,CAAC;IAED,KAAK,CAAC,uBAAuB;QAC3B,OAAO,MAAM,IAAI,CAAC,UAAU,CAAC,uBAAuB,EAAE,CAAC;IACzD,CAAC;IAED,KAAK,CAAC,OAAO;QACX,OAAO,MAAM,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC;IACzC,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,WAAW;QACf,MAAM,oBAAoB,GAAG,MAAM,IAAI,CAAC,uBAAuB,EAAE,CAAC;QAElE,MAAM,YAAY,GAAG,IAAI,iDAAsB,CAC7C,oBAAoB,CACrB,CAAC,WAAW,EAAE,CAAC;QAEhB,MAAM,OAAO,GAAG,IAAI,CAAC,eAAe,CAAC;QACrC,MAAM,SAAS,GAAG,CAAC,OAAO,EAAE,UAAU,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC;QAE1E,OAAO;YACL,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,WAAW,EAAE,OAAO,CAAC,WAAW;YAChC,SAAS,EAAE,SAAS;YAEpB,MAAM,EAAE;gBACN,MAAM,EAAE,OAAO,CAAC,IAAI;gBACpB,QAAQ,EAAE,CAAC,GAAG,YAAY,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC,GAAG,CAChD,CAAC,CAAC,OAAO,EAAE,QAAQ,CAGlB,EAAE,EAAE,CACH,IAAA,gCAAwB,EAAC;oBACvB,GAAG,QAAQ;oBACX,eAAe,EAAE,OAAO,CAAC,IAAI;iBAC9B,CAAC,CACL;gBACD,OAAO,EAAE,CAAC,GAAG,YAAY,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;gBAE3C,UAAU,EAAE,CAAC,GAAG,YAAY,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CACnD,iCAAyB,CAC1B;aACF;SACF,CAAC;IACJ,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,YAAY,CAAC,GAAqB;QACtC,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC;QAEpD,MAAM,OAAO,GAAG,IAAI,CAAC,aAAa,EAAE,SAAS,CAAC,GAAG,EAAE,aAAa,CAAC,CAAC;QAClE,IAAI,OAAO,YAAY,OAAO,EAAE;YAC9B,MAAM,OAAO,CAAC;SACf;QAED,GAAG,CAAC,mBAAmB,EAAE,CAAC;QAE1B,IAAI,CAAC,aAAa,GAAG,IAAI,GAAG,EAA6C,CAAC;QAE1E,MAAM,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,IAAK,EAAY,CAAC;QAE5D,KAAK,MAAM,SAAS,IAAI,UAAU,CAAC,MAAM,CAAC,+BAAuB,CAAC,EAAE;YAClE,SAAS,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;YAE9B,MAAM,OAAO,GAAG,SAAS,CAAC,yBAAyB,EAAE,CAAC;YACtD,MAAM,YAAY,GAAG,GAAG,CAAC,mBAAmB,CAAC,OAAO,EAAE;gBACpD,gBAAgB,EAAE,IAAI;aACvB,CAAC,CAAC;YAEH,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,YAAY,EAAE,SAAS,CAAC,CAAC;SACjD;IACH,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,wBAAwB,CAAC,GAAqB;QAClD,IAAI;YACF,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC;YAEpD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;YAC3C,IAAI,IAAI,CAAC,aAAa,EAAE;gBACtB,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,GAClB,IAAI,CAAC,aAAa,CAAC,iBAAiB,CAAC,aAAa,CAAC,CAAC;gBAEtD,MAAM,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,CAChC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,0BAA0B,IAAI,IAAI,IAAI,EAAE,CAAC,CAC3D,CAAC;aACH;iBAAM;gBACL,MAAM,GAAG,CAAC,IAAI,EAAE,CAAC;aAClB;YAED,IAAI,IAAI,CAAC,aAAa,CAAC,IAAI,GAAG,CAAC,EAAE;gBAC/B,KAAK,MAAM,CAAC,YAAY,EAAE,SAAS,CAAC,IAAI,IAAI,CAAC,aAAa,EAAE;oBAC1D,MAAM,YAAY,CAAC,MAAM,EAAE,CAAC;oBAC5B,SAAS,CAAC,OAAO,EAAE,CAAC;iBACrB;aACF;SACF;QAAC,OAAO,GAAG,EAAE;YACZ,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAY,CAAC,CAAC;YAChC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SACjB;IACH,CAAC;IAED;;;;;;;OAOG;IACH,2BAA2B;QAIzB,OAAO;YACL,IAAI,CAAC,WAAW;YAChB;gBACE,kEAAkE;gBAClE,UAAU,EAAE,KAAK;gBACjB,MAAM,EAAE,IAAI,2BAAiB,CAAC,IAAI,CAAC,MAAM,CAAC;aAC3C;SACF,CAAC;IACJ,CAAC;IAEO,gBAAgB;QACtB,OAAO,IAAI,CAAC,UAAU,CAAC,gBAAgB,EAAE,CAAC;IAC5C,CAAC;CACF;AA/MD,0CA+MC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@rsdk/core",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.1.0",
|
|
4
4
|
"description": "Nestjs based microservice chassis",
|
|
5
5
|
"license": "Apache License 2.0",
|
|
6
6
|
"publishConfig": {
|
|
@@ -38,5 +38,5 @@
|
|
|
38
38
|
"reflect-metadata": "^0.1.13",
|
|
39
39
|
"rxjs": "^7.0.0"
|
|
40
40
|
},
|
|
41
|
-
"gitHead": "
|
|
41
|
+
"gitHead": "b98d43696f973cf6e21c6299bdddae9b1d8b8d4d"
|
|
42
42
|
}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import type { DynamicModule } from '@nestjs/common';
|
|
1
2
|
import { RsdkMetadataProvider } from '@rsdk/metadata';
|
|
2
3
|
|
|
3
4
|
import { ConfigContextModule } from './config/context/module';
|
|
@@ -59,4 +60,16 @@ export class ContextAggregator {
|
|
|
59
60
|
async getConfigContext(): Promise<ConfigContext> {
|
|
60
61
|
return (await this.getAggregated()).configContext;
|
|
61
62
|
}
|
|
63
|
+
|
|
64
|
+
async getRsdkMetadataProvider(): Promise<RsdkMetadataProvider> {
|
|
65
|
+
const aggregated = await this.getAggregated();
|
|
66
|
+
|
|
67
|
+
return aggregated.rsdkMetadataProvider;
|
|
68
|
+
}
|
|
69
|
+
|
|
70
|
+
async getRoot(): Promise<DynamicModule> {
|
|
71
|
+
const { root } = await this.getAggregated();
|
|
72
|
+
|
|
73
|
+
return root;
|
|
74
|
+
}
|
|
62
75
|
}
|
package/src/platform.context.ts
CHANGED
|
@@ -9,7 +9,7 @@ import { groupBy, intersection } from 'lodash';
|
|
|
9
9
|
|
|
10
10
|
import { ConfigMetadataProvider } from './config/metadata/config-metadata.provider';
|
|
11
11
|
import { Manifest } from './manifest/manifest';
|
|
12
|
-
import type { Config, SectionMetadata } from './config';
|
|
12
|
+
import type { Config, ConfigContext, SectionMetadata } from './config';
|
|
13
13
|
import { ContextAggregator } from './context.aggregator';
|
|
14
14
|
import {
|
|
15
15
|
DuplicateProtocolException,
|
|
@@ -107,15 +107,11 @@ export class PlatformContext {
|
|
|
107
107
|
}
|
|
108
108
|
|
|
109
109
|
async getRsdkMetadataProvider(): Promise<RsdkMetadataProvider> {
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
return aggregated.rsdkMetadataProvider;
|
|
110
|
+
return await this.aggregator.getRsdkMetadataProvider();
|
|
113
111
|
}
|
|
114
112
|
|
|
115
113
|
async getRoot(): Promise<DynamicModule> {
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
return root;
|
|
114
|
+
return await this.aggregator.getRoot();
|
|
119
115
|
}
|
|
120
116
|
|
|
121
117
|
/**
|
|
@@ -164,7 +160,7 @@ export class PlatformContext {
|
|
|
164
160
|
* Производит все необходимые проверки и инициализации транспортов, не запускает приложение
|
|
165
161
|
*/
|
|
166
162
|
async configureApp(app: INestApplication): Promise<void> {
|
|
167
|
-
const configContext = await this.
|
|
163
|
+
const configContext = await this.getConfigContext();
|
|
168
164
|
|
|
169
165
|
const awaiter = this.httpTransport?.configure(app, configContext);
|
|
170
166
|
if (awaiter instanceof Promise) {
|
|
@@ -195,7 +191,7 @@ export class PlatformContext {
|
|
|
195
191
|
*/
|
|
196
192
|
async runConfiguredApplication(app: INestApplication): Promise<void> {
|
|
197
193
|
try {
|
|
198
|
-
const configContext = await this.
|
|
194
|
+
const configContext = await this.getConfigContext();
|
|
199
195
|
|
|
200
196
|
this.logger.info('Mapping controllers...');
|
|
201
197
|
if (this.httpTransport) {
|
|
@@ -242,4 +238,8 @@ export class PlatformContext {
|
|
|
242
238
|
},
|
|
243
239
|
];
|
|
244
240
|
}
|
|
241
|
+
|
|
242
|
+
private getConfigContext(): Promise<ConfigContext> {
|
|
243
|
+
return this.aggregator.getConfigContext();
|
|
244
|
+
}
|
|
245
245
|
}
|