[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)
         Auth.configure(crypto: DefaultCryptoProvider())
 
         let metadata = AppMetadata(

Example/ExampleApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -64,15 +64,6 @@
           "version": null
         }
       },
-      {
-        "package": "Starscream",
-        "repositoryURL": "https://github.com/daltoniam/Starscream",
-        "state": {
-          "branch": null,
-          "revision": "a063fda2b8145a231953c20e7a646be254365396",
-          "version": "3.1.2"
-        }
-      },
       {
         "package": "swift-qrcode-generator",
         "repositoryURL": "https://github.com/dagronf/swift-qrcode-generator",

Example/IntegrationTests/Auth/AuthTests.swift

@@ -34,13 +34,7 @@ final class AuthTests: XCTestCase {
         let logger = ConsoleLogger(suffix: 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, logger: logger)
 
         let networkingClient = NetworkingClientFactory.create(
             relayClient: relayClient,

Example/IntegrationTests/Chat/ChatTests.swift

@@ -50,13 +50,7 @@ final class ChatTests: XCTestCase {
         let logger = ConsoleLogger(suffix: 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, logger: logger)
 
         let networkingInteractor = NetworkingClientFactory.create(
             relayClient: relayClient,

Example/IntegrationTests/History/HistoryTests.swift

@@ -29,7 +29,6 @@ final class HistoryTests: XCTestCase {
             projectId: InputConfig.projectId,
             keyValueStorage: RuntimeKeyValueStorage(),
             keychainStorage: keychain,
-            socketFactory: DefaultSocketFactory(),
             logger: ConsoleLogger(suffix: prefix + " [Relay]", loggingLevel: .debug))
     }
 

Example/IntegrationTests/Pairing/PairingTests.swift

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

Example/IntegrationTests/Push/PushTests.swift

@@ -48,7 +48,6 @@ final class PushTests: XCTestCase {
             projectId: InputConfig.projectId,
             keyValueStorage: keyValueStorage,
             keychainStorage: keychain,
-            socketFactory: DefaultSocketFactory(),
             logger: relayLogger)
 
         let networkingClient = NetworkingClientFactory.create(

Example/IntegrationTests/Sign/SignClientTests.swift

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

Example/IntegrationTests/Sync/SyncTests.swift

@@ -57,13 +57,8 @@ final class SyncTests: XCTestCase {
         let kms = KeyManagementService(keychain: keychain)
         let derivationService = SyncDerivationService(syncStorage: syncSignatureStore, bip44: DefaultBIP44Provider(), kms: kms)
         let logger = ConsoleLogger(suffix: suffix, loggingLevel: .debug)
-        let relayClient = RelayClientFactory.create(
-            relayHost: InputConfig.relayHost,
-            projectId: InputConfig.projectId,
-            keyValueStorage: RuntimeKeyValueStorage(),
-            keychainStorage: keychain,
-            socketFactory: DefaultSocketFactory(),
-            logger: logger)
+        let relayClient = RelayClientFactory.create(relayHost: InputConfig.relayHost, projectId: InputConfig.projectId, keyValueStorage: RuntimeKeyValueStorage(), keychainStorage: keychain, logger: logger)
+
         let networkingInteractor = NetworkingClientFactory.create(
             relayClient: relayClient,
             logger: logger,

Example/RelayIntegrationTests/RelayClientEndToEndTests.swift

@@ -2,7 +2,6 @@ import Foundation
 import Combine
 import XCTest
 import WalletConnectUtils
-import Starscream
 @testable import WalletConnectRelay
 
 private class RelayKeychainStorageMock: KeychainStorageProtocol {
@@ -15,9 +14,9 @@ private class RelayKeychainStorageMock: KeychainStorageProtocol {
 }
 
 class WebSocketFactoryMock: WebSocketFactory {
-    private let webSocket: WebSocket
+    private let webSocket: WebSocketClient
 
-    init(webSocket: WebSocket) {
+    init(webSocket: WebSocketClient) {
         self.webSocket = webSocket
     }
 
@@ -41,9 +40,10 @@ final class RelayClientEndToEndTests: XCTestCase {
             projectId: InputConfig.projectId,
             socketAuthenticator: socketAuthenticator
         )
-        let socket = WebSocket(url: urlFactory.create())
-        let webSocketFactory = WebSocketFactoryMock(webSocket: socket)
         let logger = ConsoleLogger(suffix: prefix, loggingLevel: .debug)
+        let socket = WebSocketClient(url: urlFactory.create(), logger: ConsoleLogger(suffix: prefix, loggingLevel: .debug))
+        let webSocketFactory = WebSocketFactoryMock(webSocket: socket)
+
         let dispatcher = Dispatcher(
             socketFactory: webSocketFactory,
             relayUrlFactory: urlFactory,
@@ -57,7 +57,6 @@ final class RelayClientEndToEndTests: XCTestCase {
             projectId: InputConfig.projectId,
             keyValueStorage: keyValueStorage,
             keychainStorage: keychain,
-            socketFactory: DefaultSocketFactory(),
             socketConnectionType: .manual,
             logger: logger
         )

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/Configurator/ThirdPartyConfigurator.swift

@@ -5,7 +5,7 @@ import Web3Inbox
 struct ThirdPartyConfigurator: Configurator {
 
     func configure() {
-        Networking.configure(projectId: InputConfig.projectId, socketFactory: DefaultSocketFactory())
+        Networking.configure(projectId: InputConfig.projectId)
 
         let metadata = AppMetadata(
             name: "Example Wallet",

Sources/WalletConnectModal/Modal/Modal+Previews.swift

@@ -42,7 +42,7 @@ struct ModalContainerView_Previews: PreviewProvider {
                 icons: ["https://avatars.githubusercontent.com/u/37784886"]
             )
 
-            Networking.configure(projectId: projectId, socketFactory: WebSocketFactoryMock())
+            Networking.configure(projectId: projectId)
             WalletConnectModal.configure(projectId: projectId, metadata: metadata)
         }
 

Sources/WalletConnectModal/Modal/ModalContainerView.swift

@@ -1,16 +1,15 @@
 import SwiftUI
 
 @available(iOS 14.0, *)
+
 struct ModalContainerView: View {
 
     @Environment(\.presentationMode) var presentationMode
 
     @State var showModal: Bool = false
 
     var body: some View {
-
         VStack(spacing: -10) {
-
             Color.thickOverlay
                 .colorScheme(.light)
                 .onTapGesture {

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,24 +30,20 @@ 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",
         projectId: String,
-        socketFactory: WebSocketFactory,
         socketConnectionType: SocketConnectionType = .automatic
     ) {
         Networking.config = Networking.Config(
             relayHost: relayHost,
             projectId: projectId,
-            socketFactory: socketFactory,
             socketConnectionType: socketConnectionType
         )
         Relay.configure(
             relayHost: relayHost,
             projectId: projectId,
-            socketFactory: socketFactory,
             socketConnectionType: socketConnectionType)
     }
 }

Sources/WalletConnectNetworking/NetworkingConfig.swift

@@ -4,7 +4,6 @@ extension Networking {
     struct Config {
         let relayHost: String
         let projectId: String
-        let socketFactory: WebSocketFactory
         let socketConnectionType: SocketConnectionType
     }
 }

Sources/WalletConnectRelay/Relay.swift

@@ -15,7 +15,6 @@ public class Relay {
         return RelayClientFactory.create(
             relayHost: config.relayHost,
             projectId: config.projectId,
-            socketFactory: config.socketFactory,
             socketConnectionType: config.socketConnectionType
         )
     }()
@@ -33,13 +32,11 @@ public class Relay {
     static public func configure(
         relayHost: String = "relay.walletconnect.com",
         projectId: String,
-        socketFactory: WebSocketFactory,
         socketConnectionType: SocketConnectionType = .automatic
     ) {
         Relay.config = Relay.Config(
             relayHost: relayHost,
             projectId: projectId,
-            socketFactory: socketFactory,
             socketConnectionType: socketConnectionType
         )
     }

Sources/WalletConnectRelay/RelayClientFactory.swift

@@ -7,7 +7,6 @@ public struct RelayClientFactory {
     public static func create(
         relayHost: String,
         projectId: String,
-        socketFactory: WebSocketFactory,
         socketConnectionType: SocketConnectionType
     ) -> RelayClient {
 
@@ -22,7 +21,6 @@ public struct RelayClientFactory {
             projectId: projectId,
             keyValueStorage: keyValueStorage,
             keychainStorage: keychainStorage,
-            socketFactory: socketFactory,
             socketConnectionType: socketConnectionType,
             logger: logger
         )
@@ -34,7 +32,6 @@ public struct RelayClientFactory {
         projectId: String,
         keyValueStorage: KeyValueStorage,
         keychainStorage: KeychainStorageProtocol,
-        socketFactory: WebSocketFactory,
         socketConnectionType: SocketConnectionType = .automatic,
         logger: ConsoleLogging
     ) -> RelayClient {
@@ -50,8 +47,9 @@ public struct RelayClientFactory {
             projectId: projectId,
             socketAuthenticator: socketAuthenticator
         )
+        let webSocketClientFactory = WebSocketClientFactory()
         let dispatcher = Dispatcher(
-            socketFactory: socketFactory,
+            socketFactory: webSocketClientFactory,
             relayUrlFactory: relayUrlFactory,
             socketConnectionType: socketConnectionType,
             logger: logger

Sources/WalletConnectRelay/RelayConfig.swift

@@ -4,7 +4,6 @@ extension Relay {
     struct Config {
         let relayHost: String
         let projectId: String
-        let socketFactory: WebSocketFactory
         let socketConnectionType: SocketConnectionType
     }
 }