Made upTo a required parameter for bytes and data extensions

Author: makoni

Sources/AsyncHTTPClient/AsyncAwait/HTTPClientResponse.swift

@@ -142,19 +142,10 @@ extension HTTPClientResponse {
 extension HTTPClientResponse {
     /// Response body as `ByteBuffer`.
     /// - Parameter maxBytes: The maximum number of bytes this method is allowed to accumulate. 
-    /// Will accumulate all available bytes if nil passed.
     /// - Returns: Bytes collected over time
-    public func bytes(upTo maxBytes: Int? = nil) async throws -> ByteBuffer {
-        if let expectedBytes = maxBytes ?? self.headers.first(name: "content-length").flatMap(Int.init) {
-            return try await self.body.collect(upTo: expectedBytes)
-        }
-
-        var data = [UInt8]()
-        for try await var buffer in self.body {
-            data = data + (buffer.readBytes(length: buffer.readableBytes) ?? [])
-        }
-
-        return ByteBuffer(bytes: data)
+    public func bytes(upTo maxBytes: Int) async throws -> ByteBuffer {
+        let expectedBytes = self.headers.first(name: "content-length").flatMap(Int.init) ?? maxBytes
+        return try await self.body.collect(upTo: expectedBytes)
     }
 }
 

Sources/AsyncHTTPClient/FoundationExtensions.swift

@@ -68,10 +68,10 @@ extension HTTPClient.Body {
 @available(macOS 10.15, iOS 13.0, watchOS 6.0, tvOS 13.0, *)
 extension HTTPClientResponse {
     /// Response body as `Data`.
-    public var data: Data? {
-        get async throws {
-            var bytes = try await self.bytes()
-            return bytes.readData(length: bytes.readableBytes)
-        }
+    /// - Parameter maxBytes: The maximum number of bytes this method is allowed to accumulate.
+    /// - Returns: Bytes collected over time
+    public func data(upTo maxBytes: Int) async throws -> Data? {
+        var bytes = try await self.bytes(upTo: maxBytes)
+        return bytes.readData(length: bytes.readableBytes)
     }
 }

Tests/AsyncHTTPClientTests/AsyncAwaitEndToEndTests.swift

@@ -852,7 +852,7 @@ final class AsyncAwaitEndToEndTests: XCTestCase {
             ) else { return }
             XCTAssertEqual(response.headers["content-length"], ["4"])
             guard let body = await XCTAssertNoThrowWithResult(
-                try await response.bytes(upTo: 4)
+                try await response.bytes(upTo: 3)
             ) else { return }
             XCTAssertEqual(body, ByteBuffer(string: "1234"))
 
@@ -861,7 +861,7 @@ final class AsyncAwaitEndToEndTests: XCTestCase {
             ) else { return }
             responseNoContentLength.headers.remove(name: "content-length")
             guard let body2 = await XCTAssertNoThrowWithResult(
-                try await responseNoContentLength.bytes()
+                try await responseNoContentLength.bytes(upTo: 4)
             ) else { return }
             XCTAssertEqual(body2, ByteBuffer(string: "1234"))
         }
@@ -883,7 +883,7 @@ final class AsyncAwaitEndToEndTests: XCTestCase {
             ) else { return }
             XCTAssertEqual(response.headers["content-length"], ["4"])
             guard let bodyData = await XCTAssertNoThrowWithResult(
-                try await response.data
+                try await response.data(upTo: 4)
             ) else { return }
             XCTAssertEqual(bodyData, "1234".data(using: .utf8))
         }