Upload 2 files

src/api.rs

@@ -1,5 +1,5 @@
 use serde::{Serialize, Deserialize, de::DeserializeOwned};
-use std::{env, marker::Sized, time::Instant, sync::Arc};
+use std::{env, marker::Sized, time::{Instant, Duration}, sync::Arc};
 use std::time::{SystemTime, UNIX_EPOCH};
 use thiserror::Error;
 use serde_json::{json, value::from_value};
@@ -64,7 +64,12 @@ impl APIClient {
         match env::var("ARL") {
             Ok(arl) if !arl.trim().is_empty() => Self::new_with_arl(arl),
             _ => Self {
-                client: Client::builder().no_proxy().build().unwrap(),
+                client: Client::builder()
+                    .no_proxy()
+                    .connect_timeout(Duration::from_secs(5))
+                    .timeout(Duration::from_secs(12))
+                    .build()
+                    .unwrap(),
                 license_token: String::new(),
                 check_form: String::new(),
                 renew_instant: None,
@@ -92,7 +97,8 @@ impl APIClient {
         jar.add_cookie_str(comeback, &url);
         let builder = builder
             .cookie_provider(Arc::new(jar))
-            .timeout(std::time::Duration::from_secs(30));
+            .connect_timeout(Duration::from_secs(5))
+            .timeout(Duration::from_secs(12));
 
         let renew_instant = if !license_token.is_empty() && !check_form.is_empty() {
             Some(Instant::now())

src/main.rs

@@ -24,6 +24,7 @@ use reqwest::cookie::CookieStore;
 use reqwest::header::ACCEPT;
 use std::time::{SystemTime, UNIX_EPOCH};
 use tokio::sync::{Mutex, RwLock};
+use tokio::time::{timeout, Duration};
 
 type BoxErr = Box<dyn std::error::Error + Send + Sync + 'static>;
 
@@ -629,8 +630,7 @@ async fn stream(
         return (StatusCode::SERVICE_UNAVAILABLE, "arl required").into_response();
     }
 
-    // До 3 попыток
-    for attempt in 0..3u8 {
+    for attempt in 0..2u8 {
         if url.is_some() { break; }
 
         if attempt >= 1 {
@@ -650,7 +650,10 @@ async fn stream(
                     continue;
                 }
             }
-            media_url_for_track(&mut c, q.id, &formats).await
+            match timeout(Duration::from_secs(12), media_url_for_track(&mut c, q.id, &formats)).await {
+                Ok(v) => v,
+                Err(_) => Err("timeout".to_string()),
+            }
         };
 
         match res {