@rsdk/db 5.14.0-next.0 → 5.14.0-next.1
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/index.d.ts +2 -2
- package/dist/index.js +3 -1
- package/dist/index.js.map +1 -1
- package/dist/multi-host-url/index.d.ts +2 -2
- package/dist/multi-host-url/index.js +3 -1
- package/dist/multi-host-url/index.js.map +1 -1
- package/dist/multi-host-url/pg-native.d.ts +22 -0
- package/dist/multi-host-url/pg-native.js +36 -1
- package/dist/multi-host-url/pg-native.js.map +1 -1
- package/package.json +2 -2
- package/src/index.ts +3 -0
- package/src/multi-host-url/index.ts +2 -2
- package/src/multi-host-url/pg-native.spec.ts +34 -0
- package/src/multi-host-url/pg-native.ts +38 -2
package/dist/index.d.ts
CHANGED
|
@@ -7,5 +7,5 @@ export { Propagation } from './propagation.enum';
|
|
|
7
7
|
export { HEALTH_CHECK_QUERY } from './constants';
|
|
8
8
|
export { getSecureContextOptions } from './tls';
|
|
9
9
|
export { SslModeEnum } from './ssl-mode.enum';
|
|
10
|
-
export { MultiHostUrl, MultiHostUrlParser, MultiHostResolver, InvalidMultiHostUrl, InvalidMultiHostProtocol, MultiHostNativeRequired, pgProbe, resolveDbConnection, } from './multi-host-url';
|
|
11
|
-
export type { MultiHostEntry, MultiHostUrlInit, MultiHostProbe, PgNativeModule, ResolveDbConnectionOptions, ResolvedDbConnection, } from './multi-host-url';
|
|
10
|
+
export { MultiHostUrl, MultiHostUrlParser, MultiHostResolver, InvalidMultiHostUrl, InvalidMultiHostProtocol, MultiHostNativeRequired, pgProbe, loadPgJsDriver, withoutPgNative, resolveDbConnection, } from './multi-host-url';
|
|
11
|
+
export type { MultiHostEntry, MultiHostUrlInit, MultiHostProbe, PgModule, PgNativeModule, ResolveDbConnectionOptions, ResolvedDbConnection, } from './multi-host-url';
|
package/dist/index.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.resolveDbConnection = exports.pgProbe = exports.MultiHostNativeRequired = exports.InvalidMultiHostProtocol = exports.InvalidMultiHostUrl = exports.MultiHostResolver = exports.MultiHostUrlParser = exports.MultiHostUrl = exports.SslModeEnum = exports.getSecureContextOptions = exports.HEALTH_CHECK_QUERY = exports.Propagation = exports.TransactionRunner = exports.IncompatibleIsolationLevels = exports.CallOutOfContextWithMandatory = exports.NeverRunningInTransaction = exports.BaseContext = exports.ContextStorage = void 0;
|
|
3
|
+
exports.resolveDbConnection = exports.withoutPgNative = exports.loadPgJsDriver = exports.pgProbe = exports.MultiHostNativeRequired = exports.InvalidMultiHostProtocol = exports.InvalidMultiHostUrl = exports.MultiHostResolver = exports.MultiHostUrlParser = exports.MultiHostUrl = exports.SslModeEnum = exports.getSecureContextOptions = exports.HEALTH_CHECK_QUERY = exports.Propagation = exports.TransactionRunner = exports.IncompatibleIsolationLevels = exports.CallOutOfContextWithMandatory = exports.NeverRunningInTransaction = exports.BaseContext = exports.ContextStorage = void 0;
|
|
4
4
|
var context_storage_1 = require("./context.storage");
|
|
5
5
|
Object.defineProperty(exports, "ContextStorage", { enumerable: true, get: function () { return context_storage_1.ContextStorage; } });
|
|
6
6
|
var context_base_1 = require("./context.base");
|
|
@@ -27,5 +27,7 @@ Object.defineProperty(exports, "InvalidMultiHostUrl", { enumerable: true, get: f
|
|
|
27
27
|
Object.defineProperty(exports, "InvalidMultiHostProtocol", { enumerable: true, get: function () { return multi_host_url_1.InvalidMultiHostProtocol; } });
|
|
28
28
|
Object.defineProperty(exports, "MultiHostNativeRequired", { enumerable: true, get: function () { return multi_host_url_1.MultiHostNativeRequired; } });
|
|
29
29
|
Object.defineProperty(exports, "pgProbe", { enumerable: true, get: function () { return multi_host_url_1.pgProbe; } });
|
|
30
|
+
Object.defineProperty(exports, "loadPgJsDriver", { enumerable: true, get: function () { return multi_host_url_1.loadPgJsDriver; } });
|
|
31
|
+
Object.defineProperty(exports, "withoutPgNative", { enumerable: true, get: function () { return multi_host_url_1.withoutPgNative; } });
|
|
30
32
|
Object.defineProperty(exports, "resolveDbConnection", { enumerable: true, get: function () { return multi_host_url_1.resolveDbConnection; } });
|
|
31
33
|
//# sourceMappingURL=index.js.map
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,qDAAmD;AAA1C,iHAAA,cAAc,OAAA;AACvB,+CAA6C;AAApC,2GAAA,WAAW,OAAA;AAEpB,2CAIsB;AAHpB,uHAAA,yBAAyB,OAAA;AACzB,2HAAA,6BAA6B,OAAA;AAC7B,yHAAA,2BAA2B,OAAA;AAE7B,+DAA2D;AAAlD,yHAAA,iBAAiB,OAAA;AAC1B,uDAAiD;AAAxC,+GAAA,WAAW,OAAA;AACpB,yCAAiD;AAAxC,+GAAA,kBAAkB,OAAA;AAC3B,6BAAgD;AAAvC,8GAAA,uBAAuB,OAAA;AAChC,iDAA8C;AAArC,4GAAA,WAAW,OAAA;AACpB,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,qDAAmD;AAA1C,iHAAA,cAAc,OAAA;AACvB,+CAA6C;AAApC,2GAAA,WAAW,OAAA;AAEpB,2CAIsB;AAHpB,uHAAA,yBAAyB,OAAA;AACzB,2HAAA,6BAA6B,OAAA;AAC7B,yHAAA,2BAA2B,OAAA;AAE7B,+DAA2D;AAAlD,yHAAA,iBAAiB,OAAA;AAC1B,uDAAiD;AAAxC,+GAAA,WAAW,OAAA;AACpB,yCAAiD;AAAxC,+GAAA,kBAAkB,OAAA;AAC3B,6BAAgD;AAAvC,8GAAA,uBAAuB,OAAA;AAChC,iDAA8C;AAArC,4GAAA,WAAW,OAAA;AACpB,mDAW0B;AAVxB,8GAAA,YAAY,OAAA;AACZ,oHAAA,kBAAkB,OAAA;AAClB,mHAAA,iBAAiB,OAAA;AACjB,qHAAA,mBAAmB,OAAA;AACnB,0HAAA,wBAAwB,OAAA;AACxB,yHAAA,uBAAuB,OAAA;AACvB,yGAAA,OAAO,OAAA;AACP,gHAAA,cAAc,OAAA;AACd,iHAAA,eAAe,OAAA;AACf,qHAAA,mBAAmB,OAAA"}
|
|
@@ -4,7 +4,7 @@ export { MultiHostUrlParser } from './multi-host-url.parser';
|
|
|
4
4
|
export { MultiHostResolver } from './multi-host-url.resolver';
|
|
5
5
|
export type { MultiHostProbe } from './multi-host-url.resolver';
|
|
6
6
|
export { InvalidMultiHostUrl, InvalidMultiHostProtocol, MultiHostNativeRequired, } from './exception';
|
|
7
|
-
export { pgProbe } from './pg-native';
|
|
8
|
-
export type { PgNativeModule } from './pg-native';
|
|
7
|
+
export { pgProbe, loadPgJsDriver, withoutPgNative } from './pg-native';
|
|
8
|
+
export type { PgNativeModule, PgModule } from './pg-native';
|
|
9
9
|
export { resolveDbConnection } from './resolve-db-connection';
|
|
10
10
|
export type { ResolveDbConnectionOptions, ResolvedDbConnection, } from './resolve-db-connection';
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.resolveDbConnection = exports.pgProbe = exports.MultiHostNativeRequired = exports.InvalidMultiHostProtocol = exports.InvalidMultiHostUrl = exports.MultiHostResolver = exports.MultiHostUrlParser = exports.MultiHostUrl = void 0;
|
|
3
|
+
exports.resolveDbConnection = exports.withoutPgNative = exports.loadPgJsDriver = exports.pgProbe = exports.MultiHostNativeRequired = exports.InvalidMultiHostProtocol = exports.InvalidMultiHostUrl = exports.MultiHostResolver = exports.MultiHostUrlParser = exports.MultiHostUrl = void 0;
|
|
4
4
|
var multi_host_url_1 = require("./multi-host-url");
|
|
5
5
|
Object.defineProperty(exports, "MultiHostUrl", { enumerable: true, get: function () { return multi_host_url_1.MultiHostUrl; } });
|
|
6
6
|
var multi_host_url_parser_1 = require("./multi-host-url.parser");
|
|
@@ -13,6 +13,8 @@ Object.defineProperty(exports, "InvalidMultiHostProtocol", { enumerable: true, g
|
|
|
13
13
|
Object.defineProperty(exports, "MultiHostNativeRequired", { enumerable: true, get: function () { return exception_1.MultiHostNativeRequired; } });
|
|
14
14
|
var pg_native_1 = require("./pg-native");
|
|
15
15
|
Object.defineProperty(exports, "pgProbe", { enumerable: true, get: function () { return pg_native_1.pgProbe; } });
|
|
16
|
+
Object.defineProperty(exports, "loadPgJsDriver", { enumerable: true, get: function () { return pg_native_1.loadPgJsDriver; } });
|
|
17
|
+
Object.defineProperty(exports, "withoutPgNative", { enumerable: true, get: function () { return pg_native_1.withoutPgNative; } });
|
|
16
18
|
var resolve_db_connection_1 = require("./resolve-db-connection");
|
|
17
19
|
Object.defineProperty(exports, "resolveDbConnection", { enumerable: true, get: function () { return resolve_db_connection_1.resolveDbConnection; } });
|
|
18
20
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/multi-host-url/index.ts"],"names":[],"mappings":";;;AAAA,mDAAgD;AAAvC,8GAAA,YAAY,OAAA;AAErB,iEAA6D;AAApD,2HAAA,kBAAkB,OAAA;AAC3B,qEAA8D;AAArD,4HAAA,iBAAiB,OAAA;AAE1B,yCAIqB;AAHnB,gHAAA,mBAAmB,OAAA;AACnB,qHAAA,wBAAwB,OAAA;AACxB,oHAAA,uBAAuB,OAAA;AAEzB,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/multi-host-url/index.ts"],"names":[],"mappings":";;;AAAA,mDAAgD;AAAvC,8GAAA,YAAY,OAAA;AAErB,iEAA6D;AAApD,2HAAA,kBAAkB,OAAA;AAC3B,qEAA8D;AAArD,4HAAA,iBAAiB,OAAA;AAE1B,yCAIqB;AAHnB,gHAAA,mBAAmB,OAAA;AACnB,qHAAA,wBAAwB,OAAA;AACxB,oHAAA,uBAAuB,OAAA;AAEzB,yCAAuE;AAA9D,oGAAA,OAAO,OAAA;AAAE,2GAAA,cAAc,OAAA;AAAE,4GAAA,eAAe,OAAA;AAEjD,iEAA8D;AAArD,4HAAA,mBAAmB,OAAA"}
|
|
@@ -25,9 +25,31 @@ export type PgClientCtor = new (config: {
|
|
|
25
25
|
* `driver`/`overrideConfig.driver`, поэтому signature намеренно широкий.
|
|
26
26
|
*/
|
|
27
27
|
export type PgNativeModule = {
|
|
28
|
+
[key: string]: unknown;
|
|
28
29
|
Client: PgClientCtor;
|
|
30
|
+
};
|
|
31
|
+
export type PgModule = {
|
|
29
32
|
[key: string]: unknown;
|
|
33
|
+
Client: PgClientCtor;
|
|
34
|
+
native?: PgNativeModule | null;
|
|
30
35
|
};
|
|
36
|
+
/**
|
|
37
|
+
* TypeORM сам переключается на `pg.native`, если у модуля `pg` есть поле
|
|
38
|
+
* `.native` и установлен пакет `pg-native` — даже для одного хоста.
|
|
39
|
+
* У `pg.native` (libpq) не работают `DB_TLS_*` / объект `ssl` из Node:
|
|
40
|
+
* сертификаты из конфига не доходят до Postgres, и клиентская авторизация
|
|
41
|
+
* по сертификату падает с «connection requires a valid client certificate».
|
|
42
|
+
*
|
|
43
|
+
* @see node_modules/typeorm/driver/postgres/PostgresDriver.js (`loadDependencies`)
|
|
44
|
+
*/
|
|
45
|
+
export declare const withoutPgNative: <T extends {
|
|
46
|
+
native?: unknown;
|
|
47
|
+
}>(pg: T) => T;
|
|
48
|
+
/**
|
|
49
|
+
* JS-драйвер `pg` для TypeORM на одном хосте: тот же модуль, что {@link loadPg},
|
|
50
|
+
* но без `.native`, чтобы TypeORM сам не переключился на libpq.
|
|
51
|
+
*/
|
|
52
|
+
export declare const loadPgJsDriver: () => PgModule;
|
|
31
53
|
/**
|
|
32
54
|
* Пробует загрузить `pg.native` (биндинги к libpq). Доступ к `pg.native`
|
|
33
55
|
* лениво требует пакет `pg-native`; если его нет, возвращаем `null`, чтобы
|
|
@@ -1,9 +1,10 @@
|
|
|
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 = void 0;
|
|
4
|
+
exports.pgProbeMultiHost = exports.pgProbe = exports.loadPgNative = exports.loadPgJsDriver = exports.withoutPgNative = void 0;
|
|
5
5
|
let cachedPg = null;
|
|
6
6
|
let cachedNative = null;
|
|
7
|
+
let cachedJsDriver = null;
|
|
7
8
|
const loadPg = () => {
|
|
8
9
|
if (cachedPg)
|
|
9
10
|
return cachedPg;
|
|
@@ -15,6 +16,40 @@ const loadPg = () => {
|
|
|
15
16
|
throw new Error('`pg` package is not installed. Install it as a runtime dependency to use postgres connectivity.', { cause: error });
|
|
16
17
|
}
|
|
17
18
|
};
|
|
19
|
+
/**
|
|
20
|
+
* TypeORM сам переключается на `pg.native`, если у модуля `pg` есть поле
|
|
21
|
+
* `.native` и установлен пакет `pg-native` — даже для одного хоста.
|
|
22
|
+
* У `pg.native` (libpq) не работают `DB_TLS_*` / объект `ssl` из Node:
|
|
23
|
+
* сертификаты из конфига не доходят до Postgres, и клиентская авторизация
|
|
24
|
+
* по сертификату падает с «connection requires a valid client certificate».
|
|
25
|
+
*
|
|
26
|
+
* @see node_modules/typeorm/driver/postgres/PostgresDriver.js (`loadDependencies`)
|
|
27
|
+
*/
|
|
28
|
+
const withoutPgNative = (pg) => {
|
|
29
|
+
const js = Object.create(pg);
|
|
30
|
+
// У реального `pg` поле `.native` — геттер. Object.create его наследует,
|
|
31
|
+
// а Object.assign не может его перезаписать. Поэтому явно ставим
|
|
32
|
+
// собственное свойство `native: undefined`, чтобы TypeORM не увидел native.
|
|
33
|
+
Object.defineProperty(js, 'native', {
|
|
34
|
+
configurable: true,
|
|
35
|
+
enumerable: true,
|
|
36
|
+
value: undefined,
|
|
37
|
+
writable: true,
|
|
38
|
+
});
|
|
39
|
+
return js;
|
|
40
|
+
};
|
|
41
|
+
exports.withoutPgNative = withoutPgNative;
|
|
42
|
+
/**
|
|
43
|
+
* JS-драйвер `pg` для TypeORM на одном хосте: тот же модуль, что {@link loadPg},
|
|
44
|
+
* но без `.native`, чтобы TypeORM сам не переключился на libpq.
|
|
45
|
+
*/
|
|
46
|
+
const loadPgJsDriver = () => {
|
|
47
|
+
if (cachedJsDriver)
|
|
48
|
+
return cachedJsDriver;
|
|
49
|
+
cachedJsDriver = (0, exports.withoutPgNative)(loadPg());
|
|
50
|
+
return cachedJsDriver;
|
|
51
|
+
};
|
|
52
|
+
exports.loadPgJsDriver = loadPgJsDriver;
|
|
18
53
|
/**
|
|
19
54
|
* Пробует загрузить `pg.native` (биндинги к libpq). Доступ к `pg.native`
|
|
20
55
|
* лениво требует пакет `pg-native`; если его нет, возвращаем `null`, чтобы
|
|
@@ -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":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@rsdk/db",
|
|
3
|
-
"version": "5.14.0-next.
|
|
3
|
+
"version": "5.14.0-next.1",
|
|
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": "d659eb79bcc745bb9522ad94727806b02b091f85"
|
|
23
23
|
}
|
package/src/index.ts
CHANGED
|
@@ -19,12 +19,15 @@ export {
|
|
|
19
19
|
InvalidMultiHostProtocol,
|
|
20
20
|
MultiHostNativeRequired,
|
|
21
21
|
pgProbe,
|
|
22
|
+
loadPgJsDriver,
|
|
23
|
+
withoutPgNative,
|
|
22
24
|
resolveDbConnection,
|
|
23
25
|
} from './multi-host-url';
|
|
24
26
|
export type {
|
|
25
27
|
MultiHostEntry,
|
|
26
28
|
MultiHostUrlInit,
|
|
27
29
|
MultiHostProbe,
|
|
30
|
+
PgModule,
|
|
28
31
|
PgNativeModule,
|
|
29
32
|
ResolveDbConnectionOptions,
|
|
30
33
|
ResolvedDbConnection,
|
|
@@ -8,8 +8,8 @@ export {
|
|
|
8
8
|
InvalidMultiHostProtocol,
|
|
9
9
|
MultiHostNativeRequired,
|
|
10
10
|
} from './exception';
|
|
11
|
-
export { pgProbe } from './pg-native';
|
|
12
|
-
export type { PgNativeModule } from './pg-native';
|
|
11
|
+
export { pgProbe, loadPgJsDriver, withoutPgNative } from './pg-native';
|
|
12
|
+
export type { PgNativeModule, PgModule } from './pg-native';
|
|
13
13
|
export { resolveDbConnection } from './resolve-db-connection';
|
|
14
14
|
export type {
|
|
15
15
|
ResolveDbConnectionOptions,
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
import { withoutPgNative } from './pg-native';
|
|
2
|
+
|
|
3
|
+
describe('withoutPgNative', () => {
|
|
4
|
+
it('сохраняет Client/Pool с прототипа и перекрывает native', () => {
|
|
5
|
+
class Client {}
|
|
6
|
+
class Pool {}
|
|
7
|
+
const native = { Client };
|
|
8
|
+
const pg = { Client, Pool, native };
|
|
9
|
+
|
|
10
|
+
const js = withoutPgNative(pg);
|
|
11
|
+
|
|
12
|
+
expect(js.native).toBeUndefined();
|
|
13
|
+
expect(js.Client).toBe(Client);
|
|
14
|
+
expect(js.Pool).toBe(Pool);
|
|
15
|
+
expect(Object.getPrototypeOf(js)).toBe(pg);
|
|
16
|
+
});
|
|
17
|
+
|
|
18
|
+
it('не вычисляет геттер pg.native (иначе загрузится pg-native)', () => {
|
|
19
|
+
let accessed = false;
|
|
20
|
+
const pg = {
|
|
21
|
+
Client: class {},
|
|
22
|
+
get native(): { Client: new () => object } {
|
|
23
|
+
accessed = true;
|
|
24
|
+
return { Client: class {} };
|
|
25
|
+
},
|
|
26
|
+
};
|
|
27
|
+
|
|
28
|
+
const js = withoutPgNative(pg);
|
|
29
|
+
|
|
30
|
+
expect(accessed).toBe(false);
|
|
31
|
+
expect(js.native).toBeUndefined();
|
|
32
|
+
expect(accessed).toBe(false);
|
|
33
|
+
});
|
|
34
|
+
});
|
|
@@ -31,17 +31,19 @@ export type PgClientCtor = new (config: {
|
|
|
31
31
|
* `driver`/`overrideConfig.driver`, поэтому signature намеренно широкий.
|
|
32
32
|
*/
|
|
33
33
|
export type PgNativeModule = {
|
|
34
|
-
Client: PgClientCtor;
|
|
35
34
|
[key: string]: unknown;
|
|
35
|
+
Client: PgClientCtor;
|
|
36
36
|
};
|
|
37
37
|
|
|
38
|
-
type PgModule = {
|
|
38
|
+
export type PgModule = {
|
|
39
|
+
[key: string]: unknown;
|
|
39
40
|
Client: PgClientCtor;
|
|
40
41
|
native?: PgNativeModule | null;
|
|
41
42
|
};
|
|
42
43
|
|
|
43
44
|
let cachedPg: PgModule | null = null;
|
|
44
45
|
let cachedNative: PgNativeModule | null = null;
|
|
46
|
+
let cachedJsDriver: PgModule | null = null;
|
|
45
47
|
|
|
46
48
|
const loadPg = (): PgModule => {
|
|
47
49
|
if (cachedPg) return cachedPg;
|
|
@@ -56,6 +58,40 @@ const loadPg = (): PgModule => {
|
|
|
56
58
|
}
|
|
57
59
|
};
|
|
58
60
|
|
|
61
|
+
/**
|
|
62
|
+
* TypeORM сам переключается на `pg.native`, если у модуля `pg` есть поле
|
|
63
|
+
* `.native` и установлен пакет `pg-native` — даже для одного хоста.
|
|
64
|
+
* У `pg.native` (libpq) не работают `DB_TLS_*` / объект `ssl` из Node:
|
|
65
|
+
* сертификаты из конфига не доходят до Postgres, и клиентская авторизация
|
|
66
|
+
* по сертификату падает с «connection requires a valid client certificate».
|
|
67
|
+
*
|
|
68
|
+
* @see node_modules/typeorm/driver/postgres/PostgresDriver.js (`loadDependencies`)
|
|
69
|
+
*/
|
|
70
|
+
export const withoutPgNative = <T extends { native?: unknown }>(pg: T): T => {
|
|
71
|
+
const js = Object.create(pg) as T;
|
|
72
|
+
|
|
73
|
+
// У реального `pg` поле `.native` — геттер. Object.create его наследует,
|
|
74
|
+
// а Object.assign не может его перезаписать. Поэтому явно ставим
|
|
75
|
+
// собственное свойство `native: undefined`, чтобы TypeORM не увидел native.
|
|
76
|
+
Object.defineProperty(js, 'native', {
|
|
77
|
+
configurable: true,
|
|
78
|
+
enumerable: true,
|
|
79
|
+
value: undefined,
|
|
80
|
+
writable: true,
|
|
81
|
+
});
|
|
82
|
+
return js;
|
|
83
|
+
};
|
|
84
|
+
|
|
85
|
+
/**
|
|
86
|
+
* JS-драйвер `pg` для TypeORM на одном хосте: тот же модуль, что {@link loadPg},
|
|
87
|
+
* но без `.native`, чтобы TypeORM сам не переключился на libpq.
|
|
88
|
+
*/
|
|
89
|
+
export const loadPgJsDriver = (): PgModule => {
|
|
90
|
+
if (cachedJsDriver) return cachedJsDriver;
|
|
91
|
+
cachedJsDriver = withoutPgNative(loadPg());
|
|
92
|
+
return cachedJsDriver;
|
|
93
|
+
};
|
|
94
|
+
|
|
59
95
|
/**
|
|
60
96
|
* Пробует загрузить `pg.native` (биндинги к libpq). Доступ к `pg.native`
|
|
61
97
|
* лениво требует пакет `pg-native`; если его нет, возвращаем `null`, чтобы
|