diff options
Diffstat (limited to 'components/devtools')
| -rw-r--r-- | components/devtools/actors/console.rs | 96 | ||||
| -rw-r--r-- | components/devtools/lib.rs | 57 |
2 files changed, 110 insertions, 43 deletions
diff --git a/components/devtools/actors/console.rs b/components/devtools/actors/console.rs index a4d8f0b1591..c50d1a7b40c 100644 --- a/components/devtools/actors/console.rs +++ b/components/devtools/actors/console.rs @@ -10,15 +10,19 @@ use crate::actor::{Actor, ActorMessageStatus, ActorRegistry}; use crate::actors::object::ObjectActor; use crate::protocol::JsonPacketStream; +use crate::{ConsoleAPICall, ConsoleMessage, ConsoleMsg, PageErrorMsg}; use devtools_traits::CachedConsoleMessage; use devtools_traits::EvaluateJSReply::{ActorValue, BooleanValue, StringValue}; use devtools_traits::EvaluateJSReply::{NullValue, NumberValue, VoidValue}; -use devtools_traits::{CachedConsoleMessageTypes, DevtoolScriptControlMsg}; +use devtools_traits::{ + CachedConsoleMessageTypes, ConsoleAPI, DevtoolScriptControlMsg, LogLevel, PageError, +}; use ipc_channel::ipc::{self, IpcSender}; use msg::constellation_msg::PipelineId; use serde_json::{self, Map, Number, Value}; use std::cell::RefCell; use std::net::TcpStream; +use time::precise_time_ns; use uuid::Uuid; trait EncodableConsoleMessage { @@ -107,6 +111,7 @@ pub struct ConsoleActor { pub pipeline: PipelineId, pub script_chan: IpcSender<DevtoolScriptControlMsg>, pub streams: RefCell<Vec<TcpStream>>, + pub cached_events: RefCell<Vec<CachedConsoleMessage>>, } impl ConsoleActor { @@ -187,6 +192,58 @@ impl ConsoleActor { }; std::result::Result::Ok(reply) } + + pub(crate) fn handle_page_error(&self, page_error: PageError) { + self.cached_events + .borrow_mut() + .push(CachedConsoleMessage::PageError(page_error.clone())); + let msg = PageErrorMsg { + from: self.name(), + type_: "pageError".to_owned(), + pageError: page_error, + }; + for stream in &mut *self.streams.borrow_mut() { + stream.write_json_packet(&msg); + } + } + + pub(crate) fn handle_console_api(&self, console_message: ConsoleMessage) { + let level = match console_message.logLevel { + LogLevel::Debug => "debug", + LogLevel::Info => "info", + LogLevel::Warn => "warn", + LogLevel::Error => "error", + _ => "log", + } + .to_owned(); + self.cached_events + .borrow_mut() + .push(CachedConsoleMessage::ConsoleAPI(ConsoleAPI { + type_: "ConsoleAPI".to_owned(), + level: level.clone(), + filename: console_message.filename.clone(), + lineNumber: console_message.lineNumber as u32, + functionName: "".to_string(), //TODO + timeStamp: precise_time_ns(), + private: false, + arguments: vec![console_message.message.clone()], + })); + let msg = ConsoleAPICall { + from: self.name(), + type_: "consoleAPICall".to_owned(), + message: ConsoleMsg { + level: level, + timeStamp: precise_time_ns(), + arguments: vec![console_message.message], + filename: console_message.filename, + lineNumber: console_message.lineNumber, + columnNumber: console_message.columnNumber, + }, + }; + for stream in &mut *self.streams.borrow_mut() { + stream.write_json_packet(&msg); + } + } } impl Actor for ConsoleActor { @@ -220,24 +277,27 @@ impl Actor for ConsoleActor { s => debug!("unrecognized message type requested: \"{}\"", s), }; } - let (chan, port) = ipc::channel().unwrap(); - self.script_chan - .send(DevtoolScriptControlMsg::GetCachedMessages( - self.pipeline, - message_types, - chan, - )) - .unwrap(); - let messages = port - .recv() - .map_err(|_| ())? - .into_iter() - .map(|message| { - let json_string = message.encode().unwrap(); + let mut messages = vec![]; + for event in self.cached_events.borrow().iter() { + let include = match event { + CachedConsoleMessage::PageError(_) + if message_types.contains(CachedConsoleMessageTypes::PAGE_ERROR) => + { + true + }, + CachedConsoleMessage::ConsoleAPI(_) + if message_types.contains(CachedConsoleMessageTypes::CONSOLE_API) => + { + true + }, + _ => false, + }; + if include { + let json_string = event.encode().unwrap(); let json = serde_json::from_str::<Value>(&json_string).unwrap(); - json.as_object().unwrap().to_owned() - }) - .collect(); + messages.push(json.as_object().unwrap().to_owned()) + } + } let msg = GetCachedMessagesReply { from: self.name(), diff --git a/components/devtools/lib.rs b/components/devtools/lib.rs index f0a4e9facc8..63e4c7aea15 100644 --- a/components/devtools/lib.rs +++ b/components/devtools/lib.rs @@ -36,7 +36,7 @@ use crate::protocol::JsonPacketStream; use crossbeam_channel::{unbounded, Receiver, Sender}; use devtools_traits::{ChromeToDevtoolsControlMsg, ConsoleMessage, DevtoolsControlMsg}; use devtools_traits::{DevtoolScriptControlMsg, DevtoolsPageInfo, LogLevel, NetworkEvent}; -use devtools_traits::{ScriptToDevtoolsControlMsg, WorkerId}; +use devtools_traits::{PageError, ScriptToDevtoolsControlMsg, WorkerId}; use ipc_channel::ipc::IpcSender; use msg::constellation_msg::PipelineId; use std::borrow::ToOwned; @@ -46,7 +46,6 @@ use std::collections::HashMap; use std::net::{Shutdown, TcpListener, TcpStream}; use std::sync::{Arc, Mutex}; use std::thread; -use time::precise_time_ns; mod actor; /// Corresponds to http://mxr.mozilla.org/mozilla-central/source/toolkit/devtools/server/actors/ @@ -89,6 +88,14 @@ struct ConsoleMsg { } #[derive(Serialize)] +struct PageErrorMsg { + from: String, + #[serde(rename = "type")] + type_: String, + pageError: PageError, +} + +#[derive(Serialize)] struct NetworkEventMsg { from: String, #[serde(rename = "type")] @@ -141,7 +148,7 @@ fn run_server( receiver: Receiver<DevtoolsControlMsg>, port: u16, ) { - let listener = TcpListener::bind(&("127.0.0.1", port)).unwrap(); + let listener = TcpListener::bind(&("0.0.0.0", port)).unwrap(); let mut registry = ActorRegistry::new(); @@ -241,6 +248,7 @@ fn run_server( script_chan: script_sender.clone(), pipeline: pipeline, streams: RefCell::new(Vec::new()), + cached_events: RefCell::new(Vec::new()), }; let emulation = EmulationActor::new(actors.new_name("emulation")); @@ -317,6 +325,22 @@ fn run_server( actors.register(Box::new(thread)); } + fn handle_page_error( + actors: Arc<Mutex<ActorRegistry>>, + id: PipelineId, + page_error: PageError, + actor_pipelines: &HashMap<PipelineId, String>, + ) { + let console_actor_name = + match find_console_actor(actors.clone(), id, None, &HashMap::new(), actor_pipelines) { + Some(name) => name, + None => return, + }; + let actors = actors.lock().unwrap(); + let console_actor = actors.find::<ConsoleActor>(&console_actor_name); + console_actor.handle_page_error(page_error); + } + fn handle_console_message( actors: Arc<Mutex<ActorRegistry>>, id: PipelineId, @@ -337,28 +361,7 @@ fn run_server( }; let actors = actors.lock().unwrap(); let console_actor = actors.find::<ConsoleActor>(&console_actor_name); - let msg = ConsoleAPICall { - from: console_actor.name.clone(), - type_: "consoleAPICall".to_owned(), - message: ConsoleMsg { - level: match console_message.logLevel { - LogLevel::Debug => "debug", - LogLevel::Info => "info", - LogLevel::Warn => "warn", - LogLevel::Error => "error", - _ => "log", - } - .to_owned(), - timeStamp: precise_time_ns(), - arguments: vec![console_message.message], - filename: console_message.filename, - lineNumber: console_message.lineNumber, - columnNumber: console_message.columnNumber, - }, - }; - for stream in &mut *console_actor.streams.borrow_mut() { - stream.write_json_packet(&msg); - } + console_actor.handle_console_api(console_message); } fn find_console_actor( @@ -586,6 +589,10 @@ fn run_server( &actor_pipelines, &actor_workers, ), + DevtoolsControlMsg::FromScript(ScriptToDevtoolsControlMsg::ReportPageError( + id, + page_error, + )) => handle_page_error(actors.clone(), id, page_error, &actor_pipelines), DevtoolsControlMsg::FromScript(ScriptToDevtoolsControlMsg::ReportCSSError( id, css_error, |