Merge branch 1.7 into 4.0

Author: ali-ince

src/internal/transaction-executor.js

@@ -17,7 +17,12 @@
  * limitations under the License.
  */
 
-import { newError, SERVICE_UNAVAILABLE, SESSION_EXPIRED } from '../error'
+import {
+  newError,
+  Neo4jError,
+  SERVICE_UNAVAILABLE,
+  SESSION_EXPIRED
+} from '../error'
 
 const DEFAULT_MAX_RETRY_TIME_MS = 30 * 1000 // 30 seconds
 const DEFAULT_INITIAL_RETRY_DELAY_MS = 1000 // 1 seconds
@@ -199,6 +204,7 @@ export default class TransactionExecutor {
   static _canRetryOn (error) {
     return (
       error &&
+      error instanceof Neo4jError &&
       error.code &&
       (error.code === SERVICE_UNAVAILABLE ||
         error.code === SESSION_EXPIRED ||

test/internal/transaction-executor.test.js

@@ -80,6 +80,23 @@ describe('#unit TransactionExecutor', () => {
     await testNoRetryOnUnknownError([LOCKS_TERMINATED_ERROR], 1)
   })
 
+  it('should not retry when transaction work returns promise rejected with unknown error type', async () => {
+    class MyTestError extends Error {
+      constructor (message, code) {
+        super(message)
+        this.code = code
+      }
+    }
+
+    const error = new MyTestError('an unexpected error', 504)
+    const executor = new TransactionExecutor()
+    const realWork = () => Promise.reject(error)
+
+    await expectAsync(
+      executor.execute(transactionCreator(), tx => realWork())
+    ).toBeRejectedWith(error)
+  })
+
   it('should stop retrying when time expires', async () => {
     let clock
     const usedTransactions = []

test/types/index.test.ts

@@ -57,6 +57,16 @@ const driver1: Driver = driver('bolt://localhost:7687')
 const driver2: Driver = driver('bolt://localhost:7687', basicAuthToken1)
 const driver3: Driver = driver('bolt://localhost:7687', basicAuthToken1, config)
 
+const address1 = 'db-1.internal:7687'
+const address2 = 'db-2.internal:7687'
+const driver4: Driver = driver(
+  'bolt://localhost',
+  auth.basic('neo4j', 'password'),
+  {
+    resolver: address => Promise.resolve([address1, address2])
+  }
+)
+
 const readMode1: string = session.READ
 const writeMode1: string = session.WRITE
 

types/driver.d.ts

@@ -55,6 +55,7 @@ declare interface Config {
   connectionTimeout?: number
   disableLosslessIntegers?: boolean
   logging?: LoggingConfig
+  resolver?: (address: string) => string[] | Promise<string[]>
 }
 
 declare type SessionMode = 'READ' | 'WRITE'