Upload 2 files

src/main.rs

@@ -134,12 +134,12 @@ async fn api_client_for_arl(state: &AppState, arl: Option<String>) -> Arc<Mutex<
     c
 }
 
-fn extract_media_url(media_json: &serde_json::Value) -> String {
+fn extract_media_url(media_json: &serde_json::Value) -> (String, usize) {
     let data = media_json.get("data").and_then(|v| v.as_array());
     let Some(data_arr) = data else {
-        return String::new();
+        return (String::new(), 0);
     };
-    for data_item in data_arr {
+    for (i, data_item) in data_arr.iter().enumerate() {
         let media_arr = data_item.get("media").and_then(|v| v.as_array());
         let Some(media_arr) = media_arr else {
             continue;
@@ -168,13 +168,13 @@ fn extract_media_url(media_json: &serde_json::Value) -> String {
                 for p in preferred {
                     let p = p.trim();
                     if !p.is_empty() {
-                        return p.to_string();
+                        return (p.to_string(), i);
                     }
                 }
             }
         }
     }
-    String::new()
+    (String::new(), 0)
 }
 
 fn extract_media_format(media_json: &serde_json::Value) -> String {
@@ -242,7 +242,7 @@ async fn fetch_media_url(
     client: &APIClient,
     formats: &[Format],
     track_tokens: Vec<&str>,
-) -> Result<String, String> {
+) -> Result<(String, usize), String> {
     if client.license_token.is_empty() {
         return Err("license_token empty".to_string());
     }
@@ -263,9 +263,9 @@ async fn fetch_media_url(
         format!("media_bad_json:{}:{}", status.as_u16(), snip)
     })?;
 
-    let url = extract_media_url(&media_json);
+    let (url, idx) = extract_media_url(&media_json);
     if !url.is_empty() {
-        return Ok(url);
+        return Ok((url, idx));
     }
 
     Err(format!(
@@ -312,19 +312,23 @@ async fn media_url_for_track(
         .unwrap_or(0);
 
     let mut tokens = Vec::new();
+    let mut token_ids = Vec::new();
     if !track_token.is_empty() {
         tokens.push(track_token);
+        token_ids.push(id);
     }
     if !fallback_token.is_empty() {
         tokens.push(fallback_token);
+        let fid = if fallback_id > 0 { fallback_id } else { id };
+        token_ids.push(fid);
     }
 
     if tokens.is_empty() {
         return Err("empty TRACK_TOKEN and FALLBACK".to_string());
     }
 
-    let url = fetch_media_url(client, formats, tokens).await?;
-    let id_to_use = if fallback_id > 0 && track_token.is_empty() { fallback_id } else { id };
+    let (url, idx) = fetch_media_url(client, formats, tokens).await?;
+    let id_to_use = *token_ids.get(idx).unwrap_or(&id);
     Ok((url, id_to_use))
 }
 
@@ -626,7 +630,7 @@ async fn stream_info(State(state): State<AppState>, Query(q): Query<StreamParams
     // Upstream (опционально — если DZMEDIA_UPSTREAM задан)
     if let Ok(text) = upstream_get_url_text(&formats, &vec![q.id]).await {
         if let Ok(v) = serde_json::from_str::<serde_json::Value>(&text) {
-            url  = extract_media_url(&v);
+            url  = extract_media_url(&v).0;
             used = extract_media_format(&v);
         }
     }
@@ -833,14 +837,14 @@ async fn stream(
     let upstream = match req.send().await {
         Ok(r) => r,
         Err(_) => {
-            return (StatusCode::SERVICE_UNAVAILABLE, "Upstream request failed".to_string())
+            return (StatusCode::NOT_FOUND, "Upstream request failed".to_string())
                 .into_response()
         }
     };
 
     if !upstream.status().is_success() {
         return (
-            StatusCode::SERVICE_UNAVAILABLE,
+            StatusCode::NOT_FOUND,
             "Upstream status not OK".to_string(),
         )
             .into_response();