Skip to content

Relax Sendable requirements for interceptors #182

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
rebello95 merged 1 commit into from
Sep 25, 2023
Merged

Relax Sendable requirements for interceptors #182

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

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Libraries/Connect/Implementation/Interceptors/InterceptorChain.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

/// Represents a chain of interceptors that is used for a single request/stream,
/// and orchestrates invoking each of them in the proper order.
struct InterceptorChain: Sendable {
struct InterceptorChain: @unchecked Sendable {
private let interceptors: [Interceptor]

/// Initialize the interceptor chain.
Expand Down Expand Up @@ -83,7 +83,7 @@ struct InterceptorChain: Sendable {
}
}

private func executeInterceptors<T>(_ interceptors: [@Sendable (T) -> T], initial: T) -> T {
private func executeInterceptors<T>(_ interceptors: [(T) -> T], initial: T) -> T {
var next = initial
for interceptor in interceptors {
next = interceptor(next)
Expand Down
30 changes: 15 additions & 15 deletions Libraries/Connect/Interfaces/Interceptor.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import Foundation
/// and inbound responses.
///
/// Interceptors are expected to be instantiated once per request/stream.
public protocol Interceptor: Sendable {
public protocol Interceptor {
/// Invoked when a unary call is started. Provides a set of closures that will be called
/// as the request progresses, allowing the interceptor to alter request/response data.
///
Expand All @@ -39,31 +39,31 @@ public protocol Interceptor: Sendable {

public typealias InterceptorInitializer = @Sendable (ProtocolClientConfig) -> Interceptor

public struct UnaryFunction: Sendable {
public let requestFunction: @Sendable (HTTPRequest) -> HTTPRequest
public let responseFunction: @Sendable (HTTPResponse) -> HTTPResponse
public let responseMetricsFunction: @Sendable (HTTPMetrics) -> HTTPMetrics
public struct UnaryFunction: @unchecked Sendable {
public let requestFunction: (HTTPRequest) -> HTTPRequest
public let responseFunction: (HTTPResponse) -> HTTPResponse
public let responseMetricsFunction: (HTTPMetrics) -> HTTPMetrics

public init(
requestFunction: @escaping @Sendable (HTTPRequest) -> HTTPRequest,
responseFunction: @escaping @Sendable (HTTPResponse) -> HTTPResponse,
responseMetricsFunction: @escaping @Sendable (HTTPMetrics) -> HTTPMetrics = { $0 }
requestFunction: @escaping (HTTPRequest) -> HTTPRequest,
responseFunction: @escaping (HTTPResponse) -> HTTPResponse,
responseMetricsFunction: @escaping (HTTPMetrics) -> HTTPMetrics = { $0 }
) {
self.requestFunction = requestFunction
self.responseFunction = responseFunction
self.responseMetricsFunction = responseMetricsFunction
}
}

public struct StreamFunction: Sendable {
public let requestFunction: @Sendable (HTTPRequest) -> HTTPRequest
public let requestDataFunction: @Sendable (Data) -> Data
public let streamResultFunction: @Sendable (StreamResult<Data>) -> StreamResult<Data>
public struct StreamFunction: @unchecked Sendable {
public let requestFunction: (HTTPRequest) -> HTTPRequest
public let requestDataFunction: (Data) -> Data
public let streamResultFunction: (StreamResult<Data>) -> StreamResult<Data>

public init(
requestFunction: @escaping @Sendable (HTTPRequest) -> HTTPRequest,
requestDataFunction: @escaping @Sendable (Data) -> Data,
streamResultFunction: @escaping @Sendable (StreamResult<Data>) -> StreamResult<Data>
requestFunction: @escaping (HTTPRequest) -> HTTPRequest,
requestDataFunction: @escaping (Data) -> Data,
streamResultFunction: @escaping (StreamResult<Data>) -> StreamResult<Data>
) {
self.requestFunction = requestFunction
self.requestDataFunction = requestDataFunction
Expand Down
2 changes: 1 addition & 1 deletion Libraries/Connect/Interfaces/NetworkProtocol.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
// limitations under the License.

/// Protocols that are supported by the library.
public enum NetworkProtocol: Sendable {
public enum NetworkProtocol: @unchecked Sendable {
/// The Connect protocol:
/// https://connectrpc.com/docs/protocol
case connect
Expand Down