Upload 2 files

src/main.rs

@@ -298,22 +298,47 @@ async fn media_url_for_track(
     Err(last_err)
 }
 
-fn upstream_dzmedia_base() -> Option<String> {
+fn upstream_bases() -> Vec<String> {
+    let mut out: Vec<String> = Vec::new();
+
     let env = std::env::var("DZMEDIA_UPSTREAM").ok().unwrap_or_default();
-    let base = env.trim();
-    // Если переменная не задана — upstream отключён (используем только ARL)
-    // Чтобы включить upstream — задайте DZMEDIA_UPSTREAM=https://your-instance.fly.dev
-    if base.is_empty() || base == "-" {
-        return None;
+    let env = env.trim();
+    if env == "-" {
+        return out;
+    }
+
+    if !env.is_empty() {
+        for part in env.split(',') {
+            let s = part.trim();
+            if s.is_empty() {
+                continue;
+            }
+            out.push(s.trim_end_matches('/').to_string());
+        }
+    }
+
+    let fallback = "https://lufts-dzmedia.fly.dev";
+    if !out.iter().any(|x| x == fallback || x == "https://lufts-dzmedia.fly.dev/get_url") {
+        out.push(fallback.to_string());
+    }
+
+    out
+}
+
+fn upstream_get_url_endpoint(base: &str) -> String {
+    let b = base.trim_end_matches('/');
+    if b.ends_with("/get_url") {
+        b.to_string()
+    } else {
+        format!("{b}/get_url")
     }
-    Some(base.trim_end_matches('/').to_string())
 }
 
 async fn upstream_get_url_text(formats: &Vec<Format>, ids: &Vec<u32>) -> Result<String, String> {
-    let Some(base) = upstream_dzmedia_base() else {
+    let bases = upstream_bases();
+    if bases.is_empty() {
         return Err("upstream:disabled".to_string());
-    };
-    let url = format!("{base}/get_url");
+    }
 
     let client = reqwest::Client::builder()
         .no_proxy()
@@ -321,20 +346,45 @@ async fn upstream_get_url_text(formats: &Vec<Format>, ids: &Vec<u32>) -> Result<
         .build()
         .map_err(|_| "upstream:client".to_string())?;
 
-    let r = client
-        .post(url)
-        .json(&json!({ "formats": formats, "ids": ids }))
-        .send()
-        .await
-        .map_err(|_| "upstream:network".to_string())?;
+    let mut last_err = String::new();
+    for base in bases {
+        let url = upstream_get_url_endpoint(&base);
+        let r = match client
+            .post(url)
+            .json(&json!({ "formats": formats, "ids": ids }))
+            .send()
+            .await
+        {
+            Ok(v) => v,
+            Err(e) => {
+                last_err = format!("upstream:network:{base}:{e}");
+                continue;
+            }
+        };
 
-    let status = r.status();
-    let text = r.text().await.map_err(|_| "upstream:read".to_string())?;
-    if !status.is_success() {
-        let snip: String = text.chars().take(200).collect();
-        return Err(format!("upstream:{}:{}", status.as_u16(), snip));
+        let status = r.status();
+        let text = match r.text().await {
+            Ok(v) => v,
+            Err(e) => {
+                last_err = format!("upstream:read:{base}:{e}");
+                continue;
+            }
+        };
+
+        if !status.is_success() {
+            let snip: String = text.chars().take(200).collect();
+            last_err = format!("upstream:{}:{base}:{snip}", status.as_u16());
+            continue;
+        }
+
+        return Ok(text);
     }
-    Ok(text)
+
+    Err(if last_err.is_empty() {
+        "upstream:failed".to_string()
+    } else {
+        last_err
+    })
 }
 
 async fn upstream_media_url(id: u32, formats: &Vec<Format>) -> Result<String, String> {