FIx emailer

Author: the2pizza

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "pony"
-version = "0.4.5-dev"
+version = "0.4.6-dev"
 edition = "2021"
 build = "build.rs"
 

Cargo.toml

@@ -54,7 +54,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
 
     settings.validate().expect("Wrong settings file");
     println!(">>> Settings: {:?}", settings.clone());
-    println!(">>>>> VERSION: 0.4.5-dev");
+    println!(">>> Version: 0.4.6-dev");
 
     tracing_subscriber::fmt()
         .with_env_filter(level_from_settings(&settings.logging.level))

src/bin/agent/main.rs

@@ -40,7 +40,7 @@ async fn main() -> Result<()> {
 
     settings.validate().expect("Wrong settings file");
     println!(">>> Settings: {:?}", settings.clone());
-    println!(">>>>> VERSION: 0.4.5-dev");
+    println!(">>> Version: 0.4.6-dev");
 
     tracing_subscriber::fmt()
         .with_env_filter(level_from_settings(&settings.logging.level))

src/bin/api/main.rs

@@ -1,39 +1,52 @@
-use chrono::{DateTime, Utc};
 use hmac::{Hmac, Mac};
-use lettre::{
-    transport::smtp::authentication::Credentials, AsyncSmtpTransport, AsyncTransport, Message,
-    Tokio1Executor,
-};
+use lettre::AsyncTransport;
 use sha2::Sha256;
 use std::collections::HashMap;
-use std::fs::OpenOptions;
-use std::io::Write;
 use std::sync::Arc;
 use tokio::fs::File;
 use tokio::io::{AsyncBufReadExt, BufReader};
+
+use chrono::{DateTime, Utc};
+use tokio::fs::OpenOptions;
+use tokio::io::AsyncWriteExt;
 use tokio::sync::RwLock;
 
 use super::config::SmtpConfig;
 
 type HmacSha256 = Hmac<Sha256>;
 
+use lettre::{
+    transport::smtp::authentication::Credentials, AsyncSmtpTransport, Message, Tokio1Executor,
+};
+
 #[derive(Clone)]
 pub struct EmailStore {
     pub store: Arc<RwLock<HashMap<String, DateTime<Utc>>>>,
     file: String,
     smtp: SmtpConfig,
     secret: Vec<u8>,
     pub web_host: String,
+
+    mailer: Arc<AsyncSmtpTransport<Tokio1Executor>>,
 }
 
 impl EmailStore {
     pub fn new(file: String, smtp: SmtpConfig, secret: Vec<u8>, web_host: String) -> Self {
+        let mailer = AsyncSmtpTransport::<Tokio1Executor>::relay(&smtp.server)
+            .expect("invalid smtp server")
+            .credentials(Credentials::new(
+                smtp.username.clone(),
+                smtp.password.clone(),
+            ))
+            .build();
+
         Self {
             store: Arc::new(RwLock::new(HashMap::new())),
             file,
             smtp,
             secret,
             web_host,
+            mailer: Arc::new(mailer),
         }
     }
 
@@ -43,31 +56,10 @@ impl EmailStore {
         hex::encode(mac.finalize().into_bytes())
     }
 
-    pub async fn load_trials(&self) -> std::io::Result<()> {
-        let file = match File::open(&self.file).await {
-            Ok(f) => f,
-            Err(_) => return Ok(()),
-        };
-
-        let reader = BufReader::new(file);
-        let mut lines = reader.lines();
-
-        let mut map = HashMap::new();
-
-        while let Some(line) = lines.next_line().await? {
-            let parts: Vec<&str> = line.split(',').collect();
-
-            if parts.len() >= 2 {
-                if let Ok(ts) = parts[0].parse::<DateTime<Utc>>() {
-                    map.insert(parts[1].to_string(), ts);
-                }
-            }
-        }
-
-        let mut store = self.store.write().await;
-        *store = map;
-
-        Ok(())
+    pub async fn check_email_hmac(&self, email: &str) -> bool {
+        let email_hmac = self.hmac_email(email);
+        let store = self.store.read().await;
+        store.contains_key(&email_hmac)
     }
 
     pub async fn save_trial_hmac(
@@ -84,148 +76,90 @@ impl EmailStore {
             store.insert(email_hmac.clone(), *time);
         }
 
-        let mut file = OpenOptions::new()
+        let file = OpenOptions::new()
             .create(true)
             .append(true)
-            .open(&self.file)?;
+            .open(&self.file)
+            .await;
 
-        writeln!(
-            file,
-            "{},{},{},{}",
+        let line = format!(
+            "{},{},{},{}\n",
             time.to_rfc3339(),
             email_hmac,
             sub_id,
             ref_by
-        )?;
+        );
+
+        file?.write_all(line.as_bytes()).await?;
 
         Ok(())
     }
 
-    pub async fn check_email_hmac(&self, email: &str) -> bool {
-        let email_hmac = self.hmac_email(email);
+    pub async fn load_trials(&self) -> std::io::Result<()> {
+        let file = match File::open(&self.file).await {
+            Ok(f) => f,
+            Err(_) => return Ok(()),
+        };
 
-        let store = self.store.read().await;
-        store.contains_key(&email_hmac)
-    }
+        let reader = BufReader::new(file);
+        let mut lines = reader.lines();
 
-    pub async fn send_email(
-        &self,
-        to: &str,
-        sub_id: &uuid::Uuid,
-    ) -> Result<(), Box<dyn std::error::Error>> {
-        let html_body = format!(
-            r#"
-    <!DOCTYPE html>
-    <html>
-    <head>
-    <meta charset="UTF-8">
-    <title>FRKN Рилзопровод</title>
-    <style>
-        body {{
-            font-family: Arial, sans-serif;
-            background-color: #f4f4f4;
-            margin: 0;
-            padding: 0;
-        }}
-        .container {{
-            width: 100%;
-            max-width: 600px;
-            margin: 0 auto;
-            background-color: #ffffff;
-            padding: 20px;
-            border-radius: 12px;
-            box-shadow: 0 4px 12px rgba(0,0,0,0.1);
-        }}
-        .header {{
-            text-align: center;
-            margin-bottom: 20px;
-        }}
-        .logo {{
-            max-width: 150px;
-        }}
-        h1 {{
-            color: #1d4ed8;
-            font-size: 24px;
-        }}
-        p {{
-            color: #374151;
-            font-size: 16px;
-            line-height: 1.5;
-        }}
-        .button {{
-            display: inline-block;
-            padding: 12px 24px;
-            background-color: #1d4ed8;
-            color: #ffffff;
-            text-decoration: none;
-            border-radius: 8px;
-            margin: 20px 0;
-            font-weight: bold;
-        }}
-        .footer {{
-            font-size: 12px;
-            color: #9ca3af;
-            text-align: center;
-            margin-top: 20px;
-        }}
-    </style>
-    </head>
-    <body>
-    <div class="container">
-        <div class="header">
-            <h1>Твоя подписка FRKN активирована!</h1>
-        </div>
-        <p>Привет!</p>
-        <p>Твоя подписка для <strong>FRKN</strong> успешно активирована 🎉</p>
-
-        <a href="{web_host}/subscription?id={sub_id}"
-
-         style="
-           display: inline-block;
-           padding: 12px 24px;
-           background-color: #1d4ed8;
-           color: #ffffff !important;
-           text-decoration: none;
-           border-radius: 8px;
-           font-weight: bold;">Перейти к подписке</a>
-
-        <br><br>
-        <p>
-            Твой <strong>ID:</strong> {sub_id}<br/>
-            <div style="font-size: small;">ID это твой уникальный идентификатор подписки, рекомендуем его записать или запомнить</div>
-            <div style="font-size: small;">Мы не храним твой email</div>
-
-        </p>
-
-        <p>Подписывайся на наш Telegram: <a href="https://t.me/frkn_org">@frkn_org</a></p>
-        <br>
-        <div class="footer">
-        <a href="https://t.me/frkn_support">Поддержка</a></p> • Vive la résistance!<br/>
-           {web_host} • © 2026 FRKN Privacy Company
-        </div>
-    </div>
-    </body>
-    </html>
-    "#,
-            sub_id = sub_id,
-            web_host = self.web_host,
-        );
+        let mut map = HashMap::new();
 
-        let msg = Message::builder()
-            .from(format!("FRKN <{}>", self.smtp.from).parse()?)
-            .to(to.parse()?)
-            .subject("FRKN Рилзопровод")
-            .header(lettre::message::header::ContentType::TEXT_HTML)
-            .body(html_body)?;
+        while let Some(line) = lines.next_line().await? {
+            let parts: Vec<&str> = line.split(',').collect();
 
-        let mailer = AsyncSmtpTransport::<Tokio1Executor>::relay(&self.smtp.server)?
-            .credentials(Credentials::new(
-                self.smtp.username.clone(),
-                self.smtp.password.clone(),
-            ))
-            .build();
+            if parts.len() >= 2 {
+                if let Ok(ts) = parts[0].parse::<DateTime<Utc>>() {
+                    map.insert(parts[1].to_string(), ts);
+                }
+            }
+        }
+
+        let mut store = self.store.write().await;
+        *store = map;
 
-        mailer.send(msg).await?;
         Ok(())
     }
+
+    pub async fn send_email_background(&self, to: String, sub_id: uuid::Uuid) {
+        let mailer = self.mailer.clone();
+        let web_host = self.web_host.clone();
+        let from = self.smtp.from.clone();
+        tokio::spawn(async move {
+            let html_body = format!(
+                r#"
+                <html>
+                <body>
+                    <h2>Твой Тест-Драйв активирован</h2>
+                    <p>Ссылка:</p>
+                    <a href="{web_host}/subscription?id={sub_id}">
+                        Открыть подписку
+                    </a>
+                </body>
+                </html>
+                "#,
+                web_host = web_host,
+                sub_id = sub_id,
+            );
+
+            let msg = match Message::builder()
+                .from(from.parse().unwrap())
+                .to(to.parse().unwrap())
+                .subject("Тест-Драйв")
+                .header(lettre::message::header::ContentType::TEXT_HTML)
+                .body(html_body)
+            {
+                Ok(m) => m,
+                Err(e) => {
+                    tracing::error!("Email build error: {}", e);
+                    return;
+                }
+            };
+
+            if let Err(e) = mailer.send(msg).await {
+                tracing::error!("Email send error: {}", e);
+            }
+        });
+    }
 }

src/bin/auth/email.rs

@@ -96,10 +96,13 @@ pub async fn trial_handler(
     }
 
     let ref_by = req.referred_by.clone().unwrap_or_else(|| "WEB".to_string());
+
     let sub =
         match create_subscription(&http, &api.endpoint, &api.token, DEFAULT_DAYS, &ref_by).await {
             Ok(s) => s,
-            Err(e) => return Ok(http::internal_error(&format!("Subscription failed: {}", e))),
+            Err(e) => {
+                return Ok(http::internal_error(&format!("Subscription failed: {}", e)));
+            }
         };
 
     if let Err(e) = setup_connections(&http, &api, &sub.id).await {
@@ -110,6 +113,7 @@ pub async fn trial_handler(
     }
 
     let now = chrono::Utc::now();
+
     if let Err(e) = store
         .save_trial_hmac(&req.email, &sub.id, &now, &ref_by)
         .await
@@ -118,12 +122,7 @@ pub async fn trial_handler(
         return Ok(http::internal_error("Failed to record trial."));
     }
 
-    if let Err(e) = store.send_email(&req.email, &sub.id).await {
-        tracing::error!("Email error: {}", e);
-        return Ok(http::internal_error(
-            "Trial created, but failed to send email.",
-        ));
-    }
+    store.send_email_background(req.email.clone(), sub.id).await;
 
     Ok(http::success_response(
         "Trial activated. Check email".into(),

src/bin/auth/handlers.rs

@@ -57,7 +57,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
 
     settings.validate().expect("Wrong settings file");
     println!(">>> Settings: {:?}", settings.clone());
-    println!(">>>>> VERSION: 0.4.5-dev");
+    println!(">>> Version: 0.4.6-dev");
 
     tracing_subscriber::fmt()
         .with_env_filter(level_from_settings(&settings.logging.level))