Improve purge address of the Pool routine (#995)

bigmontz · web-flow · commit b7e219886efb · 2022-09-13T11:43:54.000+02:00
In Browser environments, the WebSocket release can take seconds to finish.
This behaviour can make LDAP authentication expired take more time than usual.

Purging the connection in parallel speeds up this process.
diff --git a/packages/bolt-connection/src/pool/pool.js b/packages/bolt-connection/src/pool/pool.js
@@ -292,16 +292,18 @@ class Pool {
 
   async _purgeKey (key) {
     const pool = this._pools[key]
+    const destructionList = []
     if (pool) {
       while (pool.length) {
         const resource = pool.pop()
         if (this._removeIdleObserver) {
           this._removeIdleObserver(resource)
         }
-        await this._destroy(resource)
+        destructionList.push(this._destroy(resource))
       }
       pool.close()
       delete this._pools[key]
+      await Promise.all(destructionList)
     }
   }
 
diff --git a/packages/bolt-connection/test/pool/pool.test.js b/packages/bolt-connection/test/pool/pool.test.js
@@ -878,7 +878,7 @@ describe('#unit Pool', () => {
     expect(resource2.observer).toBeFalsy()
   })
 
-  it('should thrown aquisition timeout exception if resource takes longer to be created', async () => {
+  it('should thrown acquisition timeout exception if resource takes longer to be created', async () => {
     const address = ServerAddress.fromUrl('bolt://localhost:7687')
     const acquisitionTimeout = 1000
     let counter = 0
@@ -911,6 +911,43 @@ describe('#unit Pool', () => {
       expect(counter).toEqual(1)
     }
   })
+
+  it('should purge resources in parallel', async () => {
+    const address = ServerAddress.fromUrl('bolt://localhost:7687')
+    let resourceCount = 0
+    const resourcesReleased = []
+    let resolveRelease
+    const releasePromise = new Promise((resolve) => {
+      resolveRelease = resolve
+    })
+
+    const pool = new Pool({
+      create: (server, release) =>
+        Promise.resolve(new Resource(server, resourceCount++, release)),
+      destroy: res => {
+        resourcesReleased.push(res)
+        resourceCount--
+        // Only destroy when the last resource
+        // get destroyed
+        if (resourceCount === 0) {
+          resolveRelease()
+        }
+        return releasePromise
+      },
+      validate: res => true
+    })
+
+    const resource1 = await pool.acquire(address)
+    const resource2 = await pool.acquire(address)
+    await resource1.close()
+    await resource2.close()
+
+    await pool.purge(address)
+
+    expect(resourcesReleased).toEqual([
+      resource2, resource1
+    ])
+  })
 })
 
 function expectNoPendingAcquisitionRequests (pool) {
diff --git a/packages/neo4j-driver/test/temporal-types.test.js b/packages/neo4j-driver/test/temporal-types.test.js
@@ -354,7 +354,7 @@ describe('#integration temporal-types', () => {
     await testSendAndReceiveRandomTemporalValues(() => randomLocalDateTime())
   }, 60000)
 
-  it('should send and receive random LocalDateTime', async () => {
+  it('should send and receive array of random LocalDateTime', async () => {
     if (neo4jDoesNotSupportTemporalTypes()) {
       return
     }

Original file line number	Diff line number	Diff line change
`@@ -292,16 +292,18 @@ class Pool {`
`292`	`292`
`293`	`293`	`async _purgeKey (key) {`
`294`	`294`	`const pool = this._pools[key]`
	`295`	`+ const destructionList = []`
`295`	`296`	`if (pool) {`
`296`	`297`	`while (pool.length) {`
`297`	`298`	`const resource = pool.pop()`
`298`	`299`	`if (this._removeIdleObserver) {`
`299`	`300`	`this._removeIdleObserver(resource)`
`300`	`301`	`}`
`301`		`- await this._destroy(resource)`
	`302`	`+ destructionList.push(this._destroy(resource))`
`302`	`303`	`}`
`303`	`304`	`pool.close()`
`304`	`305`	`delete this._pools[key]`
	`306`	`+ await Promise.all(destructionList)`
`305`	`307`	`}`
`306`	`308`	`}`
`307`	`309`
Original file line number	Diff line number	Diff line change
`@@ -354,7 +354,7 @@ describe('#integration temporal-types', () => {`
`354`	`354`	`await testSendAndReceiveRandomTemporalValues(() => randomLocalDateTime())`
`355`	`355`	`}, 60000)`
`356`	`356`
`357`		`- it('should send and receive random LocalDateTime', async () => {`
	`357`	`+ it('should send and receive array of random LocalDateTime', async () => {`
`358`	`358`	`if (neo4jDoesNotSupportTemporalTypes()) {`
`359`	`359`	`return`
`360`	`360`	`}`