Merge branch 'main' into mptcp-support

Author: Lukasa

Package.swift

@@ -21,7 +21,7 @@ let package = Package(
         .library(name: "AsyncHTTPClient", targets: ["AsyncHTTPClient"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/apple/swift-nio.git", from: "2.62.0"),
+        .package(url: "https://github.com/apple/swift-nio.git", from: "2.71.0"),
         .package(url: "https://github.com/apple/swift-nio-ssl.git", from: "2.27.1"),
         .package(url: "https://github.com/apple/swift-nio-http2.git", from: "1.19.0"),
         .package(url: "https://github.com/apple/swift-nio-extras.git", from: "1.13.0"),

Sources/AsyncHTTPClient/AsyncAwait/HTTPClientResponse.swift

@@ -108,7 +108,7 @@ extension HTTPClientResponse {
             case .transaction(_, let expectedContentLength):
                 if let contentLength = expectedContentLength {
                     if contentLength > maxBytes {
-                        throw NIOTooManyBytesError()
+                        throw NIOTooManyBytesError(maxBytes: maxBytes)
                     }
                 }
             case .anyAsyncSequence:

Sources/AsyncHTTPClient/ConnectionPool/HTTP1/HTTP1ClientChannelHandler.swift

@@ -665,7 +665,8 @@ struct IdleWriteStateMachine {
             self.state = .requestEndSent
             return .clearIdleWriteTimeoutTimer
         case .waitingForWritabilityEnabled:
-            preconditionFailure("If the channel is not writable, we can't have sent the request end.")
+            self.state = .requestEndSent
+            return .none
         case .requestEndSent:
             return .none
         }

Sources/AsyncHTTPClient/HTTPClient+HTTPCookie.swift

@@ -13,7 +13,11 @@
 //===----------------------------------------------------------------------===//
 
 import NIOHTTP1
-#if canImport(Darwin)
+#if canImport(xlocale)
+import xlocale
+#elseif canImport(locale_h)
+import locale_h
+#elseif canImport(Darwin)
 import Darwin
 #elseif canImport(Musl)
 import Musl

Tests/AsyncHTTPClientTests/AsyncAwaitEndToEndTests.swift

@@ -907,7 +907,7 @@ final class AsyncAwaitEndToEndTests: XCTestCase {
             await XCTAssertThrowsError(
                 try await response.body.collect(upTo: 3)
             ) {
-                XCTAssertEqualTypeAndValue($0, NIOTooManyBytesError())
+                XCTAssertEqualTypeAndValue($0, NIOTooManyBytesError(maxBytes: 3))
             }
         }
     }

Tests/AsyncHTTPClientTests/HTTP1ClientChannelHandlerTests.swift

@@ -376,6 +376,56 @@ class HTTP1ClientChannelHandlerTests: XCTestCase {
         }
     }
 
+    func testIdleWriteTimeoutRaceToEnd() {
+        let embedded = EmbeddedChannel()
+        var maybeTestUtils: HTTP1TestTools?
+        XCTAssertNoThrow(maybeTestUtils = try embedded.setupHTTP1Connection())
+        guard let testUtils = maybeTestUtils else { return XCTFail("Expected connection setup works") }
+
+        var maybeRequest: HTTPClient.Request?
+        XCTAssertNoThrow(maybeRequest = try HTTPClient.Request(url: "http://localhost/", method: .POST, body: .stream { _ in
+            // Advance time by more than the idle write timeout (that's 1 millisecond) to trigger the timeout.
+            let scheduled = embedded.embeddedEventLoop.flatScheduleTask(in: .milliseconds(2)) {
+                embedded.embeddedEventLoop.makeSucceededVoidFuture()
+            }
+            return scheduled.futureResult
+        }))
+
+        guard let request = maybeRequest else { return XCTFail("Expected to be able to create a request") }
+
+        let delegate = ResponseAccumulator(request: request)
+        var maybeRequestBag: RequestBag<ResponseAccumulator>?
+        XCTAssertNoThrow(maybeRequestBag = try RequestBag(
+            request: request,
+            eventLoopPreference: .delegate(on: embedded.eventLoop),
+            task: .init(eventLoop: embedded.eventLoop, logger: testUtils.logger),
+            redirectHandler: nil,
+            connectionDeadline: .now() + .seconds(30),
+            requestOptions: .forTests(idleWriteTimeout: .milliseconds(5)),
+            delegate: delegate
+        ))
+        guard let requestBag = maybeRequestBag else { return XCTFail("Expected to be able to create a request bag") }
+
+        embedded.isWritable = true
+        embedded.pipeline.fireChannelWritabilityChanged()
+        testUtils.connection.executeRequest(requestBag)
+        let expectedHeaders: HTTPHeaders = ["host": "localhost", "Transfer-Encoding": "chunked"]
+        XCTAssertEqual(
+            try embedded.readOutbound(as: HTTPClientRequestPart.self),
+            .head(HTTPRequestHead(version: .http1_1, method: .POST, uri: "/", headers: expectedHeaders))
+        )
+
+        // change the writability to false.
+        embedded.isWritable = false
+        embedded.pipeline.fireChannelWritabilityChanged()
+        embedded.embeddedEventLoop.run()
+
+        // let the writer, write an end (while writability is false)
+        embedded.embeddedEventLoop.advanceTime(by: .milliseconds(2))
+
+        XCTAssertEqual(try embedded.readOutbound(as: HTTPClientRequestPart.self), .end(nil))
+    }
+
     func testIdleWriteTimeoutWritabilityChanged() {
         let embedded = EmbeddedChannel()
         let testWriter = TestBackpressureWriter(eventLoop: embedded.eventLoop, parts: 5)

Tests/AsyncHTTPClientTests/HTTPClientTestUtils.swift

@@ -28,7 +28,11 @@ import NIOSSL
 import NIOTLS
 import NIOTransportServices
 import XCTest
-#if canImport(Darwin)
+#if canImport(xlocale)
+import xlocale
+#elseif canImport(locale_h)
+import locale_h
+#elseif canImport(Darwin)
 import Darwin
 #elseif canImport(Musl)
 import Musl