Upload 2 files

src/api.rs

@@ -64,7 +64,7 @@ impl APIClient {
         match env::var("ARL") {
             Ok(arl) if !arl.trim().is_empty() => Self::new_with_arl(arl),
             _ => Self {
-                client: Client::builder().build().unwrap(),
+                client: Client::builder().no_proxy().build().unwrap(),
                 license_token: String::new(),
                 check_form: String::new(),
                 renew_instant: None,
@@ -73,7 +73,7 @@ impl APIClient {
     }
 
     pub fn new_with_arl(arl: String) -> Self {
-        let builder = Client::builder();
+        let builder = Client::builder().no_proxy();
 
         let cookie = format!("arl={}; Domain=.deezer.com", arl);
         let comeback = "comeback=1; Domain=.deezer.com";

src/main.rs

@@ -192,6 +192,7 @@ async fn upstream_get_url_text(formats: &Vec<Format>, ids: &Vec<u32>) -> Result<
     let url = format!("{base}/get_url");
 
     let client = reqwest::Client::builder()
+        .no_proxy()
         .timeout(std::time::Duration::from_secs(20))
         .build()
         .map_err(|_| "upstream:client".to_string())?;
@@ -224,6 +225,7 @@ async fn upstream_media_url(id: u32, formats: &Vec<Format>) -> Result<String, St
 
 async fn public_track_duration(id: u32) -> Option<u32> {
     let client = reqwest::Client::builder()
+        .no_proxy()
         .timeout(std::time::Duration::from_secs(10))
         .build()
         .ok()?;
@@ -330,6 +332,7 @@ async fn fetch(Query(q): Query<FetchParams>) -> impl IntoResponse {
     }
 
     let client = reqwest::Client::builder()
+        .no_proxy()
         .timeout(std::time::Duration::from_secs(60))
         .build()
         .unwrap();
@@ -456,6 +459,7 @@ async fn stream_info(State(state): State<AppState>, Query(q): Query<StreamParams
 
     let duration = public_track_duration(q.id).await.unwrap_or(0);
     let http = reqwest::Client::builder()
+        .no_proxy()
         .timeout(std::time::Duration::from_secs(15))
         .build()
         .unwrap();
@@ -620,6 +624,7 @@ async fn stream(
         .and_then(parse_range_header);
 
     let http = reqwest::Client::builder()
+        .no_proxy()
         .timeout(std::time::Duration::from_secs(60))
         .build()
         .unwrap();
@@ -1162,6 +1167,7 @@ async fn login(Json(req): Json<LoginReq>) -> impl IntoResponse {
     let url_deezer = "https://www.deezer.com".parse::<Url>().unwrap();
     jar.add_cookie_str("comeback=1; Domain=.deezer.com", &url_deezer);
     let client = reqwest::Client::builder()
+        .no_proxy()
         .cookie_provider(jar.clone())
         .timeout(std::time::Duration::from_secs(15))
         .build()
@@ -1587,6 +1593,7 @@ async fn pair_complete(State(state): State<AppState>, Form(f): Form<PairComplete
     let url_deezer = "https://www.deezer.com".parse::<Url>().unwrap();
     jar.add_cookie_str("comeback=1; Domain=.deezer.com", &url_deezer);
     let client = reqwest::Client::builder()
+        .no_proxy()
         .cookie_provider(jar.clone())
         .timeout(std::time::Duration::from_secs(20))
         .build()
@@ -1737,9 +1744,11 @@ async fn oauth_me(Json(req): Json<OauthMeReq>) -> impl IntoResponse {
         return json_error(StatusCode::BAD_REQUEST, "access_token required");
     }
     let client = reqwest::Client::builder()
+        .no_proxy()
         .timeout(std::time::Duration::from_secs(15))
         .build()
         .unwrap();
+        .unwrap();
     match api_deezer_get(&client, "/user/me", &token, &[]).await {
         Ok(v) => (StatusCode::OK, Json(v)).into_response(),
         Err(e) => json_error(StatusCode::SERVICE_UNAVAILABLE, e),
@@ -1761,9 +1770,11 @@ async fn oauth_playlists(Json(req): Json<OauthPlaylistsReq>) -> impl IntoRespons
     let index = req.index.unwrap_or(0).to_string();
     let limit = req.limit.unwrap_or(50).to_string();
     let client = reqwest::Client::builder()
+        .no_proxy()
         .timeout(std::time::Duration::from_secs(15))
         .build()
         .unwrap();
+        .unwrap();
     let me = match api_deezer_get(&client, "/user/me", &token, &[]).await {
         Ok(v) => v,
         Err(e) => return json_error(StatusCode::SERVICE_UNAVAILABLE, e),
@@ -1799,9 +1810,11 @@ async fn oauth_playlist_tracks(Json(req): Json<OauthPlaylistTracksReq>) -> impl
     let index = req.index.unwrap_or(0).to_string();
     let limit = req.limit.unwrap_or(100).to_string();
     let client = reqwest::Client::builder()
+        .no_proxy()
         .timeout(std::time::Duration::from_secs(15))
         .build()
         .unwrap();
+        .unwrap();
     let path = format!("/playlist/{}/tracks", req.playlist_id);
     let extra = [("index", index), ("limit", limit)];
     match api_deezer_get(&client, &path, &token, &extra).await {
@@ -2151,6 +2164,7 @@ async fn oauth_flow(Json(req): Json<OauthFlowReq>) -> impl IntoResponse {
     }
     let limit = req.limit.unwrap_or(40).clamp(1, 100).to_string();
     let client = reqwest::Client::builder()
+        .no_proxy()
         .timeout(std::time::Duration::from_secs(15))
         .build()
         .unwrap();
@@ -2187,6 +2201,7 @@ async fn oauth_reco_playlists(Json(req): Json<OauthRecoReq>) -> impl IntoRespons
     let index = req.index.unwrap_or(0).to_string();
     let limit = req.limit.unwrap_or(20).clamp(1, 50).to_string();
     let client = reqwest::Client::builder()
+        .no_proxy()
         .timeout(std::time::Duration::from_secs(15))
         .build()
         .unwrap();
@@ -2215,6 +2230,7 @@ async fn oauth_reco_albums(Json(req): Json<OauthRecoReq>) -> impl IntoResponse {
     let index = req.index.unwrap_or(0).to_string();
     let limit = req.limit.unwrap_or(20).clamp(1, 50).to_string();
     let client = reqwest::Client::builder()
+        .no_proxy()
         .timeout(std::time::Duration::from_secs(15))
         .build()
         .unwrap();
@@ -2243,6 +2259,7 @@ async fn oauth_reco_artists(Json(req): Json<OauthRecoReq>) -> impl IntoResponse
     let index = req.index.unwrap_or(0).to_string();
     let limit = req.limit.unwrap_or(20).clamp(1, 50).to_string();
     let client = reqwest::Client::builder()
+        .no_proxy()
         .timeout(std::time::Duration::from_secs(15))
         .build()
         .unwrap();
@@ -2271,6 +2288,7 @@ async fn oauth_reco_tracks(Json(req): Json<OauthRecoReq>) -> impl IntoResponse {
     let index = req.index.unwrap_or(0).to_string();
     let limit = req.limit.unwrap_or(40).clamp(1, 100).to_string();
     let client = reqwest::Client::builder()
+        .no_proxy()
         .timeout(std::time::Duration::from_secs(15))
         .build()
         .unwrap();
@@ -2306,6 +2324,7 @@ async fn oauth_history(Json(req): Json<OauthHistoryReq>) -> impl IntoResponse {
     let index = req.index.unwrap_or(0).to_string();
     let limit = req.limit.unwrap_or(50).clamp(1, 100).to_string();
     let client = reqwest::Client::builder()
+        .no_proxy()
         .timeout(std::time::Duration::from_secs(15))
         .build()
         .unwrap();