remove unused code for vars

.gitignore

@@ -1,3 +1,5 @@
 /target
 /.env.ps1
 /.vscode
+/.idea
+

src/arcstr.rs

@@ -0,0 +1,69 @@
+use std::ffi::OsStr;
+use std::fmt::{Display, Formatter};
+use std::ops::Deref;
+use std::path::Path;
+use std::sync::Arc;
+
+#[derive(Debug, Clone, PartialEq, Ord, PartialOrd, Eq)]
+pub(crate) struct ArcStr {
+    inner: Arc<str>,
+}
+
+impl Deref for ArcStr {
+    type Target = str;
+
+    fn deref(&self) -> &Self::Target {
+        self.inner.deref()
+    }
+}
+
+impl From<&str> for ArcStr {
+    fn from(value: &str) -> Self {
+        Self {
+            inner: Arc::from(value),
+        }
+    }
+}
+
+#[allow(suspicious_double_ref_op)]
+impl From<&&str> for ArcStr {
+    fn from(value: &&str) -> Self {
+        Self {
+            inner: Arc::from(value.deref()),
+        }
+    }
+}
+
+impl AsRef<OsStr> for ArcStr {
+    fn as_ref(&self) -> &OsStr {
+        self.inner.as_ref().as_ref()
+    }
+}
+
+impl AsRef<Path> for ArcStr {
+    fn as_ref(&self) -> &Path {
+        self.inner.as_ref().as_ref()
+    }
+}
+
+impl AsRef<ArcStr> for ArcStr {
+    fn as_ref(&self) -> &ArcStr {
+        self
+    }
+}
+
+impl Display for ArcStr {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        write!(f, "{}", self.deref())
+    }
+}
+
+impl ArcStr {
+    pub(crate) fn as_path(&self) -> &Path {
+        self.as_ref()
+    }
+
+    pub(crate) fn as_str(&self) -> &str {
+        self.inner.deref()
+    }
+}

src/certs.rs

