mirror of
https://github.com/servo/servo.git
synced 2025-07-13 02:13:40 +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>
137 lines
3.9 KiB
Rust
137 lines
3.9 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::net::TcpStream;
|
|
|
|
use serde::Serialize;
|
|
use serde_json::{Map, Value};
|
|
|
|
use super::source::{SourceManager, SourcesReply};
|
|
use crate::actor::{Actor, ActorMessageStatus, ActorRegistry};
|
|
use crate::protocol::JsonPacketStream;
|
|
use crate::{EmptyReplyMsg, StreamId};
|
|
|
|
#[derive(Serialize)]
|
|
#[serde(rename_all = "camelCase")]
|
|
struct ThreadAttached {
|
|
from: String,
|
|
#[serde(rename = "type")]
|
|
type_: String,
|
|
actor: String,
|
|
frame: u32,
|
|
error: u32,
|
|
recording_endpoint: u32,
|
|
execution_point: u32,
|
|
popped_frames: Vec<PoppedFrameMsg>,
|
|
why: WhyMsg,
|
|
}
|
|
|
|
#[derive(Serialize)]
|
|
enum PoppedFrameMsg {}
|
|
|
|
#[derive(Serialize)]
|
|
struct WhyMsg {
|
|
#[serde(rename = "type")]
|
|
type_: String,
|
|
}
|
|
|
|
#[derive(Serialize)]
|
|
struct ThreadResumedReply {
|
|
from: String,
|
|
#[serde(rename = "type")]
|
|
type_: String,
|
|
}
|
|
|
|
#[derive(Serialize)]
|
|
struct ThreadInterruptedReply {
|
|
from: String,
|
|
#[serde(rename = "type")]
|
|
type_: String,
|
|
}
|
|
|
|
pub struct ThreadActor {
|
|
pub name: String,
|
|
pub source_manager: SourceManager,
|
|
}
|
|
|
|
impl ThreadActor {
|
|
pub fn new(name: String) -> ThreadActor {
|
|
ThreadActor {
|
|
name: name.clone(),
|
|
source_manager: SourceManager::new(),
|
|
}
|
|
}
|
|
}
|
|
|
|
impl Actor for ThreadActor {
|
|
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 {
|
|
"attach" => {
|
|
let msg = ThreadAttached {
|
|
from: self.name(),
|
|
type_: "paused".to_owned(),
|
|
actor: registry.new_name("pause"),
|
|
frame: 0,
|
|
error: 0,
|
|
recording_endpoint: 0,
|
|
execution_point: 0,
|
|
popped_frames: vec![],
|
|
why: WhyMsg {
|
|
type_: "attached".to_owned(),
|
|
},
|
|
};
|
|
let _ = stream.write_json_packet(&msg);
|
|
let _ = stream.write_json_packet(&EmptyReplyMsg { from: self.name() });
|
|
ActorMessageStatus::Processed
|
|
},
|
|
|
|
"resume" => {
|
|
let msg = ThreadResumedReply {
|
|
from: self.name(),
|
|
type_: "resumed".to_owned(),
|
|
};
|
|
let _ = stream.write_json_packet(&msg);
|
|
let _ = stream.write_json_packet(&EmptyReplyMsg { from: self.name() });
|
|
ActorMessageStatus::Processed
|
|
},
|
|
|
|
"interrupt" => {
|
|
let msg = ThreadInterruptedReply {
|
|
from: self.name(),
|
|
type_: "interrupted".to_owned(),
|
|
};
|
|
let _ = stream.write_json_packet(&msg);
|
|
ActorMessageStatus::Processed
|
|
},
|
|
|
|
"reconfigure" => {
|
|
let _ = stream.write_json_packet(&EmptyReplyMsg { from: self.name() });
|
|
ActorMessageStatus::Processed
|
|
},
|
|
|
|
// Client has attached to the thread and wants to load script sources.
|
|
// <https://firefox-source-docs.mozilla.org/devtools/backend/protocol.html#loading-script-sources>
|
|
"sources" => {
|
|
let msg = SourcesReply {
|
|
from: self.name(),
|
|
sources: self.source_manager.source_forms(registry),
|
|
};
|
|
let _ = stream.write_json_packet(&msg);
|
|
ActorMessageStatus::Processed
|
|
},
|
|
_ => ActorMessageStatus::Ignored,
|
|
})
|
|
}
|
|
}
|