Reduce VPN manager instances

DuckDuckGo.xcodeproj/project.pbxproj

@@ -10182,7 +10182,7 @@
 			repositoryURL = "https://github.com/DuckDuckGo/BrowserServicesKit";
 			requirement = {
 				kind = exactVersion;
-				version = 173.0.0;
+				version = 174.0.0;
 			};
 		};
 		9F8FE9472BAE50E50071E372 /* XCRemoteSwiftPackageReference "lottie-spm" */ = {

DuckDuckGo.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -32,8 +32,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/DuckDuckGo/BrowserServicesKit",
       "state" : {
-        "revision" : "16686ec1d3a8641b47c55d5271e29c7dbe4c9e73",
-        "version" : "173.0.0"
+        "revision" : "6db80afec11da4f0a36a81dc6030f7e83a524c87",
+        "version" : "174.0.0"
       }
     },
     {
@@ -138,7 +138,7 @@
     {
       "identity" : "swift-argument-parser",
       "kind" : "remoteSourceControl",
-      "location" : "https://github.com/apple/swift-argument-parser",
+      "location" : "https://github.com/apple/swift-argument-parser.git",
       "state" : {
         "revision" : "0fbc8848e389af3bb55c182bc19ca9d5dc2f255b",
         "version" : "1.4.0"

DuckDuckGo/AppDependencyProvider.swift

@@ -47,6 +47,7 @@ protocol DependencyProvider {
     var networkProtectionKeychainTokenStore: NetworkProtectionKeychainTokenStore { get }
     var networkProtectionTunnelController: NetworkProtectionTunnelController { get }
     var connectionObserver: ConnectionStatusObserver { get }
+    var serverInfoObserver: ConnectionServerInfoObserver { get }
     var vpnSettings: VPNSettings { get }
 }
 
@@ -88,6 +89,7 @@ class AppDependencyProvider: DependencyProvider {
     let subscriptionAppGroup = Bundle.main.appGroup(bundle: .subs)
 
     let connectionObserver: ConnectionStatusObserver = ConnectionStatusObserverThroughSession()
+    let serverInfoObserver: ConnectionServerInfoObserver = ConnectionServerInfoObserverThroughSession()
     let vpnSettings = VPNSettings(defaults: .networkProtectionGroupDefaults)
 
     init() {

DuckDuckGo/NetworkProtectionConvenienceInitialisers.swift

@@ -28,7 +28,7 @@ import Subscription
 
 private class DefaultTunnelSessionProvider: TunnelSessionProvider {
     func activeSession() async -> NETunnelProviderSession? {
-        try? await ConnectionSessionUtilities.activeSession()
+        return await AppDependencyProvider.shared.networkProtectionTunnelController.activeSession()
     }
 }
 

DuckDuckGo/NetworkProtectionDebugUtilities.swift

@@ -31,7 +31,7 @@ final class NetworkProtectionDebugUtilities {
     // MARK: - Registation Key
 
     func expireRegistrationKeyNow() async {
-        guard let activeSession = try? await ConnectionSessionUtilities.activeSession() else {
+        guard let activeSession = await AppDependencyProvider.shared.networkProtectionTunnelController.activeSession() else {
             return
         }
 
@@ -41,7 +41,7 @@ final class NetworkProtectionDebugUtilities {
     // MARK: - Notifications
 
     func sendTestNotificationRequest() async throws {
-        guard let activeSession = try? await ConnectionSessionUtilities.activeSession() else {
+        guard let activeSession = await AppDependencyProvider.shared.networkProtectionTunnelController.activeSession() else {
             return
         }
 
@@ -51,7 +51,7 @@ final class NetworkProtectionDebugUtilities {
     // MARK: - Disable VPN
 
     func disableConnectOnDemandAndShutDown() async {
-        guard let activeSession = try? await ConnectionSessionUtilities.activeSession() else {
+        guard let activeSession = await AppDependencyProvider.shared.networkProtectionTunnelController.activeSession() else {
             return
         }
 
@@ -61,7 +61,7 @@ final class NetworkProtectionDebugUtilities {
     // MARK: - Failure Simulation
 
     func triggerSimulation(_ option: NetworkProtectionSimulationOption) async {
-        guard let activeSession = try? await ConnectionSessionUtilities.activeSession() else {
+        guard let activeSession = await AppDependencyProvider.shared.networkProtectionTunnelController.activeSession() else {
             return
         }
 

DuckDuckGo/NetworkProtectionRootView.swift

@@ -33,6 +33,7 @@ struct NetworkProtectionRootView: View {
         statusViewModel = NetworkProtectionStatusViewModel(tunnelController: AppDependencyProvider.shared.networkProtectionTunnelController,
                                                            settings: AppDependencyProvider.shared.vpnSettings,
                                                            statusObserver: AppDependencyProvider.shared.connectionObserver,
+                                                           serverInfoObserver: AppDependencyProvider.shared.serverInfoObserver,
                                                            locationListRepository: locationListRepository)
     }
     var body: some View {

DuckDuckGo/NetworkProtectionStatusView.swift

@@ -202,11 +202,9 @@ struct NetworkProtectionStatusView: View {
     @ViewBuilder
     private func about() -> some View {
         Section {
-            if statusModel.shouldShowFAQ {
-                NavigationLink(UserText.netPVPNSettingsFAQ, destination: LazyView(NetworkProtectionFAQView()))
-                    .daxBodyRegular()
-                    .foregroundColor(.init(designSystemColor: .textPrimary))
-            }
+            NavigationLink(UserText.netPVPNSettingsFAQ, destination: LazyView(NetworkProtectionFAQView()))
+                .daxBodyRegular()
+                .foregroundColor(.init(designSystemColor: .textPrimary))
 
             NavigationLink(UserText.netPVPNSettingsShareFeedback, destination: VPNFeedbackFormCategoryView())
                 .daxBodyRegular()

DuckDuckGo/NetworkProtectionStatusViewModel.swift

@@ -87,7 +87,7 @@ final class NetworkProtectionStatusViewModel: ObservableObject {
         return formatter
     }()
 
-    private let tunnelController: TunnelController
+    private let tunnelController: (TunnelController & TunnelSessionProvider)
     private let statusObserver: ConnectionStatusObserver
     private let serverInfoObserver: ConnectionServerInfoObserver
     private let errorObserver: ConnectionErrorObserver
@@ -134,16 +134,12 @@ final class NetworkProtectionStatusViewModel: ObservableObject {
     @Published public var downloadTotal: String?
     private var throughputUpdateTimer: Timer?
 
-    var shouldShowFAQ: Bool {
-        AppDependencyProvider.shared.subscriptionFeatureAvailability.isFeatureAvailable
-    }
-
     @Published public var animationsOn: Bool = false
 
-    public init(tunnelController: TunnelController,
+    public init(tunnelController: (TunnelController & TunnelSessionProvider),
                 settings: VPNSettings,
                 statusObserver: ConnectionStatusObserver,
-                serverInfoObserver: ConnectionServerInfoObserver = ConnectionServerInfoObserverThroughSession(),
+                serverInfoObserver: ConnectionServerInfoObserver,
                 errorObserver: ConnectionErrorObserver = ConnectionErrorObserverThroughSession(),
                 locationListRepository: NetworkProtectionLocationListRepository) {
         self.tunnelController = tunnelController
@@ -159,6 +155,8 @@ final class NetworkProtectionStatusViewModel: ObservableObject {
 
         self.dnsSettings = settings.dnsSettings
 
+        updateViewModel(withStatus: statusObserver.recentValue)
+
         setUpIsConnectedStatePublishers()
         setUpToggledStatePublisher()
         setUpStatusMessagePublishers()
@@ -176,30 +174,10 @@ final class NetworkProtectionStatusViewModel: ObservableObject {
     }
 
     private func setUpIsConnectedStatePublishers() {
-        let isConnectedPublisher = statusObserver.publisher
-            .map { $0.isConnected }
-            .receive(on: DispatchQueue.main)
-            .eraseToAnyPublisher()
-        isConnectedPublisher
-            .map(Self.titleText(connected:))
-            .assign(to: \.headerTitle, onWeaklyHeld: self)
-            .store(in: &cancellables)
-        isConnectedPublisher
-            .map(Self.statusImageID(connected:))
-            .assign(to: \.statusImageID, onWeaklyHeld: self)
-            .store(in: &cancellables)
-        isConnectedPublisher
-            .sink { [weak self] isConnected in
-                if !isConnected {
-                    self?.uploadTotal = nil
-                    self?.downloadTotal = nil
-                    self?.throughputUpdateTimer?.invalidate()
-                    self?.throughputUpdateTimer = nil
-                } else {
-                    self?.setUpThroughputRefreshTimer()
-                }
-            }
-            .store(in: &cancellables)
+        statusObserver.publisher.sink { [weak self] status in
+            self?.updateViewModel(withStatus: status)
+        }
+        .store(in: &cancellables)
     }
 
     private func setUpToggledStatePublisher() {
@@ -292,6 +270,31 @@ final class NetworkProtectionStatusViewModel: ObservableObject {
             .store(in: &cancellables)
     }
 
+    private func updateViewModel(withStatus connectionStatus: ConnectionStatus) {
+        self.headerTitle = Self.titleText(connected: connectionStatus.isConnected)
+        self.statusImageID = Self.statusImageID(connected: connectionStatus.isConnected)
+
+        if !connectionStatus.isConnected {
+            self.uploadTotal = nil
+            self.downloadTotal = nil
+            self.throughputUpdateTimer?.invalidate()
+            self.throughputUpdateTimer = nil
+        } else {
+            self.setUpThroughputRefreshTimer()
+        }
+
+        switch connectionStatus {
+        case .connected:
+            self.isNetPEnabled = true
+        case .connecting:
+            self.isNetPEnabled = true
+            self.resetConnectionInformation()
+        default:
+            self.isNetPEnabled = false
+            self.resetConnectionInformation()
+        }
+    }
+
     private func setUpErrorPublishers() {
         guard AppDependencyProvider.shared.internalUserDecider.isInternalUser else {
             return
@@ -346,7 +349,7 @@ final class NetworkProtectionStatusViewModel: ObservableObject {
     }
 
     private func refreshDataVolumeTotals() async {
-        guard let activeSession = try? await ConnectionSessionUtilities.activeSession() else {
+        guard let activeSession = await tunnelController.activeSession() else {
             return
         }