@pi-r/postgres 0.3.6 → 0.3.8

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");
@@ -86,7 +87,6 @@ function setCredential(item) {
         }
         const poolKey = getPoolKey(credential);
         if (!(pool = POOL_STATE[poolKey]) || pool.closed) {
-            const { Pool } = require("pg");
             const config = this.getPoolConfig("postgres", password);
             if (config) {
                 const { min, max, idle } = config;
@@ -100,7 +100,7 @@ function setCredential(item) {
                     (_d = credential.idleTimeoutMillis) !== null && _d !== void 0 ? _d : (credential.idleTimeoutMillis = idle);
                 }
             }
-            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);
@@ -120,7 +120,6 @@ async function executeBatchQuery(batch, options = '', outResult) {
     if (length === 0) {
         return [];
     }
-    const db = require("pg");
     let parallel, connectOnce, errorQuery, sessionKey, outCacheMiss;
     if ((0, types_1.isPlainObject)(options)) {
         ({ parallel, connectOnce, errorQuery, sessionKey, outCacheMiss } = options);
@@ -184,7 +183,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.3.6",
+  "version": "0.3.8",
   "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.6.16",
-    "@e-mc/types": "^0.6.16",
+    "@e-mc/db": "^0.6.19",
+    "@e-mc/types": "^0.6.19",
     "pg": "^8.11.5"
   }
 }

package/client/pool.js

@@ -1,55 +0,0 @@
-"use strict";
-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', 'min', 'log', 'allowExitOnIdle', 'maxUses'];
-    static asString(credential) {
-        if (credential.host && credential.user) {
-            return JSON.stringify(this.removeUUIDKey(credential));
-        }
-        return super.asString(credential);
-    }
-    static sanitize(credential) {
-        if (!POOL_ACTIVE.has(credential) || credential.uuidKey) {
-            return credential;
-        }
-        const ssl = credential.ssl;
-        let result = super.sanitize(credential);
-        if ((0, types_1.isObject)(ssl)) {
-            if (result === credential) {
-                result = { ...credential };
-            }
-            const cert = ssl.cert;
-            if ((0, types_1.isString)(cert)) {
-                result.ssl = { cert };
-            }
-            else if (Buffer.isBuffer(cert)) {
-                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('utf8') : b), '') };
-            }
-            else {
-                result.ssl = { cert: "Unknown" };
-            }
-        }
-        return result;
-    }
-    async getConnection(credential) {
-        if (credential) {
-            POOL_ACTIVE.add(credential);
-        }
-        return this.client.connect();
-    }
-    async close() {
-        return this.client.end();
-    }
-    isEmpty() {
-        return this.closed || this.client.totalCount === 0 && this.client.waitingCount === 0 && this.client.idleCount === 0;
-    }
-    get closed() {
-        return this.client.ended;
-    }
-}
-module.exports = PostgresPool;