Release v2.0.0

src-tauri/tests/singbox_service_tests.rs

@@ -1,11 +1,8 @@
 use proxywarden_lib::component_detection::DetectedSingBox;
 use proxywarden_lib::singbox_service::{
-    build_singbox_setup_status, ensure_safe_singbox_install_dir, parse_service_command_output,
-    service_control_script, SingBoxServiceAction,
+    build_singbox_setup_status, singbox_service_xml, SINGBOX_SERVICE_LOG_DIR,
 };
-use std::path::{Path, PathBuf};
-#[cfg(windows)]
-use std::process::Command as ProcessCommand;
+use std::path::PathBuf;
 
 #[test]
 fn setup_status_reports_missing_items_when_singbox_is_absent() {
@@ -28,90 +25,22 @@ fn setup_status_reports_ready_when_binary_wrapper_and_service_exist() {
     assert!(status.ready);
     assert_eq!(status.missing_count, 0);
     assert!(status.items.iter().all(|item| item.installed));
+    assert_eq!(status.items[0].version, Some("1.11.0.0".to_string()));
+    assert_eq!(status.items[1].version, Some("3.0.0.0".to_string()));
+    assert_eq!(status.items[2].version, None);
 }
 
 #[test]
-fn parses_last_json_service_command_output_line() {
-    let output = br#"
-noise
-{"success":true,"code":"started","serviceName":"ProxyWardenSingBox","status":"Running","processId":42}
-"#;
-    let parsed = parse_service_command_output(output).expect("service json should parse");
+fn winsw_disables_logs_and_targets_fixed_app_root_log_directory() {
+    let xml = singbox_service_xml();
 
-    assert!(parsed.success);
-    assert_eq!(parsed.code, "started");
-    assert_eq!(parsed.service_name, Some("ProxyWardenSingBox".to_string()));
-    assert_eq!(parsed.status, Some("Running".to_string()));
-    assert_eq!(parsed.process_id, Some(42));
-}
-
-#[test]
-fn safe_install_dir_allows_only_proxywarden_singbox_folder() {
-    assert!(ensure_safe_singbox_install_dir(Path::new(
-        r"C:\Program Files\ProxyWarden\components\sing-box"
-    ))
-    .is_ok());
-    assert!(ensure_safe_singbox_install_dir(Path::new(r"C:\Windows")).is_err());
-    assert!(ensure_safe_singbox_install_dir(Path::new(r"C:\Program Files\sing-box")).is_err());
-}
-
-#[test]
-fn service_control_script_targets_named_service_and_action() {
-    let script = service_control_script(
-        SingBoxServiceAction::Start,
-        "ProxyWardenSingBox",
-        None,
-        None,
-    );
-
-    assert!(script.contains("$serviceName = 'ProxyWardenSingBox'"));
-    assert!(script.contains("$action = 'start'"));
-    assert!(script.contains("ConvertTo-Json -Compress"));
-}
-
-#[test]
-fn service_control_script_syncs_generated_config_before_start() {
-    let source = Path::new(r"C:\ProgramData\ProxyWarden\generated\sing-box-config.json");
-    let target = Path::new(r"C:\Program Files\ProxyWarden\components\sing-box\config.json");
-    let script = service_control_script(
-        SingBoxServiceAction::Start,
-        "ProxyWardenSingBox",
-        Some(source),
-        Some(target),
-    );
-
-    assert!(script.contains(
-        "$configSource = 'C:\\ProgramData\\ProxyWarden\\generated\\sing-box-config.json'"
-    ));
-    assert!(script.contains(
-        "$configTarget = 'C:\\Program Files\\ProxyWarden\\components\\sing-box\\config.json'"
-    ));
-    assert!(script.contains("Copy-Item -LiteralPath $configSource"));
-    assert!(script.contains("'config_sync_failed'"));
-}
-
-#[test]
-#[cfg(windows)]
-fn install_singbox_script_parses_as_powershell() {
-    let script_path = PathBuf::from(env!("CARGO_MANIFEST_DIR"))
-        .join("..")
-        .join("scripts")
-        .join("install-singbox.ps1");
-    let escaped_path = script_path.display().to_string().replace('\'', "''");
-    let parser = format!(
-        "$tokens = $null; $errors = $null; [System.Management.Automation.Language.Parser]::ParseFile('{escaped_path}', [ref]$tokens, [ref]$errors) | Out-Null; if ($errors.Count -gt 0) {{ $errors | ForEach-Object {{ $_.Message }}; exit 1 }}"
-    );
-    let output = ProcessCommand::new("powershell")
-        .args(["-NoProfile", "-NonInteractive", "-Command", &parser])
-        .output()
-        .expect("powershell parser should run");
-
-    assert!(
-        output.status.success(),
-        "install-singbox.ps1 should parse\nstdout:\n{}\nstderr:\n{}",
-        String::from_utf8_lossy(&output.stdout),
-        String::from_utf8_lossy(&output.stderr),
+    assert!(xml.contains("<log mode=\"none\"/>"));
+    assert!(xml.contains(&format!("<logpath>{SINGBOX_SERVICE_LOG_DIR}</logpath>")));
+    assert_eq!(
+        SINGBOX_SERVICE_LOG_DIR,
+        r"%BASE%\..\..\.proxywarden-service-logs\sing-box"
     );
+    assert!(!xml.contains("ProgramData"));
 }
 
 fn detected_singbox(binary_exists: bool, wrapper_exists: bool, running: bool) -> DetectedSingBox {
@@ -127,5 +56,7 @@ fn detected_singbox(binary_exists: bool, wrapper_exists: bool, running: bool) ->
         wrapper_exists,
         running,
         service_name: "ProxyWardenSingBox".to_string(),
+        version: Some("1.11.0.0".to_string()),
+        wrapper_version: Some("3.0.0.0".to_string()),
     }
 }