Fix acquisition timeout unification (#1295)

Author: MaxAake

packages/bolt-connection/src/connection-provider/connection-provider-routing.js

@@ -161,7 +161,7 @@ export default class RoutingConnectionProvider extends PooledConnectionProvider
         () => new RoutingTable({ database: homeDb })
       )
       if (currentRoutingTable && !currentRoutingTable.isStaleFor(accessMode)) {
-        conn = await this.getConnectionFromRoutingTable(currentRoutingTable, auth, accessMode, databaseSpecificErrorHandler)
+        conn = await this._getConnectionFromRoutingTable(currentRoutingTable, auth, accessMode, databaseSpecificErrorHandler)
         if (this.SSREnabled()) {
           return conn
         }
@@ -181,10 +181,10 @@ export default class RoutingConnectionProvider extends PooledConnectionProvider
         }
       }
     })
-    return this.getConnectionFromRoutingTable(routingTable, auth, accessMode, databaseSpecificErrorHandler)
+    return this._getConnectionFromRoutingTable(routingTable, auth, accessMode, databaseSpecificErrorHandler)
   }
 
-  async getConnectionFromRoutingTable (routingTable, auth, accessMode, databaseSpecificErrorHandler) {
+  async _getConnectionFromRoutingTable (routingTable, auth, accessMode, databaseSpecificErrorHandler) {
     let name
     let address
     // select a target server based on specified access mode
@@ -290,6 +290,7 @@ export default class RoutingConnectionProvider extends PooledConnectionProvider
   }
 
   async verifyAuthentication ({ database, accessMode, auth }) {
+    this._startTime = new Date().getTime()
     return this._verifyAuthentication({
       auth,
       getAddress: async () => {
@@ -320,6 +321,7 @@ export default class RoutingConnectionProvider extends PooledConnectionProvider
 
   async verifyConnectivityAndGetServerInfo ({ database, accessMode }) {
     const context = { database: database || DEFAULT_DB_NAME }
+    this._startTime = new Date().getTime()
 
     const routingTable = await this._freshRoutingTable({
       accessMode,

packages/core/src/internal/pool/pool.ts

@@ -16,7 +16,7 @@
  */
 
 import PoolConfig from './pool-config'
-import { newError } from '../../error'
+import { Neo4jError, newError } from '../../error'
 import { Logger } from '../logger'
 import { ServerAddress } from '../server-address'
 
@@ -119,6 +119,10 @@ class Pool<R extends unknown = unknown> {
     const allRequests = this._acquireRequests
     const requests = allRequests[key]
     const elapsedTime = (acquisitionContext.startTime != null && acquisitionContext.startTime !== 0) ? new Date().getTime() - acquisitionContext.startTime : 0
+    if (elapsedTime >= this._acquisitionTimeout) {
+      throw this.getAcquisitionTimeoutError(address)
+    }
+
     if (requests == null) {
       allRequests[key] = []
     }
@@ -137,12 +141,8 @@ class Pool<R extends unknown = unknown> {
           // request already resolved/rejected by the release operation; nothing to do
         } else {
           // request is still pending and needs to be failed
-          const activeCount = this.activeResourceCount(address)
-          const idleCount = this.has(address) ? this._pools[key].length : 0
           request.reject(
-            newError(
-              `Connection acquisition timed out in ${this._acquisitionTimeout} ms. Pool status: Active conn count = ${activeCount}, Idle conn count = ${idleCount}.`
-            )
+            this.getAcquisitionTimeoutError(address)
           )
         }
       }, this._acquisitionTimeout - elapsedTime)
@@ -159,6 +159,15 @@ class Pool<R extends unknown = unknown> {
     })
   }
 
+  getAcquisitionTimeoutError (address: ServerAddress): Neo4jError {
+    const key = address.asKey()
+    const activeCount = this.activeResourceCount(address)
+    const idleCount = this.has(address) ? this._pools[key].length : 0
+    return newError(
+        `Connection acquisition timed out in ${this._acquisitionTimeout} ms. Pool status: Active conn count = ${activeCount}, Idle conn count = ${idleCount}.`
+    )
+  }
+
   /**
    * Destroy all idle resources for the given address.
    * @param {ServerAddress} address the address of the server to purge its pool.