mirror of
https://github.com/servo/servo.git
synced 2025-06-06 16:45:39 +00:00
DevTools: Replace camel case variable names (#32726)
* refactor: rename to snake case * refactor: more renaming * chore: format * chore: clean
This commit is contained in:
eri
GitHub
parent
b243457ccc
commit
2888193cfe
22 changed files with 363 additions and 323 deletions
|
|
@ -24,8 +24,8 @@ struct HttpRequest {
|
|||
method: Method,
|
||||
headers: HeaderMap,
|
||||
body: Option<Vec<u8>>,
|
||||
startedDateTime: SystemTime,
|
||||
timeStamp: i64,
|
||||
started_date_time: SystemTime,
|
||||
time_stamp: i64,
|
||||
connect_time: u64,
|
||||
send_time: u64,
|
||||
}
|
||||
|
|
@ -44,13 +44,15 @@ pub struct NetworkEventActor {
|
|||
}
|
||||
|
||||
#[derive(Serialize)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub struct EventActor {
|
||||
pub actor: String,
|
||||
pub url: String,
|
||||
pub method: String,
|
||||
pub startedDateTime: String,
|
||||
pub timeStamp: i64,
|
||||
pub isXHR: bool,
|
||||
pub started_date_time: String,
|
||||
pub time_stamp: i64,
|
||||
#[serde(rename = "isXHR")]
|
||||
pub is_xhr: bool,
|
||||
pub private: bool,
|
||||
}
|
||||
|
||||
|
|
@ -60,28 +62,31 @@ pub struct ResponseCookiesMsg {
|
|||
}
|
||||
|
||||
#[derive(Serialize)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub struct ResponseStartMsg {
|
||||
pub httpVersion: String,
|
||||
pub remoteAddress: String,
|
||||
pub remotePort: u32,
|
||||
pub http_version: String,
|
||||
pub remote_address: String,
|
||||
pub remote_port: u32,
|
||||
pub status: String,
|
||||
pub statusText: String,
|
||||
pub headersSize: usize,
|
||||
pub discardResponseBody: bool,
|
||||
pub status_text: String,
|
||||
pub headers_size: usize,
|
||||
pub discard_response_body: bool,
|
||||
}
|
||||
|
||||
#[derive(Serialize)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub struct ResponseContentMsg {
|
||||
pub mimeType: String,
|
||||
pub contentSize: u32,
|
||||
pub transferredSize: u32,
|
||||
pub discardResponseBody: bool,
|
||||
pub mime_type: String,
|
||||
pub content_size: u32,
|
||||
pub transferred_size: u32,
|
||||
pub discard_response_body: bool,
|
||||
}
|
||||
|
||||
#[derive(Serialize)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub struct ResponseHeadersMsg {
|
||||
pub headers: usize,
|
||||
pub headersSize: usize,
|
||||
pub headers_size: usize,
|
||||
}
|
||||
|
||||
#[derive(Serialize)]
|
||||
|
|
@ -90,17 +95,19 @@ pub struct RequestCookiesMsg {
|
|||
}
|
||||
|
||||
#[derive(Serialize)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
pub struct RequestHeadersMsg {
|
||||
headers: usize,
|
||||
headersSize: usize,
|
||||
headers_size: usize,
|
||||
}
|
||||
|
||||
#[derive(Serialize)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
struct GetRequestHeadersReply {
|
||||
from: String,
|
||||
headers: Vec<Header>,
|
||||
headerSize: usize,
|
||||
rawHeaders: String,
|
||||
header_size: usize,
|
||||
raw_headers: String,
|
||||
}
|
||||
|
||||
#[derive(Serialize)]
|
||||
|
|
@ -110,25 +117,28 @@ struct Header {
|
|||
}
|
||||
|
||||
#[derive(Serialize)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
struct GetResponseHeadersReply {
|
||||
from: String,
|
||||
headers: Vec<Header>,
|
||||
headerSize: usize,
|
||||
rawHeaders: String,
|
||||
header_size: usize,
|
||||
raw_headers: String,
|
||||
}
|
||||
|
||||
#[derive(Serialize)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
struct GetResponseContentReply {
|
||||
from: String,
|
||||
content: Option<Vec<u8>>,
|
||||
contentDiscarded: bool,
|
||||
content_discarded: bool,
|
||||
}
|
||||
|
||||
#[derive(Serialize)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
struct GetRequestPostDataReply {
|
||||
from: String,
|
||||
postData: Option<Vec<u8>>,
|
||||
postDataDiscarded: bool,
|
||||
post_data: Option<Vec<u8>>,
|
||||
post_data_discarded: bool,
|
||||
}
|
||||
|
||||
#[derive(Serialize)]
|
||||
|
|
@ -154,10 +164,11 @@ struct Timings {
|
|||
}
|
||||
|
||||
#[derive(Serialize)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
struct GetEventTimingsReply {
|
||||
from: String,
|
||||
timings: Timings,
|
||||
totalTime: u64,
|
||||
total_time: u64,
|
||||
}
|
||||
|
||||
#[derive(Serialize)]
|
||||
|
|
@ -166,9 +177,10 @@ struct SecurityInfo {
|
|||
}
|
||||
|
||||
#[derive(Serialize)]
|
||||
#[serde(rename_all = "camelCase")]
|
||||
struct GetSecurityInfoReply {
|
||||
from: String,
|
||||
securityInfo: SecurityInfo,
|
||||
security_info: SecurityInfo,
|
||||
}
|
||||
|
||||
impl Actor for NetworkEventActor {
|
||||
|
|
@ -187,12 +199,12 @@ impl Actor for NetworkEventActor {
|
|||
Ok(match msg_type {
|
||||
"getRequestHeaders" => {
|
||||
let mut headers = Vec::new();
|
||||
let mut rawHeadersString = "".to_owned();
|
||||
let mut headersSize = 0;
|
||||
let mut raw_headers_string = "".to_owned();
|
||||
let mut headers_size = 0;
|
||||
for (name, value) in self.request.headers.iter() {
|
||||
let value = &value.to_str().unwrap().to_string();
|
||||
rawHeadersString = rawHeadersString + name.as_str() + ":" + value + "\r\n";
|
||||
headersSize += name.as_str().len() + value.len();
|
||||
raw_headers_string = raw_headers_string + name.as_str() + ":" + value + "\r\n";
|
||||
headers_size += name.as_str().len() + value.len();
|
||||
headers.push(Header {
|
||||
name: name.as_str().to_owned(),
|
||||
value: value.to_owned(),
|
||||
|
|
@ -201,8 +213,8 @@ impl Actor for NetworkEventActor {
|
|||
let msg = GetRequestHeadersReply {
|
||||
from: self.name(),
|
||||
headers,
|
||||
headerSize: headersSize,
|
||||
rawHeaders: rawHeadersString,
|
||||
header_size: headers_size,
|
||||
raw_headers: raw_headers_string,
|
||||
};
|
||||
let _ = stream.write_json_packet(&msg);
|
||||
ActorMessageStatus::Processed
|
||||
|
|
@ -226,8 +238,8 @@ impl Actor for NetworkEventActor {
|
|||
"getRequestPostData" => {
|
||||
let msg = GetRequestPostDataReply {
|
||||
from: self.name(),
|
||||
postData: self.request.body.clone(),
|
||||
postDataDiscarded: false,
|
||||
post_data: self.request.body.clone(),
|
||||
post_data_discarded: false,
|
||||
};
|
||||
let _ = stream.write_json_packet(&msg);
|
||||
ActorMessageStatus::Processed
|
||||
|
|
@ -235,24 +247,24 @@ impl Actor for NetworkEventActor {
|
|||
"getResponseHeaders" => {
|
||||
if let Some(ref response_headers) = self.response.headers {
|
||||
let mut headers = vec![];
|
||||
let mut rawHeadersString = "".to_owned();
|
||||
let mut headersSize = 0;
|
||||
let mut raw_headers_string = "".to_owned();
|
||||
let mut headers_size = 0;
|
||||
for (name, value) in response_headers.iter() {
|
||||
headers.push(Header {
|
||||
name: name.as_str().to_owned(),
|
||||
value: value.to_str().unwrap().to_owned(),
|
||||
});
|
||||
headersSize += name.as_str().len() + value.len();
|
||||
rawHeadersString.push_str(name.as_str());
|
||||
rawHeadersString.push(':');
|
||||
rawHeadersString.push_str(value.to_str().unwrap());
|
||||
rawHeadersString.push_str("\r\n");
|
||||
headers_size += name.as_str().len() + value.len();
|
||||
raw_headers_string.push_str(name.as_str());
|
||||
raw_headers_string.push(':');
|
||||
raw_headers_string.push_str(value.to_str().unwrap());
|
||||
raw_headers_string.push_str("\r\n");
|
||||
}
|
||||
let msg = GetResponseHeadersReply {
|
||||
from: self.name(),
|
||||
headers,
|
||||
headerSize: headersSize,
|
||||
rawHeaders: rawHeadersString,
|
||||
header_size: headers_size,
|
||||
raw_headers: raw_headers_string,
|
||||
};
|
||||
let _ = stream.write_json_packet(&msg);
|
||||
}
|
||||
|
|
@ -278,14 +290,14 @@ impl Actor for NetworkEventActor {
|
|||
let msg = GetResponseContentReply {
|
||||
from: self.name(),
|
||||
content: self.response.body.clone(),
|
||||
contentDiscarded: self.response.body.is_none(),
|
||||
content_discarded: self.response.body.is_none(),
|
||||
};
|
||||
let _ = stream.write_json_packet(&msg);
|
||||
ActorMessageStatus::Processed
|
||||
},
|
||||
"getEventTimings" => {
|
||||
// TODO: This is a fake timings msg
|
||||
let timingsObj = Timings {
|
||||
let timings_obj = Timings {
|
||||
blocked: 0,
|
||||
dns: 0,
|
||||
connect: self.request.connect_time,
|
||||
|
|
@ -293,12 +305,12 @@ impl Actor for NetworkEventActor {
|
|||
wait: 0,
|
||||
receive: 0,
|
||||
};
|
||||
let total = timingsObj.connect + timingsObj.send;
|
||||
let total = timings_obj.connect + timings_obj.send;
|
||||
// TODO: Send the correct values for all these fields.
|
||||
let msg = GetEventTimingsReply {
|
||||
from: self.name(),
|
||||
timings: timingsObj,
|
||||
totalTime: total,
|
||||
timings: timings_obj,
|
||||
total_time: total,
|
||||
};
|
||||
let _ = stream.write_json_packet(&msg);
|
||||
ActorMessageStatus::Processed
|
||||
|
|
@ -307,7 +319,7 @@ impl Actor for NetworkEventActor {
|
|||
// TODO: Send the correct values for securityInfo.
|
||||
let msg = GetSecurityInfoReply {
|
||||
from: self.name(),
|
||||
securityInfo: SecurityInfo {
|
||||
security_info: SecurityInfo {
|
||||
state: "insecure".to_owned(),
|
||||
},
|
||||
};
|
||||
|
|
@ -328,8 +340,8 @@ impl NetworkEventActor {
|
|||
method: Method::GET,
|
||||
headers: HeaderMap::new(),
|
||||
body: None,
|
||||
startedDateTime: SystemTime::now(),
|
||||
timeStamp: SystemTime::now()
|
||||
started_date_time: SystemTime::now(),
|
||||
time_stamp: SystemTime::now()
|
||||
.duration_since(UNIX_EPOCH)
|
||||
.unwrap_or_default()
|
||||
.as_secs() as i64,
|
||||
|
|
@ -351,8 +363,8 @@ impl NetworkEventActor {
|
|||
self.request.method = request.method.clone();
|
||||
self.request.headers = request.headers.clone();
|
||||
self.request.body = request.body;
|
||||
self.request.startedDateTime = request.startedDateTime;
|
||||
self.request.timeStamp = request.timeStamp;
|
||||
self.request.started_date_time = request.started_date_time;
|
||||
self.request.time_stamp = request.time_stamp;
|
||||
self.request.connect_time = request.connect_time;
|
||||
self.request.send_time = request.send_time;
|
||||
self.is_xhr = request.is_xhr;
|
||||
|
|
@ -372,31 +384,31 @@ impl NetworkEventActor {
|
|||
|
||||
let started_datetime_rfc3339 = match Local.timestamp_millis_opt(
|
||||
self.request
|
||||
.startedDateTime
|
||||
.started_date_time
|
||||
.duration_since(UNIX_EPOCH)
|
||||
.unwrap_or_default()
|
||||
.as_millis() as i64,
|
||||
) {
|
||||
LocalResult::None => "".to_owned(),
|
||||
LocalResult::Single(dateTime) => dateTime.to_rfc3339().to_string(),
|
||||
LocalResult::Ambiguous(dateTime, _) => dateTime.to_rfc3339().to_string(),
|
||||
LocalResult::Single(date_time) => date_time.to_rfc3339().to_string(),
|
||||
LocalResult::Ambiguous(date_time, _) => date_time.to_rfc3339().to_string(),
|
||||
};
|
||||
|
||||
EventActor {
|
||||
actor: self.name(),
|
||||
url: self.request.url.clone(),
|
||||
method: format!("{}", self.request.method),
|
||||
startedDateTime: started_datetime_rfc3339,
|
||||
timeStamp: self.request.timeStamp,
|
||||
isXHR: self.is_xhr,
|
||||
started_date_time: started_datetime_rfc3339,
|
||||
time_stamp: self.request.time_stamp,
|
||||
is_xhr: self.is_xhr,
|
||||
private: false,
|
||||
}
|
||||
}
|
||||
|
||||
pub fn response_start(&self) -> ResponseStartMsg {
|
||||
// TODO: Send the correct values for all these fields.
|
||||
let hSizeOption = self.response.headers.as_ref().map(|headers| headers.len());
|
||||
let hSize = hSizeOption.unwrap_or(0);
|
||||
let h_size_option = self.response.headers.as_ref().map(|headers| headers.len());
|
||||
let h_size = h_size_option.unwrap_or(0);
|
||||
let (status_code, status_message) = self
|
||||
.response
|
||||
.status
|
||||
|
|
@ -406,30 +418,30 @@ impl NetworkEventActor {
|
|||
});
|
||||
// TODO: Send the correct values for remoteAddress and remotePort and http_version.
|
||||
ResponseStartMsg {
|
||||
httpVersion: "HTTP/1.1".to_owned(),
|
||||
remoteAddress: "63.245.217.43".to_owned(),
|
||||
remotePort: 443,
|
||||
http_version: "HTTP/1.1".to_owned(),
|
||||
remote_address: "63.245.217.43".to_owned(),
|
||||
remote_port: 443,
|
||||
status: status_code.to_string(),
|
||||
statusText: status_message,
|
||||
headersSize: hSize,
|
||||
discardResponseBody: false,
|
||||
status_text: status_message,
|
||||
headers_size: h_size,
|
||||
discard_response_body: false,
|
||||
}
|
||||
}
|
||||
|
||||
pub fn response_content(&self) -> ResponseContentMsg {
|
||||
let mut mString = "".to_owned();
|
||||
let mut m_string = "".to_owned();
|
||||
if let Some(ref headers) = self.response.headers {
|
||||
mString = match headers.typed_get::<ContentType>() {
|
||||
m_string = match headers.typed_get::<ContentType>() {
|
||||
Some(ct) => ct.to_string(),
|
||||
_ => "".to_owned(),
|
||||
};
|
||||
}
|
||||
// TODO: Set correct values when response's body is sent to the devtools in http_loader.
|
||||
ResponseContentMsg {
|
||||
mimeType: mString,
|
||||
contentSize: 0,
|
||||
transferredSize: 0,
|
||||
discardResponseBody: true,
|
||||
mime_type: m_string,
|
||||
content_size: 0,
|
||||
transferred_size: 0,
|
||||
discard_response_body: true,
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -457,7 +469,7 @@ impl NetworkEventActor {
|
|||
}
|
||||
ResponseHeadersMsg {
|
||||
headers: headers_size,
|
||||
headersSize: headers_byte_count,
|
||||
headers_size: headers_byte_count,
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -467,7 +479,7 @@ impl NetworkEventActor {
|
|||
});
|
||||
RequestHeadersMsg {
|
||||
headers: self.request.headers.len(),
|
||||
headersSize: size,
|
||||
headers_size: size,
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue