@rsdk/db.typeorm 5.16.0-next.3 → 5.17.0-next.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/modules/metrics.module.d.ts +1 -0
- package/dist/modules/metrics.module.js +11 -0
- package/dist/modules/metrics.module.js.map +1 -1
- package/package.json +5 -5
- package/src/modules/metrics.module.spec.ts +4 -4
- package/src/modules/metrics.module.ts +11 -0
- package/tsconfig.build.json +3 -0
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
|
+
## [5.16.0](https://github.com/R-Vision/rsdk/compare/v5.16.0-next.3...v5.16.0) (2026-11-16)
|
|
7
|
+
|
|
8
|
+
**Note:** Version bump only for package @rsdk/db.typeorm
|
|
9
|
+
|
|
6
10
|
## [5.15.0](https://github.com/R-Vision/rsdk/compare/v5.15.0-next.14...v5.15.0) (2026-10-30)
|
|
7
11
|
|
|
8
12
|
**Note:** Version bump only for package @rsdk/db.typeorm
|
|
@@ -22,6 +22,7 @@ export declare class TypeOrmMetricsModule extends DbMetricsModuleBase implements
|
|
|
22
22
|
*/
|
|
23
23
|
constructor(dataSource: DataSource, client: DbClientMetrics | null, entityOperations: EntityOperationsRecorder | null, queryCache: TypeOrmQueryCache | null, logger: ILogger);
|
|
24
24
|
protected attach(add: (detach?: Detach) => void, client: DbClientMetrics): void;
|
|
25
|
+
protected closeOrm(): Promise<void>;
|
|
25
26
|
/**
|
|
26
27
|
* Master инструментируется первым. Если он не прошёл проверку (warning
|
|
27
28
|
* пишет `instrumentPool`), реплики не инструментируются: запись идёт
|
|
@@ -51,6 +51,17 @@ let TypeOrmMetricsModule = class TypeOrmMetricsModule extends plugin_kit_1.DbMet
|
|
|
51
51
|
add((0, subscribers_1.addSubscriber)(this.dataSource, new entity_operations_subscriber_1.EntityOperationsSubscriber(this.entityOperations)));
|
|
52
52
|
}
|
|
53
53
|
}
|
|
54
|
+
async closeOrm() {
|
|
55
|
+
try {
|
|
56
|
+
if (this.dataSource.isInitialized) {
|
|
57
|
+
await this.dataSource.destroy();
|
|
58
|
+
}
|
|
59
|
+
}
|
|
60
|
+
catch (error) {
|
|
61
|
+
// Как и @nestjs/typeorm, не прерываем остановку приложения
|
|
62
|
+
this.logger.error('Failed to close the data source', error);
|
|
63
|
+
}
|
|
64
|
+
}
|
|
54
65
|
/**
|
|
55
66
|
* Master инструментируется первым. Если он не прошёл проверку (warning
|
|
56
67
|
* пишет `instrumentPool`), реплики не инструментируются: запись идёт
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metrics.module.js","sourceRoot":"","sources":["../../src/modules/metrics.module.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,2CAAgD;AAChD,qCAA0C;AAM1C,iEAK0C;AAE1C,qCAAqC;AAErC,0FAAqF;AACrF,kDAAkD;AAClD,wFAAmF;AACnF,wDAAuD;AACvD,gEAA+D;AAE/D;;;;;;;GAOG;AAII,IAAM,oBAAoB,GAA1B,MAAM,oBACX,SAAQ,gCAAmB;IAQR;IAKA;IACoC;IAXvD;;;OAGG;IACH,YACmB,UAAsB,EACN,MAA8B,EAE/D,gBAAiD,EAEhC,UAAoC,EACA,MAAe;QAEpE,KAAK,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;QARf,eAAU,GAAV,UAAU,CAAY;QAKtB,eAAU,GAAV,UAAU,CAA0B;QACA,WAAM,GAAN,MAAM,CAAS;IAGtE,CAAC;IAES,MAAM,CACd,GAA8B,EAC9B,MAAuB;QAEvB,IAAI,CAAC,eAAe,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;QAClC,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,CAAC;QAE/B,IAAI,IAAI,CAAC,gBAAgB,EAAE,CAAC;YAC1B,GAAG,CACD,IAAA,2BAAa,EACX,IAAI,CAAC,UAAU,EACf,IAAI,yDAA0B,CAAC,IAAI,CAAC,gBAAgB,CAAC,CACtD,CACF,CAAC;QACJ,CAAC;IACH,CAAC;IAED;;;;;;;;OAQG;IACK,eAAe,CACrB,GAA8B,EAC9B,MAAuB;QAEvB,MAAM,CAAC,MAAM,EAAE,GAAG,QAAQ,CAAC,GAAG,IAAA,sBAAW,EAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAC3D,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,gDAAgD,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,EAAE,CAC/E,CAAC;YACF,OAAO;QACT,CAAC;QAED,MAAM,YAAY,GAAG,MAAM,CAAC,cAAc,CACxC,IAAI,EACJ,MAAM,CAAC,IAAI,EACX,MAAM,CAAC,QAAQ,EACf,IAAI,CAAC,MAAM,EACX,EAAE,iBAAiB,EAAE,IAAI,EAAE,CAC5B,CAAC;QACF,IAAI,CAAC,YAAY,EAAE,CAAC;YAClB,OAAO;QACT,CAAC;QAED,GAAG,CAAC,YAAY,CAAC,CAAC;QAClB,KAAK,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,QAAQ,EAAE,CAAC;YAC1C,GAAG,CACD,MAAM,CAAC,cAAc,CAAC,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,CAAC,MAAM,EAAE;gBACvD,iBAAiB,EAAE,IAAI;aACxB,CAAC,CACH,CAAC;QACJ,CAAC;IACH,CAAC;IAEO,oBAAoB,CAAC,GAA8B;QACzD,MAAM,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAAC;QAC/C,IAAI,CAAC,KAAK,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;YAC/B,OAAO;QACT,CAAC;QAED,GAAG,CAAC,IAAI,uDAAyB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC;IACxE,CAAC;CACF,CAAA;
|
|
1
|
+
{"version":3,"file":"metrics.module.js","sourceRoot":"","sources":["../../src/modules/metrics.module.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@rsdk/db.typeorm",
|
|
3
|
-
"version": "5.
|
|
3
|
+
"version": "5.17.0-next.0",
|
|
4
4
|
"description": "TypeOrm module for platform",
|
|
5
5
|
"license": "Apache License 2.0",
|
|
6
6
|
"publishConfig": {
|
|
@@ -14,9 +14,9 @@
|
|
|
14
14
|
"prepublishOnly": "npm run build"
|
|
15
15
|
},
|
|
16
16
|
"peerDependencies": {
|
|
17
|
-
"@nestjs/common": "^
|
|
18
|
-
"@nestjs/core": "^
|
|
19
|
-
"@nestjs/typeorm": "^
|
|
17
|
+
"@nestjs/common": "^11.2.9",
|
|
18
|
+
"@nestjs/core": "^11.2.9",
|
|
19
|
+
"@nestjs/typeorm": "^11.0.3",
|
|
20
20
|
"@rsdk/common": "*",
|
|
21
21
|
"@rsdk/common.nestjs": "*",
|
|
22
22
|
"@rsdk/common.node": "*",
|
|
@@ -28,5 +28,5 @@
|
|
|
28
28
|
"rxjs": "^7.1.0",
|
|
29
29
|
"typeorm": "^0.3.12"
|
|
30
30
|
},
|
|
31
|
-
"gitHead": "
|
|
31
|
+
"gitHead": "c65206299ce1f0f1e209bb936721a1537bc4a064"
|
|
32
32
|
}
|
|
@@ -96,8 +96,8 @@ describe('TypeOrmMetricsModule pool instrumentation', () => {
|
|
|
96
96
|
module.onModuleInit();
|
|
97
97
|
};
|
|
98
98
|
|
|
99
|
-
afterEach(() => {
|
|
100
|
-
module?.onApplicationShutdown();
|
|
99
|
+
afterEach(async () => {
|
|
100
|
+
await module?.onApplicationShutdown();
|
|
101
101
|
module = undefined;
|
|
102
102
|
logger.warn.mockReset();
|
|
103
103
|
logger.info.mockReset();
|
|
@@ -244,7 +244,7 @@ describe('TypeOrmMetricsModule injected metrics', () => {
|
|
|
244
244
|
expect(inc).toHaveBeenCalledWith({ result: 'miss' });
|
|
245
245
|
expect(dataSourceMock.subscribers).toHaveLength(1);
|
|
246
246
|
|
|
247
|
-
module.onApplicationShutdown();
|
|
247
|
+
await module.onApplicationShutdown();
|
|
248
248
|
|
|
249
249
|
expect(dataSourceMock.subscribers).toHaveLength(0);
|
|
250
250
|
});
|
|
@@ -262,6 +262,6 @@ describe('TypeOrmMetricsModule injected metrics', () => {
|
|
|
262
262
|
expect(inc).not.toHaveBeenCalled();
|
|
263
263
|
expect(dataSourceMock.subscribers).toHaveLength(0);
|
|
264
264
|
|
|
265
|
-
module.onApplicationShutdown();
|
|
265
|
+
await module.onApplicationShutdown();
|
|
266
266
|
});
|
|
267
267
|
});
|
|
@@ -69,6 +69,17 @@ export class TypeOrmMetricsModule
|
|
|
69
69
|
}
|
|
70
70
|
}
|
|
71
71
|
|
|
72
|
+
protected async closeOrm(): Promise<void> {
|
|
73
|
+
try {
|
|
74
|
+
if (this.dataSource.isInitialized) {
|
|
75
|
+
await this.dataSource.destroy();
|
|
76
|
+
}
|
|
77
|
+
} catch (error) {
|
|
78
|
+
// Как и @nestjs/typeorm, не прерываем остановку приложения
|
|
79
|
+
this.logger.error('Failed to close the data source', error as Error);
|
|
80
|
+
}
|
|
81
|
+
}
|
|
82
|
+
|
|
72
83
|
/**
|
|
73
84
|
* Master инструментируется первым. Если он не прошёл проверку (warning
|
|
74
85
|
* пишет `instrumentPool`), реплики не инструментируются: запись идёт
|