updated extensions

Author: makoni

Sources/AsyncHTTPClient/AsyncAwait/HTTPClientResponse+data.swift

@@ -0,0 +1,41 @@
+//===----------------------------------------------------------------------===//
+//
+// This source file is part of the AsyncHTTPClient open source project
+//
+// Copyright (c) 2021 Apple Inc. and the AsyncHTTPClient project authors
+// Licensed under Apache License v2.0
+//
+// See LICENSE.txt for license information
+// See CONTRIBUTORS.txt for the list of AsyncHTTPClient project authors
+//
+// SPDX-License-Identifier: Apache-2.0
+//
+//===----------------------------------------------------------------------===//
+
+import NIOCore
+import NIOHTTP1
+import Foundation
+internal import NIOFoundationCompat
+
+@available(macOS 10.15, iOS 13.0, watchOS 6.0, tvOS 13.0, *)
+extension HTTPClientResponse {
+    /// Response body as `ByteBuffer`.
+    /// - Parameter maxBytes: The maximum number of bytes this method is allowed to accumulate.
+    /// - Returns: Bytes collected over time
+    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: min(expectedBytes, maxBytes))
+    }
+}
+
+
+@available(macOS 10.15, iOS 13.0, watchOS 6.0, tvOS 13.0, *)
+extension HTTPClientResponse {
+    /// Response body as `Data`.
+    /// - 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)
+    }
+}

Sources/AsyncHTTPClient/AsyncAwait/HTTPClientResponse.swift

@@ -187,17 +187,6 @@ extension HTTPClientResponse {
     }
 }
 
-@available(macOS 10.15, iOS 13.0, watchOS 6.0, tvOS 13.0, *)
-extension HTTPClientResponse {
-    /// Response body as `ByteBuffer`.
-    /// - Parameter maxBytes: The maximum number of bytes this method is allowed to accumulate. 
-    /// - Returns: Bytes collected over time
-    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)
-    }
-}
-
 @available(macOS 10.15, iOS 13.0, watchOS 6.0, tvOS 13.0, *)
 @usableFromInline
 typealias TransactionBody = NIOThrowingAsyncSequenceProducer<

Sources/AsyncHTTPClient/FoundationExtensions.swift

@@ -73,14 +73,3 @@ extension HTTPClient.Body {
         self.bytes(data)
     }
 }
-
-@available(macOS 10.15, iOS 13.0, watchOS 6.0, tvOS 13.0, *)
-extension HTTPClientResponse {
-    /// Response body as `Data`.
-    /// - 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

@@ -1036,7 +1036,7 @@ final class AsyncAwaitEndToEndTests: XCTestCase {
             ) else { return }
             XCTAssertEqual(response.headers["content-length"], ["4"])
             guard let body = await XCTAssertNoThrowWithResult(
-                try await response.bytes(upTo: 3)
+                try await response.bytes(upTo: 5)
             ) else { return }
             XCTAssertEqual(body, ByteBuffer(string: "1234"))