feat: add clash-verge-types crate and integrate IRuntime struct

src-tauri/src/config/config.rs

@@ -1,4 +1,4 @@
-use super::{IClashTemp, IProfiles, IRuntime, IVerge};
+use super::{IClashTemp, IProfiles, IVerge};
 use crate::{
     cmd,
     config::{PrfItem, profiles_append_item_safe},
@@ -11,6 +11,7 @@ use anyhow::{Result, anyhow};
 use backoff::{Error as BackoffError, ExponentialBackoff};
 use clash_verge_draft::Draft;
 use clash_verge_logging::{Type, logging, logging_error};
+use clash_verge_types::runtime::IRuntime;
 use smartstring::alias::String;
 use std::path::PathBuf;
 use tokio::sync::OnceCell;

src-tauri/src/config/mod.rs

@@ -4,10 +4,9 @@ mod config;
 mod encrypt;
 mod prfitem;
 pub mod profiles;
-mod runtime;
 mod verge;
 
-pub use self::{clash::*, config::*, encrypt::*, prfitem::*, profiles::*, runtime::*, verge::*};
+pub use self::{clash::*, config::*, encrypt::*, prfitem::*, profiles::*, verge::*};
 
 pub const DEFAULT_PAC: &str = r#"function FindProxyForURL(url, host) {
   return "PROXY 127.0.0.1:%mixed-port%; SOCKS5 127.0.0.1:%mixed-port%; DIRECT;";

src-tauri/src/config/runtime.rs

@@ -1,123 +0,0 @@
-use crate::enhance::field::use_keys;
-use serde::{Deserialize, Serialize};
-use serde_yaml_ng::{Mapping, Value};
-use smartstring::alias::String;
-use std::collections::HashMap;
-
-#[derive(Default, Debug, Clone, Deserialize, Serialize)]
-pub struct IRuntime {
-    pub config: Option<Mapping>,
-    // 记录在订阅中（包括merge和script生成的）出现过的keys
-    // 这些keys不一定都生效
-    pub exists_keys: Vec<String>,
-    pub chain_logs: HashMap<String, Vec<(String, String)>>,
-}
-
-impl IRuntime {
-    pub fn new() -> Self {
-        Self::default()
-    }
-
-    // 这里只更改 allow-lan | ipv6 | log-level | tun
-    pub fn patch_config(&mut self, patch: Mapping) {
-        if let Some(config) = self.config.as_mut() {
-            ["allow-lan", "ipv6", "log-level", "unified-delay"]
-                .into_iter()
-                .for_each(|key| {
-                    if let Some(value) = patch.get(key).to_owned() {
-                        config.insert(key.into(), value.clone());
-                    }
-                });
-
-            let patch_tun = patch.get("tun");
-            if patch_tun.is_some() {
-                let tun = config.get("tun");
-                let mut tun: Mapping = tun.map_or_else(Mapping::new, |val| {
-                    val.as_mapping().cloned().unwrap_or_else(Mapping::new)
-                });
-                let patch_tun = patch_tun.map_or_else(Mapping::new, |val| {
-                    val.as_mapping().cloned().unwrap_or_else(Mapping::new)
-                });
-                use_keys(&patch_tun).into_iter().for_each(|key| {
-                    if let Some(value) = patch_tun.get(key.as_str()) {
-                        tun.insert(Value::from(key.as_str()), value.clone());
-                    }
-                });
-
-                config.insert("tun".into(), Value::from(tun));
-            }
-        }
-    }
-
-    //跟新链式代理配置文件
-    /// {   
-    ///     "proxies":[
-    ///         {
-    ///             name : 入口节点,
-    ///             type: xxx
-    ///             server: xxx
-    ///             port: xxx
-    ///             ports: xxx
-    ///             password: xxx
-    ///             skip-cert-verify: xxx,
-    ///        },
-    ///         {
-    ///             name : hop_node_1_xxxx,
-    ///             type: xxx
-    ///             server: xxx
-    ///             port: xxx
-    ///             ports: xxx
-    ///             password: xxx
-    ///             skip-cert-verify: xxx,
-    ///             dialer-proxy : "入口节点"
-    ///        },
-    ///         {
-    ///             name : 出口节点,
-    ///             type: xxx
-    ///             server: xxx
-    ///             port: xxx
-    ///             ports: xxx
-    ///             password: xxx
-    ///             skip-cert-verify: xxx,
-    ///             dialer-proxy : "hop_node_1_xxxx"
-    ///        }
-    ///     ],
-    ///     "proxy-groups" : [
-    ///         {
-    ///             name : "proxy_chain",
-    ///             type: "select",
-    ///             proxies ["出口节点"]
-    ///         }
-    ///     ]
-    /// }
-    ///
-    /// 传入none 为删除
-    pub fn update_proxy_chain_config(&mut self, proxy_chain_config: Option<Value>) {
-        if let Some(config) = self.config.as_mut() {
-            if let Some(Value::Sequence(proxies)) = config.get_mut("proxies") {
-                proxies.iter_mut().for_each(|proxy| {
-                    if let Some(proxy) = proxy.as_mapping_mut()
-                        && proxy.get("dialer-proxy").is_some()
-                    {
-                        proxy.remove("dialer-proxy");
-                    }
-                });
-            }
-
-            if let Some(Value::Sequence(dialer_proxies)) = proxy_chain_config
-                && let Some(Value::Sequence(proxies)) = config.get_mut("proxies")
-            {
-                for (i, dialer_proxy) in dialer_proxies.iter().enumerate() {
-                    if let Some(Value::Mapping(proxy)) = proxies
-                        .iter_mut()
-                        .find(|proxy| proxy.get("name") == Some(dialer_proxy))
-                        && i != 0
-                        && let Some(dialer_proxy) = dialer_proxies.get(i - 1)
-                    {
-                        proxy.insert("dialer-proxy".into(), dialer_proxy.to_owned());
-                    }
-                }
-            }
-        }
-    }
-}

src-tauri/src/core/manager/config.rs

@@ -1,12 +1,13 @@
 use super::CoreManager;
 use crate::{
-    config::{Config, ConfigType, IRuntime},
+    config::{Config, ConfigType},
     constants::timing,
     core::{handle, validate::CoreConfigValidator},
     utils::{dirs, help},
 };
 use anyhow::{Result, anyhow};
 use clash_verge_logging::{Type, logging};
+use clash_verge_types::runtime::IRuntime;
 use smartstring::alias::String;
 use std::{path::PathBuf, time::Instant};
 use tauri_plugin_mihomo::Error as MihomoError;