Close on outbound finish (#708)

* Use closeOnOutboundFinish to ensure everything is written

* Add testWriteLargeBodyAndClose

* Require swift-nio 2.83.0 with outbound write fix

Author: adam-fowler

Package.swift

@@ -25,7 +25,7 @@ let package = Package(
         .package(url: "https://github.com/apple/swift-http-types.git", from: "1.0.0"),
         .package(url: "https://github.com/apple/swift-metrics.git", from: "2.5.0"),
         .package(url: "https://github.com/apple/swift-distributed-tracing.git", from: "1.1.0"),
-        .package(url: "https://github.com/apple/swift-nio.git", from: "2.80.0"),
+        .package(url: "https://github.com/apple/swift-nio.git", from: "2.83.0"),
         .package(url: "https://github.com/apple/swift-nio-extras.git", from: "1.20.0"),
         .package(url: "https://github.com/apple/swift-nio-http2.git", from: "1.34.1"),
         .package(url: "https://github.com/apple/swift-nio-ssl.git", from: "2.14.0"),

Sources/HummingbirdCore/Server/HTTP/HTTP1Channel.swift

@@ -91,7 +91,7 @@ public struct HTTP1Channel: ServerChildChannel, HTTPChannelHandler {
             try channel.pipeline.syncOperations.addHandler(HTTPUserEventHandler(logger: logger))
             return try NIOAsyncChannel(
                 wrappingChannelSynchronously: channel,
-                configuration: .init()
+                configuration: .init(isOutboundHalfClosureEnabled: true)
             )
         }
     }

Sources/HummingbirdCore/Server/HTTP/HTTPChannelHandler.swift

@@ -57,7 +57,7 @@ extension HTTPChannelHandler {
                             let responseWriter = ResponseWriter(outbound: outbound)
                             try await self.responder(request, responseWriter, asyncChannel.channel)
                             if request.headers[.connection] == "close" {
-                                return
+                                break
                             }
 
                             // Flush current request
@@ -88,6 +88,9 @@ extension HTTPChannelHandler {
                         try await outbound.write(.head(.init(status: .badRequest, headerFields: [.connection: "close", .contentLength: "0"])))
                         try await outbound.write(.end(nil))
                     }
+                    // close outbound and wait for channel to close
+                    outbound.finish()
+                    try await asyncChannel.channel.closeFuture.get()
                 }
             } onCancel: {
                 asyncChannel.channel.close(mode: .input, promise: nil)

Tests/HummingbirdCoreTests/CoreTests.swift

@@ -204,6 +204,25 @@ final class HummingbirdCoreTests: XCTestCase {
         )
     }
 
+    func testWriteLargeBodyAndClose() async throws {
+        try await testServer(
+            responder: { (_, responseWriter: consuming ResponseWriter, _) in
+                let buffer = Self.randomBuffer(size: 1_140_000)
+                var bodyWriter = try await responseWriter.writeHead(.init(status: .ok))
+                try await bodyWriter.write(buffer)
+                try await bodyWriter.finish(nil)
+            },
+            configuration: .init(address: .hostname(port: 0)),
+            eventLoopGroup: Self.eventLoopGroup,
+            logger: Logger(label: "Hummingbird"),
+            test: { client in
+                let response = try await client.get("/", headers: [.connection: "close"])
+                let body = try XCTUnwrap(response.body)
+                XCTAssertEqual(body.readableBytes, 1_140_000)
+            }
+        )
+    }
+
     func testStreamBody() async throws {
         try await testServer(
             responder: { (request, responseWriter: consuming ResponseWriter, _) in