Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 05:30:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

Calculate and send the missing transferred_size and content_size to dev tools (#38216)

Browse source 
The current behaviour in dev tools network monitor is missing data for
the `Transferred` size and `Content` size.
We currently have a fn `response_content` that constructs the
`ResponseContentMsg` struct where the two missing data fields are
defined and set to zero values.
These current changes calculates the data in the `response_content` fn
and sends a `NetworkEvent::HttpResponse` to the client when the final
body is done.
Currently, we have data appearing in the `Transferred` column of the
network panel
fixes: https://github.com/servo/servo/issues/38126

---------

Signed-off-by: uthmaniv <uthmanyahayababa@gmail.com>
This commit is contained in:
Usman Yahaya Baba 2025-08-02 11:41:53 +09:00 • committed by GitHub
parent 52b04c9fd3
commit a27715a5a8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 98 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

62
components/net/http_loader.rs
View file

@ -433,27 +433,48 @@ pub fn send_request_to_devtools(
.unwrap();
}
pub fn send_response_to_devtools(request: &Request, context: &FetchContext, response: &Response) {
pub fn send_response_to_devtools(
request: &Request,
context: &FetchContext,
response: &Response,
body_data: Option<Vec<u8>>,
) {
let meta = match response.metadata() {
Ok(FetchMetadata::Unfiltered(m)) => m,
Ok(FetchMetadata::Filtered { unsafe_, .. }) => unsafe_,
Err(_) => {
log::warn!("No metadata available, skipping devtools response.");
return;
},
};
send_response_values_to_devtools(
meta.headers.map(Serde::into_inner),
meta.status,
body_data,
request,
context.devtools_chan.clone(),
);
}
#[allow(clippy::too_many_arguments)]
pub fn send_response_values_to_devtools(
headers: Option<HeaderMap>,
status: HttpStatus,
body: Option<Vec<u8>>,
request: &Request,
devtools_chan: Option<StdArc<Mutex<Sender<DevtoolsControlMsg>>>>,
) {
if let (Some(devtools_chan), Some(pipeline_id), Some(webview_id)) = (
context.devtools_chan.as_ref(),
devtools_chan,
request.pipeline_id,
request.target_webview_id,
) {
let browsing_context_id = webview_id.0;
let meta = match response
.metadata()
.expect("Response metadata should exist at this stage")
{
FetchMetadata::Unfiltered(m) => m,
FetchMetadata::Filtered { unsafe_, .. } => unsafe_,
};
let status = meta.status;
let headers = meta.headers.map(Serde::into_inner);
let devtoolsresponse = DevtoolsHttpResponse {
headers,
status,
body: None,
body,
pipeline_id,
browsing_context_id,
};
@ -935,8 +956,6 @@ pub async fn http_fetch(
.try_code()
.is_some_and(is_redirect_status)
{
// Notify devtools before handling redirect
send_response_to_devtools(request, context, &response);
// Substep 1.
if response.actual_response().status != StatusCode::SEE_OTHER {
// TODO: send RST_STREAM frame
@ -2063,9 +2082,14 @@ async fn http_network_fetch(
let done_sender3 = done_sender.clone();
let timing_ptr2 = context.timing.clone();
let timing_ptr3 = context.timing.clone();
let url1 = request.url();
let devtools_request = request.clone();
let url1 = devtools_request.url();
let url2 = url1.clone();
let status = response.status.clone();
let headers = response.headers.clone();
let devtools_chan = context.devtools_chan.clone();
HANDLE.spawn(
res.into_body()
.map_err(|e| {
@ -2091,7 +2115,15 @@ async fn http_network_fetch(
ResponseBody::Receiving(ref mut body) => std::mem::take(body),
_ => vec![],
};
let devtools_response_body = completed_body.clone();
*body = ResponseBody::Done(completed_body);
send_response_values_to_devtools(
Some(headers),
status,
Some(devtools_response_body),
&devtools_request,
devtools_chan,
);
timing_ptr2
.lock()
.unwrap()