Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ extension ConnectInterceptor: Interceptor {
requestDataFunction: { data in
return Envelope.packMessage(data, using: self.config.requestCompression)
},
streamResultFunc: { result in
streamResultFunction: { result in
switch result {
case .headers(let headers):
responseHeaders = headers
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ extension GRPCWebInterceptor: Interceptor {
requestDataFunction: { data in
return Envelope.packMessage(data, using: self.config.requestCompression)
},
streamResultFunc: { result in
streamResultFunction: { result in
switch result {
case .headers(let headers):
if let grpcCode = headers.grpcStatus() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,9 @@ struct InterceptorChain {
requestDataFunction: { data in
return executeInterceptors(interceptors.map(\.requestDataFunction), initial: data)
},
streamResultFunc: { result in
streamResultFunction: { result in
return executeInterceptors(
interceptors.reversed().map(\.streamResultFunc),
interceptors.reversed().map(\.streamResultFunction),
initial: result
)
}
Expand Down
2 changes: 1 addition & 1 deletion Libraries/Connect/Implementation/ProtocolClient.swift
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ extension ProtocolClient: ProtocolClientInterface {

let interceptAndHandleResult: (StreamResult<Data>) -> Void = { streamResult in
do {
let interceptedResult = chain.streamResultFunc(streamResult)
let interceptedResult = chain.streamResultFunction(streamResult)
onResult(try interceptedResult.toTypedResult(using: codec))
} catch let error {
// TODO: Should we terminate the stream here?
Expand Down
6 changes: 3 additions & 3 deletions Libraries/Connect/Interfaces/Interceptor.swift
Original file line number Diff line number Diff line change
Expand Up @@ -53,15 +53,15 @@ public struct UnaryFunction {
public struct StreamFunction {
public let requestFunction: (HTTPRequest) -> HTTPRequest
public let requestDataFunction: (Data) -> Data
public let streamResultFunc: (StreamResult<Data>) -> StreamResult<Data>
public let streamResultFunction: (StreamResult<Data>) -> StreamResult<Data>

public init(
requestFunction: @escaping (HTTPRequest) -> HTTPRequest,
requestDataFunction: @escaping (Data) -> Data,
streamResultFunc: @escaping (StreamResult<Data>) -> StreamResult<Data>
streamResultFunction: @escaping (StreamResult<Data>) -> StreamResult<Data>
) {
self.requestFunction = requestFunction
self.requestDataFunction = requestDataFunction
self.streamResultFunc = streamResultFunc
self.streamResultFunction = streamResultFunction
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ private struct MockStreamInterceptor: Interceptor {
self.requestDataExpectation.fulfill()
return self.outboundMessageData
},
streamResultFunc: { result in
streamResultFunction: { result in
self.resultExpectation.fulfill()
switch result {
case .headers(let headers):
Expand Down Expand Up @@ -208,21 +208,21 @@ final class InterceptorChainTests: XCTestCase {
let interceptedRequestData = chain.requestDataFunction(Data())
XCTAssertEqual(interceptedRequestData, filterBData)

switch chain.streamResultFunc(.headers(Headers())) {
switch chain.streamResultFunction(.headers(Headers())) {
case .headers(let interceptedResultHeaders):
XCTAssertEqual(interceptedResultHeaders["filter-chain"], ["filter-b", "filter-a"])
case .message, .complete:
XCTFail("Unexpected result")
}

switch chain.streamResultFunc(.message(Data())) {
switch chain.streamResultFunction(.message(Data())) {
case .message(let interceptedData):
XCTAssertEqual(interceptedData, filterAData)
case .headers, .complete:
XCTFail("Unexpected result")
}

switch chain.streamResultFunc(.complete(code: .ok, error: nil, trailers: nil)) {
switch chain.streamResultFunction(.complete(code: .ok, error: nil, trailers: nil)) {
case .complete(_, _, let interceptedTrailers):
XCTAssertEqual(interceptedTrailers?["filter-chain"], ["filter-b", "filter-a"])
case .headers, .message:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ private struct NoopInterceptor: Interceptor {
return .init(
requestFunction: { $0 },
requestDataFunction: { $0 },
streamResultFunc: { $0 }
streamResultFunction: { $0 }
)
}

Expand Down