feat: add openai and claude website test

Author: ReaJason

Cargo.lock

@@ -15,6 +15,7 @@ opt-level = "s"
 
 [dependencies]
 proxrs = { path = "proxrs" }
+anyhow = "1.0.93"
 axum = "0.7.5"
 tower-http = { version = "0.5.2", features = ["fs"] }
 serde = { version = "1.0", features = ["derive"] }

Cargo.toml

@@ -76,6 +76,8 @@ proxy-groups:
       - JP
       - SG
       - US
+      - OpenAI
+      - Claude
   - name: Select
     type: select
     filter: ".*"
@@ -125,6 +127,20 @@ proxy-groups:
     tolerance: 500
     proxies: [ ]
     filter: "(?i)美|洛杉矶|芝加哥|西雅图|America|US|United.*?States"
+  - name: OpenAI
+    type: url-test
+    url: http://www.google.com/generate_204
+    interval: 600
+    tolerance: 500
+    proxies: [ PROXY ]
+    filter: "(?i)OpenAI"
+  - name: Claude
+    type: url-test
+    url: http://www.google.com/generate_204
+    interval: 600
+    tolerance: 500
+    proxies: [ PROXY ]
+    filter: "(?i)Claude"
 rules:
   - RULE-SET,ads,REJECT
   - RULE-SET,applications,DIRECT
@@ -134,8 +150,9 @@ rules:
   - RULE-SET,google-cn,DIRECT
   - RULE-SET,bilibili,DIRECT
   - RULE-SET,cn,DIRECT
-  - RULE-SET,ai,PROXY
-  - RULE-SET,proxy,PROXY
+  - RULE-SET,claude,Claude
+  - RULE-SET,ai,OpenAI
+  - RULE-SET,youtube,PROXY
   - RULE-SET,telegramip,PROXY,no-resolve
   - RULE-SET,privateip,DIRECT,no-resolve
   - RULE-SET,cnip,DIRECT,no-resolve
@@ -221,16 +238,23 @@ rule-providers:
     behavior: domain
     format: mrs
     path: ./rules/ai.mrs
-    url: "https://github.com/DustinWin/ruleset_geodata/releases/download/clash-ruleset/ai.mrs"
+    url: "https://github.com/ReaJason/Clash-Butler/raw/refs/heads/master/rules/ai/ai.mrs"
+    interval: 86400
+
+  claude:
+    type: http
+    behavior: domain
+    format: mrs
+    path: ./rules/claude.mrs
+    url: "https://github.com/ReaJason/Clash-Butler/raw/refs/heads/master/rules/claude/claude.mrs"
     interval: 86400
-    # https://gitlab.com/lodepuly/vpn_tool/-/blob/master/Tool/Clash/Rule/AI.yaml
 
-  proxy:
+  youtube:
     type: http
     behavior: domain
     format: mrs
-    path: ./rules/proxy.mrs
-    url: "https://github.com/DustinWin/ruleset_geodata/releases/download/clash-ruleset/proxy.mrs"
+    path: ./rules/youtube.mrs
+    url: "https://github.com/DustinWin/ruleset_geodata/releases/download/clash-ruleset/youtube.mrs"
     interval: 86400
 
   cn:

conf/clash_release.yaml

@@ -37,19 +37,6 @@ proxy-groups:
     proxies: [ ]
     filter: ".*"
 rules:
-  - RULE-SET,ads,REJECT
-  - RULE-SET,applications,DIRECT
-  - RULE-SET,private,DIRECT
-  - RULE-SET,apple-cn,DIRECT
-  - RULE-SET,games-cn,DIRECT
-  - RULE-SET,google-cn,DIRECT
-  - RULE-SET,bilibili,DIRECT
-  - RULE-SET,cn,DIRECT
-  - RULE-SET,ai,PROXY
-  - RULE-SET,proxy,PROXY
-  - RULE-SET,telegramip,PROXY,no-resolve
-  - RULE-SET,privateip,DIRECT,no-resolve
-  - RULE-SET,cnip,DIRECT,no-resolve
   - GEOIP,LAN,DIRECT,no-resolve
   - GEOIP,CN,DIRECT,no-resolve
   - MATCH,PROXY
