af-db-ts 3.0.26 → 3.0.27
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/README.md +3 -3
- package/dist/cjs/__tests__/db/pg/pg-pool-no-deprecation.spec.js +61 -0
- package/dist/cjs/__tests__/db/pg/pg-pool-no-deprecation.spec.js.map +1 -0
- package/dist/cjs/src/pg/pool-pg.js +21 -6
- package/dist/cjs/src/pg/pool-pg.js.map +1 -1
- package/dist/cjs/tsconfig.tsbuildinfo +1 -1
- package/dist/esm/src/pg/pool-pg.js +21 -6
- package/dist/esm/src/pg/pool-pg.js.map +1 -1
- package/dist/types/src/pg/pool-pg.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/pg/pool-pg.ts +22 -6
package/README.md
CHANGED
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
### Not of interest to third party users
|
|
2
|
-
|
|
3
|
-
|
|
1
|
+
### Not of interest to third party users
|
|
2
|
+
|
|
3
|
+
|
|
@@ -0,0 +1,61 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const src_1 = require("../../../src");
|
|
4
|
+
const connectionId = 'test';
|
|
5
|
+
// Фиктивная registerTypeFunction, имитирующая pgvector.registerType —
|
|
6
|
+
// выполняет запрос на клиенте (именно это вызывало гонку)
|
|
7
|
+
const fakeRegisterType = async (client) => {
|
|
8
|
+
await client.query('SELECT 1');
|
|
9
|
+
};
|
|
10
|
+
afterEach(async () => {
|
|
11
|
+
// Очищаем кеш пулов, чтобы каждый тест начинал с чистого состояния
|
|
12
|
+
const pool = src_1.poolsCachePg[connectionId];
|
|
13
|
+
if (pool) {
|
|
14
|
+
await pool.end();
|
|
15
|
+
delete src_1.poolsCachePg[connectionId];
|
|
16
|
+
}
|
|
17
|
+
});
|
|
18
|
+
describe('Pool: no deprecation warning with registerTypesFunctions', () => {
|
|
19
|
+
test('queryPg с registerTypesFunctions не генерирует DeprecationWarning', async () => {
|
|
20
|
+
const warnings = [];
|
|
21
|
+
const warningHandler = (warning) => {
|
|
22
|
+
warnings.push(warning.message);
|
|
23
|
+
};
|
|
24
|
+
process.on('warning', warningHandler);
|
|
25
|
+
try {
|
|
26
|
+
// Получаем пул с registerTypesFunctions
|
|
27
|
+
const pool = await (0, src_1.getPoolPg)({
|
|
28
|
+
connectionId,
|
|
29
|
+
registerTypesFunctions: [fakeRegisterType],
|
|
30
|
+
});
|
|
31
|
+
// Выполняем несколько запросов подряд, чтобы спровоцировать гонку
|
|
32
|
+
// (если бы registerTypesFunctions были в connect-обработчике)
|
|
33
|
+
const results = await Promise.all([
|
|
34
|
+
pool.query('SELECT 1 AS val'),
|
|
35
|
+
pool.query('SELECT 2 AS val'),
|
|
36
|
+
pool.query('SELECT 3 AS val'),
|
|
37
|
+
]);
|
|
38
|
+
expect(results[0].rows[0].val).toEqual(1);
|
|
39
|
+
expect(results[1].rows[0].val).toEqual(2);
|
|
40
|
+
expect(results[2].rows[0].val).toEqual(3);
|
|
41
|
+
// Даём время на обработку возможных warning'ов (они асинхронны)
|
|
42
|
+
await new Promise((resolve) => { setTimeout(resolve, 200); });
|
|
43
|
+
const deprecationWarnings = warnings.filter((msg) => msg.includes('already executing a query'));
|
|
44
|
+
expect(deprecationWarnings).toEqual([]);
|
|
45
|
+
}
|
|
46
|
+
finally {
|
|
47
|
+
process.removeListener('warning', warningHandler);
|
|
48
|
+
}
|
|
49
|
+
});
|
|
50
|
+
test('getPoolPg возвращает работающий пул и корректно закрывается', async () => {
|
|
51
|
+
const pool = await (0, src_1.getPoolPg)({
|
|
52
|
+
connectionId,
|
|
53
|
+
registerTypesFunctions: [fakeRegisterType],
|
|
54
|
+
});
|
|
55
|
+
const res = await pool.query('SELECT current_database() AS db');
|
|
56
|
+
expect(res.rows[0].db).toBeTruthy();
|
|
57
|
+
const closed = await (0, src_1.closePoolPg)(connectionId);
|
|
58
|
+
expect(closed).toBe(true);
|
|
59
|
+
});
|
|
60
|
+
});
|
|
61
|
+
//# sourceMappingURL=pg-pool-no-deprecation.spec.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"pg-pool-no-deprecation.spec.js","sourceRoot":"","sources":["../../../../../__tests__/db/pg/pg-pool-no-deprecation.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -96,24 +96,39 @@ const getPoolPg = async (arg, throwError, registerTypesFunctions) => {
|
|
|
96
96
|
poolConfig.host = tunnelAddr.host;
|
|
97
97
|
poolConfig.port = tunnelAddr.port;
|
|
98
98
|
}
|
|
99
|
-
|
|
99
|
+
// Используем опцию verify для регистрации типов на каждом новом клиенте.
|
|
100
|
+
// pg-pool вызывает verify ПЕРЕД тем как отдать клиент потребителю,
|
|
101
|
+
// что исключает гонку между registerTypesFunctions и пользовательскими запросами.
|
|
102
|
+
// Ранее registerTypesFunctions вызывались в async-обработчике события 'connect',
|
|
103
|
+
// но pg-pool эмитит 'connect' синхронно и сразу отдаёт клиент — это приводило к
|
|
104
|
+
// DeprecationWarning в pg >= 8.19 ("client.query() when already executing a query").
|
|
105
|
+
const poolOptions = { ...poolConfig };
|
|
106
|
+
if (Array.isArray(registerTypesFunctions) && registerTypesFunctions.length > 0) {
|
|
107
|
+
const fns = registerTypesFunctions;
|
|
108
|
+
poolOptions.verify = (client, done) => {
|
|
109
|
+
Promise.all(fns.map((fn) => fn(client)))
|
|
110
|
+
.then(() => done())
|
|
111
|
+
.catch((err) => done(err));
|
|
112
|
+
};
|
|
113
|
+
}
|
|
114
|
+
const pool = new pg_1.Pool(poolOptions);
|
|
100
115
|
exports.poolsCachePg[connectionId] = pool;
|
|
101
116
|
pool.on('error', (err, client) => {
|
|
102
117
|
client.release(true);
|
|
103
118
|
logger_error_1.logger.error(err);
|
|
104
119
|
});
|
|
105
|
-
pool.on('connect',
|
|
120
|
+
pool.on('connect', (client) => {
|
|
106
121
|
const { database, processID } = client;
|
|
107
122
|
(0, debug_1.debugX)(`PG client [${connectionId}] connected! DB: "${database}" / processID: ${processID}`);
|
|
108
|
-
if (Array.isArray(registerTypesFunctions)) {
|
|
109
|
-
await Promise.all(registerTypesFunctions.map((fn) => fn(client)));
|
|
110
|
-
}
|
|
111
123
|
});
|
|
112
124
|
pool.on('remove', (client) => {
|
|
113
125
|
const { database, processID } = client;
|
|
114
126
|
(0, debug_1.debugX)(`PG client [${connectionId}] removed. DB: "${database}" / processID: ${processID}`);
|
|
115
127
|
});
|
|
116
|
-
|
|
128
|
+
// Eager-connect: создаём первое соединение сразу для раннего обнаружения ошибок.
|
|
129
|
+
// Ранее pool.connect() вызывался без сохранения клиента, что приводило к утечке.
|
|
130
|
+
const initialClient = await pool.connect();
|
|
131
|
+
initialClient.release();
|
|
117
132
|
}
|
|
118
133
|
return exports.poolsCachePg[connectionId];
|
|
119
134
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pool-pg.js","sourceRoot":"","sources":["../../../../src/pg/pool-pg.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"pool-pg.js","sourceRoot":"","sources":["../../../../src/pg/pool-pg.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"root":["../../src/common.ts","../../src/debug.ts","../../src/index.ts","../../src/logger-error.ts","../../src/@types/i-common.ts","../../src/@types/i-config.ts","../../src/@types/i-data-types-ms.ts","../../src/@types/i-data-types-pg.ts","../../src/@types/i-ms.ts","../../src/@types/i-pg.ts","../../src/ms/gen-table-interfaces-ms.ts","../../src/ms/pool-ms.ts","../../src/ms/prepare-value.ts","../../src/ms/query-ms.ts","../../src/ms/table-schema-ms.ts","../../src/ms/utils-ms.ts","../../src/ms/wrap-transaction-ms.ts","../../src/ms/get-sql/insert.ts","../../src/ms/get-sql/merge.ts","../../src/ms/get-sql/update.ts","../../src/pg/gen-table-interfaces-pg.ts","../../src/pg/insert-pg.ts","../../src/pg/is-table-or-view-exists.ts","../../src/pg/pool-pg.ts","../../src/pg/prepare-value.ts","../../src/pg/query-pg.ts","../../src/pg/table-schema-pg.ts","../../src/pg/utils-pg.ts","../../src/pg/get-sql/insert.ts","../../src/pg/get-sql/merge.ts","../../src/pg/get-sql/reset-sequence.ts","../../src/pg/get-sql/update.ts","../../src/utils/utils-array.ts","../../src/utils/utils-dt.ts","../../src/utils/utils-num.ts","../../src/utils/utils.ts","../../__tests__/01_node_env.spec.ts","../../__tests__/global-setup.ts","../../__tests__/global-teardown.ts","../../__tests__/db/ms/ms-get-sql.spec.ts","../../__tests__/db/ms/ms-prepare-sql-value.spec.ts","../../__tests__/db/ms/ms-table-schema.spec.ts","../../__tests__/db/ms/@gen-types/test-table_schema.ts","../../__tests__/db/pg/gen-table-interfaces-4-test-pg.ts","../../__tests__/db/pg/pg-get-sql.spec.ts","../../__tests__/db/pg/pg-insert.spec.ts","../../__tests__/db/pg/pg-prepare-sql-value.spec.ts","../../__tests__/db/pg/pg-table-schema.spec.ts","../../__tests__/db/pg/@gen-types/test-hard_case.ts","../../__tests__/db/pg/@gen-types/test-only_one_serial.ts","../../__tests__/db/pg/@gen-types/test-only_one_uniq.ts","../../__tests__/db/pg/@gen-types/test-serial_and_uniq.ts","../../__tests__/db/pg/@gen-types/test-table_schema.ts","../../__tests__/db/pg/array-string-escape/pg-array-string-escape.spec.ts"],"version":"5.9.3"}
|
|
1
|
+
{"root":["../../src/common.ts","../../src/debug.ts","../../src/index.ts","../../src/logger-error.ts","../../src/@types/i-common.ts","../../src/@types/i-config.ts","../../src/@types/i-data-types-ms.ts","../../src/@types/i-data-types-pg.ts","../../src/@types/i-ms.ts","../../src/@types/i-pg.ts","../../src/ms/gen-table-interfaces-ms.ts","../../src/ms/pool-ms.ts","../../src/ms/prepare-value.ts","../../src/ms/query-ms.ts","../../src/ms/table-schema-ms.ts","../../src/ms/utils-ms.ts","../../src/ms/wrap-transaction-ms.ts","../../src/ms/get-sql/insert.ts","../../src/ms/get-sql/merge.ts","../../src/ms/get-sql/update.ts","../../src/pg/gen-table-interfaces-pg.ts","../../src/pg/insert-pg.ts","../../src/pg/is-table-or-view-exists.ts","../../src/pg/pool-pg.ts","../../src/pg/prepare-value.ts","../../src/pg/query-pg.ts","../../src/pg/table-schema-pg.ts","../../src/pg/utils-pg.ts","../../src/pg/get-sql/insert.ts","../../src/pg/get-sql/merge.ts","../../src/pg/get-sql/reset-sequence.ts","../../src/pg/get-sql/update.ts","../../src/utils/utils-array.ts","../../src/utils/utils-dt.ts","../../src/utils/utils-num.ts","../../src/utils/utils.ts","../../__tests__/01_node_env.spec.ts","../../__tests__/global-setup.ts","../../__tests__/global-teardown.ts","../../__tests__/db/ms/ms-get-sql.spec.ts","../../__tests__/db/ms/ms-prepare-sql-value.spec.ts","../../__tests__/db/ms/ms-table-schema.spec.ts","../../__tests__/db/ms/@gen-types/test-table_schema.ts","../../__tests__/db/pg/gen-table-interfaces-4-test-pg.ts","../../__tests__/db/pg/pg-get-sql.spec.ts","../../__tests__/db/pg/pg-insert.spec.ts","../../__tests__/db/pg/pg-pool-no-deprecation.spec.ts","../../__tests__/db/pg/pg-prepare-sql-value.spec.ts","../../__tests__/db/pg/pg-table-schema.spec.ts","../../__tests__/db/pg/@gen-types/test-hard_case.ts","../../__tests__/db/pg/@gen-types/test-only_one_serial.ts","../../__tests__/db/pg/@gen-types/test-only_one_uniq.ts","../../__tests__/db/pg/@gen-types/test-serial_and_uniq.ts","../../__tests__/db/pg/@gen-types/test-table_schema.ts","../../__tests__/db/pg/array-string-escape/pg-array-string-escape.spec.ts"],"version":"5.9.3"}
|
|
@@ -89,24 +89,39 @@ export const getPoolPg = async (arg, throwError, registerTypesFunctions) => {
|
|
|
89
89
|
poolConfig.host = tunnelAddr.host;
|
|
90
90
|
poolConfig.port = tunnelAddr.port;
|
|
91
91
|
}
|
|
92
|
-
|
|
92
|
+
// Используем опцию verify для регистрации типов на каждом новом клиенте.
|
|
93
|
+
// pg-pool вызывает verify ПЕРЕД тем как отдать клиент потребителю,
|
|
94
|
+
// что исключает гонку между registerTypesFunctions и пользовательскими запросами.
|
|
95
|
+
// Ранее registerTypesFunctions вызывались в async-обработчике события 'connect',
|
|
96
|
+
// но pg-pool эмитит 'connect' синхронно и сразу отдаёт клиент — это приводило к
|
|
97
|
+
// DeprecationWarning в pg >= 8.19 ("client.query() when already executing a query").
|
|
98
|
+
const poolOptions = { ...poolConfig };
|
|
99
|
+
if (Array.isArray(registerTypesFunctions) && registerTypesFunctions.length > 0) {
|
|
100
|
+
const fns = registerTypesFunctions;
|
|
101
|
+
poolOptions.verify = (client, done) => {
|
|
102
|
+
Promise.all(fns.map((fn) => fn(client)))
|
|
103
|
+
.then(() => done())
|
|
104
|
+
.catch((err) => done(err));
|
|
105
|
+
};
|
|
106
|
+
}
|
|
107
|
+
const pool = new Pool(poolOptions);
|
|
93
108
|
poolsCachePg[connectionId] = pool;
|
|
94
109
|
pool.on('error', (err, client) => {
|
|
95
110
|
client.release(true);
|
|
96
111
|
logger.error(err);
|
|
97
112
|
});
|
|
98
|
-
pool.on('connect',
|
|
113
|
+
pool.on('connect', (client) => {
|
|
99
114
|
const { database, processID } = client;
|
|
100
115
|
debugX(`PG client [${connectionId}] connected! DB: "${database}" / processID: ${processID}`);
|
|
101
|
-
if (Array.isArray(registerTypesFunctions)) {
|
|
102
|
-
await Promise.all(registerTypesFunctions.map((fn) => fn(client)));
|
|
103
|
-
}
|
|
104
116
|
});
|
|
105
117
|
pool.on('remove', (client) => {
|
|
106
118
|
const { database, processID } = client;
|
|
107
119
|
debugX(`PG client [${connectionId}] removed. DB: "${database}" / processID: ${processID}`);
|
|
108
120
|
});
|
|
109
|
-
|
|
121
|
+
// Eager-connect: создаём первое соединение сразу для раннего обнаружения ошибок.
|
|
122
|
+
// Ранее pool.connect() вызывался без сохранения клиента, что приводило к утечке.
|
|
123
|
+
const initialClient = await pool.connect();
|
|
124
|
+
initialClient.release();
|
|
110
125
|
}
|
|
111
126
|
return poolsCachePg[connectionId];
|
|
112
127
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pool-pg.js","sourceRoot":"","sources":["../../../../src/pg/pool-pg.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"pool-pg.js","sourceRoot":"","sources":["../../../../src/pg/pool-pg.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pool-pg.d.ts","sourceRoot":"","sources":["../../../../src/pg/pool-pg.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,MAAM,EAAE,MAAM,KAAK,CAAC;AAC7B,OAAO,EAAE,MAAM,IAAI,SAAS,EAAE,MAAM,MAAM,CAAC;AAC3C,OAAO,EAAoB,UAAU,EAAE,MAAM,IAAI,CAAC;AAIlD,OAAO,EAAE,WAAW,EAAE,YAAY,EAAU,eAAe,EAAoB,MAAM,oBAAoB,CAAC;AAC1G,OAAO,EAAE,kBAAkB,EAAiB,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAmC5E,eAAO,MAAM,aAAa,GAAI,CAAC,GAAG,WAAW,EAAG,cAAc,MAAM,EAAE,iBAAiB,OAAO,EAAE,aAAa,OAAO,KAAG,CAAC,GAAG,SAS1H,CAAC;AAEF,eAAO,MAAM,YAAY,EAAE,kBAAuB,CAAC;AAEnD,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,SAAS,CAAC;CACnB;AAED,eAAO,MAAM,iBAAiB,EAAE;IAAE,CAAC,YAAY,EAAE,MAAM,GAAG,eAAe,CAAA;CAAO,CAAC;AAkCjF,eAAO,MAAM,SAAS,GAAU,KAAK;IACnC,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,UAAU,GAAG,YAAY,CAAC;IACvC,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,sBAAsB,CAAC,EAAE,eAAe,EAAE,CAAA;CAC3C,GAAG,MAAM,EAAE,aAAa,OAAO,EAAE,yBAAyB,eAAe,EAAE,KAAG,OAAO,CAAC,OAAO,
|
|
1
|
+
{"version":3,"file":"pool-pg.d.ts","sourceRoot":"","sources":["../../../../src/pg/pool-pg.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,MAAM,EAAE,MAAM,KAAK,CAAC;AAC7B,OAAO,EAAE,MAAM,IAAI,SAAS,EAAE,MAAM,MAAM,CAAC;AAC3C,OAAO,EAAoB,UAAU,EAAE,MAAM,IAAI,CAAC;AAIlD,OAAO,EAAE,WAAW,EAAE,YAAY,EAAU,eAAe,EAAoB,MAAM,oBAAoB,CAAC;AAC1G,OAAO,EAAE,kBAAkB,EAAiB,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAmC5E,eAAO,MAAM,aAAa,GAAI,CAAC,GAAG,WAAW,EAAG,cAAc,MAAM,EAAE,iBAAiB,OAAO,EAAE,aAAa,OAAO,KAAG,CAAC,GAAG,SAS1H,CAAC;AAEF,eAAO,MAAM,YAAY,EAAE,kBAAuB,CAAC;AAEnD,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,SAAS,CAAC;CACnB;AAED,eAAO,MAAM,iBAAiB,EAAE;IAAE,CAAC,YAAY,EAAE,MAAM,GAAG,eAAe,CAAA;CAAO,CAAC;AAkCjF,eAAO,MAAM,SAAS,GAAU,KAAK;IACnC,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,UAAU,GAAG,YAAY,CAAC;IACvC,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,sBAAsB,CAAC,EAAE,eAAe,EAAE,CAAA;CAC3C,GAAG,MAAM,EAAE,aAAa,OAAO,EAAE,yBAAyB,eAAe,EAAE,KAAG,OAAO,CAAC,OAAO,CA2D7F,CAAC;AAEF,eAAO,MAAM,WAAW,GAAU,cAAc,MAAM,KAAG,OAAO,CAAC,OAAO,CA+BvE,CAAC;AAEF,eAAO,MAAM,uBAAuB,0BAAsG,CAAC"}
|
package/package.json
CHANGED
package/src/pg/pool-pg.ts
CHANGED
|
@@ -124,24 +124,40 @@ export const getPoolPg = async (arg: {
|
|
|
124
124
|
poolConfig.port = tunnelAddr.port;
|
|
125
125
|
}
|
|
126
126
|
|
|
127
|
-
|
|
127
|
+
// Используем опцию verify для регистрации типов на каждом новом клиенте.
|
|
128
|
+
// pg-pool вызывает verify ПЕРЕД тем как отдать клиент потребителю,
|
|
129
|
+
// что исключает гонку между registerTypesFunctions и пользовательскими запросами.
|
|
130
|
+
// Ранее registerTypesFunctions вызывались в async-обработчике события 'connect',
|
|
131
|
+
// но pg-pool эмитит 'connect' синхронно и сразу отдаёт клиент — это приводило к
|
|
132
|
+
// DeprecationWarning в pg >= 8.19 ("client.query() when already executing a query").
|
|
133
|
+
const poolOptions: PoolConfig & IDbOptionsPg & { verify?: (client: PoolClient, done: (err?: Error) => void) => void } = { ...poolConfig };
|
|
134
|
+
if (Array.isArray(registerTypesFunctions) && registerTypesFunctions.length > 0) {
|
|
135
|
+
const fns = registerTypesFunctions;
|
|
136
|
+
poolOptions.verify = (client: PoolClient, done: (err?: Error) => void) => {
|
|
137
|
+
Promise.all(fns.map((fn) => fn(client)))
|
|
138
|
+
.then(() => done())
|
|
139
|
+
.catch((err) => done(err));
|
|
140
|
+
};
|
|
141
|
+
}
|
|
142
|
+
|
|
143
|
+
const pool = new Pool(poolOptions) as IPoolPg;
|
|
128
144
|
poolsCachePg[connectionId] = pool;
|
|
129
145
|
pool.on('error', (err: Error, client: PoolClient) => {
|
|
130
146
|
client.release(true);
|
|
131
147
|
logger.error(err);
|
|
132
148
|
});
|
|
133
|
-
pool.on('connect',
|
|
149
|
+
pool.on('connect', (client: PoolClient) => {
|
|
134
150
|
const { database, processID } = client as unknown as IPoolClientPg;
|
|
135
151
|
debugX(`PG client [${connectionId}] connected! DB: "${database}" / processID: ${processID}`);
|
|
136
|
-
if (Array.isArray(registerTypesFunctions)) {
|
|
137
|
-
await Promise.all(registerTypesFunctions.map((fn) => fn(client)));
|
|
138
|
-
}
|
|
139
152
|
});
|
|
140
153
|
pool.on('remove', (client: PoolClient) => {
|
|
141
154
|
const { database, processID } = client as unknown as IPoolClientPg;
|
|
142
155
|
debugX(`PG client [${connectionId}] removed. DB: "${database}" / processID: ${processID}`);
|
|
143
156
|
});
|
|
144
|
-
|
|
157
|
+
// Eager-connect: создаём первое соединение сразу для раннего обнаружения ошибок.
|
|
158
|
+
// Ранее pool.connect() вызывался без сохранения клиента, что приводило к утечке.
|
|
159
|
+
const initialClient = await pool.connect();
|
|
160
|
+
initialClient.release();
|
|
145
161
|
}
|
|
146
162
|
return poolsCachePg[connectionId];
|
|
147
163
|
};
|