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): centralize page session ownership

ldm0c14280e086b7
diff --git a/moli-protocol/src/conn.rs b/moli-protocol/src/conn.rs
index e23eff235..140f21a6d 100644
--- a/moli-protocol/src/conn.rs
+++ b/moli-protocol/src/conn.rs
@@ -548,7 +548,7 @@ pub use state::{
EmulatedGeolocationOverrideState, EmulatedMediaOverrides, IsolatedWorldDefinition,
LoadedNavigation, NavigationDispatchState, NavigationLoadOutcome, NavigationRequestLoadPolicy,
PageNavigationHistoryEntry, PageTargetHost, PendingNavigationHistoryUpdate,
- RuntimeBindingDefinition, TargetInfo, TargetPageState, URL_BASE,
+ RuntimeBindingDefinition, TargetInfo, URL_BASE,
};
pub(crate) use state::{
BrowserContextPageStorageHandles, BrowserContextResourceStorageHandles,
diff --git a/moli-protocol/src/conn/browser_context/fetch_owner.rs b/moli-protocol/src/conn/browser_context/fetch_owner.rs
index ad0ad8cdb..644b86579 100644
--- a/moli-protocol/src/conn/browser_context/fetch_owner.rs
+++ b/moli-protocol/src/conn/browser_context/fetch_owner.rs
@@ -104,7 +104,7 @@ fn fetch_body_stream_owner_for_target_mut<'a>(
) -> Option<SessionFetchBodyStreamOwner<'a>> {
let owner_key = fetch_stream_owner_key(&browser_context.id, target_id);
let target = browser_context.page_target_mut(target_id)?;
- let active_target = &mut target.state_mut().active_target;
+ let active_target = target.state_mut();
Some(SessionFetchBodyStreamOwner {
owner_key,
fetch_owner: &mut active_target.fetch_owner,
@@ -196,16 +196,10 @@ fn remove_network_intercept_from_browser_context(
intercept_id: &str,
) -> Result<Option<Option<moli_core::page::PendingPageCommand>>, String> {
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) = target
- .active_target
- .fetch_owner
- .subresource_interception_config();
- let Some(page) = target.active_target.runtime_slot.loaded_page_mut() else {
+ if target.fetch_owner.remove_network_intercept(intercept_id) {
+ let (subresource_enabled, subresource_resource_type) =
+ target.fetch_owner.subresource_interception_config();
+ let Some(page) = target.runtime_slot.loaded_page_mut() else {
return Ok(Some(None));
};
return page
diff --git a/moli-protocol/src/conn/browser_context/network_owner.rs b/moli-protocol/src/conn/browser_context/network_owner.rs
index b0800dab7..bd1c70f8b 100644
--- a/moli-protocol/src/conn/browser_context/network_owner.rs
+++ b/moli-protocol/src/conn/browser_context/network_owner.rs
@@ -229,7 +229,7 @@ impl TargetSessionOwnerMut<'_> {
f: impl FnOnce(&mut crate::conn::state::DevToolsNetworkSessionState) -> T,
) -> Option<T> {
fn mutate<T>(
- page_state: &mut crate::conn::state::TargetPageState,
+ page_state: &mut crate::conn::state::PageTargetHost,
session_id: Option<&str>,
is_auxiliary_target_session: bool,
f: impl FnOnce(&mut crate::conn::state::DevToolsNetworkSessionState) -> T,
@@ -997,7 +997,7 @@ impl CdpConnection {
#[cfg(test)]
mod tests {
use super::*;
- use crate::conn::{PageTargetHost, TargetPageState};
+ use crate::conn::PageTargetHost;
fn active_session_state_mut(browser_context: &mut BrowserContext) -> TargetSessionStateMut<'_> {
let state = browser_context.active_page_state_mut();
@@ -1009,7 +1009,7 @@ mod tests {
}
}
- fn parked_session_state_mut(state: &mut TargetPageState) -> TargetSessionStateMut<'_> {
+ fn parked_session_state_mut(state: &mut PageTargetHost) -> TargetSessionStateMut<'_> {
TargetSessionStateMut::Loaded {
devtools_session_state: &mut state.devtools_sessions
[moli_page_types::DevToolsSessionKey::Primary],
@@ -1148,7 +1148,7 @@ mod tests {
Some("cellular3g")
);
- let mut parked = TargetPageState::default();
+ let mut parked = PageTargetHost::empty("TID-network-owner-test".to_owned());
{
let network = &mut parked.devtools_sessions.primary_mut().network_session_state;
network.network_enabled = true;
diff --git a/moli-protocol/src/conn/browser_context/page_owner.rs b/moli-protocol/src/conn/browser_context/page_owner.rs
index 8f237255c..0d870d163 100644
--- a/moli-protocol/src/conn/browser_context/page_owner.rs
+++ b/moli-protocol/src/conn/browser_context/page_owner.rs
@@ -981,7 +981,7 @@ fn runtime_observable_console_payloads(
#[cfg(test)]
mod tests {
use super::*;
- use crate::conn::TargetPageState;
+ use crate::conn::PageTargetHost;
fn active_session_state_mut(browser_context: &mut BrowserContext) -> TargetSessionStateMut<'_> {
let state = browser_context.active_page_state_mut();
@@ -993,7 +993,7 @@ mod tests {
}
}
- fn parked_session_state_mut(state: &mut TargetPageState) -> TargetSessionStateMut<'_> {
+ fn parked_session_state_mut(state: &mut PageTargetHost) -> TargetSessionStateMut<'_> {
TargetSessionStateMut::Loaded {
devtools_session_state: &mut state.devtools_sessions
[moli_page_types::DevToolsSessionKey::Primary],
@@ -1064,7 +1064,7 @@ mod tests {
.enabled()
);
- let mut parked = TargetPageState::default();
+ let mut parked = PageTargetHost::empty("TID-page-owner-test".to_owned());
parked_session_state_mut(&mut parked).set_console_enabled(true);
parked_session_state_mut(&mut parked).set_log_enabled(true);
parked_session_state_mut(&mut parked).set_page_file_chooser_opened_event_enabled(true);
diff --git a/moli-protocol/src/conn/browser_context/session_owner.rs b/moli-protocol/src/conn/browser_context/session_owner.rs
index 6fdd169b9..1a85ae7c3 100644
--- a/moli-protocol/src/conn/browser_context/session_owner.rs
+++ b/moli-protocol/src/conn/browser_context/session_owner.rs
@@ -1,6 +1,6 @@
#[cfg(test)]
use crate::conn::BrowserContext;
-use crate::conn::{CdpConnection, CdpSessionRoute, TargetPageState};
+use crate::conn::{CdpConnection, CdpSessionRoute, PageTargetHost};
pub(super) enum TargetSessionOwner {
PageTarget {
@@ -26,7 +26,7 @@ impl CdpConnection {
pub(crate) fn mutate_target_page_state_for_session(
&mut self,
session_id: Option<&str>,
- f: impl FnOnce(&mut TargetPageState),
+ f: impl FnOnce(&mut PageTargetHost),
) -> bool {
self.target_session_owner_mut(session_id)
.and_then(|mut owner| owner.mutate_page_state(|state, _, _| f(state)))
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 9c1a9301d..446e46fbc 100644
--- a/moli-protocol/src/conn/browser_context/target_session_owner.rs
+++ b/moli-protocol/src/conn/browser_context/target_session_owner.rs
@@ -2,9 +2,9 @@ use super::session_owner::TargetSessionOwner;
use super::*;
use crate::conn::state::{
BrowserContextPageStorageHandles, BrowserContextResourceStorageHandles, DevToolsSessionState,
- PageNavigationHistoryEntry, RendererMainDocumentCommitSeed, TargetFetchConfig,
+ PageNavigationHistoryEntry, PageTargetHost, RendererMainDocumentCommitSeed, TargetFetchConfig,
TargetNetworkPolicyState, TargetOwnerState, TargetPageAbsenceReason,
- TargetPageResidenceIdentity, TargetPageState, TargetRuntimeSessionState, TargetRuntimeSlot,
+ TargetPageResidenceIdentity, TargetRuntimeSessionState, TargetRuntimeSlot,
};
use crate::conn::{
BackgroundProtocolEvent, ConnectionNetworkRequestIdAllocator, DocumentStartScript,
@@ -457,13 +457,13 @@ fn target_navigation_initiator_url(target_url: &str, loaded_page: Option<&Page>)
url.host_str().is_some().then_some(url)
}
-fn clear_page_runtime_remote_object_tracking(state: &mut crate::conn::state::TargetPageState) {
+fn clear_page_runtime_remote_object_tracking(state: &mut crate::conn::state::PageTargetHost) {
for session in state.devtools_sessions.states_mut() {
session.clear_runtime_remote_object_tracking();
}
}
-fn clear_page_loaded_document_session_state(state: &mut crate::conn::state::TargetPageState) {
+fn clear_page_loaded_document_session_state(state: &mut crate::conn::state::PageTargetHost) {
clear_page_runtime_remote_object_tracking(state);
for session in state.devtools_sessions.states_mut() {
session
@@ -793,7 +793,7 @@ impl<'a> TargetSessionOwnerMut<'a> {
pub(super) fn mutate_page_state<T>(
&mut self,
- f: impl FnOnce(&mut TargetPageState, bool, Option<&str>) -> T,
+ f: impl FnOnce(&mut PageTargetHost, bool, Option<&str>) -> T,
) -> Option<T> {
match self {
Self::PageTarget {
@@ -965,8 +965,12 @@ impl<'a> TargetSessionOwnerMut<'a> {
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 auxiliary_session_ids = target
+ .devtools_sessions
+ .attached_session_ids()
+ .map(str::to_owned)
+ .collect::<Vec<_>>();
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(),
@@ -1538,9 +1542,12 @@ impl CdpConnection {
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 auxiliary_session_ids = target
+ .devtools_sessions
+ .attached_session_ids()
+ .map(str::to_owned)
+ .collect::<Vec<_>>();
let primary_session_id = target.detach_session();
- let auxiliary_session_ids =
- browser_context.remove_auxiliary_sessions_for_target(target_id);
(
target,
primary_session_id,
@@ -1590,7 +1597,6 @@ impl CdpConnection {
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();
browser_context.clear_active_target_session_scoped_state_without_loaded_page();
@@ -1674,9 +1680,13 @@ impl CdpConnection {
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);
- page_session_ids
- .extend(browser_context.remove_auxiliary_sessions_for_target(target_id));
target.map(|mut target| {
+ page_session_ids.extend(
+ target
+ .devtools_sessions
+ .attached_session_ids()
+ .map(str::to_owned),
+ );
if let Some(session_id) = target.detach_session() {
page_session_ids.push(session_id);
}
@@ -2656,7 +2666,6 @@ mod tests {
assert!(
active
.active_page_state()
- .active_target
.owner_state
.target_crash_state
.is_crashed()
@@ -2698,7 +2707,6 @@ mod tests {
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);
browser_context.insert_page_target_host(crate::conn::PageTargetHost::with_url(
@@ -2799,7 +2807,6 @@ mod tests {
assert!(
active
.active_page_state()
- .active_target
.fetch_owner
.has_pending_subresource_fetch_for_test("FETCH-active")
);
@@ -2865,7 +2872,6 @@ mod tests {
assert!(
!active
.active_page_state()
- .active_target
.fetch_owner
.config_snapshot()
.is_enabled()
@@ -2873,7 +2879,6 @@ mod tests {
assert!(
!active
.active_page_state()
- .active_target
.fetch_owner
.has_pending_subresource_fetch_for_test("FETCH-active")
);
@@ -2925,7 +2930,6 @@ mod tests {
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((
"https://active.example/".to_owned(),
@@ -2977,7 +2981,6 @@ mod tests {
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();
active.record_captured_response_body(
@@ -3039,7 +3042,6 @@ mod tests {
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::PageTarget {
@@ -3782,7 +3784,6 @@ mod tests {
));
browser_context
.active_page_state_mut()
- .active_target
.runtime_slot
.set_page_attachment_id_for_test(41);
conn.browser_context = Some(browser_context);
diff --git a/moli-protocol/src/conn/dispatch_tests.rs b/moli-protocol/src/conn/dispatch_tests.rs
index 3f4c04ca6..fb5db48f0 100644
--- a/moli-protocol/src/conn/dispatch_tests.rs
+++ b/moli-protocol/src/conn/dispatch_tests.rs
@@ -1188,7 +1188,6 @@ async fn devtools_runtime_call_function_popup_activity_drains_from_protocol_neut
.as_mut()
.expect("browser context")
.active_page_state_mut()
- .active_target
.runtime_slot
.set_loaded_page_for_test(page);
@@ -2085,7 +2084,6 @@ async fn runtime_enable_uses_background_initial_document_without_adapter() {
assert!(
!browser_context
.active_page_state()
- .active_target
.runtime_slot
.has_loaded_page(),
"Runtime.enable must not install a page on the active target"
@@ -2209,7 +2207,6 @@ async fn page_enable_uses_background_initial_document_without_adapter() {
assert!(
!browser_context
.active_page_state()
- .active_target
.runtime_slot
.has_loaded_page(),
"Page.enable must not install a page on the active target"
@@ -2301,7 +2298,6 @@ async fn initial_document_page_ensure_completion_uses_captured_owner() {
assert!(
!browser_context
.active_page_state()
- .active_target
.runtime_slot
.has_loaded_page(),
"completion must not install the materialized page on the ambient active target"
@@ -2587,7 +2583,6 @@ async fn stale_initial_document_page_build_does_not_overwrite_committed_page() {
);
let initial = browser_context
.active_page_state()
- .active_target
.owner_state
.initial_empty_document_state()
.expect("initial empty document state should remain recorded");
@@ -2711,7 +2706,6 @@ async fn target_lifecycle_ensure_installs_initial_about_blank_page_for_backgroun
assert!(
!browser_context
.active_page_state()
- .active_target
.runtime_slot
.has_loaded_page(),
"background ensure must not install the materialized page on the active target"
@@ -2803,7 +2797,6 @@ async fn devtools_get_realms_succeeds_when_page_loaded_before_session_attach() {
.as_mut()
.expect("browser context")
.active_page_state_mut()
- .active_target
.runtime_slot
.set_loaded_page_for_test(page);
conn.browser_context
@@ -4468,7 +4461,6 @@ async fn devtools_command_applies_window_state_to_document_surface() {
.as_ref()
.expect("browser context")
.active_page_state()
- .active_target
.owner_state
.window_document_hidden(),
"SetWindowState must update the target owner state before applying document surfaces"
@@ -4504,7 +4496,6 @@ async fn devtools_command_applies_window_state_to_document_surface() {
.as_ref()
.expect("browser context")
.active_page_state()
- .active_target
.owner_state
.window_fullscreen(),
"SetWindowState fullscreen must update the target owner before applying document surfaces"
@@ -5303,7 +5294,6 @@ async fn devtools_command_low_backend_node_refs_miss_without_backend_binding() {
.as_mut()
.expect("browser context")
.active_page_state_mut()
- .active_target
.runtime_slot
.loaded_page_mut()
.expect("loaded page");
@@ -5396,7 +5386,6 @@ async fn devtools_command_low_backend_node_refs_miss_without_backend_binding() {
.as_mut()
.expect("browser context")
.active_page_state_mut()
- .active_target
.runtime_slot
.loaded_page_mut()
.expect("loaded page");
@@ -6983,7 +6972,6 @@ async fn command_dispatch_completes_live_browser_permission_without_legacy_fallb
.as_mut()
.expect("browser context")
.active_page_state_mut()
- .active_target
.runtime_slot
.set_loaded_page_for_test(page);
@@ -7038,7 +7026,6 @@ async fn command_dispatch_completes_target_startup_commands_without_legacy_fallb
assert!(
browser_context
.active_page_state()
- .active_target
.runtime_slot
.has_loaded_page(),
"Target.createTarget should complete target lifecycle initial document ensure"
@@ -7363,7 +7350,6 @@ async fn command_dispatch_completes_live_page_preload_without_legacy_fallback()
.as_mut()
.expect("browser context")
.active_page_state_mut()
- .active_target
.runtime_slot
.set_loaded_page_for_test(page);
@@ -7401,7 +7387,6 @@ async fn command_dispatch_completes_live_page_preload_without_legacy_fallback()
.as_ref()
.expect("browser context")
.active_page_state()
- .active_target
.owner_state
.document_start_scripts
.iter()
@@ -7445,7 +7430,6 @@ async fn command_dispatch_completes_live_page_preload_without_legacy_fallback()
.as_ref()
.expect("browser context")
.active_page_state()
- .active_target
.owner_state
.document_start_scripts
.is_empty(),
@@ -7848,7 +7832,6 @@ async fn command_dispatch_completes_live_storage_set_cookies_without_legacy_fall
.as_mut()
.expect("browser context")
.active_page_state_mut()
- .active_target
.runtime_slot
.set_loaded_page_for_test(page);
@@ -7897,7 +7880,6 @@ async fn command_dispatch_completes_live_network_extra_headers_without_legacy_fa
.as_mut()
.expect("browser context")
.active_page_state_mut()
- .active_target
.runtime_slot
.set_loaded_page_for_test(page);
@@ -7935,7 +7917,6 @@ async fn command_dispatch_completes_live_network_blocked_urls_without_legacy_fal
.as_mut()
.expect("browser context")
.active_page_state_mut()
- .active_target
.runtime_slot
.set_loaded_page_for_test(page);
@@ -7973,7 +7954,6 @@ async fn command_dispatch_completes_live_network_set_cookie_without_legacy_fallb
.as_mut()
.expect("browser context")
.active_page_state_mut()
- .active_target
.runtime_slot
.set_loaded_page_for_test(page);
@@ -8019,7 +7999,6 @@ async fn command_dispatch_completes_live_network_emulation_without_legacy_fallba
.as_mut()
.expect("browser context")
.active_page_state_mut()
- .active_target
.runtime_slot
.set_loaded_page_for_test(page);
@@ -8063,7 +8042,6 @@ async fn command_dispatch_completes_live_network_user_agent_without_legacy_fallb
.as_mut()
.expect("browser context")
.active_page_state_mut()
- .active_target
.runtime_slot
.set_loaded_page_for_test(page);
@@ -8101,7 +8079,6 @@ async fn command_dispatch_completes_live_emulation_user_agent_without_legacy_fal
.as_mut()
.expect("browser context")
.active_page_state_mut()
- .active_target
.runtime_slot
.set_loaded_page_for_test(page);
@@ -8141,7 +8118,6 @@ async fn pending_emulation_user_agent_loader_keeps_active_owner_route_across_com
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);
browser_context.stage_background_target(
@@ -8224,7 +8200,6 @@ async fn pending_emulation_timezone_keeps_background_owner_route_across_completi
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);
browser_context.stage_background_target(
@@ -8316,7 +8291,6 @@ async fn command_dispatch_completes_live_emulation_locale_without_legacy_fallbac
.as_mut()
.expect("browser context")
.active_page_state_mut()
- .active_target
.runtime_slot
.set_loaded_page_for_test(page);
@@ -8354,7 +8328,6 @@ async fn command_dispatch_completes_live_security_tls_without_legacy_fallback()
.as_mut()
.expect("browser context")
.active_page_state_mut()
- .active_target
.runtime_slot
.set_loaded_page_for_test(page);
@@ -8395,7 +8368,6 @@ async fn pending_security_tls_keeps_background_owner_route_across_completion() {
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);
browser_context.stage_background_target(
@@ -8481,7 +8453,6 @@ async fn command_dispatch_completes_live_fetch_enable_without_legacy_fallback()
.as_mut()
.expect("browser context")
.active_page_state_mut()
- .active_target
.runtime_slot
.set_loaded_page_for_test(page);
@@ -8544,7 +8515,6 @@ async fn devtools_network_intercept_commands_route_to_fetch_owner() {
.as_ref()
.expect("browser context")
.active_page_state()
- .active_target
.fetch_owner
.is_enabled(),
"unknown context intercept should not mutate active fetch config"
@@ -8578,7 +8548,6 @@ async fn devtools_network_intercept_commands_route_to_fetch_owner() {
.as_ref()
.expect("browser context")
.active_page_state()
- .active_target
.fetch_owner
.config_snapshot();
assert!(fetch_config.is_enabled());
@@ -8612,7 +8581,6 @@ async fn devtools_network_intercept_commands_route_to_fetch_owner() {
.as_ref()
.expect("browser context")
.active_page_state()
- .active_target
.fetch_owner
.is_enabled()
);
@@ -8710,7 +8678,6 @@ async fn command_dispatch_completes_live_fetch_disable_without_legacy_fallback()
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());
ctx.conn.browser_context = Some(browser_context);
@@ -8724,7 +8691,6 @@ async fn command_dispatch_completes_live_fetch_disable_without_legacy_fallback()
.as_mut()
.expect("browser context")
.active_page_state_mut()
- .active_target
.runtime_slot
.set_loaded_page_for_test(page);
@@ -8749,7 +8715,6 @@ async fn command_dispatch_completes_live_fetch_disable_without_legacy_fallback()
.as_ref()
.expect("browser context should remain loaded")
.active_page_state()
- .active_target
.fetch_owner
.is_enabled()
);
diff --git a/moli-protocol/src/conn/inspector_route.rs b/moli-protocol/src/conn/inspector_route.rs
index 563511df3..9ec3e887b 100644
--- a/moli-protocol/src/conn/inspector_route.rs
+++ b/moli-protocol/src/conn/inspector_route.rs
@@ -325,7 +325,6 @@ mod tests {
browser_context.set_loaded_page_async(page).await;
let current = browser_context
.active_page_state()
- .active_target
.runtime_slot
.current_renderer_attachment()
.expect("installed page should have a renderer attachment");
diff --git a/moli-protocol/src/conn/page_state/fetch_state.rs b/moli-protocol/src/conn/page_state/fetch_state.rs
index 080ba6109..99adc479d 100644
--- a/moli-protocol/src/conn/page_state/fetch_state.rs
+++ b/moli-protocol/src/conn/page_state/fetch_state.rs
@@ -84,7 +84,6 @@ impl BrowserContext {
Vec<(String, PendingSubresourceFetchResponseRequest)>,
) {
self.active_page_state_mut()
- .active_target
.fetch_owner
.drain_pending_requests()
}
@@ -96,15 +95,13 @@ impl BrowserContext {
) -> Result<Option<String>, String> {
let handle = self
.active_page_state_mut()
- .active_target
.runtime_slot
.allocate_io_stream_handle();
let active_target = &mut self
.page_targets
.active_mut()
.expect("cannot open a response stream without an active page target")
- .state_mut()
- .active_target;
+ .state_mut();
active_target
.fetch_owner
.open_pending_fetch_response_body_stream(
@@ -120,7 +117,6 @@ impl BrowserContext {
request_id: &str,
) -> Option<PendingSubresourceFetchRequest> {
self.active_page_state_mut()
- .active_target
.fetch_owner
.take_pending_subresource_fetch_request(request_id, None)
}
@@ -134,7 +130,6 @@ impl BrowserContext {
body: DocumentBodySource,
) {
self.active_page_state_mut()
- .active_target
.fetch_owner
.register_pending_fetch_response_navigation(
request_id,
@@ -151,7 +146,6 @@ impl BrowserContext {
pending: PendingSubresourceFetchRequest,
) {
self.active_page_state_mut()
- .active_target
.fetch_owner
.register_pending_subresource_fetch_request(request_id, pending);
}
@@ -163,7 +157,6 @@ impl BrowserContext {
pending: PendingSubresourceFetchRequest,
) {
self.active_page_state_mut()
- .active_target
.fetch_owner
.register_in_flight_subresource_fetch_request(request_id, pending);
}
@@ -171,7 +164,6 @@ impl BrowserContext {
#[cfg(test)]
pub(crate) fn allocate_subresource_network_request_id(&mut self) -> String {
self.active_page_state_mut()
- .active_target
.runtime_slot
.request_id_allocator()
.allocate_network_request_id()
@@ -185,7 +177,6 @@ impl BrowserContext {
session_ids: impl IntoIterator<Item = Option<String>>,
) {
self.active_page_state_mut()
- .active_target
.runtime_slot
.record_captured_response_body(request_id, response_body, session_ids);
}
@@ -198,7 +189,6 @@ impl BrowserContext {
session_ids: impl IntoIterator<Item = Option<String>>,
) {
self.active_page_state_mut()
- .active_target
.runtime_slot
.record_captured_response_body_source(request_id, response_body, session_ids);
}
@@ -210,7 +200,6 @@ impl BrowserContext {
session_ids: impl IntoIterator<Item = Option<String>>,
) {
self.active_page_state_mut()
- .active_target
.runtime_slot
.record_pending_response_body(request_id, session_ids);
}
@@ -221,7 +210,6 @@ impl BrowserContext {
request_id: &str,
) -> Option<&crate::domains::network::CapturedResponseBody> {
self.active_page_state()
- .active_target
.runtime_slot
.captured_response_body(request_id)
}
@@ -235,7 +223,6 @@ impl BrowserContext {
#[cfg(test)]
pub(crate) fn allocate_io_stream_handle(&mut self) -> String {
self.active_page_state_mut()
- .active_target
.runtime_slot
.allocate_io_stream_handle()
}
@@ -243,7 +230,6 @@ impl BrowserContext {
#[cfg(test)]
pub(crate) fn insert_io_stream(&mut self, handle: String, bytes: Vec<u8>, offset: usize) {
self.active_page_state_mut()
- .active_target
.runtime_slot
.insert_io_stream(handle, bytes, offset);
}
@@ -256,7 +242,6 @@ impl BrowserContext {
size: Option<usize>,
) -> Option<crate::domains::network::TargetIoStreamRead> {
self.active_page_state_mut()
- .active_target
.runtime_slot
.read_io_stream(handle, offset, size)
}
@@ -264,7 +249,6 @@ impl BrowserContext {
#[cfg(test)]
pub(crate) fn has_captured_response_body_for_test(&self, request_id: &str) -> bool {
self.active_page_state()
- .active_target
.runtime_slot
.has_captured_response_body(request_id)
}
@@ -272,7 +256,6 @@ impl BrowserContext {
#[cfg(test)]
pub(crate) fn captured_response_bodies_empty_for_test(&self) -> bool {
self.active_page_state()
- .active_target
.runtime_slot
.captured_response_bodies_empty()
}
@@ -280,7 +263,6 @@ impl BrowserContext {
#[cfg(test)]
pub(crate) fn set_next_network_request_sequence_for_test(&mut self, sequence: u64) {
self.active_page_state_mut()
- .active_target
.runtime_slot
.set_next_network_request_sequence_for_test(sequence);
}
@@ -288,7 +270,6 @@ impl BrowserContext {
#[cfg(test)]
pub(crate) fn next_network_request_sequence_for_test(&self) -> u64 {
self.active_page_state()
- .active_target
.runtime_slot
.next_network_request_sequence_for_test()
}
@@ -296,7 +277,6 @@ impl BrowserContext {
#[cfg(test)]
pub(crate) fn io_streams_empty_for_test(&self) -> bool {
self.active_page_state()
- .active_target
.runtime_slot
.io_streams_empty_for_test()
}
@@ -304,7 +284,6 @@ impl BrowserContext {
#[cfg(test)]
pub(crate) fn set_next_io_stream_sequence_for_test(&mut self, sequence: u64) {
self.active_page_state_mut()
- .active_target
.runtime_slot
.set_next_io_stream_sequence_for_test(sequence);
}
@@ -312,7 +291,6 @@ impl BrowserContext {
#[cfg(test)]
pub(crate) fn next_io_stream_sequence_for_test(&self) -> u64 {
self.active_page_state()
- .active_target
.runtime_slot
.next_io_stream_sequence_for_test()
}
@@ -320,7 +298,6 @@ impl BrowserContext {
#[cfg(test)]
pub(crate) fn set_subresource_network_emitted_record_count_for_test(&mut self, count: usize) {
self.active_page_state_mut()
- .active_target
.runtime_slot
.set_subresource_emitted_record_count_for_test(count);
}
@@ -328,7 +305,6 @@ impl BrowserContext {
#[cfg(test)]
pub(crate) fn subresource_network_emitted_record_count_for_test(&self) -> usize {
self.active_page_state()
- .active_target
.runtime_slot
.subresource_emitted_record_count_for_test()
}
@@ -447,14 +423,12 @@ mod tests {
assert!(
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_page_state()
- .active_target
.fetch_owner
.has_in_flight_subresource_fetches_for_test()
);
@@ -470,13 +444,11 @@ mod tests {
assert!(
bc.active_page_state()
- .active_target
.fetch_owner
.has_pending_subresource_fetch_for_test("INT-SUB-9")
);
assert!(
bc.active_page_state()
- .active_target
.fetch_owner
.has_pending_fetch_request_id_for_test("INT-SUB-9")
);
@@ -487,13 +459,11 @@ mod tests {
assert_eq!(pending.network_request_id, "REQ-9");
assert!(
!bc.active_page_state()
- .active_target
.fetch_owner
.has_pending_subresource_fetch_for_test("INT-SUB-9")
);
assert!(
!bc.active_page_state()
- .active_target
.fetch_owner
.has_pending_fetch_request_id_for_test("INT-SUB-9")
);
@@ -518,14 +488,12 @@ mod tests {
assert_eq!(stream, "STREAM-1");
assert!(
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_page_state()
- .active_target
.fetch_owner
.active_fetch_response_body_stream_request_id_for_test(&stream)
.is_none()
@@ -551,7 +519,6 @@ mod tests {
.unwrap();
assert!(
!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 3f4a545ef..b6562fe1f 100644
--- a/moli-protocol/src/conn/page_state/loaded.rs
+++ b/moli-protocol/src/conn/page_state/loaded.rs
@@ -59,12 +59,10 @@ impl BrowserContext {
pub(crate) fn replace_loaded_page(&mut self, page: Option<Page>) -> Option<Page> {
let previous = self
.active_page_state_mut()
- .active_target
.runtime_slot
.replace_loaded_page(page);
self.ingest_active_target_output_updates();
self.active_page_state_mut()
- .active_target
.owner_state
.clear_loaded_document_context_state();
self.clear_active_target_loaded_document_session_state();
@@ -78,12 +76,10 @@ impl BrowserContext {
) -> 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_page_state_mut()
- .active_target
.owner_state
.clear_loaded_document_context_state();
self.clear_active_target_loaded_document_session_state();
@@ -112,7 +108,6 @@ impl BrowserContext {
#[cfg(test)]
pub(crate) fn ingest_active_target_output_updates(&mut self) -> bool {
self.active_page_state_mut()
- .active_target
.runtime_slot
.ingest_owner_page_observable_output_updates()
}
@@ -120,15 +115,26 @@ impl BrowserContext {
pub(crate) async fn clear_active_target_session_scoped_state_async(
&mut self,
) -> Result<(), String> {
- self.clear_active_target_session_scoped_state_fields();
+ self.clear_active_target_session_scoped_state_preserving_attached_async(false)
+ .await
+ }
+
+ pub(crate) async fn clear_active_target_primary_session_scoped_state_async(
+ &mut self,
+ ) -> Result<(), String> {
+ self.clear_active_target_session_scoped_state_preserving_attached_async(true)
+ .await
+ }
+
+ async fn clear_active_target_session_scoped_state_preserving_attached_async(
+ &mut self,
+ preserve_attached_sessions: bool,
+ ) -> Result<(), String> {
+ self.active_page_state_mut()
+ .clear_session_scoped_state_fields(preserve_attached_sessions);
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()
- {
+ if let Some(page) = self.active_page_target_mut().runtime_slot.loaded_page_mut() {
page.set_extra_http_headers_async(&[])
.await
.map_err(|error| format!("failed to clear page extra headers: {error}"))?;
diff --git a/moli-protocol/src/conn/page_state/parked.rs b/moli-protocol/src/conn/page_state/parked.rs
index 821636d89..10accc384 100644
--- a/moli-protocol/src/conn/page_state/parked.rs
+++ b/moli-protocol/src/conn/page_state/parked.rs
@@ -70,7 +70,6 @@ impl BrowserContext {
if self.is_active_target(creator.target_id()) {
return Some(
self.active_page_target()
- .active_target
.session_storage_namespace
.deep_clone(),
);
@@ -144,7 +143,6 @@ impl BrowserContext {
pub(crate) fn has_attached_child_frame_id(&self, frame_id: &str) -> bool {
self.active_page_target()
- .active_target
.owner_state
.has_attached_child_frame_id(frame_id)
|| self.background_targets().any(|target| {
@@ -240,7 +238,6 @@ impl BrowserContext {
if self.is_active_target(target_id) {
self.set_target_url(url);
self.active_page_target_mut()
- .active_target
.owner_state
.target_crash_state
.clear();
@@ -298,23 +295,22 @@ impl BrowserContext {
return false;
};
target.devtools_sessions.ensure_attached(&session_id);
- self.auxiliary_target_sessions
- .insert(session_id, target_id.to_owned());
true
}
pub(crate) fn auxiliary_target_id_for_session(&self, session_id: &str) -> Option<&str> {
- self.auxiliary_target_sessions
- .get(session_id)
- .map(String::as_str)
+ self.page_targets
+ .iter()
+ .find(|target| target.devtools_sessions.attached(session_id).is_some())
+ .map(PageTargetHost::target_id)
}
pub(crate) fn auxiliary_session_ids_for_target(&self, target_id: &str) -> Vec<String> {
let mut session_ids = self
- .auxiliary_target_sessions
- .iter()
- .filter(|&(_session_id, session_target_id)| session_target_id == target_id)
- .map(|(session_id, _session_target_id)| session_id.clone())
+ .page_target(target_id)
+ .into_iter()
+ .flat_map(|target| target.devtools_sessions.attached_session_ids())
+ .map(str::to_owned)
.collect::<Vec<_>>();
session_ids.sort();
session_ids
@@ -339,7 +335,7 @@ impl BrowserContext {
}
pub(crate) fn remove_auxiliary_session(&mut self, session_id: &str) -> Option<String> {
- let target_id = self.auxiliary_target_sessions.remove(session_id)?;
+ let target_id = self.auxiliary_target_id_for_session(session_id)?.to_owned();
if let Some(target) = self.page_target_mut(&target_id) {
target
.runtime_slot
@@ -457,10 +453,7 @@ impl BrowserContext {
)
};
let page = if self.is_active_target(&target_id) {
- self.active_page_target_mut()
- .active_target
- .runtime_slot
- .loaded_page_mut()
+ self.active_page_target_mut().runtime_slot.loaded_page_mut()
} else {
self.background_target_mut(&target_id)
.and_then(|target| target.runtime_slot.loaded_page_mut())
@@ -498,12 +491,7 @@ impl BrowserContext {
}
pub(crate) fn remove_auxiliary_sessions_for_target(&mut self, target_id: &str) -> Vec<String> {
- let session_ids = self
- .auxiliary_target_sessions
- .iter()
- .filter(|&(_session_id, session_target_id)| session_target_id == target_id)
- .map(|(session_id, _session_target_id)| session_id.clone())
- .collect::<Vec<_>>();
+ let session_ids = self.auxiliary_session_ids_for_target(target_id);
for session_id in &session_ids {
let _ = self.remove_auxiliary_session(session_id);
}
@@ -631,7 +619,6 @@ impl BrowserContext {
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_page_state_mut()
- .active_target
.runtime_slot
.enable_auxiliary_network_events(session_id);
}
@@ -640,7 +627,6 @@ impl BrowserContext {
#[cfg(test)]
pub(crate) fn has_network_event_listeners(&self) -> bool {
self.active_page_state()
- .active_target
.runtime_slot
.has_network_event_listeners()
}
@@ -651,7 +637,6 @@ impl BrowserContext {
trigger_session_id: Option<&str>,
) -> Vec<Option<String>> {
self.active_page_state()
- .active_target
.runtime_slot
.network_event_session_ids(trigger_session_id, self.active_session_id())
}
@@ -686,20 +671,11 @@ impl BrowserContext {
&mut self,
) -> Result<(), String> {
let target_id = self.active_target_id_owned();
- let auxiliary_inspector_session_ids = self
- .auxiliary_target_sessions
- .iter()
- .filter(|(_session_id, session_target_id)| {
- target_id.as_deref() == Some(session_target_id.as_str())
- })
- .map(|(session_id, _session_target_id)| session_id.clone())
- .collect::<Vec<_>>();
- if let Some(page) = self
- .active_page_target_mut()
- .active_target
- .runtime_slot
- .loaded_page_mut()
- {
+ let auxiliary_inspector_session_ids = target_id
+ .as_deref()
+ .map(|target_id| self.auxiliary_session_ids_for_target(target_id))
+ .unwrap_or_default();
+ if let Some(page) = self.active_page_target_mut().runtime_slot.loaded_page_mut() {
for session_id in &auxiliary_inspector_session_ids {
page.detach_runtime_inspector_session_async(Some(session_id))
.await
@@ -717,9 +693,7 @@ impl BrowserContext {
.await?;
self.detach_active_session();
for session_id in auxiliary_inspector_session_ids {
- self.auxiliary_target_sessions.remove(&session_id);
self.active_page_target_mut()
- .active_target
.runtime_slot
.remove_auxiliary_network_session(&session_id);
}
@@ -733,7 +707,7 @@ impl BrowserContext {
if self.active_session_id().is_none() {
return Ok(None);
}
- self.clear_active_target_session_scoped_state_async()
+ self.clear_active_target_primary_session_scoped_state_async()
.await?;
self.detach_active_session();
Ok(target_id)
@@ -745,7 +719,6 @@ impl BrowserContext {
) -> bool {
if self.active_session_id() == Some(session_id) {
self.active_page_target_mut()
- .active_target
.runtime_slot
.disable_primary_network_events();
self.detach_active_session();
@@ -926,7 +899,7 @@ impl BrowserContext {
pub(crate) fn parked_page_session_state(
&self,
target_id: &str,
- ) -> Option<&crate::conn::state::TargetPageState> {
+ ) -> Option<&crate::conn::state::PageTargetHost> {
let state = self.background_target(target_id)?.state();
state.has_non_default_session_state().then_some(state)
}
@@ -934,7 +907,7 @@ impl BrowserContext {
pub fn mutate_parked_page_session_state<T>(
&mut self,
target_id: &str,
- mutate: impl FnOnce(&mut crate::conn::state::TargetPageState) -> T,
+ mutate: impl FnOnce(&mut crate::conn::state::PageTargetHost) -> T,
) -> T {
mutate(
self.background_target_mut(target_id)
@@ -956,11 +929,9 @@ impl BrowserContext {
return;
};
self.active_page_target_mut()
- .active_target
.runtime_slot
.mark_loaded_page_absent(TargetPageAbsenceReason::InitialDocumentPageBuildPending);
self.active_page_target_mut()
- .active_target
.owner_state
.begin_initial_empty_document(target_id, initial_url, None, storage_key);
}
@@ -1008,9 +979,7 @@ impl BrowserContext {
mutate: impl FnOnce(&mut ParkedTargetOwnerState) -> T,
) -> Option<T> {
if self.is_active_target(target_id) {
- return Some(mutate(
- &mut self.active_page_target_mut().active_target.owner_state,
- ));
+ return Some(mutate(&mut self.active_page_target_mut().owner_state));
}
self.background_target(target_id)?;
Some(self.mutate_parked_target_owner_state(target_id, mutate))
@@ -1025,7 +994,6 @@ impl BrowserContext {
&mut self
.background_target_mut(target_id)
.expect("parked target must exist")
- .active_target
.owner_state,
)
}
@@ -1034,7 +1002,7 @@ impl BrowserContext {
&self,
target_id: &str,
) -> Option<&ParkedTargetOwnerState> {
- let state = &self.background_target(target_id)?.active_target.owner_state;
+ let state = &self.background_target(target_id)?.owner_state;
(!state.is_default()).then_some(state)
}
@@ -1044,7 +1012,7 @@ impl BrowserContext {
target_id: &str,
) -> ParkedTargetOwnerState {
self.background_target(target_id)
- .map(|target| target.active_target.owner_state.clone())
+ .map(|target| target.owner_state.clone())
.unwrap_or_default()
}
@@ -1055,7 +1023,6 @@ impl BrowserContext {
) -> Option<&crate::conn::state::TargetFetchState> {
let state = self
.background_target(target_id)?
- .active_target
.fetch_owner
.pending_state();
(!state.is_empty()).then_some(state)
@@ -1076,7 +1043,6 @@ impl BrowserContext {
kind: DevToolsTargetKind::Page,
title: self
.active_page_target()
- .active_target
.owner_state
.committed_document_title()
.map(str::to_owned)
@@ -1300,19 +1266,15 @@ impl BrowserContext {
return false;
}
let current_attachment = match expected.target_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) if self.is_active_target(target_id) => {
+ self.active_page_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_page_target()
- .active_target
- .runtime_slot
- .page_attachment_id(),
+ None if self.active_target_id().is_none() => {
+ self.active_page_target().runtime_slot.page_attachment_id()
+ }
None => None,
};
current_attachment == Some(expected.page_attachment_id())
@@ -1884,23 +1846,18 @@ mod tests {
context.assign_auxiliary_session_to_target("TID-active", "SID-aux".to_owned()),
"auxiliary session should attach to active target"
);
- 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,
- }],
- );
+ context.active_page_state_mut().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()
.is_enabled()
@@ -1914,7 +1871,6 @@ mod tests {
assert!(
!context
.active_page_state()
- .active_target
.fetch_owner
.config_snapshot()
.is_enabled(),
@@ -1932,7 +1888,6 @@ mod tests {
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.active_page_state_mut().devtools_sessions
@@ -1945,12 +1900,10 @@ mod tests {
.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
.push(IsolatedWorldDefinition {
@@ -1959,7 +1912,6 @@ mod tests {
});
context
.active_page_state_mut()
- .active_target
.owner_state
.document_start_scripts
.push((
@@ -2057,17 +2009,14 @@ mod tests {
.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
.push((
@@ -2083,18 +2032,15 @@ 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()
.expect("loaded active page should have a renderer attachment");
@@ -2308,7 +2254,6 @@ mod tests {
assert_eq!(
context
.active_page_state()
- .active_target
.runtime_slot
.moli_memory_diagnostics()["loadedPageAbsenceReason"],
json!("initial-document-page-build-pending"),
@@ -2337,7 +2282,6 @@ mod tests {
assert_eq!(
context
.active_page_state()
- .active_target
.runtime_slot
.moli_memory_diagnostics()["loadedPageAbsenceReason"],
json!("initial-document-page-build-pending"),
@@ -2417,7 +2361,6 @@ mod tests {
assert_eq!(
context
.active_page_state()
- .active_target
.runtime_slot
.current_renderer_attachment()
.map(|attachment| attachment.id()),
@@ -2470,7 +2413,6 @@ mod tests {
.replace_loaded_page(Some(background_page));
let active_attachment = context
.active_page_state()
- .active_target
.runtime_slot
.current_renderer_attachment()
.expect("active attachment");
@@ -2489,7 +2431,6 @@ mod tests {
assert_eq!(
context
.active_page_state()
- .active_target
.runtime_slot
.current_renderer_attachment()
.map(|attachment| attachment.id()),
@@ -2571,7 +2512,6 @@ mod tests {
assert_eq!(
context
.active_page_state()
- .active_target
.runtime_slot
.emitted_subresource_record_count_for_session_for_test(None),
4,
@@ -2580,7 +2520,6 @@ mod tests {
assert_eq!(
context
.active_page_state()
- .active_target
.runtime_slot
.emitted_websocket_event_count_for_session_for_test(None),
5,
diff --git a/moli-protocol/src/conn/page_state/surfaces.rs b/moli-protocol/src/conn/page_state/surfaces.rs
index 1ff1f9855..363257e28 100644
--- a/moli-protocol/src/conn/page_state/surfaces.rs
+++ b/moli-protocol/src/conn/page_state/surfaces.rs
@@ -2,7 +2,7 @@ use super::super::cookie_manager_surface::BrowserContextCookieManagerSurfaceSnap
use super::super::{
BrowserContext, CdpConnection, DocumentStartScript, EmulatedDeviceMetrics,
EmulatedGeolocationOverrideState, EmulatedNetworkConditions, EmulatedViewportSurface,
- TargetPageState, viewport_surface_install_script,
+ PageTargetHost, viewport_surface_install_script,
};
#[cfg(test)]
use moli_cookie_jar::{BrowserCookieFacadeContextOverrides, BrowserCookieFacadeOverrides};
@@ -30,19 +30,17 @@ impl SurfaceOverrideInputs {
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(),
}
}
fn from_parked(
- state: &TargetPageState,
+ state: &PageTargetHost,
default_network_conditions: Option<EmulatedNetworkConditions>,
default_geolocation_override: Option<EmulatedGeolocationOverrideState>,
default_emulated_device_metrics: Option<EmulatedDeviceMetrics>,
@@ -149,7 +147,6 @@ impl BrowserContext {
let target_id = self.active_target_id();
scripts.extend(
self.active_page_target()
- .active_target
.owner_state
.document_start_scripts
.iter()
@@ -362,7 +359,7 @@ impl BrowserContext {
pub(crate) fn generated_surface_override_script_for_parked_state(
&self,
- state: &TargetPageState,
+ state: &PageTargetHost,
) -> Option<DocumentStartScript> {
Self::generated_surface_override_script_from_inputs(&SurfaceOverrideInputs::from_parked(
state,
@@ -606,12 +603,7 @@ impl BrowserContext {
let Some(script) = self.generated_surface_override_script() else {
return Ok(());
};
- let Some(page) = self
- .active_page_target_mut()
- .active_target
- .runtime_slot
- .loaded_page_mut()
- else {
+ let Some(page) = self.active_page_target_mut().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 2e0b14f92..2799ef642 100644
--- a/moli-protocol/src/conn/resource_runtime_support.rs
+++ b/moli-protocol/src/conn/resource_runtime_support.rs
@@ -283,12 +283,10 @@ impl CdpConnection {
self.session_route(session_id),
Some(super::CdpSessionRoute::Browser)
) {
- return self.browser_context.as_mut().and_then(|bc| {
- bc.active_page_target_mut()
- .active_target
- .runtime_slot
- .loaded_page_mut()
- });
+ return self
+ .browser_context
+ .as_mut()
+ .and_then(|bc| bc.active_page_target_mut().runtime_slot.loaded_page_mut());
}
self.loaded_page_mut_for_target_configuration(session_id)
.ok()
@@ -303,12 +301,10 @@ 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_page_target_mut()
- .active_target
- .runtime_slot
- .loaded_page_mut()
- });
+ return self
+ .browser_context
+ .as_mut()
+ .and_then(|bc| bc.active_page_target_mut().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 494eadcfc..94c9f61f3 100644
--- a/moli-protocol/src/conn/runtime_eval.rs
+++ b/moli-protocol/src/conn/runtime_eval.rs
@@ -230,7 +230,7 @@ enum BidiChannelListenerRoute {
}
fn unregister_runtime_remote_object_group_from_parked_page_session_state(
- page_session_state: &mut TargetPageState,
+ page_session_state: &mut PageTargetHost,
session_id: Option<&str>,
object_group: &str,
) {
@@ -552,13 +552,11 @@ fn collect_moli_diagnostics_pending_snapshots(
) -> Result<(), String> {
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()
.expect("active target loaded page should exist")
@@ -1689,7 +1687,7 @@ impl CdpConnection {
pub(crate) fn fail_pending_inspector_awaits_from_page_session_state_for_sessions_background_events_into(
out: &mut Vec<BackgroundProtocolEvent>,
- page_session_state: &mut TargetPageState,
+ page_session_state: &mut PageTargetHost,
primary_session_id: Option<&str>,
session_ids: &[&str],
reason: &'static str,
@@ -3686,10 +3684,7 @@ 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_page_target_mut()
- .active_target
- .runtime_slot
+ &mut browser_context.active_page_target_mut().runtime_slot
} else {
let target_id = route
.target_id
@@ -4127,7 +4122,6 @@ impl CdpConnection {
} else {
browser_context
.active_page_target_mut()
- .active_target
.runtime_slot
.loaded_page_mut()
}
@@ -6080,7 +6074,6 @@ mod tests {
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);
conn.browser_context = Some(browser_context);
@@ -7385,7 +7378,6 @@ mod tests {
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);
conn.browser_context = Some(browser_context);
diff --git a/moli-protocol/src/conn/runtime_load.rs b/moli-protocol/src/conn/runtime_load.rs
index 20816d02a..d4559e6db 100644
--- a/moli-protocol/src/conn/runtime_load.rs
+++ b/moli-protocol/src/conn/runtime_load.rs
@@ -2000,18 +2000,15 @@ 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(
TargetPageAbsenceReason::InitialDocumentPageBuildPending,
@@ -2056,7 +2053,6 @@ impl CdpConnection {
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();
} else if let Some(target) = browser_context.background_target_mut(&owner.target_id) {
@@ -2089,10 +2085,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()) {
- let runtime_slot = &mut browser_context
- .active_page_target_mut()
- .active_target
- .runtime_slot;
+ let runtime_slot = &mut browser_context.active_page_target_mut().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/state/browser_context.rs b/moli-protocol/src/conn/state/browser_context.rs
index fc94ae296..43affe4f5 100644
--- a/moli-protocol/src/conn/state/browser_context.rs
+++ b/moli-protocol/src/conn/state/browser_context.rs
@@ -34,7 +34,6 @@ use super::{
page_target_host::{PageTargetHost, PageTargetRegistry},
parking::TargetOwnerState,
service_worker_target::ServiceWorkerTargetState,
- session::TargetPageState,
shared_worker_target::SharedWorkerTargetState,
};
@@ -45,7 +44,6 @@ pub struct BrowserContext {
/// Policy retained while the context has no page target yet. The first
/// target inherits it; once targets exist, each target owns its surface.
pub(crate) default_document_cookie_manager_surface: BrowserContextCookieManagerSurface,
- pub auxiliary_target_sessions: HashMap<String, String>,
// Chromium exposes the live creator target, immutable creator frame, and
// window.opener access as three independent TargetInfo properties.
pub target_opener_ids: HashMap<String, String>,
@@ -376,11 +374,11 @@ impl BrowserContext {
}
#[cfg(test)]
- pub(crate) fn active_page_state(&self) -> &TargetPageState {
+ pub(crate) fn active_page_state(&self) -> &PageTargetHost {
self.active_page_target().state()
}
- pub(crate) fn active_page_state_mut(&mut self) -> &mut TargetPageState {
+ pub(crate) fn active_page_state_mut(&mut self) -> &mut PageTargetHost {
self.active_page_target_mut().state_mut()
}
@@ -514,7 +512,6 @@ impl BrowserContext {
storage_partition,
page_targets: PageTargetRegistry::default(),
default_document_cookie_manager_surface: BrowserContextCookieManagerSurface::default(),
- auxiliary_target_sessions: HashMap::new(),
target_opener_ids: HashMap::new(),
target_opener_frame_ids: HashMap::new(),
target_can_access_opener: HashSet::new(),
@@ -922,7 +919,11 @@ impl BrowserContext {
.iter()
.filter(|info| info.attached)
.count(),
- "auxiliaryTargetSessionCount": self.auxiliary_target_sessions.len(),
+ "auxiliaryTargetSessionCount": self
+ .page_targets
+ .iter()
+ .map(|target| target.devtools_sessions.attached_len())
+ .sum::<usize>(),
"targetOpenerCount": self.target_opener_ids.len(),
"targetOpenerFrameCount": self.target_opener_frame_ids.len(),
"targetCanAccessOpenerCount": self.target_can_access_opener.len(),
@@ -1289,7 +1290,6 @@ impl BrowserContext {
#[cfg(test)]
pub(crate) fn clear_document_navigation_state_for_active_target(&mut self) {
self.active_page_target_mut()
- .active_target
.runtime_slot
.clear_document_navigation_state();
}
@@ -1435,10 +1435,7 @@ impl BrowserContext {
#[cfg(test)]
pub(crate) fn session_storage_store_for_test(&self) -> &SharedWebStorageStore {
- self.active_page_target()
- .active_target
- .session_storage_namespace
- .store()
+ self.active_page_target().session_storage_namespace.store()
}
#[cfg(test)]
diff --git a/moli-protocol/src/conn/state/devtools_session.rs b/moli-protocol/src/conn/state/devtools_session.rs
index a4072ce78..0ce7d9c14 100644
--- a/moli-protocol/src/conn/state/devtools_session.rs
+++ b/moli-protocol/src/conn/state/devtools_session.rs
@@ -60,6 +60,7 @@ pub(crate) struct DevToolsSessionState {
/// source of truth.
#[derive(Clone, Debug, PartialEq)]
pub(crate) struct DevToolsSessionRegistry {
+ primary_session_id: Option<String>,
states: BTreeMap<DevToolsSessionKey, DevToolsSessionState>,
attached_order: Vec<String>,
}
@@ -67,6 +68,7 @@ pub(crate) struct DevToolsSessionRegistry {
impl Default for DevToolsSessionRegistry {
fn default() -> Self {
Self {
+ primary_session_id: None,
states: BTreeMap::from([(
DevToolsSessionKey::Primary,
DevToolsSessionState::default(),
@@ -77,6 +79,18 @@ impl Default for DevToolsSessionRegistry {
}
impl DevToolsSessionRegistry {
+ pub(crate) fn primary_session_id(&self) -> Option<&str> {
+ self.primary_session_id.as_deref()
+ }
+
+ pub(crate) fn attach_primary(&mut self, session_id: String) {
+ self.primary_session_id = Some(session_id);
+ }
+
+ pub(crate) fn detach_primary(&mut self) -> Option<String> {
+ self.primary_session_id.take()
+ }
+
pub(crate) fn primary(&self) -> &DevToolsSessionState {
self.states
.get(&DevToolsSessionKey::Primary)
@@ -164,6 +178,11 @@ impl DevToolsSessionRegistry {
})
}
+ pub(crate) fn attached_session_ids(&self) -> impl Iterator<Item = &str> {
+ self.attached_entries()
+ .map(|(session_id, _state)| session_id)
+ }
+
pub(crate) fn attached_states(&self) -> impl Iterator<Item = &DevToolsSessionState> {
self.attached_entries().map(|(_session_id, state)| state)
}
diff --git a/moli-protocol/src/conn/state/mod.rs b/moli-protocol/src/conn/state/mod.rs
index 001633d5b..d68442816 100644
--- a/moli-protocol/src/conn/state/mod.rs
+++ b/moli-protocol/src/conn/state/mod.rs
@@ -119,13 +119,6 @@ pub(crate) use browser_context::{
pub use navigation::{PageNavigationHistoryEntry, PendingNavigationHistoryUpdate};
-pub use page_target_host::PageTargetHost;
-pub(crate) use parking::{
- ParkedTargetOwnerState, PendingBidiChannelListener, PendingInspectorAwait,
- TargetInitialEmptyDocumentCreator, TargetOwnerState, TargetWindowSurfaceState,
-};
-pub use session::TargetPageState;
-
pub use emulation::{
EmulatedDeviceMetrics, EmulatedGeolocationOverride, EmulatedGeolocationOverrideState,
EmulatedMediaOverrides,
@@ -133,6 +126,11 @@ pub use emulation::{
pub(crate) use emulation::{
EmulatedNetworkConditions, EmulatedViewportSurface, viewport_surface_install_script,
};
+pub use page_target_host::PageTargetHost;
+pub(crate) use parking::{
+ ParkedTargetOwnerState, PendingBidiChannelListener, PendingInspectorAwait,
+ TargetInitialEmptyDocumentCreator, TargetOwnerState, TargetWindowSurfaceState,
+};
pub(crate) use navigation_outcome::{CompletedDownloadBody, CompletedDownloadBodyArtifact};
pub use navigation_outcome::{
diff --git a/moli-protocol/src/conn/state/navigation_outcome.rs b/moli-protocol/src/conn/state/navigation_outcome.rs
index 19fcb698c..2ef79e545 100644
--- a/moli-protocol/src/conn/state/navigation_outcome.rs
+++ b/moli-protocol/src/conn/state/navigation_outcome.rs
@@ -378,13 +378,11 @@ impl<'a> TargetInfo<'a> {
kind: "page",
title: bc
.active_page_target()
- .active_target
.owner_state
.committed_document_title()
.map(str::to_owned)
.or_else(|| {
bc.active_page_target()
- .active_target
.runtime_slot
.loaded_page()
.map(|page| page.document_title())
diff --git a/moli-protocol/src/conn/state/page_target_host.rs b/moli-protocol/src/conn/state/page_target_host.rs
index 99b1c09bd..c68f86fa1 100644
--- a/moli-protocol/src/conn/state/page_target_host.rs
+++ b/moli-protocol/src/conn/state/page_target_host.rs
@@ -1,13 +1,25 @@
+use std::collections::HashMap;
+
+use indexmap::IndexMap;
use moli_core::network::SharedWebStorageStore;
use moli_core::runtime::NavigationEngine;
+use serde_json::Value;
use super::{
+ devtools_session::DevToolsSessionRegistry,
+ emulation::{
+ EmulatedDeviceMetrics, EmulatedGeolocationOverrideState, EmulatedMediaOverrides,
+ EmulatedNetworkConditions,
+ },
+ fetch::TargetFetchOwner,
identity::TargetIdentityState,
page_slot::TargetPageSlot,
+ parking::TargetOwnerState,
runtime_slot::TargetRuntimeSlot,
- session::{ActiveTargetState, TargetPageState},
+ session::TargetNetworkPolicyState,
session_storage::TargetSessionStorageNamespace,
};
+use crate::conn::cookie_manager_surface::BrowserContextCookieManagerSurface;
/// The stable owner of all state that belongs to one page target.
///
@@ -17,18 +29,70 @@ use super::{
#[derive(Debug)]
pub struct PageTargetHost {
target_id: String,
- primary_session_id: Option<String>,
- state: Box<TargetPageState>,
navigation_engine: Option<NavigationEngine>,
+ pub(crate) target_identity: TargetIdentityState,
+ pub(crate) devtools_sessions: DevToolsSessionRegistry,
+ pub(crate) network_policy: TargetNetworkPolicyState,
+ pub(crate) http_proxy_override: Option<String>,
+ pub(crate) http_no_proxy_override: Option<String>,
+ pub(crate) tls_verify_host_override: Option<bool>,
+ pub(crate) base_locale_override: Option<String>,
+ pub(crate) base_timezone_override: Option<String>,
+ pub(crate) locale_override: Option<String>,
+ pub(crate) timezone_override: Option<String>,
+ pub(crate) network_conditions: Option<EmulatedNetworkConditions>,
+ pub(crate) geolocation_override: Option<EmulatedGeolocationOverrideState>,
+ pub(crate) emulated_media: EmulatedMediaOverrides,
+ pub(crate) emulated_device_metrics: Option<EmulatedDeviceMetrics>,
+ pub(crate) cpu_throttling_rate: f64,
+ pub(crate) input_intercept_drags_enabled: bool,
+ pub(crate) input_drag_intercepted: bool,
+ pub(crate) touch_emulation_enabled: bool,
+ pub(crate) emit_touch_events_for_mouse: bool,
+ pub(crate) focus_emulation_enabled: bool,
+ pub(crate) script_execution_disabled: bool,
+ pub(crate) css_enabled: bool,
+ pub(crate) document_cookie_manager_surface: BrowserContextCookieManagerSurface,
+ pub(crate) dom_remote_object_node_cache: HashMap<String, Value>,
+ pub(crate) runtime_slot: TargetRuntimeSlot,
+ pub(crate) fetch_owner: TargetFetchOwner,
+ pub(crate) owner_state: TargetOwnerState,
+ pub(crate) session_storage_namespace: TargetSessionStorageNamespace,
}
impl PageTargetHost {
pub(crate) fn empty(target_id: String) -> Self {
Self {
target_id,
- primary_session_id: None,
- state: Box::default(),
navigation_engine: None,
+ target_identity: TargetIdentityState::about_blank(),
+ devtools_sessions: DevToolsSessionRegistry::default(),
+ network_policy: TargetNetworkPolicyState::default(),
+ http_proxy_override: None,
+ http_no_proxy_override: None,
+ tls_verify_host_override: None,
+ base_locale_override: None,
+ base_timezone_override: None,
+ locale_override: None,
+ timezone_override: None,
+ network_conditions: None,
+ geolocation_override: None,
+ emulated_media: EmulatedMediaOverrides::default(),
+ emulated_device_metrics: None,
+ cpu_throttling_rate: 1.0,
+ input_intercept_drags_enabled: false,
+ input_drag_intercepted: false,
+ touch_emulation_enabled: false,
+ emit_touch_events_for_mouse: false,
+ focus_emulation_enabled: false,
+ script_execution_disabled: false,
+ css_enabled: false,
+ document_cookie_manager_surface: BrowserContextCookieManagerSurface::default(),
+ dom_remote_object_node_cache: HashMap::new(),
+ runtime_slot: TargetRuntimeSlot::default(),
+ fetch_owner: TargetFetchOwner::default(),
+ owner_state: TargetOwnerState::default(),
+ session_storage_namespace: TargetSessionStorageNamespace::default(),
}
}
@@ -38,19 +102,13 @@ impl PageTargetHost {
target_identity: TargetIdentityState,
target_page_slot: TargetPageSlot,
) -> Self {
- Self {
- target_id,
- primary_session_id,
- state: Box::new(TargetPageState {
- target_identity,
- active_target: ActiveTargetState {
- runtime_slot: TargetRuntimeSlot::from_page_slot(target_page_slot),
- ..Default::default()
- },
- ..Default::default()
- }),
- navigation_engine: None,
+ let mut host = Self::empty(target_id);
+ host.target_identity = target_identity;
+ host.runtime_slot = TargetRuntimeSlot::from_page_slot(target_page_slot);
+ if let Some(session_id) = primary_session_id {
+ host.devtools_sessions.attach_primary(session_id);
}
+ host
}
#[cfg(test)]
@@ -93,11 +151,11 @@ impl PageTargetHost {
}
pub(crate) fn session_id(&self) -> Option<&str> {
- self.primary_session_id.as_deref()
+ self.devtools_sessions.primary_session_id()
}
pub(crate) fn has_session(&self) -> bool {
- self.primary_session_id.is_some()
+ self.session_id().is_some()
}
pub(crate) fn is_session(&self, session_id: &str) -> bool {
@@ -105,11 +163,11 @@ impl PageTargetHost {
}
pub(crate) fn attach_session(&mut self, session_id: String) {
- self.primary_session_id = Some(session_id);
+ self.devtools_sessions.attach_primary(session_id);
}
pub(crate) fn detach_session(&mut self) -> Option<String> {
- self.primary_session_id.take()
+ self.devtools_sessions.detach_primary()
}
pub(crate) fn session_storage_store(&self) -> &SharedWebStorageStore {
@@ -127,12 +185,12 @@ impl PageTargetHost {
self.session_storage_namespace = namespace;
}
- pub(crate) fn state(&self) -> &TargetPageState {
- &self.state
+ pub(crate) fn state(&self) -> &Self {
+ self
}
- pub(crate) fn state_mut(&mut self) -> &mut TargetPageState {
- &mut self.state
+ pub(crate) fn state_mut(&mut self) -> &mut Self {
+ self
}
pub(crate) fn navigation_engine(&self) -> Option<&NavigationEngine> {
@@ -164,7 +222,7 @@ impl PageTargetHost {
&mut self,
) -> Option<(&mut NavigationEngine, &mut TargetRuntimeSlot)> {
let engine = self.navigation_engine.as_mut()?;
- Some((engine, &mut self.state.active_target.runtime_slot))
+ Some((engine, &mut self.runtime_slot))
}
pub(crate) fn has_page_domain_enabled_session(&self) -> bool {
@@ -173,10 +231,6 @@ impl PageTargetHost {
.any(|session| session.page_session_state.page_domain_enabled)
}
- pub(crate) fn has_pending_javascript_dialog(&self) -> bool {
- self.state.has_pending_javascript_dialog()
- }
-
pub(crate) fn has_pending_inspector_awaits(&self) -> bool {
self.devtools_sessions.has_pending_inspector_awaits()
}
@@ -213,20 +267,6 @@ impl PageTargetHost {
}
}
-impl std::ops::Deref for PageTargetHost {
- type Target = TargetPageState;
-
- fn deref(&self) -> &Self::Target {
- &self.state
- }
-}
-
-impl std::ops::DerefMut for PageTargetHost {
- fn deref_mut(&mut self) -> &mut Self::Target {
- &mut self.state
- }
-}
-
/// All page hosts in one browser context plus the foreground selector.
///
/// Insertion order is retained for Chromium-compatible fallback selection
@@ -234,7 +274,7 @@ impl std::ops::DerefMut for PageTargetHost {
#[derive(Debug, Default)]
pub(crate) struct PageTargetRegistry {
active_target_id: Option<String>,
- hosts: Vec<PageTargetHost>,
+ hosts: IndexMap<String, PageTargetHost>,
}
impl PageTargetRegistry {
@@ -256,30 +296,27 @@ impl PageTargetRegistry {
}
pub(crate) fn get(&self, target_id: &str) -> Option<&PageTargetHost> {
- self.hosts.iter().find(|host| host.is_target(target_id))
+ self.hosts.get(target_id)
}
pub(crate) fn get_mut(&mut self, target_id: &str) -> Option<&mut PageTargetHost> {
- self.hosts.iter_mut().find(|host| host.is_target(target_id))
+ self.hosts.get_mut(target_id)
}
pub(crate) fn insert(&mut self, host: PageTargetHost) -> bool {
- if self.get(host.target_id()).is_some() {
+ let target_id = host.target_id().to_owned();
+ if self.hosts.contains_key(&target_id) {
return false;
}
- self.hosts.push(host);
+ self.hosts.insert(target_id, host);
true
}
pub(crate) fn remove(&mut self, target_id: &str) -> Option<PageTargetHost> {
- let index = self
- .hosts
- .iter()
- .position(|host| host.is_target(target_id))?;
if self.active_target_id() == Some(target_id) {
self.active_target_id = None;
}
- Some(self.hosts.remove(index))
+ self.hosts.shift_remove(target_id)
}
pub(crate) fn select(&mut self, target_id: &str) -> bool {
@@ -291,13 +328,19 @@ impl PageTargetRegistry {
}
pub(crate) fn rekey_active(&mut self, target_id: String) -> bool {
- if self.get(&target_id).is_some() {
+ if self.hosts.contains_key(&target_id) {
return false;
}
- let Some(active) = self.active_mut() else {
+ let Some(previous_target_id) = self.active_target_id.clone() else {
+ return false;
+ };
+ let Some((index, _previous_target_id, mut active)) =
+ self.hosts.shift_remove_full(&previous_target_id)
+ else {
return false;
};
active.replace_target_id(target_id.clone());
+ self.hosts.shift_insert(index, target_id.clone(), active);
self.active_target_id = Some(target_id);
true
}
@@ -308,11 +351,11 @@ impl PageTargetRegistry {
}
pub(crate) fn iter(&self) -> impl DoubleEndedIterator<Item = &PageTargetHost> {
- self.hosts.iter()
+ self.hosts.values()
}
pub(crate) fn iter_mut(&mut self) -> impl DoubleEndedIterator<Item = &mut PageTargetHost> {
- self.hosts.iter_mut()
+ self.hosts.values_mut()
}
pub(crate) fn background(&self) -> impl DoubleEndedIterator<Item = &PageTargetHost> {
diff --git a/moli-protocol/src/conn/state/session.rs b/moli-protocol/src/conn/state/session.rs
index 34a246187..16337bf41 100644
--- a/moli-protocol/src/conn/state/session.rs
+++ b/moli-protocol/src/conn/state/session.rs
@@ -1,22 +1,10 @@
-use std::collections::HashMap;
-
-use super::devtools_session::{
- DevToolsNetworkPolicyAggregate, DevToolsNetworkSessionState, DevToolsSessionRegistry,
-};
-use super::emulation::{
- EmulatedDeviceMetrics, EmulatedGeolocationOverrideState, EmulatedMediaOverrides,
- EmulatedNetworkConditions,
-};
+use super::devtools_session::{DevToolsNetworkPolicyAggregate, DevToolsNetworkSessionState};
+use super::emulation::EmulatedMediaOverrides;
use super::fetch::TargetFetchOwner;
-use super::identity::TargetIdentityState;
use super::javascript_dialog::TargetJavaScriptDialogState;
-use super::parking::TargetOwnerState;
-use super::runtime_slot::TargetRuntimeSlot;
-use super::session_storage::TargetSessionStorageNamespace;
-use crate::conn::cookie_manager_surface::BrowserContextCookieManagerSurface;
+use super::page_target_host::PageTargetHost;
use crate::domains::audits_output_state::TargetAuditsSessionState;
use moli_core::page::V8InspectorSessionState;
-use serde_json::Value;
#[derive(Debug, Clone, Copy, Default, PartialEq, Eq)]
pub(crate) enum PerformanceTimeDomain {
@@ -71,84 +59,7 @@ impl TargetPerformanceSessionState {
}
}
-#[derive(Debug, Default)]
-pub struct ActiveTargetState {
- pub(crate) runtime_slot: TargetRuntimeSlot,
- pub(crate) fetch_owner: TargetFetchOwner,
- pub(crate) owner_state: TargetOwnerState,
- pub(crate) session_storage_namespace: TargetSessionStorageNamespace,
-}
-
-/// All mutable state owned by one page target.
-///
-/// Foreground selection is deliberately absent from this type. A page keeps
-/// the same state object while visible or hidden; selecting another page must
-/// not serialize this state into a second "parked" representation.
-#[derive(Debug)]
-pub struct TargetPageState {
- pub(crate) target_identity: TargetIdentityState,
- pub(crate) devtools_sessions: DevToolsSessionRegistry,
- pub(crate) network_policy: TargetNetworkPolicyState,
- pub(crate) http_proxy_override: Option<String>,
- pub(crate) http_no_proxy_override: Option<String>,
- pub(crate) tls_verify_host_override: Option<bool>,
- // Target-scoped non-CDP policy (for example WebDriver BiDi). CDP session
- // contributions temporarily shadow this layer and reveal it on detach.
- pub(crate) base_locale_override: Option<String>,
- pub(crate) base_timezone_override: Option<String>,
- // Materialized values consumed by navigation and the renderer.
- pub(crate) locale_override: Option<String>,
- pub(crate) timezone_override: Option<String>,
- pub(crate) network_conditions: Option<EmulatedNetworkConditions>,
- pub(crate) geolocation_override: Option<EmulatedGeolocationOverrideState>,
- pub(crate) emulated_media: EmulatedMediaOverrides,
- pub(crate) emulated_device_metrics: Option<EmulatedDeviceMetrics>,
- pub(crate) cpu_throttling_rate: f64,
- pub(crate) input_intercept_drags_enabled: bool,
- pub(crate) input_drag_intercepted: bool,
- pub(crate) touch_emulation_enabled: bool,
- pub(crate) emit_touch_events_for_mouse: bool,
- pub(crate) focus_emulation_enabled: bool,
- pub(crate) script_execution_disabled: bool,
- pub(crate) css_enabled: bool,
- pub(crate) document_cookie_manager_surface: BrowserContextCookieManagerSurface,
- pub(crate) dom_remote_object_node_cache: HashMap<String, Value>,
- pub(crate) active_target: ActiveTargetState,
-}
-
-impl Default for TargetPageState {
- fn default() -> Self {
- Self {
- target_identity: TargetIdentityState::about_blank(),
- devtools_sessions: DevToolsSessionRegistry::default(),
- network_policy: TargetNetworkPolicyState::default(),
- http_proxy_override: None,
- http_no_proxy_override: None,
- tls_verify_host_override: None,
- base_locale_override: None,
- base_timezone_override: None,
- locale_override: None,
- timezone_override: None,
- network_conditions: None,
- geolocation_override: None,
- emulated_media: EmulatedMediaOverrides::default(),
- emulated_device_metrics: None,
- cpu_throttling_rate: 1.0,
- input_intercept_drags_enabled: false,
- input_drag_intercepted: false,
- touch_emulation_enabled: false,
- emit_touch_events_for_mouse: false,
- focus_emulation_enabled: false,
- script_execution_disabled: false,
- css_enabled: false,
- document_cookie_manager_surface: BrowserContextCookieManagerSurface::default(),
- dom_remote_object_node_cache: HashMap::new(),
- active_target: ActiveTargetState::default(),
- }
- }
-}
-
-impl TargetPageState {
+impl PageTargetHost {
pub(crate) fn effective_renderer_browser_identity_override_owned(
&self,
) -> Option<moli_browser_profile::BrowserIdentityProfile> {
@@ -279,10 +190,7 @@ impl TargetPageState {
pub(crate) fn has_non_default_session_state(&self) -> bool {
self.devtools_sessions.has_non_default_state()
- || self
- .active_target
- .runtime_slot
- .primary_network_events_enabled()
+ || self.runtime_slot.primary_network_events_enabled()
|| self.network_policy != TargetNetworkPolicyState::default()
|| self.http_proxy_override.is_some()
|| self.http_no_proxy_override.is_some()
@@ -301,8 +209,7 @@ impl TargetPageState {
|| self.focus_emulation_enabled
|| self.script_execution_disabled
|| self.css_enabled
- || self.active_target.fetch_owner.config_snapshot()
- != super::fetch::TargetFetchConfig::default()
+ || self.fetch_owner.config_snapshot() != super::fetch::TargetFetchConfig::default()
}
pub(crate) fn clear_session_scoped_state_fields(
@@ -311,9 +218,7 @@ impl TargetPageState {
) {
self.devtools_sessions
.reset(preserve_auxiliary_devtools_sessions);
- self.active_target
- .runtime_slot
- .disable_primary_network_events();
+ self.runtime_slot.disable_primary_network_events();
self.network_policy.clear_session_scoped_state();
self.refresh_devtools_network_policy();
self.refresh_devtools_emulation_policy();
@@ -330,31 +235,13 @@ impl TargetPageState {
self.focus_emulation_enabled = false;
self.script_execution_disabled = false;
self.css_enabled = false;
- self.active_target.fetch_owner = TargetFetchOwner::default();
- self.active_target
- .runtime_slot
+ self.fetch_owner = TargetFetchOwner::default();
+ self.runtime_slot
.clear_session_scoped_network_observation_artifacts();
- self.active_target
- .runtime_slot
+ self.runtime_slot
.request_id_allocator()
.reset_fetch_navigation_request_counter();
- self.active_target
- .owner_state
- .clear_observable_output_state();
- }
-}
-
-impl std::ops::Deref for TargetPageState {
- type Target = ActiveTargetState;
-
- fn deref(&self) -> &Self::Target {
- &self.active_target
- }
-}
-
-impl std::ops::DerefMut for TargetPageState {
- fn deref_mut(&mut self) -> &mut Self::Target {
- &mut self.active_target
+ self.owner_state.clear_observable_output_state();
}
}
@@ -850,13 +737,12 @@ impl TargetNetworkPolicyState {
#[cfg(test)]
mod tests {
- use super::{
- PageScreencastConfig, PageScreencastFormat, PageScreencastSessionState, TargetPageState,
- };
+ use super::{PageScreencastConfig, PageScreencastFormat, PageScreencastSessionState};
+ use crate::conn::PageTargetHost;
#[test]
fn devtools_emulation_overrides_reveal_target_base_state_when_cleared() {
- let mut state = TargetPageState::default();
+ let mut state = PageTargetHost::empty("TID-policy-test".to_owned());
state.set_base_locale_override(Some("en-GB".to_owned()));
state.set_base_timezone_override(Some("Europe/London".to_owned()));
state.network_policy.set_browser_identity_override(
diff --git a/moli-protocol/src/conn/state/tests.rs b/moli-protocol/src/conn/state/tests.rs
index 4af4cec94..d09136df3 100644
--- a/moli-protocol/src/conn/state/tests.rs
+++ b/moli-protocol/src/conn/state/tests.rs
@@ -16,7 +16,7 @@ use super::navigation::{PageNavigationHistoryEntry, TargetNavigationHistoryState
use super::navigation_outcome::{NavigationDispatchState, NavigationResultProjection};
use super::page_slot::{DocumentStartScript, IsolatedWorldDefinition};
use super::runtime_slot::TargetRuntimeSlot;
-use super::session::{TargetPageSessionState, TargetPageState};
+use super::session::TargetPageSessionState;
use super::{
PageTargetHost,
parking::{ParkedTargetOwnerState, TargetOwnerState},
@@ -53,7 +53,7 @@ fn test_navigation_dispatch_state(fetch_request_id: &str) -> NavigationDispatchS
fn background_target_owns_page_session_state_atomically() {
let mut target = PageTargetHost::with_url("TID-A".to_owned(), None, "about:blank".to_owned());
- let mut state = TargetPageState::default();
+ let mut state = PageTargetHost::empty("TID-state-test".to_owned());
state.devtools_sessions[moli_page_types::DevToolsSessionKey::Primary] = DevToolsSessionState {
page_session_state: TargetPageSessionState {
log_enabled: true,
@@ -974,63 +974,37 @@ 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_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()
- );
+ assert!(!context.active_page_state().runtime_slot.has_loaded_page());
+ assert!(!context.active_page_state().fetch_owner.is_enabled());
+ assert!(context.active_page_state().owner_state.is_default());
context
.active_page_state_mut()
- .active_target
.runtime_slot
.enable_primary_network_events();
+ context.active_page_state_mut().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()),
Some(FetchRequestStage::Response)
@@ -1038,7 +1012,6 @@ 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,
7
@@ -1545,7 +1518,6 @@ fn active_target_initial_empty_document_record_tracks_navigation_lifecycle() {
assert_eq!(
context
.active_page_state()
- .active_target
.runtime_slot
.moli_memory_diagnostics()["loadedPageAbsenceReason"],
json!("initial-document-page-build-pending"),
@@ -1559,7 +1531,6 @@ fn active_target_initial_empty_document_record_tracks_navigation_lifecycle() {
let initial = context
.active_page_state()
- .active_target
.owner_state
.initial_empty_document_state()
.expect("active target should record initial empty document");
@@ -1573,7 +1544,6 @@ fn active_target_initial_empty_document_record_tracks_navigation_lifecycle() {
assert!(
context
.active_page_state()
- .active_target
.owner_state
.initial_empty_document_state()
.expect("initial empty document state")
@@ -1585,7 +1555,6 @@ fn active_target_initial_empty_document_record_tracks_navigation_lifecycle() {
.expect("active target should start document navigation");
let pending = context
.active_page_state()
- .active_target
.owner_state
.initial_empty_document_state()
.expect("initial empty document state");
@@ -1598,7 +1567,6 @@ fn active_target_initial_empty_document_record_tracks_navigation_lifecycle() {
);
let cleared = context
.active_page_state()
- .active_target
.owner_state
.initial_empty_document_state()
.expect("initial empty document state");
@@ -1611,7 +1579,6 @@ fn active_target_initial_empty_document_record_tracks_navigation_lifecycle() {
context.commit_document_navigation_if_matches(&committed);
let exited = context
.active_page_state()
- .active_target
.owner_state
.initial_empty_document_state()
.expect("initial empty document state");
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 e01555960..e8fcfeab7 100644
--- a/moli-protocol/src/conn/tests/cookie_surfaces/snapshots/telemetry.rs
+++ b/moli-protocol/src/conn/tests/cookie_surfaces/snapshots/telemetry.rs
@@ -35,7 +35,6 @@ async fn browser_context_document_cookie_snapshots_reflect_live_page_state() {
.as_mut()
.unwrap()
.active_page_state_mut()
- .active_target
.runtime_slot
.loaded_page_mut()
.unwrap()
@@ -77,7 +76,6 @@ async fn browser_context_document_cookie_snapshots_reflect_live_page_state() {
.as_mut()
.unwrap()
.active_page_state_mut()
- .active_target
.runtime_slot
.loaded_page_mut()
.unwrap()
diff --git a/moli-protocol/src/conn/tests/mod.rs b/moli-protocol/src/conn/tests/mod.rs
index 17a85616c..0b9a580c2 100644
--- a/moli-protocol/src/conn/tests/mod.rs
+++ b/moli-protocol/src/conn/tests/mod.rs
@@ -803,7 +803,6 @@ async fn replacing_or_retiring_a_loaded_page_changes_its_attachment_identity() {
assert_eq!(
context
.active_page_state()
- .active_target
.runtime_slot
.page_attachment_id(),
None
@@ -812,7 +811,6 @@ async fn replacing_or_retiring_a_loaded_page_changes_its_attachment_identity() {
assert!(context.replace_loaded_page(Some(first_page)).is_none());
let first_attachment = context
.active_page_state()
- .active_target
.runtime_slot
.page_attachment_id()
.expect("first Page attachment");
@@ -822,7 +820,6 @@ async fn replacing_or_retiring_a_loaded_page_changes_its_attachment_identity() {
.expect("first Page should be replaced");
let second_attachment = context
.active_page_state()
- .active_target
.runtime_slot
.page_attachment_id()
.expect("second Page attachment");
@@ -835,7 +832,6 @@ async fn replacing_or_retiring_a_loaded_page_changes_its_attachment_identity() {
assert_eq!(
context
.active_page_state()
- .active_target
.runtime_slot
.page_attachment_id(),
None
@@ -857,7 +853,6 @@ async fn moli_diagnostics_preserves_runtime_observable_diagnostics() {
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));
ctx.conn.browser_context = Some(browser_context);
@@ -1033,7 +1028,6 @@ async fn memory_diagnostics_sync_counts_dedicated_worker_from_cached_page_snapsh
.and_then(|context| {
context
.active_page_state_mut()
- .active_target
.runtime_slot
.loaded_page_mut()
})
diff --git a/moli-protocol/src/conn/tests/resource_runtime.rs b/moli-protocol/src/conn/tests/resource_runtime.rs
index b4077cb75..0664e71a3 100644
--- a/moli-protocol/src/conn/tests/resource_runtime.rs
+++ b/moli-protocol/src/conn/tests/resource_runtime.rs
@@ -707,7 +707,6 @@ async fn reset_resource_runtime_clears_loaded_page_cookie_backend() {
.as_mut()
.unwrap()
.active_page_state_mut()
- .active_target
.runtime_slot
.set_loaded_page_for_test(navigation.page);
@@ -716,7 +715,6 @@ async fn reset_resource_runtime_clears_loaded_page_cookie_backend() {
.as_mut()
.unwrap()
.active_page_state_mut()
- .active_target
.runtime_slot
.loaded_page_mut()
.unwrap();
@@ -733,7 +731,6 @@ async fn reset_resource_runtime_clears_loaded_page_cookie_backend() {
.as_mut()
.unwrap()
.active_page_state_mut()
- .active_target
.runtime_slot
.loaded_page_mut()
.unwrap();
@@ -975,7 +972,6 @@ async fn user_agent_override_rebinds_live_document_after_engine_runtime_invalida
.as_mut()
.unwrap()
.active_page_state_mut()
- .active_target
.runtime_slot
.set_loaded_page_for_test(navigation.page);
@@ -990,7 +986,6 @@ async fn user_agent_override_rebinds_live_document_after_engine_runtime_invalida
.as_mut()
.unwrap()
.active_page_state_mut()
- .active_target
.runtime_slot
.loaded_page_mut()
.unwrap();
@@ -1022,7 +1017,6 @@ async fn tls_and_proxy_overrides_rebind_live_document_after_engine_runtime_inval
.as_mut()
.unwrap()
.active_page_state_mut()
- .active_target
.runtime_slot
.set_loaded_page_for_test(navigation.page);
@@ -1035,7 +1029,6 @@ async fn tls_and_proxy_overrides_rebind_live_document_after_engine_runtime_inval
.as_mut()
.unwrap()
.active_page_state_mut()
- .active_target
.runtime_slot
.loaded_page_mut()
.unwrap();
@@ -1053,7 +1046,6 @@ async fn tls_and_proxy_overrides_rebind_live_document_after_engine_runtime_inval
.as_mut()
.unwrap()
.active_page_state_mut()
- .active_target
.runtime_slot
.loaded_page_mut()
.unwrap();
@@ -1351,7 +1343,6 @@ async fn session_scoped_process_message_restores_previously_active_context_after
assert!(
inactive
.active_page_state()
- .active_target
.runtime_slot
.primary_network_events_enabled()
);
@@ -1391,7 +1382,6 @@ async fn session_scoped_process_message_async_restores_previously_active_context
assert!(
inactive
.active_page_state()
- .active_target
.runtime_slot
.primary_network_events_enabled()
);
@@ -1427,7 +1417,6 @@ async fn direct_network_enable_routes_to_inactive_active_owner_without_promoting
assert!(
inactive
.active_page_state()
- .active_target
.runtime_slot
.primary_network_events_enabled()
);
@@ -1562,7 +1551,6 @@ fn devtools_document_lifecycle_wait_key_observes_interruption_and_target_loss()
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);
conn.browser_context = Some(browser_context);
@@ -1694,7 +1682,6 @@ fn devtools_document_lifecycle_wait_key_observes_interruption_and_target_loss()
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);
conn.browser_context = Some(replacement_context);
@@ -1739,7 +1726,6 @@ fn devtools_target_context_resolves_background_page_without_ambient_route() {
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);
assert!(
@@ -1753,11 +1739,9 @@ fn devtools_target_context_resolves_background_page_without_ambient_route() {
.background_target_mut("TID-background")
.expect("background PageTargetHost");
background
- .active_target
.runtime_slot
.set_page_attachment_id_for_test(1002);
background
- .active_target
.runtime_slot
.start_document_navigation("TID-background".to_owned(), "LID-background".to_owned());
conn.browser_context = Some(browser_context);
@@ -2255,7 +2239,6 @@ async fn direct_network_enable_disable_routes_to_inactive_auxiliary_owner_withou
assert!(
!inactive
.active_page_state()
- .active_target
.runtime_slot
.primary_network_events_enabled(),
"auxiliary Network.enable must not enable the target's primary listener"
@@ -2263,7 +2246,6 @@ 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")
);
@@ -2289,7 +2271,6 @@ 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")
);
@@ -2739,7 +2720,6 @@ async fn direct_console_routes_to_inactive_active_owner_without_promoting_slot()
assert_eq!(
inactive
.active_page_state()
- .active_target
.owner_state
.console_output_state
.console_domain_cursor(),
@@ -2793,7 +2773,6 @@ async fn direct_console_routes_to_inactive_active_owner_without_promoting_slot()
assert_eq!(
inactive
.active_page_state()
- .active_target
.owner_state
.console_output_state
.console_domain_cursor(),
diff --git a/moli-protocol/src/conn/tests/site_data.rs b/moli-protocol/src/conn/tests/site_data.rs
index 08d335f99..f7e83ed4a 100644
--- a/moli-protocol/src/conn/tests/site_data.rs
+++ b/moli-protocol/src/conn/tests/site_data.rs
@@ -239,7 +239,6 @@ async fn connection_preview_clear_cookie_store_with_persistent_scope_does_not_in
.as_mut()
.unwrap()
.active_page_state_mut()
- .active_target
.runtime_slot
.set_loaded_page_for_test(navigation.page);
@@ -332,7 +331,6 @@ async fn connection_clear_cookie_store_with_session_scope_invalidates_live_docum
.as_mut()
.unwrap()
.active_page_state_mut()
- .active_target
.runtime_slot
.set_loaded_page_for_test(navigation.page);
@@ -542,7 +540,6 @@ async fn connection_cookie_site_clear_invalidates_live_document_cookie_cache() {
.as_mut()
.unwrap()
.active_page_state_mut()
- .active_target
.runtime_slot
.set_loaded_page_for_test(navigation.page);
@@ -623,7 +620,6 @@ async fn connection_preview_clear_cookies_for_sites_does_not_invalidate_live_doc
.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 eec650953..f96dc3c62 100644
--- a/moli-protocol/src/domains/accessibility/tests.rs
+++ b/moli-protocol/src/domains/accessibility/tests.rs
@@ -187,7 +187,6 @@ async fn get_full_ax_tree_reads_live_renderer_dom_when_page_snapshot_is_stale()
.as_mut()
.expect("browser context")
.active_page_state_mut()
- .active_target
.runtime_slot
.loaded_page_mut()
.expect("loaded page");
@@ -232,7 +231,6 @@ async fn get_full_ax_tree_reads_live_renderer_dom_when_page_snapshot_is_stale()
.as_mut()
.expect("browser context")
.active_page_state_mut()
- .active_target
.runtime_slot
.loaded_page_mut()
.expect("loaded page");
@@ -629,7 +627,6 @@ async fn get_full_ax_tree_uses_fresh_initial_document_without_adapter() {
.as_ref()
.expect("browser context")
.active_page_state()
- .active_target
.runtime_slot
.has_loaded_page(),
"Target.createTarget should install the initial about:blank page before Accessibility"
diff --git a/moli-protocol/src/domains/activity/main_document.rs b/moli-protocol/src/domains/activity/main_document.rs
index 87e980f83..b7ce09a20 100644
--- a/moli-protocol/src/domains/activity/main_document.rs
+++ b/moli-protocol/src/domains/activity/main_document.rs
@@ -992,7 +992,6 @@ mod tests {
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);
conn.browser_context = Some(browser_context);
@@ -1137,7 +1136,6 @@ mod tests {
browser_context.attach_active_session("SID-page");
browser_context
.active_page_state_mut()
- .active_target
.runtime_slot
.enable_primary_network_events();
conn.browser_context = Some(browser_context);
diff --git a/moli-protocol/src/domains/activity/output_ingress/renderer.rs b/moli-protocol/src/domains/activity/output_ingress/renderer.rs
index 2761b4e5b..1e538bfae 100644
--- a/moli-protocol/src/domains/activity/output_ingress/renderer.rs
+++ b/moli-protocol/src/domains/activity/output_ingress/renderer.rs
@@ -263,7 +263,6 @@ mod tests {
);
browser_context
.active_page_state_mut()
- .active_target
.runtime_slot
.set_page_attachment_id_for_test(1);
conn.browser_context = Some(browser_context);
diff --git a/moli-protocol/src/domains/activity/runtime_command_barrier.rs b/moli-protocol/src/domains/activity/runtime_command_barrier.rs
index 933023a37..1e42837ae 100644
--- a/moli-protocol/src/domains/activity/runtime_command_barrier.rs
+++ b/moli-protocol/src/domains/activity/runtime_command_barrier.rs
@@ -513,7 +513,6 @@ mod tests {
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));
conn.browser_context = Some(browser_context);
diff --git a/moli-protocol/src/domains/console.rs b/moli-protocol/src/domains/console.rs
index 3cd0181b3..9a5efb88b 100644
--- a/moli-protocol/src/domains/console.rs
+++ b/moli-protocol/src/domains/console.rs
@@ -343,7 +343,6 @@ mod tests {
let snapshot = super::pending_console_activity_snapshot(super::ConsoleActivitySource {
observable: bc
.active_page_state()
- .active_target
.owner_state
.console_output_state
.console_domain_emission_snapshot(
@@ -357,7 +356,6 @@ mod tests {
.as_mut()
.expect("browser context should be loaded")
.active_page_state_mut()
- .active_target
.owner_state
.console_output_state
.advance_console_domain_to_current(
diff --git a/moli-protocol/src/domains/css.rs b/moli-protocol/src/domains/css.rs
index 5c411f5e2..65393d2fa 100644
--- a/moli-protocol/src/domains/css.rs
+++ b/moli-protocol/src/domains/css.rs
@@ -800,7 +800,6 @@ mod tests {
.as_mut()
.expect("browser context")
.active_page_state_mut()
- .active_target
.runtime_slot
.loaded_page_mut()
.expect("loaded page")
@@ -1670,7 +1669,6 @@ mod tests {
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);
browser_context.stage_background_target(
diff --git a/moli-protocol/src/domains/debugger.rs b/moli-protocol/src/domains/debugger.rs
index 6be219b67..f774cd560 100644
--- a/moli-protocol/src/domains/debugger.rs
+++ b/moli-protocol/src/domains/debugger.rs
@@ -49,7 +49,6 @@ mod tests {
.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/tests/mod.rs b/moli-protocol/src/domains/dom/tests/mod.rs
index cee43df2f..2ade1f811 100644
--- a/moli-protocol/src/domains/dom/tests/mod.rs
+++ b/moli-protocol/src/domains/dom/tests/mod.rs
@@ -33,7 +33,6 @@ async fn create_about_blank_target_with_initial_document(ctx: &mut TestContext,
.as_ref()
.expect("browser context")
.active_page_state()
- .active_target
.runtime_slot
.has_loaded_page(),
"Target.createTarget should install the initial about:blank page"
@@ -76,7 +75,6 @@ async fn get_document_uses_fresh_initial_document_without_adapter() {
.as_ref()
.expect("browser context")
.active_page_state()
- .active_target
.runtime_slot
.has_loaded_page(),
"Target.createTarget should install the initial about:blank page before DOM.getDocument"
@@ -132,7 +130,6 @@ async fn get_flattened_document_uses_fresh_initial_document_without_adapter() {
.as_ref()
.expect("browser context")
.active_page_state()
- .active_target
.runtime_slot
.has_loaded_page(),
"Target.createTarget should install the initial about:blank page before DOM.getFlattenedDocument"
@@ -186,7 +183,6 @@ async fn describe_node_uses_fresh_initial_document_without_adapter() {
.as_ref()
.expect("browser context")
.active_page_state()
- .active_target
.runtime_slot
.has_loaded_page(),
"Target.createTarget should install the initial about:blank page before DOM.describeNode"
diff --git a/moli-protocol/src/domains/dom/tests/node_ops.rs b/moli-protocol/src/domains/dom/tests/node_ops.rs
index 348a72b9e..16bf439b0 100644
--- a/moli-protocol/src/domains/dom/tests/node_ops.rs
+++ b/moli-protocol/src/domains/dom/tests/node_ops.rs
@@ -46,7 +46,6 @@ fn loaded_page_mut_for_test(ctx: &mut TestContext) -> &mut moli_core::page::Page
.as_mut()
.expect("browser context")
.active_page_state_mut()
- .active_target
.runtime_slot
.loaded_page_mut()
.expect("loaded page")
diff --git a/moli-protocol/src/domains/dom_snapshot.rs b/moli-protocol/src/domains/dom_snapshot.rs
index 37eaa7e5e..1f38ea5d2 100644
--- a/moli-protocol/src/domains/dom_snapshot.rs
+++ b/moli-protocol/src/domains/dom_snapshot.rs
@@ -1197,7 +1197,6 @@ mod tests {
.as_ref()
.expect("browser context")
.active_page_state()
- .active_target
.runtime_slot
.has_loaded_page(),
"Target.createTarget should install the initial about:blank page before DOMSnapshot"
diff --git a/moli-protocol/src/domains/dom_storage/tests.rs b/moli-protocol/src/domains/dom_storage/tests.rs
index 52161eb1b..725b48c44 100644
--- a/moli-protocol/src/domains/dom_storage/tests.rs
+++ b/moli-protocol/src/domains/dom_storage/tests.rs
@@ -128,7 +128,6 @@ async fn loaded_dom_storage_context() -> (TestContext, String, String, tokio::ta
.as_mut()
.expect("browser context should exist")
.active_page_state_mut()
- .active_target
.runtime_slot
.set_loaded_page_for_test(page);
(ctx, page_url, origin, server)
@@ -464,7 +463,6 @@ async fn dom_storage_resolves_child_frame_storage_ids_without_collapsing_to_top_
.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 edd91c2b5..52cc69432 100644
--- a/moli-protocol/src/domains/emulation.rs
+++ b/moli-protocol/src/domains/emulation.rs
@@ -2777,7 +2777,6 @@ fn start_geolocation_surface_override_page_commands(
};
let Some(page) = browser_context
.active_page_target_mut()
- .active_target
.runtime_slot
.loaded_page_mut()
else {
diff --git a/moli-protocol/src/domains/emulation/tests.rs b/moli-protocol/src/domains/emulation/tests.rs
index 1e74dfa64..93acc26d7 100644
--- a/moli-protocol/src/domains/emulation/tests.rs
+++ b/moli-protocol/src/domains/emulation/tests.rs
@@ -33,12 +33,7 @@ async fn loaded_page_html_for_test(ctx: &mut TestContext) -> String {
.conn
.browser_context
.as_mut()
- .and_then(|bc| {
- bc.active_page_state_mut()
- .active_target
- .runtime_slot
- .loaded_page_mut()
- })
+ .and_then(|bc| bc.active_page_state_mut().runtime_slot.loaded_page_mut())
.expect("loaded page");
page.serialize_html_async()
.await
@@ -605,7 +600,6 @@ async fn idle_override_updates_idle_detector_and_clear_restores_actual_state() {
.and_then(|context| {
context
.active_page_state_mut()
- .active_target
.runtime_slot
.loaded_page_mut()
})
@@ -657,7 +651,6 @@ async fn idle_override_updates_idle_detector_and_clear_restores_actual_state() {
.and_then(|context| {
context
.active_page_state_mut()
- .active_target
.runtime_slot
.loaded_page_mut()
})
@@ -699,7 +692,6 @@ async fn idle_override_updates_idle_detector_and_clear_restores_actual_state() {
.and_then(|context| {
context
.active_page_state_mut()
- .active_target
.runtime_slot
.loaded_page_mut()
})
@@ -1420,7 +1412,6 @@ async fn set_user_agent_override_applies_to_subsequent_navigation_requests() {
bc.set_active_target_id("TID-1");
bc.attach_active_session("SID-1");
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/commands.rs b/moli-protocol/src/domains/fetch/commands.rs
index 07061f455..3645a8d06 100644
--- a/moli-protocol/src/domains/fetch/commands.rs
+++ b/moli-protocol/src/domains/fetch/commands.rs
@@ -2101,7 +2101,6 @@ mod protocol_neutral_tests {
);
browser_context
.active_page_state_mut()
- .active_target
.runtime_slot
.set_page_attachment_id_for_test(1);
conn.browser_context = Some(browser_context);
@@ -2243,7 +2242,6 @@ mod protocol_neutral_tests {
);
browser_context
.active_page_state_mut()
- .active_target
.runtime_slot
.set_page_attachment_id_for_test(1);
conn.browser_context = Some(browser_context);
@@ -2380,7 +2378,6 @@ mod protocol_neutral_tests {
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);
conn.browser_context = Some(browser_context);
diff --git a/moli-protocol/src/domains/fetch/subresource.rs b/moli-protocol/src/domains/fetch/subresource.rs
index f8c319c79..1405e08e9 100644
--- a/moli-protocol/src/domains/fetch/subresource.rs
+++ b/moli-protocol/src/domains/fetch/subresource.rs
@@ -694,7 +694,6 @@ mod tests {
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);
conn.browser_context = Some(browser_context);
@@ -757,13 +756,11 @@ mod tests {
let bc = conn.browser_context.as_ref().unwrap();
assert!(
bc.active_page_state()
- .active_target
.fetch_owner
.has_pending_subresource_fetch_for_test("FETCH-1")
);
assert!(
bc.active_page_state()
- .active_target
.fetch_owner
.has_pending_subresource_fetch_for_test("FETCH-2")
);
@@ -775,7 +772,6 @@ mod tests {
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);
conn.browser_context = Some(browser_context);
@@ -820,7 +816,6 @@ mod tests {
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);
conn.browser_context = Some(browser_context);
@@ -831,7 +826,6 @@ mod tests {
.as_mut()
.expect("browser context should remain installed")
.active_page_state_mut()
- .active_target
.runtime_slot
.replace_page_attachment_id_for_test();
@@ -859,7 +853,6 @@ mod tests {
.as_ref()
.expect("browser context should remain installed")
.active_page_state()
- .active_target
.fetch_owner
.has_pending_subresource_fetch_for_test("FETCH-1"),
"a stale prepared pause must not install pending command state"
@@ -916,7 +909,6 @@ mod tests {
);
assert!(
!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 0f00a4783..721b94d94 100644
--- a/moli-protocol/src/domains/fetch/tests/basics.rs
+++ b/moli-protocol/src/domains/fetch/tests/basics.rs
@@ -143,18 +143,8 @@ 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_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().fetch_owner.is_enabled());
+ assert!(bc.active_page_state().fetch_owner.handle_auth_requests());
}
#[tokio::test]
@@ -191,18 +181,13 @@ 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_page_state()
- .active_target
- .fetch_owner
- .config_snapshot();
+ let aggregate = bc.active_page_state().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"));
assert!(primary.is_enabled());
@@ -212,7 +197,6 @@ async fn enable_and_disable_are_session_local_for_same_target() {
let aux = bc
.active_page_state()
- .active_target
.fetch_owner
.config_snapshot_for_session(Some("SID-aux"));
assert!(aux.is_enabled());
@@ -230,32 +214,25 @@ 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_page_state()
- .active_target
- .fetch_owner
- .config_snapshot();
+ let aggregate = bc.active_page_state().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_page_state()
- .active_target
.fetch_owner
.config_snapshot_for_session(Some("SID-primary"))
.is_enabled()
);
assert!(
bc.active_page_state()
- .active_target
.fetch_owner
.config_snapshot_for_session(Some("SID-aux"))
.is_enabled()
);
assert_eq!(
bc.active_page_state()
- .active_target
.fetch_owner
.subresource_interception_config(),
(true, Some(moli_core::page::SubresourceResourceType::Xhr))
@@ -300,7 +277,6 @@ async fn disable_drains_only_current_session_pending_subresource_fetches() {
.as_mut()
.expect("browser context")
.active_page_state_mut()
- .active_target
.fetch_owner;
fetch_owner.register_pending_subresource_fetch_request(
"FETCH-primary".to_owned(),
@@ -326,7 +302,6 @@ async fn disable_drains_only_current_session_pending_subresource_fetches() {
.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"));
assert!(fetch_owner.has_pending_fetch_request_id_for_test("FETCH-aux"));
@@ -364,7 +339,6 @@ async fn disable_drains_fetch_owned_pending_when_same_session_network_intercept_
.as_mut()
.expect("browser context")
.active_page_state_mut()
- .active_target
.fetch_owner;
fetch_owner.add_network_intercept(
"NETWORK-INTERCEPT-1".to_owned(),
@@ -405,7 +379,6 @@ async fn disable_drains_fetch_owned_pending_when_same_session_network_intercept_
.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"));
assert!(fetch_owner.has_pending_fetch_request_id_for_test("NETWORK-owned"));
@@ -458,12 +431,7 @@ 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_page_state()
- .active_target
- .fetch_owner
- .is_enabled()
- );
+ assert!(!bc.active_page_state().fetch_owner.is_enabled());
let staged = bc
.parked_page_session_state("TID-background")
.expect("background owner fetch config should be staged");
@@ -560,12 +528,7 @@ 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_page_state()
- .active_target
- .fetch_owner
- .is_enabled()
- );
+ assert!(!bc.active_page_state().fetch_owner.is_enabled());
let staged = bc
.parked_page_session_state("TID-fetch-background")
.expect("background fetch config should stay parked");
@@ -614,7 +577,6 @@ async fn enable_targets_inactive_owner_without_activation() {
.as_ref()
.expect("active context")
.active_page_state()
- .active_target
.fetch_owner
.is_enabled()
);
@@ -624,24 +586,16 @@ async fn enable_targets_inactive_owner_without_activation() {
.iter()
.find(|bc| bc.id == "BID-inactive")
.expect("inactive context");
+ assert!(inactive.active_page_state().fetch_owner.is_enabled());
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()
.url_pattern(),
@@ -691,12 +645,7 @@ 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_page_state()
- .active_target
- .fetch_owner
- .is_enabled()
- );
+ assert!(!bc.active_page_state().fetch_owner.is_enabled());
assert!(
bc.parked_page_session_state("TID-background").is_none(),
"disabled background fetch config should collapse to default"
@@ -716,18 +665,8 @@ 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_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().fetch_owner.is_enabled());
+ assert!(!bc.active_page_state().fetch_owner.handle_auth_requests());
}
#[tokio::test]
@@ -748,18 +687,8 @@ 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_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().fetch_owner.is_enabled());
+ assert!(!bc.active_page_state().fetch_owner.handle_auth_requests());
}
#[tokio::test]
@@ -778,17 +707,8 @@ 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_page_state()
- .active_target
- .fetch_owner
- .is_enabled()
- );
- let fetch_config = bc
- .active_page_state()
- .active_target
- .fetch_owner
- .config_snapshot();
+ assert!(bc.active_page_state().fetch_owner.is_enabled());
+ let fetch_config = bc.active_page_state().fetch_owner.config_snapshot();
assert_eq!(fetch_config.url_pattern(), "https://example.com/api/*");
}
@@ -828,15 +748,9 @@ 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_page_state()
- .active_target
- .fetch_owner
- .is_enabled()
- );
+ assert!(bc.active_page_state().fetch_owner.is_enabled());
assert_eq!(
bc.active_page_state()
- .active_target
.fetch_owner
.config_snapshot()
.resource_type_filter(),
@@ -860,15 +774,9 @@ 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_page_state()
- .active_target
- .fetch_owner
- .is_enabled()
- );
+ assert!(bc.active_page_state().fetch_owner.is_enabled());
assert_eq!(
bc.active_page_state()
- .active_target
.fetch_owner
.config_snapshot()
.resource_type_filter(),
@@ -892,15 +800,9 @@ 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_page_state()
- .active_target
- .fetch_owner
- .is_enabled()
- );
+ assert!(bc.active_page_state().fetch_owner.is_enabled());
assert_eq!(
bc.active_page_state()
- .active_target
.fetch_owner
.config_snapshot()
.resource_type_filter(),
@@ -924,15 +826,9 @@ 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_page_state()
- .active_target
- .fetch_owner
- .is_enabled()
- );
+ assert!(bc.active_page_state().fetch_owner.is_enabled());
assert_eq!(
bc.active_page_state()
- .active_target
.fetch_owner
.config_snapshot()
.resource_type_filter(),
@@ -956,15 +852,9 @@ 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_page_state()
- .active_target
- .fetch_owner
- .is_enabled()
- );
+ assert!(bc.active_page_state().fetch_owner.is_enabled());
assert_eq!(
bc.active_page_state()
- .active_target
.fetch_owner
.config_snapshot()
.resource_type_filter(),
@@ -992,15 +882,9 @@ 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_page_state()
- .active_target
- .fetch_owner
- .is_enabled()
- );
+ assert!(bc.active_page_state().fetch_owner.is_enabled());
assert_eq!(
bc.active_page_state()
- .active_target
.fetch_owner
.config_snapshot()
.resource_type_filter(),
@@ -1024,15 +908,9 @@ 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_page_state()
- .active_target
- .fetch_owner
- .is_enabled()
- );
+ assert!(bc.active_page_state().fetch_owner.is_enabled());
assert_eq!(
bc.active_page_state()
- .active_target
.fetch_owner
.config_snapshot()
.resource_type_filter(),
@@ -1056,15 +934,9 @@ 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_page_state()
- .active_target
- .fetch_owner
- .is_enabled()
- );
+ assert!(bc.active_page_state().fetch_owner.is_enabled());
assert_eq!(
bc.active_page_state()
- .active_target
.fetch_owner
.config_snapshot()
.resource_type_filter(),
@@ -1092,12 +964,7 @@ 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_page_state()
- .active_target
- .fetch_owner
- .is_enabled()
- );
+ assert!(!bc.active_page_state().fetch_owner.is_enabled());
}
}
@@ -1117,15 +984,9 @@ 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_page_state()
- .active_target
- .fetch_owner
- .is_enabled()
- );
+ assert!(bc.active_page_state().fetch_owner.is_enabled());
assert_eq!(
bc.active_page_state()
- .active_target
.fetch_owner
.config_snapshot()
.resource_type_filter(),
@@ -1149,17 +1010,8 @@ 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_page_state()
- .active_target
- .fetch_owner
- .is_enabled()
- );
- let fetch_config = bc
- .active_page_state()
- .active_target
- .fetch_owner
- .config_snapshot();
+ assert!(bc.active_page_state().fetch_owner.is_enabled());
+ let fetch_config = bc.active_page_state().fetch_owner.config_snapshot();
assert_eq!(fetch_config.request_stage(), FetchRequestStage::Response);
assert_eq!(fetch_config.resource_type_filter(), None);
}
@@ -1184,23 +1036,9 @@ 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_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!(bc.active_page_state().fetch_owner.is_enabled());
+ assert!(bc.active_page_state().fetch_owner.handle_auth_requests());
+ let fetch_config = bc.active_page_state().fetch_owner.config_snapshot();
assert_eq!(fetch_config.patterns().len(), 2);
assert_eq!(
fetch_config.patterns()[0].request_stage,
@@ -1225,11 +1063,9 @@ 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_page_state_mut()
- .active_target
.fetch_owner
.configure(None, true, Vec::new());
bc.active_page_state_mut()
- .active_target
.fetch_owner
.register_pending_fetch_navigation_request(PendingFetchNavigation {
fetch_request_id: "INT-1".to_owned(),
@@ -1262,7 +1098,6 @@ async fn disable_clears_fetch_state() {
auth_required_blocked_intercepts: Vec::new(),
});
bc.active_page_state_mut()
- .active_target
.fetch_owner
.register_pending_fetch_auth_navigation(
"INT-1".to_owned(),
@@ -1318,21 +1153,10 @@ async fn disable_clears_fetch_state() {
ctx.expect_result(5, json!({}), None);
let bc = ctx.conn.browser_context.as_ref().unwrap();
+ assert!(!bc.active_page_state().fetch_owner.is_enabled());
+ assert!(!bc.active_page_state().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()
- );
- assert!(
- !bc.active_page_state()
- .active_target
.fetch_owner
.has_pending_fetch_state_for_test()
);
@@ -1343,15 +1167,12 @@ 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_page_state_mut()
- .active_target
.fetch_owner
.configure(None, false, Vec::new());
bc.active_page_state_mut()
- .active_target
.fetch_owner
.register_pending_fetch_request_id_for_test("INT-1".to_owned());
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);
@@ -1413,11 +1234,9 @@ async fn continue_response_and_take_response_body_as_stream_validate_like_fetch_
let mut ctx = TestContext::new();
let mut bc = BrowserContext::new_with_page_for_test("BID-1", "TID-1");
bc.active_page_state_mut()
- .active_target
.fetch_owner
.register_pending_fetch_request_id_for_test("INT-42".to_owned());
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);
@@ -1452,7 +1271,6 @@ 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_page_state_mut()
- .active_target
.fetch_owner
.register_pending_fetch_request_id_for_test("INT-7".to_owned());
ctx.conn.browser_context = Some(bc);
@@ -1504,7 +1322,6 @@ async fn continue_with_auth_rejects_invalid_response_without_consuming_pending_a
let mut ctx = TestContext::new();
let mut bc = attached_browser_context();
bc.active_page_state_mut()
- .active_target
.fetch_owner
.register_pending_fetch_auth_navigation(
"INT-8".to_owned(),
@@ -1570,7 +1387,6 @@ 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_page_state()
- .active_target
.fetch_owner
.has_pending_fetch_auth_navigation_for_test("INT-8")
);
@@ -1581,7 +1397,6 @@ async fn continue_with_auth_unsupported_challenge_preserves_pending_auth_navigat
let mut ctx = TestContext::new();
let mut bc = attached_browser_context();
bc.active_page_state_mut()
- .active_target
.fetch_owner
.register_pending_fetch_auth_navigation(
"INT-9".to_owned(),
@@ -1651,7 +1466,6 @@ 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_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 b50aa3bd4..460579940 100644
--- a/moli-protocol/src/domains/fetch/tests/command_correlation.rs
+++ b/moli-protocol/src/domains/fetch/tests/command_correlation.rs
@@ -19,7 +19,6 @@ async fn context_with_loaded_fetch_page() -> TestContext {
let mut browser_context = attached_browser_context();
browser_context
.active_page_state_mut()
- .active_target
.runtime_slot
.replace_loaded_page(Some(page));
ctx.conn.browser_context = Some(browser_context);
diff --git a/moli-protocol/src/domains/fetch/tests/mod.rs b/moli-protocol/src/domains/fetch/tests/mod.rs
index 80b57d3fb..be1d9f972 100644
--- a/moli-protocol/src/domains/fetch/tests/mod.rs
+++ b/moli-protocol/src/domains/fetch/tests/mod.rs
@@ -82,12 +82,7 @@ async fn loaded_page_html_for_test(ctx: &mut TestContext) -> String {
.conn
.browser_context
.as_mut()
- .and_then(|bc| {
- bc.active_page_state_mut()
- .active_target
- .runtime_slot
- .loaded_page_mut()
- })
+ .and_then(|bc| bc.active_page_state_mut().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 23589f5e8..4040c3a71 100644
--- a/moli-protocol/src/domains/fetch/tests/navigation_auth.rs
+++ b/moli-protocol/src/domains/fetch/tests/navigation_auth.rs
@@ -44,7 +44,6 @@ async fn continue_with_auth_retries_navigation_with_basic_credentials() {
let mut ctx = TestContext::new();
let mut bc = attached_browser_context();
bc.active_page_state_mut()
- .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -206,7 +205,6 @@ async fn devtools_continue_response_credentials_retries_auth_navigation() {
let mut ctx = TestContext::new();
let mut bc = attached_browser_context();
bc.active_page_state_mut()
- .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -353,7 +351,6 @@ 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_page_state_mut()
- .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -488,7 +485,6 @@ 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_page_state_mut()
- .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -606,7 +602,6 @@ async fn navigation_auth_required_includes_synthesized_cookie_header() {
let mut ctx = TestContext::new();
let mut bc = attached_browser_context();
bc.active_page_state_mut()
- .active_target
.runtime_slot
.enable_primary_network_events();
let url = format!("http://{addr}/auth");
@@ -704,7 +699,6 @@ async fn continue_with_auth_prefers_supported_navigation_challenge_over_unsuppor
let mut ctx = TestContext::new();
let mut bc = attached_browser_context();
bc.active_page_state_mut()
- .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -855,7 +849,6 @@ async fn run_navigation_cdp_fetch_then_bidi_network_auth_required_terminal(
let mut bc = attached_browser_context();
assert!(bc.assign_auxiliary_session_to_target("TID-1", "SID-fetch".to_owned()));
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 b7d81db65..54f129e94 100644
--- a/moli-protocol/src/domains/fetch/tests/navigation_control.rs
+++ b/moli-protocol/src/domains/fetch/tests/navigation_control.rs
@@ -72,13 +72,11 @@ 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_page_state()
- .active_target
.fetch_owner
.has_pending_fetch_request_id_for_test(&request_id)
);
assert!(
bc.active_page_state()
- .active_target
.fetch_owner
.has_pending_fetch_navigation_for_test(&request_id)
);
@@ -126,13 +124,11 @@ 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_page_state()
- .active_target
.fetch_owner
.has_pending_fetch_request_id_for_test(&request_id)
);
assert!(
bc.active_page_state()
- .active_target
.fetch_owner
.has_pending_fetch_navigation_for_test(&request_id)
);
@@ -259,7 +255,6 @@ async fn fail_request_blocked_by_client_maps_main_document_navigation_to_net_err
let mut ctx = TestContext::new();
let mut bc = attached_browser_context();
bc.active_page_state_mut()
- .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -390,7 +385,6 @@ async fn response_stage_document_pattern_pauses_main_document_after_response() {
let mut ctx = TestContext::new();
let mut bc = attached_browser_context();
bc.active_page_state_mut()
- .active_target
.runtime_slot
.enable_primary_network_events();
let url = format!("http://{addr}/page");
@@ -592,7 +586,6 @@ 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_page_state_mut()
- .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -710,7 +703,6 @@ async fn intercepted_form_post_navigation_body_is_available_by_network_request_i
{
let bc = ctx.conn.browser_context.as_mut().expect("browser context");
bc.active_page_state_mut()
- .active_target
.runtime_slot
.enable_primary_network_events();
}
@@ -829,7 +821,6 @@ 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_page_state_mut()
- .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -959,7 +950,6 @@ async fn intercepted_navigation_start_events_stay_before_network_pause_with_back
let mut ctx = TestContext::new();
let mut bc = attached_browser_context();
bc.active_page_state_mut()
- .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -1018,7 +1008,6 @@ async fn disable_aborts_paused_main_document_navigation() {
let mut ctx = TestContext::new();
let mut bc = attached_browser_context();
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 703f5f3f5..0f07ac6b6 100644
--- a/moli-protocol/src/domains/fetch/tests/navigation_response_stage.rs
+++ b/moli-protocol/src/domains/fetch/tests/navigation_response_stage.rs
@@ -29,7 +29,6 @@ async fn response_stage_pause_happens_before_navigation_body_eof() {
let mut ctx = TestContext::new();
let mut bc = attached_browser_context();
bc.active_page_state_mut()
- .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -79,7 +78,6 @@ async fn response_stage_pause_happens_before_navigation_body_eof() {
.as_ref()
.and_then(|bc| {
bc.active_page_state()
- .active_target
.fetch_owner
.pending_fetch_response_prepared_renderer_agent_for_test(&response_request_id)
})
@@ -169,7 +167,6 @@ async fn assert_empty_http_error_response_stage(ctx: &mut TestContext, url: &str
.as_ref()
.and_then(|bc| {
bc.active_page_state()
- .active_target
.fetch_owner
.pending_fetch_response_prepared_renderer_agent_for_test(&request_id)
})
@@ -276,7 +273,6 @@ 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_page_state_mut()
- .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -318,7 +314,6 @@ lateBinding("author-script");
let mut ctx = TestContext::new();
let mut bc = attached_browser_context();
bc.active_page_state_mut()
- .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -333,7 +328,6 @@ lateBinding("author-script");
.as_mut()
.expect("browser context should remain installed")
.active_page_state_mut()
- .active_target
.runtime_slot
.replace_loaded_page(Some(initial_page));
@@ -507,7 +501,6 @@ 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_page_state_mut()
- .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -523,7 +516,6 @@ async fn response_stage_xml_commit_uses_live_configuration_before_first_author_s
.as_mut()
.expect("browser context should remain installed")
.active_page_state_mut()
- .active_target
.runtime_slot
.replace_loaded_page(Some(initial_page));
@@ -714,7 +706,6 @@ async fn fulfill_request_commit_uses_configuration_added_while_paused_before_aut
.as_mut()
.expect("browser context should remain installed")
.active_page_state_mut()
- .active_target
.runtime_slot
.replace_loaded_page(Some(initial_page));
@@ -896,7 +887,6 @@ async fn interleaved_response_heads_only_commit_the_current_prepared_document()
let mut ctx = TestContext::new();
let mut bc = attached_browser_context();
bc.active_page_state_mut()
- .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -934,7 +924,6 @@ async fn interleaved_response_heads_only_commit_the_current_prepared_document()
.as_ref()
.and_then(|bc| {
bc.active_page_state()
- .active_target
.fetch_owner
.pending_fetch_response_prepared_renderer_agent_for_test(&first_request_id)
})
@@ -958,7 +947,6 @@ async fn interleaved_response_heads_only_commit_the_current_prepared_document()
.as_ref()
.and_then(|bc| {
bc.active_page_state()
- .active_target
.fetch_owner
.pending_fetch_response_prepared_renderer_agent_for_test(&second_request_id)
})
@@ -967,7 +955,6 @@ async fn interleaved_response_heads_only_commit_the_current_prepared_document()
let attachment_before_continue = ctx.conn.browser_context.as_ref().and_then(|bc| {
bc.active_page_state()
- .active_target
.runtime_slot
.current_renderer_attachment()
});
@@ -988,7 +975,6 @@ async fn interleaved_response_heads_only_commit_the_current_prepared_document()
assert_eq!(
ctx.conn.browser_context.as_ref().and_then(|bc| bc
.active_page_state()
- .active_target
.runtime_slot
.current_renderer_attachment()),
attachment_before_continue,
@@ -1040,7 +1026,6 @@ async fn response_stage_continue_request_rejects_data_url_override_without_consu
let mut ctx = TestContext::new();
let mut bc = attached_browser_context();
bc.active_page_state_mut()
- .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -1088,13 +1073,11 @@ async fn response_stage_continue_request_rejects_data_url_override_without_consu
.expect("browser context should remain active");
assert!(
bc.active_page_state()
- .active_target
.fetch_owner
.has_pending_fetch_request_id_for_test(&request_id)
);
assert!(
bc.active_page_state()
- .active_target
.fetch_owner
.has_pending_fetch_navigation_for_test(&request_id)
);
@@ -1109,7 +1092,6 @@ async fn response_stage_continue_request_rejects_file_url_override_without_consu
let mut ctx = TestContext::new();
let mut bc = attached_browser_context();
bc.active_page_state_mut()
- .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -1155,13 +1137,11 @@ async fn response_stage_continue_request_rejects_file_url_override_without_consu
.expect("browser context should remain active");
assert!(
bc.active_page_state()
- .active_target
.fetch_owner
.has_pending_fetch_request_id_for_test(&request_id)
);
assert!(
bc.active_page_state()
- .active_target
.fetch_owner
.has_pending_fetch_navigation_for_test(&request_id)
);
@@ -1191,7 +1171,6 @@ async fn response_stage_continue_response_streams_network_events_through_backgro
let mut ctx = TestContext::new();
let mut bc = attached_browser_context();
bc.active_page_state_mut()
- .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -1312,7 +1291,6 @@ async fn continue_response_can_override_status_and_headers() {
let mut ctx = TestContext::new();
let mut bc = attached_browser_context();
bc.active_page_state_mut()
- .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -1777,7 +1755,6 @@ async fn fail_request_at_response_stage_aborts_navigation() {
let mut ctx = TestContext::new();
let mut bc = attached_browser_context();
bc.active_page_state_mut()
- .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -1818,7 +1795,6 @@ async fn fail_request_at_response_stage_aborts_navigation() {
.to_owned();
let attachment_before_cancel = ctx.conn.browser_context.as_ref().and_then(|bc| {
bc.active_page_state()
- .active_target
.runtime_slot
.current_renderer_attachment()
});
@@ -1828,7 +1804,6 @@ async fn fail_request_at_response_stage_aborts_navigation() {
.as_ref()
.and_then(|bc| {
bc.active_page_state()
- .active_target
.fetch_owner
.pending_fetch_response_prepared_renderer_agent_for_test(&response_request_id)
})
@@ -1853,7 +1828,6 @@ async fn fail_request_at_response_stage_aborts_navigation() {
assert_eq!(
browser_context
.active_page_state()
- .active_target
.runtime_slot
.current_renderer_attachment(),
attachment_before_cancel,
@@ -1883,7 +1857,6 @@ 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_page_state_mut()
- .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -1921,7 +1894,6 @@ async fn fulfill_request_at_response_stage_replaces_the_network_candidate_once()
.as_ref()
.and_then(|bc| {
bc.active_page_state()
- .active_target
.fetch_owner
.pending_fetch_response_prepared_renderer_agent_for_test(&request_id)
})
@@ -2401,7 +2373,6 @@ async fn get_response_body_does_not_consume_active_response_body_stream() {
.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"),
Some("INT-1")
@@ -2428,7 +2399,6 @@ async fn get_response_body_does_not_consume_active_response_body_stream() {
.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"),
Some("INT-1")
@@ -2448,7 +2418,6 @@ async fn get_response_body_does_not_consume_active_response_body_stream() {
.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"),
Some("INT-1")
@@ -2476,7 +2445,6 @@ async fn get_response_body_does_not_consume_active_response_body_stream() {
.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")
.is_none()
@@ -2760,7 +2728,6 @@ async fn clear_browser_cache_cancels_active_response_body_stream_without_stale_r
.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")
.is_none()
@@ -2849,7 +2816,6 @@ async fn fulfill_request_completes_navigation_with_synthetic_response() {
let mut ctx = TestContext::new();
let mut bc = attached_browser_context();
bc.active_page_state_mut()
- .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -2943,7 +2909,6 @@ async fn fulfill_request_navigation_get_response_body_preserves_binary_bytes() {
let mut ctx = TestContext::new();
let mut bc = attached_browser_context();
bc.active_page_state_mut()
- .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -3022,7 +2987,6 @@ async fn fulfill_request_document_body_uses_phase_one_parser_semantics() {
let mut ctx = TestContext::new();
let mut bc = attached_browser_context();
bc.active_page_state_mut()
- .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -3093,7 +3057,6 @@ async fn fulfill_request_accepts_binary_response_headers() {
let mut ctx = TestContext::new();
let mut bc = attached_browser_context();
bc.active_page_state_mut()
- .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -3185,7 +3148,6 @@ async fn continue_request_applies_url_method_headers_and_post_data() {
let mut ctx = TestContext::new();
let mut bc = attached_browser_context();
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 035347136..07c7cf1db 100644
--- a/moli-protocol/src/domains/fetch/tests/navigation_subresource.rs
+++ b/moli-protocol/src/domains/fetch/tests/navigation_subresource.rs
@@ -72,7 +72,6 @@ async fn request_stage_navigation_request_paused_includes_synthesized_cookie_hea
let mut ctx = TestContext::new();
let mut bc = attached_browser_context();
bc.active_page_state_mut()
- .active_target
.runtime_slot
.enable_primary_network_events();
let url = format!("http://{addr}/page");
@@ -153,7 +152,6 @@ fetch('/api', { method: 'POST', body: 'nav-payload' })
let mut ctx = TestContext::new();
let mut bc = attached_browser_context();
bc.active_page_state_mut()
- .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -376,7 +374,6 @@ document.addEventListener('DOMContentLoaded', () => {
let mut ctx = TestContext::new();
let mut bc = attached_browser_context();
bc.active_page_state_mut()
- .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -539,7 +536,6 @@ window.addEventListener('load', () => {
let mut ctx = TestContext::new();
let mut bc = attached_browser_context();
bc.active_page_state_mut()
- .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -701,7 +697,6 @@ window.postMessage('go', '*');
let mut ctx = TestContext::new();
let mut bc = attached_browser_context();
bc.active_page_state_mut()
- .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -868,7 +863,6 @@ document.body.setAttribute('data-trigger', '1');
let mut ctx = TestContext::new();
let mut bc = attached_browser_context();
bc.active_page_state_mut()
- .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -1034,7 +1028,6 @@ observer.observe(document.getElementById('target'));
let mut ctx = TestContext::new();
let mut bc = attached_browser_context();
bc.active_page_state_mut()
- .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -1197,7 +1190,6 @@ setTimeout(() => {
let mut ctx = TestContext::new();
let mut bc = attached_browser_context();
bc.active_page_state_mut()
- .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -1373,7 +1365,6 @@ const id = setInterval(() => {
let mut ctx = TestContext::new();
let mut bc = attached_browser_context();
bc.active_page_state_mut()
- .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -1547,7 +1538,6 @@ queueMicrotask(() => {
let mut ctx = TestContext::new();
let mut bc = attached_browser_context();
bc.active_page_state_mut()
- .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -1709,7 +1699,6 @@ Promise.resolve().then(() => {
let mut ctx = TestContext::new();
let mut bc = attached_browser_context();
bc.active_page_state_mut()
- .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -1872,7 +1861,6 @@ setTimeout(() => {
let mut ctx = TestContext::new();
let mut bc = attached_browser_context();
bc.active_page_state_mut()
- .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -2053,7 +2041,6 @@ const id = setInterval(() => {
let mut ctx = TestContext::new();
let mut bc = attached_browser_context();
bc.active_page_state_mut()
- .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -2228,7 +2215,6 @@ queueMicrotask(() => {
let mut ctx = TestContext::new();
let mut bc = attached_browser_context();
bc.active_page_state_mut()
- .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -2391,7 +2377,6 @@ Promise.resolve().then(() => {
let mut ctx = TestContext::new();
let mut bc = attached_browser_context();
bc.active_page_state_mut()
- .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -2554,7 +2539,6 @@ requestIdleCallback(deadline => {
let mut ctx = TestContext::new();
let mut bc = attached_browser_context();
bc.active_page_state_mut()
- .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -2713,7 +2697,6 @@ requestIdleCallback(() => {
let mut ctx = TestContext::new();
let mut bc = attached_browser_context();
bc.active_page_state_mut()
- .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -2878,7 +2861,6 @@ requestAnimationFrame(() => {
let mut ctx = TestContext::new();
let mut bc = attached_browser_context();
bc.active_page_state_mut()
- .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -3035,7 +3017,6 @@ requestAnimationFrame(() => {
let mut ctx = TestContext::new();
let mut bc = attached_browser_context();
bc.active_page_state_mut()
- .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -3188,7 +3169,6 @@ fetch('/api').catch(() => {});
let mut ctx = TestContext::new();
let mut bc = attached_browser_context();
bc.active_page_state_mut()
- .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -3315,7 +3295,6 @@ async fn continue_with_auth_default_aborts_pending_navigation() {
let bc = ctx.conn.browser_context.as_ref().expect("browser context");
assert!(
!bc.active_page_state()
- .active_target
.fetch_owner
.has_pending_fetch_state_for_test()
);
@@ -3360,7 +3339,6 @@ async fn continue_with_auth_success_clears_pending_auth_navigation() {
let mut ctx = TestContext::new();
let mut bc = attached_browser_context();
bc.active_page_state_mut()
- .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -3402,7 +3380,6 @@ async fn continue_with_auth_success_clears_pending_auth_navigation() {
let bc = ctx.conn.browser_context.as_ref().expect("browser context");
assert!(
bc.active_page_state()
- .active_target
.fetch_owner
.has_pending_fetch_auth_navigation_for_test("INT-1")
);
@@ -3426,7 +3403,6 @@ async fn continue_with_auth_success_clears_pending_auth_navigation() {
let bc = ctx.conn.browser_context.as_ref().expect("browser context");
assert!(
!bc.active_page_state()
- .active_target
.fetch_owner
.has_pending_fetch_state_for_test()
);
@@ -3471,7 +3447,6 @@ async fn continue_with_auth_retries_navigation_with_basic_proxy_credentials() {
let mut ctx = TestContext::new();
let mut bc = attached_browser_context();
bc.active_page_state_mut()
- .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -3567,7 +3542,6 @@ async fn continue_with_auth_retries_navigation_with_digest_proxy_credentials() {
let mut ctx = TestContext::new();
let mut bc = attached_browser_context();
bc.active_page_state_mut()
- .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -3712,7 +3686,6 @@ 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_page_state_mut()
- .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -3863,7 +3836,6 @@ async fn continue_with_auth_handles_multi_round_basic_navigation_challenge() {
let mut ctx = TestContext::new();
let mut bc = attached_browser_context();
bc.active_page_state_mut()
- .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -3996,7 +3968,6 @@ async fn continue_with_auth_handles_digest_navigation_challenge() {
let mut ctx = TestContext::new();
let mut bc = attached_browser_context();
bc.active_page_state_mut()
- .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -4128,7 +4099,6 @@ async fn continue_with_auth_handles_multi_round_digest_navigation_challenge() {
let mut ctx = TestContext::new();
let mut bc = attached_browser_context();
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 ef783b38d..6dc21c01c 100644
--- a/moli-protocol/src/domains/fetch/tests/runtime_auth_response.rs
+++ b/moli-protocol/src/domains/fetch/tests/runtime_auth_response.rs
@@ -5775,7 +5775,6 @@ async fn crash_aborts_paused_runtime_fetch_subresource() {
let bc = ctx.conn.browser_context.as_ref().expect("browser context");
assert!(
bc.active_page_state()
- .active_target
.owner_state
.target_crash_state
.is_crashed()
@@ -5925,7 +5924,6 @@ async fn crash_aborts_paused_response_stage_runtime_xhr_subresource() {
let bc = ctx.conn.browser_context.as_ref().expect("browser context");
assert!(
bc.active_page_state()
- .active_target
.owner_state
.target_crash_state
.is_crashed()
@@ -6108,7 +6106,6 @@ async fn crash_aborts_paused_runtime_xhr_auth_subresource() {
let bc = ctx.conn.browser_context.as_ref().expect("browser context");
assert!(
bc.active_page_state()
- .active_target
.owner_state
.target_crash_state
.is_crashed()
diff --git a/moli-protocol/src/domains/input/tests.rs b/moli-protocol/src/domains/input/tests.rs
index a87ad24db..3af10b9ed 100644
--- a/moli-protocol/src/domains/input/tests.rs
+++ b/moli-protocol/src/domains/input/tests.rs
@@ -316,11 +316,7 @@ async fn completed_mouse_event_does_not_restore_replaced_page_state() {
ctx.conn
.browser_context
.as_ref()
- .and_then(|context| context
- .active_page_state()
- .active_target
- .runtime_slot
- .loaded_page())
+ .and_then(|context| context.active_page_state().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"
);
diff --git a/moli-protocol/src/domains/inspector.rs b/moli-protocol/src/domains/inspector.rs
index cb571eaac..a0f2777cb 100644
--- a/moli-protocol/src/domains/inspector.rs
+++ b/moli-protocol/src/domains/inspector.rs
@@ -113,7 +113,6 @@ mod tests {
let mut bc = BrowserContext::new_with_page_for_test("BID-1", "TID-1");
bc.attach_active_session("SID-1");
bc.active_page_state_mut()
- .active_target
.owner_state
.target_crash_state
.mark_crashed();
@@ -141,7 +140,6 @@ mod tests {
bc.attach_active_session("SID-primary");
assert!(bc.assign_auxiliary_session_to_target("TID-1", "SID-aux".into()));
bc.active_page_state_mut()
- .active_target
.owner_state
.target_crash_state
.mark_crashed();
@@ -273,7 +271,6 @@ mod tests {
crate::conn::TargetPageSlot::empty_for_test_fixture(),
));
bc.active_page_state_mut()
- .active_target
.owner_state
.target_crash_state
.mark_crashed();
diff --git a/moli-protocol/src/domains/network/activity.rs b/moli-protocol/src/domains/network/activity.rs
index 0024ae51d..364b5a9f0 100644
--- a/moli-protocol/src/domains/network/activity.rs
+++ b/moli-protocol/src/domains/network/activity.rs
@@ -581,7 +581,6 @@ mod tests {
bc.set_active_target_id("TID-1");
bc.attach_active_session("SID-1");
bc.active_page_state_mut()
- .active_target
.runtime_slot
.set_page_attachment_id_for_test(1);
conn.browser_context = Some(bc);
@@ -681,7 +680,6 @@ mod tests {
bc.set_active_target_id("TID-collision");
bc.attach_active_session("SID-collision");
bc.active_page_state_mut()
- .active_target
.runtime_slot
.set_page_attachment_id_for_test(1);
conn.browser_context = Some(bc);
@@ -767,7 +765,6 @@ mod tests {
bc.attach_active_session("SID-1");
assert!(bc.assign_auxiliary_session_to_target("TID-1", "FETCH-SID".to_owned()));
bc.active_page_state_mut()
- .active_target
.runtime_slot
.set_page_attachment_id_for_test(1);
conn.browser_context = Some(bc);
@@ -819,7 +816,6 @@ mod tests {
.as_ref()
.unwrap()
.active_page_state()
- .active_target
.fetch_owner
.has_pending_subresource_fetch_for_test("FETCH-1"),
"prepared emission should still register the paused request on the owner fetch state"
@@ -834,7 +830,6 @@ mod tests {
bc.attach_active_session("SID-1");
assert!(bc.assign_auxiliary_session_to_target("TID-1", "FETCH-SID".to_owned()));
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/tests/blocked_urls.rs b/moli-protocol/src/domains/network/tests/blocked_urls.rs
index dada92280..df2c6f9fc 100644
--- a/moli-protocol/src/domains/network/tests/blocked_urls.rs
+++ b/moli-protocol/src/domains/network/tests/blocked_urls.rs
@@ -123,7 +123,6 @@ async fn set_blocked_urls_navigation_fails_with_blocked_by_client() {
bc.set_active_target_id("TID-1");
bc.attach_active_session("SID-1");
bc.active_page_state_mut()
- .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -166,7 +165,6 @@ async fn set_blocked_urls_runtime_fetch_emits_loading_failed() {
bc.set_active_target_id("TID-1");
bc.attach_active_session("SID-1");
bc.active_page_state_mut()
- .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -855,7 +853,6 @@ async fn emulate_network_conditions_offline_worker_fetch_emits_loading_failed()
bc.set_active_target_id("TID-1");
bc.attach_active_session("SID-1");
bc.active_page_state_mut()
- .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -972,7 +969,6 @@ async fn emulate_network_conditions_offline_worker_xhr_emits_loading_failed() {
bc.set_active_target_id("TID-1");
bc.attach_active_session("SID-1");
bc.active_page_state_mut()
- .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -1085,7 +1081,6 @@ async fn set_blocked_urls_runtime_xhr_emits_loading_failed() {
bc.set_active_target_id("TID-1");
bc.attach_active_session("SID-1");
bc.active_page_state_mut()
- .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -1175,7 +1170,6 @@ async fn set_blocked_urls_runtime_websocket_emits_loading_failed() {
bc.set_active_target_id("TID-1");
bc.attach_active_session("SID-1");
bc.active_page_state_mut()
- .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -1355,7 +1349,6 @@ async fn emulate_network_conditions_offline_navigation_fails_before_completion_e
bc.set_active_target_id("TID-1");
bc.attach_active_session("SID-1");
bc.active_page_state_mut()
- .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -1398,7 +1391,6 @@ async fn emulate_network_conditions_offline_runtime_fetch_emits_loading_failed()
bc.set_active_target_id("TID-1");
bc.attach_active_session("SID-1");
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 4f421c646..2a2e1a841 100644
--- a/moli-protocol/src/domains/network/tests/cache.rs
+++ b/moli-protocol/src/domains/network/tests/cache.rs
@@ -692,7 +692,6 @@ async fn clear_browser_cache_keeps_pending_response_navigation_transfer() {
let bc = ctx.conn.browser_context.as_ref().unwrap();
assert!(
bc.active_page_state()
- .active_target
.fetch_owner
.pending_fetch_response_transfer_is_pending_for_test("INT-1")
);
diff --git a/moli-protocol/src/domains/network/tests/cookies.rs b/moli-protocol/src/domains/network/tests/cookies.rs
index 34cc672a5..9a1fdc95e 100644
--- a/moli-protocol/src/domains/network/tests/cookies.rs
+++ b/moli-protocol/src/domains/network/tests/cookies.rs
@@ -323,7 +323,6 @@ async fn set_user_agent_override_applies_to_current_page_fetch_requests() {
bc.set_active_target_id("TID-1");
bc.attach_active_session("SID-1");
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 48bdcf53a..3d770caab 100644
--- a/moli-protocol/src/domains/network/tests/navigation.rs
+++ b/moli-protocol/src/domains/network/tests/navigation.rs
@@ -120,7 +120,6 @@ async fn async_dispatch_offline_runtime_fetch_emits_loading_failed() {
bc.set_active_target_id("TID-1");
bc.attach_active_session("SID-1");
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 3c8c24ab8..03fb5d749 100644
--- a/moli-protocol/src/domains/network/tests/response_body.rs
+++ b/moli-protocol/src/domains/network/tests/response_body.rs
@@ -31,7 +31,6 @@ async fn get_response_body_respects_recorded_session_visibility() {
bc.set_active_target_id("TID-1".to_owned());
bc.attach_active_session("SID-primary".to_owned());
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()));
@@ -72,7 +71,6 @@ async fn get_response_body_requires_calling_session_network_listener() {
bc.set_active_target_id("TID-1".to_owned());
bc.attach_active_session("SID-primary".to_owned());
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()));
@@ -119,7 +117,6 @@ 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_page_state_mut()
- .active_target
.runtime_slot
.enable_primary_network_events();
bc.record_pending_response_body("REQ-pending".to_owned(), [None::<String>]);
@@ -142,7 +139,6 @@ 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_page_state_mut()
- .active_target
.runtime_slot
.enable_primary_network_events();
bc.record_pending_response_body("REQ-ready".to_owned(), [None::<String>]);
@@ -173,7 +169,6 @@ async fn get_response_body_rejects_bodies_over_materialization_limit() {
ctx.conn = CdpConnection::new_with_fetch_config(config);
let mut bc = BrowserContext::new_with_page_for_test("BID-1", "TID-1");
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>]);
@@ -197,7 +192,6 @@ 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_page_state_mut()
- .active_target
.runtime_slot
.enable_primary_network_events();
bc.record_captured_response_body_source(
@@ -225,7 +219,6 @@ 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_page_state_mut()
- .active_target
.runtime_slot
.enable_primary_network_events();
bc.record_captured_response_body_source(
@@ -253,13 +246,11 @@ 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_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_page_state_mut()
- .active_target
.runtime_slot
.record_captured_request_body_with_collector_scope(
"REQ-empty".to_owned(),
@@ -270,7 +261,6 @@ async fn get_request_post_data_matches_chromium_errors_and_binary_encoding() {
);
bc.record_pending_response_body("REQ-binary".to_owned(), [None::<String>]);
bc.active_page_state_mut()
- .active_target
.runtime_slot
.record_captured_request_body_with_collector_scope(
"REQ-binary".to_owned(),
@@ -342,7 +332,6 @@ async fn get_response_body_returns_partial_body_after_staged_loading_failed() {
bc.set_active_target_id("TID-1".to_owned());
bc.attach_active_session("SID-1".to_owned());
bc.active_page_state_mut()
- .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -462,14 +451,12 @@ async fn get_request_post_data_respects_recorded_session_visibility() {
bc.set_active_target_id("TID-1".to_owned());
bc.attach_active_session("SID-primary".to_owned());
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_page_state_mut()
- .active_target
.runtime_slot
.record_captured_request_body_with_collector_scope(
"REQ-aux-only".to_owned(),
@@ -510,7 +497,6 @@ async fn get_request_post_data_returns_main_document_navigation_post_body() {
bc.set_active_target_id("TID-1".to_owned());
bc.attach_active_session("SID-1".to_owned());
bc.active_page_state_mut()
- .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -566,7 +552,6 @@ async fn get_request_post_data_uses_text_projection_while_bidi_collector_keeps_t
bc.set_active_target_id("TID-1".to_owned());
bc.attach_active_session("SID-1".to_owned());
bc.active_page_state_mut()
- .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -672,7 +657,6 @@ async fn get_network_data_returns_bidi_response_body_bytes() {
bc.set_active_target_id("TID-1".to_owned());
bc.attach_active_session("bidi-session-1".to_owned());
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 77e4b4c33..a54892013 100644
--- a/moli-protocol/src/domains/network/tests/session.rs
+++ b/moli-protocol/src/domains/network/tests/session.rs
@@ -15,7 +15,6 @@ async fn install_network_session_page(ctx: &mut TestContext, url: &str) {
.as_mut()
.unwrap()
.active_page_state_mut()
- .active_target
.runtime_slot
.set_loaded_page_for_test(page);
}
@@ -42,7 +41,6 @@ async fn enable_with_bc_succeeds() {
.as_ref()
.unwrap()
.active_page_state()
- .active_target
.runtime_slot
.primary_network_events_enabled()
);
@@ -121,7 +119,6 @@ async fn network_configuration_commands_succeed_while_the_target_is_changing_doc
.as_ref()
.unwrap()
.active_page_state()
- .active_target
.runtime_slot
.primary_network_events_enabled()
);
@@ -200,7 +197,6 @@ async fn network_configuration_completion_does_not_restore_a_replaced_document()
.as_mut()
.unwrap()
.active_page_state_mut()
- .active_target
.runtime_slot
.loaded_page_mut()
.expect("the replacement Page should remain installed")
@@ -278,7 +274,6 @@ async fn auxiliary_network_enable_does_not_enable_primary_session() {
let bc = ctx.conn.browser_context.as_ref().unwrap();
assert!(
!bc.active_page_state()
- .active_target
.runtime_slot
.primary_network_events_enabled(),
"auxiliary Network.enable must not enable the primary session"
@@ -509,7 +504,6 @@ async fn enable_after_page_load_does_not_replay_historical_subresource_events()
.as_mut()
.unwrap()
.active_page_state_mut()
- .active_target
.runtime_slot
.set_loaded_page_for_test(page);
ctx.sent.clear();
@@ -685,7 +679,6 @@ async fn websocket_runtime_activity_broadcasts_to_auxiliary_network_session() {
let mut ctx = TestContext::new();
let mut bc = BrowserContext::new_with_page_for_test("BID-1", "TID-1");
bc.active_page_state_mut()
- .active_target
.runtime_slot
.enable_primary_network_events();
bc.attach_active_session("SID-primary".to_owned());
@@ -792,7 +785,6 @@ async fn auxiliary_network_enable_after_websocket_activity_does_not_replay_histo
let mut bc = BrowserContext::new("BID-1".into());
bc.set_active_target_id("TID-1".to_owned());
bc.active_page_state_mut()
- .active_target
.runtime_slot
.enable_primary_network_events();
bc.attach_active_session("SID-primary".to_owned());
@@ -898,7 +890,6 @@ async fn fetch_runtime_activity_broadcasts_to_auxiliary_network_session() {
let mut bc = BrowserContext::new("BID-1".into());
bc.set_active_target_id("TID-1".to_owned());
bc.active_page_state_mut()
- .active_target
.runtime_slot
.enable_primary_network_events();
bc.attach_active_session("SID-primary".to_owned());
@@ -1119,7 +1110,6 @@ async fn main_document_navigation_broadcasts_to_auxiliary_network_session() {
let mut bc = BrowserContext::new("BID-1".into());
bc.set_active_target_id("TID-1".to_owned());
bc.active_page_state_mut()
- .active_target
.runtime_slot
.enable_primary_network_events();
bc.attach_active_session("SID-primary".to_owned());
@@ -1243,7 +1233,6 @@ async fn network_disable_removes_session_response_body_visibility() {
bc.set_active_target_id("TID-1".to_owned());
bc.attach_active_session("SID-primary".to_owned());
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()));
@@ -1313,7 +1302,6 @@ 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_page_state_mut()
- .active_target
.runtime_slot
.enable_primary_network_events();
bc.record_captured_response_body("REQ-1".to_owned(), "body".to_owned(), [None]);
@@ -1326,7 +1314,6 @@ async fn disable_clears_enabled_flag_and_captured_bodies() {
let bc = ctx.conn.browser_context.as_ref().unwrap();
assert!(
!bc.active_page_state()
- .active_target
.runtime_slot
.primary_network_events_enabled()
);
@@ -1339,7 +1326,6 @@ async fn primary_network_disable_preserves_auxiliary_network_session() {
bc.set_active_target_id("TID-1".to_owned());
bc.attach_active_session("SID-primary".to_owned());
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()));
@@ -1362,14 +1348,12 @@ async fn primary_network_disable_preserves_auxiliary_network_session() {
let bc = ctx.conn.browser_context.as_ref().unwrap();
assert!(
!bc.active_page_state()
- .active_target
.runtime_slot
.primary_network_events_enabled()
);
assert!(bc.has_network_event_listeners());
assert!(
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 7b6f58356..81c239a3d 100644
--- a/moli-protocol/src/domains/observable_output/emission.rs
+++ b/moli-protocol/src/domains/observable_output/emission.rs
@@ -372,7 +372,6 @@ mod tests {
.expect("browser context should be loaded");
let page = bc
.active_page_state_mut()
- .active_target
.runtime_slot
.loaded_page_mut()
.expect("loaded page should be installed");
@@ -406,7 +405,6 @@ mod tests {
.expect("test page should load");
let _ = bc
.active_page_state_mut()
- .active_target
.runtime_slot
.replace_loaded_page(Some(page));
bc.active_page_state_mut().devtools_sessions
@@ -439,7 +437,7 @@ mod tests {
.page_session_state
.log_enabled,
true,
- &bc.active_page_state().active_target.owner_state,
+ &bc.active_page_state().owner_state,
&bc.active_page_state().devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.console_output_session_state,
Some("SID-1"),
@@ -469,7 +467,6 @@ mod tests {
.as_ref()
.expect("browser context should be loaded")
.active_page_state()
- .active_target
.owner_state
.console_output_state
.console_domain_cursor()
@@ -549,7 +546,6 @@ mod tests {
.expect("test page should load");
let _ = bc
.active_page_state_mut()
- .active_target
.runtime_slot
.replace_loaded_page(Some(page));
bc.active_page_state_mut().devtools_sessions
@@ -613,7 +609,6 @@ mod tests {
.expect("test page should load");
let _ = bc
.active_page_state_mut()
- .active_target
.runtime_slot
.replace_loaded_page(Some(page));
bc.active_page_state_mut().devtools_sessions
@@ -859,7 +854,6 @@ mod tests {
let bc = ctx.conn.browser_context.as_ref().expect("browser context");
(
bc.active_page_state()
- .active_target
.runtime_slot
.page_attachment_id()
.expect("active Page attachment"),
@@ -889,10 +883,7 @@ 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_page_state()
- .active_target
- .runtime_slot
- .page_attachment_id(),
+ bc.active_page_state().runtime_slot.page_attachment_id(),
Some(promoted_attachment),
"promotion must transfer the installed Page attachment without reallocating it"
);
@@ -1423,7 +1414,6 @@ mod tests {
.as_ref()
.expect("browser context should exist")
.active_page_state()
- .active_target
.owner_state
.runtime_observable_state;
assert!(
@@ -1466,7 +1456,6 @@ mod tests {
.as_ref()
.expect("browser context should exist")
.active_page_state()
- .active_target
.owner_state
.runtime_observable_state;
assert!(
diff --git a/moli-protocol/src/domains/observable_output/output_queue.rs b/moli-protocol/src/domains/observable_output/output_queue.rs
index 46a8902e7..1c695a8ed 100644
--- a/moli-protocol/src/domains/observable_output/output_queue.rs
+++ b/moli-protocol/src/domains/observable_output/output_queue.rs
@@ -1127,11 +1127,7 @@ mod tests {
);
let prepared = queue
- .runtime_source_prepared_items(
- true,
- true,
- &bc.active_page_state().active_target.owner_state,
- )
+ .runtime_source_prepared_items(true, true, &bc.active_page_state().owner_state)
.expect("queue should produce RuntimeObservable prepared items");
let (items, cursor) = prepared.into_output_emission_parts_for_test();
@@ -1167,32 +1163,22 @@ mod tests {
));
bc.active_page_state_mut()
- .active_target
.owner_state
.runtime_observable_state
.mark_emitted_console_counts(std::collections::HashMap::from([(5, 1)]));
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_page_state().active_target.owner_state
- )
+ .runtime_source_prepared_items(true, true, &bc.active_page_state().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_page_state().active_target.owner_state
- )
+ .runtime_source_prepared_items(false, true, &bc.active_page_state().owner_state)
.is_none(),
"disabled Runtime should not produce RuntimeObservable prepared items"
);
@@ -1217,11 +1203,7 @@ mod tests {
);
let prepared = queue
- .runtime_source_prepared_items(
- true,
- true,
- &bc.active_page_state().active_target.owner_state,
- )
+ .runtime_source_prepared_items(true, true, &bc.active_page_state().owner_state)
.expect(
"contextless lifecycle source should still advance the RuntimeObservable cursor",
);
@@ -1263,11 +1245,7 @@ mod tests {
);
let prepared = queue
- .runtime_source_prepared_items(
- true,
- true,
- &bc.active_page_state().active_target.owner_state,
- )
+ .runtime_source_prepared_items(true, true, &bc.active_page_state().owner_state)
.expect("renderer producer source item should materialize RuntimeObservable output");
let (items, cursor) = prepared.into_output_emission_parts_for_test();
@@ -1339,11 +1317,7 @@ mod tests {
&second_snapshot,
);
let prepared = queue
- .runtime_source_prepared_items(
- true,
- true,
- &bc.active_page_state().active_target.owner_state,
- )
+ .runtime_source_prepared_items(true, true, &bc.active_page_state().owner_state)
.expect("combined source deltas should produce the full RuntimeObservable tail");
let (items, cursor) = prepared.into_output_emission_parts_for_test();
@@ -1361,17 +1335,12 @@ mod tests {
);
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_page_state().active_target.owner_state,
- )
+ .runtime_source_prepared_items(true, true, &bc.active_page_state().owner_state)
.expect("latest appended source item should produce the new RuntimeObservable tail");
let (items, cursor) = prepared.into_output_emission_parts_for_test();
@@ -1415,11 +1384,7 @@ mod tests {
let queue = TargetObservableOutputQueue::from_runtime_slot_source_outputs(&runtime_slot);
let prepared = queue
- .runtime_source_prepared_items(
- true,
- true,
- &bc.active_page_state().active_target.owner_state,
- )
+ .runtime_source_prepared_items(true, true, &bc.active_page_state().owner_state)
.expect("stored queue source should materialize RuntimeObservable items");
let (items, cursor) = prepared.into_output_emission_parts_for_test();
@@ -1432,17 +1397,12 @@ mod tests {
));
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_page_state().active_target.owner_state
- )
+ .runtime_source_prepared_items(true, true, &bc.active_page_state().owner_state)
.is_none(),
"stored source output must still respect owner RuntimeObservable cursor state"
);
@@ -1673,7 +1633,7 @@ mod tests {
.page_session_state
.log_enabled,
true,
- &bc.active_page_state().active_target.owner_state,
+ &bc.active_page_state().owner_state,
&bc.active_page_state().devtools_sessions[moli_page_types::DevToolsSessionKey::Primary]
.console_output_session_state,
None,
@@ -1724,7 +1684,6 @@ mod tests {
.console_output_session_state
.console_enabled = true;
bc.active_page_state_mut()
- .active_target
.owner_state
.console_output_state
.advance_console_domain_to_current(1, 0);
@@ -1748,7 +1707,7 @@ mod tests {
.page_session_state
.log_enabled,
true,
- &bc.active_page_state().active_target.owner_state,
+ &bc.active_page_state().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 a90db5e97..006d77a0b 100644
--- a/moli-protocol/src/domains/observable_output/presence.rs
+++ b/moli-protocol/src/domains/observable_output/presence.rs
@@ -578,7 +578,6 @@ mod tests {
"SID-runtime-disabled".to_owned(),
));
bc.active_page_state_mut()
- .active_target
.runtime_slot
.set_page_attachment_id_for_test(17);
conn.browser_context = Some(bc);
@@ -606,7 +605,6 @@ mod tests {
let mut conn = crate::conn::CdpConnection::default();
let mut bc = BrowserContext::new_with_page_for_test("BID-1", "TID-1");
bc.active_page_state_mut()
- .active_target
.runtime_slot
.set_page_attachment_id_for_test(1);
bc.active_page_state_mut().devtools_sessions
@@ -656,7 +654,6 @@ mod tests {
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_page_state_mut()
- .active_target
.runtime_slot
.set_page_attachment_id_for_test(1);
bc.active_page_state_mut().devtools_sessions
@@ -711,7 +708,6 @@ mod tests {
let mut conn = crate::conn::CdpConnection::default();
let mut bc = BrowserContext::new_with_page_for_test("BID-1", "TID-1");
bc.active_page_state_mut()
- .active_target
.runtime_slot
.set_page_attachment_id_for_test(1);
bc.active_page_state_mut().devtools_sessions
@@ -752,7 +748,6 @@ mod tests {
.expect("test page should load");
let _ = bc
.active_page_state_mut()
- .active_target
.runtime_slot
.replace_loaded_page(Some(page));
bc.active_page_state_mut().devtools_sessions
@@ -794,7 +789,7 @@ mod tests {
.conn
.browser_context
.as_ref()
- .map(|bc| &bc.active_page_state().active_target.runtime_slot)
+ .map(|bc| &bc.active_page_state().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 a6f4a35c2..80d7d0c6d 100644
--- a/moli-protocol/src/domains/observable_output/runtime_emission.rs
+++ b/moli-protocol/src/domains/observable_output/runtime_emission.rs
@@ -245,12 +245,10 @@ mod tests {
.as_mut()
.expect("browser context should exist");
bc.active_page_state_mut()
- .active_target
.owner_state
.runtime_observable_state
.mark_emitted_console_counts(HashMap::from([(7, 1)]));
bc.active_page_state_mut()
- .active_target
.owner_state
.runtime_observable_state
.mark_emitted_exception_entries(1);
@@ -284,11 +282,9 @@ mod tests {
.expect("browser context should exist");
bc.set_target_url("http://example.test/runtime-source".to_owned());
bc.active_page_state_mut()
- .active_target
.runtime_slot
.set_page_attachment_id_for_test(3);
bc.active_page_state_mut()
- .active_target
.runtime_slot
.sync_observable_output_source_from_renderer_snapshot(
"http://example.test/runtime-source".to_owned(),
@@ -303,7 +299,6 @@ mod tests {
.as_ref()
.expect("browser context should exist")
.active_page_state()
- .active_target
.owner_state
.runtime_observable_state;
assert_eq!(
diff --git a/moli-protocol/src/domains/page.rs b/moli-protocol/src/domains/page.rs
index 9b6a4d4d7..affdbbbba 100644
--- a/moli-protocol/src/domains/page.rs
+++ b/moli-protocol/src/domains/page.rs
@@ -1520,7 +1520,6 @@ fn start_set_javascript_dialog_handler_enabled(
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()
}) {
diff --git a/moli-protocol/src/domains/page/tests/capture.rs b/moli-protocol/src/domains/page/tests/capture.rs
index ff8e46c5d..944f51214 100644
--- a/moli-protocol/src/domains/page/tests/capture.rs
+++ b/moli-protocol/src/domains/page/tests/capture.rs
@@ -184,7 +184,6 @@ async fn capture_screenshot_rejects_completion_from_replaced_renderer_attachment
.as_mut()
.expect("browser context")
.active_page_state_mut()
- .active_target
.runtime_slot
.replace_loaded_page(Some(replacement));
@@ -268,7 +267,6 @@ async fn capture_snapshot_returns_minimal_mhtml_for_loaded_page() {
.as_mut()
.expect("browser context")
.active_page_state_mut()
- .active_target
.runtime_slot
.replace_loaded_page(Some(page));
@@ -321,7 +319,6 @@ async fn capture_snapshot_dispatch_serializes_html_in_renderer_owner() {
.as_mut()
.expect("browser context")
.active_page_state_mut()
- .active_target
.runtime_slot
.replace_loaded_page(Some(page));
@@ -926,7 +923,6 @@ async fn get_layout_metrics_queries_live_renderer_for_loaded_pages() {
.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 d4ee6d4da..ac34110f0 100644
--- a/moli-protocol/src/domains/page/tests/dialog.rs
+++ b/moli-protocol/src/domains/page/tests/dialog.rs
@@ -221,7 +221,6 @@ async fn javascript_dialog_events_round_trip_through_page_domain() {
.as_mut()
.unwrap()
.active_page_state_mut()
- .active_target
.runtime_slot
.set_loaded_page_for_test(page);
@@ -678,7 +677,6 @@ async fn javascript_dialog_events_are_emitted_after_runtime_call_function_on() {
.as_mut()
.unwrap()
.active_page_state_mut()
- .active_target
.runtime_slot
.set_loaded_page_for_test(page);
@@ -742,7 +740,6 @@ async fn javascript_dialog_events_are_emitted_from_playwright_utility_world_call
.as_mut()
.unwrap()
.active_page_state_mut()
- .active_target
.runtime_slot
.set_loaded_page_for_test(page);
@@ -830,7 +827,6 @@ async fn javascript_dialog_events_are_emitted_from_playwright_serialized_utility
.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 77410b66d..c5a4a17e3 100644
--- a/moli-protocol/src/domains/page/tests/document_content.rs
+++ b/moli-protocol/src/domains/page/tests/document_content.rs
@@ -20,14 +20,12 @@ 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(
&mut navigation.page,
@@ -36,13 +34,11 @@ 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)
.expect("document-content test renderer navigation should finish")
diff --git a/moli-protocol/src/domains/page/tests/frame_tree.rs b/moli-protocol/src/domains/page/tests/frame_tree.rs
index 34f8923ee..49d1cc19a 100644
--- a/moli-protocol/src/domains/page/tests/frame_tree.rs
+++ b/moli-protocol/src/domains/page/tests/frame_tree.rs
@@ -237,7 +237,6 @@ async fn get_frame_tree_uses_owner_element_id_when_frame_name_is_empty() {
.as_mut()
.expect("browser context")
.active_page_state_mut()
- .active_target
.runtime_slot
.replace_loaded_page(Some(page));
complete_child_frame_lifecycle(&mut ctx).await;
@@ -266,7 +265,6 @@ 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));
bc.set_target_security_origin("https://top.example".into());
@@ -298,7 +296,6 @@ 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));
bc.set_target_security_origin("https://top.example".into());
@@ -360,7 +357,6 @@ 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));
bc.set_target_security_origin("https://top.example".into());
@@ -455,7 +451,6 @@ async fn get_frame_tree_can_complete_through_pending_command_dispatch() {
.as_mut()
.expect("browser context")
.active_page_state_mut()
- .active_target
.runtime_slot
.replace_loaded_page(Some(page));
@@ -510,7 +505,6 @@ async fn pending_get_frame_tree_after_page_unload_returns_empty_target_tree() {
.as_mut()
.expect("browser context")
.active_page_state_mut()
- .active_target
.runtime_slot
.replace_loaded_page(Some(page));
@@ -529,7 +523,6 @@ async fn pending_get_frame_tree_after_page_unload_returns_empty_target_tree() {
.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 21ff1617c..c21ef7a54 100644
--- a/moli-protocol/src/domains/page/tests/lifecycle.rs
+++ b/moli-protocol/src/domains/page/tests/lifecycle.rs
@@ -283,7 +283,6 @@ async fn install_runtime_document_replacement_test_page(ctx: &mut TestContext) -
.as_mut()
.expect("runtime replacement fixture browser context")
.active_page_state_mut()
- .active_target
.runtime_slot
.set_loaded_page_for_test(navigation.page);
let (binding, initial_events) = ctx.conn.bind_renderer_document_lifecycle_for_session_owner(
@@ -425,7 +424,6 @@ async fn lifecycle_events_enable_without_renderer_binding_does_not_synthesize_re
.as_mut()
.expect("browser context")
.active_page_state_mut()
- .active_target
.runtime_slot
.set_loaded_page_for_test(page);
@@ -486,11 +484,7 @@ async fn assert_page_enable_uses_fresh_initial_document_without_adapter(target_u
ctx.conn
.browser_context
.as_ref()
- .and_then(|bc| bc
- .active_page_state()
- .active_target
- .runtime_slot
- .loaded_page())
+ .and_then(|bc| bc.active_page_state().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"
);
@@ -517,11 +511,7 @@ async fn assert_page_enable_uses_fresh_initial_document_without_adapter(target_u
ctx.conn
.browser_context
.as_ref()
- .and_then(|bc| bc
- .active_page_state()
- .active_target
- .runtime_slot
- .loaded_page())
+ .and_then(|bc| bc.active_page_state().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"
);
@@ -562,7 +552,6 @@ async fn enable_succeeds_without_legacy_materialization_adapter_when_page_missin
.as_ref()
.expect("browser context")
.active_page_state()
- .active_target
.runtime_slot
.has_loaded_page(),
"Page.enable should not install a loaded page when target lifecycle did not"
@@ -671,11 +660,7 @@ async fn enable_non_blank_initial_url_loads_through_pending_navigation_path() {
ctx.conn
.browser_context
.as_ref()
- .and_then(|bc| bc
- .active_page_state()
- .active_target
- .runtime_slot
- .loaded_page())
+ .and_then(|bc| bc.active_page_state().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"
);
@@ -855,7 +840,6 @@ async fn set_lifecycle_events_enabled_replays_loaded_page_events() {
.as_mut()
.unwrap()
.active_page_state_mut()
- .active_target
.runtime_slot
.set_loaded_page_for_test(navigation.page);
let (binding, initial_events) = ctx.conn.bind_renderer_document_lifecycle_for_session_owner(
@@ -930,7 +914,6 @@ async fn set_lifecycle_events_enabled_replays_only_protocol_visible_load_state()
.as_mut()
.unwrap()
.active_page_state_mut()
- .active_target
.runtime_slot
.set_loaded_page_for_test(navigation.page);
let (binding, initial_events) = ctx.conn.bind_renderer_document_lifecycle_for_session_owner(
@@ -1032,7 +1015,6 @@ async fn set_lifecycle_events_enabled_is_session_local_for_active_auxiliary_sess
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);
assert!(browser_context.assign_auxiliary_session_to_target("TID-active", "SID-aux".to_owned()));
@@ -2049,7 +2031,6 @@ async fn add_script_run_immediately_creates_top_level_world_even_when_child_worl
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));
ctx.process_async(json!({
@@ -2337,7 +2318,6 @@ async fn bare_isolated_worlds_do_not_persist_across_navigation() {
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));
ctx.process_async(json!({
@@ -2428,7 +2408,6 @@ async fn network_navigations_use_unique_document_loader_ids() {
.as_mut()
.unwrap()
.active_page_state_mut()
- .active_target
.runtime_slot
.enable_primary_network_events();
@@ -2580,7 +2559,6 @@ async fn crash_notifies_all_attached_sessions_and_marks_browser_context_crashed(
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));
let active_document_token = bc
@@ -2609,7 +2587,6 @@ async fn crash_notifies_all_attached_sessions_and_marks_browser_context_crashed(
let bc = ctx.conn.browser_context.as_ref().unwrap();
assert!(
bc.active_page_state()
- .active_target
.owner_state
.target_crash_state
.is_crashed()
@@ -2661,7 +2638,6 @@ async fn crash_notifies_all_attached_sessions_and_marks_browser_context_crashed(
.as_ref()
.expect("browser context")
.active_page_state()
- .active_target
.owner_state
.target_crash_state
.is_crashed()
@@ -2745,7 +2721,6 @@ async fn crash_aborts_paused_request_stage_navigation() {
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_page_state_mut()
- .active_target
.runtime_slot
.enable_primary_network_events();
@@ -2910,7 +2885,6 @@ async fn crash_aborts_paused_response_stage_navigation() {
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_page_state_mut()
- .active_target
.runtime_slot
.enable_primary_network_events();
@@ -2988,7 +2962,6 @@ async fn close_clears_loaded_page_state_and_emits_detached_events() {
.runtime_session_state
.inspector_enabled = true;
bc.active_page_state_mut()
- .active_target
.runtime_slot
.enable_primary_network_events();
bc.active_page_state_mut()
@@ -2999,26 +2972,21 @@ async fn close_clears_loaded_page_state_and_emits_detached_events() {
network.extra_headers = vec![("X-Test".into(), "1".into())];
});
bc.active_page_state_mut().css_enabled = true;
+ bc.active_page_state_mut().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
- .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));
let close_document_token = bc
@@ -3032,7 +3000,6 @@ async fn close_clears_loaded_page_state_and_emits_detached_events() {
bc.set_subresource_network_emitted_record_count_for_test(12);
bc.set_next_io_stream_sequence_for_test(7);
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()));
@@ -3091,7 +3058,6 @@ async fn close_aborts_paused_request_stage_navigation_and_clears_state() {
.runtime_session_state
.inspector_enabled = true;
bc.active_page_state_mut()
- .active_target
.runtime_slot
.enable_primary_network_events();
@@ -3335,7 +3301,6 @@ async fn close_aborts_paused_auth_navigation_and_clears_state() {
.runtime_session_state
.inspector_enabled = true;
bc.active_page_state_mut()
- .active_target
.runtime_slot
.enable_primary_network_events();
diff --git a/moli-protocol/src/domains/page/tests/mod.rs b/moli-protocol/src/domains/page/tests/mod.rs
index fbb722eda..fe16c5784 100644
--- a/moli-protocol/src/domains/page/tests/mod.rs
+++ b/moli-protocol/src/domains/page/tests/mod.rs
@@ -108,12 +108,7 @@ async fn loaded_page_html_for_test(ctx: &mut TestContext) -> String {
.conn
.browser_context
.as_mut()
- .and_then(|bc| {
- bc.active_page_state_mut()
- .active_target
- .runtime_slot
- .loaded_page_mut()
- })
+ .and_then(|bc| bc.active_page_state_mut().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 e12b228eb..6bcba1a36 100644
--- a/moli-protocol/src/domains/page/tests/navigation.rs
+++ b/moli-protocol/src/domains/page/tests/navigation.rs
@@ -914,7 +914,6 @@ async fn get_navigation_history_completes_through_command_dispatch() {
.as_mut()
.expect("browser context")
.active_page_state_mut()
- .active_target
.runtime_slot
.set_loaded_page_for_test(page);
@@ -980,7 +979,6 @@ async fn reset_navigation_history_prunes_browser_and_renderer_history() {
.as_mut()
.expect("browser context")
.active_page_state_mut()
- .active_target
.runtime_slot
.set_loaded_page_for_test(page);
@@ -1486,7 +1484,6 @@ async fn get_navigation_history_targets_inactive_loaded_owner_without_activation
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));
ctx.conn.inactive_browser_contexts.push(inactive);
@@ -5300,7 +5297,6 @@ async fn continue_request_completes_paused_navigation_before_commit_events() {
.as_mut()
.unwrap()
.active_page_state_mut()
- .active_target
.runtime_slot
.enable_primary_network_events();
@@ -5386,7 +5382,6 @@ async fn stop_loading_aborts_paused_request_stage_navigation() {
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_page_state_mut()
- .active_target
.runtime_slot
.enable_primary_network_events();
let committed_document_token = bc
@@ -5504,7 +5499,6 @@ async fn stop_loading_aborts_paused_response_stage_navigation() {
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_page_state_mut()
- .active_target
.runtime_slot
.enable_primary_network_events();
@@ -5622,7 +5616,6 @@ async fn stop_loading_aborts_paused_auth_navigation() {
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_page_state_mut()
- .active_target
.runtime_slot
.enable_primary_network_events();
@@ -6387,7 +6380,6 @@ async fn reload_after_crash_emits_target_reloaded_after_crash() {
.runtime_session_state
.record_inspector_target_crashed();
bc.active_page_state_mut()
- .active_target
.owner_state
.target_crash_state
.mark_crashed();
@@ -6416,7 +6408,6 @@ async fn reload_after_crash_emits_target_reloaded_after_crash() {
.as_ref()
.expect("browser context")
.active_page_state()
- .active_target
.owner_state
.target_crash_state
.is_crashed()
@@ -6437,7 +6428,6 @@ async fn navigate_after_crash_emits_target_reloaded_after_crash() {
.runtime_session_state
.record_inspector_target_crashed();
bc.active_page_state_mut()
- .active_target
.owner_state
.target_crash_state
.mark_crashed();
@@ -6469,7 +6459,6 @@ async fn navigate_after_crash_emits_target_reloaded_after_crash() {
.as_ref()
.expect("browser context")
.active_page_state()
- .active_target
.owner_state
.target_crash_state
.is_crashed()
@@ -6494,7 +6483,6 @@ async fn navigate_after_crash_without_inspector_enabled_clears_crash_without_eve
.as_mut()
.unwrap()
.active_page_state_mut()
- .active_target
.owner_state
.target_crash_state
.mark_crashed();
@@ -6527,7 +6515,6 @@ async fn navigate_after_crash_without_inspector_enabled_clears_crash_without_eve
.as_ref()
.expect("browser context")
.active_page_state()
- .active_target
.owner_state
.target_crash_state
.is_crashed()
diff --git a/moli-protocol/src/domains/page/tests/resources.rs b/moli-protocol/src/domains/page/tests/resources.rs
index 763fc18de..413f38085 100644
--- a/moli-protocol/src/domains/page/tests/resources.rs
+++ b/moli-protocol/src/domains/page/tests/resources.rs
@@ -383,7 +383,6 @@ async fn get_resource_tree_reports_observed_frame_subresources() {
.as_mut()
.expect("browser context")
.active_page_state_mut()
- .active_target
.runtime_slot
.set_loaded_page_for_test(page);
@@ -582,7 +581,6 @@ async fn frame_and_resource_trees_report_main_document_response_mime() {
.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/scripts.rs b/moli-protocol/src/domains/page/tests/scripts.rs
index 48856007d..fd6ccc781 100644
--- a/moli-protocol/src/domains/page/tests/scripts.rs
+++ b/moli-protocol/src/domains/page/tests/scripts.rs
@@ -119,7 +119,6 @@ async fn add_script_to_evaluate_on_new_document_does_not_mutate_existing_page()
.as_mut()
.unwrap()
.active_page_state_mut()
- .active_target
.runtime_slot
.set_loaded_page_for_test(page);
@@ -204,7 +203,6 @@ async fn add_script_to_evaluate_on_new_document_keeps_duplicate_registrations_di
.as_ref()
.expect("browser context")
.active_page_state()
- .active_target
.owner_state
.document_start_scripts
.len();
@@ -435,7 +433,6 @@ async fn add_script_to_evaluate_on_new_document_run_immediately_mutates_existing
.as_mut()
.unwrap()
.active_page_state_mut()
- .active_target
.runtime_slot
.set_loaded_page_for_test(page);
@@ -484,7 +481,6 @@ async fn add_script_to_evaluate_on_new_document_run_immediately_world_name_creat
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));
bc.set_target_security_origin("https://stale-top-origin.example".into());
@@ -655,7 +651,6 @@ async fn remove_script_to_evaluate_on_new_document_does_not_rollback_run_immedia
.as_mut()
.unwrap()
.active_page_state_mut()
- .active_target
.runtime_slot
.set_loaded_page_for_test(page);
@@ -731,7 +726,6 @@ async fn create_isolated_world_requires_matching_frame_and_uses_fresh_initial_do
.as_mut()
.unwrap()
.active_page_state_mut()
- .active_target
.runtime_slot
.set_loaded_page_for_test(iframe_page);
let child_frame_id = child_frame_id_for_single_iframe(&mut ctx, 400).await;
@@ -878,7 +872,6 @@ async fn create_isolated_world_async_accepts_child_frame_from_async_dispatch() {
.as_mut()
.unwrap()
.active_page_state_mut()
- .active_target
.runtime_slot
.set_loaded_page_for_test(iframe_page);
@@ -1147,7 +1140,6 @@ async fn create_isolated_world_installs_matching_bindings_before_document_start_
.as_mut()
.expect("browser context")
.active_page_state_mut()
- .active_target
.runtime_slot
.set_loaded_page_for_test(page);
@@ -1407,7 +1399,6 @@ async fn create_isolated_world_without_runtime_frontend_enabled_only_returns_res
.as_mut()
.unwrap()
.active_page_state_mut()
- .active_target
.runtime_slot
.set_loaded_page_for_test(page);
@@ -1444,7 +1435,6 @@ async fn create_isolated_world_accepts_cdp_and_corrected_grant_universal_access_
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));
@@ -1517,7 +1507,6 @@ async fn create_isolated_world_returns_unique_context_ids_and_emits_runtime_even
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));
bc.set_target_security_origin("https://stale-top-origin.example".into());
@@ -1716,7 +1705,6 @@ async fn create_isolated_world_does_not_persist_across_navigation() {
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));
ctx.process_async(json!({
@@ -1782,7 +1770,6 @@ async fn create_isolated_world_after_reactivating_browser_context_with_another_l
.expect("first browser context");
let _ = bc
.active_page_state_mut()
- .active_target
.runtime_slot
.replace_loaded_page(Some(first_page));
bc.active_page_state_mut().devtools_sessions
@@ -1810,7 +1797,6 @@ async fn create_isolated_world_after_reactivating_browser_context_with_another_l
.expect("second browser context");
let _ = bc
.active_page_state_mut()
- .active_target
.runtime_slot
.replace_loaded_page(Some(second_page));
bc.active_page_state_mut().devtools_sessions
diff --git a/moli-protocol/src/domains/profiler.rs b/moli-protocol/src/domains/profiler.rs
index 29e90a3bd..c65b3e8fe 100644
--- a/moli-protocol/src/domains/profiler.rs
+++ b/moli-protocol/src/domains/profiler.rs
@@ -50,7 +50,6 @@ mod tests {
.expect("browser context should exist");
let _ = browser_context
.active_page_state_mut()
- .active_target
.runtime_slot
.replace_loaded_page(Some(page));
}
@@ -96,7 +95,6 @@ mod tests {
.expect("browser context should exist");
let _ = browser_context
.active_page_state_mut()
- .active_target
.runtime_slot
.replace_loaded_page(Some(page));
}
@@ -139,12 +137,7 @@ mod tests {
.conn
.browser_context
.as_mut()
- .and_then(|bc| {
- bc.active_page_state_mut()
- .active_target
- .runtime_slot
- .loaded_page_mut()
- })
+ .and_then(|bc| bc.active_page_state_mut().runtime_slot.loaded_page_mut())
.expect("active target should still have a loaded page")
.runtime_heap_usage_async()
.await
@@ -2005,7 +1998,6 @@ mod tests {
.expect("browser context should exist");
let _ = browser_context
.active_page_state_mut()
- .active_target
.runtime_slot
.replace_loaded_page(Some(page));
@@ -2206,7 +2198,6 @@ mod tests {
.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 8ed2e9ab8..f7a069a02 100644
--- a/moli-protocol/src/domains/runtime/activity.rs
+++ b/moli-protocol/src/domains/runtime/activity.rs
@@ -599,7 +599,6 @@ mod tests {
.expect("test page should load");
let _ = bc
.active_page_state_mut()
- .active_target
.runtime_slot
.replace_loaded_page(Some(page));
ctx.conn.browser_context = Some(bc);
@@ -615,7 +614,6 @@ mod tests {
browser_context.attach_active_session("SID-1");
browser_context
.active_page_state_mut()
- .active_target
.runtime_slot
.set_page_attachment_id_for_test(1);
conn.browser_context = Some(browser_context);
diff --git a/moli-protocol/src/domains/runtime/dispatcher.rs b/moli-protocol/src/domains/runtime/dispatcher.rs
index 751a82c49..af3e685fc 100644
--- a/moli-protocol/src/domains/runtime/dispatcher.rs
+++ b/moli-protocol/src/domains/runtime/dispatcher.rs
@@ -11422,7 +11422,6 @@ mod protocol_neutral_tests {
.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 c653f30dd..df1d2ff63 100644
--- a/moli-protocol/src/domains/runtime/test_support.rs
+++ b/moli-protocol/src/domains/runtime/test_support.rs
@@ -63,7 +63,6 @@ pub(super) async fn with_loaded_http_document_async(
.as_mut()
.expect("browser context should be installed before loading test page");
bc.active_page_state_mut()
- .active_target
.runtime_slot
.enable_primary_network_events();
}
diff --git a/moli-protocol/src/domains/runtime/tests/mod.rs b/moli-protocol/src/domains/runtime/tests/mod.rs
index b3fc12ea2..2d278600d 100644
--- a/moli-protocol/src/domains/runtime/tests/mod.rs
+++ b/moli-protocol/src/domains/runtime/tests/mod.rs
@@ -149,7 +149,6 @@ async fn push_loaded_runtime_frontend_enabled_background_context_async(
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());
diff --git a/moli-protocol/src/domains/runtime/tests/navigation.rs b/moli-protocol/src/domains/runtime/tests/navigation.rs
index c4ae9d7f4..002e83153 100644
--- a/moli-protocol/src/domains/runtime/tests/navigation.rs
+++ b/moli-protocol/src/domains/runtime/tests/navigation.rs
@@ -82,7 +82,6 @@ async fn enable_uses_fresh_initial_document_without_adapter() {
.as_ref()
.expect("browser context should exist")
.active_page_state()
- .active_target
.runtime_slot
.has_loaded_page(),
"Runtime.enable should observe the already-installed about:blank page"
diff --git a/moli-protocol/src/domains/storage/tests.rs b/moli-protocol/src/domains/storage/tests.rs
index 8e709eb7a..0b6b7a19a 100644
--- a/moli-protocol/src/domains/storage/tests.rs
+++ b/moli-protocol/src/domains/storage/tests.rs
@@ -869,7 +869,6 @@ async fn pending_storage_key_keeps_background_owner_route_across_completion() {
bc.set_active_target_id("TID-storage-active".to_owned());
bc.set_target_url(active_page.final_url().as_str().to_owned());
bc.active_page_state_mut()
- .active_target
.runtime_slot
.set_loaded_page_for_test(active_page);
bc.insert_page_target_host(background);
@@ -2368,7 +2367,6 @@ async fn storage_get_usage_and_quota_reports_indexed_db_usage_for_origin() {
.as_mut()
.unwrap()
.active_page_state_mut()
- .active_target
.runtime_slot
.loaded_page_mut()
.unwrap();
@@ -2985,7 +2983,6 @@ async fn storage_clear_data_for_origin_clears_indexed_db_backend() {
.as_mut()
.unwrap()
.active_page_state_mut()
- .active_target
.runtime_slot
.loaded_page_mut()
.unwrap();
@@ -3044,7 +3041,6 @@ async fn storage_clear_data_for_origin_clears_indexed_db_backend() {
.as_mut()
.unwrap()
.active_page_state_mut()
- .active_target
.runtime_slot
.loaded_page_mut()
.unwrap();
diff --git a/moli-protocol/src/domains/target.rs b/moli-protocol/src/domains/target.rs
index 391717d55..6474bd9b5 100644
--- a/moli-protocol/src/domains/target.rs
+++ b/moli-protocol/src/domains/target.rs
@@ -1209,7 +1209,6 @@ mod devtools_runtime_entry_tests {
.as_ref()
.expect("browser context")
.active_page_state()
- .active_target
.runtime_slot
.has_loaded_page()
);
@@ -1278,7 +1277,6 @@ mod devtools_runtime_entry_tests {
.as_mut()
.expect("browser context")
.active_page_state_mut()
- .active_target
.runtime_slot
.set_loaded_page_for_test(page);
conn.register_pending_inspector_await(7101, Some("SID-runtime-ready-close"));
diff --git a/moli-protocol/src/domains/target/tests/test_support.rs b/moli-protocol/src/domains/target/tests/test_support.rs
index e699d8c18..693e8bbdc 100644
--- a/moli-protocol/src/domains/target/tests/test_support.rs
+++ b/moli-protocol/src/domains/target/tests/test_support.rs
@@ -163,7 +163,6 @@ pub(super) async fn load_bc_with_titled_page_async(
bc.set_target_url(url);
let _ = bc
.active_page_state_mut()
- .active_target
.runtime_slot
.replace_loaded_page(Some(page));
// Even this lightweight Target-domain fixture owns a real renderer 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 6a60b5f2d..726e24e9d 100644
--- a/moli-protocol/src/domains/target/tests/tests_background_staging.rs
+++ b/moli-protocol/src/domains/target/tests/tests_background_staging.rs
@@ -72,12 +72,7 @@ async fn loaded_page_html_for_test(ctx: &mut TestContext) -> String {
.conn
.browser_context
.as_mut()
- .and_then(|bc| {
- bc.active_page_state_mut()
- .active_target
- .runtime_slot
- .loaded_page_mut()
- })
+ .and_then(|bc| bc.active_page_state_mut().runtime_slot.loaded_page_mut())
.expect("loaded page");
page.serialize_html_async()
.await
@@ -192,7 +187,6 @@ async fn same_context_background_session_can_stage_its_own_pre_document_state_be
assert!(
active
.active_page_state()
- .active_target
.owner_state
.document_start_scripts
.is_empty()
@@ -401,7 +395,6 @@ async fn same_context_background_session_can_stage_its_own_utility_pre_document_
assert!(
active
.active_page_state()
- .active_target
.owner_state
.document_start_scripts
.is_empty()
@@ -5789,7 +5782,6 @@ async fn same_context_background_session_can_stage_its_own_inspector_enable_befo
.as_mut()
.unwrap()
.active_page_state_mut()
- .active_target
.owner_state
.target_crash_state
.mark_crashed();
@@ -5840,7 +5832,6 @@ async fn same_context_background_session_can_stage_its_own_inspector_enable_befo
assert!(
active
.active_page_state()
- .active_target
.owner_state
.target_crash_state
.is_crashed()
@@ -5914,7 +5905,6 @@ async fn same_context_background_session_can_stage_its_own_inspector_enable_befo
.as_ref()
.expect("browser context")
.active_page_state()
- .active_target
.owner_state
.target_crash_state
.is_crashed()
@@ -6016,7 +6006,6 @@ async fn same_context_background_session_can_disable_its_own_inspector_before_pr
.as_mut()
.unwrap()
.active_page_state_mut()
- .active_target
.owner_state
.target_crash_state
.mark_crashed();
@@ -6046,7 +6035,6 @@ async fn same_context_background_session_can_disable_its_own_inspector_before_pr
.as_ref()
.expect("browser context")
.active_page_state()
- .active_target
.owner_state
.target_crash_state
.is_crashed(),
@@ -6370,17 +6358,10 @@ 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_page_state()
- .active_target
- .fetch_owner
- .is_enabled()
- );
+ assert!(!active.active_page_state().fetch_owner.is_enabled());
assert!(
active
.active_page_state()
- .active_target
.fetch_owner
.config_snapshot()
.patterns()
@@ -6719,13 +6700,7 @@ 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_page_state()
- .active_target
- .fetch_owner
- .is_enabled()
- );
+ assert!(!active.active_page_state().fetch_owner.is_enabled());
let staged = active
.parked_page_session_state(&second_target_id)
.expect("second target should have staged parked page session state");
@@ -6921,17 +6896,10 @@ async fn same_context_background_session_can_disable_its_own_fetch_before_promot
.browser_context
.as_ref()
.expect("active browser context");
- assert!(
- !active
- .active_page_state()
- .active_target
- .fetch_owner
- .is_enabled()
- );
+ assert!(!active.active_page_state().fetch_owner.is_enabled());
assert!(
active
.active_page_state()
- .active_target
.fetch_owner
.config_snapshot()
.patterns()
@@ -7085,7 +7053,6 @@ async fn same_context_background_session_can_stage_its_own_network_enable_before
assert!(
!active
.active_page_state()
- .active_target
.runtime_slot
.primary_network_events_enabled()
);
@@ -7279,7 +7246,6 @@ async fn same_context_background_session_can_disable_its_own_network_before_prom
assert!(
!active
.active_page_state()
- .active_target
.runtime_slot
.primary_network_events_enabled()
);
@@ -7476,7 +7442,6 @@ async fn same_context_background_session_can_stage_its_own_cache_and_service_wor
assert!(
!active
.active_page_state()
- .active_target
.runtime_slot
.primary_network_events_enabled()
);
@@ -7537,7 +7502,6 @@ async fn same_context_background_session_can_stage_its_own_cache_and_service_wor
assert_eq!(bc.active_target_id(), Some(second_target_id.as_str()));
assert!(
bc.active_page_state()
- .active_target
.runtime_slot
.primary_network_events_enabled()
);
@@ -7728,7 +7692,6 @@ async fn same_context_background_session_can_disable_its_own_cache_and_service_w
assert!(
!active
.active_page_state()
- .active_target
.runtime_slot
.primary_network_events_enabled()
);
@@ -7789,7 +7752,6 @@ async fn same_context_background_session_can_disable_its_own_cache_and_service_w
assert_eq!(bc.active_target_id(), Some(second_target_id.as_str()));
assert!(
bc.active_page_state()
- .active_target
.runtime_slot
.primary_network_events_enabled()
);
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 ae05b8d7f..98051e281 100644
--- a/moli-protocol/src/domains/target/tests/tests_browser_context.rs
+++ b/moli-protocol/src/domains/target/tests/tests_browser_context.rs
@@ -788,7 +788,6 @@ async fn dispose_browser_context_aborts_paused_request_stage_navigation() {
.runtime_session_state
.inspector_enabled = true;
bc.active_page_state_mut()
- .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -868,7 +867,6 @@ async fn dispose_browser_context_aborts_root_session_navigation_without_target_s
let mut bc = BrowserContext::new("BID-root-dispose".into());
bc.set_active_target_id("TID-root-dispose");
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 084cc676d..8210a1390 100644
--- a/moli-protocol/src/domains/target/tests/tests_control_plane.rs
+++ b/moli-protocol/src/domains/target/tests/tests_control_plane.rs
@@ -828,19 +828,12 @@ async fn detach_from_target_aborts_paused_request_stage_navigation() {
assert_eq!(bc.active_target_id(), Some(target_id.as_str()));
assert!(
!bc.active_page_state()
- .active_target
.fetch_owner
.has_pending_fetch_state_for_test()
);
+ assert!(!bc.active_page_state().fetch_owner.is_enabled());
assert!(
!bc.active_page_state()
- .active_target
- .fetch_owner
- .is_enabled()
- );
- assert!(
- !bc.active_page_state()
- .active_target
.runtime_slot
.primary_network_events_enabled()
);
@@ -930,7 +923,6 @@ async fn same_context_targets_keep_paused_fetch_state_target_local_after_switchi
assert_eq!(bc.active_target_id(), Some(second_target_id.as_str()));
assert!(
!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 bf281dc30..587693bc4 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
@@ -193,7 +193,6 @@ async fn patchright_over_cdp_utility_world_binding_and_preload_stay_isolated_per
assert_eq!(
first_context
.active_page_state()
- .active_target
.owner_state
.document_start_scripts
.len(),
@@ -957,7 +956,6 @@ async fn patchright_over_cdp_pre_document_remove_utility_world_preload_prevents_
.as_ref()
.expect("browser context")
.active_page_state()
- .active_target
.owner_state
.document_start_scripts
.is_empty(),
@@ -1355,7 +1353,6 @@ async fn patchright_over_cdp_existing_utility_world_preload_remove_keeps_current
.as_ref()
.expect("browser context")
.active_page_state()
- .active_target
.owner_state
.document_start_scripts
.is_empty(),
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 3e8c44fec..e39b1855f 100644
--- a/moli-protocol/src/domains/target/tests/tests_patchright_runtimeless.rs
+++ b/moli-protocol/src/domains/target/tests/tests_patchright_runtimeless.rs
@@ -214,7 +214,6 @@ 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
.len(),
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 c2de5fa22..c899a241d 100644
--- a/moli-protocol/src/domains/target/tests/tests_playwright_cdp.rs
+++ b/moli-protocol/src/domains/target/tests/tests_playwright_cdp.rs
@@ -5804,7 +5804,6 @@ async fn playwright_over_cdp_target_document_start_script_does_not_leak_to_new_t
assert_eq!(
active
.active_page_state()
- .active_target
.owner_state
.document_start_scripts
.len(),
@@ -6142,7 +6141,6 @@ async fn playwright_over_cdp_script_execution_disabled_blocks_page_scripts_but_n
.and_then(|browser_context| {
browser_context
.active_page_state_mut()
- .active_target
.runtime_slot
.loaded_page_mut()
})
@@ -6159,7 +6157,6 @@ async fn playwright_over_cdp_script_execution_disabled_blocks_page_scripts_but_n
assert!(active.active_page_state().script_execution_disabled);
let script_runs = active
.active_page_state()
- .active_target
.runtime_slot
.loaded_page()
.expect("loaded page should exist")
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 e7bdfd230..4a73c44c8 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
@@ -473,7 +473,6 @@ async fn same_context_targets_remove_only_their_own_pre_document_script_identifi
assert!(
active
.active_page_state()
- .active_target
.owner_state
.document_start_scripts
.is_empty()
@@ -627,7 +626,6 @@ async fn same_context_targets_remove_only_their_own_utility_pre_document_script_
assert!(
active
.active_page_state()
- .active_target
.owner_state
.document_start_scripts
.is_empty()
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 3c7ce2588..5ccb09ad0 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
@@ -406,7 +406,6 @@ async fn same_context_targets_restore_their_own_crash_state_after_switching() {
.as_mut()
.unwrap()
.active_page_state_mut()
- .active_target
.owner_state
.target_crash_state
.mark_crashed();
@@ -499,7 +498,6 @@ async fn same_context_targets_restore_their_own_crash_state_after_switching() {
.as_ref()
.expect("active browser context")
.active_page_state()
- .active_target
.owner_state
.target_crash_state
.is_crashed()
@@ -527,7 +525,6 @@ async fn same_context_targets_restore_their_own_crash_state_after_switching() {
.as_ref()
.expect("browser context")
.active_page_state()
- .active_target
.owner_state
.target_crash_state
.is_crashed()
@@ -645,7 +642,6 @@ async fn same_context_targets_restore_their_own_domain_enablement_after_switchin
);
assert!(
bc.active_page_state()
- .active_target
.runtime_slot
.primary_network_events_enabled()
);
@@ -656,23 +652,9 @@ async fn same_context_targets_restore_their_own_domain_enablement_after_switchin
.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!(bc.active_page_state().fetch_owner.is_enabled());
+ assert!(bc.active_page_state().fetch_owner.handle_auth_requests());
+ let fetch_config = bc.active_page_state().fetch_owner.config_snapshot();
assert_eq!(fetch_config.patterns().len(), 1);
assert_eq!(fetch_config.patterns()[0].url_pattern, "*target-a*");
assert_eq!(
@@ -712,7 +694,6 @@ async fn same_context_targets_restore_their_own_domain_enablement_after_switchin
);
assert!(
!bc.active_page_state()
- .active_target
.runtime_slot
.primary_network_events_enabled()
);
@@ -723,21 +704,10 @@ async fn same_context_targets_restore_their_own_domain_enablement_after_switchin
.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()
- );
+ assert!(!bc.active_page_state().fetch_owner.is_enabled());
+ assert!(!bc.active_page_state().fetch_owner.handle_auth_requests());
assert!(
bc.active_page_state()
- .active_target
.fetch_owner
.config_snapshot()
.patterns()
@@ -896,13 +866,11 @@ 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_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_page_state_mut()
- .active_target
.runtime_slot
.set_network_request_counters_for_test(4, 5);
}
@@ -942,13 +910,11 @@ 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_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_page_state_mut()
- .active_target
.runtime_slot
.set_network_request_counters_for_test(9, 10);
}
@@ -961,7 +927,6 @@ async fn same_context_targets_restore_their_own_page_attachment_id_and_request_c
assert_eq!(bc.active_target_id(), Some("TID-000000000A"));
assert_eq!(
bc.active_page_state()
- .active_target
.runtime_slot
.page_attachment_id()
.map(crate::conn::TargetPageAttachmentId::get),
@@ -971,14 +936,12 @@ async fn same_context_targets_restore_their_own_page_attachment_id_and_request_c
assert_eq!(bc.subresource_network_emitted_record_count_for_test(), 12);
assert_eq!(
bc.active_page_state()
- .active_target
.runtime_slot
.next_fetch_request_id_for_test(),
4
);
assert_eq!(
bc.active_page_state()
- .active_target
.runtime_slot
.next_subresource_fetch_request_id_for_test(),
5
@@ -993,7 +956,6 @@ async fn same_context_targets_restore_their_own_page_attachment_id_and_request_c
assert_eq!(bc.active_target_id(), Some(second_target_id.as_str()));
assert_eq!(
bc.active_page_state()
- .active_target
.runtime_slot
.page_attachment_id()
.map(crate::conn::TargetPageAttachmentId::get),
@@ -1003,14 +965,12 @@ async fn same_context_targets_restore_their_own_page_attachment_id_and_request_c
assert_eq!(bc.subresource_network_emitted_record_count_for_test(), 8);
assert_eq!(
bc.active_page_state()
- .active_target
.runtime_slot
.next_fetch_request_id_for_test(),
9
);
assert_eq!(
bc.active_page_state()
- .active_target
.runtime_slot
.next_subresource_fetch_request_id_for_test(),
10
@@ -1323,7 +1283,6 @@ async fn same_context_targets_restore_their_own_crash_state_after_session_scoped
.as_mut()
.unwrap()
.active_page_state_mut()
- .active_target
.owner_state
.target_crash_state
.mark_crashed();
@@ -1391,7 +1350,6 @@ async fn same_context_targets_restore_their_own_crash_state_after_session_scoped
.as_ref()
.expect("active browser context")
.active_page_state()
- .active_target
.owner_state
.target_crash_state
.is_crashed()
@@ -1443,7 +1401,6 @@ async fn same_context_targets_restore_their_own_crash_state_after_session_scoped
.as_ref()
.expect("browser context")
.active_page_state()
- .active_target
.owner_state
.target_crash_state
.is_crashed()
@@ -1468,7 +1425,6 @@ async fn same_context_targets_restore_their_own_crash_state_after_session_scoped
.as_ref()
.expect("browser context")
.active_page_state()
- .active_target
.owner_state
.target_crash_state
.is_crashed()
@@ -1591,16 +1547,16 @@ async fn same_context_targets_restore_their_own_domain_enablement_after_session_
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_page_state().active_target
+ bc.active_page_state()
.runtime_slot
.primary_network_events_enabled()
);
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!(bc.active_page_state().fetch_owner.is_enabled());
+ assert!(bc.active_page_state().fetch_owner.handle_auth_requests());
+ let fetch_config = bc.active_page_state().fetch_owner.config_snapshot();
assert_eq!(fetch_config.patterns().len(), 1);
assert_eq!(fetch_config.patterns()[0].url_pattern, "*target-a*");
assert_eq!(
@@ -1629,16 +1585,16 @@ async fn same_context_targets_restore_their_own_domain_enablement_after_session_
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_page_state().active_target
+ bc.active_page_state()
.runtime_slot
.primary_network_events_enabled()
);
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!(bc.active_page_state().fetch_owner.is_enabled());
+ assert!(!bc.active_page_state().fetch_owner.handle_auth_requests());
+ let fetch_config = bc.active_page_state().fetch_owner.config_snapshot();
assert_eq!(fetch_config.patterns().len(), 1);
assert_eq!(fetch_config.patterns()[0].url_pattern, "*target-b*");
assert_eq!(
@@ -1667,16 +1623,16 @@ async fn same_context_targets_restore_their_own_domain_enablement_after_session_
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_page_state().active_target
+ bc.active_page_state()
.runtime_slot
.primary_network_events_enabled()
);
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!(bc.active_page_state().fetch_owner.is_enabled());
+ assert!(bc.active_page_state().fetch_owner.handle_auth_requests());
+ let fetch_config = bc.active_page_state().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 fe62417c0..86620fca8 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
@@ -1890,7 +1890,6 @@ async fn close_target_aborts_paused_request_stage_navigation() {
.runtime_session_state
.inspector_enabled = true;
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_target_attachment.rs b/moli-protocol/src/domains/target/tests/tests_target_attachment.rs
index c893ddb34..2bddd33c4 100644
--- a/moli-protocol/src/domains/target/tests/tests_target_attachment.rs
+++ b/moli-protocol/src/domains/target/tests/tests_target_attachment.rs
@@ -1482,7 +1482,6 @@ async fn attach_to_target_from_browser_session_creates_distinct_auxiliary_sessio
let bc = ctx.conn.browser_context.as_ref().unwrap();
assert!(
bc.active_page_state()
- .active_target
.runtime_slot
.has_auxiliary_network_events_for_session(target_session_id)
);
@@ -1558,7 +1557,6 @@ async fn detach_from_target() {
.runtime_session_state
.inspector_enabled = true;
bc.active_page_state_mut()
- .active_target
.runtime_slot
.enable_primary_network_events();
bc.active_page_state_mut()
@@ -1569,18 +1567,15 @@ async fn detach_from_target() {
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,
- }],
- );
+ bc.active_page_state_mut().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}}))
@@ -1605,7 +1600,6 @@ async fn detach_from_target() {
);
assert!(
!bc.active_page_state()
- .active_target
.runtime_slot
.primary_network_events_enabled()
);
@@ -1616,21 +1610,10 @@ async fn detach_from_target() {
.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()
- );
+ assert!(!bc.active_page_state().fetch_owner.is_enabled());
+ assert!(!bc.active_page_state().fetch_owner.handle_auth_requests());
assert!(
bc.active_page_state()
- .active_target
.fetch_owner
.config_snapshot()
.patterns()
@@ -1921,7 +1904,6 @@ async fn detach_from_target_removes_only_selected_session_document_start_scripts
.as_ref()
.unwrap()
.active_page_state()
- .active_target
.owner_state;
assert_eq!(owner_state.document_start_scripts.len(), 2);
assert!(
@@ -1973,7 +1955,6 @@ async fn detach_from_target_removes_only_selected_session_document_start_scripts
.as_ref()
.unwrap()
.active_page_state()
- .active_target
.owner_state;
assert_eq!(owner_state.document_start_scripts.len(), 1);
assert_eq!(
@@ -2021,12 +2002,7 @@ async fn page_renderer_inspector_session_count(ctx: &mut TestContext) -> u64 {
.conn
.browser_context
.as_mut()
- .and_then(|bc| {
- bc.active_page_state_mut()
- .active_target
- .runtime_slot
- .loaded_page_mut()
- })
+ .and_then(|bc| bc.active_page_state_mut().runtime_slot.loaded_page_mut())
.expect("active target should still have a loaded page")
.runtime_heap_usage_async()
.await
@@ -2160,7 +2136,6 @@ async fn detach_from_target_aborts_paused_request_stage_navigation() {
bc.set_active_target_id("TID-000000000A");
bc.attach_active_session("SID-1");
bc.active_page_state_mut()
- .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -2214,19 +2189,12 @@ async fn detach_from_target_aborts_paused_request_stage_navigation() {
assert_eq!(bc.active_target_id(), Some("TID-000000000A"));
assert!(
!bc.active_page_state()
- .active_target
.fetch_owner
.has_pending_fetch_state_for_test()
);
+ assert!(!bc.active_page_state().fetch_owner.is_enabled());
assert!(
!bc.active_page_state()
- .active_target
- .fetch_owner
- .is_enabled()
- );
- assert!(
- !bc.active_page_state()
- .active_target
.runtime_slot
.primary_network_events_enabled()
);
@@ -2250,7 +2218,6 @@ async fn set_auto_attach_false_detaches_existing_target() {
.runtime_session_state
.inspector_enabled = true;
bc.active_page_state_mut()
- .active_target
.runtime_slot
.enable_primary_network_events();
bc.active_page_state_mut()
@@ -2261,18 +2228,15 @@ async fn set_auto_attach_false_detaches_existing_target() {
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,
- }],
- );
+ bc.active_page_state_mut().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!({
@@ -2329,7 +2293,6 @@ async fn set_auto_attach_false_detaches_existing_target() {
);
assert!(
!bc.active_page_state()
- .active_target
.runtime_slot
.primary_network_events_enabled()
);
@@ -2340,21 +2303,10 @@ async fn set_auto_attach_false_detaches_existing_target() {
.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()
- );
+ assert!(!bc.active_page_state().fetch_owner.is_enabled());
+ assert!(!bc.active_page_state().fetch_owner.handle_auth_requests());
assert!(
bc.active_page_state()
- .active_target
.fetch_owner
.config_snapshot()
.patterns()
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 863a2f060..1b0eb43ac 100644
--- a/moli-protocol/src/domains/target/tests/tests_target_basics.rs
+++ b/moli-protocol/src/domains/target/tests/tests_target_basics.rs
@@ -255,7 +255,6 @@ async fn dispose_browser_context_aborts_paused_request_stage_navigation() {
.runtime_session_state
.inspector_enabled = true;
bc.active_page_state_mut()
- .active_target
.runtime_slot
.enable_primary_network_events();
ctx.conn.browser_context = Some(bc);
@@ -1627,7 +1626,6 @@ 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.active_page_state_mut().devtools_sessions
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 bde4f789f..8e867db92 100644
--- a/moli-protocol/src/domains/target/tests/tests_target_creation.rs
+++ b/moli-protocol/src/domains/target/tests/tests_target_creation.rs
@@ -29,7 +29,6 @@ async fn create_target_clears_stale_crash_state() {
.as_mut()
.unwrap()
.active_page_state_mut()
- .active_target
.owner_state
.target_crash_state
.mark_crashed();
@@ -52,7 +51,6 @@ async fn create_target_clears_stale_crash_state() {
.as_ref()
.expect("browser context")
.active_page_state()
- .active_target
.owner_state
.target_crash_state
.is_crashed()
@@ -1088,7 +1086,6 @@ async fn window_open_hands_off_session_storage_snapshot_and_initial_storage_key(
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));
}
@@ -2176,7 +2173,7 @@ async fn anchor_left_click_activates_popup_while_initial_navigation_waits_for_de
);
assert!(
browser_context
- .active_page_state().active_target
+ .active_page_state()
.runtime_slot
.loaded_page()
.is_some_and(|page| moli_url::is_about_blank(page.final_url())),
@@ -2195,7 +2192,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_page_state().active_target
+ .active_page_state()
.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 4dcdd42b1..b0ca70be7 100644
--- a/moli-protocol/src/domains/target/tests/tests_target_management.rs
+++ b/moli-protocol/src/domains/target/tests/tests_target_management.rs
@@ -48,7 +48,6 @@ async fn close_target_success() {
.runtime_session_state
.inspector_enabled = true;
bc.active_page_state_mut()
- .active_target
.runtime_slot
.enable_primary_network_events();
bc.active_page_state_mut()
@@ -59,29 +58,24 @@ async fn close_target_success() {
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.active_page_state_mut().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_page_state_mut()
- .active_target
.runtime_slot
.set_next_subresource_fetch_request_id_for_test(5);
bc.active_page_state_mut()
- .active_target
.owner_state
.target_crash_state
.mark_crashed();
@@ -597,7 +591,6 @@ async fn close_target_aborts_paused_request_stage_navigation() {
.runtime_session_state
.inspector_enabled = true;
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 e70d09679..a7b0c7623 100644
--- a/moli-protocol/src/domains/target/worker_target.rs
+++ b/moli-protocol/src/domains/target/worker_target.rs
@@ -3705,7 +3705,6 @@ mod tests {
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);
let owner_page = TargetPageResidenceIdentity::new(
@@ -4685,7 +4684,6 @@ mod tests {
.as_mut()
.unwrap()
.active_page_state_mut()
- .active_target
.runtime_slot
.replace_page_attachment_id_for_test();
let messages = protocol_messages(