Refine ProxyWarden routing and config flows

src-tauri/tests/component_detection_tests.rs

@@ -14,6 +14,7 @@ fn detects_existing_proxifyre_from_registry_install_location() {
     let host = MockHost::new()
         .with_registry("ProxiFyre", r"C:\Tools\ProxiFyre")
         .with_path(r"C:\Tools\ProxiFyre")
+        .with_path(r"C:\Tools\ProxiFyre\ProxiFyre.exe")
         .with_service("ProxiFyreService");
 
     let detected = detect_proxyfier_install_with_host(&host)
@@ -26,15 +27,30 @@ fn detects_existing_proxifyre_from_registry_install_location() {
         Some(PathBuf::from(r"C:\Tools\ProxiFyre\app-config.json"))
     );
     assert!(detected.running);
+    assert_eq!(detected.service_name, Some("ProxiFyreService".to_string()));
+    assert_eq!(detected.service_status, Some("running".to_string()));
 
     let component = proxyfier_component_from_detection(Some(&detected));
     assert_eq!(component.state, ComponentState::Running);
     assert!(component.installed);
     assert!(component.running);
     assert_eq!(component.path, Some(r"C:\Tools\ProxiFyre".to_string()));
+    assert_eq!(component.service_name, Some("ProxiFyreService".to_string()));
+    assert_eq!(component.service_status, Some("running".to_string()));
     assert!(component.problems.is_empty());
 }
 
+#[test]
+fn ignores_empty_common_proxifyre_folder_without_executable() {
+    let host = MockHost::new().with_path(r"C:\Tools\ProxiFyre");
+
+    assert!(detect_proxyfier_install_with_host(&host).is_none());
+
+    let component = proxyfier_component_from_detection(None);
+    assert_eq!(component.state, ComponentState::Missing);
+    assert!(!component.installed);
+}
+
 #[test]
 fn ignores_plain_proxifier_install() {
     let host = MockHost::new()
@@ -61,6 +77,25 @@ fn env_override_can_point_to_portable_proxifyre_install() {
     );
 }
 
+#[test]
+fn reports_stopped_proxifyre_service_when_executable_exists() {
+    let host = MockHost::new()
+        .with_env("PROXYWARDEN_PROXIFYRE_ROOT", r"C:\Tools\ProxiFyre")
+        .with_path(r"C:\Tools\ProxiFyre\ProxiFyre.exe")
+        .with_stopped_service("ProxiFyreService");
+
+    let detected =
+        detect_proxyfier_install_with_host(&host).expect("proxifyre executable should be detected");
+    let component = proxyfier_component_from_detection(Some(&detected));
+
+    assert_eq!(component.state, ComponentState::Installed);
+    assert!(component.installed);
+    assert!(!component.running);
+    assert_eq!(component.service_name, Some("ProxiFyreService".to_string()));
+    assert_eq!(component.service_status, Some("stopped".to_string()));
+    assert!(component.problems.is_empty());
+}
+
 #[test]
 fn missing_proxyfier_returns_install_action_status() {
     let component = proxyfier_component_from_detection(None);
@@ -73,7 +108,7 @@ fn missing_proxyfier_returns_install_action_status() {
 #[test]
 fn detects_running_local_singbox_from_default_install_root_and_service() {
     let host = MockHost::new()
-        .with_path(r"C:\Program Files\ProxyWarden\sing-box\sing-box.exe")
+        .with_path(r"C:\Program Files\ProxyWarden\components\sing-box\sing-box.exe")
         .with_service("ProxyWardenSingBox");
 
     let detected =
@@ -81,7 +116,7 @@ fn detects_running_local_singbox_from_default_install_root_and_service() {
 
     assert_eq!(
         detected.executable_path,
-        PathBuf::from(r"C:\Program Files\ProxyWarden\sing-box\sing-box.exe")
+        PathBuf::from(r"C:\Program Files\ProxyWarden\components\sing-box\sing-box.exe")
     );
     assert_eq!(detected.service_name, "ProxyWardenSingBox");
     assert!(detected.running);
@@ -92,7 +127,7 @@ fn detects_running_local_singbox_from_default_install_root_and_service() {
     assert!(component.running);
     assert_eq!(
         component.path,
-        Some(r"C:\Program Files\ProxyWarden\sing-box\sing-box.exe".to_string())
+        Some(r"C:\Program Files\ProxyWarden\components\sing-box\sing-box.exe".to_string())
     );
     assert!(component.problems.is_empty());
 }
@@ -113,6 +148,11 @@ fn detects_stopped_local_singbox_from_env_override() {
     assert_eq!(component.state, ComponentState::Stopped);
     assert!(component.installed);
     assert!(!component.running);
+    assert_eq!(
+        component.service_name,
+        Some("ProxyWardenSingBox".to_string())
+    );
+    assert_eq!(component.service_status, Some("stopped".to_string()));
     assert!(component
         .problems
         .iter()
@@ -135,7 +175,7 @@ struct MockHost {
     env: HashMap<String, String>,
     paths: HashSet<String>,
     processes: HashSet<String>,
-    services: HashSet<String>,
+    services: HashMap<String, String>,
     registry: Vec<RegistryInstallEntry>,
 }
 
@@ -160,7 +200,14 @@ impl MockHost {
     }
 
     fn with_service(mut self, service: &str) -> Self {
-        self.services.insert(service.to_ascii_lowercase());
+        self.services
+            .insert(service.to_ascii_lowercase(), "running".to_string());
+        self
+    }
+
+    fn with_stopped_service(mut self, service: &str) -> Self {
+        self.services
+            .insert(service.to_ascii_lowercase(), "stopped".to_string());
         self
     }
 
@@ -188,8 +235,10 @@ impl ProxyfierDetectionHost for MockHost {
         self.processes.contains(&process_name.to_ascii_lowercase())
     }
 
-    fn service_running(&self, service_name: &str) -> bool {
-        self.services.contains(&service_name.to_ascii_lowercase())
+    fn service_status(&self, service_name: &str) -> Option<String> {
+        self.services
+            .get(&service_name.to_ascii_lowercase())
+            .cloned()
     }
 
     fn registry_install_entries(&self) -> Vec<RegistryInstallEntry> {