YoursFunny/TelegramTwitterMediaBot
1
0
Fork 0
mirror of https://github.com/TheFunny/TelegramTwitterMediaBot.git synced 2026-09-23 23:32:05 +00:00
Code Releases Activity

site: honor TELOXIDE_PROXY for site fetches

Browse Source 
The shared HTTP client ignored the proxy the Bot API uses, so on
proxy-required networks (e.g. behind the GFW) every site fetch failed
while the bot itself worked. Explicit proxy overrides reqwest's system
detection; unset keeps direct connections.
This commit is contained in:
YoursFunny
2026-08-08 20:05:51 +08:00
parent 042a04ab6e
commit 6849006ad7
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/x-media/src/site/mod.rs
+11 -1
View File
@@ -203,12 +203,22 @@ impl From<PixivError> for FetchError {
/// Shared HTTP client (browser User-Agent) for twitter/bsky fetches and /// Shared HTTP client (browser User-Agent) for twitter/bsky fetches and
/// [`download_media`]. /// [`download_media`].
pub(crate) static CLIENT: LazyLock<reqwest::Client> = LazyLock::new(|| { pub(crate) static CLIENT: LazyLock<reqwest::Client> = LazyLock::new(|| {
let builder = reqwest::Client::builder() let mut builder = reqwest::Client::builder()
.user_agent("Mozilla/5.0") .user_agent("Mozilla/5.0")
// reqwest has no total timeout by default; a stalled connection // reqwest has no total timeout by default; a stalled connection
// would otherwise pin a fetch/handler forever. // would otherwise pin a fetch/handler forever.
.timeout(Duration::from_secs(30)) .timeout(Duration::from_secs(30))
.connect_timeout(Duration::from_secs(10)); .connect_timeout(Duration::from_secs(10));
// Route site fetches through the same proxy the Bot API uses, so a
// network that needs TELOXIDE_PROXY (e.g. behind the GFW) does not
// leave site fetches dead while the bot itself works.
if let Some(proxy) = std::env::var("TELOXIDE_PROXY")
.ok()
.filter(|s| !s.is_empty())
&& let Ok(p) = reqwest::Proxy::all(&proxy)
{
builder = builder.proxy(p);
}
// Each `#[tokio::test]` runs on its own runtime; the connection pool is // Each `#[tokio::test]` runs on its own runtime; the connection pool is
// bound to the runtime that created it, so cross-runtime reuse of idle // bound to the runtime that created it, so cross-runtime reuse of idle
// connections fails with DispatchGone. In test builds every request uses // connections fails with DispatchGone. In test builds every request uses