Upload 2 files

src/main.rs

@@ -1,4 +1,4 @@
-use axum::{
+use axum::{
     routing::{get, post},
     http::StatusCode,
     http::{HeaderMap, Method, header::{RANGE, CONTENT_RANGE, ACCEPT_RANGES, CONTENT_LENGTH, CONTENT_TYPE}},
@@ -27,34 +27,6 @@ use tokio::sync::{Mutex, RwLock};
 
 type BoxErr = Box<dyn std::error::Error + Send + Sync + 'static>;
 
-// #region debug-point A:debug-server
-async fn debug_event(hypothesis_id: &str, location: &str, msg: &str, data: serde_json::Value) {
-    let payload = json!({
-        "sessionId": "login-gateway-output",
-        "runId": "pre-fix",
-        "hypothesisId": hypothesis_id,
-        "location": location,
-        "msg": msg,
-        "data": data,
-        "ts": SystemTime::now()
-            .duration_since(UNIX_EPOCH)
-            .map(|d| d.as_millis())
-            .unwrap_or(0),
-    });
-    if let Ok(c) = reqwest::Client::builder()
-        .no_proxy()
-        .timeout(std::time::Duration::from_secs(2))
-        .build()
-    {
-        let _ = c
-            .post("http://192.168.8.103:7777/event")
-            .json(&payload)
-            .send()
-            .await;
-    }
-}
-// #endregion
-
 mod api;
 use api::{APIClient, APIError, Format};
 
@@ -1053,18 +1025,6 @@ async fn web_login(email: &str, password_md5: &str) -> Result<String, String> {
     let url_deezer = "https://www.deezer.com".parse::<Url>().map_err(|_| "web:url".to_string())?;
     jar.add_cookie_str("comeback=1; Domain=.deezer.com; Path=/", &url_deezer);
 
-    // #region debug-point B:web-login-entry
-    debug_event(
-        "B",
-        "src/main.rs:web_login:entry",
-        "[DEBUG] web_login entry",
-        json!({
-            "email_len": email.len(),
-            "password_md5_len": password_md5.len(),
-        }),
-    ).await;
-    // #endregion
-
     let client = reqwest::Client::builder()
         .no_proxy()
         .cookie_provider(jar.clone())
@@ -1100,17 +1060,6 @@ async fn web_login(email: &str, password_md5: &str) -> Result<String, String> {
         return Err("web:no_checkForm".to_string());
     }
 
-    // #region debug-point C:web-login-checkform
-    debug_event(
-        "C",
-        "src/main.rs:web_login:checkform",
-        "[DEBUG] web_login checkForm received",
-        json!({
-            "check_form_len": check_form.len(),
-        }),
-    ).await;
-    // #endregion
-
     let _ = gw_light_call_custom(
         &client,
         "user.checkCredentials",
@@ -1373,23 +1322,6 @@ async fn gw_light_call_custom(
         qp.push(("gateway_input", gi));
     }
 
-    // #region debug-point D:gw-light-query
-    debug_event(
-        "D",
-        "src/main.rs:gw_light_call_custom:request",
-        "[DEBUG] gw_light_call_custom request",
-        json!({
-            "method": method,
-            "use_get": use_get || method == "user.getArl",
-            "api_token_is_null": api_token == "null",
-            "gateway_input": gateway_input.unwrap_or(""),
-            "has_output_3": qp.iter().any(|(k, v)| *k == "output" && *v == "3"),
-            "qp": qp.iter().map(|(k, v)| format!("{k}={v}")).collect::<Vec<_>>(),
-            "param_keys": params.as_object().map(|m| m.keys().cloned().collect::<Vec<_>>()).unwrap_or_default(),
-        }),
-    ).await;
-    // #endregion
-
     let r = req
         .query(&qp)
         .header(ACCEPT, "*/*")
@@ -1413,18 +1345,6 @@ async fn gw_light_call_custom(
 
     let status = r.status();
     let text = r.text().await.map_err(|_| "read".to_string())?;
-    // #region debug-point E:gw-light-response
-    debug_event(
-        "E",
-        "src/main.rs:gw_light_call_custom:response",
-        "[DEBUG] gw_light_call_custom response",
-        json!({
-            "method": method,
-            "status": status.as_u16(),
-            "body_prefix": text.chars().take(220).collect::<String>(),
-        }),
-    ).await;
-    // #endregion
     if status.as_u16() == 403 && text.to_ascii_lowercase().contains("access denied") {
         return Err("blocked:403".to_string());
     }