up

.github/workflows/ci.yml

@@ -15,6 +15,7 @@ env:
   PACKAGE: "clash"
   REGISTRY: "ghcr.io"
   IMAGE_NAME: "clash-rs"
+  RUST_LOG: "clash=TRACE"
 
 
 # Arm builder https://github.blog/changelog/2024-09-03-github-actions-arm64-linux-and-windows-runners-are-now-generally-available/
@@ -229,26 +230,15 @@ jobs:
           command: clippy
           args: --all --target ${{ matrix.target }} ${{ matrix.extra-args }} -- -D warnings
 
-      - name: Cargo test (docker test on linux)
+      - name: Cargo test (no arm windows)
         uses: clechasseur/rs-cargo@v2
-        if: startsWith(matrix.os, 'ubuntu')
+        if: ${{ matrix.target != 'aarch64-pc-windows-msvc' }}
         with:
           use-cross: ${{ matrix.cross }}
           command: test
           args: --all --target ${{ matrix.target }} ${{ matrix.extra-args }}
         env:
           CROSS_CONTAINER_OPTS: "--network host"
-          CLASH_DOCKER_TEST: "true"
-          RUSTFLAGS: ${{ matrix.rustflags || '--cfg tokio_unstable' }}
-
-      - name: Cargo test (no docker test on windows-non-arm and macos)
-        uses: clechasseur/rs-cargo@v2
-        if: ${{ !startsWith(matrix.os, 'ubuntu') && matrix.target != 'aarch64-pc-windows-msvc' }}
-        with:
-          use-cross: ${{ matrix.cross }}
-          command: test
-          args: --all --target ${{ matrix.target }} ${{ matrix.extra-args }}
-        env:
           RUSTFLAGS: ${{ matrix.rustflags || '--cfg tokio_unstable' }}
 
       - name: Cargo build
@@ -306,7 +296,9 @@ jobs:
           # Deleted latest tag and push it
           git tag -d latest || true
           git push origin :refs/tags/latest || true
-          # Deleted all drafts
+          # Create local tag
+          git tag latest
+          # Delete all drafts
           gh release list | grep Draft |  awk '{print $1 " \t"}' |  while read -r line; do gh release delete -y "$line"; done
         env:
           GH_TOKEN: ${{ github.token }}

Cross.toml

