@pi-r/postgres 0.7.2 → 0.7.4

package/README.md

@@ -1,7 +1,7 @@
-### @pi-r/postgres
-
-https://e-mc.readthedocs.io/en/latest/db/postgres.html
-
-### LICENSE
-
+### @pi-r/postgres
+
+https://e-mc.readthedocs.io/en/latest/db/postgres.html
+
+### LICENSE
+
 MIT

package/client/pool.js

@@ -0,0 +1,55 @@
+"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 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('utf-8') };
+            }
+            else if ((0, types_1.isArray)(cert)) {
+                result.ssl = { cert: cert.reduce((a, b) => a + (Buffer.isBuffer(b) ? b.toString('utf-8') : 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;
+    }
+    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,30 +1,30 @@
-{
-  "name": "@pi-r/postgres",
-  "version": "0.7.2",
-  "description": "PostgreSQL client driver for E-mc.",
-  "main": "client/index.js",
-  "types": "client/index.d.ts",
-  "publishConfig": {
-    "access": "public"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/anpham6/pi-r.git",
-    "directory": "src/db/postgres"
-  },
-  "keywords": [
-    "squared",
-    "e-mc",
-    "squared-functions"
-  ],
-  "author": "An Pham <anpham6@gmail.com>",
-  "license": "MIT",
-  "homepage": "https://github.com/anpham6/pi-r#readme",
-  "dependencies": {
-    "@e-mc/db": "^0.9.4",
-    "@e-mc/types": "^0.9.4",
-    "pg": "^8.12.0",
-    "pg-connection-string": "^2.6.4",
-    "pg-query-stream": "^4.6.0"
-  }
-}
+{
+  "name": "@pi-r/postgres",
+  "version": "0.7.4",
+  "description": "PostgreSQL client driver for E-mc.",
+  "main": "client/index.js",
+  "types": "client/index.d.ts",
+  "publishConfig": {
+    "access": "public"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/anpham6/pi-r.git",
+    "directory": "src/db/postgres"
+  },
+  "keywords": [
+    "squared",
+    "e-mc",
+    "squared-functions"
+  ],
+  "author": "An Pham <anpham6@gmail.com>",
+  "license": "MIT",
+  "homepage": "https://github.com/anpham6/pi-r#readme",
+  "dependencies": {
+    "@e-mc/db": "^0.9.12",
+    "@e-mc/types": "^0.9.12",
+    "pg": "^8.13.0",
+    "pg-connection-string": "^2.7.0",
+    "pg-query-stream": "^4.7.0"
+  }
+}

package/types/index.d.ts

@@ -1,12 +1,12 @@
-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, PostgresCredential, string>, ExecuteAction<T> {
-    source: "postgres";
-}
-
+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, PostgresCredential, string>, ExecuteAction<T> {
+    source: "postgres";
+}
+
 export interface PostgresCredential extends Omit<ServerAuth, "password">, PoolConfig {}