fix: some protocol parse failed

Author: ReaJason

proxrs/src/protocol/hysteria2.rs

@@ -41,7 +41,7 @@ pub struct Hysteria2 {
     pub obfs_password: Option<String>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub sni: Option<String>,
-    #[serde(skip_serializing_if = "Option::is_none")]
+    #[serde(skip_serializing_if = "Option::is_none", rename = "skip-cert-verify")]
     pub skip_cert_verify: Option<bool>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub fingerprint: Option<String>,
@@ -142,7 +142,7 @@ impl ProxyAdapter for Hysteria2 {
         }
 
         let skip_cert_verify = params_map.get("insecure").is_some_and(|s| s == "1");
-        let sni = params_map.get("sni").cloned();
+        let sni = params_map.get("sni").or(params_map.get("peer")).cloned();
         let up = params_map.get("up").cloned();
         let down = params_map.get("down").cloned();
         let mut ports = params_map.get("mport").cloned();

proxrs/src/protocol/mod.rs

@@ -1,9 +1,9 @@
-mod hysteria2;
 mod ss;
 mod ssr;
 mod trojan;
 pub(crate) mod vless;
 pub(crate) mod vmess;
+pub(crate) mod hysteria2;
 
 use std::any::Any;
 use std::collections::HashMap;

proxrs/src/protocol/trojan.rs

@@ -67,7 +67,11 @@ impl ProxyAdapter for Trojan {
         // [email protected]:41001
         // 4fee57cc-ee15-4800-888f-3493f7b261f2@hk1.ee2c9087-71b0-70af-7924-09d714b25b96.6df03129.
         // the-best-airport.com:443?type=tcp&sni=new.download.the-best-airport.com&allowInsecure=1
-        let parts: Vec<&str> = url.split("?").collect();
+        // [email protected]:2095/?type=ws
+        let mut parts: Vec<&str> = url.split("/?").collect();
+        if parts.len() == 1 {
+            parts = url.split("?").collect();
+        }
         let mut network = None;
         let mut sni = None;
         let mut skip_cert_verify = None;

proxrs/src/protocol/vless.rs

@@ -79,7 +79,10 @@ impl ProxyAdapter for Vless {
 
         let url = parts[0];
         let mut params_map: HashMap<&str, String> = HashMap::new();
-        let parts = url.split("?").collect::<Vec<_>>();
+        let mut parts = url.split("/?").collect::<Vec<_>>();
+        if parts.len() == 1 {
+            parts = url.split("?").collect::<Vec<_>>();
+        }
 
         if parts.len() > 1 {
             let params = parts[1];

proxrs/src/protocol/vmess.rs

@@ -232,7 +232,7 @@ impl ProxyAdapter for Vmess {
                     }
                 }
                 let alter_id = params_map.get("alterId").unwrap().parse::<u16>().unwrap();
-                let name = params_map.get("remarks").unwrap().to_string();
+                let name = urlencoding::decode(params_map.get("remarks").unwrap()).unwrap().to_string();
 
                 // parse server port
                 let url = base64decode(parts[0]);

src/website.rs

@@ -71,13 +71,16 @@ pub async fn youtube_music_is_ok(proxy_url: &str) -> Result<bool> {
 
 mod test {
     #[tokio::test]
+    #[ignore]
     async fn test_claude_is_ok() {
         let result = super::claude_is_ok("http://localhost:7890").await;
-        assert!(result.is_ok())
+        println!("{:?}", result);
     }
+
     #[tokio::test]
+    #[ignore]
     async fn test_openai_is_ok() {
         let result = super::openai_is_ok("http://localhost:7890").await;
-        println!("{:#?}", result);
+        println!("{:?}", result);
     }
 }