Upload 2 files

src/api.rs

@@ -75,10 +75,12 @@ impl APIClient {
         let builder = Client::builder();
 
         let cookie = format!("arl={}; Domain=.deezer.com", arl);
+        let comeback = "comeback=1; Domain=.deezer.com";
         let url = "https://www.deezer.com".parse::<Url>().unwrap();
 
         let jar = Jar::default();
         jar.add_cookie_str(&cookie, &url);
+        jar.add_cookie_str(comeback, &url);
         let builder = builder.cookie_provider(Arc::new(jar));
 
         Self {
@@ -104,14 +106,18 @@ impl APIClient {
             check_form = &self.check_form;
         }
 
-        let json: DeezerResponse = self
-            .client
-            .post("https://www.deezer.com/ajax/gw-light.php")
+        let url = "https://www.deezer.com/ajax/gw-light.php";
+        let req = if method == "deezer.getUserData" {
+            self.client.get(url)
+        } else {
+            self.client.post(url).json(params)
+        };
+        let json: DeezerResponse = req
             .query(&[
                 ("method", method),
                 ("input", "3"),
                 ("api_version", "1.0"),
-                ("api_token", check_form)
+                ("api_token", check_form),
             ])
             .header(ACCEPT, "*/*")
             .header("Origin", "https://www.deezer.com")
@@ -122,7 +128,6 @@ impl APIClient {
                 "User-Agent",
                 "Mozilla/5.0 (X11; Linux x86_64; rv:128.0) Gecko/20100101 Firefox/128.0",
             )
-            .json(params)
             .send()
             .await?
             .json()

src/main.rs

@@ -382,8 +382,13 @@ async fn gw_light_call(
     api_token: &str,
     params: serde_json::Value,
 ) -> Result<serde_json::Value, String> {
-    let r = client
-        .post("https://www.deezer.com/ajax/gw-light.php")
+    let url = "https://www.deezer.com/ajax/gw-light.php";
+    let req = if method == "deezer.getUserData" {
+        client.get(url)
+    } else {
+        client.post(url).json(&params)
+    };
+    let r = req
         .query(&[
             ("method", method),
             ("input", "3"),
@@ -399,12 +404,16 @@ async fn gw_light_call(
             "User-Agent",
             "Mozilla/5.0 (X11; Linux x86_64; rv:128.0) Gecko/20100101 Firefox/128.0",
         )
-        .json(&params)
         .send()
         .await
         .map_err(|_| "network".to_string())?;
 
-    let json: GwResp = r.json().await.map_err(|_| "parse".to_string())?;
+    let status = r.status();
+    let text = r.text().await.map_err(|_| "read".to_string())?;
+    let json: GwResp = serde_json::from_str(&text).map_err(|_| {
+        let snip: String = text.chars().take(200).collect();
+        format!("parse:{}:{}", status.as_u16(), snip)
+    })?;
 
     if let Some(error) = json.error.as_object() {
         for (code, message) in error {
@@ -424,6 +433,8 @@ async fn login(Json(req): Json<LoginReq>) -> impl IntoResponse {
         return json_error(StatusCode::BAD_REQUEST, "Email and password_md5 required");
     }
     let jar = Jar::default();
+    let url = "https://www.deezer.com".parse::<Url>().unwrap();
+    jar.add_cookie_str("comeback=1; Domain=.deezer.com", &url);
     let client = reqwest::Client::builder()
         .cookie_provider(Arc::new(jar))
         .timeout(std::time::Duration::from_secs(15))