Fixes for close callback sync

Author: PopFlamingo

Sources/AsyncHTTPClient/ConnectionPool.swift

@@ -177,12 +177,9 @@ final class ConnectionPool {
             self.parentPool.release(self)
         }
 
-        fileprivate func close(runCloseCallback: Bool = true) -> EventLoopFuture<Void> {
-            return self.channel.eventLoop.flatSubmit {
-                self.shouldRunCloseCallback = runCloseCallback
-                self.channel.close(promise: nil)
-                return self.closeFuture
-            }
+        func close() -> EventLoopFuture<Void> {
+            self.channel.close(promise: nil)
+            return self.closeFuture
         }
 
         var description: String {
@@ -213,7 +210,11 @@ final class ConnectionPool {
         /// Indicates that this connection is about to close
         var isClosing: Bool = false
 
-        fileprivate var shouldRunCloseCallback: Bool = true
+        /// Indicates wether the usual close callback should be run or not, this allows customizing what happens
+        /// on close in some cases such as for the `.replaceConnection` action
+        ///
+        /// - Warning: This should be accessed under the `stateLock` of `HTTP1ConnectionProvider`
+        fileprivate var mustRunDefaultCloseCallback: Bool = true
 
         /// Convenience property indicating wether the underlying `Channel` is active or not
         var isActiveEstimation: Bool {
@@ -314,7 +315,7 @@ final class ConnectionPool {
                 self.makeConnection(on: eventLoop).cascade(to: promise)
 
             case .replaceConnection(let eventLoop, let promise):
-                connection.close(runCloseCallback: false).flatMap {
+                connection.close().flatMap {
                     self.makeConnection(on: eventLoop)
                 }.whenComplete { result in
                     switch result {
@@ -382,7 +383,7 @@ final class ConnectionPool {
             connection.channel.closeFuture.whenComplete { result in
                 let action: HTTP1ConnectionProvider.State.ClosedConnectionRemoveAction? = self.parentPool.connectionProvidersLock.withLock {
                     self.stateLock.withLock {
-                        guard connection.shouldRunCloseCallback else {
+                        guard connection.mustRunDefaultCloseCallback else {
                             return nil
                         }
                         switch result {
@@ -420,7 +421,7 @@ final class ConnectionPool {
                 let waitersPromises = waitersCopy.map { $0.promise }
                 let waitersFutures = waitersPromises.map { $0.futureResult }
                 waitersPromises.forEach { $0.fail(HTTPClientError.cancelled) }
-                let closeFutures = self.state.availableConnections.map { $0.channel.close() }
+                let closeFutures = self.state.availableConnections.map { $0.close() }
                 return (waitersFutures, closeFutures)
             }
             try? EventLoopFuture<Connection>.andAllComplete(waitersFutures, on: self.eventLoop).wait()
@@ -524,6 +525,7 @@ final class ConnectionPool {
                         return .succeed(firstWaiter.promise)
                     } else {
                         if requiresSpecifiedEL {
+                            connection.mustRunDefaultCloseCallback = false
                             return .replaceConnection(channelEL, firstWaiter.promise)
                         } else {
                             return .makeConnectionAndComplete(channelEL, firstWaiter.promise)

Sources/AsyncHTTPClient/HTTPHandler.swift

@@ -557,7 +557,7 @@ extension HTTPClient {
 
         func fail<Delegate: HTTPClientResponseDelegate>(with error: Error, delegateType: Delegate.Type) {
             if let connection = self.connection {
-                connection.channel.close().whenComplete { _ in
+                connection.close().whenComplete { _ in
                     self.releaseAssociatedConnection(delegateType: delegateType).whenComplete { _ in
                         self.promise.fail(error)
                     }