Error handler as param

WalletConnect · Sep 6, 2023 · 1c5cee4 · 1c5cee4
1 parent c014fb3
commit 1c5cee4
Show file tree

Hide file tree

Showing 10 changed files with 33 additions and 21 deletions.
diff --git a/Sources/WalletConnectNetworking/NetworkInteracting.swift b/Sources/WalletConnectNetworking/NetworkInteracting.swift
@@ -29,13 +29,15 @@ public protocol NetworkInteracting {
     func subscribeOnRequest<RequestParams: Codable>(
         protocolMethod: ProtocolMethod,
         requestOfType: RequestParams.Type,
+        errorHandler: ErrorHandler?,
         subscription: @escaping (RequestSubscriptionPayload<RequestParams>) async throws -> Void
     )
 
     func subscribeOnResponse<Request: Codable, Response: Codable>(
         protocolMethod: ProtocolMethod,
         requestOfType: Request.Type,
         responseOfType: Response.Type,
+        errorHandler: ErrorHandler?,
         subscription: @escaping (ResponseSubscriptionPayload<Request, Response>) async throws -> Void
     )
 

diff --git a/Sources/WalletConnectNetworking/NetworkingClient.swift b/Sources/WalletConnectNetworking/NetworkingClient.swift
@@ -4,7 +4,6 @@ import Combine
 public protocol NetworkingClient {
     var socketConnectionStatusPublisher: AnyPublisher<SocketConnectionStatus, Never> { get }
     var logsPublisher: AnyPublisher<Log, Never> { get }
-    var errorPublisher: AnyPublisher<Error, Never> { get }
     func setLogging(level: LoggingLevel) 
     func connect() throws
     func disconnect(closeCode: URLSessionWebSocketTask.CloseCode) throws

diff --git a/Sources/WalletConnectNetworking/NetworkingInteractor.swift b/Sources/WalletConnectNetworking/NetworkingInteractor.swift
@@ -8,8 +8,6 @@ public class NetworkingInteractor: NetworkInteracting {
     private let rpcHistory: RPCHistory
     private let logger: ConsoleLogging
 
-    private let errorPublisherSubject = PassthroughSubject<Error, Never>()
-
     private let requestPublisherSubject = PassthroughSubject<(topic: String, request: RPCRequest, decryptedPayload: Data, publishedAt: Date, derivedTopic: String?), Never>()
     private let responsePublisherSubject = PassthroughSubject<(topic: String, request: RPCRequest, response: RPCResponse, publishedAt: Date, derivedTopic: String?), Never>()
 
@@ -21,10 +19,6 @@ public class NetworkingInteractor: NetworkInteracting {
         responsePublisherSubject.eraseToAnyPublisher()
     }
 
-    public var errorPublisher: AnyPublisher<Error, Never> {
-        return errorPublisherSubject.eraseToAnyPublisher()
-    }
-
     public var logsPublisher: AnyPublisher<Log, Never> {
         logger.logsPublisher
             .merge(with: serializer.logsPublisher)
@@ -93,15 +87,16 @@ public class NetworkingInteractor: NetworkInteracting {
     public func subscribeOnRequest<RequestParams: Codable>(
         protocolMethod: ProtocolMethod,
         requestOfType: RequestParams.Type,
+        errorHandler: ErrorHandler?,
         subscription: @escaping (RequestSubscriptionPayload<RequestParams>) async throws -> Void
     ) {
         requestSubscription(on: protocolMethod)
-            .sink { [unowned self] (payload: RequestSubscriptionPayload<RequestParams>) in
+            .sink { (payload: RequestSubscriptionPayload<RequestParams>) in
                 Task(priority: .high) {
                     do {
                         try await subscription(payload)
                     } catch {
-                        errorPublisherSubject.send(error)
+                        errorHandler?.handle(error: error)
                     }
                 }
             }.store(in: &publishers)
@@ -111,15 +106,16 @@ public class NetworkingInteractor: NetworkInteracting {
         protocolMethod: ProtocolMethod,
         requestOfType: Request.Type,
         responseOfType: Response.Type,
+        errorHandler: ErrorHandler?,
         subscription: @escaping (ResponseSubscriptionPayload<Request, Response>) async throws -> Void
     ) {
         responseSubscription(on: protocolMethod)
-            .sink { [unowned self] (payload: ResponseSubscriptionPayload<Request, Response>) in
+            .sink { (payload: ResponseSubscriptionPayload<Request, Response>) in
                 Task(priority: .high) {
                     do {
                         try await subscription(payload)
                     } catch {
-                        errorPublisherSubject.send(error)
+                        errorHandler?.handle(error: error)
                     }
                 }
             }.store(in: &publishers)

diff --git a/Sources/WalletConnectNotify/Client/Common/DeleteNotifySubscriptionSubscriber.swift b/Sources/WalletConnectNotify/Client/Common/DeleteNotifySubscriptionSubscriber.swift
@@ -22,7 +22,8 @@ class DeleteNotifySubscriptionSubscriber {
     private func subscribeForDeleteSubscription() {
         networkingInteractor.subscribeOnRequest(
             protocolMethod: NotifyDeleteProtocolMethod(),
-            requestOfType: NotifyDeleteResponsePayload.Wrapper.self
+            requestOfType: NotifyDeleteResponsePayload.Wrapper.self,
+            errorHandler: logger
         ) { [unowned self] payload in
             let (_, _) = try NotifyDeleteResponsePayload.decodeAndVerify(from: payload.request)
             logger.debug("Peer deleted subscription")

diff --git a/...ConnectNotify/Client/Wallet/ProtocolEngine/wc_notifyMessage/NotifyMessageSubscriber.swift b/...ConnectNotify/Client/Wallet/ProtocolEngine/wc_notifyMessage/NotifyMessageSubscriber.swift
@@ -27,7 +27,8 @@ class NotifyMessageSubscriber {
     private func subscribeForNotifyMessages() {
         networkingInteractor.subscribeOnRequest(
             protocolMethod: NotifyMessageProtocolMethod(),
-            requestOfType: NotifyMessagePayload.Wrapper.self
+            requestOfType: NotifyMessagePayload.Wrapper.self,
+            errorHandler: logger
         ) { [unowned self] payload in
             logger.debug("Received Notify Message on topic: \(payload.topic)", properties: ["topic": payload.topic])
 

diff --git a/...tNotify/Client/Wallet/ProtocolEngine/wc_notifyUpdate/NotifyUpdateResponseSubscriber.swift b/...tNotify/Client/Wallet/ProtocolEngine/wc_notifyUpdate/NotifyUpdateResponseSubscriber.swift
@@ -33,7 +33,8 @@ private extension NotifyUpdateResponseSubscriber {
         networkingInteractor.subscribeOnResponse(
             protocolMethod: NotifyUpdateProtocolMethod(),
             requestOfType: NotifyUpdatePayload.Wrapper.self,
-            responseOfType: NotifyUpdateResponsePayload.Wrapper.self
+            responseOfType: NotifyUpdateResponsePayload.Wrapper.self,
+            errorHandler: logger
         ) { [unowned self] payload in
             logger.debug("Received Notify Update response")
 

diff --git a/...ify/Client/Wallet/ProtocolEngine/wc_pushSubscribe/NotifySubscribeResponseSubscriber.swift b/...ify/Client/Wallet/ProtocolEngine/wc_pushSubscribe/NotifySubscribeResponseSubscriber.swift
@@ -37,7 +37,8 @@ class NotifySubscribeResponseSubscriber {
         networkingInteractor.subscribeOnResponse(
             protocolMethod: NotifySubscribeProtocolMethod(),
             requestOfType: NotifySubscriptionPayload.Wrapper.self,
-            responseOfType: NotifySubscriptionResponsePayload.Wrapper.self
+            responseOfType: NotifySubscriptionResponsePayload.Wrapper.self,
+            errorHandler: logger
         ) { [unowned self] payload in
                 logger.debug("Received Notify Subscribe response")
 

diff --git a/Sources/WalletConnectUtils/Logger/ConsoleLogger.swift b/Sources/WalletConnectUtils/Logger/ConsoleLogger.swift
@@ -1,7 +1,7 @@
 import Foundation
 import Combine
 
-public protocol ConsoleLogging {
+public protocol ConsoleLogging: ErrorHandler {
     var logsPublisher: AnyPublisher<Log, Never> { get }
     func debug(_ items: Any..., file: String, function: String, line: Int, properties: [String: String]?)
     func info(_ items: Any..., file: String, function: String, line: Int)
@@ -104,9 +104,11 @@ extension ConsoleLogger: ConsoleLogging {
         }
     }
 
+    public func handle(error: Error) {
+        debug(error.localizedDescription)
+    }
 }
 
-
 #if DEBUG
 public struct ConsoleLoggerMock: ConsoleLogging {
     public var logsPublisher: AnyPublisher<WalletConnectUtils.Log, Never> {
@@ -121,6 +123,8 @@ public struct ConsoleLoggerMock: ConsoleLogging {
     public func error(_ items: Any..., file: String, function: String, line: Int) { }
 
     public func setLogging(level: LoggingLevel) { }
+
+    public func handle(error: Error) { }
 }
 #endif
 
diff --git a/Sources/WalletConnectUtils/Logger/ErrorHandler.swift b/Sources/WalletConnectUtils/Logger/ErrorHandler.swift
@@ -0,0 +1,5 @@
+import Foundation
+
+public protocol ErrorHandler {
+    func handle(error: Error)
+}
diff --git a/Tests/TestingUtils/NetworkingInteractorMock.swift b/Tests/TestingUtils/NetworkingInteractorMock.swift
@@ -98,15 +98,16 @@ public class NetworkingInteractorMock: NetworkInteracting {
     public func subscribeOnRequest<RequestParams: Codable>(
         protocolMethod: ProtocolMethod,
         requestOfType: RequestParams.Type,
+        errorHandler: ErrorHandler?,
         subscription: @escaping (RequestSubscriptionPayload<RequestParams>) async throws -> Void
     ) {
         requestSubscription(on: protocolMethod)
-            .sink { [unowned self] (payload: RequestSubscriptionPayload<RequestParams>) in
+            .sink { (payload: RequestSubscriptionPayload<RequestParams>) in
                 Task(priority: .high) {
                     do {
                         try await subscription(payload)
                     } catch {
-                        errorPublisherSubject.send(error)
+                        errorHandler?.handle(error: error)
                     }
                 }
             }.store(in: &publishers)
@@ -117,15 +118,16 @@ public class NetworkingInteractorMock: NetworkInteracting {
         protocolMethod: ProtocolMethod,
         requestOfType: Request.Type,
         responseOfType: Response.Type,
+        errorHandler: ErrorHandler?,
         subscription: @escaping (ResponseSubscriptionPayload<Request, Response>) async throws -> Void
     ) {
         responseSubscription(on: protocolMethod)
-            .sink { [unowned self] (payload: ResponseSubscriptionPayload<Request, Response>) in
+            .sink { (payload: ResponseSubscriptionPayload<Request, Response>) in
                 Task(priority: .high) {
                     do {
                         try await subscription(payload)
                     } catch {
-                        errorPublisherSubject.send(error)
+                        errorHandler?.handle(error: error)
                     }
                 }
             }.store(in: &publishers)