@@ -6,7 +6,7 @@ pre-build = [
 
 [build.env]
 volumes = ["/var/run/docker.sock=/var/run/docker.sock"] # Docker in docker
-passthrough = ["CLASH_GIT_REF", "CLASH_GIT_SHA", "RUSTFLAGS", "CLASH_DOCKER_TEST"]
+passthrough = ["CLASH_GIT_REF", "CLASH_GIT_SHA", "RUSTFLAGS", "RUST_LOG"]
 
 [target.x86_64-unknown-linux-gnu]
 image = "ghcr.io/cross-rs/x86_64-unknown-linux-gnu:main"

clash_lib/Cargo.toml

@@ -138,7 +138,8 @@ mockall = "0.13.0"
 tokio-test = "0.4.4"
 axum-macros = "0.4.0"
 bollard = "0.17"
-serial_test = "3.1.1"
+serial_test = "3.1"
+env_logger = "0.11"
 
 [build-dependencies]
 prost-build = "0.13"

clash_lib/build.rs

@@ -1,10 +1,4 @@
 fn main() -> std::io::Result<()> {
-    println!("cargo::rustc-check-cfg=cfg(docker_test)");
-    println!("cargo:rerun-if-env-changed=CLASH_DOCKER_TEST");
-    if let Some("1" | "true") = option_env!("CLASH_DOCKER_TEST") {
-        println!("cargo::rustc-cfg=docker_test");
-    }
-
     println!("cargo:rerun-if-changed=src/common/geodata/geodata.proto");
     prost_build::compile_protos(
         &["src/common/geodata/geodata.proto"],

clash_lib/src/lib.rs

@@ -513,7 +513,15 @@ async fn start_async(opts: Options) -> Result<(), Error> {
 #[cfg(test)]
 mod tests {
     use crate::{shutdown, start, Config, Options};
-    use std::{thread, time::Duration};
+    use std::{sync::Once, thread, time::Duration};
+
+    static INIT: Once = Once::new();
+
+    pub fn initialize() {
+        INIT.call_once(|| {
+            env_logger::init();
+        });
+    }
 
     #[test]
     fn start_and_stop() {

clash_lib/src/proxy/relay/mod.rs

@@ -199,7 +199,7 @@ impl OutboundHandler for Handler {
 }
 
 #[cfg(feature = "shadowsocks")]
-#[cfg(all(test, docker_test))]
+#[cfg(all(test))]
 mod tests {
 
     use tokio::sync::RwLock;

clash_lib/src/proxy/shadowsocks/datagram.rs

@@ -184,13 +184,16 @@ where
 
         let mut buf = ReadBuf::new(buf);
 
-        let rv = ready!(inner.poll_recv_from(cx, &mut buf));
+        let rv = ready!(inner.poll_recv(cx, &mut buf));
         debug!("recv udp packet from remote ss server: {:?}", rv);
 
         match rv {
             Ok((n, src, ..)) => Poll::Ready(Some(UdpPacket {
                 data: buf.filled()[..n].to_vec(),
-                src_addr: src.into(),
+                src_addr: match src {
+                    shadowsocks::relay::Address::SocketAddress(a) => a.into(),
+                    _ => SocksAddr::any_ipv4(),
+                },
                 dst_addr: SocksAddr::any_ipv4(),
             })),
             Err(_) => Poll::Ready(None),

clash_lib/src/proxy/shadowsocks/mod.rs

@@ -288,15 +288,18 @@ impl OutboundHandler for Handler {
     }
 }
 
-#[cfg(all(test, docker_test))]
+#[cfg(all(test))]
 mod tests {
 
     use super::super::utils::test_utils::{
         consts::*, docker_runner::DockerTestRunner,
     };
-    use crate::proxy::utils::test_utils::{
-        docker_runner::{DockerTestRunnerBuilder, MultiDockerTestRunner},
-        run_test_suites_and_cleanup, Suite,
+    use crate::{
+        proxy::utils::test_utils::{
+            docker_runner::{DockerTestRunnerBuilder, MultiDockerTestRunner},
+            run_test_suites_and_cleanup, Suite,
+        },
+        tests::initialize,
     };
 
     use super::*;
@@ -317,8 +320,8 @@ mod tests {
 
     #[tokio::test]
     #[serial_test::serial]
-    async fn test_ss() -> anyhow::Result<()> {
-        let _ = tracing_subscriber::fmt().try_init();
+    async fn test_ss_plain() -> anyhow::Result<()> {
+        initialize();
         let opts = HandlerOptions {
             name: "test-ss".to_owned(),
             common_opts: Default::default(),
@@ -466,9 +469,6 @@ mod tests {
     #[serial_test::serial]
     async fn test_ss_obfs_tls() -> anyhow::Result<()> {
         if cfg!(target_arch = "x86_64") {
-            let _ = tracing_subscriber::fmt()
-                .with_max_level(tracing::Level::DEBUG)
-                .try_init();
             test_ss_obfs_inner(SimpleOBFSMode::Tls).await
         } else {
             eprintln!("test_ss_obfs_tls is ignored on non-x86_64 platform");

clash_lib/src/proxy/socks/outbound/mod.rs

@@ -276,7 +276,7 @@ impl OutboundHandler for Handler {
     }
 }
 
-#[cfg(all(test, docker_test))]
+#[cfg(all(test))]
 mod tests {
 
     use std::sync::Arc;
@@ -326,7 +326,6 @@ mod tests {
     #[tokio::test]
     #[serial_test::serial]
     async fn test_socks5_no_auth() -> anyhow::Result<()> {
-        let _ = tracing_subscriber::fmt().try_init();
         let opts = HandlerOptions {
             name: "test-socks5-no-auth".to_owned(),
             common_opts: Default::default(),
@@ -352,7 +351,6 @@ mod tests {
     async fn test_socks5_auth() -> anyhow::Result<()> {
         use crate::proxy::DialWithConnector;
 
-        let _ = tracing_subscriber::fmt().try_init();
         let opts = HandlerOptions {
             name: "test-socks5-no-auth".to_owned(),
             common_opts: Default::default(),

clash_lib/src/proxy/trojan/mod.rs

@@ -254,7 +254,7 @@ impl OutboundHandler for Handler {
     }
 }
 
-#[cfg(all(test, docker_test))]
+#[cfg(all(test))]
 mod tests {
 
     use std::collections::HashMap;
@@ -288,10 +288,6 @@ mod tests {
     #[tokio::test]
     #[serial_test::serial]
     async fn test_trojan_ws() -> anyhow::Result<()> {
-        let _ = tracing_subscriber::fmt()
-            // any additional configuration of the subscriber you might want here..
-            .try_init();
-
         let span = tracing::info_span!("test_trojan_ws");
         let _enter = span.enter();
 

clash_lib/src/proxy/utils/mod.rs

@@ -3,7 +3,7 @@ use std::{
     net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr},
 };
 
-#[cfg(all(test, docker_test))]
+#[cfg(all(test))]
 pub mod test_utils;
 
 mod platform;

clash_lib/src/proxy/utils/socket_helpers.rs

@@ -148,41 +148,3 @@ pub async fn new_udp_socket(
 
     UdpSocket::from_std(socket.into())
 }
-
-#[cfg(test)]
-mod tests {
-    use std::{net::IpAddr, time::Duration};
-
-    use tokio::{net::TcpSocket, time::timeout};
-
-    #[tokio::test]
-    #[ignore = "not a real test"]
-    async fn test_connect_tcp() {
-        let mut futs = vec![];
-
-        for i in 0..100 {
-            futs.push(tokio::spawn(async move {
-                let now = std::time::Instant::now();
-                let socket = socket2::Socket::new(
-                    socket2::Domain::IPV4,
-                    socket2::Type::DGRAM,
-                    None,
-                )
-                .unwrap();
-
-                timeout(
-                    Duration::from_secs(10),
-                    TcpSocket::from_std_stream(socket.into())
-                        .connect(("1.1.1.1".parse::<IpAddr>().unwrap(), 443).into()),
-                )
-                .await
-                .unwrap()
-                .unwrap();
-
-                println!("fut {} took {:?}", i, now.elapsed().as_millis());
-            }));
-        }
-
-        futures::future::join_all(futs).await;
-    }
-}

clash_lib/src/proxy/utils/test_utils/mod.rs

@@ -33,7 +33,14 @@ pub async fn ping_pong_test(
     // server(127.0.0.1:port)
 
     let sess = Session {
-        destination: ("127.0.0.1".to_owned(), port)
+        destination: (
+            if cfg!(target_os = "linux") {
+                "127.0.0.1".to_owned()
+            } else {
+                "host.docker.internal".to_owned()
+            },
+            port,
+        )
             .try_into()
             .unwrap_or_else(|_| panic!("")),
         ..Default::default()
@@ -144,7 +151,14 @@ pub async fn ping_pong_udp_test(
     let src = ("127.0.0.1".to_owned(), 10005)
         .try_into()
         .unwrap_or_else(|_| panic!(""));
-    let dst: SocksAddr = ("127.0.0.1".to_owned(), port)
+    let dst: SocksAddr = (
+        if cfg!(target_os = "linux") {
+            "127.0.0.1".to_owned()
+        } else {
+            "host.docker.internal".to_owned()
+        },
+        port,
+    )
         .try_into()
         .unwrap_or_else(|_| panic!(""));
 

clash_lib/src/proxy/vmess/mod.rs

@@ -286,7 +286,7 @@ impl OutboundHandler for Handler {
     }
 }
 
-#[cfg(all(test, docker_test))]
+#[cfg(all(test))]
 mod tests {
     use crate::proxy::utils::test_utils::{
         config_helper::test_config_base_dir,
@@ -317,10 +317,6 @@ mod tests {
     #[tokio::test]
     #[serial_test::serial]
     async fn test_vmess_ws() -> anyhow::Result<()> {
-        let _ = tracing_subscriber::fmt()
-            // any additional configuration of the subscriber you might want here..
-            .try_init();
-
         let span = tracing::info_span!("test_vmess_ws");
         let _enter = span.enter();
 

clash_lib/src/proxy/wg/mod.rs

@@ -317,7 +317,7 @@ impl OutboundHandler for Handler {
     }
 }
 
-#[cfg(all(test, docker_test))]
+#[cfg(all(test))]
 mod tests {
 
     use crate::proxy::utils::{