Bootstrap saved state from ProxiFyre config

src-tauri/tests/command_tests.rs

@@ -22,10 +22,10 @@ mod subscription;
 mod validation;
 
 use commands::{
-    apply_profiles_with_services, build_status, resolve_component_statuses, resolve_preview,
-    save_profile_to_storage, save_target_to_storage, Clock, CommandError, DetectedProxyApplyHelper,
-    HelperApplyRequest, HelperApplyResult, ProfileInputDto, ProfileItemInputDto, ProxyApplyHelper,
-    TargetInputDto,
+    apply_profiles_with_services, build_status, read_saved_state_with_proxifyre_config,
+    resolve_component_statuses, resolve_preview, save_profile_to_storage, save_target_to_storage,
+    Clock, CommandError, DetectedProxyApplyHelper, HelperApplyRequest, HelperApplyResult,
+    ProfileInputDto, ProfileItemInputDto, ProxyApplyHelper, TargetInputDto,
 };
 use component_detection::{
     DetectedProxyfier, ProxyfierDetectionHost, ProxyfierEngine, RegistryInstallEntry,
@@ -95,6 +95,95 @@ fn save_commands_normalize_and_persist_profile_and_target() {
     cleanup(&root);
 }
 
+#[test]
+fn saved_state_bootstraps_from_existing_proxifyre_app_config() {
+    let root = test_root("proxifyre-config-import");
+    let storage = JsonStorage::new(root.clone());
+    let install_dir = root.join("ProxiFyre");
+    let config_path = install_dir.join("app-config.json");
+    fs::create_dir_all(&install_dir).expect("create proxifyre dir");
+    fs::write(
+        &config_path,
+        r#"{
+  "logLevel": "Info",
+  "bypassLan": true,
+  "proxies": [
+    {
+      "appNames": ["Discord.exe", "C:\\Games\\Launcher.exe"],
+      "socks5ProxyEndpoint": "127.0.0.1:1090",
+      "supportedProtocols": ["TCP", "UDP"]
+    }
+  ]
+}"#,
+    )
+    .expect("write proxifyre config");
+
+    let state = read_saved_state_with_proxifyre_config(&storage, Some(&config_path))
+        .expect("state should import proxifyre app config");
+
+    assert_eq!(state.profiles.len(), 1);
+    assert_eq!(state.targets.len(), 1);
+    assert_eq!(state.profiles[0].id, "main-profile");
+    assert_eq!(state.profiles[0].target_id, "main-proxy");
+    assert_eq!(state.profiles[0].items.len(), 2);
+    assert_eq!(
+        state.profiles[0].items[0].item_type,
+        ProfileItemType::Process
+    );
+    assert_eq!(state.profiles[0].items[0].value, "Discord");
+    assert_eq!(state.profiles[0].items[1].item_type, ProfileItemType::Exe);
+    assert_eq!(state.profiles[0].items[1].value, r"C:\Games\Launcher.exe");
+    assert_eq!(state.targets[0].id, "main-proxy");
+    assert_eq!(state.targets[0].host, "127.0.0.1");
+    assert_eq!(state.targets[0].port, 1090);
+
+    let persisted = storage.read_profiles().expect("read persisted profiles");
+    assert_eq!(persisted.len(), 1);
+    assert_eq!(persisted[0].items.len(), 2);
+
+    cleanup(&root);
+}
+
+#[test]
+fn saved_state_keeps_existing_proxywarden_profiles_over_proxifyre_config() {
+    let root = test_root("proxifyre-config-keeps-state");
+    let storage = JsonStorage::new(root.clone());
+    let install_dir = root.join("ProxiFyre");
+    let config_path = install_dir.join("app-config.json");
+    fs::create_dir_all(&install_dir).expect("create proxifyre dir");
+    fs::write(
+        &config_path,
+        r#"{
+  "logLevel": "Info",
+  "bypassLan": true,
+  "proxies": [
+    {
+      "appNames": ["Telegram.exe"],
+      "socks5ProxyEndpoint": "127.0.0.1:1091",
+      "supportedProtocols": ["TCP"]
+    }
+  ]
+}"#,
+    )
+    .expect("write proxifyre config");
+    storage
+        .write_profiles(&[discord_profile("home-gateway")])
+        .expect("write profiles");
+    storage
+        .write_targets(&[external_socks5_target()])
+        .expect("write targets");
+
+    let state = read_saved_state_with_proxifyre_config(&storage, Some(&config_path))
+        .expect("state should keep proxywarden storage");
+
+    assert_eq!(state.profiles.len(), 1);
+    assert_eq!(state.profiles[0].id, "discord");
+    assert_eq!(state.profiles[0].items[0].value, "Discord");
+    assert_eq!(state.targets[0].id, "home-gateway");
+
+    cleanup(&root);
+}
+
 #[test]
 fn resolve_preview_returns_structured_apps_without_filesystem_scan() {
     let preview = resolve_preview(ProfileInputDto {
@@ -194,9 +283,14 @@ fn singbox_runner_preserves_installer_args_with_spaces() {
         ],
     );
 
-    assert!(script.contains("$installerArgs = @('-InstallRoot', 'C:\\Program Files\\ProxyWarden\\sing-box'"));
-    assert!(script.contains("& powershell.exe -NoProfile -ExecutionPolicy Bypass -File $installerPath @installerArgs"));
-    assert!(!script.contains("Start-Process -FilePath 'powershell.exe' -ArgumentList $argumentList"));
+    assert!(script
+        .contains("$installerArgs = @('-InstallRoot', 'C:\\Program Files\\ProxyWarden\\sing-box'"));
+    assert!(script.contains(
+        "& powershell.exe -NoProfile -ExecutionPolicy Bypass -File $installerPath @installerArgs"
+    ));
+    assert!(
+        !script.contains("Start-Process -FilePath 'powershell.exe' -ArgumentList $argumentList")
+    );
 }
 
 #[test]