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

Make the net monitor panel in FF's devtools show meaningful output.

Browse source 
0) Advertise support for the network monitor in the initial protocol communication.
1) Only notify the developer tools server about the final request in an HTTP transaction.
2) Add timing information for connecting to the HTTP server and sending the HTTP request.
3) Reduce duplication between various networkEventUpdate structures by creating a helper function
that merges two JSON structures together. This also corrects the JSON structure so the devtools
client interprets the output correctly.
4) Calculate various header size fields correctly.
5) Remove unnecessary usize->u32 casts by making the appropriate fields usize.
6) Add header values to request and response header messages.
7) Support triggering page reloads via the devtools client.
This commit is contained in:
Josh Matthews 2016-06-03 13:39:38 -04:00
parent 1f5b0008ac
commit 7bf2e19437
11 changed files with 252 additions and 155 deletions
Download patch file Download diff file Expand all files Collapse all files

126
components/devtools/lib.rs
View file

@ -35,8 +35,7 @@ use actor::{Actor, ActorRegistry};
use actors::console::ConsoleActor;
use actors::framerate::FramerateActor;
use actors::inspector::InspectorActor;
use actors::network_event::{EventActor, NetworkEventActor, RequestCookiesMsg, ResponseCookiesMsg };
use actors::network_event::{ResponseContentMsg, ResponseHeadersMsg, ResponseStartMsg };
use actors::network_event::{EventActor, NetworkEventActor, ResponseStartMsg};
use actors::performance::PerformanceActor;
use actors::profiler::ProfilerActor;
use actors::root::RootActor;
@ -105,6 +104,24 @@ struct NetworkEventMsg {
eventActor: EventActor,
}
#[derive(Serialize)]
struct NetworkEventUpdateMsg {
from: String,
#[serde(rename = "type")]
type_: String,
updateType: String,
}
#[derive(Serialize)]
struct EventTimingsUpdateMsg {
totalTime: u64,
}
#[derive(Serialize)]
struct SecurityInfoUpdateMsg {
state: String,
}
#[derive(Serialize)]
struct ResponseStartUpdateMsg {
from: String,
@ -114,60 +131,6 @@ struct ResponseStartUpdateMsg {
response: ResponseStartMsg,
}
#[derive(Serialize)]
struct ResponseContentUpdateMsg {
from: String,
#[serde(rename = "type")]
type_: String,
updateType: String,
responseContent: ResponseContentMsg,
}
#[derive(Serialize)]
struct ResponseCookiesUpdateMsg {
from: String,
#[serde(rename = "type")]
type_: String,
updateType: String,
responseCookies: ResponseCookiesMsg,
}
#[derive(Serialize)]
struct ResponseHeadersUpdateMsg {
from: String,
#[serde(rename = "type")]
type_: String,
updateType: String,
responseHeaders: ResponseHeadersMsg,
}
#[derive(Serialize)]
struct RequestCookiesUpdateMsg {
from: String,
#[serde(rename = "type")]
type_: String,
updateType: String,
requestcookies: RequestCookiesMsg,
}
#[derive(Serialize)]
struct EventTimingsUpdateMsg {
from: String,
#[serde(rename = "type")]
type_: String,
updateType: String,
totalTime: u32,
}
#[derive(Serialize)]
struct SecurityInfoUpdateMsg {
from: String,
#[serde(rename = "type")]
type_: String,
updateType: String,
securityState: String,
}
/// Spin up a devtools server that listens for connections on the specified port.
pub fn start_server(port: u16) -> Sender<DevtoolsControlMsg> {
let (sender, receiver) = channel();
@ -416,14 +379,22 @@ fn run_server(sender: Sender<DevtoolsControlMsg>,
//Store the response information in the actor
actor.add_response(httpresponse);
let msg7 = RequestCookiesUpdateMsg {
let msg = NetworkEventUpdateMsg {
from: netevent_actor_name.clone(),
type_: "networkEventUpdate".to_owned(),
updateType: "requestHeaders".to_owned(),
};
for stream in &mut connections {
stream.write_merged_json_packet(&msg, &actor.request_headers());
}
let msg = NetworkEventUpdateMsg {
from: netevent_actor_name.clone(),
type_: "networkEventUpdate".to_owned(),
updateType: "requestCookies".to_owned(),
requestcookies: actor.request_cookies(),
};
for stream in &mut connections {
stream.write_json_packet(&msg7);
stream.write_merged_json_packet(&msg, &actor.request_cookies());
}
//Send a networkEventUpdate (responseStart) to the client
@ -437,61 +408,56 @@ fn run_server(sender: Sender<DevtoolsControlMsg>,
for stream in &mut connections {
stream.write_json_packet(&msg);
}
let msg2 = EventTimingsUpdateMsg {
let msg = NetworkEventUpdateMsg {
from: netevent_actor_name.clone(),
type_: "networkEventUpdate".to_owned(),
updateType: "eventTimings".to_owned(),
totalTime: 0
};
let extra = EventTimingsUpdateMsg {
totalTime: actor.total_time(),
};
for stream in &mut connections {
stream.write_json_packet(&msg2);
stream.write_merged_json_packet(&msg, &extra);
}
let msg3 = SecurityInfoUpdateMsg {
let msg = NetworkEventUpdateMsg {
from: netevent_actor_name.clone(),
type_: "networkEventUpdate".to_owned(),
updateType: "securityInfo".to_owned(),
securityState: "".to_owned(),
};
let extra = SecurityInfoUpdateMsg {
state: "insecure".to_owned(),
};
for stream in &mut connections {
stream.write_json_packet(&msg3);
stream.write_merged_json_packet(&msg, &extra);
}
let msg4 = ResponseContentUpdateMsg {
let msg = NetworkEventUpdateMsg {
from: netevent_actor_name.clone(),
type_: "networkEventUpdate".to_owned(),
updateType: "responseContent".to_owned(),
responseContent: actor.response_content(),
};
for stream in &mut connections {
stream.write_json_packet(&msg4);
stream.write_merged_json_packet(&msg, &actor.response_content());
}
let msg5 = ResponseCookiesUpdateMsg {
let msg = NetworkEventUpdateMsg {
from: netevent_actor_name.clone(),
type_: "networkEventUpdate".to_owned(),
updateType: "responseCookies".to_owned(),
responseCookies: actor.response_cookies(),
};
for stream in &mut connections {
stream.write_json_packet(&msg5);
stream.write_merged_json_packet(&msg, &actor.response_cookies());
}
let msg6 = ResponseHeadersUpdateMsg {
let msg = NetworkEventUpdateMsg {
from: netevent_actor_name.clone(),
type_: "networkEventUpdate".to_owned(),
updateType: "responseHeaders".to_owned(),
responseHeaders: actor.response_headers(),
};
for stream in &mut connections {
stream.write_json_packet(&msg6);
stream.write_merged_json_packet(&msg, &actor.response_headers());
}
}
}
}