@pi-r/postgres 0.11.3 → 0.12.0

package/client/index.js

@@ -1,17 +1,12 @@
 "use strict";
-exports.DB_SOURCE_TYPE = exports.DB_SOURCE_CLIENT = void 0;
-exports.setAuthentication = setAuthentication;
-exports.setCredential = setCredential;
-exports.executeQuery = executeQuery;
-exports.executeBatchQuery = executeBatchQuery;
-exports.checkTimeout = checkTimeout;
-const postgres = require("pg");
-const connectionString = require("pg-connection-string");
-const QueryStream = require("pg-query-stream");
-const Db = require("@e-mc/db");
-const types_1 = require("@e-mc/types");
-const util_1 = require("@e-mc/db/util");
-const DbPool = require("@pi-r/postgres/client/pool");
+
+const postgres = require('pg');
+const connectionString = require('pg-connection-string');
+const QueryStream = require('pg-query-stream');
+const Db = require('@e-mc/db');
+const { DB_TYPE, asFunction, errorMessage, isError, isErrorCode, isPlainObject, isString } = require('@e-mc/types');
+const { parseConnectionString, parseServerAuth } = require('@e-mc/db/util');
+const DbPool = require('@pi-r/postgres/client/pool');
 const POOL_STATE = {};
 function fromConnectionString(credential, uri) {
     const { user, password, host, port, database, application_name, ssl, options } = connectionString.parse(uri);
@@ -33,23 +28,23 @@ function fromConnectionString(credential, uri) {
         credential.options ||= options;
     }
     if (ssl) {
-        if (!(0, types_1.isPlainObject)(ssl)) {
+        if (!isPlainObject(ssl)) {
             credential.ssl ??= true;
         }
-        else if (!(0, types_1.isPlainObject)(credential.ssl)) {
+        else if (!isPlainObject(credential.ssl)) {
             credential.ssl = ssl;
         }
     }
     return credential;
 }
 function setAuthentication(credential) {
-    const auth = (0, util_1.parseServerAuth)(credential);
+    const auth = parseServerAuth(credential);
     credential.host ||= auth.hostname;
     credential.user ||= auth.username;
-    if ((0, types_1.isString)(credential.connectionString)) {
+    if (isString(credential.connectionString)) {
         fromConnectionString(credential, credential.connectionString);
     }
-    if ((0, types_1.isPlainObject)(credential.ssl)) {
+    if (isPlainObject(credential.ssl)) {
         this.readTLSConfig(credential.ssl);
     }
 }
@@ -73,13 +68,13 @@ function setCredential(item) {
             errors.push('user');
         }
         if (errors.length > 0) {
-            throw (0, types_1.errorMessage)("postgres", "Invalid credentials", errors.join(', '));
+            throw errorMessage("postgres", "Invalid credentials", errors.join(', '));
         }
     }
     if (credential.host?.endsWith('.rds.amazonaws.com')) {
         try {
             const ssl = credential.ssl ||= {};
-            if ((0, types_1.isPlainObject)(ssl) && !ssl.ca) {
+            if (isPlainObject(ssl) && !ssl.ca) {
                 const bundle = require('aws-ssl-profiles');
                 ssl.ca = bundle.ca;
             }
@@ -95,8 +90,8 @@ function setCredential(item) {
         return;
     }
     let username, password, pool;
-    if ((0, types_1.isString)(usePool)) {
-        username = credential.user || credential.connectionString && (0, util_1.parseConnectionString)(credential.connectionString)?.username;
+    if (isString(usePool)) {
+        username = credential.user || credential.connectionString && parseConnectionString(credential.connectionString)?.username;
         if (username) {
             [password, pool] = DbPool.validateKey(POOL_STATE, username, usePool);
             if (pool) {
@@ -144,7 +139,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
         return [];
     }
     let parallel, connectOnce, errorQuery, sessionKey, outCacheMiss;
-    if ((0, types_1.isPlainObject)(options)) {
+    if (isPlainObject(options)) {
         ({ parallel, connectOnce, errorQuery, sessionKey, outCacheMiss } = options);
     }
     else {
@@ -187,18 +182,12 @@ async function executeBatchQuery(batch, options = '', outResult) {
             }
             catch (err) {
                 let close;
-                switch (err instanceof Error && err.code) {
-                    case '28000':
-                    case '28P01':
-                        close = 1;
-                        break;
-                    default:
-                        close = pool.closeable;
-                        break;
+                if (!isErrorCode(err, '28000', '28P01')) {
+                    close = pool.closeable;
                 }
-                if (close) {
+                if (close !== false) {
                     await pool.detach(true);
-                    if (close === 1) {
+                    if (!close) {
                         throw err;
                     }
                 }
@@ -206,7 +195,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
             }
         }
         if (!client) {
-            clients.push(client = new postgres.Client((postgresCredential || credential)));
+            clients.push(client = new postgres.Client(postgresCredential || credential));
             await client.connect();
         }
         if (connectOnce) {
@@ -225,7 +214,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
         const item = batch[i];
         const { source, query, params, ignoreCache } = item;
         let credential = postgresCredential || onceCredential, error;
-        if (!credential && !(0, types_1.isPlainObject)(credential = item.credential) && (error = (0, types_1.errorMessage)(source, "Invalid credentials")) || !query && (error = (0, types_1.errorMessage)(source, "Missing database query"))) {
+        if (!credential && !isPlainObject(credential = item.credential) && (error = errorMessage(source, "Invalid credentials")) || !query && (error = errorMessage(source, "Missing database query"))) {
             if (this.handleFail(error, item, { errorQuery })) {
                 if (!parallel) {
                     tasks.length = 0;
@@ -242,11 +231,11 @@ async function executeBatchQuery(batch, options = '', outResult) {
             continue;
         }
         item.transactionState = 1;
-        const streamRow = typeof item.streamRow === 'string' ? this.hasCoerce("postgres", 'options', credential) && (0, types_1.asFunction)(item.streamRow) : item.streamRow;
+        const streamRow = typeof item.streamRow === 'string' ? this.hasCoerce("postgres", 'options', credential) && asFunction(item.streamRow) : item.streamRow;
         const cacheValue = ignoreCache === undefined ? sessionKey : Array.isArray(ignoreCache) ? { sessionKey, exclusiveOf: ignoreCache } : { sessionKey, renewCache: ignoreCache === 0 };
         let queryString = '';
         if (caching && ignoreCache !== true) {
-            queryString = Db.asString(query, true) + '_' + Db.asString(params, true);
+            queryString = Db.asString(query, true) + '_' + Db.asString(params, true) + (streamRow && item.options && isString(query) ? Db.asString(item.options, true) : '');
             if (ignoreCache !== 1) {
                 const result = this.getQueryResult(source, DbPool.sanitize(credential), queryString, cacheValue);
                 if (result) {
@@ -282,10 +271,10 @@ async function executeBatchQuery(batch, options = '', outResult) {
                     postgresClient = undefined;
                 }
                 commandType = this.commandType.SELECT;
-                if (streamRow && (0, types_1.isString)(query)) {
+                if (streamRow && isString(query)) {
                     const rows = [];
                     const processRow = typeof streamRow === 'function' ? streamRow : null;
-                    const stream = client.query(new QueryStream(query, params));
+                    const stream = client.query(new QueryStream(query, params, item.options));
                     stream
                         .on('data', row => {
                         if (processRow) {
@@ -293,7 +282,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
                             if (err === false) {
                                 return;
                             }
-                            if (err instanceof Error) {
+                            if (isError(err)) {
                                 error = err;
                                 return;
                             }
@@ -356,5 +345,13 @@ async function executeBatchQuery(batch, options = '', outResult) {
 async function checkTimeout(value, limit = 0) {
     return DbPool.checkTimeout(POOL_STATE, value, limit);
 }
-exports.DB_SOURCE_CLIENT = true;
-exports.DB_SOURCE_TYPE = types_1.DB_TYPE.SQL;
+const DB_SOURCE_CLIENT = true;
+const DB_SOURCE_TYPE = DB_TYPE.SQL;
+
+exports.DB_SOURCE_CLIENT = DB_SOURCE_CLIENT;
+exports.DB_SOURCE_TYPE = DB_SOURCE_TYPE;
+exports.checkTimeout = checkTimeout;
+exports.executeBatchQuery = executeBatchQuery;
+exports.executeQuery = executeQuery;
+exports.setAuthentication = setAuthentication;
+exports.setCredential = setCredential;

package/client/pool.js

@@ -1,5 +1,6 @@
 "use strict";
-const types_1 = require("@e-mc/types");
+
+const { isArray, isObject, isString } = require('@e-mc/types');
 const DbPool = require('@e-mc/db/pool');
 const POOL_ACTIVE = new WeakSet();
 class PostgresPool extends DbPool {
@@ -16,18 +17,18 @@ class PostgresPool extends DbPool {
         }
         const ssl = credential.ssl;
         let result = super.sanitize(credential);
-        if ((0, types_1.isObject)(ssl)) {
+        if (isObject(ssl)) {
             if (result === credential) {
                 result = { ...credential };
             }
             const cert = ssl.cert;
-            if ((0, types_1.isString)(cert)) {
+            if (isString(cert)) {
                 result.ssl = { cert };
             }
             else if (Buffer.isBuffer(cert)) {
                 result.ssl = { cert: cert.toString('utf8') };
             }
-            else if ((0, types_1.isArray)(cert)) {
+            else if (isArray(cert)) {
                 result.ssl = { cert: cert.reduce((a, b) => a + (Buffer.isBuffer(b) ? b.toString('utf8') : b), '') };
             }
             else {
@@ -52,4 +53,5 @@ class PostgresPool extends DbPool {
         return this.client.ended;
     }
 }
+
 module.exports = PostgresPool;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/postgres",
-  "version": "0.11.3",
+  "version": "0.12.0",
   "description": "PostgreSQL client driver for E-mc.",
   "main": "client/index.js",
   "types": "client/index.d.ts",
@@ -20,10 +20,13 @@
   "license": "MIT",
   "homepage": "https://github.com/anpham6/pi-r#readme",
   "dependencies": {
-    "@e-mc/db": "^0.13.10",
-    "@e-mc/types": "^0.13.10",
+    "@e-mc/db": "^0.14.0",
+    "@e-mc/types": "^0.14.0",
     "pg": "^8.20.0",
     "pg-connection-string": "^2.12.0",
     "pg-query-stream": "^4.14.0"
+  },
+  "peerDependencies": {
+    "@types/pg": "^8"
   }
 }