-
Notifications
You must be signed in to change notification settings - Fork 191
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #543 from WalletConnect/networking-client
[Networking] expose networking client interface
- Loading branch information
Showing
16 changed files
with
240 additions
and
225 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,7 +2,6 @@ import Foundation | |
|
|
||
| extension Auth { | ||
| struct Config { | ||
| let metadata: AppMetadata | ||
| let account: Account? | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,172 +1,9 @@ | ||
| import Foundation | ||
| import Combine | ||
| import JSONRPC | ||
| import WalletConnectRelay | ||
| import WalletConnectUtils | ||
| import WalletConnectKMS | ||
|
|
||
| public class NetworkingClient: NetworkInteracting { | ||
| private var publishers = Set<AnyCancellable>() | ||
| private let relayClient: RelayClient | ||
| private let serializer: Serializing | ||
| private let rpcHistory: RPCHistory | ||
| private let logger: ConsoleLogging | ||
|
|
||
| private let requestPublisherSubject = PassthroughSubject<(topic: String, request: RPCRequest), Never>() | ||
| private let responsePublisherSubject = PassthroughSubject<(topic: String, request: RPCRequest, response: RPCResponse), Never>() | ||
|
|
||
| public var requestPublisher: AnyPublisher<(topic: String, request: RPCRequest), Never> { | ||
| requestPublisherSubject.eraseToAnyPublisher() | ||
| } | ||
|
|
||
| private var responsePublisher: AnyPublisher<(topic: String, request: RPCRequest, response: RPCResponse), Never> { | ||
| responsePublisherSubject.eraseToAnyPublisher() | ||
| } | ||
|
|
||
| public var socketConnectionStatusPublisher: AnyPublisher<SocketConnectionStatus, Never> | ||
|
|
||
| public init( | ||
| relayClient: RelayClient, | ||
| serializer: Serializing, | ||
| logger: ConsoleLogging, | ||
| rpcHistory: RPCHistory | ||
| ) { | ||
| self.relayClient = relayClient | ||
| self.serializer = serializer | ||
| self.rpcHistory = rpcHistory | ||
| self.logger = logger | ||
| self.socketConnectionStatusPublisher = relayClient.socketConnectionStatusPublisher | ||
| setupRelaySubscribtion() | ||
| } | ||
|
|
||
| private func setupRelaySubscribtion() { | ||
| relayClient.messagePublisher | ||
| .sink { [unowned self] (topic, message) in | ||
| manageSubscription(topic, message) | ||
| }.store(in: &publishers) | ||
| } | ||
|
|
||
| public func subscribe(topic: String) async throws { | ||
| try await relayClient.subscribe(topic: topic) | ||
| } | ||
|
|
||
| public func unsubscribe(topic: String) { | ||
| relayClient.unsubscribe(topic: topic) { [unowned self] error in | ||
| if let error = error { | ||
| logger.error(error) | ||
| } else { | ||
| rpcHistory.deleteAll(forTopic: topic) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| public func requestSubscription<RequestParams: Codable>(on request: ProtocolMethod) -> AnyPublisher<RequestSubscriptionPayload<RequestParams>, Never> { | ||
| return requestPublisher | ||
| .filter { rpcRequest in | ||
| return rpcRequest.request.method == request.method | ||
| } | ||
| .compactMap { topic, rpcRequest in | ||
| guard let id = rpcRequest.id, let request = try? rpcRequest.params?.get(RequestParams.self) else { return nil } | ||
| return RequestSubscriptionPayload(id: id, topic: topic, request: request) | ||
| } | ||
| .eraseToAnyPublisher() | ||
| } | ||
|
|
||
| public func responseSubscription<Request: Codable, Response: Codable>(on request: ProtocolMethod) -> AnyPublisher<ResponseSubscriptionPayload<Request, Response>, Never> { | ||
| return responsePublisher | ||
| .filter { rpcRequest in | ||
| return rpcRequest.request.method == request.method | ||
| } | ||
| .compactMap { topic, rpcRequest, rpcResponse in | ||
| guard | ||
| let id = rpcRequest.id, | ||
| let request = try? rpcRequest.params?.get(Request.self), | ||
| let response = try? rpcResponse.result?.get(Response.self) else { return nil } | ||
| return ResponseSubscriptionPayload(id: id, topic: topic, request: request, response: response) | ||
| } | ||
| .eraseToAnyPublisher() | ||
| } | ||
|
|
||
| public func responseErrorSubscription<Request: Codable>(on request: ProtocolMethod) -> AnyPublisher<ResponseSubscriptionErrorPayload<Request>, Never> { | ||
| return responsePublisher | ||
| .filter { $0.request.method == request.method } | ||
| .compactMap { (topic, rpcRequest, rpcResponse) in | ||
| guard let id = rpcResponse.id, let request = try? rpcRequest.params?.get(Request.self), let error = rpcResponse.error else { return nil } | ||
| return ResponseSubscriptionErrorPayload(id: id, topic: topic, request: request, error: error) | ||
| } | ||
| .eraseToAnyPublisher() | ||
| } | ||
|
|
||
| public func request(_ request: RPCRequest, topic: String, protocolMethod: ProtocolMethod, envelopeType: Envelope.EnvelopeType) async throws { | ||
| try rpcHistory.set(request, forTopic: topic, emmitedBy: .local) | ||
| let message = try! serializer.serialize(topic: topic, encodable: request, envelopeType: envelopeType) | ||
| try await relayClient.publish(topic: topic, payload: message, tag: protocolMethod.requestConfig.tag, prompt: protocolMethod.requestConfig.prompt, ttl: protocolMethod.requestConfig.ttl) | ||
| } | ||
|
|
||
| /// Completes with an acknowledgement from the relay network. | ||
| /// completes with error if networking client was not able to send a message | ||
| /// TODO - relay client should provide async function - continualion should be removed from here | ||
| public func requestNetworkAck(_ request: RPCRequest, topic: String, protocolMethod: ProtocolMethod) async throws { | ||
| do { | ||
| try rpcHistory.set(request, forTopic: topic, emmitedBy: .local) | ||
| let message = try serializer.serialize(topic: topic, encodable: request) | ||
| return try await withCheckedThrowingContinuation { continuation in | ||
| relayClient.publish(topic: topic, payload: message, tag: protocolMethod.requestConfig.tag, prompt: protocolMethod.requestConfig.prompt, ttl: protocolMethod.requestConfig.ttl) { error in | ||
| if let error = error { | ||
| continuation.resume(throwing: error) | ||
| } else { | ||
| continuation.resume() | ||
| } | ||
| } | ||
| } | ||
| } catch { | ||
| logger.error(error) | ||
| } | ||
| } | ||
|
|
||
| public func respond(topic: String, response: RPCResponse, protocolMethod: ProtocolMethod, envelopeType: Envelope.EnvelopeType) async throws { | ||
| try rpcHistory.resolve(response) | ||
| let message = try! serializer.serialize(topic: topic, encodable: response, envelopeType: envelopeType) | ||
| try await relayClient.publish(topic: topic, payload: message, tag: protocolMethod.responseConfig.tag, prompt: protocolMethod.responseConfig.prompt, ttl: protocolMethod.responseConfig.ttl) | ||
| } | ||
|
|
||
| public func respondSuccess(topic: String, requestId: RPCID, protocolMethod: ProtocolMethod, envelopeType: Envelope.EnvelopeType) async throws { | ||
| let response = RPCResponse(id: requestId, result: true) | ||
| try await respond(topic: topic, response: response, protocolMethod: protocolMethod, envelopeType: envelopeType) | ||
| } | ||
|
|
||
| public func respondError(topic: String, requestId: RPCID, protocolMethod: ProtocolMethod, reason: Reason, envelopeType: Envelope.EnvelopeType) async throws { | ||
| let error = JSONRPCError(code: reason.code, message: reason.message) | ||
| let response = RPCResponse(id: requestId, error: error) | ||
| try await respond(topic: topic, response: response, protocolMethod: protocolMethod, envelopeType: envelopeType) | ||
| } | ||
|
|
||
| private func manageSubscription(_ topic: String, _ encodedEnvelope: String) { | ||
| if let deserializedJsonRpcRequest: RPCRequest = serializer.tryDeserialize(topic: topic, encodedEnvelope: encodedEnvelope) { | ||
| handleRequest(topic: topic, request: deserializedJsonRpcRequest) | ||
| } else if let response: RPCResponse = serializer.tryDeserialize(topic: topic, encodedEnvelope: encodedEnvelope) { | ||
| handleResponse(response: response) | ||
| } else { | ||
| logger.debug("Networking Interactor - Received unknown object type from networking relay") | ||
| } | ||
| } | ||
|
|
||
| private func handleRequest(topic: String, request: RPCRequest) { | ||
| do { | ||
| try rpcHistory.set(request, forTopic: topic, emmitedBy: .remote) | ||
| requestPublisherSubject.send((topic, request)) | ||
| } catch { | ||
| logger.debug(error) | ||
| } | ||
| } | ||
|
|
||
| private func handleResponse(response: RPCResponse) { | ||
| do { | ||
| try rpcHistory.resolve(response) | ||
| let record = rpcHistory.get(recordId: response.id!)! | ||
| responsePublisherSubject.send((record.topic, record.request, response)) | ||
| } catch { | ||
| logger.debug("Handle json rpc response error: \(error)") | ||
| } | ||
| } | ||
| public protocol NetworkingClient { | ||
| var socketConnectionStatusPublisher: AnyPublisher<SocketConnectionStatus, Never> { get } | ||
| func connect() throws | ||
| func disconnect(closeCode: URLSessionWebSocketTask.CloseCode) throws | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.