@rsdk/db.mikro-orm 5.8.0-next.1 → 5.8.0-next.3

package/dist/mikro-orm.plugin.js

@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MikroOrmPlugin = void 0;
 const nestjs_1 = require("@mikro-orm/nestjs");
 const core_1 = require("@rsdk/core");
+const db_1 = require("@rsdk/db");
 const logging_1 = require("@rsdk/logging");
 const lodash_1 = __importDefault(require("lodash"));
 const node_path_1 = __importDefault(require("node:path"));
@@ -65,11 +66,14 @@ class MikroOrmPlugin {
                             glob: '!(*.d).{js,ts}',
                         },
                         allowGlobalContext: true,
-                        ...this.options.overrideConfig,
                         driverOptions: {
-                            keepAlive: config.keepAlive,
-                            keepAliveInitialDelay: config.keepAliveInitialDelay,
+                            connection: {
+                                keepAlive: config.keepAlive,
+                                keepAliveInitialDelay: config.keepAliveInitialDelay,
+                                ssl: (0, db_1.getSecureContextOptions)(config),
+                            },
                         },
+                        ...this.options.overrideConfig,
                     })
                         .omitBy(lodash_1.default.isUndefined)
                         .omitBy(lodash_1.default.isNull)

package/dist/mikro-orm.plugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"mikro-orm.plugin.js","sourceRoot":"","sources":["../src/mikro-orm.plugin.ts"],"names":[],"mappings":";AAAA,iDAAiD;;;;;;AAGjD,8CAAmD;AAQnD,qCAAsC;AACtC,2CAA8C;AAC9C,oDAAuB;AACvB,0DAA6B;AAE7B,mEAAoE;AACpE,mFAAuE;AACvE,iFAA0E;AAC1E,2CAAsD;AAGtD,MAAa,cAAc;IAMI;IALrB,MAAM,CAAU,MAAM,GAAG,uBAAa,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;IAEtE;;OAEG;IACH,YAA6B,OAA8B;QAA9B,YAAO,GAAP,OAAO,CAAuB;IAAG,CAAC;IAE/D,IAAI,QAAQ;QACV,OAAO,IAAI,EAAE,OAAO,EAAE,UAAU,CAAC;IACnC,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,cAAc,CAAC,MAAM,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;QACrD,CAAC;QAED,OAAO;YACL,uBAAc,CAAC,YAAY,CAAC;gBAC1B,OAAO,EAAE;oBACP;wBACE,MAAM,EAAE,uBAAc;wBACtB,SAAS,EAAE,CAAC,mCAAuB,EAAE,0CAAe,CAAC;wBACrD,OAAO,EAAE,CAAC,0CAAe,CAAC;qBAC3B;iBACF;gBACD,MAAM,EAAE,CAAC,uCAAoB,EAAE,0CAAe,EAAE,eAAQ,CAAC;gBACzD,UAAU,EAAE,CACV,MAA4B,EAC5B,MAAuB,EACvB,OAAe,EACY,EAAE;oBAC7B,OAAO,IAAA,gBAAC,EAA4B;wBAClC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI;wBACvB,SAAS,EAAE,MAAM,CAAC,GAAG,CAAC,QAAQ,EAAE;wBAChC,GAAG,CAAC,MAAM,CAAC,MAAM,IAAI;4BACnB,MAAM,EAAE,MAAM,CAAC,MAAM;yBACtB,CAAC;wBACF,aAAa,EAAE,GAAG,EAAE,CAAC,MAAM;wBAC3B,QAAQ,EAAE,IAAI,CAAC,QAAQ;wBACvB,gBAAgB,EAAE,CAAC,IAAI,CAAC,QAAQ;wBAChC,IAAI,EAAE,OAAO,GAAG,YAAY;wBAC5B,IAAI,EAAE;4BACJ,GAAG,EAAE,MAAM,CAAC,OAAO;4BACnB,GAAG,EAAE,MAAM,CAAC,OAAO;yBACpB;wBACD,UAAU,EAAE;4BACV,SAAS,EAAE,sBAAsB;4BACjC,IAAI,EAAE,cAAc;4BACpB,IAAI,EAAE,gBAAgB;yBACvB;wBACD,kBAAkB,EAAE,IAAI;wBACxB,GAAI,IAAI,CAAC,OAAO,CAAC,cAAsB;wBACvC,aAAa,EAAE;4BACb,SAAS,EAAE,MAAM,CAAC,SAAS;4BAC3B,qBAAqB,EAAE,MAAM,CAAC,qBAAqB;yBACpD;qBACF,CAAC;yBACC,MAAM,CAAC,gBAAC,CAAC,WAAW,CAAC;yBACrB,MAAM,CAAC,gBAAC,CAAC,MAAM,CAAC;yBAChB,KAAK,EAAE,CAAC;gBACb,CAAC;aACF,CAAC;SACH,CAAC;IACJ,CAAC;IAED,iBAAiB;QACf,OAAO,CAAC,IAAI,uDAAwB,EAAE,CAAC,CAAC;IAC1C,CAAC;IAEO,mBAAmB;QACzB,OAAO,CAAC,mBAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,2BAA2B,CAAC,CAAC,CAAC;IACpE,CAAC;;AA7EH,wCA8EC"}
+{"version":3,"file":"mikro-orm.plugin.js","sourceRoot":"","sources":["../src/mikro-orm.plugin.ts"],"names":[],"mappings":";AAAA,iDAAiD;;;;;;AAGjD,8CAAmD;AAQnD,qCAAsC;AACtC,iCAAmD;AACnD,2CAA8C;AAC9C,oDAAuB;AACvB,0DAA6B;AAE7B,mEAAoE;AACpE,mFAAuE;AACvE,iFAA0E;AAC1E,2CAAsD;AAGtD,MAAa,cAAc;IAMI;IALrB,MAAM,CAAU,MAAM,GAAG,uBAAa,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;IAEtE;;OAEG;IACH,YAA6B,OAA8B;QAA9B,YAAO,GAAP,OAAO,CAAuB;IAAG,CAAC;IAE/D,IAAI,QAAQ;QACV,OAAO,IAAI,EAAE,OAAO,EAAE,UAAU,CAAC;IACnC,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,cAAc,CAAC,MAAM,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;QACrD,CAAC;QAED,OAAO;YACL,uBAAc,CAAC,YAAY,CAAC;gBAC1B,OAAO,EAAE;oBACP;wBACE,MAAM,EAAE,uBAAc;wBACtB,SAAS,EAAE,CAAC,mCAAuB,EAAE,0CAAe,CAAC;wBACrD,OAAO,EAAE,CAAC,0CAAe,CAAC;qBAC3B;iBACF;gBACD,MAAM,EAAE,CAAC,uCAAoB,EAAE,0CAAe,EAAE,eAAQ,CAAC;gBACzD,UAAU,EAAE,CACV,MAA4B,EAC5B,MAAuB,EACvB,OAAe,EACY,EAAE;oBAC7B,OAAO,IAAA,gBAAC,EAA4B;wBAClC,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI;wBACvB,SAAS,EAAE,MAAM,CAAC,GAAG,CAAC,QAAQ,EAAE;wBAChC,GAAG,CAAC,MAAM,CAAC,MAAM,IAAI;4BACnB,MAAM,EAAE,MAAM,CAAC,MAAM;yBACtB,CAAC;wBACF,aAAa,EAAE,GAAG,EAAE,CAAC,MAAM;wBAC3B,QAAQ,EAAE,IAAI,CAAC,QAAQ;wBACvB,gBAAgB,EAAE,CAAC,IAAI,CAAC,QAAQ;wBAChC,IAAI,EAAE,OAAO,GAAG,YAAY;wBAC5B,IAAI,EAAE;4BACJ,GAAG,EAAE,MAAM,CAAC,OAAO;4BACnB,GAAG,EAAE,MAAM,CAAC,OAAO;yBACpB;wBACD,UAAU,EAAE;4BACV,SAAS,EAAE,sBAAsB;4BACjC,IAAI,EAAE,cAAc;4BACpB,IAAI,EAAE,gBAAgB;yBACvB;wBACD,kBAAkB,EAAE,IAAI;wBACxB,aAAa,EAAE;4BACb,UAAU,EAAE;gCACV,SAAS,EAAE,MAAM,CAAC,SAAS;gCAC3B,qBAAqB,EAAE,MAAM,CAAC,qBAAqB;gCACnD,GAAG,EAAE,IAAA,4BAAuB,EAAC,MAAM,CAAC;6BACrC;yBACF;wBACD,GAAI,IAAI,CAAC,OAAO,CAAC,cAAsB;qBACxC,CAAC;yBACC,MAAM,CAAC,gBAAC,CAAC,WAAW,CAAC;yBACrB,MAAM,CAAC,gBAAC,CAAC,MAAM,CAAC;yBAChB,KAAK,EAAE,CAAC;gBACb,CAAC;aACF,CAAC;SACH,CAAC;IACJ,CAAC;IAED,iBAAiB;QACf,OAAO,CAAC,IAAI,uDAAwB,EAAE,CAAC,CAAC;IAC1C,CAAC;IAEO,mBAAmB;QACzB,OAAO,CAAC,mBAAI,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,2BAA2B,CAAC,CAAC,CAAC;IACpE,CAAC;;AAhFH,wCAiFC"}

