diff --git a/src/parser/mod.rs b/src/parser/mod.rs index 3900ccf..0d6e1dc 100644 --- a/src/parser/mod.rs +++ b/src/parser/mod.rs @@ -21,13 +21,13 @@ pub fn get_metadata(uri: &str) -> String { port: data.port, protocol, }; - + serde_json::to_string(&meta_data).unwrap() } pub fn create_json_config(uri: &str, socks_port: Option, http_port: Option) -> String { let config = create_config(uri, socks_port, http_port); - + serde_json::to_string(&config).unwrap() } @@ -42,7 +42,7 @@ pub fn create_config( socks_port, http_port, }); - + config_models::Config { outbounds: vec![outbound_object], inbounds: inbound_config, @@ -56,8 +56,6 @@ pub fn create_outbound_object(uri: &str) -> config_models::Outbound { let allow_insecure = data.allowInsecure == Some(String::from("true")) || data.allowInsecure == Some(String::from("1")); - - Outbound { protocol: name, tag: String::from("proxy"), diff --git a/src/parser/vmess/data.rs b/src/parser/vmess/data.rs index 0a52c82..2ca10f8 100644 --- a/src/parser/vmess/data.rs +++ b/src/parser/vmess/data.rs @@ -8,9 +8,7 @@ use serde_json::Value; pub fn get_data(uri: &str) -> RawData { let data = uri.split_once("vmess://").unwrap().1; - match general_purpose::STANDARD - .decode(url_decode_str(data).unwrap_or(String::from(data))) - { + match general_purpose::STANDARD.decode(url_decode_str(data).unwrap_or(String::from(data))) { Ok(decoded) => get_raw_data_from_base64(&decoded), Err(_) => get_raw_data_from_uri(data), } diff --git a/src/utils/mod.rs b/src/utils/mod.rs index 6443286..613c46c 100644 --- a/src/utils/mod.rs +++ b/src/utils/mod.rs @@ -24,8 +24,5 @@ pub fn parse_raw_json(input: &str) -> Option { } pub fn get_parameter_value(query: &Vec<(&str, &str)>, param: &str) -> Option { - query - .iter() - .find(|q| q.0 == param) - .map(|q| q.1.to_string()) + query.iter().find(|q| q.0 == param).map(|q| q.1.to_string()) }