From d26d6e2e64c30262268ef02ddbcdca20622ff4f9 Mon Sep 17 00:00:00 2001 From: itsusinn Date: Sun, 17 Oct 2021 11:27:10 +0800 Subject: [PATCH] refactor: use marcos to simplify --- src/config.rs | 154 ++++++++++++++++++++------------------------------ src/data.rs | 12 ++-- 2 files changed, 65 insertions(+), 101 deletions(-) diff --git a/src/config.rs b/src/config.rs index aa1d70b..680a7ca 100644 --- a/src/config.rs +++ b/src/config.rs @@ -1,109 +1,77 @@ -use log::error; -use serde_derive::{Deserialize, Serialize}; -use std::{fs, io, path::Path, sync::Arc}; -use serde_yaml as yaml; -use once_cell::sync::Lazy; -pub static CONFIG: Lazy = Lazy::new(|| { - let path = Path::new("config.yml"); - let config = read_or_create_config(path).unwrap(); - config -}); +use arcstr::ArcStr; +use dashmap::DashMap; +use serde::{Deserialize, Serialize}; +use std::path::Path; -#[derive(Debug, Serialize, Deserialize,Educe)] -#[educe(Default)] -pub struct Config{ - #[educe(Default = false)] - pub enabled: bool, - pub forwarding: ForwardingConfig, - pub telegram: TelegramConfig, - pub proxy: ProxyConfig, - pub target_address_mapper: DashMap, Arc>, +#[basic_derive] +#[derive(AutoConfig)] +#[location = "config/tg.yml"] +pub struct Config { + #[educe(Default = false)] + pub enabled: bool, + pub nats: NatsConfig, + pub telegram: TelegramConfig, + pub proxy: ProxyConfig, + pub target_address_mapper: DashMap, } -#[derive(Debug, Serialize, Deserialize,Educe)] -#[educe(Default)] -pub struct ForwardingConfig { - // pattern: "nats://{host}:{port}" - #[educe(Default = "nats://itsusinn.site:4222")] - pub address: String +impl Config { + pub fn mapper(&self,target: &i64) -> Option{ + match self.target_address_mapper.get(target) { + Some(v) => return Some(v.clone()), + None => return None, + } + } } -#[derive(Debug, Serialize, Deserialize,Educe)] -#[educe(Default)] -pub struct ProxyConfig{ - #[educe(Default = false)] - pub enabled: bool, - // pattern: "http://{username}:{password}@{host}:{port}" - #[educe(Default = "http://127.0.0.1:7890")] - pub address: String, +#[basic_derive] +pub struct NatsConfig { + // pattern: "nats://{host}:{port}" + #[educe(Default = "nats://itsusinn.site:4222")] + pub address: String, } -#[derive(Debug, Serialize, Deserialize,Educe)] -#[educe(Default)] -pub struct TelegramConfig { - #[educe(Default = "BOT_TOKEN")] - pub token: String, - #[educe(Default = "BOT_NAME")] - pub bot_name: String, - pub webhook: WebhookConfig +#[basic_derive] +pub struct ProxyConfig { + #[educe(Default = false)] + pub enabled: bool, + // pattern: "http://{username}:{password}@{host}:{port}" + #[educe(Default = "http://127.0.0.1:7890")] + pub address: String, } -#[derive(Debug, Serialize, Deserialize,Educe)] -#[educe(Default)] -pub struct WebhookConfig { - #[educe(Default = false)] - pub enable: bool, - #[educe(Default = false)] - pub heroku:bool, - #[educe(Default = 8889)] - pub port:u16, - #[educe(Default = "heroku-app-name.herokuapp.com")] - pub host:String +#[basic_derive] +pub struct CipherConfig { + #[educe(Default = false)] + pub enabled: bool, + // pattern: "http://{username}:{password}@{host}:{port}" + #[educe(Default = "this-is-an-example-key")] + pub key: String, } -impl Config { - pub fn default_string() -> Result { - let result = yaml::to_string(&Config::default()).map_err(|_| Error::SerializationError)?; - Ok(result) - } - pub fn save(&self) { - let ser = yaml::to_string(self).unwrap(); - log::info!("Configuration file was saved"); - fs::write("config.yml", ser).unwrap(); - } +#[basic_derive] +pub struct TelegramConfig { + #[educe(Default = "BOT_TOKEN")] + pub token: String, + #[educe(Default = "BOT_NAME")] + pub bot_name: String, + pub webhook: WebhookConfig, } -fn read_or_create_config(path: &Path) -> Result { - if !path.exists() { - fs::create_dir_all(path.parent().unwrap_or(Path::new("./")))?; - fs::write(path, Config::default_string()?)?; - }; - let data = fs::read(path)?; - let result: Result = yaml::from_slice(&data); - let result = match result { - Ok(val) => val, - Err(_) => { - error!("Cannot de-serialize the configuration file"); - error!("It may be caused by incompatible configuration files due to version updates"); - error!("The original file has been changed to config.toml.old, please merge the configuration files manually"); - let default_string = Config::default_string()?; - let reanme_path = format!("{}.old", path.clone().to_string_lossy()); - let rename_path =Path::new(&reanme_path); - fs::rename(path, rename_path)?; - fs::write(path, default_string)?; - Config::default() - } - }; - Ok(result) +#[basic_derive] +pub struct WebhookConfig { + #[educe(Default = false)] + pub enable: bool, + #[educe(Default = false)] + pub heroku: bool, + #[educe(Default = 8889)] + pub port: u16, + #[educe(Default = "heroku-app-name.herokuapp.com")] + pub host: String, } -use dashmap::DashMap; -use thiserror::Error; +#[basic_derive] +pub struct BehaviorConfig {} -#[derive(Debug, Error)] -pub enum Error { - #[error("无法序列化")] - SerializationError, - #[error("I/O error")] - IO(#[from] io::Error), -} +#[basic_derive] +pub struct FormatConfig {} diff --git a/src/data.rs b/src/data.rs index f6463df..0239887 100644 --- a/src/data.rs +++ b/src/data.rs @@ -1,12 +1,8 @@ -use std::sync::Arc; -use once_cell::sync::Lazy; use dashmap::DashMap; +use std::sync::Arc; -pub static DATA: Lazy = Lazy::new(|| { - RuntimeData::default() -}); -#[derive(Educe)] +#[derive(Educe, Singleton)] #[educe(Default)] -pub struct RuntimeData { - pub active_endpoint:DashMap,bool> +pub struct Data { + pub active_endpoint: DashMap, bool>, }