Remove client name

Example/DApp/ClientDelegate.swift

@@ -1,4 +1,5 @@
 import WalletConnect
+import Relayer
 
 class ClientDelegate: WalletConnectClientDelegate {
     var client: WalletConnectClient
@@ -13,12 +14,8 @@ class ClientDelegate: WalletConnectClientDelegate {
             description: "a description",
             url: "wallet.connect",
             icons: ["https://gblobscdn.gitbook.com/spaces%2F-LJJeCjcLrr53DcT1Ml7%2Favatar.png?alt=media"])
-        self.client = WalletConnectClient(
-            metadata: metadata,
-            projectId: "52af113ee0c1e1a20f4995730196c13e",
-            isController: false,
-            relayHost: "relay.dev.walletconnect.com"
-        )
+        let relayer = Relayer(relayHost: "relay.dev.walletconnect.com", projectId: "52af113ee0c1e1a20f4995730196c13e")
+        self.client = WalletConnectClient(metadata: metadata, relayer: relayer)
         client.delegate = self
     }
 

Example/DApp/Connect/ConnectViewController.swift

@@ -86,7 +86,7 @@ class ConnectViewController: UIViewController, UITableViewDataSource, UITableVie
 
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         let cell = tableView.dequeueReusableCell(withIdentifier: "pairing_cell", for: indexPath)
-        cell.textLabel?.text = activePairings[indexPath.row].peer!.name
+        cell.textLabel?.text = activePairings[indexPath.row].peer?.name ?? ""
         return cell
     }
 

Example/ExampleApp/Responder/ResponderViewController.swift

@@ -15,7 +15,6 @@ final class ResponderViewController: UIViewController {
         return WalletConnectClient(
             metadata: metadata,
             projectId: "52af113ee0c1e1a20f4995730196c13e",
-            isController: true,
             relayHost: "relay.dev.walletconnect.com"
         )
     }()
@@ -159,7 +158,7 @@ extension ResponderViewController: SessionViewControllerDelegate {
         print("did reject session")
         let proposal = currentProposal!
         currentProposal = nil
-        client.reject(proposal: proposal, reason: Reason(code: 0, message: "reject"))
+        client.reject(proposal: proposal, reason: .disapprovedChains)
     }
 }
 

README.md

