@pi-r/postgres 0.5.0 → 0.6.1

package/client/index.js

@@ -2,15 +2,17 @@
 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 connectionString = require("pg-connection-string");
 const util_1 = require("@e-mc/db/util");
 const types_1 = require("@e-mc/types");
 const Db = require("@e-mc/db");
+const QueryStream = require("pg-query-stream");
 const DbPool = require('@e-mc/db/pool');
 class PostgresPool extends DbPool {
-    getConnection() {
+    async getConnection() {
         return this.client.connect();
     }
-    close() {
+    async close() {
         return this.client.end();
     }
     isEmpty() {
@@ -43,11 +45,31 @@ function removePoolProperties(credential) {
     }
     return credential;
 }
+function fromConnectionString(credential, uri) {
+    const { user, password, host, port, database, application_name, ssl } = connectionString.parse(uri);
+    if (!credential.user) {
+        credential.user = user;
+        credential.password = password;
+    }
+    credential.host || (credential.host = host);
+    if (port) {
+        credential.port || (credential.port = parseInt(port));
+    }
+    credential.database || (credential.database = database);
+    credential.application_name || (credential.application_name = application_name);
+    if (ssl) {
+        credential.ssl ?? (credential.ssl = (0, types_1.isPlainObject)(ssl) ? ssl : true);
+    }
+    return credential;
+}
 const getPoolKey = (credential) => (credential.host || '') + '_' + (credential.port || '5432') + (credential.user || '') + '_' + (credential.password || '') + '_' + (credential.database || '') + '_' + (credential.connectionString || '');
 function setAuthentication(credential) {
     const auth = (0, util_1.parseServerAuth)(credential);
     credential.host || (credential.host = auth.hostname);
     credential.user || (credential.user = auth.username);
+    if ((0, types_1.isString)(credential.connectionString)) {
+        fromConnectionString(credential, credential.connectionString);
+    }
     if ((0, types_1.isPlainObject)(credential.ssl)) {
         this.readTLSConfig(credential.ssl);
     }
@@ -59,8 +81,10 @@ function setCredential(item) {
         setAuthentication.call(this, credential);
     }
     else {
-        credential = { connectionString: item.uri };
-        item.credential = credential;
+        credential = {};
+        if ((0, types_1.isString)(item.uri)) {
+            item.credential = fromConnectionString(credential, item.uri);
+        }
     }
     if (!credential.connectionString) {
         const errors = [];
@@ -75,42 +99,42 @@ function setCredential(item) {
         }
     }
     const usePool = item.usePool;
-    if (item.usePool && typeof credential.password !== 'function') {
-        let username, password, pool;
-        if (typeof usePool === 'string' && (username = credential.user || credential.connectionString && (0, util_1.parseConnectionString)(credential.connectionString)?.username)) {
-            [password, pool] = DbPool.validateKey(POOL_STATE, username, usePool);
-            if (pool) {
-                pool.add(item, password);
-                return;
-            }
+    if (!item.usePool || typeof credential.password === 'function') {
+        if ('usePool' in item) {
+            item.usePool = false;
         }
-        const poolKey = getPoolKey(credential);
-        if (!(pool = POOL_STATE[poolKey]) || pool.closed) {
-            const config = this.getPoolConfig("postgres" /* STRINGS.MODULE_NAME */, password);
-            if (config) {
-                const { min, max, idle, timeout } = config;
-                if (min >= 0) {
-                    credential.min ?? (credential.min = min);
-                }
-                if (max > 0) {
-                    credential.max ?? (credential.max = max);
-                }
-                if (idle > 0) {
-                    credential.idleTimeoutMillis ?? (credential.idleTimeoutMillis = idle);
-                }
-                if (timeout > 0) {
-                    credential.connectionTimeoutMillis ?? (credential.connectionTimeoutMillis = timeout);
-                }
-            }
-            new PostgresPool(new postgres.Pool(credential), poolKey, username && password ? { username, password } : undefined).add(item).parent = POOL_STATE;
-        }
-        else {
-            pool.add(item);
+        return;
+    }
+    let username, password, pool;
+    if (typeof usePool === 'string' && (username = credential.user || credential.connectionString && (0, util_1.parseConnectionString)(credential.connectionString)?.username)) {
+        [password, pool] = DbPool.validateKey(POOL_STATE, username, usePool);
+        if (pool) {
+            pool.add(item, password);
+            return;
         }
     }
-    else if ('usePool' in item) {
-        item.usePool = false;
+    const poolKey = getPoolKey(credential);
+    if ((pool = POOL_STATE[poolKey]) && !pool.closed) {
+        pool.add(item);
+        return;
+    }
+    const config = this.getPoolConfig("postgres" /* STRINGS.MODULE_NAME */, password);
+    if (config) {
+        const { min, max, idle, timeout } = config;
+        if (min >= 0) {
+            credential.min ?? (credential.min = min);
+        }
+        if (max > 0) {
+            credential.max ?? (credential.max = max);
+        }
+        if (idle > 0) {
+            credential.idleTimeoutMillis ?? (credential.idleTimeoutMillis = idle);
+        }
+        if (timeout > 0) {
+            credential.connectionTimeoutMillis ?? (credential.connectionTimeoutMillis = timeout);
+        }
     }
+    new PostgresPool(new postgres.Pool(credential), poolKey, username && password ? { username, password } : undefined).add(item).parent = POOL_STATE;
 }
 exports.setCredential = setCredential;
 async function executeQuery(item, options) {
@@ -197,6 +221,9 @@ async function executeBatchQuery(batch, options = '', outResult) {
         item.transactionState &= ~64 /* DB_TRANSACTION.AUTH */;
         return client;
     };
+    if (this.host?.username) {
+        this.applyCommand(...batch);
+    }
     for (let i = 0; i < length; ++i) {
         const item = batch[i];
         const { source, query, params, ignoreCache } = item;
@@ -218,10 +245,10 @@ async function executeBatchQuery(batch, options = '', outResult) {
             continue;
         }
         item.transactionState = 1 /* DB_TRANSACTION.ACTIVE */;
-        const renewCache = ignoreCache === 0;
-        const cacheValue = renewCache ? { sessionKey, renewCache } : sessionKey;
+        const streamRow = typeof item.streamRow === 'string' ? this.hasCoerce("postgres" /* STRINGS.MODULE_NAME */, 'options', null, credential) && (0, types_1.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 || ignoreCache === false || ignoreCache === 1 || renewCache) {
+        if (caching && ignoreCache !== true) {
             queryString = Db.asString(query, true) + '_' + Db.asString(params, true);
             if (ignoreCache !== 1) {
                 const result = this.getQueryResult(source, removePoolProperties(credential), queryString, cacheValue);
@@ -258,9 +285,41 @@ async function executeBatchQuery(batch, options = '', outResult) {
                     postgresClient = undefined;
                 }
                 commandType = this.commandType.SELECT;
-                const { rows, command } = await client.query(query, params);
-                this.add(item, 4 /* DB_TRANSACTION.COMMIT */);
-                resolve(rows.length || command === 'SELECT' ? this.setQueryResult(source, removePoolProperties(credential), queryString, rows, cacheValue) : null);
+                if (streamRow && (0, types_1.isString)(query)) {
+                    const rows = [];
+                    const processRow = typeof streamRow === 'function' && streamRow;
+                    const stream = client.query(new QueryStream(query, params));
+                    stream
+                        .on('data', row => {
+                        if (processRow) {
+                            const err = processRow(row);
+                            if (err === false) {
+                                return;
+                            }
+                            if (err instanceof Error) {
+                                error = err;
+                                return;
+                            }
+                        }
+                        rows.push(row);
+                    })
+                        .on('error', err => error || (error = err))
+                        .on('close', () => {
+                        if (error && this.handleFail(error, item, { errorQuery, commandType })) {
+                            reject(error);
+                        }
+                        else {
+                            this.add(item, 4 /* DB_TRANSACTION.COMMIT */);
+                            resolve(!error ? this.setQueryResult(source, removePoolProperties(credential), queryString, rows, cacheValue) : rows);
+                        }
+                    })
+                        .on('end', () => stream.destroy());
+                }
+                else {
+                    const { rows, command } = await client.query(query, params);
+                    this.add(item, 4 /* DB_TRANSACTION.COMMIT */);
+                    resolve(rows.length || command === 'SELECT' ? this.setQueryResult(source, removePoolProperties(credential), queryString, rows, cacheValue) : null);
+                }
             }
             catch (err) {
                 if (this.handleFail(err, item, { errorQuery, commandType })) {
@@ -290,7 +349,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
     }, outResult);
 }
 exports.executeBatchQuery = executeBatchQuery;
-function checkTimeout(value, limit = 0) {
+async function checkTimeout(value, limit = 0) {
     return DbPool.checkTimeout(POOL_STATE, value, limit);
 }
 exports.checkTimeout = checkTimeout;

package/package.json

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

package/types/index.d.ts

@@ -2,6 +2,7 @@ import type { DbDataSource } from '@e-mc/types/lib/squared';
 
 import type { ExecuteAction, ServerAuth } from '@e-mc/types/lib/db';
 
+// @ts-ignore
 import type { PoolConfig, QueryArrayConfig } from 'pg';
 
 export interface PostgresDataSource<T = unknown[]> extends DbDataSource<string | QueryArrayConfig, unknown, unknown, string | PostgresCredential, string>, ExecuteAction<T> {