@rsdk/db.typeorm 5.12.0-next.6 → 5.12.0-next.8

package/dist/index.d.ts

@@ -5,6 +5,7 @@ export { IsolationLevel } from './types';
 export { OverrideEntity } from './metadata/override-entity.decorator';
 export { TypeOrmEntity } from './metadata/typeorm-entity.decorator';
 export { flatOrder } from './flat-order';
+export { TypeOrmPluginConfig } from './providers/typeorm.config';
 export declare const Runner: TransactionRunner<import("./types").IsolationLevel, import("./internal/context").TypeOrmContext>;
 export declare const Transactional: (payload?: {
     isolation?: import("./types").IsolationLevel;

package/dist/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Transactional = exports.Runner = exports.flatOrder = exports.TypeOrmEntity = exports.OverrideEntity = exports.IsolationLevel = exports.TypeOrmPlugin = exports.DataSourceExtractor = void 0;
+exports.Transactional = exports.Runner = exports.TypeOrmPluginConfig = exports.flatOrder = exports.TypeOrmEntity = exports.OverrideEntity = exports.IsolationLevel = exports.TypeOrmPlugin = exports.DataSourceExtractor = void 0;
 const db_1 = require("@rsdk/db");
 const strategy_1 = require("./internal/strategy");
 var data_source_extractor_1 = require("./data-source-extractor");
@@ -15,6 +15,8 @@ var typeorm_entity_decorator_1 = require("./metadata/typeorm-entity.decorator");
 Object.defineProperty(exports, "TypeOrmEntity", { enumerable: true, get: function () { return typeorm_entity_decorator_1.TypeOrmEntity; } });
 var flat_order_1 = require("./flat-order");
 Object.defineProperty(exports, "flatOrder", { enumerable: true, get: function () { return flat_order_1.flatOrder; } });
+var typeorm_config_1 = require("./providers/typeorm.config");
+Object.defineProperty(exports, "TypeOrmPluginConfig", { enumerable: true, get: function () { return typeorm_config_1.TypeOrmPluginConfig; } });
 exports.Runner = new db_1.TransactionRunner(new strategy_1.TypeOrmTransactionalStrategy());
 exports.Transactional = exports.Runner.Transactional.bind(exports.Runner);
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,iCAA6C;AAE7C,kDAAmE;AAEnE,iEAA8D;AAArD,4HAAA,mBAAmB,OAAA;AAE5B,mDAAiD;AAAxC,+GAAA,aAAa,OAAA;AACtB,iCAAyC;AAAhC,uGAAA,cAAc,OAAA;AACvB,kFAAsE;AAA7D,2HAAA,cAAc,OAAA;AACvB,gFAAoE;AAA3D,yHAAA,aAAa,OAAA;AACtB,2CAAyC;AAAhC,uGAAA,SAAS,OAAA;AAEL,QAAA,MAAM,GAAG,IAAI,sBAAiB,CAAC,IAAI,uCAA4B,EAAE,CAAC,CAAC;AACnE,QAAA,aAAa,GAAG,cAAM,CAAC,aAAa,CAAC,IAAI,CAAC,cAAM,CAAC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,iCAA6C;AAE7C,kDAAmE;AAEnE,iEAA8D;AAArD,4HAAA,mBAAmB,OAAA;AAE5B,mDAAiD;AAAxC,+GAAA,aAAa,OAAA;AACtB,iCAAyC;AAAhC,uGAAA,cAAc,OAAA;AACvB,kFAAsE;AAA7D,2HAAA,cAAc,OAAA;AACvB,gFAAoE;AAA3D,yHAAA,aAAa,OAAA;AACtB,2CAAyC;AAAhC,uGAAA,SAAS,OAAA;AAClB,6DAAiE;AAAxD,qHAAA,mBAAmB,OAAA;AAEf,QAAA,MAAM,GAAG,IAAI,sBAAiB,CAAC,IAAI,uCAA4B,EAAE,CAAC,CAAC;AACnE,QAAA,aAAa,GAAG,cAAM,CAAC,aAAa,CAAC,IAAI,CAAC,cAAM,CAAC,CAAC"}

package/dist/providers/typeorm.config.d.ts

@@ -1,8 +1,9 @@
 import { Timespan } from '@rsdk/common';
 import { Config } from '@rsdk/core';
-import { SslModeEnum } from '@rsdk/db';
+import { MultiHostUrl, SslModeEnum } from '@rsdk/db';
 export declare class TypeOrmPluginConfig extends Config {
-    url: URL;
+    url: MultiHostUrl;
+    multiHostBootstrapFallback: boolean;
     schema: string;
     poolMin: number;
     poolMax: number;

package/dist/providers/typeorm.config.js

@@ -15,6 +15,7 @@ const core_1 = require("@rsdk/core");
 const db_1 = require("@rsdk/db");
 let TypeOrmPluginConfig = class TypeOrmPluginConfig extends core_1.Config {
     url;
+    multiHostBootstrapFallback;
     schema;
     poolMin;
     poolMax;
@@ -30,11 +31,28 @@ let TypeOrmPluginConfig = class TypeOrmPluginConfig extends core_1.Config {
 };
 exports.TypeOrmPluginConfig = TypeOrmPluginConfig;
 __decorate([
-    (0, core_1.Property)('URL', new core_1.UrlParser(), {
-        description: 'Database server url',
+    (0, core_1.Property)('URL', new db_1.MultiHostUrlParser(), {
+        description: (0, common_1.text) `
+      Database server url. Supports multi-host syntax for Postgres:
+      \`postgres://user:pass@host1:5432,host2:5432/db\`. Port is optional (driver default, e.g. 5432 for PostgreSQL).
+      With \`pg-native\` installed RSDK uses libpq runtime failover. Without \`pg-native\`
+      the app fails fast at startup unless DB_MULTIHOST_BOOTSTRAP_FALLBACK=true is set.
+      See docs/md/DATABASES.md for details.
+    `,
     }),
-    __metadata("design:type", URL)
+    __metadata("design:type", db_1.MultiHostUrl)
 ], TypeOrmPluginConfig.prototype, "url", void 0);
+__decorate([
+    (0, core_1.Property)('MULTIHOST_BOOTSTRAP_FALLBACK', new core_1.BoolParser(), {
+        defaultValue: false,
+        description: (0, common_1.text) `
+      Allows silent fallback to bootstrap-resolve when DB_URL has multiple
+      hosts but \`pg-native\` is not installed. When false (default) the app
+      fails fast at startup so that runtime failover is never quietly downgraded.
+    `,
+    }),
+    __metadata("design:type", Boolean)
+], TypeOrmPluginConfig.prototype, "multiHostBootstrapFallback", void 0);
 __decorate([
     (0, core_1.Property)('SCHEMA', new core_1.StringParser(), {
         description: (0, common_1.text) `

package/dist/providers/typeorm.config.js.map

@@ -1 +1 @@
-{"version":3,"file":"typeorm.config.js","sourceRoot":"","sources":["../../src/providers/typeorm.config.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"typeorm.config.js","sourceRoot":"","sources":["../../src/providers/typeorm.config.ts"],"names":[],"mappings":"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"}

package/dist/typeorm.plugin.js

@@ -46,34 +46,78 @@ class TypeOrmPlugin {
                     },
                 ],
                 inject: [providers_1.TypeOrmPluginConfig, providers_1.TypeOrmLoggerAdapter, core_1.APP_NAME],
-                useFactory: (config, logger, appName) => ({
+                useFactory: async (config, logger, appName) => {
+                    const ssl = (0, db_1.getSecureContextOptions)(config);
                     /**
-                     * Так как typeorm поддерживает целый зоопарк не совместимых друг с другом СУБД, для всего нужны разные опции
-                     * И он начинает ругаться на то что какие-то поля должны быть, каких то не должно быть
-                     * Принято волевое решение пока остановиться на нашей основной СУБД, а именно `postgres`
+                     * libpq-режим имеет смысл только для wire-совместимых с PostgreSQL
+                     * драйверов. Для mysql/mariadb/mssql/etc multi-host обслуживается
+                     * resolver-ом (bootstrap-only) — у их драйверов своё API failover.
                      */
-                    type: this.options.type,
-                    url: config.url.toString(),
-                    ...(config.schema && {
-                        schema: config.schema,
-                    }),
-                    logger,
-                    ...(this.entities && { entities: this.entities }),
-                    autoLoadEntities: !this.entities,
-                    retryDelay: config.reconnectInterval.millis(),
-                    retryAttempts: config.reconnectAttempts,
-                    applicationName: appName + ':typeorm',
-                    extra: {
-                        min: config.poolMin,
-                        max: config.poolMax,
-                        keepAlive: config.keepAlive,
-                        keepAliveInitialDelay: config.keepAliveInitialDelay,
-                        ssl: (0, db_1.getSecureContextOptions)(config),
-                    },
-                    migrations,
-                    migrationsTableName: 'typeorm_migrations',
-                    ...this.options.overrideConfig,
-                }),
+                    const isPostgresFamily = this.options.type === 'postgres' ||
+                        this.options.type === 'aurora-postgres';
+                    /**
+                     * Probe передаётся только если фолбэк явно разрешён через env.
+                     * Иначе resolveDbConnection упадёт с MultiHostNativeRequired при
+                     * отсутствии pg-native — runtime failover не будет тихо потерян.
+                     */
+                    const resolved = await (0, db_1.resolveDbConnection)({
+                        url: config.url,
+                        logger: TypeOrmPlugin.logger,
+                        isPostgresFamily,
+                        ...(config.multiHostBootstrapFallback && {
+                            bootstrapProbe: (candidate) => (0, db_1.pgProbe)(candidate, ssl),
+                        }),
+                    });
+                    let nativeDriver;
+                    let connection;
+                    let extraConnection;
+                    if (resolved.kind === 'native-libpq') {
+                        nativeDriver = resolved.driver;
+                        connection = {
+                            host: resolved.firstHostEntry.host,
+                            port: resolved.firstHostEntry.port,
+                            ...(resolved.username && { username: resolved.username }),
+                            ...(resolved.password && { password: resolved.password }),
+                            ...(resolved.database && { database: resolved.database }),
+                        };
+                        extraConnection = {
+                            nativeConnectionString: resolved.multiHostUrl,
+                        };
+                    }
+                    else {
+                        connection = { url: resolved.url.toString() };
+                        extraConnection = {};
+                    }
+                    const userOverride = (this.options.overrideConfig ?? {});
+                    const driverOverride = nativeDriver !== undefined && userOverride.driver === undefined
+                        ? { driver: nativeDriver }
+                        : {};
+                    return {
+                        type: this.options.type,
+                        ...connection,
+                        ...(config.schema && {
+                            schema: config.schema,
+                        }),
+                        logger,
+                        ...(this.entities && { entities: this.entities }),
+                        autoLoadEntities: !this.entities,
+                        retryDelay: config.reconnectInterval.millis(),
+                        retryAttempts: config.reconnectAttempts,
+                        applicationName: appName + ':typeorm',
+                        extra: {
+                            min: config.poolMin,
+                            max: config.poolMax,
+                            keepAlive: config.keepAlive,
+                            keepAliveInitialDelay: config.keepAliveInitialDelay,
+                            ssl,
+                            ...extraConnection,
+                        },
+                        migrations,
+                        migrationsTableName: 'typeorm_migrations',
+                        ...userOverride,
+                        ...driverOverride,
+                    };
+                },
                 dataSourceFactory: (options) => {
                     if (!options) {
                         throw new exceptions_1.DatasourceOptionsNotSet();

package/dist/typeorm.plugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"typeorm.plugin.js","sourceRoot":"","sources":["../src/typeorm.plugin.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"typeorm.plugin.js","sourceRoot":"","sources":["../src/typeorm.plugin.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsdk/db.typeorm",
-  "version": "5.12.0-next.6",
+  "version": "5.12.0-next.8",
   "description": "TypeOrm module for platform",
   "license": "Apache License 2.0",
   "publishConfig": {
@@ -28,5 +28,5 @@
     "rxjs": "^7.1.0",
     "typeorm": "^0.3.12"
   },
-  "gitHead": "32103725bddbe5e7e99074ba40b5032dc14cf60c"
+  "gitHead": "ce0adb86b9bafb8df462e4eb47600c8bb08cc7df"
 }

package/src/index.ts

@@ -9,6 +9,7 @@ export { IsolationLevel } from './types';
 export { OverrideEntity } from './metadata/override-entity.decorator';
 export { TypeOrmEntity } from './metadata/typeorm-entity.decorator';
 export { flatOrder } from './flat-order';
+export { TypeOrmPluginConfig } from './providers/typeorm.config';
 
 export const Runner = new TransactionRunner(new TypeOrmTransactionalStrategy());
 export const Transactional = Runner.Transactional.bind(Runner);

package/src/providers/typeorm.config.ts

@@ -9,9 +9,8 @@ import {
   Property,
   StringParser,
   TimespanParser,
-  UrlParser,
 } from '@rsdk/core';
-import { SslModeEnum } from '@rsdk/db';
+import { MultiHostUrl, MultiHostUrlParser, SslModeEnum } from '@rsdk/db';
 
 @ConfigSection({
   name: 'typeorm database config',
@@ -19,10 +18,26 @@ import { SslModeEnum } from '@rsdk/db';
   prefix: 'DB',
 })
 export class TypeOrmPluginConfig extends Config {
-  @Property('URL', new UrlParser(), {
-    description: 'Database server url',
+  @Property('URL', new MultiHostUrlParser(), {
+    description: text`
+      Database server url. Supports multi-host syntax for Postgres:
+      \`postgres://user:pass@host1:5432,host2:5432/db\`. Port is optional (driver default, e.g. 5432 for PostgreSQL).
+      With \`pg-native\` installed RSDK uses libpq runtime failover. Without \`pg-native\`
+      the app fails fast at startup unless DB_MULTIHOST_BOOTSTRAP_FALLBACK=true is set.
+      See docs/md/DATABASES.md for details.
+    `,
+  })
+  url!: MultiHostUrl;
+
+  @Property('MULTIHOST_BOOTSTRAP_FALLBACK', new BoolParser(), {
+    defaultValue: false,
+    description: text`
+      Allows silent fallback to bootstrap-resolve when DB_URL has multiple
+      hosts but \`pg-native\` is not installed. When false (default) the app
+      fails fast at startup so that runtime failover is never quietly downgraded.
+    `,
   })
-  url!: URL;
+  multiHostBootstrapFallback!: boolean;
 
   @Property('SCHEMA', new StringParser(), {
     description: text`

package/src/typeorm.plugin.ts

@@ -8,7 +8,11 @@ import type {
   PlatformAppPlugin,
 } from '@rsdk/core';
 import { APP_NAME } from '@rsdk/core';
-import { getSecureContextOptions } from '@rsdk/db';
+import {
+  getSecureContextOptions,
+  pgProbe,
+  resolveDbConnection,
+} from '@rsdk/db';
 import { LoggerFactory } from '@rsdk/logging';
 import path from 'node:path';
 import type { DataSourceOptions } from 'typeorm';
@@ -59,38 +63,93 @@ export class TypeOrmPlugin implements PlatformAppPlugin {
           },
         ],
         inject: [TypeOrmPluginConfig, TypeOrmLoggerAdapter, APP_NAME],
-        useFactory: (
+        useFactory: async (
           config: TypeOrmPluginConfig,
           logger: TypeOrmLoggerAdapter,
           appName: string,
-        ): TypeOrmModuleOptions => ({
+        ): Promise<TypeOrmModuleOptions> => {
+          const ssl = getSecureContextOptions(config);
+
           /**
-           * Так как typeorm поддерживает целый зоопарк не совместимых друг с другом СУБД, для всего нужны разные опции
-           * И он начинает ругаться на то что какие-то поля должны быть, каких то не должно быть
-           * Принято волевое решение пока остановиться на нашей основной СУБД, а именно `postgres`
+           * libpq-режим имеет смысл только для wire-совместимых с PostgreSQL
+           * драйверов. Для mysql/mariadb/mssql/etc multi-host обслуживается
+           * resolver-ом (bootstrap-only) — у их драйверов своё API failover.
            */
-          type: this.options.type,
-          url: config.url.toString(),
-          ...(config.schema && {
-            schema: config.schema,
-          }),
-          logger,
-          ...(this.entities && { entities: this.entities }),
-          autoLoadEntities: !this.entities,
-          retryDelay: config.reconnectInterval.millis(),
-          retryAttempts: config.reconnectAttempts,
-          applicationName: appName + ':typeorm',
-          extra: {
-            min: config.poolMin,
-            max: config.poolMax,
-            keepAlive: config.keepAlive,
-            keepAliveInitialDelay: config.keepAliveInitialDelay,
-            ssl: getSecureContextOptions(config),
-          },
-          migrations,
-          migrationsTableName: 'typeorm_migrations',
-          ...(this.options.overrideConfig as any),
-        }),
+          const isPostgresFamily =
+            this.options.type === 'postgres' ||
+            this.options.type === 'aurora-postgres';
+
+          /**
+           * Probe передаётся только если фолбэк явно разрешён через env.
+           * Иначе resolveDbConnection упадёт с MultiHostNativeRequired при
+           * отсутствии pg-native — runtime failover не будет тихо потерян.
+           */
+          const resolved = await resolveDbConnection({
+            url: config.url,
+            logger: TypeOrmPlugin.logger,
+            isPostgresFamily,
+            ...(config.multiHostBootstrapFallback && {
+              bootstrapProbe: (candidate: URL): Promise<void> =>
+                pgProbe(candidate, ssl),
+            }),
+          });
+
+          let nativeDriver: unknown;
+          let connection: Record<string, unknown>;
+          let extraConnection: Record<string, unknown>;
+
+          if (resolved.kind === 'native-libpq') {
+            nativeDriver = resolved.driver;
+            connection = {
+              host: resolved.firstHostEntry.host,
+              port: resolved.firstHostEntry.port,
+              ...(resolved.username && { username: resolved.username }),
+              ...(resolved.password && { password: resolved.password }),
+              ...(resolved.database && { database: resolved.database }),
+            };
+            extraConnection = {
+              nativeConnectionString: resolved.multiHostUrl,
+            };
+          } else {
+            connection = { url: resolved.url.toString() };
+            extraConnection = {};
+          }
+
+          const userOverride = (this.options.overrideConfig ?? {}) as Record<
+            string,
+            unknown
+          >;
+          const driverOverride =
+            nativeDriver !== undefined && userOverride.driver === undefined
+              ? { driver: nativeDriver }
+              : {};
+
+          return {
+            type: this.options.type,
+            ...connection,
+            ...(config.schema && {
+              schema: config.schema,
+            }),
+            logger,
+            ...(this.entities && { entities: this.entities }),
+            autoLoadEntities: !this.entities,
+            retryDelay: config.reconnectInterval.millis(),
+            retryAttempts: config.reconnectAttempts,
+            applicationName: appName + ':typeorm',
+            extra: {
+              min: config.poolMin,
+              max: config.poolMax,
+              keepAlive: config.keepAlive,
+              keepAliveInitialDelay: config.keepAliveInitialDelay,
+              ssl,
+              ...extraConnection,
+            },
+            migrations,
+            migrationsTableName: 'typeorm_migrations',
+            ...(userOverride as any),
+            ...driverOverride,
+          };
+        },
         dataSourceFactory: (options?: DataSourceOptions) => {
           if (!options) {
             throw new DatasourceOptionsNotSet();