Add read_timeout to connection settings

Author: juliusza

lib/client.js

@@ -403,6 +403,10 @@ Client.prototype.query = function (config, values, callback) {
   if (config === null || config === undefined) {
     throw new TypeError('Client was passed a null or undefined query')
   } else if (typeof config.submit === 'function') {
+    var readTimeoutTimer
+    var queryCallback
+    var readTimeout = config.query_timeout || this.connectionParameters.query_timeout
+
     result = query = config
     if (typeof values === 'function') {
       query.callback = query.callback || values
@@ -416,6 +420,32 @@ Client.prototype.query = function (config, values, callback) {
     }
   }
 
+  if (readTimeout) {
+    queryCallback = query.callback;
+
+    readTimeoutTimer = setTimeout(() => {
+      var error = new Error('Query read timeout');
+
+      this.emit('error', error)
+      queryCallback(error)
+
+      // we already returned an error,
+      // just do nothing when query completes
+      delete query.callback
+
+      // Remove from queue
+      var index = this.queryQueue.indexOf(query)
+      if (index > -1) {
+        this.queryQueue.splice(index, 1)
+      }
+    }, readTimeout)
+
+    query.callback = (err, res) => {
+      clearTimeout(readTimeoutTimer)
+      queryCallback(err, res)
+    }
+  }
+
   if (this.binary && !query.binary) {
     query.binary = true
   }

lib/connection-parameters.js

@@ -65,6 +65,7 @@ var ConnectionParameters = function (config) {
   this.application_name = val('application_name', config, 'PGAPPNAME')
   this.fallback_application_name = val('fallback_application_name', config, false)
   this.statement_timeout = val('statement_timeout', config, false)
+  this.query_timeout = val('query_timeout', config, false)
 }
 
 // Convert arg to a string, surround in single quotes, and escape single quotes and backslashes

lib/defaults.js

@@ -55,7 +55,10 @@ module.exports = {
   parseInputDatesAsUTC: false,
 
   // max milliseconds any query using this connection will execute for before timing out in error. false=unlimited
-  statement_timeout: false
+  statement_timeout: false,
+
+  // max miliseconds to wait for query to complete (client side)
+  query_timeout: false
 }
 
 var pgTypes = require('pg-types')