feat: sync the widget and app.

ref sing-box.

Author: YinMo19

ControlWidgets/AppIntent.swift

@@ -8,38 +8,78 @@
 import AppIntents
 import SwiftUI
 import WidgetKit
+import NetworkExtension
 
 struct ControlWidgetsControl: ControlWidget {
     static let kind: String = "site.yinmo.easytier.ControlWidgets"
 
     var body: some ControlWidgetConfiguration {
-        AppIntentControlConfiguration(
+        StaticControlConfiguration(
             kind: Self.kind,
             provider: VPNControlProvider()
         ) { isConnected in
             ControlWidgetToggle(
+                "EasyTier",
                 isOn: isConnected,
                 action: ToggleVPNIntent()
-            ) {
-                Label("EasyTier", systemImage: "network")
+            ) { isOn in
+                Label(isOn ? "Connected" : "Disconnected", systemImage: "network")
+                    .controlWidgetActionHint(isOn ? "Disconnect" : "Connect")
             }
         }
         .displayName("EasyTier")
         .description("Toggle VPN connection")
     }
 }
 
-struct VPNControlProvider: AppIntentControlValueProvider {
-    func previewValue(configuration: VPNControlConfiguration) -> Bool {
-        false
-    }
-    
-    func currentValue(configuration: VPNControlConfiguration) async throws -> Bool {
-        let defaults = UserDefaults(suiteName: "group.site.yinmo.easytier")
-        return defaults?.bool(forKey: "VPNIsConnected") ?? false
+extension ControlWidgetsControl {
+    struct VPNControlProvider: ControlValueProvider {
+        var previewValue: Bool {
+            false
+        }
+
+        func currentValue() async throws -> Bool {
+            let managers = try await NETunnelProviderManager.loadAllFromPreferences()
+            guard let manager = managers.first else {
+                return false
+            }
+            return manager.connection.status == .connected
+        }
     }
 }
 
-struct VPNControlConfiguration: ControlConfigurationIntent {
-    static let title: LocalizedStringResource = "VPN Control"
+struct ToggleVPNIntent: SetValueIntent {
+    static let title: LocalizedStringResource = "Toggle VPN"
+
+    @Parameter(title: "Connected")
+    var value: Bool
+
+    func perform() async throws -> some IntentResult {
+        let managers = try await NETunnelProviderManager.loadAllFromPreferences()
+        guard let manager = managers.first else {
+            return .result()
+        }
+
+        if value {
+            // Connect - need to load config from App Group
+            let defaults = UserDefaults(suiteName: "group.site.yinmo.easytier")
+            guard let configData = defaults?.data(forKey: "LastVPNConfig"),
+                  let config = try? JSONDecoder().decode([String: String].self, from: configData) else {
+                // Try to start with empty options as fallback
+                try manager.connection.startVPNTunnel()
+                return .result()
+            }
+            
+            // Convert to NSDictionary for VPN options
+            var options: [String: NSObject] = [:]
+            for (key, val) in config {
+                options[key] = val as NSString
+            }
+            try manager.connection.startVPNTunnel(options: options)
+        } else {
+            manager.connection.stopVPNTunnel()
+        }
+
+        return .result()
+    }
 }

ControlWidgets/ControlWidgetsControl.swift

@@ -55,19 +55,18 @@ class NEManager: NEManagerProtocol {
                 }
 
                 // Sync VPN connection status to App Group for Control Widget
-                let defaults = UserDefaults(suiteName: "group.site.yinmo.easytier")
-                let isConnected = self.status == .connected
-                defaults?.set(isConnected, forKey: "VPNIsConnected")
-                defaults?.synchronize()
-                
-                // Reload Control Center Widget to reflect new state
-                if #available(iOS 18.0, *) {
-                    ControlCenter.shared.reloadControls(ofKind: "site.yinmo.easytier.ControlWidgets")
-                }
+                self.syncWidgetState()
             }
         }
     }
 
+    // Notify Control Widget to refresh its state
+    private func syncWidgetState() {
+        if #available(iOS 18.0, *) {
+            ControlCenter.shared.reloadControls(ofKind: "site.yinmo.easytier.ControlWidgets")
+        }
+    }
+    
     private func reset() {
         manager = nil
         connection = nil
@@ -173,13 +172,29 @@ class NEManager: NEManagerProtocol {
         if let routes = config.routes {
             options["routes"] = NSArray(array: routes.map { $0 as NSString })
         }
+        
+        // Save config to App Group for Widget use
+        let defaults = UserDefaults(suiteName: "group.site.yinmo.easytier")
+        var configDict: [String: String] = [:]
+        for (key, value) in options {
+            if let strValue = value as? String {
+                configDict[key] = strValue
+            }
+        }
+        if let configData = try? JSONEncoder().encode(configDict) {
+            defaults?.set(configData, forKey: "LastVPNConfig")
+            defaults?.synchronize()
+        }
+        
         do {
             try manager.connection.startVPNTunnel(options: options)
         } catch {
             Self.logger.error("connect() start vpn tunnel failed: \(String(describing: error))")
             throw error
         }
         Self.logger.info("connect() started")
+        // Immediately sync widget state after initiating connection
+        syncWidgetState()
     }
 
     func disconnect() async {
@@ -188,6 +203,8 @@ class NEManager: NEManagerProtocol {
             return
         }
         manager.connection.stopVPNTunnel()
+        // Immediately sync widget state after initiating disconnection
+        syncWidgetState()
     }
 
     func updateName(name: String, server: String) async {

EasyTier/Utils/NEManager.swift

@@ -31,7 +31,6 @@ struct DashboardView<Manager: NEManagerProtocol>: View {
     @State var errorMessage: TextItem?
 
     @State private var darwinObserver: DNObserver? = nil
-    @State private var widgetToggleObserver: DNObserver? = nil
 
     var selectedProfile: ProfileSummary? {
         guard let selectedProfileId else { return nil }
@@ -239,34 +238,6 @@ struct DashboardView<Manager: NEManagerProtocol>: View {
                     }
                 }
             }
-            
-            // Register Darwin notification observer for Control Widget toggle
-            widgetToggleObserver = DNObserver(name: "site.yinmo.easytier.toggleVPN") {
-                let defaults = UserDefaults(suiteName: "group.site.yinmo.easytier")
-                let desiredState = defaults?.bool(forKey: "VPNDesiredState") ?? false
-                
-                DispatchQueue.main.async {
-                    if desiredState {
-                        // Connect using selected profile or first available
-                        guard let profile = self.selectedProfile ?? self.networks.first else {
-                            DashboardLogger.warning("No profile available for widget toggle")
-                            return
-                        }
-                        Task {
-                            do {
-                                try await self.manager.connect(profile: profile)
-                            } catch {
-                                DashboardLogger.error("Widget toggle connect failed: \(error.localizedDescription)")
-                            }
-                        }
-                    } else {
-                        // Disconnect
-                        Task {
-                            await self.manager.disconnect()
-                        }
-                    }
-                }
-            }
         }
         .onChange(of: selectedProfile) {
             lastSelected = selectedProfile?.id.uuidString
@@ -276,9 +247,8 @@ struct DashboardView<Manager: NEManagerProtocol>: View {
             }
         }
         .onDisappear {
-            // Release observers to remove registration
+            // Release observer to remove registration
             darwinObserver = nil
-            widgetToggleObserver = nil
         }
         .fileImporter(
             isPresented: $showImportPicker,