Skip to content

armgit / moli

Public Imported from GitHub
0

Best headless browser for AI agents. Lite, Fast, High-Compatibility. Built in Rust

refactor(cdp): unify page target owner routing

ldm065ad88a2598d
diff --git a/moli-protocol/src/conn.rs b/moli-protocol/src/conn.rs
index 176fa6e2a..e23eff235 100644
--- a/moli-protocol/src/conn.rs
+++ b/moli-protocol/src/conn.rs
@@ -3543,19 +3543,6 @@ impl CdpConnection {
tab_target_id
}
- pub(crate) fn register_worker_target_host(
- &mut self,
- target_id: &str,
- kind: DevToolsTargetKind,
- ) {
- self.target_control
- .register_worker(target_id.to_owned(), kind);
- }
-
- pub(crate) fn remove_worker_target_host(&mut self, target_id: &str) -> bool {
- self.target_control.remove_worker(target_id)
- }
-
#[doc(hidden)]
pub fn tab_target_id_for_page_target_id(&self, page_target_id: &str) -> Option<&str> {
self.target_control
@@ -3997,7 +3984,15 @@ impl CdpConnection {
#[cfg(test)]
pub(crate) fn target_registry_host_kind(&self, target_id: &str) -> Option<DevToolsTargetKind> {
- self.target_control.host_kind(target_id)
+ self.devtools_target_info(target_id)
+ .map(|target| target.kind)
+ }
+
+ fn has_registered_target_id(&self, target_id: &str) -> bool {
+ self.target_control.contains_tab_or_page_relation(target_id)
+ || self
+ .browser_contexts()
+ .any(|context| context.devtools_target_info(target_id).is_some())
}
pub fn install_default_browser_target(&mut self) {
@@ -4039,7 +4034,10 @@ impl CdpConnection {
}
}
}
- if self.target_control.host_kind(&default_target_id).is_none() {
+ if !self
+ .target_control
+ .contains_tab_or_page_relation(&default_target_id)
+ {
self.register_top_level_page_target(&default_target_id);
}
self.default_target_lifecycle.mark_live();
@@ -4080,13 +4078,7 @@ impl CdpConnection {
// Never let a later worker/page allocation alias such a target:
// looking it up would otherwise return the pre-existing target's
// kind and state even though the renderer record names a worker.
- let target_id_is_live = self.target_control.host_kind(&target_id).is_some()
- || self
- .browser_context
- .iter()
- .chain(self.inactive_browser_contexts.iter())
- .any(|context| context.devtools_target_info(&target_id).is_some());
- if !target_id_is_live {
+ if !self.has_registered_target_id(&target_id) {
return target_id;
}
}
@@ -4109,7 +4101,7 @@ impl CdpConnection {
u64::from(self.next_tab_target_id)
};
let target_id = format!("TAB-{id}");
- if self.target_control.host_kind(&target_id).is_none() {
+ if !self.has_registered_target_id(&target_id) {
return target_id;
}
}
diff --git a/moli-protocol/src/conn/browser_context/emulation_owner.rs b/moli-protocol/src/conn/browser_context/emulation_owner.rs
index 7171c305d..057ab7f67 100644
--- a/moli-protocol/src/conn/browser_context/emulation_owner.rs
+++ b/moli-protocol/src/conn/browser_context/emulation_owner.rs
@@ -23,27 +23,18 @@ impl TargetSessionOwnerMut<'_> {
f: impl FnOnce(Option<TargetEmulationSessionStateMut<'_>>),
) -> bool {
match &mut self {
- Self::ActiveTarget {
- browser_context, ..
- } => {
- let state = browser_context.active_page_state_mut();
- f(Some(TargetEmulationSessionStateMut {
- network_conditions: &mut state.network_conditions,
- geolocation_override: &mut state.geolocation_override,
- emulated_media: &mut state.emulated_media,
- emulated_device_metrics: &mut state.emulated_device_metrics,
- cpu_throttling_rate: &mut state.cpu_throttling_rate,
- touch_emulation_enabled: &mut state.touch_emulation_enabled,
- emit_touch_events_for_mouse: &mut state.emit_touch_events_for_mouse,
- focus_emulation_enabled: &mut state.focus_emulation_enabled,
- script_execution_disabled: &mut state.script_execution_disabled,
- }))
- }
- Self::PageTargetHost {
+ Self::PageTarget {
browser_context,
target_id,
..
- } => browser_context.mutate_parked_page_session_state(target_id, |state| {
+ } => {
+ let Some(state) = browser_context
+ .page_target_mut(target_id)
+ .map(|target| target.state_mut())
+ else {
+ f(None);
+ return false;
+ };
f(Some(TargetEmulationSessionStateMut {
network_conditions: &mut state.network_conditions,
geolocation_override: &mut state.geolocation_override,
@@ -55,7 +46,7 @@ impl TargetSessionOwnerMut<'_> {
focus_emulation_enabled: &mut state.focus_emulation_enabled,
script_execution_disabled: &mut state.script_execution_disabled,
}))
- }),
+ }
Self::NoLoadedBrowserContext => {
f(None);
return false;
@@ -117,15 +108,13 @@ impl TargetSessionOwnerMut<'_> {
impl TargetSessionOwnerRef<'_> {
fn emit_touch_events_for_mouse(&self) -> Option<bool> {
match self {
- Self::ActiveTarget {
- browser_context, ..
- } => Some(browser_context.emit_touch_events_for_mouse),
- Self::PageTargetHost {
+ Self::PageTarget {
browser_context,
target_id,
..
} => browser_context
- .parked_page_session_state(target_id)
+ .page_target(target_id)
+ .map(|target| target.state())
.map(|state| state.emit_touch_events_for_mouse),
Self::NoLoadedBrowserContext => None,
}
@@ -197,17 +186,9 @@ impl CdpConnection {
impl BrowserContext {
pub(crate) fn effective_active_emulated_device_metrics(&self) -> Option<EmulatedDeviceMetrics> {
- self.emulated_device_metrics
+ self.active_page_target()
+ .emulated_device_metrics
.clone()
.or_else(|| self.default_emulated_device_metrics.clone())
}
-
- pub(crate) fn effective_parked_emulated_device_metrics(
- &self,
- target_id: &str,
- ) -> Option<EmulatedDeviceMetrics> {
- self.parked_page_session_state(target_id)
- .and_then(|state| state.emulated_device_metrics.clone())
- .or_else(|| self.default_emulated_device_metrics.clone())
- }
}
diff --git a/moli-protocol/src/conn/browser_context/fetch_owner.rs b/moli-protocol/src/conn/browser_context/fetch_owner.rs
index 03cd0ffff..ad0ad8cdb 100644
--- a/moli-protocol/src/conn/browser_context/fetch_owner.rs
+++ b/moli-protocol/src/conn/browser_context/fetch_owner.rs
@@ -102,18 +102,8 @@ fn fetch_body_stream_owner_for_target_mut<'a>(
browser_context: &'a mut BrowserContext,
target_id: &str,
) -> Option<SessionFetchBodyStreamOwner<'a>> {
- let is_active_target = browser_context.active_target_id() == Some(target_id);
- if is_active_target {
- let owner_key = fetch_stream_owner_key(&browser_context.id, target_id);
- let active_target = &mut browser_context.active_target;
- return Some(SessionFetchBodyStreamOwner {
- owner_key,
- fetch_owner: &mut active_target.fetch_owner,
- runtime_slot: &mut active_target.runtime_slot,
- });
- }
let owner_key = fetch_stream_owner_key(&browser_context.id, target_id);
- let target = browser_context.background_target_mut(target_id)?;
+ let target = browser_context.page_target_mut(target_id)?;
let active_target = &mut target.state_mut().active_target;
Some(SessionFetchBodyStreamOwner {
owner_key,
@@ -126,41 +116,21 @@ fn runtime_slot_for_target_scoped_stream_mut<'a>(
browser_context: &'a mut BrowserContext,
target_id: &str,
) -> Option<&'a mut TargetRuntimeSlot> {
- let is_active_target = browser_context.active_target_id() == Some(target_id)
- || (target_id == "active" && browser_context.active_target_id().is_none());
- if is_active_target {
- return Some(&mut browser_context.active_target.runtime_slot);
- }
browser_context
- .background_target_mut(target_id)
+ .page_target_mut(target_id)
.map(|target| &mut target.runtime_slot)
}
impl TargetSessionOwnerMut<'_> {
fn open_scoped_io_stream_body_source(&mut self, body: CapturedBody) -> Result<String, String> {
match self {
- Self::ActiveTarget {
- browser_context, ..
- } => {
- let target_id = browser_context
- .active_target_id_owned()
- .unwrap_or_else(|| "active".to_owned());
- let owner_key = fetch_stream_owner_key(&browser_context.id, &target_id);
- let runtime_slot = &mut browser_context.active_target.runtime_slot;
- let handle = target_scoped_stream_handle(
- &owner_key,
- runtime_slot.allocate_io_stream_handle(),
- );
- runtime_slot.insert_io_stream_body_source(handle.clone(), body, 0);
- Ok(handle)
- }
- Self::PageTargetHost {
+ Self::PageTarget {
browser_context,
target_id,
..
} => {
let owner_key = fetch_stream_owner_key(&browser_context.id, target_id);
- let Some(target) = browser_context.background_target_mut(target_id) else {
+ let Some(target) = browser_context.page_target_mut(target_id) else {
return Err("NoDocumentLoaded".to_owned());
};
let handle = target_scoped_stream_handle(
@@ -225,16 +195,17 @@ fn remove_network_intercept_from_browser_context(
browser_context: &mut BrowserContext,
intercept_id: &str,
) -> Result<Option<Option<moli_core::page::PendingPageCommand>>, String> {
- if browser_context
+ let target = browser_context.active_page_target_mut();
+ if target
.active_target
.fetch_owner
.remove_network_intercept(intercept_id)
{
- let (subresource_enabled, subresource_resource_type) = browser_context
+ let (subresource_enabled, subresource_resource_type) = target
.active_target
.fetch_owner
.subresource_interception_config();
- let Some(page) = browser_context.active_target.runtime_slot.loaded_page_mut() else {
+ let Some(page) = target.active_target.runtime_slot.loaded_page_mut() else {
return Ok(Some(None));
};
return page
@@ -1187,19 +1158,7 @@ fn pending_fetch_request_route(
browser_context: &BrowserContext,
request_id: &str,
) -> Option<CdpSessionRoute> {
- if browser_context
- .active_target
- .fetch_owner
- .contains_pending_request(request_id)
- {
- return Some(CdpSessionRoute::PageTarget {
- browser_context_id: browser_context.id.clone(),
- target_id: browser_context.active_target_id_owned()?,
- is_attached_session: false,
- });
- }
-
- browser_context.background_targets().find_map(|target| {
+ browser_context.page_targets.iter().find_map(|target| {
target
.fetch_owner
.contains_pending_request(request_id)
@@ -1214,28 +1173,19 @@ fn pending_fetch_request_route(
impl TargetSessionOwnerMut<'_> {
fn session_id(&self) -> Option<&str> {
match self {
- Self::ActiveTarget { session_id, .. } | Self::PageTargetHost { session_id, .. } => {
- session_id.as_deref()
- }
+ Self::PageTarget { session_id, .. } => session_id.as_deref(),
Self::NoLoadedBrowserContext => None,
}
}
fn pending_fetch_owner_mut(&mut self) -> Option<SessionPendingFetchOwner<'_>> {
match self {
- Self::ActiveTarget {
- browser_context, ..
- } => Some(SessionPendingFetchOwner(
- &mut browser_context.active_target.fetch_owner,
- )),
- Self::PageTargetHost {
+ Self::PageTarget {
browser_context,
target_id,
..
} => Some(SessionPendingFetchOwner(
- &mut browser_context
- .background_target_mut(target_id)?
- .fetch_owner,
+ &mut browser_context.page_target_mut(target_id)?.fetch_owner,
)),
Self::NoLoadedBrowserContext => None,
}
@@ -1243,15 +1193,7 @@ impl TargetSessionOwnerMut<'_> {
fn fetch_body_stream_owner_mut(&mut self) -> Option<SessionFetchBodyStreamOwner<'_>> {
match self {
- Self::ActiveTarget {
- browser_context, ..
- } => {
- let target_id = browser_context
- .active_target_id_owned()
- .unwrap_or_else(|| "active".to_owned());
- fetch_body_stream_owner_for_target_mut(browser_context, &target_id)
- }
- Self::PageTargetHost {
+ Self::PageTarget {
browser_context,
target_id,
..
diff --git a/moli-protocol/src/conn/browser_context/network_owner.rs b/moli-protocol/src/conn/browser_context/network_owner.rs
index 9f70a0e09..b0800dab7 100644
--- a/moli-protocol/src/conn/browser_context/network_owner.rs
+++ b/moli-protocol/src/conn/browser_context/network_owner.rs
@@ -12,11 +12,11 @@ use moli_core::page::PendingPageCommand;
impl TargetSessionStateMut<'_> {
fn set_tls_verify_host_override(mut self, enabled: bool) -> bool {
- let should_refresh_active_engine = matches!(self, Self::Active { .. });
- if let Some(tls_verify_host_override) = self.tls_verify_host_override_mut() {
- *tls_verify_host_override = Some(enabled);
- }
- should_refresh_active_engine
+ let Some(tls_verify_host_override) = self.tls_verify_host_override_mut() else {
+ return false;
+ };
+ *tls_verify_host_override = Some(enabled);
+ true
}
fn set_emulated_network_conditions(
@@ -39,13 +39,8 @@ impl TargetSessionStateMut<'_> {
}
enum TargetNetworkListenerOwnerMut<'a> {
- Active {
- browser_context: &'a mut BrowserContext,
- is_auxiliary_target_session: bool,
- },
- Background {
- browser_context: &'a mut BrowserContext,
- target_id: String,
+ PageTarget {
+ target: &'a mut crate::conn::PageTargetHost,
is_auxiliary_target_session: bool,
},
NoLoadedBrowserContext,
@@ -54,23 +49,17 @@ enum TargetNetworkListenerOwnerMut<'a> {
impl<'a> TargetSessionOwnerMut<'a> {
fn into_network_listener_owner(self) -> TargetNetworkListenerOwnerMut<'a> {
match self {
- Self::ActiveTarget {
- browser_context,
- is_auxiliary_target_session,
- ..
- } => TargetNetworkListenerOwnerMut::Active {
- browser_context,
- is_auxiliary_target_session,
- },
- Self::PageTargetHost {
+ Self::PageTarget {
browser_context,
target_id,
is_auxiliary_target_session,
..
- } => TargetNetworkListenerOwnerMut::Background {
- browser_context,
- target_id,
- is_auxiliary_target_session,
+ } => match browser_context.page_target_mut(&target_id) {
+ Some(target) => TargetNetworkListenerOwnerMut::PageTarget {
+ target,
+ is_auxiliary_target_session,
+ },
+ None => TargetNetworkListenerOwnerMut::NoLoadedBrowserContext,
},
Self::NoLoadedBrowserContext => TargetNetworkListenerOwnerMut::NoLoadedBrowserContext,
}
@@ -102,28 +91,18 @@ impl<'a> TargetSessionOwnerMut<'a> {
impl TargetNetworkListenerOwnerMut<'_> {
fn network_listener_enabled(&self, session_id: Option<&str>) -> bool {
match self {
- Self::Active {
- browser_context, ..
- } => browser_context.network_enabled_for_session(session_id),
- Self::Background {
- browser_context,
- target_id,
+ Self::PageTarget {
+ target,
is_auxiliary_target_session,
} => {
if *is_auxiliary_target_session {
return session_id.is_some_and(|session_id| {
- browser_context
- .background_target(target_id)
- .is_some_and(|target| {
- target
- .runtime_slot()
- .auxiliary_network_events_enabled_for_session(session_id)
- })
+ target
+ .runtime_slot()
+ .auxiliary_network_events_enabled_for_session(session_id)
});
}
- browser_context
- .background_target(target_id)
- .is_some_and(|target| target.runtime_slot.primary_network_events_enabled())
+ target.runtime_slot.primary_network_events_enabled()
}
Self::NoLoadedBrowserContext => false,
}
@@ -131,101 +110,47 @@ impl TargetNetworkListenerOwnerMut<'_> {
fn set_primary_network_enabled(&mut self, enabled: bool) {
match self {
- Self::Active {
- browser_context, ..
- } => {
- browser_context
- .active_target
- .runtime_slot
- .set_primary_network_events_enabled(enabled);
- }
- Self::Background {
- browser_context,
- target_id,
- ..
- } => {
- if let Some(target) = browser_context.background_target_mut(target_id) {
- target
- .runtime_slot
- .set_primary_network_events_enabled(enabled);
- }
- }
+ Self::PageTarget { target, .. } => target
+ .runtime_slot
+ .set_primary_network_events_enabled(enabled),
Self::NoLoadedBrowserContext => {}
}
}
fn initialize_network_observation_cursor_at_current_tail(&mut self, session_id: Option<&str>) {
match self {
- Self::Active {
- browser_context, ..
- } => {
- browser_context.initialize_network_listener_observation_cursor(session_id);
- }
- Self::Background {
- browser_context,
- target_id,
- ..
- } => {
- initialize_parked_network_observation_cursor(browser_context, target_id, session_id)
- }
+ Self::PageTarget { target, .. } => target
+ .runtime_slot
+ .initialize_network_session_observation_cursor_at_output_tail(session_id),
Self::NoLoadedBrowserContext => {}
}
}
fn remove_network_observation_cursor(&mut self, session_id: Option<&str>) {
match self {
- Self::Active {
- browser_context, ..
- } => {
- browser_context.remove_network_listener_observation_cursor(session_id);
- }
- Self::Background {
- browser_context,
- target_id,
- ..
- } => remove_parked_network_observation_cursor(browser_context, target_id, session_id),
+ Self::PageTarget { target, .. } => target
+ .runtime_slot
+ .remove_network_session_observation_cursor(session_id),
Self::NoLoadedBrowserContext => {}
}
}
fn remove_captured_response_body_visibility_for_session(&mut self, session_id: Option<&str>) {
match self {
- Self::Active {
- browser_context, ..
- } => {
- browser_context.remove_captured_response_body_visibility_for_session(session_id);
- }
- Self::Background {
- browser_context,
- target_id,
- ..
- } => {
- remove_parked_captured_response_body_visibility(
- browser_context,
- target_id,
- session_id,
- );
- }
+ Self::PageTarget { target, .. } => target
+ .runtime_slot
+ .remove_captured_response_body_visibility_for_session(session_id),
Self::NoLoadedBrowserContext => {}
}
}
fn clear_network_observation_artifacts_if_unobserved(&mut self) {
match self {
- Self::Active {
- browser_context, ..
- } => {
- browser_context.clear_network_observation_artifacts_if_unobserved();
- }
- Self::Background {
- browser_context,
- target_id,
- ..
- } => {
- clear_parked_network_observation_artifacts_if_unobserved(
- browser_context,
- target_id,
- );
+ Self::PageTarget { target, .. } => {
+ if !target.runtime_slot.has_network_event_listeners() {
+ target.runtime_slot.clear_captured_response_bodies();
+ target.runtime_slot.clear_websocket_request_ids();
+ }
}
Self::NoLoadedBrowserContext => {}
}
@@ -239,11 +164,7 @@ impl TargetNetworkListenerOwnerMut<'_> {
fn is_auxiliary_target_session(&self) -> bool {
match self {
- Self::Active {
- is_auxiliary_target_session,
- ..
- }
- | Self::Background {
+ Self::PageTarget {
is_auxiliary_target_session,
..
} => *is_auxiliary_target_session,
@@ -252,19 +173,8 @@ impl TargetNetworkListenerOwnerMut<'_> {
}
fn enable_listener(mut self, session_id: Option<&str>) -> bool {
- match &mut self {
- Self::Active {
- browser_context,
- is_auxiliary_target_session,
- } => {
- browser_context.enable_network_event_listener_for_session(
- session_id,
- *is_auxiliary_target_session,
- );
- return true;
- }
- Self::NoLoadedBrowserContext => return false,
- Self::Background { .. } => {}
+ if matches!(self, Self::NoLoadedBrowserContext) {
+ return false;
}
let adding_network_event_listener = !self.network_listener_enabled(session_id);
@@ -285,19 +195,8 @@ impl TargetNetworkListenerOwnerMut<'_> {
}
fn disable_listener(mut self, session_id: Option<&str>) -> bool {
- match &mut self {
- Self::Active {
- browser_context,
- is_auxiliary_target_session,
- } => {
- browser_context.disable_network_event_listener_for_session(
- session_id,
- *is_auxiliary_target_session,
- );
- return true;
- }
- Self::NoLoadedBrowserContext => return false,
- Self::Background { .. } => {}
+ if matches!(self, Self::NoLoadedBrowserContext) {
+ return false;
}
let listener_session_id = self.listener_session_id(session_id);
@@ -318,16 +217,7 @@ impl TargetNetworkListenerOwnerMut<'_> {
fn runtime_slot_mut(&mut self) -> Option<&mut TargetRuntimeSlot> {
match self {
- Self::Active {
- browser_context, ..
- } => Some(&mut browser_context.active_target.runtime_slot),
- Self::Background {
- browser_context,
- target_id,
- ..
- } => browser_context
- .background_target_mut(target_id)
- .map(|target| &mut target.runtime_slot),
+ Self::PageTarget { target, .. } => Some(&mut target.runtime_slot),
Self::NoLoadedBrowserContext => None,
}
}
@@ -352,32 +242,17 @@ impl TargetSessionOwnerMut<'_> {
}
match self {
- Self::ActiveTarget {
+ Self::PageTarget {
browser_context,
+ target_id,
session_id,
is_auxiliary_target_session,
- ..
} => Some(mutate(
- browser_context.active_page_state_mut(),
+ browser_context.page_target_mut(target_id)?.state_mut(),
session_id.as_deref(),
*is_auxiliary_target_session,
f,
)),
- Self::PageTargetHost {
- browser_context,
- target_id,
- session_id,
- is_auxiliary_target_session,
- } => Some(
- browser_context.mutate_parked_page_session_state(target_id, |page_state| {
- mutate(
- page_state,
- session_id.as_deref(),
- *is_auxiliary_target_session,
- f,
- )
- }),
- ),
Self::NoLoadedBrowserContext => None,
}
}
@@ -553,56 +428,32 @@ impl TargetSessionOwnerMut<'_> {
fn set_devtools_browser_identity_override(
&mut self,
browser_identity: Option<crate::conn::DevToolsBrowserIdentityOverride>,
- ) -> Option<bool> {
- let refresh_active_engine = matches!(
- self,
- Self::ActiveTarget {
- is_current_active_browser_context: true,
- ..
- }
- );
+ ) -> bool {
self.mutate_page_state(|state, is_auxiliary_target_session, session_id| {
state.set_devtools_browser_identity_override(
is_auxiliary_target_session,
session_id,
browser_identity,
);
- })?;
- Some(refresh_active_engine)
+ })
+ .is_some()
}
fn set_base_user_agent_override(
&mut self,
user_agent: Option<String>,
fallback_identity: &moli_browser_profile::BrowserIdentityProfile,
- ) -> Option<bool> {
- let refresh_active_engine = matches!(
- self,
- Self::ActiveTarget {
- is_current_active_browser_context: true,
- ..
- }
- );
+ ) -> bool {
self.mutate_page_state(|state, _is_auxiliary_target_session, _session_id| {
state
.network_policy
.set_base_user_agent_override(user_agent, fallback_identity);
- })?;
- Some(refresh_active_engine)
+ })
+ .is_some()
}
- fn set_tls_verify_host_override(mut self, enabled: bool) -> Option<bool> {
- self.mutate_session_state_ref(|state| {
- state.set_tls_verify_host_override(enabled);
- });
- match self {
- Self::ActiveTarget {
- is_current_active_browser_context,
- ..
- } => Some(is_current_active_browser_context),
- Self::PageTargetHost { .. } => Some(false),
- Self::NoLoadedBrowserContext => None,
- }
+ fn set_tls_verify_host_override(mut self, enabled: bool) -> bool {
+ self.mutate_session_state_ref(|state| state.set_tls_verify_host_override(enabled))
}
fn start_set_emulated_network_conditions(
@@ -646,24 +497,14 @@ impl CdpConnection {
session_id: Option<&str>,
) -> Option<&CapturedResponseBody> {
self.browser_contexts().find_map(|browser_context| {
- browser_context
- .active_target
- .runtime_slot
- .captured_response_body(request_id)
- .filter(|body| {
- body.is_visible_to_session(session_id) || body.is_visible_to_session(None)
- })
- .or_else(|| {
- browser_context.background_targets().find_map(|target| {
- target
- .runtime_slot()
- .captured_response_body(request_id)
- .filter(|body| {
- body.is_visible_to_session(session_id)
- || body.is_visible_to_session(None)
- })
+ browser_context.page_targets.iter().find_map(|target| {
+ target
+ .runtime_slot()
+ .captured_response_body(request_id)
+ .filter(|body| {
+ body.is_visible_to_session(session_id) || body.is_visible_to_session(None)
})
- })
+ })
})
}
@@ -673,24 +514,14 @@ impl CdpConnection {
session_id: Option<&str>,
) -> Option<&CapturedRequestBody> {
self.browser_contexts().find_map(|browser_context| {
- browser_context
- .active_target
- .runtime_slot
- .captured_request_body(request_id)
- .filter(|body| {
- body.is_visible_to_session(session_id) || body.is_visible_to_session(None)
- })
- .or_else(|| {
- browser_context.background_targets().find_map(|target| {
- target
- .runtime_slot()
- .captured_request_body(request_id)
- .filter(|body| {
- body.is_visible_to_session(session_id)
- || body.is_visible_to_session(None)
- })
+ browser_context.page_targets.iter().find_map(|target| {
+ target
+ .runtime_slot()
+ .captured_request_body(request_id)
+ .filter(|body| {
+ body.is_visible_to_session(session_id) || body.is_visible_to_session(None)
})
- })
+ })
})
}
@@ -1047,13 +878,8 @@ impl CdpConnection {
let Some(mut owner) = self.target_session_owner_mut(session_id) else {
return Err("BrowserContextNotLoaded".to_owned());
};
- let Some(refresh_active_engine) =
- owner.set_base_user_agent_override(user_agent, &fallback_identity)
- else {
+ if !owner.set_base_user_agent_override(user_agent, &fallback_identity) {
return Err("BrowserContextNotLoaded".to_owned());
- };
- if refresh_active_engine {
- self.apply_active_engine_fetch_overrides();
}
self.start_rebuild_resource_runtime_for_session_owner(session_id)
}
@@ -1077,10 +903,12 @@ impl CdpConnection {
if is_browser_session && let Some(browser_context) = self.browser_context.as_mut() {
if let Some(browser_identity) = browser_identity {
browser_context
+ .active_page_target_mut()
.network_policy
.set_browser_identity_override(browser_identity);
} else {
browser_context
+ .active_page_target_mut()
.network_policy
.clear_browser_identity_override();
}
@@ -1109,13 +937,8 @@ impl CdpConnection {
return Err("BrowserContextNotLoaded".to_owned());
};
let mut owner = owner;
- let Some(refresh_active_engine) =
- owner.set_devtools_browser_identity_override(browser_identity)
- else {
+ if !owner.set_devtools_browser_identity_override(browser_identity) {
return Err("BrowserContextNotLoaded".to_owned());
- };
- if refresh_active_engine {
- self.apply_active_engine_fetch_overrides();
}
self.start_rebuild_resource_runtime_for_session_owner(session_id)
}
@@ -1143,14 +966,10 @@ impl CdpConnection {
let Some(owner) = self.target_session_owner_mut(session_id) else {
return Err("BrowserContextNotLoaded".to_owned());
};
- let Some(refresh_active_engine) = owner.set_tls_verify_host_override(enabled) else {
+ if !owner.set_tls_verify_host_override(enabled) {
return Err("BrowserContextNotLoaded".to_owned());
- };
- if refresh_active_engine {
- self.apply_active_engine_fetch_overrides();
- return self.start_rebuild_resource_runtime_for_session_owner(session_id);
}
- Ok(None)
+ self.start_rebuild_resource_runtime_for_session_owner(session_id)
}
pub(crate) fn start_set_emulated_network_conditions_for_session_owner(
@@ -1175,55 +994,6 @@ impl CdpConnection {
}
}
-fn initialize_parked_network_observation_cursor(
- browser_context: &mut BrowserContext,
- target_id: &str,
- session_id: Option<&str>,
-) {
- browser_context
- .background_target_mut(target_id)
- .expect("background target route must retain its target")
- .runtime_slot
- .initialize_network_session_observation_cursor_at_output_tail(session_id);
-}
-
-fn remove_parked_network_observation_cursor(
- browser_context: &mut BrowserContext,
- target_id: &str,
- session_id: Option<&str>,
-) {
- browser_context
- .background_target_mut(target_id)
- .expect("background target route must retain its target")
- .runtime_slot
- .remove_network_session_observation_cursor(session_id);
-}
-
-fn remove_parked_captured_response_body_visibility(
- browser_context: &mut BrowserContext,
- target_id: &str,
- session_id: Option<&str>,
-) {
- browser_context
- .background_target_mut(target_id)
- .expect("background target route must retain its target")
- .runtime_slot
- .remove_captured_response_body_visibility_for_session(session_id);
-}
-
-fn clear_parked_network_observation_artifacts_if_unobserved(
- browser_context: &mut BrowserContext,
- target_id: &str,
-) {
- if let Some(target) = browser_context.background_target_mut(target_id) {
- if target.runtime_slot.has_network_event_listeners() {
- return;
- }
- target.runtime_slot.clear_captured_response_bodies();
- target.runtime_slot.clear_websocket_request_ids();
- }
-}
-
#[cfg(test)]
mod tests {
use super::*;
@@ -1231,7 +1001,7 @@ mod tests {
fn active_session_state_mut(browser_context: &mut BrowserContext) -> TargetSessionStateMut<'_> {
let state = browser_context.active_page_state_mut();
- TargetSessionStateMut::Active {
+ TargetSessionStateMut::Loaded {
devtools_session_state: &mut state.devtools_sessions
[moli_page_types::DevToolsSessionKey::Primary],
network_policy: &mut state.network_policy,
@@ -1240,7 +1010,7 @@ mod tests {
}
fn parked_session_state_mut(state: &mut TargetPageState) -> TargetSessionStateMut<'_> {
- TargetSessionStateMut::Parked {
+ TargetSessionStateMut::Loaded {
devtools_session_state: &mut state.devtools_sessions
[moli_page_types::DevToolsSessionKey::Primary],
network_policy: &mut state.network_policy,
@@ -1307,14 +1077,20 @@ mod tests {
fn target_session_state_mut_applies_active_and_parked_network_fields() {
let mut active = BrowserContext::new_with_page_for_test("BID-active", "TID-active");
{
- let network = &mut active.devtools_sessions.primary_mut().network_session_state;
+ let network = &mut active
+ .active_page_state_mut()
+ .devtools_sessions
+ .primary_mut()
+ .network_session_state;
network.network_enabled = true;
network.cache_disabled = true;
network.bypass_service_worker = true;
network.blocked_url_patterns = vec!["*://blocked.test/*".to_owned()];
network.extra_headers = vec![("X-Test".to_owned(), "active".to_owned())];
}
- active.refresh_devtools_network_policy();
+ active
+ .active_page_state_mut()
+ .refresh_devtools_network_policy();
let active_offline = active_session_state_mut(&mut active).set_emulated_network_conditions(
true,
25.0,
@@ -1323,23 +1099,52 @@ mod tests {
Some("cellular3g".to_owned()),
);
- assert!(active.network_policy.cache_disabled());
- assert!(active.network_policy.bypass_service_worker());
+ assert!(active.active_page_state().network_policy.cache_disabled());
+ assert!(
+ active
+ .active_page_state()
+ .network_policy
+ .bypass_service_worker()
+ );
assert_eq!(
- active.network_policy.blocked_url_patterns(),
+ active
+ .active_page_state()
+ .network_policy
+ .blocked_url_patterns(),
vec!["*://blocked.test/*"]
);
assert_eq!(
- active.network_policy.extra_headers(),
+ active.active_page_state().network_policy.extra_headers(),
vec![("X-Test".to_owned(), "active".to_owned())]
);
assert_eq!(active_offline, Some(true));
- assert!(active.network_policy.network_offline());
- assert_eq!(active.network_policy.emulated_network_latency(), 25.0);
- assert_eq!(active.network_policy.emulated_download_throughput(), 1024.0);
- assert_eq!(active.network_policy.emulated_upload_throughput(), 256.0);
+ assert!(active.active_page_state().network_policy.network_offline());
assert_eq!(
- active.network_policy.emulated_connection_type(),
+ active
+ .active_page_state()
+ .network_policy
+ .emulated_network_latency(),
+ 25.0
+ );
+ assert_eq!(
+ active
+ .active_page_state()
+ .network_policy
+ .emulated_download_throughput(),
+ 1024.0
+ );
+ assert_eq!(
+ active
+ .active_page_state()
+ .network_policy
+ .emulated_upload_throughput(),
+ 256.0
+ );
+ assert_eq!(
+ active
+ .active_page_state()
+ .network_policy
+ .emulated_connection_type(),
Some("cellular3g")
);
diff --git a/moli-protocol/src/conn/browser_context/page_owner.rs b/moli-protocol/src/conn/browser_context/page_owner.rs
index 8de9ed619..8f237255c 100644
--- a/moli-protocol/src/conn/browser_context/page_owner.rs
+++ b/moli-protocol/src/conn/browser_context/page_owner.rs
@@ -373,36 +373,13 @@ impl TargetSessionOwnerMut<'_> {
None
} else {
match &self {
- Self::ActiveTarget {
- browser_context,
- session_id,
- is_auxiliary_target_session,
- ..
- } => {
- if browser_context.loaded_page().is_none() {
- return PageLifecycleEventsEnableResult::Handled {
- replay_target: None,
- };
- }
- let Some(_frame_id) = browser_context.active_target_id() else {
- return PageLifecycleEventsEnableResult::Handled {
- replay_target: None,
- };
- };
- let replay_session_id = if *is_auxiliary_target_session {
- session_id.clone()
- } else {
- browser_context.active_session_id_owned()
- };
- replay_session_id.map(|session_id| PageLifecycleReplayTarget { session_id })
- }
- Self::PageTargetHost {
+ Self::PageTarget {
browser_context,
target_id,
session_id,
is_auxiliary_target_session,
} => browser_context
- .background_target(target_id)
+ .page_target(target_id)
.filter(|target| target.has_loaded_page())
.and_then(|target| {
let replay_session_id = if *is_auxiliary_target_session {
@@ -546,6 +523,7 @@ fn devtools_session_page_domain_enabled(state: &DevToolsSessionState) -> bool {
fn browser_context_has_page_domain_enabled_session(browser_context: &BrowserContext) -> bool {
browser_context
+ .active_page_target()
.devtools_sessions
.states()
.any(devtools_session_page_domain_enabled)
@@ -1007,7 +985,7 @@ mod tests {
fn active_session_state_mut(browser_context: &mut BrowserContext) -> TargetSessionStateMut<'_> {
let state = browser_context.active_page_state_mut();
- TargetSessionStateMut::Active {
+ TargetSessionStateMut::Loaded {
devtools_session_state: &mut state.devtools_sessions
[moli_page_types::DevToolsSessionKey::Primary],
network_policy: &mut state.network_policy,
@@ -1016,7 +994,7 @@ mod tests {
}
fn parked_session_state_mut(state: &mut TargetPageState) -> TargetSessionStateMut<'_> {
- TargetSessionStateMut::Parked {
+ TargetSessionStateMut::Loaded {
devtools_session_state: &mut state.devtools_sessions
[moli_page_types::DevToolsSessionKey::Primary],
network_policy: &mut state.network_policy,
@@ -1042,38 +1020,45 @@ mod tests {
);
assert!(
- active.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ active.active_page_state().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.console_output_session_state
.console_enabled
);
assert!(
- active.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ active.active_page_state().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.page_session_state
.log_enabled
);
assert!(
- active.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ active.active_page_state().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.page_session_state
.page_file_chooser_opened_event_enabled
);
assert!(
- active.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ active.active_page_state().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.page_session_state
.page_bypass_csp_enabled
);
assert_eq!(
- active.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ active.active_page_state().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.page_session_state
.page_font_families,
font_families
);
assert!(
- active.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ active.active_page_state().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.page_session_state
.page_intercept_file_chooser_dialog_enabled
);
assert!(
- active.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ active.active_page_state().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.page_session_state
.performance
.enabled()
@@ -1195,6 +1180,7 @@ mod tests {
conn.browser_context
.as_ref()
.expect("browser context")
+ .active_page_state()
.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.page_session_state
.page_file_chooser_opened_event_enabled
@@ -1206,6 +1192,7 @@ mod tests {
.browser_context
.as_ref()
.expect("browser context")
+ .active_page_state()
.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.page_session_state
.page_file_chooser_opened_event_enabled
diff --git a/moli-protocol/src/conn/browser_context/session_owner.rs b/moli-protocol/src/conn/browser_context/session_owner.rs
index d8a3f94ee..6fdd169b9 100644
--- a/moli-protocol/src/conn/browser_context/session_owner.rs
+++ b/moli-protocol/src/conn/browser_context/session_owner.rs
@@ -1,11 +1,9 @@
-use crate::conn::{BrowserContext, CdpConnection, CdpSessionRoute, TargetPageState};
+#[cfg(test)]
+use crate::conn::BrowserContext;
+use crate::conn::{CdpConnection, CdpSessionRoute, TargetPageState};
pub(super) enum TargetSessionOwner {
- ActiveTarget {
- browser_context_id: String,
- is_auxiliary_target_session: bool,
- },
- PageTargetHost {
+ PageTarget {
browser_context_id: String,
target_id: String,
is_auxiliary_target_session: bool,
@@ -14,6 +12,7 @@ pub(super) enum TargetSessionOwner {
}
impl CdpConnection {
+ #[cfg(test)]
pub(crate) fn with_background_target_session<R>(
&mut self,
session_id: Option<&str>,
@@ -24,15 +23,14 @@ impl CdpConnection {
Some(f(browser_context, &target_id))
}
- pub(crate) fn mutate_background_target_page_session_state(
+ pub(crate) fn mutate_target_page_state_for_session(
&mut self,
session_id: Option<&str>,
f: impl FnOnce(&mut TargetPageState),
) -> bool {
- self.with_background_target_session(session_id, |browser_context, target_id| {
- browser_context.mutate_parked_page_session_state(target_id, f);
- })
- .is_some()
+ self.target_session_owner_mut(session_id)
+ .and_then(|mut owner| owner.mutate_page_state(|state, _, _| f(state)))
+ .is_some()
}
pub(super) fn target_session_owner(
@@ -62,11 +60,12 @@ impl CdpConnection {
let Some(browser_context) = self.browser_context.as_ref() else {
return Some(TargetSessionOwner::NoLoadedBrowserContext);
};
- if !browser_context.has_active_target() {
+ let Some(target_id) = browser_context.active_target_id() else {
return Some(TargetSessionOwner::NoLoadedBrowserContext);
- }
- return Some(TargetSessionOwner::ActiveTarget {
+ };
+ return Some(TargetSessionOwner::PageTarget {
browser_context_id: browser_context.id.clone(),
+ target_id: target_id.to_owned(),
is_auxiliary_target_session: false,
});
}
@@ -77,19 +76,23 @@ impl CdpConnection {
CdpSessionRoute::Browser => Some(
self.browser_context
.as_ref()
- .filter(|browser_context| browser_context.has_active_target())
- .map(|browser_context| TargetSessionOwner::ActiveTarget {
- browser_context_id: browser_context.id.clone(),
- is_auxiliary_target_session: false,
+ .and_then(|browser_context| {
+ Some(TargetSessionOwner::PageTarget {
+ browser_context_id: browser_context.id.clone(),
+ target_id: browser_context.active_target_id()?.to_owned(),
+ is_auxiliary_target_session: false,
+ })
})
.unwrap_or(TargetSessionOwner::NoLoadedBrowserContext),
),
CdpSessionRoute::BrowserContext { browser_context_id } => Some(
self.browser_context_by_id(&browser_context_id)
- .filter(|browser_context| browser_context.has_active_target())
- .map(|_| TargetSessionOwner::ActiveTarget {
- browser_context_id,
- is_auxiliary_target_session: false,
+ .and_then(|browser_context| {
+ Some(TargetSessionOwner::PageTarget {
+ browser_context_id,
+ target_id: browser_context.active_target_id()?.to_owned(),
+ is_auxiliary_target_session: false,
+ })
})
.unwrap_or(TargetSessionOwner::NoLoadedBrowserContext),
),
@@ -99,13 +102,8 @@ impl CdpConnection {
is_attached_session,
} => {
let browser_context = self.browser_context_by_id(&browser_context_id)?;
- if browser_context.is_active_target(&target_id) {
- Some(TargetSessionOwner::ActiveTarget {
- browser_context_id,
- is_auxiliary_target_session: is_attached_session,
- })
- } else if browser_context.page_target(&target_id).is_some() {
- Some(TargetSessionOwner::PageTargetHost {
+ if browser_context.page_target(&target_id).is_some() {
+ Some(TargetSessionOwner::PageTarget {
browser_context_id,
target_id,
is_auxiliary_target_session: is_attached_session,
diff --git a/moli-protocol/src/conn/browser_context/target_session_owner.rs b/moli-protocol/src/conn/browser_context/target_session_owner.rs
index 5e60fd7a3..9c1a9301d 100644
--- a/moli-protocol/src/conn/browser_context/target_session_owner.rs
+++ b/moli-protocol/src/conn/browser_context/target_session_owner.rs
@@ -28,13 +28,7 @@ use moli_fetch::BrowserNavigationRequestKind;
use url::Url;
pub(super) enum TargetSessionOwnerMut<'a> {
- ActiveTarget {
- browser_context: &'a mut BrowserContext,
- session_id: Option<String>,
- is_auxiliary_target_session: bool,
- is_current_active_browser_context: bool,
- },
- PageTargetHost {
+ PageTarget {
browser_context: &'a mut BrowserContext,
target_id: String,
session_id: Option<String>,
@@ -44,12 +38,7 @@ pub(super) enum TargetSessionOwnerMut<'a> {
}
pub(super) enum TargetSessionOwnerRef<'a> {
- ActiveTarget {
- browser_context: &'a BrowserContext,
- session_id: Option<String>,
- is_auxiliary_target_session: bool,
- },
- PageTargetHost {
+ PageTarget {
browser_context: &'a BrowserContext,
target_id: String,
session_id: Option<String>,
@@ -103,12 +92,7 @@ impl ClosedPageTarget {
}
pub(super) enum TargetSessionStateMut<'a> {
- Active {
- devtools_session_state: &'a mut DevToolsSessionState,
- network_policy: &'a mut TargetNetworkPolicyState,
- tls_verify_host_override: &'a mut Option<bool>,
- },
- Parked {
+ Loaded {
devtools_session_state: &'a mut DevToolsSessionState,
network_policy: &'a mut TargetNetworkPolicyState,
tls_verify_host_override: &'a mut Option<bool>,
@@ -263,62 +247,106 @@ impl TargetNavigationLoadInputs {
.then_some(report)
}
- fn from_browser_context_active_target(browser_context: &BrowserContext) -> Self {
- Self {
+ fn from_browser_context_target(
+ browser_context: &BrowserContext,
+ target_id: &str,
+ ) -> Option<Self> {
+ let target = browser_context.page_target(target_id)?;
+ let page_state = target.state();
+ let mut document_start_scripts = Vec::new();
+ let generated_surface_script = if browser_context.is_active_target(target_id) {
+ browser_context.generated_surface_override_script_for_active_target()
+ } else {
+ browser_context.generated_surface_override_script_for_parked_state(page_state)
+ };
+ if let Some(script) = generated_surface_script {
+ document_start_scripts.push(script);
+ }
+ document_start_scripts.extend(browser_context.default_document_start_script_descriptors());
+ document_start_scripts.extend(target.owner_state.document_start_scripts.iter().map(
+ |(identifier, script)| {
+ BrowserContext::target_document_start_script_descriptor(
+ Some(target_id),
+ identifier,
+ script,
+ )
+ },
+ ));
+
+ let effective_network_conditions = page_state
+ .network_conditions
+ .or(browser_context.default_network_conditions)
+ .or(browser_context.global_network_conditions);
+ let emulated_device_metrics = page_state
+ .emulated_device_metrics
+ .clone()
+ .or_else(|| browser_context.default_emulated_device_metrics.clone());
+
+ Some(Self {
browser_context_id: Some(browser_context.id.clone()),
storage_handles: TargetNavigationStorageHandles::from_page_handles(
- browser_context.page_storage_handles(),
+ browser_context.page_storage_handles_for_target(target_id)?,
),
- root_frame_id: browser_context.active_target_id_owned(),
+ root_frame_id: Some(target_id.to_owned()),
renderer_runtime: browser_context.renderer_runtime_owner_access(),
- browser_identity_override: browser_context
- .effective_active_browser_identity_override_owned(),
- navigator_identity_override: browser_context
- .effective_active_renderer_browser_identity_override_owned(),
- http_proxy_override: browser_context.effective_active_http_proxy_override_owned(),
- http_no_proxy_override: browser_context.effective_active_http_no_proxy_override_owned(),
- tls_verify_host_override: browser_context.effective_active_tls_verify_host_override(),
+ browser_identity_override: page_state
+ .network_policy
+ .browser_identity_override_owned()
+ .or_else(|| browser_context.default_browser_identity_override_owned()),
+ navigator_identity_override: page_state
+ .effective_renderer_browser_identity_override_owned()
+ .or_else(|| browser_context.default_browser_identity_override_owned()),
+ http_proxy_override: page_state
+ .http_proxy_override
+ .clone()
+ .or_else(|| browser_context.default_http_proxy_override.clone()),
+ http_no_proxy_override: page_state
+ .http_no_proxy_override
+ .clone()
+ .or_else(|| browser_context.default_http_no_proxy_override.clone()),
+ tls_verify_host_override: page_state
+ .tls_verify_host_override
+ .or(browser_context.default_tls_verify_host_override),
navigation_initiator_url: target_navigation_initiator_url(
- browser_context.target_url(),
- browser_context.loaded_page(),
+ target.target_url(),
+ target.loaded_page(),
),
browser_navigation_kind: BrowserNavigationRequestKind::Navigate,
infer_navigation_referrer: true,
- document_start_scripts: browser_context.document_start_script_descriptors(),
- runtime_bindings: browser_context
- .devtools_sessions
- .runtime_bindings_for_renderer(),
- runtime_inspector_session_restore_snapshots: browser_context
+ document_start_scripts,
+ runtime_bindings: page_state.devtools_sessions.runtime_bindings_for_renderer(),
+ runtime_inspector_session_restore_snapshots: page_state
.devtools_sessions
.runtime_inspector_restore_snapshots(),
- extra_http_headers: browser_context.effective_extra_headers(),
- locale_override: browser_context.effective_active_locale_override_owned(),
- timezone_override: browser_context.effective_active_timezone_override_owned(),
- script_execution_disabled: browser_context.script_execution_disabled,
- bypass_content_security_policy: browser_context
- .devtools_sessions
- .page_bypass_csp_enabled(),
- cpu_throttling_rate: browser_context.cpu_throttling_rate,
- emulated_media: (&browser_context.emulated_media).into(),
- viewport_surface: browser_context
- .effective_active_emulated_device_metrics()
+ extra_http_headers: browser_context
+ .merged_extra_headers_for_target_policy(page_state.network_policy.extra_headers()),
+ locale_override: page_state
+ .locale_override
+ .clone()
+ .or_else(|| browser_context.default_locale_override.clone()),
+ timezone_override: page_state
+ .timezone_override
+ .clone()
+ .or_else(|| browser_context.default_timezone_override.clone()),
+ script_execution_disabled: page_state.script_execution_disabled,
+ bypass_content_security_policy: page_state.devtools_sessions.page_bypass_csp_enabled(),
+ cpu_throttling_rate: page_state.cpu_throttling_rate,
+ emulated_media: (&page_state.emulated_media).into(),
+ viewport_surface: emulated_device_metrics
.as_ref()
.map(|metrics| metrics.viewport_surface().to_page_viewport_surface()),
- network_offline: browser_context.network_policy.network_offline()
- || browser_context.effective_active_network_offline(),
- bypass_service_worker: browser_context.network_policy.bypass_service_worker(),
- cache_disabled: browser_context.network_policy.cache_disabled(),
- blocked_url_patterns: browser_context
- .network_policy
- .blocked_url_patterns()
- .to_vec(),
- fetch_subresource_interception: browser_context
- .active_target
+ network_offline: page_state.network_policy.network_offline()
+ || effective_network_conditions
+ .is_some_and(|conditions| !conditions.navigator_online()),
+ bypass_service_worker: page_state.network_policy.bypass_service_worker(),
+ cache_disabled: page_state.network_policy.cache_disabled(),
+ blocked_url_patterns: page_state.network_policy.blocked_url_patterns().to_vec(),
+ fetch_subresource_interception: page_state
.fetch_owner
.subresource_interception_config(),
permission_overrides: Vec::new(),
main_document_commit_seed: None,
- }
+ })
}
fn from_browser_context_fallback(browser_context: &BrowserContext) -> Self {
@@ -429,18 +457,14 @@ fn target_navigation_initiator_url(target_url: &str, loaded_page: Option<&Page>)
url.host_str().is_some().then_some(url)
}
-fn clear_parked_page_runtime_remote_object_tracking(
- state: &mut crate::conn::state::TargetPageState,
-) {
+fn clear_page_runtime_remote_object_tracking(state: &mut crate::conn::state::TargetPageState) {
for session in state.devtools_sessions.states_mut() {
session.clear_runtime_remote_object_tracking();
}
}
-fn clear_parked_page_loaded_document_session_state(
- state: &mut crate::conn::state::TargetPageState,
-) {
- clear_parked_page_runtime_remote_object_tracking(state);
+fn clear_page_loaded_document_session_state(state: &mut crate::conn::state::TargetPageState) {
+ clear_page_runtime_remote_object_tracking(state);
for session in state.devtools_sessions.states_mut() {
session
.page_session_state
@@ -460,47 +484,32 @@ fn renderer_runtime_inspector_session_id(
}
impl<'a> TargetSessionOwnerRef<'a> {
- fn navigation_initiator_url(&self) -> Option<Url> {
+ fn target(&self) -> Option<&'a crate::conn::PageTargetHost> {
match self {
- Self::ActiveTarget {
- browser_context, ..
- } => target_navigation_initiator_url(
- browser_context.target_url(),
- browser_context.loaded_page(),
- ),
- Self::PageTargetHost {
+ Self::PageTarget {
browser_context,
target_id,
..
- } => {
- let target = browser_context.background_target(target_id)?;
- target_navigation_initiator_url(target.target_url(), target.loaded_page())
- }
+ } => browser_context.page_target(target_id),
Self::NoLoadedBrowserContext => None,
}
}
+ fn navigation_initiator_url(&self) -> Option<Url> {
+ let target = self.target()?;
+ target_navigation_initiator_url(target.target_url(), target.loaded_page())
+ }
+
pub(super) fn devtools_session_state(&self) -> Option<&'a DevToolsSessionState> {
match self {
- Self::ActiveTarget {
- browser_context,
+ Self::PageTarget {
session_id,
is_auxiliary_target_session,
- } => browser_context
+ ..
+ } => self
+ .target()?
.devtools_sessions
.routed(*is_auxiliary_target_session, session_id.as_deref()),
- Self::PageTargetHost {
- browser_context,
- target_id,
- session_id,
- is_auxiliary_target_session,
- } => browser_context
- .parked_page_session_state(target_id)
- .and_then(|state| {
- state
- .devtools_sessions
- .routed(*is_auxiliary_target_session, session_id.as_deref())
- }),
Self::NoLoadedBrowserContext => None,
}
}
@@ -511,19 +520,7 @@ impl<'a> TargetSessionOwnerRef<'a> {
}
pub(super) fn effective_page_bypass_csp_enabled(&self) -> Option<bool> {
- match self {
- Self::ActiveTarget {
- browser_context, ..
- } => Some(browser_context.devtools_sessions.page_bypass_csp_enabled()),
- Self::PageTargetHost {
- browser_context,
- target_id,
- ..
- } => browser_context
- .parked_page_session_state(target_id)
- .map(|state| state.devtools_sessions.page_bypass_csp_enabled()),
- Self::NoLoadedBrowserContext => None,
- }
+ Some(self.target()?.devtools_sessions.page_bypass_csp_enabled())
}
pub(super) fn runtime_session_state(&self) -> Option<&'a TargetRuntimeSessionState> {
@@ -533,12 +530,7 @@ impl<'a> TargetSessionOwnerRef<'a> {
pub(super) fn renderer_runtime_inspector_session_id(&self) -> Option<String> {
match self {
- Self::ActiveTarget {
- session_id,
- is_auxiliary_target_session,
- ..
- }
- | Self::PageTargetHost {
+ Self::PageTarget {
session_id,
is_auxiliary_target_session,
..
@@ -551,36 +543,13 @@ impl<'a> TargetSessionOwnerRef<'a> {
}
pub(super) fn runtime_bindings_for_renderer(&self) -> Vec<RuntimeBindingDefinition> {
- match self {
- Self::ActiveTarget {
- browser_context, ..
- } => browser_context
- .devtools_sessions
- .runtime_bindings_for_renderer(),
- Self::PageTargetHost {
- browser_context,
- target_id,
- ..
- } => browser_context
- .parked_page_session_state(target_id)
- .map(|state| state.devtools_sessions.runtime_bindings_for_renderer())
- .unwrap_or_default(),
- Self::NoLoadedBrowserContext => Vec::new(),
- }
+ self.target()
+ .map(|target| target.devtools_sessions.runtime_bindings_for_renderer())
+ .unwrap_or_default()
}
pub(super) fn target_owner_state(&self) -> Option<&'a TargetOwnerState> {
- match self {
- Self::ActiveTarget {
- browser_context, ..
- } => Some(&browser_context.active_target.owner_state),
- Self::PageTargetHost {
- browser_context,
- target_id,
- ..
- } => browser_context.parked_target_owner_state(target_id),
- Self::NoLoadedBrowserContext => None,
- }
+ Some(&self.target()?.owner_state)
}
pub(super) fn initial_empty_document_url_if_current(&self) -> Option<String> {
@@ -607,46 +576,16 @@ impl<'a> TargetSessionOwnerRef<'a> {
}
pub(super) fn aggregate_fetch_config(&self) -> Option<TargetFetchConfig> {
- match self {
- Self::ActiveTarget {
- browser_context, ..
- } => Some(browser_context.active_target.fetch_owner.config_snapshot()),
- Self::PageTargetHost {
- browser_context,
- target_id,
- ..
- } => browser_context
- .background_target(target_id)
- .map(|target| target.fetch_owner.config_snapshot()),
- Self::NoLoadedBrowserContext => None,
- }
+ Some(self.target()?.fetch_owner.config_snapshot())
}
pub(super) fn runtime_slot(&self) -> Option<&'a TargetRuntimeSlot> {
- match self {
- Self::ActiveTarget {
- browser_context, ..
- } => Some(&browser_context.active_target.runtime_slot),
- Self::PageTargetHost {
- browser_context,
- target_id,
- ..
- } => browser_context
- .background_target(target_id)
- .map(|target| target.runtime_slot()),
- Self::NoLoadedBrowserContext => None,
- }
+ Some(self.target()?.runtime_slot())
}
pub(super) fn owner_identity(&self) -> Option<(String, Option<String>)> {
match self {
- Self::ActiveTarget {
- browser_context, ..
- } => Some((
- browser_context.id.clone(),
- browser_context.active_target_id_owned(),
- )),
- Self::PageTargetHost {
+ Self::PageTarget {
browser_context,
target_id,
..
@@ -656,78 +595,28 @@ impl<'a> TargetSessionOwnerRef<'a> {
}
pub(super) fn primary_session_id(&self) -> Option<String> {
- match self {
- Self::ActiveTarget {
- browser_context, ..
- } => browser_context.active_session_id_owned(),
- Self::PageTargetHost {
- browser_context,
- target_id,
- ..
- } => browser_context
- .background_target(target_id)
- .and_then(|target| target.session_id().map(str::to_owned)),
- Self::NoLoadedBrowserContext => None,
- }
+ self.target()?.session_id().map(str::to_owned)
}
pub(super) fn target_url(&self) -> Option<String> {
- match self {
- Self::ActiveTarget {
- browser_context, ..
- } => Some(browser_context.target_url().to_owned()),
- Self::PageTargetHost {
- browser_context,
- target_id,
- ..
- } => browser_context
- .background_target(target_id)
- .map(|target| target.target_url().to_owned()),
- Self::NoLoadedBrowserContext => None,
- }
+ Some(self.target()?.target_url().to_owned())
}
pub(super) fn frame_tree_identity(&self) -> Option<(String, String, String, String)> {
- match self {
- Self::ActiveTarget {
- browser_context, ..
- } => {
- let document_url = browser_context
- .active_target
- .runtime_slot
- .loaded_page()
- // Only a browser-owned network error Document diverges
- // from the user-visible Target/history URL in this fix.
- // Initial-empty popup identity remains a separate issue.
- .filter(|page| page.final_url().as_str() == NETWORK_ERROR_PAGE_URL)
- .map(|page| page.final_url().to_string())
- .unwrap_or_else(|| browser_context.target_url().to_owned());
- Some((
- browser_context.active_target_id_owned()?,
- document_url,
- browser_context.target_security_origin().to_owned(),
- browser_context.target_secure_context_type().to_owned(),
- ))
- }
- Self::PageTargetHost {
- browser_context,
- target_id,
- ..
- } => {
- let target = browser_context.background_target(target_id)?;
- Some((
- target.target_id().to_owned(),
- target
- .loaded_page()
- .filter(|page| page.final_url().as_str() == NETWORK_ERROR_PAGE_URL)
- .map(|page| page.final_url().to_string())
- .unwrap_or_else(|| target.target_identity().url().to_owned()),
- target.target_identity().security_origin().to_owned(),
- target.target_identity().secure_context_type().to_owned(),
- ))
- }
- Self::NoLoadedBrowserContext => None,
- }
+ let target = self.target()?;
+ let document_url = target
+ .loaded_page()
+ // Only a browser-owned network error Document diverges from the
+ // user-visible Target/history URL.
+ .filter(|page| page.final_url().as_str() == NETWORK_ERROR_PAGE_URL)
+ .map(|page| page.final_url().to_string())
+ .unwrap_or_else(|| target.target_identity().url().to_owned());
+ Some((
+ target.target_id().to_owned(),
+ document_url,
+ target.target_identity().security_origin().to_owned(),
+ target.target_identity().secure_context_type().to_owned(),
+ ))
}
pub(super) fn frame_tree_loader_id(&self) -> Option<String> {
@@ -743,126 +632,30 @@ impl<'a> TargetSessionOwnerRef<'a> {
pub(super) fn emulated_device_metrics(&self) -> Option<EmulatedDeviceMetrics> {
match self {
- Self::ActiveTarget {
- browser_context, ..
- } => browser_context.effective_active_emulated_device_metrics(),
- Self::PageTargetHost {
+ Self::PageTarget {
browser_context,
target_id,
..
- } => browser_context.effective_parked_emulated_device_metrics(target_id),
+ } => browser_context
+ .page_target(target_id)?
+ .emulated_device_metrics
+ .clone()
+ .or_else(|| browser_context.default_emulated_device_metrics.clone()),
Self::NoLoadedBrowserContext => None,
}
}
pub(super) fn navigation_load_inputs(&self) -> TargetNavigationLoadInputs {
match self {
- Self::ActiveTarget {
- browser_context, ..
- } => TargetNavigationLoadInputs::from_browser_context_active_target(browser_context),
- Self::PageTargetHost {
+ Self::PageTarget {
browser_context,
target_id,
..
} => {
- let Some(target) = browser_context.background_target(target_id) else {
- return TargetNavigationLoadInputs::from_browser_context_fallback(
- browser_context,
- );
- };
- let page_state = target.state();
- let mut document_start_scripts = Vec::new();
- if let Some(script) =
- browser_context.generated_surface_override_script_for_parked_target(target_id)
- {
- document_start_scripts.push(script);
- }
- document_start_scripts
- .extend(browser_context.default_document_start_script_descriptors());
- if let Some(owner_state) = browser_context.parked_target_owner_state(target_id) {
- document_start_scripts.extend(owner_state.document_start_scripts.iter().map(
- |(identifier, script)| {
- BrowserContext::target_document_start_script_descriptor(
- Some(target_id.as_str()),
- identifier,
- script,
- )
- },
- ));
- }
- let runtime_bindings = page_state.devtools_sessions.runtime_bindings_for_renderer();
- let runtime_inspector_session_restore_snapshots = page_state
- .devtools_sessions
- .runtime_inspector_restore_snapshots();
- let extra_http_headers = page_state.network_policy.extra_headers().to_vec();
- let locale_override = page_state
- .locale_override
- .clone()
- .or_else(|| browser_context.default_locale_override.clone());
-
- TargetNavigationLoadInputs {
- browser_context_id: Some(browser_context.id.clone()),
- storage_handles: TargetNavigationStorageHandles::from_page_handles(
- browser_context
- .page_storage_handles_for_target(target_id)
- .expect("background target must retain target-owned storage"),
- ),
- root_frame_id: Some(target_id.clone()),
- renderer_runtime: browser_context.renderer_runtime_owner_access(),
- browser_identity_override: page_state
- .network_policy
- .browser_identity_override_owned()
- .or_else(|| browser_context.default_browser_identity_override_owned()),
- navigator_identity_override: page_state
- .effective_renderer_browser_identity_override_owned()
- .or_else(|| browser_context.default_browser_identity_override_owned()),
- http_proxy_override: page_state
- .http_proxy_override
- .clone()
- .or_else(|| browser_context.default_http_proxy_override.clone()),
- http_no_proxy_override: page_state
- .http_no_proxy_override
- .clone()
- .or_else(|| browser_context.default_http_no_proxy_override.clone()),
- tls_verify_host_override: page_state
- .tls_verify_host_override
- .or(browser_context.default_tls_verify_host_override),
- navigation_initiator_url: target_navigation_initiator_url(
- target.target_url(),
- target.loaded_page(),
- ),
- browser_navigation_kind: BrowserNavigationRequestKind::Navigate,
- infer_navigation_referrer: true,
- document_start_scripts,
- runtime_bindings,
- runtime_inspector_session_restore_snapshots,
- extra_http_headers,
- locale_override,
- timezone_override: page_state
- .timezone_override
- .clone()
- .or_else(|| browser_context.default_timezone_override.clone()),
- script_execution_disabled: page_state.script_execution_disabled,
- bypass_content_security_policy: page_state
- .devtools_sessions
- .page_bypass_csp_enabled(),
- cpu_throttling_rate: page_state.cpu_throttling_rate,
- emulated_media: (&page_state.emulated_media).into(),
- viewport_surface: browser_context
- .effective_parked_emulated_device_metrics(target_id)
- .as_ref()
- .map(|metrics| metrics.viewport_surface().to_page_viewport_surface()),
- network_offline: page_state.network_policy.network_offline()
- || browser_context.effective_parked_network_offline(target_id),
- bypass_service_worker: page_state.network_policy.bypass_service_worker(),
- cache_disabled: page_state.network_policy.cache_disabled(),
- blocked_url_patterns: page_state.network_policy.blocked_url_patterns().to_vec(),
- fetch_subresource_interception: page_state
- .fetch_owner
- .subresource_interception_config(),
- permission_overrides: Vec::new(),
- main_document_commit_seed: None,
- }
+ TargetNavigationLoadInputs::from_browser_context_target(browser_context, target_id)
+ .unwrap_or_else(|| {
+ TargetNavigationLoadInputs::from_browser_context_fallback(browser_context)
+ })
}
Self::NoLoadedBrowserContext => unreachable!(
"connection-owned no-context load inputs must be provided by CdpConnection"
@@ -874,11 +667,7 @@ impl<'a> TargetSessionOwnerRef<'a> {
impl TargetSessionStateMut<'_> {
pub(super) fn devtools_session_state_mut(&mut self) -> Option<&mut DevToolsSessionState> {
match self {
- Self::Active {
- devtools_session_state,
- ..
- }
- | Self::Parked {
+ Self::Loaded {
devtools_session_state,
..
} => Some(&mut **devtools_session_state),
@@ -888,11 +677,7 @@ impl TargetSessionStateMut<'_> {
pub(super) fn page_session_state_mut(&mut self) -> Option<&mut TargetPageSessionState> {
match self {
- Self::Active {
- devtools_session_state,
- ..
- }
- | Self::Parked {
+ Self::Loaded {
devtools_session_state,
..
} => Some(&mut devtools_session_state.page_session_state),
@@ -902,11 +687,7 @@ impl TargetSessionStateMut<'_> {
pub(super) fn runtime_session_state_mut(&mut self) -> Option<&mut TargetRuntimeSessionState> {
match self {
- Self::Active {
- devtools_session_state,
- ..
- }
- | Self::Parked {
+ Self::Loaded {
devtools_session_state,
..
} => Some(&mut devtools_session_state.runtime_session_state),
@@ -916,20 +697,14 @@ impl TargetSessionStateMut<'_> {
pub(super) fn network_policy_mut(&mut self) -> Option<&mut TargetNetworkPolicyState> {
match self {
- Self::Active { network_policy, .. } | Self::Parked { network_policy, .. } => {
- Some(*network_policy)
- }
+ Self::Loaded { network_policy, .. } => Some(*network_policy),
Self::NoLoaded => None,
}
}
pub(super) fn tls_verify_host_override_mut(&mut self) -> Option<&mut Option<bool>> {
match self {
- Self::Active {
- tls_verify_host_override,
- ..
- }
- | Self::Parked {
+ Self::Loaded {
tls_verify_host_override,
..
} => Some(*tls_verify_host_override),
@@ -939,75 +714,79 @@ impl TargetSessionStateMut<'_> {
}
impl<'a> TargetSessionOwnerMut<'a> {
- pub(super) fn target_url(&self) -> Option<String> {
+ fn target(&self) -> Option<&crate::conn::PageTargetHost> {
match self {
- Self::ActiveTarget {
- browser_context, ..
- } => Some(browser_context.target_url().to_owned()),
- Self::PageTargetHost {
+ Self::PageTarget {
browser_context,
target_id,
..
- } => browser_context
- .background_target(target_id)
- .map(|target| target.target_url().to_owned()),
+ } => browser_context.page_target(target_id),
Self::NoLoadedBrowserContext => None,
}
}
- pub(super) fn runtime_slot_ref(&self) -> Option<&TargetRuntimeSlot> {
+ fn target_mut(&mut self) -> Option<&mut crate::conn::PageTargetHost> {
match self {
- Self::ActiveTarget {
- browser_context, ..
- } => Some(&browser_context.active_target.runtime_slot),
- Self::PageTargetHost {
+ Self::PageTarget {
browser_context,
target_id,
..
- } => browser_context
- .background_target(target_id)
- .map(|target| target.runtime_slot()),
+ } => browser_context.page_target_mut(target_id),
+ Self::NoLoadedBrowserContext => None,
+ }
+ }
+
+ fn into_target_mut(self) -> Option<&'a mut crate::conn::PageTargetHost> {
+ match self {
+ Self::PageTarget {
+ browser_context,
+ target_id,
+ ..
+ } => browser_context.page_target_mut(&target_id),
Self::NoLoadedBrowserContext => None,
}
}
+ fn page_snapshot(&self) -> Option<(String, String)> {
+ let target = self.target()?;
+ target
+ .runtime_slot()
+ .loaded_page()
+ .map(|page| (target.target_url().to_owned(), page.document_title()))
+ }
+
+ pub(super) fn target_url(&self) -> Option<String> {
+ Some(self.target()?.target_url().to_owned())
+ }
+
+ pub(super) fn runtime_slot_ref(&self) -> Option<&TargetRuntimeSlot> {
+ Some(self.target()?.runtime_slot())
+ }
+
pub(super) fn mutate_session_state_ref<T>(
&mut self,
f: impl FnOnce(TargetSessionStateMut<'_>) -> T,
) -> T {
match self {
- Self::ActiveTarget {
+ Self::PageTarget {
browser_context,
+ target_id,
session_id,
is_auxiliary_target_session,
- ..
} => {
- let state = browser_context.active_page_state_mut();
+ let Some(target) = browser_context.page_target_mut(target_id) else {
+ return f(TargetSessionStateMut::NoLoaded);
+ };
+ let state = target.state_mut();
let devtools_session_state = state
.devtools_sessions
.routed_mut_or_insert(*is_auxiliary_target_session, session_id.as_deref());
- f(TargetSessionStateMut::Active {
+ f(TargetSessionStateMut::Loaded {
devtools_session_state,
network_policy: &mut state.network_policy,
tls_verify_host_override: &mut state.tls_verify_host_override,
})
}
- Self::PageTargetHost {
- browser_context,
- target_id,
- session_id,
- is_auxiliary_target_session,
- ..
- } => browser_context.mutate_parked_page_session_state(target_id, |state| {
- let devtools_session_state = state
- .devtools_sessions
- .routed_mut_or_insert(*is_auxiliary_target_session, session_id.as_deref());
- f(TargetSessionStateMut::Parked {
- devtools_session_state,
- network_policy: &mut state.network_policy,
- tls_verify_host_override: &mut state.tls_verify_host_override,
- })
- }),
Self::NoLoadedBrowserContext => f(TargetSessionStateMut::NoLoaded),
}
}
@@ -1017,27 +796,16 @@ impl<'a> TargetSessionOwnerMut<'a> {
f: impl FnOnce(&mut TargetPageState, bool, Option<&str>) -> T,
) -> Option<T> {
match self {
- Self::ActiveTarget {
+ Self::PageTarget {
browser_context,
+ target_id,
session_id,
is_auxiliary_target_session,
- ..
} => Some(f(
- browser_context.active_page_state_mut(),
+ browser_context.page_target_mut(target_id)?.state_mut(),
*is_auxiliary_target_session,
session_id.as_deref(),
)),
- Self::PageTargetHost {
- browser_context,
- target_id,
- session_id,
- is_auxiliary_target_session,
- ..
- } => Some(
- browser_context.mutate_parked_page_session_state(target_id, |state| {
- f(state, *is_auxiliary_target_session, session_id.as_deref())
- }),
- ),
Self::NoLoadedBrowserContext => None,
}
}
@@ -1054,15 +822,10 @@ impl<'a> TargetSessionOwnerMut<'a> {
f: impl FnOnce(Option<&mut TargetOwnerState>) -> T,
) -> T {
match self {
- Self::ActiveTarget {
- browser_context, ..
- } => f(Some(&mut browser_context.active_target.owner_state)),
- Self::PageTargetHost {
- browser_context,
- target_id,
- ..
- } => browser_context
- .mutate_parked_target_owner_state(target_id, |owner_state| f(Some(owner_state))),
+ Self::PageTarget { .. } => {
+ let owner_state = self.target_mut().map(|target| &mut target.owner_state);
+ f(owner_state)
+ }
Self::NoLoadedBrowserContext => f(None),
}
}
@@ -1073,38 +836,11 @@ impl<'a> TargetSessionOwnerMut<'a> {
handle_auth_requests: bool,
patterns: Vec<FetchInterceptionPattern>,
) -> Option<(bool, Option<moli_core::page::SubresourceResourceType>)> {
- match self {
- Self::ActiveTarget {
- browser_context, ..
- } => {
- browser_context.active_target.fetch_owner.configure(
- command_session_id,
- handle_auth_requests,
- patterns,
- );
- Some(
- browser_context
- .active_target
- .fetch_owner
- .subresource_interception_config(),
- )
- }
- Self::PageTargetHost {
- browser_context,
- target_id,
- ..
- } => {
- let mut subresource_config = (false, None);
- browser_context.mutate_parked_page_session_state(target_id, |state| {
- state
- .fetch_owner
- .configure(command_session_id, handle_auth_requests, patterns);
- subresource_config = state.fetch_owner.subresource_interception_config();
- });
- Some(subresource_config)
- }
- Self::NoLoadedBrowserContext => None,
- }
+ let target = self.target_mut()?;
+ target
+ .fetch_owner
+ .configure(command_session_id, handle_auth_requests, patterns);
+ Some(target.fetch_owner.subresource_interception_config())
}
pub(super) fn add_network_intercept(
@@ -1115,149 +851,45 @@ impl<'a> TargetSessionOwnerMut<'a> {
auth_url_patterns: Vec<String>,
patterns: Vec<FetchInterceptionPattern>,
) -> Option<(bool, Option<moli_core::page::SubresourceResourceType>)> {
- match self {
- Self::ActiveTarget {
- browser_context, ..
- } => {
- browser_context
- .active_target
- .fetch_owner
- .add_network_intercept(
- intercept_id,
- command_session_id,
- handle_auth_requests,
- auth_url_patterns,
- patterns,
- );
- Some(
- browser_context
- .active_target
- .fetch_owner
- .subresource_interception_config(),
- )
- }
- Self::PageTargetHost {
- browser_context,
- target_id,
- ..
- } => {
- let mut subresource_config = (false, None);
- browser_context.mutate_parked_page_session_state(target_id, |state| {
- state.fetch_owner.add_network_intercept(
- intercept_id,
- command_session_id,
- handle_auth_requests,
- auth_url_patterns,
- patterns,
- );
- subresource_config = state.fetch_owner.subresource_interception_config();
- });
- Some(subresource_config)
- }
- Self::NoLoadedBrowserContext => None,
- }
+ let target = self.target_mut()?;
+ target.fetch_owner.add_network_intercept(
+ intercept_id,
+ command_session_id,
+ handle_auth_requests,
+ auth_url_patterns,
+ patterns,
+ );
+ Some(target.fetch_owner.subresource_interception_config())
}
pub(super) fn remove_network_intercept(
&mut self,
intercept_id: &str,
) -> Option<(bool, Option<moli_core::page::SubresourceResourceType>)> {
- match self {
- Self::ActiveTarget {
- browser_context, ..
- } => {
- if !browser_context
- .active_target
- .fetch_owner
- .remove_network_intercept(intercept_id)
- {
- return None;
- }
- Some(
- browser_context
- .active_target
- .fetch_owner
- .subresource_interception_config(),
- )
- }
- Self::PageTargetHost {
- browser_context,
- target_id,
- ..
- } => {
- let mut removed = false;
- let mut subresource_config = (false, None);
- browser_context.mutate_parked_page_session_state(target_id, |state| {
- removed = state.fetch_owner.remove_network_intercept(intercept_id);
- subresource_config = state.fetch_owner.subresource_interception_config();
- });
- removed.then_some(subresource_config)
- }
- Self::NoLoadedBrowserContext => None,
- }
+ let target = self.target_mut()?;
+ target
+ .fetch_owner
+ .remove_network_intercept(intercept_id)
+ .then(|| target.fetch_owner.subresource_interception_config())
}
pub(super) fn reset_fetch_config_for_session_and_drain_pending_state(
&mut self,
session_id: Option<&str>,
) -> Option<FetchDisableStateWithSubresourceConfig> {
- match self {
- Self::ActiveTarget {
- browser_context, ..
- } => {
- let previous_subresource_config = browser_context
- .active_target
- .fetch_owner
- .subresource_interception_config();
- let removed = browser_context
- .active_target
- .fetch_owner
- .remove_fetch_session(session_id);
- let subresource_config = browser_context
- .active_target
- .fetch_owner
- .subresource_interception_config();
- let pending = if removed {
- browser_context
- .active_target
- .fetch_owner
- .drain_pending_requests_for_disable_session(session_id)
- } else {
- empty_pending_fetch_state()
- };
- let page_update_required =
- removed && previous_subresource_config != subresource_config;
- Some((pending, subresource_config, page_update_required))
- }
- Self::PageTargetHost {
- browser_context,
- target_id,
- ..
- } => {
- let previous_subresource_config = browser_context
- .background_target(target_id)
- .map(|target| target.fetch_owner.subresource_interception_config())
- .unwrap_or((false, None));
- let mut subresource_config = (false, None);
- let mut removed = false;
- browser_context.mutate_parked_page_session_state(target_id, |state| {
- removed = state.fetch_owner.remove_fetch_session(session_id);
- subresource_config = state.fetch_owner.subresource_interception_config();
- });
- let pending = if removed {
- browser_context
- .background_target_mut(target_id)?
- .fetch_owner
- .drain_pending_requests_for_disable_session(session_id)
- } else {
- empty_pending_fetch_state()
- };
- let page_update_required =
- removed && previous_subresource_config != subresource_config;
- Some((pending, subresource_config, page_update_required))
- }
- Self::NoLoadedBrowserContext => None,
- }
+ let target = self.target_mut()?;
+ let previous_subresource_config = target.fetch_owner.subresource_interception_config();
+ let removed = target.fetch_owner.remove_fetch_session(session_id);
+ let subresource_config = target.fetch_owner.subresource_interception_config();
+ let pending = if removed {
+ target
+ .fetch_owner
+ .drain_pending_requests_for_disable_session(session_id)
+ } else {
+ empty_pending_fetch_state()
+ };
+ let page_update_required = removed && previous_subresource_config != subresource_config;
+ Some((pending, subresource_config, page_update_required))
}
pub(super) fn drain_fetch_pending_state(
@@ -1270,65 +902,28 @@ impl<'a> TargetSessionOwnerMut<'a> {
Vec<(String, PendingSubresourceFetchAuthRequest)>,
Vec<(String, PendingSubresourceFetchResponseRequest)>,
)> {
- match self {
- Self::ActiveTarget {
- browser_context, ..
- } => Some(browser_context.take_active_target_pending_fetch_state()),
- Self::PageTargetHost {
- browser_context,
- target_id,
- ..
- } => Some(
- browser_context
- .background_target_mut(target_id)?
- .fetch_owner
- .drain_pending_requests(),
- ),
- Self::NoLoadedBrowserContext => None,
- }
+ Some(self.target_mut()?.fetch_owner.drain_pending_requests())
}
pub(super) async fn mark_target_crashed_async(&mut self) -> Option<()> {
- match self {
- Self::ActiveTarget {
- browser_context, ..
- } => {
- browser_context.mark_active_target_crashed_async().await;
- Some(())
- }
- Self::PageTargetHost {
- browser_context,
- target_id,
- ..
- } => {
- browser_context.background_target(target_id)?;
- browser_context.mutate_parked_target_owner_state(target_id, |owner_state| {
- owner_state.target_crash_state.mark_crashed();
- owner_state.navigation_history_state.clear();
- owner_state.clear_loaded_document_context_state();
- });
- browser_context.mutate_parked_page_session_state(target_id, |state| {
- clear_parked_page_loaded_document_session_state(state);
- });
- let previous = {
- let target = browser_context.background_target_mut(target_id)?;
- target.runtime_slot.clear_document_navigation_state();
- let previous = target
- .runtime_slot
- .clear_loaded_page_with_reason(TargetPageAbsenceReason::TargetCrashed);
- target.runtime_slot.reset_subresource_cursor();
- target
- .runtime_slot
- .reset_all_target_scoped_network_artifacts();
- previous
- };
- if let Some(page) = previous {
- let _ = page.close_async().await;
- }
- Some(())
- }
- Self::NoLoadedBrowserContext => None,
+ let target = self.target_mut()?;
+ target.owner_state.target_crash_state.mark_crashed();
+ target.owner_state.navigation_history_state.clear();
+ target.owner_state.clear_loaded_document_context_state();
+ clear_page_loaded_document_session_state(target.state_mut());
+ target.fetch_owner.clear_pending();
+ target.runtime_slot.clear_document_navigation_state();
+ let previous = target
+ .runtime_slot
+ .clear_loaded_page_with_reason(TargetPageAbsenceReason::TargetCrashed);
+ target.runtime_slot.reset_subresource_cursor();
+ target
+ .runtime_slot
+ .reset_all_target_scoped_network_artifacts();
+ if let Some(page) = previous {
+ let _ = page.close_async().await;
}
+ Some(())
}
pub(super) async fn discard_loaded_page_after_failed_navigation_async(
@@ -1337,355 +932,112 @@ impl<'a> TargetSessionOwnerMut<'a> {
) -> Option<()> {
let next_url = final_url.to_string();
let security_origin = final_url.origin().ascii_serialization();
- match self {
- Self::ActiveTarget {
- browser_context, ..
- } => {
- browser_context.set_target_url(next_url);
- browser_context.set_target_security_origin(security_origin);
- if let Some(target_id) = browser_context.active_target_id_owned() {
- browser_context.mark_target_initial_empty_document_exited(&target_id);
- }
- browser_context
- .active_target
- .runtime_slot
- .clear_document_navigation_state();
- browser_context.clear_active_target_runtime_remote_object_tracking();
- let previous = browser_context
- .clear_loaded_page_with_reason(TargetPageAbsenceReason::NavigationFailed);
- if let Some(page) = previous {
- let _ = page.close_async().await;
- }
- Some(())
- }
- Self::PageTargetHost {
- browser_context,
- target_id,
- ..
- } => {
- browser_context.background_target(target_id)?;
- browser_context.mutate_parked_target_owner_state(target_id, |owner_state| {
- owner_state.mark_initial_empty_document_exited();
- owner_state.clear_committed_document_navigation_state();
- });
- browser_context.mutate_parked_page_session_state(target_id, |state| {
- clear_parked_page_loaded_document_session_state(state);
- });
- let previous = {
- let target = browser_context.background_target_mut(target_id)?;
- target.set_target_url(next_url);
- target.set_target_security_origin(security_origin);
- target.runtime_slot.clear_document_navigation_state();
- let previous = target
- .runtime_slot
- .clear_loaded_page_with_reason(TargetPageAbsenceReason::NavigationFailed);
- target.runtime_slot.reset_subresource_cursor();
- target.runtime_slot.clear_websocket_artifacts();
- previous
- };
- if let Some(page) = previous {
- let _ = page.close_async().await;
- }
- Some(())
- }
- Self::NoLoadedBrowserContext => None,
+ let target = self.target_mut()?;
+ target.set_target_url(next_url);
+ target.set_target_security_origin(security_origin);
+ target.owner_state.mark_initial_empty_document_exited();
+ target
+ .owner_state
+ .clear_committed_document_navigation_state();
+ clear_page_loaded_document_session_state(target.state_mut());
+ target.runtime_slot.clear_document_navigation_state();
+ let previous = target
+ .runtime_slot
+ .clear_loaded_page_with_reason(TargetPageAbsenceReason::NavigationFailed);
+ target.runtime_slot.reset_subresource_cursor();
+ target.runtime_slot.clear_websocket_artifacts();
+ if let Some(page) = previous {
+ let _ = page.close_async().await;
}
+ Some(())
}
pub(super) async fn close_page_target_async(&mut self) -> Option<ClosedPageTarget> {
- match self {
- Self::ActiveTarget {
- browser_context, ..
- } => {
- let target_id = browser_context.active_target_id_owned()?;
- let primary_session_id = browser_context.active_session_id_owned();
- let auxiliary_session_ids =
- browser_context.remove_auxiliary_sessions_for_target(&target_id);
- browser_context.remove_active_page_target_async().await;
- Some(ClosedPageTarget {
- target_id,
- primary_session_id,
- auxiliary_session_ids,
- })
- }
- Self::PageTargetHost {
- browser_context,
- target_id,
- ..
- } => {
- let mut target = browser_context.remove_background_target(target_id)?;
- browser_context.forget_target_opener_references_for_target(target_id);
- browser_context.forget_target_window_names_for_target(target_id);
- browser_context.forget_target_popup_id_for_target(target_id);
- let primary_session_id = target.detach_session();
- let auxiliary_session_ids =
- browser_context.remove_auxiliary_sessions_for_target(target_id);
- target.close_page_async().await;
- Some(ClosedPageTarget {
- target_id: target_id.clone(),
- primary_session_id,
- auxiliary_session_ids,
- })
- }
- Self::NoLoadedBrowserContext => None,
- }
+ let Self::PageTarget {
+ browser_context,
+ target_id,
+ ..
+ } = self
+ else {
+ return None;
+ };
+ let mut target = browser_context.page_targets.remove(target_id)?;
+ browser_context.forget_target_opener_references_for_target(target_id);
+ browser_context.forget_target_window_names_for_target(target_id);
+ browser_context.forget_target_popup_id_for_target(target_id);
+ let primary_session_id = target.detach_session();
+ let auxiliary_session_ids = browser_context.remove_auxiliary_sessions_for_target(target_id);
+ target.close_page_async().await;
+ Some(ClosedPageTarget {
+ target_id: target_id.clone(),
+ primary_session_id,
+ auxiliary_session_ids,
+ })
}
pub(super) fn runtime_slot_mut(&mut self) -> Option<&mut TargetRuntimeSlot> {
- match self {
- Self::ActiveTarget {
- browser_context, ..
- } => Some(&mut browser_context.active_target.runtime_slot),
- Self::PageTargetHost {
- browser_context,
- target_id,
- ..
- } => browser_context
- .background_target_mut(target_id)
- .map(|target| &mut target.runtime_slot),
- Self::NoLoadedBrowserContext => None,
- }
+ Some(&mut self.target_mut()?.runtime_slot)
}
pub(super) fn into_runtime_slot_mut(self) -> Option<&'a mut TargetRuntimeSlot> {
- match self {
- Self::ActiveTarget {
- browser_context, ..
- } => Some(&mut browser_context.active_target.runtime_slot),
- Self::PageTargetHost {
- browser_context,
- target_id,
- ..
- } => browser_context
- .background_target_mut(&target_id)
- .map(|target| &mut target.runtime_slot),
- Self::NoLoadedBrowserContext => None,
- }
+ Some(&mut self.into_target_mut()?.runtime_slot)
}
pub(super) fn navigation_history_snapshot(
&mut self,
) -> Option<(usize, Vec<PageNavigationHistoryEntry>)> {
- match self {
- Self::ActiveTarget {
- browser_context, ..
- } => {
- let target_url = browser_context.target_url().to_owned();
- let page_snapshot = browser_context
- .active_target
- .runtime_slot
- .loaded_page()
- .map(|page| (target_url, page.document_title()));
- Some(
- browser_context
- .active_target
- .owner_state
- .navigation_history_snapshot(page_snapshot),
- )
- }
- Self::PageTargetHost {
- browser_context,
- target_id,
- ..
- } => {
- let page_snapshot =
- browser_context
- .background_target(target_id)
- .and_then(|target| {
- target
- .runtime_slot()
- .loaded_page()
- .map(|page| (target.target_url().to_owned(), page.document_title()))
- });
- Some(
- browser_context.mutate_parked_target_owner_state(target_id, |owner_state| {
- owner_state.navigation_history_snapshot(page_snapshot)
- }),
- )
- }
- Self::NoLoadedBrowserContext => None,
- }
- }
-
- pub(super) fn apply_renderer_document_title(&mut self, title: String) -> Option<bool> {
- match self {
- Self::ActiveTarget {
- browser_context, ..
- } => Some(
- browser_context
- .active_target
- .owner_state
- .commit_document_title(title),
- ),
- Self::PageTargetHost {
- browser_context,
- target_id,
- ..
- } => Some(
- browser_context.mutate_parked_target_owner_state(target_id, |owner_state| {
- owner_state.commit_document_title(title)
- }),
- ),
- Self::NoLoadedBrowserContext => None,
- }
- }
-
- pub(super) fn navigation_history_entry_url(&mut self, entry_id: i32) -> Option<String> {
- match self {
- Self::ActiveTarget {
- browser_context, ..
- } => browser_context.navigation_history_entry_url(entry_id),
- Self::PageTargetHost {
- browser_context,
- target_id,
- ..
- } => {
- let page_snapshot =
- browser_context
- .background_target(target_id)
- .and_then(|target| {
- target
- .runtime_slot()
- .loaded_page()
- .map(|page| (target.target_url().to_owned(), page.document_title()))
- });
- browser_context.mutate_parked_target_owner_state(target_id, |owner_state| {
- owner_state.navigation_history_entry_url(page_snapshot, entry_id)
- })
- }
- Self::NoLoadedBrowserContext => None,
- }
- }
-
- pub(super) fn reset_navigation_history(&mut self) -> Option<bool> {
- match self {
- Self::ActiveTarget {
- browser_context, ..
- } => {
- let target_url = browser_context.target_url().to_owned();
- let page_snapshot = browser_context
- .active_target
- .runtime_slot
- .loaded_page()
- .map(|page| (target_url, page.document_title()));
- Some(
- browser_context
- .active_target
- .owner_state
- .reset_navigation_history(page_snapshot),
- )
- }
- Self::PageTargetHost {
- browser_context,
- target_id,
- ..
- } => {
- let page_snapshot =
- browser_context
- .background_target(target_id)
- .and_then(|target| {
- target
- .runtime_slot()
- .loaded_page()
- .map(|page| (target.target_url().to_owned(), page.document_title()))
- });
- Some(
- browser_context.mutate_parked_target_owner_state(target_id, |owner_state| {
- owner_state.reset_navigation_history(page_snapshot)
- }),
- )
- }
- Self::NoLoadedBrowserContext => None,
- }
- }
-
- pub(super) fn can_reset_navigation_history(&mut self) -> Option<bool> {
- match self {
- Self::ActiveTarget {
- browser_context, ..
- } => {
- let target_url = browser_context.target_url().to_owned();
- let page_snapshot = browser_context
- .active_target
- .runtime_slot
- .loaded_page()
- .map(|page| (target_url, page.document_title()));
- Some(
- browser_context
- .active_target
- .owner_state
- .can_reset_navigation_history(page_snapshot),
- )
- }
- Self::PageTargetHost {
- browser_context,
- target_id,
- ..
- } => {
- let page_snapshot =
- browser_context
- .background_target(target_id)
- .and_then(|target| {
- target
- .runtime_slot()
- .loaded_page()
- .map(|page| (target.target_url().to_owned(), page.document_title()))
- });
- Some(
- browser_context.mutate_parked_target_owner_state(target_id, |owner_state| {
- owner_state.can_reset_navigation_history(page_snapshot)
- }),
- )
- }
- Self::NoLoadedBrowserContext => None,
- }
+ let page_snapshot = self.page_snapshot();
+ Some(
+ self.target_mut()?
+ .owner_state
+ .navigation_history_snapshot(page_snapshot),
+ )
+ }
+
+ pub(super) fn apply_renderer_document_title(&mut self, title: String) -> Option<bool> {
+ Some(self.target_mut()?.owner_state.commit_document_title(title))
+ }
+
+ pub(super) fn navigation_history_entry_url(&mut self, entry_id: i32) -> Option<String> {
+ let page_snapshot = self.page_snapshot();
+ self.target_mut()?
+ .owner_state
+ .navigation_history_entry_url(page_snapshot, entry_id)
+ }
+
+ pub(super) fn reset_navigation_history(&mut self) -> Option<bool> {
+ let page_snapshot = self.page_snapshot();
+ Some(
+ self.target_mut()?
+ .owner_state
+ .reset_navigation_history(page_snapshot),
+ )
+ }
+
+ pub(super) fn can_reset_navigation_history(&mut self) -> Option<bool> {
+ let page_snapshot = self.page_snapshot();
+ Some(
+ self.target_mut()?
+ .owner_state
+ .can_reset_navigation_history(page_snapshot),
+ )
}
pub(super) fn mark_next_navigation_history_replace_current(&mut self) -> Option<()> {
- match self {
- Self::ActiveTarget {
- browser_context, ..
- } => {
- browser_context.mark_next_navigation_history_replace_current();
- Some(())
- }
- Self::PageTargetHost {
- browser_context,
- target_id,
- ..
- } => {
- browser_context.mutate_parked_target_owner_state(target_id, |owner_state| {
- owner_state.mark_next_navigation_history_replace_current();
- });
- Some(())
- }
- Self::NoLoadedBrowserContext => None,
- }
+ self.target_mut()?
+ .owner_state
+ .mark_next_navigation_history_replace_current();
+ Some(())
}
pub(super) fn mark_next_navigation_history_traverse_to_entry(
&mut self,
entry_id: i32,
) -> Option<()> {
- match self {
- Self::ActiveTarget {
- browser_context, ..
- } => {
- browser_context.mark_next_navigation_history_traverse_to_entry(entry_id);
- Some(())
- }
- Self::PageTargetHost {
- browser_context,
- target_id,
- ..
- } => {
- browser_context.mutate_parked_target_owner_state(target_id, |owner_state| {
- owner_state.mark_next_navigation_history_traverse_to_entry(entry_id);
- });
- Some(())
- }
- Self::NoLoadedBrowserContext => None,
- }
+ self.target_mut()?
+ .owner_state
+ .mark_next_navigation_history_traverse_to_entry(entry_id);
+ Some(())
}
pub(super) fn record_same_document_navigation(
@@ -1695,51 +1047,21 @@ impl<'a> TargetSessionOwnerMut<'a> {
) -> Option<String> {
let next_url = url.to_string();
let security_origin = url.origin().ascii_serialization();
- match self {
- Self::ActiveTarget {
- browser_context, ..
- } => {
- let frame_id = browser_context.active_target_id_owned()?;
- browser_context
- .record_same_document_navigation_history(next_url.clone(), history_update);
- browser_context.set_target_url(next_url);
- browser_context.set_target_security_origin(security_origin);
- Some(frame_id)
- }
- Self::PageTargetHost {
- browser_context,
- target_id,
- ..
- } => {
- let frame_id = target_id.clone();
- let page_snapshot =
- browser_context
- .background_target(target_id)
- .and_then(|target| {
- target
- .runtime_slot()
- .loaded_page()
- .map(|page| (target.target_url().to_owned(), page.document_title()))
- });
- let title = page_snapshot
- .as_ref()
- .map(|(_, title)| title.clone())
- .unwrap_or_default();
- browser_context.mutate_parked_target_owner_state(target_id, |owner_state| {
- owner_state.record_same_document_navigation_history(
- page_snapshot,
- next_url.clone(),
- title,
- history_update,
- );
- });
- let target = browser_context.background_target_mut(target_id)?;
- target.set_target_url(next_url);
- target.set_target_security_origin(security_origin);
- Some(frame_id)
- }
- Self::NoLoadedBrowserContext => None,
- }
+ let page_snapshot = self.page_snapshot();
+ let title = page_snapshot
+ .as_ref()
+ .map(|(_, title)| title.clone())
+ .unwrap_or_default();
+ let target = self.target_mut()?;
+ target.owner_state.record_same_document_navigation_history(
+ page_snapshot,
+ next_url.clone(),
+ title,
+ history_update,
+ );
+ target.set_target_url(next_url);
+ target.set_target_security_origin(security_origin);
+ Some(target.target_id().to_owned())
}
pub(super) fn effective_extra_headers_for_target_policy(
@@ -1747,10 +1069,7 @@ impl<'a> TargetSessionOwnerMut<'a> {
headers: Vec<(String, String)>,
) -> Vec<(String, String)> {
match self {
- Self::ActiveTarget {
- browser_context, ..
- }
- | Self::PageTargetHost {
+ Self::PageTarget {
browser_context, ..
} => browser_context.merged_extra_headers_for_target_policy(&headers),
Self::NoLoadedBrowserContext => headers,
@@ -1766,115 +1085,14 @@ impl<'a> TargetSessionOwnerMut<'a> {
network_request_id_allocator: &mut ConnectionNetworkRequestIdAllocator,
) -> Option<TargetNavigationRequestPreflight> {
match self {
- Self::ActiveTarget {
- browser_context,
- session_id: _,
- ..
- } => {
- let frame_id = browser_context
- .active_target_id_owned()
- .unwrap_or_else(|| "FRAME-0".to_owned());
- let mut request_headers = browser_context.effective_extra_headers();
- let user_agent = browser_context
- .effective_active_browser_identity_override()
- .unwrap_or(fallback_browser_identity)
- .user_agent();
- apply_user_agent_header(&mut request_headers, user_agent);
- apply_referrer_header(&mut request_headers, referrer);
- let fetch_config = browser_context.active_target.fetch_owner.config_snapshot();
- let default_session_id = browser_context.active_session_id_owned();
- let fetch_snapshot = fetch_config.subresource_interception_snapshot();
- let document_request_pause = (!is_data_url)
- .then(|| {
- fetch_snapshot
- .matching_request_stage_pause_sessions(
- default_session_id.as_deref(),
- DevToolsNetworkResourceType::Document,
- requested_url,
- )
- .into_iter()
- .next()
- })
- .flatten();
- let document_response_pause = (!is_data_url)
- .then(|| {
- fetch_snapshot
- .matching_response_stage_pause_sessions(
- default_session_id.as_deref(),
- DevToolsNetworkResourceType::Document,
- requested_url,
- )
- .into_iter()
- .next()
- })
- .flatten();
- let document_fetch_response_stage_candidate =
- !is_data_url && fetch_config.has_document_response_stage_candidate();
- let document_fetch_request_stage = document_request_pause
- .as_ref()
- .map(|_| FetchRequestStage::Request)
- .or_else(|| {
- document_response_pause
- .as_ref()
- .map(|_| FetchRequestStage::Response)
- })
- .or_else(|| {
- document_fetch_response_stage_candidate
- .then_some(FetchRequestStage::Response)
- });
- let document_fetch_event_session_id = document_request_pause
- .as_ref()
- .and_then(|pause| pause.session_id.clone())
- .or_else(|| {
- document_response_pause
- .as_ref()
- .and_then(|pause| pause.session_id.clone())
- });
- let document_auth_required =
- !is_data_url && fetch_config.matches_auth_required(requested_url);
- let document_auth_required_blocked_intercepts = if document_auth_required {
- fetch_config.matching_auth_required_network_intercepts(requested_url)
- } else {
- Vec::new()
- };
- let active_has_network_event_listeners =
- browser_context.has_network_event_listeners();
- let observes_document_request = active_has_network_event_listeners
- || (!is_data_url && (fetch_config.is_enabled() || document_auth_required));
- let needs_fetch_navigation_request_id =
- document_fetch_request_stage.is_some() || document_auth_required;
- let (document_loader_id, document_request_id, fetch_navigation_request_id) =
- browser_context.prepare_document_navigation_request_ids(
- network_request_id_allocator,
- active_has_network_event_listeners,
- observes_document_request,
- needs_fetch_navigation_request_id,
- );
- Some(TargetNavigationRequestPreflight {
- frame_id,
- session_id: default_session_id,
- document_fetch_event_session_id,
- inherited_security_origin: browser_context.target_security_origin().to_owned(),
- inherited_secure_context_type: browser_context
- .target_secure_context_type()
- .to_owned(),
- request_headers,
- document_fetch_request_stage,
- document_fetch_response_stage_candidate,
- document_auth_required,
- document_auth_required_blocked_intercepts,
- document_loader_id,
- document_request_id,
- fetch_navigation_request_id,
- })
- }
- Self::PageTargetHost {
+ Self::PageTarget {
browser_context,
target_id,
session_id: _,
..
} => {
- let target = browser_context.background_target(target_id)?;
+ let target = browser_context.page_target(target_id)?;
+ let frame_id = target_id.clone();
let target_session_id = target.session_id().map(str::to_owned);
let inherited_security_origin =
target.target_identity().security_origin().to_owned();
@@ -1882,9 +1100,7 @@ impl<'a> TargetSessionOwnerMut<'a> {
target.target_identity().secure_context_type().to_owned();
let target_has_network_event_listeners =
target.runtime_slot().has_network_event_listeners();
- let network_enabled = target.runtime_slot().primary_network_events_enabled();
let network_policy = target.network_policy.clone();
- let fetch_config = target.fetch_owner.config_snapshot();
let mut request_headers = browser_context
.merged_extra_headers_for_target_policy(network_policy.extra_headers());
let user_agent = network_policy
@@ -1894,6 +1110,7 @@ impl<'a> TargetSessionOwnerMut<'a> {
.user_agent();
apply_user_agent_header(&mut request_headers, user_agent);
apply_referrer_header(&mut request_headers, referrer);
+ let fetch_config = target.fetch_owner.config_snapshot();
let fetch_snapshot = fetch_config.subresource_interception_snapshot();
let document_request_pause = (!is_data_url)
.then(|| {
@@ -1948,24 +1165,21 @@ impl<'a> TargetSessionOwnerMut<'a> {
} else {
Vec::new()
};
- let observes_document_request = network_enabled
- || target_has_network_event_listeners
+ let observes_document_request = target_has_network_event_listeners
|| (!is_data_url && (fetch_config.is_enabled() || document_auth_required));
- let clear_captured_response_bodies =
- network_enabled || target_has_network_event_listeners;
let needs_fetch_navigation_request_id =
document_fetch_request_stage.is_some() || document_auth_required;
let (document_loader_id, document_request_id, fetch_navigation_request_id) =
browser_context
- .background_target_mut(target_id)?
+ .page_target_mut(target_id)?
.prepare_document_navigation_request_ids(
network_request_id_allocator,
- clear_captured_response_bodies,
+ target_has_network_event_listeners,
observes_document_request,
needs_fetch_navigation_request_id,
);
Some(TargetNavigationRequestPreflight {
- frame_id: target_id.clone(),
+ frame_id,
session_id: target_session_id,
document_fetch_event_session_id,
inherited_security_origin,
@@ -1988,62 +1202,19 @@ impl<'a> TargetSessionOwnerMut<'a> {
&mut self,
) -> Option<TargetLoadedNavigationCommitState> {
match self {
- Self::ActiveTarget {
- browser_context,
- session_id,
- is_auxiliary_target_session,
- ..
- } => {
- let devtools_session_state = browser_context
- .devtools_sessions
- .routed(*is_auxiliary_target_session, session_id.as_deref());
- Some(TargetLoadedNavigationCommitState {
- browser_context_id: browser_context.id.clone(),
- runtime_frontend_enabled: devtools_session_state
- .map(|state| state.runtime_session_state.runtime_frontend_enabled)
- .unwrap_or_default(),
- renderer_runtime_inspector_session_id: renderer_runtime_inspector_session_id(
- *is_auxiliary_target_session,
- session_id.as_deref(),
- ),
- runtime_inspector_session_restore_snapshots: browser_context
- .devtools_sessions
- .runtime_inspector_restore_snapshots(),
- stored_runtime_bindings: browser_context
- .devtools_sessions
- .runtime_bindings_for_renderer(),
- session_runtime_bindings: devtools_session_state
- .map(|state| state.runtime_bindings.clone())
- .unwrap_or_default(),
- isolated_worlds: browser_context
- .active_target
- .owner_state
- .isolated_worlds
- .clone(),
- fetch_subresource_config: browser_context
- .active_target
- .fetch_owner
- .subresource_interception_config(),
- })
- }
- Self::PageTargetHost {
+ Self::PageTarget {
browser_context,
target_id,
session_id,
is_auxiliary_target_session,
} => {
- let target = browser_context.background_target(target_id)?;
+ let target = browser_context.page_target(target_id)?;
let page_state = target.state();
let devtools_session_state = page_state
.devtools_sessions
.routed(*is_auxiliary_target_session, session_id.as_deref());
- let isolated_worlds = browser_context
- .parked_target_owner_state(target_id)
- .map(|owner_state| owner_state.isolated_worlds.clone())
- .unwrap_or_default();
- let browser_context_id = browser_context.id.clone();
Some(TargetLoadedNavigationCommitState {
- browser_context_id,
+ browser_context_id: browser_context.id.clone(),
runtime_frontend_enabled: devtools_session_state
.map(|state| state.runtime_session_state.runtime_frontend_enabled)
.unwrap_or_default(),
@@ -2060,10 +1231,8 @@ impl<'a> TargetSessionOwnerMut<'a> {
session_runtime_bindings: devtools_session_state
.map(|state| state.runtime_bindings.clone())
.unwrap_or_default(),
- isolated_worlds,
- fetch_subresource_config: page_state
- .fetch_owner
- .subresource_interception_config(),
+ isolated_worlds: target.owner_state.isolated_worlds.clone(),
+ fetch_subresource_config: target.fetch_owner.subresource_interception_config(),
})
}
Self::NoLoadedBrowserContext => None,
@@ -2079,29 +1248,12 @@ impl<'a> TargetSessionOwnerMut<'a> {
let security_origin = main_document_commit.security_origin.clone();
let secure_context_type = main_document_commit.secure_context_type.clone();
match self {
- Self::ActiveTarget {
- browser_context, ..
- } => {
- browser_context.set_target_url(next_url);
- browser_context.set_target_security_origin(security_origin);
- browser_context.set_target_secure_context_type(secure_context_type);
- if let Some(target_id) = browser_context.active_target_id_owned() {
- browser_context.mark_target_initial_empty_document_exited(&target_id);
- }
- Some(())
- }
- Self::PageTargetHost {
- browser_context,
- target_id,
- ..
- } => {
- let target = browser_context.background_target_mut(target_id)?;
+ Self::PageTarget { .. } => {
+ let target = self.target_mut()?;
target.set_target_url(next_url);
target.set_target_security_origin(security_origin);
target.set_target_secure_context_type(secure_context_type);
- browser_context.mutate_parked_target_owner_state(target_id, |owner_state| {
- owner_state.mark_initial_empty_document_exited();
- });
+ target.owner_state.mark_initial_empty_document_exited();
Some(())
}
Self::NoLoadedBrowserContext => None,
@@ -2110,20 +1262,10 @@ impl<'a> TargetSessionOwnerMut<'a> {
pub(super) fn clear_pending_navigation_history_update(&mut self) -> Option<()> {
match self {
- Self::ActiveTarget {
- browser_context, ..
- } => {
- browser_context.clear_pending_navigation_history_update();
- Some(())
- }
- Self::PageTargetHost {
- browser_context,
- target_id,
- ..
- } => {
- browser_context.mutate_parked_target_owner_state(target_id, |owner_state| {
- owner_state.clear_pending_navigation_history_update()
- });
+ Self::PageTarget { .. } => {
+ self.target_mut()?
+ .owner_state
+ .clear_pending_navigation_history_update();
Some(())
}
Self::NoLoadedBrowserContext => None,
@@ -2132,20 +1274,22 @@ impl<'a> TargetSessionOwnerMut<'a> {
pub(super) async fn commit_loaded_navigation_page_async(
&mut self,
- mut page: Page,
+ page: Page,
renderer_attachment_commit: LoadedNavigationRendererAttachmentCommit,
history_url: &Url,
) -> Option<anyhow::Result<LoadedNavigationPageCommit>> {
match self {
- Self::ActiveTarget {
- browser_context, ..
+ Self::PageTarget {
+ browser_context,
+ target_id,
+ ..
} => {
- if let Some(target_id) = browser_context.active_target_id_owned() {
- browser_context.mark_target_initial_empty_document_exited(&target_id);
- }
+ let browser_context_id = browser_context.id.clone();
Some(
browser_context
+ .page_target_mut(target_id)?
.commit_loaded_navigation_page_async(
+ &browser_context_id,
page,
renderer_attachment_commit,
history_url,
@@ -2153,121 +1297,6 @@ impl<'a> TargetSessionOwnerMut<'a> {
.await,
)
}
- Self::PageTargetHost {
- browser_context,
- target_id,
- ..
- } => {
- let committed_document_post_response_continuation =
- page.take_committed_document_post_response_continuation();
- let previous_page_owner = browser_context
- .background_target(target_id)?
- .runtime_slot
- .page_attachment_id()
- .map(|page_attachment_id| {
- TargetPageResidenceIdentity::new(
- browser_context.id.clone(),
- Some(target_id.clone()),
- page_attachment_id,
- )
- });
- let primary_session_id = browser_context
- .background_target(target_id)?
- .session_id()
- .map(str::to_owned);
- let previous_title = browser_context
- .parked_target_owner_state(target_id)
- .and_then(|owner_state| {
- owner_state.committed_document_title().map(str::to_owned)
- })
- .or_else(|| {
- browser_context
- .background_target(target_id)?
- .runtime_slot()
- .loaded_page()
- .map(Page::document_title)
- });
- let committed_document_title = page.document_title();
- let page_snapshot = (history_url.to_string(), page.document_title());
- browser_context.mutate_parked_target_owner_state(target_id, |owner_state| {
- owner_state.mark_initial_empty_document_exited();
- if let Some(previous_title) = previous_title {
- owner_state.refresh_current_navigation_history_title(previous_title);
- }
- owner_state.record_loaded_page_navigation_history(page_snapshot);
- owner_state.clear_committed_document_navigation_state();
- owner_state.commit_document_title(committed_document_title);
- });
- browser_context.mutate_parked_page_session_state(target_id, |state| {
- clear_parked_page_loaded_document_session_state(state);
- });
- let (previous_attachment, new_attachment_id) = {
- let target = browser_context.background_target_mut(target_id)?;
- let previous_attachment = match renderer_attachment_commit {
- LoadedNavigationRendererAttachmentCommit::Prepare(
- renderer_agent_candidate,
- ) => match target
- .runtime_slot
- .commit_loaded_navigation_renderer_attachment(
- &mut page,
- renderer_agent_candidate,
- ) {
- Ok(previous) => previous,
- Err(error) => return Some(Err(error.into())),
- },
- LoadedNavigationRendererAttachmentCommit::AlreadyCommitted(transaction) => {
- if let Err(error) = target
- .runtime_slot
- .bind_page_to_committed_renderer_agent_candidate(
- &mut page,
- &transaction,
- )
- {
- return Some(Err(error.into()));
- }
- transaction.previous()
- }
- };
- let new_attachment_id = page
- .renderer_agent_attachment_id()
- .expect("committed navigation Page must have a renderer attachment");
- (previous_attachment, new_attachment_id)
- };
- if let Some(previous_attachment) = previous_attachment
- && previous_attachment.id() != new_attachment_id
- {
- let replacements =
- match browser_context.mutate_parked_page_session_state(target_id, |state| {
- state.devtools_sessions.prepare_renderer_call_replacements(
- primary_session_id.as_deref(),
- previous_attachment.id(),
- new_attachment_id,
- )
- }) {
- Ok(replacements) => replacements,
- Err(error) => return Some(Err(error.into())),
- };
- browser_context
- .background_target_mut(target_id)?
- .runtime_slot
- .install_pending_renderer_call_replacements(replacements);
- }
- let previous = {
- let target = browser_context.background_target_mut(target_id)?;
- let previous = target.replace_loaded_page(Some(page));
- target.runtime_slot.reset_subresource_cursor();
- target.runtime_slot.clear_websocket_artifacts();
- previous
- };
- let replaced_page_owner = previous.as_ref().and(previous_page_owner);
- if let Some(page) = previous {
- let _ = page.close_async().await;
- }
- Some(Ok(LoadedNavigationPageCommit {
- replaced_page_owner,
- committed_document_post_response_continuation,
- }))
- }
Self::NoLoadedBrowserContext => None,
}
}
@@ -2409,71 +1438,35 @@ impl CdpConnection {
let _ = page.close_async().await;
return Ok(InitialDocumentPageInstallResult::Stale);
}
- if browser_context.active_target_id() == Some(owner.target_id.as_str()) {
- let loader_id = browser_context
- .active_target
- .owner_state
- .initial_empty_document_loader_id_if_current()
- .map(str::to_owned);
- browser_context.mark_target_initial_empty_document_materialized(&owner.target_id);
- let previous = browser_context.replace_loaded_page(Some(page));
- if let Some(loader_id) = loader_id {
- let _ = browser_context
- .active_target
- .runtime_slot
- .page_slot_mut()
- .bind_renderer_document_lifecycle(
- page_creation_artifacts,
- None,
- owner.target_id.clone(),
- loader_id,
- );
- }
- browser_context
- .assert_target_materialized_initial_empty_document_has_page(&owner.target_id)?;
- if let Some(page) = previous {
- let _ = page.close_async().await;
- }
- return Ok(InitialDocumentPageInstallResult::Installed);
- }
-
- if browser_context
- .background_target(&owner.target_id)
- .is_none()
- {
+ let Some(target) = browser_context.page_target_mut(&owner.target_id) else {
+ let _ = page.close_async().await;
return Err("TargetNotLoaded".to_owned());
- }
- let loader_id = browser_context
- .parked_target_owner_state(&owner.target_id)
- .and_then(|owner_state| owner_state.initial_empty_document_loader_id_if_current())
- .map(str::to_owned);
- browser_context.mutate_parked_target_owner_state(&owner.target_id, |owner_state| {
- owner_state.mark_initial_empty_document_materialized();
- owner_state.clear_committed_document_navigation_state();
- });
- browser_context.mutate_parked_page_session_state(&owner.target_id, |state| {
- clear_parked_page_loaded_document_session_state(state);
- });
- let previous = {
- let target = browser_context
- .background_target_mut(&owner.target_id)
- .ok_or_else(|| "TargetNotLoaded".to_owned())?;
- let previous = target.replace_loaded_page(Some(page));
- target.runtime_slot.reset_subresource_cursor();
- target.runtime_slot.clear_websocket_artifacts();
- if let Some(loader_id) = loader_id {
- let _ = target
- .runtime_slot
- .page_slot_mut()
- .bind_renderer_document_lifecycle(
- page_creation_artifacts,
- None,
- owner.target_id.clone(),
- loader_id,
- );
- }
- previous
};
+ let loader_id = target
+ .owner_state
+ .initial_empty_document_loader_id_if_current()
+ .map(str::to_owned);
+ target
+ .owner_state
+ .mark_initial_empty_document_materialized();
+ target
+ .owner_state
+ .clear_committed_document_navigation_state();
+ clear_page_loaded_document_session_state(target.state_mut());
+ let previous = target.replace_loaded_page(Some(page));
+ target.runtime_slot.reset_subresource_cursor();
+ target.runtime_slot.clear_websocket_artifacts();
+ if let Some(loader_id) = loader_id {
+ let _ = target
+ .runtime_slot
+ .page_slot_mut()
+ .bind_renderer_document_lifecycle(
+ page_creation_artifacts,
+ None,
+ owner.target_id.clone(),
+ loader_id,
+ );
+ }
browser_context
.assert_target_materialized_initial_empty_document_has_page(&owner.target_id)?;
if let Some(page) = previous {
@@ -2596,6 +1589,7 @@ impl CdpConnection {
let auxiliary_session_ids =
browser_context.remove_auxiliary_sessions_for_target(&target_id);
let collected_network_data_artifacts = browser_context
+ .active_page_target()
.active_target
.runtime_slot
.collected_network_data_artifacts();
@@ -3176,11 +2170,7 @@ impl CdpConnection {
session_id: Option<&str>,
) -> Option<Option<String>> {
match self.target_session_owner(session_id)? {
- TargetSessionOwner::ActiveTarget {
- is_auxiliary_target_session,
- ..
- }
- | TargetSessionOwner::PageTargetHost {
+ TargetSessionOwner::PageTarget {
is_auxiliary_target_session,
..
} => Some(
@@ -3520,29 +2510,13 @@ impl CdpConnection {
owner_route: Option<&CdpSessionRoute>,
) -> Option<TargetSessionOwnerMut<'_>> {
match self.target_session_owner_for_route(session_id, owner_route)? {
- TargetSessionOwner::ActiveTarget {
- browser_context_id,
- is_auxiliary_target_session,
- } => {
- let is_current_active_browser_context = self
- .browser_context
- .as_ref()
- .is_some_and(|browser_context| browser_context.id == browser_context_id);
- self.browser_context_by_id_mut(&browser_context_id)
- .map(|browser_context| TargetSessionOwnerMut::ActiveTarget {
- browser_context,
- session_id: session_id.map(str::to_owned),
- is_auxiliary_target_session,
- is_current_active_browser_context,
- })
- }
- TargetSessionOwner::PageTargetHost {
+ TargetSessionOwner::PageTarget {
browser_context_id,
target_id,
is_auxiliary_target_session,
} => self
.browser_context_by_id_mut(&browser_context_id)
- .map(|browser_context| TargetSessionOwnerMut::PageTargetHost {
+ .map(|browser_context| TargetSessionOwnerMut::PageTarget {
browser_context,
target_id,
session_id: session_id.map(str::to_owned),
@@ -3568,23 +2542,13 @@ impl CdpConnection {
owner_route: Option<&CdpSessionRoute>,
) -> Option<TargetSessionOwnerRef<'_>> {
match self.target_session_owner_for_route(session_id, owner_route)? {
- TargetSessionOwner::ActiveTarget {
- browser_context_id,
- is_auxiliary_target_session,
- } => self
- .browser_context_by_id(&browser_context_id)
- .map(|browser_context| TargetSessionOwnerRef::ActiveTarget {
- browser_context,
- session_id: session_id.map(str::to_owned),
- is_auxiliary_target_session,
- }),
- TargetSessionOwner::PageTargetHost {
+ TargetSessionOwner::PageTarget {
browser_context_id,
target_id,
is_auxiliary_target_session,
} => self
.browser_context_by_id(&browser_context_id)
- .map(|browser_context| TargetSessionOwnerRef::PageTargetHost {
+ .map(|browser_context| TargetSessionOwnerRef::PageTarget {
browser_context,
target_id,
session_id: session_id.map(str::to_owned),
@@ -3676,11 +2640,11 @@ mod tests {
fn target_session_owner_mut_mutates_active_and_parked_owner_state() {
let mut active = BrowserContext::new_with_page_for_test("BID-active", "TID-active");
{
- let mut owner = TargetSessionOwnerMut::ActiveTarget {
+ let mut owner = TargetSessionOwnerMut::PageTarget {
browser_context: &mut active,
+ target_id: "TID-active".to_owned(),
session_id: None,
is_auxiliary_target_session: false,
- is_current_active_browser_context: true,
};
owner.mutate_target_owner_state(|owner_state| {
owner_state
@@ -3691,6 +2655,7 @@ mod tests {
}
assert!(
active
+ .active_page_state()
.active_target
.owner_state
.target_crash_state
@@ -3699,7 +2664,7 @@ mod tests {
let mut parked = parked_target_context();
{
- let mut owner = TargetSessionOwnerMut::PageTargetHost {
+ let mut owner = TargetSessionOwnerMut::PageTarget {
browser_context: &mut parked,
target_id: "TID-parked".to_owned(),
session_id: None,
@@ -3732,6 +2697,7 @@ mod tests {
browser_context.set_active_target_id("TID-active".to_owned());
browser_context.attach_active_session("SID-active-primary".to_owned());
browser_context
+ .active_page_state_mut()
.active_target
.runtime_slot
.set_page_attachment_id_for_test(1);
@@ -3819,11 +2785,11 @@ mod tests {
fn target_session_owner_mut_mutates_active_and_parked_fetch_state() {
let mut active = BrowserContext::new_with_page_for_test("BID-active", "TID-active");
{
- let mut owner = TargetSessionOwnerMut::ActiveTarget {
+ let mut owner = TargetSessionOwnerMut::PageTarget {
browser_context: &mut active,
+ target_id: "TID-active".to_owned(),
session_id: None,
is_auxiliary_target_session: false,
- is_current_active_browser_context: true,
};
assert!(owner.register_pending_subresource_fetch_request(
"FETCH-active".to_owned(),
@@ -3832,6 +2798,7 @@ mod tests {
}
assert!(
active
+ .active_page_state()
.active_target
.fetch_owner
.has_pending_subresource_fetch_for_test("FETCH-active")
@@ -3839,7 +2806,7 @@ mod tests {
let mut parked = parked_target_context();
{
- let mut owner = TargetSessionOwnerMut::PageTargetHost {
+ let mut owner = TargetSessionOwnerMut::PageTarget {
browser_context: &mut parked,
target_id: "TID-parked".to_owned(),
session_id: None,
@@ -3874,11 +2841,11 @@ mod tests {
let mut active = BrowserContext::new_with_page_for_test("BID-active", "TID-active");
{
- let mut owner = TargetSessionOwnerMut::ActiveTarget {
+ let mut owner = TargetSessionOwnerMut::PageTarget {
browser_context: &mut active,
+ target_id: "TID-active".to_owned(),
session_id: None,
is_auxiliary_target_session: false,
- is_current_active_browser_context: true,
};
assert_eq!(
owner.configure_fetch(Some("SID-active".to_owned()), true, patterns.clone()),
@@ -3897,6 +2864,7 @@ mod tests {
}
assert!(
!active
+ .active_page_state()
.active_target
.fetch_owner
.config_snapshot()
@@ -3904,6 +2872,7 @@ mod tests {
);
assert!(
!active
+ .active_page_state()
.active_target
.fetch_owner
.has_pending_subresource_fetch_for_test("FETCH-active")
@@ -3911,7 +2880,7 @@ mod tests {
let mut parked = parked_target_context();
{
- let mut owner = TargetSessionOwnerMut::PageTargetHost {
+ let mut owner = TargetSessionOwnerMut::PageTarget {
browser_context: &mut parked,
target_id: "TID-parked".to_owned(),
session_id: None,
@@ -3955,6 +2924,7 @@ mod tests {
fn target_session_owner_mut_snapshots_active_and_parked_navigation_history() {
let mut active = BrowserContext::new_with_page_for_test("BID-active", "TID-active");
active
+ .active_page_state_mut()
.active_target
.owner_state
.record_loaded_page_navigation_history((
@@ -3962,11 +2932,11 @@ mod tests {
"active".to_owned(),
));
{
- let mut owner = TargetSessionOwnerMut::ActiveTarget {
+ let mut owner = TargetSessionOwnerMut::PageTarget {
browser_context: &mut active,
+ target_id: "TID-active".to_owned(),
session_id: None,
is_auxiliary_target_session: false,
- is_current_active_browser_context: true,
};
let (current_index, entries) = owner
.navigation_history_snapshot()
@@ -3984,7 +2954,7 @@ mod tests {
));
});
{
- let mut owner = TargetSessionOwnerMut::PageTargetHost {
+ let mut owner = TargetSessionOwnerMut::PageTarget {
browser_context: &mut parked,
target_id: "TID-parked".to_owned(),
session_id: None,
@@ -4006,6 +2976,7 @@ mod tests {
fn target_session_owner_mut_prepares_active_navigation_request_preflight() {
let mut active = BrowserContext::new_with_page_for_test("BID-active", "FRAME-0");
active
+ .active_page_state_mut()
.active_target
.runtime_slot
.enable_primary_network_events();
@@ -4016,11 +2987,11 @@ mod tests {
);
assert!(active.has_captured_response_body_for_test("REQ-old"));
- let mut owner = TargetSessionOwnerMut::ActiveTarget {
+ let mut owner = TargetSessionOwnerMut::PageTarget {
browser_context: &mut active,
+ target_id: "FRAME-0".to_owned(),
session_id: Some("SID-active".to_owned()),
is_auxiliary_target_session: false,
- is_current_active_browser_context: true,
};
owner.configure_fetch(
Some("SID-active".to_owned()),
@@ -4067,14 +3038,15 @@ mod tests {
fn target_session_owner_mut_observes_active_data_url_navigation_with_network_listener() {
let mut active = BrowserContext::new_with_page_for_test("BID-active", "FRAME-0");
active
+ .active_page_state_mut()
.active_target
.runtime_slot
.enable_primary_network_events();
- let mut owner = TargetSessionOwnerMut::ActiveTarget {
+ let mut owner = TargetSessionOwnerMut::PageTarget {
browser_context: &mut active,
+ target_id: "FRAME-0".to_owned(),
session_id: None,
is_auxiliary_target_session: false,
- is_current_active_browser_context: true,
};
let mut network_request_id_allocator = ConnectionNetworkRequestIdAllocator::default();
let preflight = owner
@@ -4105,8 +3077,9 @@ mod tests {
#[test]
fn target_session_owner_mut_prepares_background_navigation_request_preflight() {
let mut parked = BrowserContext::new_with_page_for_test("BID-parked", "TID-active");
- parked.locale_override = Some("zh-CN".to_owned());
+ parked.active_page_state_mut().locale_override = Some("zh-CN".to_owned());
parked
+ .active_page_state_mut()
.network_policy
.set_browser_identity_override(test_browser_identity("Active-Only-UA"));
parked.replace_default_browser_identity_override_for_test(test_browser_identity(
@@ -4149,7 +3122,7 @@ mod tests {
.has_captured_response_body("REQ-old")
);
- let mut owner = TargetSessionOwnerMut::PageTargetHost {
+ let mut owner = TargetSessionOwnerMut::PageTarget {
browser_context: &mut parked,
target_id: "TID-parked".to_owned(),
session_id: Some("SID-parked".to_owned()),
@@ -4228,7 +3201,7 @@ mod tests {
state.runtime_slot.enable_primary_network_events();
});
- let mut owner = TargetSessionOwnerMut::PageTargetHost {
+ let mut owner = TargetSessionOwnerMut::PageTarget {
browser_context: &mut parked,
target_id: "TID-parked".to_owned(),
session_id: None,
@@ -4264,7 +3237,7 @@ mod tests {
#[test]
fn target_session_owner_ref_snapshots_background_navigation_load_inputs() {
let mut parked = BrowserContext::new_with_page_for_test("BID-parked", "TID-active");
- parked.locale_override = Some("zh-CN".to_owned());
+ parked.active_page_state_mut().locale_override = Some("zh-CN".to_owned());
parked.insert_page_target_host(crate::conn::PageTargetHost::with_url(
"TID-parked".to_owned(),
Some("SID-parked".to_owned()),
@@ -4319,7 +3292,7 @@ mod tests {
);
});
- let owner = TargetSessionOwnerRef::PageTargetHost {
+ let owner = TargetSessionOwnerRef::PageTarget {
browser_context: &parked,
target_id: "TID-parked".to_owned(),
session_id: Some("SID-parked".to_owned()),
@@ -4416,7 +3389,7 @@ mod tests {
});
let commit_state = {
- let mut owner = TargetSessionOwnerMut::PageTargetHost {
+ let mut owner = TargetSessionOwnerMut::PageTarget {
browser_context: &mut parked,
target_id: "TID-parked".to_owned(),
session_id: None,
@@ -4452,7 +3425,7 @@ mod tests {
timestamp: 0.0,
};
{
- let mut owner = TargetSessionOwnerMut::PageTargetHost {
+ let mut owner = TargetSessionOwnerMut::PageTarget {
browser_context: &mut parked,
target_id: "TID-parked".to_owned(),
session_id: None,
@@ -4496,7 +3469,7 @@ mod tests {
owner_state.mark_next_navigation_history_replace_current();
});
{
- let mut owner = TargetSessionOwnerMut::PageTargetHost {
+ let mut owner = TargetSessionOwnerMut::PageTarget {
browser_context: &mut parked,
target_id: "TID-parked".to_owned(),
session_id: None,
@@ -4545,7 +3518,7 @@ mod tests {
.page_attachment_id();
{
- let mut owner = TargetSessionOwnerMut::PageTargetHost {
+ let mut owner = TargetSessionOwnerMut::PageTarget {
browser_context: &mut parked,
target_id: "TID-parked".to_owned(),
session_id: None,
@@ -4692,7 +3665,8 @@ mod tests {
Some("SID-background".to_owned()),
"about:blank".to_owned(),
));
- browser_context.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ browser_context.active_page_state_mut().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.runtime_session_state
.runtime_frontend_enabled = true;
browser_context.mutate_parked_page_session_state("TID-background", |state| {
@@ -4807,6 +3781,7 @@ mod tests {
"SID-runtime-disabled".to_owned(),
));
browser_context
+ .active_page_state_mut()
.active_target
.runtime_slot
.set_page_attachment_id_for_test(41);
@@ -4917,6 +3892,7 @@ mod tests {
inactive.set_active_target_id("TID-inactive".to_owned());
inactive.set_target_url("https://inactive.example/".to_owned());
inactive
+ .active_page_state_mut()
.devtools_sessions
.ensure_attached("SID-aux-inactive")
.console_output_session_state
diff --git a/moli-protocol/src/conn/dispatch_tests.rs b/moli-protocol/src/conn/dispatch_tests.rs
index 92adcc7e9..3f4c04ca6 100644
--- a/moli-protocol/src/conn/dispatch_tests.rs
+++ b/moli-protocol/src/conn/dispatch_tests.rs
@@ -1187,6 +1187,7 @@ async fn devtools_runtime_call_function_popup_activity_drains_from_protocol_neut
.browser_context
.as_mut()
.expect("browser context")
+ .active_page_state_mut()
.active_target
.runtime_slot
.set_loaded_page_for_test(page);
@@ -2082,7 +2083,11 @@ async fn runtime_enable_uses_background_initial_document_without_adapter() {
"background target should keep its target-lifecycle initial page"
);
assert!(
- !browser_context.active_target.runtime_slot.has_loaded_page(),
+ !browser_context
+ .active_page_state()
+ .active_target
+ .runtime_slot
+ .has_loaded_page(),
"Runtime.enable must not install a page on the active target"
);
assert!(
@@ -2202,7 +2207,11 @@ async fn page_enable_uses_background_initial_document_without_adapter() {
"background target should keep its target-lifecycle initial page"
);
assert!(
- !browser_context.active_target.runtime_slot.has_loaded_page(),
+ !browser_context
+ .active_page_state()
+ .active_target
+ .runtime_slot
+ .has_loaded_page(),
"Page.enable must not install a page on the active target"
);
}
@@ -2290,7 +2299,11 @@ async fn initial_document_page_ensure_completion_uses_captured_owner() {
"completion should install the materialized page on the captured background target"
);
assert!(
- !browser_context.active_target.runtime_slot.has_loaded_page(),
+ !browser_context
+ .active_page_state()
+ .active_target
+ .runtime_slot
+ .has_loaded_page(),
"completion must not install the materialized page on the ambient active target"
);
}
@@ -2573,6 +2586,7 @@ async fn stale_initial_document_page_build_does_not_overwrite_committed_page() {
"current page should remain the committed navigation page"
);
let initial = browser_context
+ .active_page_state()
.active_target
.owner_state
.initial_empty_document_state()
@@ -2695,7 +2709,11 @@ async fn target_lifecycle_ensure_installs_initial_about_blank_page_for_backgroun
"ensure should install loaded page on background target"
);
assert!(
- !browser_context.active_target.runtime_slot.has_loaded_page(),
+ !browser_context
+ .active_page_state()
+ .active_target
+ .runtime_slot
+ .has_loaded_page(),
"background ensure must not install the materialized page on the active target"
);
}
@@ -2784,6 +2802,7 @@ async fn devtools_get_realms_succeeds_when_page_loaded_before_session_attach() {
conn.browser_context
.as_mut()
.expect("browser context")
+ .active_page_state_mut()
.active_target
.runtime_slot
.set_loaded_page_for_test(page);
@@ -4448,6 +4467,7 @@ async fn devtools_command_applies_window_state_to_document_surface() {
conn.browser_context
.as_ref()
.expect("browser context")
+ .active_page_state()
.active_target
.owner_state
.window_document_hidden(),
@@ -4483,6 +4503,7 @@ async fn devtools_command_applies_window_state_to_document_surface() {
conn.browser_context
.as_ref()
.expect("browser context")
+ .active_page_state()
.active_target
.owner_state
.window_fullscreen(),
@@ -5281,6 +5302,7 @@ async fn devtools_command_low_backend_node_refs_miss_without_backend_binding() {
.browser_context
.as_mut()
.expect("browser context")
+ .active_page_state_mut()
.active_target
.runtime_slot
.loaded_page_mut()
@@ -5373,6 +5395,7 @@ async fn devtools_command_low_backend_node_refs_miss_without_backend_binding() {
.browser_context
.as_mut()
.expect("browser context")
+ .active_page_state_mut()
.active_target
.runtime_slot
.loaded_page_mut()
@@ -6959,6 +6982,7 @@ async fn command_dispatch_completes_live_browser_permission_without_legacy_fallb
conn.browser_context
.as_mut()
.expect("browser context")
+ .active_page_state_mut()
.active_target
.runtime_slot
.set_loaded_page_for_test(page);
@@ -7012,7 +7036,11 @@ async fn command_dispatch_completes_target_startup_commands_without_legacy_fallb
let browser_context = conn.browser_context.as_ref().expect("browser context");
assert_eq!(browser_context.active_target_id(), Some(target_id.as_str()));
assert!(
- browser_context.active_target.runtime_slot.has_loaded_page(),
+ browser_context
+ .active_page_state()
+ .active_target
+ .runtime_slot
+ .has_loaded_page(),
"Target.createTarget should complete target lifecycle initial document ensure"
);
@@ -7334,6 +7362,7 @@ async fn command_dispatch_completes_live_page_preload_without_legacy_fallback()
.browser_context
.as_mut()
.expect("browser context")
+ .active_page_state_mut()
.active_target
.runtime_slot
.set_loaded_page_for_test(page);
@@ -7371,6 +7400,7 @@ async fn command_dispatch_completes_live_page_preload_without_legacy_fallback()
.browser_context
.as_ref()
.expect("browser context")
+ .active_page_state()
.active_target
.owner_state
.document_start_scripts
@@ -7414,6 +7444,7 @@ async fn command_dispatch_completes_live_page_preload_without_legacy_fallback()
.browser_context
.as_ref()
.expect("browser context")
+ .active_page_state()
.active_target
.owner_state
.document_start_scripts
@@ -7816,6 +7847,7 @@ async fn command_dispatch_completes_live_storage_set_cookies_without_legacy_fall
conn.browser_context
.as_mut()
.expect("browser context")
+ .active_page_state_mut()
.active_target
.runtime_slot
.set_loaded_page_for_test(page);
@@ -7864,6 +7896,7 @@ async fn command_dispatch_completes_live_network_extra_headers_without_legacy_fa
conn.browser_context
.as_mut()
.expect("browser context")
+ .active_page_state_mut()
.active_target
.runtime_slot
.set_loaded_page_for_test(page);
@@ -7901,6 +7934,7 @@ async fn command_dispatch_completes_live_network_blocked_urls_without_legacy_fal
conn.browser_context
.as_mut()
.expect("browser context")
+ .active_page_state_mut()
.active_target
.runtime_slot
.set_loaded_page_for_test(page);
@@ -7938,6 +7972,7 @@ async fn command_dispatch_completes_live_network_set_cookie_without_legacy_fallb
conn.browser_context
.as_mut()
.expect("browser context")
+ .active_page_state_mut()
.active_target
.runtime_slot
.set_loaded_page_for_test(page);
@@ -7983,6 +8018,7 @@ async fn command_dispatch_completes_live_network_emulation_without_legacy_fallba
conn.browser_context
.as_mut()
.expect("browser context")
+ .active_page_state_mut()
.active_target
.runtime_slot
.set_loaded_page_for_test(page);
@@ -8026,6 +8062,7 @@ async fn command_dispatch_completes_live_network_user_agent_without_legacy_fallb
conn.browser_context
.as_mut()
.expect("browser context")
+ .active_page_state_mut()
.active_target
.runtime_slot
.set_loaded_page_for_test(page);
@@ -8063,6 +8100,7 @@ async fn command_dispatch_completes_live_emulation_user_agent_without_legacy_fal
conn.browser_context
.as_mut()
.expect("browser context")
+ .active_page_state_mut()
.active_target
.runtime_slot
.set_loaded_page_for_test(page);
@@ -8102,6 +8140,7 @@ async fn pending_emulation_user_agent_loader_keeps_active_owner_route_across_com
let mut browser_context = BrowserContext::new("BID-emulation-ua-owner-route".to_owned());
browser_context.set_active_target_id("TID-emulation-ua-active".to_owned());
browser_context
+ .active_page_state_mut()
.active_target
.runtime_slot
.set_loaded_page_for_test(active_page);
@@ -8184,6 +8223,7 @@ async fn pending_emulation_timezone_keeps_background_owner_route_across_completi
let mut browser_context = BrowserContext::new("BID-emulation-timezone-owner-route".to_owned());
browser_context.set_active_target_id("TID-emulation-timezone-active".to_owned());
browser_context
+ .active_page_state_mut()
.active_target
.runtime_slot
.set_loaded_page_for_test(active_page);
@@ -8275,6 +8315,7 @@ async fn command_dispatch_completes_live_emulation_locale_without_legacy_fallbac
conn.browser_context
.as_mut()
.expect("browser context")
+ .active_page_state_mut()
.active_target
.runtime_slot
.set_loaded_page_for_test(page);
@@ -8312,6 +8353,7 @@ async fn command_dispatch_completes_live_security_tls_without_legacy_fallback()
conn.browser_context
.as_mut()
.expect("browser context")
+ .active_page_state_mut()
.active_target
.runtime_slot
.set_loaded_page_for_test(page);
@@ -8352,6 +8394,7 @@ async fn pending_security_tls_keeps_background_owner_route_across_completion() {
let mut browser_context = BrowserContext::new("BID-security-owner-route".to_owned());
browser_context.set_active_target_id("TID-security-active".to_owned());
browser_context
+ .active_page_state_mut()
.active_target
.runtime_slot
.set_loaded_page_for_test(active_page);
@@ -8437,6 +8480,7 @@ async fn command_dispatch_completes_live_fetch_enable_without_legacy_fallback()
.browser_context
.as_mut()
.expect("browser context")
+ .active_page_state_mut()
.active_target
.runtime_slot
.set_loaded_page_for_test(page);
@@ -8499,6 +8543,7 @@ async fn devtools_network_intercept_commands_route_to_fetch_owner() {
.browser_context
.as_ref()
.expect("browser context")
+ .active_page_state()
.active_target
.fetch_owner
.is_enabled(),
@@ -8532,6 +8577,7 @@ async fn devtools_network_intercept_commands_route_to_fetch_owner() {
.browser_context
.as_ref()
.expect("browser context")
+ .active_page_state()
.active_target
.fetch_owner
.config_snapshot();
@@ -8565,6 +8611,7 @@ async fn devtools_network_intercept_commands_route_to_fetch_owner() {
.browser_context
.as_ref()
.expect("browser context")
+ .active_page_state()
.active_target
.fetch_owner
.is_enabled()
@@ -8662,6 +8709,7 @@ async fn command_dispatch_completes_live_fetch_disable_without_legacy_fallback()
let mut browser_context = BrowserContext::new("BID-fetch-disable-live".to_owned());
browser_context.set_active_target_id("TID-fetch-disable-live".to_owned());
browser_context
+ .active_page_state_mut()
.active_target
.fetch_owner
.configure(None, true, Vec::new());
@@ -8675,6 +8723,7 @@ async fn command_dispatch_completes_live_fetch_disable_without_legacy_fallback()
.browser_context
.as_mut()
.expect("browser context")
+ .active_page_state_mut()
.active_target
.runtime_slot
.set_loaded_page_for_test(page);
@@ -8699,6 +8748,7 @@ async fn command_dispatch_completes_live_fetch_disable_without_legacy_fallback()
.browser_context
.as_ref()
.expect("browser context should remain loaded")
+ .active_page_state()
.active_target
.fetch_owner
.is_enabled()
@@ -9024,7 +9074,7 @@ fn command_dispatch_completes_input_owner_commands_without_legacy_fallback() {
assert!(
conn.browser_context
.as_ref()
- .is_some_and(|context| !context.input_intercept_drags_enabled)
+ .is_some_and(|context| !context.active_page_state().input_intercept_drags_enabled)
);
let raw = serde_json::to_string(&json!({
diff --git a/moli-protocol/src/conn/inspector_route.rs b/moli-protocol/src/conn/inspector_route.rs
index e99953223..563511df3 100644
--- a/moli-protocol/src/conn/inspector_route.rs
+++ b/moli-protocol/src/conn/inspector_route.rs
@@ -324,6 +324,7 @@ mod tests {
);
browser_context.set_loaded_page_async(page).await;
let current = browser_context
+ .active_page_state()
.active_target
.runtime_slot
.current_renderer_attachment()
@@ -346,6 +347,7 @@ mod tests {
.browser_context
.as_ref()
.expect("browser context")
+ .active_page_state()
.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.inspector_session_state
.v8_state,
@@ -371,6 +373,7 @@ mod tests {
.browser_context
.as_ref()
.expect("browser context")
+ .active_page_state()
.devtools_sessions
.attached("SID-state-aux")
.expect("auxiliary session state")
@@ -422,6 +425,7 @@ mod tests {
.browser_context
.as_ref()
.expect("browser context")
+ .active_page_state()
.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.inspector_session_state
.v8_state,
@@ -450,6 +454,7 @@ mod tests {
.browser_context
.as_ref()
.expect("browser context")
+ .active_page_state()
.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.inspector_session_state
.v8_state,
diff --git a/moli-protocol/src/conn/page_state/fetch_state.rs b/moli-protocol/src/conn/page_state/fetch_state.rs
index 51dae0d73..080ba6109 100644
--- a/moli-protocol/src/conn/page_state/fetch_state.rs
+++ b/moli-protocol/src/conn/page_state/fetch_state.rs
@@ -1,10 +1,10 @@
+use super::super::{BrowserContext, ConnectionNetworkRequestIdAllocator, PageTargetHost};
+#[cfg(test)]
use super::super::{
- BrowserContext, ConnectionNetworkRequestIdAllocator, PageTargetHost, PausedDocumentTransfer,
+ DocumentBodySource, DocumentNavigationToken, NavigationDispatchState, PausedDocumentTransfer,
PendingFetchAuthNavigation, PendingFetchNavigation, PendingSubresourceFetchAuthRequest,
PendingSubresourceFetchRequest, PendingSubresourceFetchResponseRequest,
};
-#[cfg(test)]
-use super::super::{DocumentBodySource, DocumentNavigationToken, NavigationDispatchState};
fn document_navigation_loader_id(sequence: u64) -> String {
format!("LID-{sequence:010}")
@@ -72,6 +72,7 @@ impl BrowserContext {
self.page_targets.insert(host)
}
+ #[cfg(test)]
pub(crate) fn take_active_target_pending_fetch_state(
&mut self,
) -> (
@@ -82,11 +83,10 @@ impl BrowserContext {
Vec<(String, PendingSubresourceFetchAuthRequest)>,
Vec<(String, PendingSubresourceFetchResponseRequest)>,
) {
- self.active_target.fetch_owner.drain_pending_requests()
- }
-
- pub(crate) fn clear_pending_fetch_state(&mut self) {
- self.active_target.fetch_owner.clear_pending();
+ self.active_page_state_mut()
+ .active_target
+ .fetch_owner
+ .drain_pending_requests()
}
#[cfg(test)]
@@ -94,7 +94,11 @@ impl BrowserContext {
&mut self,
request_id: &str,
) -> Result<Option<String>, String> {
- let handle = self.active_target.runtime_slot.allocate_io_stream_handle();
+ let handle = self
+ .active_page_state_mut()
+ .active_target
+ .runtime_slot
+ .allocate_io_stream_handle();
let active_target = &mut self
.page_targets
.active_mut()
@@ -115,7 +119,8 @@ impl BrowserContext {
&mut self,
request_id: &str,
) -> Option<PendingSubresourceFetchRequest> {
- self.active_target
+ self.active_page_state_mut()
+ .active_target
.fetch_owner
.take_pending_subresource_fetch_request(request_id, None)
}
@@ -128,7 +133,8 @@ impl BrowserContext {
navigation: NavigationDispatchState,
body: DocumentBodySource,
) {
- self.active_target
+ self.active_page_state_mut()
+ .active_target
.fetch_owner
.register_pending_fetch_response_navigation(
request_id,
@@ -144,7 +150,8 @@ impl BrowserContext {
request_id: String,
pending: PendingSubresourceFetchRequest,
) {
- self.active_target
+ self.active_page_state_mut()
+ .active_target
.fetch_owner
.register_pending_subresource_fetch_request(request_id, pending);
}
@@ -155,14 +162,16 @@ impl BrowserContext {
request_id: Option<String>,
pending: PendingSubresourceFetchRequest,
) {
- self.active_target
+ self.active_page_state_mut()
+ .active_target
.fetch_owner
.register_in_flight_subresource_fetch_request(request_id, pending);
}
#[cfg(test)]
pub(crate) fn allocate_subresource_network_request_id(&mut self) -> String {
- self.active_target
+ self.active_page_state_mut()
+ .active_target
.runtime_slot
.request_id_allocator()
.allocate_network_request_id()
@@ -175,7 +184,8 @@ impl BrowserContext {
response_body: String,
session_ids: impl IntoIterator<Item = Option<String>>,
) {
- self.active_target
+ self.active_page_state_mut()
+ .active_target
.runtime_slot
.record_captured_response_body(request_id, response_body, session_ids);
}
@@ -187,7 +197,8 @@ impl BrowserContext {
response_body: crate::conn::CapturedBody,
session_ids: impl IntoIterator<Item = Option<String>>,
) {
- self.active_target
+ self.active_page_state_mut()
+ .active_target
.runtime_slot
.record_captured_response_body_source(request_id, response_body, session_ids);
}
@@ -198,7 +209,8 @@ impl BrowserContext {
request_id: String,
session_ids: impl IntoIterator<Item = Option<String>>,
) {
- self.active_target
+ self.active_page_state_mut()
+ .active_target
.runtime_slot
.record_pending_response_body(request_id, session_ids);
}
@@ -208,40 +220,30 @@ impl BrowserContext {
&self,
request_id: &str,
) -> Option<&crate::domains::network::CapturedResponseBody> {
- self.active_target
+ self.active_page_state()
+ .active_target
.runtime_slot
.captured_response_body(request_id)
}
- pub(crate) fn clear_captured_response_bodies(&mut self) {
- self.active_target
- .runtime_slot
- .clear_captured_response_bodies();
- }
-
pub(crate) fn clear_network_body_artifacts(&mut self) {
for target in self.page_targets.iter_mut() {
target.runtime_slot.clear_network_body_artifacts();
}
}
- pub(crate) fn remove_captured_response_body_visibility_for_session(
- &mut self,
- session_id: Option<&str>,
- ) {
- self.active_target
- .runtime_slot
- .remove_captured_response_body_visibility_for_session(session_id);
- }
-
#[cfg(test)]
pub(crate) fn allocate_io_stream_handle(&mut self) -> String {
- self.active_target.runtime_slot.allocate_io_stream_handle()
+ self.active_page_state_mut()
+ .active_target
+ .runtime_slot
+ .allocate_io_stream_handle()
}
#[cfg(test)]
pub(crate) fn insert_io_stream(&mut self, handle: String, bytes: Vec<u8>, offset: usize) {
- self.active_target
+ self.active_page_state_mut()
+ .active_target
.runtime_slot
.insert_io_stream(handle, bytes, offset);
}
@@ -253,129 +255,83 @@ impl BrowserContext {
offset: Option<usize>,
size: Option<usize>,
) -> Option<crate::domains::network::TargetIoStreamRead> {
- self.active_target
+ self.active_page_state_mut()
+ .active_target
.runtime_slot
.read_io_stream(handle, offset, size)
}
- pub(crate) fn reset_subresource_network_cursor(&mut self) {
- self.active_target.runtime_slot.reset_subresource_cursor();
- }
-
- pub(crate) fn clear_websocket_network_request_ids(&mut self) {
- self.active_target
- .runtime_slot
- .clear_websocket_request_ids();
- }
-
- pub(crate) fn clear_websocket_network_artifacts(&mut self) {
- self.active_target.runtime_slot.clear_websocket_artifacts();
- }
-
- pub(crate) fn initialize_network_listener_observation_cursor(
- &mut self,
- session_id: Option<&str>,
- ) {
- self.active_target
- .runtime_slot
- .initialize_network_session_observation_cursor_at_output_tail(session_id);
- }
-
- pub(crate) fn remove_network_listener_observation_cursor(&mut self, session_id: Option<&str>) {
- self.active_target
- .runtime_slot
- .remove_network_session_observation_cursor(session_id);
- }
-
- pub(crate) fn clear_session_scoped_network_observation_artifacts(&mut self) {
- self.active_target
- .runtime_slot
- .clear_session_scoped_network_observation_artifacts();
- }
-
#[cfg(test)]
pub(crate) fn has_captured_response_body_for_test(&self, request_id: &str) -> bool {
- self.active_target
+ self.active_page_state()
+ .active_target
.runtime_slot
.has_captured_response_body(request_id)
}
#[cfg(test)]
pub(crate) fn captured_response_bodies_empty_for_test(&self) -> bool {
- self.active_target
+ self.active_page_state()
+ .active_target
.runtime_slot
.captured_response_bodies_empty()
}
#[cfg(test)]
pub(crate) fn set_next_network_request_sequence_for_test(&mut self, sequence: u64) {
- self.active_target
+ self.active_page_state_mut()
+ .active_target
.runtime_slot
.set_next_network_request_sequence_for_test(sequence);
}
#[cfg(test)]
pub(crate) fn next_network_request_sequence_for_test(&self) -> u64 {
- self.active_target
+ self.active_page_state()
+ .active_target
.runtime_slot
.next_network_request_sequence_for_test()
}
#[cfg(test)]
pub(crate) fn io_streams_empty_for_test(&self) -> bool {
- self.active_target.runtime_slot.io_streams_empty_for_test()
+ self.active_page_state()
+ .active_target
+ .runtime_slot
+ .io_streams_empty_for_test()
}
#[cfg(test)]
pub(crate) fn set_next_io_stream_sequence_for_test(&mut self, sequence: u64) {
- self.active_target
+ self.active_page_state_mut()
+ .active_target
.runtime_slot
.set_next_io_stream_sequence_for_test(sequence);
}
#[cfg(test)]
pub(crate) fn next_io_stream_sequence_for_test(&self) -> u64 {
- self.active_target
+ self.active_page_state()
+ .active_target
.runtime_slot
.next_io_stream_sequence_for_test()
}
#[cfg(test)]
pub(crate) fn set_subresource_network_emitted_record_count_for_test(&mut self, count: usize) {
- self.active_target
+ self.active_page_state_mut()
+ .active_target
.runtime_slot
.set_subresource_emitted_record_count_for_test(count);
}
#[cfg(test)]
pub(crate) fn subresource_network_emitted_record_count_for_test(&self) -> usize {
- self.active_target
+ self.active_page_state()
+ .active_target
.runtime_slot
.subresource_emitted_record_count_for_test()
}
-
- pub(crate) fn prepare_document_navigation_request_ids(
- &mut self,
- network_request_id_allocator: &mut ConnectionNetworkRequestIdAllocator,
- clear_captured_response_bodies: bool,
- observes_document_request: bool,
- needs_fetch_navigation_request_id: bool,
- ) -> (String, Option<String>, Option<String>) {
- if clear_captured_response_bodies {
- self.clear_captured_response_bodies();
- }
- let mut allocator = self.active_target.runtime_slot.request_id_allocator();
- let document_loader_id =
- document_navigation_loader_id(network_request_id_allocator.allocate_sequence());
- let document_request_id = observes_document_request.then(|| document_loader_id.clone());
- let fetch_navigation_request_id = needs_fetch_navigation_request_id
- .then(|| allocator.allocate_fetch_navigation_request_id());
- (
- document_loader_id,
- document_request_id,
- fetch_navigation_request_id,
- )
- }
}
impl PageTargetHost {
@@ -490,13 +446,15 @@ mod tests {
);
assert!(
- bc.active_target
+ bc.active_page_state()
+ .active_target
.fetch_owner
.has_in_flight_subresource_fetches_for_test()
);
let _ = bc.take_active_target_pending_fetch_state();
assert!(
- !bc.active_target
+ !bc.active_page_state()
+ .active_target
.fetch_owner
.has_in_flight_subresource_fetches_for_test()
);
@@ -511,12 +469,14 @@ mod tests {
);
assert!(
- bc.active_target
+ bc.active_page_state()
+ .active_target
.fetch_owner
.has_pending_subresource_fetch_for_test("INT-SUB-9")
);
assert!(
- bc.active_target
+ bc.active_page_state()
+ .active_target
.fetch_owner
.has_pending_fetch_request_id_for_test("INT-SUB-9")
);
@@ -526,12 +486,14 @@ mod tests {
.expect("pending subresource fetch should be found by its protocol request id");
assert_eq!(pending.network_request_id, "REQ-9");
assert!(
- !bc.active_target
+ !bc.active_page_state()
+ .active_target
.fetch_owner
.has_pending_subresource_fetch_for_test("INT-SUB-9")
);
assert!(
- !bc.active_target
+ !bc.active_page_state()
+ .active_target
.fetch_owner
.has_pending_fetch_request_id_for_test("INT-SUB-9")
);
@@ -555,13 +517,15 @@ mod tests {
assert_eq!(stream, "STREAM-1");
assert!(
- bc.active_target
+ bc.active_page_state()
+ .active_target
.fetch_owner
.pending_fetch_response_transfer_is_pending_for_test("INT-1"),
"buffered body stream reads from IO artifacts and keeps the paused response reusable"
);
assert!(
- bc.active_target
+ bc.active_page_state()
+ .active_target
.fetch_owner
.active_fetch_response_body_stream_request_id_for_test(&stream)
.is_none()
@@ -586,7 +550,8 @@ mod tests {
.await
.unwrap();
assert!(
- !bc.active_target
+ !bc.active_page_state()
+ .active_target
.fetch_owner
.has_in_flight_subresource_fetches_for_test()
);
diff --git a/moli-protocol/src/conn/page_state/loaded.rs b/moli-protocol/src/conn/page_state/loaded.rs
index bf22da082..3f4a545ef 100644
--- a/moli-protocol/src/conn/page_state/loaded.rs
+++ b/moli-protocol/src/conn/page_state/loaded.rs
@@ -46,118 +46,58 @@ impl BrowserContext {
.clear_session_scoped_state_fields(false);
}
+ #[cfg(test)]
fn clear_active_target_loaded_document_session_state(&mut self) {
- for session in self.devtools_sessions.states_mut() {
+ for session in self.active_page_state_mut().devtools_sessions.states_mut() {
session
.page_session_state
.clear_loaded_document_context_state();
}
}
- pub(crate) fn clear_active_target_runtime_remote_object_tracking(&mut self) {
- for session in self.devtools_sessions.states_mut() {
- session.clear_runtime_remote_object_tracking();
- }
- }
-
+ #[cfg(test)]
pub(crate) fn replace_loaded_page(&mut self, page: Option<Page>) -> Option<Page> {
- let previous = self.active_target.runtime_slot.replace_loaded_page(page);
+ let previous = self
+ .active_page_state_mut()
+ .active_target
+ .runtime_slot
+ .replace_loaded_page(page);
self.ingest_active_target_output_updates();
- self.active_target
+ self.active_page_state_mut()
+ .active_target
.owner_state
.clear_loaded_document_context_state();
self.clear_active_target_loaded_document_session_state();
previous
}
+ #[cfg(test)]
pub(crate) fn clear_loaded_page_with_reason(
&mut self,
reason: TargetPageAbsenceReason,
) -> Option<Page> {
let previous = self
+ .active_page_state_mut()
.active_target
.runtime_slot
.clear_loaded_page_with_reason(reason);
self.ingest_active_target_output_updates();
- self.active_target
+ self.active_page_state_mut()
+ .active_target
.owner_state
.clear_loaded_document_context_state();
self.clear_active_target_loaded_document_session_state();
previous
}
- pub(crate) fn mark_next_navigation_history_replace_current(&mut self) {
- self.active_target
- .owner_state
- .mark_next_navigation_history_replace_current();
- }
-
- pub(crate) fn mark_next_navigation_history_traverse_to_entry(&mut self, entry_id: i32) {
- self.active_target
- .owner_state
- .mark_next_navigation_history_traverse_to_entry(entry_id);
- }
-
- pub(crate) fn clear_pending_navigation_history_update(&mut self) {
- self.active_target
- .owner_state
- .clear_pending_navigation_history_update();
- }
-
- pub(crate) fn navigation_history_entry_url(&mut self, entry_id: i32) -> Option<String> {
- let target_url = self.target_url().to_owned();
- let page_snapshot = self
- .loaded_page()
- .map(|page| (target_url, page.document_title()));
- self.active_target
- .owner_state
- .navigation_history_entry_url(page_snapshot, entry_id)
- }
-
- fn record_loaded_page_navigation_history(&mut self, page: &Page, history_url: &Url) {
- let previous_title = self
- .active_target
- .owner_state
- .committed_document_title()
- .map(str::to_owned)
- .or_else(|| self.loaded_page().map(Page::document_title));
- if let Some(previous_title) = previous_title {
- self.active_target
- .owner_state
- .refresh_current_navigation_history_title(previous_title);
- }
- self.active_target
- .owner_state
- .record_loaded_page_navigation_history((
- history_url.to_string(),
- page.document_title(),
- ));
- }
-
- pub(crate) fn record_same_document_navigation_history(
- &mut self,
- url: String,
- history_update: moli_core::page::SameDocumentHistoryUpdate,
- ) {
- let page_snapshot = self
- .loaded_page()
- .map(|page| (self.target_url().to_owned(), page.document_title()));
- let title = page_snapshot
- .as_ref()
- .map(|(_, title)| title.clone())
- .unwrap_or_default();
- self.active_target
- .owner_state
- .record_same_document_navigation_history(page_snapshot, url, title, history_update);
- }
-
#[cfg(test)]
pub(crate) async fn set_loaded_page_async(&mut self, mut page: Page) {
// BrowserContext owns document-cookie facade overrides for the active
// browsing context. New pages should inherit the current browser
// policy surface before any JS observes `document.cookie` or
// `navigator.cookieEnabled`.
- self.document_cookie_manager_surface
+ self.active_page_state()
+ .document_cookie_manager_surface
.apply_to_page_async(&mut page)
.await;
let _ = self.replace_loaded_page(Some(page));
@@ -169,94 +109,26 @@ impl BrowserContext {
.is_some()
}
+ #[cfg(test)]
pub(crate) fn ingest_active_target_output_updates(&mut self) -> bool {
- self.active_target
+ self.active_page_state_mut()
+ .active_target
.runtime_slot
.ingest_owner_page_observable_output_updates()
}
- pub(crate) async fn commit_loaded_navigation_page_async(
- &mut self,
- mut page: Page,
- renderer_attachment_commit: LoadedNavigationRendererAttachmentCommit,
- history_url: &Url,
- ) -> anyhow::Result<LoadedNavigationPageCommit> {
- let committed_document_post_response_continuation =
- page.take_committed_document_post_response_continuation();
- let previous_page_owner =
- self.active_target
- .runtime_slot
- .page_attachment_id()
- .map(|page_attachment_id| {
- TargetPageResidenceIdentity::new(
- self.id.clone(),
- self.active_target_id_owned(),
- page_attachment_id,
- )
- });
- let primary_session_id = self.active_session_id_owned();
- let previous_attachment = match renderer_attachment_commit {
- LoadedNavigationRendererAttachmentCommit::Prepare(renderer_agent_candidate) => self
- .active_target
- .runtime_slot
- .commit_loaded_navigation_renderer_attachment(
- &mut page,
- renderer_agent_candidate,
- )?,
- LoadedNavigationRendererAttachmentCommit::AlreadyCommitted(transaction) => {
- self.active_target
- .runtime_slot
- .bind_page_to_committed_renderer_agent_candidate(&mut page, &transaction)?;
- transaction.previous()
- }
- };
- let new_attachment_id = page
- .renderer_agent_attachment_id()
- .expect("committed navigation Page must have a renderer attachment");
- if let Some(previous_attachment) = previous_attachment
- && previous_attachment.id() != new_attachment_id
- {
- let page_state = self.active_page_state_mut();
- let replacements = page_state
- .devtools_sessions
- .prepare_renderer_call_replacements(
- primary_session_id.as_deref(),
- previous_attachment.id(),
- new_attachment_id,
- )?;
- page_state
- .active_target
- .runtime_slot
- .install_pending_renderer_call_replacements(replacements);
- }
- let committed_document_title = page.document_title();
- self.record_loaded_page_navigation_history(&page, history_url);
- let previous = self.replace_loaded_page(Some(page));
- self.reset_subresource_network_cursor();
- self.clear_websocket_network_artifacts();
- self.active_target
- .owner_state
- .clear_committed_document_navigation_state();
- self.active_target
- .owner_state
- .commit_document_title(committed_document_title);
- self.clear_active_target_runtime_remote_object_tracking();
- let replaced_page_owner = previous.as_ref().and(previous_page_owner);
- if let Some(page) = previous {
- Self::close_page_best_effort(page).await;
- }
- Ok(LoadedNavigationPageCommit {
- replaced_page_owner,
- committed_document_post_response_continuation,
- })
- }
-
pub(crate) async fn clear_active_target_session_scoped_state_async(
&mut self,
) -> Result<(), String> {
self.clear_active_target_session_scoped_state_fields();
- let emulated_media: moli_core::page::EmulatedMediaOverrides = (&self.emulated_media).into();
- if let Some(page) = self.active_target.runtime_slot.loaded_page_mut() {
+ let emulated_media: moli_core::page::EmulatedMediaOverrides =
+ (&self.active_page_target().emulated_media).into();
+ if let Some(page) = self
+ .active_page_target_mut()
+ .active_target
+ .runtime_slot
+ .loaded_page_mut()
+ {
page.set_extra_http_headers_async(&[])
.await
.map_err(|error| format!("failed to clear page extra headers: {error}"))?;
@@ -289,24 +161,6 @@ impl BrowserContext {
self.clear_active_target_session_scoped_state_fields();
}
- pub(crate) async fn mark_active_target_crashed_async(&mut self) {
- self.active_target
- .owner_state
- .target_crash_state
- .mark_crashed();
- self.clear_document_navigation_state_for_active_target();
- let page = self.clear_loaded_page_with_reason(TargetPageAbsenceReason::TargetCrashed);
- if let Some(page) = page {
- Self::close_page_best_effort(page).await;
- }
- self.clear_pending_fetch_state();
- self.active_target
- .owner_state
- .navigation_history_state
- .clear();
- self.clear_session_scoped_network_observation_artifacts();
- }
-
pub(crate) async fn remove_active_page_target_async(&mut self) -> bool {
let Some(target_id) = self.active_target_id_owned() else {
return false;
@@ -329,6 +183,92 @@ impl BrowserContext {
}
impl PageTargetHost {
+ pub(crate) async fn commit_loaded_navigation_page_async(
+ &mut self,
+ browser_context_id: &str,
+ mut page: Page,
+ renderer_attachment_commit: LoadedNavigationRendererAttachmentCommit,
+ history_url: &Url,
+ ) -> anyhow::Result<LoadedNavigationPageCommit> {
+ let committed_document_post_response_continuation =
+ page.take_committed_document_post_response_continuation();
+ let previous_page_owner =
+ self.runtime_slot
+ .page_attachment_id()
+ .map(|page_attachment_id| {
+ TargetPageResidenceIdentity::new(
+ browser_context_id.to_owned(),
+ Some(self.target_id().to_owned()),
+ page_attachment_id,
+ )
+ });
+ let primary_session_id = self.session_id().map(str::to_owned);
+ let previous_title = self
+ .owner_state
+ .committed_document_title()
+ .map(str::to_owned)
+ .or_else(|| self.loaded_page().map(Page::document_title));
+ let previous_attachment = match renderer_attachment_commit {
+ LoadedNavigationRendererAttachmentCommit::Prepare(renderer_agent_candidate) => self
+ .runtime_slot
+ .commit_loaded_navigation_renderer_attachment(
+ &mut page,
+ renderer_agent_candidate,
+ )?,
+ LoadedNavigationRendererAttachmentCommit::AlreadyCommitted(transaction) => {
+ self.runtime_slot
+ .bind_page_to_committed_renderer_agent_candidate(&mut page, &transaction)?;
+ transaction.previous()
+ }
+ };
+ let new_attachment_id = page
+ .renderer_agent_attachment_id()
+ .expect("committed navigation Page must have a renderer attachment");
+ if let Some(previous_attachment) = previous_attachment
+ && previous_attachment.id() != new_attachment_id
+ {
+ let replacements = self.devtools_sessions.prepare_renderer_call_replacements(
+ primary_session_id.as_deref(),
+ previous_attachment.id(),
+ new_attachment_id,
+ )?;
+ self.runtime_slot
+ .install_pending_renderer_call_replacements(replacements);
+ }
+
+ self.owner_state.mark_initial_empty_document_exited();
+ if let Some(previous_title) = previous_title {
+ self.owner_state
+ .refresh_current_navigation_history_title(previous_title);
+ }
+ let committed_document_title = page.document_title();
+ self.owner_state.record_loaded_page_navigation_history((
+ history_url.to_string(),
+ committed_document_title.clone(),
+ ));
+ self.owner_state.clear_committed_document_navigation_state();
+ self.owner_state
+ .commit_document_title(committed_document_title);
+ for session in self.devtools_sessions.states_mut() {
+ session.clear_runtime_remote_object_tracking();
+ session
+ .page_session_state
+ .clear_loaded_document_context_state();
+ }
+
+ let previous = self.replace_loaded_page(Some(page));
+ self.runtime_slot.reset_subresource_cursor();
+ self.runtime_slot.clear_websocket_artifacts();
+ let replaced_page_owner = previous.as_ref().and(previous_page_owner);
+ if let Some(page) = previous {
+ BrowserContext::close_page_best_effort(page).await;
+ }
+ Ok(LoadedNavigationPageCommit {
+ replaced_page_owner,
+ committed_document_post_response_continuation,
+ })
+ }
+
pub(crate) fn target_url(&self) -> &str {
self.target_identity.url()
}
diff --git a/moli-protocol/src/conn/page_state/parked.rs b/moli-protocol/src/conn/page_state/parked.rs
index 8cd444ab8..821636d89 100644
--- a/moli-protocol/src/conn/page_state/parked.rs
+++ b/moli-protocol/src/conn/page_state/parked.rs
@@ -68,7 +68,12 @@ impl BrowserContext {
) -> Option<TargetSessionStorageNamespace> {
creator.and_then(|creator| {
if self.is_active_target(creator.target_id()) {
- return Some(self.active_target.session_storage_namespace.deep_clone());
+ return Some(
+ self.active_page_target()
+ .active_target
+ .session_storage_namespace
+ .deep_clone(),
+ );
}
self.background_target(creator.target_id())
.map(PageTargetHost::deep_clone_session_storage_namespace)
@@ -138,7 +143,8 @@ impl BrowserContext {
}
pub(crate) fn has_attached_child_frame_id(&self, frame_id: &str) -> bool {
- self.active_target
+ self.active_page_target()
+ .active_target
.owner_state
.has_attached_child_frame_id(frame_id)
|| self.background_targets().any(|target| {
@@ -233,7 +239,11 @@ impl BrowserContext {
pub(crate) fn update_target_url(&mut self, target_id: &str, url: String) -> bool {
if self.is_active_target(target_id) {
self.set_target_url(url);
- self.active_target.owner_state.target_crash_state.clear();
+ self.active_page_target_mut()
+ .active_target
+ .owner_state
+ .target_crash_state
+ .clear();
return true;
}
if let Some(target) = self.background_target_mut(target_id) {
@@ -418,9 +428,14 @@ impl BrowserContext {
) = if self.is_active_target(&target_id) {
(
self.effective_extra_headers(),
- self.network_policy.bypass_service_worker(),
- self.network_policy.cache_disabled(),
- self.network_policy.blocked_url_patterns().to_vec(),
+ self.active_page_target()
+ .network_policy
+ .bypass_service_worker(),
+ self.active_page_target().network_policy.cache_disabled(),
+ self.active_page_target()
+ .network_policy
+ .blocked_url_patterns()
+ .to_vec(),
self.effective_active_locale_override_owned(),
self.effective_active_timezone_override_owned(),
)
@@ -442,7 +457,10 @@ impl BrowserContext {
)
};
let page = if self.is_active_target(&target_id) {
- self.active_target.runtime_slot.loaded_page_mut()
+ self.active_page_target_mut()
+ .active_target
+ .runtime_slot
+ .loaded_page_mut()
} else {
self.background_target_mut(&target_id)
.and_then(|target| target.runtime_slot.loaded_page_mut())
@@ -609,93 +627,31 @@ impl BrowserContext {
Some(target_id)
}
+ #[cfg(test)]
pub(crate) fn enable_auxiliary_network_events(&mut self, session_id: &str) {
if self.auxiliary_target_id_for_session(session_id).is_some() {
- self.active_target
+ self.active_page_state_mut()
+ .active_target
.runtime_slot
.enable_auxiliary_network_events(session_id);
}
}
- pub(crate) fn disable_auxiliary_network_events(&mut self, session_id: &str) -> bool {
- self.active_target
- .runtime_slot
- .disable_auxiliary_network_events(session_id)
- }
-
+ #[cfg(test)]
pub(crate) fn has_network_event_listeners(&self) -> bool {
- self.active_target
+ self.active_page_state()
+ .active_target
.runtime_slot
.has_network_event_listeners()
}
- pub(crate) fn network_enabled_for_session(&self, session_id: Option<&str>) -> bool {
- if let Some(session_id) = session_id
- && self.auxiliary_target_id_for_session(session_id).is_some()
- {
- return self
- .active_target
- .runtime_slot
- .auxiliary_network_events_enabled_for_session(session_id);
- }
- self.active_target
- .runtime_slot
- .primary_network_events_enabled()
- }
-
- pub(crate) fn enable_network_event_listener_for_session(
- &mut self,
- session_id: Option<&str>,
- is_auxiliary_target_session: bool,
- ) -> bool {
- let adding_network_event_listener = !self.network_enabled_for_session(session_id);
- if is_auxiliary_target_session && let Some(session_id) = session_id {
- self.enable_auxiliary_network_events(session_id);
- } else {
- self.active_target
- .runtime_slot
- .enable_primary_network_events();
- }
- if adding_network_event_listener {
- self.initialize_network_listener_observation_cursor(session_id);
- }
- adding_network_event_listener
- }
-
- pub(crate) fn disable_network_event_listener_for_session(
- &mut self,
- session_id: Option<&str>,
- is_auxiliary_target_session: bool,
- ) {
- let listener_session_id =
- if is_auxiliary_target_session && let Some(session_id) = session_id {
- self.disable_auxiliary_network_events(session_id);
- Some(session_id)
- } else {
- self.active_target
- .runtime_slot
- .disable_primary_network_events();
- session_id
- };
- self.remove_network_listener_observation_cursor(listener_session_id);
- self.remove_captured_response_body_visibility_for_session(listener_session_id);
- self.clear_network_observation_artifacts_if_unobserved();
- }
-
- pub(crate) fn clear_network_observation_artifacts_if_unobserved(&mut self) {
- if self.has_network_event_listeners() {
- return;
- }
- self.clear_captured_response_bodies();
- self.clear_websocket_network_request_ids();
- }
-
#[cfg(test)]
pub(crate) fn network_event_session_ids(
&self,
trigger_session_id: Option<&str>,
) -> Vec<Option<String>> {
- self.active_target
+ self.active_page_state()
+ .active_target
.runtime_slot
.network_event_session_ids(trigger_session_id, self.active_session_id())
}
@@ -738,7 +694,12 @@ impl BrowserContext {
})
.map(|(session_id, _session_target_id)| session_id.clone())
.collect::<Vec<_>>();
- if let Some(page) = self.active_target.runtime_slot.loaded_page_mut() {
+ if let Some(page) = self
+ .active_page_target_mut()
+ .active_target
+ .runtime_slot
+ .loaded_page_mut()
+ {
for session_id in &auxiliary_inspector_session_ids {
page.detach_runtime_inspector_session_async(Some(session_id))
.await
@@ -757,7 +718,8 @@ impl BrowserContext {
self.detach_active_session();
for session_id in auxiliary_inspector_session_ids {
self.auxiliary_target_sessions.remove(&session_id);
- self.active_target
+ self.active_page_target_mut()
+ .active_target
.runtime_slot
.remove_auxiliary_network_session(&session_id);
}
@@ -782,7 +744,8 @@ impl BrowserContext {
session_id: &str,
) -> bool {
if self.active_session_id() == Some(session_id) {
- self.active_target
+ self.active_page_target_mut()
+ .active_target
.runtime_slot
.disable_primary_network_events();
self.detach_active_session();
@@ -992,17 +955,17 @@ impl BrowserContext {
let Some(target_id) = self.active_target_id_owned() else {
return;
};
- self.active_target
+ self.active_page_target_mut()
+ .active_target
.runtime_slot
.mark_loaded_page_absent(TargetPageAbsenceReason::InitialDocumentPageBuildPending);
- self.active_target.owner_state.begin_initial_empty_document(
- target_id,
- initial_url,
- None,
- storage_key,
- );
+ self.active_page_target_mut()
+ .active_target
+ .owner_state
+ .begin_initial_empty_document(target_id, initial_url, None, storage_key);
}
+ #[cfg(test)]
pub(crate) fn mark_target_initial_empty_document_materialized(&mut self, target_id: &str) {
self.mutate_target_owner_state_by_target_id(target_id, |owner_state| {
owner_state.mark_initial_empty_document_materialized();
@@ -1045,7 +1008,9 @@ impl BrowserContext {
mutate: impl FnOnce(&mut ParkedTargetOwnerState) -> T,
) -> Option<T> {
if self.is_active_target(target_id) {
- return Some(mutate(&mut self.active_target.owner_state));
+ return Some(mutate(
+ &mut self.active_page_target_mut().active_target.owner_state,
+ ));
}
self.background_target(target_id)?;
Some(self.mutate_parked_target_owner_state(target_id, mutate))
@@ -1110,6 +1075,7 @@ impl BrowserContext {
target_id: Some(DevToolsTargetId::from(target_id)),
kind: DevToolsTargetKind::Page,
title: self
+ .active_page_target()
.active_target
.owner_state
.committed_document_title()
@@ -1334,15 +1300,19 @@ impl BrowserContext {
return false;
}
let current_attachment = match expected.target_id() {
- Some(target_id) if self.is_active_target(target_id) => {
- self.active_target.runtime_slot.page_attachment_id()
- }
+ Some(target_id) if self.is_active_target(target_id) => self
+ .active_page_target()
+ .active_target
+ .runtime_slot
+ .page_attachment_id(),
Some(target_id) => self
.background_target(target_id)
.and_then(|target| target.runtime_slot.page_attachment_id()),
- None if self.active_target_id().is_none() => {
- self.active_target.runtime_slot.page_attachment_id()
- }
+ None if self.active_target_id().is_none() => self
+ .active_page_target()
+ .active_target
+ .runtime_slot
+ .page_attachment_id(),
None => None,
};
current_attachment == Some(expected.page_attachment_id())
@@ -1914,17 +1884,22 @@ mod tests {
context.assign_auxiliary_session_to_target("TID-active", "SID-aux".to_owned()),
"auxiliary session should attach to active target"
);
- context.active_target.fetch_owner.configure(
- Some("SID-aux".to_owned()),
- false,
- vec![FetchInterceptionPattern {
- url_pattern: "*".to_owned(),
- resource_type_filter: None,
- request_stage: FetchRequestStage::Request,
- }],
- );
+ context
+ .active_page_state_mut()
+ .active_target
+ .fetch_owner
+ .configure(
+ Some("SID-aux".to_owned()),
+ false,
+ vec![FetchInterceptionPattern {
+ url_pattern: "*".to_owned(),
+ resource_type_filter: None,
+ request_stage: FetchRequestStage::Request,
+ }],
+ );
assert!(
context
+ .active_page_state()
.active_target
.fetch_owner
.config_snapshot()
@@ -1938,6 +1913,7 @@ mod tests {
assert!(
!context
+ .active_page_state()
.active_target
.fetch_owner
.config_snapshot()
@@ -1955,20 +1931,25 @@ mod tests {
context.set_target_security_origin("https://active.test".to_owned());
context.set_target_secure_context_type("Secure".to_owned());
context
+ .active_page_state_mut()
.active_target
.runtime_slot
.set_page_attachment_id_for_test(42);
- context.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ context.active_page_state_mut().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.runtime_session_state
.runtime_frontend_enabled = true;
- context.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ context.active_page_state_mut().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.runtime_session_state
.inspector_enabled = true;
context
+ .active_page_state_mut()
.active_target
.owner_state
.next_document_start_script_id = 3;
context
+ .active_page_state_mut()
.active_target
.owner_state
.isolated_worlds
@@ -1977,6 +1958,7 @@ mod tests {
grant_universal_access: false,
});
context
+ .active_page_state_mut()
.active_target
.owner_state
.document_start_scripts
@@ -2038,42 +2020,53 @@ mod tests {
context.set_active_target_id("TID-demote".to_owned());
context.attach_active_session("SID-demote".to_owned());
context.set_target_url(active_page.final_url().as_str().to_owned());
- context.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ context.active_page_state_mut().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.runtime_session_state
.runtime_frontend_enabled = true;
- context.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ context.active_page_state_mut().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.runtime_session_state
.inspector_enabled = true;
- context.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ context.active_page_state_mut().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.console_output_session_state
.console_enabled = true;
- context.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ context.active_page_state_mut().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.page_session_state
.log_enabled = true;
assert!(
- context.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ context.active_page_state_mut().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.page_session_state
.performance
.enable(PerformanceTimeDomain::ThreadTicks)
);
- context.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ context.active_page_state_mut().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.page_session_state
.page_lifecycle_events = true;
- context.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ context.active_page_state_mut().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.page_session_state
.page_file_chooser_opened_event_enabled = true;
- context.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ context.active_page_state_mut().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.page_session_state
.page_intercept_file_chooser_dialog_enabled = true;
context
+ .active_page_state_mut()
.active_target
.runtime_slot
.set_primary_network_events_enabled(true);
context
+ .active_page_state_mut()
.active_target
.owner_state
.next_document_start_script_id = 9;
context
+ .active_page_state_mut()
.active_target
.owner_state
.document_start_scripts
@@ -2089,15 +2082,18 @@ mod tests {
},
));
context
+ .active_page_state_mut()
.active_target
.runtime_slot
.set_network_request_counters_for_test(77, 88);
context
+ .active_page_state_mut()
.active_target
.runtime_slot
.mark_subresource_records_emitted(None, 0, 3);
context.set_loaded_page_async(active_page).await;
let active_attachment = context
+ .active_page_state()
.active_target
.runtime_slot
.current_renderer_attachment()
@@ -2310,7 +2306,11 @@ mod tests {
"production demotion must preserve a pending initial document absence reason"
);
assert_eq!(
- context.active_target.runtime_slot.moli_memory_diagnostics()["loadedPageAbsenceReason"],
+ context
+ .active_page_state()
+ .active_target
+ .runtime_slot
+ .moli_memory_diagnostics()["loadedPageAbsenceReason"],
json!("initial-document-page-build-pending"),
"the replacement target must expose its own pending initial document build"
);
@@ -2335,7 +2335,11 @@ mod tests {
);
assert_eq!(
- context.active_target.runtime_slot.moli_memory_diagnostics()["loadedPageAbsenceReason"],
+ context
+ .active_page_state()
+ .active_target
+ .runtime_slot
+ .moli_memory_diagnostics()["loadedPageAbsenceReason"],
json!("initial-document-page-build-pending"),
"production promotion must preserve a pending initial document absence reason"
);
@@ -2412,6 +2416,7 @@ mod tests {
);
assert_eq!(
context
+ .active_page_state()
.active_target
.runtime_slot
.current_renderer_attachment()
@@ -2464,6 +2469,7 @@ mod tests {
.expect("background target")
.replace_loaded_page(Some(background_page));
let active_attachment = context
+ .active_page_state()
.active_target
.runtime_slot
.current_renderer_attachment()
@@ -2482,6 +2488,7 @@ mod tests {
assert_eq!(
context
+ .active_page_state()
.active_target
.runtime_slot
.current_renderer_attachment()
@@ -2550,17 +2557,20 @@ mod tests {
assert_eq!(context.active_target_id(), Some("TID-bg"));
assert!(
- context.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ context.active_page_state().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.runtime_session_state
.runtime_frontend_enabled
);
assert!(
- context.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ context.active_page_state().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.runtime_session_state
.inspector_enabled
);
assert_eq!(
context
+ .active_page_state()
.active_target
.runtime_slot
.emitted_subresource_record_count_for_session_for_test(None),
@@ -2569,6 +2579,7 @@ mod tests {
);
assert_eq!(
context
+ .active_page_state()
.active_target
.runtime_slot
.emitted_websocket_event_count_for_session_for_test(None),
@@ -2576,40 +2587,47 @@ mod tests {
"websocket observation cursor should restore with target network artifacts"
);
assert!(
- context.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ context.active_page_state().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.page_session_state
.page_lifecycle_events
);
assert!(
- context.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ context.active_page_state().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.page_session_state
.log_enabled
);
assert!(
- context.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ context.active_page_state().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.console_output_session_state
.console_enabled
);
assert!(
- context.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ context.active_page_state().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.page_session_state
.performance
.enabled()
);
assert_eq!(
- context.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ context.active_page_state().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.page_session_state
.performance
.time_domain(),
PerformanceTimeDomain::ThreadTicks
);
assert!(
- context.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ context.active_page_state().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.page_session_state
.page_file_chooser_opened_event_enabled
);
assert!(
- context.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ context.active_page_state().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.page_session_state
.page_intercept_file_chooser_dialog_enabled
);
diff --git a/moli-protocol/src/conn/page_state/surfaces.rs b/moli-protocol/src/conn/page_state/surfaces.rs
index 449edf3d7..1ff1f9855 100644
--- a/moli-protocol/src/conn/page_state/surfaces.rs
+++ b/moli-protocol/src/conn/page_state/surfaces.rs
@@ -25,14 +25,16 @@ impl SurfaceOverrideInputs {
network_conditions: browser_context.effective_active_network_conditions(),
geolocation_override: browser_context.effective_active_geolocation_override(),
emulated_device_metrics: browser_context.effective_active_emulated_device_metrics(),
- touch_emulation_enabled: browser_context.touch_emulation_enabled,
- focus_emulation_enabled: browser_context.focus_emulation_enabled,
+ touch_emulation_enabled: browser_context.active_page_target().touch_emulation_enabled,
+ focus_emulation_enabled: browser_context.active_page_target().focus_emulation_enabled,
active_target_surface: true,
window_document_hidden: browser_context
+ .active_page_target()
.active_target
.owner_state
.window_document_hidden(),
window_fullscreen: browser_context
+ .active_page_target()
.active_target
.owner_state
.window_fullscreen(),
@@ -146,7 +148,8 @@ impl BrowserContext {
scripts.extend(self.default_document_start_script_descriptors());
let target_id = self.active_target_id();
scripts.extend(
- self.active_target
+ self.active_page_target()
+ .active_target
.owner_state
.document_start_scripts
.iter()
@@ -324,7 +327,11 @@ impl BrowserContext {
}
pub fn max_touch_points(&self) -> u32 {
- if self.touch_emulation_enabled { 1 } else { 0 }
+ if self.active_page_target().touch_emulation_enabled {
+ 1
+ } else {
+ 0
+ }
}
pub fn document_has_focus(&self) -> bool {
@@ -599,7 +606,12 @@ impl BrowserContext {
let Some(script) = self.generated_surface_override_script() else {
return Ok(());
};
- let Some(page) = self.active_target.runtime_slot.loaded_page_mut() else {
+ let Some(page) = self
+ .active_page_target_mut()
+ .active_target
+ .runtime_slot
+ .loaded_page_mut()
+ else {
return Ok(());
};
page.run_page_surface_override_script_async(&script.source)
diff --git a/moli-protocol/src/conn/resource_runtime_support.rs b/moli-protocol/src/conn/resource_runtime_support.rs
index b086e136d..2e0b14f92 100644
--- a/moli-protocol/src/conn/resource_runtime_support.rs
+++ b/moli-protocol/src/conn/resource_runtime_support.rs
@@ -283,10 +283,12 @@ impl CdpConnection {
self.session_route(session_id),
Some(super::CdpSessionRoute::Browser)
) {
- return self
- .browser_context
- .as_mut()
- .and_then(|bc| bc.active_target.runtime_slot.loaded_page_mut());
+ return self.browser_context.as_mut().and_then(|bc| {
+ bc.active_page_target_mut()
+ .active_target
+ .runtime_slot
+ .loaded_page_mut()
+ });
}
self.loaded_page_mut_for_target_configuration(session_id)
.ok()
@@ -301,10 +303,12 @@ impl CdpConnection {
session_id.and_then(|session_id| self.session_route(Some(session_id))),
Some(super::CdpSessionRoute::Browser)
) {
- return self
- .browser_context
- .as_mut()
- .and_then(|bc| bc.active_target.runtime_slot.loaded_page_mut());
+ return self.browser_context.as_mut().and_then(|bc| {
+ bc.active_page_target_mut()
+ .active_target
+ .runtime_slot
+ .loaded_page_mut()
+ });
}
self.loaded_page_mut_for_target_configuration_for_route(session_id, owner_route)
.ok()
diff --git a/moli-protocol/src/conn/runtime_eval.rs b/moli-protocol/src/conn/runtime_eval.rs
index 153c1b3bf..494eadcfc 100644
--- a/moli-protocol/src/conn/runtime_eval.rs
+++ b/moli-protocol/src/conn/runtime_eval.rs
@@ -550,8 +550,14 @@ fn collect_moli_diagnostics_pending_snapshots(
browser_context: &mut BrowserContext,
pending: &mut Vec<PendingMoliDiagnosticsPageSnapshot>,
) -> Result<(), String> {
- if browser_context.active_target.runtime_slot.has_loaded_page() {
+ if browser_context
+ .active_page_target()
+ .active_target
+ .runtime_slot
+ .has_loaded_page()
+ {
let pending_snapshot = browser_context
+ .active_page_target()
.active_target
.runtime_slot
.loaded_page()
@@ -3680,7 +3686,10 @@ impl CdpConnection {
.browser_context_by_id_mut(&route.browser_context_id)
.ok_or_else(|| "NoDocumentLoaded".to_owned())?;
let slot = if browser_context.active_target_id() == route.target_id.as_deref() {
- &mut browser_context.active_target.runtime_slot
+ &mut browser_context
+ .active_page_target_mut()
+ .active_target
+ .runtime_slot
} else {
let target_id = route
.target_id
@@ -4116,7 +4125,11 @@ impl CdpConnection {
.background_target_mut(target_id)
.and_then(|target| target.loaded_page_mut())
} else {
- browser_context.active_target.runtime_slot.loaded_page_mut()
+ browser_context
+ .active_page_target_mut()
+ .active_target
+ .runtime_slot
+ .loaded_page_mut()
}
})
else {
@@ -6066,6 +6079,7 @@ mod tests {
browser_context.set_active_target_id("TID-active");
browser_context.attach_active_session("SID-active".to_owned());
browser_context
+ .active_page_state_mut()
.active_target
.runtime_slot
.set_page_attachment_id_for_test(1);
@@ -7180,7 +7194,8 @@ mod tests {
{
let browser_context = conn.browser_context.as_ref().expect("browser context");
assert!(
- browser_context.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ browser_context.active_page_state().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.has_pending_inspector_awaits(),
"active DevTools session should physically store its pending await"
);
@@ -7369,6 +7384,7 @@ mod tests {
browser_context.set_active_target_id("TID-listener-cancel".to_owned());
browser_context.attach_active_session("SID-listener-cancel".to_owned());
browser_context
+ .active_page_state_mut()
.active_target
.runtime_slot
.set_page_attachment_id_for_test(1);
diff --git a/moli-protocol/src/conn/runtime_load.rs b/moli-protocol/src/conn/runtime_load.rs
index 0bd00a550..20816d02a 100644
--- a/moli-protocol/src/conn/runtime_load.rs
+++ b/moli-protocol/src/conn/runtime_load.rs
@@ -1999,15 +1999,18 @@ impl CdpConnection {
{
if browser_context.active_target_id() == Some(owner.target_id.as_str()) {
if browser_context
+ .active_page_target()
.active_target
.runtime_slot
.has_initial_document_page_build_in_progress()
{
browser_context
+ .active_page_target_mut()
.active_target
.runtime_slot
.fail_initial_document_page_build(message.clone());
browser_context
+ .active_page_target_mut()
.active_target
.runtime_slot
.mark_loaded_page_absent(
@@ -2052,6 +2055,7 @@ impl CdpConnection {
if let Some(browser_context) = self.browser_context_by_id_mut(&owner.browser_context_id) {
if browser_context.active_target_id() == Some(owner.target_id.as_str()) {
browser_context
+ .active_page_target_mut()
.active_target
.runtime_slot
.complete_initial_document_page_build();
@@ -2085,7 +2089,10 @@ impl CdpConnection {
) {
if let Some(browser_context) = self.browser_context_by_id_mut(&owner.browser_context_id) {
if browser_context.active_target_id() == Some(owner.target_id.as_str()) {
- let runtime_slot = &mut browser_context.active_target.runtime_slot;
+ let runtime_slot = &mut browser_context
+ .active_page_target_mut()
+ .active_target
+ .runtime_slot;
if runtime_slot.has_initial_document_page_build_in_progress() {
runtime_slot.fail_initial_document_page_build(message);
runtime_slot.mark_loaded_page_absent(
diff --git a/moli-protocol/src/conn/settings/engine.rs b/moli-protocol/src/conn/settings/engine.rs
index 72d592d1f..103df6f0d 100644
--- a/moli-protocol/src/conn/settings/engine.rs
+++ b/moli-protocol/src/conn/settings/engine.rs
@@ -71,6 +71,7 @@ impl CdpConnection {
);
if let Some(browser_context) = self.browser_context.as_mut() {
browser_context
+ .active_page_target_mut()
.network_policy
.set_browser_identity_override(browser_identity);
} else {
diff --git a/moli-protocol/src/conn/state/browser_context.rs b/moli-protocol/src/conn/state/browser_context.rs
index 86139dade..fc94ae296 100644
--- a/moli-protocol/src/conn/state/browser_context.rs
+++ b/moli-protocol/src/conn/state/browser_context.rs
@@ -358,37 +358,30 @@ impl std::fmt::Debug for BrowserContext {
}
}
-impl std::ops::Deref for BrowserContext {
- type Target = TargetPageState;
-
- fn deref(&self) -> &Self::Target {
- self.active_page_state()
- }
-}
-
-impl std::ops::DerefMut for BrowserContext {
- fn deref_mut(&mut self) -> &mut Self::Target {
- self.active_page_state_mut()
- }
-}
-
fn usize_to_u64_saturating(value: usize) -> u64 {
u64::try_from(value).unwrap_or(u64::MAX)
}
impl BrowserContext {
- pub(crate) fn active_page_state(&self) -> &TargetPageState {
+ pub(crate) fn active_page_target(&self) -> &PageTargetHost {
self.page_targets
.active()
.expect("BrowserContext has no active page target")
- .state()
}
- pub(crate) fn active_page_state_mut(&mut self) -> &mut TargetPageState {
+ pub(crate) fn active_page_target_mut(&mut self) -> &mut PageTargetHost {
self.page_targets
.active_mut()
.expect("BrowserContext has no active page target")
- .state_mut()
+ }
+
+ #[cfg(test)]
+ pub(crate) fn active_page_state(&self) -> &TargetPageState {
+ self.active_page_target().state()
+ }
+
+ pub(crate) fn active_page_state_mut(&mut self) -> &mut TargetPageState {
+ self.active_page_target_mut().state_mut()
}
/// Parks a dialog only until the matching lightweight-popup target obtains
@@ -974,22 +967,15 @@ impl BrowserContext {
}
pub(crate) fn loaded_document_page_count(&self) -> usize {
- usize::from(self.has_loaded_page())
- + self
- .background_targets()
- .filter(|target| target.has_loaded_page())
- .count()
+ self.page_targets
+ .iter()
+ .filter(|target| target.has_loaded_page())
+ .count()
}
pub(crate) fn pending_document_page_build_count(&self) -> usize {
- usize::from(
- self.has_active_target()
- && self
- .active_target
- .runtime_slot
- .has_pending_initial_document_page_build(),
- ) + self
- .background_targets()
+ self.page_targets
+ .iter()
.filter(|target| {
target
.runtime_slot()
@@ -999,13 +985,7 @@ impl BrowserContext {
}
pub(crate) fn target_has_pending_initial_document_page_build(&self, target_id: &str) -> bool {
- if self.active_target_id() == Some(target_id) {
- return self
- .active_target
- .runtime_slot
- .has_pending_initial_document_page_build();
- }
- self.background_target(target_id).is_some_and(|target| {
+ self.page_target(target_id).is_some_and(|target| {
target
.runtime_slot()
.has_pending_initial_document_page_build()
@@ -1016,13 +996,7 @@ impl BrowserContext {
&self,
target_id: &str,
) -> Option<&'static str> {
- if self.active_target_id() == Some(target_id) {
- return self
- .active_target
- .runtime_slot
- .transient_no_page_reason_for_protocol_output();
- }
- self.background_target(target_id).and_then(|target| {
+ self.page_target(target_id).and_then(|target| {
target
.runtime_slot()
.transient_no_page_reason_for_protocol_output()
@@ -1033,46 +1007,25 @@ impl BrowserContext {
&self,
target_id: &str,
) -> Result<(), String> {
- if self.active_target_id() == Some(target_id) {
- return materialized_initial_empty_document_missing_page_error(
- target_id,
- &self.active_target.owner_state,
- self.has_loaded_page(),
- )
- .map_or(Ok(()), Err);
- }
-
- let Some(target) = self.background_target(target_id) else {
- return Ok(());
- };
- let Some(owner_state) = self.parked_target_owner_state(target_id) else {
+ let Some(target) = self.page_target(target_id) else {
return Ok(());
};
materialized_initial_empty_document_missing_page_error(
target_id,
- owner_state,
+ &target.owner_state,
target.has_loaded_page(),
)
.map_or(Ok(()), Err)
}
pub(crate) fn can_install_current_initial_empty_document_page(&self, target_id: &str) -> bool {
- if self.active_target_id() == Some(target_id) {
- return !self.has_loaded_page()
- && self
- .active_target
- .owner_state
- .can_install_current_initial_empty_document_page();
- }
-
- let Some(target) = self.background_target(target_id) else {
+ let Some(target) = self.page_target(target_id) else {
return false;
};
- if target.has_loaded_page() {
- return false;
- }
- self.parked_target_owner_state(target_id)
- .is_none_or(TargetOwnerState::can_install_current_initial_empty_document_page)
+ !target.has_loaded_page()
+ && target
+ .owner_state
+ .can_install_current_initial_empty_document_page()
}
/// Reports whether one exact Page target is still on its materialized
@@ -1200,12 +1153,7 @@ impl BrowserContext {
loader_id: String,
) -> Option<DocumentNavigationToken> {
let target_id = self.active_target_id()?.to_owned();
- let token = self
- .active_target
- .runtime_slot
- .start_document_navigation(target_id.clone(), loader_id);
- self.mark_target_initial_empty_document_pending_cross_document_navigation(&target_id);
- Some(token)
+ self.start_document_navigation_for_target(&target_id, loader_id)
}
pub(crate) fn start_document_navigation_for_target(
@@ -1213,16 +1161,7 @@ impl BrowserContext {
target_id: &str,
loader_id: String,
) -> Option<DocumentNavigationToken> {
- if self.active_target_id() == Some(target_id) {
- let target_id = target_id.to_owned();
- let token = self
- .active_target
- .runtime_slot
- .start_document_navigation(target_id.clone(), loader_id);
- self.mark_target_initial_empty_document_pending_cross_document_navigation(&target_id);
- return Some(token);
- }
- let target = self.background_target_mut(target_id)?;
+ let target = self.page_target_mut(target_id)?;
let token = target
.runtime_slot
.start_document_navigation(target_id.to_owned(), loader_id);
@@ -1234,31 +1173,18 @@ impl BrowserContext {
&self,
token: &DocumentNavigationToken,
) -> bool {
- if self.active_target_id() == Some(token.target_id.as_str()) {
- return self
- .active_target
- .runtime_slot
- .accepts_pending_document_navigation_event(token);
- }
- self.background_target(&token.target_id)
- .is_some_and(|target| {
- target
- .runtime_slot()
- .accepts_pending_document_navigation_event(token)
- })
+ self.page_target(&token.target_id).is_some_and(|target| {
+ target
+ .runtime_slot()
+ .accepts_pending_document_navigation_event(token)
+ })
}
pub(crate) fn document_navigation_cancellation_handle(
&self,
token: &DocumentNavigationToken,
) -> Option<moli_fetch::FetchCancelHandle> {
- if self.active_target_id() == Some(token.target_id.as_str()) {
- return self
- .active_target
- .runtime_slot
- .document_navigation_cancellation_handle(token);
- }
- self.background_target(&token.target_id).and_then(|target| {
+ self.page_target(&token.target_id).and_then(|target| {
target
.runtime_slot()
.document_navigation_cancellation_handle(token)
@@ -1270,13 +1196,7 @@ impl BrowserContext {
token: &DocumentNavigationToken,
additional_cancellation: Option<moli_fetch::FetchCancelHandle>,
) -> bool {
- if self.active_target_id() == Some(token.target_id.as_str()) {
- return self
- .active_target
- .runtime_slot
- .arm_background_navigation_completion(token, additional_cancellation);
- }
- let Some(target) = self.background_target_mut(&token.target_id) else {
+ let Some(target) = self.page_target_mut(&token.target_id) else {
if let Some(cancellation) = additional_cancellation {
cancellation.cancel();
}
@@ -1291,13 +1211,7 @@ impl BrowserContext {
&mut self,
token: &DocumentNavigationToken,
) -> bool {
- if self.active_target_id() == Some(token.target_id.as_str()) {
- return self
- .active_target
- .runtime_slot
- .settle_background_navigation_completion(token);
- }
- self.background_target_mut(&token.target_id)
+ self.page_target_mut(&token.target_id)
.is_some_and(|target| {
target
.runtime_slot
@@ -1312,13 +1226,7 @@ impl BrowserContext {
}
pub(crate) fn has_inflight_background_navigation_for_target(&self, target_id: &str) -> bool {
- if self.active_target_id() == Some(target_id) {
- return self
- .active_target
- .runtime_slot
- .has_inflight_background_navigation();
- }
- self.background_target(target_id)
+ self.page_target(target_id)
.is_some_and(|target| target.runtime_slot().has_inflight_background_navigation())
}
@@ -1326,18 +1234,11 @@ impl BrowserContext {
&self,
token: &DocumentNavigationToken,
) -> bool {
- if self.active_target_id() == Some(token.target_id.as_str()) {
- return self
- .active_target
- .runtime_slot
- .accepts_document_body_completion_event(token);
- }
- self.background_target(&token.target_id)
- .is_some_and(|target| {
- target
- .runtime_slot()
- .accepts_document_body_completion_event(token)
- })
+ self.page_target(&token.target_id).is_some_and(|target| {
+ target
+ .runtime_slot()
+ .accepts_document_body_completion_event(token)
+ })
}
pub(crate) fn has_pending_document_navigation_for_target(
@@ -1347,13 +1248,7 @@ impl BrowserContext {
let Some(target_id) = target_id else {
return false;
};
- if self.active_target_id() == Some(target_id) {
- return self
- .active_target
- .runtime_slot
- .has_pending_document_navigation();
- }
- self.background_target(target_id)
+ self.page_target(target_id)
.is_some_and(|target| target.runtime_slot().has_pending_document_navigation())
}
@@ -1365,27 +1260,13 @@ impl BrowserContext {
let Some(target_id) = target_id else {
return;
};
- if self.active_target_id() == Some(target_id) {
- let cleared = self
- .active_target
- .runtime_slot
- .clear_pending_document_navigation_if_loader_matches(loader_id);
- if cleared {
- self.clear_target_initial_empty_document_pending_cross_document_navigation(
- target_id,
- );
- }
- return;
- }
- if let Some(target) = self.background_target_mut(target_id) {
- let cleared = target
+ let cleared = self.page_target_mut(target_id).is_some_and(|target| {
+ target
.runtime_slot
- .clear_pending_document_navigation_if_loader_matches(loader_id);
- if cleared {
- self.clear_target_initial_empty_document_pending_cross_document_navigation(
- target_id,
- );
- }
+ .clear_pending_document_navigation_if_loader_matches(loader_id)
+ });
+ if cleared {
+ self.clear_target_initial_empty_document_pending_cross_document_navigation(target_id);
}
}
@@ -1393,28 +1274,22 @@ impl BrowserContext {
&mut self,
token: &DocumentNavigationToken,
) {
- if self.active_target_id() == Some(token.target_id.as_str()) {
- let committed = self
- .active_target
- .runtime_slot
- .commit_pending_document_navigation_if_matches(token);
- if committed {
- self.mark_target_initial_empty_document_exited(&token.target_id);
- }
- return;
- }
- if let Some(target) = self.background_target_mut(&token.target_id) {
- let committed = target
- .runtime_slot
- .commit_pending_document_navigation_if_matches(token);
- if committed {
- self.mark_target_initial_empty_document_exited(&token.target_id);
- }
+ let committed = self
+ .page_target_mut(&token.target_id)
+ .is_some_and(|target| {
+ target
+ .runtime_slot
+ .commit_pending_document_navigation_if_matches(token)
+ });
+ if committed {
+ self.mark_target_initial_empty_document_exited(&token.target_id);
}
}
+ #[cfg(test)]
pub(crate) fn clear_document_navigation_state_for_active_target(&mut self) {
- self.active_target
+ self.active_page_target_mut()
+ .active_target
.runtime_slot
.clear_document_navigation_state();
}
@@ -1560,7 +1435,10 @@ impl BrowserContext {
#[cfg(test)]
pub(crate) fn session_storage_store_for_test(&self) -> &SharedWebStorageStore {
- self.active_target.session_storage_namespace.store()
+ self.active_page_target()
+ .active_target
+ .session_storage_namespace
+ .store()
}
#[cfg(test)]
@@ -1839,27 +1717,34 @@ impl BrowserContext {
}
pub(crate) fn target_url(&self) -> &str {
- self.target_identity.url()
+ self.active_page_target().target_identity.url()
}
pub(crate) fn target_security_origin(&self) -> &str {
- self.target_identity.security_origin()
+ self.active_page_target().target_identity.security_origin()
}
pub(crate) fn target_secure_context_type(&self) -> &str {
- self.target_identity.secure_context_type()
+ self.active_page_target()
+ .target_identity
+ .secure_context_type()
}
pub(crate) fn set_target_url(&mut self, url: String) {
- self.target_identity.set_url(url);
+ self.active_page_target_mut().target_identity.set_url(url);
}
+ #[cfg(test)]
pub(crate) fn set_target_security_origin(&mut self, security_origin: String) {
- self.target_identity.set_security_origin(security_origin);
+ self.active_page_target_mut()
+ .target_identity
+ .set_security_origin(security_origin);
}
+ #[cfg(test)]
pub(crate) fn set_target_secure_context_type(&mut self, secure_context_type: String) {
- self.target_identity
+ self.active_page_target_mut()
+ .target_identity
.set_secure_context_type(secure_context_type);
}
}
diff --git a/moli-protocol/src/conn/state/navigation_outcome.rs b/moli-protocol/src/conn/state/navigation_outcome.rs
index 74259aaf9..19fcb698c 100644
--- a/moli-protocol/src/conn/state/navigation_outcome.rs
+++ b/moli-protocol/src/conn/state/navigation_outcome.rs
@@ -377,12 +377,14 @@ impl<'a> TargetInfo<'a> {
target_id,
kind: "page",
title: bc
+ .active_page_target()
.active_target
.owner_state
.committed_document_title()
.map(str::to_owned)
.or_else(|| {
- bc.active_target
+ bc.active_page_target()
+ .active_target
.runtime_slot
.loaded_page()
.map(|page| page.document_title())
diff --git a/moli-protocol/src/conn/state/runtime_slot.rs b/moli-protocol/src/conn/state/runtime_slot.rs
index 608ad7d0b..e0d30d741 100644
--- a/moli-protocol/src/conn/state/runtime_slot.rs
+++ b/moli-protocol/src/conn/state/runtime_slot.rs
@@ -923,6 +923,7 @@ impl TargetRuntimeSlot {
self.network_agent.set_primary_events_enabled(enabled);
}
+ #[cfg(test)]
pub(crate) fn enable_primary_network_events(&mut self) {
self.network_agent.enable_primary_events();
}
diff --git a/moli-protocol/src/conn/state/tests.rs b/moli-protocol/src/conn/state/tests.rs
index 36807dd96..4af4cec94 100644
--- a/moli-protocol/src/conn/state/tests.rs
+++ b/moli-protocol/src/conn/state/tests.rs
@@ -974,36 +974,62 @@ fn active_target_state_groups_runtime_fetch_and_owner_state() {
let mut context =
BrowserContext::new_with_page_for_test("BID-active-owner", "TID-active-owner");
- assert!(!context.active_target.runtime_slot.has_loaded_page());
- assert!(!context.active_target.fetch_owner.is_enabled());
- assert!(context.active_target.owner_state.is_default());
+ assert!(
+ !context
+ .active_page_state()
+ .active_target
+ .runtime_slot
+ .has_loaded_page()
+ );
+ assert!(
+ !context
+ .active_page_state()
+ .active_target
+ .fetch_owner
+ .is_enabled()
+ );
+ assert!(
+ context
+ .active_page_state()
+ .active_target
+ .owner_state
+ .is_default()
+ );
context
+ .active_page_state_mut()
.active_target
.runtime_slot
.enable_primary_network_events();
- context.active_target.fetch_owner.configure(
- Some("FETCH-SID".to_owned()),
- false,
- vec![FetchInterceptionPattern {
- url_pattern: "*".to_owned(),
- resource_type_filter: Some(FetchResourceTypeFilter::Document),
- request_stage: FetchRequestStage::Response,
- }],
- );
context
+ .active_page_state_mut()
+ .active_target
+ .fetch_owner
+ .configure(
+ Some("FETCH-SID".to_owned()),
+ false,
+ vec![FetchInterceptionPattern {
+ url_pattern: "*".to_owned(),
+ resource_type_filter: Some(FetchResourceTypeFilter::Document),
+ request_stage: FetchRequestStage::Response,
+ }],
+ );
+ context
+ .active_page_state_mut()
.active_target
.owner_state
.next_document_start_script_id = 7;
assert!(
context
+ .active_page_state()
.active_target
.runtime_slot
.primary_network_events_enabled()
);
assert_eq!(
context
+ .active_page_state()
.active_target
.fetch_owner
.matching_document_request_stage(&Url::parse("https://example.test/").unwrap()),
@@ -1011,6 +1037,7 @@ fn active_target_state_groups_runtime_fetch_and_owner_state() {
);
assert_eq!(
context
+ .active_page_state()
.active_target
.owner_state
.next_document_start_script_id,
@@ -1516,7 +1543,11 @@ fn active_target_initial_empty_document_record_tracks_navigation_lifecycle() {
context.begin_active_target_initial_empty_document("about:blank#active".to_owned());
assert_eq!(
- context.active_target.runtime_slot.moli_memory_diagnostics()["loadedPageAbsenceReason"],
+ context
+ .active_page_state()
+ .active_target
+ .runtime_slot
+ .moli_memory_diagnostics()["loadedPageAbsenceReason"],
json!("initial-document-page-build-pending"),
"active initial document target should make the missing Page reason explicit"
);
@@ -1527,6 +1558,7 @@ fn active_target_initial_empty_document_record_tracks_navigation_lifecycle() {
);
let initial = context
+ .active_page_state()
.active_target
.owner_state
.initial_empty_document_state()
@@ -1540,6 +1572,7 @@ fn active_target_initial_empty_document_record_tracks_navigation_lifecycle() {
context.mark_target_initial_empty_document_materialized("TID-initial-active");
assert!(
context
+ .active_page_state()
.active_target
.owner_state
.initial_empty_document_state()
@@ -1551,6 +1584,7 @@ fn active_target_initial_empty_document_record_tracks_navigation_lifecycle() {
.start_document_navigation_for_active_target("LOADER-initial-active".to_owned())
.expect("active target should start document navigation");
let pending = context
+ .active_page_state()
.active_target
.owner_state
.initial_empty_document_state()
@@ -1563,6 +1597,7 @@ fn active_target_initial_empty_document_record_tracks_navigation_lifecycle() {
"LOADER-initial-active",
);
let cleared = context
+ .active_page_state()
.active_target
.owner_state
.initial_empty_document_state()
@@ -1575,6 +1610,7 @@ fn active_target_initial_empty_document_record_tracks_navigation_lifecycle() {
.expect("active target should restart document navigation");
context.commit_document_navigation_if_matches(&committed);
let exited = context
+ .active_page_state()
.active_target
.owner_state
.initial_empty_document_state()
diff --git a/moli-protocol/src/conn/target/control.rs b/moli-protocol/src/conn/target/control.rs
index 16ab278d3..5ed6100b4 100644
--- a/moli-protocol/src/conn/target/control.rs
+++ b/moli-protocol/src/conn/target/control.rs
@@ -1,6 +1,6 @@
use std::collections::HashSet;
-use super::graph::TabTarget;
+use super::graph::{TabTarget, TargetGraph};
use crate::devtools_runtime::{
DevToolsSessionId, DevToolsTargetFilterEntry, DevToolsTargetId, DevToolsTargetInfo,
DevToolsTargetKind, TargetAttachmentEvent, TargetDetachmentEvent,
@@ -8,47 +8,37 @@ use crate::devtools_runtime::{
use super::{
CommittedAttachSession, DetachedTargetSession, PreparedAttachSession, TargetClosureCleanupPlan,
- TargetClosurePlan, TargetEventPlan, TargetHandlerStore, TargetHostDelta, TargetRegistry,
- TargetSessionRegistry,
+ TargetClosurePlan, TargetEventPlan, TargetHandlerStore, TargetHostDelta, TargetSessionRegistry,
};
use crate::conn::{BackgroundProtocolEvent, CdpSessionRoute, CdpTargetFilter};
#[derive(Clone, Debug, Default, PartialEq, Eq)]
pub(crate) struct TargetControlPlane {
sessions: TargetSessionRegistry,
- registry: TargetRegistry,
+ graph: TargetGraph,
handlers: TargetHandlerStore,
}
impl TargetControlPlane {
pub(crate) fn register_tab(&mut self, tab_target_id: String, primary_page_target_id: String) {
- self.registry
+ self.graph
.register_tab(tab_target_id, primary_page_target_id);
}
- pub(crate) fn register_worker(&mut self, target_id: String, kind: DevToolsTargetKind) {
- self.registry.register_worker(target_id, kind);
- }
-
- pub(crate) fn remove_worker(&mut self, target_id: &str) -> bool {
- self.registry.remove_worker(target_id).is_some()
- }
-
pub(crate) fn tab_target_id_for_page_target_id(&self, page_target_id: &str) -> Option<&str> {
- self.registry
- .tab_target_id_for_page_target_id(page_target_id)
+ self.graph.tab_target_id_for_page_target_id(page_target_id)
}
pub(crate) fn primary_page_target_id_for_tab_target_id(
&self,
tab_target_id: &str,
) -> Option<&str> {
- self.registry
+ self.graph
.primary_page_target_id_for_tab_target_id(tab_target_id)
}
pub(crate) fn primary_session_id_for_tab_target_id(&self, tab_target_id: &str) -> Option<&str> {
- self.registry
+ self.graph
.primary_session_id_for_tab_target_id(tab_target_id)
}
@@ -58,23 +48,25 @@ impl TargetControlPlane {
session_id: String,
auxiliary: bool,
) -> bool {
- self.registry
+ self.graph
.assign_session_to_tab_target(tab_target_id, session_id, auxiliary)
}
pub(crate) fn remove_tab_session(&mut self, session_id: &str) -> Option<String> {
- self.registry.remove_tab_session(session_id)
+ self.graph.remove_tab_session(session_id)
}
pub(crate) fn remove_tab_by_page_target_id(
&mut self,
page_target_id: &str,
) -> Option<TargetClosurePlan> {
- self.registry.remove_tab_by_page_target_id(page_target_id)
+ self.graph
+ .remove_tab_by_page_target_id(page_target_id)
+ .map(TargetClosurePlan::from_tab_target)
}
pub(crate) fn tab_target_id_for_session_id(&self, session_id: &str) -> Option<&str> {
- self.registry.tab_target_id_for_session_id(session_id)
+ self.graph.tab_target_id_for_session_id(session_id)
}
pub(crate) fn tab_target_info_for_page_target_info(
@@ -85,7 +77,7 @@ impl TargetControlPlane {
return None;
}
let page_target_id = page_target_info.target_id.as_ref()?.as_str();
- let target = self.registry.tab_for_page_target_id(page_target_id)?;
+ let target = self.graph.tab_for_page_target_id(page_target_id)?;
Some(super::projection::tab_target_info_from_page_target_info(
target,
page_target_info,
@@ -99,14 +91,14 @@ impl TargetControlPlane {
let target = target_info
.target_id
.as_ref()
- .and_then(|target_id| self.registry.tab_for_page_target_id(target_id.as_str()));
+ .and_then(|target_id| self.graph.tab_for_page_target_id(target_id.as_str()));
super::projection::project_page_tab_target_infos_for_destruction(target, target_info)
}
fn paired_tab_target(&self, target_id: &str) -> Option<&TabTarget> {
- self.registry
+ self.graph
.tab_for_page_target_id(target_id)
- .or_else(|| self.registry.tab(target_id))
+ .or_else(|| self.graph.tab(target_id))
}
pub(crate) fn target_created_deltas(&self, target_id: &str) -> Vec<TargetHostDelta> {
@@ -537,11 +529,11 @@ impl TargetControlPlane {
#[cfg(test)]
pub(crate) fn len(&self) -> usize {
- self.registry.len()
+ self.graph.len()
}
- pub(crate) fn host_kind(&self, target_id: &str) -> Option<DevToolsTargetKind> {
- self.registry.host(target_id).map(|host| host.kind())
+ pub(crate) fn contains_tab_or_page_relation(&self, target_id: &str) -> bool {
+ self.graph.contains_target_id(target_id)
}
}
diff --git a/moli-protocol/src/conn/target/graph.rs b/moli-protocol/src/conn/target/graph.rs
index 869de7418..f4bd64e7e 100644
--- a/moli-protocol/src/conn/target/graph.rs
+++ b/moli-protocol/src/conn/target/graph.rs
@@ -1,5 +1,40 @@
use std::collections::{HashMap, HashSet};
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub(crate) enum TargetHostDelta {
+ Created { target_id: String },
+ InfoChanged { target_id: String },
+ Destroyed { target_id: String },
+}
+
+impl TargetHostDelta {
+ pub(crate) fn created(target_id: impl Into<String>) -> Self {
+ Self::Created {
+ target_id: target_id.into(),
+ }
+ }
+
+ pub(crate) fn info_changed(target_id: impl Into<String>) -> Self {
+ Self::InfoChanged {
+ target_id: target_id.into(),
+ }
+ }
+
+ pub(crate) fn destroyed(target_id: impl Into<String>) -> Self {
+ Self::Destroyed {
+ target_id: target_id.into(),
+ }
+ }
+
+ pub(crate) fn target_id(&self) -> &str {
+ match self {
+ Self::Created { target_id }
+ | Self::InfoChanged { target_id }
+ | Self::Destroyed { target_id } => target_id,
+ }
+ }
+}
+
#[derive(Clone, Debug, Default, PartialEq, Eq)]
pub(crate) struct TargetSessionSet {
primary_session_id: Option<String>,
@@ -90,6 +125,37 @@ impl TabTarget {
}
}
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub(crate) struct TargetClosurePlan {
+ tab_target: TabTarget,
+ deltas: Vec<TargetHostDelta>,
+}
+
+impl TargetClosurePlan {
+ pub(super) fn from_tab_target(target: TabTarget) -> Self {
+ let deltas = target
+ .target_ids_in_destruction_order()
+ .into_iter()
+ .map(TargetHostDelta::destroyed)
+ .collect();
+ Self {
+ tab_target: target,
+ deltas,
+ }
+ }
+
+ pub(crate) fn tab_target(&self) -> &TabTarget {
+ &self.tab_target
+ }
+
+ pub(crate) fn destroyed_target_ids(&self) -> impl Iterator<Item = &str> {
+ self.deltas.iter().filter_map(|delta| match delta {
+ TargetHostDelta::Destroyed { target_id } => Some(target_id.as_str()),
+ TargetHostDelta::Created { .. } | TargetHostDelta::InfoChanged { .. } => None,
+ })
+ }
+}
+
#[derive(Clone, Debug, Default, PartialEq, Eq)]
pub(crate) struct TargetGraph {
tabs: HashMap<String, TabTarget>,
@@ -181,6 +247,10 @@ impl TargetGraph {
self.tabs.get(tab_target_id)
}
+ pub(crate) fn contains_target_id(&self, target_id: &str) -> bool {
+ self.tabs.contains_key(target_id) || self.page_to_tab.contains_key(target_id)
+ }
+
#[cfg(test)]
pub(crate) fn len(&self) -> usize {
self.tabs.len()
diff --git a/moli-protocol/src/conn/target/host.rs b/moli-protocol/src/conn/target/host.rs
deleted file mode 100644
index 86d0d22e1..000000000
--- a/moli-protocol/src/conn/target/host.rs
+++ /dev/null
@@ -1,26 +0,0 @@
-use crate::devtools_runtime::DevToolsTargetKind;
-
-/// Stable protocol identity for one live CDP target.
-///
-/// Ownership and association belong to `TargetGraph`; keeping them out of the
-/// host avoids conflating Moli's internal Tab/Page relationship with CDP's
-/// public `parentId` semantics.
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub(crate) struct TargetHost {
- id: String,
- kind: DevToolsTargetKind,
-}
-
-impl TargetHost {
- pub(crate) fn new(id: String, kind: DevToolsTargetKind) -> Self {
- Self { id, kind }
- }
-
- pub(crate) fn id(&self) -> &str {
- &self.id
- }
-
- pub(crate) fn kind(&self) -> DevToolsTargetKind {
- self.kind
- }
-}
diff --git a/moli-protocol/src/conn/target/mod.rs b/moli-protocol/src/conn/target/mod.rs
index dd7ffd662..f697ad9f5 100644
--- a/moli-protocol/src/conn/target/mod.rs
+++ b/moli-protocol/src/conn/target/mod.rs
@@ -3,10 +3,8 @@ mod auto_attach_owner;
mod control;
mod default_target;
mod graph;
-mod host;
mod observer;
mod projection;
-mod registry;
mod route;
mod session;
mod session_binding;
@@ -17,8 +15,8 @@ mod worker_session;
pub(crate) use activation::TargetActivationTransition;
pub(crate) use control::TargetControlPlane;
pub(crate) use default_target::{DEFAULT_BROWSER_CONTEXT_ID, DefaultTargetLifecycle};
+pub(crate) use graph::{TargetClosurePlan, TargetHostDelta};
pub(crate) use observer::{TargetHandlerStore, target_destroyed_automation_events};
-pub(crate) use registry::{TargetClosurePlan, TargetHostDelta, TargetRegistry};
pub(crate) use route::{CdpSessionRoute, TargetHandlerAccessMode};
pub(crate) use session::{
CommittedAttachSession, DetachedTargetSession, PreparedAttachSession, TargetSessionRegistry,
diff --git a/moli-protocol/src/conn/target/registry.rs b/moli-protocol/src/conn/target/registry.rs
deleted file mode 100644
index cc0b2ab3d..000000000
--- a/moli-protocol/src/conn/target/registry.rs
+++ /dev/null
@@ -1,290 +0,0 @@
-use std::collections::HashMap;
-
-use super::graph::{TabTarget, TargetGraph};
-use super::host::TargetHost;
-use crate::devtools_runtime::DevToolsTargetKind;
-
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub(crate) enum TargetHostDelta {
- Created { target_id: String },
- InfoChanged { target_id: String },
- Destroyed { target_id: String },
-}
-
-impl TargetHostDelta {
- pub(crate) fn created(target_id: impl Into<String>) -> Self {
- Self::Created {
- target_id: target_id.into(),
- }
- }
-
- pub(crate) fn info_changed(target_id: impl Into<String>) -> Self {
- Self::InfoChanged {
- target_id: target_id.into(),
- }
- }
-
- pub(crate) fn destroyed(target_id: impl Into<String>) -> Self {
- Self::Destroyed {
- target_id: target_id.into(),
- }
- }
-
- pub(crate) fn target_id(&self) -> &str {
- match self {
- Self::Created { target_id }
- | Self::InfoChanged { target_id }
- | Self::Destroyed { target_id } => target_id,
- }
- }
-}
-
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub(crate) struct TargetClosurePlan {
- tab_target: TabTarget,
- deltas: Vec<TargetHostDelta>,
-}
-
-impl TargetClosurePlan {
- fn from_tab_target(target: TabTarget) -> Self {
- let deltas = target
- .target_ids_in_destruction_order()
- .into_iter()
- .map(TargetHostDelta::destroyed)
- .collect();
- Self {
- tab_target: target,
- deltas,
- }
- }
-
- pub(crate) fn tab_target(&self) -> &TabTarget {
- &self.tab_target
- }
-
- pub(crate) fn destroyed_target_ids(&self) -> impl Iterator<Item = &str> {
- self.deltas.iter().filter_map(|delta| match delta {
- TargetHostDelta::Destroyed { target_id } => Some(target_id.as_str()),
- TargetHostDelta::Created { .. } | TargetHostDelta::InfoChanged { .. } => None,
- })
- }
-}
-
-#[derive(Clone, Debug, Default, PartialEq, Eq)]
-pub(crate) struct TargetRegistry {
- hosts: HashMap<String, TargetHost>,
- graph: TargetGraph,
-}
-
-impl TargetRegistry {
- pub(crate) fn register_tab(&mut self, tab_target_id: String, primary_page_target_id: String) {
- self.remove_tab_by_page_target_id(&primary_page_target_id);
- self.remove_tab_by_target_id(&tab_target_id);
- self.hosts.insert(
- tab_target_id.clone(),
- TargetHost::new(tab_target_id.clone(), DevToolsTargetKind::Tab),
- );
- self.hosts.insert(
- primary_page_target_id.clone(),
- TargetHost::new(primary_page_target_id.clone(), DevToolsTargetKind::Page),
- );
- self.graph
- .register_tab(tab_target_id, primary_page_target_id);
- }
-
- pub(crate) fn register_worker(&mut self, target_id: String, kind: DevToolsTargetKind) {
- debug_assert!(matches!(
- kind,
- DevToolsTargetKind::Worker
- | DevToolsTargetKind::SharedWorker
- | DevToolsTargetKind::ServiceWorker
- ));
- self.hosts
- .insert(target_id.clone(), TargetHost::new(target_id, kind));
- }
-
- pub(crate) fn remove_worker(&mut self, target_id: &str) -> Option<TargetHost> {
- let host = self.hosts.get(target_id)?;
- if !matches!(
- host.kind(),
- DevToolsTargetKind::Worker
- | DevToolsTargetKind::SharedWorker
- | DevToolsTargetKind::ServiceWorker
- ) {
- return None;
- }
- self.hosts.remove(target_id)
- }
-
- pub(crate) fn remove_tab_by_page_target_id(
- &mut self,
- page_target_id: &str,
- ) -> Option<TargetClosurePlan> {
- let target = self.graph.remove_tab_by_page_target_id(page_target_id)?;
- self.remove_tab_hosts(&target);
- Some(TargetClosurePlan::from_tab_target(target))
- }
-
- pub(crate) fn remove_tab_by_target_id(
- &mut self,
- tab_target_id: &str,
- ) -> Option<TargetClosurePlan> {
- let target = self.graph.remove_tab_by_target_id(tab_target_id)?;
- self.remove_tab_hosts(&target);
- Some(TargetClosurePlan::from_tab_target(target))
- }
-
- fn remove_tab_hosts(&mut self, target: &TabTarget) {
- self.hosts.remove(target.id());
- self.hosts.remove(target.primary_page_target_id());
- }
-
- pub(crate) fn tab_target_id_for_page_target_id(&self, page_target_id: &str) -> Option<&str> {
- let host = self.hosts.get(page_target_id)?;
- debug_assert_eq!(host.id(), page_target_id);
- if host.kind() != DevToolsTargetKind::Page {
- return None;
- }
- self.graph.tab_target_id_for_page_target_id(page_target_id)
- }
-
- pub(crate) fn primary_page_target_id_for_tab_target_id(
- &self,
- tab_target_id: &str,
- ) -> Option<&str> {
- let host = self.hosts.get(tab_target_id)?;
- debug_assert_eq!(host.id(), tab_target_id);
- if host.kind() != DevToolsTargetKind::Tab {
- return None;
- }
- self.graph
- .primary_page_target_id_for_tab_target_id(tab_target_id)
- }
-
- pub(crate) fn primary_session_id_for_tab_target_id(&self, tab_target_id: &str) -> Option<&str> {
- self.graph
- .primary_session_id_for_tab_target_id(tab_target_id)
- }
-
- pub(crate) fn assign_session_to_tab_target(
- &mut self,
- tab_target_id: &str,
- session_id: String,
- auxiliary: bool,
- ) -> bool {
- if self
- .primary_page_target_id_for_tab_target_id(tab_target_id)
- .is_none()
- {
- return false;
- }
- self.graph
- .assign_session_to_tab_target(tab_target_id, session_id, auxiliary)
- }
-
- pub(crate) fn remove_tab_session(&mut self, session_id: &str) -> Option<String> {
- self.graph.remove_tab_session(session_id)
- }
-
- pub(crate) fn tab_target_id_for_session_id(&self, session_id: &str) -> Option<&str> {
- self.graph.tab_target_id_for_session_id(session_id)
- }
-
- pub(crate) fn tab_for_page_target_id(&self, page_target_id: &str) -> Option<&TabTarget> {
- self.graph.tab_for_page_target_id(page_target_id)
- }
-
- pub(crate) fn tab(&self, tab_target_id: &str) -> Option<&TabTarget> {
- self.graph.tab(tab_target_id)
- }
-
- #[cfg(test)]
- pub(crate) fn len(&self) -> usize {
- self.graph.len()
- }
-
- #[cfg(test)]
- pub(crate) fn host_count(&self) -> usize {
- self.hosts.len()
- }
-
- pub(crate) fn host(&self, target_id: &str) -> Option<&TargetHost> {
- self.hosts.get(target_id)
- }
-}
-
-#[cfg(test)]
-mod tests {
- use crate::devtools_runtime::DevToolsTargetKind;
-
- use super::TargetRegistry;
-
- #[test]
- fn target_registry_registers_distinct_page_and_tab_hosts() {
- let mut registry = TargetRegistry::default();
- registry.register_tab("TAB-1".to_owned(), "TID-page".to_owned());
-
- assert_eq!(registry.len(), 1);
- assert_eq!(
- registry.tab_target_id_for_page_target_id("TID-page"),
- Some("TAB-1")
- );
- assert_eq!(
- registry.primary_page_target_id_for_tab_target_id("TAB-1"),
- Some("TID-page")
- );
-
- let page = registry.host("TID-page").expect("page host");
- assert_eq!(page.id(), "TID-page");
- assert_eq!(page.kind(), DevToolsTargetKind::Page);
-
- let tab = registry.host("TAB-1").expect("tab host");
- assert_eq!(tab.id(), "TAB-1");
- assert_eq!(tab.kind(), DevToolsTargetKind::Tab);
- }
-
- #[test]
- fn target_registry_removes_page_and_tab_hosts_together() {
- let mut registry = TargetRegistry::default();
- registry.register_tab("TAB-1".to_owned(), "TID-page".to_owned());
-
- let removed = registry
- .remove_tab_by_target_id("TAB-1")
- .expect("removed tab target");
- assert_eq!(removed.tab_target().primary_page_target_id(), "TID-page");
- assert_eq!(removed.tab_target().id(), "TAB-1");
- assert_eq!(
- removed.destroyed_target_ids().collect::<Vec<_>>(),
- vec!["TID-page", "TAB-1"]
- );
- assert_eq!(registry.host("TID-page"), None);
- assert_eq!(registry.host("TAB-1"), None);
- assert_eq!(registry.tab_target_id_for_page_target_id("TID-page"), None);
- assert_eq!(
- registry.primary_page_target_id_for_tab_target_id("TAB-1"),
- None
- );
- }
-
- #[test]
- fn target_registry_registers_and_removes_worker_host_without_tab_graph() {
- let mut registry = TargetRegistry::default();
- registry.register_worker(
- "TID-shared-worker".to_owned(),
- DevToolsTargetKind::SharedWorker,
- );
-
- assert_eq!(registry.len(), 0);
- assert_eq!(registry.host_count(), 1);
- let host = registry.host("TID-shared-worker").expect("worker host");
- assert_eq!(host.id(), "TID-shared-worker");
- assert_eq!(host.kind(), DevToolsTargetKind::SharedWorker);
-
- let removed = registry
- .remove_worker("TID-shared-worker")
- .expect("removed worker host");
- assert_eq!(removed.id(), "TID-shared-worker");
- assert_eq!(registry.host("TID-shared-worker"), None);
- assert_eq!(registry.host_count(), 0);
- }
-}
diff --git a/moli-protocol/src/conn/target/route.rs b/moli-protocol/src/conn/target/route.rs
index 011652f39..c74bf496c 100644
--- a/moli-protocol/src/conn/target/route.rs
+++ b/moli-protocol/src/conn/target/route.rs
@@ -293,6 +293,7 @@ impl CdpConnection {
.map(|(_, target_id)| target_id)
}
+ #[cfg(test)]
pub(crate) fn background_target_route(
&self,
session_id: Option<&str>,
diff --git a/moli-protocol/src/conn/tests/cookie_surfaces/snapshots/telemetry.rs b/moli-protocol/src/conn/tests/cookie_surfaces/snapshots/telemetry.rs
index 4d247a591..e01555960 100644
--- a/moli-protocol/src/conn/tests/cookie_surfaces/snapshots/telemetry.rs
+++ b/moli-protocol/src/conn/tests/cookie_surfaces/snapshots/telemetry.rs
@@ -34,6 +34,7 @@ async fn browser_context_document_cookie_snapshots_reflect_live_page_state() {
.browser_context
.as_mut()
.unwrap()
+ .active_page_state_mut()
.active_target
.runtime_slot
.loaded_page_mut()
@@ -75,6 +76,7 @@ async fn browser_context_document_cookie_snapshots_reflect_live_page_state() {
.browser_context
.as_mut()
.unwrap()
+ .active_page_state_mut()
.active_target
.runtime_slot
.loaded_page_mut()
diff --git a/moli-protocol/src/conn/tests/mod.rs b/moli-protocol/src/conn/tests/mod.rs
index c98409d14..17a85616c 100644
--- a/moli-protocol/src/conn/tests/mod.rs
+++ b/moli-protocol/src/conn/tests/mod.rs
@@ -801,12 +801,17 @@ async fn replacing_or_retiring_a_loaded_page_changes_its_attachment_identity() {
));
let context = conn.browser_context.as_mut().unwrap();
assert_eq!(
- context.active_target.runtime_slot.page_attachment_id(),
+ context
+ .active_page_state()
+ .active_target
+ .runtime_slot
+ .page_attachment_id(),
None
);
assert!(context.replace_loaded_page(Some(first_page)).is_none());
let first_attachment = context
+ .active_page_state()
.active_target
.runtime_slot
.page_attachment_id()
@@ -816,6 +821,7 @@ async fn replacing_or_retiring_a_loaded_page_changes_its_attachment_identity() {
.replace_loaded_page(Some(second_page))
.expect("first Page should be replaced");
let second_attachment = context
+ .active_page_state()
.active_target
.runtime_slot
.page_attachment_id()
@@ -827,7 +833,11 @@ async fn replacing_or_retiring_a_loaded_page_changes_its_attachment_identity() {
.clear_loaded_page_with_reason(TargetPageAbsenceReason::TargetClosed)
.expect("second Page should be retired");
assert_eq!(
- context.active_target.runtime_slot.page_attachment_id(),
+ context
+ .active_page_state()
+ .active_target
+ .runtime_slot
+ .page_attachment_id(),
None
);
let _ = second.close_async().await;
@@ -846,6 +856,7 @@ async fn moli_diagnostics_preserves_runtime_observable_diagnostics() {
browser_context.attach_active_session("SID-diagnostics-capture");
browser_context.set_target_url(page.final_url().as_str().to_owned());
let _ = browser_context
+ .active_page_state_mut()
.active_target
.runtime_slot
.replace_loaded_page(Some(page));
@@ -1019,7 +1030,13 @@ async fn memory_diagnostics_sync_counts_dedicated_worker_from_cached_page_snapsh
let ready_response = conn
.browser_context
.as_mut()
- .and_then(|context| context.active_target.runtime_slot.loaded_page_mut())
+ .and_then(|context| {
+ context
+ .active_page_state_mut()
+ .active_target
+ .runtime_slot
+ .loaded_page_mut()
+ })
.expect("loaded sync diagnostics page")
.evaluate_runtime_expression_async("globalThis.__lmSyncDiagnosticsWorkerReady === true")
.await
@@ -1276,9 +1293,11 @@ async fn memory_diagnostics_splits_pending_inspector_await_counts_by_target_owne
browser_context.set_active_target_id("TID-pending-await-active");
browser_context.attach_active_session("SID-pending-await-active");
browser_context.replace_loaded_page(Some(active_page));
- browser_context.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ browser_context.active_page_state_mut().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.register_pending_inspector_await(10_001, Some("SID-pending-await-active"), None);
- browser_context.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ browser_context.active_page_state_mut().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.register_pending_inspector_await(
10_002,
Some("SID-pending-await-active"),
diff --git a/moli-protocol/src/conn/tests/resource_runtime.rs b/moli-protocol/src/conn/tests/resource_runtime.rs
index 34925e50f..b4077cb75 100644
--- a/moli-protocol/src/conn/tests/resource_runtime.rs
+++ b/moli-protocol/src/conn/tests/resource_runtime.rs
@@ -502,6 +502,7 @@ fn page_request_client_for_navigation_inputs_inherits_service_worker_bypass() {
browser_context.set_active_target_id("TID-1");
browser_context.attach_active_session("SID-1");
browser_context
+ .active_page_state_mut()
.network_policy
.set_bypass_service_worker(true);
conn.browser_context = Some(browser_context);
@@ -705,6 +706,7 @@ async fn reset_resource_runtime_clears_loaded_page_cookie_backend() {
conn.browser_context
.as_mut()
.unwrap()
+ .active_page_state_mut()
.active_target
.runtime_slot
.set_loaded_page_for_test(navigation.page);
@@ -713,6 +715,7 @@ async fn reset_resource_runtime_clears_loaded_page_cookie_backend() {
.browser_context
.as_mut()
.unwrap()
+ .active_page_state_mut()
.active_target
.runtime_slot
.loaded_page_mut()
@@ -729,6 +732,7 @@ async fn reset_resource_runtime_clears_loaded_page_cookie_backend() {
.browser_context
.as_mut()
.unwrap()
+ .active_page_state_mut()
.active_target
.runtime_slot
.loaded_page_mut()
@@ -970,6 +974,7 @@ async fn user_agent_override_rebinds_live_document_after_engine_runtime_invalida
conn.browser_context
.as_mut()
.unwrap()
+ .active_page_state_mut()
.active_target
.runtime_slot
.set_loaded_page_for_test(navigation.page);
@@ -984,6 +989,7 @@ async fn user_agent_override_rebinds_live_document_after_engine_runtime_invalida
.browser_context
.as_mut()
.unwrap()
+ .active_page_state_mut()
.active_target
.runtime_slot
.loaded_page_mut()
@@ -1015,6 +1021,7 @@ async fn tls_and_proxy_overrides_rebind_live_document_after_engine_runtime_inval
conn.browser_context
.as_mut()
.unwrap()
+ .active_page_state_mut()
.active_target
.runtime_slot
.set_loaded_page_for_test(navigation.page);
@@ -1027,6 +1034,7 @@ async fn tls_and_proxy_overrides_rebind_live_document_after_engine_runtime_inval
.browser_context
.as_mut()
.unwrap()
+ .active_page_state_mut()
.active_target
.runtime_slot
.loaded_page_mut()
@@ -1044,6 +1052,7 @@ async fn tls_and_proxy_overrides_rebind_live_document_after_engine_runtime_inval
.browser_context
.as_mut()
.unwrap()
+ .active_page_state_mut()
.active_target
.runtime_slot
.loaded_page_mut()
@@ -1097,12 +1106,14 @@ async fn loader_uses_active_browser_context_user_agent_override() {
let mut conn = CdpConnection::new();
let mut first = BrowserContext::new_with_page_for_test("BID-1", "TID-1");
first
+ .active_page_state_mut()
.network_policy
.set_user_agent_override("Moli/Context-A".into());
conn.browser_context = Some(first);
let mut second = BrowserContext::new_with_page_for_test("BID-2", "TID-2");
second
+ .active_page_state_mut()
.network_policy
.set_user_agent_override("Moli/Context-B".into());
conn.inactive_browser_contexts.push(second);
@@ -1127,11 +1138,11 @@ async fn loader_uses_active_browser_context_user_agent_override() {
async fn loader_uses_active_browser_context_http_proxy_override() {
let mut conn = CdpConnection::new();
let mut first = BrowserContext::new_with_page_for_test("BID-1", "TID-1");
- first.http_proxy_override = Some("http://proxy-a.test:8080".into());
+ first.active_page_state_mut().http_proxy_override = Some("http://proxy-a.test:8080".into());
conn.browser_context = Some(first);
let mut second = BrowserContext::new_with_page_for_test("BID-2", "TID-2");
- second.http_proxy_override = Some("http://proxy-b.test:8080".into());
+ second.active_page_state_mut().http_proxy_override = Some("http://proxy-b.test:8080".into());
conn.inactive_browser_contexts.push(second);
assert_eq!(
@@ -1154,11 +1165,11 @@ async fn loader_uses_active_browser_context_http_proxy_override() {
async fn loader_uses_active_browser_context_http_no_proxy_override() {
let mut conn = CdpConnection::new();
let mut first = BrowserContext::new_with_page_for_test("BID-1", "TID-1");
- first.http_no_proxy_override = Some("localhost,127.0.0.1".into());
+ first.active_page_state_mut().http_no_proxy_override = Some("localhost,127.0.0.1".into());
conn.browser_context = Some(first);
let mut second = BrowserContext::new_with_page_for_test("BID-2", "TID-2");
- second.http_no_proxy_override = Some("::1,.example.com".into());
+ second.active_page_state_mut().http_no_proxy_override = Some("::1,.example.com".into());
conn.inactive_browser_contexts.push(second);
assert_eq!(
@@ -1181,11 +1192,11 @@ async fn loader_uses_active_browser_context_http_no_proxy_override() {
async fn loader_uses_active_browser_context_tls_verify_host_override() {
let mut conn = CdpConnection::new();
let mut first = BrowserContext::new_with_page_for_test("BID-1", "TID-1");
- first.tls_verify_host_override = Some(false);
+ first.active_page_state_mut().tls_verify_host_override = Some(false);
conn.browser_context = Some(first);
let mut second = BrowserContext::new_with_page_for_test("BID-2", "TID-2");
- second.tls_verify_host_override = Some(true);
+ second.active_page_state_mut().tls_verify_host_override = Some(true);
conn.inactive_browser_contexts.push(second);
assert!(
@@ -1209,18 +1220,21 @@ async fn removing_an_inactive_browser_context_keeps_the_previously_active_contex
let mut first = BrowserContext::new_with_page_for_test("BID-A", "TID-A");
first
+ .active_page_state_mut()
.network_policy
.set_user_agent_override("Moli/Context-A".into());
conn.browser_context = Some(first);
let mut second = BrowserContext::new_with_page_for_test("BID-B", "TID-B");
second
+ .active_page_state_mut()
.network_policy
.set_user_agent_override("Moli/Context-B".into());
conn.inactive_browser_contexts.push(second);
let mut third = BrowserContext::new_with_page_for_test("BID-C", "TID-C");
third
+ .active_page_state_mut()
.network_policy
.set_user_agent_override("Moli/Context-C".into());
conn.inactive_browser_contexts.push(third);
@@ -1259,12 +1273,14 @@ async fn manual_browser_context_restore_reselects_original_context_after_switch(
let mut first = BrowserContext::new_with_page_for_test("BID-A", "TID-A");
first
+ .active_page_state_mut()
.network_policy
.set_user_agent_override("Moli/Context-A".into());
conn.browser_context = Some(first);
let mut second = BrowserContext::new_with_page_for_test("BID-B", "TID-B");
second
+ .active_page_state_mut()
.network_policy
.set_user_agent_override("Moli/Context-B".into());
conn.inactive_browser_contexts.push(second);
@@ -1334,6 +1350,7 @@ async fn session_scoped_process_message_restores_previously_active_context_after
.expect("session browser context should remain inactive after dispatch");
assert!(
inactive
+ .active_page_state()
.active_target
.runtime_slot
.primary_network_events_enabled()
@@ -1373,6 +1390,7 @@ async fn session_scoped_process_message_async_restores_previously_active_context
.expect("session browser context should remain inactive after async dispatch");
assert!(
inactive
+ .active_page_state()
.active_target
.runtime_slot
.primary_network_events_enabled()
@@ -1408,6 +1426,7 @@ async fn direct_network_enable_routes_to_inactive_active_owner_without_promoting
.expect("inactive owner must remain parked");
assert!(
inactive
+ .active_page_state()
.active_target
.runtime_slot
.primary_network_events_enabled()
@@ -1421,7 +1440,8 @@ async fn direct_runtime_evaluate_routes_to_inactive_active_owner_without_promoti
let mut inactive = BrowserContext::new("BID-B".into());
inactive.set_active_target_id("TID-B".to_owned());
inactive.attach_active_session("SID-B");
- inactive.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ inactive.active_page_state_mut().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.runtime_session_state
.runtime_frontend_enabled = true;
ctx.conn.inactive_browser_contexts.push(inactive);
@@ -1463,13 +1483,16 @@ async fn direct_runtime_evaluate_document_replacement_lifecycle_uses_inactive_ow
let mut inactive = BrowserContext::new("BID-document-replacement".into());
inactive.set_active_target_id("TID-document-replacement".to_owned());
inactive.attach_active_session("SID-document-replacement");
- inactive.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ inactive.active_page_state_mut().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.runtime_session_state
.runtime_frontend_enabled = true;
- inactive.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ inactive.active_page_state_mut().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.dom_session_state
.enabled = true;
- inactive.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ inactive.active_page_state_mut().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.page_session_state
.page_lifecycle_events = true;
ctx.conn.inactive_browser_contexts.push(inactive);
@@ -1538,6 +1561,7 @@ fn devtools_document_lifecycle_wait_key_observes_interruption_and_target_loss()
browser_context.set_active_target_id("TID-lifecycle-wait".to_owned());
browser_context.attach_active_session("SID-lifecycle-wait");
browser_context
+ .active_page_state_mut()
.active_target
.runtime_slot
.set_page_attachment_id_for_test(901);
@@ -1669,6 +1693,7 @@ fn devtools_document_lifecycle_wait_key_observes_interruption_and_target_loss()
replacement_context.set_active_target_id("TID-other".to_owned());
replacement_context.attach_active_session("SID-lifecycle-wait");
replacement_context
+ .active_page_state_mut()
.active_target
.runtime_slot
.set_page_attachment_id_for_test(902);
@@ -1713,6 +1738,7 @@ fn devtools_target_context_resolves_background_page_without_ambient_route() {
let mut browser_context = BrowserContext::new("BID-explicit-owner".into());
browser_context.set_active_target_id("TID-active");
browser_context
+ .active_page_state_mut()
.active_target
.runtime_slot
.set_page_attachment_id_for_test(1001);
@@ -1768,7 +1794,8 @@ async fn direct_runtime_evaluate_same_document_navigation_updates_inactive_owner
let mut inactive = BrowserContext::new("BID-same-document".into());
inactive.set_active_target_id("TID-same-document".to_owned());
inactive.attach_active_session("SID-same-document");
- inactive.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ inactive.active_page_state_mut().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.runtime_session_state
.runtime_frontend_enabled = true;
inactive.set_target_url(initial_url.clone());
@@ -2160,7 +2187,8 @@ async fn direct_runtime_evaluate_routes_to_inactive_auxiliary_owner_without_prom
inactive.set_active_target_id("TID-B".to_owned());
inactive.attach_active_session("SID-primary");
assert!(inactive.assign_auxiliary_session_to_target("TID-B", "SID-aux".to_owned()));
- inactive.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ inactive.active_page_state_mut().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.runtime_session_state
.runtime_frontend_enabled = true;
ctx.conn.inactive_browser_contexts.push(inactive);
@@ -2226,6 +2254,7 @@ async fn direct_network_enable_disable_routes_to_inactive_auxiliary_owner_withou
.expect("inactive owner must remain parked");
assert!(
!inactive
+ .active_page_state()
.active_target
.runtime_slot
.primary_network_events_enabled(),
@@ -2233,6 +2262,7 @@ async fn direct_network_enable_disable_routes_to_inactive_auxiliary_owner_withou
);
assert!(
inactive
+ .active_page_state()
.active_target
.runtime_slot
.has_auxiliary_network_events_for_session("SID-aux")
@@ -2258,6 +2288,7 @@ async fn direct_network_enable_disable_routes_to_inactive_auxiliary_owner_withou
.expect("inactive owner must remain parked");
assert!(
!inactive
+ .active_page_state()
.active_target
.runtime_slot
.has_auxiliary_network_events_for_session("SID-aux")
@@ -2626,7 +2657,8 @@ async fn direct_background_command_does_not_emit_active_observable_output_under_
let mut active = BrowserContext::new("BID-A".into());
active.set_active_target_id("TID-active".to_owned());
active.attach_active_session("SID-active");
- active.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ active.active_page_state_mut().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.console_output_session_state
.console_enabled = true;
active.replace_loaded_page(Some(active_page));
@@ -2699,12 +2731,14 @@ async fn direct_console_routes_to_inactive_active_owner_without_promoting_slot()
.find(|bc| bc.id == "BID-B")
.expect("inactive owner must remain parked");
assert!(
- inactive.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ inactive.active_page_state().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.console_output_session_state
.console_enabled
);
assert_eq!(
inactive
+ .active_page_state()
.active_target
.owner_state
.console_output_state
@@ -2751,12 +2785,14 @@ async fn direct_console_routes_to_inactive_active_owner_without_promoting_slot()
.find(|bc| bc.id == "BID-B")
.expect("inactive owner must remain parked");
assert!(
- !inactive.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ !inactive.active_page_state().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.console_output_session_state
.console_enabled
);
assert_eq!(
inactive
+ .active_page_state()
.active_target
.owner_state
.console_output_state
@@ -2993,12 +3029,14 @@ async fn direct_log_enable_routes_to_inactive_active_owner_without_promoting_slo
.find(|bc| bc.id == "BID-B")
.expect("inactive owner must remain parked");
assert!(
- inactive.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ inactive.active_page_state().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.page_session_state
.log_enabled
);
assert_eq!(
- inactive.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ inactive.active_page_state().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.console_output_session_state
.log_lifecycle_entries,
0,
@@ -3122,7 +3160,8 @@ async fn direct_log_disable_routes_to_inactive_active_owner_without_promoting_sl
let mut inactive = BrowserContext::new("BID-B".into());
inactive.set_active_target_id("TID-B".to_owned());
inactive.attach_active_session("SID-B");
- inactive.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ inactive.active_page_state_mut().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.page_session_state
.log_enabled = true;
ctx.conn.inactive_browser_contexts.push(inactive);
@@ -3152,12 +3191,14 @@ async fn direct_log_disable_routes_to_inactive_active_owner_without_promoting_sl
.find(|bc| bc.id == "BID-B")
.expect("inactive owner must remain parked");
assert!(
- !inactive.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ !inactive.active_page_state().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.page_session_state
.log_enabled
);
assert_eq!(
- inactive.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ inactive.active_page_state().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.console_output_session_state
.log_lifecycle_entries,
0,
@@ -3251,29 +3292,63 @@ async fn direct_network_policy_routes_to_inactive_active_owner_without_promoting
.iter()
.find(|bc| bc.id == "BID-B")
.expect("inactive owner must remain parked");
- assert!(inactive.network_policy.cache_disabled());
- assert!(inactive.network_policy.bypass_service_worker());
+ assert!(inactive.active_page_state().network_policy.cache_disabled());
+ assert!(
+ inactive
+ .active_page_state()
+ .network_policy
+ .bypass_service_worker()
+ );
assert_eq!(
- inactive.network_policy.blocked_url_patterns(),
+ inactive
+ .active_page_state()
+ .network_policy
+ .blocked_url_patterns(),
vec!["*://blocked.test/*".to_owned()]
);
assert_eq!(
- inactive.network_policy.extra_headers(),
+ inactive.active_page_state().network_policy.extra_headers(),
vec![("X-Test".to_owned(), "direct".to_owned())]
);
assert_eq!(
- inactive.network_policy.user_agent_override(),
+ inactive
+ .active_page_state()
+ .network_policy
+ .user_agent_override(),
Some("Moli/Direct-UA")
);
- assert!(inactive.network_policy.network_offline());
- assert_eq!(inactive.network_policy.emulated_network_latency(), 25.0);
+ assert!(
+ inactive
+ .active_page_state()
+ .network_policy
+ .network_offline()
+ );
+ assert_eq!(
+ inactive
+ .active_page_state()
+ .network_policy
+ .emulated_network_latency(),
+ 25.0
+ );
assert_eq!(
- inactive.network_policy.emulated_download_throughput(),
+ inactive
+ .active_page_state()
+ .network_policy
+ .emulated_download_throughput(),
1024.0
);
- assert_eq!(inactive.network_policy.emulated_upload_throughput(), 256.0);
assert_eq!(
- inactive.network_policy.emulated_connection_type(),
+ inactive
+ .active_page_state()
+ .network_policy
+ .emulated_upload_throughput(),
+ 256.0
+ );
+ assert_eq!(
+ inactive
+ .active_page_state()
+ .network_policy
+ .emulated_connection_type(),
Some("cellular3g")
);
}
@@ -3316,9 +3391,13 @@ async fn direct_network_policy_invalid_params_return_owner_plan_error_without_pr
.iter()
.find(|bc| bc.id == "BID-B")
.expect("inactive owner must remain parked");
- assert!(!inactive.network_policy.cache_disabled());
+ assert!(!inactive.active_page_state().network_policy.cache_disabled());
assert!(
- inactive.network_policy.extra_headers().is_empty(),
+ inactive
+ .active_page_state()
+ .network_policy
+ .extra_headers()
+ .is_empty(),
"invalid direct output-plan commands must not mutate owner policy"
);
}
diff --git a/moli-protocol/src/conn/tests/site_data.rs b/moli-protocol/src/conn/tests/site_data.rs
index 34933aeb3..08d335f99 100644
--- a/moli-protocol/src/conn/tests/site_data.rs
+++ b/moli-protocol/src/conn/tests/site_data.rs
@@ -238,6 +238,7 @@ async fn connection_preview_clear_cookie_store_with_persistent_scope_does_not_in
conn.browser_context
.as_mut()
.unwrap()
+ .active_page_state_mut()
.active_target
.runtime_slot
.set_loaded_page_for_test(navigation.page);
@@ -330,6 +331,7 @@ async fn connection_clear_cookie_store_with_session_scope_invalidates_live_docum
conn.browser_context
.as_mut()
.unwrap()
+ .active_page_state_mut()
.active_target
.runtime_slot
.set_loaded_page_for_test(navigation.page);
@@ -539,6 +541,7 @@ async fn connection_cookie_site_clear_invalidates_live_document_cookie_cache() {
conn.browser_context
.as_mut()
.unwrap()
+ .active_page_state_mut()
.active_target
.runtime_slot
.set_loaded_page_for_test(navigation.page);
@@ -619,6 +622,7 @@ async fn connection_preview_clear_cookies_for_sites_does_not_invalidate_live_doc
conn.browser_context
.as_mut()
.unwrap()
+ .active_page_state_mut()
.active_target
.runtime_slot
.set_loaded_page_for_test(navigation.page);
diff --git a/moli-protocol/src/domains/accessibility/tests.rs b/moli-protocol/src/domains/accessibility/tests.rs
index 74a203ef4..eec650953 100644
--- a/moli-protocol/src/domains/accessibility/tests.rs
+++ b/moli-protocol/src/domains/accessibility/tests.rs
@@ -186,6 +186,7 @@ async fn get_full_ax_tree_reads_live_renderer_dom_when_page_snapshot_is_stale()
.browser_context
.as_mut()
.expect("browser context")
+ .active_page_state_mut()
.active_target
.runtime_slot
.loaded_page_mut()
@@ -230,6 +231,7 @@ async fn get_full_ax_tree_reads_live_renderer_dom_when_page_snapshot_is_stale()
.browser_context
.as_mut()
.expect("browser context")
+ .active_page_state_mut()
.active_target
.runtime_slot
.loaded_page_mut()
@@ -626,6 +628,7 @@ async fn get_full_ax_tree_uses_fresh_initial_document_without_adapter() {
.browser_context
.as_ref()
.expect("browser context")
+ .active_page_state()
.active_target
.runtime_slot
.has_loaded_page(),
diff --git a/moli-protocol/src/domains/activity/main_document.rs b/moli-protocol/src/domains/activity/main_document.rs
index 5fa6aa930..87e980f83 100644
--- a/moli-protocol/src/domains/activity/main_document.rs
+++ b/moli-protocol/src/domains/activity/main_document.rs
@@ -991,6 +991,7 @@ mod tests {
browser_context.attach_active_session("SID-nav");
browser_context.set_target_url("https://example.test/start".to_owned());
browser_context
+ .active_page_state_mut()
.active_target
.runtime_slot
.set_page_attachment_id_for_test(1);
@@ -1135,6 +1136,7 @@ mod tests {
let mut browser_context = BrowserContext::new_with_page_for_test("BID-1", "TID-page");
browser_context.attach_active_session("SID-page");
browser_context
+ .active_page_state_mut()
.active_target
.runtime_slot
.enable_primary_network_events();
@@ -1326,7 +1328,8 @@ mod tests {
browser_context.set_active_target_id("FRAME-1");
browser_context.attach_active_session("SID-nav");
browser_context.set_target_url("https://example.test/parent".to_owned());
- browser_context.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ browser_context.active_page_state_mut().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.page_session_state
.page_domain_enabled = true;
let mut conn = CdpConnection::new();
diff --git a/moli-protocol/src/domains/activity/output_ingress/renderer.rs b/moli-protocol/src/domains/activity/output_ingress/renderer.rs
index ea9f03b54..2761b4e5b 100644
--- a/moli-protocol/src/domains/activity/output_ingress/renderer.rs
+++ b/moli-protocol/src/domains/activity/output_ingress/renderer.rs
@@ -262,6 +262,7 @@ mod tests {
)
);
browser_context
+ .active_page_state_mut()
.active_target
.runtime_slot
.set_page_attachment_id_for_test(1);
diff --git a/moli-protocol/src/domains/activity/runtime_command_barrier.rs b/moli-protocol/src/domains/activity/runtime_command_barrier.rs
index db2102554..933023a37 100644
--- a/moli-protocol/src/domains/activity/runtime_command_barrier.rs
+++ b/moli-protocol/src/domains/activity/runtime_command_barrier.rs
@@ -512,6 +512,7 @@ mod tests {
browser_context.attach_active_session(SESSION_ID);
browser_context.set_target_url(page.final_url().as_str().to_owned());
let _ = browser_context
+ .active_page_state_mut()
.active_target
.runtime_slot
.replace_loaded_page(Some(page));
diff --git a/moli-protocol/src/domains/console.rs b/moli-protocol/src/domains/console.rs
index 13aa952f6..3cd0181b3 100644
--- a/moli-protocol/src/domains/console.rs
+++ b/moli-protocol/src/domains/console.rs
@@ -199,7 +199,8 @@ mod tests {
}
let browser_context = ctx.conn.browser_context.as_ref().expect("browser context");
assert!(
- !browser_context.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ !browser_context.active_page_state().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.console_output_session_state
.console_enabled,
"transitional observable-output enabled bit should track Console.disable"
@@ -221,6 +222,7 @@ mod tests {
.browser_context
.as_ref()
.expect("browser context should exist")
+ .active_page_state()
.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.console_output_session_state
.console_enabled,
@@ -245,6 +247,7 @@ mod tests {
.browser_context
.as_ref()
.expect("browser context should exist")
+ .active_page_state()
.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.console_output_session_state
.console_enabled,
@@ -322,7 +325,8 @@ mod tests {
.browser_context
.as_mut()
.expect("browser context should be loaded");
- bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ bc.active_page_state_mut().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.console_output_session_state
.console_enabled = true;
assert_eq!(
@@ -338,6 +342,7 @@ mod tests {
let script_execution = page.script_execution();
let snapshot = super::pending_console_activity_snapshot(super::ConsoleActivitySource {
observable: bc
+ .active_page_state()
.active_target
.owner_state
.console_output_state
@@ -351,6 +356,7 @@ mod tests {
.browser_context
.as_mut()
.expect("browser context should be loaded")
+ .active_page_state_mut()
.active_target
.owner_state
.console_output_state
@@ -545,7 +551,8 @@ mod tests {
ctx.expect_result(13, json!({}), Some("SID-background"));
let active = ctx.conn.browser_context.as_ref().expect("browser context");
assert!(
- !active.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ !active.active_page_state().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.console_output_session_state
.console_enabled
);
diff --git a/moli-protocol/src/domains/css.rs b/moli-protocol/src/domains/css.rs
index a41c7e159..5c411f5e2 100644
--- a/moli-protocol/src/domains/css.rs
+++ b/moli-protocol/src/domains/css.rs
@@ -799,6 +799,7 @@ mod tests {
.browser_context
.as_mut()
.expect("browser context")
+ .active_page_state_mut()
.active_target
.runtime_slot
.loaded_page_mut()
@@ -1211,12 +1212,26 @@ mod tests {
ctx.process_async(json!({"id": 101, "method": "CSS.enable"}))
.await;
- assert!(ctx.conn.browser_context.as_ref().unwrap().css_enabled);
+ assert!(
+ ctx.conn
+ .browser_context
+ .as_ref()
+ .unwrap()
+ .active_page_state()
+ .css_enabled
+ );
ctx.expect_result(101, json!({}), None);
ctx.process_async(json!({"id": 102, "method": "CSS.disable"}))
.await;
- assert!(!ctx.conn.browser_context.as_ref().unwrap().css_enabled);
+ assert!(
+ !ctx.conn
+ .browser_context
+ .as_ref()
+ .unwrap()
+ .active_page_state()
+ .css_enabled
+ );
ctx.expect_result(102, json!({}), None);
}
@@ -1406,7 +1421,14 @@ mod tests {
}))
.await;
ctx.expect_result(116, json!({}), Some("SID-1"));
- assert!(ctx.conn.browser_context.as_ref().unwrap().css_enabled);
+ assert!(
+ ctx.conn
+ .browser_context
+ .as_ref()
+ .unwrap()
+ .active_page_state()
+ .css_enabled
+ );
ctx.process_async(json!({
"id": 117,
@@ -1415,7 +1437,14 @@ mod tests {
}))
.await;
ctx.expect_result(117, json!({}), Some("SID-1"));
- assert!(!ctx.conn.browser_context.as_ref().unwrap().css_enabled);
+ assert!(
+ !ctx.conn
+ .browser_context
+ .as_ref()
+ .unwrap()
+ .active_page_state()
+ .css_enabled
+ );
}
#[tokio::test]
@@ -1640,6 +1669,7 @@ mod tests {
let mut browser_context = BrowserContext::new("BID-css-owner-route".to_owned());
browser_context.set_active_target_id("TID-css-active".to_owned());
browser_context
+ .active_page_state_mut()
.active_target
.runtime_slot
.set_loaded_page_for_test(active_page);
diff --git a/moli-protocol/src/domains/css/style_sheets.rs b/moli-protocol/src/domains/css/style_sheets.rs
index e819cc95e..19bf31693 100644
--- a/moli-protocol/src/domains/css/style_sheets.rs
+++ b/moli-protocol/src/domains/css/style_sheets.rs
@@ -122,14 +122,9 @@ pub(super) fn get_style_sheet_command_output_plan(
}
fn set_css_enabled(conn: &mut CdpConnection, cmd: &Cmd<'_>, enabled: bool) {
- if conn.mutate_background_target_page_session_state(cmd.session_id, |state| {
+ conn.mutate_target_page_state_for_session(cmd.session_id, |state| {
state.css_enabled = enabled;
- }) {
- return;
- }
- if let Some(bc) = conn.browser_context.as_mut() {
- bc.css_enabled = enabled;
- }
+ });
}
fn style_sheet_header_value(frame_id: &str, header: &RendererStyleSheetHeader) -> Value {
diff --git a/moli-protocol/src/domains/debugger.rs b/moli-protocol/src/domains/debugger.rs
index f601da785..6be219b67 100644
--- a/moli-protocol/src/domains/debugger.rs
+++ b/moli-protocol/src/domains/debugger.rs
@@ -48,6 +48,7 @@ mod tests {
.browser_context
.as_mut()
.expect("browser context")
+ .active_page_state_mut()
.active_target
.runtime_slot
.replace_loaded_page(Some(page));
diff --git a/moli-protocol/src/domains/dom.rs b/moli-protocol/src/domains/dom.rs
index 3cee2dbed..0f4854259 100644
--- a/moli-protocol/src/domains/dom.rs
+++ b/moli-protocol/src/domains/dom.rs
@@ -203,8 +203,13 @@ fn cached_dom_remote_object_node_for_session(
session_id: Option<&str>,
object_id: &str,
) -> Option<Value> {
- let (browser_context_id, _) = conn.target_owner_identity_for_session(session_id)?;
- conn.browser_context_by_id(&browser_context_id)?
+ let (browser_context_id, target_id) = conn.target_owner_identity_for_session(session_id)?;
+ let browser_context = conn.browser_context_by_id(&browser_context_id)?;
+ let target_id = target_id
+ .as_deref()
+ .or_else(|| browser_context.active_target_id())?;
+ browser_context
+ .page_target(target_id)?
.dom_remote_object_node_cache
.get(object_id)
.cloned()
@@ -216,12 +221,18 @@ fn cache_dom_remote_object_node_for_session(
object_id: String,
node: Value,
) {
- let Some((browser_context_id, _)) = conn.target_owner_identity_for_session(session_id) else {
+ let Some((browser_context_id, target_id)) = conn.target_owner_identity_for_session(session_id)
+ else {
return;
};
if let Some(browser_context) = conn.browser_context_by_id_mut(&browser_context_id) {
- browser_context
- .dom_remote_object_node_cache
- .insert(object_id, node);
+ let target_id = target_id.or_else(|| browser_context.active_target_id_owned());
+ let Some(target) = target_id
+ .as_deref()
+ .and_then(|target_id| browser_context.page_target_mut(target_id))
+ else {
+ return;
+ };
+ target.dom_remote_object_node_cache.insert(object_id, node);
}
}
diff --git a/moli-protocol/src/domains/dom/tests/mod.rs b/moli-protocol/src/domains/dom/tests/mod.rs
index 9f63b5ec3..cee43df2f 100644
--- a/moli-protocol/src/domains/dom/tests/mod.rs
+++ b/moli-protocol/src/domains/dom/tests/mod.rs
@@ -32,6 +32,7 @@ async fn create_about_blank_target_with_initial_document(ctx: &mut TestContext,
.browser_context
.as_ref()
.expect("browser context")
+ .active_page_state()
.active_target
.runtime_slot
.has_loaded_page(),
@@ -74,6 +75,7 @@ async fn get_document_uses_fresh_initial_document_without_adapter() {
.browser_context
.as_ref()
.expect("browser context")
+ .active_page_state()
.active_target
.runtime_slot
.has_loaded_page(),
@@ -129,6 +131,7 @@ async fn get_flattened_document_uses_fresh_initial_document_without_adapter() {
.browser_context
.as_ref()
.expect("browser context")
+ .active_page_state()
.active_target
.runtime_slot
.has_loaded_page(),
@@ -182,6 +185,7 @@ async fn describe_node_uses_fresh_initial_document_without_adapter() {
.browser_context
.as_ref()
.expect("browser context")
+ .active_page_state()
.active_target
.runtime_slot
.has_loaded_page(),
diff --git a/moli-protocol/src/domains/dom/tests/node_ops.rs b/moli-protocol/src/domains/dom/tests/node_ops.rs
index c1e08d4c0..348a72b9e 100644
--- a/moli-protocol/src/domains/dom/tests/node_ops.rs
+++ b/moli-protocol/src/domains/dom/tests/node_ops.rs
@@ -45,6 +45,7 @@ fn loaded_page_mut_for_test(ctx: &mut TestContext) -> &mut moli_core::page::Page
.browser_context
.as_mut()
.expect("browser context")
+ .active_page_state_mut()
.active_target
.runtime_slot
.loaded_page_mut()
diff --git a/moli-protocol/src/domains/dom_snapshot.rs b/moli-protocol/src/domains/dom_snapshot.rs
index 9072fa719..37eaa7e5e 100644
--- a/moli-protocol/src/domains/dom_snapshot.rs
+++ b/moli-protocol/src/domains/dom_snapshot.rs
@@ -1196,6 +1196,7 @@ mod tests {
.browser_context
.as_ref()
.expect("browser context")
+ .active_page_state()
.active_target
.runtime_slot
.has_loaded_page(),
diff --git a/moli-protocol/src/domains/dom_storage/activity.rs b/moli-protocol/src/domains/dom_storage/activity.rs
index c7e8422f1..e9a1af3f7 100644
--- a/moli-protocol/src/domains/dom_storage/activity.rs
+++ b/moli-protocol/src/domains/dom_storage/activity.rs
@@ -85,45 +85,19 @@ fn dom_storage_subscriptions_for_browser_context_owner(
};
let mut subscriptions = Vec::new();
- if browser_context.page_targets.active().is_some() {
- if let Some(subscription) = browser_context
+ for target in browser_context.page_targets.iter() {
+ if let Some(subscription) = target
.devtools_sessions
.primary()
.dom_storage_session_state
.mutation_subscription()
{
- subscriptions.push((
- browser_context.active_session_id_owned(),
- subscription.clone(),
- ));
+ let event_session_id = target.session_id().map(str::to_owned);
+ if browser_context.is_active_target(target.target_id()) || event_session_id.is_some() {
+ subscriptions.push((event_session_id, subscription.clone()));
+ }
}
- subscriptions.extend(
- browser_context
- .devtools_sessions
- .attached_entries()
- .filter_map(|(session_id, state)| {
- state
- .dom_storage_session_state
- .mutation_subscription()
- .map(|subscription| (Some(session_id.to_owned()), subscription.clone()))
- }),
- );
- }
- for target in browser_context.background_targets() {
- let Some(state) = browser_context.parked_page_session_state(target.target_id()) else {
- continue;
- };
- if let (Some(session_id), Some(subscription)) = (
- target.session_id(),
- state
- .devtools_sessions
- .primary()
- .dom_storage_session_state
- .mutation_subscription(),
- ) {
- subscriptions.push((Some(session_id.to_owned()), subscription.clone()));
- }
- subscriptions.extend(state.devtools_sessions.attached_entries().filter_map(
+ subscriptions.extend(target.devtools_sessions.attached_entries().filter_map(
|(session_id, state)| {
state
.dom_storage_session_state
diff --git a/moli-protocol/src/domains/dom_storage/tests.rs b/moli-protocol/src/domains/dom_storage/tests.rs
index 1ed43e642..52161eb1b 100644
--- a/moli-protocol/src/domains/dom_storage/tests.rs
+++ b/moli-protocol/src/domains/dom_storage/tests.rs
@@ -127,6 +127,7 @@ async fn loaded_dom_storage_context() -> (TestContext, String, String, tokio::ta
.browser_context
.as_mut()
.expect("browser context should exist")
+ .active_page_state_mut()
.active_target
.runtime_slot
.set_loaded_page_for_test(page);
@@ -462,6 +463,7 @@ async fn dom_storage_resolves_child_frame_storage_ids_without_collapsing_to_top_
.browser_context
.as_mut()
.expect("browser context")
+ .active_page_state_mut()
.active_target
.runtime_slot
.set_loaded_page_for_test(page);
diff --git a/moli-protocol/src/domains/emulation.rs b/moli-protocol/src/domains/emulation.rs
index 4d06696b8..edd91c2b5 100644
--- a/moli-protocol/src/domains/emulation.rs
+++ b/moli-protocol/src/domains/emulation.rs
@@ -489,7 +489,7 @@ fn start_locale_override_command(
return EmulationCommandTaskStep::Complete(CommandOutputPlan::error(code, message));
}
let pending = if emulation_command_is_context_wide(conn, cmd.session_id) {
- match start_context_locale_override_page_commands(conn) {
+ match start_context_locale_override_page_commands(conn, locale_override.as_deref()) {
Ok(pending) => pending,
Err(error) => {
return EmulationCommandTaskStep::Complete(CommandOutputPlan::error(-32000, error));
@@ -2689,24 +2689,8 @@ fn start_context_emulated_media_page_commands(
return Ok(Vec::new());
};
let browser_context_id = browser_context.id.clone();
- let active_target_id = browser_context.active_target_id_owned();
let mut pending = Vec::new();
- if let Some(active_target_id) = active_target_id
- && let Some(page) = browser_context.active_target.runtime_slot.loaded_page_mut()
- {
- pending.push(PendingEmulationPageCommand {
- target: PendingEmulationPageTarget::BrowserContextTarget {
- browser_context_id: browser_context_id.clone(),
- target_id: active_target_id,
- },
- operation: PendingEmulationPageOperation::SetEmulatedMedia,
- pending: page
- .start_set_emulated_media(overrides)
- .map_err(|error| error.to_string())?,
- runtime_response_rx: None,
- });
- }
- for target in browser_context.background_targets_mut() {
+ for target in browser_context.page_targets.iter_mut() {
let target_id = target.target_id().to_owned();
let Some(page) = target.loaded_page_mut() else {
continue;
@@ -2746,6 +2730,7 @@ fn start_session_locale_override_page_commands(
fn start_context_locale_override_page_commands(
conn: &mut CdpConnection,
+ locale_override: Option<&str>,
) -> Result<Vec<PendingEmulationPageCommand>, String> {
let mut pending = Vec::new();
for browser_context in conn
@@ -2754,30 +2739,9 @@ fn start_context_locale_override_page_commands(
.chain(conn.inactive_browser_contexts.iter_mut())
{
let browser_context_id = browser_context.id.clone();
- let active_target_id = browser_context.active_target_id_owned();
- let active_locale = browser_context.effective_active_locale_override_owned();
- if let Some(active_target_id) = active_target_id
- && let Some(page) = browser_context.active_target.runtime_slot.loaded_page_mut()
- {
- pending.extend(start_locale_override_page_command(
- PendingEmulationPageTarget::BrowserContextTarget {
- browser_context_id: browser_context_id.clone(),
- target_id: active_target_id,
- },
- page,
- active_locale.as_deref(),
- )?);
- }
- for index in 0..browser_context.background_target_count() {
- let target_id = browser_context
- .background_target_at(index)
- .expect("background target index must remain valid")
- .target_id()
- .to_owned();
- let Some(page) = browser_context
- .background_target_at_mut(index)
- .and_then(PageTargetHost::loaded_page_mut)
- else {
+ for target in browser_context.page_targets.iter_mut() {
+ let target_id = target.target_id().to_owned();
+ let Some(page) = target.loaded_page_mut() else {
continue;
};
pending.extend(start_locale_override_page_command(
@@ -2786,7 +2750,7 @@ fn start_context_locale_override_page_commands(
target_id,
},
page,
- active_locale.as_deref(),
+ locale_override,
)?);
}
}
@@ -2811,7 +2775,12 @@ fn start_geolocation_surface_override_page_commands(
let Some(target_id) = browser_context.active_target_id_owned() else {
return Ok(Vec::new());
};
- let Some(page) = browser_context.active_target.runtime_slot.loaded_page_mut() else {
+ let Some(page) = browser_context
+ .active_page_target_mut()
+ .active_target
+ .runtime_slot
+ .loaded_page_mut()
+ else {
return Ok(Vec::new());
};
start_surface_override_page_command(
diff --git a/moli-protocol/src/domains/emulation/tests.rs b/moli-protocol/src/domains/emulation/tests.rs
index 57acdde1f..1e74dfa64 100644
--- a/moli-protocol/src/domains/emulation/tests.rs
+++ b/moli-protocol/src/domains/emulation/tests.rs
@@ -33,7 +33,12 @@ async fn loaded_page_html_for_test(ctx: &mut TestContext) -> String {
.conn
.browser_context
.as_mut()
- .and_then(|bc| bc.active_target.runtime_slot.loaded_page_mut())
+ .and_then(|bc| {
+ bc.active_page_state_mut()
+ .active_target
+ .runtime_slot
+ .loaded_page_mut()
+ })
.expect("loaded page");
page.serialize_html_async()
.await
@@ -256,6 +261,7 @@ async fn script_execution_disabled_completes_through_io_pending_dispatch() {
.browser_context
.as_ref()
.unwrap()
+ .active_page_state()
.script_execution_disabled
);
}
@@ -290,6 +296,7 @@ async fn auxiliary_session_first_io_emulation_response_uses_its_session_host() {
.browser_context
.as_ref()
.expect("browser context")
+ .active_page_state()
.script_execution_disabled
);
}
@@ -322,6 +329,7 @@ async fn timezone_override_can_complete_through_pending_command_dispatch() {
.browser_context
.as_ref()
.unwrap()
+ .active_page_state()
.timezone_override
.as_deref(),
Some("Asia/Shanghai")
@@ -356,7 +364,13 @@ async fn emulated_media_can_complete_through_pending_command_dispatch() {
&& message["sessionId"] == json!("SID-1")
&& message["result"] == json!({})
}));
- let media = &ctx.conn.browser_context.as_ref().unwrap().emulated_media;
+ let media = &ctx
+ .conn
+ .browser_context
+ .as_ref()
+ .unwrap()
+ .active_page_state()
+ .emulated_media;
assert_eq!(media.media.as_deref(), Some("screen"));
assert_eq!(media.color_scheme.as_deref(), Some("dark"));
}
@@ -588,7 +602,13 @@ async fn idle_override_updates_idle_detector_and_clear_restores_actual_state() {
.conn
.browser_context
.as_mut()
- .and_then(|context| context.active_target.runtime_slot.loaded_page_mut())
+ .and_then(|context| {
+ context
+ .active_page_state_mut()
+ .active_target
+ .runtime_slot
+ .loaded_page_mut()
+ })
.expect("loaded page");
page.set_permission_overrides_async(&[moli_core::page::PermissionOverrideRegistration {
permission: json!("idleDetection"),
@@ -634,7 +654,13 @@ async fn idle_override_updates_idle_detector_and_clear_restores_actual_state() {
.conn
.browser_context
.as_mut()
- .and_then(|context| context.active_target.runtime_slot.loaded_page_mut())
+ .and_then(|context| {
+ context
+ .active_page_state_mut()
+ .active_target
+ .runtime_slot
+ .loaded_page_mut()
+ })
.expect("loaded page");
assert_eq!(
page.evaluate_runtime_expression_async(
@@ -670,7 +696,13 @@ async fn idle_override_updates_idle_detector_and_clear_restores_actual_state() {
.conn
.browser_context
.as_mut()
- .and_then(|context| context.active_target.runtime_slot.loaded_page_mut())
+ .and_then(|context| {
+ context
+ .active_page_state_mut()
+ .active_target
+ .runtime_slot
+ .loaded_page_mut()
+ })
.expect("loaded page");
assert_eq!(
page.evaluate_runtime_expression_async(
@@ -780,10 +812,14 @@ async fn pure_state_emulation_commands_complete_through_command_dispatch() {
}
let browser_context = ctx.conn.browser_context.as_ref().unwrap();
- assert!(browser_context.focus_emulation_enabled);
- assert!(browser_context.touch_emulation_enabled);
- assert!(browser_context.emit_touch_events_for_mouse);
- assert_eq!(browser_context.cpu_throttling_rate, 1.0);
+ assert!(browser_context.active_page_state().focus_emulation_enabled);
+ assert!(browser_context.active_page_state().touch_emulation_enabled);
+ assert!(
+ browser_context
+ .active_page_state()
+ .emit_touch_events_for_mouse
+ );
+ assert_eq!(browser_context.active_page_state().cpu_throttling_rate, 1.0);
}
#[tokio::test(flavor = "multi_thread")]
@@ -808,6 +844,7 @@ async fn set_cpu_throttling_rate_rejects_invalid_params() {
.browser_context
.as_ref()
.expect("browser context")
+ .active_page_state()
.cpu_throttling_rate,
1.0
);
@@ -877,6 +914,7 @@ async fn live_apply_emulation_commands_without_loaded_page_do_not_use_legacy_fal
.browser_context
.as_ref()
.expect("browser context")
+ .active_page_state()
.cpu_throttling_rate,
2.5
);
@@ -1011,6 +1049,7 @@ async fn live_cpu_throttling_rate_uses_pending_command_dispatch() {
.browser_context
.as_ref()
.expect("browser context")
+ .active_page_state()
.cpu_throttling_rate,
3.0
);
@@ -1122,6 +1161,7 @@ async fn multi_session_browser_identity_uses_attachment_order_and_field_contribu
.browser_context
.as_ref()
.expect("browser context")
+ .active_page_state()
.network_policy
.user_agent_override(),
Some("Moli/Aux-1")
@@ -1152,6 +1192,7 @@ async fn multi_session_browser_identity_uses_attachment_order_and_field_contribu
.browser_context
.as_ref()
.expect("browser context")
+ .active_page_state()
.network_policy
.user_agent_override(),
Some("Moli/Primary-2")
@@ -1174,6 +1215,7 @@ async fn multi_session_browser_identity_uses_attachment_order_and_field_contribu
.browser_context
.as_ref()
.expect("browser context")
+ .active_page_state()
.network_policy
.browser_identity_override()
.expect("UA and per-field contributions should compose an identity");
@@ -1195,6 +1237,7 @@ async fn multi_session_browser_identity_uses_attachment_order_and_field_contribu
.browser_context
.as_ref()
.expect("browser context")
+ .active_page_state()
.network_policy
.user_agent_override(),
Some("Moli/Aux-2"),
@@ -1210,6 +1253,7 @@ async fn multi_session_browser_identity_uses_attachment_order_and_field_contribu
.browser_context
.as_ref()
.expect("browser context")
+ .active_page_state()
.network_policy
.user_agent_override(),
Some("Moli/Primary-2")
@@ -1233,6 +1277,7 @@ async fn async_emulation_device_state_updates_browser_context() {
.browser_context
.as_ref()
.unwrap()
+ .active_page_state()
.focus_emulation_enabled
);
@@ -1248,6 +1293,7 @@ async fn async_emulation_device_state_updates_browser_context() {
.browser_context
.as_ref()
.unwrap()
+ .active_page_state()
.touch_emulation_enabled
);
@@ -1263,6 +1309,7 @@ async fn async_emulation_device_state_updates_browser_context() {
.browser_context
.as_ref()
.unwrap()
+ .active_page_state()
.emit_touch_events_for_mouse
);
@@ -1277,7 +1324,7 @@ async fn async_emulation_device_state_updates_browser_context() {
.conn
.browser_context
.as_ref()
- .and_then(|bc| bc.geolocation_override.as_ref())
+ .and_then(|bc| bc.active_page_state().geolocation_override.as_ref())
.and_then(EmulatedGeolocationOverrideState::position)
.expect("geolocation override should be set");
assert_eq!(geolocation.latitude, 37.33182);
@@ -1295,7 +1342,7 @@ async fn async_emulation_device_state_updates_browser_context() {
.conn
.browser_context
.as_ref()
- .and_then(|bc| bc.emulated_device_metrics.as_ref())
+ .and_then(|bc| bc.active_page_state().emulated_device_metrics.as_ref())
.expect("device metrics should be set");
assert_eq!(metrics.width, 800);
assert_eq!(metrics.height, 600);
@@ -1312,6 +1359,7 @@ async fn async_emulation_device_state_updates_browser_context() {
.browser_context
.as_ref()
.unwrap()
+ .active_page_state()
.emulated_device_metrics
.is_none()
);
@@ -1371,7 +1419,8 @@ async fn set_user_agent_override_applies_to_subsequent_navigation_requests() {
let mut bc = BrowserContext::new("BID-1".into());
bc.set_active_target_id("TID-1");
bc.attach_active_session("SID-1");
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -2259,7 +2308,10 @@ async fn clear_geolocation_override_restores_default_after_explicit_unavailable(
ctx.conn
.browser_context
.as_ref()
- .and_then(|browser_context| browser_context.geolocation_override.as_ref()),
+ .and_then(|browser_context| browser_context
+ .active_page_state()
+ .geolocation_override
+ .as_ref()),
Some(EmulatedGeolocationOverrideState::PositionUnavailable)
));
assert_eq!(
@@ -2279,6 +2331,7 @@ async fn clear_geolocation_override_restores_default_after_explicit_unavailable(
.browser_context
.as_ref()
.expect("browser context")
+ .active_page_state()
.geolocation_override
.is_none()
);
@@ -2794,7 +2847,13 @@ async fn context_locale_override_applies_to_loaded_background_page_without_promo
Some("TID-active"),
"context-wide overrides should not promote the loaded background target"
);
- assert_eq!(browser_context.locale_override.as_deref(), Some("fr-FR"));
+ assert_eq!(
+ browser_context
+ .active_page_state()
+ .locale_override
+ .as_deref(),
+ Some("fr-FR")
+ );
assert!(
browser_context
.parked_page_session_state("TID-background")
@@ -2908,11 +2967,18 @@ async fn session_emulation_routes_to_loaded_background_owner_without_promotion()
let browser_context = ctx.conn.browser_context.as_ref().expect("browser context");
assert!(
- browser_context.emulated_media.color_scheme.is_none(),
+ browser_context
+ .active_page_state()
+ .emulated_media
+ .color_scheme
+ .is_none(),
"background Emulation should not mutate the active target media override"
);
assert!(
- browser_context.locale_override.is_none(),
+ browser_context
+ .active_page_state()
+ .locale_override
+ .is_none(),
"background Emulation should not mutate the active target locale override"
);
let parked = browser_context
diff --git a/moli-protocol/src/domains/fetch/commands.rs b/moli-protocol/src/domains/fetch/commands.rs
index 95f51008d..07061f455 100644
--- a/moli-protocol/src/domains/fetch/commands.rs
+++ b/moli-protocol/src/domains/fetch/commands.rs
@@ -2100,6 +2100,7 @@ mod protocol_neutral_tests {
browser_context.assign_auxiliary_session_to_target("TID-chain", "SID-aux".to_owned())
);
browser_context
+ .active_page_state_mut()
.active_target
.runtime_slot
.set_page_attachment_id_for_test(1);
@@ -2241,6 +2242,7 @@ mod protocol_neutral_tests {
.assign_auxiliary_session_to_target("TID-response-chain", "SID-aux".to_owned())
);
browser_context
+ .active_page_state_mut()
.active_target
.runtime_slot
.set_page_attachment_id_for_test(1);
@@ -2377,6 +2379,7 @@ mod protocol_neutral_tests {
browser_context.set_active_target_id("TID-chain-bidi".to_owned());
browser_context.attach_active_session("SID-primary".to_owned());
browser_context
+ .active_page_state_mut()
.active_target
.runtime_slot
.set_page_attachment_id_for_test(1);
diff --git a/moli-protocol/src/domains/fetch/subresource.rs b/moli-protocol/src/domains/fetch/subresource.rs
index f70d49ae0..f8c319c79 100644
--- a/moli-protocol/src/domains/fetch/subresource.rs
+++ b/moli-protocol/src/domains/fetch/subresource.rs
@@ -693,6 +693,7 @@ mod tests {
let mut conn = CdpConnection::default();
let mut browser_context = BrowserContext::new_with_page_for_test("BID-1", "TID-active");
browser_context
+ .active_page_state_mut()
.active_target
.runtime_slot
.set_page_attachment_id_for_test(1);
@@ -755,12 +756,14 @@ mod tests {
let bc = conn.browser_context.as_ref().unwrap();
assert!(
- bc.active_target
+ bc.active_page_state()
+ .active_target
.fetch_owner
.has_pending_subresource_fetch_for_test("FETCH-1")
);
assert!(
- bc.active_target
+ bc.active_page_state()
+ .active_target
.fetch_owner
.has_pending_subresource_fetch_for_test("FETCH-2")
);
@@ -771,6 +774,7 @@ mod tests {
let mut conn = CdpConnection::default();
let mut browser_context = BrowserContext::new_with_page_for_test("BID-1", "TID-active");
browser_context
+ .active_page_state_mut()
.active_target
.runtime_slot
.set_page_attachment_id_for_test(1);
@@ -815,6 +819,7 @@ mod tests {
let mut conn = CdpConnection::default();
let mut browser_context = BrowserContext::new_with_page_for_test("BID-1", "TID-active");
browser_context
+ .active_page_state_mut()
.active_target
.runtime_slot
.set_page_attachment_id_for_test(1);
@@ -825,6 +830,7 @@ mod tests {
conn.browser_context
.as_mut()
.expect("browser context should remain installed")
+ .active_page_state_mut()
.active_target
.runtime_slot
.replace_page_attachment_id_for_test();
@@ -852,6 +858,7 @@ mod tests {
.browser_context
.as_ref()
.expect("browser context should remain installed")
+ .active_page_state()
.active_target
.fetch_owner
.has_pending_subresource_fetch_for_test("FETCH-1"),
@@ -908,7 +915,8 @@ mod tests {
.is_some_and(|state| state.has_pending_subresource_fetch_for_test("FETCH-1"))
);
assert!(
- !bc.active_target
+ !bc.active_page_state()
+ .active_target
.fetch_owner
.has_pending_subresource_fetch_for_test("FETCH-1"),
"background owner emission must not register the pause on the active target"
diff --git a/moli-protocol/src/domains/fetch/tests/basics.rs b/moli-protocol/src/domains/fetch/tests/basics.rs
index bb07e42b4..0f00a4783 100644
--- a/moli-protocol/src/domains/fetch/tests/basics.rs
+++ b/moli-protocol/src/domains/fetch/tests/basics.rs
@@ -143,8 +143,18 @@ async fn enable_sets_fetch_flags_for_supported_patterns() {
ctx.expect_result(2, json!({}), None);
let bc = ctx.conn.browser_context.as_ref().unwrap();
- assert!(bc.active_target.fetch_owner.is_enabled());
- assert!(bc.active_target.fetch_owner.handle_auth_requests());
+ assert!(
+ bc.active_page_state()
+ .active_target
+ .fetch_owner
+ .is_enabled()
+ );
+ assert!(
+ bc.active_page_state()
+ .active_target
+ .fetch_owner
+ .handle_auth_requests()
+ );
}
#[tokio::test]
@@ -181,12 +191,17 @@ async fn enable_and_disable_are_session_local_for_same_target() {
{
let bc = ctx.conn.browser_context.as_ref().expect("browser context");
- let aggregate = bc.active_target.fetch_owner.config_snapshot();
+ let aggregate = bc
+ .active_page_state()
+ .active_target
+ .fetch_owner
+ .config_snapshot();
assert!(aggregate.is_enabled());
assert!(aggregate.handle_auth_requests());
assert_eq!(aggregate.patterns().len(), 2);
let primary = bc
+ .active_page_state()
.active_target
.fetch_owner
.config_snapshot_for_session(Some("SID-primary"));
@@ -196,6 +211,7 @@ async fn enable_and_disable_are_session_local_for_same_target() {
assert_eq!(primary.patterns()[0].url_pattern, "*primary*");
let aux = bc
+ .active_page_state()
.active_target
.fetch_owner
.config_snapshot_for_session(Some("SID-aux"));
@@ -214,25 +230,32 @@ async fn enable_and_disable_are_session_local_for_same_target() {
ctx.expect_result(212, json!({}), Some("SID-primary"));
let bc = ctx.conn.browser_context.as_ref().expect("browser context");
- let aggregate = bc.active_target.fetch_owner.config_snapshot();
+ let aggregate = bc
+ .active_page_state()
+ .active_target
+ .fetch_owner
+ .config_snapshot();
assert!(aggregate.is_enabled());
assert!(!aggregate.handle_auth_requests());
assert_eq!(aggregate.patterns().len(), 1);
assert_eq!(aggregate.patterns()[0].url_pattern, "*aux*");
assert!(
- !bc.active_target
+ !bc.active_page_state()
+ .active_target
.fetch_owner
.config_snapshot_for_session(Some("SID-primary"))
.is_enabled()
);
assert!(
- bc.active_target
+ bc.active_page_state()
+ .active_target
.fetch_owner
.config_snapshot_for_session(Some("SID-aux"))
.is_enabled()
);
assert_eq!(
- bc.active_target
+ bc.active_page_state()
+ .active_target
.fetch_owner
.subresource_interception_config(),
(true, Some(moli_core::page::SubresourceResourceType::Xhr))
@@ -276,6 +299,7 @@ async fn disable_drains_only_current_session_pending_subresource_fetches() {
.browser_context
.as_mut()
.expect("browser context")
+ .active_page_state_mut()
.active_target
.fetch_owner;
fetch_owner.register_pending_subresource_fetch_request(
@@ -301,6 +325,7 @@ async fn disable_drains_only_current_session_pending_subresource_fetches() {
.browser_context
.as_mut()
.expect("browser context")
+ .active_page_state_mut()
.active_target
.fetch_owner;
assert!(!fetch_owner.has_pending_fetch_request_id_for_test("FETCH-primary"));
@@ -338,6 +363,7 @@ async fn disable_drains_fetch_owned_pending_when_same_session_network_intercept_
.browser_context
.as_mut()
.expect("browser context")
+ .active_page_state_mut()
.active_target
.fetch_owner;
fetch_owner.add_network_intercept(
@@ -378,6 +404,7 @@ async fn disable_drains_fetch_owned_pending_when_same_session_network_intercept_
.browser_context
.as_mut()
.expect("browser context")
+ .active_page_state_mut()
.active_target
.fetch_owner;
assert!(!fetch_owner.has_pending_fetch_request_id_for_test("FETCH-owned"));
@@ -431,7 +458,12 @@ async fn enable_targets_loaded_background_owner_without_promotion() {
let bc = ctx.conn.browser_context.as_ref().expect("browser context");
assert_eq!(bc.active_target_id(), Some("TID-active"));
- assert!(!bc.active_target.fetch_owner.is_enabled());
+ assert!(
+ !bc.active_page_state()
+ .active_target
+ .fetch_owner
+ .is_enabled()
+ );
let staged = bc
.parked_page_session_state("TID-background")
.expect("background owner fetch config should be staged");
@@ -528,7 +560,12 @@ async fn pending_fetch_enable_keeps_background_owner_route_across_completion() {
let bc = ctx.conn.browser_context.as_ref().expect("browser context");
assert_eq!(bc.active_target_id(), Some("TID-fetch-active"));
- assert!(!bc.active_target.fetch_owner.is_enabled());
+ assert!(
+ !bc.active_page_state()
+ .active_target
+ .fetch_owner
+ .is_enabled()
+ );
let staged = bc
.parked_page_session_state("TID-fetch-background")
.expect("background fetch config should stay parked");
@@ -576,6 +613,7 @@ async fn enable_targets_inactive_owner_without_activation() {
.browser_context
.as_ref()
.expect("active context")
+ .active_page_state()
.active_target
.fetch_owner
.is_enabled()
@@ -586,10 +624,23 @@ async fn enable_targets_inactive_owner_without_activation() {
.iter()
.find(|bc| bc.id == "BID-inactive")
.expect("inactive context");
- assert!(inactive.active_target.fetch_owner.is_enabled());
- assert!(inactive.active_target.fetch_owner.handle_auth_requests());
+ assert!(
+ inactive
+ .active_page_state()
+ .active_target
+ .fetch_owner
+ .is_enabled()
+ );
+ assert!(
+ inactive
+ .active_page_state()
+ .active_target
+ .fetch_owner
+ .handle_auth_requests()
+ );
assert_eq!(
inactive
+ .active_page_state()
.active_target
.fetch_owner
.config_snapshot()
@@ -640,7 +691,12 @@ async fn disable_targets_loaded_background_owner_without_promotion() {
let bc = ctx.conn.browser_context.as_ref().expect("browser context");
assert_eq!(bc.active_target_id(), Some("TID-active"));
- assert!(!bc.active_target.fetch_owner.is_enabled());
+ assert!(
+ !bc.active_page_state()
+ .active_target
+ .fetch_owner
+ .is_enabled()
+ );
assert!(
bc.parked_page_session_state("TID-background").is_none(),
"disabled background fetch config should collapse to default"
@@ -660,8 +716,18 @@ async fn enable_without_params_enables_default_fetch_interception() {
ctx.expect_result(12, json!({}), None);
let bc = ctx.conn.browser_context.as_ref().unwrap();
- assert!(bc.active_target.fetch_owner.is_enabled());
- assert!(!bc.active_target.fetch_owner.handle_auth_requests());
+ assert!(
+ bc.active_page_state()
+ .active_target
+ .fetch_owner
+ .is_enabled()
+ );
+ assert!(
+ !bc.active_page_state()
+ .active_target
+ .fetch_owner
+ .handle_auth_requests()
+ );
}
#[tokio::test]
@@ -682,8 +748,18 @@ async fn enable_with_invalid_request_stage_errors_and_keeps_fetch_disabled() {
ctx.expect_error(3, -32602, "InvalidParams");
let bc = ctx.conn.browser_context.as_ref().unwrap();
- assert!(!bc.active_target.fetch_owner.is_enabled());
- assert!(!bc.active_target.fetch_owner.handle_auth_requests());
+ assert!(
+ !bc.active_page_state()
+ .active_target
+ .fetch_owner
+ .is_enabled()
+ );
+ assert!(
+ !bc.active_page_state()
+ .active_target
+ .fetch_owner
+ .handle_auth_requests()
+ );
}
#[tokio::test]
@@ -702,8 +778,17 @@ async fn enable_with_specific_url_pattern_sets_pattern() {
ctx.expect_result(18, json!({}), None);
let bc = ctx.conn.browser_context.as_ref().unwrap();
- assert!(bc.active_target.fetch_owner.is_enabled());
- let fetch_config = bc.active_target.fetch_owner.config_snapshot();
+ assert!(
+ bc.active_page_state()
+ .active_target
+ .fetch_owner
+ .is_enabled()
+ );
+ let fetch_config = bc
+ .active_page_state()
+ .active_target
+ .fetch_owner
+ .config_snapshot();
assert_eq!(fetch_config.url_pattern(), "https://example.com/api/*");
}
@@ -743,9 +828,15 @@ async fn enable_with_document_resource_type_filter_sets_document_filter() {
ctx.expect_result(14, json!({}), None);
let bc = ctx.conn.browser_context.as_ref().unwrap();
- assert!(bc.active_target.fetch_owner.is_enabled());
+ assert!(
+ bc.active_page_state()
+ .active_target
+ .fetch_owner
+ .is_enabled()
+ );
assert_eq!(
- bc.active_target
+ bc.active_page_state()
+ .active_target
.fetch_owner
.config_snapshot()
.resource_type_filter(),
@@ -769,9 +860,15 @@ async fn enable_with_script_resource_type_filter_sets_script_filter() {
ctx.expect_result(15, json!({}), None);
let bc = ctx.conn.browser_context.as_ref().unwrap();
- assert!(bc.active_target.fetch_owner.is_enabled());
+ assert!(
+ bc.active_page_state()
+ .active_target
+ .fetch_owner
+ .is_enabled()
+ );
assert_eq!(
- bc.active_target
+ bc.active_page_state()
+ .active_target
.fetch_owner
.config_snapshot()
.resource_type_filter(),
@@ -795,9 +892,15 @@ async fn enable_with_fetch_resource_type_filter_sets_fetch_filter() {
ctx.expect_result(15, json!({}), None);
let bc = ctx.conn.browser_context.as_ref().unwrap();
- assert!(bc.active_target.fetch_owner.is_enabled());
+ assert!(
+ bc.active_page_state()
+ .active_target
+ .fetch_owner
+ .is_enabled()
+ );
assert_eq!(
- bc.active_target
+ bc.active_page_state()
+ .active_target
.fetch_owner
.config_snapshot()
.resource_type_filter(),
@@ -821,9 +924,15 @@ async fn enable_with_xhr_resource_type_filter_sets_xhr_filter() {
ctx.expect_result(16, json!({}), None);
let bc = ctx.conn.browser_context.as_ref().unwrap();
- assert!(bc.active_target.fetch_owner.is_enabled());
+ assert!(
+ bc.active_page_state()
+ .active_target
+ .fetch_owner
+ .is_enabled()
+ );
assert_eq!(
- bc.active_target
+ bc.active_page_state()
+ .active_target
.fetch_owner
.config_snapshot()
.resource_type_filter(),
@@ -847,9 +956,15 @@ async fn enable_with_ping_resource_type_filter_sets_ping_filter() {
ctx.expect_result(18, json!({}), None);
let bc = ctx.conn.browser_context.as_ref().unwrap();
- assert!(bc.active_target.fetch_owner.is_enabled());
+ assert!(
+ bc.active_page_state()
+ .active_target
+ .fetch_owner
+ .is_enabled()
+ );
assert_eq!(
- bc.active_target
+ bc.active_page_state()
+ .active_target
.fetch_owner
.config_snapshot()
.resource_type_filter(),
@@ -877,9 +992,15 @@ async fn enable_with_csp_violation_report_resource_type_filter_sets_csp_report_f
ctx.expect_result(19, json!({}), None);
let bc = ctx.conn.browser_context.as_ref().unwrap();
- assert!(bc.active_target.fetch_owner.is_enabled());
+ assert!(
+ bc.active_page_state()
+ .active_target
+ .fetch_owner
+ .is_enabled()
+ );
assert_eq!(
- bc.active_target
+ bc.active_page_state()
+ .active_target
.fetch_owner
.config_snapshot()
.resource_type_filter(),
@@ -903,9 +1024,15 @@ async fn enable_with_websocket_resource_type_filter_sets_websocket_filter() {
ctx.expect_result(20, json!({}), None);
let bc = ctx.conn.browser_context.as_ref().unwrap();
- assert!(bc.active_target.fetch_owner.is_enabled());
+ assert!(
+ bc.active_page_state()
+ .active_target
+ .fetch_owner
+ .is_enabled()
+ );
assert_eq!(
- bc.active_target
+ bc.active_page_state()
+ .active_target
.fetch_owner
.config_snapshot()
.resource_type_filter(),
@@ -929,9 +1056,15 @@ async fn enable_with_other_resource_type_filter_sets_other_filter() {
ctx.expect_result(21, json!({}), None);
let bc = ctx.conn.browser_context.as_ref().unwrap();
- assert!(bc.active_target.fetch_owner.is_enabled());
+ assert!(
+ bc.active_page_state()
+ .active_target
+ .fetch_owner
+ .is_enabled()
+ );
assert_eq!(
- bc.active_target
+ bc.active_page_state()
+ .active_target
.fetch_owner
.config_snapshot()
.resource_type_filter(),
@@ -959,7 +1092,12 @@ async fn enable_rejects_unimplemented_parser_discovered_resource_type_filters()
ctx.expect_error(20, -32602, "InvalidParams");
let bc = ctx.conn.browser_context.as_ref().unwrap();
- assert!(!bc.active_target.fetch_owner.is_enabled());
+ assert!(
+ !bc.active_page_state()
+ .active_target
+ .fetch_owner
+ .is_enabled()
+ );
}
}
@@ -979,9 +1117,15 @@ async fn enable_accepts_image_resource_type_filter() {
ctx.expect_result(22, json!({}), None);
let bc = ctx.conn.browser_context.as_ref().unwrap();
- assert!(bc.active_target.fetch_owner.is_enabled());
+ assert!(
+ bc.active_page_state()
+ .active_target
+ .fetch_owner
+ .is_enabled()
+ );
assert_eq!(
- bc.active_target
+ bc.active_page_state()
+ .active_target
.fetch_owner
.config_snapshot()
.resource_type_filter(),
@@ -1005,8 +1149,17 @@ async fn enable_with_response_stage_pattern_sets_response_stage() {
ctx.expect_result(17, json!({}), None);
let bc = ctx.conn.browser_context.as_ref().unwrap();
- assert!(bc.active_target.fetch_owner.is_enabled());
- let fetch_config = bc.active_target.fetch_owner.config_snapshot();
+ assert!(
+ bc.active_page_state()
+ .active_target
+ .fetch_owner
+ .is_enabled()
+ );
+ let fetch_config = bc
+ .active_page_state()
+ .active_target
+ .fetch_owner
+ .config_snapshot();
assert_eq!(fetch_config.request_stage(), FetchRequestStage::Response);
assert_eq!(fetch_config.resource_type_filter(), None);
}
@@ -1031,9 +1184,23 @@ async fn enable_with_multiple_supported_patterns_enables_fetch_interception() {
ctx.expect_result(13, json!({}), None);
let bc = ctx.conn.browser_context.as_ref().unwrap();
- assert!(bc.active_target.fetch_owner.is_enabled());
- assert!(bc.active_target.fetch_owner.handle_auth_requests());
- let fetch_config = bc.active_target.fetch_owner.config_snapshot();
+ assert!(
+ bc.active_page_state()
+ .active_target
+ .fetch_owner
+ .is_enabled()
+ );
+ assert!(
+ bc.active_page_state()
+ .active_target
+ .fetch_owner
+ .handle_auth_requests()
+ );
+ let fetch_config = bc
+ .active_page_state()
+ .active_target
+ .fetch_owner
+ .config_snapshot();
assert_eq!(fetch_config.patterns().len(), 2);
assert_eq!(
fetch_config.patterns()[0].request_stage,
@@ -1057,10 +1224,12 @@ async fn disable_without_browser_context_errors() {
async fn disable_clears_fetch_state() {
let mut ctx = TestContext::new();
let mut bc = BrowserContext::new_with_page_for_test("BID-1", "TID-1");
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.fetch_owner
.configure(None, true, Vec::new());
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.fetch_owner
.register_pending_fetch_navigation_request(PendingFetchNavigation {
fetch_request_id: "INT-1".to_owned(),
@@ -1092,7 +1261,8 @@ async fn disable_clears_fetch_state() {
crate::conn::ResponseStageUrlMatchPolicy::AlreadyMatched,
auth_required_blocked_intercepts: Vec::new(),
});
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.fetch_owner
.register_pending_fetch_auth_navigation(
"INT-1".to_owned(),
@@ -1148,10 +1318,21 @@ async fn disable_clears_fetch_state() {
ctx.expect_result(5, json!({}), None);
let bc = ctx.conn.browser_context.as_ref().unwrap();
- assert!(!bc.active_target.fetch_owner.is_enabled());
- assert!(!bc.active_target.fetch_owner.handle_auth_requests());
assert!(
- !bc.active_target
+ !bc.active_page_state()
+ .active_target
+ .fetch_owner
+ .is_enabled()
+ );
+ assert!(
+ !bc.active_page_state()
+ .active_target
+ .fetch_owner
+ .handle_auth_requests()
+ );
+ assert!(
+ !bc.active_page_state()
+ .active_target
.fetch_owner
.has_pending_fetch_state_for_test()
);
@@ -1161,13 +1342,16 @@ async fn disable_clears_fetch_state() {
async fn disable_after_enable_resets_pending_requests() {
let mut ctx = TestContext::new();
let mut bc = BrowserContext::new_with_page_for_test("BID-1", "TID-1");
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.fetch_owner
.configure(None, false, Vec::new());
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.fetch_owner
.register_pending_fetch_request_id_for_test("INT-1".to_owned());
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.fetch_owner
.register_pending_fetch_request_id_for_test("INT-2".to_owned());
ctx.conn.browser_context = Some(bc);
@@ -1228,10 +1412,12 @@ async fn continue_request_with_intercept_response_still_validates_request_id() {
async fn continue_response_and_take_response_body_as_stream_validate_like_fetch_actions() {
let mut ctx = TestContext::new();
let mut bc = BrowserContext::new_with_page_for_test("BID-1", "TID-1");
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.fetch_owner
.register_pending_fetch_request_id_for_test("INT-42".to_owned());
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.fetch_owner
.register_pending_fetch_request_id_for_test("INT-43".to_owned());
ctx.conn.browser_context = Some(bc);
@@ -1265,7 +1451,8 @@ async fn continue_response_and_take_response_body_as_stream_validate_like_fetch_
async fn pending_fetch_request_can_be_consumed_once() {
let mut ctx = TestContext::new();
let mut bc = BrowserContext::new_with_page_for_test("BID-1", "TID-1");
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.fetch_owner
.register_pending_fetch_request_id_for_test("INT-7".to_owned());
ctx.conn.browser_context = Some(bc);
@@ -1316,7 +1503,8 @@ async fn continue_with_auth_and_get_response_body_share_request_validation() {
async fn continue_with_auth_rejects_invalid_response_without_consuming_pending_auth_navigation() {
let mut ctx = TestContext::new();
let mut bc = attached_browser_context();
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.fetch_owner
.register_pending_fetch_auth_navigation(
"INT-8".to_owned(),
@@ -1381,7 +1569,8 @@ async fn continue_with_auth_rejects_invalid_response_without_consuming_pending_a
let bc = ctx.conn.browser_context.as_ref().expect("browser context");
assert!(
- bc.active_target
+ bc.active_page_state()
+ .active_target
.fetch_owner
.has_pending_fetch_auth_navigation_for_test("INT-8")
);
@@ -1391,7 +1580,8 @@ async fn continue_with_auth_rejects_invalid_response_without_consuming_pending_a
async fn continue_with_auth_unsupported_challenge_preserves_pending_auth_navigation() {
let mut ctx = TestContext::new();
let mut bc = attached_browser_context();
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.fetch_owner
.register_pending_fetch_auth_navigation(
"INT-9".to_owned(),
@@ -1460,7 +1650,8 @@ async fn continue_with_auth_unsupported_challenge_preserves_pending_auth_navigat
let bc = ctx.conn.browser_context.as_ref().expect("browser context");
assert!(
- bc.active_target
+ bc.active_page_state()
+ .active_target
.fetch_owner
.has_pending_fetch_auth_navigation_for_test("INT-9")
);
diff --git a/moli-protocol/src/domains/fetch/tests/command_correlation.rs b/moli-protocol/src/domains/fetch/tests/command_correlation.rs
index 93a088f39..b50aa3bd4 100644
--- a/moli-protocol/src/domains/fetch/tests/command_correlation.rs
+++ b/moli-protocol/src/domains/fetch/tests/command_correlation.rs
@@ -18,6 +18,7 @@ async fn context_with_loaded_fetch_page() -> TestContext {
.expect("fetch correlation page should load");
let mut browser_context = attached_browser_context();
browser_context
+ .active_page_state_mut()
.active_target
.runtime_slot
.replace_loaded_page(Some(page));
diff --git a/moli-protocol/src/domains/fetch/tests/mod.rs b/moli-protocol/src/domains/fetch/tests/mod.rs
index 6563e9d76..80b57d3fb 100644
--- a/moli-protocol/src/domains/fetch/tests/mod.rs
+++ b/moli-protocol/src/domains/fetch/tests/mod.rs
@@ -82,7 +82,12 @@ async fn loaded_page_html_for_test(ctx: &mut TestContext) -> String {
.conn
.browser_context
.as_mut()
- .and_then(|bc| bc.active_target.runtime_slot.loaded_page_mut())
+ .and_then(|bc| {
+ bc.active_page_state_mut()
+ .active_target
+ .runtime_slot
+ .loaded_page_mut()
+ })
.expect("loaded page");
page.serialize_html_async()
.await
diff --git a/moli-protocol/src/domains/fetch/tests/navigation_auth.rs b/moli-protocol/src/domains/fetch/tests/navigation_auth.rs
index 2c4bb5ba3..23589f5e8 100644
--- a/moli-protocol/src/domains/fetch/tests/navigation_auth.rs
+++ b/moli-protocol/src/domains/fetch/tests/navigation_auth.rs
@@ -43,7 +43,8 @@ async fn continue_with_auth_retries_navigation_with_basic_credentials() {
let mut ctx = TestContext::new();
let mut bc = attached_browser_context();
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -204,7 +205,8 @@ async fn devtools_continue_response_credentials_retries_auth_navigation() {
let mut ctx = TestContext::new();
let mut bc = attached_browser_context();
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -350,7 +352,8 @@ async fn continue_with_auth_and_intercept_response_pauses_before_authorized_body
let mut ctx = TestContext::new();
let mut bc = attached_browser_context();
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -484,7 +487,8 @@ async fn continue_with_non_basic_auth_and_intercept_response_fails_explicitly_wi
let mut ctx = TestContext::new();
let mut bc = attached_browser_context();
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -601,7 +605,8 @@ async fn navigation_auth_required_includes_synthesized_cookie_header() {
let mut ctx = TestContext::new();
let mut bc = attached_browser_context();
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.enable_primary_network_events();
let url = format!("http://{addr}/auth");
@@ -698,7 +703,8 @@ async fn continue_with_auth_prefers_supported_navigation_challenge_over_unsuppor
let mut ctx = TestContext::new();
let mut bc = attached_browser_context();
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -848,7 +854,8 @@ async fn run_navigation_cdp_fetch_then_bidi_network_auth_required_terminal(
let mut ctx = TestContext::new();
let mut bc = attached_browser_context();
assert!(bc.assign_auxiliary_session_to_target("TID-1", "SID-fetch".to_owned()));
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
diff --git a/moli-protocol/src/domains/fetch/tests/navigation_control.rs b/moli-protocol/src/domains/fetch/tests/navigation_control.rs
index eb65c394b..b7d81db65 100644
--- a/moli-protocol/src/domains/fetch/tests/navigation_control.rs
+++ b/moli-protocol/src/domains/fetch/tests/navigation_control.rs
@@ -71,12 +71,14 @@ async fn continue_request_rejects_invalid_url_without_consuming_pending_navigati
let bc = ctx.conn.browser_context.as_ref().expect("browser context");
assert!(
- bc.active_target
+ bc.active_page_state()
+ .active_target
.fetch_owner
.has_pending_fetch_request_id_for_test(&request_id)
);
assert!(
- bc.active_target
+ bc.active_page_state()
+ .active_target
.fetch_owner
.has_pending_fetch_navigation_for_test(&request_id)
);
@@ -123,12 +125,14 @@ async fn continue_request_rejects_invalid_post_data_without_consuming_pending_na
let bc = ctx.conn.browser_context.as_ref().expect("browser context");
assert!(
- bc.active_target
+ bc.active_page_state()
+ .active_target
.fetch_owner
.has_pending_fetch_request_id_for_test(&request_id)
);
assert!(
- bc.active_target
+ bc.active_page_state()
+ .active_target
.fetch_owner
.has_pending_fetch_navigation_for_test(&request_id)
);
@@ -254,7 +258,8 @@ async fn main_document_request_uses_loader_id_as_observed_network_request_id() {
async fn fail_request_blocked_by_client_maps_main_document_navigation_to_net_error_text() {
let mut ctx = TestContext::new();
let mut bc = attached_browser_context();
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -384,7 +389,8 @@ async fn response_stage_document_pattern_pauses_main_document_after_response() {
let mut ctx = TestContext::new();
let mut bc = attached_browser_context();
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.enable_primary_network_events();
let url = format!("http://{addr}/page");
@@ -585,7 +591,8 @@ async fn continue_request_with_post_data_marks_network_request_as_having_post_da
let mut ctx = TestContext::new();
let mut bc = attached_browser_context();
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -702,7 +709,8 @@ async fn intercepted_form_post_navigation_body_is_available_by_network_request_i
.await;
{
let bc = ctx.conn.browser_context.as_mut().expect("browser context");
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.enable_primary_network_events();
}
@@ -820,7 +828,8 @@ async fn continue_request_with_intercept_response_pauses_after_response_until_co
let mut ctx = TestContext::new();
let mut bc = attached_browser_context();
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -949,7 +958,8 @@ async fn continue_request_with_intercept_response_pauses_after_response_until_co
async fn intercepted_navigation_start_events_stay_before_network_pause_with_background_sender() {
let mut ctx = TestContext::new();
let mut bc = attached_browser_context();
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -1007,7 +1017,8 @@ async fn disable_aborts_paused_main_document_navigation() {
let url = format!("http://{addr}/page");
let mut ctx = TestContext::new();
let mut bc = attached_browser_context();
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
diff --git a/moli-protocol/src/domains/fetch/tests/navigation_response_stage.rs b/moli-protocol/src/domains/fetch/tests/navigation_response_stage.rs
index 10c444cde..703f5f3f5 100644
--- a/moli-protocol/src/domains/fetch/tests/navigation_response_stage.rs
+++ b/moli-protocol/src/domains/fetch/tests/navigation_response_stage.rs
@@ -28,7 +28,8 @@ async fn response_stage_pause_happens_before_navigation_body_eof() {
let mut ctx = TestContext::new();
let mut bc = attached_browser_context();
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -77,7 +78,8 @@ async fn response_stage_pause_happens_before_navigation_body_eof() {
.browser_context
.as_ref()
.and_then(|bc| {
- bc.active_target
+ bc.active_page_state()
+ .active_target
.fetch_owner
.pending_fetch_response_prepared_renderer_agent_for_test(&response_request_id)
})
@@ -166,7 +168,8 @@ async fn assert_empty_http_error_response_stage(ctx: &mut TestContext, url: &str
.browser_context
.as_ref()
.and_then(|bc| {
- bc.active_target
+ bc.active_page_state()
+ .active_target
.fetch_owner
.pending_fetch_response_prepared_renderer_agent_for_test(&request_id)
})
@@ -272,7 +275,8 @@ async fn empty_http_error_response_stage_commits_browser_error_document_after_co
let mut ctx = TestContext::new();
let mut bc = attached_browser_context();
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -313,7 +317,8 @@ lateBinding("author-script");
let mut ctx = TestContext::new();
let mut bc = attached_browser_context();
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -327,6 +332,7 @@ lateBinding("author-script");
.browser_context
.as_mut()
.expect("browser context should remain installed")
+ .active_page_state_mut()
.active_target
.runtime_slot
.replace_loaded_page(Some(initial_page));
@@ -500,7 +506,8 @@ async fn response_stage_xml_commit_uses_live_configuration_before_first_author_s
let mut ctx = TestContext::new();
let mut bc = attached_browser_context();
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -515,6 +522,7 @@ async fn response_stage_xml_commit_uses_live_configuration_before_first_author_s
.browser_context
.as_mut()
.expect("browser context should remain installed")
+ .active_page_state_mut()
.active_target
.runtime_slot
.replace_loaded_page(Some(initial_page));
@@ -705,6 +713,7 @@ async fn fulfill_request_commit_uses_configuration_added_while_paused_before_aut
.browser_context
.as_mut()
.expect("browser context should remain installed")
+ .active_page_state_mut()
.active_target
.runtime_slot
.replace_loaded_page(Some(initial_page));
@@ -886,7 +895,8 @@ async fn interleaved_response_heads_only_commit_the_current_prepared_document()
let mut ctx = TestContext::new();
let mut bc = attached_browser_context();
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -923,7 +933,8 @@ async fn interleaved_response_heads_only_commit_the_current_prepared_document()
.browser_context
.as_ref()
.and_then(|bc| {
- bc.active_target
+ bc.active_page_state()
+ .active_target
.fetch_owner
.pending_fetch_response_prepared_renderer_agent_for_test(&first_request_id)
})
@@ -946,18 +957,20 @@ async fn interleaved_response_heads_only_commit_the_current_prepared_document()
.browser_context
.as_ref()
.and_then(|bc| {
- bc.active_target
+ bc.active_page_state()
+ .active_target
.fetch_owner
.pending_fetch_response_prepared_renderer_agent_for_test(&second_request_id)
})
.expect("second response head should reserve a renderer agent");
assert_ne!(first_agent, second_agent);
- let attachment_before_continue = ctx
- .conn
- .browser_context
- .as_ref()
- .and_then(|bc| bc.active_target.runtime_slot.current_renderer_attachment());
+ let attachment_before_continue = ctx.conn.browser_context.as_ref().and_then(|bc| {
+ bc.active_page_state()
+ .active_target
+ .runtime_slot
+ .current_renderer_attachment()
+ });
ctx.process_async(json!({
"id": 367,
"method": "Fetch.continueResponse",
@@ -973,10 +986,11 @@ async fn interleaved_response_heads_only_commit_the_current_prepared_document()
"renderer channel navigation was superseded by a newer navigation"
);
assert_eq!(
- ctx.conn
- .browser_context
- .as_ref()
- .and_then(|bc| bc.active_target.runtime_slot.current_renderer_attachment()),
+ ctx.conn.browser_context.as_ref().and_then(|bc| bc
+ .active_page_state()
+ .active_target
+ .runtime_slot
+ .current_renderer_attachment()),
attachment_before_continue,
"a superseded response head must not switch the renderer channel"
);
@@ -1025,7 +1039,8 @@ async fn interleaved_response_heads_only_commit_the_current_prepared_document()
async fn response_stage_continue_request_rejects_data_url_override_without_consuming_pause() {
let mut ctx = TestContext::new();
let mut bc = attached_browser_context();
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -1072,12 +1087,14 @@ async fn response_stage_continue_request_rejects_data_url_override_without_consu
.as_ref()
.expect("browser context should remain active");
assert!(
- bc.active_target
+ bc.active_page_state()
+ .active_target
.fetch_owner
.has_pending_fetch_request_id_for_test(&request_id)
);
assert!(
- bc.active_target
+ bc.active_page_state()
+ .active_target
.fetch_owner
.has_pending_fetch_navigation_for_test(&request_id)
);
@@ -1091,7 +1108,8 @@ async fn response_stage_continue_request_rejects_data_url_override_without_consu
async fn response_stage_continue_request_rejects_file_url_override_without_consuming_pause() {
let mut ctx = TestContext::new();
let mut bc = attached_browser_context();
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -1136,12 +1154,14 @@ async fn response_stage_continue_request_rejects_file_url_override_without_consu
.as_ref()
.expect("browser context should remain active");
assert!(
- bc.active_target
+ bc.active_page_state()
+ .active_target
.fetch_owner
.has_pending_fetch_request_id_for_test(&request_id)
);
assert!(
- bc.active_target
+ bc.active_page_state()
+ .active_target
.fetch_owner
.has_pending_fetch_navigation_for_test(&request_id)
);
@@ -1170,7 +1190,8 @@ async fn response_stage_continue_response_streams_network_events_through_backgro
let mut ctx = TestContext::new();
let mut bc = attached_browser_context();
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -1290,7 +1311,8 @@ async fn continue_response_can_override_status_and_headers() {
let mut ctx = TestContext::new();
let mut bc = attached_browser_context();
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -1754,7 +1776,8 @@ async fn fail_request_at_response_stage_aborts_navigation() {
let mut ctx = TestContext::new();
let mut bc = attached_browser_context();
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -1793,17 +1816,19 @@ async fn fail_request_at_response_stage_aborts_navigation() {
.as_str()
.expect("response-stage request id")
.to_owned();
- let attachment_before_cancel = ctx
- .conn
- .browser_context
- .as_ref()
- .and_then(|bc| bc.active_target.runtime_slot.current_renderer_attachment());
+ let attachment_before_cancel = ctx.conn.browser_context.as_ref().and_then(|bc| {
+ bc.active_page_state()
+ .active_target
+ .runtime_slot
+ .current_renderer_attachment()
+ });
assert!(
ctx.conn
.browser_context
.as_ref()
.and_then(|bc| {
- bc.active_target
+ bc.active_page_state()
+ .active_target
.fetch_owner
.pending_fetch_response_prepared_renderer_agent_for_test(&response_request_id)
})
@@ -1827,6 +1852,7 @@ async fn fail_request_at_response_stage_aborts_navigation() {
assert!(browser_context.loaded_page().is_none());
assert_eq!(
browser_context
+ .active_page_state()
.active_target
.runtime_slot
.current_renderer_attachment(),
@@ -1856,7 +1882,8 @@ async fn fulfill_request_at_response_stage_replaces_the_network_candidate_once()
let mut ctx = TestContext::new();
let mut bc = attached_browser_context();
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -1893,7 +1920,8 @@ async fn fulfill_request_at_response_stage_replaces_the_network_candidate_once()
.browser_context
.as_ref()
.and_then(|bc| {
- bc.active_target
+ bc.active_page_state()
+ .active_target
.fetch_owner
.pending_fetch_response_prepared_renderer_agent_for_test(&request_id)
})
@@ -2372,6 +2400,7 @@ async fn get_response_body_does_not_consume_active_response_body_stream() {
.browser_context
.as_ref()
.unwrap()
+ .active_page_state()
.active_target
.fetch_owner
.active_fetch_response_body_stream_request_id_for_test("BID-1:TID-1:STREAM-1"),
@@ -2398,6 +2427,7 @@ async fn get_response_body_does_not_consume_active_response_body_stream() {
.browser_context
.as_ref()
.unwrap()
+ .active_page_state()
.active_target
.fetch_owner
.active_fetch_response_body_stream_request_id_for_test("BID-1:TID-1:STREAM-1"),
@@ -2417,6 +2447,7 @@ async fn get_response_body_does_not_consume_active_response_body_stream() {
.browser_context
.as_ref()
.unwrap()
+ .active_page_state()
.active_target
.fetch_owner
.active_fetch_response_body_stream_request_id_for_test("BID-1:TID-1:STREAM-1"),
@@ -2444,6 +2475,7 @@ async fn get_response_body_does_not_consume_active_response_body_stream() {
.browser_context
.as_ref()
.unwrap()
+ .active_page_state()
.active_target
.fetch_owner
.active_fetch_response_body_stream_request_id_for_test("BID-1:TID-1:STREAM-1")
@@ -2727,6 +2759,7 @@ async fn clear_browser_cache_cancels_active_response_body_stream_without_stale_r
.browser_context
.as_ref()
.unwrap()
+ .active_page_state()
.active_target
.fetch_owner
.active_fetch_response_body_stream_request_id_for_test("BID-1:TID-1:STREAM-1")
@@ -2815,7 +2848,8 @@ async fn fail_request_finishes_pending_navigation_with_error() {
async fn fulfill_request_completes_navigation_with_synthetic_response() {
let mut ctx = TestContext::new();
let mut bc = attached_browser_context();
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -2908,7 +2942,8 @@ async fn fulfill_request_completes_navigation_with_synthetic_response() {
async fn fulfill_request_navigation_get_response_body_preserves_binary_bytes() {
let mut ctx = TestContext::new();
let mut bc = attached_browser_context();
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -2986,7 +3021,8 @@ async fn fulfill_request_navigation_get_response_body_preserves_binary_bytes() {
async fn fulfill_request_document_body_uses_phase_one_parser_semantics() {
let mut ctx = TestContext::new();
let mut bc = attached_browser_context();
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -3056,7 +3092,8 @@ async fn fulfill_request_document_body_uses_phase_one_parser_semantics() {
async fn fulfill_request_accepts_binary_response_headers() {
let mut ctx = TestContext::new();
let mut bc = attached_browser_context();
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -3147,7 +3184,8 @@ async fn continue_request_applies_url_method_headers_and_post_data() {
let continued_url = format!("http://{addr}/continued");
let mut ctx = TestContext::new();
let mut bc = attached_browser_context();
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
diff --git a/moli-protocol/src/domains/fetch/tests/navigation_subresource.rs b/moli-protocol/src/domains/fetch/tests/navigation_subresource.rs
index a0b460b7f..035347136 100644
--- a/moli-protocol/src/domains/fetch/tests/navigation_subresource.rs
+++ b/moli-protocol/src/domains/fetch/tests/navigation_subresource.rs
@@ -71,7 +71,8 @@ async fn request_stage_navigation_request_paused_includes_synthesized_cookie_hea
let mut ctx = TestContext::new();
let mut bc = attached_browser_context();
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.enable_primary_network_events();
let url = format!("http://{addr}/page");
@@ -151,7 +152,8 @@ fetch('/api', { method: 'POST', body: 'nav-payload' })
let mut ctx = TestContext::new();
let mut bc = attached_browser_context();
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -373,7 +375,8 @@ document.addEventListener('DOMContentLoaded', () => {
let mut ctx = TestContext::new();
let mut bc = attached_browser_context();
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -535,7 +538,8 @@ window.addEventListener('load', () => {
let mut ctx = TestContext::new();
let mut bc = attached_browser_context();
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -696,7 +700,8 @@ window.postMessage('go', '*');
let mut ctx = TestContext::new();
let mut bc = attached_browser_context();
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -862,7 +867,8 @@ document.body.setAttribute('data-trigger', '1');
let mut ctx = TestContext::new();
let mut bc = attached_browser_context();
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -1027,7 +1033,8 @@ observer.observe(document.getElementById('target'));
let mut ctx = TestContext::new();
let mut bc = attached_browser_context();
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -1189,7 +1196,8 @@ setTimeout(() => {
let mut ctx = TestContext::new();
let mut bc = attached_browser_context();
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -1364,7 +1372,8 @@ const id = setInterval(() => {
let mut ctx = TestContext::new();
let mut bc = attached_browser_context();
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -1537,7 +1546,8 @@ queueMicrotask(() => {
let mut ctx = TestContext::new();
let mut bc = attached_browser_context();
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -1698,7 +1708,8 @@ Promise.resolve().then(() => {
let mut ctx = TestContext::new();
let mut bc = attached_browser_context();
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -1860,7 +1871,8 @@ setTimeout(() => {
let mut ctx = TestContext::new();
let mut bc = attached_browser_context();
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -2040,7 +2052,8 @@ const id = setInterval(() => {
let mut ctx = TestContext::new();
let mut bc = attached_browser_context();
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -2214,7 +2227,8 @@ queueMicrotask(() => {
let mut ctx = TestContext::new();
let mut bc = attached_browser_context();
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -2376,7 +2390,8 @@ Promise.resolve().then(() => {
let mut ctx = TestContext::new();
let mut bc = attached_browser_context();
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -2538,7 +2553,8 @@ requestIdleCallback(deadline => {
let mut ctx = TestContext::new();
let mut bc = attached_browser_context();
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -2696,7 +2712,8 @@ requestIdleCallback(() => {
let mut ctx = TestContext::new();
let mut bc = attached_browser_context();
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -2860,7 +2877,8 @@ requestAnimationFrame(() => {
let mut ctx = TestContext::new();
let mut bc = attached_browser_context();
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -3016,7 +3034,8 @@ requestAnimationFrame(() => {
let mut ctx = TestContext::new();
let mut bc = attached_browser_context();
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -3168,7 +3187,8 @@ fetch('/api').catch(() => {});
let mut ctx = TestContext::new();
let mut bc = attached_browser_context();
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -3294,7 +3314,8 @@ async fn continue_with_auth_default_aborts_pending_navigation() {
ctx.expect_error(74, -32000, "Fetch auth challenge aborted");
let bc = ctx.conn.browser_context.as_ref().expect("browser context");
assert!(
- !bc.active_target
+ !bc.active_page_state()
+ .active_target
.fetch_owner
.has_pending_fetch_state_for_test()
);
@@ -3338,7 +3359,8 @@ async fn continue_with_auth_success_clears_pending_auth_navigation() {
let mut ctx = TestContext::new();
let mut bc = attached_browser_context();
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -3379,7 +3401,8 @@ async fn continue_with_auth_success_clears_pending_auth_navigation() {
let bc = ctx.conn.browser_context.as_ref().expect("browser context");
assert!(
- bc.active_target
+ bc.active_page_state()
+ .active_target
.fetch_owner
.has_pending_fetch_auth_navigation_for_test("INT-1")
);
@@ -3402,7 +3425,8 @@ async fn continue_with_auth_success_clears_pending_auth_navigation() {
let bc = ctx.conn.browser_context.as_ref().expect("browser context");
assert!(
- !bc.active_target
+ !bc.active_page_state()
+ .active_target
.fetch_owner
.has_pending_fetch_state_for_test()
);
@@ -3446,7 +3470,8 @@ async fn continue_with_auth_retries_navigation_with_basic_proxy_credentials() {
let mut ctx = TestContext::new();
let mut bc = attached_browser_context();
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -3541,7 +3566,8 @@ async fn continue_with_auth_retries_navigation_with_digest_proxy_credentials() {
let mut ctx = TestContext::new();
let mut bc = attached_browser_context();
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -3685,7 +3711,8 @@ async fn cancel_https_proxy_connect_auth_emits_407_without_extra_info_and_fails_
let mut ctx = TestContext::new();
let mut bc = attached_browser_context();
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -3835,7 +3862,8 @@ async fn continue_with_auth_handles_multi_round_basic_navigation_challenge() {
let mut ctx = TestContext::new();
let mut bc = attached_browser_context();
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -3967,7 +3995,8 @@ async fn continue_with_auth_handles_digest_navigation_challenge() {
let mut ctx = TestContext::new();
let mut bc = attached_browser_context();
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -4098,7 +4127,8 @@ async fn continue_with_auth_handles_multi_round_digest_navigation_challenge() {
let mut ctx = TestContext::new();
let mut bc = attached_browser_context();
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
diff --git a/moli-protocol/src/domains/fetch/tests/runtime_auth_response.rs b/moli-protocol/src/domains/fetch/tests/runtime_auth_response.rs
index 8f70d1758..ef783b38d 100644
--- a/moli-protocol/src/domains/fetch/tests/runtime_auth_response.rs
+++ b/moli-protocol/src/domains/fetch/tests/runtime_auth_response.rs
@@ -472,8 +472,12 @@ async fn runtime_child_frame_fetch_subresource_interception_uses_child_frame_att
let mut ctx = TestContext::new();
with_loaded_http_document(&mut ctx, &top_url, "SID-1", "TID-1").await;
ctx.enable_page_events_for_test(Some("SID-1"));
- ctx.conn.browser_context.as_mut().unwrap().devtools_sessions
- [moli_page_types::DevToolsSessionKey::Primary]
+ ctx.conn
+ .browser_context
+ .as_mut()
+ .unwrap()
+ .active_page_state_mut()
+ .devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.runtime_session_state
.inspector_enabled = true;
ctx.sent.clear();
@@ -5183,8 +5187,12 @@ async fn close_aborts_paused_response_stage_runtime_xhr_subresource() {
let xhr_url = format!("http://{addr}/xhr");
let mut ctx = TestContext::new();
with_loaded_http_document(&mut ctx, &page_url, "SID-1", "TID-1").await;
- ctx.conn.browser_context.as_mut().unwrap().devtools_sessions
- [moli_page_types::DevToolsSessionKey::Primary]
+ ctx.conn
+ .browser_context
+ .as_mut()
+ .unwrap()
+ .active_page_state_mut()
+ .devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.runtime_session_state
.inspector_enabled = true;
ctx.sent.clear();
@@ -5517,8 +5525,12 @@ async fn close_aborts_paused_runtime_xhr_auth_subresource() {
let protected_url = format!("http://{addr}/protected");
let mut ctx = TestContext::new();
with_loaded_http_document(&mut ctx, &page_url, "SID-1", "TID-1").await;
- ctx.conn.browser_context.as_mut().unwrap().devtools_sessions
- [moli_page_types::DevToolsSessionKey::Primary]
+ ctx.conn
+ .browser_context
+ .as_mut()
+ .unwrap()
+ .active_page_state_mut()
+ .devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.runtime_session_state
.inspector_enabled = true;
ctx.sent.clear();
@@ -5761,7 +5773,13 @@ async fn crash_aborts_paused_runtime_fetch_subresource() {
ctx.expect_error(905, -32000, "RequestNotFound");
let bc = ctx.conn.browser_context.as_ref().expect("browser context");
- assert!(bc.active_target.owner_state.target_crash_state.is_crashed());
+ assert!(
+ bc.active_page_state()
+ .active_target
+ .owner_state
+ .target_crash_state
+ .is_crashed()
+ );
assert!(!bc.has_loaded_page());
server.abort();
@@ -5905,7 +5923,13 @@ async fn crash_aborts_paused_response_stage_runtime_xhr_subresource() {
ctx.expect_error(912, -32000, "RequestNotFound");
let bc = ctx.conn.browser_context.as_ref().expect("browser context");
- assert!(bc.active_target.owner_state.target_crash_state.is_crashed());
+ assert!(
+ bc.active_page_state()
+ .active_target
+ .owner_state
+ .target_crash_state
+ .is_crashed()
+ );
assert!(!bc.has_loaded_page());
server.abort();
@@ -6082,7 +6106,13 @@ async fn crash_aborts_paused_runtime_xhr_auth_subresource() {
ctx.expect_error(919, -32000, "RequestNotFound");
let bc = ctx.conn.browser_context.as_ref().expect("browser context");
- assert!(bc.active_target.owner_state.target_crash_state.is_crashed());
+ assert!(
+ bc.active_page_state()
+ .active_target
+ .owner_state
+ .target_crash_state
+ .is_crashed()
+ );
assert!(!bc.has_loaded_page());
server.abort();
diff --git a/moli-protocol/src/domains/fetch/tests/runtime_fetch.rs b/moli-protocol/src/domains/fetch/tests/runtime_fetch.rs
index 4b867183d..7b3ef578b 100644
--- a/moli-protocol/src/domains/fetch/tests/runtime_fetch.rs
+++ b/moli-protocol/src/domains/fetch/tests/runtime_fetch.rs
@@ -1776,8 +1776,12 @@ async fn continue_request_returns_before_delayed_subresource_response() {
let api_url = format!("http://{addr}/api");
let mut ctx = TestContext::new();
with_loaded_http_document(&mut ctx, &page_url, "SID-1", "TID-1").await;
- ctx.conn.browser_context.as_mut().unwrap().devtools_sessions
- [moli_page_types::DevToolsSessionKey::Primary]
+ ctx.conn
+ .browser_context
+ .as_mut()
+ .unwrap()
+ .active_page_state_mut()
+ .devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.runtime_session_state
.inspector_enabled = true;
ctx.sent.clear();
@@ -5461,8 +5465,12 @@ async fn runtime_fetch_subresource_pauses_until_continue_request_then_resolves_p
let api_url = format!("http://{addr}/api");
let mut ctx = TestContext::new();
with_loaded_http_document(&mut ctx, &page_url, "SID-1", "TID-1").await;
- ctx.conn.browser_context.as_mut().unwrap().devtools_sessions
- [moli_page_types::DevToolsSessionKey::Primary]
+ ctx.conn
+ .browser_context
+ .as_mut()
+ .unwrap()
+ .active_page_state_mut()
+ .devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.runtime_session_state
.inspector_enabled = true;
ctx.sent.clear();
@@ -5611,8 +5619,12 @@ async fn runtime_fetch_subresource_continue_request_fails_when_network_offline()
"TID-1",
)
.await;
- ctx.conn.browser_context.as_mut().unwrap().devtools_sessions
- [moli_page_types::DevToolsSessionKey::Primary]
+ ctx.conn
+ .browser_context
+ .as_mut()
+ .unwrap()
+ .active_page_state_mut()
+ .devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.runtime_session_state
.inspector_enabled = true;
ctx.sent.clear();
@@ -5738,8 +5750,12 @@ async fn runtime_fetch_subresource_request_animation_frame_pauses_until_continue
let api_url = format!("http://{addr}/api");
let mut ctx = TestContext::new();
with_loaded_http_document(&mut ctx, &page_url, "SID-1", "TID-1").await;
- ctx.conn.browser_context.as_mut().unwrap().devtools_sessions
- [moli_page_types::DevToolsSessionKey::Primary]
+ ctx.conn
+ .browser_context
+ .as_mut()
+ .unwrap()
+ .active_page_state_mut()
+ .devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.runtime_session_state
.inspector_enabled = true;
ctx.sent.clear();
@@ -5915,8 +5931,12 @@ async fn runtime_fetch_subresource_queue_microtask_pauses_until_continue_request
let api_url = format!("http://{addr}/api");
let mut ctx = TestContext::new();
with_loaded_http_document(&mut ctx, &page_url, "SID-1", "TID-1").await;
- ctx.conn.browser_context.as_mut().unwrap().devtools_sessions
- [moli_page_types::DevToolsSessionKey::Primary]
+ ctx.conn
+ .browser_context
+ .as_mut()
+ .unwrap()
+ .active_page_state_mut()
+ .devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.runtime_session_state
.inspector_enabled = true;
ctx.sent.clear();
@@ -7742,8 +7762,12 @@ async fn close_aborts_paused_runtime_fetch_subresource() {
let api_url = format!("http://{addr}/api");
let mut ctx = TestContext::new();
with_loaded_http_document(&mut ctx, &page_url, "SID-1", "TID-1").await;
- ctx.conn.browser_context.as_mut().unwrap().devtools_sessions
- [moli_page_types::DevToolsSessionKey::Primary]
+ ctx.conn
+ .browser_context
+ .as_mut()
+ .unwrap()
+ .active_page_state_mut()
+ .devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.runtime_session_state
.inspector_enabled = true;
ctx.sent.clear();
diff --git a/moli-protocol/src/domains/fetch/tests/runtime_xhr.rs b/moli-protocol/src/domains/fetch/tests/runtime_xhr.rs
index 8eeb196cc..b15b45079 100644
--- a/moli-protocol/src/domains/fetch/tests/runtime_xhr.rs
+++ b/moli-protocol/src/domains/fetch/tests/runtime_xhr.rs
@@ -160,8 +160,12 @@ async fn runtime_xhr_subresource_pauses_until_continue_request_then_loads_respon
let xhr_url = format!("http://{addr}/xhr");
let mut ctx = TestContext::new();
with_loaded_http_document(&mut ctx, &page_url, "SID-1", "TID-1").await;
- ctx.conn.browser_context.as_mut().unwrap().devtools_sessions
- [moli_page_types::DevToolsSessionKey::Primary]
+ ctx.conn
+ .browser_context
+ .as_mut()
+ .unwrap()
+ .active_page_state_mut()
+ .devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.runtime_session_state
.inspector_enabled = true;
ctx.sent.clear();
@@ -461,8 +465,12 @@ async fn runtime_xhr_subresource_request_animation_frame_pauses_until_continue_r
let xhr_url = format!("http://{addr}/xhr");
let mut ctx = TestContext::new();
with_loaded_http_document(&mut ctx, &page_url, "SID-1", "TID-1").await;
- ctx.conn.browser_context.as_mut().unwrap().devtools_sessions
- [moli_page_types::DevToolsSessionKey::Primary]
+ ctx.conn
+ .browser_context
+ .as_mut()
+ .unwrap()
+ .active_page_state_mut()
+ .devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.runtime_session_state
.inspector_enabled = true;
ctx.sent.clear();
@@ -619,8 +627,12 @@ async fn runtime_xhr_subresource_queue_microtask_pauses_until_continue_request_t
let xhr_url = format!("http://{addr}/xhr");
let mut ctx = TestContext::new();
with_loaded_http_document(&mut ctx, &page_url, "SID-1", "TID-1").await;
- ctx.conn.browser_context.as_mut().unwrap().devtools_sessions
- [moli_page_types::DevToolsSessionKey::Primary]
+ ctx.conn
+ .browser_context
+ .as_mut()
+ .unwrap()
+ .active_page_state_mut()
+ .devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.runtime_session_state
.inspector_enabled = true;
ctx.sent.clear();
diff --git a/moli-protocol/src/domains/input.rs b/moli-protocol/src/domains/input.rs
index c1070f4ab..652c45fe4 100644
--- a/moli-protocol/src/domains/input.rs
+++ b/moli-protocol/src/domains/input.rs
@@ -1515,19 +1515,6 @@ pub(super) fn loaded_page_mut<'a>(
conn.loaded_page_mut_for_protocol_access(session_id).ok()
}
-pub(super) fn browser_context_mut_for_session_owner<'a>(
- conn: &'a mut CdpConnection,
- session_id: Option<&str>,
-) -> Option<&'a mut crate::conn::BrowserContext> {
- let browser_context_id = conn
- .session_route(session_id)
- .and_then(|route| route.browser_context_id().map(str::to_owned));
- if let Some(browser_context_id) = browser_context_id {
- return conn.browser_context_by_id_mut(&browser_context_id);
- }
- conn.browser_context.as_mut()
-}
-
#[derive(Debug, Default, Eq, PartialEq)]
pub(crate) struct InputPreparedOutputs {
download_activations: Vec<RendererPendingDownloadActivation>,
@@ -2198,7 +2185,8 @@ mod producer_tests {
let mut conn = CdpConnection::default();
let mut bc = BrowserContext::new_with_page_for_test("BID-typed", "TID-typed");
bc.attach_active_session("SID-typed");
- bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ bc.active_page_state_mut().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.page_session_state
.page_file_chooser_opened_event_enabled = true;
conn.browser_context = Some(bc);
@@ -2281,7 +2269,8 @@ mod producer_tests {
let mut bc = BrowserContext::new("BID-document-collision".into());
bc.set_active_target_id("TID-document-collision");
bc.attach_active_session("SID-document-collision");
- bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ bc.active_page_state_mut().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.page_session_state
.page_file_chooser_opened_event_enabled = true;
conn.browser_context = Some(bc);
@@ -2351,7 +2340,8 @@ mod producer_tests {
let mut bc = BrowserContext::new("BID-page-replacement".into());
bc.set_active_target_id("TID-page-replacement");
bc.attach_active_session("SID-page-replacement");
- bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ bc.active_page_state_mut().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.page_session_state
.page_file_chooser_opened_event_enabled = true;
conn.browser_context = Some(bc);
@@ -2465,7 +2455,8 @@ mod producer_tests {
let mut conn = CdpConnection::default();
let mut bc = BrowserContext::new_with_page_for_test("BID-1", "TID-1");
bc.attach_active_session("SID-1");
- bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ bc.active_page_state_mut().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.page_session_state
.page_file_chooser_opened_event_enabled = true;
conn.browser_context = Some(bc);
@@ -2512,7 +2503,8 @@ mod producer_tests {
let mut conn = CdpConnection::default();
let mut bc = BrowserContext::new_with_page_for_test("BID-context", "TID-context");
bc.attach_active_session("SID-context");
- bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ bc.active_page_state_mut().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.page_session_state
.page_file_chooser_opened_event_enabled = true;
conn.browser_context = Some(bc);
diff --git a/moli-protocol/src/domains/input/drag.rs b/moli-protocol/src/domains/input/drag.rs
index 7ae37f84f..f792b5433 100644
--- a/moli-protocol/src/domains/input/drag.rs
+++ b/moli-protocol/src/domains/input/drag.rs
@@ -25,9 +25,10 @@ pub(super) fn cancel_dragging_command_output_plan(
conn: &mut CdpConnection,
cmd: &Cmd<'_>,
) -> CommandOutputPlan {
- let Some(browser_context) = browser_context_mut_for_session_owner(conn, cmd.session_id) else {
+ if !conn.mutate_target_page_state_for_session(cmd.session_id, |state| {
+ state.input_drag_intercepted = false;
+ }) {
return CommandOutputPlan::error(-32000, "NoBrowserContext");
- };
- browser_context.input_drag_intercepted = false;
+ }
CommandOutputPlan::success()
}
diff --git a/moli-protocol/src/domains/input/tests.rs b/moli-protocol/src/domains/input/tests.rs
index 752c3a2fa..a87ad24db 100644
--- a/moli-protocol/src/domains/input/tests.rs
+++ b/moli-protocol/src/domains/input/tests.rs
@@ -316,7 +316,11 @@ async fn completed_mouse_event_does_not_restore_replaced_page_state() {
ctx.conn
.browser_context
.as_ref()
- .and_then(|context| context.active_target.runtime_slot.loaded_page())
+ .and_then(|context| context
+ .active_page_state()
+ .active_target
+ .runtime_slot
+ .loaded_page())
.is_some_and(|page| page.final_url().as_str() == replacement_url),
"settling the original input command must not install its Page state into the replacement"
);
@@ -783,6 +787,7 @@ async fn cancel_dragging_clears_reachable_drag_state_and_succeeds_when_idle() {
.browser_context
.as_mut()
.expect("browser context")
+ .active_page_state_mut()
.input_drag_intercepted = true;
ctx.process_async(json!({
@@ -796,6 +801,7 @@ async fn cancel_dragging_clears_reachable_drag_state_and_succeeds_when_idle() {
.browser_context
.as_ref()
.expect("browser context")
+ .active_page_state()
.input_drag_intercepted
);
@@ -1682,6 +1688,7 @@ async fn coordinate_touch_commands_complete_through_pending_layout_dispatch() {
.browser_context
.as_mut()
.expect("loaded browser context")
+ .active_page_state_mut()
.emit_touch_events_for_mouse = true;
for (id, event_type, buttons) in [(4107, "mousePressed", 1), (4108, "mouseReleased", 0)] {
ctx.process_async(json!({
diff --git a/moli-protocol/src/domains/inspector.rs b/moli-protocol/src/domains/inspector.rs
index eea80c283..cb571eaac 100644
--- a/moli-protocol/src/domains/inspector.rs
+++ b/moli-protocol/src/domains/inspector.rs
@@ -86,6 +86,7 @@ mod tests {
.browser_context
.as_ref()
.expect("browser context")
+ .active_page_state()
.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.runtime_session_state
.inspector_enabled
@@ -99,6 +100,7 @@ mod tests {
.browser_context
.as_ref()
.expect("browser context")
+ .active_page_state()
.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.runtime_session_state
.inspector_enabled
@@ -110,7 +112,8 @@ mod tests {
let mut ctx = TestContext::new();
let mut bc = BrowserContext::new_with_page_for_test("BID-1", "TID-1");
bc.attach_active_session("SID-1");
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.owner_state
.target_crash_state
.mark_crashed();
@@ -137,7 +140,8 @@ mod tests {
bc.set_active_target_id("TID-1");
bc.attach_active_session("SID-primary");
assert!(bc.assign_auxiliary_session_to_target("TID-1", "SID-aux".into()));
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.owner_state
.target_crash_state
.mark_crashed();
@@ -268,7 +272,8 @@ mod tests {
),
crate::conn::TargetPageSlot::empty_for_test_fixture(),
));
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.owner_state
.target_crash_state
.mark_crashed();
@@ -286,7 +291,8 @@ mod tests {
{
let bc = ctx.conn.browser_context.as_ref().expect("browser context");
assert!(
- !bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ !bc.active_page_state().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.runtime_session_state
.inspector_enabled
);
@@ -302,7 +308,7 @@ mod tests {
ctx.expect_result(5, json!({}), Some("SID-B"));
let bc = ctx.conn.browser_context.as_ref().expect("browser context");
assert!(
- !bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ !bc.active_page_state().devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.runtime_session_state
.inspector_enabled
);
diff --git a/moli-protocol/src/domains/log.rs b/moli-protocol/src/domains/log.rs
index f920d24bd..2acfd268a 100644
--- a/moli-protocol/src/domains/log.rs
+++ b/moli-protocol/src/domains/log.rs
@@ -665,7 +665,8 @@ mod tests {
ctx.expect_result(1, json!({}), Some("SID-background"));
let active = ctx.conn.browser_context.as_ref().expect("browser context");
assert!(
- !active.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ !active.active_page_state().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.page_session_state
.log_enabled
);
@@ -858,6 +859,7 @@ mod tests {
.browser_context
.as_ref()
.expect("browser context")
+ .active_page_state()
.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.console_output_session_state
.log_violation_thresholds;
@@ -875,6 +877,7 @@ mod tests {
.browser_context
.as_ref()
.expect("browser context")
+ .active_page_state()
.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.console_output_session_state
.log_violation_thresholds
diff --git a/moli-protocol/src/domains/network/activity.rs b/moli-protocol/src/domains/network/activity.rs
index 237d12eb4..0024ae51d 100644
--- a/moli-protocol/src/domains/network/activity.rs
+++ b/moli-protocol/src/domains/network/activity.rs
@@ -580,7 +580,8 @@ mod tests {
let mut bc = BrowserContext::new("BID-1".into());
bc.set_active_target_id("TID-1");
bc.attach_active_session("SID-1");
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.set_page_attachment_id_for_test(1);
conn.browser_context = Some(bc);
@@ -679,7 +680,8 @@ mod tests {
let mut bc = BrowserContext::new("BID-collision".into());
bc.set_active_target_id("TID-collision");
bc.attach_active_session("SID-collision");
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.set_page_attachment_id_for_test(1);
conn.browser_context = Some(bc);
@@ -764,7 +766,8 @@ mod tests {
bc.set_active_target_id("TID-1");
bc.attach_active_session("SID-1");
assert!(bc.assign_auxiliary_session_to_target("TID-1", "FETCH-SID".to_owned()));
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.set_page_attachment_id_for_test(1);
conn.browser_context = Some(bc);
@@ -815,6 +818,7 @@ mod tests {
conn.browser_context
.as_ref()
.unwrap()
+ .active_page_state()
.active_target
.fetch_owner
.has_pending_subresource_fetch_for_test("FETCH-1"),
@@ -829,7 +833,8 @@ mod tests {
bc.set_active_target_id("TID-1");
bc.attach_active_session("SID-1");
assert!(bc.assign_auxiliary_session_to_target("TID-1", "FETCH-SID".to_owned()));
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.set_page_attachment_id_for_test(1);
conn.browser_context = Some(bc);
diff --git a/moli-protocol/src/domains/network/agent.rs b/moli-protocol/src/domains/network/agent.rs
index ecf948f35..5ad463284 100644
--- a/moli-protocol/src/domains/network/agent.rs
+++ b/moli-protocol/src/domains/network/agent.rs
@@ -208,6 +208,7 @@ impl TargetNetworkAgentState {
self.primary_enabled = enabled;
}
+ #[cfg(test)]
pub(crate) fn enable_primary_events(&mut self) {
self.set_primary_events_enabled(true);
}
diff --git a/moli-protocol/src/domains/network/tests/blocked_urls.rs b/moli-protocol/src/domains/network/tests/blocked_urls.rs
index be7ea78fd..dada92280 100644
--- a/moli-protocol/src/domains/network/tests/blocked_urls.rs
+++ b/moli-protocol/src/domains/network/tests/blocked_urls.rs
@@ -50,6 +50,7 @@ async fn set_blocked_urls_updates_browser_context_state() {
.browser_context
.as_ref()
.unwrap()
+ .active_page_state()
.network_policy
.blocked_url_patterns(),
vec![
@@ -70,6 +71,7 @@ async fn set_blocked_urls_updates_browser_context_state() {
.browser_context
.as_ref()
.unwrap()
+ .active_page_state()
.network_policy
.blocked_url_patterns()
.is_empty()
@@ -93,6 +95,7 @@ async fn set_blocked_urls_contribution_activates_with_network_handler() {
.browser_context
.as_ref()
.unwrap()
+ .active_page_state()
.network_policy
.blocked_url_patterns()
.is_empty(),
@@ -105,6 +108,7 @@ async fn set_blocked_urls_contribution_activates_with_network_handler() {
.browser_context
.as_ref()
.unwrap()
+ .active_page_state()
.network_policy
.blocked_url_patterns(),
["*without-enable*".to_owned()],
@@ -118,7 +122,8 @@ async fn set_blocked_urls_navigation_fails_with_blocked_by_client() {
let mut bc = BrowserContext::new("BID-1".into());
bc.set_active_target_id("TID-1");
bc.attach_active_session("SID-1");
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -160,7 +165,8 @@ async fn set_blocked_urls_runtime_fetch_emits_loading_failed() {
let mut bc = BrowserContext::new("BID-1".into());
bc.set_active_target_id("TID-1");
bc.attach_active_session("SID-1");
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -848,7 +854,8 @@ async fn emulate_network_conditions_offline_worker_fetch_emits_loading_failed()
let mut bc = BrowserContext::new("BID-1".into());
bc.set_active_target_id("TID-1");
bc.attach_active_session("SID-1");
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -964,7 +971,8 @@ async fn emulate_network_conditions_offline_worker_xhr_emits_loading_failed() {
let mut bc = BrowserContext::new("BID-1".into());
bc.set_active_target_id("TID-1");
bc.attach_active_session("SID-1");
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -1076,7 +1084,8 @@ async fn set_blocked_urls_runtime_xhr_emits_loading_failed() {
let mut bc = BrowserContext::new("BID-1".into());
bc.set_active_target_id("TID-1");
bc.attach_active_session("SID-1");
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -1165,7 +1174,8 @@ async fn set_blocked_urls_runtime_websocket_emits_loading_failed() {
let mut bc = BrowserContext::new("BID-1".into());
bc.set_active_target_id("TID-1");
bc.attach_active_session("SID-1");
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -1312,12 +1322,29 @@ async fn emulate_network_conditions_updates_browser_context_state() {
ctx.expect_result(30, json!({}), None);
let bc = ctx.conn.browser_context.as_ref().unwrap();
- assert!(bc.network_policy.network_offline());
- assert_eq!(bc.network_policy.emulated_network_latency(), 150.0);
- assert_eq!(bc.network_policy.emulated_download_throughput(), 1024.0);
- assert_eq!(bc.network_policy.emulated_upload_throughput(), 512.0);
+ assert!(bc.active_page_state().network_policy.network_offline());
assert_eq!(
- bc.network_policy.emulated_connection_type(),
+ bc.active_page_state()
+ .network_policy
+ .emulated_network_latency(),
+ 150.0
+ );
+ assert_eq!(
+ bc.active_page_state()
+ .network_policy
+ .emulated_download_throughput(),
+ 1024.0
+ );
+ assert_eq!(
+ bc.active_page_state()
+ .network_policy
+ .emulated_upload_throughput(),
+ 512.0
+ );
+ assert_eq!(
+ bc.active_page_state()
+ .network_policy
+ .emulated_connection_type(),
Some("cellular3g")
);
}
@@ -1327,7 +1354,8 @@ async fn emulate_network_conditions_offline_navigation_fails_before_completion_e
let mut bc = BrowserContext::new("BID-1".into());
bc.set_active_target_id("TID-1");
bc.attach_active_session("SID-1");
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -1369,7 +1397,8 @@ async fn emulate_network_conditions_offline_runtime_fetch_emits_loading_failed()
let mut bc = BrowserContext::new("BID-1".into());
bc.set_active_target_id("TID-1");
bc.attach_active_session("SID-1");
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
diff --git a/moli-protocol/src/domains/network/tests/cache.rs b/moli-protocol/src/domains/network/tests/cache.rs
index cd15ee211..4f421c646 100644
--- a/moli-protocol/src/domains/network/tests/cache.rs
+++ b/moli-protocol/src/domains/network/tests/cache.rs
@@ -691,7 +691,8 @@ async fn clear_browser_cache_keeps_pending_response_navigation_transfer() {
let bc = ctx.conn.browser_context.as_ref().unwrap();
assert!(
- bc.active_target
+ bc.active_page_state()
+ .active_target
.fetch_owner
.pending_fetch_response_transfer_is_pending_for_test("INT-1")
);
@@ -744,6 +745,7 @@ async fn set_cache_disabled_updates_browser_context_state() {
.browser_context
.as_ref()
.unwrap()
+ .active_page_state()
.network_policy
.cache_disabled()
);
@@ -760,6 +762,7 @@ async fn set_cache_disabled_updates_browser_context_state() {
.browser_context
.as_ref()
.unwrap()
+ .active_page_state()
.network_policy
.cache_disabled()
);
@@ -804,7 +807,7 @@ async fn devtools_set_cache_behavior_global_updates_existing_targets_and_default
);
let bc = ctx.conn.browser_context.as_ref().expect("browser context");
- assert!(bc.network_policy.cache_disabled());
+ assert!(bc.active_page_state().network_policy.cache_disabled());
assert!(
bc.parked_page_session_state("TID-background")
.expect("background state")
@@ -854,7 +857,7 @@ async fn devtools_set_cache_behavior_contexts_only_updates_requested_targets() {
.expect("context-scoped BiDi cache behavior should succeed");
let bc = ctx.conn.browser_context.as_ref().expect("browser context");
- assert!(!bc.network_policy.cache_disabled());
+ assert!(!bc.active_page_state().network_policy.cache_disabled());
assert!(
bc.parked_page_session_state("TID-background")
.expect("background state")
@@ -980,6 +983,7 @@ async fn set_bypass_service_worker_updates_browser_context_state() {
.browser_context
.as_ref()
.unwrap()
+ .active_page_state()
.network_policy
.bypass_service_worker()
);
@@ -996,6 +1000,7 @@ async fn set_bypass_service_worker_updates_browser_context_state() {
.browser_context
.as_ref()
.unwrap()
+ .active_page_state()
.network_policy
.bypass_service_worker()
);
diff --git a/moli-protocol/src/domains/network/tests/cookies.rs b/moli-protocol/src/domains/network/tests/cookies.rs
index 9fdf0f449..34cc672a5 100644
--- a/moli-protocol/src/domains/network/tests/cookies.rs
+++ b/moli-protocol/src/domains/network/tests/cookies.rs
@@ -79,9 +79,12 @@ async fn set_extra_http_headers_replaces_previous_headers() {
ctx.expect_result(4, json!({}), None);
let bc = ctx.conn.browser_context.as_ref().expect("browser context");
- assert_eq!(bc.network_policy.extra_headers().len(), 1);
assert_eq!(
- bc.network_policy.extra_headers()[0],
+ bc.active_page_state().network_policy.extra_headers().len(),
+ 1
+ );
+ assert_eq!(
+ bc.active_page_state().network_policy.extra_headers()[0],
("food".to_owned(), "bars".to_owned())
);
}
@@ -319,7 +322,8 @@ async fn set_user_agent_override_applies_to_current_page_fetch_requests() {
let mut bc = BrowserContext::new("BID-1".into());
bc.set_active_target_id("TID-1");
bc.attach_active_session("SID-1");
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
diff --git a/moli-protocol/src/domains/network/tests/navigation.rs b/moli-protocol/src/domains/network/tests/navigation.rs
index 1da2d3963..48bdcf53a 100644
--- a/moli-protocol/src/domains/network/tests/navigation.rs
+++ b/moli-protocol/src/domains/network/tests/navigation.rs
@@ -119,7 +119,8 @@ async fn async_dispatch_offline_runtime_fetch_emits_loading_failed() {
let mut bc = BrowserContext::new("BID-1".into());
bc.set_active_target_id("TID-1");
bc.attach_active_session("SID-1");
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
diff --git a/moli-protocol/src/domains/network/tests/response_body.rs b/moli-protocol/src/domains/network/tests/response_body.rs
index 6d33aa0d0..3c8c24ab8 100644
--- a/moli-protocol/src/domains/network/tests/response_body.rs
+++ b/moli-protocol/src/domains/network/tests/response_body.rs
@@ -30,7 +30,8 @@ async fn get_response_body_respects_recorded_session_visibility() {
let mut bc = BrowserContext::new("BID-1".into());
bc.set_active_target_id("TID-1".to_owned());
bc.attach_active_session("SID-primary".to_owned());
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.enable_primary_network_events();
assert!(bc.assign_auxiliary_session_to_target("TID-1", "SID-aux".to_owned()));
@@ -70,7 +71,8 @@ async fn get_response_body_requires_calling_session_network_listener() {
let mut bc = BrowserContext::new("BID-1".into());
bc.set_active_target_id("TID-1".to_owned());
bc.attach_active_session("SID-primary".to_owned());
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.enable_primary_network_events();
assert!(bc.assign_auxiliary_session_to_target("TID-1", "SID-aux".to_owned()));
@@ -116,7 +118,8 @@ async fn get_response_body_requires_calling_session_network_listener() {
async fn get_response_body_reports_pending_body_as_existing_without_data() {
let mut ctx = TestContext::new();
let mut bc = BrowserContext::new_with_page_for_test("BID-1", "TID-1");
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.enable_primary_network_events();
bc.record_pending_response_body("REQ-pending".to_owned(), [None::<String>]);
@@ -138,7 +141,8 @@ async fn get_response_body_reports_pending_body_as_existing_without_data() {
async fn get_response_body_ready_body_replaces_pending_body() {
let mut ctx = TestContext::new();
let mut bc = BrowserContext::new_with_page_for_test("BID-1", "TID-1");
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.enable_primary_network_events();
bc.record_pending_response_body("REQ-ready".to_owned(), [None::<String>]);
@@ -168,7 +172,8 @@ async fn get_response_body_rejects_bodies_over_materialization_limit() {
let mut ctx = TestContext::new();
ctx.conn = CdpConnection::new_with_fetch_config(config);
let mut bc = BrowserContext::new_with_page_for_test("BID-1", "TID-1");
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.enable_primary_network_events();
bc.record_captured_response_body("REQ-large".to_owned(), "hello".to_owned(), [None::<String>]);
@@ -191,7 +196,8 @@ async fn get_response_body_rejects_bodies_over_materialization_limit() {
async fn get_response_body_reports_default_single_resource_budget_eviction() {
let mut ctx = TestContext::new();
let mut bc = BrowserContext::new_with_page_for_test("BID-1", "TID-1");
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.enable_primary_network_events();
bc.record_captured_response_body_source(
@@ -218,7 +224,8 @@ async fn get_response_body_reports_default_single_resource_budget_eviction() {
async fn get_response_body_base64_encodes_non_utf8_captured_bytes() {
let mut ctx = TestContext::new();
let mut bc = BrowserContext::new_with_page_for_test("BID-1", "TID-1");
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.enable_primary_network_events();
bc.record_captured_response_body_source(
@@ -245,12 +252,14 @@ async fn get_response_body_base64_encodes_non_utf8_captured_bytes() {
async fn get_request_post_data_matches_chromium_errors_and_binary_encoding() {
let mut ctx = TestContext::new();
let mut bc = BrowserContext::new_with_page_for_test("BID-1", "TID-1");
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.enable_primary_network_events();
bc.record_pending_response_body("REQ-get".to_owned(), [None::<String>]);
bc.record_pending_response_body("REQ-empty".to_owned(), [None::<String>]);
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.record_captured_request_body_with_collector_scope(
"REQ-empty".to_owned(),
@@ -260,7 +269,8 @@ async fn get_request_post_data_matches_chromium_errors_and_binary_encoding() {
false,
);
bc.record_pending_response_body("REQ-binary".to_owned(), [None::<String>]);
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.record_captured_request_body_with_collector_scope(
"REQ-binary".to_owned(),
@@ -331,7 +341,8 @@ async fn get_response_body_returns_partial_body_after_staged_loading_failed() {
let mut bc = BrowserContext::new("BID-1".into());
bc.set_active_target_id("TID-1".to_owned());
bc.attach_active_session("SID-1".to_owned());
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -450,13 +461,15 @@ async fn get_request_post_data_respects_recorded_session_visibility() {
let mut bc = BrowserContext::new("BID-1".into());
bc.set_active_target_id("TID-1".to_owned());
bc.attach_active_session("SID-primary".to_owned());
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.enable_primary_network_events();
assert!(bc.assign_auxiliary_session_to_target("TID-1", "SID-aux".to_owned()));
bc.enable_auxiliary_network_events("SID-aux");
bc.record_pending_response_body("REQ-aux-only".to_owned(), [Some("SID-aux".to_owned())]);
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.record_captured_request_body_with_collector_scope(
"REQ-aux-only".to_owned(),
@@ -496,7 +509,8 @@ async fn get_request_post_data_returns_main_document_navigation_post_body() {
let mut bc = BrowserContext::new("BID-1".into());
bc.set_active_target_id("TID-1".to_owned());
bc.attach_active_session("SID-1".to_owned());
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -551,7 +565,8 @@ async fn get_request_post_data_uses_text_projection_while_bidi_collector_keeps_t
let mut bc = BrowserContext::new("BID-1".into());
bc.set_active_target_id("TID-1".to_owned());
bc.attach_active_session("SID-1".to_owned());
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -656,7 +671,8 @@ async fn get_network_data_returns_bidi_response_body_bytes() {
let mut bc = BrowserContext::new("BID-1".into());
bc.set_active_target_id("TID-1".to_owned());
bc.attach_active_session("bidi-session-1".to_owned());
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
diff --git a/moli-protocol/src/domains/network/tests/session.rs b/moli-protocol/src/domains/network/tests/session.rs
index 951c7b345..77e4b4c33 100644
--- a/moli-protocol/src/domains/network/tests/session.rs
+++ b/moli-protocol/src/domains/network/tests/session.rs
@@ -14,6 +14,7 @@ async fn install_network_session_page(ctx: &mut TestContext, url: &str) {
.browser_context
.as_mut()
.unwrap()
+ .active_page_state_mut()
.active_target
.runtime_slot
.set_loaded_page_for_test(page);
@@ -40,6 +41,7 @@ async fn enable_with_bc_succeeds() {
.browser_context
.as_ref()
.unwrap()
+ .active_page_state()
.active_target
.runtime_slot
.primary_network_events_enabled()
@@ -118,6 +120,7 @@ async fn network_configuration_commands_succeed_while_the_target_is_changing_doc
.browser_context
.as_ref()
.unwrap()
+ .active_page_state()
.active_target
.runtime_slot
.primary_network_events_enabled()
@@ -196,6 +199,7 @@ async fn network_configuration_completion_does_not_restore_a_replaced_document()
.browser_context
.as_mut()
.unwrap()
+ .active_page_state_mut()
.active_target
.runtime_slot
.loaded_page_mut()
@@ -273,7 +277,8 @@ async fn auxiliary_network_enable_does_not_enable_primary_session() {
let bc = ctx.conn.browser_context.as_ref().unwrap();
assert!(
- !bc.active_target
+ !bc.active_page_state()
+ .active_target
.runtime_slot
.primary_network_events_enabled(),
"auxiliary Network.enable must not enable the primary session"
@@ -364,7 +369,13 @@ async fn page_network_policy_aggregates_enabled_sessions_like_chromium_handlers(
ctx.expect_result(id, json!({}), Some(session_id));
}
- let policy = &ctx.conn.browser_context.as_ref().unwrap().network_policy;
+ let policy = &ctx
+ .conn
+ .browser_context
+ .as_ref()
+ .unwrap()
+ .active_page_state()
+ .network_policy;
assert!(policy.cache_disabled());
assert!(policy.bypass_service_worker());
assert_eq!(
@@ -393,7 +404,13 @@ async fn page_network_policy_aggregates_enabled_sessions_like_chromium_handlers(
.await;
ctx.expect_result(20_009, json!({}), Some("SID-primary"));
- let policy = &ctx.conn.browser_context.as_ref().unwrap().network_policy;
+ let policy = &ctx
+ .conn
+ .browser_context
+ .as_ref()
+ .unwrap()
+ .active_page_state()
+ .network_policy;
assert!(!policy.cache_disabled());
assert!(!policy.bypass_service_worker());
assert_eq!(
@@ -417,7 +434,13 @@ async fn page_network_policy_aggregates_enabled_sessions_like_chromium_handlers(
.await;
ctx.expect_result(20_010, json!({}), Some("SID-primary"));
- let policy = &ctx.conn.browser_context.as_ref().unwrap().network_policy;
+ let policy = &ctx
+ .conn
+ .browser_context
+ .as_ref()
+ .unwrap()
+ .active_page_state()
+ .network_policy;
assert!(!policy.cache_disabled());
assert!(!policy.bypass_service_worker());
assert_eq!(
@@ -485,6 +508,7 @@ async fn enable_after_page_load_does_not_replay_historical_subresource_events()
.browser_context
.as_mut()
.unwrap()
+ .active_page_state_mut()
.active_target
.runtime_slot
.set_loaded_page_for_test(page);
@@ -660,7 +684,8 @@ async fn websocket_runtime_activity_broadcasts_to_auxiliary_network_session() {
let socket_literal = serde_json::to_string(&socket_url).unwrap();
let mut ctx = TestContext::new();
let mut bc = BrowserContext::new_with_page_for_test("BID-1", "TID-1");
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.enable_primary_network_events();
bc.attach_active_session("SID-primary".to_owned());
@@ -766,7 +791,8 @@ async fn auxiliary_network_enable_after_websocket_activity_does_not_replay_histo
let mut ctx = TestContext::new();
let mut bc = BrowserContext::new("BID-1".into());
bc.set_active_target_id("TID-1".to_owned());
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.enable_primary_network_events();
bc.attach_active_session("SID-primary".to_owned());
@@ -871,7 +897,8 @@ async fn fetch_runtime_activity_broadcasts_to_auxiliary_network_session() {
let mut ctx = TestContext::new();
let mut bc = BrowserContext::new("BID-1".into());
bc.set_active_target_id("TID-1".to_owned());
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.enable_primary_network_events();
bc.attach_active_session("SID-primary".to_owned());
@@ -1091,7 +1118,8 @@ async fn main_document_navigation_broadcasts_to_auxiliary_network_session() {
let mut ctx = TestContext::new();
let mut bc = BrowserContext::new("BID-1".into());
bc.set_active_target_id("TID-1".to_owned());
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.enable_primary_network_events();
bc.attach_active_session("SID-primary".to_owned());
@@ -1214,7 +1242,8 @@ async fn network_disable_removes_session_response_body_visibility() {
let mut bc = BrowserContext::new("BID-1".into());
bc.set_active_target_id("TID-1".to_owned());
bc.attach_active_session("SID-primary".to_owned());
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.enable_primary_network_events();
assert!(bc.assign_auxiliary_session_to_target("TID-1", "SID-aux".to_owned()));
@@ -1283,7 +1312,8 @@ async fn network_disable_removes_session_response_body_visibility() {
async fn disable_clears_enabled_flag_and_captured_bodies() {
let mut ctx = TestContext::new();
let mut bc = BrowserContext::new_with_page_for_test("BID-1", "TID-1");
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.enable_primary_network_events();
bc.record_captured_response_body("REQ-1".to_owned(), "body".to_owned(), [None]);
@@ -1295,7 +1325,8 @@ async fn disable_clears_enabled_flag_and_captured_bodies() {
let bc = ctx.conn.browser_context.as_ref().unwrap();
assert!(
- !bc.active_target
+ !bc.active_page_state()
+ .active_target
.runtime_slot
.primary_network_events_enabled()
);
@@ -1307,7 +1338,8 @@ async fn primary_network_disable_preserves_auxiliary_network_session() {
let mut bc = BrowserContext::new("BID-1".into());
bc.set_active_target_id("TID-1".to_owned());
bc.attach_active_session("SID-primary".to_owned());
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.enable_primary_network_events();
assert!(bc.assign_auxiliary_session_to_target("TID-1", "SID-aux".to_owned()));
@@ -1329,13 +1361,15 @@ async fn primary_network_disable_preserves_auxiliary_network_session() {
let bc = ctx.conn.browser_context.as_ref().unwrap();
assert!(
- !bc.active_target
+ !bc.active_page_state()
+ .active_target
.runtime_slot
.primary_network_events_enabled()
);
assert!(bc.has_network_event_listeners());
assert!(
- bc.active_target
+ bc.active_page_state()
+ .active_target
.runtime_slot
.has_auxiliary_network_events_for_session("SID-aux")
);
diff --git a/moli-protocol/src/domains/observable_output/emission.rs b/moli-protocol/src/domains/observable_output/emission.rs
index 1bbbdfe31..7b6f58356 100644
--- a/moli-protocol/src/domains/observable_output/emission.rs
+++ b/moli-protocol/src/domains/observable_output/emission.rs
@@ -371,6 +371,7 @@ mod tests {
.as_mut()
.expect("browser context should be loaded");
let page = bc
+ .active_page_state_mut()
.active_target
.runtime_slot
.loaded_page_mut()
@@ -404,13 +405,16 @@ mod tests {
.await
.expect("test page should load");
let _ = bc
+ .active_page_state_mut()
.active_target
.runtime_slot
.replace_loaded_page(Some(page));
- bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ bc.active_page_state_mut().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.console_output_session_state
.console_enabled = true;
- bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ bc.active_page_state_mut().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.page_session_state
.log_enabled = true;
ctx.conn.browser_context = Some(bc);
@@ -428,15 +432,15 @@ mod tests {
bc.target_url(),
bc.page_attachment_id()
.expect("loaded Page must have an attachment id"),
- bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ bc.active_page_state().devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.console_output_session_state
.console_enabled,
- bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ bc.active_page_state().devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.page_session_state
.log_enabled,
true,
- &bc.active_target.owner_state,
- &bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ &bc.active_page_state().active_target.owner_state,
+ &bc.active_page_state().devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.console_output_session_state,
Some("SID-1"),
);
@@ -464,6 +468,7 @@ mod tests {
.browser_context
.as_ref()
.expect("browser context should be loaded")
+ .active_page_state()
.active_target
.owner_state
.console_output_state
@@ -496,6 +501,7 @@ mod tests {
.browser_context
.as_ref()
.expect("browser context should be loaded")
+ .active_page_state()
.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.console_output_session_state
.log_lifecycle_entries
@@ -542,10 +548,12 @@ mod tests {
.await
.expect("test page should load");
let _ = bc
+ .active_page_state_mut()
.active_target
.runtime_slot
.replace_loaded_page(Some(page));
- bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ bc.active_page_state_mut().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.console_output_session_state
.console_enabled = true;
ctx.conn.browser_context = Some(bc);
@@ -604,10 +612,12 @@ mod tests {
.await
.expect("test page should load");
let _ = bc
+ .active_page_state_mut()
.active_target
.runtime_slot
.replace_loaded_page(Some(page));
- bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ bc.active_page_state_mut().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.console_output_session_state
.console_enabled = true;
ctx.conn.browser_context = Some(bc);
@@ -668,7 +678,8 @@ mod tests {
.await
.expect("first test page should load");
let _ = bc.replace_loaded_page(Some(first_page));
- bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ bc.active_page_state_mut().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.console_output_session_state
.console_enabled = true;
ctx.conn.browser_context = Some(bc);
@@ -690,7 +701,8 @@ mod tests {
.expect("browser context should remain loaded");
let _ = bc.replace_loaded_page(Some(second_page));
bc.set_target_url(page_url.to_owned());
- bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ bc.active_page_state_mut().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.console_output_session_state
.console_enabled = true;
}
@@ -737,7 +749,8 @@ mod tests {
bc.set_target_url("data:text/html,active-owner".to_owned());
bc.attach_active_session("SID-active".to_owned());
let _ = bc.replace_loaded_page(Some(active_page));
- bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ bc.active_page_state_mut().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.console_output_session_state
.console_enabled = true;
bc.insert_page_target_host(PageTargetHost::new(
@@ -825,7 +838,8 @@ mod tests {
bc.set_target_url("data:text/html,old-active-owner".to_owned());
bc.attach_active_session("SID-active".to_owned());
let _ = bc.replace_loaded_page(Some(active_page));
- bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ bc.active_page_state_mut().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.console_output_session_state
.console_enabled = true;
bc.insert_page_target_host(PageTargetHost::new(
@@ -844,7 +858,8 @@ mod tests {
let (old_active_attachment, promoted_attachment) = {
let bc = ctx.conn.browser_context.as_ref().expect("browser context");
(
- bc.active_target
+ bc.active_page_state()
+ .active_target
.runtime_slot
.page_attachment_id()
.expect("active Page attachment"),
@@ -874,7 +889,10 @@ mod tests {
let bc = ctx.conn.browser_context.as_ref().expect("browser context");
assert_eq!(bc.active_target_id(), Some("TID-promoted"));
assert_eq!(
- bc.active_target.runtime_slot.page_attachment_id(),
+ bc.active_page_state()
+ .active_target
+ .runtime_slot
+ .page_attachment_id(),
Some(promoted_attachment),
"promotion must transfer the installed Page attachment without reallocating it"
);
@@ -945,7 +963,8 @@ mod tests {
.await
.expect("test page should load");
let _ = bc.replace_loaded_page(Some(page));
- bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ bc.active_page_state_mut().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.runtime_session_state
.runtime_frontend_enabled = true;
ctx.conn.browser_context = Some(bc);
@@ -1003,7 +1022,8 @@ mod tests {
.await
.expect("test page should load");
let _ = bc.replace_loaded_page(Some(page));
- bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ bc.active_page_state_mut().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.runtime_session_state
.runtime_frontend_enabled = true;
ctx.conn.browser_context = Some(bc);
@@ -1058,7 +1078,8 @@ mod tests {
.await
.expect("test page should load");
let _ = bc.replace_loaded_page(Some(page));
- bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ bc.active_page_state_mut().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.runtime_session_state
.runtime_frontend_enabled = true;
ctx.conn.browser_context = Some(bc);
@@ -1112,10 +1133,12 @@ mod tests {
.await
.expect("test page should load");
let _ = bc.replace_loaded_page(Some(page));
- bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ bc.active_page_state_mut().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.runtime_session_state
.runtime_frontend_enabled = true;
- bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ bc.active_page_state_mut().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.console_output_session_state
.renderer_runtime_agent_owns_page_console_api_events = true;
ctx.conn.browser_context = Some(bc);
@@ -1188,7 +1211,8 @@ mod tests {
.await
.expect("test page should load");
let _ = bc.replace_loaded_page(Some(page));
- bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ bc.active_page_state_mut().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.runtime_session_state
.runtime_frontend_enabled = true;
ctx.conn.browser_context = Some(bc);
@@ -1224,7 +1248,8 @@ mod tests {
.await
.expect("first test page should load");
let _ = bc.replace_loaded_page(Some(first_page));
- bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ bc.active_page_state_mut().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.runtime_session_state
.runtime_frontend_enabled = true;
ctx.conn.browser_context = Some(bc);
@@ -1252,7 +1277,8 @@ mod tests {
.expect("browser context should remain loaded");
let _ = bc.replace_loaded_page(Some(second_page));
bc.set_target_url(page_url.to_owned());
- bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ bc.active_page_state_mut().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.runtime_session_state
.runtime_frontend_enabled = true;
}
@@ -1284,7 +1310,8 @@ mod tests {
.await
.expect("first test page should load");
let _ = bc.replace_loaded_page(Some(first_page));
- bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ bc.active_page_state_mut().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.runtime_session_state
.runtime_frontend_enabled = true;
ctx.conn.browser_context = Some(bc);
@@ -1312,7 +1339,8 @@ mod tests {
.expect("browser context should remain loaded");
let _ = bc.replace_loaded_page(Some(second_page));
bc.set_target_url(page_url.to_owned());
- bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ bc.active_page_state_mut().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.runtime_session_state
.runtime_frontend_enabled = true;
}
@@ -1394,6 +1422,7 @@ mod tests {
.browser_context
.as_ref()
.expect("browser context should exist")
+ .active_page_state()
.active_target
.owner_state
.runtime_observable_state;
@@ -1436,6 +1465,7 @@ mod tests {
.browser_context
.as_ref()
.expect("browser context should exist")
+ .active_page_state()
.active_target
.owner_state
.runtime_observable_state;
diff --git a/moli-protocol/src/domains/observable_output/output_queue.rs b/moli-protocol/src/domains/observable_output/output_queue.rs
index 3e666c0c2..46a8902e7 100644
--- a/moli-protocol/src/domains/observable_output/output_queue.rs
+++ b/moli-protocol/src/domains/observable_output/output_queue.rs
@@ -1127,7 +1127,11 @@ mod tests {
);
let prepared = queue
- .runtime_source_prepared_items(true, true, &bc.active_target.owner_state)
+ .runtime_source_prepared_items(
+ true,
+ true,
+ &bc.active_page_state().active_target.owner_state,
+ )
.expect("queue should produce RuntimeObservable prepared items");
let (items, cursor) = prepared.into_output_emission_parts_for_test();
@@ -1162,23 +1166,33 @@ mod tests {
&& *exception_index == 0
));
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.owner_state
.runtime_observable_state
.mark_emitted_console_counts(std::collections::HashMap::from([(5, 1)]));
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.owner_state
.runtime_observable_state
.mark_emitted_exception_entries(1);
assert!(
queue
- .runtime_source_prepared_items(true, true, &bc.active_target.owner_state)
+ .runtime_source_prepared_items(
+ true,
+ true,
+ &bc.active_page_state().active_target.owner_state
+ )
.is_none(),
"owner cursor should suppress source output already emitted from this queue item"
);
assert!(
queue
- .runtime_source_prepared_items(false, true, &bc.active_target.owner_state)
+ .runtime_source_prepared_items(
+ false,
+ true,
+ &bc.active_page_state().active_target.owner_state
+ )
.is_none(),
"disabled Runtime should not produce RuntimeObservable prepared items"
);
@@ -1203,7 +1217,11 @@ mod tests {
);
let prepared = queue
- .runtime_source_prepared_items(true, true, &bc.active_target.owner_state)
+ .runtime_source_prepared_items(
+ true,
+ true,
+ &bc.active_page_state().active_target.owner_state,
+ )
.expect(
"contextless lifecycle source should still advance the RuntimeObservable cursor",
);
@@ -1245,7 +1263,11 @@ mod tests {
);
let prepared = queue
- .runtime_source_prepared_items(true, true, &bc.active_target.owner_state)
+ .runtime_source_prepared_items(
+ true,
+ true,
+ &bc.active_page_state().active_target.owner_state,
+ )
.expect("renderer producer source item should materialize RuntimeObservable output");
let (items, cursor) = prepared.into_output_emission_parts_for_test();
@@ -1317,7 +1339,11 @@ mod tests {
&second_snapshot,
);
let prepared = queue
- .runtime_source_prepared_items(true, true, &bc.active_target.owner_state)
+ .runtime_source_prepared_items(
+ true,
+ true,
+ &bc.active_page_state().active_target.owner_state,
+ )
.expect("combined source deltas should produce the full RuntimeObservable tail");
let (items, cursor) = prepared.into_output_emission_parts_for_test();
@@ -1334,13 +1360,18 @@ mod tests {
"source materialization should combine append-time source deltas for an owner cursor before the first delta"
);
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.owner_state
.runtime_observable_state
.mark_emitted_console_counts(std::collections::HashMap::from([(5, 1)]));
let prepared = queue
- .runtime_source_prepared_items(true, true, &bc.active_target.owner_state)
+ .runtime_source_prepared_items(
+ true,
+ true,
+ &bc.active_page_state().active_target.owner_state,
+ )
.expect("latest appended source item should produce the new RuntimeObservable tail");
let (items, cursor) = prepared.into_output_emission_parts_for_test();
@@ -1384,7 +1415,11 @@ mod tests {
let queue = TargetObservableOutputQueue::from_runtime_slot_source_outputs(&runtime_slot);
let prepared = queue
- .runtime_source_prepared_items(true, true, &bc.active_target.owner_state)
+ .runtime_source_prepared_items(
+ true,
+ true,
+ &bc.active_page_state().active_target.owner_state,
+ )
.expect("stored queue source should materialize RuntimeObservable items");
let (items, cursor) = prepared.into_output_emission_parts_for_test();
@@ -1396,13 +1431,18 @@ mod tests {
if text == "stored source"
));
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.owner_state
.runtime_observable_state
.mark_emitted_console_counts(std::collections::HashMap::from([(5, 1)]));
assert!(
queue
- .runtime_source_prepared_items(true, true, &bc.active_target.owner_state)
+ .runtime_source_prepared_items(
+ true,
+ true,
+ &bc.active_page_state().active_target.owner_state
+ )
.is_none(),
"stored source output must still respect owner RuntimeObservable cursor state"
);
@@ -1606,10 +1646,12 @@ mod tests {
fn observable_backlog_queue_reports_console_and_log_ranges_from_owner_cursors() {
let mut bc = BrowserContext::new_with_page_for_test("BID-1", "TID-1");
bc.set_target_url("http://example.test/observable".to_owned());
- bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ bc.active_page_state_mut().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.console_output_session_state
.console_enabled = true;
- bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ bc.active_page_state_mut().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.page_session_state
.log_enabled = true;
let queue = TargetObservableOutputQueue {
@@ -1624,15 +1666,15 @@ mod tests {
let mut prepared = queue.console_log_backlog_ranges(
bc.target_url(),
page_attachment_id(1),
- bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ bc.active_page_state().devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.console_output_session_state
.console_enabled,
- bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ bc.active_page_state().devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.page_session_state
.log_enabled,
true,
- &bc.active_target.owner_state,
- &bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ &bc.active_page_state().active_target.owner_state,
+ &bc.active_page_state().devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.console_output_session_state,
None,
);
@@ -1677,10 +1719,12 @@ mod tests {
fn observable_backlog_queue_filters_single_raw_queue_by_kind_cursor() {
let mut bc = BrowserContext::new_with_page_for_test("BID-1", "TID-1");
bc.set_target_url("http://example.test/observable".to_owned());
- bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ bc.active_page_state_mut().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.console_output_session_state
.console_enabled = true;
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.owner_state
.console_output_state
.advance_console_domain_to_current(1, 0);
@@ -1697,15 +1741,15 @@ mod tests {
let mut prepared = queue.console_log_backlog_ranges(
bc.target_url(),
page_attachment_id(1),
- bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ bc.active_page_state().devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.console_output_session_state
.console_enabled,
- bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ bc.active_page_state().devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.page_session_state
.log_enabled,
true,
- &bc.active_target.owner_state,
- &bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ &bc.active_page_state().active_target.owner_state,
+ &bc.active_page_state().devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.console_output_session_state,
None,
);
diff --git a/moli-protocol/src/domains/observable_output/presence.rs b/moli-protocol/src/domains/observable_output/presence.rs
index 58f635784..a90db5e97 100644
--- a/moli-protocol/src/domains/observable_output/presence.rs
+++ b/moli-protocol/src/domains/observable_output/presence.rs
@@ -577,7 +577,8 @@ mod tests {
"TID-runtime-lifecycle",
"SID-runtime-disabled".to_owned(),
));
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.set_page_attachment_id_for_test(17);
conn.browser_context = Some(bc);
@@ -604,10 +605,12 @@ mod tests {
fn observable_source_outputs_own_runtime_observable_presence() {
let mut conn = crate::conn::CdpConnection::default();
let mut bc = BrowserContext::new_with_page_for_test("BID-1", "TID-1");
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.set_page_attachment_id_for_test(1);
- bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ bc.active_page_state_mut().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.runtime_session_state
.runtime_frontend_enabled = true;
conn.browser_context = Some(bc);
@@ -652,16 +655,20 @@ mod tests {
let mut conn = crate::conn::CdpConnection::default();
let mut bc = BrowserContext::new_with_page_for_test("BID-1", "TID-1");
bc.set_target_url("data:text/html,console-only-source".to_owned());
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.set_page_attachment_id_for_test(1);
- bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ bc.active_page_state_mut().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.console_output_session_state
.console_enabled = true;
- bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ bc.active_page_state_mut().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.page_session_state
.log_enabled = true;
- bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ bc.active_page_state_mut().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.runtime_session_state
.runtime_frontend_enabled = false;
conn.browser_context = Some(bc);
@@ -703,10 +710,12 @@ mod tests {
fn observable_source_outputs_require_concrete_runtime_prepared_items() {
let mut conn = crate::conn::CdpConnection::default();
let mut bc = BrowserContext::new_with_page_for_test("BID-1", "TID-1");
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.set_page_attachment_id_for_test(1);
- bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ bc.active_page_state_mut().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.runtime_session_state
.runtime_frontend_enabled = true;
conn.browser_context = Some(bc);
@@ -742,13 +751,16 @@ mod tests {
.await
.expect("test page should load");
let _ = bc
+ .active_page_state_mut()
.active_target
.runtime_slot
.replace_loaded_page(Some(page));
- bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ bc.active_page_state_mut().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.console_output_session_state
.console_enabled = true;
- bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ bc.active_page_state_mut().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.page_session_state
.log_enabled = true;
ctx.conn.browser_context = Some(bc);
@@ -782,7 +794,7 @@ mod tests {
.conn
.browser_context
.as_ref()
- .map(|bc| &bc.active_target.runtime_slot)
+ .map(|bc| &bc.active_page_state().active_target.runtime_slot)
.expect("browser context should be loaded");
let queue = TargetObservableOutputQueue::from_runtime_slot(runtime_slot)
.expect("queue should load");
diff --git a/moli-protocol/src/domains/observable_output/runtime_emission.rs b/moli-protocol/src/domains/observable_output/runtime_emission.rs
index 720d77c14..a6f4a35c2 100644
--- a/moli-protocol/src/domains/observable_output/runtime_emission.rs
+++ b/moli-protocol/src/domains/observable_output/runtime_emission.rs
@@ -229,7 +229,8 @@ mod tests {
.browser_context
.as_mut()
.expect("browser context should exist");
- bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ bc.active_page_state_mut().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.runtime_session_state
.runtime_frontend_enabled = true;
}
@@ -243,11 +244,13 @@ mod tests {
.browser_context
.as_mut()
.expect("browser context should exist");
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.owner_state
.runtime_observable_state
.mark_emitted_console_counts(HashMap::from([(7, 1)]));
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.owner_state
.runtime_observable_state
.mark_emitted_exception_entries(1);
@@ -280,10 +283,12 @@ mod tests {
.as_mut()
.expect("browser context should exist");
bc.set_target_url("http://example.test/runtime-source".to_owned());
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.set_page_attachment_id_for_test(3);
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.sync_observable_output_source_from_renderer_snapshot(
"http://example.test/runtime-source".to_owned(),
@@ -297,6 +302,7 @@ mod tests {
.browser_context
.as_ref()
.expect("browser context should exist")
+ .active_page_state()
.active_target
.owner_state
.runtime_observable_state;
@@ -320,6 +326,7 @@ mod tests {
let mut inactive = BrowserContext::new("BID-inactive".to_owned());
inactive.set_active_target_id("TID-inactive".to_owned());
inactive
+ .active_page_state_mut()
.devtools_sessions
.ensure_attached("SID-aux")
.runtime_session_state
diff --git a/moli-protocol/src/domains/page.rs b/moli-protocol/src/domains/page.rs
index a3e48ba63..9b6a4d4d7 100644
--- a/moli-protocol/src/domains/page.rs
+++ b/moli-protocol/src/domains/page.rs
@@ -1517,11 +1517,13 @@ fn start_set_javascript_dialog_handler_enabled(
.map(|_| ())
.map_err(|error| error.to_string());
}
- if let Some(page) = conn
- .browser_context
- .as_mut()
- .and_then(|browser_context| browser_context.active_target.runtime_slot.loaded_page_mut())
- {
+ if let Some(page) = conn.browser_context.as_mut().and_then(|browser_context| {
+ browser_context
+ .active_page_target_mut()
+ .active_target
+ .runtime_slot
+ .loaded_page_mut()
+ }) {
return page
.start_set_javascript_dialog_handler_enabled(enabled)
.map(|_| ())
@@ -3479,7 +3481,8 @@ mod producer_tests {
bc.set_active_target_id("TID-activity-order");
bc.set_target_url("https://example.test/page".to_owned());
bc.attach_active_session("SID-activity-order");
- bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ bc.active_page_state_mut().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.page_session_state
.page_file_chooser_opened_event_enabled = true;
conn.browser_context = Some(bc);
@@ -3635,10 +3638,12 @@ mod producer_tests {
bc.set_active_target_id("TID-later-activity-order");
bc.set_target_url("https://example.test/page".to_owned());
bc.attach_active_session("SID-later-activity-order");
- bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ bc.active_page_state_mut().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.page_session_state
.page_lifecycle_events = true;
- bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ bc.active_page_state_mut().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.page_session_state
.page_domain_enabled = true;
conn.browser_context = Some(bc);
@@ -3801,13 +3806,16 @@ mod producer_tests {
bc.set_active_target_id("TID-1");
bc.set_target_url("https://example.test/page".to_owned());
bc.attach_active_session("SID-1");
- bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ bc.active_page_state_mut().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.page_session_state
.page_lifecycle_events = true;
- bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ bc.active_page_state_mut().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.page_session_state
.page_domain_enabled = true;
- bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ bc.active_page_state_mut().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.runtime_session_state
.runtime_frontend_enabled = true;
conn.browser_context = Some(bc);
@@ -3882,10 +3890,12 @@ mod producer_tests {
bc.set_active_target_id("TID-1");
bc.set_target_url("https://example.test/page".to_owned());
bc.attach_active_session("SID-1");
- bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ bc.active_page_state_mut().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.page_session_state
.page_lifecycle_events = true;
- bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ bc.active_page_state_mut().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.page_session_state
.page_domain_enabled = true;
conn.browser_context = Some(bc);
@@ -4018,7 +4028,8 @@ mod producer_tests {
bc.set_active_target_id("TID-1");
bc.set_target_url("https://top.example/page".to_owned());
bc.attach_active_session("SID-1");
- bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ bc.active_page_state_mut().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.page_session_state
.page_domain_enabled = true;
conn.browser_context = Some(bc);
@@ -4224,10 +4235,12 @@ mod producer_tests {
bc.set_active_target_id("TID-1");
bc.set_target_url("https://example.test/page".to_owned());
bc.attach_active_session("SID-1");
- bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ bc.active_page_state_mut().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.page_session_state
.page_lifecycle_events = true;
- bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ bc.active_page_state_mut().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.page_session_state
.page_domain_enabled = true;
conn.browser_context = Some(bc);
@@ -4402,7 +4415,8 @@ mod producer_tests {
bc.set_active_target_id("TID-1");
bc.set_target_url("https://example.test/page".to_owned());
bc.attach_active_session("SID-1");
- bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ bc.active_page_state_mut().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.page_session_state
.page_domain_enabled = true;
conn.browser_context = Some(bc);
@@ -4569,7 +4583,8 @@ mod producer_tests {
browser_context.set_active_target_id("TID-child-delivery-route");
browser_context.set_target_url("https://example.test/page".to_owned());
browser_context.attach_active_session("SID-child-delivery-route");
- browser_context.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ browser_context.active_page_state_mut().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.page_session_state
.page_domain_enabled = true;
conn.browser_context = Some(browser_context);
@@ -4661,7 +4676,8 @@ mod producer_tests {
bc.set_active_target_id("TID-1");
bc.set_target_url("about:blank".to_owned());
bc.attach_active_session("SID-1");
- bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ bc.active_page_state_mut().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.page_session_state
.page_domain_enabled = true;
conn.browser_context = Some(bc);
diff --git a/moli-protocol/src/domains/page/tests/capture.rs b/moli-protocol/src/domains/page/tests/capture.rs
index 69873989b..ff8e46c5d 100644
--- a/moli-protocol/src/domains/page/tests/capture.rs
+++ b/moli-protocol/src/domains/page/tests/capture.rs
@@ -183,6 +183,7 @@ async fn capture_screenshot_rejects_completion_from_replaced_renderer_attachment
.browser_context
.as_mut()
.expect("browser context")
+ .active_page_state_mut()
.active_target
.runtime_slot
.replace_loaded_page(Some(replacement));
@@ -266,6 +267,7 @@ async fn capture_snapshot_returns_minimal_mhtml_for_loaded_page() {
.browser_context
.as_mut()
.expect("browser context")
+ .active_page_state_mut()
.active_target
.runtime_slot
.replace_loaded_page(Some(page));
@@ -318,6 +320,7 @@ async fn capture_snapshot_dispatch_serializes_html_in_renderer_owner() {
.browser_context
.as_mut()
.expect("browser context")
+ .active_page_state_mut()
.active_target
.runtime_slot
.replace_loaded_page(Some(page));
@@ -560,7 +563,7 @@ async fn capture_screenshot_targets_inactive_loaded_owner_without_activation() {
let mut inactive = BrowserContext::new("BID-inactive-screenshot".to_owned());
inactive.set_active_target_id("TID-inactive".to_owned());
inactive.attach_active_session("SID-inactive".to_owned());
- inactive.emulated_device_metrics = Some(EmulatedDeviceMetrics {
+ inactive.active_page_state_mut().emulated_device_metrics = Some(EmulatedDeviceMetrics {
width: 500,
height: 300,
device_scale_factor: 1.5,
@@ -922,6 +925,7 @@ async fn get_layout_metrics_queries_live_renderer_for_loaded_pages() {
.browser_context
.as_mut()
.expect("browser context")
+ .active_page_state_mut()
.active_target
.runtime_slot
.replace_loaded_page(Some(page));
diff --git a/moli-protocol/src/domains/page/tests/dialog.rs b/moli-protocol/src/domains/page/tests/dialog.rs
index 473cb5374..d4ee6d4da 100644
--- a/moli-protocol/src/domains/page/tests/dialog.rs
+++ b/moli-protocol/src/domains/page/tests/dialog.rs
@@ -136,7 +136,8 @@ async fn pending_javascript_dialogs_are_preserved_per_parked_target() {
{
let browser_context = ctx.conn.browser_context.as_mut().unwrap();
- browser_context.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ browser_context.active_page_state_mut().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.page_session_state
.javascript_dialog_state
.push(dialog("TID-A", "a"));
@@ -157,12 +158,14 @@ async fn pending_javascript_dialogs_are_preserved_per_parked_target() {
.unwrap()
);
assert!(
- browser_context.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ browser_context.active_page_state().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.page_session_state
.javascript_dialog_state
.is_empty()
);
- browser_context.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ browser_context.active_page_state_mut().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.page_session_state
.javascript_dialog_state
.push(dialog("TID-B", "b"));
@@ -177,7 +180,8 @@ async fn pending_javascript_dialogs_are_preserved_per_parked_target() {
.unwrap()
);
assert_eq!(
- browser_context.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ browser_context.active_page_state().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.page_session_state
.javascript_dialog_state
.pending_dialogs(),
@@ -194,7 +198,8 @@ async fn pending_javascript_dialogs_are_preserved_per_parked_target() {
.unwrap()
);
assert_eq!(
- browser_context.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ browser_context.active_page_state().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.page_session_state
.javascript_dialog_state
.pending_dialogs(),
@@ -215,6 +220,7 @@ async fn javascript_dialog_events_round_trip_through_page_domain() {
.browser_context
.as_mut()
.unwrap()
+ .active_page_state_mut()
.active_target
.runtime_slot
.set_loaded_page_for_test(page);
@@ -671,6 +677,7 @@ async fn javascript_dialog_events_are_emitted_after_runtime_call_function_on() {
.browser_context
.as_mut()
.unwrap()
+ .active_page_state_mut()
.active_target
.runtime_slot
.set_loaded_page_for_test(page);
@@ -734,6 +741,7 @@ async fn javascript_dialog_events_are_emitted_from_playwright_utility_world_call
.browser_context
.as_mut()
.unwrap()
+ .active_page_state_mut()
.active_target
.runtime_slot
.set_loaded_page_for_test(page);
@@ -821,6 +829,7 @@ async fn javascript_dialog_events_are_emitted_from_playwright_serialized_utility
.browser_context
.as_mut()
.unwrap()
+ .active_page_state_mut()
.active_target
.runtime_slot
.set_loaded_page_for_test(page);
diff --git a/moli-protocol/src/domains/page/tests/document_content.rs b/moli-protocol/src/domains/page/tests/document_content.rs
index c56398614..77410b66d 100644
--- a/moli-protocol/src/domains/page/tests/document_content.rs
+++ b/moli-protocol/src/domains/page/tests/document_content.rs
@@ -19,12 +19,14 @@ async fn install_document_content_test_page(ctx: &mut TestContext, url: &str) {
{
let browser_context = ctx.conn.browser_context.as_mut().expect("browser context");
let renderer_agent_candidate = browser_context
+ .active_page_state_mut()
.active_target
.runtime_slot
.prepare_renderer_agent_candidate(&committed_document, &mut navigation.page)
.expect("document-content test renderer candidate should attach");
browser_context.commit_document_navigation_if_matches(&committed_document);
browser_context
+ .active_page_state_mut()
.active_target
.runtime_slot
.commit_loaded_navigation_renderer_attachment(
@@ -33,11 +35,13 @@ async fn install_document_content_test_page(ctx: &mut TestContext, url: &str) {
)
.expect("document-content test renderer candidate should commit");
browser_context
+ .active_page_state_mut()
.active_target
.runtime_slot
.set_loaded_page_for_test(navigation.page);
assert!(
browser_context
+ .active_page_state_mut()
.active_target
.runtime_slot
.finish_renderer_document_navigation(&committed_document)
diff --git a/moli-protocol/src/domains/page/tests/frame_tree.rs b/moli-protocol/src/domains/page/tests/frame_tree.rs
index b66c83ae7..34f8923ee 100644
--- a/moli-protocol/src/domains/page/tests/frame_tree.rs
+++ b/moli-protocol/src/domains/page/tests/frame_tree.rs
@@ -236,6 +236,7 @@ async fn get_frame_tree_uses_owner_element_id_when_frame_name_is_empty() {
.browser_context
.as_mut()
.expect("browser context")
+ .active_page_state_mut()
.active_target
.runtime_slot
.replace_loaded_page(Some(page));
@@ -264,6 +265,7 @@ async fn get_frame_tree_projects_sandboxed_about_blank_from_document_url() {
{
let bc = ctx.conn.browser_context.as_mut().expect("browser context");
let _ = bc
+ .active_page_state_mut()
.active_target
.runtime_slot
.replace_loaded_page(Some(page));
@@ -295,6 +297,7 @@ async fn get_frame_tree_recurses_into_nested_child_frames() {
{
let bc = ctx.conn.browser_context.as_mut().expect("browser context");
let _ = bc
+ .active_page_state_mut()
.active_target
.runtime_slot
.replace_loaded_page(Some(page));
@@ -356,6 +359,7 @@ async fn get_frame_tree_projects_nested_sandboxed_srcdoc_from_document_urls() {
{
let bc = ctx.conn.browser_context.as_mut().expect("browser context");
let _ = bc
+ .active_page_state_mut()
.active_target
.runtime_slot
.replace_loaded_page(Some(page));
@@ -450,6 +454,7 @@ async fn get_frame_tree_can_complete_through_pending_command_dispatch() {
.browser_context
.as_mut()
.expect("browser context")
+ .active_page_state_mut()
.active_target
.runtime_slot
.replace_loaded_page(Some(page));
@@ -504,6 +509,7 @@ async fn pending_get_frame_tree_after_page_unload_returns_empty_target_tree() {
.browser_context
.as_mut()
.expect("browser context")
+ .active_page_state_mut()
.active_target
.runtime_slot
.replace_loaded_page(Some(page));
@@ -522,6 +528,7 @@ async fn pending_get_frame_tree_after_page_unload_returns_empty_target_tree() {
.browser_context
.as_mut()
.expect("browser context")
+ .active_page_state_mut()
.active_target
.runtime_slot
.clear_loaded_page_for_test_fixture();
diff --git a/moli-protocol/src/domains/page/tests/lifecycle.rs b/moli-protocol/src/domains/page/tests/lifecycle.rs
index adc325b7c..21ff1617c 100644
--- a/moli-protocol/src/domains/page/tests/lifecycle.rs
+++ b/moli-protocol/src/domains/page/tests/lifecycle.rs
@@ -102,19 +102,22 @@ fn page_owner_state_commands_complete_through_command_dispatch() {
let browser_context = ctx.conn.browser_context.as_ref().expect("browser context");
assert!(
- browser_context.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ browser_context.active_page_state().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.page_session_state
.page_bypass_csp_enabled
);
assert_eq!(
- browser_context.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ browser_context.active_page_state().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.page_session_state
.page_font_families
.get("standard"),
Some(&json!("Times New Roman"))
);
assert!(
- browser_context.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ browser_context.active_page_state().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.page_session_state
.page_intercept_file_chooser_dialog_enabled
);
@@ -124,7 +127,7 @@ fn page_owner_state_commands_complete_through_command_dispatch() {
browser_context
.renderer_runtime()
.set_javascript_dialog_handler_enabled(true);
- let page_session_state = &mut browser_context.devtools_sessions
+ let page_session_state = &mut browser_context.active_page_state_mut().devtools_sessions
[moli_page_types::DevToolsSessionKey::Primary]
.page_session_state;
page_session_state.page_domain_enabled = true;
@@ -151,7 +154,8 @@ fn page_owner_state_commands_complete_through_command_dispatch() {
let browser_context = ctx.conn.browser_context.as_ref().expect("browser context");
assert_page_domain_disabled(
- &browser_context.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ &browser_context.active_page_state().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.page_session_state,
);
assert!(
@@ -278,6 +282,7 @@ async fn install_runtime_document_replacement_test_page(ctx: &mut TestContext) -
.browser_context
.as_mut()
.expect("runtime replacement fixture browser context")
+ .active_page_state_mut()
.active_target
.runtime_slot
.set_loaded_page_for_test(navigation.page);
@@ -419,6 +424,7 @@ async fn lifecycle_events_enable_without_renderer_binding_does_not_synthesize_re
.browser_context
.as_mut()
.expect("browser context")
+ .active_page_state_mut()
.active_target
.runtime_slot
.set_loaded_page_for_test(page);
@@ -480,7 +486,11 @@ async fn assert_page_enable_uses_fresh_initial_document_without_adapter(target_u
ctx.conn
.browser_context
.as_ref()
- .and_then(|bc| bc.active_target.runtime_slot.loaded_page())
+ .and_then(|bc| bc
+ .active_page_state()
+ .active_target
+ .runtime_slot
+ .loaded_page())
.is_some_and(|page| page.final_url().as_str() == target_url),
"Target.createTarget should install the initial about:blank owner page"
);
@@ -507,7 +517,11 @@ async fn assert_page_enable_uses_fresh_initial_document_without_adapter(target_u
ctx.conn
.browser_context
.as_ref()
- .and_then(|bc| bc.active_target.runtime_slot.loaded_page())
+ .and_then(|bc| bc
+ .active_page_state()
+ .active_target
+ .runtime_slot
+ .loaded_page())
.is_some_and(|page| page.final_url().as_str() == target_url),
"Page.enable should keep using the target-lifecycle initial about:blank page"
);
@@ -547,6 +561,7 @@ async fn enable_succeeds_without_legacy_materialization_adapter_when_page_missin
.browser_context
.as_ref()
.expect("browser context")
+ .active_page_state()
.active_target
.runtime_slot
.has_loaded_page(),
@@ -656,7 +671,11 @@ async fn enable_non_blank_initial_url_loads_through_pending_navigation_path() {
ctx.conn
.browser_context
.as_ref()
- .and_then(|bc| bc.active_target.runtime_slot.loaded_page())
+ .and_then(|bc| bc
+ .active_page_state()
+ .active_target
+ .runtime_slot
+ .loaded_page())
.is_some_and(|page| page.final_url().as_str() == page_url),
"Page.enable pending path should install the initial non-blank document"
);
@@ -673,7 +692,7 @@ async fn enable_accepts_enable_file_chooser_opened_event_param() {
.await;
ctx.expect_result(101, json!({}), None);
assert!(ctx.conn.browser_context.as_ref().is_some_and(|bc| {
- bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ bc.active_page_state().devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.page_session_state
.page_file_chooser_opened_event_enabled
}));
@@ -804,8 +823,12 @@ async fn set_lifecycle_events_enabled_sets_flag() {
.await;
ctx.expect_result(1, json!({}), None);
assert!(
- ctx.conn.browser_context.as_ref().unwrap().devtools_sessions
- [moli_page_types::DevToolsSessionKey::Primary]
+ ctx.conn
+ .browser_context
+ .as_ref()
+ .unwrap()
+ .active_page_state()
+ .devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.page_session_state
.page_lifecycle_events
);
@@ -831,6 +854,7 @@ async fn set_lifecycle_events_enabled_replays_loaded_page_events() {
.browser_context
.as_mut()
.unwrap()
+ .active_page_state_mut()
.active_target
.runtime_slot
.set_loaded_page_for_test(navigation.page);
@@ -905,6 +929,7 @@ async fn set_lifecycle_events_enabled_replays_only_protocol_visible_load_state()
.browser_context
.as_mut()
.unwrap()
+ .active_page_state_mut()
.active_target
.runtime_slot
.set_loaded_page_for_test(navigation.page);
@@ -1006,6 +1031,7 @@ async fn set_lifecycle_events_enabled_is_session_local_for_active_auxiliary_sess
let artifacts = navigation.page_creation_artifacts;
let browser_context = ctx.conn.browser_context.as_mut().unwrap();
browser_context
+ .active_page_state_mut()
.active_target
.runtime_slot
.set_loaded_page_for_test(navigation.page);
@@ -1055,7 +1081,8 @@ async fn set_lifecycle_events_enabled_is_session_local_for_active_auxiliary_sess
let browser_context = ctx.conn.browser_context.as_ref().unwrap();
assert!(
- !browser_context.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ !browser_context.active_page_state().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.page_session_state
.page_lifecycle_events,
"primary page session should stay disabled"
@@ -1153,7 +1180,8 @@ async fn page_disable_clears_page_handler_state_for_active_auxiliary_session() {
);
let browser_context = ctx.conn.browser_context.as_mut().unwrap();
mark_page_domain_enabled(
- &mut browser_context.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ &mut browser_context.active_page_state_mut().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.page_session_state,
);
assert!(browser_context.assign_auxiliary_session_to_target("TID-active", "SID-aux".to_owned()));
@@ -1175,7 +1203,8 @@ async fn page_disable_clears_page_handler_state_for_active_auxiliary_session() {
let browser_context = ctx.conn.browser_context.as_ref().unwrap();
assert_page_domain_enabled(
- &browser_context.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ &browser_context.active_page_state().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.page_session_state,
);
assert_page_domain_disabled(
@@ -2019,6 +2048,7 @@ async fn add_script_run_immediately_creates_top_level_world_even_when_child_worl
.expect("page should load");
let bc = ctx.conn.browser_context.as_mut().expect("browser context");
let _ = bc
+ .active_page_state_mut()
.active_target
.runtime_slot
.replace_loaded_page(Some(page));
@@ -2306,6 +2336,7 @@ async fn bare_isolated_worlds_do_not_persist_across_navigation() {
.expect("page should load");
let bc = ctx.conn.browser_context.as_mut().expect("browser context");
let _ = bc
+ .active_page_state_mut()
.active_target
.runtime_slot
.replace_loaded_page(Some(page));
@@ -2396,6 +2427,7 @@ async fn network_navigations_use_unique_document_loader_ids() {
.browser_context
.as_mut()
.unwrap()
+ .active_page_state_mut()
.active_target
.runtime_slot
.enable_primary_network_events();
@@ -2547,6 +2579,7 @@ async fn crash_notifies_all_attached_sessions_and_marks_browser_context_crashed(
let bc = ctx.conn.browser_context.as_mut().unwrap();
assert!(bc.assign_auxiliary_session_to_target("TID-1", "SID-aux".into()));
let _ = bc
+ .active_page_state_mut()
.active_target
.runtime_slot
.replace_loaded_page(Some(page));
@@ -2574,14 +2607,21 @@ async fn crash_notifies_all_attached_sessions_and_marks_browser_context_crashed(
assert_eq!(auxiliary_inspector["sessionId"], "SID-aux");
let bc = ctx.conn.browser_context.as_ref().unwrap();
- assert!(bc.active_target.owner_state.target_crash_state.is_crashed());
assert!(
- bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ bc.active_page_state()
+ .active_target
+ .owner_state
+ .target_crash_state
+ .is_crashed()
+ );
+ assert!(
+ bc.active_page_state().devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.runtime_session_state
.inspector_target_crashed_delivered()
);
assert!(
- bc.devtools_sessions
+ bc.active_page_state()
+ .devtools_sessions
.attached("SID-aux")
.is_some_and(|state| state
.runtime_session_state
@@ -2620,6 +2660,7 @@ async fn crash_notifies_all_attached_sessions_and_marks_browser_context_crashed(
.browser_context
.as_ref()
.expect("browser context")
+ .active_page_state()
.active_target
.owner_state
.target_crash_state
@@ -2703,7 +2744,8 @@ async fn crash_aborts_paused_request_stage_navigation() {
let mut ctx = TestContext::new();
load_bc_with_session(&mut ctx, "BID-1", "TID-1", "SID-1", "about:blank");
let bc = ctx.conn.browser_context.as_mut().unwrap();
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.enable_primary_network_events();
@@ -2867,7 +2909,8 @@ async fn crash_aborts_paused_response_stage_navigation() {
let mut ctx = TestContext::new();
load_bc_with_session(&mut ctx, "BID-1", "TID-1", "SID-1", "about:blank");
let bc = ctx.conn.browser_context.as_mut().unwrap();
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.enable_primary_network_events();
@@ -2935,39 +2978,46 @@ async fn close_clears_loaded_page_state_and_emits_detached_events() {
.await
.expect("page should load");
let bc = ctx.conn.browser_context.as_mut().unwrap();
- bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ bc.active_page_state_mut().devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.page_session_state
.page_lifecycle_events = true;
- bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ bc.active_page_state_mut().devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.runtime_session_state
.runtime_frontend_enabled = true;
- bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ bc.active_page_state_mut().devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.runtime_session_state
.inspector_enabled = true;
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.enable_primary_network_events();
- bc.mutate_devtools_network_session_state(false, None, |network| {
- network.network_enabled = true;
- network.cache_disabled = true;
- network.bypass_service_worker = true;
- network.extra_headers = vec![("X-Test".into(), "1".into())];
- });
- bc.css_enabled = true;
- bc.active_target.fetch_owner.configure(
- None,
- true,
- vec![FetchInterceptionPattern {
- url_pattern: "*".into(),
- resource_type_filter: None,
- request_stage: FetchRequestStage::Response,
- }],
- );
- bc.active_target
+ bc.active_page_state_mut()
+ .mutate_devtools_network_session_state(false, None, |network| {
+ network.network_enabled = true;
+ network.cache_disabled = true;
+ network.bypass_service_worker = true;
+ network.extra_headers = vec![("X-Test".into(), "1".into())];
+ });
+ bc.active_page_state_mut().css_enabled = true;
+ bc.active_page_state_mut()
+ .active_target
+ .fetch_owner
+ .configure(
+ None,
+ true,
+ vec![FetchInterceptionPattern {
+ url_pattern: "*".into(),
+ resource_type_filter: None,
+ request_stage: FetchRequestStage::Response,
+ }],
+ );
+ bc.active_page_state_mut()
+ .active_target
.owner_state
.target_crash_state
.mark_crashed();
let _ = bc
+ .active_page_state_mut()
.active_target
.runtime_slot
.replace_loaded_page(Some(page));
@@ -2981,7 +3031,8 @@ async fn close_clears_loaded_page_state_and_emits_detached_events() {
bc.set_next_network_request_sequence_for_test(41);
bc.set_subresource_network_emitted_record_count_for_test(12);
bc.set_next_io_stream_sequence_for_test(7);
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.set_next_subresource_fetch_request_id_for_test(5);
assert!(bc.assign_auxiliary_session_to_target("TID-1", "SID-aux".into()));
@@ -3036,10 +3087,11 @@ async fn close_aborts_paused_request_stage_navigation_and_clears_state() {
let mut ctx = TestContext::new();
load_bc_with_session(&mut ctx, "BID-1", "TID-1", "SID-1", "about:blank");
let bc = ctx.conn.browser_context.as_mut().unwrap();
- bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ bc.active_page_state_mut().devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.runtime_session_state
.inspector_enabled = true;
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.enable_primary_network_events();
@@ -3279,10 +3331,11 @@ async fn close_aborts_paused_auth_navigation_and_clears_state() {
let mut ctx = TestContext::new();
load_bc_with_session(&mut ctx, "BID-1", "TID-1", "SID-1", "about:blank");
let bc = ctx.conn.browser_context.as_mut().unwrap();
- bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ bc.active_page_state_mut().devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.runtime_session_state
.inspector_enabled = true;
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.enable_primary_network_events();
@@ -3502,7 +3555,7 @@ async fn set_bypass_csp_accepts_valid_params_and_returns_empty_result() {
.await;
ctx.expect_result(2, json!({}), None);
assert!(ctx.conn.browser_context.as_ref().is_some_and(|bc| {
- bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ bc.active_page_state().devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.page_session_state
.page_bypass_csp_enabled
}));
@@ -3536,14 +3589,16 @@ async fn set_font_families_accepts_object_params_and_returns_empty_result() {
ctx.expect_result(4, json!({}), None);
let browser_context = ctx.conn.browser_context.as_ref().expect("browser context");
assert_eq!(
- browser_context.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ browser_context.active_page_state().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.page_session_state
.page_font_families
.get("standard"),
Some(&json!("Times New Roman"))
);
assert_eq!(
- browser_context.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ browser_context.active_page_state().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.page_session_state
.page_font_families
.get("fixed"),
@@ -3584,7 +3639,7 @@ async fn set_intercept_file_chooser_dialog_accepts_valid_params_and_returns_empt
.await;
ctx.expect_result(51, json!({}), None);
assert!(ctx.conn.browser_context.as_ref().is_some_and(|bc| {
- bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ bc.active_page_state().devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.page_session_state
.page_intercept_file_chooser_dialog_enabled
}));
@@ -3999,7 +4054,8 @@ async fn start_screencast_is_session_local_for_active_auxiliary_session() {
let browser_context = ctx.conn.browser_context.as_ref().unwrap();
assert!(
- !browser_context.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ !browser_context.active_page_state().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.page_session_state
.page_screencast
.is_active(),
diff --git a/moli-protocol/src/domains/page/tests/mod.rs b/moli-protocol/src/domains/page/tests/mod.rs
index 87bf3eb83..fbb722eda 100644
--- a/moli-protocol/src/domains/page/tests/mod.rs
+++ b/moli-protocol/src/domains/page/tests/mod.rs
@@ -108,7 +108,12 @@ async fn loaded_page_html_for_test(ctx: &mut TestContext) -> String {
.conn
.browser_context
.as_mut()
- .and_then(|bc| bc.active_target.runtime_slot.loaded_page_mut())
+ .and_then(|bc| {
+ bc.active_page_state_mut()
+ .active_target
+ .runtime_slot
+ .loaded_page_mut()
+ })
.expect("loaded page");
page.serialize_html_async()
.await
diff --git a/moli-protocol/src/domains/page/tests/navigation.rs b/moli-protocol/src/domains/page/tests/navigation.rs
index 8aee16f58..e12b228eb 100644
--- a/moli-protocol/src/domains/page/tests/navigation.rs
+++ b/moli-protocol/src/domains/page/tests/navigation.rs
@@ -913,6 +913,7 @@ async fn get_navigation_history_completes_through_command_dispatch() {
.browser_context
.as_mut()
.expect("browser context")
+ .active_page_state_mut()
.active_target
.runtime_slot
.set_loaded_page_for_test(page);
@@ -978,6 +979,7 @@ async fn reset_navigation_history_prunes_browser_and_renderer_history() {
.browser_context
.as_mut()
.expect("browser context")
+ .active_page_state_mut()
.active_target
.runtime_slot
.set_loaded_page_for_test(page);
@@ -1483,6 +1485,7 @@ async fn get_navigation_history_targets_inactive_loaded_owner_without_activation
inactive.attach_active_session("SID-inactive".to_owned());
inactive.set_target_url(page.final_url().as_str().to_owned());
inactive
+ .active_page_state_mut()
.active_target
.runtime_slot
.replace_loaded_page(Some(page));
@@ -1841,8 +1844,12 @@ async fn navigate_with_runtime_frontend_enabled_network_child_playwright_style_u
let mut ctx = TestContext::new();
load_bc_with_session(&mut ctx, "BID-1", "TID-1", "SID-1", "about:blank");
ctx.enable_page_events_for_test(Some("SID-1"));
- ctx.conn.browser_context.as_mut().unwrap().devtools_sessions
- [moli_page_types::DevToolsSessionKey::Primary]
+ ctx.conn
+ .browser_context
+ .as_mut()
+ .unwrap()
+ .active_page_state_mut()
+ .devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.runtime_session_state
.runtime_frontend_enabled = true;
ctx.enable_background_navigation_scheduler_for_test();
@@ -2623,8 +2630,12 @@ async fn navigate_with_lifecycle_events_enabled_emits_lifecycle_markers() {
load_bc_with_session(&mut ctx, "BID-1", "TID-1", "SID-1", "about:blank");
ctx.enable_page_events_for_test(Some("SID-1"));
ctx.enable_dom_events_for_test(Some("SID-1"));
- ctx.conn.browser_context.as_mut().unwrap().devtools_sessions
- [moli_page_types::DevToolsSessionKey::Primary]
+ ctx.conn
+ .browser_context
+ .as_mut()
+ .unwrap()
+ .active_page_state_mut()
+ .devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.page_session_state
.page_lifecycle_events = true;
@@ -2787,8 +2798,12 @@ async fn navigate_with_child_iframe_emits_child_frame_navigation_and_lifecycle_e
let mut ctx = TestContext::new();
load_bc_with_session(&mut ctx, "BID-1", "TID-1", "SID-1", "about:blank");
ctx.enable_page_events_for_test(Some("SID-1"));
- ctx.conn.browser_context.as_mut().unwrap().devtools_sessions
- [moli_page_types::DevToolsSessionKey::Primary]
+ ctx.conn
+ .browser_context
+ .as_mut()
+ .unwrap()
+ .active_page_state_mut()
+ .devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.page_session_state
.page_lifecycle_events = true;
@@ -3104,8 +3119,12 @@ async fn navigate_with_nested_child_frame_reports_outer_parent_frame_id() {
let mut ctx = TestContext::new();
load_bc_with_session(&mut ctx, "BID-1", "TID-1", "SID-1", "about:blank");
ctx.enable_page_events_for_test(Some("SID-1"));
- ctx.conn.browser_context.as_mut().unwrap().devtools_sessions
- [moli_page_types::DevToolsSessionKey::Primary]
+ ctx.conn
+ .browser_context
+ .as_mut()
+ .unwrap()
+ .active_page_state_mut()
+ .devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.page_session_state
.page_lifecycle_events = true;
ctx.process_async(json!({
@@ -3192,10 +3211,12 @@ async fn navigate_with_runtime_frontend_enabled_emits_nested_child_default_conte
load_bc_with_session(&mut ctx, "BID-1", "TID-1", "SID-1", "about:blank");
ctx.enable_page_events_for_test(Some("SID-1"));
let browser_context = ctx.conn.browser_context.as_mut().unwrap();
- browser_context.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ browser_context.active_page_state_mut().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.page_session_state
.page_lifecycle_events = true;
- browser_context.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ browser_context.active_page_state_mut().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.runtime_session_state
.runtime_frontend_enabled = true;
@@ -3274,8 +3295,12 @@ async fn navigate_with_legacy_runtime_frontend_projection_emits_context_creation
load_bc_with_session(&mut ctx, "BID-1", "TID-1", "SID-1", "about:blank");
ctx.enable_page_events_for_test(Some("SID-1"));
ctx.enable_dom_events_for_test(Some("SID-1"));
- ctx.conn.browser_context.as_mut().unwrap().devtools_sessions
- [moli_page_types::DevToolsSessionKey::Primary]
+ ctx.conn
+ .browser_context
+ .as_mut()
+ .unwrap()
+ .active_page_state_mut()
+ .devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.runtime_session_state
.runtime_frontend_enabled = true;
ctx.enable_background_navigation_scheduler_for_test();
@@ -3560,8 +3585,12 @@ async fn navigate_with_runtime_frontend_enabled_emits_initial_console_before_dcl
let mut ctx = TestContext::new();
load_bc_with_session(&mut ctx, "BID-1", "TID-1", "SID-1", "about:blank");
ctx.enable_page_events_for_test(Some("SID-1"));
- ctx.conn.browser_context.as_mut().unwrap().devtools_sessions
- [moli_page_types::DevToolsSessionKey::Primary]
+ ctx.conn
+ .browser_context
+ .as_mut()
+ .unwrap()
+ .active_page_state_mut()
+ .devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.runtime_session_state
.runtime_frontend_enabled = true;
@@ -3627,6 +3656,7 @@ async fn navigate_with_console_enabled_emits_initial_console_without_runtime_ena
.browser_context
.as_ref()
.expect("browser context should exist")
+ .active_page_state()
.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.inspector_session_state
.v8_state
@@ -3776,8 +3806,12 @@ async fn navigate_with_runtime_frontend_enabled_emits_child_default_execution_co
let mut ctx = TestContext::new();
load_bc_with_session(&mut ctx, "BID-1", "TID-1", "SID-1", "about:blank");
ctx.enable_page_events_for_test(Some("SID-1"));
- ctx.conn.browser_context.as_mut().unwrap().devtools_sessions
- [moli_page_types::DevToolsSessionKey::Primary]
+ ctx.conn
+ .browser_context
+ .as_mut()
+ .unwrap()
+ .active_page_state_mut()
+ .devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.runtime_session_state
.runtime_frontend_enabled = true;
@@ -5115,10 +5149,10 @@ async fn navigate_failure_creates_runtime_context_and_completes_lifecycle() {
load_bc_with_session(&mut ctx, "BID-1", "TID-1", "SID-1", "about:blank");
ctx.enable_page_events_for_test(Some("SID-1"));
let bc = ctx.conn.browser_context.as_mut().unwrap();
- bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ bc.active_page_state_mut().devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.runtime_session_state
.runtime_frontend_enabled = true;
- bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ bc.active_page_state_mut().devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.page_session_state
.page_lifecycle_events = true;
@@ -5265,6 +5299,7 @@ async fn continue_request_completes_paused_navigation_before_commit_events() {
.browser_context
.as_mut()
.unwrap()
+ .active_page_state_mut()
.active_target
.runtime_slot
.enable_primary_network_events();
@@ -5350,7 +5385,8 @@ async fn stop_loading_aborts_paused_request_stage_navigation() {
let mut ctx = TestContext::new();
load_bc_with_session(&mut ctx, "BID-1", "TID-1", "SID-1", "about:blank");
let bc = ctx.conn.browser_context.as_mut().unwrap();
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.enable_primary_network_events();
let committed_document_token = bc
@@ -5467,7 +5503,8 @@ async fn stop_loading_aborts_paused_response_stage_navigation() {
let mut ctx = TestContext::new();
load_bc_with_session(&mut ctx, "BID-1", "TID-1", "SID-1", "about:blank");
let bc = ctx.conn.browser_context.as_mut().unwrap();
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.enable_primary_network_events();
@@ -5584,7 +5621,8 @@ async fn stop_loading_aborts_paused_auth_navigation() {
let mut ctx = TestContext::new();
load_bc_with_session(&mut ctx, "BID-1", "TID-1", "SID-1", "about:blank");
let bc = ctx.conn.browser_context.as_mut().unwrap();
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.enable_primary_network_events();
@@ -6345,10 +6383,11 @@ async fn reload_after_crash_emits_target_reloaded_after_crash() {
"data:text/html,<body>reload-after-crash</body>",
);
let bc = ctx.conn.browser_context.as_mut().unwrap();
- bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ bc.active_page_state_mut().devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.runtime_session_state
.record_inspector_target_crashed();
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.owner_state
.target_crash_state
.mark_crashed();
@@ -6376,6 +6415,7 @@ async fn reload_after_crash_emits_target_reloaded_after_crash() {
.browser_context
.as_ref()
.expect("browser context")
+ .active_page_state()
.active_target
.owner_state
.target_crash_state
@@ -6393,10 +6433,11 @@ async fn navigate_after_crash_emits_target_reloaded_after_crash() {
"data:text/html,<body>before-crash</body>",
);
let bc = ctx.conn.browser_context.as_mut().unwrap();
- bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ bc.active_page_state_mut().devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.runtime_session_state
.record_inspector_target_crashed();
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.owner_state
.target_crash_state
.mark_crashed();
@@ -6427,6 +6468,7 @@ async fn navigate_after_crash_emits_target_reloaded_after_crash() {
.browser_context
.as_ref()
.expect("browser context")
+ .active_page_state()
.active_target
.owner_state
.target_crash_state
@@ -6451,6 +6493,7 @@ async fn navigate_after_crash_without_inspector_enabled_clears_crash_without_eve
.browser_context
.as_mut()
.unwrap()
+ .active_page_state_mut()
.active_target
.owner_state
.target_crash_state
@@ -6483,6 +6526,7 @@ async fn navigate_after_crash_without_inspector_enabled_clears_crash_without_eve
.browser_context
.as_ref()
.expect("browser context")
+ .active_page_state()
.active_target
.owner_state
.target_crash_state
diff --git a/moli-protocol/src/domains/page/tests/resources.rs b/moli-protocol/src/domains/page/tests/resources.rs
index ddef5ff98..763fc18de 100644
--- a/moli-protocol/src/domains/page/tests/resources.rs
+++ b/moli-protocol/src/domains/page/tests/resources.rs
@@ -382,6 +382,7 @@ async fn get_resource_tree_reports_observed_frame_subresources() {
.browser_context
.as_mut()
.expect("browser context")
+ .active_page_state_mut()
.active_target
.runtime_slot
.set_loaded_page_for_test(page);
@@ -580,6 +581,7 @@ async fn frame_and_resource_trees_report_main_document_response_mime() {
.browser_context
.as_mut()
.expect("browser context")
+ .active_page_state_mut()
.active_target
.runtime_slot
.set_loaded_page_for_test(page);
diff --git a/moli-protocol/src/domains/page/tests/runtime.rs b/moli-protocol/src/domains/page/tests/runtime.rs
index 99a860969..0f4e03617 100644
--- a/moli-protocol/src/domains/page/tests/runtime.rs
+++ b/moli-protocol/src/domains/page/tests/runtime.rs
@@ -1113,8 +1113,12 @@ async fn runtime_evaluate_child_navigation_emits_child_frame_navigation_and_life
let mut ctx = TestContext::new();
load_bc_with_session(&mut ctx, "BID-1", "TID-1", "SID-1", "about:blank");
ctx.enable_page_events_for_test(Some("SID-1"));
- ctx.conn.browser_context.as_mut().unwrap().devtools_sessions
- [moli_page_types::DevToolsSessionKey::Primary]
+ ctx.conn
+ .browser_context
+ .as_mut()
+ .unwrap()
+ .active_page_state_mut()
+ .devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.page_session_state
.page_lifecycle_events = true;
ctx.process_async(json!({
@@ -1162,8 +1166,12 @@ async fn runtime_evaluate_timeout_child_navigation_emits_child_frame_navigation_
let mut ctx = TestContext::new();
load_bc_with_session(&mut ctx, "BID-1", "TID-1", "SID-1", "about:blank");
ctx.enable_page_events_for_test(Some("SID-1"));
- ctx.conn.browser_context.as_mut().unwrap().devtools_sessions
- [moli_page_types::DevToolsSessionKey::Primary]
+ ctx.conn
+ .browser_context
+ .as_mut()
+ .unwrap()
+ .active_page_state_mut()
+ .devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.page_session_state
.page_lifecycle_events = true;
ctx.process_async(json!({
@@ -1202,8 +1210,12 @@ async fn runtime_evaluate_child_location_navigation_emits_child_frame_navigation
let mut ctx = TestContext::new();
load_bc_with_session(&mut ctx, "BID-1", "TID-1", "SID-1", "about:blank");
ctx.enable_page_events_for_test(Some("SID-1"));
- ctx.conn.browser_context.as_mut().unwrap().devtools_sessions
- [moli_page_types::DevToolsSessionKey::Primary]
+ ctx.conn
+ .browser_context
+ .as_mut()
+ .unwrap()
+ .active_page_state_mut()
+ .devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.page_session_state
.page_lifecycle_events = true;
ctx.process_async(json!({
@@ -1280,8 +1292,12 @@ async fn runtime_evaluate_child_history_back_emits_child_frame_navigation_and_li
let mut ctx = TestContext::new();
load_bc_with_session(&mut ctx, "BID-1", "TID-1", "SID-1", "about:blank");
ctx.enable_page_events_for_test(Some("SID-1"));
- ctx.conn.browser_context.as_mut().unwrap().devtools_sessions
- [moli_page_types::DevToolsSessionKey::Primary]
+ ctx.conn
+ .browser_context
+ .as_mut()
+ .unwrap()
+ .active_page_state_mut()
+ .devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.page_session_state
.page_lifecycle_events = true;
ctx.process_async(json!({
diff --git a/moli-protocol/src/domains/page/tests/scripts.rs b/moli-protocol/src/domains/page/tests/scripts.rs
index a7602a88c..48856007d 100644
--- a/moli-protocol/src/domains/page/tests/scripts.rs
+++ b/moli-protocol/src/domains/page/tests/scripts.rs
@@ -118,6 +118,7 @@ async fn add_script_to_evaluate_on_new_document_does_not_mutate_existing_page()
.browser_context
.as_mut()
.unwrap()
+ .active_page_state_mut()
.active_target
.runtime_slot
.set_loaded_page_for_test(page);
@@ -202,6 +203,7 @@ async fn add_script_to_evaluate_on_new_document_keeps_duplicate_registrations_di
.browser_context
.as_ref()
.expect("browser context")
+ .active_page_state()
.active_target
.owner_state
.document_start_scripts
@@ -432,6 +434,7 @@ async fn add_script_to_evaluate_on_new_document_run_immediately_mutates_existing
.browser_context
.as_mut()
.unwrap()
+ .active_page_state_mut()
.active_target
.runtime_slot
.set_loaded_page_for_test(page);
@@ -480,6 +483,7 @@ async fn add_script_to_evaluate_on_new_document_run_immediately_world_name_creat
.expect("page should load");
let bc = ctx.conn.browser_context.as_mut().expect("browser context");
let _ = bc
+ .active_page_state_mut()
.active_target
.runtime_slot
.replace_loaded_page(Some(page));
@@ -650,6 +654,7 @@ async fn remove_script_to_evaluate_on_new_document_does_not_rollback_run_immedia
.browser_context
.as_mut()
.unwrap()
+ .active_page_state_mut()
.active_target
.runtime_slot
.set_loaded_page_for_test(page);
@@ -725,6 +730,7 @@ async fn create_isolated_world_requires_matching_frame_and_uses_fresh_initial_do
.browser_context
.as_mut()
.unwrap()
+ .active_page_state_mut()
.active_target
.runtime_slot
.set_loaded_page_for_test(iframe_page);
@@ -871,6 +877,7 @@ async fn create_isolated_world_async_accepts_child_frame_from_async_dispatch() {
.browser_context
.as_mut()
.unwrap()
+ .active_page_state_mut()
.active_target
.runtime_slot
.set_loaded_page_for_test(iframe_page);
@@ -1139,6 +1146,7 @@ async fn create_isolated_world_installs_matching_bindings_before_document_start_
.browser_context
.as_mut()
.expect("browser context")
+ .active_page_state_mut()
.active_target
.runtime_slot
.set_loaded_page_for_test(page);
@@ -1398,6 +1406,7 @@ async fn create_isolated_world_without_runtime_frontend_enabled_only_returns_res
.browser_context
.as_mut()
.unwrap()
+ .active_page_state_mut()
.active_target
.runtime_slot
.set_loaded_page_for_test(page);
@@ -1434,6 +1443,7 @@ async fn create_isolated_world_accepts_cdp_and_corrected_grant_universal_access_
.expect("page should load");
let bc = ctx.conn.browser_context.as_mut().expect("browser context");
let _ = bc
+ .active_page_state_mut()
.active_target
.runtime_slot
.replace_loaded_page(Some(page));
@@ -1506,6 +1516,7 @@ async fn create_isolated_world_returns_unique_context_ids_and_emits_runtime_even
.expect("page should load");
let bc = ctx.conn.browser_context.as_mut().expect("browser context");
let _ = bc
+ .active_page_state_mut()
.active_target
.runtime_slot
.replace_loaded_page(Some(page));
@@ -1704,6 +1715,7 @@ async fn create_isolated_world_does_not_persist_across_navigation() {
.expect("page should load");
let bc = ctx.conn.browser_context.as_mut().expect("browser context");
let _ = bc
+ .active_page_state_mut()
.active_target
.runtime_slot
.replace_loaded_page(Some(page));
@@ -1769,10 +1781,12 @@ async fn create_isolated_world_after_reactivating_browser_context_with_another_l
.as_mut()
.expect("first browser context");
let _ = bc
+ .active_page_state_mut()
.active_target
.runtime_slot
.replace_loaded_page(Some(first_page));
- bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ bc.active_page_state_mut().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.runtime_session_state
.runtime_frontend_enabled = false;
}
@@ -1795,10 +1809,12 @@ async fn create_isolated_world_after_reactivating_browser_context_with_another_l
.browser_context_by_id_mut("BID-2")
.expect("second browser context");
let _ = bc
+ .active_page_state_mut()
.active_target
.runtime_slot
.replace_loaded_page(Some(second_page));
- bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ bc.active_page_state_mut().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.runtime_session_state
.runtime_frontend_enabled = false;
}
diff --git a/moli-protocol/src/domains/performance.rs b/moli-protocol/src/domains/performance.rs
index b43887106..62c3f8e86 100644
--- a/moli-protocol/src/domains/performance.rs
+++ b/moli-protocol/src/domains/performance.rs
@@ -579,6 +579,7 @@ mod tests {
.browser_context
.as_ref()
.expect("browser context")
+ .active_page_state()
.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.page_session_state
.performance;
@@ -658,6 +659,7 @@ mod tests {
.browser_context
.as_ref()
.expect("browser context")
+ .active_page_state()
.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.page_session_state
.performance;
@@ -892,12 +894,14 @@ mod tests {
let browser_context = ctx.conn.browser_context.as_ref().expect("browser context");
assert!(
- !browser_context.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ !browser_context.active_page_state().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.page_session_state
.performance
.enabled()
);
let auxiliary = browser_context
+ .active_page_state()
.devtools_sessions
.attached("SID-aux")
.expect("auxiliary session state")
@@ -1198,7 +1202,8 @@ mod tests {
ctx.expect_result(5, json!({}), Some("SID-background"));
let active = ctx.conn.browser_context.as_ref().expect("browser context");
assert!(
- !active.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ !active.active_page_state().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.page_session_state
.performance
.enabled()
diff --git a/moli-protocol/src/domains/profiler.rs b/moli-protocol/src/domains/profiler.rs
index 09ad79acd..29e90a3bd 100644
--- a/moli-protocol/src/domains/profiler.rs
+++ b/moli-protocol/src/domains/profiler.rs
@@ -49,6 +49,7 @@ mod tests {
.as_mut()
.expect("browser context should exist");
let _ = browser_context
+ .active_page_state_mut()
.active_target
.runtime_slot
.replace_loaded_page(Some(page));
@@ -94,6 +95,7 @@ mod tests {
.as_mut()
.expect("browser context should exist");
let _ = browser_context
+ .active_page_state_mut()
.active_target
.runtime_slot
.replace_loaded_page(Some(page));
@@ -137,7 +139,12 @@ mod tests {
.conn
.browser_context
.as_mut()
- .and_then(|bc| bc.active_target.runtime_slot.loaded_page_mut())
+ .and_then(|bc| {
+ bc.active_page_state_mut()
+ .active_target
+ .runtime_slot
+ .loaded_page_mut()
+ })
.expect("active target should still have a loaded page")
.runtime_heap_usage_async()
.await
@@ -869,7 +876,10 @@ mod tests {
let browser_context = ctx.conn.browser_context.as_ref().expect("browser context");
assert_eq!(browser_context.active_session_id(), None);
assert!(
- browser_context.devtools_sessions.attached_is_empty(),
+ browser_context
+ .active_page_state()
+ .devtools_sessions
+ .attached_is_empty(),
"detaching the primary target session must drop active auxiliary inspector session state"
);
}
@@ -1579,6 +1589,7 @@ mod tests {
.browser_context
.as_ref()
.expect("browser context")
+ .active_page_state()
.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.inspector_session_state;
assert!(
@@ -1993,6 +2004,7 @@ mod tests {
.as_mut()
.expect("browser context should exist");
let _ = browser_context
+ .active_page_state_mut()
.active_target
.runtime_slot
.replace_loaded_page(Some(page));
@@ -2193,6 +2205,7 @@ mod tests {
.as_mut()
.expect("browser context should exist after reload");
let _ = browser_context
+ .active_page_state_mut()
.active_target
.runtime_slot
.replace_loaded_page(Some(page));
diff --git a/moli-protocol/src/domains/runtime/activity.rs b/moli-protocol/src/domains/runtime/activity.rs
index 2151e8eb8..8ed2e9ab8 100644
--- a/moli-protocol/src/domains/runtime/activity.rs
+++ b/moli-protocol/src/domains/runtime/activity.rs
@@ -598,6 +598,7 @@ mod tests {
.await
.expect("test page should load");
let _ = bc
+ .active_page_state_mut()
.active_target
.runtime_slot
.replace_loaded_page(Some(page));
@@ -613,6 +614,7 @@ mod tests {
browser_context.set_active_target_id("TID-1");
browser_context.attach_active_session("SID-1");
browser_context
+ .active_page_state_mut()
.active_target
.runtime_slot
.set_page_attachment_id_for_test(1);
@@ -847,13 +849,16 @@ mod tests {
.browser_context
.as_mut()
.expect("browser context should be loaded");
- bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ bc.active_page_state_mut().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.console_output_session_state
.console_enabled = true;
- bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ bc.active_page_state_mut().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.page_session_state
.log_enabled = true;
- bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ bc.active_page_state_mut().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.runtime_session_state
.runtime_frontend_enabled = true;
ctx.conn
diff --git a/moli-protocol/src/domains/runtime/dispatcher.rs b/moli-protocol/src/domains/runtime/dispatcher.rs
index f9a8b0c8c..751a82c49 100644
--- a/moli-protocol/src/domains/runtime/dispatcher.rs
+++ b/moli-protocol/src/domains/runtime/dispatcher.rs
@@ -11421,6 +11421,7 @@ mod protocol_neutral_tests {
.browser_context
.as_mut()
.expect("browser context")
+ .active_page_state_mut()
.active_target
.runtime_slot
.set_loaded_page_for_test(page);
diff --git a/moli-protocol/src/domains/runtime/test_support.rs b/moli-protocol/src/domains/runtime/test_support.rs
index dff833a53..c653f30dd 100644
--- a/moli-protocol/src/domains/runtime/test_support.rs
+++ b/moli-protocol/src/domains/runtime/test_support.rs
@@ -62,7 +62,8 @@ pub(super) async fn with_loaded_http_document_async(
.browser_context
.as_mut()
.expect("browser context should be installed before loading test page");
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.enable_primary_network_events();
}
diff --git a/moli-protocol/src/domains/runtime/tests/bindings.rs b/moli-protocol/src/domains/runtime/tests/bindings.rs
index 358c36074..2d798274d 100644
--- a/moli-protocol/src/domains/runtime/tests/bindings.rs
+++ b/moli-protocol/src/domains/runtime/tests/bindings.rs
@@ -62,6 +62,7 @@ async fn runtime_disable_clears_stored_binding_definitions_when_enabled() {
.browser_context
.as_ref()
.expect("browser context should exist")
+ .active_page_state()
.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.runtime_bindings
.iter()
@@ -80,6 +81,7 @@ async fn runtime_disable_clears_stored_binding_definitions_when_enabled() {
.browser_context
.as_ref()
.expect("browser context should exist")
+ .active_page_state()
.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.runtime_bindings
.is_empty(),
@@ -279,6 +281,7 @@ async fn add_binding_can_complete_through_multi_phase_pending_command_task() {
.browser_context
.as_ref()
.expect("browser context should exist")
+ .active_page_state()
.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.runtime_bindings
.iter()
@@ -433,6 +436,7 @@ async fn add_binding_rejects_execution_context_id_with_context_name() {
.browser_context
.as_ref()
.expect("browser context should exist")
+ .active_page_state()
.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.runtime_bindings
.iter()
@@ -478,6 +482,7 @@ async fn remove_binding_deactivates_current_page_binding_and_removes_persisted_d
.browser_context
.as_ref()
.expect("browser context should exist")
+ .active_page_state()
.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.runtime_bindings
.iter()
@@ -542,6 +547,7 @@ async fn remove_binding_can_complete_through_multi_phase_pending_command_task()
.browser_context
.as_ref()
.expect("browser context should exist")
+ .active_page_state()
.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.runtime_bindings
.iter()
@@ -827,6 +833,7 @@ async fn add_binding_without_runtime_enable_installs_current_main_world_and_pers
.browser_context
.as_ref()
.expect("browser context should exist")
+ .active_page_state()
.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.runtime_bindings
.iter()
@@ -936,6 +943,7 @@ async fn add_binding_with_execution_context_id_targets_existing_isolated_world()
.browser_context
.as_ref()
.expect("browser context should exist")
+ .active_page_state()
.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.runtime_bindings
.iter()
@@ -1023,6 +1031,7 @@ async fn add_binding_execution_context_id_completes_through_pending_command_task
.browser_context
.as_ref()
.expect("browser context should exist")
+ .active_page_state()
.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.runtime_bindings
.iter()
@@ -1300,6 +1309,7 @@ async fn patchright_style_pre_document_add_binding_persists_until_navigation() {
.browser_context
.as_ref()
.expect("browser context should exist")
+ .active_page_state()
.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.runtime_bindings
.iter()
@@ -1379,6 +1389,7 @@ async fn pre_document_add_binding_completes_through_command_task_without_live_pa
.browser_context
.as_ref()
.expect("browser context should exist")
+ .active_page_state()
.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.runtime_bindings
.iter()
@@ -1441,6 +1452,7 @@ async fn patchright_style_pre_document_remove_binding_succeeds_before_navigation
.browser_context
.as_ref()
.expect("browser context should exist")
+ .active_page_state()
.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.runtime_bindings
.iter()
@@ -1528,6 +1540,7 @@ async fn pre_document_remove_binding_completes_through_command_task_without_live
.browser_context
.as_ref()
.expect("browser context should exist")
+ .active_page_state()
.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.runtime_bindings
.iter()
diff --git a/moli-protocol/src/domains/runtime/tests/console.rs b/moli-protocol/src/domains/runtime/tests/console.rs
index 39a5f023e..c001ab133 100644
--- a/moli-protocol/src/domains/runtime/tests/console.rs
+++ b/moli-protocol/src/domains/runtime/tests/console.rs
@@ -518,6 +518,7 @@ async fn deferred_heap_profiler_state_follows_renderer_owned_document_navigation
.browser_context
.as_ref()
.expect("browser context")
+ .active_page_state()
.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.inspector_session_state;
assert!(
diff --git a/moli-protocol/src/domains/runtime/tests/evaluate.rs b/moli-protocol/src/domains/runtime/tests/evaluate.rs
index 9c345a489..575727294 100644
--- a/moli-protocol/src/domains/runtime/tests/evaluate.rs
+++ b/moli-protocol/src/domains/runtime/tests/evaluate.rs
@@ -331,6 +331,7 @@ async fn loaded_page_runtime_enable_projection_waits_for_v8_success() {
.browser_context
.as_ref()
.expect("browser context should exist")
+ .active_page_state()
.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.runtime_session_state
.runtime_frontend_enabled,
@@ -353,6 +354,7 @@ async fn loaded_page_runtime_enable_projection_waits_for_v8_success() {
.browser_context
.as_ref()
.expect("browser context should exist")
+ .active_page_state()
.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.runtime_session_state
.runtime_frontend_enabled,
@@ -549,7 +551,7 @@ async fn runtime_agent_configuration_is_restored_on_replacement_page_isolate() {
.browser_context
.as_ref()
.expect("browser context should exist");
- let v8_state_before_navigation = browser_context.devtools_sessions
+ let v8_state_before_navigation = browser_context.active_page_state().devtools_sessions
[moli_page_types::DevToolsSessionKey::Primary]
.inspector_session_state
.v8_state
@@ -579,6 +581,7 @@ async fn runtime_agent_configuration_is_restored_on_replacement_page_isolate() {
.browser_context
.as_ref()
.expect("browser context should exist")
+ .active_page_state()
.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.inspector_session_state
.v8_state
@@ -637,13 +640,15 @@ async fn opaque_reattach_state_wins_over_conflicting_runtime_listener_configurat
.as_mut()
.expect("browser context should exist");
assert!(
- browser_context.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ browser_context.active_page_state().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.inspector_session_state
.v8_state
.is_some(),
"successful Runtime.disable must persist the disabled V8 agent cookie"
);
- browser_context.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ browser_context.active_page_state_mut().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.runtime_session_state
.runtime_frontend_enabled = true;
@@ -1718,6 +1723,7 @@ async fn enable_and_disable_update_browser_context_runtime_flag() {
.browser_context
.as_ref()
.expect("browser context should exist")
+ .active_page_state()
.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.runtime_session_state
.runtime_frontend_enabled
@@ -1731,6 +1737,7 @@ async fn enable_and_disable_update_browser_context_runtime_flag() {
.browser_context
.as_ref()
.expect("browser context should exist")
+ .active_page_state()
.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.runtime_session_state
.runtime_frontend_enabled
@@ -1744,6 +1751,7 @@ async fn enable_and_disable_update_browser_context_runtime_flag() {
.browser_context
.as_ref()
.expect("browser context should exist")
+ .active_page_state()
.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.runtime_session_state
.runtime_frontend_enabled
@@ -1925,7 +1933,8 @@ async fn document_navigation_gate_is_scoped_to_background_target_owner() {
let mut browser_context = BrowserContext::new("BID-1".to_owned());
browser_context.set_active_target_id("TID-active");
browser_context.attach_active_session("SID-active");
- browser_context.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ browser_context.active_page_state_mut().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.runtime_session_state
.runtime_frontend_enabled = true;
browser_context.insert_page_target_host(background_target);
@@ -6642,7 +6651,7 @@ async fn registered_named_world_object_handles_remain_callable_after_navigation(
.expect("browser context should exist");
bc.set_active_target_id("TID-1");
bc.attach_active_session("SID-1");
- bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ bc.active_page_state_mut().devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.runtime_session_state
.runtime_frontend_enabled = true;
diff --git a/moli-protocol/src/domains/runtime/tests/inspector.rs b/moli-protocol/src/domains/runtime/tests/inspector.rs
index 871e864f6..2cd2881e9 100644
--- a/moli-protocol/src/domains/runtime/tests/inspector.rs
+++ b/moli-protocol/src/domains/runtime/tests/inspector.rs
@@ -11,7 +11,7 @@ async fn isolated_inspector_context_lookup_does_not_issue_internal_runtime_enabl
.expect("browser context should exist");
bc.set_active_target_id("TID-1");
bc.attach_active_session("SID-1");
- bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ bc.active_page_state_mut().devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.runtime_session_state
.runtime_frontend_enabled = true;
let utility_context_id = create_isolated_world_async(&mut ctx, 14, "utility").await;
@@ -46,7 +46,7 @@ async fn isolated_inspector_context_lookup_does_not_collide_with_pending_inspect
.expect("browser context should exist");
bc.set_active_target_id("TID-1");
bc.attach_active_session("SID-1");
- bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ bc.active_page_state_mut().devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.runtime_session_state
.runtime_frontend_enabled = true;
let utility_context_id = create_isolated_world_async(&mut ctx, 15, "utility").await;
@@ -83,7 +83,7 @@ async fn runtime_evaluate_materializes_default_context_via_inspector_hook() {
.expect("browser context should exist");
bc.set_active_target_id("TID-1");
bc.attach_active_session("SID-1");
- bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ bc.active_page_state_mut().devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.runtime_session_state
.runtime_frontend_enabled = true;
ctx.sent.clear();
@@ -135,7 +135,7 @@ async fn pending_inspector_await_does_not_block_default_context_evaluate() {
.expect("browser context should exist");
bc.set_active_target_id("TID-1");
bc.attach_active_session("SID-1");
- bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ bc.active_page_state_mut().devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.runtime_session_state
.runtime_frontend_enabled = true;
ctx.conn
diff --git a/moli-protocol/src/domains/runtime/tests/mod.rs b/moli-protocol/src/domains/runtime/tests/mod.rs
index 728687567..b3fc12ea2 100644
--- a/moli-protocol/src/domains/runtime/tests/mod.rs
+++ b/moli-protocol/src/domains/runtime/tests/mod.rs
@@ -148,11 +148,13 @@ async fn push_loaded_runtime_frontend_enabled_background_context_async(
let mut background_context = crate::conn::BrowserContext::new(browser_context_id.to_owned());
background_context.set_active_target_id(target_id.to_owned());
let _ = background_context
+ .active_page_state_mut()
.active_target
.runtime_slot
.replace_loaded_page(Some(page));
background_context.attach_active_session(session_id.to_owned());
- background_context.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ background_context.active_page_state_mut().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.runtime_session_state
.runtime_frontend_enabled = true;
ctx.conn.inactive_browser_contexts.push(background_context);
diff --git a/moli-protocol/src/domains/runtime/tests/navigation.rs b/moli-protocol/src/domains/runtime/tests/navigation.rs
index 7a088df9d..c4ae9d7f4 100644
--- a/moli-protocol/src/domains/runtime/tests/navigation.rs
+++ b/moli-protocol/src/domains/runtime/tests/navigation.rs
@@ -81,6 +81,7 @@ async fn enable_uses_fresh_initial_document_without_adapter() {
.browser_context
.as_ref()
.expect("browser context should exist")
+ .active_page_state()
.active_target
.runtime_slot
.has_loaded_page(),
diff --git a/moli-protocol/src/domains/security.rs b/moli-protocol/src/domains/security.rs
index 8ef48109d..b03dfdcf6 100644
--- a/moli-protocol/src/domains/security.rs
+++ b/moli-protocol/src/domains/security.rs
@@ -164,6 +164,7 @@ mod tests {
.iter()
.find(|bc| bc.id == "BID-2")
.expect("session browser context")
+ .active_page_state()
.tls_verify_host_override,
Some(false)
);
@@ -171,7 +172,7 @@ mod tests {
ctx.conn
.browser_context
.as_ref()
- .and_then(|bc| bc.tls_verify_host_override),
+ .and_then(|bc| bc.active_page_state().tls_verify_host_override),
None
);
}
diff --git a/moli-protocol/src/domains/storage/tests.rs b/moli-protocol/src/domains/storage/tests.rs
index c4a9c2ce5..8e709eb7a 100644
--- a/moli-protocol/src/domains/storage/tests.rs
+++ b/moli-protocol/src/domains/storage/tests.rs
@@ -868,7 +868,8 @@ async fn pending_storage_key_keeps_background_owner_route_across_completion() {
let mut bc = BrowserContext::new("BID-storage-owner-route".to_owned());
bc.set_active_target_id("TID-storage-active".to_owned());
bc.set_target_url(active_page.final_url().as_str().to_owned());
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.set_loaded_page_for_test(active_page);
bc.insert_page_target_host(background);
@@ -2366,6 +2367,7 @@ async fn storage_get_usage_and_quota_reports_indexed_db_usage_for_origin() {
.browser_context
.as_mut()
.unwrap()
+ .active_page_state_mut()
.active_target
.runtime_slot
.loaded_page_mut()
@@ -2982,6 +2984,7 @@ async fn storage_clear_data_for_origin_clears_indexed_db_backend() {
.browser_context
.as_mut()
.unwrap()
+ .active_page_state_mut()
.active_target
.runtime_slot
.loaded_page_mut()
@@ -3040,6 +3043,7 @@ async fn storage_clear_data_for_origin_clears_indexed_db_backend() {
.browser_context
.as_mut()
.unwrap()
+ .active_page_state_mut()
.active_target
.runtime_slot
.loaded_page_mut()
diff --git a/moli-protocol/src/domains/target.rs b/moli-protocol/src/domains/target.rs
index ba29381e1..391717d55 100644
--- a/moli-protocol/src/domains/target.rs
+++ b/moli-protocol/src/domains/target.rs
@@ -1208,6 +1208,7 @@ mod devtools_runtime_entry_tests {
conn.browser_context
.as_ref()
.expect("browser context")
+ .active_page_state()
.active_target
.runtime_slot
.has_loaded_page()
@@ -1276,6 +1277,7 @@ mod devtools_runtime_entry_tests {
conn.browser_context
.as_mut()
.expect("browser context")
+ .active_page_state_mut()
.active_target
.runtime_slot
.set_loaded_page_for_test(page);
diff --git a/moli-protocol/src/domains/target/browser_context.rs b/moli-protocol/src/domains/target/browser_context.rs
index ae6a5c2a0..ad25f102f 100644
--- a/moli-protocol/src/domains/target/browser_context.rs
+++ b/moli-protocol/src/domains/target/browser_context.rs
@@ -221,22 +221,12 @@ pub(in crate::domains) fn devtools_client_window_info_for_target(
.as_ref()
.map(|context| context.id.as_str());
for browser_context in conn.browser_contexts() {
- if browser_context.active_target_id() == Some(target_id.as_str()) {
- let active = active_browser_context_id == Some(browser_context.id.as_str());
+ if let Some(target) = browser_context.page_target(target_id.as_str()) {
return Some(devtools_client_window_info_from_owner_state(
target_id.clone(),
- active,
- Some(&browser_context.active_target.owner_state),
- ));
- }
- if browser_context
- .background_targets()
- .any(|target| target.target_id() == target_id.as_str())
- {
- return Some(devtools_client_window_info_from_owner_state(
- target_id.clone(),
- false,
- browser_context.parked_target_owner_state(target_id.as_str()),
+ active_browser_context_id == Some(browser_context.id.as_str())
+ && browser_context.is_active_target(target_id.as_str()),
+ Some(&target.owner_state),
));
}
}
diff --git a/moli-protocol/src/domains/target/creation.rs b/moli-protocol/src/domains/target/creation.rs
index ea681abeb..3e10d58fd 100644
--- a/moli-protocol/src/domains/target/creation.rs
+++ b/moli-protocol/src/domains/target/creation.rs
@@ -346,7 +346,11 @@ pub(super) fn execute_devtools_create_target_command(
}
bc.set_target_url(command.url.clone());
bc.begin_active_target_initial_empty_document(initial_empty_document_url.clone());
- bc.active_target.owner_state.target_crash_state.clear();
+ bc.page_target_mut(&target_id)
+ .expect("newly selected target must exist")
+ .owner_state
+ .target_crash_state
+ .clear();
}
if command.url != initial_empty_document_url {
// Chromium gives Target.createTarget(url) one initial
diff --git a/moli-protocol/src/domains/target/tests/test_support.rs b/moli-protocol/src/domains/target/tests/test_support.rs
index 1dddda975..e699d8c18 100644
--- a/moli-protocol/src/domains/target/tests/test_support.rs
+++ b/moli-protocol/src/domains/target/tests/test_support.rs
@@ -162,6 +162,7 @@ pub(super) async fn load_bc_with_titled_page_async(
.expect("loaded Target fixture must retain its BrowserContext owner");
bc.set_target_url(url);
let _ = bc
+ .active_page_state_mut()
.active_target
.runtime_slot
.replace_loaded_page(Some(page));
diff --git a/moli-protocol/src/domains/target/tests/tests_background_staging.rs b/moli-protocol/src/domains/target/tests/tests_background_staging.rs
index c8daef611..6a60b5f2d 100644
--- a/moli-protocol/src/domains/target/tests/tests_background_staging.rs
+++ b/moli-protocol/src/domains/target/tests/tests_background_staging.rs
@@ -72,7 +72,12 @@ async fn loaded_page_html_for_test(ctx: &mut TestContext) -> String {
.conn
.browser_context
.as_mut()
- .and_then(|bc| bc.active_target.runtime_slot.loaded_page_mut())
+ .and_then(|bc| {
+ bc.active_page_state_mut()
+ .active_target
+ .runtime_slot
+ .loaded_page_mut()
+ })
.expect("loaded page");
page.serialize_html_async()
.await
@@ -178,13 +183,15 @@ async fn same_context_background_session_can_stage_its_own_pre_document_state_be
script_id
);
assert!(
- active.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ active.active_page_state().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.runtime_bindings
.is_empty(),
"active target DevTools session must not inherit staged target binding"
);
assert!(
active
+ .active_page_state()
.active_target
.owner_state
.document_start_scripts
@@ -385,13 +392,15 @@ async fn same_context_background_session_can_stage_its_own_utility_pre_document_
script_id
);
assert!(
- active.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ active.active_page_state().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.runtime_bindings
.is_empty(),
"active target DevTools session must not inherit staged target binding"
);
assert!(
active
+ .active_page_state()
.active_target
.owner_state
.document_start_scripts
@@ -1290,7 +1299,14 @@ async fn same_context_background_session_can_stage_its_own_emulated_media_before
.as_ref()
.expect("active browser context");
assert_eq!(active.active_target_id(), Some("TID-000000000PM"));
- assert_eq!(active.emulated_media.color_scheme.as_deref(), Some("dark"));
+ assert_eq!(
+ active
+ .active_page_state()
+ .emulated_media
+ .color_scheme
+ .as_deref(),
+ Some("dark")
+ );
let staged = active
.parked_page_session_state(&second_target_id)
.expect("second target should have staged parked page session state");
@@ -1422,7 +1438,11 @@ async fn same_context_background_session_can_clear_its_own_emulated_media_before
.expect("active browser context");
assert_eq!(active.active_target_id(), Some("TID-000000000PMC"));
assert!(
- active.emulated_media.color_scheme.is_none(),
+ active
+ .active_page_state()
+ .emulated_media
+ .color_scheme
+ .is_none(),
"active target should keep its default emulated media",
);
assert!(
@@ -1556,8 +1576,14 @@ async fn same_context_background_session_can_stage_its_own_network_conditions_be
.as_ref()
.expect("active browser context");
assert_eq!(active.active_target_id(), Some("TID-000000000PN"));
- assert!(!active.network_policy.network_offline());
- assert_eq!(active.network_policy.emulated_network_latency(), 10.0);
+ assert!(!active.active_page_state().network_policy.network_offline());
+ assert_eq!(
+ active
+ .active_page_state()
+ .network_policy
+ .emulated_network_latency(),
+ 10.0
+ );
let staged = active
.parked_page_session_state(&second_target_id)
.expect("second target should have staged parked page session state");
@@ -1607,15 +1633,38 @@ async fn same_context_background_session_can_stage_its_own_network_conditions_be
promoted.active_session_id(),
Some(second_session_id.as_str())
);
- assert!(promoted.network_policy.network_offline());
- assert_eq!(promoted.network_policy.emulated_network_latency(), 25.0);
+ assert!(
+ promoted
+ .active_page_state()
+ .network_policy
+ .network_offline()
+ );
assert_eq!(
- promoted.network_policy.emulated_download_throughput(),
+ promoted
+ .active_page_state()
+ .network_policy
+ .emulated_network_latency(),
+ 25.0
+ );
+ assert_eq!(
+ promoted
+ .active_page_state()
+ .network_policy
+ .emulated_download_throughput(),
1024.0
);
- assert_eq!(promoted.network_policy.emulated_upload_throughput(), 256.0);
assert_eq!(
- promoted.network_policy.emulated_connection_type(),
+ promoted
+ .active_page_state()
+ .network_policy
+ .emulated_upload_throughput(),
+ 256.0
+ );
+ assert_eq!(
+ promoted
+ .active_page_state()
+ .network_policy
+ .emulated_connection_type(),
Some("cellular3g")
);
}
@@ -1695,7 +1744,11 @@ async fn same_context_background_session_can_stage_its_own_blocked_urls_before_p
.as_ref()
.expect("active browser context");
assert!(
- active.network_policy.blocked_url_patterns().is_empty(),
+ active
+ .active_page_state()
+ .network_policy
+ .blocked_url_patterns()
+ .is_empty(),
"active target should keep its own block list"
);
let staged = active
@@ -1733,7 +1786,11 @@ async fn same_context_background_session_can_stage_its_own_blocked_urls_before_p
.expect("promoted browser context");
assert_eq!(promoted.active_target_id(), Some(second_target_id.as_str()));
assert!(
- promoted.network_policy.blocked_url_patterns().is_empty(),
+ promoted
+ .active_page_state()
+ .network_policy
+ .blocked_url_patterns()
+ .is_empty(),
"promotion must not activate a disabled Network handler"
);
}
@@ -1750,6 +1807,7 @@ async fn same_context_background_session_can_stage_its_own_blocked_urls_before_p
.browser_context
.as_ref()
.expect("promoted browser context")
+ .active_page_state()
.network_policy
.blocked_url_patterns(),
["http://example.test/blocked/*".to_owned()],
@@ -1857,7 +1915,7 @@ async fn same_context_background_session_can_reset_its_own_network_conditions_be
.expect("active browser context");
assert_eq!(active.active_target_id(), Some("TID-000000000PR"));
assert!(
- !active.network_policy.network_offline(),
+ !active.active_page_state().network_policy.network_offline(),
"active target should keep its default online state",
);
let staged = active
@@ -1905,12 +1963,38 @@ async fn same_context_background_session_can_reset_its_own_network_conditions_be
{
let promoted = ctx.conn.browser_context.as_ref().expect("browser context");
assert_eq!(promoted.active_target_id(), Some(second_target_id.as_str()));
- assert!(!promoted.network_policy.network_offline());
- assert_eq!(promoted.network_policy.emulated_network_latency(), 0.0);
- assert_eq!(promoted.network_policy.emulated_download_throughput(), -1.0);
- assert_eq!(promoted.network_policy.emulated_upload_throughput(), -1.0);
+ assert!(
+ !promoted
+ .active_page_state()
+ .network_policy
+ .network_offline()
+ );
assert_eq!(
- promoted.network_policy.emulated_connection_type(),
+ promoted
+ .active_page_state()
+ .network_policy
+ .emulated_network_latency(),
+ 0.0
+ );
+ assert_eq!(
+ promoted
+ .active_page_state()
+ .network_policy
+ .emulated_download_throughput(),
+ -1.0
+ );
+ assert_eq!(
+ promoted
+ .active_page_state()
+ .network_policy
+ .emulated_upload_throughput(),
+ -1.0
+ );
+ assert_eq!(
+ promoted
+ .active_page_state()
+ .network_policy
+ .emulated_connection_type(),
Some("none")
);
}
@@ -2044,7 +2128,7 @@ async fn same_context_background_session_can_stage_its_own_extra_headers_before_
.as_ref()
.expect("active browser context");
assert_eq!(
- active.network_policy.extra_headers(),
+ active.active_page_state().network_policy.extra_headers(),
vec![("X-Target".into(), "A".into())]
);
let staged = active
@@ -2249,7 +2333,7 @@ async fn same_context_background_session_can_clear_its_own_extra_headers_before_
.as_ref()
.expect("active browser context");
assert_eq!(
- active.network_policy.extra_headers(),
+ active.active_page_state().network_policy.extra_headers(),
vec![("X-Target".into(), "A".into())]
);
let staged = active
@@ -2418,7 +2502,10 @@ async fn same_context_background_session_can_stage_its_own_user_agent_before_pro
.as_ref()
.expect("active browser context");
assert_eq!(
- active.network_policy.user_agent_override(),
+ active
+ .active_page_state()
+ .network_policy
+ .user_agent_override(),
Some("Moli/Stage-A")
);
let staged = active
@@ -2620,7 +2707,11 @@ async fn same_context_background_session_can_clear_its_own_user_agent_before_pro
.as_ref()
.expect("active browser context");
assert!(
- active.network_policy.user_agent_override().is_none(),
+ active
+ .active_page_state()
+ .network_policy
+ .user_agent_override()
+ .is_none(),
"active target should keep its default user agent override",
);
let staged = active
@@ -2794,8 +2885,14 @@ async fn same_context_background_session_stages_locale_without_changing_request_
.browser_context
.as_ref()
.expect("active browser context");
- assert_eq!(active.locale_override.as_deref(), Some("en-GB"));
- assert_eq!(active.timezone_override.as_deref(), Some("UTC"));
+ assert_eq!(
+ active.active_page_state().locale_override.as_deref(),
+ Some("en-GB")
+ );
+ assert_eq!(
+ active.active_page_state().timezone_override.as_deref(),
+ Some("UTC")
+ );
let staged = active
.parked_page_session_state(&second_target_id)
.expect("second target should have staged parked page session state");
@@ -2990,7 +3087,7 @@ async fn same_context_background_session_can_clear_its_own_locale_before_promoti
.as_ref()
.expect("active browser context");
assert!(
- active.locale_override.is_none(),
+ active.active_page_state().locale_override.is_none(),
"active target should keep its default locale override",
);
assert!(
@@ -3149,7 +3246,7 @@ async fn same_context_background_session_can_clear_its_own_timezone_before_promo
.as_ref()
.expect("active browser context");
assert!(
- active.timezone_override.is_none(),
+ active.active_page_state().timezone_override.is_none(),
"active target should keep its default timezone override",
);
assert!(
@@ -3342,17 +3439,21 @@ async fn same_context_background_session_can_stage_its_own_emulation_overrides_b
.as_ref()
.expect("active browser context");
assert_eq!(
- active.emulated_device_metrics.as_ref().map(|metrics| (
- metrics.width,
- metrics.height,
- metrics.device_scale_factor,
- metrics.screen_width,
- metrics.screen_height
- )),
+ active
+ .active_page_state()
+ .emulated_device_metrics
+ .as_ref()
+ .map(|metrics| (
+ metrics.width,
+ metrics.height,
+ metrics.device_scale_factor,
+ metrics.screen_width,
+ metrics.screen_height
+ )),
Some((1280, 720, 2.0, 1440, 900))
);
- assert!(active.touch_emulation_enabled);
- assert!(active.focus_emulation_enabled);
+ assert!(active.active_page_state().touch_emulation_enabled);
+ assert!(active.active_page_state().focus_emulation_enabled);
let staged = active
.parked_page_session_state(&second_target_id)
@@ -3592,26 +3693,26 @@ async fn same_context_background_session_can_stage_its_own_page_settings_before_
.expect("promoted browser context");
assert_eq!(active.active_target_id(), Some(second_target_id.as_str()));
assert!(
- active.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ active.active_page_state().devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.page_session_state
.page_bypass_csp_enabled
);
assert_eq!(
- active.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ active.active_page_state().devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.page_session_state
.page_font_families
.get("standard"),
Some(&json!("Georgia"))
);
assert_eq!(
- active.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ active.active_page_state().devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.page_session_state
.page_font_families
.get("fixed"),
Some(&json!("Fira Code"))
);
assert!(
- active.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ active.active_page_state().devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.page_session_state
.page_intercept_file_chooser_dialog_enabled
);
@@ -3693,7 +3794,7 @@ async fn same_context_background_session_can_clear_its_own_device_metrics_before
.as_ref()
.expect("active browser context");
assert!(
- active.emulated_device_metrics.is_none(),
+ active.active_page_state().emulated_device_metrics.is_none(),
"active target should keep its default device metrics",
);
assert!(
@@ -3865,11 +3966,11 @@ async fn same_context_background_session_can_clear_its_own_touch_and_focus_befor
.as_ref()
.expect("active browser context");
assert!(
- !active.touch_emulation_enabled,
+ !active.active_page_state().touch_emulation_enabled,
"active target should keep default touch emulation"
);
assert!(
- !active.focus_emulation_enabled,
+ !active.active_page_state().focus_emulation_enabled,
"active target should keep default focus emulation"
);
assert!(
@@ -4015,7 +4116,7 @@ async fn same_context_background_session_can_stage_its_own_script_execution_disa
.browser_context
.as_ref()
.expect("active browser context");
- assert!(!active.script_execution_disabled);
+ assert!(!active.active_page_state().script_execution_disabled);
let staged = active
.parked_page_session_state(&second_target_id)
.expect("second target should have staged parked page session state");
@@ -4090,7 +4191,7 @@ async fn same_context_background_session_can_stage_its_own_script_execution_disa
.browser_context
.as_ref()
.expect("promoted browser context");
- assert!(promoted.script_execution_disabled);
+ assert!(promoted.active_page_state().script_execution_disabled);
}
ctx.process_async(json!({
@@ -4181,7 +4282,7 @@ async fn same_context_background_session_can_reenable_its_own_script_execution_b
.browser_context
.as_ref()
.expect("active browser context");
- assert!(!active.script_execution_disabled);
+ assert!(!active.active_page_state().script_execution_disabled);
// A completed renderer call may retain its monotonic correlation
// allocator in the parked session; only the effective setting must
// collapse back to the default.
@@ -4262,7 +4363,7 @@ async fn same_context_background_session_can_reenable_its_own_script_execution_b
.browser_context
.as_ref()
.expect("promoted browser context");
- assert!(!promoted.script_execution_disabled);
+ assert!(!promoted.active_page_state().script_execution_disabled);
}
ctx.process_async(json!({
@@ -4353,7 +4454,8 @@ async fn same_context_background_session_can_stage_its_own_lifecycle_events_befo
.as_ref()
.expect("active browser context");
assert!(
- !active.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ !active.active_page_state().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.page_session_state
.page_lifecycle_events
);
@@ -4529,7 +4631,8 @@ async fn same_context_background_session_can_disable_its_own_lifecycle_events_be
.as_ref()
.expect("active browser context");
assert!(
- !active.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ !active.active_page_state().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.page_session_state
.page_lifecycle_events
);
@@ -4666,7 +4769,8 @@ async fn same_context_background_session_can_stage_its_own_runtime_enable_before
.as_ref()
.expect("active browser context");
assert!(
- !active.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ !active.active_page_state().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.runtime_session_state
.runtime_frontend_enabled
);
@@ -5592,7 +5696,8 @@ async fn same_context_background_session_can_disable_its_own_runtime_before_prom
.as_ref()
.expect("active browser context");
assert!(
- !active.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ !active.active_page_state().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.runtime_session_state
.runtime_frontend_enabled
);
@@ -5683,6 +5788,7 @@ async fn same_context_background_session_can_stage_its_own_inspector_enable_befo
.browser_context
.as_mut()
.unwrap()
+ .active_page_state_mut()
.active_target
.owner_state
.target_crash_state
@@ -5733,13 +5839,15 @@ async fn same_context_background_session_can_stage_its_own_inspector_enable_befo
.expect("active browser context");
assert!(
active
+ .active_page_state()
.active_target
.owner_state
.target_crash_state
.is_crashed()
);
assert!(
- !active.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ !active.active_page_state().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.runtime_session_state
.inspector_enabled
);
@@ -5805,6 +5913,7 @@ async fn same_context_background_session_can_stage_its_own_inspector_enable_befo
.browser_context
.as_ref()
.expect("browser context")
+ .active_page_state()
.active_target
.owner_state
.target_crash_state
@@ -5880,7 +5989,8 @@ async fn same_context_background_session_can_disable_its_own_inspector_before_pr
.as_ref()
.expect("active browser context");
assert!(
- !active.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ !active.active_page_state().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.runtime_session_state
.inspector_enabled
);
@@ -5905,6 +6015,7 @@ async fn same_context_background_session_can_disable_its_own_inspector_before_pr
.browser_context
.as_mut()
.unwrap()
+ .active_page_state_mut()
.active_target
.owner_state
.target_crash_state
@@ -5934,6 +6045,7 @@ async fn same_context_background_session_can_disable_its_own_inspector_before_pr
.browser_context
.as_ref()
.expect("browser context")
+ .active_page_state()
.active_target
.owner_state
.target_crash_state
@@ -6001,7 +6113,7 @@ async fn same_context_background_session_can_stage_its_own_css_enable_before_pro
.browser_context
.as_ref()
.expect("active browser context");
- assert!(!active.css_enabled);
+ assert!(!active.active_page_state().css_enabled);
let staged = active
.parked_page_session_state(&second_target_id)
.expect("second target should have staged parked page session state");
@@ -6023,7 +6135,7 @@ async fn same_context_background_session_can_stage_its_own_css_enable_before_pro
.as_ref()
.expect("promoted browser context");
assert_eq!(active.active_target_id(), Some(second_target_id.as_str()));
- assert!(active.css_enabled);
+ assert!(active.active_page_state().css_enabled);
}
ctx.process_async(json!({
@@ -6047,6 +6159,7 @@ async fn same_context_background_session_can_stage_its_own_css_enable_before_pro
.browser_context
.as_ref()
.expect("browser context")
+ .active_page_state()
.css_enabled
);
}
@@ -6118,7 +6231,7 @@ async fn same_context_background_session_can_disable_its_own_css_before_promotio
.browser_context
.as_ref()
.expect("active browser context");
- assert!(!active.css_enabled);
+ assert!(!active.active_page_state().css_enabled);
assert!(
active
.parked_page_session_state(&second_target_id)
@@ -6142,7 +6255,7 @@ async fn same_context_background_session_can_disable_its_own_css_before_promotio
.as_ref()
.expect("promoted browser context");
assert_eq!(active.active_target_id(), Some(second_target_id.as_str()));
- assert!(!active.css_enabled);
+ assert!(!active.active_page_state().css_enabled);
}
ctx.process_async(json!({
@@ -6166,6 +6279,7 @@ async fn same_context_background_session_can_disable_its_own_css_before_promotio
.browser_context
.as_ref()
.expect("browser context")
+ .active_page_state()
.css_enabled
);
}
@@ -6256,9 +6370,16 @@ async fn same_context_background_session_can_stage_its_own_fetch_enable_before_p
.browser_context
.as_ref()
.expect("active browser context");
- assert!(!active.active_target.fetch_owner.is_enabled());
+ assert!(
+ !active
+ .active_page_state()
+ .active_target
+ .fetch_owner
+ .is_enabled()
+ );
assert!(
active
+ .active_page_state()
.active_target
.fetch_owner
.config_snapshot()
@@ -6598,7 +6719,13 @@ async fn same_context_background_session_can_stage_its_own_fetch_auth_handling_b
.browser_context
.as_ref()
.expect("active browser context");
- assert!(!active.active_target.fetch_owner.is_enabled());
+ assert!(
+ !active
+ .active_page_state()
+ .active_target
+ .fetch_owner
+ .is_enabled()
+ );
let staged = active
.parked_page_session_state(&second_target_id)
.expect("second target should have staged parked page session state");
@@ -6794,9 +6921,16 @@ async fn same_context_background_session_can_disable_its_own_fetch_before_promot
.browser_context
.as_ref()
.expect("active browser context");
- assert!(!active.active_target.fetch_owner.is_enabled());
+ assert!(
+ !active
+ .active_page_state()
+ .active_target
+ .fetch_owner
+ .is_enabled()
+ );
assert!(
active
+ .active_page_state()
.active_target
.fetch_owner
.config_snapshot()
@@ -6950,6 +7084,7 @@ async fn same_context_background_session_can_stage_its_own_network_enable_before
.expect("active browser context");
assert!(
!active
+ .active_page_state()
.active_target
.runtime_slot
.primary_network_events_enabled()
@@ -7143,6 +7278,7 @@ async fn same_context_background_session_can_disable_its_own_network_before_prom
.expect("active browser context");
assert!(
!active
+ .active_page_state()
.active_target
.runtime_slot
.primary_network_events_enabled()
@@ -7339,12 +7475,18 @@ async fn same_context_background_session_can_stage_its_own_cache_and_service_wor
.expect("active browser context");
assert!(
!active
+ .active_page_state()
.active_target
.runtime_slot
.primary_network_events_enabled()
);
- assert!(!active.network_policy.cache_disabled());
- assert!(!active.network_policy.bypass_service_worker());
+ assert!(!active.active_page_state().network_policy.cache_disabled());
+ assert!(
+ !active
+ .active_page_state()
+ .network_policy
+ .bypass_service_worker()
+ );
let staged = active
.parked_page_session_state(&second_target_id)
.expect("second target should have staged parked page session state");
@@ -7394,12 +7536,17 @@ async fn same_context_background_session_can_stage_its_own_cache_and_service_wor
.expect("promoted browser context");
assert_eq!(bc.active_target_id(), Some(second_target_id.as_str()));
assert!(
- bc.active_target
+ bc.active_page_state()
+ .active_target
.runtime_slot
.primary_network_events_enabled()
);
- assert!(bc.network_policy.cache_disabled());
- assert!(bc.network_policy.bypass_service_worker());
+ assert!(bc.active_page_state().network_policy.cache_disabled());
+ assert!(
+ bc.active_page_state()
+ .network_policy
+ .bypass_service_worker()
+ );
}
ctx.process_async(json!({
@@ -7580,12 +7727,18 @@ async fn same_context_background_session_can_disable_its_own_cache_and_service_w
.expect("active browser context");
assert!(
!active
+ .active_page_state()
.active_target
.runtime_slot
.primary_network_events_enabled()
);
- assert!(!active.network_policy.cache_disabled());
- assert!(!active.network_policy.bypass_service_worker());
+ assert!(!active.active_page_state().network_policy.cache_disabled());
+ assert!(
+ !active
+ .active_page_state()
+ .network_policy
+ .bypass_service_worker()
+ );
let staged = active
.parked_page_session_state(&second_target_id)
.expect("second target should have staged parked page session state");
@@ -7635,12 +7788,17 @@ async fn same_context_background_session_can_disable_its_own_cache_and_service_w
.expect("promoted browser context");
assert_eq!(bc.active_target_id(), Some(second_target_id.as_str()));
assert!(
- bc.active_target
+ bc.active_page_state()
+ .active_target
.runtime_slot
.primary_network_events_enabled()
);
- assert!(!bc.network_policy.cache_disabled());
- assert!(!bc.network_policy.bypass_service_worker());
+ assert!(!bc.active_page_state().network_policy.cache_disabled());
+ assert!(
+ !bc.active_page_state()
+ .network_policy
+ .bypass_service_worker()
+ );
}
ctx.process_async(json!({
diff --git a/moli-protocol/src/domains/target/tests/tests_browser_context.rs b/moli-protocol/src/domains/target/tests/tests_browser_context.rs
index b424b90ae..ae05b8d7f 100644
--- a/moli-protocol/src/domains/target/tests/tests_browser_context.rs
+++ b/moli-protocol/src/domains/target/tests/tests_browser_context.rs
@@ -112,7 +112,7 @@ async fn dispose_browser_context_emits_detached_events_for_attached_target() {
let mut bc = BrowserContext::new("BID-20".into());
bc.set_active_target_id("TID-000000000A");
bc.attach_active_session("SID-000000000A");
- bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ bc.active_page_state_mut().devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.runtime_session_state
.inspector_enabled = true;
ctx.conn.browser_context = Some(bc);
@@ -784,10 +784,11 @@ async fn dispose_browser_context_aborts_paused_request_stage_navigation() {
let mut bc = BrowserContext::new("BID-9".into());
bc.set_active_target_id("TID-000000000A");
bc.attach_active_session("SID-1");
- bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ bc.active_page_state_mut().devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.runtime_session_state
.inspector_enabled = true;
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -866,7 +867,8 @@ async fn dispose_browser_context_aborts_root_session_navigation_without_target_s
let mut ctx = TestContext::new();
let mut bc = BrowserContext::new("BID-root-dispose".into());
bc.set_active_target_id("TID-root-dispose");
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
diff --git a/moli-protocol/src/domains/target/tests/tests_control_plane.rs b/moli-protocol/src/domains/target/tests/tests_control_plane.rs
index 7518973c1..084cc676d 100644
--- a/moli-protocol/src/domains/target/tests/tests_control_plane.rs
+++ b/moli-protocol/src/domains/target/tests/tests_control_plane.rs
@@ -827,13 +827,20 @@ async fn detach_from_target_aborts_paused_request_stage_navigation() {
assert!(!bc.has_active_session());
assert_eq!(bc.active_target_id(), Some(target_id.as_str()));
assert!(
- !bc.active_target
+ !bc.active_page_state()
+ .active_target
.fetch_owner
.has_pending_fetch_state_for_test()
);
- assert!(!bc.active_target.fetch_owner.is_enabled());
assert!(
- !bc.active_target
+ !bc.active_page_state()
+ .active_target
+ .fetch_owner
+ .is_enabled()
+ );
+ assert!(
+ !bc.active_page_state()
+ .active_target
.runtime_slot
.primary_network_events_enabled()
);
@@ -922,7 +929,8 @@ async fn same_context_targets_keep_paused_fetch_state_target_local_after_switchi
let bc = ctx.conn.browser_context.as_ref().expect("browser context");
assert_eq!(bc.active_target_id(), Some(second_target_id.as_str()));
assert!(
- !bc.active_target
+ !bc.active_page_state()
+ .active_target
.fetch_owner
.has_pending_fetch_state_for_test(),
"promoted target should not see another target's pending fetch ids",
diff --git a/moli-protocol/src/domains/target/tests/tests_patchright/utility_world/preload_runtime.rs b/moli-protocol/src/domains/target/tests/tests_patchright/utility_world/preload_runtime.rs
index ae55e6157..bf281dc30 100644
--- a/moli-protocol/src/domains/target/tests/tests_patchright/utility_world/preload_runtime.rs
+++ b/moli-protocol/src/domains/target/tests/tests_patchright/utility_world/preload_runtime.rs
@@ -192,6 +192,7 @@ async fn patchright_over_cdp_utility_world_binding_and_preload_stay_isolated_per
.expect("first browser context should still exist");
assert_eq!(
first_context
+ .active_page_state()
.active_target
.owner_state
.document_start_scripts
@@ -199,7 +200,8 @@ async fn patchright_over_cdp_utility_world_binding_and_preload_stay_isolated_per
1
);
assert!(
- first_context.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ first_context.active_page_state().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.runtime_bindings
.iter()
.any(|binding| {
@@ -583,6 +585,7 @@ async fn patchright_over_cdp_existing_utility_world_binding_install_by_execution
.browser_context
.as_ref()
.expect("browser context")
+ .active_page_state()
.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.runtime_bindings
.iter()
@@ -785,6 +788,7 @@ async fn patchright_over_cdp_pre_document_remove_binding_prevents_first_navigati
.browser_context
.as_ref()
.expect("browser context")
+ .active_page_state()
.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.runtime_bindings
.iter()
@@ -952,6 +956,7 @@ async fn patchright_over_cdp_pre_document_remove_utility_world_preload_prevents_
.browser_context
.as_ref()
.expect("browser context")
+ .active_page_state()
.active_target
.owner_state
.document_start_scripts
@@ -1349,6 +1354,7 @@ async fn patchright_over_cdp_existing_utility_world_preload_remove_keeps_current
.browser_context
.as_ref()
.expect("browser context")
+ .active_page_state()
.active_target
.owner_state
.document_start_scripts
diff --git a/moli-protocol/src/domains/target/tests/tests_patchright_runtimeless.rs b/moli-protocol/src/domains/target/tests/tests_patchright_runtimeless.rs
index 1f6f39e98..3e8c44fec 100644
--- a/moli-protocol/src/domains/target/tests/tests_patchright_runtimeless.rs
+++ b/moli-protocol/src/domains/target/tests/tests_patchright_runtimeless.rs
@@ -213,6 +213,7 @@ async fn patchright_over_cdp_switching_back_to_first_context_keeps_older_page_ru
);
assert_eq!(
first_context
+ .active_page_state()
.active_target
.owner_state
.document_start_scripts
@@ -220,7 +221,8 @@ async fn patchright_over_cdp_switching_back_to_first_context_keeps_older_page_ru
1
);
assert!(
- first_context.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ first_context.active_page_state().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.runtime_bindings
.iter()
.any(|binding| {
diff --git a/moli-protocol/src/domains/target/tests/tests_playwright_cdp.rs b/moli-protocol/src/domains/target/tests/tests_playwright_cdp.rs
index 7a6782689..c2de5fa22 100644
--- a/moli-protocol/src/domains/target/tests/tests_playwright_cdp.rs
+++ b/moli-protocol/src/domains/target/tests/tests_playwright_cdp.rs
@@ -5803,6 +5803,7 @@ async fn playwright_over_cdp_target_document_start_script_does_not_leak_to_new_t
assert_eq!(active.active_session_id(), Some(second_session_id.as_str()));
assert_eq!(
active
+ .active_page_state()
.active_target
.owner_state
.document_start_scripts
@@ -5948,13 +5949,16 @@ async fn playwright_over_cdp_context_profile_surfaces_permissions_tls_and_metric
assert_eq!(active.id, browser_context_id);
assert_eq!(active.active_target_id(), Some(target_id.as_str()));
assert_eq!(active.active_session_id(), Some(session_id.as_str()));
- assert_eq!(active.tls_verify_host_override, Some(false));
assert_eq!(
- active.emulated_device_metrics.as_ref().map(|metrics| (
- metrics.width,
- metrics.height,
- metrics.device_scale_factor
- )),
+ active.active_page_state().tls_verify_host_override,
+ Some(false)
+ );
+ assert_eq!(
+ active
+ .active_page_state()
+ .emulated_device_metrics
+ .as_ref()
+ .map(|metrics| (metrics.width, metrics.height, metrics.device_scale_factor)),
Some((1280, 720, 2.0))
);
@@ -6135,7 +6139,13 @@ async fn playwright_over_cdp_script_execution_disabled_blocks_page_scripts_but_n
ctx.conn
.browser_context
.as_mut()
- .and_then(|browser_context| browser_context.active_target.runtime_slot.loaded_page_mut())
+ .and_then(|browser_context| {
+ browser_context
+ .active_page_state_mut()
+ .active_target
+ .runtime_slot
+ .loaded_page_mut()
+ })
.expect("script-disabled loaded page")
.refresh_script_execution_report_async()
.await
@@ -6146,8 +6156,9 @@ async fn playwright_over_cdp_script_execution_disabled_blocks_page_scripts_but_n
.browser_context
.as_ref()
.expect("active browser context");
- assert!(active.script_execution_disabled);
+ assert!(active.active_page_state().script_execution_disabled);
let script_runs = active
+ .active_page_state()
.active_target
.runtime_slot
.loaded_page()
diff --git a/moli-protocol/src/domains/target/tests/tests_same_context_bindings.rs b/moli-protocol/src/domains/target/tests/tests_same_context_bindings.rs
index 7bfdae712..e7bdfd230 100644
--- a/moli-protocol/src/domains/target/tests/tests_same_context_bindings.rs
+++ b/moli-protocol/src/domains/target/tests/tests_same_context_bindings.rs
@@ -472,6 +472,7 @@ async fn same_context_targets_remove_only_their_own_pre_document_script_identifi
.expect("active browser context");
assert!(
active
+ .active_page_state()
.active_target
.owner_state
.document_start_scripts
@@ -625,6 +626,7 @@ async fn same_context_targets_remove_only_their_own_utility_pre_document_script_
.expect("active browser context");
assert!(
active
+ .active_page_state()
.active_target
.owner_state
.document_start_scripts
@@ -821,7 +823,8 @@ async fn same_context_targets_remove_only_their_own_utility_binding_definition_a
.as_ref()
.expect("active browser context");
assert!(
- active.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ active.active_page_state().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.runtime_bindings
.iter()
.any(|binding| {
@@ -1014,7 +1017,8 @@ async fn same_context_targets_remove_only_their_own_main_world_binding_definitio
.as_ref()
.expect("active browser context");
assert!(
- active.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ active.active_page_state().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.runtime_bindings
.iter()
.any(|binding| {
@@ -1239,7 +1243,7 @@ async fn same_context_targets_remove_only_their_own_dual_world_binding_definitio
.expect("active browser context");
assert!(
active
- .devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ .active_page_state().devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.runtime_bindings
.iter()
diff --git a/moli-protocol/src/domains/target/tests/tests_same_context_overrides.rs b/moli-protocol/src/domains/target/tests/tests_same_context_overrides.rs
index 4233f4368..4e9ad6ee8 100644
--- a/moli-protocol/src/domains/target/tests/tests_same_context_overrides.rs
+++ b/moli-protocol/src/domains/target/tests/tests_same_context_overrides.rs
@@ -135,10 +135,13 @@ async fn same_context_targets_restore_their_own_page_session_overrides_after_swi
.expect("active browser context");
assert_eq!(bc.active_target_id(), Some("TID-000000000A"));
assert_eq!(
- bc.network_policy.extra_headers(),
+ bc.active_page_state().network_policy.extra_headers(),
vec![("X-Target".into(), "A".into())]
);
- assert_eq!(bc.locale_override.as_deref(), Some("en-GB"));
+ assert_eq!(
+ bc.active_page_state().locale_override.as_deref(),
+ Some("en-GB")
+ );
}
ctx.process_async(json!({
@@ -193,10 +196,13 @@ async fn same_context_targets_restore_their_own_page_session_overrides_after_swi
.expect("active browser context");
assert_eq!(bc.active_target_id(), Some(second_target_id.as_str()));
assert_eq!(
- bc.network_policy.extra_headers(),
+ bc.active_page_state().network_policy.extra_headers(),
vec![("X-Target".into(), "B".into())]
);
- assert_eq!(bc.locale_override.as_deref(), Some("fr-FR"));
+ assert_eq!(
+ bc.active_page_state().locale_override.as_deref(),
+ Some("fr-FR")
+ );
}
ctx.process_async(json!({
@@ -385,12 +391,33 @@ async fn same_context_targets_restore_their_own_network_conditions_after_session
.as_ref()
.expect("active browser context after restoring first target");
assert_eq!(active.active_target_id(), Some("TID-000000000NA"));
- assert!(!active.network_policy.network_offline());
- assert_eq!(active.network_policy.emulated_network_latency(), 150.0);
- assert_eq!(active.network_policy.emulated_download_throughput(), 1024.0);
- assert_eq!(active.network_policy.emulated_upload_throughput(), 512.0);
+ assert!(!active.active_page_state().network_policy.network_offline());
+ assert_eq!(
+ active
+ .active_page_state()
+ .network_policy
+ .emulated_network_latency(),
+ 150.0
+ );
+ assert_eq!(
+ active
+ .active_page_state()
+ .network_policy
+ .emulated_download_throughput(),
+ 1024.0
+ );
+ assert_eq!(
+ active
+ .active_page_state()
+ .network_policy
+ .emulated_upload_throughput(),
+ 512.0
+ );
assert_eq!(
- active.network_policy.emulated_connection_type(),
+ active
+ .active_page_state()
+ .network_policy
+ .emulated_connection_type(),
Some("cellular3g")
);
}
@@ -854,12 +881,12 @@ async fn same_context_targets_restore_their_own_loader_overrides_after_switching
ctx.take_all();
ctx.process_async(json!({
- "id": 1041741,
+ "id": 1041740,
"method": "Target.activateTarget",
- "params": { "targetId": second_target_id }
+ "params": { "targetId": "TID-000000000UA" }
}))
.await;
- ctx.expect_result(1041741, json!({}), None);
+ ctx.expect_result(1041740, json!({}), None);
ctx.process_async(json!({
"id": 104175,
@@ -879,6 +906,43 @@ async fn same_context_targets_restore_their_own_loader_overrides_after_switching
.await;
ctx.expect_result(104176, json!({}), Some(&second_session_id));
+ {
+ let browser_context = ctx
+ .conn
+ .browser_context
+ .as_ref()
+ .expect("active browser context");
+ assert_ne!(
+ browser_context.active_target_id(),
+ Some(second_target_id.as_str()),
+ "the second target must still be in the background"
+ );
+ let background = browser_context
+ .page_target(&second_target_id)
+ .expect("background target");
+ assert_eq!(
+ background.network_policy.user_agent_override(),
+ Some("Moli/Target-B")
+ );
+ assert_eq!(background.tls_verify_host_override, Some(true));
+ assert!(
+ background
+ .navigation_engine()
+ .expect("background navigation engine")
+ .fetch_config()
+ .tls_verify_host(),
+ "the exact background engine must be rebuilt before activation"
+ );
+ }
+
+ ctx.process_async(json!({
+ "id": 1041741,
+ "method": "Target.activateTarget",
+ "params": { "targetId": second_target_id }
+ }))
+ .await;
+ ctx.expect_result(1041741, json!({}), None);
+
{
let active = ctx
.conn
@@ -887,10 +951,16 @@ async fn same_context_targets_restore_their_own_loader_overrides_after_switching
.expect("active browser context");
assert_eq!(active.active_target_id(), Some(second_target_id.as_str()));
assert_eq!(
- active.network_policy.user_agent_override(),
+ active
+ .active_page_state()
+ .network_policy
+ .user_agent_override(),
Some("Moli/Target-B")
);
- assert_eq!(active.tls_verify_host_override, Some(true));
+ assert_eq!(
+ active.active_page_state().tls_verify_host_override,
+ Some(true)
+ );
}
ctx.conn
.ensure_resource_request_client()
@@ -914,10 +984,16 @@ async fn same_context_targets_restore_their_own_loader_overrides_after_switching
.expect("active browser context");
assert_eq!(active.active_target_id(), Some("TID-000000000UA"));
assert_eq!(
- active.network_policy.user_agent_override(),
+ active
+ .active_page_state()
+ .network_policy
+ .user_agent_override(),
Some("Moli/Target-A")
);
- assert_eq!(active.tls_verify_host_override, Some(false));
+ assert_eq!(
+ active.active_page_state().tls_verify_host_override,
+ Some(false)
+ );
}
ctx.conn
.ensure_resource_request_client()
@@ -948,8 +1024,9 @@ async fn same_context_targets_restore_their_own_proxy_loader_overrides_after_swi
.browser_context
.as_mut()
.expect("active browser context");
- active.http_proxy_override = Some("http://proxy-a.test:8080".into());
- active.http_no_proxy_override = Some("localhost,127.0.0.1".into());
+ active.active_page_state_mut().http_proxy_override =
+ Some("http://proxy-a.test:8080".into());
+ active.active_page_state_mut().http_no_proxy_override = Some("localhost,127.0.0.1".into());
}
ctx.conn.invalidate_resource_runtime_async().await;
ctx.conn
@@ -1016,8 +1093,9 @@ async fn same_context_targets_restore_their_own_proxy_loader_overrides_after_swi
.as_mut()
.expect("active browser context");
assert_eq!(active.active_target_id(), Some(second_target_id.as_str()));
- active.http_proxy_override = Some("http://proxy-b.test:8080".into());
- active.http_no_proxy_override = Some("::1,.example.com".into());
+ active.active_page_state_mut().http_proxy_override =
+ Some("http://proxy-b.test:8080".into());
+ active.active_page_state_mut().http_no_proxy_override = Some("::1,.example.com".into());
}
ctx.conn.invalidate_resource_runtime_async().await;
ctx.conn
@@ -1042,11 +1120,11 @@ async fn same_context_targets_restore_their_own_proxy_loader_overrides_after_swi
.expect("active browser context");
assert_eq!(active.active_target_id(), Some("TID-000000000PX"));
assert_eq!(
- active.http_proxy_override.as_deref(),
+ active.active_page_state().http_proxy_override.as_deref(),
Some("http://proxy-a.test:8080")
);
assert_eq!(
- active.http_no_proxy_override.as_deref(),
+ active.active_page_state().http_no_proxy_override.as_deref(),
Some("localhost,127.0.0.1")
);
}
@@ -1169,10 +1247,16 @@ async fn same_context_targets_restore_their_own_loader_overrides_after_close_tar
.expect("active browser context");
assert_eq!(active.active_target_id(), Some("TID-000000000UC"));
assert_eq!(
- active.network_policy.user_agent_override(),
+ active
+ .active_page_state()
+ .network_policy
+ .user_agent_override(),
Some("Moli/Close-A")
);
- assert_eq!(active.tls_verify_host_override, Some(false));
+ assert_eq!(
+ active.active_page_state().tls_verify_host_override,
+ Some(false)
+ );
}
ctx.conn
.ensure_resource_request_client()
@@ -1204,8 +1288,9 @@ async fn same_context_targets_restore_their_own_proxy_loader_overrides_after_clo
.browser_context
.as_mut()
.expect("active browser context");
- active.http_proxy_override = Some("http://proxy-close-a.test:8080".into());
- active.http_no_proxy_override = Some("localhost,127.0.0.1".into());
+ active.active_page_state_mut().http_proxy_override =
+ Some("http://proxy-close-a.test:8080".into());
+ active.active_page_state_mut().http_no_proxy_override = Some("localhost,127.0.0.1".into());
}
ctx.conn.invalidate_resource_runtime_async().await;
ctx.conn
@@ -1274,8 +1359,9 @@ async fn same_context_targets_restore_their_own_proxy_loader_overrides_after_clo
.browser_context
.as_mut()
.expect("active browser context");
- active.http_proxy_override = Some("http://proxy-close-b.test:8080".into());
- active.http_no_proxy_override = Some("::1,.example.com".into());
+ active.active_page_state_mut().http_proxy_override =
+ Some("http://proxy-close-b.test:8080".into());
+ active.active_page_state_mut().http_no_proxy_override = Some("::1,.example.com".into());
}
ctx.conn.invalidate_resource_runtime_async().await;
ctx.conn
@@ -1304,11 +1390,11 @@ async fn same_context_targets_restore_their_own_proxy_loader_overrides_after_clo
.expect("active browser context");
assert_eq!(active.active_target_id(), Some("TID-000000000PC"));
assert_eq!(
- active.http_proxy_override.as_deref(),
+ active.active_page_state().http_proxy_override.as_deref(),
Some("http://proxy-close-a.test:8080")
);
assert_eq!(
- active.http_no_proxy_override.as_deref(),
+ active.active_page_state().http_no_proxy_override.as_deref(),
Some("localhost,127.0.0.1")
);
}
diff --git a/moli-protocol/src/domains/target/tests/tests_same_context_state.rs b/moli-protocol/src/domains/target/tests/tests_same_context_state.rs
index 8a83b4e7f..3c7ce2588 100644
--- a/moli-protocol/src/domains/target/tests/tests_same_context_state.rs
+++ b/moli-protocol/src/domains/target/tests/tests_same_context_state.rs
@@ -104,6 +104,7 @@ async fn same_context_targets_restore_their_own_script_execution_disabled_after_
.browser_context
.as_ref()
.expect("active browser context")
+ .active_page_state()
.script_execution_disabled
);
@@ -152,6 +153,7 @@ async fn same_context_targets_restore_their_own_script_execution_disabled_after_
.browser_context
.as_ref()
.expect("active browser context")
+ .active_page_state()
.script_execution_disabled
);
@@ -403,12 +405,17 @@ async fn same_context_targets_restore_their_own_crash_state_after_switching() {
.browser_context
.as_mut()
.unwrap()
+ .active_page_state_mut()
.active_target
.owner_state
.target_crash_state
.mark_crashed();
- ctx.conn.browser_context.as_mut().unwrap().devtools_sessions
- [moli_page_types::DevToolsSessionKey::Primary]
+ ctx.conn
+ .browser_context
+ .as_mut()
+ .unwrap()
+ .active_page_state_mut()
+ .devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.runtime_session_state
.record_inspector_target_crashed();
@@ -491,6 +498,7 @@ async fn same_context_targets_restore_their_own_crash_state_after_switching() {
.browser_context
.as_ref()
.expect("active browser context")
+ .active_page_state()
.active_target
.owner_state
.target_crash_state
@@ -518,6 +526,7 @@ async fn same_context_targets_restore_their_own_crash_state_after_switching() {
.browser_context
.as_ref()
.expect("browser context")
+ .active_page_state()
.active_target
.owner_state
.target_crash_state
@@ -620,31 +629,50 @@ async fn same_context_targets_restore_their_own_domain_enablement_after_switchin
.expect("active browser context");
assert_eq!(bc.active_target_id(), Some("TID-000000000A"));
assert!(
- bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ bc.active_page_state().devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.page_session_state
.page_lifecycle_events
);
assert!(
- bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ bc.active_page_state().devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.runtime_session_state
.runtime_frontend_enabled
);
assert!(
- bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ bc.active_page_state().devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.runtime_session_state
.inspector_enabled
);
assert!(
- bc.active_target
+ bc.active_page_state()
+ .active_target
.runtime_slot
.primary_network_events_enabled()
);
- assert!(bc.network_policy.cache_disabled());
- assert!(bc.network_policy.bypass_service_worker());
- assert!(bc.css_enabled);
- assert!(bc.active_target.fetch_owner.is_enabled());
- assert!(bc.active_target.fetch_owner.handle_auth_requests());
- let fetch_config = bc.active_target.fetch_owner.config_snapshot();
+ assert!(bc.active_page_state().network_policy.cache_disabled());
+ assert!(
+ bc.active_page_state()
+ .network_policy
+ .bypass_service_worker()
+ );
+ assert!(bc.active_page_state().css_enabled);
+ assert!(
+ bc.active_page_state()
+ .active_target
+ .fetch_owner
+ .is_enabled()
+ );
+ assert!(
+ bc.active_page_state()
+ .active_target
+ .fetch_owner
+ .handle_auth_requests()
+ );
+ let fetch_config = bc
+ .active_page_state()
+ .active_target
+ .fetch_owner
+ .config_snapshot();
assert_eq!(fetch_config.patterns().len(), 1);
assert_eq!(fetch_config.patterns()[0].url_pattern, "*target-a*");
assert_eq!(
@@ -668,32 +696,48 @@ async fn same_context_targets_restore_their_own_domain_enablement_after_switchin
.expect("active browser context");
assert_eq!(bc.active_target_id(), Some(second_target_id.as_str()));
assert!(
- !bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ !bc.active_page_state().devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.page_session_state
.page_lifecycle_events
);
assert!(
- !bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ !bc.active_page_state().devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.runtime_session_state
.runtime_frontend_enabled
);
assert!(
- !bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ !bc.active_page_state().devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.runtime_session_state
.inspector_enabled
);
assert!(
- !bc.active_target
+ !bc.active_page_state()
+ .active_target
.runtime_slot
.primary_network_events_enabled()
);
- assert!(!bc.network_policy.cache_disabled());
- assert!(!bc.network_policy.bypass_service_worker());
- assert!(!bc.css_enabled);
- assert!(!bc.active_target.fetch_owner.is_enabled());
- assert!(!bc.active_target.fetch_owner.handle_auth_requests());
+ assert!(!bc.active_page_state().network_policy.cache_disabled());
+ assert!(
+ !bc.active_page_state()
+ .network_policy
+ .bypass_service_worker()
+ );
+ assert!(!bc.active_page_state().css_enabled);
assert!(
- bc.active_target
+ !bc.active_page_state()
+ .active_target
+ .fetch_owner
+ .is_enabled()
+ );
+ assert!(
+ !bc.active_page_state()
+ .active_target
+ .fetch_owner
+ .handle_auth_requests()
+ );
+ assert!(
+ bc.active_page_state()
+ .active_target
.fetch_owner
.config_snapshot()
.patterns()
@@ -851,12 +895,14 @@ async fn same_context_targets_restore_their_own_page_attachment_id_and_request_c
.attach_active_session("SID-active");
{
let bc = ctx.conn.browser_context.as_mut().expect("browser context");
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.set_page_attachment_id_for_test(11);
bc.set_next_network_request_sequence_for_test(41);
bc.set_subresource_network_emitted_record_count_for_test(12);
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.set_network_request_counters_for_test(4, 5);
}
@@ -895,12 +941,14 @@ async fn same_context_targets_restore_their_own_page_attachment_id_and_request_c
{
let bc = ctx.conn.browser_context.as_mut().expect("browser context");
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.set_page_attachment_id_for_test(23);
bc.set_next_network_request_sequence_for_test(71);
bc.set_subresource_network_emitted_record_count_for_test(8);
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.set_network_request_counters_for_test(9, 10);
}
@@ -912,7 +960,8 @@ async fn same_context_targets_restore_their_own_page_attachment_id_and_request_c
let bc = ctx.conn.browser_context.as_ref().expect("browser context");
assert_eq!(bc.active_target_id(), Some("TID-000000000A"));
assert_eq!(
- bc.active_target
+ bc.active_page_state()
+ .active_target
.runtime_slot
.page_attachment_id()
.map(crate::conn::TargetPageAttachmentId::get),
@@ -921,13 +970,15 @@ async fn same_context_targets_restore_their_own_page_attachment_id_and_request_c
assert_eq!(bc.next_network_request_sequence_for_test(), 41);
assert_eq!(bc.subresource_network_emitted_record_count_for_test(), 12);
assert_eq!(
- bc.active_target
+ bc.active_page_state()
+ .active_target
.runtime_slot
.next_fetch_request_id_for_test(),
4
);
assert_eq!(
- bc.active_target
+ bc.active_page_state()
+ .active_target
.runtime_slot
.next_subresource_fetch_request_id_for_test(),
5
@@ -941,7 +992,8 @@ async fn same_context_targets_restore_their_own_page_attachment_id_and_request_c
let bc = ctx.conn.browser_context.as_ref().expect("browser context");
assert_eq!(bc.active_target_id(), Some(second_target_id.as_str()));
assert_eq!(
- bc.active_target
+ bc.active_page_state()
+ .active_target
.runtime_slot
.page_attachment_id()
.map(crate::conn::TargetPageAttachmentId::get),
@@ -950,13 +1002,15 @@ async fn same_context_targets_restore_their_own_page_attachment_id_and_request_c
assert_eq!(bc.next_network_request_sequence_for_test(), 71);
assert_eq!(bc.subresource_network_emitted_record_count_for_test(), 8);
assert_eq!(
- bc.active_target
+ bc.active_page_state()
+ .active_target
.runtime_slot
.next_fetch_request_id_for_test(),
9
);
assert_eq!(
- bc.active_target
+ bc.active_page_state()
+ .active_target
.runtime_slot
.next_subresource_fetch_request_id_for_test(),
10
@@ -1268,12 +1322,17 @@ async fn same_context_targets_restore_their_own_crash_state_after_session_scoped
.browser_context
.as_mut()
.unwrap()
+ .active_page_state_mut()
.active_target
.owner_state
.target_crash_state
.mark_crashed();
- ctx.conn.browser_context.as_mut().unwrap().devtools_sessions
- [moli_page_types::DevToolsSessionKey::Primary]
+ ctx.conn
+ .browser_context
+ .as_mut()
+ .unwrap()
+ .active_page_state_mut()
+ .devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.runtime_session_state
.record_inspector_target_crashed();
@@ -1331,6 +1390,7 @@ async fn same_context_targets_restore_their_own_crash_state_after_session_scoped
.browser_context
.as_ref()
.expect("active browser context")
+ .active_page_state()
.active_target
.owner_state
.target_crash_state
@@ -1382,6 +1442,7 @@ async fn same_context_targets_restore_their_own_crash_state_after_session_scoped
.browser_context
.as_ref()
.expect("browser context")
+ .active_page_state()
.active_target
.owner_state
.target_crash_state
@@ -1406,6 +1467,7 @@ async fn same_context_targets_restore_their_own_crash_state_after_session_scoped
.browser_context
.as_ref()
.expect("browser context")
+ .active_page_state()
.active_target
.owner_state
.target_crash_state
@@ -1525,20 +1587,20 @@ async fn same_context_targets_restore_their_own_domain_enablement_after_session_
.as_ref()
.expect("active browser context");
assert_eq!(bc.active_target_id(), Some("TID-000000000DS"));
- assert!(bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary].page_session_state.page_lifecycle_events);
- assert!(bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary].runtime_session_state.runtime_frontend_enabled);
- assert!(bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary].runtime_session_state.inspector_enabled);
+ assert!(bc.active_page_state().devtools_sessions[moli_page_types::DevToolsSessionKey::Primary].page_session_state.page_lifecycle_events);
+ assert!(bc.active_page_state().devtools_sessions[moli_page_types::DevToolsSessionKey::Primary].runtime_session_state.runtime_frontend_enabled);
+ assert!(bc.active_page_state().devtools_sessions[moli_page_types::DevToolsSessionKey::Primary].runtime_session_state.inspector_enabled);
assert!(
- bc.active_target
+ bc.active_page_state().active_target
.runtime_slot
.primary_network_events_enabled()
);
- assert!(bc.network_policy.cache_disabled());
- assert!(bc.network_policy.bypass_service_worker());
- assert!(bc.css_enabled);
- assert!(bc.active_target.fetch_owner.is_enabled());
- assert!(bc.active_target.fetch_owner.handle_auth_requests());
- let fetch_config = bc.active_target.fetch_owner.config_snapshot();
+ assert!(bc.active_page_state().network_policy.cache_disabled());
+ assert!(bc.active_page_state().network_policy.bypass_service_worker());
+ assert!(bc.active_page_state().css_enabled);
+ assert!(bc.active_page_state().active_target.fetch_owner.is_enabled());
+ assert!(bc.active_page_state().active_target.fetch_owner.handle_auth_requests());
+ let fetch_config = bc.active_page_state().active_target.fetch_owner.config_snapshot();
assert_eq!(fetch_config.patterns().len(), 1);
assert_eq!(fetch_config.patterns()[0].url_pattern, "*target-a*");
assert_eq!(
@@ -1563,20 +1625,20 @@ async fn same_context_targets_restore_their_own_domain_enablement_after_session_
.as_ref()
.expect("active browser context after session-scoped promotion");
assert_eq!(bc.active_target_id(), Some(second_target_id.as_str()));
- assert!(!bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary].page_session_state.page_lifecycle_events);
- assert!(bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary].runtime_session_state.runtime_frontend_enabled);
- assert!(!bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary].runtime_session_state.inspector_enabled);
+ assert!(!bc.active_page_state().devtools_sessions[moli_page_types::DevToolsSessionKey::Primary].page_session_state.page_lifecycle_events);
+ assert!(bc.active_page_state().devtools_sessions[moli_page_types::DevToolsSessionKey::Primary].runtime_session_state.runtime_frontend_enabled);
+ assert!(!bc.active_page_state().devtools_sessions[moli_page_types::DevToolsSessionKey::Primary].runtime_session_state.inspector_enabled);
assert!(
- bc.active_target
+ bc.active_page_state().active_target
.runtime_slot
.primary_network_events_enabled()
);
- assert!(!bc.network_policy.cache_disabled());
- assert!(!bc.network_policy.bypass_service_worker());
- assert!(!bc.css_enabled);
- assert!(bc.active_target.fetch_owner.is_enabled());
- assert!(!bc.active_target.fetch_owner.handle_auth_requests());
- let fetch_config = bc.active_target.fetch_owner.config_snapshot();
+ assert!(!bc.active_page_state().network_policy.cache_disabled());
+ assert!(!bc.active_page_state().network_policy.bypass_service_worker());
+ assert!(!bc.active_page_state().css_enabled);
+ assert!(bc.active_page_state().active_target.fetch_owner.is_enabled());
+ assert!(!bc.active_page_state().active_target.fetch_owner.handle_auth_requests());
+ let fetch_config = bc.active_page_state().active_target.fetch_owner.config_snapshot();
assert_eq!(fetch_config.patterns().len(), 1);
assert_eq!(fetch_config.patterns()[0].url_pattern, "*target-b*");
assert_eq!(
@@ -1601,20 +1663,20 @@ async fn same_context_targets_restore_their_own_domain_enablement_after_session_
.as_ref()
.expect("active browser context after restoring first target");
assert_eq!(bc.active_target_id(), Some("TID-000000000DS"));
- assert!(bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary].page_session_state.page_lifecycle_events);
- assert!(bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary].runtime_session_state.runtime_frontend_enabled);
- assert!(bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary].runtime_session_state.inspector_enabled);
+ assert!(bc.active_page_state().devtools_sessions[moli_page_types::DevToolsSessionKey::Primary].page_session_state.page_lifecycle_events);
+ assert!(bc.active_page_state().devtools_sessions[moli_page_types::DevToolsSessionKey::Primary].runtime_session_state.runtime_frontend_enabled);
+ assert!(bc.active_page_state().devtools_sessions[moli_page_types::DevToolsSessionKey::Primary].runtime_session_state.inspector_enabled);
assert!(
- bc.active_target
+ bc.active_page_state().active_target
.runtime_slot
.primary_network_events_enabled()
);
- assert!(bc.network_policy.cache_disabled());
- assert!(bc.network_policy.bypass_service_worker());
- assert!(bc.css_enabled);
- assert!(bc.active_target.fetch_owner.is_enabled());
- assert!(bc.active_target.fetch_owner.handle_auth_requests());
- let fetch_config = bc.active_target.fetch_owner.config_snapshot();
+ assert!(bc.active_page_state().network_policy.cache_disabled());
+ assert!(bc.active_page_state().network_policy.bypass_service_worker());
+ assert!(bc.active_page_state().css_enabled);
+ assert!(bc.active_page_state().active_target.fetch_owner.is_enabled());
+ assert!(bc.active_page_state().active_target.fetch_owner.handle_auth_requests());
+ let fetch_config = bc.active_page_state().active_target.fetch_owner.config_snapshot();
assert_eq!(fetch_config.patterns().len(), 1);
assert_eq!(fetch_config.patterns()[0].url_pattern, "*target-a*");
assert_eq!(
diff --git a/moli-protocol/src/domains/target/tests/tests_same_context_target_local.rs b/moli-protocol/src/domains/target/tests/tests_same_context_target_local.rs
index 35c67d3cf..fe62417c0 100644
--- a/moli-protocol/src/domains/target/tests/tests_same_context_target_local.rs
+++ b/moli-protocol/src/domains/target/tests/tests_same_context_target_local.rs
@@ -1886,10 +1886,11 @@ async fn close_target_aborts_paused_request_stage_navigation() {
let mut bc = BrowserContext::new("BID-9".into());
bc.set_active_target_id("TID-000000000A");
bc.attach_active_session("SID-1");
- bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ bc.active_page_state_mut().devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.runtime_session_state
.inspector_enabled = true;
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -2592,6 +2593,12 @@ async fn playwright_over_cdp_context_target_attach_and_navigate_smoke() {
assert_eq!(active.id, browser_context_id);
assert_eq!(active.active_target_id(), Some(target_id.as_str()));
assert_eq!(active.active_session_id(), Some(session_id.as_str()));
- assert_eq!(active.locale_override.as_deref(), Some("fr-FR"));
- assert_eq!(active.timezone_override.as_deref(), Some("UTC"));
+ assert_eq!(
+ active.active_page_state().locale_override.as_deref(),
+ Some("fr-FR")
+ );
+ assert_eq!(
+ active.active_page_state().timezone_override.as_deref(),
+ Some("UTC")
+ );
}
diff --git a/moli-protocol/src/domains/target/tests/tests_target_attachment.rs b/moli-protocol/src/domains/target/tests/tests_target_attachment.rs
index bb3bae6f1..c893ddb34 100644
--- a/moli-protocol/src/domains/target/tests/tests_target_attachment.rs
+++ b/moli-protocol/src/domains/target/tests/tests_target_attachment.rs
@@ -1481,7 +1481,8 @@ async fn attach_to_target_from_browser_session_creates_distinct_auxiliary_sessio
let bc = ctx.conn.browser_context.as_ref().unwrap();
assert!(
- bc.active_target
+ bc.active_page_state()
+ .active_target
.runtime_slot
.has_auxiliary_network_events_for_session(target_session_id)
);
@@ -1547,34 +1548,39 @@ async fn detach_from_target() {
ctx.expect_result(11, json!({ "sessionId": sid }), None);
let bc = ctx.conn.browser_context.as_mut().unwrap();
- bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ bc.active_page_state_mut().devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.page_session_state
.page_lifecycle_events = true;
- bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ bc.active_page_state_mut().devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.runtime_session_state
.runtime_frontend_enabled = true;
- bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ bc.active_page_state_mut().devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.runtime_session_state
.inspector_enabled = true;
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.enable_primary_network_events();
- bc.mutate_devtools_network_session_state(false, None, |network| {
- network.network_enabled = true;
- network.cache_disabled = true;
- network.bypass_service_worker = true;
- network.extra_headers = vec![("X-Test".into(), "1".into())];
- });
- bc.css_enabled = true;
- bc.active_target.fetch_owner.configure(
- None,
- true,
- vec![crate::conn::FetchInterceptionPattern {
- url_pattern: "*".into(),
- resource_type_filter: None,
- request_stage: crate::conn::FetchRequestStage::Request,
- }],
- );
+ bc.active_page_state_mut()
+ .mutate_devtools_network_session_state(false, None, |network| {
+ network.network_enabled = true;
+ network.cache_disabled = true;
+ network.bypass_service_worker = true;
+ network.extra_headers = vec![("X-Test".into(), "1".into())];
+ });
+ bc.active_page_state_mut().css_enabled = true;
+ bc.active_page_state_mut()
+ .active_target
+ .fetch_owner
+ .configure(
+ None,
+ true,
+ vec![crate::conn::FetchInterceptionPattern {
+ url_pattern: "*".into(),
+ resource_type_filter: None,
+ request_stage: crate::conn::FetchRequestStage::Request,
+ }],
+ );
ctx.process_async(json!({"id": 12, "method": "Target.detachFromTarget",
"params": {"targetId": tid}}))
@@ -1583,38 +1589,59 @@ async fn detach_from_target() {
let bc = ctx.conn.browser_context.as_ref().unwrap();
assert!(!bc.has_active_session());
assert!(
- !bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ !bc.active_page_state().devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.page_session_state
.page_lifecycle_events
);
assert!(
- !bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ !bc.active_page_state().devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.runtime_session_state
.runtime_frontend_enabled
);
assert!(
- !bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ !bc.active_page_state().devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.runtime_session_state
.inspector_enabled
);
assert!(
- !bc.active_target
+ !bc.active_page_state()
+ .active_target
.runtime_slot
.primary_network_events_enabled()
);
- assert!(!bc.network_policy.cache_disabled());
- assert!(!bc.network_policy.bypass_service_worker());
- assert!(!bc.css_enabled);
- assert!(!bc.active_target.fetch_owner.is_enabled());
- assert!(!bc.active_target.fetch_owner.handle_auth_requests());
+ assert!(!bc.active_page_state().network_policy.cache_disabled());
+ assert!(
+ !bc.active_page_state()
+ .network_policy
+ .bypass_service_worker()
+ );
+ assert!(!bc.active_page_state().css_enabled);
assert!(
- bc.active_target
+ !bc.active_page_state()
+ .active_target
+ .fetch_owner
+ .is_enabled()
+ );
+ assert!(
+ !bc.active_page_state()
+ .active_target
+ .fetch_owner
+ .handle_auth_requests()
+ );
+ assert!(
+ bc.active_page_state()
+ .active_target
.fetch_owner
.config_snapshot()
.patterns()
.is_empty()
);
- assert!(bc.network_policy.extra_headers().is_empty());
+ assert!(
+ bc.active_page_state()
+ .network_policy
+ .extra_headers()
+ .is_empty()
+ );
// Attach again after detach.
ctx.process_async(json!({"id": 13, "method": "Target.attachToTarget",
@@ -1893,6 +1920,7 @@ async fn detach_from_target_removes_only_selected_session_document_start_scripts
.browser_context
.as_ref()
.unwrap()
+ .active_page_state()
.active_target
.owner_state;
assert_eq!(owner_state.document_start_scripts.len(), 2);
@@ -1944,6 +1972,7 @@ async fn detach_from_target_removes_only_selected_session_document_start_scripts
.browser_context
.as_ref()
.unwrap()
+ .active_page_state()
.active_target
.owner_state;
assert_eq!(owner_state.document_start_scripts.len(), 1);
@@ -1992,7 +2021,12 @@ async fn page_renderer_inspector_session_count(ctx: &mut TestContext) -> u64 {
.conn
.browser_context
.as_mut()
- .and_then(|bc| bc.active_target.runtime_slot.loaded_page_mut())
+ .and_then(|bc| {
+ bc.active_page_state_mut()
+ .active_target
+ .runtime_slot
+ .loaded_page_mut()
+ })
.expect("active target should still have a loaded page")
.runtime_heap_usage_async()
.await
@@ -2125,7 +2159,8 @@ async fn detach_from_target_aborts_paused_request_stage_navigation() {
let mut bc = BrowserContext::new("BID-9".into());
bc.set_active_target_id("TID-000000000A");
bc.attach_active_session("SID-1");
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -2178,13 +2213,20 @@ async fn detach_from_target_aborts_paused_request_stage_navigation() {
assert!(!bc.has_active_session());
assert_eq!(bc.active_target_id(), Some("TID-000000000A"));
assert!(
- !bc.active_target
+ !bc.active_page_state()
+ .active_target
.fetch_owner
.has_pending_fetch_state_for_test()
);
- assert!(!bc.active_target.fetch_owner.is_enabled());
assert!(
- !bc.active_target
+ !bc.active_page_state()
+ .active_target
+ .fetch_owner
+ .is_enabled()
+ );
+ assert!(
+ !bc.active_page_state()
+ .active_target
.runtime_slot
.primary_network_events_enabled()
);
@@ -2198,34 +2240,39 @@ async fn set_auto_attach_false_detaches_existing_target() {
load_bc_with_target(&mut ctx, "BID-9", "TID-000000000D");
let bc = ctx.conn.browser_context.as_mut().unwrap();
bc.attach_active_session("SID-1");
- bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ bc.active_page_state_mut().devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.page_session_state
.page_lifecycle_events = true;
- bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ bc.active_page_state_mut().devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.runtime_session_state
.runtime_frontend_enabled = true;
- bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ bc.active_page_state_mut().devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.runtime_session_state
.inspector_enabled = true;
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.enable_primary_network_events();
- bc.mutate_devtools_network_session_state(false, None, |network| {
- network.network_enabled = true;
- network.cache_disabled = true;
- network.bypass_service_worker = true;
- network.extra_headers = vec![("X-Test".into(), "1".into())];
- });
- bc.css_enabled = true;
- bc.active_target.fetch_owner.configure(
- None,
- true,
- vec![crate::conn::FetchInterceptionPattern {
- url_pattern: "*".into(),
- resource_type_filter: None,
- request_stage: crate::conn::FetchRequestStage::Request,
- }],
- );
+ bc.active_page_state_mut()
+ .mutate_devtools_network_session_state(false, None, |network| {
+ network.network_enabled = true;
+ network.cache_disabled = true;
+ network.bypass_service_worker = true;
+ network.extra_headers = vec![("X-Test".into(), "1".into())];
+ });
+ bc.active_page_state_mut().css_enabled = true;
+ bc.active_page_state_mut()
+ .active_target
+ .fetch_owner
+ .configure(
+ None,
+ true,
+ vec![crate::conn::FetchInterceptionPattern {
+ url_pattern: "*".into(),
+ resource_type_filter: None,
+ request_stage: crate::conn::FetchRequestStage::Request,
+ }],
+ );
ctx.conn.auto_attach = true;
ctx.process_async(json!({
@@ -2266,38 +2313,59 @@ async fn set_auto_attach_false_detaches_existing_target() {
assert!(!bc.has_active_session());
assert_eq!(bc.active_target_id(), Some("TID-000000000D"));
assert!(
- !bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ !bc.active_page_state().devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.page_session_state
.page_lifecycle_events
);
assert!(
- !bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ !bc.active_page_state().devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.runtime_session_state
.runtime_frontend_enabled
);
assert!(
- !bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ !bc.active_page_state().devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.runtime_session_state
.inspector_enabled
);
assert!(
- !bc.active_target
+ !bc.active_page_state()
+ .active_target
.runtime_slot
.primary_network_events_enabled()
);
- assert!(!bc.network_policy.cache_disabled());
- assert!(!bc.network_policy.bypass_service_worker());
- assert!(!bc.css_enabled);
- assert!(!bc.active_target.fetch_owner.is_enabled());
- assert!(!bc.active_target.fetch_owner.handle_auth_requests());
+ assert!(!bc.active_page_state().network_policy.cache_disabled());
+ assert!(
+ !bc.active_page_state()
+ .network_policy
+ .bypass_service_worker()
+ );
+ assert!(!bc.active_page_state().css_enabled);
assert!(
- bc.active_target
+ !bc.active_page_state()
+ .active_target
+ .fetch_owner
+ .is_enabled()
+ );
+ assert!(
+ !bc.active_page_state()
+ .active_target
+ .fetch_owner
+ .handle_auth_requests()
+ );
+ assert!(
+ bc.active_page_state()
+ .active_target
.fetch_owner
.config_snapshot()
.patterns()
.is_empty()
);
- assert!(bc.network_policy.extra_headers().is_empty());
+ assert!(
+ bc.active_page_state()
+ .network_policy
+ .extra_headers()
+ .is_empty()
+ );
assert!(!ctx.conn.auto_attach);
}
diff --git a/moli-protocol/src/domains/target/tests/tests_target_basics.rs b/moli-protocol/src/domains/target/tests/tests_target_basics.rs
index e4e77fe10..863a2f060 100644
--- a/moli-protocol/src/domains/target/tests/tests_target_basics.rs
+++ b/moli-protocol/src/domains/target/tests/tests_target_basics.rs
@@ -251,10 +251,11 @@ async fn dispose_browser_context_aborts_paused_request_stage_navigation() {
let mut bc = BrowserContext::new("BID-9".into());
bc.set_active_target_id("TID-000000000A");
bc.attach_active_session("SID-1");
- bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ bc.active_page_state_mut().devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.runtime_session_state
.inspector_enabled = true;
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -1625,10 +1626,12 @@ async fn same_context_targets_do_not_replay_bare_isolated_worlds_after_switching
{
let bc = ctx.conn.browser_context.as_mut().expect("browser context");
let _ = bc
+ .active_page_state_mut()
.active_target
.runtime_slot
.replace_loaded_page(Some(first_page));
- bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ bc.active_page_state_mut().devtools_sessions
+ [moli_page_types::DevToolsSessionKey::Primary]
.runtime_session_state
.runtime_frontend_enabled = true;
}
@@ -1718,8 +1721,12 @@ async fn same_context_targets_do_not_replay_bare_isolated_worlds_after_switching
second_promote["result"]["result"]["value"],
json!("second-target")
);
- ctx.conn.browser_context.as_mut().unwrap().devtools_sessions
- [moli_page_types::DevToolsSessionKey::Primary]
+ ctx.conn
+ .browser_context
+ .as_mut()
+ .unwrap()
+ .active_page_state_mut()
+ .devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.runtime_session_state
.runtime_frontend_enabled = true;
@@ -1752,8 +1759,12 @@ async fn same_context_targets_do_not_replay_bare_isolated_worlds_after_switching
.is_empty(),
"target activation must not turn a document-scoped world into persistent state"
);
- ctx.conn.browser_context.as_mut().unwrap().devtools_sessions
- [moli_page_types::DevToolsSessionKey::Primary]
+ ctx.conn
+ .browser_context
+ .as_mut()
+ .unwrap()
+ .active_page_state_mut()
+ .devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.runtime_session_state
.runtime_frontend_enabled = true;
let target_a_replay_url =
@@ -1813,8 +1824,12 @@ async fn same_context_targets_do_not_replay_bare_isolated_worlds_after_switching
}))
.await;
ctx.expect_result(104157, json!({}), None);
- ctx.conn.browser_context.as_mut().unwrap().devtools_sessions
- [moli_page_types::DevToolsSessionKey::Primary]
+ ctx.conn
+ .browser_context
+ .as_mut()
+ .unwrap()
+ .active_page_state_mut()
+ .devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.runtime_session_state
.runtime_frontend_enabled = true;
diff --git a/moli-protocol/src/domains/target/tests/tests_target_creation.rs b/moli-protocol/src/domains/target/tests/tests_target_creation.rs
index d2a496a2e..bde4f789f 100644
--- a/moli-protocol/src/domains/target/tests/tests_target_creation.rs
+++ b/moli-protocol/src/domains/target/tests/tests_target_creation.rs
@@ -28,6 +28,7 @@ async fn create_target_clears_stale_crash_state() {
.browser_context
.as_mut()
.unwrap()
+ .active_page_state_mut()
.active_target
.owner_state
.target_crash_state
@@ -50,6 +51,7 @@ async fn create_target_clears_stale_crash_state() {
.browser_context
.as_ref()
.expect("browser context")
+ .active_page_state()
.active_target
.owner_state
.target_crash_state
@@ -1085,6 +1087,7 @@ async fn window_open_hands_off_session_storage_snapshot_and_initial_storage_key(
let browser_context = ctx.conn.browser_context.as_mut().unwrap();
browser_context.set_target_url(page.final_url().as_str().to_owned());
let _ = browser_context
+ .active_page_state_mut()
.active_target
.runtime_slot
.replace_loaded_page(Some(page));
@@ -2173,7 +2176,7 @@ async fn anchor_left_click_activates_popup_while_initial_navigation_waits_for_de
);
assert!(
browser_context
- .active_target
+ .active_page_state().active_target
.runtime_slot
.loaded_page()
.is_some_and(|page| moli_url::is_about_blank(page.final_url())),
@@ -2192,7 +2195,7 @@ async fn anchor_left_click_activates_popup_while_initial_navigation_waits_for_de
.is_some_and(|browser_context| {
browser_context.active_target_id() == Some(popup_target_id.as_str())
&& browser_context
- .active_target
+ .active_page_state().active_target
.runtime_slot
.loaded_page()
.is_some_and(|page| page.final_url().as_str() == POPUP_URL)
diff --git a/moli-protocol/src/domains/target/tests/tests_target_management.rs b/moli-protocol/src/domains/target/tests/tests_target_management.rs
index 87dbbf9a4..4dcdd42b1 100644
--- a/moli-protocol/src/domains/target/tests/tests_target_management.rs
+++ b/moli-protocol/src/domains/target/tests/tests_target_management.rs
@@ -38,43 +38,50 @@ async fn close_target_success() {
let mut ctx = TestContext::new();
load_bc_with_target(&mut ctx, "BID-9", "TID-000000000A");
let bc = ctx.conn.browser_context.as_mut().unwrap();
- bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ bc.active_page_state_mut().devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.page_session_state
.page_lifecycle_events = true;
- bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ bc.active_page_state_mut().devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.runtime_session_state
.runtime_frontend_enabled = true;
- bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ bc.active_page_state_mut().devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.runtime_session_state
.inspector_enabled = true;
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.enable_primary_network_events();
- bc.mutate_devtools_network_session_state(false, None, |network| {
- network.network_enabled = true;
- network.cache_disabled = true;
- network.bypass_service_worker = true;
- network.extra_headers = vec![("X-Test".into(), "1".into())];
- });
- bc.css_enabled = true;
- bc.active_target.fetch_owner.configure(
- None,
- true,
- vec![crate::conn::FetchInterceptionPattern {
- url_pattern: "*".into(),
- resource_type_filter: None,
- request_stage: crate::conn::FetchRequestStage::Response,
- }],
- );
+ bc.active_page_state_mut()
+ .mutate_devtools_network_session_state(false, None, |network| {
+ network.network_enabled = true;
+ network.cache_disabled = true;
+ network.bypass_service_worker = true;
+ network.extra_headers = vec![("X-Test".into(), "1".into())];
+ });
+ bc.active_page_state_mut().css_enabled = true;
+ bc.active_page_state_mut()
+ .active_target
+ .fetch_owner
+ .configure(
+ None,
+ true,
+ vec![crate::conn::FetchInterceptionPattern {
+ url_pattern: "*".into(),
+ resource_type_filter: None,
+ request_stage: crate::conn::FetchRequestStage::Response,
+ }],
+ );
bc.set_target_security_origin("https://old.example".into());
bc.set_target_secure_context_type("InsecureScheme".into());
bc.set_next_network_request_sequence_for_test(41);
bc.set_subresource_network_emitted_record_count_for_test(12);
bc.set_next_io_stream_sequence_for_test(7);
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.set_next_subresource_fetch_request_id_for_test(5);
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.owner_state
.target_crash_state
.mark_crashed();
@@ -298,7 +305,7 @@ async fn close_target_emits_detached_events() {
let bc = ctx.conn.browser_context.as_mut().unwrap();
bc.attach_active_session(session_id.clone());
assert!(bc.assign_auxiliary_session_to_target("TID-000000000A", "SID-aux".into()));
- bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ bc.active_page_state_mut().devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.runtime_session_state
.inspector_enabled = true;
@@ -586,10 +593,11 @@ async fn close_target_aborts_paused_request_stage_navigation() {
let mut bc = BrowserContext::new("BID-9".into());
bc.set_active_target_id("TID-000000000A");
bc.attach_active_session("SID-1");
- bc.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
+ bc.active_page_state_mut().devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.runtime_session_state
.inspector_enabled = true;
- bc.active_target
+ bc.active_page_state_mut()
+ .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
diff --git a/moli-protocol/src/domains/target/worker_target.rs b/moli-protocol/src/domains/target/worker_target.rs
index f2764cf79..e70d09679 100644
--- a/moli-protocol/src/domains/target/worker_target.rs
+++ b/moli-protocol/src/domains/target/worker_target.rs
@@ -24,11 +24,11 @@ use moli_shared_worker::SharedWorkerInstanceId;
use serde_json::json;
use url::Url;
+use crate::devtools_runtime::{DevToolsNetworkResourceType, RuntimeExecutionContextsClearedEvent};
+#[cfg(test)]
use crate::devtools_runtime::{
- DevToolsNetworkResourceType, DevToolsTargetKind, RuntimeExecutionContextsClearedEvent,
+ DevToolsTargetInfo, DevToolsTargetKind, RuntimeExecutionContextEvent,
};
-#[cfg(test)]
-use crate::devtools_runtime::{DevToolsTargetInfo, RuntimeExecutionContextEvent};
use crate::{
conn::{
BackgroundProtocolEvent, CdpConnection, PreparedTargetAttach, PreparedTargetHostDelta,
@@ -738,7 +738,6 @@ fn register_dedicated_worker_target(
.then(|| context.devtools_target_info(&target_id))
.flatten()
};
- conn.register_worker_target_host(&target_id, DevToolsTargetKind::Worker);
if let Some(target_info) = created_snapshot {
outputs.push(WorkerTargetLifecycleOutput::DedicatedWorkerCreated {
browser_context_id: browser_context_id.to_owned(),
@@ -1273,7 +1272,6 @@ async fn commit_dedicated_worker_retirement_output_async(
if removed.is_none() {
return Ok(events);
}
- conn.remove_worker_target_host(&target_id);
if let Some(target_delta) = target_delta {
events.extend(conn.prepared_target_host_delta_event_plan(target_delta));
}
@@ -1320,8 +1318,6 @@ fn commit_failed_dedicated_worker_retirement_sync(
if removed.is_none() {
return Vec::new();
}
- conn.remove_worker_target_host(&target_id);
-
let mut events = Vec::new();
for output in outputs.worker_target_lifecycle_outputs {
match output {
@@ -1589,7 +1585,6 @@ fn register_shared_worker_target(
));
}
}
- conn.register_worker_target_host(&target_id, DevToolsTargetKind::SharedWorker);
if let Some(target_info) = created_snapshot {
outputs.push(WorkerTargetLifecycleOutput::SharedWorkerCreated {
target_delta: PreparedTargetHostDelta::created(target_id.clone(), Some(target_info)),
@@ -1710,7 +1705,6 @@ fn register_service_worker_target_with_active_run(
attached_outputs.push((attachment, prepared_attach));
}
}
- conn.register_worker_target_host(&target_id, DevToolsTargetKind::ServiceWorker);
if let Some(target_info) = created_snapshot {
outputs.push(WorkerTargetLifecycleOutput::ServiceWorkerCreated {
version: version.clone(),
@@ -2015,7 +2009,6 @@ fn remove_shared_worker_target_with_reason(
else {
return outputs;
};
- conn.remove_worker_target_host(&target_id);
let session_ids = target.session_ids();
let mut pending_await_direct_outputs = Vec::new();
let mut pending_await_claimed_outputs = Vec::new();
@@ -2161,7 +2154,6 @@ fn remove_service_worker_target_with_reason(
.version_identity(browser_context_id)
.expect("removed service-worker target must retain its exact version identity");
let run_retirement = target.take_current_run_retirement(browser_context_id);
- conn.remove_worker_target_host(&target_id);
let deleted_events = service_worker::deleted_target_events(
&target,
registration_deleted,
@@ -3712,6 +3704,7 @@ mod tests {
let mut context = BrowserContext::new("BID-1".to_owned());
context.set_active_target_id("TID-page");
let page_attachment_id = context
+ .active_page_state_mut()
.active_target
.runtime_slot
.set_page_attachment_id_for_test(1);
@@ -4688,11 +4681,10 @@ mod tests {
String::new(),
Vec::new(),
));
- conn.register_worker_target_host(&retained_target_id, DevToolsTargetKind::Worker);
-
conn.browser_context
.as_mut()
.unwrap()
+ .active_page_state_mut()
.active_target
.runtime_slot
.replace_page_attachment_id_for_test();