refactor: 清理冗余代码并统一 clipboard 到 core

- host.rs: 合并 capacity_check_with_grace_delay 双 cfg 分支为单函数
- core: 新增 clipboard feature（非默认），统一 clipboard_copy 实现
- cli/tui: 移除各自的 clipboard 代码，改用 sculk_core::clipboard
- TunnelConfig: 新增 initial_retries 字段（默认 3），取代硬编码常量
- lib.rs: 删除未使用的 VERSION 常量
- tui: Profile 加载失败时在日志面板显示错误信息

Author: KercyDing

Cargo.lock

@@ -4,9 +4,8 @@ version = "0.1.0"
 edition = "2024"
 
 [dependencies]
-sculk-core = { workspace = true, features = ["persist"] }
+sculk-core = { workspace = true, features = ["persist", "clipboard"] }
 anyhow.workspace = true
-arboard.workspace = true
 clap.workspace = true
 tokio.workspace = true
 tracing.workspace = true

cli/Cargo.toml

@@ -138,7 +138,7 @@ async fn run_command(cli: Cli) -> anyhow::Result<()> {
             let quoted = format!("\"{ticket_str}\"");
             println!("Ticket: {quoted}");
 
-            if clipboard_copy(&quoted) {
+            if sculk_core::clipboard::clipboard_copy(&quoted) {
                 println!("(Copied to clipboard)");
             }
 
@@ -258,49 +258,6 @@ fn print_event(event: &TunnelEvent) {
     }
 }
 
-/// 复制文本到系统剪贴板。
-///
-/// Linux Wayland 下优先使用 `wl-copy`（fork 后台进程持有内容），
-/// 其他平台回退到 arboard。
-fn clipboard_copy(text: &str) -> bool {
-    #[cfg(target_os = "linux")]
-    {
-        use std::io::Write;
-        use std::process::{Command, Stdio};
-
-        if std::env::var_os("WAYLAND_DISPLAY").is_some()
-            && let Ok(mut child) = Command::new("wl-copy")
-                .stdin(Stdio::piped())
-                .stdout(Stdio::null())
-                .stderr(Stdio::null())
-                .spawn()
-        {
-            if let Some(mut stdin) = child.stdin.take() {
-                let _ = stdin.write_all(text.as_bytes());
-            }
-            return child.wait().is_ok_and(|s| s.success());
-        }
-
-        if std::env::var_os("DISPLAY").is_some()
-            && let Ok(mut child) = Command::new("xclip")
-                .args(["-selection", "clipboard"])
-                .stdin(Stdio::piped())
-                .stdout(Stdio::null())
-                .stderr(Stdio::null())
-                .spawn()
-        {
-            if let Some(mut stdin) = child.stdin.take() {
-                let _ = stdin.write_all(text.as_bytes());
-            }
-            return child.wait().is_ok_and(|s| s.success());
-        }
-    }
-
-    arboard::Clipboard::new()
-        .and_then(|mut cb| cb.set_text(text))
-        .is_ok()
-}
-
 #[cfg(test)]
 mod tests {
     use clap::Parser;

cli/src/main.rs

@@ -6,6 +6,7 @@ edition = "2024"
 [features]
 default = []
 ci = []
+clipboard = ["dep:arboard"]
 persist = ["dep:dirs", "dep:rand", "dep:serde", "dep:toml"]
 
 [dependencies]
@@ -14,6 +15,7 @@ iroh.workspace = true
 tokio.workspace = true
 tracing.workspace = true
 url.workspace = true
+arboard = { workspace = true, optional = true }
 dirs = { workspace = true, optional = true }
 rand = { workspace = true, optional = true }
 serde = { workspace = true, optional = true }

core/Cargo.toml

@@ -1,6 +1,8 @@
 //! 系统剪贴板写入。
 
-/// 复制文本到系统剪贴板。
+/// 将文本写入系统剪贴板，成功返回 `true`。
+///
+/// Linux Wayland 下优先调用 `wl-copy`，X11 下调用 `xclip`，其余平台使用 `arboard`。
 pub fn clipboard_copy(text: &str) -> bool {
     #[cfg(target_os = "linux")]
     {

tui/src/clipboard.rs core/src/clipboard.rstui/src/clipboard.rs renamed to core/src/clipboard.rs

@@ -51,12 +51,12 @@
 //! - `TunnelConfig::password` 是应用层校验，不替代传输层加密。
 //! - `join` 侧是否自动重连由 `max_retries` 控制。
 
+#[cfg(feature = "clipboard")]
+pub mod clipboard;
 #[cfg(feature = "persist")]
 pub mod persist;
 pub mod tunnel;
 
-pub const VERSION: &str = env!("CARGO_PKG_VERSION");
-
 /// Minecraft 服务端标准端口。
 pub const DEFAULT_MC_PORT: u16 = 25565;
 

core/src/lib.rs

@@ -14,8 +14,10 @@ pub struct TunnelConfig {
     pub event_delay: Duration,
     /// 连接密码，`None` 表示不校验。
     pub password: Option<String>,
-    /// 最大重连次数（仅 join 侧）：`None` 无限，`Some(0)` 关闭重连。
+    /// 最大重连次数（join 侧）：`None` 无限，`Some(0)` 关闭重连。
     pub max_retries: Option<u32>,
+    /// 首次连接的重试上限（join 侧），默认 3 次。
+    pub initial_retries: u32,
     /// 重连初始退避（仅 join 侧）。
     pub base_backoff: Duration,
     /// 重连最大退避（仅 join 侧）。
@@ -30,6 +32,7 @@ impl Default for TunnelConfig {
             event_delay: Duration::ZERO,
             password: None,
             max_retries: None,
+            initial_retries: 3,
             base_backoff: Duration::from_millis(500),
             max_backoff: Duration::from_secs(30),
             max_players: None,

core/src/tunnel/event.rs

@@ -132,31 +132,11 @@ async fn capacity_check_with_grace(
     capacity_check_with_grace_delay(sessions, incoming_id, max_players, FULL_RECHECK_DELAY).await
 }
 
-#[cfg(test)]
-async fn capacity_check_with_grace_delay(
-    sessions: Arc<Mutex<HostSessions>>,
-    incoming_id: EndpointId,
-    max_players: Option<u32>,
-    recheck_delay: Duration,
-) -> bool {
-    capacity_check_with_grace_delay_impl(sessions, incoming_id, max_players, recheck_delay).await
-}
-
-#[cfg(not(test))]
 async fn capacity_check_with_grace_delay(
     sessions: Arc<Mutex<HostSessions>>,
     incoming_id: EndpointId,
     max_players: Option<u32>,
     recheck_delay: Duration,
-) -> bool {
-    capacity_check_with_grace_delay_impl(sessions, incoming_id, max_players, recheck_delay).await
-}
-
-async fn capacity_check_with_grace_delay_impl(
-    sessions: Arc<Mutex<HostSessions>>,
-    incoming_id: EndpointId,
-    max_players: Option<u32>,
-    recheck_delay: Duration,
 ) -> bool {
     let Some(max) = max_players else {
         return true;

core/src/tunnel/iroh/host.rs

@@ -6,8 +6,6 @@ use super::auth::auth_send;
 use super::monitor::spawn_path_monitor;
 use super::transport::bridge;
 
-const DEFAULT_INITIAL_RETRIES: u32 = 3;
-
 /// Join 侧重连 supervisor。
 #[allow(clippy::too_many_arguments)]
 pub(super) async fn reconnect_supervisor(
@@ -138,7 +136,7 @@ pub(super) async fn connect_with_retry(
     config: &TunnelConfig,
     tx: &mpsc::Sender<TunnelEvent>,
 ) -> anyhow::Result<Connection> {
-    let max = DEFAULT_INITIAL_RETRIES;
+    let max = config.initial_retries;
     let mut last_err = None;
 
     for attempt in 0..=max {

core/src/tunnel/iroh/join.rs

@@ -4,9 +4,8 @@ version = "0.1.0"
 edition = "2024"
 
 [dependencies]
-sculk-core = { workspace = true, features = ["persist"] }
+sculk-core = { workspace = true, features = ["persist", "clipboard"] }
 anyhow.workspace = true
-arboard.workspace = true
 tokio.workspace = true
 tracing.workspace = true
 tracing-subscriber.workspace = true