DBS initialisation and timeouts

mod/query.js

@@ -1,4 +1,4 @@
-const dbs_connections = require('./utils/dbs')()
+const dbs_connections = require('./utils/dbs')
 
 const sqlFilter = require('./utils/sqlFilter')
 

mod/user/acl.js

@@ -1,8 +1,10 @@
 const { Pool } = require('pg');
 
-module.exports = () => {
+const connection = process.env.PRIVATE?.split('|') || process.env.PUBLIC?.split('|')
+
+let pool = null
 
-  const connection = process.env.PRIVATE && process.env.PRIVATE.split('|') || process.env.PUBLIC && process.env.PUBLIC.split('|')
+module.exports = () => {
 
   if(!connection || !connection[1]) return
 
@@ -11,24 +13,26 @@ module.exports = () => {
   const acl_schema = connection[1].split('.')[0] === acl_table ? 'public' : connection[1].split('.')[0]
 
   // Create PostgreSQL connection pool for ACL table.
-  const pool = new Pool({
-    connectionString: connection[0],
-    statement_timeout: 1000
+  pool ??= new Pool({
+    connectionString: connection[0]
   })
 
   // Method to query ACL. arr must be empty array by default.
   return async (q, arr) => {
 
     try {
 
-      const { rows } = await pool.query(q.replace(/acl_table/g, acl_table).replace(/acl_schema/g, acl_schema), arr)
+      const client = await pool.connect()
+
+      const { rows } = await client.query(q.replace(/acl_table/g, acl_table).replace(/acl_schema/g, acl_schema), arr)
+
+      client.release()
+
       return rows
 
     } catch (err) {
       console.error(err)
       return err
     }
-
   }
-
 }

mod/utils/dbs.js

@@ -4,49 +4,40 @@ const logger = require('./logger');
 
 const dbs = {};
 
-module.exports = () => {
-
-  Object.keys(process.env)
-
-    // Filter keys which start with DBS 
-    .filter(key => key.split('_')[0] === 'DBS')
-
-    // Filter keys which are not yet assigned to dbs object.
-    .filter(key => !dbs[key.split('_')[1]])
-
-    .forEach(key => {
-
-      const pool = new Pool({
-        connectionString: process.env[key],
-        statement_timeout: parseInt(process.env.STATEMENT_TIMEOUT) || 10000
-      });
-
-      dbs[key.split('_')[1]] = async (q, arr, timeout) => {
-
-        // Request which accepts q and arr and will return rows or rows.err.
-        try {
-
-          const client = await pool.connect()
-
-          timeout && await client.query(`SET statement_timeout = ${parseInt(timeout)}`)
-
-          const { rows } = await client.query(q, arr)
-
-          timeout && await client.query(`SET statement_timeout = ${parseInt(process.env.STATEMENT_TIMEOUT) || 10000}`)
-
-          client.release()
-
-          return rows
-
-        } catch (err) {
-
-          logger({err, q, arr})
-          return err;
+Object.keys(process.env)
+
+  // Filter keys which start with DBS 
+  .filter(key => key.startsWith('DBS_'))
+
+  .forEach(key => {
+
+    const pool = new Pool({
+      connectionString: process.env[key],
+      keepAlive: true
+    });
+
+    dbs[key.split('_')[1]] = async (query, variables, timeout) => {
+
+      try {
+
+        const client = await pool.connect()
+
+        if (timeout || process.env.STATEMENT_TIMEOUT) {
+          await client.query(`SET statement_timeout = ${parseInt(timeout) || parseInt(process.env.STATEMENT_TIMEOUT)}`)
         }
-
-      }
 
-    })
+        const { rows } = await client.query(query, variables)
+
+        client.release()
+
+        return rows
+
+      } catch (err) {
+
+        logger({ err, query, variables })
+        return err;
+      }
+    }
+  })
 
-  return dbs
-};
+module.exports = dbs