Merge pull request #12 from reown-com/socket-fix

socket fix
reown-com · Sep 17, 2024 · e10d164 · e10d164
2 parents 42e3fba + 61c93cf
commit e10d164
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/Sources/WalletConnectRelay/Dispatching.swift b/Sources/WalletConnectRelay/Dispatching.swift
@@ -6,7 +6,7 @@ protocol Dispatching {
     var isSocketConnected: Bool { get }
     var networkConnectionStatusPublisher: AnyPublisher<NetworkConnectionStatus, Never> { get }
     var socketConnectionStatusPublisher: AnyPublisher<SocketConnectionStatus, Never> { get }
-    func send(_ string: String, completion: @escaping (Error?) -> Void)
+//    func send(_ string: String, completion: @escaping (Error?) -> Void)
     func protectedSend(_ string: String, completion: @escaping (Error?) -> Void)
     func protectedSend(_ string: String) async throws
     func connect() throws
@@ -58,11 +58,7 @@ final class Dispatcher: NSObject, Dispatching {
         setUpWebSocketSession()
     }
 
-    func send(_ string: String, completion: @escaping (Error?) -> Void) {
-        guard socket.isConnected else {
-            completion(NetworkError.connectionFailed)
-            return
-        }
+    private func send(_ string: String, completion: @escaping (Error?) -> Void) {
         socket.write(string: string) {
             completion(nil)
         }

diff --git a/Sources/WalletConnectRelay/SocketConnectionHandler/AutomaticSocketConnectionHandler.swift b/Sources/WalletConnectRelay/SocketConnectionHandler/AutomaticSocketConnectionHandler.swift
@@ -318,6 +318,7 @@ extension AutomaticSocketConnectionHandler: SocketConnectionHandler {
                                 isConnecting = false
                                 handleFailedConnectionAndReconnectIfNeeded() // Trigger reconnection
                             }
+                            logger.debug("Will throw an error \(NetworkError.connectionFailed)")
                             continuation.resume(throwing: NetworkError.connectionFailed)
                         }
                     }

diff --git a/Tests/RelayerTests/DispatcherTests.swift b/Tests/RelayerTests/DispatcherTests.swift
@@ -51,7 +51,7 @@ final class DispatcherTests: XCTestCase {
 
     func testSendWhileConnected() {
         try! sut.connect()
-        sut.send("1") {_ in}
+        sut.protectedSend("1") {_ in}
         XCTAssertEqual(webSocket.sendCallCount, 1)
     }