From b413d702b272960dcc3970394194f5328c784eeb Mon Sep 17 00:00:00 2001 From: Valerio Date: Thu, 23 Apr 2026 14:59:29 +0200 Subject: [PATCH] feat(fetch): add fetch_smart with Reddit + Akamai rescue paths, bump 0.5.6 --- CHANGELOG.md | 10 +++++ Cargo.lock | 14 +++---- Cargo.toml | 2 +- crates/webclaw-fetch/src/client.rs | 59 ++++++++++++++++++++++++++---- 4 files changed, 69 insertions(+), 16 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 94b9ddb..54cb31f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,16 @@ All notable changes to webclaw are documented here. Format follows [Keep a Changelog](https://keepachangelog.com/). +## [0.5.6] — 2026-04-23 + +### Added +- `FetchClient::fetch_smart(url)` applies per-site rescue logic and returns the same `FetchResult` shape as `fetch()`. Reddit URLs route to the `.json` API, and Akamai-style challenge pages trigger a homepage cookie warmup plus a retry. Makes `/v1/scrape` on Reddit populate markdown again. + +### Fixed +- Regression introduced in 0.5.4 where the production server's `/v1/scrape` bypassed the Reddit `.json` shortcut and Akamai cookie warmup that `fetch_and_extract` had been providing. Both helpers now live in `fetch_smart` and every caller path picks them up. + +--- + ## [0.5.5] — 2026-04-23 ### Added diff --git a/Cargo.lock b/Cargo.lock index 30135cd..b382000 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3219,7 +3219,7 @@ dependencies = [ [[package]] name = "webclaw-cli" -version = "0.5.5" +version = "0.5.6" dependencies = [ "clap", "dotenvy", @@ -3240,7 +3240,7 @@ dependencies = [ [[package]] name = "webclaw-core" -version = "0.5.5" +version = "0.5.6" dependencies = [ "ego-tree", "once_cell", @@ -3258,7 +3258,7 @@ dependencies = [ [[package]] name = "webclaw-fetch" -version = "0.5.5" +version = "0.5.6" dependencies = [ "async-trait", "bytes", @@ -3284,7 +3284,7 @@ dependencies = [ [[package]] name = "webclaw-llm" -version = "0.5.5" +version = "0.5.6" dependencies = [ "async-trait", "reqwest", @@ -3297,7 +3297,7 @@ dependencies = [ [[package]] name = "webclaw-mcp" -version = "0.5.5" +version = "0.5.6" dependencies = [ "dirs", "dotenvy", @@ -3317,7 +3317,7 @@ dependencies = [ [[package]] name = "webclaw-pdf" -version = "0.5.5" +version = "0.5.6" dependencies = [ "pdf-extract", "thiserror", @@ -3326,7 +3326,7 @@ dependencies = [ [[package]] name = "webclaw-server" -version = "0.5.5" +version = "0.5.6" dependencies = [ "anyhow", "axum", diff --git a/Cargo.toml b/Cargo.toml index abd5816..d9cfd92 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,7 +3,7 @@ resolver = "2" members = ["crates/*"] [workspace.package] -version = "0.5.5" +version = "0.5.6" edition = "2024" license = "AGPL-3.0" repository = "https://github.com/0xMassi/webclaw" diff --git a/crates/webclaw-fetch/src/client.rs b/crates/webclaw-fetch/src/client.rs index e147337..d61694f 100644 --- a/crates/webclaw-fetch/src/client.rs +++ b/crates/webclaw-fetch/src/client.rs @@ -261,10 +261,52 @@ impl FetchClient { self.cloud.as_deref() } + /// Fetch a URL with per-site rescue paths: Reddit URLs redirect to the + /// `.json` API, and Akamai-style challenge responses trigger a homepage + /// cookie warmup and a retry. Returns the same `FetchResult` shape as + /// [`Self::fetch`] so every caller (CLI, MCP, OSS server, production + /// server) benefits without shape churn. + /// + /// This is the method most callers want. Use plain [`Self::fetch`] only + /// when you need literal no-rescue behavior (e.g. inside the rescue + /// logic itself to avoid recursion). + pub async fn fetch_smart(&self, url: &str) -> Result { + // Reddit: the HTML page shows a verification interstitial for most + // client IPs, but appending `.json` returns the post + comment tree + // publicly. `parse_reddit_json` in downstream code knows how to read + // the result; here we just do the URL swap at the fetch layer. + if crate::reddit::is_reddit_url(url) { + let json_url = crate::reddit::json_url(url); + if let Ok(resp) = self.fetch(&json_url).await { + if resp.status == 200 && !resp.html.is_empty() { + return Ok(resp); + } + } + // If the .json fetch failed, fall through to the HTML path. + } + + let resp = self.fetch(url).await?; + + // Akamai / bazadebezolkohpepadr challenge: visit the homepage to + // collect warmup cookies (_abck, bm_sz, etc.), then retry. + if is_challenge_html(&resp.html) + && let Some(homepage) = extract_homepage(url) + { + debug!("challenge detected, warming cookies via {homepage}"); + let _ = self.fetch(&homepage).await; + if let Ok(retry) = self.fetch(url).await { + return Ok(retry); + } + } + + Ok(resp) + } + /// Fetch a URL and return the raw HTML + response metadata. /// /// Automatically retries on transient failures (network errors, 5xx, 429) - /// with exponential backoff: 0s, 1s (2 attempts total). + /// with exponential backoff: 0s, 1s (2 attempts total). No per-site + /// rescue logic; use [`Self::fetch_smart`] for that. #[instrument(skip(self), fields(url = %url))] pub async fn fetch(&self, url: &str) -> Result { let delays = [Duration::ZERO, Duration::from_secs(1)]; @@ -713,22 +755,23 @@ fn is_pdf_content_type(headers: &http::HeaderMap) -> bool { /// Detect if a response looks like a bot protection challenge page. fn is_challenge_response(response: &Response) -> bool { - let len = response.body().len(); + is_challenge_html(response.text().as_ref()) +} + +/// Same as `is_challenge_response`, operating on a body string directly +/// so callers holding a `FetchResult` can reuse the heuristic. +fn is_challenge_html(html: &str) -> bool { + let len = html.len(); if len > 15_000 || len == 0 { return false; } - - let text = response.text(); - let lower = text.to_lowercase(); - + let lower = html.to_lowercase(); if lower.contains("challenge page") { return true; } - if lower.contains("bazadebezolkohpepadr") && len < 5_000 { return true; } - false }