Send connect address to routing procedure

Author: Peter Wilhelmsson

src/internal/connection-provider-routing.js

@@ -57,7 +57,9 @@ export default class RoutingConnectionProvider extends PooledConnectionProvider
 
     this._seedRouter = address
     this._routingTables = {}
-    this._rediscovery = new Rediscovery(new RoutingUtil(routingContext))
+    this._rediscovery = new Rediscovery(
+      new RoutingUtil(routingContext, address)
+    )
     this._loadBalancingStrategy = new LeastConnectedLoadBalancingStrategy(
       this._connectionPool
     )

src/internal/routing-util.js

@@ -33,8 +33,11 @@ const PROCEDURE_NOT_FOUND_CODE = 'Neo.ClientError.Procedure.ProcedureNotFound'
 const DATABASE_NOT_FOUND_CODE = 'Neo.ClientError.Database.DatabaseNotFound'
 
 export default class RoutingUtil {
-  constructor (routingContext) {
+  constructor (routingContext, initialAddress) {
     this._routingContext = routingContext
+    // The address that the driver is connecting to, used by routing as a fallback when routing
+    // and clustering isn't configured.
+    this._initialAddress = initialAddress
   }
 
   /**
@@ -148,6 +151,10 @@ export default class RoutingUtil {
           context: this._routingContext,
           database: database || null
         }
+        if (protocolVersion >= 4.1) {
+          params.context = params.context || {}
+          params.context.address = this._initialAddress
+        }
       } else {
         query = CALL_GET_ROUTING_TABLE
         params = { context: this._routingContext }

test/internal/routing-util.test.js

@@ -37,6 +37,58 @@ import {
 
 const ROUTER_ADDRESS = ServerAddress.fromUrl('test.router.com:4242')
 
+class FakeSession {
+  constructor (runResponse, fakeConnection) {
+    this._runResponse = runResponse
+    this._fakeConnection = fakeConnection
+    this._closed = false
+  }
+
+  static successful (result) {
+    return new FakeSession(Promise.resolve(result), null)
+  }
+
+  static failed (error) {
+    return new FakeSession(Promise.reject(error), null)
+  }
+
+  static withFakeConnection (connection) {
+    return new FakeSession(null, connection)
+  }
+
+  _run (ignoreQuery, ignoreParameters, queryRunner) {
+    if (this._runResponse) {
+      return this._runResponse
+    }
+    queryRunner(this._fakeConnection)
+    return Promise.resolve()
+  }
+
+  withBookmark (bookmark) {
+    this._lastBookmark = bookmark
+    return this
+  }
+
+  withDatabase (database) {
+    this._database = database || ''
+    return this
+  }
+
+  withMode (mode) {
+    this._mode = mode
+    return this
+  }
+
+  close () {
+    this._closed = true
+    return Promise.resolve()
+  }
+
+  isClosed () {
+    return this._closed
+  }
+}
+
 describe('#unit RoutingUtil', () => {
   it('should return retrieved records when query succeeds', done => {
     const session = FakeSession.successful({ records: ['foo', 'bar', 'baz'] })
@@ -261,6 +313,18 @@ describe('#unit RoutingUtil', () => {
       ))
   })
 
+  it('should pass initial address while invoking routing procedure', async () => {
+    const connection = new FakeConnection().withServerVersion('Neo4j/4.1.0')
+    const session = FakeSession.withFakeConnection(connection)
+    const util = new RoutingUtil({}, 'initialAddr')
+
+    await util.callRoutingProcedure(session, '', ROUTER_ADDRESS)
+
+    expect(connection.seenParameters).toEqual([
+      { context: { address: 'initialAddr' }, database: null }
+    ])
+  })
+
   it('should parse valid ttl', () => {
     const clock = lolex.install()
     try {
@@ -503,56 +567,4 @@ describe('#unit RoutingUtil', () => {
       done()
     })
   }
-
-  class FakeSession {
-    constructor (runResponse, fakeConnection) {
-      this._runResponse = runResponse
-      this._fakeConnection = fakeConnection
-      this._closed = false
-    }
-
-    static successful (result) {
-      return new FakeSession(Promise.resolve(result), null)
-    }
-
-    static failed (error) {
-      return new FakeSession(Promise.reject(error), null)
-    }
-
-    static withFakeConnection (connection) {
-      return new FakeSession(null, connection)
-    }
-
-    _run (ignoreQuery, ignoreParameters, queryRunner) {
-      if (this._runResponse) {
-        return this._runResponse
-      }
-      queryRunner(this._fakeConnection)
-      return Promise.resolve()
-    }
-
-    withBookmark (bookmark) {
-      this._lastBookmark = bookmark
-      return this
-    }
-
-    withDatabase (database) {
-      this._database = database || ''
-      return this
-    }
-
-    withMode (mode) {
-      this._mode = mode
-      return this
-    }
-
-    close () {
-      this._closed = true
-      return Promise.resolve()
-    }
-
-    isClosed () {
-      return this._closed
-    }
-  }
 })

test/session.test.js

@@ -41,7 +41,7 @@ describe('#integration session', () => {
     driver = neo4j.driver('bolt://localhost', sharedNeo4j.authToken)
     session = driver.session()
     originalTimeout = jasmine.DEFAULT_TIMEOUT_INTERVAL
-    jasmine.DEFAULT_TIMEOUT_INTERVAL = 60000
+    jasmine.DEFAULT_TIMEOUT_INTERVAL = 70000
 
     protocolVersion = await sharedNeo4j.cleanupAndGetProtocolVersion(driver)
   })