Upload main.rs

src/main.rs

@@ -928,6 +928,7 @@ async fn mobile_gw(
             ("api_version", "1.0"),
             ("api_token",   api_token),
             ("input",       "3"),
+            ("output",      "3"),
             ("cid",         cid.as_str()),
             ("api_key",     MOBILE_API_KEY),
         ])
@@ -1112,6 +1113,65 @@ async fn web_login(email: &str, password_md5: &str) -> Result<String, String> {
     Ok(arl)
 }
 
+fn worker_base() -> Option<String> {
+    let env = std::env::var("DZMEDIA_WORKER").ok().unwrap_or_default();
+    let base = env.trim();
+    if base.is_empty() || base == "-" {
+        return None;
+    }
+    Some(base.trim_end_matches('/').to_string())
+}
+
+#[derive(Serialize)]
+struct WorkerLoginReq<'a> {
+    email: &'a str,
+    password_md5: &'a str,
+}
+
+#[derive(Deserialize)]
+struct WorkerLoginResp {
+    arl: Option<String>,
+    error: Option<String>,
+}
+
+async fn worker_login(email: &str, password_md5: &str) -> Result<String, String> {
+    let Some(base) = worker_base() else {
+        return Err("worker:disabled".to_string());
+    };
+    let url = format!("{base}/login");
+
+    let client = reqwest::Client::builder()
+        .no_proxy()
+        .timeout(std::time::Duration::from_secs(25))
+        .build()
+        .map_err(|_| "worker:client".to_string())?;
+
+    let r = client
+        .post(url)
+        .json(&WorkerLoginReq { email, password_md5 })
+        .send()
+        .await
+        .map_err(|_| "worker:network".to_string())?;
+
+    let status = r.status();
+    let text = r.text().await.map_err(|_| "worker:read".to_string())?;
+    if !status.is_success() {
+        let snip: String = text.chars().take(200).collect();
+        return Err(format!("worker:http:{}:{}", status.as_u16(), snip));
+    }
+    let v: WorkerLoginResp = serde_json::from_str(&text).map_err(|_| {
+        let snip: String = text.chars().take(200).collect();
+        format!("worker:parse:{snip}")
+    })?;
+    if let Some(arl) = v.arl {
+        if arl.len() >= 100 {
+            return Ok(arl);
+        }
+        return Err(format!("worker:arl_too_short:{}", arl.len()));
+    }
+    Err(format!("worker:error:{}", v.error.unwrap_or_else(|| "unknown".to_string())))
+}
+
 
 async fn gw_light_call(
     client: &reqwest::Client,
@@ -1330,7 +1390,18 @@ async fn login(Json(req): Json<LoginReq>) -> impl IntoResponse {
                 "uid":          "",
                 "access_token": null
             }))).into_response(),
-            Err(e2) => json_error(StatusCode::UNAUTHORIZED, format!("login_failed; mobile:{e1}; web:{e2}")),
+            Err(e2) => match worker_login(&email, &pass).await {
+                Ok(arl) => (StatusCode::OK, Json(json!({
+                    "arl":          arl,
+                    "token":        null,
+                    "uid":          "",
+                    "access_token": null
+                }))).into_response(),
+                Err(e3) => json_error(
+                    StatusCode::UNAUTHORIZED,
+                    format!("login_failed; mobile:{e1}; web:{e2}; worker:{e3}"),
+                ),
+            },
         }
     }
 }
@@ -1699,7 +1770,10 @@ async fn pair_complete(State(state): State<AppState>, Form(f): Form<PairComplete
         Ok(arl) => Ok(arl),
         Err(e1) => match web_login(&email, &pass_md5).await {
             Ok(arl) => Ok(arl),
-            Err(e2) => Err(format!("mobile:{e1}; web:{e2}")),
+            Err(e2) => match worker_login(&email, &pass_md5).await {
+                Ok(arl) => Ok(arl),
+                Err(e3) => Err(format!("mobile:{e1}; web:{e2}; worker:{e3}")),
+            },
         },
     };