mirror of
https://github.com/clash-verge-rev/clash-verge-rev.git
synced 2026-10-14 21:20:48 +08:00
wonfen
22947632c0
* fix(cmd): preserve anyhow context in coded errors Use alternate error formatting so coded failures retain the full anyhow context chain without changing their wire format. * fix(macos): skip redundant proxy disable writes When both proxy modes are off, read macOS state first and skip networksetup if the OS is already clean. Update the guard target only after a successful write. * feat(proxy): classify system proxy failures Attach stable, actionable proxy failure codes to anyhow chains while preserving the original diagnostic causes. * feat(cmd): return structured command failures Replace encoded error strings with serializable code and detail fields, and update frontend notice consumers to handle the structured shape. * fix(scripts): use the js-yaml namespace import Import js-yaml through its ESM namespace so the i18n cleanup script can access load and dump. * feat(proxy): localize classified proxy failures Map privilege and direct-fallback codes to localized explanations, and let mapped causes outrank generic operation keys in notices. * fix(ui): bound notice text and render failure details Limit resolved notice text without truncating clipboard content, and normalize structured failures embedded in translation parameters. * feat(proxy): persist unseen proxy failures Store unresolved classified failures by code, notify the frontend when the table changes, and show each failure sequence once when a visible window can receive it. * feat(proxy): report tray and hotkey toggle failures Record classified failures from tray and hotkey proxy toggles so they appear when a visible window is available. * fix(ui): restore the proxy switch after failed toggles Refresh frontend proxy state after a failed toggle so the switch reflects the rolled-back configuration. * feat(proxy): stop the guard after repeated failures Report guard outcomes, stop after the failure threshold, and persist the classified failure for the frontend. * fix(macos): preserve proxy during service handoff Stop a sidecar being handed to the service without clearing proxy state that the new owner must inherit. * feat(macos): classify misplaced sidecar state Distinguish a refused sidecar proxy write from a machine that still needs the privileged service installed. * feat(ui): recover misplaced sidecar notices Offer a restart action for macOS proxy failures caused by a ready service while the core still runs as a sidecar. * feat(ui): install the service from proxy notices Let privilege notices install the macOS service, restart the core, and report the runtime mode that was actually reached. * feat(cmd): attach requested proxy operations Carry the requested proxy direction with structured command failures when the originating command knows it. * feat(sysproxy): drain guards before OS access Wait for the local proxy guard to stop before OS reads, service handoff, or final writes, and refuse transitions when it does not drain. * feat(sysproxy): recover partial proxy writes Use write progress to choose whether to restore the old guard or compensate with a disabled proxy state, while preserving actionable errors. * feat(sysproxy): skip already-applied proxy writes Compare macOS proxy snapshots with global, PAC, and disabled targets so matching state avoids redundant privileged writes. * feat(proxy): report background proxy failures Persist and surface classified proxy failures from lifecycle paths that have no direct caller awaiting the result. * feat(ui): move proxy recovery into a dialog Guide users through installing or switching to the service after a refused proxy write, and suppress duplicate toast reports. * fix(ui): close proxy dialog after service recovery Dismiss the recovery dialog once the core reaches service mode, even when the original proxy request remains pending. * feat(ui): retry proxy request after service recovery Replay the requested proxy direction after the core reaches service mode, while leaving incidental restores unchanged. * fix(proxy): refresh state after successful apply Publish the proxy refresh from the shared apply path after releasing the lifecycle lock, and remove the tray-specific duplicate. * feat(ui): show proxy recovery progress Display installation, restart, and proxy-apply stages while keeping the primary action spinner visible during recovery. * feat(ui): route unavailable TUN through service recovery Let the TUN switch request service recovery and restore its requested state after the core restarts in service mode. * fix(ui): avoid duplicate TUN recovery errors Roll back deferred TUN toggles without reporting an error, and publish configuration refreshes from the transaction commit path. * chore: update changelog & pinlock * fix(core): resolve platform-specific clippy warnings * fix(core): detect Windows wildcard TCP conflicts Windows permits a specific exclusive bind beside an existing non-exclusive wildcard listener. Consult the system TCP listener table so the probe reports that overlap as a conflict.
157 lines
4.2 KiB
TOML
157 lines
4.2 KiB
TOML
[workspace]
|
|
members = [
|
|
"src-tauri",
|
|
"crates/clash-verge-draft",
|
|
"crates/clash-verge-media-unlock",
|
|
"crates/clash-verge-logging",
|
|
"crates/clash-verge-signal",
|
|
"crates/tauri-plugin-clash-verge-sysinfo",
|
|
"crates/clash-verge-i18n",
|
|
"crates/clash-verge-limiter",
|
|
]
|
|
resolver = "2"
|
|
|
|
[profile.release]
|
|
panic = "unwind"
|
|
codegen-units = 1
|
|
lto = "thin"
|
|
opt-level = 3
|
|
debug = 1
|
|
strip = "none"
|
|
overflow-checks = false
|
|
split-debuginfo = "unpacked"
|
|
rpath = false
|
|
|
|
[profile.dev]
|
|
incremental = true
|
|
codegen-units = 64
|
|
opt-level = 0
|
|
debug = true
|
|
strip = "none"
|
|
overflow-checks = true
|
|
lto = false
|
|
rpath = false
|
|
|
|
[profile.fast-release]
|
|
inherits = "release"
|
|
codegen-units = 64
|
|
incremental = true
|
|
lto = false
|
|
opt-level = 0
|
|
debug = true
|
|
strip = false
|
|
|
|
[profile.debug-release]
|
|
inherits = "fast-release"
|
|
codegen-units = 1
|
|
split-debuginfo = "unpacked"
|
|
|
|
[workspace.dependencies]
|
|
clash-verge-draft = { path = "crates/clash-verge-draft" }
|
|
clash-verge-media-unlock = { path = "crates/clash-verge-media-unlock" }
|
|
clash-verge-logging = { path = "crates/clash-verge-logging" }
|
|
clash-verge-signal = { path = "crates/clash-verge-signal" }
|
|
clash-verge-i18n = { path = "crates/clash-verge-i18n" }
|
|
clash-verge-limiter = { path = "crates/clash-verge-limiter" }
|
|
tauri-plugin-clash-verge-sysinfo = { path = "crates/tauri-plugin-clash-verge-sysinfo" }
|
|
|
|
tauri = { version = "2.11.5" }
|
|
tauri-plugin-clipboard-manager = "2.3.2"
|
|
parking_lot = { version = "0.12.5", features = ["hardware-lock-elision"] }
|
|
anyhow = "1.0.104"
|
|
chrono = "0.4.45"
|
|
criterion = { version = "0.8.2", features = ["async_tokio"] }
|
|
tokio = { version = "1.53.1", features = [
|
|
"rt-multi-thread",
|
|
"macros",
|
|
"time",
|
|
"sync",
|
|
] }
|
|
flexi_logger = "0.31.10"
|
|
log = "0.4.33"
|
|
regex = "1.13.1"
|
|
reqwest = { version = "0.13.4", features = ["json", "cookies", "gzip", "rustls", "form"] }
|
|
rust_iso3166 = "0.2.0"
|
|
|
|
smartstring = { version = "1.0.1" }
|
|
compact_str = { version = "0.10.0", features = ["serde"] }
|
|
|
|
serde = { version = "1.0.229" }
|
|
serde_json = { version = "1.0.151" }
|
|
serde_yaml_ng = { version = "0.10.0" }
|
|
bitflags = { version = "2.13.1" }
|
|
socket2 = "0.6.5"
|
|
|
|
# *** For Windows platform only ***
|
|
deelevate = "0.2.0"
|
|
windows-sys = { version = "0.61.2", features = [
|
|
"Win32_Foundation",
|
|
"Win32_NetworkManagement_IpHelper",
|
|
"Win32_Networking_WinSock",
|
|
"Win32_Security",
|
|
"Win32_Security_Authorization",
|
|
"Win32_Storage_FileSystem",
|
|
"Win32_System_Threading",
|
|
"Win32_System_JobObjects"
|
|
] }
|
|
# *********************************
|
|
|
|
[workspace.lints.clippy]
|
|
# fallible_impl_from = "deny" // 过于激进，暂时不开启
|
|
# implicit_clone = "deny" // 可能会造成额外开销，暂时不开启
|
|
# option_if_let_else = "deny" // 过于激进，暂时不开启
|
|
# self_only_used_in_recursion = "deny" // Since 1.92.0
|
|
async_yields_async = "deny"
|
|
await_holding_lock = "deny"
|
|
branches_sharing_code = "deny"
|
|
clone_on_ref_ptr = "warn"
|
|
cloned_instead_of_copied = "deny"
|
|
cognitive_complexity = "deny"
|
|
collection_is_never_read = "deny"
|
|
copy_iterator = "deny"
|
|
correctness = { level = "deny", priority = -1 }
|
|
dbg_macro = "warn"
|
|
equatable_if_let = "deny"
|
|
expect_used = "warn"
|
|
expl_impl_clone_on_copy = "deny"
|
|
future_not_send = "deny"
|
|
iter_on_empty_collections = "deny"
|
|
iter_on_single_items = "deny"
|
|
iter_with_drain = "deny"
|
|
large_const_arrays = "warn"
|
|
large_futures = "deny"
|
|
large_stack_arrays = "warn"
|
|
large_types_passed_by_value = "deny"
|
|
missing_const_for_fn = "deny"
|
|
mutex_atomic = "deny"
|
|
mutex_integer = "deny"
|
|
needless_collect = "deny"
|
|
needless_continue = "deny"
|
|
needless_pass_by_ref_mut = "deny"
|
|
needless_raw_string_hashes = "deny"
|
|
option_as_ref_cloned = "deny"
|
|
or_fun_call = "deny"
|
|
panic = "deny"
|
|
pathbuf_init_then_push = "deny"
|
|
rc_clone_in_vec_init = "warn"
|
|
rc_mutex = "deny"
|
|
redundant_clone = "deny"
|
|
redundant_else = "deny"
|
|
significant_drop_in_scrutinee = "deny"
|
|
significant_drop_tightening = "deny"
|
|
string_lit_as_bytes = "deny"
|
|
suspicious = { level = "deny", priority = -1 }
|
|
suspicious_operation_groupings = "deny"
|
|
todo = "warn"
|
|
trait_duplication_in_bounds = "deny"
|
|
tuple_array_conversions = "deny"
|
|
unimplemented = "deny"
|
|
unnecessary_self_imports = "deny"
|
|
unnecessary_wraps = "deny"
|
|
unused_async = "deny"
|
|
unused_trait_names = "deny"
|
|
unwrap_used = "warn"
|
|
use_self = "deny"
|
|
useless_let_if_seq = "deny"
|
|
wildcard_imports = "deny"
|