neo4j
diff --git a/‎packages/bolt-connection/src/bolt/bolt-protocol-v1.js
Copy file name to clipboard
+11Lines changed: 11 additions & 0 deletions b/‎packages/bolt-connection/src/bolt/bolt-protocol-v1.js
Copy file name to clipboard
+11Lines changed: 11 additions & 0 deletions
diff --git a/‎packages/bolt-connection/src/connection-provider/connection-provider-pooled.js
Copy file name to clipboard
+6-2Lines changed: 6 additions & 2 deletions b/‎packages/bolt-connection/src/connection-provider/connection-provider-pooled.js
Copy file name to clipboard
+6-2Lines changed: 6 additions & 2 deletions
diff --git a/‎packages/bolt-connection/src/connection/connection-channel.js
Copy file name to clipboard
+39-2Lines changed: 39 additions & 2 deletions b/‎packages/bolt-connection/src/connection/connection-channel.js
Copy file name to clipboard
+39-2Lines changed: 39 additions & 2 deletions
diff --git a/‎packages/bolt-connection/src/connection/connection-delegate.js
Copy file name to clipboard
+4Lines changed: 4 additions & 0 deletions b/‎packages/bolt-connection/src/connection/connection-delegate.js
Copy file name to clipboard
+4Lines changed: 4 additions & 0 deletions
diff --git a/‎packages/bolt-connection/src/connection/connection.js
Copy file name to clipboard
+4Lines changed: 4 additions & 0 deletions b/‎packages/bolt-connection/src/connection/connection.js
Copy file name to clipboard
+4Lines changed: 4 additions & 0 deletions
diff --git a/‎packages/bolt-connection/test/connection-provider/connection-provider-direct.test.js
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎packages/bolt-connection/test/connection-provider/connection-provider-direct.test.js
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎packages/bolt-connection/test/connection-provider/connection-provider-routing.test.js
Copy file name to clipboard
+24-2Lines changed: 24 additions & 2 deletions b/‎packages/bolt-connection/test/connection-provider/connection-provider-routing.test.js
Copy file name to clipboard
+24-2Lines changed: 24 additions & 2 deletions
diff --git a/‎packages/bolt-connection/test/connection/connection-channel.test.js
Copy file name to clipboard
+174Lines changed: 174 additions & 0 deletions b/‎packages/bolt-connection/test/connection/connection-channel.test.js
Copy file name to clipboard
+174Lines changed: 174 additions & 0 deletions
@@ -79,6 +79,7 @@ export default class BoltProtocol {
     this._log = log
     this._onProtocolError = onProtocolError
     this._fatalError = null
+    this._lastMessageSignature = null
   }
 
   /**
@@ -356,6 +357,8 @@ export default class BoltProtocol {
         this._log.debug(`C: ${message}`)
       }
 
+      this._lastMessageSignature = message.signature
+
       this.packer().packStruct(
         message.signature,
         message.fields.map(field => this.packer().packable(field))
@@ -369,6 +372,14 @@ export default class BoltProtocol {
     }
   }
 
+  isLastMessageLogin () {
+    return this._lastMessageSignature === 0x01
+  }
+
+  isLastMessageReset () {
+    return this._lastMessageSignature === 0x0f
+  }
+
   /**
    * Notifies faltal erros to the observers and mark the protocol in the fatal error state.
    * @param {Error} error The error
 
@@ -71,7 +71,9 @@ export default class PooledConnectionProvider extends ConnectionProvider {
    */
   _createConnection (address, release) {
     return this._createChannelConnection(address).then(connection => {
-      connection._release = () => release(address, connection)
+      connection._release = () => {
+        return release(address, connection)
+      }
       this._openConnections[connection.id] = connection
       return connection
         .connect(this._userAgent, this._authToken)
@@ -119,7 +121,9 @@ export default class PooledConnectionProvider extends ConnectionProvider {
     const connection = await this._connectionPool.acquire(address)
     const serverInfo = new ServerInfo(connection.server, connection.protocol().version)
     try {
-      await connection.resetAndFlush()
+      if (!connection.protocol().isLastMessageLogin()) {
+        await connection.resetAndFlush()
+      }
     } finally {
       await connection._release()
     }
 
@@ -123,6 +123,8 @@ export default class ChannelConnection extends Connection {
   ) {
     super(errorHandler)
 
+    this._reseting = false
+    this._resetObservers = []
     this._id = idGenerator++
     this._address = address
     this._server = { address: address.asHostPort() }
@@ -304,7 +306,7 @@ export default class ChannelConnection extends Connection {
    */
   resetAndFlush () {
     return new Promise((resolve, reject) => {
-      this._protocol.reset({
+      this._reset({
         onError: error => {
           if (this._isBroken) {
             // handling a fatal error, no need to raise a protocol violation
@@ -328,7 +330,7 @@ export default class ChannelConnection extends Connection {
       return
     }
 
-    this._protocol.reset({
+    this._reset({
       onError: () => {
         this._protocol.resetFailure()
       },
@@ -338,6 +340,41 @@ export default class ChannelConnection extends Connection {
     })
   }
 
+  _reset(observer) {
+    if (this._reseting) {
+      if (!this._protocol.isLastMessageReset()) {
+        this._protocol.reset({
+          onError: error => {
+            observer.onError(error)
+          }, onComplete: () => {
+            observer.onComplete()
+          }
+        })
+      } else {
+        this._resetObservers.push(observer)
+      }
+      return
+    }
+
+    this._resetObservers.push(observer)
+    this._reseting = true
+
+    const notifyFinish = (notify) => {
+      this._reseting = false
+      const observers = this._resetObservers
+      this._resetObservers = []
+      observers.forEach(notify)
+    }
+
+    this._protocol.reset({
+      onError: error => {
+        notifyFinish(obs => obs.onError(error))
+      }, onComplete: () => {
+        notifyFinish(obs => obs.onComplete())
+      }
+    })
+  }
+
   /*
    * Pop next pending observer form the list of observers and make it current observer.
    * @protected
 
@@ -83,6 +83,10 @@ export default class DelegateConnection extends Connection {
     return this._delegate.resetAndFlush()
   }
 
+  hasOngoingObservableRequests () {
+    return this._delegate.hasOngoingObservableRequests()
+  }
+
   close () {
     return this._delegate.close()
   }
 
@@ -103,6 +103,10 @@ export default class Connection {
     throw new Error('not implemented')
   }
 
+  hasOngoingObservableRequests () {
+    throw new Error('not implemented')
+  }
+
   /**
    * Call close on the channel.
    * @returns {Promise<void>} - A promise that will be resolved when the connection is closed.
 
@@ -251,7 +251,7 @@ describe('.verifyConnectivityAndGetServerInfo()', () => {
       const create = (address, release) => {
         const connection = new FakeConnection(address, release, server)
         connection.protocol = () => {
-          return { version: protocolVersion }
+          return { version: protocolVersion, isLastMessageLogin() { return false } }
         }
         connection.resetAndFlush = resetAndFlush
         if (releaseMock) {
 
@@ -2584,6 +2584,26 @@ describe('#unit RoutingConnectionProvider', () => {
           .toBeGreaterThan(connections[0].resetAndFlush.mock.invocationCallOrder[0])
       })
 
+      it('should not call resetAndFlush for newly created connections', async () => {
+        const { connectionProvider, routingTable, seenConnectionsPerAddress, pool } = setup({ newConnection: true })
+        const acquireSpy = jest.spyOn(pool, 'acquire')
+
+        await connectionProvider.verifyConnectivityAndGetServerInfo({ database, accessMode })
+
+        const targetServers = accessMode === WRITE ? routingTable.writers : routingTable.readers
+        const address = targetServers[0]
+        expect(acquireSpy).toHaveBeenCalledWith(address)
+
+        const connections = seenConnectionsPerAddress.get(address)
+
+        // verifying resetAndFlush was not called
+        expect(connections[0].resetAndFlush).not.toHaveBeenCalled()
+
+        // extra checks
+        expect(connections.length).toBe(1)
+        expect(connections[0]._release).toHaveBeenCalled()
+      })
+
       it('should not acquire, resetAndFlush and release connections for sever with the other access mode', async () => {
         const { connectionProvider, routingTable, seenConnectionsPerAddress, pool } = setup()
         const acquireSpy = jest.spyOn(pool, 'acquire')
@@ -2756,7 +2776,7 @@ describe('#unit RoutingConnectionProvider', () => {
         })
       })
 
-      function setup ({ resetAndFlush, releaseMock } = {}) {
+      function setup ({ resetAndFlush, releaseMock, newConnection } = { }) {
         const routingTable = newRoutingTable(
           database || null,
           [server1, server2],
@@ -2774,6 +2794,7 @@ describe('#unit RoutingConnectionProvider', () => {
               seenConnectionsPerAddress.set(address, [])
             }
             const connection = new FakeConnection(address, release, 'version', protocolVersion, server)
+            connection._firstUsage = !!newConnection
             if (resetAndFlush) {
               connection.resetAndFlush = resetAndFlush
             }
@@ -3082,7 +3103,8 @@ class FakeConnection extends Connection {
 
   protocol () {
     return {
-      version: this._protocolVersion
+      version: this._protocolVersion,
+      isLastMessageLogin: () => this._firstUsage
     }
   }
 }
 
@@ -260,6 +260,76 @@ describe('ChannelConnection', () => {
         expect(protocol.reset).toHaveBeenCalled()
         expect(protocol.resetFailure).toHaveBeenCalled()
       })
+
+      it('should not call protocol.reset() when there is an ongoing reset', () => {
+        const channel = {
+          _open: true
+        }
+
+        const protocol = {
+          reset: jest.fn(),
+          resetFailure: jest.fn(),
+          isLastMessageReset: jest.fn(() => true)
+        }
+        const protocolSupplier = () => protocol
+        const connection = spyOnConnectionChannel({ channel, protocolSupplier })
+
+        connection._resetOnFailure()
+
+        expect(protocol.reset).toHaveBeenCalledTimes(1)
+        expect(protocol.resetFailure).not.toHaveBeenCalled()
+
+        connection._resetOnFailure()
+
+        expect(protocol.reset).toHaveBeenCalledTimes(1)
+        expect(protocol.resetFailure).not.toHaveBeenCalled()
+      })
+
+      it('should call protocol.reset() when after a previous reset completed', () => {
+        const channel = {
+          _open: true
+        }
+
+        const protocol = {
+          reset: jest.fn(observer => observer.onComplete()),
+          resetFailure: jest.fn()
+        }
+        const protocolSupplier = () => protocol
+        const connection = spyOnConnectionChannel({ channel, protocolSupplier })
+
+        connection._resetOnFailure()
+
+        expect(protocol.reset).toHaveBeenCalledTimes(1)
+        expect(protocol.resetFailure).toHaveBeenCalledTimes(1)
+
+        connection._resetOnFailure()
+
+        expect(protocol.reset).toHaveBeenCalledTimes(2)
+        expect(protocol.resetFailure).toHaveBeenCalledTimes(2)
+      })
+
+      it('should call protocol.reset() when after a previous reset fail', () => {
+        const channel = {
+          _open: true
+        }
+
+        const protocol = {
+          reset: jest.fn(observer => observer.onError(new Error('some error'))),
+          resetFailure: jest.fn()
+        }
+        const protocolSupplier = () => protocol
+        const connection = spyOnConnectionChannel({ channel, protocolSupplier })
+
+        connection._resetOnFailure()
+
+        expect(protocol.reset).toHaveBeenCalledTimes(1)
+        expect(protocol.resetFailure).toHaveBeenCalledTimes(1)
+
+        connection._resetOnFailure()
+
+        expect(protocol.reset).toHaveBeenCalledTimes(2)
+        expect(protocol.resetFailure).toHaveBeenCalledTimes(2)
+      })
     })
 
     describe('when connection is not open', () => {
@@ -340,6 +410,110 @@ describe('ChannelConnection', () => {
     })
   })
 
+  describe('.resetAndFlush()', () => {
+    it('should call protocol.reset() onComplete', async () => {
+      const channel = {
+        _open: true
+      }
+
+      const protocol = {
+        reset: jest.fn(observer => observer.onComplete()),
+        resetFailure: jest.fn()
+      }
+      const protocolSupplier = () => protocol
+      const connection = spyOnConnectionChannel({ channel, protocolSupplier })
+
+      await connection.resetAndFlush().catch(() => {})
+
+      expect(protocol.reset).toHaveBeenCalled()
+    })
+
+    it('should call protocol.reset() onError', async () => {
+      const channel = {
+        _open: true
+      }
+
+      const protocol = {
+        reset: jest.fn(observer => observer.onError()),
+        resetFailure: jest.fn()
+      }
+      const protocolSupplier = () => protocol
+      const connection = spyOnConnectionChannel({ channel, protocolSupplier })
+
+      await connection.resetAndFlush().catch(() => {})
+
+      expect(protocol.reset).toHaveBeenCalled()
+    })
+
+    it('should not call protocol.reset() when there is an ongoing reset', async () => {
+      const channel = {
+        _open: true
+      }
+
+      const protocol = {
+        reset: jest.fn(observer => {
+          setTimeout(() => observer.onComplete(), 100)
+        }),
+        resetFailure: jest.fn(),
+        isLastMessageReset: jest.fn(() => true)
+      }
+      const protocolSupplier = () => protocol
+      const connection = spyOnConnectionChannel({ channel, protocolSupplier })
+
+      const completeFirstResetAndFlush = connection.resetAndFlush()
+
+      expect(protocol.reset).toHaveBeenCalledTimes(1)
+
+      await connection.resetAndFlush()
+
+      expect(protocol.reset).toHaveBeenCalledTimes(1)
+
+      await completeFirstResetAndFlush
+    })
+
+    it('should call protocol.reset() when after a previous reset completed', async () => {
+      const channel = {
+        _open: true
+      }
+
+      const protocol = {
+        reset: jest.fn(observer => observer.onComplete()),
+        resetFailure: jest.fn()
+      }
+      const protocolSupplier = () => protocol
+      const connection = spyOnConnectionChannel({ channel, protocolSupplier })
+
+      await connection.resetAndFlush()
+
+      expect(protocol.reset).toHaveBeenCalledTimes(1)
+
+      await connection.resetAndFlush()
+
+      expect(protocol.reset).toHaveBeenCalledTimes(2)
+    })
+
+    it('should call protocol.reset() when after a previous reset fail', async () => {
+      const channel = {
+        _open: true
+      }
+
+      const protocol = {
+        reset: jest.fn(observer => observer.onError(new Error('some error'))),
+        resetFailure: jest.fn()
+      }
+      const protocolSupplier = () => protocol
+      const connection = spyOnConnectionChannel({ channel, protocolSupplier })
+
+      await connection.resetAndFlush().catch(() => {})
+
+      expect(protocol.reset).toHaveBeenCalledTimes(1)
+
+      await connection.resetAndFlush().catch(() => {})
+
+      expect(protocol.reset).toHaveBeenCalledTimes(2)
+    })
+  })
+
   function spyOnConnectionChannel ({
     channel,
     errorHandler,
Original file line number	Diff line number	Diff line change
`@@ -83,6 +83,10 @@ export default class DelegateConnection extends Connection {`
`83`	`83`	`return this._delegate.resetAndFlush()`
`84`	`84`	`}`
`85`	`85`
	`86`	`+ hasOngoingObservableRequests () {`
	`87`	`+ return this._delegate.hasOngoingObservableRequests()`
	`88`	`+ }`
	`89`	`+`
`86`	`90`	`close () {`
`87`	`91`	`return this._delegate.close()`
`88`	`92`	`}`
Original file line number	Diff line number	Diff line change
`@@ -251,7 +251,7 @@ describe('.verifyConnectivityAndGetServerInfo()', () => {`
`251`	`251`	`const create = (address, release) => {`
`252`	`252`	`const connection = new FakeConnection(address, release, server)`
`253`	`253`	`connection.protocol = () => {`
`254`		`- return { version: protocolVersion }`
	`254`	`+ return { version: protocolVersion, isLastMessageLogin() { return false } }`
`255`	`255`	`}`
`256`	`256`	`connection.resetAndFlush = resetAndFlush`
`257`	`257`	`if (releaseMock) {`