fix: PoolBase kClose and kDestroy should await and not return the Promise (#3716) (#3723)

github-actions[bot] · Uzlopak · web-flow · commit fd32a55ccefa · 2024-10-12T12:15:29.000+02:00
(cherry picked from commit cda5f94) Co-authored-by: Aras Abbasi <aras.abbasi@googlemail.com>
diff --git a/lib/dispatcher/pool-base.js b/lib/dispatcher/pool-base.js
@@ -113,9 +113,9 @@ class PoolBase extends DispatcherBase {
 
   async [kClose] () {
     if (this[kQueue].isEmpty()) {
-      return Promise.all(this[kClients].map(c => c.close()))
+      await Promise.all(this[kClients].map(c => c.close()))
     } else {
-      return new Promise((resolve) => {
+      await new Promise((resolve) => {
         this[kClosedResolve] = resolve
       })
     }
@@ -130,7 +130,7 @@ class PoolBase extends DispatcherBase {
       item.handler.onError(err)
     }
 
-    return Promise.all(this[kClients].map(c => c.destroy(err)))
+    await Promise.all(this[kClients].map(c => c.destroy(err)))
   }
 
   [kDispatch] (opts, handler) {

Original file line number	Diff line number	Diff line change
`@@ -113,9 +113,9 @@ class PoolBase extends DispatcherBase {`
`113`	`113`
`114`	`114`	`async [kClose] () {`
`115`	`115`	`if (this[kQueue].isEmpty()) {`
`116`		`- return Promise.all(this[kClients].map(c => c.close()))`
	`116`	`+ await Promise.all(this[kClients].map(c => c.close()))`
`117`	`117`	`} else {`
`118`		`- return new Promise((resolve) => {`
	`118`	`+ await new Promise((resolve) => {`
`119`	`119`	`this[kClosedResolve] = resolve`
`120`	`120`	`})`
`121`	`121`	`}`
`@@ -130,7 +130,7 @@ class PoolBase extends DispatcherBase {`
`130`	`130`	`item.handler.onError(err)`
`131`	`131`	`}`
`132`	`132`
`133`		`- return Promise.all(this[kClients].map(c => c.destroy(err)))`
	`133`	`+ await Promise.all(this[kClients].map(c => c.destroy(err)))`
`134`	`134`	`}`
`135`	`135`
`136`	`136`	`[kDispatch] (opts, handler) {`