feat(logging): introduce clash-verge-logging crate for management (#5486)

* feat(logging): introduce clash-verge-logging crate for management

- Added a new crate `clash-verge-logging` with dependencies on `log`, `tokio`, `compact_str`, and `flexi_logger`.
- Implemented logging types and macros for structured logging across the application.
- Replaced existing logging imports with the new `clash_verge_logging` crate in various modules.
- Updated logging functionality to support different logging types and error handling.
- Refactored code to improve logging consistency and maintainability.

* fix(logging): update import paths for clash_verge_logging in linux.rs and dns.rs

* fix(logging): update import statement for clash_verge_logging in windows.rs

src-tauri/src/cmd/app.rs

@@ -3,12 +3,10 @@ use crate::core::sysopt::Sysopt;
 use crate::utils::resolve::ui::{self, UiReadyStage};
 use crate::{
     cmd::StringifyErr as _,
-    feat, logging,
-    utils::{
-        dirs::{self, PathBufExec as _},
-        logging::Type,
-    },
+    feat,
+    utils::dirs::{self, PathBufExec as _},
 };
+use clash_verge_logging::{Type, logging};
 use smartstring::alias::String;
 use std::path::Path;
 use tauri::{AppHandle, Manager as _};

src-tauri/src/cmd/clash.rs

@@ -1,4 +1,5 @@
 use super::CmdResult;
+use crate::feat;
 use crate::utils::dirs;
 use crate::{
     cmd::StringifyErr as _,
@@ -6,7 +7,7 @@ use crate::{
     constants,
     core::{CoreManager, handle, validate::CoreConfigValidator},
 };
-use crate::{feat, logging, utils::logging::Type};
+use clash_verge_logging::{Type, logging};
 use compact_str::CompactString;
 use serde_yaml_ng::Mapping;
 use smartstring::alias::String;

src-tauri/src/cmd/media_unlock_checker/bahamut.rs

@@ -1,10 +1,9 @@
 use std::sync::Arc;
 
+use clash_verge_logging::{Type, logging};
 use regex::Regex;
 use reqwest::{Client, cookie::Jar};
 
-use crate::{logging, utils::logging::Type};
-
 use super::UnlockItem;
 use super::utils::{country_code_to_emoji, get_local_date_string};
 

src-tauri/src/cmd/media_unlock_checker/disney_plus.rs

@@ -1,7 +1,7 @@
 use regex::Regex;
 use reqwest::Client;
 
-use crate::{logging, utils::logging::Type};
+use clash_verge_logging::{Type, logging};
 
 use super::UnlockItem;
 use super::utils::{country_code_to_emoji, get_local_date_string};

src-tauri/src/cmd/media_unlock_checker/gemini.rs

@@ -1,7 +1,7 @@
 use regex::Regex;
 use reqwest::Client;
 
-use crate::{logging, utils::logging::Type};
+use clash_verge_logging::{Type, logging};
 
 use super::UnlockItem;
 use super::utils::{country_code_to_emoji, get_local_date_string};

src-tauri/src/cmd/media_unlock_checker/mod.rs

@@ -4,7 +4,7 @@ use reqwest::Client;
 use tauri::command;
 use tokio::{sync::Mutex, task::JoinSet};
 
-use crate::{logging, utils::logging::Type};
+use clash_verge_logging::{Type, logging};
 
 mod bahamut;
 mod bilibili;

src-tauri/src/cmd/media_unlock_checker/netflix.rs

@@ -1,7 +1,7 @@
 use reqwest::Client;
 use serde_json::Value;
 
-use crate::{logging, utils::logging::Type};
+use clash_verge_logging::{Type, logging};
 
 use super::UnlockItem;
 use super::utils::{country_code_to_emoji, get_local_date_string};

src-tauri/src/cmd/media_unlock_checker/prime_video.rs

@@ -1,7 +1,7 @@
 use regex::Regex;
 use reqwest::Client;
 
-use crate::{logging, utils::logging::Type};
+use clash_verge_logging::{Type, logging};
 
 use super::UnlockItem;
 use super::utils::{country_code_to_emoji, get_local_date_string};

src-tauri/src/cmd/media_unlock_checker/youtube.rs

@@ -1,7 +1,7 @@
 use regex::Regex;
 use reqwest::Client;
 
-use crate::{logging, utils::logging::Type};
+use clash_verge_logging::{Type, logging};
 
 use super::UnlockItem;
 use super::utils::{country_code_to_emoji, get_local_date_string};

src-tauri/src/cmd/network.rs

@@ -1,6 +1,6 @@
 use super::CmdResult;
 use crate::cmd::StringifyErr as _;
-use crate::{logging, utils::logging::Type};
+use clash_verge_logging::{Type, logging};
 use gethostname::gethostname;
 use network_interface::NetworkInterface;
 use serde_yaml_ng::Mapping;

src-tauri/src/cmd/profile.rs

@@ -10,12 +10,13 @@ use crate::{
         profiles_append_item_safe,
     },
     core::{CoreManager, handle, timer::Timer, tray::Tray},
-    feat, logging,
+    feat,
     module::auto_backup::{AutoBackupManager, AutoBackupTrigger},
     process::AsyncHandler,
     ret_err,
-    utils::{dirs, help, logging::Type},
+    utils::{dirs, help},
 };
+use clash_verge_logging::{Type, logging};
 use scopeguard::defer;
 use smartstring::alias::String;
 use std::sync::atomic::{AtomicBool, Ordering};

src-tauri/src/cmd/proxy.rs

@@ -1,5 +1,5 @@
 use super::CmdResult;
-use crate::{logging, utils::logging::Type};
+use clash_verge_logging::{Type, logging};
 
 // TODO: 前端通过 emit 发送更新事件, tray 监听更新事件
 /// 同步托盘和GUI的代理选择状态

src-tauri/src/cmd/runtime.rs

@@ -1,8 +1,7 @@
 use super::CmdResult;
-use crate::{
-    cmd::StringifyErr as _, config::Config, core::CoreManager, logging_error, utils::logging::Type,
-};
+use crate::{cmd::StringifyErr as _, config::Config, core::CoreManager};
 use anyhow::{Context as _, anyhow};
+use clash_verge_logging::{Type, logging_error};
 use serde_yaml_ng::Mapping;
 use smartstring::alias::String;
 use std::collections::HashMap;

src-tauri/src/cmd/save_profile.rs

@@ -3,10 +3,10 @@ use crate::{
     cmd::StringifyErr as _,
     config::{Config, PrfItem},
     core::{CoreManager, handle, validate::CoreConfigValidator},
-    logging,
     module::auto_backup::{AutoBackupManager, AutoBackupTrigger},
-    utils::{dirs, logging::Type},
+    utils::dirs,
 };
+use clash_verge_logging::{Type, logging};
 use smartstring::alias::String;
 use tokio::fs;
 

src-tauri/src/cmd/system.rs

@@ -3,10 +3,9 @@ use std::sync::Arc;
 use super::CmdResult;
 use crate::{
     core::{CoreManager, handle, manager::RunningMode},
-    logging,
     module::sysinfo::PlatformSpecification,
-    utils::logging::Type,
 };
+use clash_verge_logging::{Type, logging};
 #[cfg(target_os = "windows")]
 use deelevate::{PrivilegeLevel, Token};
 use once_cell::sync::Lazy;

src-tauri/src/cmd/validate.rs

@@ -1,9 +1,6 @@
 use super::CmdResult;
-use crate::{
-    core::{handle, validate::CoreConfigValidator},
-    logging,
-    utils::logging::Type,
-};
+use crate::core::{handle, validate::CoreConfigValidator};
+use clash_verge_logging::{Type, logging};
 use smartstring::alias::String;
 
 /// 发送脚本验证通知消息

src-tauri/src/config/clash.rs

@@ -2,8 +2,8 @@ use crate::config::Config;
 use crate::constants::{network, tun as tun_const};
 use crate::utils::dirs::{ipc_path, path_to_str};
 use crate::utils::{dirs, help};
-use crate::{logging, utils::logging::Type};
 use anyhow::Result;
+use clash_verge_logging::{Type, logging};
 use serde::{Deserialize, Serialize};
 use serde_yaml_ng::{Mapping, Value};
 use std::{

src-tauri/src/config/config.rs

@@ -4,11 +4,12 @@ use crate::{
     config::{PrfItem, profiles_append_item_safe},
     constants::{files, timing},
     core::{CoreManager, handle, service, tray, validate::CoreConfigValidator},
-    enhance, logging, logging_error,
-    utils::{dirs, help, logging::Type},
+    enhance,
+    utils::{dirs, help},
 };
 use anyhow::{Result, anyhow};
 use backoff::{Error as BackoffError, ExponentialBackoff};
+use clash_verge_logging::{Type, logging, logging_error};
 use draft::Draft;
 use smartstring::alias::String;
 use std::path::PathBuf;

src-tauri/src/config/profiles.rs

@@ -3,8 +3,8 @@ use crate::utils::{
     dirs::{self, PathBufExec as _},
     help,
 };
-use crate::{logging, utils::logging::Type};
 use anyhow::{Context as _, Result, bail};
+use clash_verge_logging::{Type, logging};
 use serde::{Deserialize, Serialize};
 use serde_yaml_ng::Mapping;
 use smartstring::alias::String;

src-tauri/src/config/verge.rs

@@ -1,10 +1,10 @@
 use crate::config::Config;
 use crate::{
     config::{DEFAULT_PAC, deserialize_encrypted, serialize_encrypted},
-    logging,
-    utils::{dirs, help, i18n, logging::Type},
+    utils::{dirs, help, i18n},
 };
 use anyhow::Result;
+use clash_verge_logging::{Type, logging};
 use log::LevelFilter;
 use serde::{Deserialize, Serialize};
 use smartstring::alias::String;

src-tauri/src/core/backup.rs

@@ -1,12 +1,8 @@
 use crate::constants::files::DNS_CONFIG;
-use crate::{
-    config::Config,
-    logging,
-    process::AsyncHandler,
-    utils::{dirs, logging::Type},
-};
+use crate::{config::Config, process::AsyncHandler, utils::dirs};
 use anyhow::Error;
 use arc_swap::{ArcSwap, ArcSwapOption};
+use clash_verge_logging::{Type, logging};
 use once_cell::sync::OnceCell;
 use reqwest_dav::list_cmd::{ListEntity, ListFile};
 use smartstring::alias::String;

src-tauri/src/core/hotkey.rs

@@ -1,11 +1,12 @@
 use crate::process::AsyncHandler;
 use crate::utils::notification::{NotificationEvent, notify_event};
 use crate::{
-    config::Config, core::handle, feat, logging, module::lightweight::entry_lightweight_mode,
-    singleton_with_logging, utils::logging::Type,
+    config::Config, core::handle, feat, module::lightweight::entry_lightweight_mode,
+    singleton_with_logging,
 };
 use anyhow::{Result, bail};
 use arc_swap::ArcSwap;
+use clash_verge_logging::{Type, logging};
 use smartstring::alias::String;
 use std::{collections::HashMap, fmt, str::FromStr, sync::Arc};
 use tauri_plugin_global_shortcut::{Code, GlobalShortcutExt as _, ShortcutState};

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

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

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

@@ -1,15 +1,12 @@
 use super::{CoreManager, RunningMode};
 use crate::cmd::StringifyErr as _;
 use crate::config::{Config, IVerge};
-use crate::{
-    core::{
-        logger::CLASH_LOGGER,
-        service::{SERVICE_MANAGER, ServiceStatus},
-    },
-    logging,
-    utils::logging::Type,
+use crate::core::{
+    logger::CLASH_LOGGER,
+    service::{SERVICE_MANAGER, ServiceStatus},
 };
 use anyhow::Result;
+use clash_verge_logging::{Type, logging};
 use smartstring::alias::String;
 
 impl CoreManager {

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

@@ -5,13 +5,10 @@ use crate::{
     core::{handle, logger::CLASH_LOGGER, service},
     logging,
     process::CommandChildGuard,
-    utils::{
-        dirs,
-        init::sidecar_writer,
-        logging::{SharedWriter, Type, write_sidecar_log},
-    },
+    utils::{dirs, init::sidecar_writer},
 };
 use anyhow::Result;
+use clash_verge_logging::{SharedWriter, Type, write_sidecar_log};
 use compact_str::CompactString;
 use flexi_logger::DeferredNow;
 use log::Level;

src-tauri/src/core/notification.rs

@@ -1,9 +1,6 @@
 use super::handle::Handle;
-use crate::{
-    constants::{retry, timing},
-    logging,
-    utils::logging::Type,
-};
+use crate::constants::{retry, timing};
+use clash_verge_logging::{Type, logging};
 use parking_lot::RwLock;
 use smartstring::alias::String;
 use std::{

src-tauri/src/core/service.rs

@@ -1,10 +1,10 @@
 use crate::{
     config::Config,
     core::tray,
-    logging, logging_error,
-    utils::{dirs, init::service_writer_config, logging::Type},
+    utils::{dirs, init::service_writer_config},
 };
 use anyhow::{Context as _, Result, bail};
+use clash_verge_logging::{Type, logging, logging_error};
 use clash_verge_service_ipc::CoreConfig;
 use compact_str::CompactString;
 use once_cell::sync::Lazy;

src-tauri/src/core/sysopt.rs

@@ -3,10 +3,10 @@ use crate::utils::autostart as startup_shortcut;
 use crate::{
     config::{Config, IVerge},
     core::handle::Handle,
-    logging, logging_error, singleton_lazy,
-    utils::logging::Type,
+    singleton_lazy,
 };
 use anyhow::Result;
+use clash_verge_logging::{Type, logging, logging_error};
 use parking_lot::RwLock;
 use scopeguard::defer;
 use smartstring::alias::String;

src-tauri/src/core/timer.rs

@@ -1,10 +1,10 @@
 use crate::{
     config::Config,
     core::{CoreManager, manager::RunningMode, sysopt::Sysopt},
-    feat, logging, logging_error, singleton,
-    utils::logging::Type,
+    feat, singleton,
 };
 use anyhow::{Context as _, Result};
+use clash_verge_logging::{Type, logging, logging_error};
 use delay_timer::prelude::{DelayTimer, DelayTimerBuilder, TaskBuilder};
 use parking_lot::RwLock;
 use smartstring::alias::String;

src-tauri/src/core/validate.rs

@@ -9,7 +9,7 @@ use crate::config::{Config, ConfigType};
 use crate::core::handle;
 use crate::singleton_lazy;
 use crate::utils::dirs;
-use crate::{logging, utils::logging::Type};
+use clash_verge_logging::{Type, logging};
 
 pub struct CoreConfigValidator {
     is_processing: AtomicBool,

src-tauri/src/enhance/merge.rs

@@ -1,4 +1,4 @@
-use crate::{logging, utils::logging::Type};
+use clash_verge_logging::{Type, logging};
 
 use super::use_lowercase;
 use serde_yaml_ng::{self, Mapping, Value};

src-tauri/src/enhance/mod.rs

@@ -16,7 +16,7 @@ use self::{
 use crate::constants;
 use crate::utils::dirs;
 use crate::{config::Config, utils::tmpl};
-use crate::{logging, utils::logging::Type};
+use clash_verge_logging::{Type, logging};
 use serde_yaml_ng::Mapping;
 use smartstring::alias::String;
 use std::collections::{HashMap, HashSet};

src-tauri/src/feat/backup.rs

@@ -1,16 +1,15 @@
 use crate::{
     config::{Config, IVerge},
     core::backup,
-    logging,
     process::AsyncHandler,
     utils::{
         dirs::{PathBufExec as _, app_home_dir, local_backup_dir, verge_path},
         help,
-        logging::Type,
     },
 };
 use anyhow::{Result, anyhow};
 use chrono::Utc;
+use clash_verge_logging::{Type, logging};
 use reqwest_dav::list_cmd::ListFile;
 use serde::Serialize;
 use smartstring::alias::String;

src-tauri/src/feat/clash.rs

@@ -1,10 +1,10 @@
 use crate::{
     config::Config,
     core::{CoreManager, handle, tray},
-    logging, logging_error,
     process::AsyncHandler,
-    utils::{self, logging::Type, resolve},
+    utils::{self, resolve},
 };
+use clash_verge_logging::{Type, logging, logging_error};
 use serde_yaml_ng::{Mapping, Value};
 use smartstring::alias::String;
 

src-tauri/src/feat/config.rs

@@ -1,11 +1,10 @@
 use crate::{
     config::{Config, IVerge},
     core::{CoreManager, handle, hotkey, sysopt, tray},
-    logging, logging_error,
     module::{auto_backup::AutoBackupManager, lightweight},
-    utils::logging::Type,
 };
 use anyhow::Result;
+use clash_verge_logging::{Type, logging, logging_error};
 use draft::SharedBox;
 use serde_yaml_ng::Mapping;
 

src-tauri/src/feat/profile.rs

@@ -2,10 +2,9 @@ use crate::{
     cmd,
     config::{Config, PrfItem, PrfOption, profiles::profiles_draft_update_item_safe},
     core::{CoreManager, handle, tray},
-    logging, logging_error,
-    utils::logging::Type,
 };
 use anyhow::{Result, bail};
+use clash_verge_logging::{Type, logging, logging_error};
 use smartstring::alias::String;
 use tauri::Emitter as _;
 

src-tauri/src/feat/proxy.rs

@@ -1,9 +1,8 @@
 use crate::{
     config::{Config, IVerge},
     core::handle,
-    logging,
-    utils::logging::Type,
 };
+use clash_verge_logging::{Type, logging};
 use std::env;
 use tauri_plugin_clipboard_manager::ClipboardExt as _;
 

src-tauri/src/feat/window.rs

@@ -1,8 +1,9 @@
 use crate::config::Config;
 use crate::core::{CoreManager, handle, sysopt};
+use crate::module::lightweight;
 use crate::utils;
 use crate::utils::window_manager::WindowManager;
-use crate::{logging, module::lightweight, utils::logging::Type};
+use clash_verge_logging::{Type, logging};
 
 /// Public API: open or close the dashboard
 pub async fn open_or_close_dashboard() {

src-tauri/src/lib.rs

@@ -19,13 +19,13 @@ use crate::{
     utils::{resolve, server},
 };
 use anyhow::Result;
+use clash_verge_logging::{Type, logging};
 use once_cell::sync::OnceCell;
 use rust_i18n::i18n;
 use tauri::{AppHandle, Manager as _};
 #[cfg(target_os = "macos")]
 use tauri_plugin_autostart::MacosLauncher;
 use tauri_plugin_deep_link::DeepLinkExt as _;
-use utils::logging::Type;
 
 i18n!("locales", fallback = "zh");
 
@@ -267,10 +267,9 @@ pub fn run() {
         use crate::{
             config::Config,
             core::{self, handle, hotkey},
-            logging,
             process::AsyncHandler,
-            utils::logging::Type,
         };
+        use clash_verge_logging::{Type, logging};
         use tauri::AppHandle;
         #[cfg(target_os = "macos")]
         use tauri::Manager as _;

src-tauri/src/module/auto_backup.rs

@@ -1,12 +1,12 @@
 use crate::{
     config::{Config, IVerge},
     feat::create_local_backup_with_namer,
-    logging,
     process::AsyncHandler,
-    utils::{dirs::local_backup_dir, logging::Type},
+    utils::dirs::local_backup_dir,
 };
 use anyhow::Result;
 use chrono::Local;
+use clash_verge_logging::{Type, logging};
 use once_cell::sync::OnceCell;
 use parking_lot::RwLock;
 use std::{

src-tauri/src/module/lightweight.rs

@@ -1,12 +1,10 @@
 use crate::{
     config::Config,
     core::{handle, timer::Timer, tray::Tray},
-    logging,
     process::AsyncHandler,
-    utils::logging::Type,
 };
 
-use crate::logging_error;
+use clash_verge_logging::{Type, logging, logging_error};
 
 use crate::utils::window_manager::WindowManager;
 use anyhow::{Context as _, Result};

src-tauri/src/module/signal/unix.rs

@@ -4,7 +4,8 @@ use signal_hook::{
     low_level,
 };
 
-use crate::{feat, logging, logging_error, utils::logging::Type};
+use crate::feat;
+use clash_verge_logging::{Type, logging, logging_error};
 
 pub fn register() {
     tauri::async_runtime::spawn(async {

src-tauri/src/module/signal/windows.rs

@@ -8,7 +8,8 @@ use windows_sys::Win32::{
     },
 };
 
-use crate::{core::handle, feat, logging, utils::logging::Type};
+use crate::{core::handle, feat};
+use clash_verge_logging::{Type, logging};
 
 // code refer to:
 //      global-hotkey (https://github.com/tauri-apps/global-hotkey)

src-tauri/src/utils/autostart.rs

@@ -1,7 +1,7 @@
 #[cfg(target_os = "windows")]
-use crate::{logging, utils::logging::Type};
-#[cfg(target_os = "windows")]
 use anyhow::{Result, anyhow};
+#[cfg(target_os = "windows")]
+use clash_verge_logging::{Type, logging};
 
 #[cfg(target_os = "windows")]
 use std::{os::windows::process::CommandExt as _, path::Path, path::PathBuf};

src-tauri/src/utils/dirs.rs

@@ -1,10 +1,7 @@
-use crate::{
-    core::{CoreManager, handle, manager::RunningMode},
-    logging,
-    utils::logging::Type,
-};
+use crate::core::{CoreManager, handle, manager::RunningMode};
 use anyhow::Result;
 use async_trait::async_trait;
+use clash_verge_logging::{Type, logging};
 use once_cell::sync::OnceCell;
 #[cfg(unix)]
 use std::iter;

src-tauri/src/utils/help.rs

@@ -1,5 +1,6 @@
-use crate::{config::with_encryption, enhance::seq::SeqMap, logging, utils::logging::Type};
+use crate::{config::with_encryption, enhance::seq::SeqMap};
 use anyhow::{Context as _, Result, anyhow, bail};
+use clash_verge_logging::{Type, logging};
 use nanoid::nanoid;
 use serde::{Serialize, de::DeserializeOwned};
 use serde_yaml_ng::Mapping;

src-tauri/src/utils/init.rs

@@ -1,6 +1,4 @@
 // #[cfg(not(feature = "tracing"))]
-#[cfg(not(feature = "tauri-dev"))]
-use crate::utils::logging::NoModuleFilter;
 use crate::{
     config::{Config, IClashTemp, IProfiles, IVerge},
     constants,
@@ -10,11 +8,13 @@ use crate::{
     utils::{
         dirs::{self, PathBufExec as _, service_log_dir, sidecar_log_dir},
         help,
-        logging::Type,
     },
 };
 use anyhow::Result;
 use chrono::{Local, TimeZone as _};
+#[cfg(not(feature = "tauri-dev"))]
+use clash_verge_logging::NoModuleFilter;
+use clash_verge_logging::Type;
 use clash_verge_service_ipc::WriterConfig;
 use flexi_logger::writers::FileLogWriter;
 use flexi_logger::{Cleanup, Criterion, FileSpec};

src-tauri/src/utils/linux.rs

@@ -1,6 +1,5 @@
-use crate::logging;
-use crate::utils::logging::Type;
 use anyhow::Result;
+use clash_verge_logging::{Type, logging};
 use std::collections::{HashMap, HashSet};
 use std::env;
 use std::fs;

src-tauri/src/utils/logging.rs

@@ -1,157 +0,0 @@
-use compact_str::CompactString;
-use flexi_logger::DeferredNow;
-#[cfg(not(feature = "tauri-dev"))]
-use flexi_logger::filter::LogLineFilter;
-use flexi_logger::writers::FileLogWriter;
-use flexi_logger::writers::LogWriter as _;
-use log::Level;
-use log::Record;
-use std::{fmt, sync::Arc};
-use tokio::sync::{Mutex, MutexGuard};
-
-pub type SharedWriter = Arc<Mutex<FileLogWriter>>;
-
-#[derive(Debug, PartialEq, Eq)]
-pub enum Type {
-    Cmd,
-    Core,
-    Config,
-    Setup,
-    System,
-    Service,
-    Hotkey,
-    Window,
-    Tray,
-    Timer,
-    Frontend,
-    Backup,
-    File,
-    Lightweight,
-    Network,
-    ProxyMode,
-    Validate,
-    ClashVergeRev,
-}
-
-impl fmt::Display for Type {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        match self {
-            Self::Cmd => write!(f, "[Cmd]"),
-            Self::Core => write!(f, "[Core]"),
-            Self::Config => write!(f, "[Config]"),
-            Self::Setup => write!(f, "[Setup]"),
-            Self::System => write!(f, "[System]"),
-            Self::Service => write!(f, "[Service]"),
-            Self::Hotkey => write!(f, "[Hotkey]"),
-            Self::Window => write!(f, "[Window]"),
-            Self::Tray => write!(f, "[Tray]"),
-            Self::Timer => write!(f, "[Timer]"),
-            Self::Frontend => write!(f, "[Frontend]"),
-            Self::Backup => write!(f, "[Backup]"),
-            Self::File => write!(f, "[File]"),
-            Self::Lightweight => write!(f, "[Lightweight]"),
-            Self::Network => write!(f, "[Network]"),
-            Self::ProxyMode => write!(f, "[ProxMode]"),
-            Self::Validate => write!(f, "[Validate]"),
-            Self::ClashVergeRev => write!(f, "[ClashVergeRev]"),
-        }
-    }
-}
-
-#[macro_export]
-macro_rules! error {
-    ($result: expr) => {
-        log::error!(target: "app", "{}", $result);
-    };
-}
-
-/// wrap the anyhow error
-/// transform the error to String
-#[macro_export]
-macro_rules! wrap_err {
-    // Case 1: Future<Result<T, E>>
-    ($stat:expr, async) => {{
-        match $stat.await {
-            Ok(a) => Ok::<_, ::anyhow::Error>(a),
-            Err(err) => {
-                log::error!(target: "app", "{}", err);
-                Err(::anyhow::Error::msg(err.to_string()))
-            }
-        }
-    }};
-}
-
-#[macro_export]
-macro_rules! logging {
-    // 不带 print 参数的版本（默认不打印）
-    ($level:ident, $type:expr, $($arg:tt)*) => {
-        log::$level!(target: "app", "{} {}", $type, format_args!($($arg)*))
-    };
-}
-
-#[macro_export]
-macro_rules! logging_error {
-    // Handle Result<T, E>
-    ($type:expr, $expr:expr) => {
-        if let Err(err) = $expr {
-            log::error!(target: "app", "[{}] {}", $type, err);
-        }
-    };
-
-    // Handle formatted message: always print to stdout and log as error
-    ($type:expr, $fmt:literal $(, $arg:expr)*) => {
-        log::error!(target: "app", "[{}] {}", $type, format_args!($fmt $(, $arg)*));
-    };
-}
-
-pub fn write_sidecar_log(
-    writer: MutexGuard<'_, FileLogWriter>,
-    now: &mut DeferredNow,
-    level: Level,
-    message: &CompactString,
-) {
-    let args = format_args!("{}", message);
-
-    let record = Record::builder()
-        .args(args)
-        .level(level)
-        .target("sidecar")
-        .build();
-
-    let _ = writer.write(now, &record);
-}
-
-#[cfg(not(feature = "tauri-dev"))]
-pub struct NoModuleFilter<'a>(pub &'a [&'a str]);
-
-#[cfg(not(feature = "tauri-dev"))]
-impl<'a> NoModuleFilter<'a> {
-    #[inline]
-    pub fn filter(&self, record: &Record) -> bool {
-        if let Some(module) = record.module_path() {
-            for blocked in self.0 {
-                if module.len() >= blocked.len()
-                    && module.as_bytes()[..blocked.len()] == blocked.as_bytes()[..]
-                {
-                    return false;
-                }
-            }
-        }
-        true
-    }
-}
-
-#[cfg(not(feature = "tauri-dev"))]
-impl<'a> LogLineFilter for NoModuleFilter<'a> {
-    fn write(
-        &self,
-        now: &mut DeferredNow,
-        record: &Record,
-        writer: &dyn flexi_logger::filter::LogLineWriter,
-    ) -> std::io::Result<()> {
-        if !self.filter(record) {
-            return Ok(());
-        }
-        writer.write(now, record)
-    }
-}

src-tauri/src/utils/mod.rs

@@ -6,7 +6,6 @@ pub mod i18n;
 pub mod init;
 #[cfg(target_os = "linux")]
 pub mod linux;
-pub mod logging;
 pub mod network;
 pub mod notification;
 pub mod resolve;

src-tauri/src/utils/resolve/dns.rs

@@ -1,8 +1,7 @@
-#[cfg(target_os = "macos")]
-use crate::{logging, utils::logging::Type};
+use clash_verge_logging::{Type, logging};
+
 pub async fn set_public_dns(dns_server: String) {
-    use crate::utils::logging::Type;
-    use crate::{core::handle, logging, utils::dirs};
+    use crate::{core::handle, utils::dirs};
     use tauri_plugin_shell::ShellExt as _;
     let app_handle = handle::Handle::app_handle();
 

src-tauri/src/utils/resolve/mod.rs

@@ -9,11 +9,11 @@ use crate::{
         sysopt,
         tray::Tray,
     },
-    logging, logging_error,
     module::{auto_backup::AutoBackupManager, lightweight::auto_lightweight_boot, signal},
     process::AsyncHandler,
-    utils::{init, logging::Type, server, window_manager::WindowManager},
+    utils::{init, server, window_manager::WindowManager},
 };
+use clash_verge_logging::{Type, logging, logging_error};
 
 pub mod dns;
 pub mod scheme;

src-tauri/src/utils/resolve/scheme.rs

@@ -8,9 +8,8 @@ use tauri::Url;
 use crate::{
     config::{Config, PrfItem, profiles},
     core::handle,
-    logging,
-    utils::logging::Type,
 };
+use clash_verge_logging::{Type, logging};
 
 pub(super) async fn resolve_scheme(param: &str) -> Result<()> {
     logging!(info, Type::Config, "received deep link: {param}");

src-tauri/src/utils/resolve/ui.rs

@@ -6,7 +6,7 @@ use std::sync::{
 };
 use tokio::sync::Notify;
 
-use crate::{logging, utils::logging::Type};
+use clash_verge_logging::{Type, logging};
 
 // 获取 UI 是否准备就绪的全局状态
 static UI_READY: AtomicBool = AtomicBool::new(false);

src-tauri/src/utils/resolve/window.rs

@@ -3,12 +3,9 @@ use tauri::WebviewWindow;
 use crate::{
     config::Config,
     core::handle,
-    logging_error,
-    utils::{
-        logging::Type,
-        resolve::window_script::{INITIAL_LOADING_OVERLAY, WINDOW_INITIAL_SCRIPT},
-    },
+    utils::resolve::window_script::{INITIAL_LOADING_OVERLAY, WINDOW_INITIAL_SCRIPT},
 };
+use clash_verge_logging::{Type, logging_error};
 
 // 定义默认窗口尺寸常量
 const DEFAULT_WIDTH: f64 = 940.0;

src-tauri/src/utils/server.rs

@@ -1,12 +1,12 @@
 use super::resolve;
 use crate::{
     config::{Config, DEFAULT_PAC, IVerge},
-    logging, logging_error,
     module::lightweight,
     process::AsyncHandler,
-    utils::{logging::Type, window_manager::WindowManager},
+    utils::window_manager::WindowManager,
 };
 use anyhow::{Result, bail};
+use clash_verge_logging::{Type, logging, logging_error};
 use once_cell::sync::OnceCell;
 use parking_lot::Mutex;
 use port_scanner::local_port_available;

src-tauri/src/utils/singleton.rs

@@ -47,9 +47,9 @@ macro_rules! singleton_with_logging {
             pub fn global() -> &'static $struct_name {
                 $instance_name.get_or_init(|| {
                     let instance = Self::new();
-                    $crate::logging!(
+                    clash_verge_logging::logging!(
                         info,
-                        $crate::utils::logging::Type::Setup,
+                        clash_verge_logging::Type::Setup,
                         concat!($struct_name_str, " initialized")
                     );
                     instance

src-tauri/src/utils/window_manager.rs

@@ -1,8 +1,5 @@
-use crate::{
-    core::handle,
-    logging,
-    utils::{logging::Type, resolve::window::build_new_window},
-};
+use crate::{core::handle, utils::resolve::window::build_new_window};
+use clash_verge_logging::{Type, logging};
 use std::future::Future;
 use std::pin::Pin;
 use tauri::{Manager as _, WebviewWindow, Wry};