2026-08-27 15:39:29 commit

Author: ZEROLINGG

client_cli/Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "free-proxy"
-version = "0.2.3"
+version = "0.2.4"
 license = "MIT OR Apache-2.0"
 edition = "2021"
 authors = ["ZEROLINGG <bcsz8833221@gmail.com>"]

client_cli/Cargo.toml

@@ -1,7 +1,7 @@
 {
   "$schema": "https://schema.tauri.app/config/2",
   "productName": "free-proxy",
-  "version": "0.2.3",
+  "version": "0.2.4",
   "identifier": "com.zz.freeproxy",
   "build": {
     "beforeDevCommand": "pnpm dev",

client_tauri/src-tauri/Cargo.lock

@@ -64,7 +64,7 @@ ipnetwork = { version = "0.21.1", optional = true }
 dirs = { version = "6", optional = true }
 rand = { version = "0.8", optional = true }
 machine-uid = { version = "0.6.0", optional = true }
-tracing = { version = "0.1", optional = true }
+#tracing = { version = "0.1", optional = true }
 
 postcard = { version = "1.1", features = ["alloc"] }
 
@@ -74,7 +74,7 @@ postcard = { version = "1.1", features = ["alloc"] }
 default = ["client"]
 
 # 本地客户端：tokio 运行时 + HTTP 客户端 + MITM TLS
-client = ["dep:tokio", "dep:reqwest", "dep:futures-util", "dep:async-stream", "dep:rustls", "dep:tokio-rustls", "dep:rcgen", "dep:moka", "dep:time", "dep:ipnetwork", "dep:reqwest-websocket", "dep:dirs", "dep:rand", "dep:machine-uid", "dep:tracing"]
+client = ["dep:tokio", "dep:reqwest", "dep:futures-util", "dep:async-stream", "dep:rustls", "dep:tokio-rustls", "dep:rcgen", "dep:moka", "dep:time", "dep:ipnetwork", "dep:reqwest-websocket", "dep:dirs", "dep:rand", "dep:machine-uid"]
 
 # 服务端 (wasm) 构建：纯逻辑，无 tokio
 server = []

client_tauri/src-tauri/tauri.conf.json

@@ -246,7 +246,7 @@ impl Proxy {
                 let (socket, addr) = match listener.accept().await {
                     Ok(v) => v,
                     Err(e) => {
-                        tracing::error!("[Client:error] accept error: {e}");
+                        eprintln!("[Client:error] accept error: {e}");
                         break;
                     }
                 };
@@ -255,9 +255,9 @@ impl Proxy {
                     if let Err(e) = handle_connection(socket, shared).await {
                         if is_benign_disconnect(&e) {
                             #[cfg(debug_assertions)]
-                            tracing::debug!("[Client:error] connection {addr}: {e} (benign disconnect)");
+                            eprintln!("[Client:error] connection {addr}: {e} (benign disconnect)");
                         } else {
-                            tracing::error!("[Client:error] connection {addr}: {:.1024?}...", format!("{e:#?}"));
+                            eprintln!("[Client:error] connection {addr}: {:.1024?}...", format!("{e:#?}"));
                         }
                     }
                 });

lib/Cargo.lock

@@ -200,18 +200,19 @@ where
     // ---------- 请求体范围判定 ----------
     let extent = body_extent(&header.headers)?;
 
-    tracing::debug!(
-        "[Client:debug] {:<7} {:<15.30} {:<15.30} {:?}",
-        header.method,
-        header
-            .headers
-            .iter()
-            .find(|(k, _)| k.eq_ignore_ascii_case("HOST"))
-            .map(|(_, v)| v)
-            .unwrap_or(&"unknown".to_string()),
-        header.path,
-        extent
-    );
+    // println!(
+    //     "[Client:debug] {:<7} {:<15.30} {:<15.30} {:?} {:.512?}",
+    //     header.method,
+    //     header
+    //         .headers
+    //         .iter()
+    //         .find(|(k, _)| k.eq_ignore_ascii_case("HOST"))
+    //         .map(|(_, v)| v)
+    //         .unwrap_or(&"unknown".to_string()),
+    //     header.path,
+    //     extent,
+    //     format!("{:?}",header.headers)
+    // );
 
     // ---------- WebSocket 升级请求：转入 WS 隧道，连接不再复用 ----------
     if header.is_websocket_upgrade() {
@@ -330,15 +331,15 @@ where
             Ok(Ok(Err(e))) => return Err(anyhow::Error::new(e).context("worker request failed")),
             Ok(Err(e)) => return Err(anyhow::Error::new(e).context("worker task panicked")),
             Err(_) => {
-                tracing::warn!("proxy: worker response idle timeout");
+                eprintln!("proxy: worker response idle timeout");
                 write_502(stream).await?;
                 return Ok(false);
             }
         },
     };
 
     if !resp.status().is_success() {
-        tracing::error!(
+        eprintln!(
             "worker request error: {}, body: {:.1024}...",
             resp.status(),
             resp.text().await.unwrap_or_default()
@@ -386,7 +387,7 @@ where
                 let chunk = match chunk {
                     Ok(c) => c,
                     Err(_) => {
-                        tracing::debug!("[Client:debug] frame idle timeout (no data for {:?})", FRAME_IDLE_TIMEOUT);
+                        eprintln!("[Client:debug] frame idle timeout (no data for {:?})", FRAME_IDLE_TIMEOUT);
                         if !wrote {
                             write_502(stream).await?;
                         }
@@ -397,11 +398,11 @@ where
                 let bytes = match chunk {
                     Some(Ok(b)) => b,
                     Some(Err(e)) => {
-                        tracing::warn!("[Client:debug] frame read error: {e}");
+                        eprintln!("[Client:debug] frame read error: {e}");
                         return Ok(false);
                     }
                     None => {
-                        tracing::warn!("[Client:debug] stream ended without EOS (truncated)");
+                        eprintln!("[Client:debug] stream ended without EOS (truncated)");
                         if !wrote {
                             write_502(stream).await?;
                         }
@@ -432,7 +433,7 @@ where
                             return Ok(true);
                         }
                         Err(e) => {
-                            tracing::warn!("[Client:debug] frame protocol error: {e}");
+                            eprintln!("[Client:debug] frame protocol error: {e}");
                             if !wrote {
                                 write_502(stream).await?;
                             }

lib/Cargo.toml

@@ -73,7 +73,7 @@ impl TlsManager {
                 Err(e) => {
                     // 解密失败（设备 uid 变化）或文件损坏：自动重建 CA。
                     // CA 证书随之变化，用户需重新导入 ca.crt.pem 到系统信任区。
-                    tracing::warn!("CA key load failed ({e:#}); regenerating CA");
+                    eprintln!("CA key load failed ({e:#}); regenerating CA");
                     remove_ca_files(&cert_path, &key_path, ca_dir);
                     let (cert, key, cert_pem) =
                         generate_and_persist_ca(&cert_path, &key_path, key_secret)?;

lib/src/proxy/mod.rs

@@ -91,7 +91,7 @@ where
     {
         Ok(u) => u,
         Err(e) => {
-            tracing::error!("ws: tunnel handshake failed: {e:#}");
+            eprintln!("ws: tunnel handshake failed: {e:#}");
             let _ = stream
                 .write_all(b"HTTP/1.1 502 Bad Gateway\r\nContent-Length: 0\r\n\r\n")
                 .await;
@@ -101,7 +101,7 @@ where
     let mut ws = match upgraded.into_websocket().await {
         Ok(w) => w,
         Err(e) => {
-            tracing::error!("ws: tunnel upgrade failed: {e:#}");
+            eprintln!("ws: tunnel upgrade failed: {e:#}");
             let _ = stream
                 .write_all(b"HTTP/1.1 502 Bad Gateway\r\nContent-Length: 0\r\n\r\n")
                 .await;
@@ -244,7 +244,7 @@ where
                         }
                         // 服务端明确抛出的内部错误
                         WsTunnelMsg::Error(err_msg) => {
-                            tracing::warn!("ws: received explicit error from worker: {err_msg}");
+                            eprintln!("ws: received explicit error from worker: {err_msg}");
                             let mut w = wr_download.lock().await;
 
                             if has_upgraded {
@@ -271,7 +271,7 @@ where
                 }
                 Ok(_) => {}
                 Err(e) => {
-                    tracing::error!("proxy ws: tunnel read error: {e}");
+                    eprintln!("proxy ws: tunnel read error: {e}");
                     return Err(e).context("ws tunnel read failed");
                 }
             }
@@ -284,12 +284,12 @@ where
     tokio::select! {
         res = upload => {
             if let Err(e) = res {
-                tracing::warn!("ws tunnel upload terminated with error: {e:#}");
+                eprintln!("ws tunnel upload terminated with error: {e:#}");
             }
         }
         res = download => {
             if let Err(e) = res {
-                tracing::warn!("ws tunnel download terminated with error: {e:#}");
+                eprintln!("ws tunnel download terminated with error: {e:#}");
             }
         }
     }