Skip to content

Commit 7c6ae47

Browse files
dnadobadnadoba
committed
run swift format
1 parent c406b0b commit 7c6ae47

8 files changed

+49
-53
lines changed

‎Sources/AsyncHTTPClient/AsyncAwait/AsyncRequest+Validation.swift

+7-9
Original file line numberDiff line numberDiff line change
@@ -25,41 +25,39 @@ struct PreparedRequest {
2525

2626
@available(macOS 12.0, iOS 15.0, watchOS 8.0, tvOS 15.0, *)
2727
extension HTTPClientRequest {
28-
2928
func prepareForExecution() throws -> PreparedRequest {
30-
3129
guard let url = URL(string: self.url) else {
3230
throw HTTPClientError.invalidURL
3331
}
34-
32+
3533
guard let urlScheme = url.scheme?.lowercased() else {
3634
throw HTTPClientError.emptyScheme
3735
}
38-
36+
3937
let kind = try HTTPClient.Request.Kind(forScheme: urlScheme)
4038
let useTLS: Bool = urlScheme == "https" || urlScheme == "https+unix"
41-
39+
4240
let poolKey = try ConnectionPool.Key(
4341
scheme: .init(string: urlScheme),
4442
host: kind.hostFromURL(url),
4543
port: url.port ?? (useTLS ? 443 : 80),
4644
unixPath: kind.socketPathFromURL(url),
4745
tlsConfiguration: nil
4846
)
49-
47+
5048
var head = HTTPRequestHead(version: .http1_1, method: self.method, uri: url.uri, headers: self.headers)
51-
49+
5250
let bodyLength = RequestBodyLength(self.body)
5351
let metadata = try head.headers.validateAndSetTransportFraming(method: self.method, bodyLength: bodyLength)
54-
52+
5553
// if no host header was set, let's pick
5654
if !head.headers.contains(name: "host") {
5755
guard let urlHost = url.host else {
5856
throw HTTPClientError.emptyHost
5957
}
6058
head.headers.add(name: "host", value: urlHost)
6159
}
62-
60+
6361
return .init(poolKey: poolKey, requestFramingMetadata: metadata, head: head, body: body)
6462
}
6563
}

‎Sources/AsyncHTTPClient/AsyncAwait/AsyncRequestBag+StateMachine.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ extension AsyncRequestBag {
166166
}
167167

168168
// MARK: - Request -
169-
169+
170170
enum StartExecutionAction {
171171
case cancel(HTTPRequestExecutor)
172172
case none

‎Sources/AsyncHTTPClient/AsyncAwait/AsyncRequestBag.swift

+18-20
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,13 @@
1313
//===----------------------------------------------------------------------===//
1414

1515
import Logging
16-
import NIOCore
1716
import NIOConcurrencyHelpers
18-
import NIOSSL
17+
import NIOCore
1918
import NIOHTTP1
19+
import NIOSSL
2020

2121
@available(macOS 12.0, iOS 15.0, watchOS 8.0, tvOS 15.0, *)
2222
class AsyncRequestBag {
23-
24-
2523
let logger: Logger
2624
// TODO: We should drop the request after sending to free up resource ASAP
2725
let requestHead: HTTPRequestHead
@@ -80,7 +78,7 @@ class AsyncRequestBag {
8078
let action = self.stateLock.withLock {
8179
self.state.fail(error)
8280
}
83-
81+
8482
switch action {
8583
case .none:
8684
break
@@ -89,7 +87,7 @@ class AsyncRequestBag {
8987
continuation.resume(throwing: error)
9088
scheduler?.cancelRequest(self) // NOTE: scheduler and executor are exclusive here
9189
executor?.cancelRequest(self)
92-
90+
9391
case .failResponseStream(let continuation, let error, let executor):
9492
continuation.resume(throwing: error)
9593
executor.cancelRequest(self)
@@ -102,20 +100,20 @@ class AsyncRequestBag {
102100
let action = self.stateLock.withLock {
103101
self.state.willExecuteRequest(executor)
104102
}
105-
103+
106104
switch action {
107105
case .cancel(let executor):
108106
executor.cancelRequest(self)
109107
case .none:
110108
break
111109
}
112110
}
113-
111+
114112
func resumeRequestBodyStream() {
115113
let action = self.stateLock.withLock {
116114
self.state.resumeRequestBodyStream()
117115
}
118-
116+
119117
switch action {
120118
case .none:
121119
break
@@ -137,7 +135,7 @@ class AsyncRequestBag {
137135
}
138136
}
139137
}
140-
138+
141139
private func writeOnceAndOneTimeOnly(byteBuffer: ByteBuffer) {
142140
#warning("TODO: @fabianfett")
143141
let writeAction = self.stateLock.withLock {
@@ -151,23 +149,23 @@ class AsyncRequestBag {
151149
let finishAction = self.stateLock.withLock {
152150
self.state.finishRequestBodyStream()
153151
}
154-
152+
155153
guard case .forwardStreamFinished(let executor) = finishAction else {
156154
preconditionFailure("")
157155
}
158156
executor.finishRequestBodyStream(self)
159157
}
160-
158+
161159
enum AfterNextBodyPartAction {
162160
case `continue`
163161
case pause
164162
}
165-
163+
166164
private func requestBodyStreamNextPart(_ part: IOData) -> AfterNextBodyPartAction {
167165
let writeAction = self.stateLock.withLock {
168166
self.state.producedNextRequestPart(part)
169167
}
170-
168+
171169
switch writeAction {
172170
case .write(let part, let executor, let continueAfter):
173171
executor.writeRequestBodyPart(part, request: self)
@@ -176,14 +174,14 @@ class AsyncRequestBag {
176174
} else {
177175
return .pause
178176
}
179-
177+
180178
case .ignore:
181179
// we only ignore reads, if the request has failed anyway. we should leave
182180
// the reader loop
183181
return .pause
184182
}
185183
}
186-
184+
187185
private func requestBodyStreamFinished() {
188186
let finishAction = self.stateLock.withLock {
189187
self.state.finishRequestBodyStream()
@@ -197,12 +195,12 @@ class AsyncRequestBag {
197195
}
198196
return
199197
}
200-
198+
201199
private func requestBodyStreamFailed(_ error: Error) {
202200
let failAction = self.stateLock.withLock {
203201
self.state.failedToProduceNextRequestPart(error)
204202
}
205-
203+
206204
switch failAction {
207205
case .none:
208206
break
@@ -275,7 +273,7 @@ class AsyncRequestBag {
275273
guard let part = try await next(allocator) else { // <---- dispatch point!
276274
return self.requestBodyStreamFinished()
277275
}
278-
276+
279277
switch self.requestBodyStreamNextPart(part) {
280278
case .pause:
281279
return
@@ -298,7 +296,7 @@ extension AsyncRequestBag: HTTPSchedulableRequest {
298296
var tlsConfiguration: TLSConfiguration? {
299297
return nil
300298
}
301-
299+
302300
var requiredEventLoop: EventLoop? {
303301
return nil
304302
}

‎Sources/AsyncHTTPClient/AsyncAwait/HTTPClientRequest.swift

+12-12
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ struct HTTPClientRequest {
4848
return allocator.buffer(bytes: sequence)
4949
})
5050
}
51+
5152
static func bytes<C: RandomAccessCollection>(_ collection: C) -> Body where C.Element == UInt8 {
5253
self.init(.sequence(length: collection.count) { allocator in
5354
if let buffer = collection.withContiguousStorageIfAvailable({ allocator.buffer(bytes: $0) }) {
@@ -192,17 +193,16 @@ extension HTTPClientResponse.Body: AsyncSequence {
192193
extension HTTPClient {
193194
func execute(_ request: HTTPClientRequest, deadline: NIODeadline, logger: Logger) async throws -> HTTPClientResponse {
194195
actor SwiftCancellationHandlingSucksAsFuck {
195-
196196
enum State {
197197
case initialized
198198
case register(AsyncRequestBag)
199199
case cancelled
200200
}
201-
201+
202202
private var state: State = .initialized
203-
203+
204204
init() {}
205-
205+
206206
func registerRequestBag(_ bag: AsyncRequestBag) {
207207
switch self.state {
208208
case .initialized:
@@ -213,7 +213,7 @@ extension HTTPClient {
213213
preconditionFailure()
214214
}
215215
}
216-
216+
217217
func cancel() {
218218
switch self.state {
219219
case .register(let bag):
@@ -227,13 +227,13 @@ extension HTTPClient {
227227
}
228228
}
229229
let preparedRequest = try request.prepareForExecution()
230-
230+
231231
let cancelHandler = SwiftCancellationHandlingSucksAsFuck()
232-
233-
//let onCancel: @Sendable () -> () =
234-
232+
233+
// let onCancel: @Sendable () -> () =
234+
235235
return try await withTaskCancellationHandler(operation: { () async throws -> HTTPClientResponse in
236-
try await withUnsafeThrowingContinuation{
236+
try await withUnsafeThrowingContinuation {
237237
(continuation: UnsafeContinuation<HTTPClientResponse, Swift.Error>) -> Void in
238238
let bag = AsyncRequestBag(
239239
request: preparedRequest,
@@ -243,11 +243,11 @@ extension HTTPClient {
243243
preferredEventLoop: self.eventLoopGroup.next(),
244244
responseContinuation: continuation
245245
)
246-
246+
247247
_Concurrency.Task {
248248
await cancelHandler.registerRequestBag(bag)
249249
}
250-
250+
251251
self.poolManager.executeRequest(bag)
252252
}
253253
}, onCancel: {

‎Sources/AsyncHTTPClient/ConnectionPool.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ enum ConnectionPool {
2828
self.tlsConfiguration = BestEffortHashableTLSConfiguration(wrapping: tls)
2929
}
3030
}
31-
31+
3232
init(
3333
scheme: Scheme,
3434
host: String,
@@ -55,7 +55,7 @@ enum ConnectionPool {
5555
case unix
5656
case http_unix
5757
case https_unix
58-
58+
5959
init(string: String) {
6060
switch string {
6161
case "http":

‎Sources/AsyncHTTPClient/RequestValidation.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ extension HTTPHeaders {
4545
}
4646

4747
private func validateFieldNames() throws {
48-
let invalidFieldNames = self.compactMap { (name, _) -> String? in
49-
let satisfy = name.utf8.allSatisfy { (char) -> Bool in
48+
let invalidFieldNames = self.compactMap { name, _ -> String? in
49+
let satisfy = name.utf8.allSatisfy { char -> Bool in
5050
switch char {
5151
case UInt8(ascii: "a")...UInt8(ascii: "z"),
5252
UInt8(ascii: "A")...UInt8(ascii: "Z"),

‎Tests/AsyncHTTPClientTests/AsyncRequestTests.swift

+6-6
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ final class AsyncRequestTests: XCTestCase {
5555

5656
var request = HTTPClientRequest(url: "https://localhost/")
5757
request.method = .GET
58-
58+
5959
var maybePreparedRequest: PreparedRequest?
6060
XCTAssertNoThrow(maybePreparedRequest = try request.prepareForExecution())
6161
guard let preparedRequest = maybePreparedRequest else {
@@ -83,8 +83,8 @@ final class AsyncRequestTests: XCTestCase {
8383
XCTAssertEqual(response.status, responseHead.status)
8484
XCTAssertEqual(response.headers, responseHead.headers)
8585
XCTAssertEqual(response.version, responseHead.version)
86-
87-
let iterator = SharedIterator(response.body.filter({ $0.readableBytes > 0 }).makeAsyncIterator())
86+
87+
let iterator = SharedIterator(response.body.filter { $0.readableBytes > 0 }.makeAsyncIterator())
8888

8989
for i in 0..<100 {
9090
XCTAssertFalse(executor.signalledDemandForResponseBody, "Demand was not signalled yet.")
@@ -304,7 +304,7 @@ final class AsyncRequestTests: XCTestCase {
304304
XCTAssertEqual(response.version, .http2)
305305
XCTAssertEqual(delegate.hitStreamClosed, 0)
306306

307-
let iterator = SharedIterator(response.body.filter{ $0.readableBytes > 0 }.makeAsyncIterator())
307+
let iterator = SharedIterator(response.body.filter { $0.readableBytes > 0 }.makeAsyncIterator())
308308

309309
// at this point we can start to write to the stream and wait for the results
310310

@@ -344,7 +344,7 @@ actor SharedIterator<Iterator: AsyncIteratorProtocol> {
344344
}
345345

346346
func next() async throws -> Iterator.Element? {
347-
var iter = iterator
347+
var iter = self.iterator
348348
defer { self.iterator = iter }
349349
return try await iter.next()
350350
}
@@ -509,7 +509,7 @@ extension AsyncRequestBag {
509509
}
510510
// the promise can never fail and it is therefore safe to force unwrap
511511
let requestBag = try! requestBagPromise.futureResult.wait()
512-
512+
513513
return (requestBag, result)
514514
}
515515
}

‎Tests/AsyncHTTPClientTests/RequestBagTests.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414

1515
@testable import AsyncHTTPClient
1616
import Logging
17-
import NIOCore
1817
import NIOConcurrencyHelpers
18+
import NIOCore
1919
import NIOEmbedded
2020
import NIOHTTP1
2121
import XCTest

0 commit comments

Comments
 (0)