@pi-r/postgres 0.2.2 → 0.5.0

package/client/index.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DB_SOURCE_TYPE = exports.DB_SOURCE_CLIENT = exports.checkTimeout = exports.executeBatchQuery = exports.executeQuery = exports.setCredential = exports.setAuthentication = void 0;
+const postgres = require("pg");
 const util_1 = require("@e-mc/db/util");
 const types_1 = require("@e-mc/types");
 const Db = require("@e-mc/db");
@@ -20,11 +21,27 @@ class PostgresPool extends DbPool {
     }
 }
 const POOL_STATE = {};
-function removePoolProperties(options) {
-    if (!options.uuidKey && ('ssl' in options || 'max' in options || 'min' in options || 'idleTimeoutMillis' in options || 'log' in options || 'allowExitOnIdle' in options || 'maxUses' in options)) {
-        return { ...options, ssl: (0, types_1.isObject)(options.ssl) ? true : undefined, max: undefined, min: undefined, idleTimeoutMillis: undefined, log: undefined, allowExitOnIdle: undefined, maxUses: undefined };
+const POOL_UNUSED = ['ssl', 'keepAlive', 'statement_timeout', 'query_timeout', 'keepAliveInitialDelayMillis', 'idle_in_transaction_session_timeout', 'connectionTimeoutMillis', 'max', 'min', 'idleTimeoutMillis', 'log', 'allowExitOnIdle', 'maxUses'];
+function removePoolProperties(credential) {
+    if (!credential.uuidKey) {
+        let result;
+        for (let i = 0, length = POOL_UNUSED.length; i < length; ++i) {
+            const attr = POOL_UNUSED[i];
+            if (attr in credential) {
+                result || (result = { ...credential });
+                if (attr === 'ssl' && (0, types_1.isObject)(result[attr])) {
+                    result[attr] = true;
+                }
+                else {
+                    delete result[attr];
+                }
+            }
+        }
+        if (result) {
+            return result;
+        }
     }
-    return options;
+    return credential;
 }
 const getPoolKey = (credential) => (credential.host || '') + '_' + (credential.port || '5432') + (credential.user || '') + '_' + (credential.password || '') + '_' + (credential.database || '') + '_' + (credential.connectionString || '');
 function setAuthentication(credential) {
@@ -69,10 +86,9 @@ function setCredential(item) {
         }
         const poolKey = getPoolKey(credential);
         if (!(pool = POOL_STATE[poolKey]) || pool.closed) {
-            const { Pool } = require("pg" /* STRINGS.PACKAGE_NAME */);
             const config = this.getPoolConfig("postgres" /* STRINGS.MODULE_NAME */, password);
             if (config) {
-                const { min, max, idle } = config;
+                const { min, max, idle, timeout } = config;
                 if (min >= 0) {
                     credential.min ?? (credential.min = min);
                 }
@@ -82,8 +98,11 @@ function setCredential(item) {
                 if (idle > 0) {
                     credential.idleTimeoutMillis ?? (credential.idleTimeoutMillis = idle);
                 }
+                if (timeout > 0) {
+                    credential.connectionTimeoutMillis ?? (credential.connectionTimeoutMillis = timeout);
+                }
             }
-            new PostgresPool(new Pool(credential), poolKey, username && password ? { username, password } : undefined).add(item).parent = POOL_STATE;
+            new PostgresPool(new postgres.Pool(credential), poolKey, username && password ? { username, password } : undefined).add(item).parent = POOL_STATE;
         }
         else {
             pool.add(item);
@@ -103,7 +122,6 @@ async function executeBatchQuery(batch, options = '', outResult) {
     if (length === 0) {
         return [];
     }
-    const db = require("pg" /* STRINGS.PACKAGE_NAME */);
     let parallel, connectOnce, errorQuery, sessionKey, outCacheMiss;
     if ((0, types_1.isPlainObject)(options)) {
         ({ parallel, connectOnce, errorQuery, sessionKey, outCacheMiss } = options);
@@ -167,7 +185,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
             }
         }
         if (!client) {
-            clients.push(client = new db.Client((postgresCredential || credential)));
+            clients.push(client = new postgres.Client((postgresCredential || credential)));
             await client.connect();
         }
         if (connectOnce) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/postgres",
-  "version": "0.2.2",
+  "version": "0.5.0",
   "description": "PostgreSQL client driver for E-mc.",
   "main": "client/index.js",
   "types": "client/index.d.ts",
@@ -21,8 +21,8 @@
   "license": "MIT",
   "homepage": "https://github.com/anpham6/pi-r#readme",
   "dependencies": {
-    "@e-mc/db": "^0.5.3",
-    "@e-mc/types": "^0.5.3",
-    "pg": "^8.11.0"
+    "@e-mc/db": "^0.7.0",
+    "@e-mc/types": "^0.7.0",
+    "pg": "^8.11.3"
   }
 }