mythix-orm-postgresql 1.7.1 → 1.7.3

package/lib/postgresql-connection.js

@@ -7,10 +7,18 @@ const Nife                      = require('nife');
 const { DateTime }              = require('luxon');
 const PG                        = require('pg');
 const PGFormat                  = require('pg-format');
-const { Literals }              = require('mythix-orm');
+const { Literals, Errors }      = require('mythix-orm');
 const { SQLConnectionBase }     = require('mythix-orm-sql-base');
 const PostgreSQLQueryGenerator  = require('./postgresql-query-generator');
 
+const DEFAULT_TIMEOUT_MS = 5000;
+
+function sleep(ms) {
+  return new Promise((resolve) => {
+    setTimeout(resolve, ms);
+  });
+}
+
 class PostgreSQLConnection extends SQLConnectionBase {
   static dialect = 'postgresql';
 
@@ -33,6 +41,27 @@ class PostgreSQLConnection extends SQLConnectionBase {
     return !!this.pool;
   }
 
+  async getPoolConnection(_retryCount) {
+    let retryCount = _retryCount || 0;
+
+    try {
+      return await this.pool.connect();
+    } catch (error) {
+      let options           = this.getOptions();
+      let connectMaxRetries = (options.connectMaxRetries == null) ? 5 : options.connectMaxRetries;
+      let connectRetryDelay = (options.connectRetryDelay == null) ? 5000 : options.connectRetryDelay;
+
+      if (error.code === 'ECONNREFUSED') {
+        if (retryCount < connectMaxRetries) {
+          await sleep(connectRetryDelay);
+          return this.getPoolConnection(retryCount + 1);
+        }
+
+        throw new Errors.MythixORMConnectionTimedOutError(error);
+      }
+    }
+  }
+
   async start() {
     let options = this.getOptions();
 
@@ -45,11 +74,10 @@ class PostgreSQLConnection extends SQLConnectionBase {
       },
       options,
       {
-        statement_timeout:                    options.statementTimeout,
-        query_timeout:                        options.queryTimeout,
-        connectionTimeoutMillis:              options.connectionTimeout,
+        statement_timeout:                    options.statementTimeout || DEFAULT_TIMEOUT_MS,
+        query_timeout:                        options.queryTimeout || DEFAULT_TIMEOUT_MS,
+        connectionTimeoutMillis:              options.connectionTimeout || 60000,
         idle_in_transaction_session_timeout:  options.idleTransactionTimeout,
-        idleTimeoutMillis:                    options.idleConnectionTimeout,
         max:                                  options.maxPoolConnections,
       },
     );
@@ -73,6 +101,10 @@ class PostgreSQLConnection extends SQLConnectionBase {
     pool.on('remove', (client) => {
       this.emit('disconnect', client);
     });
+
+    // Ensure that we can connect to the DB
+    let client = await this.getPoolConnection();
+    await client.release();
   }
 
   async stop() {
@@ -141,7 +173,7 @@ class PostgreSQLConnection extends SQLConnectionBase {
     try {
       client = _client || this.inTransaction;
       if (!client) {
-        client = await this.pool.connect();
+        client = await this.getPoolConnection();
         hasOwnClient = true;
       }
 
@@ -155,8 +187,14 @@ class PostgreSQLConnection extends SQLConnectionBase {
       else
         result = await client.query(sql);
 
+      if (client && hasOwnClient)
+        await client.release();
+
       return this.formatResultsResponse(sql, result);
     } catch (error) {
+      if (client && hasOwnClient)
+        await client.release();
+
       if (logger) {
         logger.error(error);
         logger.error('QUERY: ', sql);
@@ -165,13 +203,10 @@ class PostgreSQLConnection extends SQLConnectionBase {
       error.query = sql;
 
       throw error;
-    } finally {
-      if (client && hasOwnClient)
-        await client.release();
     }
   }
 
-  async transaction(callback, _options) {
+  async transaction(callback, _options, _retryCount) {
     let options       = _options || {};
     let inheritedThis = Object.create(options.connection || this.getContextValue('connection', this));
     let lockMode      = inheritedThis.getLockMode(options.lock);
@@ -198,15 +233,33 @@ class PostgreSQLConnection extends SQLConnectionBase {
     }
 
     if (!inheritedThis.inTransaction) {
-      client = inheritedThis.inTransaction = await inheritedThis.pool.connect();
+      client = inheritedThis.inTransaction = await inheritedThis.getPoolConnection();
+
+      let beginSuccess = false;
 
       try {
         await inheritedThis.query(`BEGIN${(options.beginArguments) ? ` ${options.beginArguments}` : ''}`, options, client);
-        if (lockStatement)
+        beginSuccess = true;
+
+        if (lockStatement) {
+          console.log('LOCK STATEMENT: ', lockStatement);
           await inheritedThis.query(lockStatement, options, client);
+        }
 
         // TODO: Need to handle "busy" error
       } catch (error) {
+        if (beginSuccess)
+          await inheritedThis.query('ROLLBACK', options, client);
+
+        // Transaction timeout (deadlock)
+        if (error.query && (/LOCK TABLE/).test(error.query.text)) {
+          let retryCount = _retryCount || 0;
+          if (retryCount < 5) {
+            await client.release();
+            return this.transaction(callback, _options, retryCount + 1);
+          }
+        }
+
         await client.release();
         throw error;
       }
@@ -221,7 +274,7 @@ class PostgreSQLConnection extends SQLConnectionBase {
     }
 
     try {
-      let result = await inheritedThis.createContext(callback, inheritedThis, inheritedThis);
+      let result = await await inheritedThis.createContext(callback, inheritedThis, inheritedThis);
 
       if (savePointName)
         await inheritedThis.query(`RELEASE SAVEPOINT ${savePointName}`, options, client);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mythix-orm-postgresql",
-  "version": "1.7.1",
+  "version": "1.7.3",
   "description": "PostgreSQL driver for Mythix ORM",
   "main": "lib/index.js",
   "type": "commonjs",
@@ -33,8 +33,8 @@
   },
   "homepage": "https://github.com/th317erd/mythix-orm-postgresql#readme",
   "peerDependencies": {
-    "mythix-orm": "^1.8.1",
-    "mythix-orm-sql-base": "^1.7.1"
+    "mythix-orm": "^1.8.2",
+    "mythix-orm-sql-base": "^1.7.2"
   },
   "dependencies": {
     "luxon": "^3.0.4",