feat: v1.0.35 final - uninstall button, installer fixes, oob strategy, diagnostics v2

Author: roninreilly

Sources/main.swift

@@ -199,6 +199,17 @@ struct ContentView: View {
                     .buttonStyle(.plain)
                     .font(.subheadline)
                     .foregroundStyle(.secondary)
+                    
+                    Text("•")
+                        .foregroundStyle(.tertiary)
+                        .padding(.horizontal, 4)
+                    
+                    Button("Uninstall Service") {
+                        installerManager.uninstall()
+                    }
+                    .buttonStyle(.plain)
+                    .font(.subheadline)
+                    .foregroundStyle(.secondary)
                 }
 
                 Spacer()
@@ -796,6 +807,32 @@ class InstallerManager: ObservableObject {
         self.isInstalled = hasDir && hasSudoers
     }
 
+    func uninstall() {
+        self.isInstalling = true
+        self.errorMessage = nil
+        
+        let path = "/opt/darkware-zapret"
+        let sudoers = "/etc/sudoers.d/darkware-zapret"
+        
+        let scriptSource = "do shell script \"rm -rf '\(path)' && rm -f '\(sudoers)'\" with administrator privileges"
+        
+        DispatchQueue.global(qos: .userInitiated).async {
+            var error: NSDictionary?
+            if let scriptObject = NSAppleScript(source: scriptSource) {
+                scriptObject.executeAndReturnError(&error)
+            }
+            
+            DispatchQueue.main.async {
+                if let error = error {
+                    self.errorMessage = (error["NSAppleScriptErrorBriefMessage"] as? String) ?? "Uninstall failed"
+                } else {
+                    self.checkInstallation()
+                }
+                self.isInstalling = false
+            }
+        }
+    }
+    
     func install() {
         self.isInstalling = true
         self.errorMessage = nil

install_darkware.sh

@@ -78,7 +78,7 @@ chmod +x "$TARGET_DIR/ipset/"*.sh
 # Try to download Re-filter list (contains YouTube and other needed domains)
 echo "Downloading Re-filter hostlist..."
 # Run in subshell to not change script cwd, ignore errors to not break install
-(export GZIP_LISTS=0 && cd "$TARGET_DIR/ipset" && ./get_refilter_domains.sh) || echo "Warning: Failed to download Re-filter list. Using empty list."
+(export GZIP_LISTS=0 && cd "$TARGET_DIR/ipset" && ./get_refilter_domains.sh >/dev/null 2>&1) || echo "Warning: Failed to download Re-filter list. Using empty list."
 chmod 644 "$TARGET_DIR/ipset/"*.txt
 
 # Add dummy entry if user list is empty (best practice from install_easy.sh)
@@ -129,3 +129,4 @@ launchctl unload "$PLIST_PATH" 2>/dev/null || true
 launchctl load -w "$PLIST_PATH"
 
 echo "Installation complete."
+exit 0