@@ -61,117 +48,4 @@ rule-providers:
     format: mrs
     path: ./rules/fakeip-filter.mrs
     url: "https://github.com/DustinWin/ruleset_geodata/releases/download/clash-ruleset/fakeip-filter.mrs"
-    interval: 86400
-
-  ads:
-    type: http
-    behavior: domain
-    format: mrs
-    path: ./rules/ads.mrs
-    url: "https://github.com/DustinWin/ruleset_geodata/releases/download/clash-ruleset/ads.mrs"
-    interval: 86400
-
-  applications:
-    type: http
-    behavior: classical
-    format: text
-    path: ./rules/applications.list
-    url: "https://github.com/DustinWin/ruleset_geodata/releases/download/clash-ruleset/applications.list"
-    interval: 86400
-
-  private:
-    type: http
-    behavior: domain
-    format: mrs
-    path: ./rules/private.mrs
-    url: "https://github.com/DustinWin/ruleset_geodata/releases/download/clash-ruleset/private.mrs"
-    interval: 86400
-
-  games-cn:
-    type: http
-    behavior: domain
-    format: mrs
-    path: ./rules/games-cn.mrs
-    url: "https://github.com/DustinWin/ruleset_geodata/releases/download/clash-ruleset/games-cn.mrs"
-    interval: 86400
-
-  microsoft-cn:
-    type: http
-    behavior: domain
-    format: mrs
-    path: ./rules/microsoft-cn.mrs
-    url: "https://github.com/DustinWin/ruleset_geodata/releases/download/clash-ruleset/microsoft-cn.mrs"
-    interval: 86400
-
-  apple-cn:
-    type: http
-    behavior: domain
-    format: mrs
-    path: ./rules/apple-cn.mrs
-    url: "https://github.com/DustinWin/ruleset_geodata/releases/download/clash-ruleset/apple-cn.mrs"
-    interval: 86400
-
-  google-cn:
-    type: http
-    behavior: domain
-    format: mrs
-    path: ./rules/google-cn.mrs
-    url: "https://github.com/DustinWin/ruleset_geodata/releases/download/clash-ruleset/google-cn.mrs"
-    interval: 86400
-
-  bilibili:
-    type: http
-    behavior: domain
-    format: mrs
-    path: ./rules/bilibili.mrs
-    url: "https://github.com/DustinWin/ruleset_geodata/releases/download/clash-ruleset/bilibili.mrs"
-    interval: 86400
-
-  ai:
-    type: http
-    behavior: domain
-    format: mrs
-    path: ./rules/ai.mrs
-    url: "https://github.com/DustinWin/ruleset_geodata/releases/download/clash-ruleset/ai.mrs"
-    interval: 86400
-    # https://gitlab.com/lodepuly/vpn_tool/-/blob/master/Tool/Clash/Rule/AI.yaml
-
-  proxy:
-    type: http
-    behavior: domain
-    format: mrs
-    path: ./rules/proxy.mrs
-    url: "https://github.com/DustinWin/ruleset_geodata/releases/download/clash-ruleset/proxy.mrs"
-    interval: 86400
-
-  cn:
-    type: http
-    behavior: domain
-    format: mrs
-    path: ./rules/cn.mrs
-    url: "https://github.com/DustinWin/ruleset_geodata/releases/download/clash-ruleset/cn.mrs"
-    interval: 86400
-
-  telegramip:
-    type: http
-    behavior: ipcidr
-    format: mrs
-    path: ./rules/telegramip.mrs
-    url: "https://github.com/DustinWin/ruleset_geodata/releases/download/clash-ruleset/telegramip.mrs"
-    interval: 86400
-
-  privateip:
-    type: http
-    behavior: ipcidr
-    format: mrs
-    path: ./rules/privateip.mrs
-    url: "https://github.com/DustinWin/ruleset_geodata/releases/download/clash-ruleset/privateip.mrs"
-    interval: 86400
-
-  cnip:
-    type: http
-    behavior: ipcidr
-    format: mrs
-    path: ./rules/cnip.mrs
-    url: "https://github.com/DustinWin/ruleset_geodata/releases/download/clash-ruleset/cnip.mrs"
     interval: 86400

