@koziatek/pgsql 1.0.1 → 2.0.0

package/env.js

@@ -1,3 +1,6 @@
+require('dotenv').config();
+
+
 module.exports = {
     PGSQL_DATABASE_CONNECTION_STRING: process?.env?.PGSQL_DATABASE_CONNECTION_STRING || false,
     PGSQL_POOL_MAX: process?.env?.PGSQL_POOL_MAX || 1,

package/index.js

@@ -6,6 +6,8 @@ let POOL_PROMISE;
 
 class PgSQL {
 
+    static config;
+
     static async GetPool() {
         if (POOL) return POOL;
         if (POOL_PROMISE) return POOL_PROMISE;
@@ -20,18 +22,27 @@ class PgSQL {
         await pool.end();
     }
 
-    static async Open(config=env) {
-        if(POOL) return POOL;
+    static SetConfig({ca, connectionString, pool_max=1, idleTimeourMillis=30_000, connectionTimeoutMillis=5_000, maxUses=5_000}){
+        return this.config = {
+            connectionString, 
+            max: pool_max, 
+            idleTimeourMillis, 
+            connectionTimeoutMillis, 
+            maxUses,
+            ssl: {
+                ca,
+                rejectUnauthorized: true,
+            }
+        }
+    }
+
 
-        if(!config?.PGSQL_DATABASE_CONNECTION_STRING) throw new Error('Missing Connection String: PGSQL_DATABASE_CONNECTION_STRING')
+    static async Open() {
+        if(POOL) return POOL;
+        const config = this.config;
+        if(!config?.connectionString) throw new Error('Missing Connection String: connectionString')
 
-        return POOL = new Pool({
-            connectionString: config.PGSQL_DATABASE_CONNECTION_STRING,
-            max: Number(config.PGSQL_POOL_MAX || 1),
-            idleTimeoutMillis: Number(config.PGSQL_POOL_IDLE_MS || 30_000),
-            connectionTimeoutMillis: Number(config.PGSQL_POOL_CONN_TIMEOUT_MS || 5_000),
-            maxUses: Number(config.PGSQL_POOL_MAX_USES || 5_000),
-        });
+        return POOL = new Pool(config);
     }
 
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@koziatek/pgsql",
-  "version": "1.0.1",
+  "version": "2.0.0",
   "description": "",
   "main": "index.js",
   "publishConfig": {

package/tests/Connection.test.js

@@ -1,9 +1,17 @@
 const { PgSQL } = require("..");
+const fs = require("fs");
+const path = require("path");
 
 
 
 describe('PgSQL Connection', ()=>{
     it('- can connect to database.', async () => {
+        const caPath = path.join(__dirname,'..','ca-certificate.secret.crt');
+        console.log('caPath',caPath);
+        const ca = fs.readFileSync(caPath, "utf8");
+        const connectionString = process.env.PGSQL_DATABASE_CONNECTION_STRING;
+        console.log('connectionString',connectionString);
+        PgSQL.SetConfig({ca, connectionString})
         const connected = await PgSQL.CheckConnection();
         expect(connected).toBe(true);
     });