Adds pixels to track CC usage for the VPN

duckduckgo · Dec 16, 2024 · b57e2a5 · b57e2a5
1 parent c5704a9
commit b57e2a5
Show file tree

Hide file tree

Showing 2 changed files with 55 additions and 12 deletions.
diff --git a/Core/PixelEvent.swift b/Core/PixelEvent.swift
@@ -470,6 +470,16 @@ extension Pixel {
         case networkProtectionWidgetDisconnectCancelled
         case networkProtectionWidgetDisconnectFailure
 
+        case vpnControlCenterConnectAttempt
+        case vpnControlCenterConnectSuccess
+        case vpnControlCenterConnectCancelled
+        case vpnControlCenterConnectFailure
+
+        case vpnControlCenterDisconnectAttempt
+        case vpnControlCenterDisconnectSuccess
+        case vpnControlCenterDisconnectCancelled
+        case vpnControlCenterDisconnectFailure
+
         case networkProtectionDNSUpdateCustom
         case networkProtectionDNSUpdateDefault
 
@@ -1671,6 +1681,16 @@ extension Pixel.Event {
         case .networkProtectionWidgetDisconnectCancelled: return "m_netp_widget_disconnect_cancelled"
         case .networkProtectionWidgetDisconnectFailure: return "m_netp_widget_disconnect_failure"
 
+        case .vpnControlCenterConnectAttempt: return "m_vpn_control-center_connect_attempt"
+        case .vpnControlCenterConnectSuccess: return "m_vpn_control-center_connect_success"
+        case .vpnControlCenterConnectCancelled: return "m_vpn_control-center_connect_cancelled"
+        case .vpnControlCenterConnectFailure: return "m_vpn_control-center_connect_failure"
+
+        case .vpnControlCenterDisconnectAttempt: return "m_vpn_control-center_disconnect_attempt"
+        case .vpnControlCenterDisconnectSuccess: return "m_vpn_control-center_disconnect_success"
+        case .vpnControlCenterDisconnectCancelled: return "m_vpn_control-center_disconnect_cancelled"
+        case .vpnControlCenterDisconnectFailure: return "m_vpn_control-center_disconnect_failure"
+
         // MARK: Secure Vault
         case .secureVaultL1KeyMigration: return "m_secure-vault_keystore_event_l1-key-migration"
         case .secureVaultL2KeyMigration: return "m_secure-vault_keystore_event_l2-key-migration"

diff --git a/DuckDuckGo/VPNToggleIntent.swift b/DuckDuckGo/VPNToggleIntent.swift
@@ -22,6 +22,7 @@ import NetworkExtension
 import NetworkProtection
 import WidgetKit
 import Core
+import OSLog
 
 // MARK: - Toggle
 
@@ -45,30 +46,52 @@ extension VPNToggleIntent: SetValueIntent & ForegroundContinuableIntent {
 
     @MainActor
     func perform() async throws -> some IntentResult {
-        do {
-            //DailyPixel.fireDailyAndCount(pixel: .networkProtectionWidgetConnectAttempt)
+        if value {
+            try await startVPN()
+        } else {
+            try await stopVPN()
+        }
 
-            let controller = VPNIntentTunnelController()
+        return .result()
+    }
 
-            if value {
-                try await controller.start()
-            } else {
-                try await controller.stop()
-            }
+    private func startVPN() async throws {
+        do {
+            DailyPixel.fireDailyAndCount(pixel: .vpnControlCenterConnectAttempt)
 
-            return .result()
+            let controller = VPNIntentTunnelController()
+            try await controller.start()
+            DailyPixel.fireDailyAndCount(pixel: .vpnControlCenterConnectSuccess)
         } catch {
             switch error {
             case VPNIntentTunnelController.StartFailure.vpnNotConfigured:
-                //DailyPixel.fireDailyAndCount(pixel: .networkProtectionWidgetConnectCancelled)
+                DailyPixel.fireDailyAndCount(pixel: .vpnControlCenterConnectCancelled)
 
                 let dialog = IntentDialog(stringLiteral: UserText.vpnNeedsToBeEnabledFromApp)
-                throw needsToContinueInForegroundError() {
+                throw needsToContinueInForegroundError(dialog) {
                     await UIApplication.shared.open(AppDeepLinkSchemes.openVPN.url)
                 }
             default:
-                //DailyPixel.fireDailyAndCount(pixel: .networkProtectionWidgetConnectFailure, error: error)
+                DailyPixel.fireDailyAndCount(pixel: .vpnControlCenterConnectFailure, error: error)
+                throw error
+            }
+        }
+    }
 
+    private func stopVPN() async throws {
+        do {
+            DailyPixel.fireDailyAndCount(pixel: .vpnControlCenterDisconnectAttempt)
+
+            let controller = VPNIntentTunnelController()
+            try await controller.stop()
+            DailyPixel.fireDailyAndCount(pixel: .vpnControlCenterDisconnectSuccess)
+        } catch {
+            switch error {
+            case VPNIntentTunnelController.StopFailure.vpnNotConfigured:
+                DailyPixel.fireDailyAndCount(pixel: .vpnControlCenterDisconnectCancelled)
+                throw error
+            default:
+                DailyPixel.fireDailyAndCount(pixel: .vpnControlCenterDisconnectFailure, error: error)
                 throw error
             }
         }