Add button to uninstall system extension

SagerNet · Nov 22, 2023 · adb9577 · adb9577
1 parent 1b12837
commit adb9577
Show file tree

Hide file tree

Showing 2 changed files with 60 additions and 6 deletions.
diff --git a/ApplicationLibrary/Views/Setting/SettingView.swift b/ApplicationLibrary/Views/Setting/SettingView.swift
@@ -101,15 +101,52 @@ public struct SettingView: View {
                                         Task {
                                             do {
                                                 if let result = try await SystemExtension.install(forceUpdate: true) {
-                                                    if result == .willCompleteAfterReboot {
-                                                        alert = Alert(errorMessage: "Need reboot")
+                                                    switch result {
+                                                    case .completed:
+                                                        alert = Alert(
+                                                            title: Text("Update"),
+                                                            message: Text("System Extension updated."),
+                                                            dismissButton: .default(Text("Ok")) {}
+                                                        )
+                                                    case .willCompleteAfterReboot:
+                                                        alert = Alert(
+                                                            title: Text("Update"),
+                                                            message: Text("Reboot required."),
+                                                            dismissButton: .default(Text("Ok")) {}
+                                                        )
                                                     }
                                                 }
                                             } catch {
                                                 alert = Alert(error)
                                             }
                                         }
                                     }
+                                    Button {
+                                        Task {
+                                            do {
+                                                if let result = try await SystemExtension.uninstall() {
+                                                    switch result {
+                                                    case .completed:
+                                                        alert = Alert(
+                                                            title: Text("Uninstall"),
+                                                            message: Text("System Extension removed."),
+                                                            dismissButton: .default(Text("Ok")) {}
+                                                        )
+                                                    case .willCompleteAfterReboot:
+                                                        alert = Alert(
+                                                            title: Text("Uninstall"),
+                                                            message: Text("Reboot required."),
+                                                            dismissButton: .default(Text("Ok")) {}
+                                                        )
+                                                    }
+                                                }
+                                            } catch {
+                                                alert = Alert(error)
+                                            }
+                                        }
+                                    } label: {
+                                        Text("Uninstall System Extension").foregroundColor(.red)
+                                    }
                                 }.frame(maxWidth: .infinity, alignment: .trailing)
                             }
                         #endif

diff --git a/Library/Network/SystemExtension.swift b/Library/Network/SystemExtension.swift
@@ -10,7 +10,7 @@
         private var properties: [OSSystemExtensionProperties]?
         private var error: Error?
 
-        private init(forceUpdate: Bool = false, inBackground: Bool = false) {
+        private init(_ forceUpdate: Bool = false, _ inBackground: Bool = false) {
             self.forceUpdate = forceUpdate
             self.inBackground = inBackground
         }
@@ -53,7 +53,7 @@
             semaphore.signal()
         }
 
-        public func submitAndWait() throws -> OSSystemExtensionRequest.Result? {
+        public func activation() throws -> OSSystemExtensionRequest.Result? {
             let request = OSSystemExtensionRequest.activationRequest(forExtensionWithIdentifier: FilePath.packageName + ".system", queue: .main)
             request.delegate = self
             OSSystemExtensionManager.shared.submitRequest(request)
@@ -64,6 +64,17 @@
             return result
         }
 
+        public func deactivation() throws -> OSSystemExtensionRequest.Result? {
+            let request = OSSystemExtensionRequest.deactivationRequest(forExtensionWithIdentifier: FilePath.packageName + ".system", queue: .main)
+            request.delegate = self
+            OSSystemExtensionManager.shared.submitRequest(request)
+            semaphore.wait()
+            if let error {
+                throw error
+            }
+            return result
+        }
+
         public func getProperties() throws -> [OSSystemExtensionProperties] {
             let request = OSSystemExtensionRequest.propertiesRequest(forExtensionWithIdentifier: FilePath.packageName + ".system", queue: .main)
             request.delegate = self
@@ -100,9 +111,15 @@
             return false
         }
 
-        public static func install(forceUpdate: Bool = false, inBackground _: Bool = false) async throws -> OSSystemExtensionRequest.Result? {
+        public static func install(forceUpdate: Bool = false, inBackground: Bool = false) async throws -> OSSystemExtensionRequest.Result? {
+            try await Task.detached {
+                try SystemExtension(forceUpdate, inBackground).activation()
+            }.result.get()
+        }
+
+        public static func uninstall() async throws -> OSSystemExtensionRequest.Result? {
             try await Task.detached {
-                try SystemExtension(forceUpdate: forceUpdate).submitAndWait()
+                try SystemExtension().deactivation()
             }.result.get()
         }
     }