@@ -24,10 +24,8 @@ You usually want to have a single instance of a client in you app.
                                    icons: [String]?)
         let client = WalletConnectClient(metadata: AppMetadata,
                             projectId: String,
-                            isController: Bool,
                             relayHost: String)
 ```
-The `controller` client will always be the "wallet" which is exposing blockchain accounts to a "dapp" and therefore is also in charge of signing.
 
 After instantiation of a client set its delegate.
 #### Pair Clients

Sources/Relayer/AppStateObserving.swift

@@ -0,0 +1,48 @@
+
+import Foundation
+#if os(iOS)
+import UIKit
+#endif
+
+protocol AppStateObserving {
+    var onWillEnterForeground: (()->())? {get set}
+    var onWillEnterBackground: (()->())? {get set}
+}
+
+class AppStateObserver: AppStateObserving {
+    @objc var onWillEnterForeground: (() -> ())?
+
+    @objc var onWillEnterBackground: (() -> ())?
+
+    init() {
+        subscribeNotificationCenter()
+    }
+
+    private func subscribeNotificationCenter() {
+#if os(iOS)
+        NotificationCenter.default.addObserver(
+            self,
+            selector: #selector(appWillEnterForeground),
+            name: UIApplication.willEnterForegroundNotification,
+            object: nil)
+        NotificationCenter.default.addObserver(
+            self,
+            selector: #selector(appWillEnterBackground),
+            name: UIApplication.willResignActiveNotification,
+            object: nil)
+#endif
+    }
+
+    @objc
+    private func appWillEnterBackground() {
+        onWillEnterBackground?()
+    }
+
+    @objc
+    private func appWillEnterForeground() {
+        onWillEnterForeground?()
+    }
+
+}
+
+

Sources/Relayer/Dispatching.swift

@@ -6,60 +6,53 @@ protocol Dispatching {
     var onDisconnect: (()->())? {get set}
     var onMessage: ((String) -> ())? {get set}
     func send(_ string: String, completion: @escaping (Error?)->())
-    func connect()
-    func disconnect(closeCode: URLSessionWebSocketTask.CloseCode)
+    func connect() throws
+    func disconnect(closeCode: URLSessionWebSocketTask.CloseCode) throws
 }
 
 final class Dispatcher: NSObject, Dispatching {
     var onConnect: (() -> ())?
     var onDisconnect: (() -> ())?
     var onMessage: ((String) -> ())?
     private var textFramesQueue = Queue<String>()
-    private var networkMonitor: NetworkMonitoring
-    private let url: URL
     var socket: WebSocketSessionProtocol
     var socketConnectionObserver: SocketConnectionObserving
+    var socketConnectionHandler: SocketConnectionHandler
 
-    init(url: URL,
-         networkMonitor: NetworkMonitoring = NetworkMonitor(),
-         socket: WebSocketSessionProtocol,
-         socketConnectionObserver: SocketConnectionObserving) {
-        self.url = url
-        self.networkMonitor = networkMonitor
+    init(socket: WebSocketSessionProtocol,
+         socketConnectionObserver: SocketConnectionObserving,
+         socketConnectionHandler: SocketConnectionHandler) {
         self.socket = socket
         self.socketConnectionObserver = socketConnectionObserver
+        self.socketConnectionHandler = socketConnectionHandler
         super.init()
         setUpWebSocketSession()
         setUpSocketConnectionObserving()
-        setUpNetworkMonitoring()
-        socket.connect(on: url)
     }
 
     func send(_ string: String, completion: @escaping (Error?) -> Void) {
         if socket.isConnected {
             self.socket.send(string, completionHandler: completion)
+            //TODO - enqueue     if fails
         } else {
             textFramesQueue.enqueue(string)
         }
     }
 
-    func connect() {
-        if !socket.isConnected {
-            socket.connect(on: url)
-        }
+    func connect() throws {
+        try socketConnectionHandler.handleConnect()
     }
 
-    func disconnect(closeCode: URLSessionWebSocketTask.CloseCode) {
-        socket.disconnect(with: closeCode)
-        onDisconnect?()
+    func disconnect(closeCode: URLSessionWebSocketTask.CloseCode) throws {
+        try socketConnectionHandler.handleDisconnect(closeCode: closeCode)
     }
 
     private func setUpWebSocketSession() {
         socket.onMessageReceived = { [weak self] in
             self?.onMessage?($0)
         }
         socket.onMessageError = { error in
-            print(error)
+            print("WebSocket Error \(error)")
         }
     }
 
@@ -73,16 +66,6 @@ final class Dispatcher: NSObject, Dispatching {
         }
     }
 
-    private func setUpNetworkMonitoring() {
-        networkMonitor.onSatisfied = { [weak self] in
-            self?.connect()
-        }
-        networkMonitor.onUnsatisfied = { [weak self] in
-            self?.disconnect(closeCode: .goingAway)
-        }
-        networkMonitor.startMonitoring()
-    }
-
     private func dequeuePendingTextFrames() {
         while let frame = textFramesQueue.dequeue() {
             send(frame) { error in
@@ -93,4 +76,3 @@ final class Dispatcher: NSObject, Dispatching {
         }
     }
 }
-

Sources/Relayer/NetworkMonitoring.swift

@@ -26,3 +26,4 @@ class NetworkMonitor: NetworkMonitoring {
         monitor.start(queue: monitorQueue)
     }
 }
+

Sources/Relayer/WakuNetworkRelay.swift → Sources/Relayer/Relayer.swift

@@ -4,7 +4,7 @@ import Combine
 import WalletConnectUtils
 
 
-public final class WakuNetworkRelay {
+public final class Relayer {
     enum RelyerError: Error {
         case subscriptionIdNotFound
     }
@@ -28,39 +28,56 @@ public final class WakuNetworkRelay {
         requestAcknowledgePublisherSubject.eraseToAnyPublisher()
     }
     private let requestAcknowledgePublisherSubject = PassthroughSubject<JSONRPCResponse<Bool>, Never>()
-    private let logger: ConsoleLogging
+    let logger: ConsoleLogging
+    static let historyIdentifier = "com.walletconnect.sdk.relayer.subscription_json_rpc_record"
 
     init(dispatcher: Dispatching,
          logger: ConsoleLogging,
-         keyValueStorage: KeyValueStorage,
-         uniqueIdentifier: String) {
+         keyValueStorage: KeyValueStorage) {
         self.logger = logger
         self.dispatcher = dispatcher
-        let historyIdentifier = "com.walletconnect.sdk.\(uniqueIdentifier).relayer.subscription_json_rpc_record"
-        self.jsonRpcSubscriptionsHistory = JsonRpcHistory<RelayJSONRPC.SubscriptionParams>(logger: logger, keyValueStore: KeyValueStore<JsonRpcRecord>(defaults: keyValueStorage, identifier: historyIdentifier))
+
+        self.jsonRpcSubscriptionsHistory = JsonRpcHistory<RelayJSONRPC.SubscriptionParams>(logger: logger, keyValueStore: KeyValueStore<JsonRpcRecord>(defaults: keyValueStorage, identifier: Self.historyIdentifier))
         setUpBindings()
     }
 
-    public convenience init(logger: ConsoleLogging,
-                            url: URL,
-                            keyValueStorage: KeyValueStorage,
-                            uniqueIdentifier: String) {
+    /// Instantiates Relayer
+    /// - Parameters:
+    ///   - relayHost: proxy server host that your application will use to connect to Waku Network. If you register your project at `www.walletconnect.com` you can use `relay.walletconnect.com`
+    ///   - projectId: an optional parameter used to access the public WalletConnect infrastructure. Go to `www.walletconnect.com` for info.
+    ///   - keyValueStorage: by default WalletConnect SDK will store sequences in UserDefaults
+    ///   - uniqueIdentifier: if your app requires more than one relayer instances you are required to call identify them
+    ///   - socketConnectionType: socket connection type
+    ///   - logger: logger instance
+    public convenience init(relayHost: String,
+                            projectId: String,
+                            keyValueStorage: KeyValueStorage = UserDefaults.standard,
+                            uniqueIdentifier: String? = nil,
+                            socketConnectionType: SocketConnectionType = .automatic,
+                            logger: ConsoleLogging = ConsoleLogger(loggingLevel: .off)) {
         let socketConnectionObserver = SocketConnectionObserver()
         let urlSession = URLSession(configuration: .default, delegate: socketConnectionObserver, delegateQueue: OperationQueue())
-        let socket = WebSocketSession(session: urlSession)
-        let dispatcher = Dispatcher(url: url, socket: socket, socketConnectionObserver: socketConnectionObserver)
+        let url = Self.makeRelayUrl(host: relayHost, projectId: projectId)
+        let socket = WebSocketSession(session: urlSession, url: url)
+        var socketConnectionHandler: SocketConnectionHandler
+        switch socketConnectionType {
+        case .automatic:
+            socketConnectionHandler = AutomaticSocketConnectionHandler(socket: socket)
+        case .manual:
+            socketConnectionHandler = ManualSocketConnectionHandler(socket: socket)
+        }
+        let dispatcher = Dispatcher(socket: socket, socketConnectionObserver: socketConnectionObserver, socketConnectionHandler: socketConnectionHandler)
         self.init(dispatcher: dispatcher,
                   logger: logger,
-                  keyValueStorage: keyValueStorage,
-                  uniqueIdentifier: uniqueIdentifier)
+                  keyValueStorage: keyValueStorage)
     }
 
-    public func connect() {
-        dispatcher.connect()
+    public func connect() throws {
+        try dispatcher.connect()
     }
 
-    public func disconnect(closeCode: URLSessionWebSocketTask.CloseCode) {
-        dispatcher.disconnect(closeCode: closeCode)
+    public func disconnect(closeCode: URLSessionWebSocketTask.CloseCode) throws {
+        try dispatcher.disconnect(closeCode: closeCode)
     }
 
     @discardableResult public func publish(topic: String, payload: String, completion: @escaping ((Error?) -> ())) -> Int64 {
@@ -192,7 +209,7 @@ public final class WakuNetworkRelay {
         }
     }
 
-    static public func makeRelayUrl(host: String, projectId: String) -> URL {
+    static private func makeRelayUrl(host: String, projectId: String) -> URL {
         var components = URLComponents()
         components.scheme = "wss"
         components.host = host

Sources/Relayer/SocketConnectionHandler/AutomaticSocketConnectionHandler.swift

@@ -0,0 +1,77 @@
+
+#if os(iOS)
+import UIKit
+#endif
+import Foundation
+
+class AutomaticSocketConnectionHandler: SocketConnectionHandler {
+    enum Error: Swift.Error {
+        case manualSocketConnectionForbidden
+        case manualSocketDisconnectionForbidden
+    }
+    private var appStateObserver: AppStateObserving
+    let socket: WebSocketConnecting
+    private var networkMonitor: NetworkMonitoring
+    private let backgroundTaskRegistrar: BackgroundTaskRegistering
+
+    init(networkMonitor: NetworkMonitoring = NetworkMonitor(),
+         socket: WebSocketConnecting,
+         appStateObserver: AppStateObserving = AppStateObserver(),
+         backgroundTaskRegistrar: BackgroundTaskRegistering = BackgroundTaskRegistrar()) {
+        self.appStateObserver = appStateObserver
+        self.socket = socket
+        self.networkMonitor = networkMonitor
+        self.backgroundTaskRegistrar = backgroundTaskRegistrar
+        setUpStateObserving()
+        setUpNetworkMonitoring()
+        socket.connect()
+    }
+
+    private func setUpStateObserving() {
+        appStateObserver.onWillEnterBackground = { [unowned self] in
+            registerBackgroundTask()
+        }
+
+        appStateObserver.onWillEnterForeground = { [unowned self] in
+            socket.connect()
+        }
+    }
+
+    private func setUpNetworkMonitoring() {
+        networkMonitor.onSatisfied = { [weak self] in
+            self?.handleNetworkSatisfied()
+        }
+        networkMonitor.onUnsatisfied = { [weak self] in
+            self?.handleNetworkUnsatisfied()
+        }
+        networkMonitor.startMonitoring()
+    }
+
+    func registerBackgroundTask() {
+        backgroundTaskRegistrar.register(name: "Finish Network Tasks") { [unowned self] in
+            endBackgroundTask()
+        }
+    }
+
+    func endBackgroundTask() {
+        socket.disconnect(with: .normalClosure)
+    }
+
+    func handleConnect() throws {
+        throw Error.manualSocketConnectionForbidden
+    }
+
+    func handleDisconnect(closeCode: URLSessionWebSocketTask.CloseCode) throws {
+        throw Error.manualSocketDisconnectionForbidden
+    }
+
+    func handleNetworkUnsatisfied() {
+        socket.disconnect(with: .goingAway)
+    }
+
+    func handleNetworkSatisfied() {
+        if !socket.isConnected {
+            socket.connect()
+        }
+    }
+}