Merge branch 'master' into jrmerz-master

Author: charmander

.eslintrc

@@ -1,6 +1,19 @@
 {
- "extends": "standard",
+ "plugins": [
+ "node"
+ ],
+ "extends": [
+ "standard",
+ "eslint:recommended",
+ "plugin:node/recommended"
+ ],
+ "parserOptions": {
+ "ecmaVersion": 2017
+ },
+ "env": {
+ "node": true,
+ "es6": true
+ },
  "rules": {
- "no-new-func": "off"
  }
 }

.npmignore

@@ -7,3 +7,4 @@ script/
 *.swp
 test/
 .travis.yml
+ci_scripts/

.travis.yml

@@ -1,8 +1,17 @@
 language: node_js
-sudo: false
+sudo: true
 dist: trusty
+
 before_script:
  - node script/create-test-tables.js pg://postgres@127.0.0.1:5432/postgres
+ 
+before_install:
+ - if [ $TRAVIS_OS_NAME == "linux" ]; then
+ if [[ $(node -v) =~ v[1-9][0-9] ]]; then
+ source ./ci_scripts/build.sh;
+ fi
+ fi
+ 
 env:
  - CC=clang CXX=clang++ npm_config_clang=1 PGUSER=postgres PGDATABASE=postgres
 
@@ -17,6 +26,9 @@ matrix:
  - node_js: "10"
  addons:
  postgresql: "9.6"
+ - node_js: "12"
+ addons:
+ postgresql: "9.6"
  - node_js: "lts/carbon"
  addons:
  postgresql: "9.1"

CHANGELOG.md

@@ -4,7 +4,16 @@ For richer information consult the commit log on github with referenced pull req
 
 We do not include break-fix version release in this file.
 
