@rsdk/db.typeorm 4.0.0-next.2 → 4.0.0-next.3
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 +7 -0
- package/dist/providers/typeorm-logger.adapter.js +7 -1
- package/dist/providers/typeorm-logger.adapter.js.map +1 -1
- package/dist/providers/typeorm.healthcheck.js +6 -3
- package/dist/providers/typeorm.healthcheck.js.map +1 -1
- package/package.json +11 -9
- package/src/providers/typeorm-logger.adapter.ts +6 -1
- package/src/providers/typeorm.healthcheck.ts +7 -4
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,13 @@
|
|
|
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
|
+
## [4.0.0-next.3](https://github.com/R-Vision/rsdk/compare/v4.0.0-next.2...v4.0.0-next.3) (2023-11-12)
|
|
7
|
+
|
|
8
|
+
### Bug Fixes
|
|
9
|
+
|
|
10
|
+
* all yarn peers dependency issues ([e0db9ef](https://github.com/R-Vision/rsdk/commit/e0db9ef1ab8a4df4e1f8ff6f6a9e3728f497549b))
|
|
11
|
+
* one HEALTH_CHECK_QUERY + log it with trace level ([c6765da](https://github.com/R-Vision/rsdk/commit/c6765daedfec2e74230cc99234609dc57e2f39c3))
|
|
12
|
+
|
|
6
13
|
## [4.0.0-next.2](https://github.com/R-Vision/rsdk/compare/v4.0.0-next.1...v4.0.0-next.2) (2023-11-10)
|
|
7
14
|
|
|
8
15
|
**Note:** Version bump only for package @rsdk/db.typeorm
|
|
@@ -15,6 +15,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
15
15
|
exports.TypeormLoggerAdapter = void 0;
|
|
16
16
|
const common_1 = require("@nestjs/common");
|
|
17
17
|
const core_1 = require("@rsdk/core");
|
|
18
|
+
const db_1 = require("@rsdk/db");
|
|
18
19
|
let TypeormLoggerAdapter = class TypeormLoggerAdapter {
|
|
19
20
|
platformLogger;
|
|
20
21
|
constructor(platformLogger) {
|
|
@@ -22,7 +23,12 @@ let TypeormLoggerAdapter = class TypeormLoggerAdapter {
|
|
|
22
23
|
}
|
|
23
24
|
logQuery(query, parameters) {
|
|
24
25
|
const message = this.formatParts(`query: ${query}`, parameters && `parameters: ${JSON.stringify(parameters)}`);
|
|
25
|
-
|
|
26
|
+
if (query === db_1.HEALTH_CHECK_QUERY) {
|
|
27
|
+
this.platformLogger.trace(message);
|
|
28
|
+
}
|
|
29
|
+
else {
|
|
30
|
+
this.platformLogger.debug(message);
|
|
31
|
+
}
|
|
26
32
|
}
|
|
27
33
|
logMigration(message) {
|
|
28
34
|
this.platformLogger.info('Migration: ' + message);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"typeorm-logger.adapter.js","sourceRoot":"","sources":["../../src/providers/typeorm-logger.adapter.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA4C;AAC5C,qCAA0C;
|
|
1
|
+
{"version":3,"file":"typeorm-logger.adapter.js","sourceRoot":"","sources":["../../src/providers/typeorm-logger.adapter.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA4C;AAC5C,qCAA0C;AAC1C,iCAA8C;AAKvC,IAAM,oBAAoB,GAA1B,MAAM,oBAAoB;IACc;IAA7C,YAA6C,cAAuB;QAAvB,mBAAc,GAAd,cAAc,CAAS;IAAG,CAAC;IAExE,QAAQ,CAAC,KAAa,EAAE,UAAkB;QACxC,MAAM,OAAO,GAAG,IAAI,CAAC,WAAW,CAC9B,UAAU,KAAK,EAAE,EACjB,UAAU,IAAI,eAAe,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,EAAE,CAC1D,CAAC;QAEF,IAAI,KAAK,KAAK,uBAAkB,EAAE;YAChC,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;SACpC;aAAM;YACL,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;SACpC;IACH,CAAC;IAED,YAAY,CAAC,OAAe;QAC1B,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,aAAa,GAAG,OAAO,CAAC,CAAC;IACpD,CAAC;IAED,WAAW,CAAC,GAAG,KAAuC;QACpD,OAAO,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACzC,CAAC;IAED,YAAY,CAAC,IAAY,EAAE,KAAa,EAAE,UAAkB;QAC1D,MAAM,OAAO,GAAG,IAAI,CAAC,WAAW,CAC9B,UAAU,KAAK,EAAE,EACjB,UAAU,IAAI,cAAc,GAAG,UAAU,EACzC,SAAS,IAAI,EAAE,CAChB,CAAC;QAEF,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACpC,CAAC;IAED,aAAa,CAAC,KAAqB,EAAE,KAAa,EAAE,UAAkB;QACpE,MAAM,KAAK,GAAG;YACZ,UAAU,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE;YACjC,UAAU,KAAK,EAAE;YACjB,UAAU,IAAI,eAAe,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,EAAE;SAC1D,CAAC;QACF,MAAM,OAAO,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,KAAK,CAAC,CAAC;QAE3C,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IACrC,CAAC;IAED,cAAc,CAAC,OAAe;QAC5B,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,gBAAgB,OAAO,EAAE,CAAC,CAAC;IACtD,CAAC;IAED,GAAG,CAAC,KAA8B,EAAE,OAAY;QAC9C,IAAI,KAAK,KAAK,KAAK,EAAE;YACnB,OAAO,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;SAC1C;QAED,OAAO,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC;IAC7C,CAAC;CACF,CAAA;AAxDY,oDAAoB;+BAApB,oBAAoB;IADhC,IAAA,mBAAU,GAAE;IAEE,WAAA,IAAA,mBAAY,EAAC,SAAS,CAAC,CAAA;;GADzB,oBAAoB,CAwDhC"}
|
|
@@ -11,7 +11,9 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.TypeOrmHealthIndicator = void 0;
|
|
13
13
|
const common_1 = require("@nestjs/common");
|
|
14
|
+
const common_2 = require("@rsdk/common");
|
|
14
15
|
const core_1 = require("@rsdk/core");
|
|
16
|
+
const db_1 = require("@rsdk/db");
|
|
15
17
|
const typeorm_1 = require("typeorm");
|
|
16
18
|
let TypeOrmHealthIndicator = class TypeOrmHealthIndicator {
|
|
17
19
|
manager;
|
|
@@ -20,11 +22,12 @@ let TypeOrmHealthIndicator = class TypeOrmHealthIndicator {
|
|
|
20
22
|
}
|
|
21
23
|
async check() {
|
|
22
24
|
try {
|
|
23
|
-
|
|
24
|
-
return core_1.CheckResult.up(
|
|
25
|
+
await this.manager.query(db_1.HEALTH_CHECK_QUERY);
|
|
26
|
+
return core_1.CheckResult.up({ query: db_1.HEALTH_CHECK_QUERY });
|
|
25
27
|
}
|
|
26
28
|
catch (error) {
|
|
27
|
-
|
|
29
|
+
common_2.Assert.isError(error);
|
|
30
|
+
return core_1.CheckResult.down({ error: error.message });
|
|
28
31
|
}
|
|
29
32
|
}
|
|
30
33
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"typeorm.healthcheck.js","sourceRoot":"","sources":["../../src/providers/typeorm.healthcheck.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;
|
|
1
|
+
{"version":3,"file":"typeorm.healthcheck.js","sourceRoot":"","sources":["../../src/providers/typeorm.healthcheck.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,yCAAsC;AAEtC,qCAAoD;AACpD,iCAA8C;AAC9C,qCAAwC;AAIjC,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IACb;IAApB,YAAoB,OAAsB;QAAtB,YAAO,GAAP,OAAO,CAAe;IAAG,CAAC;IAE9C,KAAK,CAAC,KAAK;QACT,IAAI;YACF,MAAM,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,uBAAkB,CAAC,CAAC;YAE7C,OAAO,kBAAW,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,uBAAkB,EAAE,CAAC,CAAC;SACtD;QAAC,OAAO,KAAc,EAAE;YACvB,eAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;YACtB,OAAO,kBAAW,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC;SACnD;IACH,CAAC;CACF,CAAA;AAbY,wDAAsB;iCAAtB,sBAAsB;IAFlC,IAAA,mBAAU,GAAE;IACZ,IAAA,gBAAS,EAAC,SAAS,CAAC;qCAEU,uBAAa;GAD/B,sBAAsB,CAalC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@rsdk/db.typeorm",
|
|
3
|
-
"version": "4.0.0-next.
|
|
3
|
+
"version": "4.0.0-next.3",
|
|
4
4
|
"description": "Typeorm module for platform",
|
|
5
5
|
"license": "Apache License 2.0",
|
|
6
6
|
"publishConfig": {
|
|
@@ -14,16 +14,18 @@
|
|
|
14
14
|
"prepublishOnly": "npm run build"
|
|
15
15
|
},
|
|
16
16
|
"peerDependencies": {
|
|
17
|
-
"@nestjs/common": "^10.
|
|
18
|
-
"@nestjs/core": "^10.
|
|
17
|
+
"@nestjs/common": "^10.0.0",
|
|
18
|
+
"@nestjs/core": "^10.0.0",
|
|
19
19
|
"@nestjs/typeorm": "^10.0.0",
|
|
20
|
-
"@rsdk/common": "^4.0.0-next.
|
|
21
|
-
"@rsdk/common.nestjs": "^4.0.0-next.
|
|
22
|
-
"@rsdk/core": "^4.0.0-next.
|
|
23
|
-
"@rsdk/db": "^4.0.0-next.
|
|
24
|
-
"@rsdk/logging": "^4.0.0-next.
|
|
20
|
+
"@rsdk/common": "^4.0.0-next.3",
|
|
21
|
+
"@rsdk/common.nestjs": "^4.0.0-next.3",
|
|
22
|
+
"@rsdk/core": "^4.0.0-next.3",
|
|
23
|
+
"@rsdk/db": "^4.0.0-next.3",
|
|
24
|
+
"@rsdk/logging": "^4.0.0-next.3",
|
|
25
25
|
"@rsdk/nest-tools": "^4.0.0-next.2",
|
|
26
|
+
"reflect-metadata": "^0.1.13",
|
|
27
|
+
"rxjs": "^7.0.0",
|
|
26
28
|
"typeorm": "^0.3.12"
|
|
27
29
|
},
|
|
28
|
-
"gitHead": "
|
|
30
|
+
"gitHead": "313c39a379ea9ace9d94939223a53c46c12d77f9"
|
|
29
31
|
}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { Injectable } from '@nestjs/common';
|
|
2
2
|
import { InjectLogger } from '@rsdk/core';
|
|
3
|
+
import { HEALTH_CHECK_QUERY } from '@rsdk/db';
|
|
3
4
|
import { ILogger } from '@rsdk/logging';
|
|
4
5
|
import type { Logger } from 'typeorm';
|
|
5
6
|
|
|
@@ -13,7 +14,11 @@ export class TypeormLoggerAdapter implements Logger {
|
|
|
13
14
|
parameters && `parameters: ${JSON.stringify(parameters)}`,
|
|
14
15
|
);
|
|
15
16
|
|
|
16
|
-
|
|
17
|
+
if (query === HEALTH_CHECK_QUERY) {
|
|
18
|
+
this.platformLogger.trace(message);
|
|
19
|
+
} else {
|
|
20
|
+
this.platformLogger.debug(message);
|
|
21
|
+
}
|
|
17
22
|
}
|
|
18
23
|
|
|
19
24
|
logMigration(message: string): any {
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import { Injectable } from '@nestjs/common';
|
|
2
|
+
import { Assert } from '@rsdk/common';
|
|
2
3
|
import type { HealthIndicator } from '@rsdk/core';
|
|
3
4
|
import { CheckResult, Indicator } from '@rsdk/core';
|
|
5
|
+
import { HEALTH_CHECK_QUERY } from '@rsdk/db';
|
|
4
6
|
import { EntityManager } from 'typeorm';
|
|
5
7
|
|
|
6
8
|
@Injectable()
|
|
@@ -10,11 +12,12 @@ export class TypeOrmHealthIndicator implements HealthIndicator {
|
|
|
10
12
|
|
|
11
13
|
async check(): Promise<CheckResult> {
|
|
12
14
|
try {
|
|
13
|
-
|
|
15
|
+
await this.manager.query(HEALTH_CHECK_QUERY);
|
|
14
16
|
|
|
15
|
-
return CheckResult.up(
|
|
16
|
-
} catch (error:
|
|
17
|
-
|
|
17
|
+
return CheckResult.up({ query: HEALTH_CHECK_QUERY });
|
|
18
|
+
} catch (error: unknown) {
|
|
19
|
+
Assert.isError(error);
|
|
20
|
+
return CheckResult.down({ error: error.message });
|
|
18
21
|
}
|
|
19
22
|
}
|
|
20
23
|
}
|