@@ -20,19 +20,12 @@ where
     T: ICryptoProvider,
 {
     pub(crate) fn new(cfg: &AppConfig, provider: T) -> Self {
-        let base_dir = PathBuf::from(&cfg.base_directory);
-        let keys_dir = base_dir.clone().join(cfg.keys_subdir.clone());
-        let name = cfg.name.clone();
-
-        let ca_file = keys_dir.join(cfg.ca_filename.clone());
-        let key_file = keys_dir.join(format!("{}.key", &name));
-        let cert_file = keys_dir.join(format!("{}.crt", &name));
         let provider = Arc::new(provider);
 
         Certs {
-            ca_file,
-            key_file,
-            cert_file,
+            ca_file: cfg.ca_filepath.clone(),
+            key_file: cfg.key_filepath.clone(),
+            cert_file: cfg.cert_filepath.clone(),
             provider,
         }
     }

src/common.rs

@@ -3,10 +3,8 @@ use async_stream::stream;
 use clap::Parser;
 use encoding::{label::encoding_from_whatwg_label, EncoderTrap};
 use std::{
-    collections::BTreeMap,
     fmt::Display,
     path::{Path, PathBuf},
-    str::FromStr,
 };
 use tokio::{
     fs::{self, File},
@@ -15,10 +13,8 @@ use tokio::{
 
 use futures_core::stream::Stream;
 
-pub(crate) type VarsMap = BTreeMap<String, String>;
-
 pub(crate) const UTF8_STR: &str = "utf8";
-pub(crate) const DEFAULT_ENCODING: &str = "cp866"; // .bat
+pub(crate) const DEFAULT_ENCODING: &str = UTF8_STR;
 
 #[derive(Debug, Clone, PartialEq)]
 pub enum OpenSSLProviderArg {
@@ -26,12 +22,11 @@ pub enum OpenSSLProviderArg {
     ExternalBin(String),
 }
 
-impl FromStr for OpenSSLProviderArg {
-    type Err = anyhow::Error;
-    fn from_str(s: &str) -> Result<Self, Self::Err> {
-        match s.to_ascii_lowercase().as_str() {
-            "internal" => Ok(OpenSSLProviderArg::Internal),
-            x => Ok(OpenSSLProviderArg::ExternalBin(x.to_string())),
+impl From<Option<&String>> for OpenSSLProviderArg {
+    fn from(value: Option<&String>) -> Self {
+        match value {
+            Some(x) => OpenSSLProviderArg::ExternalBin(x.clone()),
+            _ => OpenSSLProviderArg::Internal,
         }
     }
 }
@@ -75,9 +70,9 @@ pub(crate) struct Args {
     #[arg(long, default_value = "3650")]
     pub(crate) days: u32,
 
-    /// openssl binary or (internal)
-    #[arg(long, short, default_value = "internal")]
-    pub(crate) openssl: OpenSSLProviderArg,
+    /// use openssl binary
+    #[arg(long = "with-openssl", short)]
+    pub(crate) openssl: Option<String>,
 
     /// template file
     #[arg(long, default_value = "template.ovpn")]
@@ -87,35 +82,54 @@ pub(crate) struct Args {
 pub(crate) struct AppConfig {
     pub(crate) encoding: String,
     pub(crate) req_days: u32,
-    pub(crate) keys_subdir: String,
-    pub(crate) config_subdir: String,
-    pub(crate) template_file: String,
+    pub(crate) template_file: PathBuf,
     pub(crate) openssl_default_cnf: String,
     pub(crate) openssl_cnf_env: String,
-    pub(crate) ca_filename: String,
+    pub(crate) ca_filepath: PathBuf,
+    pub(crate) ca_key_filepath: PathBuf,
     pub(crate) default_email_domain: String,
     pub(crate) openssl: OpenSSLProviderArg,
-    pub(crate) base_directory: String,
+    pub(crate) base_directory: PathBuf,
     pub(crate) email: String,
     pub(crate) name: String,
+    pub(crate) conf_filepath: PathBuf,
+    pub(crate) req_filepath: PathBuf,
+    pub(crate) key_filepath: PathBuf,
+    pub(crate) cert_filepath: PathBuf,
 }
 
 impl Default for AppConfig {
     fn default() -> Self {
+        let name = String::from("user");
+        let base_directory: PathBuf = ".".into();
+        let keys_directory = base_directory.join("keys");
+        let config_directory = base_directory.join("config");
+        let template_file = base_directory.join("template.ovpn");
+        let openssl_default_cnf = String::from("openssl-1.0.0.cnf");
+        let ca_filepath = keys_directory.join("ca.crt");
+        let ca_key_filepath = keys_directory.join("ca.key");
+        let req_filepath = keys_directory.join(format!("{}.csr", &name));
+        let key_filepath = keys_directory.join(format!("{}.key", &name));
+        let cert_filepath = keys_directory.join(format!("{}.crt", &name));
+        let conf_filepath = config_directory.join(format!("{}.ovpn", &name));
+
         Self {
             encoding: DEFAULT_ENCODING.into(),
             req_days: 30650,
-            keys_subdir: "keys".into(),
-            config_subdir: "config".into(),
-            template_file: "template.ovpn".into(),
-            openssl_default_cnf: "openssl-1.0.0.cnf".into(),
+            template_file,
+            conf_filepath,
+            req_filepath,
+            key_filepath,
+            cert_filepath,
+            openssl_default_cnf,
             openssl_cnf_env: "KEY_CONFIG".into(),
-            ca_filename: "ca.crt".into(),
+            ca_filepath,
+            ca_key_filepath,
             default_email_domain: "example.com".into(),
             openssl: OpenSSLProviderArg::Internal,
-            base_directory: ".".into(),
+            base_directory,
             email: "name@example.com".into(),
-            name: "user".into(),
+            name,
         }
     }
 }
@@ -124,11 +138,25 @@ impl From<&Args> for AppConfig {
     fn from(args: &Args) -> Self {
         let defaults = Self::default();
 
+        let name = args.name.clone();
         let base_directory = args
             .directory
             .as_ref()
-            .unwrap_or(&defaults.base_directory)
+            .map(PathBuf::from)
+            .unwrap_or(defaults.base_directory)
             .clone();
+
+        let keys_directory = base_directory.join(&args.keys_dir);
+        let config_directory = base_directory.join(&args.config_dir);
+        let template_file = base_directory.join(&args.template_file);
+        let openssl_default_cnf = String::from("openssl-1.0.0.cnf");
+        let ca_filepath = keys_directory.join("ca.crt");
+        let ca_key_filepath = keys_directory.join("ca.key");
+        let req_filepath = keys_directory.join(format!("{}.csr", &name));
+        let key_filepath = keys_directory.join(format!("{}.key", &name));
+        let cert_filepath = keys_directory.join(format!("{}.crt", &name));
+        let conf_filepath = config_directory.join(format!("{}.ovpn", &name));
+
         let email = args.email.clone().unwrap_or(format!(
             "{}@{}",
             &args.name,
@@ -140,38 +168,34 @@ impl From<&Args> for AppConfig {
             defaults.encoding.clone()
         };
         let name = args.name.clone();
-        let openssl = args.openssl.clone();
-        let template_file = args.template_file.clone();
+        let openssl: OpenSSLProviderArg = args.openssl.as_ref().into();
         let req_days = args.days;
-        let keys_subdir = args.keys_dir.clone();
-        let config_subdir = args.config_dir.clone();
 
         Self {
             base_directory,
+            template_file,
+            openssl_default_cnf,
+            ca_filepath,
+            ca_key_filepath,
+            req_filepath,
+            key_filepath,
+            cert_filepath,
+            conf_filepath,
             email,
             encoding,
             name,
             openssl,
-            template_file,
             req_days,
-            keys_subdir,
-            config_subdir,
             ..defaults
         }
     }
 }
 
 pub(crate) async fn is_file_exist(filepath: &PathBuf) -> bool {
-    let metadata = tokio::fs::metadata(&filepath).await;
-    if metadata.is_err() {
-        return false;
+    match tokio::fs::metadata(&filepath).await {
+        Ok(x) => x.is_file(),
+        _ => false,
     }
-
-    if !metadata.unwrap().is_file() {
-        return false;
-    }
-
-    true
 }
 
 pub(crate) async fn read_file<P>(filepath: P, encoding: &str) -> Result<String>
@@ -202,7 +226,7 @@ pub(crate) async fn write_file<P: AsRef<Path>>(
     let enc = encoding_from_whatwg_label(encoding).ok_or(anyhow!("encoding not found"))?;
     let mut bytes = Vec::new();
     enc.encode_to(text, EncoderTrap::Ignore, &mut bytes)
-        .map_err(|_| anyhow!("can't encode"))?;
+        .map_err(|e| anyhow!("can't encode: {:?}", e))?;
 
     fs::write(filepath, bytes).await.context("can't write file")
 }

src/main.rs

@@ -1,10 +1,9 @@
-use std::path::PathBuf;
-
-use anyhow::{anyhow, Ok, Result};
+use anyhow::{anyhow, Context, Result};
 use clap::Parser;
-use common::{is_file_exist, OpenSSLProviderArg, VarsMap};
+use common::{is_file_exist, OpenSSLProviderArg};
 use crypto_provider::ICryptoProvider;
 
+mod arcstr;
 mod certs;
 mod common;
 mod crypto_provider;
@@ -16,13 +15,10 @@ use crate::certs::Certs;
 use crate::common::{AppConfig, Args};
 use crate::openssl::{external::OpenSSLExternalProvider, internal::OpenSSLInternalProvider};
 use crate::ovpn::OvpnConfig;
-use crate::vars::VarsFile;
+use crate::vars::{VarsFile, VarsMap};
 
 async fn build_client_with<T: ICryptoProvider>(config: &AppConfig, provider: T) -> Result<String> {
-    let name = config.name.clone();
-    let base_dir = PathBuf::from(&config.base_directory);
-    let config_dir = base_dir.join(&config.config_subdir);
-    let config_file = config_dir.join(format!("{}.ovpn", &name));
+    let config_file = config.conf_filepath.clone();
     let config_file_str = config_file
         .to_str()
         .ok_or(anyhow!("config file exist err"))?
@@ -59,15 +55,16 @@ async fn build_client_config(config: &AppConfig, vars: VarsMap) -> Result<String
 async fn main() -> Result<()> {
     let args = Args::parse();
     let config = AppConfig::from(&args);
-    let mut vars = VarsFile::from_config(&config).await?;
-    vars.parse().await?;
+    let vars = VarsFile::from_config(&config)
+        .await
+        .context("vars from config")?
+        .parse()
+        .await
+        .context("parse vars")?;
 
-    println!("found vars: {}", vars.filepath.to_str().expect("fff"));
-    println!("loaded: {:#?}", &vars.vars);
+    println!("loaded: {:#?}", &vars);
 
-    let vars = vars.vars.ok_or(anyhow!("no vars loaded"))?;
     let config_file = build_client_config(&config, vars).await?;
-
     println!("created: {}", &config_file);
 
     Ok(())

src/openssl/external.rs

@@ -1,10 +1,12 @@
 use anyhow::{anyhow, Result};
+use std::ops::Deref;
 use std::path::PathBuf;
 
 use tokio::process::Command;
 
-use crate::common::{is_file_exist, AppConfig, VarsMap};
+use crate::common::{is_file_exist, AppConfig};
 use crate::crypto_provider::ICryptoProvider;
+use crate::vars::{IStrMap, VarsMap};
 
 pub(crate) struct OpenSSLExternalProvider {
     vars: VarsMap,
@@ -33,18 +35,12 @@ impl OpenSSLExternalProvider {
 
     pub(crate) fn from_cfg(cfg: &AppConfig, vars: VarsMap) -> Self {
         let base_dir = PathBuf::from(&cfg.base_directory);
-        let keys_dir = base_dir.join(&cfg.keys_subdir);
-        let name = cfg.name.clone();
         let mut vars = vars;
 
-        vars.insert("KEY_CN".into(), name.clone());
-        vars.insert("KEY_NAME".into(), name.clone());
-        vars.insert("KEY_EMAIL".into(), cfg.email.clone());
+        vars.insert("KEY_CN", &cfg.name);
+        vars.insert("KEY_NAME", &cfg.name);
+        vars.insert("KEY_EMAIL", &cfg.email);
 
-        let ca_file = keys_dir.join(&cfg.ca_filename);
-        let req_file = keys_dir.join(format!("{}.csr", &name));
-        let key_file = keys_dir.join(format!("{}.key", &name));
-        let cert_file = keys_dir.join(format!("{}.crt", &name));
         let openssl_cnf = base_dir.join(
             std::env::var(&cfg.openssl_cnf_env)
                 .as_ref()
@@ -56,10 +52,10 @@ impl OpenSSLExternalProvider {
             base_dir,
             openssl_cnf,
             openssl: cfg.openssl.to_string(),
-            ca_file,
-            req_file,
-            key_file,
-            cert_file,
+            ca_file: cfg.ca_filepath.clone(),
+            req_file: cfg.req_filepath.clone(),
+            key_file: cfg.key_filepath.clone(),
+            cert_file: cfg.cert_filepath.clone(),
             req_days: cfg.req_days,
         }
     }
@@ -92,7 +88,7 @@ impl ICryptoProvider for OpenSSLExternalProvider {
                 "-batch",
             ])
             .current_dir(&self.base_dir)
-            .envs(&self.vars)
+            .envs(self.vars.deref())
             .status()
             .await?;
 
@@ -128,7 +124,7 @@ impl ICryptoProvider for OpenSSLExternalProvider {
                 "-batch",
             ])
             .current_dir(&self.base_dir)
-            .envs(&self.vars)
+            .envs(self.vars.deref())
             .status()
             .await?;
 

src/openssl/internal.rs

@@ -1,4 +1,4 @@
-use anyhow::{anyhow, Context, Ok, Result};
+use anyhow::{anyhow, Context, Result};
 use openssl::{
     asn1::Asn1Time,
     conf::{Conf, ConfMethod},
@@ -16,13 +16,14 @@ use std::path::{Path, PathBuf};
 use tokio::fs;
 
 use crate::{
-    common::{is_file_exist, read_file, AppConfig, VarsMap},
+    common::{is_file_exist, read_file, AppConfig},
     crypto_provider::ICryptoProvider,
 };
 
 use lazy_static::lazy_static;
 use std::collections::HashMap;
 
+use crate::vars::{IStrMap, VarsMap};
 use chrono::{Datelike, Days, Timelike, Utc};
 
 lazy_static! {
@@ -93,10 +94,6 @@ fn get_time_str_x509(days: u32) -> Result<String> {
 
 pub(crate) struct OpenSSLInternalProvider {
     vars: VarsMap,
-    #[allow(unused)]
-    base_dir: PathBuf,
-    #[allow(unused)]
-    openssl_cnf: PathBuf,
     ca_file: PathBuf,
     ca_key_file: PathBuf,
     req_file: PathBuf,
@@ -121,41 +118,24 @@ impl OpenSSLInternalProvider {
     }
 
     pub(crate) fn try_from_cfg(cfg: &AppConfig, vars: VarsMap) -> Result<Self> {
-        let base_dir = PathBuf::from(&cfg.base_directory);
-        let keys_dir = base_dir.join(&cfg.keys_subdir);
-        let name = cfg.name.clone();
         let mut vars = vars;
 
-        vars.insert("KEY_CN".into(), name.clone());
-        vars.insert("KEY_NAME".into(), name.clone());
-        vars.insert("KEY_EMAIL".into(), cfg.email.clone());
+        vars.insert("KEY_CN", &cfg.name);
+        vars.insert("KEY_NAME", &cfg.name);
+        vars.insert("KEY_EMAIL", &cfg.email);
 
-        let ca_file = keys_dir.join(&cfg.ca_filename);
-        let ca_key_file = ca_file.with_extension("key");
-        let req_file = keys_dir.join(format!("{}.csr", &name));
-        let key_file = keys_dir.join(format!("{}.key", &name));
-        let cert_file = keys_dir.join(format!("{}.crt", &name));
-        let openssl_cnf = base_dir.join(
-            std::env::var(&cfg.openssl_cnf_env)
-                .as_ref()
-                .unwrap_or(&cfg.openssl_default_cnf),
-        );
-
-        let default_key_size = "2048".to_string();
-        let key_size_s = vars.get("KEY_SIZE").unwrap_or(&default_key_size);
+        let key_size_s = vars.get(&"KEY_SIZE").unwrap_or("2048");
         let key_size: u32 = key_size_s.parse().context("parse key size error")?;
 
         let encoding = cfg.encoding.clone();
 
         Ok(Self {
             vars,
-            base_dir,
-            openssl_cnf,
-            ca_file,
-            ca_key_file,
-            req_file,
-            key_file,
-            cert_file,
+            ca_file: cfg.ca_filepath.clone(),
+            ca_key_file: cfg.ca_key_filepath.clone(),
+            req_file: cfg.req_filepath.clone(),
+            key_file: cfg.key_filepath.clone(),
+            cert_file: cfg.cert_filepath.clone(),
             req_days: cfg.req_days,
             key_size,
             encoding,
@@ -209,9 +189,9 @@ impl OpenSSLInternalProvider {
         for (&key, &var) in KEYMAP.iter() {
             let value = self
                 .vars
-                .get(var)
+                .get(&var)
                 .ok_or(anyhow!("variable not set: {}", var))?;
-            name_builder.append_entry_by_text(key, value).unwrap();
+            name_builder.append_entry_by_text(key, value)?;
         }
         Ok(name_builder.build())
     }
@@ -227,10 +207,10 @@ impl OpenSSLInternalProvider {
         let key_extended_ext = ExtendedKeyUsage::new().client_auth().build()?;
 
         let mut san_extension = SubjectAlternativeName::new();
-        if let Some(name) = vars.get("KEY_NAME") {
+        if let Some(name) = vars.get(&"KEY_NAME") {
             san_extension.dns(name);
         }
-        if let Some(email) = vars.get("KEY_EMAIL") {
+        if let Some(email) = vars.get(&"KEY_EMAIL") {
             san_extension.email(email);
         }
         let san_ext = san_extension.build(context).context("build san")?;

src/vars.rs

@@ -3,38 +3,84 @@ use regex::Regex;
 use std::{path::PathBuf, pin::Pin};
 use tokio::pin;
 
+use crate::arcstr::ArcStr;
+use crate::common::{read_file_by_lines, AppConfig};
 use futures_util::stream::StreamExt;
+use std::collections::BTreeMap;
+use std::fmt::{Debug, Formatter};
+use std::ops::Deref;
+use std::path::Path;
 
-use crate::common::{read_file_by_lines, AppConfig, VarsMap};
+pub(crate) type ArcVarsMap = BTreeMap<ArcStr, ArcStr>;
+
+#[derive(Clone, PartialEq, Ord, PartialOrd, Eq)]
+pub(crate) struct VarsMap(ArcVarsMap);
+
+pub(crate) trait IStrMap {
+    fn get<S: AsRef<str> + Clone>(&self, key: &S) -> Option<&str>;
+    fn insert<S: AsRef<str> + Clone>(&mut self, key: S, value: S) -> Option<S>;
+}
+
+impl IStrMap for VarsMap {
+    fn get<S: AsRef<str> + Clone>(&self, key: &S) -> Option<&str> {
+        self.0.get(&ArcStr::from(key.as_ref())).map(|x| x.as_str())
+    }
+
+    fn insert<S: AsRef<str> + Clone>(&mut self, key: S, value: S) -> Option<S> {
+        let key = ArcStr::from(key.as_ref());
+        let value2 = ArcStr::from(value.clone().as_ref());
+        self.0.insert(key, value2).and(Some(value))
+    }
+}
+
+impl Deref for VarsMap {
+    type Target = BTreeMap<ArcStr, ArcStr>;
+
+    fn deref(&self) -> &Self::Target {
+        &self.0
+    }
+}
+
+impl Debug for VarsMap {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        let debug_map: BTreeMap<_, _> =
+            self.iter().map(|(k, v)| (k.as_str(), v.as_str())).collect();
+        debug_map.fmt(f)
+    }
+}
 
 pub(crate) struct VarsFile {
-    pub(crate) filepath: PathBuf,
-    pub(crate) vars: Option<VarsMap>,
-    pub(crate) encoding: String,
+    pub(crate) filepath: ArcStr,
+    pub(crate) encoding: ArcStr,
 }
 
 impl VarsFile {
-    async fn from_file(filepath: &PathBuf, encoding: String) -> Result<Self> {
-        let metadata = tokio::fs::metadata(&filepath).await.context(format!(
-            "file not found {}",
-            filepath.to_str().expect("str")
-        ))?;
+    async fn from_file<P>(filepath: P, encoding: ArcStr) -> Result<Self>
+    where
+        P: AsRef<Path>,
+    {
+        let filepath_str = filepath
+            .as_ref()
+            .to_str()
+            .ok_or(anyhow!("filepath to str"))?;
+        let metadata = tokio::fs::metadata(filepath_str)
+            .await
+            .context(format!("config file not found: {}", &filepath_str))?;
         if !metadata.is_file() {
-            Err(anyhow!("{} is not a file", filepath.to_str().expect("str")))?
+            Err(anyhow!("config is not a file {}", &filepath_str))?;
         }
         Ok(VarsFile {
-            filepath: filepath.to_path_buf(),
-            vars: None,
+            filepath: ArcStr::from(filepath_str),
             encoding,
         })
     }
 
-    async fn from_dir(dir: PathBuf, encoding: String) -> Result<Self> {
-        let filepath = dir.join("vars");
-        let err_context = format!(
-            "vars or vars.bat file not found in {}",
-            dir.to_str().expect("str")
-        );
+    async fn from_dir<P>(dir: P, encoding: ArcStr) -> Result<Self>
+    where
+        P: AsRef<Path>,
+    {
+        let filepath = dir.as_ref().join("vars");
+        let err_context = "vars or vars.bat file not found";
 
         match Self::from_file(&filepath, encoding.clone()).await {
             Ok(res) => Ok(res),
@@ -47,50 +93,38 @@ impl VarsFile {
     pub(crate) async fn from_config(config: &AppConfig) -> Result<Self> {
         Self::from_dir(
             PathBuf::from(&config.base_directory),
-            config.encoding.clone(),
+            ArcStr::from(config.encoding.as_str()),
         )
         .await
     }
 
-    pub(crate) async fn parse(&mut self) -> Result<()> {
-        let mut result = VarsMap::new();
-        let lines = read_file_by_lines(&self.filepath, &self.encoding).await?;
+    pub(crate) async fn parse(&self) -> Result<VarsMap> {
+        let mut result = ArcVarsMap::new();
+        result.insert("__file__".into(), self.filepath.clone());
+        result.insert("__encoding__".into(), self.encoding.clone());
+
+        let lines = read_file_by_lines(&self.filepath.as_path(), &self.encoding)
+            .await
+            .context("vars read error")?;
         let lines = Pin::from(lines);
         pin!(lines);
 
-        let re_v2 =
-            Regex::new(r#"^(export|set)\s\b(?P<key>[\w\d_]+)\b=\s?"?(?P<value>[^\#]+?)"?$"#)
-                .context("regex v2")?;
-        let re_v3 = Regex::new(r"^set_var\s(?P<key1>[\w\d_]+)\s+(?P<value1>[^\#]+?)$")
-            .context("regex v3")?;
+        let re_v2 = Regex::new(r#"^(export|set)\s\b(?P<key>[\w\d_]+)\b=\s?"?(?P<value>[^#]+?)"?$"#)
+            .context("regex v2")
+            .context("re_v2 error")?;
+        let re_v3 = Regex::new(r"^set_var\s(?P<key1>[\w\d_]+)\s+(?P<value1>[^#]+?)$")
+            .context("regex v3")
+            .context("re_v3 error")?;
 
         while let Some(line) = lines.next().await {
-            if let Some(caps) = re_v2.captures(line.as_str()) {
-                result.insert(caps["key"].to_string(), caps["value"].to_string());
+            for re in [&re_v2, &re_v3].iter() {
+                if let Some(caps) = re.captures(line.as_str()) {
+                    let [key, value] = [&caps["key"], &caps["value"]].map(ArcStr::from);
+                    result.insert(key, value);
                     continue;
                 }
-
-            if let Some(caps) = re_v3.captures(line.as_str()) {
-                result.insert(caps["key"].to_string(), caps["value"].to_string());
-            };
-        }
-
-        self.vars = Some(result);
-        Ok(())
-    }
-
-    #[allow(dead_code)]
-    fn apply(&self) -> Result<()> {
-        if let Some(vars) = self.vars.clone() {
-            for (key, value) in vars.iter() {
-                unsafe {
-                    std::env::set_var(key, value);
             }
         }
-        } else {
-            Err(anyhow!("vars not parsed"))?
-        }
-
-        Ok(())
+        Ok(VarsMap(result))
     }
 }