APPLE: fix wrong connection mode on first launch (#3991)

Author: rokas-ambrazevicius

nym-vpn-apple/Services/Sources/Services/AppSettings/AppSettings.swift

@@ -43,6 +43,9 @@ import CountriesManagerTypes
     @AppStorage(AppSettingKey.exitRouter.rawValue)
     public var exitRouter: String?
 
+    @AppStorage(AppSettingKey.connectionConfig.rawValue)
+    public var connectionConfig: String?
+
     @AppStorage(AppSettingKey.connectionType.rawValue)
     public var connectionType: Int?
 
@@ -133,4 +136,5 @@ public enum AppSettingKey: String {
     case quic
     case shouldReconnect
     case passphraseStored
+    case connectionConfig
 }

nym-vpn-apple/Services/Sources/Services/ConnectionManager/ConnectionManager+macOS.swift

@@ -1,7 +1,8 @@
 #if os(macOS)
 import Foundation
-import TunnelMixnet
+import ConnectionTypes
 import NotificationMessages
+import TunnelMixnet
 
 extension ConnectionManager {
     @MainActor func connect() async throws {
@@ -20,13 +21,8 @@ extension ConnectionManager {
         }
     }
 
-    @MainActor func fetchConnectionConfig() async {
-        connectionConfig = await grpcManager.config()
-    }
-
     func updateConnectionConfig() {
         Task {
-            guard let connectionConfig else { return }
             try? await grpcManager.updateConfig(newConfig: connectionConfig)
         }
     }
@@ -63,16 +59,6 @@ extension ConnectionManager {
             }
             .store(in: &cancellables)
 
-        grpcManager.$isServing
-            .receive(on: DispatchQueue.main)
-            .sink { [weak self] isServing in
-                guard isServing else { return }
-                Task { @MainActor in
-                    await self?.fetchConnectionConfig()
-                }
-            }
-            .store(in: &cancellables)
-
         grpcManager.$connectionInfoData
             .removeDuplicates()
             .receive(on: DispatchQueue.main)
@@ -82,7 +68,7 @@ extension ConnectionManager {
         appSettings.$isQuicEnabledPublisher
             .receive(on: DispatchQueue.main)
             .sink { [weak self] newValue in
-                self?.connectionConfig?.enableBridges = newValue
+                self?.connectionConfig.enableBridges = newValue
                 guard let self, currentTunnelStatus == .connected, appSettings.shouldReconnect else { return }
                 updateConnectionConfig()
             }

nym-vpn-apple/Services/Sources/Services/ConnectionManager/ConnectionManager.swift

@@ -52,7 +52,11 @@ import GRPCManager
     )
 #endif
 
-    @Published public var connectionConfig: ConnectionConfig?
+    @Published public var connectionConfig: ConnectionConfig {
+        didSet {
+            connectionStorage.connectionConfig = connectionConfig
+        }
+    }
     @Published public var connectedDate: Date?
     @Published public var connectionRetryAttempt: Int?
     @Published public var afterDisconnectAction: AfterDisconnectAction?
@@ -64,9 +68,9 @@ import GRPCManager
         didSet {
             switch connectionType {
             case .mixnet5hop:
-                connectionConfig?.enableTwoHop = false
+                connectionConfig.enableTwoHop = false
             case .wireguard:
-                connectionConfig?.enableTwoHop = true
+                connectionConfig.enableTwoHop = true
             }
             appSettings.connectionType = connectionType.rawValue
             updateConnectionConfig()
@@ -89,7 +93,7 @@ import GRPCManager
     @Published public var entryGateway: EntryGateway {
         didSet {
             Task { @MainActor in
-                connectionConfig?.entry = entryGateway
+                connectionConfig.entry = entryGateway
                 connectionStorage.entryGateway = entryGateway
                 updateConnectionConfig()
             }
@@ -98,7 +102,7 @@ import GRPCManager
     @Published public var exitRouter: ExitRouter {
         didSet {
             Task { @MainActor in
-                connectionConfig?.exit = exitRouter
+                connectionConfig.exit = exitRouter
                 connectionStorage.exitRouter = exitRouter
                 updateConnectionConfig()
             }
@@ -119,6 +123,7 @@ import GRPCManager
         self.entryGateway = connectionStorage.entryGateway
         self.exitRouter = connectionStorage.exitRouter
         self.connectionType = connectionStorage.connectionType
+        self.connectionConfig = connectionStorage.connectionConfig
         setup()
     }
 #endif
@@ -139,6 +144,7 @@ import GRPCManager
         self.entryGateway = connectionStorage.entryGateway
         self.exitRouter = connectionStorage.exitRouter
         self.connectionType = connectionStorage.connectionType
+        self.connectionConfig = connectionStorage.connectionConfig
         setup()
     }
 #endif
@@ -169,9 +175,6 @@ private extension ConnectionManager {
         setupAppSettingsObservers()
         setupConnectionChangeObserver()
         setupConnectionErrorObserver()
-        Task { @MainActor in
-            await fetchConnectionConfig()
-        }
     }
 }
 
@@ -210,7 +213,7 @@ private extension ConnectionManager {
         appSettings.$isQuicEnabledPublisher
             .removeDuplicates()
             .sink { [weak self] value in
-                self?.connectionConfig?.enableBridges = value
+                self?.connectionConfig.enableBridges = value
             }
             .store(in: &cancellables)
 

nym-vpn-apple/Services/Sources/Services/ConnectionManager/ConnectionStorage.swift

@@ -14,7 +14,6 @@ import GatewayManager
     private let appSettings: AppSettings
     private let configurationManager: ConfigurationManager
     private let gatewayManager: GatewayManager
-    private let resolver = GatewaySelectionResolver()
 
     private var entryGatewayType: NodeType { connectionType == .wireguard ? .vpn : .entry }
     private var exitGatewayType: NodeType { connectionType == .wireguard ? .vpn : .exit }
@@ -38,49 +37,17 @@ import GatewayManager
         set { appSettings.exitRouter = newValue.toJson() }
     }
 
-    var resolvedEntryGateway: EntryGateway {
-        get async {
-            let json = appSettings.entryGateway ?? ""
-            let snapshotEntry = gatewayManager.entry
-            let snapshotExit  = gatewayManager.exit
-            let snapshotVPN   = gatewayManager.vpn
-            let entryCountries = gatewayManager.entryCountries
-            let exitCountries  = gatewayManager.exitCountries
-            let vpnCountries   = gatewayManager.vpnCountries
-
-            return await resolver.resolveEntryGateway(
-                jsonString: json,
-                connectionType: connectionType,
-                entry: snapshotEntry,
-                exit: snapshotExit,
-                vpn: snapshotVPN,
-                entryCountries: entryCountries,
-                exitCountries: exitCountries,
-                vpnCountries: vpnCountries
-            )
+    var connectionConfig: ConnectionConfig {
+        get {
+            guard let storedConfig = appSettings.connectionConfig,
+                  let decodedConfig = ConnectionConfig.from(jsonString: storedConfig)
+            else {
+                return generateInitialConfig()
+            }
+            return decodedConfig
         }
-    }
-
-    var resolvedExitRouter: ExitRouter {
-        get async {
-            let json = appSettings.exitRouter ?? ""
-            let snapshotEntry = gatewayManager.entry
-            let snapshotExit  = gatewayManager.exit
-            let snapshotVPN   = gatewayManager.vpn
-            let entryCountries = gatewayManager.entryCountries
-            let exitCountries  = gatewayManager.exitCountries
-            let vpnCountries   = gatewayManager.vpnCountries
-
-            return await resolver.resolveExitRouter(
-                jsonString: json,
-                connectionType: connectionType,
-                entry: snapshotEntry,
-                exit: snapshotExit,
-                vpn: snapshotVPN,
-                entryCountries: entryCountries,
-                exitCountries: exitCountries,
-                vpnCountries: vpnCountries
-            )
+        set {
+            appSettings.connectionConfig = newValue.toJson()
         }
     }
 
@@ -94,3 +61,20 @@ import GatewayManager
         self.gatewayManager = gatewayManager
     }
 }
+
+private extension ConnectionStorage {
+    func generateInitialConfig() -> ConnectionConfig {
+        ConnectionConfig(
+            entry: entryGateway,
+            exit: exitRouter,
+            allowLan: false,
+            disableIpv6: !appSettings.isIPv6TrafficEnabled,
+            enableTwoHop: connectionType == .wireguard,
+            enableBridges: appSettings.isQuicEnabled,
+            netstack: false,
+            disablePoissonRate: false,
+            disableBackgroundCoverTraffic: false,
+            residentialExit: false
+        )
+    }
+}