build: update deps

Author: Itsusinn

.gitignore

@@ -2,3 +2,5 @@
 target/
 .DS_Store
 .idea/
+
+tuic-server/dbg.toml

Cargo.lock

@@ -52,7 +52,7 @@ rustls-pemfile = { version = "2", default-features = false, features = ["std"] }
 # Error-handling
 thiserror = { version = "2", default-features = false }
 anyhow = "1"
-eyre = { version = "0" }
+eyre = { version = "0.6" }
 
 # Logging
 time = { version = "0.3", features = ["macros", "local-offset"] }

tuic-client/Cargo.toml

@@ -19,4 +19,4 @@ thiserror = { version = "2", default-features = false }
 tuic = { path = "../tuic", default-features = false, features = ["async_marshal", "marshal", "model"] }
 uuid = { version = "1", default-features = false, features = ["std"] }
 tokio = { version = "1", default-features = false, features = ["io-util"] }
-eyre = { version = "0" }
+eyre = { version = "0.6" }

tuic-quinn/Cargo.toml

@@ -75,4 +75,5 @@ reqwest = { version = "0.12", default-features = false, features = ["rustls-tls"
 tempfile = "3"
 tokio = { version = "1", features = ["full", "test-util"] }
 x509-parser = "0.18"
-chrono = "0.4"
+chrono = "0.4"
+tokio-test = "0.4"

tuic-server/Cargo.toml

@@ -18,7 +18,7 @@ use super::{Connection, ERROR_CODE, UdpSession};
 use crate::{
     config::OutboundRule,
     error::Error,
-    io::exchange_tcp,
+    io::copy_io,
     restful,
     utils::{IpMode, UdpRelayMode},
 };
@@ -226,7 +226,7 @@ impl Connection {
 
             // a -> b tx
             // a <- b rx
-            let (tx, rx, err) = exchange_tcp(&mut conn, &mut stream).await;
+            let (tx, rx, err) = copy_io(&mut conn, &mut stream).await;
             if err.is_some() {
                 _ = conn.reset(ERROR_CODE);
             } else {
@@ -241,9 +241,9 @@ impl Connection {
             restful::traffic_tx(&self.ctx, &uuid, tx);
             restful::traffic_rx(&self.ctx, &uuid, rx);
             if let Some(err) = err {
-                return Err(err);
+                return Err(err.into());
             }
-            Ok(())
+            eyre::Ok(())
         };
 
         match process.await {

tuic-server/src/connection/handle_task.rs

@@ -1,11 +1,12 @@
-use tokio::io::{AsyncReadExt, AsyncWriteExt};
+use tokio::io::{AsyncRead, AsyncReadExt, AsyncWrite, AsyncWriteExt};
 
-const BUFFER_SIZE: usize = 8 * 1024;
+const BUFFER_SIZE: usize = 16 * 1024;
 
-pub async fn exchange_tcp(
-    a: &mut tuic_quinn::Connect,
-    b: &mut tokio::net::TcpStream,
-) -> (usize, usize, Option<eyre::Error>) {
+pub async fn copy_io<A, B>(a: &mut A, b: &mut B) -> (usize, usize, Option<std::io::Error>)
+where
+    A: AsyncRead + AsyncWrite + Unpin + ?Sized,
+    B: AsyncRead + AsyncWrite + Unpin + ?Sized,
+{
     let mut a2b = [0u8; BUFFER_SIZE];
     let mut b2a = [0u8; BUFFER_SIZE];
 
@@ -16,42 +17,40 @@ pub async fn exchange_tcp(
 
     loop {
         tokio::select! {
-            a2b_res = a.recv.read(&mut a2b) => match a2b_res {
-                Ok(Some(num)) => {
-                    a2b_num += num;
-                    if let Err(err) = b.write_all(&a2b[..num]).await {
-                        last_err = Some(err.into());
-                        break;
-                    }
-                },
-                // EOF
-                Ok(None) => {
+           a2b_res = a.read(&mut a2b) => match a2b_res {
+              Ok(num) => {
+                 // EOF
+                 if num == 0 {
                     break;
-                },
-                Err(err) => {
-                    last_err = Some(err.into());
+                 }
+                 a2b_num += num;
+                 if let Err(err) = b.write_all(&a2b[..num]).await {
+                    last_err = Some(err);
                     break;
-                }
-            },
-
-            b2a_res = b.read(&mut b2a) => match b2a_res {
-                Ok(num) => {
-                    // EOF
-                    if num == 0 {
-                        break;
-                    }
-                    b2a_num += num;
-                    if let Err(err) = a.send.write_all(&b2a[..num]).await {
-                        last_err = Some(err.into());
-                        break;
-                    }
-                },
-                Err(err) => {
-                    last_err = Some(err.into());
+                 }
+              },
+              Err(err) => {
+                 last_err = Some(err);
+                 break;
+              }
+           },
+           b2a_res = b.read(&mut b2a) => match b2a_res {
+              Ok(num) => {
+                 // EOF
+                 if num == 0 {
                     break;
-                },
-            }
-
+                 }
+                 b2a_num += num;
+                 if let Err(err) = a.write_all(&b2a[..num]).await {
+                    last_err = Some(err);
+                    break;
+                 }
+              },
+              Err(err) => {
+                 last_err = Some(err);
+                 break;
+              },
+           }
         }
     }
 

tuic-server/src/io.rs

@@ -40,6 +40,7 @@ struct AppContext {
 
 #[tokio::main]
 async fn main() -> eyre::Result<()> {
+
     let cfg = match parse_config(lexopt::Parser::from_env()).await {
         Ok(cfg) => cfg,
         Err(ConfigError::Version(msg) | ConfigError::Help(msg)) => {
@@ -51,7 +52,10 @@ async fn main() -> eyre::Result<()> {
             process::exit(1);
         }
     };
+    run(cfg).await
+}
 
+pub async fn run(cfg: Config) -> eyre::Result<()> {
     let mut online_counter = HashMap::new();
     for (user, _) in cfg.users.iter() {
         online_counter.insert(user.to_owned(), AtomicUsize::new(0));