conf/clash_test.yaml

@@ -6,11 +6,7 @@ fast_mode = false
 # 支持本地地址（绝对地址）/User/xxx/xx.yml
 # 支持单个订阅链接，ss://xxx
 subs = [
-    "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",
+    "https://raw.githubusercontent.com/ReaJason/Clash-Butler/refs/heads/master/clash.yaml"
 ]
 
 # 是否重命名节点，打开后会使用 geoip 等方式进行代理真实 IP 和地理地址查询
@@ -24,6 +20,9 @@ pools = [
     "https://raw.githubusercontent.com/Ruk1ng001/freeSub/main/clash.yaml"
 ]
 
+# 测试分组大小
+test_group_size = 50
+
 # 连通性测试
 [connect_test]
 url = "http://www.google.com/generate_204"

conf/config.toml

@@ -250,7 +250,7 @@ impl SubManager {
             *name_counts.entry(name).or_insert(0) += 1;
         }
 
-        for proxy in proxies {
+        for proxy in &mut *proxies {
             let name = proxy.get_name().to_string();
             if let Some(count) = name_counts.get(&name) {
                 if count > &1 {
@@ -266,6 +266,9 @@ impl SubManager {
                 }
             }
         }
+
+        // 以名称重新排序
+        proxies.sort_by(|a, b| a.get_name().cmp(&b.get_name()));
     }
 
     // 通过配置格式，获取 clash 配置文件内容
@@ -304,8 +307,14 @@ impl SubManager {
                             .get_mut(Value::String("proxies".to_string()))
                             .and_then(Value::as_sequence_mut)
                         {
+                            let mut removed_default = false;
                             for proxy in new_proxies {
                                 if regex.is_match(proxy.get_name()) {
+                                    if !removed_default
+                                        && proxies.get(0).is_some_and(|p| p.as_str().unwrap().eq("PROXY")) {
+                                        proxies.remove(0);
+                                        removed_default = true;
+                                    }
                                     proxies.push(Value::String(proxy.get_name().to_string()));
                                 }
                             }
@@ -343,7 +352,7 @@ mod test {
         let mut proxies = SubManager::parse_from_path(
             "/Users/reajason/RustroverProjects/clash-butler/subs/0c1149d13476bbe3b62eecb7c9b895f4",
         )
-        .unwrap();
+            .unwrap();
         SubManager::unset_proxies_name(&mut proxies);
         let content = SubManager::get_clash_config_content(path.to_string(), &proxies).unwrap();
         println!("{}", content);
@@ -417,4 +426,19 @@ mod test {
             "/Users/reajason/RustroverProjects/clash-butler/subs/release/proxy.yaml".to_string();
         SubManager::save_proxies_into_clash_file(&proxies, release_clash_template_path, save_path);
     }
+
+    #[tokio::test]
+    async fn test_rename() {
+        let urls = vec![
+            "/Users/reajason/RustroverProjects/clash-butler/clash.yaml"
+                .to_string(),
+        ];
+        let mut proxies = SubManager::get_proxies_from_urls(&urls).await;
+        SubManager::rename_dup_proxies_name(&mut proxies);
+        let release_clash_template_path =
+            "/Users/reajason/RustroverProjects/clash-butler/conf/clash_release.yaml".to_string();
+        let save_path =
+            "/Users/reajason/RustroverProjects/clash-butler/clash1.yaml".to_string();
+        SubManager::save_proxies_into_clash_file(&proxies, release_clash_template_path, save_path)
+    }
 }

proxrs/src/sub.rs

@@ -18,7 +18,7 @@ const CF_TRACE_URL: &str = "https://1.0.0.1/cdn-cgi/trace";
 const CF_CN_TRACE_URL: &str = "https://cf-ns.com/cdn-cgi/trace";
 
 // IP 查询超时时间
-const TIMEOUT: Duration = Duration::from_millis(1000);
+const TIMEOUT: Duration = Duration::from_secs(5);
 
 type IpBoxFuture<'a> = BoxFuture<'a, Result<(IpAddr, &'a str), Box<dyn std::error::Error>>>;