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

Fixes #6879

Browse source
This commit is contained in:
Harrison G 2015-08-05 10:49:25 -04:00
parent debd7d87d6
commit 8943f11e54
2 changed files with 27 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
components/devtools/lib.rs
View file

@ -172,8 +172,8 @@ fn run_server(sender: Sender<DevtoolsControlMsg>,
println!("error: EOF"); println!("error: EOF");
break 'outer break 'outer
} }
Err(e) => { Err(err_msg) => {
println!("error: {}", e.description()); println!("error: {}", err_msg);
break 'outer break 'outer
} }
} }

35
components/devtools/protocol.rs
View file

@ -8,12 +8,14 @@
use rustc_serialize::{json, Encodable}; use rustc_serialize::{json, Encodable};
use rustc_serialize::json::Json; use rustc_serialize::json::Json;
use std::io::{self, Read, Write}; use rustc_serialize::json::ParserError::{IoError, SyntaxError};
use std::error::Error;
use std::io::{Read, Write};
use std::net::TcpStream; use std::net::TcpStream;
pub trait JsonPacketStream { pub trait JsonPacketStream {
fn write_json_packet<'a, T: Encodable>(&mut self, obj: &T); fn write_json_packet<'a, T: Encodable>(&mut self, obj: &T);
fn read_json_packet(&mut self) -> io::Result<Option<Json>>; fn read_json_packet(&mut self) -> Result<Option<Json>, String>;
} }
impl JsonPacketStream for TcpStream { impl JsonPacketStream for TcpStream {
@ -25,25 +27,38 @@ impl JsonPacketStream for TcpStream {
self.write_all(s.as_bytes()).unwrap(); self.write_all(s.as_bytes()).unwrap();
} }
fn read_json_packet<'a>(&mut self) -> io::Result<Option<Json>> { fn read_json_packet<'a>(&mut self) -> Result<Option<Json>, String> {
// https://wiki.mozilla.org/Remote_Debugging_Protocol_Stream_Transport // https://wiki.mozilla.org/Remote_Debugging_Protocol_Stream_Transport
// In short, each JSON packet is [ascii length]:[JSON data of given length] // In short, each JSON packet is [ascii length]:[JSON data of given length]
let mut buffer = vec!(); let mut buffer = vec!();
loop { loop {
let mut buf = [0]; let mut buf = [0];
let byte = match try!(self.read(&mut buf)) { let byte = match self.read(&mut buf) {
0 => return Ok(None), // EOF Ok(0) => return Ok(None), // EOF
1 => buf[0], Ok(1) => buf[0],
_ => unreachable!(), Ok(_) => unreachable!(),
Err(e) => return Err(e.description().to_string()),
}; };
match byte { match byte {
b':' => { b':' => {
let packet_len_str = String::from_utf8(buffer).unwrap(); let packet_len_str = match String::from_utf8(buffer) {
let packet_len = u64::from_str_radix(&packet_len_str, 10).unwrap(); Ok(packet_len) => packet_len,
Err(_) => return Err("nonvalid UTF8 in packet length".to_string()),
};
let packet_len = match u64::from_str_radix(&packet_len_str, 10) {
Ok(packet_len) => packet_len,
Err(_) => return Err("packet length missing / not parsable".to_string()),
};
let mut packet = String::new(); let mut packet = String::new();
self.take(packet_len).read_to_string(&mut packet).unwrap(); self.take(packet_len).read_to_string(&mut packet).unwrap();
println!("{}", packet); println!("{}", packet);
return Ok(Some(Json::from_str(&packet).unwrap())) return match Json::from_str(&packet) {
Ok(json) => Ok(Some(json)),
Err(err) => match err {
IoError(ioerr) => return Err(ioerr.description().to_string()),
SyntaxError(_, l, c) => return Err(format!("syntax at {}:{}", l, c)),
},
};
}, },
c => buffer.push(c), c => buffer.push(c),
} }