Refactor proxy routing and installer flows

src-tauri/src/commands.rs

@@ -437,39 +437,18 @@ impl Clock for SystemClock {
     }
 }
 
-pub struct StagedApplyHelper;
-
-impl ProxyApplyHelper for StagedApplyHelper {
-    fn apply_proxy_config(
-        &self,
-        request: HelperApplyRequest<'_>,
-    ) -> Result<HelperApplyResult, CommandError> {
-        Ok(HelperApplyResult {
-            success: true,
-            changed: true,
-            action: format!("{}.stage-generated-config", request.adapter_id),
-            message: format!(
-                "Сгенерированный конфиг подготовлен в {}; интеграция привилегированного помощника еще не подключена",
-                request.config_path.display()
-            ),
-        })
-    }
-}
-
 pub struct DetectedProxyApplyHelper<H = SystemProxyfierDetectionHost> {
     host: H,
 }
 
 impl DetectedProxyApplyHelper<SystemProxyfierDetectionHost> {
     pub fn system() -> Self {
-        Self {
-            host: SystemProxyfierDetectionHost,
-        }
+        SystemProxyfierDetectionHost.into()
     }
 }
 
-impl<H> DetectedProxyApplyHelper<H> {
-    pub fn new(host: H) -> Self {
+impl<H> From<H> for DetectedProxyApplyHelper<H> {
+    fn from(host: H) -> Self {
         Self { host }
     }
 }

src-tauri/src/singbox_service.rs

@@ -3,11 +3,7 @@ use crate::models::{DEFAULT_LOCAL_SINGBOX_INSTALL_ROOT, DEFAULT_LOCAL_SINGBOX_SE
 use serde::{Deserialize, Serialize};
 use std::path::Path;
 
-pub const SINGBOX_RELEASE_API_URL: &str =
-    "https://api.github.com/repos/SagerNet/sing-box/releases/latest";
-pub const WINSW_RELEASE_API_URL: &str = "https://api.github.com/repos/winsw/winsw/releases/latest";
 pub const WINSW_WRAPPER_FILE: &str = "ProxyWardenSingBox.exe";
-pub const SINGBOX_BINARY_FILE: &str = "sing-box.exe";
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 pub enum SingBoxServiceAction {

src-tauri/src/storage.rs

@@ -75,13 +75,6 @@ impl JsonStorage {
         &self.paths
     }
 
-    pub fn ensure_dirs(&self) -> io::Result<()> {
-        fs::create_dir_all(&self.paths.config_dir)?;
-        fs::create_dir_all(&self.paths.state_dir)?;
-        fs::create_dir_all(&self.paths.generated_dir)?;
-        Ok(())
-    }
-
     pub fn read_profiles(&self) -> io::Result<Vec<Profile>> {
         self.read_json_or_default(&self.paths.profiles_file)
     }
@@ -102,10 +95,6 @@ impl JsonStorage {
         self.read_json_or_default(&self.paths.components_file)
     }
 
-    pub fn write_components(&self, components: &[ComponentStatus]) -> io::Result<()> {
-        self.write_json(&self.paths.components_file, components)
-    }
-
     pub fn read_local_singbox_config(&self) -> io::Result<LocalSingBoxConfig> {
         self.read_json_or_default(&self.paths.local_singbox_file)
     }
@@ -135,11 +124,6 @@ impl JsonStorage {
         Ok(cap_activity(entries, self.activity_limit))
     }
 
-    pub fn write_activity(&self, entries: &[ActivityEntry]) -> io::Result<()> {
-        let entries = cap_activity(entries.to_vec(), self.activity_limit);
-        self.write_json(&self.paths.activity_file, &entries)
-    }
-
     pub fn append_activity(&self, entry: ActivityEntry) -> io::Result<Vec<ActivityEntry>> {
         let entries = self.read_activity()?;
         let entries = append_activity(entries, entry, self.activity_limit);