Upload main.rs

src/main.rs

@@ -47,7 +47,6 @@ struct CdnCacheEntry {
     expires_at: std::time::Instant,
 }
 
-#[derive(Clone)]
 struct AppState {
     api: Arc<Mutex<APIClient>>,
     api_by_arl: Arc<RwLock<HashMap<String, Arc<Mutex<APIClient>>>>>,
@@ -943,34 +942,76 @@ async fn send_audio(
     let mime = if ext == "flac" { "audio/flac" } else { "audio/mpeg" };
     let filename = format!("track_{}.{}", q.id, ext);
 
-    // Загружаем в Telegram через multipart
+    // Загружаем в Telegram через отдельный клиент.
+    // Для api.telegram.org в некоторых средах HF прямое соединение с no_proxy()
+    // падает на TLS handshake, поэтому здесь даем reqwest использовать env proxy
+    // и принудительно уходим на HTTP/1.1 с короткими ретраями.
     let tg_url = format!("https://api.telegram.org/bot{}/sendAudio", bot_token);
-    let part = reqwest::multipart::Part::bytes(dec)
-        .file_name(filename)
-        .mime_str(mime)
-        .unwrap();
-    let mut form = reqwest::multipart::Form::new()
-        .text("chat_id", q.chat_id.clone())
-        .part("audio", part);
-    if let Some(ref t) = q.title    { form = form.text("title", t.clone()); }
-    if let Some(ref p) = q.performer { form = form.text("performer", p.clone()); }
-    if let Some(d) = q.duration     { form = form.text("duration", d.to_string()); }
-
-    let tg_resp = match http.post(&tg_url).multipart(form).send().await {
-        Ok(r) => r,
-        Err(e) => return json_error(StatusCode::BAD_GATEWAY, format!("Telegram upload: {}", e)),
-    };
-
-    let tg_json: serde_json::Value = match tg_resp.json().await {
-        Ok(j) => j,
-        Err(e) => return json_error(StatusCode::BAD_GATEWAY, format!("Telegram parse: {}", e)),
-    };
-
-    if tg_json.get("ok").and_then(|v| v.as_bool()) != Some(true) {
-        let desc = tg_json.get("description").and_then(|v| v.as_str()).unwrap_or("unknown");
-        tracing::error!("Telegram sendAudio error: {}", desc);
-        return json_error(StatusCode::BAD_GATEWAY, format!("Telegram: {}", desc));
-    }
+    let tg_http = reqwest::Client::builder()
+        .http1_only()
+        .connect_timeout(Duration::from_secs(20))
+        .timeout(Duration::from_secs(180))
+        .tcp_keepalive(Duration::from_secs(30))
+        .build()
+        .unwrap();
+
+    let mut tg_json: Option<serde_json::Value> = None;
+    let mut last_tg_err: Option<String> = None;
+
+    for attempt in 1..=3u8 {
+        let part = reqwest::multipart::Part::bytes(dec.clone())
+            .file_name(filename.clone())
+            .mime_str(mime)
+            .unwrap();
+        let mut form = reqwest::multipart::Form::new()
+            .text("chat_id", q.chat_id.clone())
+            .part("audio", part);
+        if let Some(ref t) = q.title { form = form.text("title", t.clone()); }
+        if let Some(ref p) = q.performer { form = form.text("performer", p.clone()); }
+        if let Some(d) = q.duration { form = form.text("duration", d.to_string()); }
+
+        match tg_http.post(&tg_url).multipart(form).send().await {
+            Ok(resp) => {
+                let status = resp.status();
+                match resp.json::<serde_json::Value>().await {
+                    Ok(j) => {
+                        if status.is_success() && j.get("ok").and_then(|v| v.as_bool()) == Some(true) {
+                            tg_json = Some(j);
+                            break;
+                        }
+                        let desc = j
+                            .get("description")
+                            .and_then(|v| v.as_str())
+                            .unwrap_or("unknown")
+                            .to_string();
+                        tracing::warn!("Telegram sendAudio attempt {} failed: status={} desc={}", attempt, status, desc);
+                        last_tg_err = Some(format!("Telegram {}: {}", status, desc));
+                    }
+                    Err(e) => {
+                        tracing::warn!("Telegram sendAudio attempt {} parse failed: {}", attempt, e);
+                        last_tg_err = Some(format!("Telegram parse: {}", e));
+                    }
+                }
+            }
+            Err(e) => {
+                tracing::warn!("Telegram sendAudio attempt {} upload failed: {}", attempt, e);
+                last_tg_err = Some(format!("Telegram upload: {}", e));
+            }
+        }
+
+        if attempt < 3 {
+            tokio::time::sleep(Duration::from_secs((attempt as u64) * 2)).await;
+        }
+    }
+
+    let tg_json = match tg_json {
+        Some(j) => j,
+        None => {
+            let err = last_tg_err.unwrap_or_else(|| "Telegram upload failed".to_string());
+            tracing::error!("Telegram sendAudio final failure: {}", err);
+            return json_error(StatusCode::BAD_GATEWAY, err);
+        }
+    };
 
     let file_id = tg_json.pointer("/result/audio/file_id")
         .and_then(|v| v.as_str())