Update for HB 2.0.0-alpha.2 (#14)

* Update for HB 2.0.0-alpha.2

* Ensure request/response length is set

Author: adam-fowler

Package.swift

@@ -13,7 +13,7 @@ let package = Package(
     ],
     dependencies: [
         .package(url: "https://github.com/apple/swift-openapi-runtime.git", from: "1.0.0"),
-        .package(url: "https://github.com/hummingbird-project/hummingbird.git", from: "2.0.0-alpha.1"),
+        .package(url: "https://github.com/hummingbird-project/hummingbird.git", from: "2.0.0-alpha.2"),
     ],
     targets: [
         .target(

Sources/OpenAPIHummingbird/OpenAPITransport.swift

@@ -49,17 +49,17 @@ extension HBRequest {
     /// Construct ``OpenAPIRuntime.Request`` from Hummingbird ``HBRequest``
     func makeOpenAPIRequest<Context: HBBaseRequestContext>(context: Context) throws -> (HTTPRequest, HTTPBody?) {
         let request = self.head
-        let body: HTTPBody?
-        switch self.body {
-        case .byteBuffer(let buffer):
-            body = HTTPBody([UInt8](buffer: buffer))
-        case .stream(let streamer):
-            body = .init(
-                streamer.map { [UInt8](buffer: $0) },
-                length: .unknown,
-                iterationBehavior: .single
-            )
+        // extract length from content-length header
+        let length = if let contentLengthHeader = self.headers[.contentLength], let contentLength = Int(contentLengthHeader) {
+            HTTPBody.Length.known(numericCast(contentLength))
+        } else {
+            HTTPBody.Length.unknown
         }
+        let body = HTTPBody(
+            self.body.map { [UInt8](buffer: $0) },
+            length: length,
+            iterationBehavior: .single
+        )
         return (request, body)
     }
 }
@@ -80,7 +80,15 @@ extension HBResponse {
         let responseBody: HBResponseBody
         if let body = body {
             let bufferSequence = body.map { ByteBuffer(bytes: $0)}
-            responseBody = .init(asyncSequence: bufferSequence)
+            if case .known(let length) = body.length {
+                responseBody = .init(contentLength: numericCast(length)) { writer in
+                    for try await buffer in bufferSequence {
+                        try await writer.write(buffer)
+                    }
+                }
+            } else {
+                responseBody = .init(asyncSequence: bufferSequence)
+            }
         } else {
             responseBody = .init(byteBuffer: ByteBuffer())
         }

Tests/OpenAPIHummingbirdTests/OpenAPITransportTests.swift

@@ -79,6 +79,7 @@ final class HBOpenAPITransportTests: XCTestCase {
                 // Check the HBResponse (created from the Response) is what meets expectations.
                 XCTAssertEqual(hbResponse.status, .created)
                 XCTAssertEqual(hbResponse.headers[.xMumble], "mumble")
+                XCTAssertEqual(hbResponse.headers[.contentLength], "👋".utf8.count.description)
                 XCTAssertEqual(try String(buffer: XCTUnwrap(hbResponse.body)), "👋")
             }
         }