Handle disconnect on foreground only

WalletConnect · Nov 22, 2022 · 0434e31 · 0434e31
1 parent 88be00f
commit 0434e31
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 10 deletions.
diff --git a/Sources/WalletConnectRelay/AppStateObserving.swift b/Sources/WalletConnectRelay/AppStateObserving.swift
@@ -1,14 +1,23 @@
 import Foundation
-#if os(iOS)
+
+#if canImport(UIKit)
 import UIKit
+#elseif canImport(AppKit)
+import AppKit
 #endif
 
+enum ApplicationState {
+    case background, foreground
+}
+
 protocol AppStateObserving: AnyObject {
+    var currentState: ApplicationState { get }
     var onWillEnterForeground: (() -> Void)? {get set}
     var onWillEnterBackground: (() -> Void)? {get set}
 }
 
 class AppStateObserver: AppStateObserving {
+
     @objc var onWillEnterForeground: (() -> Void)?
 
     @objc var onWillEnterBackground: (() -> Void)?
@@ -17,6 +26,16 @@ class AppStateObserver: AppStateObserving {
         subscribeNotificationCenter()
     }
 
+    var currentState: ApplicationState {
+#if canImport(UIKit)
+        let isActive = UIApplication.shared.applicationState == .active
+        return isActive ? .foreground : .background
+#elseif canImport(AppKit)
+        let isActive = NSApplication.shared.isActive
+        return isActive ? .foreground : .background
+#endif
+    }
+
     private func subscribeNotificationCenter() {
 #if os(iOS)
         NotificationCenter.default.addObserver(

diff --git a/Sources/WalletConnectRelay/SocketConnectionHandler/AutomaticSocketConnectionHandler.swift b/Sources/WalletConnectRelay/SocketConnectionHandler/AutomaticSocketConnectionHandler.swift
@@ -10,8 +10,7 @@ class AutomaticSocketConnectionHandler {
         case manualSocketConnectionForbidden, manualSocketDisconnectionForbidden
     }
 
-    let socket: WebSocketConnecting
-
+    private let socket: WebSocketConnecting
     private let appStateObserver: AppStateObserving
     private let networkMonitor: NetworkMonitoring
     private let backgroundTaskRegistrar: BackgroundTaskRegistering
@@ -82,6 +81,8 @@ extension AutomaticSocketConnectionHandler: SocketConnectionHandler {
     }
 
     func handleDisconnection() {
-        reconnect()
+        if appStateObserver.currentState == .foreground {
+            reconnect()
+        }
     }
 }
diff --git a/Tests/RelayerTests/AutomaticSocketConnectionHandlerTests.swift b/Tests/RelayerTests/AutomaticSocketConnectionHandlerTests.swift
@@ -6,8 +6,9 @@ final class AutomaticSocketConnectionHandlerTests: XCTestCase {
     var sut: AutomaticSocketConnectionHandler!
     var webSocketSession: WebSocketMock!
     var networkMonitor: NetworkMonitoringMock!
-    var appStateObserver: AppStateObserving!
+    var appStateObserver: AppStateObserverMock!
     var backgroundTaskRegistrar: BackgroundTaskRegistrarMock!
+
     override func setUp() {
         webSocketSession = WebSocketMock()
         networkMonitor = NetworkMonitoringMock()
@@ -22,9 +23,9 @@ final class AutomaticSocketConnectionHandlerTests: XCTestCase {
 
     func testConnectsOnConnectionSatisfied() {
         webSocketSession.disconnect()
-        XCTAssertFalse(sut.socket.isConnected)
+        XCTAssertFalse(webSocketSession.isConnected)
         networkMonitor.onSatisfied?()
-        XCTAssertTrue(sut.socket.isConnected)
+        XCTAssertTrue(webSocketSession.isConnected)
     }
 
     func testHandleConnectThrows() {
@@ -38,7 +39,7 @@ final class AutomaticSocketConnectionHandlerTests: XCTestCase {
     func testReconnectsOnEnterForeground() {
         webSocketSession.disconnect()
         appStateObserver.onWillEnterForeground?()
-        XCTAssertTrue(sut.socket.isConnected)
+        XCTAssertTrue(webSocketSession.isConnected)
     }
 
     func testRegisterTaskOnEnterBackground() {
@@ -49,8 +50,24 @@ final class AutomaticSocketConnectionHandlerTests: XCTestCase {
 
     func testDisconnectOnEndBackgroundTask() {
         appStateObserver.onWillEnterBackground?()
-        XCTAssertTrue(sut.socket.isConnected)
+        XCTAssertTrue(webSocketSession.isConnected)
         backgroundTaskRegistrar.completion!()
-        XCTAssertFalse(sut.socket.isConnected)
+        XCTAssertFalse(webSocketSession.isConnected)
+    }
+
+    func testReconnectOnDisconnectForeground() {
+        appStateObserver.currentState = .foreground
+        XCTAssertTrue(webSocketSession.isConnected)
+        webSocketSession.disconnect()
+        sut.handleDisconnection()
+        XCTAssertTrue(webSocketSession.isConnected)
+    }
+
+    func testReconnectOnDisconnectBackground() {
+        appStateObserver.currentState = .background
+        XCTAssertTrue(webSocketSession.isConnected)
+        webSocketSession.disconnect()
+        sut.handleDisconnection()
+        XCTAssertFalse(webSocketSession.isConnected)
     }
 }
diff --git a/Tests/RelayerTests/Mocks/AppStateObserverMock.swift b/Tests/RelayerTests/Mocks/AppStateObserverMock.swift
@@ -2,6 +2,7 @@ import Foundation
 @testable import WalletConnectRelay
 
 class AppStateObserverMock: AppStateObserving {
+    var currentState: ApplicationState = .foreground
     var onWillEnterForeground: (() -> Void)?
     var onWillEnterBackground: (() -> Void)?
 }