fix: retry webfetch with simple UA on 403 (#10328)
This commit is contained in:
@@ -56,15 +56,21 @@ export const WebFetchTool = Tool.define("webfetch", {
|
|||||||
"text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8"
|
"text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8"
|
||||||
}
|
}
|
||||||
|
|
||||||
const response = await fetch(params.url, {
|
const signal = AbortSignal.any([controller.signal, ctx.abort])
|
||||||
signal: AbortSignal.any([controller.signal, ctx.abort]),
|
const headers = {
|
||||||
headers: {
|
"User-Agent":
|
||||||
"User-Agent":
|
"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/143.0.0.0 Safari/537.36",
|
||||||
"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/143.0.0.0 Safari/537.36",
|
Accept: acceptHeader,
|
||||||
Accept: acceptHeader,
|
"Accept-Language": "en-US,en;q=0.9",
|
||||||
"Accept-Language": "en-US,en;q=0.9",
|
}
|
||||||
},
|
|
||||||
})
|
const initial = await fetch(params.url, { signal, headers })
|
||||||
|
|
||||||
|
// Retry with honest UA if blocked by Cloudflare bot detection (TLS fingerprint mismatch)
|
||||||
|
const response =
|
||||||
|
initial.status === 403 && initial.headers.get("cf-mitigated") === "challenge"
|
||||||
|
? await fetch(params.url, { signal, headers: { ...headers, "User-Agent": "opencode" } })
|
||||||
|
: initial
|
||||||
|
|
||||||
clearTimeout(timeoutId)
|
clearTimeout(timeoutId)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user