@rsdk/db 5.16.0-next.1 → 5.16.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/dist/multi-host-url/multi-host-url.resolver.js +1 -1
- package/dist/multi-host-url/multi-host-url.resolver.js.map +1 -1
- package/dist/multi-host-url/pg-native.d.ts +10 -0
- package/dist/multi-host-url/pg-native.js +13 -1
- package/dist/multi-host-url/pg-native.js.map +1 -1
- package/dist/multi-host-url/resolve-db-connection.d.ts +12 -4
- package/dist/multi-host-url/resolve-db-connection.js +5 -0
- package/dist/multi-host-url/resolve-db-connection.js.map +1 -1
- package/package.json +2 -2
- package/src/multi-host-url/multi-host-url.resolver.spec.ts +38 -0
- package/src/multi-host-url/multi-host-url.resolver.ts +2 -1
- package/src/multi-host-url/pg-native.spec.ts +24 -1
- package/src/multi-host-url/pg-native.ts +16 -0
- package/src/multi-host-url/resolve-db-connection.spec.ts +57 -0
- package/src/multi-host-url/resolve-db-connection.ts +22 -5
|
@@ -28,10 +28,10 @@ class MultiHostResolver {
|
|
|
28
28
|
return url.getHostAt(0);
|
|
29
29
|
}
|
|
30
30
|
for (let i = 0; i < url.hosts.length; i++) {
|
|
31
|
-
const candidate = url.getHostAt(i);
|
|
32
31
|
const entry = url.hosts[i];
|
|
33
32
|
const hostLabel = entry.port === undefined ? entry.host : `${entry.host}:${entry.port}`;
|
|
34
33
|
try {
|
|
34
|
+
const candidate = url.getHostAt(i);
|
|
35
35
|
await probe(candidate);
|
|
36
36
|
if (i > 0) {
|
|
37
37
|
this.logger.info(`multi-host db: connected to host #${i + 1} (${hostLabel}) after previous hosts failed`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"multi-host-url.resolver.js","sourceRoot":"","sources":["../../src/multi-host-url/multi-host-url.resolver.ts"],"names":[],"mappings":";;;AAMA;;;;;;;;;;;;;;;;GAgBG;AACH,MAAa,iBAAiB;IACC;IAA7B,YAA6B,MAAe;QAAf,WAAM,GAAN,MAAM,CAAS;IAAG,CAAC;IAEhD,KAAK,CAAC,OAAO,CAAC,GAAiB,EAAE,KAAqB;QACpD,IAAI,GAAG,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC3B,OAAO,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;QAC1B,CAAC;QAED,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YAC1C,MAAM,
|
|
1
|
+
{"version":3,"file":"multi-host-url.resolver.js","sourceRoot":"","sources":["../../src/multi-host-url/multi-host-url.resolver.ts"],"names":[],"mappings":";;;AAMA;;;;;;;;;;;;;;;;GAgBG;AACH,MAAa,iBAAiB;IACC;IAA7B,YAA6B,MAAe;QAAf,WAAM,GAAN,MAAM,CAAS;IAAG,CAAC;IAEhD,KAAK,CAAC,OAAO,CAAC,GAAiB,EAAE,KAAqB;QACpD,IAAI,GAAG,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC3B,OAAO,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;QAC1B,CAAC;QAED,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YAC1C,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YAC3B,MAAM,SAAS,GACb,KAAK,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC;YAExE,IAAI,CAAC;gBACH,MAAM,SAAS,GAAG,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;gBAEnC,MAAM,KAAK,CAAC,SAAS,CAAC,CAAC;gBACvB,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;oBACV,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,qCAAqC,CAAC,GAAG,CAAC,KAAK,SAAS,+BAA+B,CACxF,CAAC;gBACJ,CAAC;gBACD,OAAO,SAAS,CAAC;YACnB,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,uBAAuB,SAAS,6BAA6B,EAC7D,KAAc,CACf,CAAC;YACJ,CAAC;QACH,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,6IAA6I,CAC9I,CAAC;QACF,OAAO,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;IAC1B,CAAC;CACF;AApCD,8CAoCC"}
|
|
@@ -3,12 +3,14 @@
|
|
|
3
3
|
* `pg` — peer-зависимость использующего пакета; здесь оборачиваем `require`
|
|
4
4
|
* в try/catch, чтобы пакет, не использующий postgres, не падал при загрузке.
|
|
5
5
|
*/
|
|
6
|
+
import type { MultiHostEntry } from './multi-host-url';
|
|
6
7
|
export type PgClient = {
|
|
7
8
|
connect(): Promise<void>;
|
|
8
9
|
query(text: string): Promise<unknown>;
|
|
9
10
|
end(): Promise<void>;
|
|
10
11
|
};
|
|
11
12
|
export type PgClientCtor = new (config: {
|
|
13
|
+
host?: string;
|
|
12
14
|
connectionString?: string;
|
|
13
15
|
/**
|
|
14
16
|
* Escape hatch у `pg.native`: строка идёт напрямую в libpq, минуя
|
|
@@ -33,6 +35,14 @@ export type PgModule = {
|
|
|
33
35
|
Client: PgClientCtor;
|
|
34
36
|
native?: PgNativeModule | null;
|
|
35
37
|
};
|
|
38
|
+
/**
|
|
39
|
+
* Заглушка для полей `host`/`port` драйвера в native-режиме. `pg.native` перед
|
|
40
|
+
* каждым подключением делает `dns.lookup(host)` и падает, если имя не
|
|
41
|
+
* резолвится, даже когда задан `nativeConnectionString`. Настоящий первый хост
|
|
42
|
+
* поэтому отключил бы failover, а без `host` драйвер возьмёт `PGHOST`.
|
|
43
|
+
* @see node_modules/pg/lib/native/client.js (`_connect`)
|
|
44
|
+
*/
|
|
45
|
+
export declare const PG_NATIVE_PLACEHOLDER_HOST: MultiHostEntry;
|
|
36
46
|
/**
|
|
37
47
|
* TypeORM сам переключается на `pg.native`, если у модуля `pg` есть поле
|
|
38
48
|
* `.native` и установлен пакет `pg-native` — даже для одного хоста.
|
|
@@ -1,7 +1,18 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
/* eslint-disable @typescript-eslint/no-require-imports, import/no-extraneous-dependencies */
|
|
3
3
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
4
|
-
exports.pgProbeMultiHost = exports.pgProbe = exports.loadPgNative = exports.loadPgJsDriver = exports.withoutPgNative = void 0;
|
|
4
|
+
exports.pgProbeMultiHost = exports.pgProbe = exports.loadPgNative = exports.loadPgJsDriver = exports.withoutPgNative = exports.PG_NATIVE_PLACEHOLDER_HOST = void 0;
|
|
5
|
+
/**
|
|
6
|
+
* Заглушка для полей `host`/`port` драйвера в native-режиме. `pg.native` перед
|
|
7
|
+
* каждым подключением делает `dns.lookup(host)` и падает, если имя не
|
|
8
|
+
* резолвится, даже когда задан `nativeConnectionString`. Настоящий первый хост
|
|
9
|
+
* поэтому отключил бы failover, а без `host` драйвер возьмёт `PGHOST`.
|
|
10
|
+
* @see node_modules/pg/lib/native/client.js (`_connect`)
|
|
11
|
+
*/
|
|
12
|
+
exports.PG_NATIVE_PLACEHOLDER_HOST = {
|
|
13
|
+
host: '127.0.0.1',
|
|
14
|
+
port: 5432,
|
|
15
|
+
};
|
|
5
16
|
let cachedPg = null;
|
|
6
17
|
let cachedNative = null;
|
|
7
18
|
let cachedJsDriver = null;
|
|
@@ -109,6 +120,7 @@ exports.pgProbe = pgProbe;
|
|
|
109
120
|
*/
|
|
110
121
|
const pgProbeMultiHost = async (multiHostUrl, Client) => {
|
|
111
122
|
const client = new Client({
|
|
123
|
+
host: exports.PG_NATIVE_PLACEHOLDER_HOST.host,
|
|
112
124
|
nativeConnectionString: multiHostUrl,
|
|
113
125
|
});
|
|
114
126
|
await client.connect();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pg-native.js","sourceRoot":"","sources":["../../src/multi-host-url/pg-native.ts"],"names":[],"mappings":";AAAA,6FAA6F;;;
|
|
1
|
+
{"version":3,"file":"pg-native.js","sourceRoot":"","sources":["../../src/multi-host-url/pg-native.ts"],"names":[],"mappings":";AAAA,6FAA6F;;;AA8C7F;;;;;;GAMG;AACU,QAAA,0BAA0B,GAAmB;IACxD,IAAI,EAAE,WAAW;IACjB,IAAI,EAAE,IAAI;CACX,CAAC;AAEF,IAAI,QAAQ,GAAoB,IAAI,CAAC;AACrC,IAAI,YAAY,GAA0B,IAAI,CAAC;AAC/C,IAAI,cAAc,GAAoB,IAAI,CAAC;AAE3C,MAAM,MAAM,GAAG,GAAa,EAAE;IAC5B,IAAI,QAAQ;QAAE,OAAO,QAAQ,CAAC;IAC9B,IAAI,CAAC;QACH,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAa,CAAC;QACrC,OAAO,QAAQ,CAAC;IAClB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,IAAI,KAAK,CACb,iGAAiG,EACjG,EAAE,KAAK,EAAE,KAAc,EAAE,CAC1B,CAAC;IACJ,CAAC;AACH,CAAC,CAAC;AAEF;;;;;;;;GAQG;AACI,MAAM,eAAe,GAAG,CAAiC,EAAK,EAAK,EAAE;IAC1E,MAAM,EAAE,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,CAAM,CAAC;IAElC,yEAAyE;IACzE,iEAAiE;IACjE,4EAA4E;IAC5E,MAAM,CAAC,cAAc,CAAC,EAAE,EAAE,QAAQ,EAAE;QAClC,YAAY,EAAE,IAAI;QAClB,UAAU,EAAE,IAAI;QAChB,KAAK,EAAE,SAAS;QAChB,QAAQ,EAAE,IAAI;KACf,CAAC,CAAC;IACH,OAAO,EAAE,CAAC;AACZ,CAAC,CAAC;AAbW,QAAA,eAAe,mBAa1B;AAEF;;;GAGG;AACI,MAAM,cAAc,GAAG,GAAa,EAAE;IAC3C,IAAI,cAAc;QAAE,OAAO,cAAc,CAAC;IAC1C,cAAc,GAAG,IAAA,uBAAe,EAAC,MAAM,EAAE,CAAC,CAAC;IAC3C,OAAO,cAAc,CAAC;AACxB,CAAC,CAAC;AAJW,QAAA,cAAc,kBAIzB;AAEF;;;;;GAKG;AACI,MAAM,YAAY,GAAG,GAA0B,EAAE;IACtD,IAAI,YAAY;QAAE,OAAO,YAAY,CAAC;IAEtC,MAAM,EAAE,GAAG,MAAM,EAAE,CAAC;IACpB,IAAI,QAA2C,CAAC;IAEhD,IAAI,CAAC;QACH,QAAQ,GAAG,EAAE,CAAC,MAAM,CAAC;IACvB,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;IACD,IAAI,CAAC,QAAQ,EAAE,MAAM,EAAE,CAAC;QACtB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,YAAY,GAAG,QAAQ,CAAC;IACxB,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AAjBW,QAAA,YAAY,gBAiBvB;AAEF;;;;GAIG;AACI,MAAM,OAAO,GAAG,KAAK,EAAE,SAAc,EAAE,GAAY,EAAiB,EAAE;IAC3E,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,MAAM,CAAC;IAC/B,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC;QACxB,gBAAgB,EAAE,SAAS,CAAC,QAAQ,EAAE;QACtC,GAAG;QACH,uBAAuB,EAAE,KAAK;KAC/B,CAAC,CAAC;IAEH,MAAM,MAAM,CAAC,OAAO,EAAE,CAAC;IACvB,IAAI,CAAC;QACH,MAAM,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;IACjC,CAAC;YAAS,CAAC;QACT,MAAM,MAAM,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE;YAC5B,aAAa;QACf,CAAC,CAAC,CAAC;IACL,CAAC;AACH,CAAC,CAAC;AAhBW,QAAA,OAAO,WAgBlB;AAEF;;;;;;;;;GASG;AACI,MAAM,gBAAgB,GAAG,KAAK,EACnC,YAAoB,EACpB,MAAoB,EACL,EAAE;IACjB,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC;QACxB,IAAI,EAAE,kCAA0B,CAAC,IAAI;QACrC,sBAAsB,EAAE,YAAY;KACrC,CAAC,CAAC;IAEH,MAAM,MAAM,CAAC,OAAO,EAAE,CAAC;IACvB,IAAI,CAAC;QACH,MAAM,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;IACjC,CAAC;YAAS,CAAC;QACT,MAAM,MAAM,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE;YAC5B,aAAa;QACf,CAAC,CAAC,CAAC;IACL,CAAC;AACH,CAAC,CAAC;AAjBW,QAAA,gBAAgB,oBAiB3B"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import type { ILogger } from '@rsdk/logging';
|
|
2
|
-
import type { MultiHostEntry
|
|
2
|
+
import type { MultiHostEntry } from './multi-host-url';
|
|
3
|
+
import { MultiHostUrl } from './multi-host-url';
|
|
3
4
|
import type { MultiHostProbe } from './multi-host-url.resolver';
|
|
4
5
|
import type { PgNativeModule } from './pg-native';
|
|
5
6
|
/**
|
|
@@ -36,9 +37,16 @@ export type ResolvedDbConnection = {
|
|
|
36
37
|
/** Оригинальная multi-host строка для libpq. */
|
|
37
38
|
multiHostUrl: string;
|
|
38
39
|
/**
|
|
39
|
-
*
|
|
40
|
-
*
|
|
41
|
-
*
|
|
40
|
+
* Single-host URL с теми же учётными данными и базой, но с адресом-заглушкой
|
|
41
|
+
* вместо хоста. Подставляется туда, где драйверу нужен один хост
|
|
42
|
+
* (`host` у TypeORM и knex, `clientUrl` у MikroORM); реальный коннект
|
|
43
|
+
* libpq собирает из `multiHostUrl`.
|
|
44
|
+
*/
|
|
45
|
+
placeholderUrl: URL;
|
|
46
|
+
/**
|
|
47
|
+
* @deprecated Не передавайте в драйвер, потому что при неразрешимом имени
|
|
48
|
+
* первого хоста подключение падает и failover не срабатывает. Используйте
|
|
49
|
+
* `placeholderUrl`.
|
|
42
50
|
*/
|
|
43
51
|
firstHostEntry: MultiHostEntry;
|
|
44
52
|
username?: string;
|
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.resolveDbConnection = void 0;
|
|
4
4
|
const exception_1 = require("./exception");
|
|
5
|
+
const multi_host_url_1 = require("./multi-host-url");
|
|
5
6
|
const multi_host_url_resolver_1 = require("./multi-host-url.resolver");
|
|
6
7
|
const pg_native_1 = require("./pg-native");
|
|
7
8
|
/**
|
|
@@ -29,6 +30,10 @@ const resolveDbConnection = async (options) => {
|
|
|
29
30
|
return {
|
|
30
31
|
kind: 'native-libpq',
|
|
31
32
|
multiHostUrl,
|
|
33
|
+
placeholderUrl: new multi_host_url_1.MultiHostUrl({
|
|
34
|
+
...options.url,
|
|
35
|
+
hosts: [pg_native_1.PG_NATIVE_PLACEHOLDER_HOST],
|
|
36
|
+
}).getHostAt(0),
|
|
32
37
|
firstHostEntry: options.url.hosts[0],
|
|
33
38
|
...(options.url.username && { username: options.url.username }),
|
|
34
39
|
...(options.url.password && { password: options.url.password }),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolve-db-connection.js","sourceRoot":"","sources":["../../src/multi-host-url/resolve-db-connection.ts"],"names":[],"mappings":";;;AAEA,2CAAsD;
|
|
1
|
+
{"version":3,"file":"resolve-db-connection.js","sourceRoot":"","sources":["../../src/multi-host-url/resolve-db-connection.ts"],"names":[],"mappings":";;;AAEA,2CAAsD;AAEtD,qDAAgD;AAEhD,uEAA8D;AAE9D,2CAIqB;AAiErB;;;;;;;;;;;GAWG;AACI,MAAM,mBAAmB,GAAG,KAAK,EACtC,OAAmC,EACJ,EAAE;IACjC,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC;IACjD,MAAM,MAAM,GACV,WAAW,IAAI,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,IAAA,wBAAY,GAAE,CAAC,CAAC,CAAC,IAAI,CAAC;IAElE,IAAI,MAAM,EAAE,CAAC;QACX,MAAM,YAAY,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC;QAE5C,MAAM,IAAA,4BAAgB,EAAC,YAAY,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;QACpD,OAAO,CAAC,MAAM,CAAC,IAAI,CACjB,kEAAkE,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,UAAU;YAClG,4FAA4F;YAC5F,wFAAwF;YACxF,uCAAuC,CAC1C,CAAC;QAEF,OAAO;YACL,IAAI,EAAE,cAAc;YACpB,YAAY;YACZ,cAAc,EAAE,IAAI,6BAAY,CAAC;gBAC/B,GAAG,OAAO,CAAC,GAAG;gBACd,KAAK,EAAE,CAAC,sCAA0B,CAAC;aACpC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;YACf,cAAc,EAAE,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC;YACpC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,EAAE,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC;YAC/D,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,EAAE,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC;YAC/D,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,EAAE,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC;YAC/D,MAAM,EAAE,MAAM;SACf,CAAC;IACJ,CAAC;IAED,IAAI,WAAW,IAAI,OAAO,CAAC,gBAAgB,EAAE,CAAC;QAC5C,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,CAAC;YAC5B,MAAM,IAAI,mCAAuB,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QAC9D,CAAC;QACD,OAAO,CAAC,MAAM,CAAC,IAAI,CACjB,4FAA4F,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,UAAU;YAC5H,mGAAmG;YACnG,6EAA6E,CAChF,CAAC;IACJ,CAAC;IAED;;;OAGG;IACH,MAAM,KAAK,GACT,OAAO,CAAC,cAAc,IAAI,CAAC,GAAkB,EAAE,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;IACrE,MAAM,QAAQ,GAAG,IAAI,2CAAiB,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IACvD,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;IAE5D,OAAO,EAAE,IAAI,EAAE,aAAa,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAC;AAChD,CAAC,CAAC;AAtDW,QAAA,mBAAmB,uBAsD9B"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@rsdk/db",
|
|
3
|
-
"version": "5.16.0-next.
|
|
3
|
+
"version": "5.16.0-next.3",
|
|
4
4
|
"description": "Common functionality and interfaces for relational database plugins",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"publishConfig": {
|
|
@@ -19,5 +19,5 @@
|
|
|
19
19
|
"@rsdk/logging": "*",
|
|
20
20
|
"reflect-metadata": "^0.1.12 || ^0.2.0"
|
|
21
21
|
},
|
|
22
|
-
"gitHead": "
|
|
22
|
+
"gitHead": "1f97ab569e4605769856c6a2f7fe4a384f2afaa5"
|
|
23
23
|
}
|
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
import type { ILogger } from '@rsdk/logging';
|
|
2
|
+
|
|
3
|
+
import type { MultiHostUrl } from './multi-host-url';
|
|
4
|
+
import { MultiHostUrlParser } from './multi-host-url.parser';
|
|
5
|
+
import { MultiHostResolver } from './multi-host-url.resolver';
|
|
6
|
+
|
|
7
|
+
const logger = { info: jest.fn(), warn: jest.fn() } as unknown as ILogger;
|
|
8
|
+
const parse = (value: string): MultiHostUrl =>
|
|
9
|
+
new MultiHostUrlParser('postgres:').parse(value);
|
|
10
|
+
const succeed = (): Promise<void> => Promise.resolve();
|
|
11
|
+
|
|
12
|
+
describe('MultiHostResolver', () => {
|
|
13
|
+
it('пропускает хост, из которого не собирается URL', async () => {
|
|
14
|
+
const probe = jest.fn(succeed);
|
|
15
|
+
|
|
16
|
+
const resolved = await new MultiHostResolver(logger).resolve(
|
|
17
|
+
parse('postgres://u:p@ba^d:5432,good:5433/db'),
|
|
18
|
+
probe,
|
|
19
|
+
);
|
|
20
|
+
|
|
21
|
+
expect(resolved.hostname).toBe('good');
|
|
22
|
+
expect(probe).toHaveBeenCalledTimes(1);
|
|
23
|
+
});
|
|
24
|
+
|
|
25
|
+
it('выбирает следующий хост, если проба первого упала', async () => {
|
|
26
|
+
const probe = jest
|
|
27
|
+
.fn(succeed)
|
|
28
|
+
.mockRejectedValueOnce(new Error('ENOTFOUND'));
|
|
29
|
+
|
|
30
|
+
const resolved = await new MultiHostResolver(logger).resolve(
|
|
31
|
+
parse('postgres://u:p@bad:5432,good:5433/db'),
|
|
32
|
+
probe,
|
|
33
|
+
);
|
|
34
|
+
|
|
35
|
+
expect(resolved.hostname).toBe('good');
|
|
36
|
+
expect(probe).toHaveBeenCalledTimes(2);
|
|
37
|
+
});
|
|
38
|
+
});
|
|
@@ -30,12 +30,13 @@ export class MultiHostResolver {
|
|
|
30
30
|
}
|
|
31
31
|
|
|
32
32
|
for (let i = 0; i < url.hosts.length; i++) {
|
|
33
|
-
const candidate = url.getHostAt(i);
|
|
34
33
|
const entry = url.hosts[i];
|
|
35
34
|
const hostLabel =
|
|
36
35
|
entry.port === undefined ? entry.host : `${entry.host}:${entry.port}`;
|
|
37
36
|
|
|
38
37
|
try {
|
|
38
|
+
const candidate = url.getHostAt(i);
|
|
39
|
+
|
|
39
40
|
await probe(candidate);
|
|
40
41
|
if (i > 0) {
|
|
41
42
|
this.logger.info(
|
|
@@ -1,4 +1,27 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import type { PgClientCtor } from './pg-native';
|
|
2
|
+
import {
|
|
3
|
+
PG_NATIVE_PLACEHOLDER_HOST,
|
|
4
|
+
pgProbeMultiHost,
|
|
5
|
+
withoutPgNative,
|
|
6
|
+
} from './pg-native';
|
|
7
|
+
|
|
8
|
+
const succeed = (): Promise<void> => Promise.resolve();
|
|
9
|
+
|
|
10
|
+
describe('pgProbeMultiHost', () => {
|
|
11
|
+
it('не даёт драйверу взять host из PGHOST', async () => {
|
|
12
|
+
const multiHostUrl = 'postgres://u:p@h1:5432,h2:5432/db';
|
|
13
|
+
const Client = jest
|
|
14
|
+
.fn()
|
|
15
|
+
.mockReturnValue({ connect: succeed, query: succeed, end: succeed });
|
|
16
|
+
|
|
17
|
+
await pgProbeMultiHost(multiHostUrl, Client as unknown as PgClientCtor);
|
|
18
|
+
|
|
19
|
+
expect(Client).toHaveBeenCalledWith({
|
|
20
|
+
host: PG_NATIVE_PLACEHOLDER_HOST.host,
|
|
21
|
+
nativeConnectionString: multiHostUrl,
|
|
22
|
+
});
|
|
23
|
+
});
|
|
24
|
+
});
|
|
2
25
|
|
|
3
26
|
describe('withoutPgNative', () => {
|
|
4
27
|
it('сохраняет Client/Pool с прототипа и перекрывает native', () => {
|
|
@@ -6,6 +6,8 @@
|
|
|
6
6
|
* в try/catch, чтобы пакет, не использующий postgres, не падал при загрузке.
|
|
7
7
|
*/
|
|
8
8
|
|
|
9
|
+
import type { MultiHostEntry } from './multi-host-url';
|
|
10
|
+
|
|
9
11
|
export type PgClient = {
|
|
10
12
|
connect(): Promise<void>;
|
|
11
13
|
query(text: string): Promise<unknown>;
|
|
@@ -13,6 +15,7 @@ export type PgClient = {
|
|
|
13
15
|
};
|
|
14
16
|
|
|
15
17
|
export type PgClientCtor = new (config: {
|
|
18
|
+
host?: string;
|
|
16
19
|
connectionString?: string;
|
|
17
20
|
|
|
18
21
|
/**
|
|
@@ -41,6 +44,18 @@ export type PgModule = {
|
|
|
41
44
|
native?: PgNativeModule | null;
|
|
42
45
|
};
|
|
43
46
|
|
|
47
|
+
/**
|
|
48
|
+
* Заглушка для полей `host`/`port` драйвера в native-режиме. `pg.native` перед
|
|
49
|
+
* каждым подключением делает `dns.lookup(host)` и падает, если имя не
|
|
50
|
+
* резолвится, даже когда задан `nativeConnectionString`. Настоящий первый хост
|
|
51
|
+
* поэтому отключил бы failover, а без `host` драйвер возьмёт `PGHOST`.
|
|
52
|
+
* @see node_modules/pg/lib/native/client.js (`_connect`)
|
|
53
|
+
*/
|
|
54
|
+
export const PG_NATIVE_PLACEHOLDER_HOST: MultiHostEntry = {
|
|
55
|
+
host: '127.0.0.1',
|
|
56
|
+
port: 5432,
|
|
57
|
+
};
|
|
58
|
+
|
|
44
59
|
let cachedPg: PgModule | null = null;
|
|
45
60
|
let cachedNative: PgNativeModule | null = null;
|
|
46
61
|
let cachedJsDriver: PgModule | null = null;
|
|
@@ -155,6 +170,7 @@ export const pgProbeMultiHost = async (
|
|
|
155
170
|
Client: PgClientCtor,
|
|
156
171
|
): Promise<void> => {
|
|
157
172
|
const client = new Client({
|
|
173
|
+
host: PG_NATIVE_PLACEHOLDER_HOST.host,
|
|
158
174
|
nativeConnectionString: multiHostUrl,
|
|
159
175
|
});
|
|
160
176
|
|
|
@@ -0,0 +1,57 @@
|
|
|
1
|
+
import type { ILogger } from '@rsdk/logging';
|
|
2
|
+
|
|
3
|
+
import { MultiHostUrlParser } from './multi-host-url.parser';
|
|
4
|
+
import type { PgClientCtor } from './pg-native';
|
|
5
|
+
import {
|
|
6
|
+
loadPgNative,
|
|
7
|
+
PG_NATIVE_PLACEHOLDER_HOST,
|
|
8
|
+
pgProbeMultiHost,
|
|
9
|
+
} from './pg-native';
|
|
10
|
+
import { resolveDbConnection } from './resolve-db-connection';
|
|
11
|
+
|
|
12
|
+
jest.mock('./pg-native', () => ({
|
|
13
|
+
...jest.requireActual('./pg-native'),
|
|
14
|
+
loadPgNative: jest.fn(),
|
|
15
|
+
pgProbeMultiHost: jest.fn(),
|
|
16
|
+
}));
|
|
17
|
+
|
|
18
|
+
const logger = { info: jest.fn(), warn: jest.fn() } as unknown as ILogger;
|
|
19
|
+
|
|
20
|
+
describe('resolveDbConnection в native-режиме', () => {
|
|
21
|
+
beforeEach(() => {
|
|
22
|
+
jest.mocked(loadPgNative).mockReturnValue({
|
|
23
|
+
Client: class {} as unknown as PgClientCtor,
|
|
24
|
+
});
|
|
25
|
+
});
|
|
26
|
+
|
|
27
|
+
it('не отдаёт драйверу настоящий первый хост', async () => {
|
|
28
|
+
const value = 'postgres://u:p%40ss@no-such..host:5432,good:5433/db?a=1';
|
|
29
|
+
|
|
30
|
+
const resolved = await resolveDbConnection({
|
|
31
|
+
url: new MultiHostUrlParser('postgres:').parse(value),
|
|
32
|
+
logger,
|
|
33
|
+
isPostgresFamily: true,
|
|
34
|
+
});
|
|
35
|
+
|
|
36
|
+
if (resolved.kind !== 'native-libpq') {
|
|
37
|
+
throw new Error(`unexpected kind: ${resolved.kind}`);
|
|
38
|
+
}
|
|
39
|
+
expect(resolved.multiHostUrl).toBe(value);
|
|
40
|
+
expect(resolved.placeholderUrl.toString()).toBe(
|
|
41
|
+
`postgres://u:p%40ss@${PG_NATIVE_PLACEHOLDER_HOST.host}:${PG_NATIVE_PLACEHOLDER_HOST.port}/db?a=1`,
|
|
42
|
+
);
|
|
43
|
+
});
|
|
44
|
+
|
|
45
|
+
it('строит заглушку и для имени, из которого не собирается URL', async () => {
|
|
46
|
+
const resolved = await resolveDbConnection({
|
|
47
|
+
url: new MultiHostUrlParser('postgres:').parse(
|
|
48
|
+
'postgres://u:p@ba^d:5432,good:5433/db',
|
|
49
|
+
),
|
|
50
|
+
logger,
|
|
51
|
+
isPostgresFamily: true,
|
|
52
|
+
});
|
|
53
|
+
|
|
54
|
+
expect(resolved.kind).toBe('native-libpq');
|
|
55
|
+
expect(pgProbeMultiHost).toHaveBeenCalled();
|
|
56
|
+
});
|
|
57
|
+
});
|
|
@@ -1,11 +1,16 @@
|
|
|
1
1
|
import type { ILogger } from '@rsdk/logging';
|
|
2
2
|
|
|
3
3
|
import { MultiHostNativeRequired } from './exception';
|
|
4
|
-
import type { MultiHostEntry
|
|
4
|
+
import type { MultiHostEntry } from './multi-host-url';
|
|
5
|
+
import { MultiHostUrl } from './multi-host-url';
|
|
5
6
|
import type { MultiHostProbe } from './multi-host-url.resolver';
|
|
6
7
|
import { MultiHostResolver } from './multi-host-url.resolver';
|
|
7
8
|
import type { PgNativeModule } from './pg-native';
|
|
8
|
-
import {
|
|
9
|
+
import {
|
|
10
|
+
loadPgNative,
|
|
11
|
+
PG_NATIVE_PLACEHOLDER_HOST,
|
|
12
|
+
pgProbeMultiHost,
|
|
13
|
+
} from './pg-native';
|
|
9
14
|
|
|
10
15
|
/**
|
|
11
16
|
* Опции стратегии установки соединения для multi-host URL.
|
|
@@ -47,9 +52,17 @@ export type ResolvedDbConnection =
|
|
|
47
52
|
multiHostUrl: string;
|
|
48
53
|
|
|
49
54
|
/**
|
|
50
|
-
*
|
|
51
|
-
*
|
|
52
|
-
*
|
|
55
|
+
* Single-host URL с теми же учётными данными и базой, но с адресом-заглушкой
|
|
56
|
+
* вместо хоста. Подставляется туда, где драйверу нужен один хост
|
|
57
|
+
* (`host` у TypeORM и knex, `clientUrl` у MikroORM); реальный коннект
|
|
58
|
+
* libpq собирает из `multiHostUrl`.
|
|
59
|
+
*/
|
|
60
|
+
placeholderUrl: URL;
|
|
61
|
+
|
|
62
|
+
/**
|
|
63
|
+
* @deprecated Не передавайте в драйвер, потому что при неразрешимом имени
|
|
64
|
+
* первого хоста подключение падает и failover не срабатывает. Используйте
|
|
65
|
+
* `placeholderUrl`.
|
|
53
66
|
*/
|
|
54
67
|
firstHostEntry: MultiHostEntry;
|
|
55
68
|
username?: string;
|
|
@@ -95,6 +108,10 @@ export const resolveDbConnection = async (
|
|
|
95
108
|
return {
|
|
96
109
|
kind: 'native-libpq',
|
|
97
110
|
multiHostUrl,
|
|
111
|
+
placeholderUrl: new MultiHostUrl({
|
|
112
|
+
...options.url,
|
|
113
|
+
hosts: [PG_NATIVE_PLACEHOLDER_HOST],
|
|
114
|
+
}).getHostAt(0),
|
|
98
115
|
firstHostEntry: options.url.hosts[0],
|
|
99
116
|
...(options.url.username && { username: options.url.username }),
|
|
100
117
|
...(options.url.password && { password: options.url.password }),
|