diff --git a/src/parser/config_models/mod.rs b/src/config_models/mod.rs similarity index 100% rename from src/parser/config_models/mod.rs rename to src/config_models/mod.rs diff --git a/src/main.rs b/src/main.rs index aafaaf6..55253e1 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,6 +1,7 @@ mod parser; use clap::{Parser, Subcommand}; use std::path::PathBuf; +pub mod config_models; #[derive(Parser)] #[command(author, version, about, long_about = None)] @@ -21,6 +22,6 @@ fn main() { } }; println!("the uri is: {}", cli.uri); - let json_config = parser::create_json_config(&cli.uri); + let json_config = parser::create_json_config(&cli.uri, cli.socksport); println!("The json config is: {}" , json_config); } diff --git a/src/parser/mod.rs b/src/parser/mod.rs index 4e861de..343a665 100644 --- a/src/parser/mod.rs +++ b/src/parser/mod.rs @@ -1,7 +1,6 @@ +use crate::config_models; use std::process::exit; -use self::config_models::{Config, Outbound}; -pub mod config_models; mod uri_identifier; mod vless; @@ -11,16 +10,16 @@ pub fn create_json_config(uri: &str, socks_port: Option) -> String { return serialized; } -pub fn create_config(uri: &str, socks_port: Option) -> Config { +pub fn create_config(uri: &str, socks_port: Option) -> config_models::Config { let outbound_object = create_outbound_object(uri); - let config = Config { + let config = config_models::Config { outbounds: vec![outbound_object], inbounds: None, }; return config; } -pub fn create_outbound_object(uri: &str) -> Outbound { +pub fn create_outbound_object(uri: &str) -> config_models::Outbound { let protocol = uri_identifier::get_uri_protocol(uri); match protocol { Some(uri_identifier::Protocols::Vless) => { diff --git a/src/parser/vless/mod.rs b/src/parser/vless/mod.rs index 7735083..41f87dd 100644 --- a/src/parser/vless/mod.rs +++ b/src/parser/vless/mod.rs @@ -1,6 +1,6 @@ use querystring; mod models; -use crate::parser::config_models::*; +use crate::config_models::*; use std::process::exit; pub fn create_outbound_object(data: models::VlessData) -> Outbound {