mirror of
https://github.com/clash-verge-rev/clash-verge-rev.git
synced 2026-11-18 18:02:08 +08:00
* refactor(config): adopt tristr for config strings Wire the tristr git dependency (pinned rev) and switch the config and enhance modules from smartstring::alias::String to tristr::alias::String. Drop the smartstring-era per-field specta overrides except the three webdav fields required by serialize_with and the ipc::JsonValue bridge: tristr maps to Primitive::str natively and the generated bindings stay byte-identical (gen-contract --check passes). Call sites in not-yet-migrated modules (cmd/core/feat/utils) are bridged with explicit tristr::alias::String paths and as_str().into() conversions; each bridge is absorbed when its module migrates. * refactor(cmd): adopt tristr for command strings Switch the cmd module from smartstring::alias::String to tristr::alias::String and drop its smartstring-era per-field specta overrides (ProfileSelection/ProfileCreate/ProfilePatch, RuntimeLogs); bindings stay byte-identical. Calls into not-yet-migrated feat/core functions keep smartstring-typed locals via full paths until those modules migrate. * refactor(core): adopt tristr for core strings Switch the core module (validate, timer, sysopt, backup, hotkey, tray, manager, notify) from smartstring::alias::String to tristr::alias::String and drop the smartstring-era specta overrides on ValidationOutcome and the notify payload structs; bindings stay byte-identical. WebDAV calls from the not-yet-migrated feat module are bridged with as_str().into(). * refactor(feat): adopt tristr for feature strings Switch the feat module (backup, icon, dns, profile, clash) from smartstring::alias::String to tristr::alias::String, drop its smartstring-era specta overrides (IconInfo, backup listings, DnsOverrideOutcome), and absorb the temporary smartstring-typed bridge locals the cmd module used to call into feat. * refactor(utils): adopt tristr for utility strings Switch utils/network.rs and utils/resolve/scheme.rs from smartstring::alias::String to tristr::alias::String and absorb the temporary user_agent and profile-name bridge conversions. * refactor(deps): drop smartstring in favor of tristr Remove the smartstring workspace and member dependencies and its Cargo.lock entry; tristr is the only string representation left. * build(deps): bump tristr to fuzz-harness fix rev Pin 3738d8c renames the stale vstr path dependency in the upstream fuzz manifest so its seven targets build again; library code is unchanged from 3756ed1a.
109 lines
3.4 KiB
Rust
109 lines
3.4 KiB
Rust
use super::CmdResult;
|
|
use crate::{cmd::StringifyErr as _, config::Config, core::CoreManager, utils::yaml_emitter};
|
|
use anyhow::{Context as _, anyhow};
|
|
use std::collections::HashMap;
|
|
use tristr::alias::String;
|
|
|
|
#[tauri::command]
|
|
#[specta::specta]
|
|
pub async fn get_runtime_config() -> CmdResult<Option<crate::ipc::YamlMapping>> {
|
|
Ok(Config::runtime()
|
|
.await
|
|
.latest_arc()
|
|
.config
|
|
.clone()
|
|
.map(crate::ipc::YamlMapping))
|
|
}
|
|
|
|
#[tauri::command]
|
|
#[specta::specta]
|
|
pub async fn get_runtime_yaml() -> CmdResult<std::string::String> {
|
|
let runtime = Config::runtime().await;
|
|
let runtime = runtime.latest_arc();
|
|
|
|
let config = runtime.config.as_ref();
|
|
config
|
|
.ok_or_else(|| anyhow!("failed to parse config to yaml file"))
|
|
.and_then(|config| yaml_emitter::to_mihomo_config_string(config).context("failed to convert config to yaml"))
|
|
.stringify_err()
|
|
}
|
|
|
|
#[tauri::command]
|
|
#[specta::specta]
|
|
pub async fn get_runtime_logs() -> CmdResult<RuntimeLogs> {
|
|
Ok(RuntimeLogs(Config::runtime().await.latest_arc().chain_logs.clone()))
|
|
}
|
|
|
|
#[derive(serde::Serialize, specta::Type)]
|
|
#[serde(transparent)]
|
|
pub struct RuntimeLogs(HashMap<String, Vec<(String, String)>>);
|
|
|
|
#[tauri::command]
|
|
#[specta::specta]
|
|
pub fn take_discarded_keys_notice() -> Option<std::string::String> {
|
|
crate::enhance::take_discarded_keys_notice().map(Into::into)
|
|
}
|
|
|
|
#[tauri::command]
|
|
#[specta::specta]
|
|
pub async fn get_runtime_proxy_chain_config(
|
|
proxy_chain_exit_node: std::string::String,
|
|
) -> CmdResult<std::string::String> {
|
|
let runtime = Config::runtime().await;
|
|
let runtime = runtime.latest_arc();
|
|
|
|
let config = runtime
|
|
.config
|
|
.as_ref()
|
|
.ok_or_else(|| anyhow!("failed to parse config to yaml file"))
|
|
.stringify_err()?;
|
|
|
|
if let Some(serde_yaml_ng::Value::Sequence(proxies)) = config.get("proxies") {
|
|
let mut proxy_name = Some(Some(proxy_chain_exit_node.as_str()));
|
|
let mut proxies_chain = Vec::new();
|
|
|
|
while let Some(proxy) = proxies.iter().find(|proxy| {
|
|
if let serde_yaml_ng::Value::Mapping(proxy_map) = proxy {
|
|
proxy_map.get("name").map(|x| x.as_str()) == proxy_name && proxy_map.get("dialer-proxy").is_some()
|
|
} else {
|
|
false
|
|
}
|
|
}) {
|
|
proxies_chain.push(proxy);
|
|
proxy_name = proxy.get("dialer-proxy").map(|x| x.as_str());
|
|
}
|
|
|
|
if let Some(entry_proxy) = proxies
|
|
.iter()
|
|
.find(|proxy| proxy.get("name").map(|x| x.as_str()) == proxy_name)
|
|
&& !proxies_chain.is_empty()
|
|
{
|
|
proxies_chain.push(entry_proxy);
|
|
}
|
|
|
|
proxies_chain.reverse();
|
|
|
|
let mut config: HashMap<String, Vec<&serde_yaml_ng::Value>> = HashMap::new();
|
|
|
|
config.insert("proxies".into(), proxies_chain);
|
|
|
|
yaml_emitter::to_mihomo_config_string(&config)
|
|
.context("YAML generation failed")
|
|
.stringify_err()
|
|
} else {
|
|
Err("failed to get proxies or proxy-groups".into())
|
|
}
|
|
}
|
|
|
|
#[tauri::command]
|
|
#[specta::specta]
|
|
pub async fn update_proxy_chain_config_in_runtime(
|
|
proxy_chain_config: Option<crate::ipc::YamlValue>,
|
|
) -> CmdResult<crate::core::validate::ValidationOutcome> {
|
|
let proxy_chain_config = proxy_chain_config.map(|value| value.0);
|
|
CoreManager::global()
|
|
.update_runtime_config(|d| d.update_proxy_chain_config(proxy_chain_config))
|
|
.await
|
|
.stringify_err()
|
|
}
|