mirror of
https://github.com/servo/servo.git
synced 2025-06-28 11:03:39 +01:00
We currently store the source contents in both the SourceActor and the ThreadActor’s SourceManager, which is redundant. We also currently send the source contents in thread `sources` responses and watcher `resources-available-array` messages, but in both cases this is unnecessary (and ignored by the client). This patch merges SourceData into SourceActor, making the latter the single source of truth for source-related state. We also create a SourceForm type, which represents the subset of source-related state that gets sent in thread `sources` responses (and for now, watcher `resources-available-array` messages). Finally we rename `source_urls` → `source_actor_names` and `new_source` → `new_registered` for clarity. Testing: no changes to client-facing behaviour, and this is covered by tests Signed-off-by: Delan Azabani <dazabani@igalia.com> Co-authored-by: atbrakhi <atbrakhi@igalia.com>
149 lines
4.1 KiB
Rust
149 lines
4.1 KiB
Rust
/* This Source Code Form is subject to the terms of the Mozilla Public
|
||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */
|
||
|
||
use std::cell::RefCell;
|
||
use std::collections::BTreeSet;
|
||
use std::net::TcpStream;
|
||
|
||
use serde::Serialize;
|
||
use serde_json::{Map, Value};
|
||
use servo_url::ServoUrl;
|
||
|
||
use crate::StreamId;
|
||
use crate::actor::{Actor, ActorMessageStatus, ActorRegistry};
|
||
use crate::protocol::JsonPacketStream;
|
||
|
||
/// A `sourceForm` as used in responses to thread `sources` requests.
|
||
///
|
||
/// For now, we also use this for sources in watcher `resource-available-array` messages,
|
||
/// but in Firefox those have extra fields.
|
||
///
|
||
/// <https://firefox-source-docs.mozilla.org/devtools/backend/protocol.html#loading-script-sources>
|
||
#[derive(Clone, Debug, Eq, Ord, PartialEq, PartialOrd, Serialize)]
|
||
#[serde(rename_all = "camelCase")]
|
||
pub(crate) struct SourceForm {
|
||
pub actor: String,
|
||
/// URL of the script, or URL of the page for inline scripts.
|
||
pub url: String,
|
||
pub is_black_boxed: bool,
|
||
}
|
||
|
||
#[derive(Serialize)]
|
||
pub(crate) struct SourcesReply {
|
||
pub from: String,
|
||
pub sources: Vec<SourceForm>,
|
||
}
|
||
|
||
pub(crate) struct SourceManager {
|
||
source_actor_names: RefCell<BTreeSet<String>>,
|
||
}
|
||
|
||
#[derive(Clone, Debug)]
|
||
pub struct SourceActor {
|
||
/// Actor name.
|
||
pub name: String,
|
||
|
||
/// URL of the script, or URL of the page for inline scripts.
|
||
pub url: ServoUrl,
|
||
|
||
/// The ‘black-boxed’ flag, which tells the debugger to avoid pausing inside this script.
|
||
/// <https://firefox-source-docs.mozilla.org/devtools/backend/protocol.html#black-boxing-sources>
|
||
pub is_black_boxed: bool,
|
||
|
||
pub content: String,
|
||
pub content_type: String,
|
||
}
|
||
|
||
#[derive(Serialize)]
|
||
struct SourceContentReply {
|
||
from: String,
|
||
#[serde(rename = "contentType")]
|
||
content_type: String,
|
||
source: String,
|
||
}
|
||
|
||
impl SourceManager {
|
||
pub fn new() -> Self {
|
||
Self {
|
||
source_actor_names: RefCell::new(BTreeSet::default()),
|
||
}
|
||
}
|
||
|
||
pub fn add_source(&self, actor_name: &str) {
|
||
self.source_actor_names
|
||
.borrow_mut()
|
||
.insert(actor_name.to_owned());
|
||
}
|
||
|
||
pub fn source_forms(&self, actors: &ActorRegistry) -> Vec<SourceForm> {
|
||
self.source_actor_names
|
||
.borrow()
|
||
.iter()
|
||
.map(|actor_name| actors.find::<SourceActor>(actor_name).source_form())
|
||
.collect()
|
||
}
|
||
}
|
||
|
||
impl SourceActor {
|
||
pub fn new(name: String, url: ServoUrl, content: String, content_type: String) -> SourceActor {
|
||
SourceActor {
|
||
name,
|
||
url,
|
||
content,
|
||
content_type,
|
||
is_black_boxed: false,
|
||
}
|
||
}
|
||
|
||
pub fn new_registered(
|
||
actors: &mut ActorRegistry,
|
||
url: ServoUrl,
|
||
content: String,
|
||
content_type: String,
|
||
) -> &SourceActor {
|
||
let source_actor_name = actors.new_name("source");
|
||
|
||
let source_actor = SourceActor::new(source_actor_name.clone(), url, content, content_type);
|
||
actors.register(Box::new(source_actor));
|
||
|
||
actors.find(&source_actor_name)
|
||
}
|
||
|
||
pub fn source_form(&self) -> SourceForm {
|
||
SourceForm {
|
||
actor: self.name.clone(),
|
||
url: self.url.to_string(),
|
||
is_black_boxed: self.is_black_boxed,
|
||
}
|
||
}
|
||
}
|
||
|
||
impl Actor for SourceActor {
|
||
fn name(&self) -> String {
|
||
self.name.clone()
|
||
}
|
||
|
||
fn handle_message(
|
||
&self,
|
||
_registry: &ActorRegistry,
|
||
msg_type: &str,
|
||
_msg: &Map<String, Value>,
|
||
stream: &mut TcpStream,
|
||
_id: StreamId,
|
||
) -> Result<ActorMessageStatus, ()> {
|
||
Ok(match msg_type {
|
||
// Client has requested contents of the source.
|
||
"source" => {
|
||
let reply = SourceContentReply {
|
||
from: self.name(),
|
||
content_type: self.content_type.clone(),
|
||
source: self.content.clone(),
|
||
};
|
||
let _ = stream.write_json_packet(&reply);
|
||
ActorMessageStatus::Processed
|
||
},
|
||
_ => ActorMessageStatus::Ignored,
|
||
})
|
||
}
|
||
}
|