[Dispatching] Native socket support

Example/DApp/SceneDelegate.swift

@@ -12,7 +12,7 @@ class SceneDelegate: UIResponder, UIWindowSceneDelegate {
     private let authCoordinator = AuthCoordinator()
 
     func scene(_ scene: UIScene, willConnectTo session: UISceneSession, options connectionOptions: UIScene.ConnectionOptions) {
-        Networking.configure(projectId: InputConfig.projectId, socketFactory: DefaultSocketFactory())
+        Networking.configure(projectId: InputConfig.projectId, socketFactory: WalletConnectSocketClientFactory())
         Auth.configure(crypto: DefaultCryptoProvider())
 
         let metadata = AppMetadata(

Example/IntegrationTests/Auth/AuthTests.swift

@@ -34,13 +34,7 @@ final class AuthTests: XCTestCase {
         let logger = ConsoleLogger(prefix: prefix, loggingLevel: .debug)
         let keyValueStorage = RuntimeKeyValueStorage()
         let keychain = KeychainStorageMock()
-        let relayClient = RelayClientFactory.create(
-            relayHost: InputConfig.relayHost,
-            projectId: InputConfig.projectId,
-            keyValueStorage: keyValueStorage,
-            keychainStorage: keychain,
-            socketFactory: DefaultSocketFactory(),
-            logger: logger)
+        let relayClient = RelayClientFactory.create(relayHost: InputConfig.relayHost, projectId: InputConfig.projectId, keyValueStorage: RuntimeKeyValueStorage(), keychainStorage: keychain, socketFactory: WalletConnectSocketClientFactory(), logger: logger)
 
         let networkingClient = NetworkingClientFactory.create(
             relayClient: relayClient,

Example/IntegrationTests/Chat/ChatTests.swift

@@ -51,13 +51,7 @@ final class ChatTests: XCTestCase {
         let logger = ConsoleLogger(prefix: prefix, loggingLevel: .debug)
         let keyValueStorage = RuntimeKeyValueStorage()
         let keychain = KeychainStorageMock()
-        let relayClient = RelayClientFactory.create(
-            relayHost: InputConfig.relayHost,
-            projectId: InputConfig.projectId,
-            keyValueStorage: keyValueStorage,
-            keychainStorage: keychain,
-            socketFactory: DefaultSocketFactory(),
-            logger: logger)
+        let relayClient = RelayClientFactory.create(relayHost: InputConfig.relayHost, projectId: InputConfig.projectId, keyValueStorage: RuntimeKeyValueStorage(), keychainStorage: keychain, socketFactory: WalletConnectSocketClientFactory(), logger: logger)
 
         let networkingInteractor = NetworkingClientFactory.create(
             relayClient: relayClient,

Example/IntegrationTests/Pairing/PairingTests.swift

@@ -36,7 +36,7 @@ final class PairingTests: XCTestCase {
             projectId: InputConfig.projectId,
             keyValueStorage: RuntimeKeyValueStorage(),
             keychainStorage: keychain,
-            socketFactory: DefaultSocketFactory(),
+            socketFactory: WalletConnectSocketClientFactory(),
             logger: relayLogger)
 
         let networkingClient = NetworkingClientFactory.create(

Example/IntegrationTests/Sign/SignClientTests.swift

@@ -20,7 +20,8 @@ final class SignClientTests: XCTestCase {
             projectId: InputConfig.projectId,
             keyValueStorage: keyValueStorage,
             keychainStorage: keychain,
-            socketFactory: DefaultSocketFactory(),
+            socketFactory: WalletConnectSocketClientFactory(),
+            socketConnectionType: .automatic,
             logger: logger
         )
 

Example/RelayIntegrationTests/RelayClientEndToEndTests.swift

@@ -15,14 +15,14 @@ private class RelayKeychainStorageMock: KeychainStorageProtocol {
 }
 
 class WebSocketFactoryMock: WebSocketFactory {
-    private let webSocket: WebSocket
+    private let webSocket: WebSocketClient
 
-    init(webSocket: WebSocket) {
+    init(webSocket: WebSocketClient) {
         self.webSocket = webSocket
     }
 
     func create(with url: URL) -> WebSocketConnecting {
-        return webSocket
+        return webSocket as! WebSocketConnecting
     }
 }
 
@@ -57,7 +57,7 @@ final class RelayClientEndToEndTests: XCTestCase {
             projectId: InputConfig.projectId,
             keyValueStorage: keyValueStorage,
             keychainStorage: keychain,
-            socketFactory: DefaultSocketFactory(),
+            socketFactory: webSocketFactory,
             socketConnectionType: .manual,
             logger: logger
         )

Example/Shared/DefaultSocketFactory.swift

@@ -1,8 +1,13 @@
 import Foundation
+
 import Starscream
 import WalletConnectRelay
 
-extension WebSocket: WebSocketConnecting { }
+extension WebSocket: WebSocketConnecting {
+    public func reconnect() {
+        connect()
+    }
+}
 
 struct DefaultSocketFactory: WebSocketFactory {
     func create(with url: URL) -> WebSocketConnecting {

Example/Showcase/Classes/ApplicationLayer/Configurator/ThirdPartyConfigurator.swift

@@ -4,17 +4,14 @@ import Auth
 import WalletConnectModal
 
 struct ThirdPartyConfigurator: Configurator {
-
-    func configure() {
-
+    func configure() {       
         let metadata = AppMetadata(
             name: "Showcase App",
             description: "Showcase description",
             url: "example.wallet",
             icons: ["https://avatars.githubusercontent.com/u/37784886"]
         )
-
-        Networking.configure(projectId: InputConfig.projectId, socketFactory: DefaultSocketFactory())
+        Networking.configure(projectId: InputConfig.projectId)
         Auth.configure(crypto: DefaultCryptoProvider())
         WalletConnectModal.configure(projectId: InputConfig.projectId, metadata: metadata)
     }

Example/WalletApp/ApplicationLayer/ConfigurationService.swift

@@ -1,12 +1,13 @@
 import UIKit
 import WalletConnectNetworking
 import WalletConnectNotify
+
 import Web3Wallet
 
 final class ConfigurationService {
 
     func configure(importAccount: ImportAccount) {
-        Networking.configure(projectId: InputConfig.projectId, socketFactory: DefaultSocketFactory())
+        Networking.configure(projectId: InputConfig.projectId, socketFactory: WalletConnectSocketClientFactory())
         Networking.instance.setLogging(level: .debug)
 
         let metadata = AppMetadata(

Example/WalletApp/ApplicationLayer/Configurator/ThirdPartyConfigurator.swift

@@ -1,8 +1,12 @@
 import Foundation
 
+import WalletConnectNetworking
+import Web3Wallet
+
 struct ThirdPartyConfigurator: Configurator {
 
     func configure() {
+
     }
 
     private func configureLogging() {

Sources/WalletConnectModal/Mocks/Listing+Mocks.swift

@@ -1,7 +1,5 @@
 import Foundation
 
-#if DEBUG
-
 extension Listing {
     static let stubList: [Listing] = [
         Listing(
@@ -63,5 +61,3 @@ extension Listing {
         )
     ]
 }
-
-#endif

Sources/WalletConnectModal/Modal/Modal+Previews.swift

@@ -13,6 +13,7 @@ class WebSocketMock: WebSocketConnecting {
 
     func connect() {}
     func disconnect() {}
+    func reconnect() {}
     func write(string: String, completion: (() -> Void)?) {}
 }
 
@@ -41,7 +42,7 @@ struct ModalContainerView_Previews: PreviewProvider {
                 icons: ["https://avatars.githubusercontent.com/u/37784886"]
             )
 
-            Networking.configure(projectId: projectId, socketFactory: WebSocketFactoryMock())
+            Networking.configure(projectId: projectId, socketFactory: WalletConnectSocketClientFactory())
             WalletConnectModal.configure(projectId: projectId, metadata: metadata)
         }
 

Sources/WalletConnectModal/Modal/ModalInteractor.swift

@@ -11,7 +11,6 @@ protocol ModalSheetInteractor {
 }
 
 final class DefaultModalSheetInteractor: ModalSheetInteractor {
-
     lazy var sessionSettlePublisher: AnyPublisher<Session, Never> = WalletConnectModal.instance.sessionSettlePublisher
     lazy var sessionRejectionPublisher: AnyPublisher<(Session.Proposal, Reason), Never> = WalletConnectModal.instance.sessionRejectionPublisher
 

Sources/WalletConnectNetworking/Networking.swift

@@ -30,7 +30,6 @@ public class Networking {
     /// - Parameters:
     ///   - relayHost: relay host
     ///   - projectId: project id
-    ///   - socketFactory: web socket factory
     ///   - socketConnectionType: socket connection type
     static public func configure(
         relayHost: String = "relay.walletconnect.com",

Sources/WalletConnectRelay/Dispatching.swift

@@ -20,6 +20,7 @@ final class Dispatcher: NSObject, Dispatching {
     private let logger: ConsoleLogging
 
     private let defaultTimeout: Int = 5
+
     /// The property is used to determine whether relay.walletconnect.org will be used
     /// in case relay.walletconnect.com doesn't respond for some reason (most likely due to being blocked in the user's location).
     private var fallback = false
@@ -55,12 +56,12 @@ final class Dispatcher: NSObject, Dispatching {
         setUpSocketConnectionObserving()
     }
 
-    func send(_ string: String, completion: @escaping (Error?) -> Void) {
+    func send(_ message: String, completion: @escaping (Error?) -> Void) {
         guard socket.isConnected else {
             completion(NetworkError.webSocketNotConnected)
             return
         }
-        socket.write(string: string) {
+        socket.write(string: message) {
             completion(nil)
         }
     }
@@ -120,9 +121,11 @@ extension Dispatcher {
 
     private func setUpSocketConnectionObserving() {
         socket.onConnect = { [unowned self] in
+            logger.debug("[WebSocket] - Connected")
             self.socketConnectionStatusPublisherSubject.send(.connected)
         }
         socket.onDisconnect = { [unowned self] error in
+            logger.debug("[WebSocket] - Disconnected")
             self.socketConnectionStatusPublisherSubject.send(.disconnected)
             if error != nil {
                 self.socket.request.url = relayUrlFactory.create(fallback: fallback)

Sources/WalletConnectRelay/RelayClientFactory.swift

@@ -1,7 +1,6 @@
 //     
 import Foundation
 
-
 public struct RelayClientFactory {
 
     public static func create(
@@ -28,7 +27,6 @@ public struct RelayClientFactory {
         )
     }
 
-
     public static func create(
         relayHost: String,
         projectId: String,
@@ -50,6 +48,7 @@ public struct RelayClientFactory {
             projectId: projectId,
             socketAuthenticator: socketAuthenticator
         )
+
         let dispatcher = Dispatcher(
             socketFactory: socketFactory,
             relayUrlFactory: relayUrlFactory,

Sources/WalletConnectRelay/RelayURLFactory.swift

@@ -4,7 +4,7 @@ struct RelayUrlFactory {
     private let relayHost: String
     private let projectId: String
     private let socketAuthenticator: ClientIdAuthenticating
-    
+
     init(
         relayHost: String,
         projectId: String,

Sources/WalletConnectRelay/SocketConnectionHandler/AutomaticSocketConnectionHandler.swift

@@ -48,6 +48,8 @@ class AutomaticSocketConnectionHandler {
         networkMonitor.networkConnectionStatusPublisher.sink { [weak self] networkConnectionStatus in
             if networkConnectionStatus == .connected {
                 self?.reconnectIfNeeded()
+            } else {
+                self?.socket.disconnect()
             }
         }
         .store(in: &publishers)
@@ -65,7 +67,7 @@ class AutomaticSocketConnectionHandler {
 
     private func reconnectIfNeeded() {
         if !socket.isConnected {
-            socket.connect()
+            socket.reconnect()
         }
     }
 }

Sources/WalletConnectRelay/SocketConnectionHandler/WebSocket.swift

@@ -6,8 +6,10 @@ public protocol WebSocketConnecting: AnyObject {
     var onDisconnect: ((Error?) -> Void)? { get set }
     var onText: ((String) -> Void)? { get set }
     var request: URLRequest { get set }
+
     func connect()
     func disconnect()
+    func reconnect()
     func write(string: String, completion: (() -> Void)?)
 }
 

Sources/WalletConnectRelay/WalletConnectSocketClient/UnfairLock.swift

@@ -0,0 +1,21 @@
+import Foundation
+import Combine
+
+final class UnfairLock {
+    private var _lock: UnsafeMutablePointer<os_unfair_lock>
+
+    init() {
+        _lock = UnsafeMutablePointer<os_unfair_lock>.allocate(capacity: 1)
+        _lock.initialize(to: os_unfair_lock())
+    }
+
+    deinit {
+        _lock.deallocate()
+    }
+
+    func locked<ReturnValue>(_ f: () throws -> ReturnValue) rethrows -> ReturnValue {
+        os_unfair_lock_lock(_lock)
+        defer { os_unfair_lock_unlock(_lock) }
+        return try f()
+    }
+}