@pi-r/postgres 0.9.4 → 0.10.0

package/client/index.js

@@ -73,7 +73,7 @@ function setCredential(item) {
             errors.push('user');
         }
         if (errors.length > 0) {
-            throw (0, types_1.errorMessage)("postgres", 'Not defined - ' + errors.join(' | '));
+            throw (0, types_1.errorMessage)("postgres", "Invalid credentials", errors.join(', '));
         }
     }
     if (credential.host?.endsWith('.rds.amazonaws.com')) {
@@ -96,7 +96,8 @@ function setCredential(item) {
     }
     let username, password, pool;
     if ((0, types_1.isString)(usePool)) {
-        if (username = credential.user || credential.connectionString && (0, util_1.parseConnectionString)(credential.connectionString)?.username) {
+        username = credential.user || credential.connectionString && (0, util_1.parseConnectionString)(credential.connectionString)?.username;
+        if (username) {
             [password, pool] = DbPool.validateKey(POOL_STATE, username, usePool);
             if (pool) {
                 pool.add(item, password);
@@ -110,10 +111,7 @@ function setCredential(item) {
     }
     const config = this.getPoolConfig("postgres", password);
     if (config) {
-        const { min, max, idle, timeout } = config;
-        if (min >= 0) {
-            credential.min ??= min;
-        }
+        const { max, idle, timeout } = config;
         if (max > 0) {
             credential.max ??= max;
         }

package/client/pool.js

@@ -3,6 +3,7 @@ const types_1 = require("@e-mc/types");
 const DbPool = require('@e-mc/db/pool');
 const POOL_ACTIVE = new WeakSet();
 class PostgresPool extends DbPool {
+    static CACHE_UNUSED = ['statement_timeout', 'query_timeout', 'keepAliveInitialDelayMillis', 'idle_in_transaction_session_timeout', 'connectionTimeoutMillis', 'idleTimeoutMillis', 'keepAlive', 'max', 'log', 'allowExitOnIdle', 'maxUses'];
     static asString(credential) {
         if (credential.host && credential.user) {
             return JSON.stringify(this.removeUUIDKey(credential));
@@ -24,10 +25,10 @@ class PostgresPool extends DbPool {
                 result.ssl = { cert };
             }
             else if (Buffer.isBuffer(cert)) {
-                result.ssl = { cert: cert.toString('utf-8') };
+                result.ssl = { cert: cert.toString('utf8') };
             }
             else if ((0, types_1.isArray)(cert)) {
-                result.ssl = { cert: cert.reduce((a, b) => a + (Buffer.isBuffer(b) ? b.toString('utf-8') : b), '') };
+                result.ssl = { cert: cert.reduce((a, b) => a + (Buffer.isBuffer(b) ? b.toString('utf8') : b), '') };
             }
             else {
                 result.ssl = { cert: "Unknown" };
@@ -45,11 +46,10 @@ class PostgresPool extends DbPool {
         return this.client.end();
     }
     isEmpty() {
-        return this.closed || this.client.totalCount === 0 && this.client.waitingCount === 0;
+        return this.closed || this.client.totalCount === 0 && this.client.waitingCount === 0 && this.client.idleCount === 0;
     }
     get closed() {
         return this.client.ended;
     }
 }
-PostgresPool.CACHE_UNUSED = ['keepAlive', 'statement_timeout', 'query_timeout', 'keepAliveInitialDelayMillis', 'idle_in_transaction_session_timeout', 'connectionTimeoutMillis', 'max', 'min', 'idleTimeoutMillis', 'log', 'allowExitOnIdle', 'maxUses'];
 module.exports = PostgresPool;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/postgres",
-  "version": "0.9.4",
+  "version": "0.10.0",
   "description": "PostgreSQL client driver for E-mc.",
   "main": "client/index.js",
   "types": "client/index.d.ts",
@@ -20,10 +20,10 @@
   "license": "MIT",
   "homepage": "https://github.com/anpham6/pi-r#readme",
   "dependencies": {
-    "@e-mc/db": "^0.11.5",
-    "@e-mc/types": "^0.11.5",
-    "pg": "^8.14.1",
-    "pg-connection-string": "^2.7.0",
-    "pg-query-stream": "^4.8.1"
+    "@e-mc/db": "^0.12.0",
+    "@e-mc/types": "^0.12.0",
+    "pg": "^8.15.5",
+    "pg-connection-string": "^2.8.5",
+    "pg-query-stream": "^4.9.5"
   }
 }