@pi-r/postgres 0.2.2 → 0.2.9

package/LICENSE

@@ -1,4 +1,4 @@
-Copyright 2023 An Pham
+Copyright 2020-24 Code Geass
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 

package/README.md

@@ -1,5 +1,7 @@
-### @pi-r/postgres
+# @pi-r/postgres
 
-### LICENSE
+PEP 402 - Forever Josee + Nunnally
+
+## LICENSE
 
 MIT

package/client/index.d.ts

@@ -1,8 +1,9 @@
 import type { IDb } from '@e-mc/types/lib';
-import type { PostgresCredential, PostgresDataSource } from '@e-mc/types/lib/db';
 
 import type { IDbSourceClient } from '@e-mc/db/types';
 
+import type { PostgresCredential, PostgresDataSource } from '../types';
+
 declare const Postgres: IDbSourceClient<PostgresDataSource> & {
     setAuthentication(this: IDb, credential: PostgresCredential): void;
 };

package/client/index.js

@@ -20,11 +20,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) {
@@ -54,7 +70,7 @@ function setCredential(item) {
             errors.push('user');
         }
         if (errors.length) {
-            throw (0, types_1.errorMessage)("postgres" /* STRINGS.MODULE_NAME */, 'Not defined - ' + errors.join(' | '));
+            throw (0, types_1.errorMessage)("postgres", 'Not defined - ' + errors.join(' | '));
         }
     }
     const usePool = item.usePool;
@@ -69,8 +85,8 @@ 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);
+            const { Pool } = require("pg");
+            const config = this.getPoolConfig("postgres", password);
             if (config) {
                 const { min, max, idle } = config;
                 if (min >= 0) {
@@ -103,7 +119,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
     if (length === 0) {
         return [];
     }
-    const db = require("pg" /* STRINGS.PACKAGE_NAME */);
+    const db = require("pg");
     let parallel, connectOnce, errorQuery, sessionKey, outCacheMiss;
     if ((0, types_1.isPlainObject)(options)) {
         ({ parallel, connectOnce, errorQuery, sessionKey, outCacheMiss } = options);
@@ -124,17 +140,17 @@ async function executeBatchQuery(batch, options = '', outResult) {
     if (!parallel) {
         outResult || (outResult = new Array(length));
     }
-    const caching = this.hasCache("postgres" /* STRINGS.MODULE_NAME */, sessionKey);
+    const caching = this.hasCache("postgres", sessionKey);
     const tasks = new Array(length);
     const clients = [];
     const pools = [];
     let postgresPool, postgresClient, postgresCredential, onceCredential = connectOnce ? batch[0].credential : undefined;
     const getConnection = async (item, credential) => {
-        item.transactionState = 64 /* DB_TRANSACTION.AUTH */;
+        item.transactionState = 64;
         let client;
         if (postgresPool) {
             pools.push(client = await postgresPool.getConnection());
-            item.transactionState &= ~64 /* DB_TRANSACTION.AUTH */;
+            item.transactionState &= ~64;
             return client;
         }
         const pool = item.usePool && DbPool.findKey(POOL_STATE, item.usePool, getPoolKey(credential), ...connectOnce ? [item, batch[0]] : [item]);
@@ -176,14 +192,14 @@ async function executeBatchQuery(batch, options = '', outResult) {
             }
             postgresCredential = credential;
         }
-        item.transactionState &= ~64 /* DB_TRANSACTION.AUTH */;
+        item.transactionState &= ~64;
         return client;
     };
     for (let i = 0; i < length; ++i) {
         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" /* ERR_DB.CREDENTIALS */)) || !query && (error = (0, types_1.errorMessage)(source, "Missing database query" /* ERR_DB.QUERY */))) {
+        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 (this.handleFail(error, item, { errorQuery })) {
                 if (!parallel) {
                     tasks.length = 0;
@@ -199,7 +215,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
             }
             continue;
         }
-        item.transactionState = 1 /* DB_TRANSACTION.ACTIVE */;
+        item.transactionState = 1;
         const renewCache = ignoreCache === 0;
         const cacheValue = renewCache ? { sessionKey, renewCache } : sessionKey;
         let queryString = '';
@@ -214,7 +230,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
                     else {
                         outResult[i] = result;
                     }
-                    this.add(item, 4 /* DB_TRANSACTION.COMMIT */ | 128 /* DB_TRANSACTION.CACHE */);
+                    this.add(item, 4 | 128);
                     continue;
                 }
                 if (!ignoreCache && outCacheMiss) {
@@ -241,7 +257,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
                 }
                 commandType = this.commandType.SELECT;
                 const { rows, command } = await client.query(query, params);
-                this.add(item, 4 /* DB_TRANSACTION.COMMIT */);
+                this.add(item, 4);
                 resolve(rows.length || command === 'SELECT' ? this.setQueryResult(source, removePoolProperties(credential), queryString, rows, cacheValue) : null);
             }
             catch (err) {
@@ -265,7 +281,7 @@ async function executeBatchQuery(batch, options = '', outResult) {
     }
     return this.processRows(batch, tasks, {
         disconnect: () => {
-            clients.forEach(item => item.end(err => err && this.writeFail(["Unable to close connnection" /* ERR_DB.CONNECTION_CLOSE */, "postgres" /* STRINGS.MODULE_NAME */], err, { type: 65536 /* LOG_TYPE.DB */, fatal: false })));
+            clients.forEach(item => item.end(err => err && this.writeFail(["Unable to close connnection", "postgres"], err, { type: 65536, fatal: false })));
             pools.forEach(item => item.release());
         },
         parallel

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pi-r/postgres",
-  "version": "0.2.2",
+  "version": "0.2.9",
   "description": "PostgreSQL client driver for E-mc.",
   "main": "client/index.js",
   "types": "client/index.d.ts",
@@ -9,7 +9,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/anpham6/pi-r.git",
+    "url": "git+https://github.com/anpham6/pi-r.git",
     "directory": "src/db/postgres"
   },
   "keywords": [
@@ -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.5.5",
+    "@e-mc/types": "^0.5.5",
+    "pg": "^8.11.5"
   }
 }

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> {