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): consolidate optional owner Page access

ldm0deb111966afb
diff --git a/moli-protocol/src/conn.rs b/moli-protocol/src/conn.rs
index 664e2746e..9d212ede6 100644
--- a/moli-protocol/src/conn.rs
+++ b/moli-protocol/src/conn.rs
@@ -1758,7 +1758,7 @@ impl CdpConnection {
session_id: Option<&str>,
) -> bool {
self.runtime_session_owner_slot(session_id)
- .is_ok_and(TargetRuntimeSlot::renderer_document_navigation_is_suspended)
+ .is_some_and(TargetRuntimeSlot::renderer_document_navigation_is_suspended)
}
pub(crate) fn accepts_pending_document_navigation_for_owner(
@@ -1810,7 +1810,6 @@ impl CdpConnection {
owner: &CommandOwnerScope,
) -> Option<String> {
self.runtime_session_owner_slot_for_owner(owner)
- .ok()
.and_then(|slot| slot.current_document_loader_id().map(str::to_owned))
}
@@ -1841,7 +1840,6 @@ impl CdpConnection {
let mut request_id_allocator = std::mem::take(&mut self.network_request_id_allocator);
let delivery = self
.runtime_session_owner_slot_mut_for_owner(owner)
- .ok()
.and_then(|slot| {
slot.ingest_renderer_network_output_item_and_prepare_live_delivery(
source_renderer_page,
@@ -1870,50 +1868,31 @@ impl CdpConnection {
owner: &CommandOwnerScope,
) -> Result<&mut Page, String> {
self.ensure_document_accessible_for_owner(owner)?;
- self.loaded_page_mut_for_interruptible_protocol_access_for_owner(owner)
+ self.loaded_page_mut_for_owner(owner)
+ .ok_or_else(|| "NoDocumentLoaded".to_owned())
}
- /// Returns the Page that currently carries target-scoped configuration.
- ///
- /// A cross-Document navigation keeps its outgoing Page attached until the
- /// replacement commits. Network and Emulation settings belong to the
- /// stable target/session, so they must remain writable during that window:
- /// the outgoing Page needs the update if navigation fails, while commit
- /// configuration replays the same target state into the replacement Page.
- /// Document-reading commands must continue to use
- /// [`Self::loaded_page_mut_for_protocol_access`] and observe the navigation
- /// gate instead.
- pub(crate) fn loaded_page_mut_for_target_configuration(
+ pub(crate) fn loaded_page_mut_for_session_owner(
&mut self,
session_id: Option<&str>,
- ) -> Result<&mut Page, String> {
+ ) -> Option<&mut Page> {
let owner = CommandOwnerScope::capture(self, session_id);
- self.loaded_page_mut_for_target_configuration_for_owner(&owner)
+ self.loaded_page_mut_for_owner(&owner)
}
- pub(crate) fn loaded_page_mut_for_target_configuration_for_owner(
- &mut self,
- owner: &CommandOwnerScope,
- ) -> Result<&mut Page, String> {
- self.runtime_session_owner_slot_mut_for_owner(owner)?
- .loaded_page_mut()
- .ok_or_else(|| "NoDocumentLoaded".to_owned())
- }
-
- /// Returns the exact Page that remains attached while a cross-Document
- /// navigation is suspended.
+ /// Returns the owner's currently attached Page without a navigation gate.
///
- /// Only commands classified as renderer-interruptible at the parsed CDP
- /// boundary may use this access path. Ordinary protocol commands must use
- /// [`Self::loaded_page_mut_for_protocol_access`] so they wait for the
- /// replacement attachment instead of entering the old renderer.
- pub(crate) fn loaded_page_mut_for_interruptible_protocol_access_for_owner(
+ /// During cross-Document navigation this may still be the outgoing Page.
+ /// Target-scoped configuration, renderer-interruptible commands and
+ /// completion handling may access it; configuration is replayed into the
+ /// replacement at commit. Ordinary document commands must use
+ /// [`Self::loaded_page_mut_for_protocol_access`] instead.
+ pub(crate) fn loaded_page_mut_for_owner(
&mut self,
owner: &CommandOwnerScope,
- ) -> Result<&mut Page, String> {
+ ) -> Option<&mut Page> {
self.runtime_session_owner_slot_mut_for_owner(owner)?
.loaded_page_mut()
- .ok_or_else(|| "NoDocumentLoaded".to_owned())
}
pub(crate) fn start_document_navigation_for_owner(
@@ -1956,7 +1935,7 @@ impl CdpConnection {
Vec<moli_core::page::RendererDocumentLifecycleEvent>,
) {
let (binding, events, document_scope_changed) = {
- let Ok(slot) = self.runtime_session_owner_slot_mut_for_owner(owner) else {
+ let Some(slot) = self.runtime_session_owner_slot_mut_for_owner(owner) else {
return (None, Vec::new());
};
let previous_document_scope = slot
@@ -1994,7 +1973,7 @@ impl CdpConnection {
Vec<moli_core::page::RendererDocumentLifecycleEvent>,
) {
let (binding, events, document_scope_changed, document_input_stream_opened) = {
- let Ok(slot) = self.runtime_session_owner_slot_mut_for_owner(owner) else {
+ let Some(slot) = self.runtime_session_owner_slot_mut_for_owner(owner) else {
return (None, Vec::new());
};
let previous_document_scope = slot
@@ -2039,7 +2018,7 @@ impl CdpConnection {
fn retire_javascript_dialogs_for_owner(&mut self, owner: &CommandOwnerScope) {
let event_session_ids = self.page_event_session_ids_for_owner(owner);
- if let Ok(slot) = self.runtime_session_owner_slot_mut_for_owner(owner) {
+ if let Some(slot) = self.runtime_session_owner_slot_mut_for_owner(owner) {
slot.retire_javascript_dialog_scope();
}
for event_session_id in event_session_ids {
@@ -2059,7 +2038,7 @@ impl CdpConnection {
loader_id: &str,
) -> bool {
self.runtime_session_owner_slot_mut_for_owner(owner)
- .is_ok_and(|slot| {
+ .is_some_and(|slot| {
slot.page_slot_mut()
.begin_renderer_document_load_visibility_barrier(loader_id)
})
@@ -2070,8 +2049,7 @@ impl CdpConnection {
owner: &CommandOwnerScope,
loader_id: &str,
) -> Option<Vec<moli_core::page::RendererDocumentLifecycleEvent>> {
- self.runtime_session_owner_slot_mut_for_owner(owner)
- .ok()?
+ self.runtime_session_owner_slot_mut_for_owner(owner)?
.page_slot_mut()
.release_renderer_document_load_visibility_barrier(loader_id)
}
@@ -2082,7 +2060,7 @@ impl CdpConnection {
loader_id: &str,
) -> bool {
self.runtime_session_owner_slot_mut_for_owner(owner)
- .is_ok_and(|slot| {
+ .is_some_and(|slot| {
slot.page_slot_mut()
.cancel_renderer_document_load_visibility_barrier(loader_id)
})
@@ -2096,10 +2074,7 @@ impl CdpConnection {
CommittedRendererDocumentBinding,
moli_core::page::RendererDocumentLifecycleSnapshot,
)> {
- let page_slot = self
- .runtime_session_owner_slot(session_id)
- .ok()?
- .page_slot();
+ let page_slot = self.runtime_session_owner_slot(session_id)?.page_slot();
Some((
page_slot.renderer_document_lifecycle_binding()?.clone(),
page_slot.renderer_document_lifecycle_authoritative_snapshot()?,
@@ -2117,7 +2092,7 @@ impl CdpConnection {
RendererDocumentLifecycleObservation::Unavailable,
);
};
- let Ok(slot) = self.runtime_session_owner_slot_mut_for_owner(owner) else {
+ let Some(slot) = self.runtime_session_owner_slot_mut_for_owner(owner) else {
return RendererDocumentLifecycleObserver::resolved(
RendererDocumentLifecycleObservation::Unavailable,
);
@@ -2133,10 +2108,7 @@ impl CdpConnection {
CommittedRendererDocumentBinding,
moli_core::page::RendererDocumentLifecycleSnapshot,
)> {
- let page_slot = self
- .runtime_session_owner_slot(session_id)
- .ok()?
- .page_slot();
+ let page_slot = self.runtime_session_owner_slot(session_id)?.page_slot();
Some((
page_slot.renderer_document_lifecycle_binding()?.clone(),
page_slot.renderer_document_lifecycle_visible_snapshot()?,
@@ -2149,7 +2121,7 @@ impl CdpConnection {
loader_id: &str,
) -> bool {
self.runtime_session_owner_slot_mut_for_owner(owner)
- .is_ok_and(|slot| {
+ .is_some_and(|slot| {
slot.page_slot_mut()
.arm_root_post_load_observation(loader_id)
})
@@ -2176,7 +2148,6 @@ impl CdpConnection {
let binding = self
.runtime_session_owner_slot_mut_for_owner(owner)
- .ok()
.and_then(|slot| {
slot.page_slot_mut()
.take_root_frame_stopped_loading_binding()
@@ -2217,13 +2188,12 @@ impl CdpConnection {
) -> bool {
if !self
.runtime_session_owner_slot_for_owner(owner)
- .is_ok_and(|slot| slot.renderer_subresources_are_idle())
+ .is_some_and(|slot| slot.renderer_subresources_are_idle())
{
return false;
}
let binding = self
.runtime_session_owner_slot_mut_for_owner(owner)
- .ok()
.and_then(|slot| slot.page_slot_mut().take_root_network_idle_binding());
let Some(binding) = binding else {
return false;
@@ -2301,8 +2271,7 @@ impl CdpConnection {
let owner = self.command_owner_scope_for_devtools_context(context)?;
let page = self.target_page_residence_identity_for_owner(&owner)?;
let document = self
- .runtime_session_owner_slot_for_owner(&owner)
- .ok()?
+ .runtime_session_owner_slot_for_owner(&owner)?
.page_slot()
.renderer_document_lifecycle_binding()?
.renderer_document_identity();
@@ -2317,8 +2286,7 @@ impl CdpConnection {
) -> Option<DevToolsDocumentLifecycleWaitKey> {
let owner_scope = self.command_owner_scope_for_devtools_context(context)?;
let registration = self
- .runtime_session_owner_slot_mut_for_owner(&owner_scope)
- .ok()?
+ .runtime_session_owner_slot_mut_for_owner(&owner_scope)?
.page_slot_mut()
.register_renderer_document_lifecycle_waiter(milestone, expected_loader_id);
let (registration_id, binding) = registration?;
@@ -2341,7 +2309,6 @@ impl CdpConnection {
return DevToolsDocumentLifecycleWaitState::Unavailable;
};
self.runtime_session_owner_slot_for_owner(&owner_scope)
- .ok()
.map_or(DevToolsDocumentLifecycleWaitState::Unavailable, |slot| {
devtools_document_lifecycle_wait_state_for_slot(slot, key)
})
@@ -2356,7 +2323,7 @@ impl CdpConnection {
return false;
};
self.runtime_session_owner_slot_mut_for_owner(&owner_scope)
- .is_ok_and(|slot| {
+ .is_some_and(|slot| {
slot.page_slot_mut()
.release_renderer_document_lifecycle_waiter(
key.registration_id,
diff --git a/moli-protocol/src/conn/browser_context/fetch_owner.rs b/moli-protocol/src/conn/browser_context/fetch_owner.rs
index dc2cf47b2..aced50c9a 100644
--- a/moli-protocol/src/conn/browser_context/fetch_owner.rs
+++ b/moli-protocol/src/conn/browser_context/fetch_owner.rs
@@ -317,7 +317,7 @@ impl CdpConnection {
pub(crate) fn allocate_pending_subresource_fetch_request_ids_for_owner(
&mut self,
owner: &CommandOwnerScope,
- ) -> Result<(String, String), String> {
+ ) -> Option<(String, String)> {
let mut network_request_id_allocator =
std::mem::take(&mut self.network_request_id_allocator);
let result = self
@@ -336,7 +336,7 @@ impl CdpConnection {
pub(crate) fn allocate_fetch_navigation_request_id_for_owner(
&mut self,
owner: &CommandOwnerScope,
- ) -> Result<String, String> {
+ ) -> Option<String> {
self.runtime_session_owner_slot_mut_for_owner(owner)
.map(|runtime_slot| {
runtime_slot
@@ -387,7 +387,6 @@ impl CdpConnection {
let Some(owner) = target_scoped_stream_owner_from_handle(handle) else {
return self
.runtime_session_owner_slot_mut(session_id)
- .ok()
.and_then(|runtime_slot| runtime_slot.read_io_stream(handle, offset, size));
};
if !target_scoped_stream_owner_matches_session(self, session_id, &owner) {
@@ -405,7 +404,7 @@ impl CdpConnection {
network_request_id: String,
socket_id: u64,
) -> bool {
- let Ok(runtime_slot) = self.runtime_session_owner_slot_mut_for_owner(owner) else {
+ let Some(runtime_slot) = self.runtime_session_owner_slot_mut_for_owner(owner) else {
return false;
};
runtime_slot.register_synthetic_websocket_request(
@@ -431,7 +430,6 @@ impl CdpConnection {
request_id: &str,
) -> Option<u64> {
self.runtime_session_owner_slot_for_owner(owner)
- .ok()
.and_then(|runtime_slot| {
runtime_slot.synthetic_websocket_socket_id_for_request(request_id)
})
@@ -755,7 +753,7 @@ impl CdpConnection {
let Some(stream_owner) = target_scoped_stream_owner_from_handle(handle) else {
return self
.runtime_session_owner_slot_mut(session_id)
- .is_ok_and(|runtime_slot| runtime_slot.close_io_stream(handle));
+ .is_some_and(|runtime_slot| runtime_slot.close_io_stream(handle));
};
if !target_scoped_stream_owner_matches_session(self, session_id, &stream_owner) {
return false;
@@ -993,7 +991,7 @@ impl CdpConnection {
let Some(handle) = pending.network_request_handle else {
return;
};
- if let Ok(runtime_slot) = self.runtime_session_owner_slot_mut_for_owner(owner) {
+ if let Some(runtime_slot) = self.runtime_session_owner_slot_mut_for_owner(owner) {
runtime_slot.record_subresource_request_id_for_handle_if_absent(
handle,
pending.network_request_id.clone(),
@@ -1009,7 +1007,7 @@ impl CdpConnection {
let Some(handle) = pending.network_request_handle else {
return;
};
- if let Ok(runtime_slot) = self.runtime_session_owner_slot_mut_for_owner(owner) {
+ if let Some(runtime_slot) = self.runtime_session_owner_slot_mut_for_owner(owner) {
runtime_slot.record_subresource_request_id_for_handle_if_absent(
handle,
pending.network_request_id.clone(),
@@ -1025,7 +1023,7 @@ impl CdpConnection {
let Some(handle) = pending.network_request_handle else {
return;
};
- if let Ok(runtime_slot) = self.runtime_session_owner_slot_mut_for_owner(owner) {
+ if let Some(runtime_slot) = self.runtime_session_owner_slot_mut_for_owner(owner) {
runtime_slot.record_subresource_request_id_for_handle_if_absent(
handle,
pending.network_request_id.clone(),
diff --git a/moli-protocol/src/conn/browser_context/network_owner.rs b/moli-protocol/src/conn/browser_context/network_owner.rs
index aeb49d4ba..46f2563c5 100644
--- a/moli-protocol/src/conn/browser_context/network_owner.rs
+++ b/moli-protocol/src/conn/browser_context/network_owner.rs
@@ -413,7 +413,7 @@ impl CdpConnection {
return target.network_enabled(session_id);
}
self.runtime_session_owner_slot(session_id)
- .is_ok_and(|runtime_slot| runtime_slot.has_network_event_listeners())
+ .is_some_and(|runtime_slot| runtime_slot.has_network_event_listeners())
}
pub(crate) fn network_backlog_prepared_delivery_for_owner(
@@ -427,7 +427,6 @@ impl CdpConnection {
std::mem::take(&mut self.network_request_id_allocator);
let result = self
.runtime_session_owner_slot_mut_for_owner(owner)
- .ok()
.map(|runtime_slot| {
runtime_slot.network_backlog_prepared_delivery(
trigger_session_id,
@@ -449,7 +448,6 @@ impl CdpConnection {
std::mem::take(&mut self.network_request_id_allocator);
let result = self
.runtime_session_owner_slot_mut(session_id)
- .ok()
.map(|runtime_slot| {
runtime_slot.network_request_id_for_subresource_handle(
handle,
@@ -471,7 +469,6 @@ impl CdpConnection {
std::mem::take(&mut self.network_request_id_allocator);
let result = self
.runtime_session_owner_slot_mut_for_owner(owner)
- .ok()
.and_then(|runtime_slot| {
runtime_slot.pending_network_backlog_delivery_snapshot(
trigger_session_id,
@@ -496,7 +493,7 @@ impl CdpConnection {
&self,
owner: &crate::conn::CommandOwnerScope,
) -> Vec<Option<String>> {
- let Ok(runtime_slot) = self.runtime_session_owner_slot_for_owner(owner) else {
+ let Some(runtime_slot) = self.runtime_session_owner_slot_for_owner(owner) else {
return vec![owner.session_id().map(str::to_owned)];
};
let primary_session_id = self.runtime_session_owner_primary_session_id_for_owner(owner);
diff --git a/moli-protocol/src/conn/browser_context/page_owner.rs b/moli-protocol/src/conn/browser_context/page_owner.rs
index be5a516b6..172cc3d42 100644
--- a/moli-protocol/src/conn/browser_context/page_owner.rs
+++ b/moli-protocol/src/conn/browser_context/page_owner.rs
@@ -570,7 +570,6 @@ impl CdpConnection {
) -> bool {
if self
.runtime_session_owner_slot_for_owner(owner)
- .ok()
.and_then(TargetRuntimeSlot::committed_document_loader_id)
!= Some(loader_id.as_str())
{
@@ -594,8 +593,7 @@ impl CdpConnection {
session_id: Option<&str>,
) -> Option<MainDocumentResourceSnapshot> {
let loader_id = self
- .runtime_session_owner_slot(session_id)
- .ok()?
+ .runtime_session_owner_slot(session_id)?
.committed_document_loader_id()?
.to_owned();
self.target_owner_state_for_session(session_id)?
@@ -683,7 +681,7 @@ impl CdpConnection {
let renderer_console_agent_owns_page_console_api_events = enabled
&& self
.runtime_session_owner_slot_for_owner(owner)
- .is_ok_and(|slot| slot.has_loaded_page());
+ .is_some_and(|slot| slot.has_loaded_page());
let _ = self.with_target_devtools_session_state_for_owner_mut(owner, |state| {
state
.console_output_session_state
diff --git a/moli-protocol/src/conn/browser_context/runtime_owner.rs b/moli-protocol/src/conn/browser_context/runtime_owner.rs
index 5aa5c3f71..132ea2545 100644
--- a/moli-protocol/src/conn/browser_context/runtime_owner.rs
+++ b/moli-protocol/src/conn/browser_context/runtime_owner.rs
@@ -131,7 +131,7 @@ impl CdpConnection {
let owns = owns
&& self
.runtime_session_owner_slot_for_owner(owner)
- .is_ok_and(|slot| slot.has_loaded_page());
+ .is_some_and(|slot| slot.has_loaded_page());
self.with_target_devtools_session_state_for_owner_mut(owner, |state| {
state
.console_output_session_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 afe37f99a..92b61dff1 100644
--- a/moli-protocol/src/conn/browser_context/target_session_owner.rs
+++ b/moli-protocol/src/conn/browser_context/target_session_owner.rs
@@ -1843,8 +1843,7 @@ impl CdpConnection {
.map(str::to_owned)
});
let page_attachment_id = self
- .runtime_session_owner_slot_for_owner(owner)
- .ok()?
+ .runtime_session_owner_slot_for_owner(owner)?
.page_attachment_id()?;
Some(TargetPageResidenceIdentity::new(
browser_context_id,
@@ -1871,8 +1870,7 @@ impl CdpConnection {
.map(str::to_owned)
});
let page_attachment_id = self
- .runtime_session_owner_slot_for_owner(owner)
- .ok()?
+ .runtime_session_owner_slot_for_owner(owner)?
.pending_page_attachment_id()?;
Some(TargetPageResidenceIdentity::new(
browser_context_id,
@@ -1893,8 +1891,7 @@ impl CdpConnection {
.map(str::to_owned)
});
let page_attachment_id = self
- .runtime_session_owner_slot_mut_for_owner(owner)
- .ok()?
+ .runtime_session_owner_slot_mut_for_owner(owner)?
.reserve_renderer_page_attachment(renderer_page);
Some(TargetPageResidenceIdentity::new(
browser_context_id,
@@ -1919,8 +1916,7 @@ impl CdpConnection {
&mut self,
owner: &CommandOwnerScope,
) -> Option<crate::conn::TargetPageResidenceToken> {
- self.runtime_session_owner_slot_mut_for_owner(owner)
- .ok()?
+ self.runtime_session_owner_slot_mut_for_owner(owner)?
.page_slot_mut()
.page_residence_token()
}
@@ -1962,8 +1958,7 @@ impl CdpConnection {
&self,
owner: &CommandOwnerScope,
) -> Option<crate::conn::RendererPageResidenceIdentity> {
- self.runtime_session_owner_slot_for_owner(owner)
- .ok()?
+ self.runtime_session_owner_slot_for_owner(owner)?
.loaded_page()
.map(crate::conn::RendererPageResidenceIdentity::from_page)
}
@@ -2068,7 +2063,6 @@ impl CdpConnection {
},
};
self.runtime_session_owner_slot_for_owner(&CommandOwnerScope::for_route(route))
- .ok()
.and_then(|slot| slot.page_slot().renderer_document_lifecycle_binding())
.map(crate::conn::CommittedRendererDocumentBinding::renderer_document_identity)
== Some(expected.root_document())
@@ -2078,8 +2072,7 @@ impl CdpConnection {
&self,
owner: &CommandOwnerScope,
) -> Option<moli_core::RendererDocumentLifecycleIdentity> {
- self.runtime_session_owner_slot_for_owner(owner)
- .ok()?
+ self.runtime_session_owner_slot_for_owner(owner)?
.page_slot()
.renderer_document_lifecycle_binding()
.map(crate::conn::CommittedRendererDocumentBinding::renderer_document_identity)
@@ -2163,7 +2156,7 @@ impl CdpConnection {
pub(crate) fn runtime_session_owner_slot_mut(
&mut self,
session_id: Option<&str>,
- ) -> Result<&mut TargetRuntimeSlot, String> {
+ ) -> Option<&mut TargetRuntimeSlot> {
let owner = CommandOwnerScope::capture(self, session_id);
self.runtime_session_owner_slot_mut_for_owner(&owner)
}
@@ -2171,23 +2164,22 @@ impl CdpConnection {
pub(crate) fn runtime_session_owner_slot_mut_for_owner(
&mut self,
owner: &CommandOwnerScope,
- ) -> Result<&mut TargetRuntimeSlot, String> {
+ ) -> Option<&mut TargetRuntimeSlot> {
let renderer_inspector_session_id =
self.target_renderer_runtime_inspector_session_id_for_owner(owner);
let slot = self
- .target_session_owner_mut_for_owner(owner)
- .map(TargetSessionOwnerMut::into_runtime_slot_mut)
- .ok_or_else(|| "NoDocumentLoaded".to_owned())?;
+ .target_session_owner_mut_for_owner(owner)?
+ .into_runtime_slot_mut();
if let Some(page) = slot.loaded_page_mut() {
page.set_renderer_devtools_command_session_id(renderer_inspector_session_id);
}
- Ok(slot)
+ Some(slot)
}
pub(crate) fn runtime_session_owner_slot(
&self,
session_id: Option<&str>,
- ) -> Result<&TargetRuntimeSlot, String> {
+ ) -> Option<&TargetRuntimeSlot> {
let owner = CommandOwnerScope::capture(self, session_id);
self.runtime_session_owner_slot_for_owner(&owner)
}
@@ -2195,10 +2187,9 @@ impl CdpConnection {
pub(crate) fn runtime_session_owner_slot_for_owner(
&self,
owner: &CommandOwnerScope,
- ) -> Result<&TargetRuntimeSlot, String> {
+ ) -> Option<&TargetRuntimeSlot> {
self.target_session_owner_ref_for_owner(owner)
.map(|owner| owner.runtime_slot())
- .ok_or_else(|| "NoDocumentLoaded".to_owned())
}
pub(crate) fn runtime_session_owner_primary_session_id(
@@ -4065,7 +4056,7 @@ mod tests {
);
assert!(
conn.runtime_session_owner_slot(Some("SID-missing"))
- .is_err()
+ .is_none()
);
}
diff --git a/moli-protocol/src/conn/downloads.rs b/moli-protocol/src/conn/downloads.rs
index 5d991ba08..0e19ecc03 100644
--- a/moli-protocol/src/conn/downloads.rs
+++ b/moli-protocol/src/conn/downloads.rs
@@ -672,7 +672,6 @@ impl CdpConnection {
.unwrap_or_else(|| browser_context.effective_extra_headers());
let initiator_url = self
.runtime_session_owner_slot_for_owner(owner)
- .ok()
.and_then(|slot| slot.loaded_page().map(|page| page.final_url().clone()));
Some(PendingDownloadOwnerContext {
browser_context_id,
diff --git a/moli-protocol/src/conn/fetch_support.rs b/moli-protocol/src/conn/fetch_support.rs
index 164eedbb6..bd5561911 100644
--- a/moli-protocol/src/conn/fetch_support.rs
+++ b/moli-protocol/src/conn/fetch_support.rs
@@ -1759,8 +1759,7 @@ impl CdpConnection {
handle_auth_requests: bool,
) -> Result<PendingSubresourceContinueOutcome, String> {
let page = self
- .runtime_session_owner_slot_mut_for_owner(owner)?
- .loaded_page_mut()
+ .loaded_page_mut_for_owner(owner)
.ok_or_else(|| "NoDocumentLoaded".to_owned())?;
page.continue_pending_subresource_fetch_async(
internal_id,
@@ -1802,8 +1801,7 @@ impl CdpConnection {
auth: SubresourceAuthCredentials,
) -> Result<PendingSubresourceContinueOutcome, String> {
let page = self
- .runtime_session_owner_slot_mut_for_owner(owner)?
- .loaded_page_mut()
+ .loaded_page_mut_for_owner(owner)
.ok_or_else(|| "NoDocumentLoaded".to_owned())?;
page.continue_pending_subresource_auth_async(internal_id, auth)
.await
@@ -1837,8 +1835,7 @@ impl CdpConnection {
error_text: String,
) -> Result<Option<moli_core::RendererOutputFence>, String> {
let page = self
- .runtime_session_owner_slot_mut_for_owner(owner)?
- .loaded_page_mut()
+ .loaded_page_mut_for_owner(owner)
.ok_or_else(|| "NoDocumentLoaded".to_owned())?;
page.fail_pending_subresource_auth_async(internal_id, error_text)
.await
@@ -1872,8 +1869,7 @@ impl CdpConnection {
error_text: String,
) -> Result<Option<moli_core::RendererOutputFence>, String> {
let page = self
- .runtime_session_owner_slot_mut_for_owner(owner)?
- .loaded_page_mut()
+ .loaded_page_mut_for_owner(owner)
.ok_or_else(|| "NoDocumentLoaded".to_owned())?;
page.fail_pending_subresource_fetch_async(internal_id, error_text)
.await
@@ -1906,8 +1902,7 @@ impl CdpConnection {
response_body: moli_core::page::RendererSyntheticResponseBody,
) -> Result<(), String> {
let page = self
- .runtime_session_owner_slot_mut(session_id)?
- .loaded_page_mut()
+ .loaded_page_mut_for_session_owner(session_id)
.ok_or_else(|| "NoDocumentLoaded".to_owned())?;
page.fulfill_pending_subresource_fetch_async(
internal_id,
@@ -1959,8 +1954,7 @@ impl CdpConnection {
response_headers: Option<Vec<(String, Vec<u8>)>>,
) -> Result<(), String> {
let page = self
- .runtime_session_owner_slot_mut_for_owner(owner)?
- .loaded_page_mut()
+ .loaded_page_mut_for_owner(owner)
.ok_or_else(|| "NoDocumentLoaded".to_owned())?;
page.continue_pending_subresource_response_async(
internal_id,
@@ -2002,8 +1996,7 @@ impl CdpConnection {
error_text: String,
) -> Result<Option<moli_core::RendererOutputFence>, String> {
let page = self
- .runtime_session_owner_slot_mut_for_owner(owner)?
- .loaded_page_mut()
+ .loaded_page_mut_for_owner(owner)
.ok_or_else(|| "NoDocumentLoaded".to_owned())?;
page.fail_pending_subresource_response_async(internal_id, error_text)
.await
@@ -2036,8 +2029,7 @@ impl CdpConnection {
response_body: moli_core::page::RendererSyntheticResponseBody,
) -> Result<(), String> {
let page = self
- .runtime_session_owner_slot_mut(session_id)?
- .loaded_page_mut()
+ .loaded_page_mut_for_session_owner(session_id)
.ok_or_else(|| "NoDocumentLoaded".to_owned())?;
page.fulfill_pending_subresource_response_async(
internal_id,
@@ -2065,8 +2057,7 @@ impl CdpConnection {
data: String,
) -> Result<(), String> {
let page = self
- .runtime_session_owner_slot_mut(session_id)?
- .loaded_page_mut()
+ .loaded_page_mut_for_session_owner(session_id)
.ok_or_else(|| "NoDocumentLoaded".to_owned())?;
page.receive_synthetic_websocket_text_async(socket_id, data)
.await
@@ -2089,8 +2080,7 @@ impl CdpConnection {
data: Vec<u8>,
) -> Result<(), String> {
let page = self
- .runtime_session_owner_slot_mut(session_id)?
- .loaded_page_mut()
+ .loaded_page_mut_for_session_owner(session_id)
.ok_or_else(|| "NoDocumentLoaded".to_owned())?;
page.receive_synthetic_websocket_binary_async(socket_id, data)
.await
@@ -2117,8 +2107,7 @@ impl CdpConnection {
reason: String,
) -> Result<(), String> {
let page = self
- .runtime_session_owner_slot_mut(session_id)?
- .loaded_page_mut()
+ .loaded_page_mut_for_session_owner(session_id)
.ok_or_else(|| "NoDocumentLoaded".to_owned())?;
page.close_synthetic_websocket_from_server_async(socket_id, code, reason)
.await
diff --git a/moli-protocol/src/conn/inspector_route.rs b/moli-protocol/src/conn/inspector_route.rs
index 2c071a14b..a6f9187f9 100644
--- a/moli-protocol/src/conn/inspector_route.rs
+++ b/moli-protocol/src/conn/inspector_route.rs
@@ -16,7 +16,6 @@ impl CdpConnection {
attachment_id: RendererAgentAttachmentId,
) -> bool {
self.runtime_session_owner_slot(session_id)
- .ok()
.and_then(|slot| slot.current_renderer_attachment())
.is_some_and(|attachment| attachment.id() == attachment_id)
}
@@ -26,7 +25,6 @@ impl CdpConnection {
owner: &CommandOwnerScope,
) -> Option<RendererAgentAttachmentId> {
self.runtime_session_owner_slot_for_owner(owner)
- .ok()
.and_then(|slot| slot.current_renderer_attachment())
.map(RendererAgentAttachment::id)
}
@@ -53,7 +51,8 @@ impl CdpConnection {
agent_token: RendererDevToolsAgentToken,
) -> Result<PreparedRendererAgentAttachment, String> {
self.validate_navigation_target_owner_for_scope(owner, token)?;
- self.runtime_session_owner_slot_mut_for_owner(owner)?
+ self.runtime_session_owner_slot_mut_for_owner(owner)
+ .ok_or_else(|| "NoDocumentLoaded".to_owned())?
.prepare_renderer_agent_candidate_token(token, agent_token)
.map_err(|error| error.to_string())
}
@@ -70,7 +69,6 @@ impl CdpConnection {
}
let current_attachment = self
.runtime_session_owner_slot_for_owner(owner)
- .ok()
.and_then(|slot| slot.current_renderer_attachment());
if let Some(current_attachment) = current_attachment {
// Page-creation facts are frozen before protocol installs the new
@@ -115,12 +113,10 @@ impl CdpConnection {
.map(|state| (batch.session.clone(), state))
})
.collect::<Vec<_>>();
- match self
- .runtime_session_owner_slot_mut_for_owner(owner)
- .and_then(|slot| {
- slot.route_current_renderer_inspector_output(attachment_id, batches)
- .map_err(|error| error.to_string())
- }) {
+ let Some(slot) = self.runtime_session_owner_slot_mut_for_owner(owner) else {
+ return Vec::new();
+ };
+ match slot.route_current_renderer_inspector_output(attachment_id, batches) {
Ok(batches) => {
let primary_session_id =
self.runtime_session_owner_primary_session_id_for_owner(owner);
@@ -155,7 +151,8 @@ impl CdpConnection {
) -> Result<CommittedRendererAgentAttachment, String> {
self.validate_navigation_target_owner_for_scope(owner, candidate.navigation())?;
let transaction = self
- .runtime_session_owner_slot_mut_for_owner(owner)?
+ .runtime_session_owner_slot_mut_for_owner(owner)
+ .ok_or_else(|| "NoDocumentLoaded".to_owned())?
.commit_renderer_agent_candidate_transaction(candidate, renderer_page)
.map_err(|error| error.to_string())?;
let page_owner = self
@@ -180,7 +177,8 @@ impl CdpConnection {
return Err("NavigationTargetPageChanged".into());
}
if !self
- .runtime_session_owner_slot_mut_for_owner(owner)?
+ .runtime_session_owner_slot_mut_for_owner(owner)
+ .ok_or_else(|| "NoDocumentLoaded".to_owned())?
.page_slot_mut()
.bind_existing_page_document_navigation(
candidate.navigation(),
@@ -199,7 +197,8 @@ impl CdpConnection {
transaction: CommittedRendererAgentAttachment,
) -> Result<(), String> {
self.validate_navigation_target_owner_for_scope(owner, transaction.navigation())?;
- self.runtime_session_owner_slot_mut_for_owner(owner)?
+ self.runtime_session_owner_slot_mut_for_owner(owner)
+ .ok_or_else(|| "NoDocumentLoaded".to_owned())?
.rollback_committed_renderer_agent_candidate(transaction)
.map_err(|error| error.to_string())
}
@@ -215,12 +214,8 @@ impl CdpConnection {
{
return None;
}
- match self
- .runtime_session_owner_slot_mut_for_owner(owner)
- .and_then(|slot| {
- slot.finish_renderer_document_navigation(token)
- .map_err(|error| error.to_string())
- }) {
+ let slot = self.runtime_session_owner_slot_mut_for_owner(owner)?;
+ match slot.finish_renderer_document_navigation(token) {
Ok(finish) => Some(finish),
Err(error) => {
tracing::debug!(
diff --git a/moli-protocol/src/conn/page_state/surfaces.rs b/moli-protocol/src/conn/page_state/surfaces.rs
index ec285454f..78a5b77ce 100644
--- a/moli-protocol/src/conn/page_state/surfaces.rs
+++ b/moli-protocol/src/conn/page_state/surfaces.rs
@@ -533,7 +533,6 @@ impl CdpConnection {
.unwrap_or_default();
let has_loaded_page = self
.runtime_session_owner_slot_mut(Some(session_id))
- .ok()
.is_some_and(|slot| slot.loaded_page().is_some());
if !has_loaded_page {
let _ = self.with_target_owner_state_for_session_mut(Some(session_id), |owner_state| {
@@ -546,9 +545,7 @@ impl CdpConnection {
for registry_key in registry_keys {
let result: anyhow::Result<()> = async {
let pending = self
- .runtime_session_owner_slot_mut(Some(session_id))
- .ok()
- .and_then(|slot| slot.loaded_page_mut())
+ .loaded_page_mut_for_session_owner(Some(session_id))
.ok_or_else(|| {
anyhow::anyhow!(
"page disappeared while removing detached-session document-start scripts"
@@ -566,9 +563,7 @@ impl CdpConnection {
)
})?;
let page = self
- .runtime_session_owner_slot_mut(Some(session_id))
- .ok()
- .and_then(|slot| slot.loaded_page_mut())
+ .loaded_page_mut_for_session_owner(Some(session_id))
.ok_or_else(|| {
anyhow::anyhow!(
"page disappeared while finishing detached-session document-start script cleanup"
diff --git a/moli-protocol/src/conn/renderer_command_turn.rs b/moli-protocol/src/conn/renderer_command_turn.rs
index a03da1036..5f37dcefd 100644
--- a/moli-protocol/src/conn/renderer_command_turn.rs
+++ b/moli-protocol/src/conn/renderer_command_turn.rs
@@ -27,7 +27,7 @@ impl CdpConnection {
// frozen target. Resolving a missing session through the active Page
// here would install this result into a newly activated sibling.
let scope = CommandOwnerScope::for_page_residence(owner);
- if let Ok(page) = self.loaded_page_mut_for_interruptible_protocol_access_for_owner(&scope) {
+ if let Some(page) = self.loaded_page_mut_for_owner(&scope) {
return page.finish_page_command_turn(completion);
}
diff --git a/moli-protocol/src/conn/resource_runtime_support.rs b/moli-protocol/src/conn/resource_runtime_support.rs
index 881785b0e..3193888dd 100644
--- a/moli-protocol/src/conn/resource_runtime_support.rs
+++ b/moli-protocol/src/conn/resource_runtime_support.rs
@@ -304,8 +304,7 @@ impl CdpConnection {
.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()
+ self.loaded_page_mut_for_session_owner(session_id)
}
fn resource_runtime_apply_page_for_owner(
@@ -321,8 +320,7 @@ impl CdpConnection {
.as_mut()
.and_then(|bc| bc.active_page_target_mut().runtime_slot.loaded_page_mut());
}
- self.loaded_page_mut_for_target_configuration_for_owner(owner)
- .ok()
+ self.loaded_page_mut_for_owner(owner)
}
}
diff --git a/moli-protocol/src/conn/runtime_eval/execution_contexts.rs b/moli-protocol/src/conn/runtime_eval/execution_contexts.rs
index cde996316..f723c4035 100644
--- a/moli-protocol/src/conn/runtime_eval/execution_contexts.rs
+++ b/moli-protocol/src/conn/runtime_eval/execution_contexts.rs
@@ -8,7 +8,7 @@ impl CdpConnection {
let target_id = self
.target_owner_identity_for_owner(owner)
.and_then(|(_, target_id)| target_id);
- let page = self.runtime_session_owner_page_mut_for_owner(owner)?;
+ let page = self.loaded_page_mut_for_protocol_access_for_owner(owner)?;
let target_id = target_id.as_deref();
let devtools_target_id = target_id.map(DevToolsTargetId::from);
let realms = page
@@ -38,7 +38,7 @@ impl CdpConnection {
&mut self,
session_id: Option<&str>,
) -> Result<Option<i64>, String> {
- let page = self.runtime_session_owner_page_mut(session_id)?;
+ let page = self.loaded_page_mut_for_protocol_access(session_id)?;
page.default_execution_context_id_async()
.await
.map_err(|error| format!("runtime default execution context lookup failed: {error}"))
@@ -49,8 +49,7 @@ impl CdpConnection {
owner: &CommandOwnerScope,
) -> Result<Option<i64>, String> {
let page = self
- .runtime_session_owner_slot_mut_for_owner(owner)?
- .loaded_page_mut()
+ .loaded_page_mut_for_owner(owner)
.ok_or_else(|| "NoDocumentLoaded".to_owned())?;
page.default_or_initial_execution_context_id_async()
.await
@@ -66,7 +65,7 @@ impl CdpConnection {
let owner_target_id = self
.target_owner_identity_for_owner(owner)
.and_then(|(_, target_id)| target_id);
- let page = self.runtime_session_owner_page_mut_for_owner(owner)?;
+ let page = self.loaded_page_mut_for_protocol_access_for_owner(owner)?;
let result = if let Some(frame_id) = frame_id
&& owner_target_id.as_deref() != Some(frame_id)
{
@@ -91,7 +90,7 @@ impl CdpConnection {
session_id: Option<&str>,
execution_context_id: i64,
) -> Result<bool, String> {
- let page = self.runtime_session_owner_page_mut(session_id)?;
+ let page = self.loaded_page_mut_for_protocol_access(session_id)?;
page.has_isolated_execution_context_id_async(execution_context_id)
.await
.map_err(|error| format!("runtime isolated context lookup failed: {error}"))
@@ -102,7 +101,7 @@ impl CdpConnection {
session_id: Option<&str>,
execution_context_id: i64,
) -> Result<bool, String> {
- let page = self.runtime_session_owner_page_mut(session_id)?;
+ let page = self.loaded_page_mut_for_protocol_access(session_id)?;
page.child_frame_id_for_default_execution_context_id_async(execution_context_id)
.await
.map(|frame_id| frame_id.is_some())
@@ -124,7 +123,7 @@ impl CdpConnection {
owner: &CommandOwnerScope,
frame_id: &str,
) -> Result<Option<i64>, String> {
- let page = self.runtime_session_owner_page_mut_for_owner(owner)?;
+ let page = self.loaded_page_mut_for_protocol_access_for_owner(owner)?;
page.child_default_execution_context_id_for_frame_id_async(frame_id)
.await
.map_err(|error| format!("runtime child default context lookup failed: {error}"))
@@ -135,7 +134,7 @@ impl CdpConnection {
owner: &CommandOwnerScope,
execution_context_id: i64,
) -> Result<PendingRuntimeChildDefaultContextLookupDispatch, String> {
- let page = self.runtime_session_owner_page_mut_for_owner(owner)?;
+ let page = self.loaded_page_mut_for_protocol_access_for_owner(owner)?;
let pending = page
.start_child_frame_id_for_default_execution_context_id(execution_context_id)
.map_err(|error| format!("runtime child default context lookup failed: {error}"))?;
@@ -149,7 +148,7 @@ impl CdpConnection {
&mut self,
completed: CompletedRuntimeChildDefaultContextLookupDispatch,
) -> Result<bool, String> {
- let page = self.runtime_session_owner_page_mut_for_owner(&completed.owner)?;
+ let page = self.loaded_page_mut_for_protocol_access_for_owner(&completed.owner)?;
page.finish_child_frame_id_for_default_execution_context_id(completed.completion)
.map(|frame_id| frame_id.is_some())
.map_err(|error| format!("runtime child default context lookup failed: {error}"))
@@ -171,7 +170,7 @@ impl CdpConnection {
session_id: Option<&str>,
execution_context_id: i64,
) -> Result<Option<i64>, String> {
- let page = self.runtime_session_owner_page_mut(session_id)?;
+ let page = self.loaded_page_mut_for_protocol_access(session_id)?;
page.ensure_isolated_worlds_attached_to_inspector_async()
.await
.map_err(|error| {
@@ -198,7 +197,7 @@ impl CdpConnection {
session_id: Option<&str>,
execution_context_id: i64,
) -> Result<Option<i64>, String> {
- let page = self.runtime_session_owner_page_mut(session_id)?;
+ let page = self.loaded_page_mut_for_protocol_access(session_id)?;
page.ensure_isolated_worlds_attached_to_inspector_async()
.await
.map_err(|error| {
@@ -250,7 +249,7 @@ impl CdpConnection {
await_promise: bool,
) -> Result<Value, String> {
let payload = {
- let page = self.runtime_session_owner_page_mut(session_id)?;
+ let page = self.loaded_page_mut_for_protocol_access(session_id)?;
page.evaluate_runtime_expression_in_execution_context_without_navigation_follow_with_await_async(
execution_context_id,
expression,
@@ -285,7 +284,7 @@ impl CdpConnection {
execution_context_name: Option<&str>,
execution_context_id: Option<i64>,
) -> Result<(), String> {
- let page = self.runtime_session_owner_page_mut(session_id)?;
+ let page = self.loaded_page_mut_for_protocol_access(session_id)?;
page.install_runtime_binding_async(name, execution_context_name, execution_context_id)
.await
.map_err(|error| format!("runtime binding install failed: {error}"))
@@ -298,7 +297,7 @@ impl CdpConnection {
execution_context_name: Option<&str>,
execution_context_id: Option<i64>,
) -> Result<PendingRuntimeBindingPageCommandDispatch, String> {
- let page = self.runtime_session_owner_page_mut_for_owner(owner)?;
+ let page = self.loaded_page_mut_for_protocol_access_for_owner(owner)?;
let pending = page
.start_install_runtime_binding(name, execution_context_name, execution_context_id)
.map_err(|error| format!("runtime binding install failed: {error}"))?;
@@ -318,7 +317,7 @@ impl CdpConnection {
self.target_runtime_bindings_for_current_inspector_owner(owner);
let inspector_session_id =
self.target_renderer_runtime_inspector_session_id_for_owner(owner);
- let page = self.runtime_session_owner_page_mut_for_owner(owner)?;
+ let page = self.loaded_page_mut_for_protocol_access_for_owner(owner)?;
let pending = page
.start_set_runtime_binding_state(
inspector_session_id,
@@ -342,7 +341,7 @@ impl CdpConnection {
self.target_runtime_bindings_for_current_inspector_owner(owner);
let inspector_session_id =
self.target_renderer_runtime_inspector_session_id_for_owner(owner);
- let page = self.runtime_session_owner_page_mut_for_owner(owner)?;
+ let page = self.loaded_page_mut_for_protocol_access_for_owner(owner)?;
page.set_runtime_binding_state_async(
inspector_session_id,
&stored_runtime_bindings,
@@ -362,7 +361,7 @@ impl CdpConnection {
session_id: Option<&str>,
name: &str,
) -> Result<(), String> {
- let page = self.runtime_session_owner_page_mut(session_id)?;
+ let page = self.loaded_page_mut_for_protocol_access(session_id)?;
page.remove_runtime_binding_async(name)
.await
.map_err(|error| format!("runtime binding removal failed: {error}"))
@@ -373,7 +372,7 @@ impl CdpConnection {
owner: &CommandOwnerScope,
name: &str,
) -> Result<PendingRuntimeBindingPageCommandDispatch, String> {
- let page = self.runtime_session_owner_page_mut_for_owner(owner)?;
+ let page = self.loaded_page_mut_for_protocol_access_for_owner(owner)?;
let pending = page
.start_remove_runtime_binding(name)
.map_err(|error| format!("runtime binding removal failed: {error}"))?;
@@ -388,7 +387,7 @@ impl CdpConnection {
&mut self,
completed: CompletedRuntimeBindingPageCommandDispatch,
) -> Result<(), String> {
- let page = self.runtime_session_owner_page_mut_for_owner(&completed.owner)?;
+ let page = self.loaded_page_mut_for_protocol_access_for_owner(&completed.owner)?;
page.finish_unit_runtime_page_command(completed.completion, completed.operation)
.map_err(|error| format!("{} failed: {error}", completed.operation))
}
@@ -403,7 +402,7 @@ impl CdpConnection {
session_id: Option<&str>,
name: &str,
) -> Result<(), String> {
- let page = self.runtime_session_owner_page_mut(session_id)?;
+ let page = self.loaded_page_mut_for_protocol_access(session_id)?;
page.remove_default_runtime_binding_async(name)
.await
.map_err(|error| format!("runtime default binding removal failed: {error}"))
@@ -415,7 +414,7 @@ impl CdpConnection {
) -> Result<bool, String> {
let inspector_session_id =
self.target_renderer_runtime_inspector_session_id_for_session(session_id);
- let page = self.runtime_session_owner_page_mut(session_id)?;
+ let page = self.loaded_page_mut_for_protocol_access(session_id)?;
page.detach_runtime_inspector_session_async(inspector_session_id.as_deref())
.await
.map_err(|error| format!("runtime inspector session detach failed: {error}"))
diff --git a/moli-protocol/src/conn/runtime_eval/inspector_routing.rs b/moli-protocol/src/conn/runtime_eval/inspector_routing.rs
index 338645f66..a460bb7ba 100644
--- a/moli-protocol/src/conn/runtime_eval/inspector_routing.rs
+++ b/moli-protocol/src/conn/runtime_eval/inspector_routing.rs
@@ -799,7 +799,7 @@ impl CdpConnection {
let inspector_session_id =
self.target_renderer_runtime_inspector_session_id_for_owner(owner);
let pending = {
- let page = self.runtime_session_owner_page_mut_for_owner(owner)?;
+ let page = self.loaded_page_mut_for_protocol_access_for_owner(owner)?;
page.start_document_node_snapshot_for_object_id_in_inspector_session(
inspector_session_id,
include_whitespace,
@@ -813,7 +813,7 @@ impl CdpConnection {
.wait()
.await
.map_err(|error| format!("resolve runtime node snapshot failed: {error}"))?;
- let page = self.runtime_session_owner_page_mut_for_owner(owner)?;
+ let page = self.loaded_page_mut_for_protocol_access_for_owner(owner)?;
page.finish_document_node_snapshot_for_object_id(completion)
.map_err(|error| format!("resolve runtime node snapshot failed: {error}"))
}
@@ -826,7 +826,7 @@ impl CdpConnection {
pierce: bool,
) -> Result<Option<DocumentNodeObjectSnapshot>, String> {
let pending = {
- let page = self.runtime_session_owner_page_mut_for_owner(owner)?;
+ let page = self.loaded_page_mut_for_protocol_access_for_owner(owner)?;
page.start_document_node_snapshot_for_backend_node_id(backend_node_id, depth, pierce)
.map_err(|error| format!("resolve backend node snapshot failed: {error}"))?
};
@@ -834,7 +834,7 @@ impl CdpConnection {
.wait()
.await
.map_err(|error| format!("resolve backend node snapshot failed: {error}"))?;
- let page = self.runtime_session_owner_page_mut_for_owner(owner)?;
+ let page = self.loaded_page_mut_for_protocol_access_for_owner(owner)?;
page.finish_document_node_snapshot_for_backend_node_id(completion)
.map_err(|error| format!("resolve backend node snapshot failed: {error}"))
}
@@ -848,7 +848,7 @@ impl CdpConnection {
let inspector_session_id =
self.target_renderer_runtime_inspector_session_id_for_owner(owner);
let pending = {
- let page = self.runtime_session_owner_page_mut_for_owner(owner)?;
+ let page = self.loaded_page_mut_for_protocol_access_for_owner(owner)?;
page.start_register_document_bidi_node_binding(
inspector_session_id,
shared_id.to_owned(),
@@ -860,7 +860,7 @@ impl CdpConnection {
.wait()
.await
.map_err(|error| format!("register BiDi node binding failed: {error}"))?;
- let page = self.runtime_session_owner_page_mut_for_owner(owner)?;
+ let page = self.loaded_page_mut_for_protocol_access_for_owner(owner)?;
page.finish_register_document_bidi_node_binding(completion)
.map_err(|error| format!("register BiDi node binding failed: {error}"))
}
@@ -873,7 +873,7 @@ impl CdpConnection {
let inspector_session_id =
self.target_renderer_runtime_inspector_session_id_for_owner(owner);
let pending = {
- let page = self.runtime_session_owner_page_mut_for_owner(owner)?;
+ let page = self.loaded_page_mut_for_protocol_access_for_owner(owner)?;
page.start_document_bidi_node_binding(inspector_session_id, shared_id.to_owned())
.map_err(|error| format!("resolve BiDi node binding failed: {error}"))?
};
@@ -881,7 +881,7 @@ impl CdpConnection {
.wait()
.await
.map_err(|error| format!("resolve BiDi node binding failed: {error}"))?;
- let page = self.runtime_session_owner_page_mut_for_owner(owner)?;
+ let page = self.loaded_page_mut_for_protocol_access_for_owner(owner)?;
page.finish_document_bidi_node_binding(completion)
.map_err(|error| format!("resolve BiDi node binding failed: {error}"))
}
@@ -894,7 +894,7 @@ impl CdpConnection {
let inspector_session_id =
self.target_renderer_runtime_inspector_session_id_for_owner(owner);
let pending = {
- let page = self.runtime_session_owner_page_mut_for_owner(owner)?;
+ let page = self.loaded_page_mut_for_protocol_access_for_owner(owner)?;
page.start_document_bidi_node_shared_id_for_backend_node_id(
inspector_session_id,
backend_node_id,
@@ -905,7 +905,7 @@ impl CdpConnection {
.wait()
.await
.map_err(|error| format!("resolve BiDi node shared id failed: {error}"))?;
- let page = self.runtime_session_owner_page_mut_for_owner(owner)?;
+ let page = self.loaded_page_mut_for_protocol_access_for_owner(owner)?;
page.finish_document_bidi_node_shared_id_for_backend_node_id(completion)
.map_err(|error| format!("resolve BiDi node shared id failed: {error}"))
}
@@ -920,7 +920,7 @@ impl CdpConnection {
let inspector_session_id =
self.target_renderer_runtime_inspector_session_id_for_owner(owner);
let pending = {
- let page = self.runtime_session_owner_page_mut_for_owner(owner)?;
+ let page = self.loaded_page_mut_for_protocol_access_for_owner(owner)?;
page.start_resolve_runtime_object_for_backend_node_id_in_inspector_session(
inspector_session_id,
backend_node_id,
@@ -933,7 +933,7 @@ impl CdpConnection {
.wait()
.await
.map_err(|error| format!("resolve runtime object for backend node failed: {error}"))?;
- let page = self.runtime_session_owner_page_mut_for_owner(owner)?;
+ let page = self.loaded_page_mut_for_protocol_access_for_owner(owner)?;
let result = page
.finish_resolve_runtime_object_for_backend_node_id(completion)
.map_err(|error| format!("resolve runtime object for backend node failed: {error}"))?;
diff --git a/moli-protocol/src/conn/runtime_eval/protocol_dispatch.rs b/moli-protocol/src/conn/runtime_eval/protocol_dispatch.rs
index 4d9556614..9a82bc380 100644
--- a/moli-protocol/src/conn/runtime_eval/protocol_dispatch.rs
+++ b/moli-protocol/src/conn/runtime_eval/protocol_dispatch.rs
@@ -10,7 +10,7 @@ impl CdpConnection {
&mut self,
owner: &CommandOwnerScope,
) {
- if let Ok(slot) = self.runtime_session_owner_slot_mut_for_owner(owner) {
+ if let Some(slot) = self.runtime_session_owner_slot_mut_for_owner(owner) {
let _ = slot.ingest_owner_page_observable_output_updates();
}
}
@@ -66,7 +66,7 @@ impl CdpConnection {
let inspector_session_id =
self.target_renderer_runtime_inspector_session_id_for_session(session_id);
let messages = {
- let page = self.runtime_session_owner_page_mut(session_id)?;
+ let page = self.loaded_page_mut_for_protocol_access(session_id)?;
page.dispatch_runtime_protocol_message_for_inspector_session_async(
inspector_session_id,
raw_json,
@@ -172,17 +172,19 @@ impl CdpConnection {
raw_json: String,
inspector_route: RendererInspectorCommandRoute,
) -> Result<PendingRuntimeProtocolMessageDispatch, String> {
- let route = self.runtime_protocol_message_page_route_for_owner(owner)?;
+ let route = self
+ .runtime_protocol_message_page_route_for_owner(owner)
+ .ok_or_else(|| "NoDocumentLoaded".to_owned())?;
let raw_json = self.rewrite_runtime_inspector_command_for_owner(owner, &raw_json, None)?;
let inspector_session_id =
self.target_renderer_runtime_inspector_session_id_for_owner(owner);
let page = match inspector_route {
RendererInspectorCommandRoute::MainThread => {
- self.runtime_session_owner_page_mut_for_owner(owner)?
- }
- RendererInspectorCommandRoute::Io => {
- self.runtime_session_owner_page_mut_for_interruptible_control_for_owner(owner)?
+ self.loaded_page_mut_for_protocol_access_for_owner(owner)?
}
+ RendererInspectorCommandRoute::Io => self
+ .loaded_page_mut_for_owner(owner)
+ .ok_or_else(|| "NoDocumentLoaded".to_owned())?,
};
let pending = match inspector_route {
RendererInspectorCommandRoute::MainThread => page
@@ -239,7 +241,9 @@ impl CdpConnection {
command_id: u64,
inspector_route: RendererInspectorCommandRoute,
) -> Result<PendingRuntimeProtocolMessageDispatch, String> {
- let route = self.runtime_protocol_message_page_route_for_owner(owner)?;
+ let route = self
+ .runtime_protocol_message_page_route_for_owner(owner)
+ .ok_or_else(|| "NoDocumentLoaded".to_owned())?;
let (correlation, raw_json, response_sender, response_route) = self
.prepare_renderer_call_for_owner(
owner,
@@ -251,11 +255,11 @@ impl CdpConnection {
self.target_renderer_runtime_inspector_session_id_for_owner(owner);
let page_result = match inspector_route {
RendererInspectorCommandRoute::MainThread => {
- self.runtime_session_owner_page_mut_for_owner(owner)
- }
- RendererInspectorCommandRoute::Io => {
- self.runtime_session_owner_page_mut_for_interruptible_control_for_owner(owner)
+ self.loaded_page_mut_for_protocol_access_for_owner(owner)
}
+ RendererInspectorCommandRoute::Io => self
+ .loaded_page_mut_for_owner(owner)
+ .ok_or_else(|| "NoDocumentLoaded".to_owned()),
};
let page = match page_result {
Ok(page) => page,
@@ -293,11 +297,13 @@ impl CdpConnection {
action: &str,
raw_json: String,
) -> Result<PendingRuntimeProtocolMessageDispatch, String> {
- let route = self.runtime_protocol_message_page_route_for_owner(owner)?;
+ let route = self
+ .runtime_protocol_message_page_route_for_owner(owner)
+ .ok_or_else(|| "NoDocumentLoaded".to_owned())?;
let raw_json = self.rewrite_runtime_inspector_command_for_owner(owner, &raw_json, None)?;
let inspector_session_id =
self.target_renderer_runtime_inspector_session_id_for_owner(owner);
- let page = self.runtime_session_owner_page_mut_for_owner(owner)?;
+ let page = self.loaded_page_mut_for_protocol_access_for_owner(owner)?;
let pending = page
.start_runtime_protocol_message_for_inspector_session_with_context_resolution(
inspector_session_id,
@@ -320,7 +326,9 @@ impl CdpConnection {
descriptor: RendererCommandDescriptor,
command_id: u64,
) -> Result<PendingRuntimeProtocolMessageDispatch, String> {
- let route = self.runtime_protocol_message_page_route_for_owner(owner)?;
+ let route = self
+ .runtime_protocol_message_page_route_for_owner(owner)
+ .ok_or_else(|| "NoDocumentLoaded".to_owned())?;
let (correlation, raw_json, response_sender, response_route) = self
.prepare_renderer_call_for_owner(
owner,
@@ -330,7 +338,7 @@ impl CdpConnection {
)?;
let inspector_session_id =
self.target_renderer_runtime_inspector_session_id_for_owner(owner);
- let page = match self.runtime_session_owner_page_mut_for_owner(owner) {
+ let page = match self.loaded_page_mut_for_protocol_access_for_owner(owner) {
Ok(page) => page,
Err(error) => {
let removed = self.take_renderer_call_for_frontend_for_owner(owner, command_id);
@@ -441,18 +449,16 @@ impl CdpConnection {
replay.renderer_inspector_session_id().map(str::to_owned);
let (correlation, replay, response_delivery, frontend_payload, response_sender) =
replay.into_replay().into_parts();
- let route = match self.runtime_protocol_message_page_route_for_session_owner(
- frontend_session_id.as_deref(),
- ) {
- Ok(route) => route,
- Err(error) => {
+ let route = match self.runtime_protocol_message_page_route_for_owner(&owner) {
+ Some(route) => route,
+ None => {
self.settle_renderer_replacement_error(
&mut events,
frontend_session_id.as_deref(),
response_delivery,
&response_sender,
correlation,
- &error,
+ "NoDocumentLoaded",
);
continue;
}
@@ -476,8 +482,7 @@ impl CdpConnection {
RendererInspectorResponseDelivery::SessionSink
);
let pending = self
- .runtime_session_owner_page_mut(frontend_session_id.as_deref())
- .map_err(|error| error.to_string())
+ .loaded_page_mut_for_protocol_access(frontend_session_id.as_deref())
.and_then(|page| {
let result = crate::domains::performance::performance_metrics_result(
&page.cached_performance_metric_snapshot(),
@@ -519,8 +524,7 @@ impl CdpConnection {
RendererInspectorResponseDelivery::SessionSink
);
let pending = self
- .runtime_session_owner_page_mut(frontend_session_id.as_deref())
- .map_err(|error| error.to_string())
+ .loaded_page_mut_for_protocol_access(frontend_session_id.as_deref())
.and_then(|page| {
page.start_set_script_execution_disabled_from_io_with_response(
renderer_inspector_session_id.clone(),
@@ -576,7 +580,8 @@ impl CdpConnection {
}
};
let pending = {
- let page = match self.runtime_session_owner_page_mut(frontend_session_id.as_deref())
+ let page = match self
+ .loaded_page_mut_for_protocol_access(frontend_session_id.as_deref())
{
Ok(page) => page,
Err(error) => {
diff --git a/moli-protocol/src/conn/runtime_eval/runtime_dispatch.rs b/moli-protocol/src/conn/runtime_eval/runtime_dispatch.rs
index 82c864c07..9a38cc5c5 100644
--- a/moli-protocol/src/conn/runtime_eval/runtime_dispatch.rs
+++ b/moli-protocol/src/conn/runtime_eval/runtime_dispatch.rs
@@ -47,7 +47,7 @@ impl CdpConnection {
await_promise: bool,
) -> Result<Value, String> {
let payload = {
- let page = self.runtime_session_owner_page_mut(session_id)?;
+ let page = self.loaded_page_mut_for_protocol_access(session_id)?;
page.evaluate_runtime_expression_without_navigation_follow_with_await_async(
expression,
await_promise,
@@ -72,10 +72,12 @@ impl CdpConnection {
&mut self,
owner: &CommandOwnerScope,
) -> Result<PendingRuntimeEnableEventsDispatch, String> {
- let route = self.runtime_protocol_message_page_route_for_owner(owner)?;
+ let route = self
+ .runtime_protocol_message_page_route_for_owner(owner)
+ .ok_or_else(|| "NoDocumentLoaded".to_owned())?;
let inspector_session_id =
self.target_renderer_runtime_inspector_session_id_for_owner(owner);
- let page = self.runtime_session_owner_page_mut_for_owner(owner)?;
+ let page = self.loaded_page_mut_for_protocol_access_for_owner(owner)?;
let pending = page
.start_runtime_enable_events_for_inspector_session(inspector_session_id.as_deref())
.map_err(|error| format!("runtime enable event replay failed: {error}"))?;
@@ -142,59 +144,14 @@ impl CdpConnection {
Ok(replay)
}
- pub(super) fn runtime_session_owner_page_mut(
- &mut self,
- session_id: Option<&str>,
- ) -> Result<&mut Page, String> {
- self.loaded_page_mut_for_protocol_access(session_id)
- }
-
- pub(super) fn runtime_session_owner_page_mut_for_owner(
- &mut self,
- owner: &CommandOwnerScope,
- ) -> Result<&mut Page, String> {
- self.loaded_page_mut_for_protocol_access_for_owner(owner)
- }
-
- pub(super) fn runtime_session_owner_page_mut_for_interruptible_control_for_owner(
- &mut self,
- owner: &CommandOwnerScope,
- ) -> Result<&mut Page, String> {
- self.loaded_page_mut_for_interruptible_protocol_access_for_owner(owner)
- }
-
- pub(super) fn runtime_protocol_message_page_route_for_session_owner(
- &self,
- session_id: Option<&str>,
- ) -> Result<RuntimeProtocolMessagePageRoute, String> {
- let (browser_context_id, target_id) = self
- .target_owner_identity_for_session(session_id)
- .ok_or_else(|| "NoDocumentLoaded".to_owned())?;
- let slot = self.runtime_session_owner_slot(session_id)?;
- let renderer_agent_attachment_id = slot
- .current_renderer_attachment()
- .ok_or_else(|| "NoDocumentLoaded".to_owned())?
- .id();
- Ok(RuntimeProtocolMessagePageRoute {
- browser_context_id,
- target_id,
- renderer_agent_attachment_id,
- })
- }
-
pub(super) fn runtime_protocol_message_page_route_for_owner(
&self,
owner: &CommandOwnerScope,
- ) -> Result<RuntimeProtocolMessagePageRoute, String> {
- let (browser_context_id, target_id) = self
- .target_owner_identity_for_owner(owner)
- .ok_or_else(|| "NoDocumentLoaded".to_owned())?;
+ ) -> Option<RuntimeProtocolMessagePageRoute> {
+ let (browser_context_id, target_id) = self.target_owner_identity_for_owner(owner)?;
let slot = self.runtime_session_owner_slot_for_owner(owner)?;
- let renderer_agent_attachment_id = slot
- .current_renderer_attachment()
- .ok_or_else(|| "NoDocumentLoaded".to_owned())?
- .id();
- Ok(RuntimeProtocolMessagePageRoute {
+ let renderer_agent_attachment_id = slot.current_renderer_attachment()?.id();
+ Some(RuntimeProtocolMessagePageRoute {
browser_context_id,
target_id,
renderer_agent_attachment_id,
diff --git a/moli-protocol/src/conn/runtime_load.rs b/moli-protocol/src/conn/runtime_load.rs
index 0545b00b9..0de1687c9 100644
--- a/moli-protocol/src/conn/runtime_load.rs
+++ b/moli-protocol/src/conn/runtime_load.rs
@@ -1635,8 +1635,10 @@ impl CdpConnection {
}
let slot = self
.runtime_session_owner_slot_mut_for_owner(owner)
- .map_err(|error| {
- RendererPageReplacementError::document_preserved(anyhow::anyhow!(error))
+ .ok_or_else(|| {
+ RendererPageReplacementError::document_preserved(anyhow::anyhow!(
+ "NoDocumentLoaded"
+ ))
})?;
let page = slot.loaded_page_mut().ok_or_else(|| {
RendererPageReplacementError::document_preserved(anyhow::anyhow!(
@@ -1706,7 +1708,6 @@ impl CdpConnection {
let mut inputs = self.navigation_request_load_inputs(navigation);
inputs.document_replacement = self
.runtime_session_owner_slot_for_owner(&navigation.owner)
- .ok()
.and_then(|slot| {
let page_slot = slot.page_slot();
let cancellation = page_slot.document_navigation_cancellation_handle(token)?;
@@ -1808,8 +1809,7 @@ impl CdpConnection {
// navigation can retain that frame-host state; a cross-site renderer
// replacement must start with the actual idle state.
let page = self
- .runtime_session_owner_slot_for_owner(owner)
- .ok()?
+ .runtime_session_owner_slot_for_owner(owner)?
.loaded_page()?;
moli_site::same_site_urls(page.final_url(), final_url, true)
.then(|| page.idle_override())
@@ -1820,9 +1820,8 @@ impl CdpConnection {
&mut self,
owner: &CommandOwnerScope,
) -> Result<Option<PendingInitialDocumentPageBuild>, String> {
- let runtime_slot = match self.runtime_session_owner_slot_for_owner(owner) {
- Ok(slot) => slot,
- Err(_) => return Ok(None),
+ let Some(runtime_slot) = self.runtime_session_owner_slot_for_owner(owner) else {
+ return Ok(None);
};
if runtime_slot.has_loaded_page() {
return Ok(None);
@@ -1944,9 +1943,8 @@ impl CdpConnection {
&mut self,
owner: &CommandOwnerScope,
) -> Result<Option<PendingInitialDocumentPageBuild>, String> {
- let runtime_slot = match self.runtime_session_owner_slot_for_owner(owner) {
- Ok(slot) => slot,
- Err(_) => return Ok(None),
+ let Some(runtime_slot) = self.runtime_session_owner_slot_for_owner(owner) else {
+ return Ok(None);
};
if runtime_slot.has_loaded_page() {
return Ok(None);
@@ -1973,10 +1971,12 @@ impl CdpConnection {
let page_storage = load_inputs.page_storage_handles();
let top_level_storage_key =
self.runtime_session_owner_initial_empty_document_storage_key_for_owner(owner);
- self.runtime_session_owner_slot_mut_for_owner(owner)?
+ self.runtime_session_owner_slot_mut_for_owner(owner)
+ .ok_or_else(|| "NoDocumentLoaded".to_owned())?
.start_initial_document_page_build();
let pending_auxiliary_page = self
- .runtime_session_owner_slot_mut_for_owner(owner)?
+ .runtime_session_owner_slot_mut_for_owner(owner)
+ .ok_or_else(|| "NoDocumentLoaded".to_owned())?
.take_auxiliary_page();
let page_reservation = pending_auxiliary_page
.as_ref()
@@ -1987,7 +1987,8 @@ impl CdpConnection {
page_reservation.page_id(),
);
if !self
- .runtime_session_owner_slot_mut_for_owner(owner)?
+ .runtime_session_owner_slot_mut_for_owner(owner)
+ .ok_or_else(|| "NoDocumentLoaded".to_owned())?
.bind_initial_document_page_build_renderer_page(renderer_page)
{
let message =
diff --git a/moli-protocol/src/domains/activity/output_ingress/renderer.rs b/moli-protocol/src/domains/activity/output_ingress/renderer.rs
index a89f4ac11..ece25d79b 100644
--- a/moli-protocol/src/domains/activity/output_ingress/renderer.rs
+++ b/moli-protocol/src/domains/activity/output_ingress/renderer.rs
@@ -229,7 +229,7 @@ async fn project_renderer_output_records_for_owner(
event.kind,
moli_core::page::RendererDocumentLifecycleEventKind::Started { .. }
)
- && let Ok(slot) = conn.runtime_session_owner_slot_mut_for_owner(owner)
+ && let Some(slot) = conn.runtime_session_owner_slot_mut_for_owner(owner)
{
slot.observe_renderer_output_document_start(event.document);
}
@@ -271,7 +271,7 @@ async fn project_renderer_output_records_for_owner(
}
}
}
- if let Ok(slot) = conn.runtime_session_owner_slot_mut_for_owner(owner) {
+ if let Some(slot) = conn.runtime_session_owner_slot_mut_for_owner(owner) {
// Do not release predecessor correlations halfway through a batch:
// prepared Network deliveries from that batch still need projection.
slot.finish_retiring_document_output_projection();
diff --git a/moli-protocol/src/domains/activity/subresource.rs b/moli-protocol/src/domains/activity/subresource.rs
index 1fcf9e4dc..2a2b75b8d 100644
--- a/moli-protocol/src/domains/activity/subresource.rs
+++ b/moli-protocol/src/domains/activity/subresource.rs
@@ -252,7 +252,7 @@ async fn flush_prepared_subresource_continue_action_background_events_async(
);
let mut remaining_sessions = Vec::new();
for session in response_stage_sessions.into_iter().skip(1) {
- let Ok((next_request_id, _)) = conn
+ let Some((next_request_id, _)) = conn
.allocate_pending_subresource_fetch_request_ids_for_owner(command_owner)
else {
return;
@@ -367,7 +367,7 @@ async fn flush_prepared_subresource_continue_action_background_events_async(
);
let mut remaining_sessions = Vec::new();
for session in auth_sessions.into_iter().skip(1) {
- let Ok((next_request_id, _)) = conn
+ let Some((next_request_id, _)) = conn
.allocate_pending_subresource_fetch_request_ids_for_owner(command_owner)
else {
return;
@@ -651,7 +651,7 @@ fn clear_fetch_pause_network_announcement(
owner: &CommandOwnerScope,
request_id: &str,
) {
- if let Ok(runtime_slot) = conn.runtime_session_owner_slot_mut_for_owner(owner) {
+ if let Some(runtime_slot) = conn.runtime_session_owner_slot_mut_for_owner(owner) {
runtime_slot.clear_fetch_pause_announced_request_id(request_id);
}
}
@@ -665,7 +665,7 @@ fn record_subresource_network_request_handle(
let Some(request_handle) = request_handle else {
return;
};
- if let Ok(runtime_slot) = conn.runtime_session_owner_slot_mut_for_owner(owner) {
+ if let Some(runtime_slot) = conn.runtime_session_owner_slot_mut_for_owner(owner) {
runtime_slot.record_subresource_request_id_for_handle_if_absent(
request_handle,
request_id.to_owned(),
diff --git a/moli-protocol/src/domains/console.rs b/moli-protocol/src/domains/console.rs
index 2d91def0b..9ac592a07 100644
--- a/moli-protocol/src/domains/console.rs
+++ b/moli-protocol/src/domains/console.rs
@@ -39,7 +39,7 @@ fn console_command_has_renderer_agent(conn: &CdpConnection, cmd: &Cmd<'_>) -> bo
return true;
}
conn.runtime_session_owner_slot(cmd.session_id)
- .is_ok_and(|slot| slot.has_loaded_page())
+ .is_some_and(|slot| slot.has_loaded_page())
}
pub(crate) fn apply_console_output_state_for_session(
diff --git a/moli-protocol/src/domains/dom/activity.rs b/moli-protocol/src/domains/dom/activity.rs
index cb51a6344..eb77571f5 100644
--- a/moli-protocol/src/domains/dom/activity.rs
+++ b/moli-protocol/src/domains/dom/activity.rs
@@ -71,7 +71,6 @@ impl DomPreparedOutputs {
) -> Self {
let current_attachment = conn
.runtime_session_owner_slot_for_owner(source_owner)
- .ok()
.and_then(|slot| slot.current_renderer_attachment());
Self {
batches: batches
diff --git a/moli-protocol/src/domains/emulation.rs b/moli-protocol/src/domains/emulation.rs
index 0a8d349db..2ee0e59cc 100644
--- a/moli-protocol/src/domains/emulation.rs
+++ b/moli-protocol/src/domains/emulation.rs
@@ -438,7 +438,7 @@ fn start_navigator_override_page_command(
) {
return step;
}
- let Some(page) = loaded_page_mut_for_target_configuration(conn, cmd.session_id) else {
+ let Some(page) = conn.loaded_page_mut_for_session_owner(cmd.session_id) else {
return EmulationCommandTaskStep::Complete(CommandOutputPlan::result(json!({})));
};
let pending = match page.start_set_navigator_overrides(&overrides) {
@@ -518,7 +518,8 @@ fn start_script_execution_disabled_command(
"BrowserContextNotLoaded",
));
}
- let Some(attachment_id) = loaded_page_mut_for_target_configuration(conn, cmd.session_id)
+ let Some(attachment_id) = conn
+ .loaded_page_mut_for_session_owner(cmd.session_id)
.and_then(|page| page.renderer_agent_attachment_id())
else {
return EmulationCommandTaskStep::Complete(CommandOutputPlan::result(json!({})));
@@ -529,7 +530,8 @@ fn start_script_execution_disabled_command(
if cmd.id.is_none()
|| response_delivery == moli_page_types::RendererInspectorResponseDelivery::AdapterReply
{
- let page = loaded_page_mut_for_target_configuration(conn, cmd.session_id)
+ let page = conn
+ .loaded_page_mut_for_session_owner(cmd.session_id)
.expect("the captured Emulation Page must remain loaded synchronously");
let pending = page.start_set_script_execution_disabled_from_io(params.value);
return EmulationCommandTaskStep::Pending(PendingEmulationCommandDispatch {
@@ -563,7 +565,8 @@ fn start_script_execution_disabled_command(
response_rx.is_none(),
"Emulation session output must not allocate an adapter-reply receiver",
);
- let pending = loaded_page_mut_for_target_configuration(conn, cmd.session_id)
+ let pending = conn
+ .loaded_page_mut_for_session_owner(cmd.session_id)
.filter(|page| page.renderer_agent_attachment_id() == Some(attachment_id))
.ok_or_else(|| "Emulation renderer attachment changed before IO dispatch".to_owned())
.and_then(|page| {
@@ -687,7 +690,7 @@ fn start_update_idle_override_command(
return step;
}
- let Some(page) = loaded_page_mut_for_target_configuration(conn, cmd.session_id) else {
+ let Some(page) = conn.loaded_page_mut_for_session_owner(cmd.session_id) else {
return EmulationCommandTaskStep::Complete(CommandOutputPlan::result(json!({})));
};
match page.start_set_idle_override(idle_override) {
@@ -887,7 +890,7 @@ fn start_scrollbars_hidden_command(
return step;
}
let owner_scope = CommandOwnerScope::capture(conn, cmd.session_id);
- let Some(page) = loaded_page_mut_for_target_configuration(conn, cmd.session_id) else {
+ let Some(page) = conn.loaded_page_mut_for_session_owner(cmd.session_id) else {
return EmulationCommandTaskStep::Complete(CommandOutputPlan::success());
};
match page.start_set_scrollbars_hidden(params.hidden) {
@@ -954,7 +957,7 @@ fn start_emulated_media_command(
}
} else {
let owner_scope = CommandOwnerScope::capture(conn, cmd.session_id);
- let Some(page) = loaded_page_mut_for_target_configuration(conn, cmd.session_id) else {
+ let Some(page) = conn.loaded_page_mut_for_session_owner(cmd.session_id) else {
return EmulationCommandTaskStep::Complete(CommandOutputPlan::result(json!({})));
};
match page.start_set_emulated_media(&page_overrides) {
@@ -1127,7 +1130,7 @@ fn start_clear_device_metrics_override_command(
return step;
}
- let Some(page) = loaded_page_mut_for_target_configuration(conn, cmd.session_id) else {
+ let Some(page) = conn.loaded_page_mut_for_session_owner(cmd.session_id) else {
return EmulationCommandTaskStep::Complete(CommandOutputPlan::result(json!({})));
};
let pending_viewport = match page.start_set_viewport_surface(viewport_surface) {
@@ -1188,10 +1191,7 @@ fn start_apply_device_metrics(
owner_scope: CommandOwnerScope,
) -> Result<Option<PendingEmulationCommandDispatch>, DevToolsError> {
record_device_metrics(conn, &owner_scope, &metrics)?;
- let Some(page) = conn
- .loaded_page_mut_for_target_configuration_for_owner(&owner_scope)
- .ok()
- else {
+ let Some(page) = conn.loaded_page_mut_for_owner(&owner_scope) else {
return Ok(None);
};
let viewport_surface = Some(metrics.viewport_surface());
@@ -1701,8 +1701,7 @@ fn loaded_page_mut_for_pending_emulation_target<'a>(
.and_then(|target| target.loaded_page_mut())
.map(|page| &*page),
PendingEmulationPageTarget::SessionOwner { owner_scope } => conn
- .loaded_page_mut_for_target_configuration_for_owner(owner_scope)
- .ok()
+ .loaded_page_mut_for_owner(owner_scope)
.map(|page| &*page),
}
}
@@ -1889,10 +1888,7 @@ fn start_user_agent_loader_update_for_current_route(
let resource_runtime = conn
.build_registered_browser_resource_runtime_for_navigation_load_inputs(&load_inputs)
.map_err(|error| DevToolsError::new(DevToolsErrorKind::Internal, error))?;
- let Some(page) = conn
- .loaded_page_mut_for_target_configuration_for_owner(&owner)
- .ok()
- else {
+ let Some(page) = conn.loaded_page_mut_for_owner(&owner) else {
return Ok(None);
};
let pending = page
@@ -2622,14 +2618,6 @@ fn pending_emulation_page_configuration_will_be_replayed(
current_attachment_id != Some(dispatched_attachment_id)
}
-fn loaded_page_mut_for_target_configuration<'a>(
- conn: &'a mut CdpConnection,
- session_id: Option<&str>,
-) -> Option<&'a mut moli_core::page::Page> {
- conn.loaded_page_mut_for_target_configuration(session_id)
- .ok()
-}
-
pub(crate) async fn dispose_page_session_async(
conn: &mut CdpConnection,
session_id: &str,
@@ -2644,7 +2632,7 @@ pub(crate) async fn dispose_page_session_async(
};
let owner = CommandOwnerScope::capture(conn, Some(session_id));
let load_inputs = conn.navigation_load_inputs_for_owner(&owner);
- if let Some(page) = loaded_page_mut_for_target_configuration(conn, Some(session_id)) {
+ if let Some(page) = conn.loaded_page_mut_for_session_owner(Some(session_id)) {
if delta.script_execution_disabled {
record_emulation_disposal_result(
&mut first_error,
@@ -2867,10 +2855,7 @@ fn start_session_surface_override_page_command_for_owner(
)
}
};
- let Some(page) = conn
- .loaded_page_mut_for_target_configuration_for_owner(owner_scope)
- .ok()
- else {
+ let Some(page) = conn.loaded_page_mut_for_owner(owner_scope) else {
return Ok(Vec::new());
};
start_surface_override_page_command(
@@ -2910,10 +2895,7 @@ fn start_surface_override_for_route(
}
};
let owner = CommandOwnerScope::for_route(route.clone());
- let Some(page) = conn
- .loaded_page_mut_for_target_configuration_for_owner(&owner)
- .ok()
- else {
+ let Some(page) = conn.loaded_page_mut_for_owner(&owner) else {
return Ok(Vec::new());
};
start_surface_override_page_command(target, page, navigator_overrides, document_activity)
@@ -2947,9 +2929,7 @@ fn finish_pending_emulation_page_command(
if matches!(operation, PendingEmulationPageOperation::SetUserAgentLoader) {
return conn.finish_rebuild_resource_runtime_for_owner(&owner_scope, completion);
}
- let page = conn
- .loaded_page_mut_for_target_configuration_for_owner(&owner_scope)
- .ok();
+ let page = conn.loaded_page_mut_for_owner(&owner_scope);
finish_emulation_page_operation_on_current_attachment(page, operation, completion)
}
PendingEmulationPageTarget::BrowserContextTarget {
diff --git a/moli-protocol/src/domains/fetch.rs b/moli-protocol/src/domains/fetch.rs
index 0f1003a27..580b81786 100644
--- a/moli-protocol/src/domains/fetch.rs
+++ b/moli-protocol/src/domains/fetch.rs
@@ -884,12 +884,8 @@ fn complete_fetch_config_update_command(
};
// Fetch policy belongs to the target and may finish updating while a
// navigation is replacing its document.
- let page = match conn.loaded_page_mut_for_target_configuration_for_owner(&owner_scope) {
- Ok(page) => page,
- Err(message) if message == "NoDocumentLoaded" => {
- return CommandOutputPlan::from_devtools_result(result);
- }
- Err(message) => return CommandOutputPlan::error(-32000, message),
+ let Some(page) = conn.loaded_page_mut_for_owner(&owner_scope) else {
+ return CommandOutputPlan::from_devtools_result(result);
};
match page.finish_set_fetch_subresource_interception(completion) {
Ok(()) => CommandOutputPlan::from_devtools_result(result),
diff --git a/moli-protocol/src/domains/fetch/navigation.rs b/moli-protocol/src/domains/fetch/navigation.rs
index d7c18ce08..dfe0771e4 100644
--- a/moli-protocol/src/domains/fetch/navigation.rs
+++ b/moli-protocol/src/domains/fetch/navigation.rs
@@ -887,7 +887,7 @@ fn register_navigation_auth_required_event(
);
let mut remaining_sessions = Vec::new();
for session in auth_sessions.into_iter().skip(1) {
- let Ok(next_request_id) =
+ let Some(next_request_id) =
conn.allocate_fetch_navigation_request_id_for_owner(&pending.navigation.owner)
else {
break;
diff --git a/moli-protocol/src/domains/fetch/subresource.rs b/moli-protocol/src/domains/fetch/subresource.rs
index 632ee9624..c2c78b59e 100644
--- a/moli-protocol/src/domains/fetch/subresource.rs
+++ b/moli-protocol/src/domains/fetch/subresource.rs
@@ -134,7 +134,7 @@ async fn prepare_subresource_fetch_pause_sources_async(
info,
detached_parser_script_fetch_continuation,
} = source;
- let Ok((request_id, network_request_id)) =
+ let Some((request_id, network_request_id)) =
conn.allocate_pending_subresource_fetch_request_ids_for_owner(owner)
else {
return outputs;
@@ -298,7 +298,7 @@ async fn prepare_subresource_fetch_pause_sources_async(
);
let mut remaining_sessions = Vec::new();
for session in request_stage_pause_sessions.into_iter().skip(1) {
- let Ok((next_request_id, _)) =
+ let Some((next_request_id, _)) =
conn.allocate_pending_subresource_fetch_request_ids_for_owner(owner)
else {
return outputs;
@@ -396,7 +396,7 @@ pub(crate) fn emit_subresource_fetch_pause_outputs(
) {
return;
}
- if let Ok(runtime_slot) = conn.runtime_session_owner_slot_mut_for_owner(&pending_owner) {
+ if let Some(runtime_slot) = conn.runtime_session_owner_slot_mut_for_owner(&pending_owner) {
// Chromium publishes Network.requestWillBeSent before the Fetch pause.
// The renderer's later transport start belongs to the same lifecycle
// and must not publish a second initial Network event.
diff --git a/moli-protocol/src/domains/input.rs b/moli-protocol/src/domains/input.rs
index f1a5c3714..b4d739585 100644
--- a/moli-protocol/src/domains/input.rs
+++ b/moli-protocol/src/domains/input.rs
@@ -1059,11 +1059,11 @@ fn start_page_input_command_with_access(
None
};
let page = if targets_outgoing_document {
- conn.loaded_page_mut_for_interruptible_protocol_access_for_owner(command_owner)
+ conn.loaded_page_mut_for_owner(command_owner)
} else {
conn.loaded_page_mut_for_protocol_access_for_owner(command_owner)
+ .ok()
}
- .ok()
.ok_or_else(PendingInputCommandStartError::no_document_loaded)?;
let pending = start(page).map_err(PendingInputCommandStartError::renderer_error)?;
Ok(Some(PendingInputCommandDispatch {
diff --git a/moli-protocol/src/domains/io.rs b/moli-protocol/src/domains/io.rs
index ef1c45489..0f25b280f 100644
--- a/moli-protocol/src/domains/io.rs
+++ b/moli-protocol/src/domains/io.rs
@@ -267,7 +267,7 @@ fn complete_read_blob_command(
let Some(bytes) = bytes else {
return CommandOutputPlan::error(-32000, "Read failed");
};
- let Ok(slot) = conn.runtime_session_owner_slot_mut(session_id) else {
+ let Some(slot) = conn.runtime_session_owner_slot_mut(session_id) else {
return CommandOutputPlan::error(-32000, "Read failed");
};
slot.insert_io_stream_body_source(handle.clone(), CapturedBody::from_shared_bytes(bytes), 0);
diff --git a/moli-protocol/src/domains/log.rs b/moli-protocol/src/domains/log.rs
index b1d8c48b0..54c0ba998 100644
--- a/moli-protocol/src/domains/log.rs
+++ b/moli-protocol/src/domains/log.rs
@@ -208,7 +208,6 @@ mod tests {
fn loaded_lifecycle_error_contains(ctx: &TestContext, needle: &str) -> bool {
ctx.conn
.runtime_session_owner_slot(Some("SID-1"))
- .ok()
.and_then(|slot| slot.observable_output_latest_source_tail())
.is_some_and(|source| {
source.observable_output_items().iter().any(|item| {
diff --git a/moli-protocol/src/domains/native.rs b/moli-protocol/src/domains/native.rs
index 6ff04bc07..1e964202f 100644
--- a/moli-protocol/src/domains/native.rs
+++ b/moli-protocol/src/domains/native.rs
@@ -217,7 +217,7 @@ pub(crate) fn project_terminal_for_owner(
});
let owner = owner.filter(|owner| {
conn.runtime_session_owner_slot_for_owner(owner)
- .is_ok_and(|slot| {
+ .is_some_and(|slot| {
slot.has_loaded_page()
&& slot
.current_renderer_attachment()
diff --git a/moli-protocol/src/domains/network.rs b/moli-protocol/src/domains/network.rs
index edc239515..1f32a5aea 100644
--- a/moli-protocol/src/domains/network.rs
+++ b/moli-protocol/src/domains/network.rs
@@ -739,8 +739,7 @@ fn complete_network_policy_refresh(
}
};
if let Err(error) = finish_network_page_operation_on_current_attachment(
- conn.loaded_page_mut_for_target_configuration_for_owner(&owner_scope)
- .ok(),
+ conn.loaded_page_mut_for_owner(&owner_scope),
NetworkPageCommandFinish::RequestPolicy,
completion,
) {
@@ -778,8 +777,7 @@ fn complete_unit_page_network_command(
}
};
match finish_network_page_operation_on_current_attachment(
- conn.loaded_page_mut_for_target_configuration_for_owner(&owner_scope)
- .ok(),
+ conn.loaded_page_mut_for_owner(&owner_scope),
finish,
completion,
) {
@@ -865,8 +863,7 @@ fn network_page_configuration_will_be_replayed(
};
let owner_still_exists = conn.target_owner_identity_for_owner(owner_scope).is_some();
let current_attachment = conn
- .loaded_page_mut_for_target_configuration_for_owner(owner_scope)
- .ok()
+ .loaded_page_mut_for_owner(owner_scope)
.and_then(|page| page.renderer_agent_attachment_id());
owner_still_exists && current_attachment != Some(dispatched_attachment)
}
diff --git a/moli-protocol/src/domains/network/backlog.rs b/moli-protocol/src/domains/network/backlog.rs
index 82c35001e..56803baa4 100644
--- a/moli-protocol/src/domains/network/backlog.rs
+++ b/moli-protocol/src/domains/network/backlog.rs
@@ -219,7 +219,7 @@ fn emit_complete_subresource_network_delivery_record(
let record_document_url = output.document_url();
let timestamp = base_timestamp + ((output.index() + 1) as f64 * 0.000_001);
let resource_type = output.resource_type().into();
- let Ok(runtime_slot) = conn.runtime_session_owner_slot_mut_for_owner(owner) else {
+ let Some(runtime_slot) = conn.runtime_session_owner_slot_mut_for_owner(owner) else {
return false;
};
let request_was_announced_by_fetch_pause =
@@ -422,7 +422,7 @@ fn emit_staged_subresource_request_started(
let resource_type = output.resource_type().into();
let request_was_announced_by_fetch_pause = conn
.runtime_session_owner_slot_mut_for_owner(owner)
- .is_ok_and(|runtime_slot| runtime_slot.take_fetch_pause_announced_request_id(request_id));
+ .is_some_and(|runtime_slot| runtime_slot.take_fetch_pause_announced_request_id(request_id));
if output.resource_type() != moli_core::page::SubresourceResourceType::WebSocket {
record_subresource_pending_response_body(conn, owner, request_id, event_session_ids);
record_subresource_request_body(
@@ -747,8 +747,7 @@ pub(crate) fn emit_prepared_renderer_network_live_background_events(
let Some((frame_id, snapshot)) = (|| {
let frame_id = conn.target_owner_identity_for_owner(owner)?.1?;
let snapshot = conn
- .runtime_session_owner_slot_mut_for_owner(owner)
- .ok()?
+ .runtime_session_owner_slot_mut_for_owner(owner)?
.pending_network_backlog_delivery_snapshot_from_backlog(prepared)?;
Some((frame_id, snapshot))
})() else {
@@ -806,7 +805,7 @@ fn pending_network_backlog_delivery_snapshot(
prepared_network_outputs: Option<&mut NetworkPreparedOutputs>,
) -> Option<PendingNetworkBacklogDeliverySnapshot> {
if let Some(prepared_network_outputs) = prepared_network_outputs {
- let runtime_slot = conn.runtime_session_owner_slot_mut_for_owner(owner).ok()?;
+ let runtime_slot = conn.runtime_session_owner_slot_mut_for_owner(owner)?;
return runtime_slot.pending_network_backlog_delivery_snapshot_from_backlog(
prepared_network_outputs.backlog_mut(),
);
@@ -824,7 +823,7 @@ fn mark_network_backlog_delivery_snapshot_emitted(
owner: &CommandOwnerScope,
snapshot: &PendingNetworkBacklogDeliverySnapshot,
) {
- let Ok(runtime_slot) = conn.runtime_session_owner_slot_mut_for_owner(owner) else {
+ let Some(runtime_slot) = conn.runtime_session_owner_slot_mut_for_owner(owner) else {
return;
};
runtime_slot.mark_network_backlog_delivery_snapshot_emitted(snapshot);
@@ -849,7 +848,7 @@ fn record_subresource_response_body_source(
collector_ids.iter().cloned(),
collection_was_gated,
);
- let Ok(runtime_slot) = conn.runtime_session_owner_slot_mut_for_owner(owner) else {
+ let Some(runtime_slot) = conn.runtime_session_owner_slot_mut_for_owner(owner) else {
return;
};
runtime_slot.record_captured_response_body_source_with_collector_scope(
@@ -882,7 +881,7 @@ fn record_subresource_request_body(
collector_ids.iter().cloned(),
collection_was_gated,
);
- let Ok(runtime_slot) = conn.runtime_session_owner_slot_mut_for_owner(owner) else {
+ let Some(runtime_slot) = conn.runtime_session_owner_slot_mut_for_owner(owner) else {
return;
};
runtime_slot.record_captured_request_body_with_collector_scope(
@@ -908,7 +907,7 @@ fn record_subresource_pending_response_body(
let collection_was_gated = conn.network_data_collection_is_gated_for_body(
crate::automation::DevToolsNetworkDataType::Response,
);
- let Ok(runtime_slot) = conn.runtime_session_owner_slot_mut_for_owner(owner) else {
+ let Some(runtime_slot) = conn.runtime_session_owner_slot_mut_for_owner(owner) else {
return;
};
runtime_slot.record_pending_response_body_with_collector_scope(
@@ -934,7 +933,7 @@ fn record_subresource_failed_response_body(
let collection_was_gated = conn.network_data_collection_is_gated_for_body(
crate::automation::DevToolsNetworkDataType::Response,
);
- let Ok(runtime_slot) = conn.runtime_session_owner_slot_mut_for_owner(owner) else {
+ let Some(runtime_slot) = conn.runtime_session_owner_slot_mut_for_owner(owner) else {
return;
};
runtime_slot.record_failed_response_body_with_collector_scope(
diff --git a/moli-protocol/src/domains/network/main_document_progress/mod.rs b/moli-protocol/src/domains/network/main_document_progress/mod.rs
index 3d4d987af..3d477b71d 100644
--- a/moli-protocol/src/domains/network/main_document_progress/mod.rs
+++ b/moli-protocol/src/domains/network/main_document_progress/mod.rs
@@ -523,7 +523,6 @@ fn completed_document_body_progress_queue(
}
let _ = conn
.runtime_session_owner_slot_mut(owner_session_id)
- .ok()
.and_then(|runtime_slot| {
record_main_document_response_body_for_network(
runtime_slot,
@@ -1531,7 +1530,7 @@ fn record_child_document_response_body(
collection_was_gated,
);
}
- let Ok(runtime_slot) = conn.runtime_session_owner_slot_mut(owner_session_id) else {
+ let Some(runtime_slot) = conn.runtime_session_owner_slot_mut(owner_session_id) else {
return;
};
if let Some(captured_body) = captured_body {
@@ -2322,7 +2321,7 @@ fn record_pending_main_document_response_body(
let collection_was_gated = conn.network_data_collection_is_gated_for_body(
crate::automation::DevToolsNetworkDataType::Response,
);
- if let Ok(runtime_slot) = conn.runtime_session_owner_slot_mut(state.session_id.as_deref()) {
+ if let Some(runtime_slot) = conn.runtime_session_owner_slot_mut(state.session_id.as_deref()) {
runtime_slot.record_pending_response_body_with_collector_scope(
request_id,
session_ids.iter().cloned(),
@@ -2362,7 +2361,7 @@ pub(crate) fn record_main_document_request_body(
collector_ids.iter().cloned(),
collection_was_gated,
);
- if let Ok(runtime_slot) = conn.runtime_session_owner_slot_mut(state.session_id.as_deref()) {
+ if let Some(runtime_slot) = conn.runtime_session_owner_slot_mut(state.session_id.as_deref()) {
// CDP getRequestPostData uses the text projection that request events
// and Fetch interception expose, which omits multipart file contents.
// Never surface raw transport bytes through the CDP captured store.
@@ -2400,7 +2399,7 @@ pub(crate) fn record_failed_main_document_response_body(
let collection_was_gated = conn.network_data_collection_is_gated_for_body(
crate::automation::DevToolsNetworkDataType::Response,
);
- if let Ok(runtime_slot) = conn.runtime_session_owner_slot_mut(state.session_id.as_deref()) {
+ if let Some(runtime_slot) = conn.runtime_session_owner_slot_mut(state.session_id.as_deref()) {
runtime_slot.record_failed_response_body_with_collector_scope(
request_id,
error_text,
@@ -2439,7 +2438,7 @@ pub(crate) fn record_completed_main_document_response_body(
collection_was_gated,
);
}
- if let Ok(runtime_slot) = conn.runtime_session_owner_slot_mut(state.session_id.as_deref()) {
+ if let Some(runtime_slot) = conn.runtime_session_owner_slot_mut(state.session_id.as_deref()) {
let _ = record_main_document_response_body_for_network(
runtime_slot,
network_enabled,
diff --git a/moli-protocol/src/domains/network/response_body.rs b/moli-protocol/src/domains/network/response_body.rs
index 7a0e392cf..da680f1f3 100644
--- a/moli-protocol/src/domains/network/response_body.rs
+++ b/moli-protocol/src/domains/network/response_body.rs
@@ -39,7 +39,7 @@ pub(super) fn get_response_body_command_output_plan(
}
let response_body_materialize_limit = conn.response_body_materialize_limit();
let primary_session_id = conn.runtime_session_owner_primary_session_id(cmd.session_id);
- let Ok(slot) = conn.runtime_session_owner_slot(cmd.session_id) else {
+ let Some(slot) = conn.runtime_session_owner_slot(cmd.session_id) else {
return CommandOutputPlan::error(-32000, "No resource with given identifier found");
};
if !network_events_enabled_for_session(slot, cmd.session_id, primary_session_id.as_deref()) {
@@ -80,7 +80,7 @@ pub(super) fn get_request_post_data_command_output_plan(
}
let body_materialize_limit = conn.response_body_materialize_limit();
let primary_session_id = conn.runtime_session_owner_primary_session_id(cmd.session_id);
- let Ok(slot) = conn.runtime_session_owner_slot(cmd.session_id) else {
+ let Some(slot) = conn.runtime_session_owner_slot(cmd.session_id) else {
return CommandOutputPlan::error(-32000, "No resource with given id was found");
};
if !network_events_enabled_for_session(slot, cmd.session_id, primary_session_id.as_deref()) {
diff --git a/moli-protocol/src/domains/observable_output/output_queue.rs b/moli-protocol/src/domains/observable_output/output_queue.rs
index a311a23fe..bea453f8f 100644
--- a/moli-protocol/src/domains/observable_output/output_queue.rs
+++ b/moli-protocol/src/domains/observable_output/output_queue.rs
@@ -324,7 +324,7 @@ impl ObservableSessionAuditsPreparedRange {
conn: &CdpConnection,
) -> Option<Self> {
let session_id = self.session_id();
- let runtime_slot = conn.runtime_session_owner_slot(session_id).ok()?;
+ let runtime_slot = conn.runtime_session_owner_slot(session_id)?;
let document_binding = runtime_slot.committed_renderer_document_binding()?;
let owner_state = conn.target_owner_state_for_session(session_id)?;
let session_state = conn.target_page_session_state_for_session(session_id)?;
@@ -372,9 +372,7 @@ impl ObservableSessionRuntimePreparedItems {
}
let session_id = self.attachment.session_id().map(str::to_owned);
let url = conn.runtime_session_owner_target_url(session_id.as_deref())?;
- let runtime_slot = conn
- .runtime_session_owner_slot(session_id.as_deref())
- .ok()?;
+ let runtime_slot = conn.runtime_session_owner_slot(session_id.as_deref())?;
runtime_slot
.page_attachment_id()
.is_some_and(|attachment_id| self.items.matches_source_identity(&url, attachment_id))
@@ -512,7 +510,7 @@ impl ObservableConsoleLogPreparedRange {
conn: &mut CdpConnection,
session_id: Option<&str>,
) -> Option<Self> {
- let runtime_slot = conn.runtime_session_owner_slot(session_id).ok()?;
+ let runtime_slot = conn.runtime_session_owner_slot(session_id)?;
let url = conn.runtime_session_owner_target_url(session_id)?;
if !self.domain.enabled_for_session(conn, session_id)?
|| url != self.url()
diff --git a/moli-protocol/src/domains/observable_output/presence.rs b/moli-protocol/src/domains/observable_output/presence.rs
index f4752591e..42a394441 100644
--- a/moli-protocol/src/domains/observable_output/presence.rs
+++ b/moli-protocol/src/domains/observable_output/presence.rs
@@ -136,7 +136,6 @@ pub(in crate::domains) fn inspector_issue_prepared_outputs(
// belonged to its replacement.
let Some(document_binding) = conn
.runtime_session_owner_slot_for_owner(owner)
- .ok()
.and_then(|slot| slot.committed_renderer_document_binding())
else {
return prepared;
@@ -332,7 +331,7 @@ fn renderer_agent_owns_page_console_api_events(
}) {
return false;
}
- let Ok(runtime_slot) = conn.runtime_session_owner_slot_for_owner(owner) else {
+ let Some(runtime_slot) = conn.runtime_session_owner_slot_for_owner(owner) else {
return false;
};
if !runtime_slot.has_loaded_page() {
@@ -356,7 +355,7 @@ fn renderer_runtime_agent_owns_page_console_api_events(
}) {
return false;
}
- let Ok(runtime_slot) = conn.runtime_session_owner_slot_for_owner(owner) else {
+ let Some(runtime_slot) = conn.runtime_session_owner_slot_for_owner(owner) else {
return false;
};
if !runtime_slot.has_loaded_page() {
@@ -377,7 +376,7 @@ fn runtime_observable_source_tail_for_session_owner(
session_id: Option<&str>,
) -> Option<super::TargetRuntimeObservableSourceOutput> {
let url = conn.runtime_session_owner_target_url(session_id)?;
- let runtime_slot = conn.runtime_session_owner_slot_mut(session_id).ok()?;
+ let runtime_slot = conn.runtime_session_owner_slot_mut(session_id)?;
runtime_slot.sync_observable_output_source_from_renderer_runtime_source(url, source)
}
@@ -387,7 +386,7 @@ fn runtime_console_source_tail_for_owner(
owner: &CommandOwnerScope,
) -> Option<super::TargetRuntimeObservableSourceOutput> {
let url = conn.runtime_session_owner_target_url_for_owner(owner)?;
- let runtime_slot = conn.runtime_session_owner_slot_mut_for_owner(owner).ok()?;
+ let runtime_slot = conn.runtime_session_owner_slot_mut_for_owner(owner)?;
runtime_slot.append_renderer_runtime_console_message(url, message)
}
@@ -398,7 +397,7 @@ fn runtime_lifecycle_error_source_tail_for_owner(
owner: &CommandOwnerScope,
) -> Option<super::TargetRuntimeObservableSourceOutput> {
let url = conn.runtime_session_owner_target_url_for_owner(owner)?;
- let runtime_slot = conn.runtime_session_owner_slot_mut_for_owner(owner).ok()?;
+ let runtime_slot = conn.runtime_session_owner_slot_mut_for_owner(owner)?;
runtime_slot.append_renderer_runtime_lifecycle_error(url, text, execution_context_id)
}
@@ -432,7 +431,7 @@ pub(in crate::domains) fn live_log_prepared_outputs_for_renderer_network_fact(
.target_owner_state_for_owner(owner)
.cloned()
.unwrap_or_default();
- let Some(runtime_slot) = conn.runtime_session_owner_slot_for_owner(owner).ok() else {
+ let Some(runtime_slot) = conn.runtime_session_owner_slot_for_owner(owner) else {
return ObservablePreparedOutputs::default();
};
let Some(url) = conn.runtime_session_owner_target_url_for_owner(owner) else {
@@ -468,7 +467,7 @@ fn observable_console_log_prepared_outputs_for_session_owner(
.target_owner_state_for_session(session_id)
.cloned()
.unwrap_or_default();
- let runtime_slot = conn.runtime_session_owner_slot(session_id).ok()?;
+ let runtime_slot = conn.runtime_session_owner_slot(session_id)?;
let url = conn.runtime_session_owner_target_url(session_id)?;
let queue = super::output_queue::TargetObservableOutputQueue::from_runtime_slot(runtime_slot)?;
let page_attachment_id = runtime_slot.page_attachment_id()?;
diff --git a/moli-protocol/src/domains/observable_output/runtime_emission.rs b/moli-protocol/src/domains/observable_output/runtime_emission.rs
index b7ab19117..cf8c1f0d2 100644
--- a/moli-protocol/src/domains/observable_output/runtime_emission.rs
+++ b/moli-protocol/src/domains/observable_output/runtime_emission.rs
@@ -50,7 +50,7 @@ fn runtime_observable_cursor_end_from_owner_queue_for_owner(
conn: &CdpConnection,
owner: &CommandOwnerScope,
) -> Option<(HashMap<i64, usize>, usize)> {
- let runtime_slot = conn.runtime_session_owner_slot_for_owner(owner).ok()?;
+ let runtime_slot = conn.runtime_session_owner_slot_for_owner(owner)?;
let source = runtime_slot.observable_output_latest_source_tail()?;
let url = conn.runtime_session_owner_target_url_for_owner(owner)?;
(source.url() == url && runtime_slot.page_attachment_id() == Some(source.page_attachment_id()))
@@ -62,8 +62,7 @@ fn runtime_observable_cursor_end_from_owner_observable_queue_for_owner(
conn: &CdpConnection,
owner: &CommandOwnerScope,
) -> Option<(usize, usize)> {
- conn.runtime_session_owner_slot_for_owner(owner)
- .ok()?
+ conn.runtime_session_owner_slot_for_owner(owner)?
.observable_output_cursor_end()
}
diff --git a/moli-protocol/src/domains/page.rs b/moli-protocol/src/domains/page.rs
index 91863b134..d62330e86 100644
--- a/moli-protocol/src/domains/page.rs
+++ b/moli-protocol/src/domains/page.rs
@@ -1772,7 +1772,7 @@ fn try_start_page_enable_command(
)));
}
match conn.runtime_session_owner_slot(cmd.session_id) {
- Ok(slot)
+ Some(slot)
if slot.has_loaded_page()
&& conn.runtime_session_owner_can_start_initial_document_navigation(
cmd.session_id,
@@ -1796,10 +1796,10 @@ fn try_start_page_enable_command(
&[],
))
}
- Ok(slot) if slot.has_loaded_page() => {
+ Some(slot) if slot.has_loaded_page() => {
Some(PageCommandTaskStep::Complete(CommandOutputPlan::success()))
}
- Ok(_) if !conn.runtime_session_owner_target_is_initial_about_blank(cmd.session_id) => {
+ Some(_) if !conn.runtime_session_owner_target_is_initial_about_blank(cmd.session_id) => {
let owner = CommandOwnerScope::capture(conn, cmd.session_id);
let start = match navigation::start_initial_document_navigation_for_session_owner(
conn,
@@ -1818,11 +1818,11 @@ fn try_start_page_enable_command(
&[],
))
}
- Ok(_) => Some(PageCommandTaskStep::Complete(CommandOutputPlan::success())),
- Err(_) if cmd.session_id.is_some() => Some(PageCommandTaskStep::Complete(
+ Some(_) => Some(PageCommandTaskStep::Complete(CommandOutputPlan::success())),
+ None if cmd.session_id.is_some() => Some(PageCommandTaskStep::Complete(
CommandOutputPlan::error(-31998, "TargetNotLoaded"),
)),
- Err(_) => Some(PageCommandTaskStep::Complete(CommandOutputPlan::success())),
+ None => Some(PageCommandTaskStep::Complete(CommandOutputPlan::success())),
}
}
@@ -1843,11 +1843,7 @@ fn try_start_page_set_document_content_command(
if let Err(message) = conn.ensure_document_accessible_for_session_owner(session_id) {
return PageCommandTaskStep::Complete(CommandOutputPlan::error(-32000, message));
}
- let Some(page) = conn
- .runtime_session_owner_slot_mut(session_id)
- .ok()
- .and_then(|slot| slot.loaded_page_mut())
- else {
+ let Some(page) = conn.loaded_page_mut_for_session_owner(session_id) else {
return PageCommandTaskStep::Complete(CommandOutputPlan::error(
-32000,
"No Document instance to set HTML for",
@@ -1965,11 +1961,7 @@ pub(crate) async fn complete_pending_page_command(
}
};
let completed_script = {
- let Some(page) = conn
- .runtime_session_owner_slot_mut_for_owner(&owner_scope)
- .ok()
- .and_then(|slot| slot.loaded_page_mut())
- else {
+ let Some(page) = conn.loaded_page_mut_for_owner(&owner_scope) else {
return PageCommandTaskStep::Complete(CommandOutputPlan::error(
-32000,
"NoDocumentLoaded",
@@ -1998,11 +1990,7 @@ pub(crate) async fn complete_pending_page_command(
));
}
};
- let Some(page) = conn
- .runtime_session_owner_slot_mut_for_owner(&owner_scope)
- .ok()
- .and_then(|slot| slot.loaded_page_mut())
- else {
+ let Some(page) = conn.loaded_page_mut_for_owner(&owner_scope) else {
return PageCommandTaskStep::Complete(CommandOutputPlan::error(
-32000,
"NoDocumentLoaded",
@@ -2060,11 +2048,7 @@ pub(crate) async fn complete_pending_page_command(
));
}
};
- let Some(page) = conn
- .runtime_session_owner_slot_mut_for_owner(&owner_scope)
- .ok()
- .and_then(|slot| slot.loaded_page_mut())
- else {
+ let Some(page) = conn.loaded_page_mut_for_owner(&owner_scope) else {
return PageCommandTaskStep::Complete(CommandOutputPlan::error(
-32000,
"NoDocumentLoaded",
@@ -2088,11 +2072,7 @@ pub(crate) async fn complete_pending_page_command(
}
};
let (result, output) = {
- let Some(page) = conn
- .runtime_session_owner_slot_mut_for_owner(&owner_scope)
- .ok()
- .and_then(|slot| slot.loaded_page_mut())
- else {
+ let Some(page) = conn.loaded_page_mut_for_owner(&owner_scope) else {
return PageCommandTaskStep::Complete(CommandOutputPlan::error(
-32000,
"No Document instance to set HTML for",
@@ -2158,11 +2138,7 @@ pub(crate) async fn complete_pending_page_command(
&[],
));
}
- let Some(page) = conn
- .runtime_session_owner_slot_mut_for_owner(&owner_scope)
- .ok()
- .and_then(|slot| slot.loaded_page_mut())
- else {
+ let Some(page) = conn.loaded_page_mut_for_owner(&owner_scope) else {
return PageCommandTaskStep::Complete(get_frame_tree_command_output_plan(
output_kind,
target_id,
@@ -2216,11 +2192,7 @@ pub(crate) async fn complete_pending_page_command(
));
}
};
- let Some(page) = conn
- .runtime_session_owner_slot_mut_for_owner(&owner_scope)
- .ok()
- .and_then(|slot| slot.loaded_page_mut())
- else {
+ let Some(page) = conn.loaded_page_mut_for_owner(&owner_scope) else {
return PageCommandTaskStep::Complete(CommandOutputPlan::error(
-32000,
"NoDocumentLoaded",
diff --git a/moli-protocol/src/domains/page/capture.rs b/moli-protocol/src/domains/page/capture.rs
index 3a57ec781..19933352c 100644
--- a/moli-protocol/src/domains/page/capture.rs
+++ b/moli-protocol/src/domains/page/capture.rs
@@ -365,11 +365,7 @@ pub(super) async fn execute_devtools_get_layout_metrics_for_current_owner(
conn: &mut CdpConnection,
owner: &CommandOwnerScope,
) -> Result<DevToolsLayoutMetricsResult, DevToolsError> {
- let Some(page) = conn
- .runtime_session_owner_slot_mut_for_owner(owner)
- .ok()
- .and_then(|slot| slot.loaded_page_mut())
- else {
+ let Some(page) = conn.loaded_page_mut_for_owner(owner) else {
return Err(devtools_layout_metrics_error("NoDocumentLoaded"));
};
let pending = page.start_layout_metrics().map_err(|error| {
@@ -378,11 +374,7 @@ pub(super) async fn execute_devtools_get_layout_metrics_for_current_owner(
let completed = pending.wait().await.map_err(|error| {
devtools_layout_metrics_error(format!("Failed to produce layout metrics: {error}"))
})?;
- let Some(page) = conn
- .runtime_session_owner_slot_mut_for_owner(owner)
- .ok()
- .and_then(|slot| slot.loaded_page_mut())
- else {
+ let Some(page) = conn.loaded_page_mut_for_owner(owner) else {
return Err(devtools_layout_metrics_error("NoDocumentLoaded"));
};
page.finish_layout_metrics(completed)
@@ -676,11 +668,7 @@ pub(super) fn start_devtools_get_layout_metrics_command(
) -> PageCommandTaskStep {
let command_session_id = command.context.session_id.as_ref().map(|id| id.as_str());
let owner_scope = CommandOwnerScope::capture(conn, command_session_id);
- let Some(page) = conn
- .runtime_session_owner_slot_mut(command_session_id)
- .ok()
- .and_then(|slot| slot.loaded_page_mut())
- else {
+ let Some(page) = conn.loaded_page_mut_for_session_owner(command_session_id) else {
return PageCommandTaskStep::Complete(CommandOutputPlan::from_devtools_error(
devtools_layout_metrics_error("NoDocumentLoaded"),
));
diff --git a/moli-protocol/src/domains/page/javascript_dialog.rs b/moli-protocol/src/domains/page/javascript_dialog.rs
index 59e4901a1..c9cf5a7ee 100644
--- a/moli-protocol/src/domains/page/javascript_dialog.rs
+++ b/moli-protocol/src/domains/page/javascript_dialog.rs
@@ -5,9 +5,7 @@ pub(super) fn start_set_javascript_dialog_handler_enabled(
session_id: Option<&str>,
enabled: bool,
) -> Result<(), String> {
- if let Ok(slot) = conn.runtime_session_owner_slot_mut(session_id)
- && let Some(page) = slot.loaded_page_mut()
- {
+ if let Some(page) = conn.loaded_page_mut_for_session_owner(session_id) {
return page
.start_set_javascript_dialog_handler_enabled(enabled)
.map(|_| ())
@@ -313,7 +311,7 @@ fn source_is_current(conn: &CdpConnection, dialog: &PreparedJavaScriptDialog) ->
conn.target_page_protocol_attachment_identity_is_current(dialog.source_attachment())
&& conn
.runtime_session_owner_slot(dialog.source_attachment().session_id())
- .is_ok_and(|slot| slot.observes_javascript_dialog_scope(dialog.source_dialog_scope()))
+ .is_some_and(|slot| slot.observes_javascript_dialog_scope(dialog.source_dialog_scope()))
}
fn trace_stale_source(dialog: &PreparedJavaScriptDialog) {
diff --git a/moli-protocol/src/domains/page/navigation.rs b/moli-protocol/src/domains/page/navigation.rs
index 07fc41319..74c22641f 100644
--- a/moli-protocol/src/domains/page/navigation.rs
+++ b/moli-protocol/src/domains/page/navigation.rs
@@ -1452,11 +1452,7 @@ fn start_top_level_same_document_navigate(
result_payload: Value,
replace_current: bool,
) -> NavigateCommandStart {
- let Some(page) = conn
- .runtime_session_owner_slot_mut_for_owner(owner)
- .ok()
- .and_then(|slot| slot.loaded_page_mut())
- else {
+ let Some(page) = conn.loaded_page_mut_for_owner(owner) else {
return NavigateCommandStart::CompletePlan(CommandOutputPlan::error(
-32000,
"NoDocumentLoaded",
@@ -1513,11 +1509,7 @@ fn start_child_frame_navigate_command(
"NoDocumentLoaded",
));
};
- let Some(page) = conn
- .runtime_session_owner_slot_mut_for_owner(owner)
- .ok()
- .and_then(|slot| slot.loaded_page_mut())
- else {
+ let Some(page) = conn.loaded_page_mut_for_owner(owner) else {
return NavigateCommandStart::CompletePlan(CommandOutputPlan::error(
-32000,
"NoDocumentLoaded",
@@ -1764,7 +1756,6 @@ fn start_same_document_history_traversal_command(
) -> PageCommandTaskStep {
let page = conn
.runtime_session_owner_slot_mut_for_owner(&fallback.owner)
- .ok()
.and_then(|slot| slot.loaded_page())
.ok_or_else(|| anyhow::anyhow!("TargetNotLoaded"));
let page = match page {
@@ -1810,9 +1801,7 @@ pub(super) fn complete_pending_same_document_history_traversal_command(
}
};
let result = conn
- .runtime_session_owner_slot_mut_for_owner(&fallback.owner)
- .ok()
- .and_then(|slot| slot.loaded_page_mut())
+ .loaded_page_mut_for_owner(&fallback.owner)
.ok_or_else(|| anyhow::anyhow!("TargetNotLoaded"))
.and_then(|page| page.finish_top_level_history_traversal_by_delta(completion));
match result {
@@ -2502,11 +2491,7 @@ pub(super) fn try_start_reset_navigation_history_command(
}
}
let pending = {
- let Some(page) = conn
- .runtime_session_owner_slot_mut(cmd.session_id)
- .ok()
- .and_then(|slot| slot.loaded_page_mut())
- else {
+ let Some(page) = conn.loaded_page_mut_for_session_owner(cmd.session_id) else {
return PageCommandTaskStep::Complete(CommandOutputPlan::error(
-32000,
"NoDocumentLoaded",
@@ -2540,11 +2525,7 @@ pub(super) fn complete_reset_navigation_history_command(
return PageCommandTaskStep::Complete(CommandOutputPlan::error(-32000, message));
}
};
- let Some(page) = conn
- .runtime_session_owner_slot_mut_for_owner(owner)
- .ok()
- .and_then(|slot| slot.loaded_page_mut())
- else {
+ let Some(page) = conn.loaded_page_mut_for_owner(owner) else {
return PageCommandTaskStep::Complete(CommandOutputPlan::error(-32000, "NoDocumentLoaded"));
};
match page.finish_reset_navigation_history(completion) {
@@ -3147,11 +3128,7 @@ pub(super) async fn complete_pending_child_frame_navigate_command(
}
};
let (navigated, renderer_output) = {
- let Some(page) = conn
- .runtime_session_owner_slot_mut_for_owner(owner)
- .ok()
- .and_then(|slot| slot.loaded_page_mut())
- else {
+ let Some(page) = conn.loaded_page_mut_for_owner(owner) else {
return PageCommandTaskStep::Complete(CommandOutputPlan::error(-31998, "NoSuchTarget"));
};
match page.finish_child_frame_navigation_to_url_command_turn(completion) {
@@ -3234,11 +3211,7 @@ pub(super) async fn complete_pending_same_document_navigate_command(
}
};
let (navigated, output) = {
- let Some(page) = conn
- .runtime_session_owner_slot_mut_for_owner(owner)
- .ok()
- .and_then(|slot| slot.loaded_page_mut())
- else {
+ let Some(page) = conn.loaded_page_mut_for_owner(owner) else {
return PageCommandTaskStep::Complete(CommandOutputPlan::error(-31998, "NoSuchTarget"));
};
match page.finish_top_level_same_document_navigation_command_turn(completion) {
diff --git a/moli-protocol/src/domains/page/output.rs b/moli-protocol/src/domains/page/output.rs
index 2f6aa7f56..564d41e15 100644
--- a/moli-protocol/src/domains/page/output.rs
+++ b/moli-protocol/src/domains/page/output.rs
@@ -77,7 +77,7 @@ impl PagePreparedOutputs {
let _ = dialog.finish(false, String::new());
return Self::default();
};
- let Ok(runtime_slot) = conn.runtime_session_owner_slot_for_owner(owner) else {
+ let Some(runtime_slot) = conn.runtime_session_owner_slot_for_owner(owner) else {
let _ = dialog.finish(false, String::new());
return Self::default();
};
diff --git a/moli-protocol/src/domains/page/preload.rs b/moli-protocol/src/domains/page/preload.rs
index bc05d1ad8..2276b63a5 100644
--- a/moli-protocol/src/domains/page/preload.rs
+++ b/moli-protocol/src/domains/page/preload.rs
@@ -117,7 +117,9 @@ async fn append_loaded_page_document_start_script_for_owner_async(
) -> Result<(), String> {
let renderer_runtime_inspector_session_id =
conn.target_renderer_runtime_inspector_session_id_for_owner(owner);
- let slot = conn.runtime_session_owner_slot_mut_for_owner(owner)?;
+ let slot = conn
+ .runtime_session_owner_slot_mut_for_owner(owner)
+ .ok_or_else(|| "NoDocumentLoaded".to_owned())?;
if let Some(page) = slot.loaded_page_mut() {
page.add_document_start_script_runtime_activity_async(
renderer_runtime_inspector_session_id.as_deref(),
@@ -135,7 +137,9 @@ async fn remove_loaded_page_document_start_script_for_owner_async(
owner: &CommandOwnerScope,
registry_key: &str,
) -> Result<(), String> {
- let slot = conn.runtime_session_owner_slot_mut_for_owner(owner)?;
+ let slot = conn
+ .runtime_session_owner_slot_mut_for_owner(owner)
+ .ok_or_else(|| "NoDocumentLoaded".to_owned())?;
if let Some(page) = slot.loaded_page_mut() {
page.remove_document_start_script_by_registry_key_async(registry_key)
.await
@@ -153,11 +157,7 @@ fn start_default_document_start_script_append(
) -> PageCommandTaskStep {
let renderer_runtime_inspector_session_id =
conn.target_renderer_runtime_inspector_session_id_for_session(command_session_id);
- let Some(page) = conn
- .runtime_session_owner_slot_mut(command_session_id)
- .ok()
- .and_then(|slot| slot.loaded_page_mut())
- else {
+ let Some(page) = conn.loaded_page_mut_for_session_owner(command_session_id) else {
return PageCommandTaskStep::Complete(add_preload_script_result_plan(identifier));
};
match page.start_add_document_start_script_runtime_activity(
@@ -188,11 +188,7 @@ fn start_document_start_script_remove(
let Some(registry_key) = registry_key else {
return PageCommandTaskStep::Complete(CommandOutputPlan::success());
};
- let Some(page) = conn
- .runtime_session_owner_slot_mut(command_session_id)
- .ok()
- .and_then(|slot| slot.loaded_page_mut())
- else {
+ let Some(page) = conn.loaded_page_mut_for_session_owner(command_session_id) else {
return PageCommandTaskStep::Complete(CommandOutputPlan::success());
};
match page.start_remove_document_start_script_by_registry_key(&registry_key) {
@@ -538,11 +534,7 @@ async fn append_default_document_start_script_direct_async(
) -> Result<String, DevToolsError> {
let renderer_runtime_inspector_session_id =
conn.target_renderer_runtime_inspector_session_id_for_owner(owner);
- let Some(page) = conn
- .runtime_session_owner_slot_mut_for_owner(owner)
- .ok()
- .and_then(|slot| slot.loaded_page_mut())
- else {
+ let Some(page) = conn.loaded_page_mut_for_owner(owner) else {
return Ok(identifier);
};
let pending = page
@@ -556,11 +548,7 @@ async fn append_default_document_start_script_direct_async(
.wait()
.await
.map_err(|error| devtools_preload_internal_error(error.to_string()))?;
- let Some(page) = conn
- .runtime_session_owner_slot_mut_for_owner(owner)
- .ok()
- .and_then(|slot| slot.loaded_page_mut())
- else {
+ let Some(page) = conn.loaded_page_mut_for_owner(owner) else {
return Err(devtools_preload_internal_error("NoDocumentLoaded"));
};
page.finish_document_start_script_result(completion)
@@ -617,11 +605,7 @@ async fn remove_document_start_script_direct_async(
let Some(registry_key) = registry_key else {
return Ok(());
};
- let Some(page) = conn
- .runtime_session_owner_slot_mut_for_owner(owner)
- .ok()
- .and_then(|slot| slot.loaded_page_mut())
- else {
+ let Some(page) = conn.loaded_page_mut_for_owner(owner) else {
return Ok(());
};
let pending = page
@@ -631,11 +615,7 @@ async fn remove_document_start_script_direct_async(
.wait()
.await
.map_err(|error| devtools_preload_internal_error(error.to_string()))?;
- let Some(page) = conn
- .runtime_session_owner_slot_mut_for_owner(owner)
- .ok()
- .and_then(|slot| slot.loaded_page_mut())
- else {
+ let Some(page) = conn.loaded_page_mut_for_owner(owner) else {
return Err(devtools_preload_internal_error("NoDocumentLoaded"));
};
page.finish_unit_runtime_page_command(completion, "remove document-start script")
@@ -1222,7 +1202,7 @@ pub(super) fn try_start_create_isolated_world_command(
if conn
.runtime_session_owner_slot(cmd.session_id)
- .is_ok_and(|slot| !slot.has_loaded_page())
+ .is_some_and(|slot| !slot.has_loaded_page())
{
return PageCommandTaskStep::Complete(CommandOutputPlan::error(-32000, "NoDocumentLoaded"));
}
@@ -1381,7 +1361,7 @@ fn loaded_page_mut_for_create_isolated_world_renderer_command<'a>(
) -> Result<&'a mut moli_core::page::Page, CommandOutputPlan> {
let slot = conn
.runtime_session_owner_slot_mut_for_owner(owner)
- .map_err(|error| CommandOutputPlan::error(-32000, error))?;
+ .ok_or_else(|| CommandOutputPlan::error(-32000, "NoDocumentLoaded"))?;
task.pending_renderer_agent_attachment_id = Some(
slot.current_renderer_attachment()
.ok_or_else(|| CommandOutputPlan::error(-32000, "NoDocumentLoaded"))?
@@ -1604,11 +1584,7 @@ pub(super) async fn complete_pending_create_isolated_world_command(
}
};
let completed_world = {
- let Some(page) = conn
- .runtime_session_owner_slot_mut_for_owner(owner)
- .ok()
- .and_then(|slot| slot.loaded_page_mut())
- else {
+ let Some(page) = conn.loaded_page_mut_for_owner(owner) else {
return PageCommandTaskStep::Complete(CommandOutputPlan::error(
-32000,
"NoDocumentLoaded",
@@ -1741,10 +1717,9 @@ async fn add_script_to_evaluate_on_new_document_direct_async(
}
let pending_run_immediately = {
let renderer_runtime_inspector_session_id = renderer_inspector_session_id;
- let slot = match conn.runtime_session_owner_slot_mut_for_owner(owner) {
- Ok(slot) => slot,
- Err(error) => return Err(devtools_preload_internal_error(error)),
- };
+ let slot = conn
+ .runtime_session_owner_slot_mut_for_owner(owner)
+ .ok_or_else(|| devtools_preload_internal_error("NoDocumentLoaded"))?;
if let Some(page) = slot.loaded_page_mut() {
Some(
page.start_add_document_start_script_runtime_activity(
@@ -1768,12 +1743,9 @@ async fn add_script_to_evaluate_on_new_document_direct_async(
.await
.map_err(|error| devtools_preload_internal_error(error.to_string()))?;
let (result, output) = {
- let slot = conn
- .runtime_session_owner_slot_mut_for_owner(owner)
- .map_err(devtools_preload_internal_error)?;
- let page = slot.loaded_page_mut().ok_or_else(|| {
- devtools_preload_internal_error("NoDocumentLoaded".to_owned())
- })?;
+ let page = conn
+ .loaded_page_mut_for_owner(owner)
+ .ok_or_else(|| devtools_preload_internal_error("NoDocumentLoaded"))?;
page.finish_document_start_script_result_command_turn(completion)
.map_err(|error| devtools_preload_internal_error(error.to_string()))?
};
diff --git a/moli-protocol/src/domains/page/producer_tests.rs b/moli-protocol/src/domains/page/producer_tests.rs
index fb0bfa431..60e88b2a8 100644
--- a/moli-protocol/src/domains/page/producer_tests.rs
+++ b/moli-protocol/src/domains/page/producer_tests.rs
@@ -145,7 +145,7 @@ fn javascript_dialog_scope_for_test(
) -> crate::conn::TargetJavaScriptDialogScopeObserver {
conn.runtime_session_owner_slot(Some(session_id))
.map(|slot| slot.javascript_dialog_scope_observer())
- .unwrap_or_else(|_| {
+ .unwrap_or_else(|| {
crate::conn::TargetJavaScriptDialogScopeObserver::stale_for_absent_owner_test()
})
}
diff --git a/moli-protocol/src/domains/page/resource_search.rs b/moli-protocol/src/domains/page/resource_search.rs
index d28282bdd..d1d897ed4 100644
--- a/moli-protocol/src/domains/page/resource_search.rs
+++ b/moli-protocol/src/domains/page/resource_search.rs
@@ -111,11 +111,7 @@ pub(super) fn try_start_search_in_resource_command(
main_document,
};
let owner = CommandOwnerScope::capture(conn, cmd.session_id);
- let Some(page) = conn
- .runtime_session_owner_slot_mut_for_owner(&owner)
- .ok()
- .and_then(|slot| slot.loaded_page_mut())
- else {
+ let Some(page) = conn.loaded_page_mut_for_owner(&owner) else {
return complete_error(CONTENT_UNAVAILABLE);
};
match page.start_resource_search_by_lines(request) {
@@ -136,11 +132,7 @@ pub(super) fn complete_search_in_resource_command(
owner: &CommandOwnerScope,
completed: CompletedSearchInResourceCommand,
) -> PageCommandTaskStep {
- let Some(page) = conn
- .runtime_session_owner_slot_mut_for_owner(owner)
- .ok()
- .and_then(|slot| slot.loaded_page_mut())
- else {
+ let Some(page) = conn.loaded_page_mut_for_owner(owner) else {
return complete_error(CONTENT_UNAVAILABLE);
};
let completion = match completed.completed {
diff --git a/moli-protocol/src/domains/page/resource_tree.rs b/moli-protocol/src/domains/page/resource_tree.rs
index 452f810e3..5ced1a7b4 100644
--- a/moli-protocol/src/domains/page/resource_tree.rs
+++ b/moli-protocol/src/domains/page/resource_tree.rs
@@ -292,11 +292,7 @@ pub(super) async fn devtools_frame_tree_for_current_owner_async(
Vec::new(),
));
}
- let Some(page) = conn
- .runtime_session_owner_slot_mut_for_owner(owner)
- .ok()
- .and_then(|slot| slot.loaded_page_mut())
- else {
+ let Some(page) = conn.loaded_page_mut_for_owner(owner) else {
return Ok(frame_tree_payload(
target_id,
target_loader_id,
@@ -327,11 +323,7 @@ pub(super) async fn devtools_frame_tree_for_current_owner_async(
Vec::new(),
));
}
- let Some(page) = conn
- .runtime_session_owner_slot_mut_for_owner(owner)
- .ok()
- .and_then(|slot| slot.loaded_page_mut())
- else {
+ let Some(page) = conn.loaded_page_mut_for_owner(owner) else {
return Ok(frame_tree_payload(
target_id,
target_loader_id,
@@ -490,11 +482,7 @@ pub(super) fn start_devtools_get_frame_tree_command(
&[],
));
}
- let Some(page) = conn
- .runtime_session_owner_slot_mut_for_owner(&owner)
- .ok()
- .and_then(|slot| slot.loaded_page_mut())
- else {
+ let Some(page) = conn.loaded_page_mut_for_owner(&owner) else {
return PageCommandTaskStep::Complete(get_frame_tree_command_output_plan(
output_kind,
target_id,
diff --git a/moli-protocol/src/domains/page/termination.rs b/moli-protocol/src/domains/page/termination.rs
index 2e26c794d..326a0d6df 100644
--- a/moli-protocol/src/domains/page/termination.rs
+++ b/moli-protocol/src/domains/page/termination.rs
@@ -396,8 +396,7 @@ pub(super) async fn complete_stop_loading_command_dispatch(
owner: &CommandOwnerScope,
) -> PageCommandTaskStep {
let mut out = Vec::new();
- if let Ok(slot) = conn.runtime_session_owner_slot_mut_for_owner(owner)
- && let Some(page) = slot.loaded_page_mut()
+ if let Some(page) = conn.loaded_page_mut_for_owner(owner)
&& let Err(error) = page.stop_document_lifecycle_async().await
{
tracing::debug!(%error, "failed to stop renderer document lifecycle");
@@ -489,7 +488,7 @@ pub(super) async fn complete_crash_command_dispatch(
// it never enters a V8InspectorSession or the ordinary target IO task FIFO.
// Seal both DevTools receivers and interrupt active V8 synchronously so
// target retirement cannot wait behind earlier JavaScript or IO work.
- if let Ok(page) = conn.loaded_page_mut_for_interruptible_protocol_access_for_owner(owner) {
+ if let Some(page) = conn.loaded_page_mut_for_owner(owner) {
page.crash_devtools_target_from_io();
}
diff --git a/moli-protocol/src/domains/performance.rs b/moli-protocol/src/domains/performance.rs
index 8e08953db..0a7fb3f7f 100644
--- a/moli-protocol/src/domains/performance.rs
+++ b/moli-protocol/src/domains/performance.rs
@@ -120,9 +120,9 @@ fn loaded_page_mut_for_renderer_access<'a>(
CdpRendererCommandAccess::MainThread => {
conn.loaded_page_mut_for_protocol_access_for_owner(owner)
}
- CdpRendererCommandAccess::Io => {
- conn.loaded_page_mut_for_interruptible_protocol_access_for_owner(owner)
- }
+ CdpRendererCommandAccess::Io => conn
+ .loaded_page_mut_for_owner(owner)
+ .ok_or_else(|| "NoDocumentLoaded".to_owned()),
CdpRendererCommandAccess::OwnerIndependent => {
Err("Performance.getMetrics requires a renderer Page".to_owned())
}
@@ -227,7 +227,6 @@ pub(crate) fn try_start_performance_command_dispatch(
}
if !conn
.runtime_session_owner_slot(cmd.session_id)
- .ok()
.is_some_and(|slot| slot.has_loaded_page())
{
return PerformanceCommandTaskStep::Complete(default_metrics_command_output_plan());
diff --git a/moli-protocol/src/domains/runtime/dispatcher.rs b/moli-protocol/src/domains/runtime/dispatcher.rs
index 5bd326e1a..d07f64b00 100644
--- a/moli-protocol/src/domains/runtime/dispatcher.rs
+++ b/moli-protocol/src/domains/runtime/dispatcher.rs
@@ -1002,7 +1002,7 @@ pub(crate) fn start_heap_profiler_inspector_command_dispatch(
if !conn
.runtime_session_owner_slot(cmd.session_id)
- .is_ok_and(|slot| slot.has_loaded_page())
+ .is_some_and(|slot| slot.has_loaded_page())
{
return RuntimeCommandTaskStep::Complete(match action {
HeapProfilerAction::Enable | HeapProfilerAction::Disable => {
diff --git a/moli-protocol/src/domains/runtime/dispatcher/dispatch.rs b/moli-protocol/src/domains/runtime/dispatcher/dispatch.rs
index 8a3c262f5..a286f6fa9 100644
--- a/moli-protocol/src/domains/runtime/dispatcher/dispatch.rs
+++ b/moli-protocol/src/domains/runtime/dispatcher/dispatch.rs
@@ -536,14 +536,14 @@ pub(super) fn start_runtime_enable_command_for_owner(
owner_scope: CommandOwnerScope,
) -> RuntimeCommandTaskStep {
let has_loaded_page = match conn.runtime_session_owner_slot_for_owner(&owner_scope) {
- Ok(slot) => slot.has_loaded_page(),
- Err(_) if owner_scope.session_id().is_some() => {
+ Some(slot) => slot.has_loaded_page(),
+ None if owner_scope.session_id().is_some() => {
return RuntimeCommandTaskStep::Complete(CommandOutputPlan::error(
-32001,
"Unknown sessionId",
));
}
- Err(_) => {
+ None => {
match conn.set_runtime_frontend_enabled_for_owner(&owner_scope, true) {
SessionOwnerRuntimeFrontendEnableResult::Handled => {}
SessionOwnerRuntimeFrontendEnableResult::UnknownSession => {
@@ -681,11 +681,11 @@ pub(super) fn try_start_pending_runtime_binding_command(
};
let live_page_update_unavailable = conn
.runtime_session_owner_slot_for_owner(&owner_scope)
- .is_ok_and(|slot| !slot.has_loaded_page())
+ .is_some_and(|slot| !slot.has_loaded_page())
|| should_persist
&& conn
.runtime_session_owner_slot_for_owner(&owner_scope)
- .is_ok_and(|slot| slot.renderer_document_navigation_is_suspended());
+ .is_some_and(|slot| slot.renderer_document_navigation_is_suspended());
if live_page_update_unavailable {
task.command_response = Some(RuntimeBindingCommandResponse::empty_success());
let meta = RuntimeCommandCompletionMeta {
diff --git a/moli-protocol/src/domains/runtime/dispatcher/runtime_lifecycle.rs b/moli-protocol/src/domains/runtime/dispatcher/runtime_lifecycle.rs
index a5d94ff9d..cc471d26a 100644
--- a/moli-protocol/src/domains/runtime/dispatcher/runtime_lifecycle.rs
+++ b/moli-protocol/src/domains/runtime/dispatcher/runtime_lifecycle.rs
@@ -17,7 +17,7 @@ pub(super) fn start_runtime_disable_command_for_owner(
) -> RuntimeCommandTaskStep {
if !conn
.runtime_session_owner_slot_for_owner(&owner_scope)
- .is_ok_and(|slot| slot.has_loaded_page())
+ .is_some_and(|slot| slot.has_loaded_page())
{
return RuntimeCommandTaskStep::Complete(disable_command_output_plan_sync_for_owner(
conn,
@@ -74,7 +74,7 @@ pub(super) fn start_runtime_run_if_waiting_for_debugger_command(
}
if !conn
.runtime_session_owner_slot(cmd.session_id)
- .is_ok_and(|slot| slot.has_loaded_page())
+ .is_some_and(|slot| slot.has_loaded_page())
{
return RuntimeCommandTaskStep::Complete(CommandOutputPlan::success());
}
@@ -115,7 +115,7 @@ pub(super) fn start_runtime_discard_console_entries_command(
) -> RuntimeCommandTaskStep {
if !conn
.runtime_session_owner_slot(cmd.session_id)
- .is_ok_and(|slot| slot.has_loaded_page())
+ .is_some_and(|slot| slot.has_loaded_page())
{
advance_runtime_observable_cursors_to_current_for_session_owner(conn, cmd.session_id);
return RuntimeCommandTaskStep::Complete(CommandOutputPlan::success());
diff --git a/moli-protocol/src/domains/target/session_disposal.rs b/moli-protocol/src/domains/target/session_disposal.rs
index 019a794a0..1d3ac116e 100644
--- a/moli-protocol/src/domains/target/session_disposal.rs
+++ b/moli-protocol/src/domains/target/session_disposal.rs
@@ -98,7 +98,6 @@ async fn recover_failed_page_session_disposal_async(
});
let has_live_page = conn
.runtime_session_owner_slot_for_owner(&owner)
- .ok()
.is_some_and(|slot| slot.loaded_page().is_some());
if has_live_page {