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): let preparation select supported native commands

ldm0e36271e0d056
diff --git a/moli-protocol/src/domains/dom/resolve/native.rs b/moli-protocol/src/domains/dom/resolve/native.rs
index f2320d367..254b45fef 100644
--- a/moli-protocol/src/domains/dom/resolve/native.rs
+++ b/moli-protocol/src/domains/dom/resolve/native.rs
@@ -19,31 +19,6 @@ type StartError = PendingDomCommandStartError;
pub(crate) fn try_start(conn: &mut CdpConnection, cmd: &Cmd<'_>) -> Option<NativeCommandStep> {
let action = cmd.parse_action::<DomAction>()?;
- if !mutation::handles(action)
- && !matches!(
- action,
- DomAction::ResolveNode
- | DomAction::SetFileInputFiles
- | DomAction::GetDocument
- | DomAction::GetFlattenedDocument
- | DomAction::QuerySelector
- | DomAction::QuerySelectorAll
- | DomAction::RequestChildNodes
- | DomAction::GetFrameOwner
- | DomAction::GetAttributes
- | DomAction::DescribeNode
- | DomAction::GetOuterHtml
- | DomAction::GetBoxModel
- | DomAction::GetContentQuads
- | DomAction::RequestNode
- | DomAction::PushNodesByBackendIdsToFrontend
- | DomAction::PerformSearch
- | DomAction::GetSearchResults
- | DomAction::DiscardSearchResults
- )
- {
- return None;
- }
if action == DomAction::DiscardSearchResults
&& search::build_cdp_discard_search_results_command(conn, cmd).is_none()
{
@@ -69,33 +44,35 @@ pub(crate) fn try_start(conn: &mut CdpConnection, cmd: &Cmd<'_>) -> Option<Nativ
"DOM agent hasn't been enabled",
)));
}
- Some(match prepare(conn, cmd, action) {
- Ok(operation) => native::start_operation(conn, cmd, operation),
- Err(error) => {
- NativeCommandStep::Complete(CommandOutputPlan::error(error.code, error.message))
- }
- })
+ match prepare(conn, cmd, action) {
+ Ok(Some(operation)) => Some(native::start_operation(conn, cmd, operation)),
+ Ok(None) => None,
+ Err(error) => Some(NativeCommandStep::Complete(CommandOutputPlan::error(
+ error.code,
+ error.message,
+ ))),
+ }
}
fn prepare(
conn: &CdpConnection,
cmd: &Cmd<'_>,
action: DomAction,
-) -> Result<Operation, StartError> {
+) -> Result<Option<Operation>, StartError> {
if action == DomAction::ResolveNode {
- return remote_object::prepare(conn, cmd);
+ return remote_object::prepare(conn, cmd).map(Some);
}
if action == DomAction::SetFileInputFiles {
- return files::prepare(conn, cmd);
+ return files::prepare(conn, cmd).map(Some);
}
- if mutation::handles(action) {
- return mutation::prepare(conn, cmd, action);
+ if let Some(operation) = mutation::prepare(conn, cmd, action)? {
+ return Ok(Some(operation));
}
let owner = CommandOwnerScope::capture(conn, cmd.session_id);
let session = conn.target_renderer_runtime_inspector_session_id_for_owner(&owner);
let top_frame = top_frame_id_for_owner(conn, &owner);
let whitespace = dom_agent_includes_whitespace_for_owner(conn, &owner);
- match action {
+ let operation = match action {
DomAction::GetDocument | DomAction::GetFlattenedDocument => {
let flattened = action == DomAction::GetFlattenedDocument;
let kind = if flattened {
@@ -536,8 +513,9 @@ fn prepare(
},
))
}
- _ => unreachable!("native DOM preparation is selected at admission"),
- }
+ _ => return Ok(None),
+ };
+ operation.map(Some)
}
fn node_not_found() -> Response {
diff --git a/moli-protocol/src/domains/dom/resolve/native/mutation.rs b/moli-protocol/src/domains/dom/resolve/native/mutation.rs
index 762429903..e9d5bec11 100644
--- a/moli-protocol/src/domains/dom/resolve/native/mutation.rs
+++ b/moli-protocol/src/domains/dom/resolve/native/mutation.rs
@@ -3,34 +3,14 @@
use super::*;
-pub(super) fn handles(action: DomAction) -> bool {
- matches!(
- action,
- DomAction::Disable
- | DomAction::RemoveNode
- | DomAction::Focus
- | DomAction::SetAttributeValue
- | DomAction::RemoveAttribute
- | DomAction::MoveTo
- | DomAction::SetAttributesAsText
- | DomAction::SetNodeName
- | DomAction::SetNodeValue
- | DomAction::SetOuterHtml
- | DomAction::ScrollIntoViewIfNeeded
- | DomAction::GetNodeForLocation
- | DomAction::SetNodeStackTracesEnabled
- | DomAction::GetNodeStackTraces
- )
-}
-
pub(super) fn prepare(
conn: &CdpConnection,
cmd: &Cmd<'_>,
action: DomAction,
-) -> Result<Operation, StartError> {
+) -> Result<Option<Operation>, StartError> {
let owner = CommandOwnerScope::capture(conn, cmd.session_id);
let session = conn.target_renderer_runtime_inspector_session_id_for_owner(&owner);
- match action {
+ let operation = match action {
DomAction::Disable => Ok(Operation::new(
Command::DiscardDomAgentFrontendBindings {
inspector_session_id: session,
@@ -286,8 +266,9 @@ pub(super) fn prepare(
},
))
}
- _ => unreachable!("DOM mutation preparation only handles its admitted actions"),
- }
+ _ => return Ok(None),
+ };
+ operation.map(Some)
}
fn unit(reply: anyhow::Result<Reply>, prefix: &str) -> Response {
diff --git a/moli-protocol/src/domains/page/native.rs b/moli-protocol/src/domains/page/native.rs
index 98817c244..da0962c60 100644
--- a/moli-protocol/src/domains/page/native.rs
+++ b/moli-protocol/src/domains/page/native.rs
@@ -11,40 +11,19 @@ use moli_core::{
pub(crate) fn try_start(conn: &mut CdpConnection, cmd: &Cmd<'_>) -> Option<NativeCommandStep> {
let action = cmd.parse_action::<PageAction>()?;
- if matches!(
- action,
- PageAction::CreateIsolatedWorld
- | PageAction::AddScriptToEvaluateOnNewDocument
- | PageAction::RemoveScriptToEvaluateOnNewDocument
- ) {
- return preload::native::try_start(conn, cmd, action);
+ match prepare(conn, cmd, action) {
+ Ok(Some(operation)) => Some(native::start_operation(conn, cmd, operation)),
+ Ok(None) => preload::native::try_start(conn, cmd, action),
+ Err(plan) => Some(NativeCommandStep::Complete(plan)),
}
-
- if !matches!(
- action,
- PageAction::GetFrameTree
- | PageAction::GetResourceTree
- | PageAction::GetLayoutMetrics
- | PageAction::CaptureScreenshot
- | PageAction::CaptureSnapshot
- | PageAction::SetDocumentContent
- | PageAction::SetBypassCsp
- | PageAction::ResetNavigationHistory
- ) {
- return None;
- }
- Some(match prepare(conn, cmd, action) {
- Ok(operation) => native::start_operation(conn, cmd, operation),
- Err(plan) => NativeCommandStep::Complete(plan),
- })
}
fn prepare(
conn: &mut CdpConnection,
cmd: &Cmd<'_>,
action: PageAction,
-) -> Result<Operation, CommandOutputPlan> {
- match action {
+) -> Result<Option<Operation>, CommandOutputPlan> {
+ let operation = match action {
PageAction::GetFrameTree | PageAction::GetResourceTree => {
resource_tree::prepare_native_tree(conn, cmd, action == PageAction::GetResourceTree)
}
@@ -196,6 +175,7 @@ fn prepare(
_ => unreachable!("Page history reset reply"),
},
)),
- _ => unreachable!("Page native preparation handles its admitted actions"),
- }
+ _ => return Ok(None),
+ };
+ operation.map(Some)
}