Merge pull request #42 from WalletConnect/#41-register-background-task

register background task
WalletConnect · Jan 25, 2022 · 673318a · 673318a
2 parents 496f6a8 + 6794a6f
commit 673318a
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 17 deletions.
diff --git a/Example/ExampleApp/Proposer/ProposerViewController.swift b/Example/ExampleApp/Proposer/ProposerViewController.swift
@@ -47,6 +47,7 @@ final class ProposerViewController: UIViewController {
         proposerView.tableView.delegate = self
 
         client.delegate = self
+        client.logger.setLogging(level: .debug)
     }
 
     @objc func copyURI() {

diff --git a/Sources/Relayer/WakuNetworkRelay.swift b/Sources/Relayer/WakuNetworkRelay.swift
@@ -184,7 +184,7 @@ public final class WakuNetworkRelay {
     private func acknowledgeSubscription(requestId: Int64) {
         let response = JSONRPCResponse(id: requestId, result: AnyCodable(true))
         let responseJson = try! response.json()
-        try? jsonRpcSubscriptionsHistory.resolve(response: JsonRpcResponseTypes.response(response))
+        _ = try? jsonRpcSubscriptionsHistory.resolve(response: JsonRpcResponseTypes.response(response))
         dispatcher.send(responseJson) { [weak self] error in
             if let error = error {
                 self?.logger.debug("Failed to Respond for request id: \(requestId), error: \(error)")

diff --git a/Sources/WalletConnect/Engine/PairingEngine.swift b/Sources/WalletConnect/Engine/PairingEngine.swift
@@ -2,6 +2,7 @@ import Foundation
 import Combine
 import WalletConnectUtils
 
+
 final class PairingEngine {
 
     var onApprovalAcknowledgement: ((Pairing) -> Void)?
@@ -163,7 +164,7 @@ final class PairingEngine {
             }
         }
     }
-    
+
     private func setUpWCRequestHandling() {
         wcSubscriber.onReceivePayload = { [unowned self] subscriptionPayload in
             let requestId = subscriptionPayload.wcRequest.id

diff --git a/Sources/WalletConnect/Engine/SessionEngine.swift b/Sources/WalletConnect/Engine/SessionEngine.swift
@@ -366,7 +366,7 @@ final class SessionEngine {
             if let error = error {
                 logger.error(error)
             } else {
-                try? sequencesStore.setSequence(session)
+                sequencesStore.setSequence(session)
                 onSessionUpgrade?(session.topic, newPermissions)
             }
         }

diff --git a/Sources/WalletConnect/Relay/WalletConnectRelay.swift b/Sources/WalletConnect/Relay/WalletConnectRelay.swift
@@ -103,10 +103,10 @@ class WalletConnectRelay: WalletConnectRelaying {
 
     func respond(topic: String, response: JsonRpcResponseTypes, completion: @escaping ((Error?)->())) {
         do {
-            try jsonRpcHistory.resolve(response: response)
+            _ = try jsonRpcHistory.resolve(response: response)
             let message = try jsonRpcSerialiser.serialise(topic: topic, encodable: response.value)
             logger.debug("Responding....topic: \(topic)")
-            networkRelayer.publish(topic: topic, payload: message) { [weak self] error in
+            networkRelayer.publish(topic: topic, payload: message) { error in
                 completion(error)
             }
         } catch WalletConnectError.internal(.jsonRpcDuplicateDetected) {

diff --git a/Sources/WalletConnect/WalletConnectClient.swift b/Sources/WalletConnect/WalletConnectClient.swift
@@ -31,7 +31,10 @@ public final class WalletConnectClient {
     private let secureStorage: SecureStorage
     private let pairingQueue = DispatchQueue(label: "com.walletconnect.sdk.client.pairing", qos: .userInitiated)
     private let history: JsonRpcHistory
-
+#if os(iOS)
+    private var backgroundTaskID: UIBackgroundTaskIdentifier = .invalid
+#endif
+
     // MARK: - Initializers
 
     /// Initializes and returns newly created WalletConnect Client Instance. Establishes a network connection with the relay
@@ -68,8 +71,25 @@ public final class WalletConnectClient {
         self.sessionEngine = SessionEngine(relay: relay, crypto: crypto, subscriber: WCSubscriber(relay: relay, logger: logger), sequencesStore: sessionSequencesStore, isController: isController, metadata: metadata, logger: logger)
         setUpEnginesCallbacks()
         subscribeNotificationCenter()
+        registerBackgroundTask()
     }
 
+    func registerBackgroundTask() {
+#if os(iOS)
+        self.backgroundTaskID = UIApplication.shared.beginBackgroundTask (withName: "Finish Network Tasks") { [weak self] in
+            self?.endBackgroundTask()
+        }
+#endif
+    }
+
+    func endBackgroundTask() {
+#if os(iOS)
+        wakuRelay.disconnect(closeCode: .goingAway)
+        print("Background task ended.")
+        UIApplication.shared.endBackgroundTask(backgroundTaskID)
+        backgroundTaskID = .invalid
+#endif
+    }
     deinit {
         unsubscribeNotificationCenter()
     }
@@ -291,11 +311,6 @@ public final class WalletConnectClient {
 
     private func subscribeNotificationCenter() {
 #if os(iOS)
-        NotificationCenter.default.addObserver(
-            self,
-            selector: #selector(appDidEnterBackground),
-            name: UIApplication.didEnterBackgroundNotification,
-            object: nil)
         NotificationCenter.default.addObserver(
             self,
             selector: #selector(appWillEnterForeground),
@@ -306,18 +321,14 @@ public final class WalletConnectClient {
 
     private func unsubscribeNotificationCenter() {
 #if os(iOS)
-        NotificationCenter.default.removeObserver(self, name: UIApplication.didEnterBackgroundNotification, object: nil)
         NotificationCenter.default.removeObserver(self, name: UIApplication.willEnterForegroundNotification, object: nil)
 #endif
     }
 
     @objc
     private func appWillEnterForeground() {
         wakuRelay.connect()
+        registerBackgroundTask()
     }
-
-    @objc
-    private func appDidEnterBackground() {
-        wakuRelay.disconnect(closeCode: .goingAway)
-    }
+
 }