Improve response logic

Cargo.toml

@@ -16,7 +16,7 @@ pyo3 = { version = "0.23.4", features = ["extension-module", "abi3-py38", "index
 anyhow = "1.0.95"
 tracing = { version = "0.1.41", features = ["log-always"] }
 pyo3-log = "0.12.1"
-rquest = { version = "2.0.3", features = [
+rquest = { version = "2.1.0", features = [
     "json",
     "cookies",
     "socks",
@@ -37,6 +37,10 @@ bytes = "1.10.0"
 pythonize = "0.23.0"
 serde_json = "1.0.138"
 webpki-root-certs = "0.26.8"
+http-body-util = "0.1.2"
+http = "1.2.0"
+mime = "0.3.17"
+url = "2.5.4"
 
 [profile.release]
 codegen-units = 1

src/lib.rs

@@ -2,12 +2,10 @@
 use std::sync::{Arc, LazyLock, Mutex};
 use std::time::Duration;
 
-use anyhow::{Error, Result};
-use bytes::Bytes;
+use anyhow::Result;
 use foldhash::fast::RandomState;
 use indexmap::IndexMap;
 use pyo3::prelude::*;
-use pyo3::types::PyBytes;
 use pythonize::depythonize;
 use rquest::{
     header::{HeaderValue, COOKIE},
@@ -439,35 +437,28 @@ impl RClient {
             }
 
             // Send the request and await the response
-            let resp = request_builder.send().await?;
-
-            // Response items
-            let cookies: IndexMapSSR = resp
-                .cookies()
-                .map(|cookie| (cookie.name().to_string(), cookie.value().to_string()))
-                .collect();
-            let headers: IndexMapSSR = resp.headers().to_indexmap();
+            let resp: rquest::Response = request_builder.send().await?;
+            let url: String = resp.url().to_string();
             let status_code = resp.status().as_u16();
-            let url = resp.url().to_string();
-            let buf = resp.bytes().await?;
 
-            tracing::info!("response: {} {} {}", url, status_code, buf.len());
-            Ok((buf, cookies, headers, status_code, url))
+            tracing::info!("response: {} {}", url, status_code);
+            Ok((resp, url, status_code))
         };
 
         // Execute an async future, releasing the Python GIL for concurrency.
         // Use Tokio global runtime to block on the future.
-        let result: Result<(Bytes, IndexMapSSR, IndexMapSSR, u16, String), Error> =
+        let response: Result<(rquest::Response, String, u16)> =
             py.allow_threads(|| RUNTIME.block_on(future));
-        let (f_buf, f_cookies, f_headers, f_status_code, f_url) = result?;
-
+        let result = response?;
+        let resp = http::Response::from(result.0);
+        let url = result.1;
+        let status_code = result.2;
         Ok(Response {
-            content: PyBytes::new(py, &f_buf).unbind(),
-            cookies: f_cookies,
-            encoding: String::new(),
-            headers: f_headers,
-            status_code: f_status_code,
-            url: f_url,
+            resp,
+            _content: None,
+            _encoding: None,
+            url,
+            status_code,
         })
     }
 }