+### 7.12.0
+
+- Add support for [async password lookup](https://github.com/brianc/node-postgres/pull/1926).
+
+### 7.11.0
+
+- Add support for [connection_timeout](https://github.com/brianc/node-postgres/pull/1847/files#diff-5391bde944956870128be1136e7bc176R63) and [keepalives_idle](https://github.com/brianc/node-postgres/pull/1847).
+
 ### 7.10.0
+
 - Add support for [per-query types](https://github.com/brianc/node-postgres/pull/1825).
 
 ### 7.9.0

Makefile

@@ -62,4 +62,6 @@ test-pool:
 
 lint:
 @echo "***Starting lint***"
-node_modules/.bin/eslint lib
+node -e "process.exit(Number(process.versions.node.split('.')[0]) < 8 ? 0 : 1)" \
+ && echo "***Skipping lint (node version too old)***" \
+ || node_modules/.bin/eslint lib

SPONSORS.md

@@ -1,10 +1,13 @@
 node-postgres is made possible by the helpful contributors from the community well as the following generous supporters on [Patreon](https://www.patreon.com/node_postgres).
 
 # Leaders
+
 - [MadKudu](https://www.madkudu.com) - [@madkudu](https://twitter.com/madkudu)
 - [Third Iron](https://thirdiron.com/)
+- [Timescale](https://timescale.com)
 
 # Supporters
+
 - John Fawcett
 - Lalit Kapoor [@lalitkapoor](https://twitter.com/lalitkapoor)
 - Paul Frazee [@pfrazee](https://twitter.com/pfrazee)

ci_scripts/build.sh

@@ -0,0 +1,9 @@
+#!/bin/sh
+
+BUILD_DIR="$(pwd)"
+source ./ci_scripts/install_openssl.sh 1.1.1b
+sudo updatedb
+source ./ci_scripts/install_libpq.sh
+sudo updatedb
+sudo ldconfig
+cd $BUILD_DIR

ci_scripts/install_libpq.sh

@@ -0,0 +1,38 @@
+#!/bin/bash
+
+set -e
+
+OPENSSL_DIR="$(pwd)/openssl-1.1.1b"
+POSTGRES_VERSION="11.3"
+POSTGRES_DIR="$(pwd)/postgres-${POSTGRES_VERSION}"
+TMP_DIR="/tmp/postgres"
+JOBS="-j$(nproc || echo 1)"
+
+if [ -d "${TMP_DIR}" ]; then
+ rm -rf "${TMP_DIR}"
+fi
+
+mkdir -p "${TMP_DIR}"
+
+curl https://ftp.postgresql.org/pub/source/v${POSTGRES_VERSION}/postgresql-${POSTGRES_VERSION}.tar.gz | \
+ tar -C "${TMP_DIR}" -xzf -
+
+cd "${TMP_DIR}/postgresql-${POSTGRES_VERSION}"
+
+if [ -d "${POSTGRES_DIR}" ]; then
+ rm -rf "${POSTGRES_DIR}"
+fi
+mkdir -p $POSTGRES_DIR
+
+./configure --prefix=$POSTGRES_DIR --with-openssl --with-includes=${OPENSSL_DIR}/include --with-libraries=${OPENSSL_DIR}/lib --without-readline
+
+cd src/interfaces/libpq; make; make install; cd -
+cd src/bin/pg_config; make install; cd -
+cd src/backend; make generated-headers; cd -
+cd src/include; make install; cd -
+
+export PATH="${POSTGRES_DIR}/bin:${PATH}"
+export CFLAGS="-I${POSTGRES_DIR}/include"
+export LDFLAGS="-L${POSTGRES_DIR}/lib"
+export LD_LIBRARY_PATH="${POSTGRES_DIR}/lib:$LD_LIBRARY_PATH"
+export PKG_CONFIG_PATH="${POSTGRES_DIR}/lib/pkgconfig:$PKG_CONFIG_PATH"

ci_scripts/install_openssl.sh

@@ -0,0 +1,35 @@
+#!/bin/sh
+
+if [ ${#} -lt 1 ]; then
+ echo "OpenSSL version required." 1>&2
+ exit 1
+fi
+
+OPENSSL_VERSION="${1}"
+OPENSSL_DIR="$(pwd)/openssl-${OPENSSL_VERSION}"
+TMP_DIR="/tmp/openssl"
+JOBS="-j$(nproc)"
+
+if [ -d "${TMP_DIR}" ]; then
+ rm -rf "${TMP_DIR}"
+fi
+mkdir -p "${TMP_DIR}"
+curl -s https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz | \
+ tar -C "${TMP_DIR}" -xzf -
+pushd "${TMP_DIR}/openssl-${OPENSSL_VERSION}"
+if [ -d "${OPENSSL_DIR}" ]; then
+ rm -rf "${OPENSSL_DIR}"
+fi
+./Configure \
+ --prefix=${OPENSSL_DIR} \
+ enable-crypto-mdebug enable-crypto-mdebug-backtrace \
+ linux-x86_64
+make -s $JOBS
+make install_sw
+popd
+
+export PATH="${OPENSSL_DIR}/bin:${PATH}"
+export CFLAGS="-I${OPENSSL_DIR}/include"
+export LDFLAGS="-L${OPENSSL_DIR}/lib"
+export LD_LIBRARY_PATH="${OPENSSL_DIR}/lib:$LD_LIBRARY_PATH"
+export PKG_CONFIG_PATH="${OPENSSL_DIR}/lib/pkgconfig:$PKG_CONFIG_PATH"

lib/client.js

@@ -44,13 +44,15 @@ var Client = function (config) {
  stream: c.stream,
  ssl: this.connectionParameters.ssl,
  keepAlive: c.keepAlive || false,
+ keepAliveInitialDelayMillis: c.keepAliveInitialDelayMillis || 0,
  encoding: this.connectionParameters.client_encoding || 'utf8'
  })
  this.queryQueue = []
  this.binary = c.binary || defaults.binary
  this.processID = null
  this.secretKey = null
  this.ssl = this.connectionParameters.ssl || false
+ this._connectionTimeoutMillis = c.connectionTimeoutMillis || 0
 }
 
 util.inherits(Client, EventEmitter)
@@ -83,6 +85,14 @@ Client.prototype._connect = function (callback) {
  }
  this._connecting = true
 
+ var connectionTimeoutHandle
+ if (this._connectionTimeoutMillis > 0) {
+ connectionTimeoutHandle = setTimeout(() => {
+ con._ending = true
+ con.stream.destroy(new Error('timeout expired'))
+ }, this._connectionTimeoutMillis)
+ }
+
  if (this.host && this.host.indexOf('/') === 0) {
  con.connect(this.host + '/.s.PGSQL.' + this.port)
  } else {
@@ -104,7 +114,24 @@ Client.prototype._connect = function (callback) {
 
  function checkPgPass (cb) {
  return function (msg) {
- if (self.password !== null) {
+ if (typeof self.password === 'function') {
+ self._Promise.resolve()
+ .then(() => self.password())
+ .then(pass => {
+ if (pass !== undefined) {
+ if (typeof pass !== 'string') {
+ con.emit('error', new TypeError('Password must be a string'))
+ return
+ }
+ self.connectionParameters.password = self.password = pass
+ } else {
+ self.connectionParameters.password = self.password = null
+ }
+ cb(msg)
+ }).catch(err => {
+ con.emit('error', err)
+ })
+ } else if (self.password !== null) {
  cb(msg)
  } else {
  pgPass(self.connectionParameters, function (pass) {
@@ -159,6 +186,7 @@ Client.prototype._connect = function (callback) {
  return
  }
  this._connectionError = true
+ clearTimeout(connectionTimeoutHandle)
  if (callback) {
  return callback(err)
  }
@@ -196,6 +224,7 @@ Client.prototype._connect = function (callback) {
  con.removeListener('errorMessage', connectingErrorHandler)
  con.on('error', connectedErrorHandler)
  con.on('errorMessage', connectedErrorMessageHandler)
+ clearTimeout(connectionTimeoutHandle)
 
  // process possible callback argument to Client#connect
  if (callback) {
@@ -280,11 +309,13 @@ Client.prototype._attachListeners = function (con) {
  })
 
  // delegate portalSuspended to active query
+ // eslint-disable-next-line no-unused-vars
  con.on('portalSuspended', function (msg) {
  self.activeQuery.handlePortalSuspended(con)
  })
 
- // deletagate emptyQuery to active query
+ // delegate emptyQuery to active query
+ // eslint-disable-next-line no-unused-vars
  con.on('emptyQuery', function (msg) {
  self.activeQuery.handleEmptyQuery(con)
  })
@@ -297,12 +328,14 @@ Client.prototype._attachListeners = function (con) {
  // if a prepared statement has a name and properly parses
  // we track that its already been executed so we don't parse
  // it again on the same client
+ // eslint-disable-next-line no-unused-vars
  con.on('parseComplete', function (msg) {
  if (self.activeQuery.name) {
  con.parsedStatements[self.activeQuery.name] = self.activeQuery.text
  }
  })
 
+ // eslint-disable-next-line no-unused-vars
  con.on('copyInResponse', function (msg) {
  self.activeQuery.handleCopyInResponse(self.connection)
  })