Skip to content

Commit 801d676

Browse files
zunda-pixelzunda-pixel
committed
format
1 parent 6675151 commit 801d676

File tree

12 files changed

+103
-88
lines changed

12 files changed

+103
-88
lines changed

‎Sources/Auth/AuthClient.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1122,7 +1122,7 @@ public final class AuthClient: Sendable {
11221122

11231123
if let jwt {
11241124
request.headerFields[.authorization] = "Bearer \(jwt)"
1125-
let (data, _) = try await api.execute(for: request, from: nil)
1125+
let (data, _) = try await api.execute(for: request, from: nil)
11261126
return try configuration.decoder.decode(User.self, from: data)
11271127
} else {
11281128
let (data, _) = try await api.authorizedExecute(for: request, from: nil)

‎Sources/Auth/Internal/SessionStorage.swift‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,8 @@ extension StorageMigration {
125125
let storedSession = try? AuthClient.Configuration.jsonDecoder.decode(
126126
StoredSession.self,
127127
from: data
128-
) {
128+
)
129+
{
129130
let session = try AuthClient.Configuration.jsonEncoder.encode(storedSession.session)
130131
try storage.store(key: key, value: session)
131132
}

‎Sources/Functions/FunctionsClient.swift‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -238,10 +238,10 @@ public final class FunctionsClient: Sendable {
238238
.appendingQueryItems(options.query),
239239
headerFields: mutableState.headers.merging(options.headers) { $1 }
240240
)
241-
242-
if options.body != nil && request.headerFields[.contentType] == nil {
243-
request.headerFields[.contentType] = "application/json"
244-
}
241+
242+
if options.body != nil && request.headerFields[.contentType] == nil {
243+
request.headerFields[.contentType] = "application/json"
244+
}
245245

246246
if let region = options.region ?? region {
247247
request.headerFields[.xRegion] = region

‎Sources/Helpers/HTTP/HTTPClient.swift‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,12 @@ package actor HTTPClient: HTTPClientType {
3232
_ request: HTTPRequest,
3333
_ bodyData: Data?
3434
) async throws -> (Data, HTTPResponse) {
35-
var next: @Sendable (HTTPRequest, Data?) async throws -> (Data, HTTPResponse) = { request, bodyData in
36-
var request = request
37-
if bodyData != nil && request.headerFields[.contentType] == nil {
38-
request.headerFields[.contentType] = "application/json"
39-
}
35+
var next: @Sendable (HTTPRequest, Data?) async throws -> (Data, HTTPResponse) = {
36+
request, bodyData in
37+
var request = request
38+
if bodyData != nil && request.headerFields[.contentType] == nil {
39+
request.headerFields[.contentType] = "application/json"
40+
}
4041
return try await self.fetch(request, bodyData)
4142
}
4243

‎Sources/Helpers/HTTP/HTTPFields.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ extension HTTPFields {
1515
) rethrows {
1616
self = try self.merging(other, uniquingKeysWith: combine)
1717
}
18-
18+
1919
package func merging(
2020
_ other: Self,
2121
uniquingKeysWith combine: (String, String) throws -> String

‎Sources/Helpers/HTTP/URLSession+HTTPRequest.swift‎

Lines changed: 55 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -2,56 +2,56 @@ import Foundation
22
import HTTPTypes
33

44
#if canImport(FoundationNetworking)
5-
import FoundationNetworking
5+
import FoundationNetworking
66
#endif
77

88
#if !os(WASI)
99

10-
extension URLSessionTask {
10+
extension URLSessionTask {
1111
/// The original HTTP request this task was created with.
1212
public var originalHTTPRequest: HTTPRequest? {
13-
self.originalRequest?.httpRequest
13+
self.originalRequest?.httpRequest
1414
}
1515

1616
/// The current HTTP request -- may differ from the `originalHTTPRequest` due to HTTP redirection.
1717
public var currentHTTPRequest: HTTPRequest? {
18-
self.currentRequest?.httpRequest
18+
self.currentRequest?.httpRequest
1919
}
2020

2121
/// The HTTP response received from the server.
2222
public var httpResponse: HTTPResponse? {
23-
(self.response as? HTTPURLResponse)?.httpResponse
23+
(self.response as? HTTPURLResponse)?.httpResponse
2424
}
25-
}
25+
}
2626

27-
private enum HTTPTypeConversionError: Error {
27+
private enum HTTPTypeConversionError: Error {
2828
case failedToConvertHTTPRequestToURLRequest
2929
case failedToConvertURLResponseToHTTPResponse
30-
}
30+
}
3131

3232
#endif
3333

3434
#if canImport(FoundationNetworking) && compiler(<6)
3535

36-
@available(macOS 12.0, iOS 15.0, watchOS 8.0, tvOS 15.0, *)
37-
extension URLSession {
36+
@available(macOS 12.0, iOS 15.0, watchOS 8.0, tvOS 15.0, *)
37+
extension URLSession {
3838
/// Convenience method to load data using an `HTTPRequest`; creates and resumes a `URLSessionDataTask` internally.
3939
///
4040
/// - Parameter request: The `HTTPRequest` for which to load data.
4141
/// - Parameter delegate: Task-specific delegate.
4242
/// - Returns: Data and response.
4343
public func data(
44-
for request: HTTPRequest,
45-
delegate: (any URLSessionTaskDelegate)? = nil
44+
for request: HTTPRequest,
45+
delegate: (any URLSessionTaskDelegate)? = nil
4646
) async throws -> (Data, HTTPResponse) {
47-
guard let urlRequest = URLRequest(httpRequest: request) else {
48-
throw HTTPTypeConversionError.failedToConvertHTTPRequestToURLRequest
49-
}
50-
let (data, urlResponse) = try await self.data(for: urlRequest, delegate: delegate)
51-
guard let response = (urlResponse as? HTTPURLResponse)?.httpResponse else {
52-
throw HTTPTypeConversionError.failedToConvertURLResponseToHTTPResponse
53-
}
54-
return (data, response)
47+
guard let urlRequest = URLRequest(httpRequest: request) else {
48+
throw HTTPTypeConversionError.failedToConvertHTTPRequestToURLRequest
49+
}
50+
let (data, urlResponse) = try await self.data(for: urlRequest, delegate: delegate)
51+
guard let response = (urlResponse as? HTTPURLResponse)?.httpResponse else {
52+
throw HTTPTypeConversionError.failedToConvertURLResponseToHTTPResponse
53+
}
54+
return (data, response)
5555
}
5656

5757
/// Convenience method to upload data using an `HTTPRequest`, creates and resumes a `URLSessionUploadTask` internally.
@@ -61,53 +61,56 @@ extension URLSession {
6161
/// - Parameter delegate: Task-specific delegate.
6262
/// - Returns: Data and response.
6363
public func upload(
64-
for request: HTTPRequest,
65-
from bodyData: Data,
66-
delegate: (any URLSessionTaskDelegate)? = nil
64+
for request: HTTPRequest,
65+
from bodyData: Data,
66+
delegate: (any URLSessionTaskDelegate)? = nil
6767
) async throws -> (Data, HTTPResponse) {
68-
guard let urlRequest = URLRequest(httpRequest: request) else {
69-
throw HTTPTypeConversionError.failedToConvertHTTPRequestToURLRequest
70-
}
71-
let (data, urlResponse) = try await self.upload(for: urlRequest, from: bodyData, delegate: delegate)
72-
guard let response = (urlResponse as? HTTPURLResponse)?.httpResponse else {
73-
throw HTTPTypeConversionError.failedToConvertURLResponseToHTTPResponse
74-
}
75-
return (data, response)
68+
guard let urlRequest = URLRequest(httpRequest: request) else {
69+
throw HTTPTypeConversionError.failedToConvertHTTPRequestToURLRequest
70+
}
71+
let (data, urlResponse) = try await self.upload(
72+
for: urlRequest, from: bodyData, delegate: delegate)
73+
guard let response = (urlResponse as? HTTPURLResponse)?.httpResponse else {
74+
throw HTTPTypeConversionError.failedToConvertURLResponseToHTTPResponse
75+
}
76+
return (data, response)
7677
}
77-
}
78+
}
7879

79-
@available(macOS 10.15, iOS 13.0, watchOS 6.0, tvOS 13.0, *)
80-
extension URLSession {
80+
@available(macOS 10.15, iOS 13.0, watchOS 6.0, tvOS 13.0, *)
81+
extension URLSession {
8182
/// Convenience method to load data using an `HTTPRequest`; creates and resumes a `URLSessionDataTask` internally.
8283
///
8384
/// - Parameter request: The `HTTPRequest` for which to load data.
8485
/// - Returns: Data and response.
8586
public func data(for request: HTTPRequest) async throws -> (Data, HTTPResponse) {
86-
guard let urlRequest = URLRequest(httpRequest: request) else {
87-
throw HTTPTypeConversionError.failedToConvertHTTPRequestToURLRequest
88-
}
89-
let (data, urlResponse) = try await self.data(for: urlRequest)
90-
guard let response = (urlResponse as? HTTPURLResponse)?.httpResponse else {
91-
throw HTTPTypeConversionError.failedToConvertURLResponseToHTTPResponse
92-
}
93-
return (data, response)
87+
guard let urlRequest = URLRequest(httpRequest: request) else {
88+
throw HTTPTypeConversionError.failedToConvertHTTPRequestToURLRequest
89+
}
90+
let (data, urlResponse) = try await self.data(for: urlRequest)
91+
guard let response = (urlResponse as? HTTPURLResponse)?.httpResponse else {
92+
throw HTTPTypeConversionError.failedToConvertURLResponseToHTTPResponse
93+
}
94+
return (data, response)
9495
}
9596

9697
/// Convenience method to upload data using an `HTTPRequest`, creates and resumes a `URLSessionUploadTask` internally.
9798
///
9899
/// - Parameter request: The `HTTPRequest` for which to upload data.
99100
/// - Parameter bodyData: Data to upload.
100101
/// - Returns: Data and response.
101-
public func upload(for request: HTTPRequest, from bodyData: Data) async throws -> (Data, HTTPResponse) {
102-
guard let urlRequest = URLRequest(httpRequest: request) else {
103-
throw HTTPTypeConversionError.failedToConvertHTTPRequestToURLRequest
104-
}
105-
let (data, urlResponse) = try await self.upload(for: urlRequest, from: bodyData)
106-
guard let response = (urlResponse as? HTTPURLResponse)?.httpResponse else {
107-
throw HTTPTypeConversionError.failedToConvertURLResponseToHTTPResponse
108-
}
109-
return (data, response)
102+
public func upload(for request: HTTPRequest, from bodyData: Data) async throws -> (
103+
Data, HTTPResponse
104+
) {
105+
guard let urlRequest = URLRequest(httpRequest: request) else {
106+
throw HTTPTypeConversionError.failedToConvertHTTPRequestToURLRequest
107+
}
108+
let (data, urlResponse) = try await self.upload(for: urlRequest, from: bodyData)
109+
guard let response = (urlResponse as? HTTPURLResponse)?.httpResponse else {
110+
throw HTTPTypeConversionError.failedToConvertURLResponseToHTTPResponse
111+
}
112+
return (data, response)
110113
}
111-
}
114+
}
112115

113116
#endif

‎Sources/Realtime/PhoenixTransport.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -204,9 +204,9 @@ open class URLSessionTransport: NSObject, PhoenixTransport, URLSessionWebSocketD
204204
url: url,
205205
headerFields: headers
206206
)
207-
207+
208208
let urlRequest = URLRequest(httpRequest: request)!
209-
209+
210210
task = session?.webSocketTask(with: urlRequest)
211211

212212
// Start the task

‎Sources/Realtime/V2/RealtimeChannelV2.swift‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,11 @@ struct Socket: Sendable {
3737
var addChannel: @Sendable (_ channel: RealtimeChannelV2) -> Void
3838
var removeChannel: @Sendable (_ channel: RealtimeChannelV2) async -> Void
3939
var push: @Sendable (_ message: RealtimeMessageV2) async -> Void
40-
var httpSend: @Sendable (
41-
_ request: HTTPRequest,
42-
_ bodyData: Data?
43-
) async throws -> (Data, HTTPResponse)
40+
var httpSend:
41+
@Sendable (
42+
_ request: HTTPRequest,
43+
_ bodyData: Data?
44+
) async throws -> (Data, HTTPResponse)
4445
}
4546

4647
extension Socket {

‎Sources/Realtime/V2/Types.swift‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,13 @@ public struct RealtimeClientOptions: Sendable {
2121
var timeoutInterval: TimeInterval
2222
var disconnectOnSessionLoss: Bool
2323
var connectOnSubscribe: Bool
24-
var fetch: (@Sendable (
25-
_ request: HTTPRequest,
26-
_ bodyData: Data?
27-
) async throws -> (Data, HTTPResponse))?
24+
var fetch:
25+
(
26+
@Sendable (
27+
_ request: HTTPRequest,
28+
_ bodyData: Data?
29+
) async throws -> (Data, HTTPResponse)
30+
)?
2831
package var logger: (any SupabaseLogger)?
2932

3033
public static let defaultHeartbeatInterval: TimeInterval = 15
@@ -40,10 +43,12 @@ public struct RealtimeClientOptions: Sendable {
4043
timeoutInterval: TimeInterval = Self.defaultTimeoutInterval,
4144
disconnectOnSessionLoss: Bool = Self.defaultDisconnectOnSessionLoss,
4245
connectOnSubscribe: Bool = Self.defaultConnectOnSubscribe,
43-
fetch: (@Sendable (
44-
_ request: HTTPRequest,
45-
_ bodyData: Data?
46-
) async throws -> (Data, HTTPResponse))? = nil,
46+
fetch: (
47+
@Sendable (
48+
_ request: HTTPRequest,
49+
_ bodyData: Data?
50+
) async throws -> (Data, HTTPResponse)
51+
)? = nil,
4752
logger: (any SupabaseLogger)? = nil
4853
) {
4954
self.headers = headers

‎Sources/Storage/StorageHTTPClient.swift‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,11 @@ import HTTPTypesFoundation
77
#endif
88

99
public struct StorageHTTPSession: Sendable {
10-
public var fetch: @Sendable (
11-
_ request: HTTPRequest,
12-
_ bodyData: Data?
13-
) async throws -> (Data, HTTPResponse)
10+
public var fetch:
11+
@Sendable (
12+
_ request: HTTPRequest,
13+
_ bodyData: Data?
14+
) async throws -> (Data, HTTPResponse)
1415

1516
public init(
1617
fetch: @escaping @Sendable (

0 commit comments

Comments
 (0)