af-db-ts 3.0.2 → 3.0.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.
|
@@ -7,10 +7,10 @@ exports.closeAllPgConnectionsPg = exports.closePoolPg = exports.getPoolPg = expo
|
|
|
7
7
|
/* eslint-disable no-await-in-loop */
|
|
8
8
|
const config_1 = __importDefault(require("config"));
|
|
9
9
|
const pg_1 = require("pg");
|
|
10
|
-
const af_echo_ts_1 = require("af-echo-ts");
|
|
11
10
|
const af_tools_ts_1 = require("af-tools-ts");
|
|
12
11
|
const logger_error_1 = require("../logger-error");
|
|
13
12
|
const common_1 = require("../common");
|
|
13
|
+
const debug_1 = require("../debug");
|
|
14
14
|
const cfg = (0, af_tools_ts_1.cloneDeep)(config_1.default.util.toObject(config_1.default));
|
|
15
15
|
let dbs = {};
|
|
16
16
|
let dbOptions = {};
|
|
@@ -62,14 +62,14 @@ const getPoolPg = async (connectionId, throwError, registerTypesFunctions) => {
|
|
|
62
62
|
});
|
|
63
63
|
pool.on('connect', async (client) => {
|
|
64
64
|
const { database, processID } = client;
|
|
65
|
-
|
|
65
|
+
(0, debug_1.debugX)(`PG client [${connectionId}] connected! DB: "${database}" / processID: ${processID}`);
|
|
66
66
|
if (Array.isArray(registerTypesFunctions)) {
|
|
67
67
|
await Promise.all(registerTypesFunctions.map((fn) => fn(client)));
|
|
68
68
|
}
|
|
69
69
|
});
|
|
70
70
|
pool.on('remove', (client) => {
|
|
71
71
|
const { database, processID } = client;
|
|
72
|
-
|
|
72
|
+
(0, debug_1.debugX)(`PG client [${connectionId}] removed. DB: "${database}" / processID: ${processID}`);
|
|
73
73
|
});
|
|
74
74
|
await pool.connect();
|
|
75
75
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pool-pg.js","sourceRoot":"","sources":["../../../../src/pg/pool-pg.ts"],"names":[],"mappings":";;;;;;AAAA,qCAAqC;AACrC,oDAA4B;AAC5B,2BAAkD;AAClD,
|
|
1
|
+
{"version":3,"file":"pool-pg.js","sourceRoot":"","sources":["../../../../src/pg/pool-pg.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
/* eslint-disable no-await-in-loop */
|
|
2
2
|
import config from 'config';
|
|
3
3
|
import { Pool } from 'pg';
|
|
4
|
-
import { echo } from 'af-echo-ts';
|
|
5
4
|
import { cloneDeep } from 'af-tools-ts';
|
|
6
5
|
import { logger } from '../logger-error';
|
|
7
6
|
import { _3_HOURS } from '../common';
|
|
7
|
+
import { debugX } from '../debug';
|
|
8
8
|
const cfg = cloneDeep(config.util.toObject(config));
|
|
9
9
|
let dbs = {};
|
|
10
10
|
let dbOptions = {};
|
|
@@ -55,14 +55,14 @@ export const getPoolPg = async (connectionId, throwError, registerTypesFunctions
|
|
|
55
55
|
});
|
|
56
56
|
pool.on('connect', async (client) => {
|
|
57
57
|
const { database, processID } = client;
|
|
58
|
-
|
|
58
|
+
debugX(`PG client [${connectionId}] connected! DB: "${database}" / processID: ${processID}`);
|
|
59
59
|
if (Array.isArray(registerTypesFunctions)) {
|
|
60
60
|
await Promise.all(registerTypesFunctions.map((fn) => fn(client)));
|
|
61
61
|
}
|
|
62
62
|
});
|
|
63
63
|
pool.on('remove', (client) => {
|
|
64
64
|
const { database, processID } = client;
|
|
65
|
-
|
|
65
|
+
debugX(`PG client [${connectionId}] removed. DB: "${database}" / processID: ${processID}`);
|
|
66
66
|
});
|
|
67
67
|
await pool.connect();
|
|
68
68
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pool-pg.js","sourceRoot":"","sources":["../../../../src/pg/pool-pg.ts"],"names":[],"mappings":"AAAA,qCAAqC;AACrC,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAE,IAAI,EAA0B,MAAM,IAAI,CAAC;AAClD,OAAO,EAAE,
|
|
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":"
|
|
1
|
+
{"version":3,"file":"pool-pg.d.ts","sourceRoot":"","sources":["../../../../src/pg/pool-pg.ts"],"names":[],"mappings":"AAKA,OAAO,EAAwB,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAC3E,OAAO,EAAE,kBAAkB,EAAiB,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAmC5E,eAAO,MAAM,aAAa,GAAI,CAAC,gBAAiB,MAAM,mBAAmB,OAAO,eAAe,OAAO,KAAG,CAAC,GAAG,SAS5G,CAAC;AAEF,eAAO,MAAM,YAAY,EAAE,kBAAuB,CAAC;AAEnD,eAAO,MAAM,SAAS,iBAAwB,MAAM,eAAe,OAAO,2BAA2B,eAAe,EAAE,KAAG,OAAO,CAAC,OAAO,CAuBvI,CAAC;AAEF,eAAO,MAAM,WAAW,iBAAwB,MAAM,KAAG,OAAO,CAAC,OAAO,CAavE,CAAC;AAEF,eAAO,MAAM,uBAAuB,0BAAsG,CAAC"}
|
package/package.json
CHANGED
package/src/pg/pool-pg.ts
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
/* eslint-disable no-await-in-loop */
|
|
2
2
|
import config from 'config';
|
|
3
3
|
import { Pool, PoolClient, PoolConfig } from 'pg';
|
|
4
|
-
import { echo } from 'af-echo-ts';
|
|
5
4
|
import { cloneDeep } from 'af-tools-ts';
|
|
6
5
|
import { logger } from '../logger-error';
|
|
7
6
|
import { IDbOptionsPg, IDbsPg, IRegisterTypeFn } from '../@types/i-config';
|
|
8
7
|
import { IConnectionPoolsPg, IPoolClientPg, IPoolPg } from '../@types/i-pg';
|
|
9
8
|
import { _3_HOURS } from '../common';
|
|
9
|
+
import { debugX } from '../debug';
|
|
10
10
|
|
|
11
11
|
const cfg = cloneDeep(config.util.toObject(config)) as any;
|
|
12
12
|
|
|
@@ -63,14 +63,14 @@ export const getPoolPg = async (connectionId: string, throwError?: boolean, regi
|
|
|
63
63
|
});
|
|
64
64
|
pool.on('connect', async (client: PoolClient) => {
|
|
65
65
|
const { database, processID } = client as unknown as IPoolClientPg;
|
|
66
|
-
|
|
66
|
+
debugX(`PG client [${connectionId}] connected! DB: "${database}" / processID: ${processID}`);
|
|
67
67
|
if (Array.isArray(registerTypesFunctions)) {
|
|
68
68
|
await Promise.all(registerTypesFunctions.map((fn) => fn(client)));
|
|
69
69
|
}
|
|
70
70
|
});
|
|
71
71
|
pool.on('remove', (client: PoolClient) => {
|
|
72
72
|
const { database, processID } = client as unknown as IPoolClientPg;
|
|
73
|
-
|
|
73
|
+
debugX(`PG client [${connectionId}] removed. DB: "${database}" / processID: ${processID}`);
|
|
74
74
|
});
|
|
75
75
|
await pool.connect();
|
|
76
76
|
}
|