package/dist/providers/mikro-orm.config.d.ts

@@ -6,4 +6,8 @@ export declare class MikroOrmPluginConfig extends Config {
     poolMax: number;
     keepAlive: boolean;
     keepAliveInitialDelay: number;
+    allowSelfSignedCert?: boolean | undefined;
+    tlsCa?: string | undefined;
+    tlsCert?: string | undefined;
+    tlsKey?: string | undefined;
 }

package/dist/providers/mikro-orm.config.js

@@ -19,6 +19,10 @@ let MikroOrmPluginConfig = class MikroOrmPluginConfig extends core_1.Config {
     poolMax;
     keepAlive;
     keepAliveInitialDelay;
+    allowSelfSignedCert;
+    tlsCa;
+    tlsCert;
+    tlsKey;
 };
 exports.MikroOrmPluginConfig = MikroOrmPluginConfig;
 __decorate([
@@ -79,6 +83,34 @@ __decorate([
     }),
     __metadata("design:type", Number)
 ], MikroOrmPluginConfig.prototype, "keepAliveInitialDelay", void 0);
+__decorate([
+    (0, core_1.Property)('ALLOW_SELF_SIGNED_CERT', new core_1.BoolParser(), {
+        defaultValue: undefined,
+        description: 'Allow self-signed certificates',
+    }),
+    __metadata("design:type", Object)
+], MikroOrmPluginConfig.prototype, "allowSelfSignedCert", void 0);
+__decorate([
+    (0, core_1.Property)('TLS_CA', new core_1.StringParser(), {
+        defaultValue: undefined,
+        description: 'Path to CA certificate',
+    }),
+    __metadata("design:type", Object)
+], MikroOrmPluginConfig.prototype, "tlsCa", void 0);
+__decorate([
+    (0, core_1.Property)('TLS_CERT', new core_1.StringParser(), {
+        defaultValue: undefined,
+        description: 'Path to client certificate',
+    }),
+    __metadata("design:type", Object)
+], MikroOrmPluginConfig.prototype, "tlsCert", void 0);
+__decorate([
+    (0, core_1.Property)('TLS_KEY', new core_1.StringParser(), {
+        defaultValue: undefined,
+        description: 'Path to client key',
+    }),
+    __metadata("design:type", Object)
+], MikroOrmPluginConfig.prototype, "tlsKey", void 0);
 exports.MikroOrmPluginConfig = MikroOrmPluginConfig = __decorate([
     (0, core_1.ConfigSection)({
         name: 'mikro-orm database config',

package/dist/providers/mikro-orm.config.js.map

@@ -1 +1 @@
-{"version":3,"file":"mikro-orm.config.js","sourceRoot":"","sources":["../../src/providers/mikro-orm.config.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yCAAoC;AACpC,qCASoB;AAOb,IAAM,oBAAoB,GAA1B,MAAM,oBAAqB,SAAQ,aAAM;IAI9C,GAAG,CAAO;IASV,MAAM,CAAU;IAShB,OAAO,CAAU;IASjB,OAAO,CAAU;IAUjB,SAAS,CAAW;IAUpB,qBAAqB,CAAU;CAChC,CAAA;AApDY,oDAAoB;AAI/B;IAHC,IAAA,eAAQ,EAAC,KAAK,EAAE,IAAI,gBAAS,EAAE,EAAE;QAChC,WAAW,EAAE,qBAAqB;KACnC,CAAC;8BACI,GAAG;iDAAC;AASV;IAPC,IAAA,eAAQ,EAAC,QAAQ,EAAE,IAAI,mBAAY,EAAE,EAAE;QACtC,WAAW,EAAE,IAAA,aAAI,EAAA;;;KAGhB;QACD,YAAY,EAAE,SAAS;KACxB,CAAC;;oDACc;AAShB;IAPC,IAAA,eAAQ,EAAC,UAAU,EAAE,IAAI,gBAAS,EAAE,EAAE;QACrC,YAAY,EAAE,CAAC;QACf,WAAW,EAAE,IAAA,aAAI,EAAA;;;KAGhB;KACF,CAAC;;qDACe;AASjB;IAPC,IAAA,eAAQ,EAAC,UAAU,EAAE,IAAI,gBAAS,EAAE,EAAE;QACrC,YAAY,EAAE,EAAE;QAChB,WAAW,EAAE,IAAA,aAAI,EAAA;;;KAGhB;KACF,CAAC;;qDACe;AAUjB;IARC,IAAA,eAAQ,EAAC,YAAY,EAAE,IAAI,iBAAU,EAAE,EAAE;QACxC,YAAY,EAAE,IAAI;QAClB,WAAW,EAAE,IAAA,aAAI,EAAA;;;;KAIhB;KACF,CAAC;;uDACkB;AAUpB;IARC,IAAA,eAAQ,EAAC,0BAA0B,EAAE,IAAI,gBAAS,EAAE,EAAE;QACrD,YAAY,EAAE,SAAS;QACvB,WAAW,EAAE,IAAA,aAAI,EAAA;;;;KAIhB;KACF,CAAC;;mEAC6B;+BAnDpB,oBAAoB;IALhC,IAAA,oBAAa,EAAC;QACb,IAAI,EAAE,2BAA2B;QACjC,IAAI,EAAE,CAAC,gBAAS,CAAC,cAAc,EAAE,gBAAS,CAAC,OAAO,CAAC;QACnD,MAAM,EAAE,IAAI;KACb,CAAC;GACW,oBAAoB,CAoDhC"}
+{"version":3,"file":"mikro-orm.config.js","sourceRoot":"","sources":["../../src/providers/mikro-orm.config.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,yCAAoC;AACpC,qCASoB;AAOb,IAAM,oBAAoB,GAA1B,MAAM,oBAAqB,SAAQ,aAAM;IAI9C,GAAG,CAAO;IASV,MAAM,CAAU;IAShB,OAAO,CAAU;IASjB,OAAO,CAAU;IAUjB,SAAS,CAAW;IAUpB,qBAAqB,CAAU;IAM/B,mBAAmB,CAAuB;IAM1C,KAAK,CAAsB;IAM3B,OAAO,CAAsB;IAM7B,MAAM,CAAsB;CAC7B,CAAA;AA5EY,oDAAoB;AAI/B;IAHC,IAAA,eAAQ,EAAC,KAAK,EAAE,IAAI,gBAAS,EAAE,EAAE;QAChC,WAAW,EAAE,qBAAqB;KACnC,CAAC;8BACI,GAAG;iDAAC;AASV;IAPC,IAAA,eAAQ,EAAC,QAAQ,EAAE,IAAI,mBAAY,EAAE,EAAE;QACtC,WAAW,EAAE,IAAA,aAAI,EAAA;;;KAGhB;QACD,YAAY,EAAE,SAAS;KACxB,CAAC;;oDACc;AAShB;IAPC,IAAA,eAAQ,EAAC,UAAU,EAAE,IAAI,gBAAS,EAAE,EAAE;QACrC,YAAY,EAAE,CAAC;QACf,WAAW,EAAE,IAAA,aAAI,EAAA;;;KAGhB;KACF,CAAC;;qDACe;AASjB;IAPC,IAAA,eAAQ,EAAC,UAAU,EAAE,IAAI,gBAAS,EAAE,EAAE;QACrC,YAAY,EAAE,EAAE;QAChB,WAAW,EAAE,IAAA,aAAI,EAAA;;;KAGhB;KACF,CAAC;;qDACe;AAUjB;IARC,IAAA,eAAQ,EAAC,YAAY,EAAE,IAAI,iBAAU,EAAE,EAAE;QACxC,YAAY,EAAE,IAAI;QAClB,WAAW,EAAE,IAAA,aAAI,EAAA;;;;KAIhB;KACF,CAAC;;uDACkB;AAUpB;IARC,IAAA,eAAQ,EAAC,0BAA0B,EAAE,IAAI,gBAAS,EAAE,EAAE;QACrD,YAAY,EAAE,SAAS;QACvB,WAAW,EAAE,IAAA,aAAI,EAAA;;;;KAIhB;KACF,CAAC;;mEAC6B;AAM/B;IAJC,IAAA,eAAQ,EAAC,wBAAwB,EAAE,IAAI,iBAAU,EAAE,EAAE;QACpD,YAAY,EAAE,SAAS;QACvB,WAAW,EAAE,gCAAgC;KAC9C,CAAC;;iEACwC;AAM1C;IAJC,IAAA,eAAQ,EAAC,QAAQ,EAAE,IAAI,mBAAY,EAAE,EAAE;QACtC,YAAY,EAAE,SAAS;QACvB,WAAW,EAAE,wBAAwB;KACtC,CAAC;;mDACyB;AAM3B;IAJC,IAAA,eAAQ,EAAC,UAAU,EAAE,IAAI,mBAAY,EAAE,EAAE;QACxC,YAAY,EAAE,SAAS;QACvB,WAAW,EAAE,4BAA4B;KAC1C,CAAC;;qDAC2B;AAM7B;IAJC,IAAA,eAAQ,EAAC,SAAS,EAAE,IAAI,mBAAY,EAAE,EAAE;QACvC,YAAY,EAAE,SAAS;QACvB,WAAW,EAAE,oBAAoB;KAClC,CAAC;;oDAC0B;+BA3EjB,oBAAoB;IALhC,IAAA,oBAAa,EAAC;QACb,IAAI,EAAE,2BAA2B;QACjC,IAAI,EAAE,CAAC,gBAAS,CAAC,cAAc,EAAE,gBAAS,CAAC,OAAO,CAAC;QACnD,MAAM,EAAE,IAAI;KACb,CAAC;GACW,oBAAoB,CA4EhC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsdk/db.mikro-orm",
-  "version": "5.8.0-next.1",
+  "version": "5.8.0-next.3",
   "description": "Mikro-orm module for platform",
   "license": "Apache License 2.0",
   "publishConfig": {
@@ -30,5 +30,5 @@
     "reflect-metadata": "^0.1.12 || ^0.2.0",
     "rxjs": "^7.1.0"
   },
-  "gitHead": "466ee102dcc2bce0b90df8f561c3e73d889c8468"
+  "gitHead": "0f2d793fff0ebfa56506a569495d24ad3b055797"
 }

package/src/mikro-orm.plugin.ts

@@ -10,6 +10,7 @@ import type {
   PlatformAppPlugin,
 } from '@rsdk/core';
 import { APP_NAME } from '@rsdk/core';
+import { getSecureContextOptions } from '@rsdk/db';
 import { LoggerFactory } from '@rsdk/logging';
 import _ from 'lodash';
 import path from 'node:path';
@@ -77,11 +78,14 @@ export class MikroOrmPlugin implements PlatformAppPlugin {
               glob: '!(*.d).{js,ts}',
             },
             allowGlobalContext: true,
-            ...(this.options.overrideConfig as any),
             driverOptions: {
-              keepAlive: config.keepAlive,
-              keepAliveInitialDelay: config.keepAliveInitialDelay,
+              connection: {
+                keepAlive: config.keepAlive,
+                keepAliveInitialDelay: config.keepAliveInitialDelay,
+                ssl: getSecureContextOptions(config),
+              },
             },
+            ...(this.options.overrideConfig as any),
           })
             .omitBy(_.isUndefined)
             .omitBy(_.isNull)

package/src/providers/mikro-orm.config.ts

@@ -67,4 +67,28 @@ export class MikroOrmPluginConfig extends Config {
     `,
   })
   keepAliveInitialDelay!: number;
+
+  @Property('ALLOW_SELF_SIGNED_CERT', new BoolParser(), {
+    defaultValue: undefined,
+    description: 'Allow self-signed certificates',
+  })
+  allowSelfSignedCert?: boolean | undefined;
+
+  @Property('TLS_CA', new StringParser(), {
+    defaultValue: undefined,
+    description: 'Path to CA certificate',
+  })
+  tlsCa?: string | undefined;
+
+  @Property('TLS_CERT', new StringParser(), {
+    defaultValue: undefined,
+    description: 'Path to client certificate',
+  })
+  tlsCert?: string | undefined;
+
+  @Property('TLS_KEY', new StringParser(), {
+    defaultValue: undefined,
+    description: 'Path to client key',
+  })
+  tlsKey?: string | undefined;
 }