ci: test

Author: ReaJason

.github/workflows/ci.yaml

@@ -16,7 +16,7 @@ concurrency:
 jobs:
   check:
     name: Check
-    runs-on: ubuntu-22.04
+    runs-on: macos-latest
     steps:
       - uses: actions/checkout@v4
       - name: Install toolchain
@@ -28,11 +28,17 @@ jobs:
       - run: cargo +nightly fmt
   build:
     name: Build
-    runs-on: ubuntu-22.04
+    runs-on: macos-latest
     steps:
       - uses: actions/checkout@v4
       - uses: Swatinem/rust-cache@v2
       - name: Build
         run: cargo build --verbose
-        #- name: Run tests
-        #run: cargo test --verbose
+      - name: Run
+        run: cargo run
+      - name: Upload
+        uses: actions/upload-artifact@v4
+        with:
+          name: clash.yaml
+          path: subs/release/clash.yaml
+          retention-days: 5

conf/config.toml

@@ -6,20 +6,21 @@ fast_mode = false
 # 支持本地地址（绝对地址）/User/xxx/xx.yml
 # 支持单个订阅链接，ss://xxx
 subs = [
-    "https://sub.reajason.eu.org/clash.yaml"
+    "https://sub.reajason.eu.org/clash.yaml",
+    "https://s1.byte16.com/api/v1/client/subscribe?token=feba159f3478ff8936f52a43d88aae8b",
+    "https://www.cwy-water.us.kg/api/v1/client/subscribe?token=daa0f9c43c5b7f91a08aee21dab0138c",
+    "https://guanxi.us.kg/guanxi",
+    "https://naiher.me/vdnYUg.txt",
 ]
 
 # 是否重命名节点，打开后会使用 geoip 等方式进行代理真实 IP 和地理地址查询
 rename_node = true
 rename_pattern = "${COUNTRYCODE}_${CITY}_${ISP}"
 
 # 是否需要加上代理池的节点一起筛选
-need_add_pool = false
+need_add_pool = true
 # 代理节点池
 pools = [
-    "https://sub.ss5.xyz/",
-    "https://igdux.top/~Clash",
-    #    "https://sub.tgzdyz2.xyz/sub",
     "https://raw.githubusercontent.com/Ruk1ng001/freeSub/main/clash.yaml"
 ]
 

src/clash.rs

@@ -99,7 +99,7 @@ impl ClashMeta {
     ) -> Result<HashMap<String, i64>, Box<dyn std::error::Error>> {
         let url = format!("{}/group/{}/delay", &self.external_url, group_name);
         let client = Client::builder()
-            .timeout(Duration::from_secs(1))
+            .timeout(Duration::from_secs(10))
             .build()
             .unwrap();
         let response = client.get(&url).query(&delay_test_config).send().await?;
@@ -240,14 +240,14 @@ mod tests {
     #[tokio::test]
     #[ignore]
     async fn test_group_delay() {
-        let clash_meta = ClashMeta::new(9090, 7890);
+        let clash_meta = ClashMeta::new(9091, 7890);
         let result = clash_meta
             .test_group(
-                "Select",
+                "PROXY",
                 &DelayTestConfig {
                     url: "http://www.google.com/generate_204".to_string(),
                     expected: Some(204),
-                    timeout: 500,
+                    timeout: 1000,
                 },
             )
             .await;