@rsdk/db.typeorm 5.8.0-next.0 → 5.8.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/dist/providers/typeorm.config.d.ts +4 -0
- package/dist/providers/typeorm.config.js +32 -0
- package/dist/providers/typeorm.config.js.map +1 -1
- package/dist/typeorm.plugin.js +2 -0
- package/dist/typeorm.plugin.js.map +1 -1
- package/package.json +2 -2
- package/src/providers/typeorm.config.ts +24 -0
- package/src/typeorm.plugin.ts +2 -0
|
@@ -9,4 +9,8 @@ export declare class TypeOrmPluginConfig extends Config {
|
|
|
9
9
|
reconnectInterval: Timespan;
|
|
10
10
|
keepAlive: boolean;
|
|
11
11
|
keepAliveInitialDelay: number;
|
|
12
|
+
allowSelfSignedCert?: boolean | undefined;
|
|
13
|
+
tlsCa?: string | undefined;
|
|
14
|
+
tlsCert?: string | undefined;
|
|
15
|
+
tlsKey?: string | undefined;
|
|
12
16
|
}
|
|
@@ -21,6 +21,10 @@ let TypeOrmPluginConfig = class TypeOrmPluginConfig extends core_1.Config {
|
|
|
21
21
|
reconnectInterval;
|
|
22
22
|
keepAlive;
|
|
23
23
|
keepAliveInitialDelay;
|
|
24
|
+
allowSelfSignedCert;
|
|
25
|
+
tlsCa;
|
|
26
|
+
tlsCert;
|
|
27
|
+
tlsKey;
|
|
24
28
|
};
|
|
25
29
|
exports.TypeOrmPluginConfig = TypeOrmPluginConfig;
|
|
26
30
|
__decorate([
|
|
@@ -95,6 +99,34 @@ __decorate([
|
|
|
95
99
|
}),
|
|
96
100
|
__metadata("design:type", Number)
|
|
97
101
|
], TypeOrmPluginConfig.prototype, "keepAliveInitialDelay", void 0);
|
|
102
|
+
__decorate([
|
|
103
|
+
(0, core_1.Property)('ALLOW_SELF_SIGNED_CERT', new core_1.BoolParser(), {
|
|
104
|
+
defaultValue: undefined,
|
|
105
|
+
description: 'Allow self-signed certificates',
|
|
106
|
+
}),
|
|
107
|
+
__metadata("design:type", Object)
|
|
108
|
+
], TypeOrmPluginConfig.prototype, "allowSelfSignedCert", void 0);
|
|
109
|
+
__decorate([
|
|
110
|
+
(0, core_1.Property)('TLS_CA', new core_1.StringParser(), {
|
|
111
|
+
defaultValue: undefined,
|
|
112
|
+
description: 'CA certificate (filepath or content)',
|
|
113
|
+
}),
|
|
114
|
+
__metadata("design:type", Object)
|
|
115
|
+
], TypeOrmPluginConfig.prototype, "tlsCa", void 0);
|
|
116
|
+
__decorate([
|
|
117
|
+
(0, core_1.Property)('TLS_CERT', new core_1.StringParser(), {
|
|
118
|
+
defaultValue: undefined,
|
|
119
|
+
description: 'Client certificate (filepath or content)',
|
|
120
|
+
}),
|
|
121
|
+
__metadata("design:type", Object)
|
|
122
|
+
], TypeOrmPluginConfig.prototype, "tlsCert", void 0);
|
|
123
|
+
__decorate([
|
|
124
|
+
(0, core_1.Property)('TLS_KEY', new core_1.StringParser(), {
|
|
125
|
+
defaultValue: undefined,
|
|
126
|
+
description: 'Client key (filepath or content)',
|
|
127
|
+
}),
|
|
128
|
+
__metadata("design:type", Object)
|
|
129
|
+
], TypeOrmPluginConfig.prototype, "tlsKey", void 0);
|
|
98
130
|
exports.TypeOrmPluginConfig = TypeOrmPluginConfig = __decorate([
|
|
99
131
|
(0, core_1.ConfigSection)({
|
|
100
132
|
name: 'typeorm database config',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"typeorm.config.js","sourceRoot":"","sources":["../../src/providers/typeorm.config.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yCAA8C;AAC9C,qCAUoB;AAOb,IAAM,mBAAmB,GAAzB,MAAM,mBAAoB,SAAQ,aAAM;IAI7C,GAAG,CAAO;IASV,MAAM,CAAU;IAShB,OAAO,CAAU;IASjB,OAAO,CAAU;IAMjB,iBAAiB,CAAU;IAM3B,iBAAiB,CAAY;IAU7B,SAAS,CAAW;IAUpB,qBAAqB,CAAU;
|
|
1
|
+
{"version":3,"file":"typeorm.config.js","sourceRoot":"","sources":["../../src/providers/typeorm.config.ts"],"names":[],"mappings":"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"}
|
package/dist/typeorm.plugin.js
CHANGED
|
@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
7
7
|
exports.TypeOrmPlugin = void 0;
|
|
8
8
|
const typeorm_1 = require("@nestjs/typeorm");
|
|
9
9
|
const core_1 = require("@rsdk/core");
|
|
10
|
+
const db_1 = require("@rsdk/db");
|
|
10
11
|
const logging_1 = require("@rsdk/logging");
|
|
11
12
|
const node_path_1 = __importDefault(require("node:path"));
|
|
12
13
|
const exceptions_1 = require("./internal/exceptions");
|
|
@@ -68,6 +69,7 @@ class TypeOrmPlugin {
|
|
|
68
69
|
max: config.poolMax,
|
|
69
70
|
keepAlive: config.keepAlive,
|
|
70
71
|
keepAliveInitialDelay: config.keepAliveInitialDelay,
|
|
72
|
+
ssl: (0, db_1.getSecureContextOptions)(config),
|
|
71
73
|
},
|
|
72
74
|
migrations,
|
|
73
75
|
migrationsTableName: 'typeorm_migrations',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"typeorm.plugin.js","sourceRoot":"","sources":["../src/typeorm.plugin.ts"],"names":[],"mappings":";AAAA,iDAAiD;;;;;;AAIjD,6CAAgD;AAOhD,qCAAsC;AACtC,2CAA8C;AAC9C,0DAA6B;AAG7B,sDAAgE;AAChE,wDAAqD;AACrD,iFAA4E;AAC5E,6HAAqH;AACrH,2CAIqB;AACrB,6EAAuE;AAGvE,MAAa,aAAa;IAMK;IALrB,MAAM,CAAU,MAAM,GAAG,uBAAa,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;IAErE;;OAEG;IACH,YAA6B,OAA6B;QAA7B,YAAO,GAAP,OAAO,CAAsB;QACxD,yBAAW,CAAC,UAAU,EAAE,CAAC;IAC3B,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,IAAI,EAAE,OAAO,EAAE,QAAQ,CAAC;IACjC,CAAC;IAED,aAAa;QACX,OAAO,KAAK,CAAC;IACf,CAAC;IAED,OAAO;QACL,MAAM,UAAU,GAAG,IAAI,CAAC,mBAAmB,EAAE,CAAC;QAC9C,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC5B,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;QACpD,CAAC;QAED,OAAO;YACL,uBAAa,CAAC,YAAY,CAAC;gBACzB,OAAO,EAAE;oBACP;wBACE,MAAM,EAAE,uBAAa;wBACrB,SAAS,EAAE,CAAC,kCAAsB,EAAE,gCAAoB,CAAC;wBACzD,OAAO,EAAE,CAAC,gCAAoB,CAAC;qBAChC;iBACF;gBACD,MAAM,EAAE,CAAC,+BAAmB,EAAE,gCAAoB,EAAE,eAAQ,CAAC;gBAC7D,UAAU,EAAE,CACV,MAA2B,EAC3B,MAA4B,EAC5B,OAAe,EACO,EAAE,CAAC,CAAC;oBAC1B;;;;uBAIG;oBACH,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI;oBACvB,GAAG,EAAE,MAAM,CAAC,GAAG,CAAC,QAAQ,EAAE;oBAC1B,GAAG,CAAC,MAAM,CAAC,MAAM,IAAI;wBACnB,MAAM,EAAE,MAAM,CAAC,MAAM;qBACtB,CAAC;oBACF,MAAM;oBACN,GAAG,CAAC,IAAI,CAAC,QAAQ,IAAI,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC;oBACjD,gBAAgB,EAAE,CAAC,IAAI,CAAC,QAAQ;oBAChC,UAAU,EAAE,MAAM,CAAC,iBAAiB,CAAC,MAAM,EAAE;oBAC7C,aAAa,EAAE,MAAM,CAAC,iBAAiB;oBACvC,eAAe,EAAE,OAAO,GAAG,UAAU;oBACrC,KAAK,EAAE;wBACL,GAAG,EAAE,MAAM,CAAC,OAAO;wBACnB,GAAG,EAAE,MAAM,CAAC,OAAO;wBACnB,SAAS,EAAE,MAAM,CAAC,SAAS;wBAC3B,qBAAqB,EAAE,MAAM,CAAC,qBAAqB;
|
|
1
|
+
{"version":3,"file":"typeorm.plugin.js","sourceRoot":"","sources":["../src/typeorm.plugin.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.8.0-next.
|
|
3
|
+
"version": "5.8.0-next.2",
|
|
4
4
|
"description": "TypeOrm module for platform",
|
|
5
5
|
"license": "Apache License 2.0",
|
|
6
6
|
"publishConfig": {
|
|
@@ -28,5 +28,5 @@
|
|
|
28
28
|
"rxjs": "^7.1.0",
|
|
29
29
|
"typeorm": "^0.3.12"
|
|
30
30
|
},
|
|
31
|
-
"gitHead": "
|
|
31
|
+
"gitHead": "b2d33ec333bce5108a9a7ec8d1502c19bb968283"
|
|
32
32
|
}
|
|
@@ -80,4 +80,28 @@ export class TypeOrmPluginConfig extends Config {
|
|
|
80
80
|
`,
|
|
81
81
|
})
|
|
82
82
|
keepAliveInitialDelay!: number;
|
|
83
|
+
|
|
84
|
+
@Property('ALLOW_SELF_SIGNED_CERT', new BoolParser(), {
|
|
85
|
+
defaultValue: undefined,
|
|
86
|
+
description: 'Allow self-signed certificates',
|
|
87
|
+
})
|
|
88
|
+
allowSelfSignedCert?: boolean | undefined;
|
|
89
|
+
|
|
90
|
+
@Property('TLS_CA', new StringParser(), {
|
|
91
|
+
defaultValue: undefined,
|
|
92
|
+
description: 'CA certificate (filepath or content)',
|
|
93
|
+
})
|
|
94
|
+
tlsCa?: string | undefined;
|
|
95
|
+
|
|
96
|
+
@Property('TLS_CERT', new StringParser(), {
|
|
97
|
+
defaultValue: undefined,
|
|
98
|
+
description: 'Client certificate (filepath or content)',
|
|
99
|
+
})
|
|
100
|
+
tlsCert?: string | undefined;
|
|
101
|
+
|
|
102
|
+
@Property('TLS_KEY', new StringParser(), {
|
|
103
|
+
defaultValue: undefined,
|
|
104
|
+
description: 'Client key (filepath or content)',
|
|
105
|
+
})
|
|
106
|
+
tlsKey?: string | undefined;
|
|
83
107
|
}
|
package/src/typeorm.plugin.ts
CHANGED
|
@@ -10,6 +10,7 @@ import type {
|
|
|
10
10
|
PlatformAppPlugin,
|
|
11
11
|
} from '@rsdk/core';
|
|
12
12
|
import { APP_NAME } from '@rsdk/core';
|
|
13
|
+
import { getSecureContextOptions } from '@rsdk/db';
|
|
13
14
|
import { LoggerFactory } from '@rsdk/logging';
|
|
14
15
|
import path from 'node:path';
|
|
15
16
|
import type { DataSourceOptions } from 'typeorm';
|
|
@@ -86,6 +87,7 @@ export class TypeOrmPlugin implements PlatformAppPlugin {
|
|
|
86
87
|
max: config.poolMax,
|
|
87
88
|
keepAlive: config.keepAlive,
|
|
88
89
|
keepAliveInitialDelay: config.keepAliveInitialDelay,
|
|
90
|
+
ssl: getSecureContextOptions(config),
|
|
89
91
|
},
|
|
90
92
|
migrations,
|
|
91
93
|
migrationsTableName: 'typeorm_migrations',
|