Skip to content

Prep for 1.0 alpha, adapted to runtime changes in main #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 27, 2023
Merged

Prep for 1.0 alpha, adapted to runtime changes in main #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ let package = Package(
dependencies: [
.package(url: "https://github.com/apple/swift-nio", from: "2.58.0"),
.package(url: "https://github.com/swift-server/async-http-client.git", from: "1.19.0"),
.package(url: "https://github.com/apple/swift-openapi-runtime", .upToNextMinor(from: "0.3.0")),
.package(url: "https://github.com/apple/swift-openapi-runtime", branch: "main"),
.package(url: "https://github.com/apple/swift-docc-plugin", from: "1.0.0"),
],
targets: [
Expand Down
4 changes: 2 additions & 2 deletions Sources/OpenAPIAsyncHTTPClient/AsyncHTTPClientTransport.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ public struct AsyncHTTPClientTransport: ClientTransport {
let length: HTTPClientRequest.Body.Length
switch body.length {
case .unknown: length = .unknown
case .known(let count): length = .known(count)
case .known(let count): length = .known(Int(count))
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Converting from Int64 to Int can trap. We should throw an error instead.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We're matching the AHC response header parsing behavior: https://github.com/swift-server/async-http-client/blob/c70e0856797ef826ff13627790241011f831975f/Sources/AsyncHTTPClient/AsyncAwait/HTTPClientResponse.swift#L135

If AHC changes to throwing errors, we should update the transport too.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes but no 😄 The code you linked is about parsing the content-length header and a couple lines below you are doing it like AHC. However, we are not looking at the conten-length parsing code right now. This is converting the user defined known size of the request body from an Int64 to an Int which AHC doesn't do at all right now.

}
clientRequest.body = .stream(body.map { .init(bytes: $0) }, length: length)
}
Expand All @@ -197,7 +197,7 @@ public struct AsyncHTTPClientTransport: ClientTransport {
for header in httpResponse.headers { headerFields[.init(header.name)!] = header.value }

let length: HTTPBody.Length
if let lengthHeaderString = headerFields[.contentLength], let lengthHeader = Int(lengthHeaderString) {
if let lengthHeaderString = headerFields[.contentLength], let lengthHeader = Int64(lengthHeaderString) {
length = .known(lengthHeader)
} else {
length = .unknown
Expand Down