fix(client): use MEDIA_CLIENT with redirect following for media proxy

Algorithm5838 · Algorithm5838 · commit ffd620c021f1 · 2026-04-12T17:23:56.000+03:00
diff --git a/src/client.rs b/src/client.rs
@@ -31,6 +31,35 @@ const ALTERNATIVE_REDDIT_URL_BASE_HOST: &str = "www.reddit.com";
 
 pub static CLIENT: LazyLock<WreqClient> = LazyLock::new(build_client);
 
+/// A separate wreq client used only for media proxying (images, videos, HLS).
+/// Unlike CLIENT (which uses Policy::none() so the Reddit API redirect logic
+/// in request() stays intact), this client follows redirects automatically so
+/// that CDN 302s are resolved server-side and the browser always receives the
+/// final media bytes rather than a redirect to a bare Reddit CDN URL.
+pub static MEDIA_CLIENT: LazyLock<WreqClient> = LazyLock::new(|| {
+	let emulations = [
+		Emulation::Chrome135,
+		Emulation::Chrome136,
+		Emulation::Chrome137,
+		Emulation::Firefox135,
+		Emulation::Firefox136,
+	];
+	let emulation_os = [EmulationOS::Android, EmulationOS::Windows, EmulationOS::Linux];
+
+	let rand = fastrand::usize(..);
+	let emulation = EmulationOption::builder()
+		.emulation(emulations[rand % emulations.len()])
+		.emulation_os(emulation_os[rand % emulation_os.len()])
+		.build()
+		.emulation();
+
+	WreqClient::builder()
+		.emulation(emulation)
+		.redirect(Policy::limited(10))
+		.build()
+		.expect("Should always be able to build a wreq media client")
+});
+
 pub static OAUTH_CLIENT: LazyLock<ArcSwap<Oauth>> = LazyLock::new(|| {
 	let client = block_on(Oauth::new());
 	tokio::spawn(token_daemon());
@@ -97,9 +126,14 @@ impl IntoHyperResponse for wreq::Response {
 
 		let mut builder = hyper::Response::builder().status(status);
 		for (key_bytes, val_bytes) in &raw_headers {
-			let key = hyper::header::HeaderName::from_bytes(key_bytes).map_err(|e| e.to_string())?;
-			let val = hyper::header::HeaderValue::from_bytes(val_bytes).map_err(|e| e.to_string())?;
-			builder = builder.header(key, val);
+			// Skip headers that hyper rejects (e.g. non-ASCII bytes in CDN headers)
+			// rather than aborting the entire response.
+			if let (Ok(key), Ok(val)) = (
+				hyper::header::HeaderName::from_bytes(key_bytes),
+				hyper::header::HeaderValue::from_bytes(val_bytes),
+			) {
+				builder = builder.header(key, val);
+			}
 		}
 		// wreq already decompresses; remove the content-encoding header so
 		// downstream code doesn't try to decompress again.
@@ -198,7 +232,9 @@ pub async fn proxy(req: hyper::Request<Body>, format: &str) -> Result<Response<B
 }
 
 async fn stream(url: &str, req: &hyper::Request<Body>) -> Result<Response<Body>, String> {
-	let mut builder = CLIENT.get(url);
+	// Use MEDIA_CLIENT (Policy::limited(10)) so CDN 302 redirects are followed
+	// server-side. CLIENT uses Policy::none() for Reddit API redirect handling.
+	let mut builder = MEDIA_CLIENT.get(url);
 
 	// Copy useful headers from original request
 	// Convert hyper header values (http v0.2) to bytes for wreq (http v1.x)
