fix continuation being missused

WalletConnect · May 3, 2024 · 590394c · 590394c
1 parent fd02b0a
commit 590394c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/Sources/WalletConnectRelay/Dispatching.swift b/Sources/WalletConnectRelay/Dispatching.swift
@@ -72,7 +72,6 @@ final class Dispatcher: NSObject, Dispatching {
         var cancellable: AnyCancellable?
         cancellable = Publishers.CombineLatest(socketConnectionStatusPublisher, networkConnectionStatusPublisher)
             .filter { $0.0 == .connected && $0.1 == .connected }
-            .first()
             .setFailureType(to: NetworkError.self)
             .timeout(.seconds(defaultTimeout), scheduler: concurrentQueue, customError: { .connectionFailed })
             .sink(receiveCompletion: { [unowned self] result in

diff --git a/Sources/WalletConnectRelay/SocketConnectionHandler/AutomaticSocketConnectionHandler.swift b/Sources/WalletConnectRelay/SocketConnectionHandler/AutomaticSocketConnectionHandler.swift
@@ -56,7 +56,11 @@ class AutomaticSocketConnectionHandler {
         // Start a timer for the fallback mechanism
         let timer = DispatchSource.makeTimerSource(queue: concurrentQueue)
         timer.schedule(deadline: .now() + .seconds(defaultTimeout))
-        timer.setEventHandler { [unowned self] in
+        timer.setEventHandler { [weak self] in
+            guard let self = self else {
+                timer.cancel()
+                return
+            }
             if !self.socket.isConnected {
                 self.logger.debug("Connection timed out, initiating fallback...")
                 self.socketUrlFallbackHandler.handleFallbackIfNeeded(error: .connectionFailed)

diff --git a/Sources/WalletConnectRelay/SocketConnectionHandler/ManualSocketConnectionHandler.swift b/Sources/WalletConnectRelay/SocketConnectionHandler/ManualSocketConnectionHandler.swift
@@ -28,7 +28,11 @@ class ManualSocketConnectionHandler: SocketConnectionHandler {
         // Start a timer for the fallback mechanism
         let timer = DispatchSource.makeTimerSource(queue: concurrentQueue)
         timer.schedule(deadline: .now() + .seconds(defaultTimeout))
-        timer.setEventHandler { [unowned self] in
+        timer.setEventHandler { [weak self] in
+            guard let self = self else {
+                timer.cancel()
+                return
+            }
             if !self.socket.isConnected {
                 self.logger.debug("Connection timed out, initiating fallback...")
                 self.socketUrlFallbackHandler.handleFallbackIfNeeded(error: .connectionFailed)