Best headless browser for AI agents. Lite, Fast, High-Compatibility. Built in Rust
Rust ai-agentsai-toolsbrowserbrowser-automationcloud-browserheadlessheadless-browserkitesurfplaywrightpuppeteerrustservoweb-crawlerweb-crawlingweb-scraperweb-scraping
refactor(dom): resolve attribute references in the renderer handler
ldm05c19ed1006e1
diff --git a/moli-cdp-smoke/moli_cdp_smoke/groups/cdp_ordering.py b/moli-cdp-smoke/moli_cdp_smoke/groups/cdp_ordering.pyindex 61ea9de66..6da9c33f4 100644--- a/moli-cdp-smoke/moli_cdp_smoke/groups/cdp_ordering.py+++ b/moli-cdp-smoke/moli_cdp_smoke/groups/cdp_ordering.py@@ -165,6 +165,7 @@ async def _native_prefix(wire: _Wire, page: _Page, _is_moli: bool) -> dict[str,("CSS.getComputedStyleForNode", {"nodeId": page.node}),("Accessibility.getFullAXTree", {}),("DOM.resolveNode", {"nodeId": page.node, "objectGroup": "cdp-ordering"}),+ ("DOM.getAttributes", {"nodeId": page.node}),("DOM.describeNode", {"backendNodeId": 2147483647}),]ids = [await wire.send(method, params, session) for method, params in commands]@@ -199,6 +200,8 @@ async def _native_prefix(wire: _Wire, page: _Page, _is_moli: bool) -> dict[str,assert_equal(replies[ids[4]]["result"]["node"]["nodeName"], "INPUT", "native node snapshot")color = next(p["value"] for p in replies[ids[5]]["result"]["computedStyle"] if p["name"] == "color")assert_equal(color, "rgb(255, 0, 0)", "native computed style")+ assert_equal(replies[ids[8]]["result"]["attributes"], ["id", "probe"],+ "native attributes share the renderer query and its ordered terminal")object_id = replies[ids[7]]["result"]["object"]["objectId"]resolved = await wire.call("Runtime.callFunctionOn", {"objectId": object_id, "functionDeclaration": "function() { return this.id; }",@@ -270,10 +273,12 @@ async def _pause(wire: _Wire, page: _Page, *, instrumentation: bool = False) ->async def _normal_pause(wire: _Wire, page: _Page, _is_moli: bool) -> dict[str, Any]:outer = await _pause(wire, page)commands = [("Page.getFrameTree", {}), ("DOM.describeNode", {"nodeId": page.node}),- ("CSS.getComputedStyleForNode", {"nodeId": page.node})]+ ("CSS.getComputedStyleForNode", {"nodeId": page.node}),+ ("DOM.getAttributes", {"nodeId": page.node})]ids = [await wire.send(method, params, page.session) for method, params in commands]- for rid in reversed(ids):- await wire.response(rid)+ replies = {rid: await wire.response(rid) for rid in reversed(ids)}+ assert_equal(replies[ids[-1]]["result"]["attributes"], ["id", "probe"],+ "native attributes resolve the frontend node while paused")if wire.has_response(outer):raise SmokeError("native queries must leave the outer evaluation paused")await wire.call("Debugger.resume", session=page.session)diff --git a/moli-core/src/page/mod.rs b/moli-core/src/page/mod.rsindex fa0ec384e..af35f2481 100644--- a/moli-core/src/page/mod.rs+++ b/moli-core/src/page/mod.rs@@ -185,7 +185,7 @@ pub use crate::renderer::{RendererDocumentQuerySelectorNode, RendererDocumentQuerySelectorResolution,RendererDocumentQuerySelectorWithChildNodeSnapshotEvents, RendererDomBidiNodeBindingResolution,RendererDomBidiNodeSharedIdResolution, RendererDomFrontendNodeBindingResolution,- RendererDomNodeCreationStackFrame, RendererDomNodeCreationStackTrace,+ RendererDomNodeCreationStackFrame, RendererDomNodeCreationStackTrace, RendererDomNodeReference,RendererDomNodeStackTraceResolution, RendererDomSearchRegistration,RendererDomSearchResultNode, RendererDomSearchResultsResolution, RendererRuntimeRemoteObject,RendererStyleSheetHeader, RendererStyleSheetInventoryUpdate, RendererStyleSheetPayload,diff --git a/moli-core/src/page/renderer_command_support.rs b/moli-core/src/page/renderer_command_support.rsindex a59c9d9f7..94203125d 100644--- a/moli-core/src/page/renderer_command_support.rs+++ b/moli-core/src/page/renderer_command_support.rs@@ -21,7 +21,7 @@ use crate::renderer::{RendererDocumentQuerySelectorWithChildNodeSnapshotEvents, RendererDomAttributeMutation,RendererDomAttributeMutationOutcome, RendererDomBidiNodeBindingResolution,RendererDomBidiNodeSharedIdResolution, RendererDomEdit, RendererDomEditOutcome,- RendererDomFocusOutcome, RendererDomFrontendNodeBindingResolution,+ RendererDomFocusOutcome, RendererDomFrontendNodeBindingResolution, RendererDomNodeReference,RendererDomNodeStackTraceResolution, RendererDomSearchRegistration,RendererDomSearchResultsResolution, RendererDomSnapshotCaptureOptions,RendererDomSnapshotCapturePayload, RendererLayoutMetrics, RendererPageCommand,@@ -1310,13 +1310,21 @@ impl Page {)}+ /// Resolve the native reference and read attributes in one renderer turn.+ pub fn start_document_node_attributes(+ &self,+ reference: RendererDomNodeReference,+ ) -> Result<PendingPageCommand> {+ self.start_page_command(RendererPageCommand::DocumentNodeAttributes { reference })+ }+pub fn start_document_node_attributes_for_backend_node_id(&self,backend_node_id: u32,) -> Result<PendingPageCommand> {- self.start_page_command(- RendererPageCommand::DocumentNodeAttributesForBackendNodeId { backend_node_id },- )+ self.start_document_node_attributes(RendererDomNodeReference::BackendNodeId(+ backend_node_id,+ ))}pub fn finish_document_node_attributes(diff --git a/moli-core/src/renderer.rs b/moli-core/src/renderer.rsindex 8fb459bdd..c877782bb 100644--- a/moli-core/src/renderer.rs+++ b/moli-core/src/renderer.rs@@ -34,9 +34,10 @@ pub use moli_renderer_v8::{RendererDocumentQuerySelectorWithChildNodeSnapshotEvents, RendererDomBidiNodeBindingResolution,RendererDomBidiNodeSharedIdResolution, RendererDomEdit, RendererDomEditOutcome,RendererDomFrontendNodeBindingResolution, RendererDomNodeCreationStackFrame,- RendererDomNodeCreationStackTrace, RendererDomNodeStackTraceResolution,- RendererDomSearchRegistration, RendererDomSearchResultNode, RendererDomSearchResultsResolution,- RendererStyleSheetHeader, RendererStyleSheetInventoryUpdate, RendererStyleSheetPayload,+ RendererDomNodeCreationStackTrace, RendererDomNodeReference,+ RendererDomNodeStackTraceResolution, RendererDomSearchRegistration,+ RendererDomSearchResultNode, RendererDomSearchResultsResolution, RendererStyleSheetHeader,+ RendererStyleSheetInventoryUpdate, RendererStyleSheetPayload,};pub use moli_renderer_v8::{PageVmInitStage, RendererReplyBoundary};diff --git a/moli-protocol/src/automation.rs b/moli-protocol/src/automation.rsindex cc9c985e3..907e6ebc2 100644--- a/moli-protocol/src/automation.rs+++ b/moli-protocol/src/automation.rs@@ -922,6 +922,23 @@ pub enum DevToolsDomNodeReference {BackendNodeId(u32),}+impl DevToolsDomNodeReference {+ pub(crate) fn into_renderer_reference(+ self,+ inspector_session_id: Option<String>,+ ) -> moli_core::page::RendererDomNodeReference {+ match self {+ Self::FrontendNodeId(frontend_node_id) => {+ moli_core::page::RendererDomNodeReference::FrontendNodeId {+ inspector_session_id,+ frontend_node_id,+ }+ }+ Self::BackendNodeId(id) => moli_core::page::RendererDomNodeReference::BackendNodeId(id),+ }+ }+}+#[derive(Debug, Clone, PartialEq, Eq)]pub struct DevToolsRequestChildNodesCommand {pub context: AutomationContext,diff --git a/moli-protocol/src/domains/css/native.rs b/moli-protocol/src/domains/css/native.rsindex 1122060ec..fe2f35dae 100644--- a/moli-protocol/src/domains/css/native.rs+++ b/moli-protocol/src/domains/css/native.rs@@ -161,9 +161,9 @@ fn backend_style_operation(backend_node_id: u32, query: StyleQuery) -> OperationStyleQuery::Computed => {Command::ComputedStylePropertiesForBackendNodeId { backend_node_id }}- StyleQuery::Inline(_) => {- Command::DocumentNodeAttributesForBackendNodeId { backend_node_id }- }+ StyleQuery::Inline(_) => Command::DocumentNodeAttributes {+ reference: moli_core::page::RendererDomNodeReference::BackendNodeId(backend_node_id),+ },};Operation::new(command, move |reply| project_style(reply, query))}diff --git a/moli-protocol/src/domains/dom/child_frame.rs b/moli-protocol/src/domains/dom/child_frame.rsindex 9148d82e9..02ebc1ad6 100644--- a/moli-protocol/src/domains/dom/child_frame.rs+++ b/moli-protocol/src/domains/dom/child_frame.rs@@ -199,10 +199,12 @@ async fn attributes_command(owner: &CommandOwnerScope,reference: DevToolsDomNodeReference,) -> Result<DevToolsGetAttributesResult, PendingDomCommandStartError> {- let reference = resolve_frontend_node_reference(conn, owner, reference).await?;+ let session = conn.target_renderer_runtime_inspector_session_id_for_owner(owner);let page = loaded_page_mut_for_owner(conn, owner).ok_or_else(PendingDomCommandStartError::no_document_loaded)?;- let pending = start_document_node_attributes_for_reference(page, reference)?;+ let pending = page+ .start_document_node_attributes(reference.into_renderer_reference(session))+ .map_err(PendingDomCommandStartError::renderer_error)?;let completion = pending.wait().await@@ -212,15 +214,6 @@ async fn attributes_command(.and_then(attributes_result_from_renderer_resolution)}-fn start_document_node_attributes_for_reference(- page: &Page,- reference: DevToolsDomNodeReference,-) -> Result<PendingPageCommand, PendingDomCommandStartError> {- let backend_node_id = required_child_frame_backend_node_id(&reference)?;- page.start_document_node_attributes_for_backend_node_id(backend_node_id)- .map_err(PendingDomCommandStartError::renderer_error)-}-async fn text_command(conn: &mut CdpConnection,owner: &CommandOwnerScope,diff --git a/moli-protocol/src/domains/dom/resolve.rs b/moli-protocol/src/domains/dom/resolve.rsindex 5b9c66f43..fc5385c7b 100644--- a/moli-protocol/src/domains/dom/resolve.rs+++ b/moli-protocol/src/domains/dom/resolve.rs@@ -226,9 +226,6 @@ pub(super) enum PendingDomCommandKind {object_group: Option<String>,top_frame_id: Option<String>,},- ResolveFrontendNodeForGetAttributes {- frontend_node_id: u32,- },ResolveFrontendNodeForGetText {frontend_node_id: u32,},@@ -497,15 +494,6 @@ fn required_backend_node_id_for_reference(}}-fn start_document_node_attributes_for_reference(- page: &Page,- reference: DevToolsDomNodeReference,-) -> Result<PendingPageCommand, PendingDomCommandStartError> {- let backend_node_id = required_backend_node_id_for_reference(&reference)?;- page.start_document_node_attributes_for_backend_node_id(backend_node_id)- .map_err(PendingDomCommandStartError::renderer_error)-}-fn start_document_node_text_for_reference(page: &Page,reference: DevToolsDomNodeReference,diff --git a/moli-protocol/src/domains/dom/resolve/native.rs b/moli-protocol/src/domains/dom/resolve/native.rsindex 254b45fef..966042cc0 100644--- a/moli-protocol/src/domains/dom/resolve/native.rs+++ b/moli-protocol/src/domains/dom/resolve/native.rs@@ -125,26 +125,21 @@ fn prepare(}DomAction::GetAttributes => {let params = build_cdp_get_attributes_command(conn, cmd)?;- Ok(with_backend(- session,- params.reference,- NestedMain,- |backend_node_id| {- Operation::new(- Command::DocumentNodeAttributesForBackendNodeId { backend_node_id },- |reply| match reply {- Ok(Reply::DocumentNodeAttributesResolution(resolution)) => {- match attributes_result_from_renderer_resolution(resolution) {- Ok(result) => Response::success(- json!({"attributes": result.attributes.into_iter().flat_map(|attr| [attr.name, attr.value]).collect::<Vec<_>>()}),- ),- Err(error) => Response::error(error.code, error.message),- }- }- Err(error) => Response::error(-32000, error.to_string()),- _ => unreachable!("DOM attributes reply"),- },- )+ Ok(Operation::new(+ Command::DocumentNodeAttributes {+ reference: params.reference.into_renderer_reference(session),+ },+ |reply| match reply {+ Ok(Reply::DocumentNodeAttributesResolution(resolution)) => {+ match attributes_result_from_renderer_resolution(resolution) {+ Ok(result) => Response::success(json!({+ "attributes": flatten_dom_attributes(result.attributes),+ })),+ Err(error) => Response::error(error.code, error.message),+ }+ }+ Err(error) => Response::error(-32000, error.to_string()),+ _ => unreachable!("DOM attributes reply"),},))}diff --git a/moli-protocol/src/domains/dom/resolve/node_completion.rs b/moli-protocol/src/domains/dom/resolve/node_completion.rsindex d3383d4ce..8565225a9 100644--- a/moli-protocol/src/domains/dom/resolve/node_completion.rs+++ b/moli-protocol/src/domains/dom/resolve/node_completion.rs@@ -38,15 +38,6 @@ pub(super) fn complete_pending_dom_command_result(let completion = *completed_work;let result = match completed.kind {- PendingDomCommandKind::ResolveFrontendNodeForGetAttributes { frontend_node_id } => {- return complete_frontend_node_binding_for_get_attributes_result(- conn,- completed.command_id,- &owner_scope,- completion,- frontend_node_id,- );- }PendingDomCommandKind::ResolveFrontendNodeForGetText { frontend_node_id } => {return complete_frontend_node_binding_for_get_text_result(conn,@@ -888,46 +879,6 @@ where}}-pub(super) fn complete_frontend_node_binding_for_get_attributes(- conn: &mut CdpConnection,- command_id: Option<u64>,- owner: &CommandOwnerScope,- completion: CompletedPageCommand,- _frontend_node_id: u32,- out: &mut DomCommandOutput,-) -> DomCommandTaskStep {- complete_frontend_node_binding_followup(- conn,- command_id,- owner,- completion,- out,- |page, reference| {- start_document_node_attributes_for_reference(page, reference)- .map(|pending| (pending, PendingDomCommandKind::GetAttributesLive))- },- )-}--pub(super) fn complete_frontend_node_binding_for_get_attributes_result(- conn: &mut CdpConnection,- command_id: Option<u64>,- owner: &CommandOwnerScope,- completion: CompletedPageCommand,- _frontend_node_id: u32,-) -> DevToolsDomCommandTaskStep {- complete_frontend_node_binding_followup_result(- conn,- command_id,- owner,- completion,- |page, reference| {- start_document_node_attributes_for_reference(page, reference)- .map(|pending| (pending, PendingDomCommandKind::GetAttributesLive))- },- )-}-pub(super) fn complete_frontend_node_binding_for_remove_node(conn: &mut CdpConnection,command_id: Option<u64>,diff --git a/moli-protocol/src/domains/dom/resolve/pending_command.rs b/moli-protocol/src/domains/dom/resolve/pending_command.rsindex 6f74fcea7..e6df833e2 100644--- a/moli-protocol/src/domains/dom/resolve/pending_command.rs+++ b/moli-protocol/src/domains/dom/resolve/pending_command.rs@@ -51,16 +51,6 @@ pub(super) fn complete_pending_dom_command(out,);}- PendingDomCommandKind::ResolveFrontendNodeForGetAttributes { frontend_node_id } => {- return complete_frontend_node_binding_for_get_attributes(- conn,- command_id,- &owner_scope,- completion,- frontend_node_id,- out,- );- }PendingDomCommandKind::ResolveFrontendNodeForGetText { frontend_node_id } => {return complete_frontend_node_binding_for_get_text(conn,@@ -664,7 +654,6 @@ pub(super) fn complete_pending_dom_command(| PendingDomCommandKind::DiscardSearchResultsLive| PendingDomCommandKind::SetNodeStackTracesEnabled| PendingDomCommandKind::GetNodeStackTraces- | PendingDomCommandKind::ResolveFrontendNodeForGetAttributes { .. }| PendingDomCommandKind::ResolveFrontendNodeForGetText { .. }| PendingDomCommandKind::ResolveFrontendNodeForGetProperty { .. }| PendingDomCommandKind::ResolveFrontendNodeForDomGeometry { .. }diff --git a/moli-protocol/src/domains/dom/resolve/protocol_dispatch.rs b/moli-protocol/src/domains/dom/resolve/protocol_dispatch.rsindex dc7e0219a..b9895376c 100644--- a/moli-protocol/src/domains/dom/resolve/protocol_dispatch.rs+++ b/moli-protocol/src/domains/dom/resolve/protocol_dispatch.rs@@ -27,19 +27,12 @@ pub(super) fn start_devtools_get_attributes_command(owner: &CommandOwnerScope,command: DevToolsGetAttributesCommand,) -> Result<Option<PendingDomCommandDispatch>, PendingDomCommandStartError> {- if let DevToolsDomNodeReference::FrontendNodeId(frontend_node_id) = command.reference {- return start_document_frontend_node_binding_command(- conn,- command_id,- owner,- frontend_node_id,- PendingDomCommandKind::ResolveFrontendNodeForGetAttributes { frontend_node_id },- );- }- let reference = command.reference;+ let session = conn.target_renderer_runtime_inspector_session_id_for_owner(owner);let page = loaded_page_mut_for_owner(conn, owner).ok_or_else(PendingDomCommandStartError::no_document_loaded)?;- let pending = start_document_node_attributes_for_reference(page, reference)?;+ let pending = page+ .start_document_node_attributes(command.reference.into_renderer_reference(session))+ .map_err(PendingDomCommandStartError::renderer_error)?;Ok(Some(PendingDomCommandDispatch {command_id,owner_scope: owner.clone(),diff --git a/moli-renderer-v8/src/devtools/command/nested.rs b/moli-renderer-v8/src/devtools/command/nested.rsindex f37943dee..6cd88e0f2 100644--- a/moli-renderer-v8/src/devtools/command/nested.rs+++ b/moli-renderer-v8/src/devtools/command/nested.rs@@ -58,7 +58,7 @@ impl RendererPageCommand {| Self::RegisterDocumentBidiNodeBinding { .. }| Self::DocumentBidiNodeBinding { .. }| Self::DocumentBidiNodeSharedIdForBackendNodeId { .. }- | Self::DocumentNodeAttributesForBackendNodeId { .. }+ | Self::DocumentNodeAttributes { .. }| Self::DocumentNodeTextForBackendNodeId { .. }| Self::DocumentNodePropertyForBackendNodeId { .. }| Self::AccessibilityTreePayloadsForDocument { .. }diff --git a/moli-renderer-v8/src/lib.rs b/moli-renderer-v8/src/lib.rsindex bba2c0320..28b6f4c7a 100644--- a/moli-renderer-v8/src/lib.rs+++ b/moli-renderer-v8/src/lib.rs@@ -257,8 +257,9 @@ pub use runtime::{RendererDomDebuggerEventListenersResolution, RendererDomDebuggerXhrBreakpoint, RendererDomEdit,RendererDomEditOutcome, RendererDomFocusOutcome, RendererDomFrontendNodeBindingResolution,RendererDomMutationEvent, RendererDomMutationEventBatch, RendererDomNodeCreationStackFrame,- RendererDomNodeCreationStackTrace, RendererDomNodeStackTraceResolution,- RendererDomSearchRegistration, RendererDomSearchResultNode, RendererDomSearchResultsResolution,+ RendererDomNodeCreationStackTrace, RendererDomNodeReference,+ RendererDomNodeStackTraceResolution, RendererDomSearchRegistration,+ RendererDomSearchResultNode, RendererDomSearchResultsResolution,RendererDomSnapshotCaptureOptions, RendererDomSnapshotCapturePayload, RendererDragData,RendererDragDataItem, RendererDraggedDirectory, RendererDraggedFile, RendererFrameToken,RendererGeometryQuad, RendererInputDispatchOutcome, RendererInspectorCommandEnvelope,diff --git a/moli-renderer-v8/src/runtime/mod.rs b/moli-renderer-v8/src/runtime/mod.rsindex 7f5af739e..a1f8df57e 100644--- a/moli-renderer-v8/src/runtime/mod.rs+++ b/moli-renderer-v8/src/runtime/mod.rs@@ -339,8 +339,9 @@ pub use self::page_surface::{RendererDomDebuggerEventListenersResolution, RendererDomDebuggerXhrBreakpoint, RendererDomEdit,RendererDomEditOutcome, RendererDomFocusOutcome, RendererDomFrontendNodeBindingResolution,RendererDomMutationEvent, RendererDomMutationEventBatch, RendererDomNodeCreationStackFrame,- RendererDomNodeCreationStackTrace, RendererDomNodeStackTraceResolution,- RendererDomSearchRegistration, RendererDomSearchResultNode, RendererDomSearchResultsResolution,+ RendererDomNodeCreationStackTrace, RendererDomNodeReference,+ RendererDomNodeStackTraceResolution, RendererDomSearchRegistration,+ RendererDomSearchResultNode, RendererDomSearchResultsResolution,RendererDomSnapshotCaptureOptions, RendererDomSnapshotCapturePayload, RendererDragData,RendererDragDataItem, RendererDraggedDirectory, RendererDraggedFile, RendererGeometryQuad,RendererInputDispatchOutcome, RendererInspectorProtocolConfiguration,diff --git a/moli-renderer-v8/src/runtime/page_commands.rs b/moli-renderer-v8/src/runtime/page_commands.rsindex 75f758ef4..4cc16f192 100644--- a/moli-renderer-v8/src/runtime/page_commands.rs+++ b/moli-renderer-v8/src/runtime/page_commands.rs@@ -752,9 +752,9 @@ impl PageVm {backend_node_id,),)),- RendererPageCommand::DocumentNodeAttributesForBackendNodeId { backend_node_id } => {+ RendererPageCommand::DocumentNodeAttributes { reference } => {Ok(RendererPageReply::DocumentNodeAttributesResolution(- self.document_node_attributes_for_backend_node_id(backend_node_id),+ self.document_node_attributes(reference),))}RendererPageCommand::DocumentNodeTextForBackendNodeId { backend_node_id } => {diff --git a/moli-renderer-v8/src/runtime/page_dom.rs b/moli-renderer-v8/src/runtime/page_dom.rsindex 0130bdab0..85b21f655 100644--- a/moli-renderer-v8/src/runtime/page_dom.rs+++ b/moli-renderer-v8/src/runtime/page_dom.rs@@ -2727,10 +2727,27 @@ impl PageVm {}}- pub(crate) fn document_node_attributes_for_live_handle(- &self,- handle: DomHandle,+ pub(crate) fn document_node_attributes(+ &mut self,+ reference: RendererDomNodeReference,) -> RendererDocumentNodeAttributesResolution {+ let backend_node_id = match reference {+ RendererDomNodeReference::BackendNodeId(id) => id,+ RendererDomNodeReference::FrontendNodeId {+ inspector_session_id,+ frontend_node_id,+ } => match self+ .document_frontend_node_binding(inspector_session_id.as_deref(), frontend_node_id)+ {+ RendererDomFrontendNodeBindingResolution::BackendNodeId(id) => id,+ RendererDomFrontendNodeBindingResolution::NotFound => {+ return RendererDocumentNodeAttributesResolution::MissingNode;+ }+ },+ };+ let Some(handle) = self.live_handle_for_backend_node_id(backend_node_id) else {+ return RendererDocumentNodeAttributesResolution::MissingNode;+ };let document = self.vm().document_runtime.dom_host().dom();let Some(node) = document.node(handle) else {return RendererDocumentNodeAttributesResolution::MissingNode;@@ -2746,16 +2763,6 @@ impl PageVm {RendererDocumentNodeAttributesResolution::Found(attributes)}- pub(crate) fn document_node_attributes_for_backend_node_id(- &mut self,- backend_node_id: u32,- ) -> RendererDocumentNodeAttributesResolution {- let Some(handle) = self.live_handle_for_backend_node_id(backend_node_id) else {- return RendererDocumentNodeAttributesResolution::MissingNode;- };- self.document_node_attributes_for_live_handle(handle)- }-pub(crate) fn document_node_text_for_live_handle(&self,handle: DomHandle,diff --git a/moli-renderer-v8/src/runtime/page_surface.rs b/moli-renderer-v8/src/runtime/page_surface.rsindex c85fba9ce..cd4a558d6 100644--- a/moli-renderer-v8/src/runtime/page_surface.rs+++ b/moli-renderer-v8/src/runtime/page_surface.rs@@ -4273,6 +4273,19 @@ pub struct RendererRuntimeRealmInfo {pub grant_universal_access: Option<bool>,}+/// A native DOM-agent reference, resolved against the current Page document.+/// Frontend IDs belong to one Inspector session; backend IDs use the Page's+/// live node registry. Inspector objects and WebDriver/BiDi handles require+/// their own resolution and cannot enter this native-only query boundary.+#[derive(Debug, Clone, PartialEq, Eq)]+pub enum RendererDomNodeReference {+ FrontendNodeId {+ inspector_session_id: Option<String>,+ frontend_node_id: u32,+ },+ BackendNodeId(u32),+}+#[derive(Debug, Clone, PartialEq, Eq)]pub enum RendererDocumentNodeAttributesResolution {Found(Vec<(String, String)>),@@ -4958,8 +4971,8 @@ pub enum RendererPageCommand {inspector_session_id: Option<String>,backend_node_id: u32,},- DocumentNodeAttributesForBackendNodeId {- backend_node_id: u32,+ DocumentNodeAttributes {+ reference: RendererDomNodeReference,},DocumentNodeTextForBackendNodeId {backend_node_id: u32,@@ -5591,9 +5604,7 @@ impl RendererPageCommand {Self::DocumentBidiNodeSharedIdForBackendNodeId { .. } => {Some("DocumentBidiNodeSharedIdForBackendNodeId")}- Self::DocumentNodeAttributesForBackendNodeId { .. } => {- Some("DocumentNodeAttributesForBackendNodeId")- }+ Self::DocumentNodeAttributes { .. } => Some("DocumentNodeAttributes"),Self::DocumentNodeTextForBackendNodeId { .. } => {Some("DocumentNodeTextForBackendNodeId")}diff --git a/moli-renderer-v8/src/runtime/tests/extracted/runtime_scripts.rs b/moli-renderer-v8/src/runtime/tests/extracted/runtime_scripts.rsindex f14fee628..aed128925 100644--- a/moli-renderer-v8/src/runtime/tests/extracted/runtime_scripts.rs+++ b/moli-renderer-v8/src/runtime/tests/extracted/runtime_scripts.rs@@ -1,5 +1,110 @@use super::*;+#[tokio::test(flavor = "multi_thread")]+async fn typed_attributes_resolve_scoped_references_against_live_nodes() {+ use super::{RendererDocumentNodeAttributesResolution as Attributes, RendererDomNodeReference};++ async fn attributes(+ page: &super::RendererPageHandle,+ reference: RendererDomNodeReference,+ ) -> Attributes {+ let (reply, _) = page+ .run_async_command(RendererPageCommand::DocumentNodeAttributes { reference })+ .await+ .expect("typed attributes query completes");+ let RendererPageReply::DocumentNodeAttributesResolution(result) = reply else {+ panic!("expected typed attribute resolution");+ };+ result+ }++ let runtime = JsRuntime::initialize();+ let loader = ResourceRequestClient::new(&moli_fetch::FetchConfig::default())+ .expect("default resource request client");+ let page = create_test_html_page(+ &runtime,+ &loader,+ url::Url::parse("https://example.test/attributes").unwrap(),+ "<!doctype html><html><body><input id='probe' data-state='before'></body></html>",+ )+ .await;+ let (reply, _) = page+ .run_async_command(RendererPageCommand::DocumentQuerySelectorForDocument {+ inspector_session_id: Some("attributes-a".to_owned()),+ include_whitespace: false,+ selector: "#probe".to_owned(),+ multiple: false,+ })+ .await+ .expect("bind the frontend node in session A");+ let RendererPageReply::DocumentQuerySelectorResolution(+ RendererDocumentQuerySelectorResolution::Found(nodes),+ ) = reply+ else {+ panic!("expected probe node");+ };+ let node = nodes[0];+ let frontend = RendererDomNodeReference::FrontendNodeId {+ inspector_session_id: Some("attributes-a".to_owned()),+ frontend_node_id: node.frontend_node_id,+ };+ assert_eq!(+ attributes(&page, frontend.clone()).await,+ Attributes::Found(vec![+ ("id".to_owned(), "probe".to_owned()),+ ("data-state".to_owned(), "before".to_owned()),+ ])+ );+ assert_eq!(+ attributes(+ &page,+ RendererDomNodeReference::FrontendNodeId {+ inspector_session_id: Some("attributes-b".to_owned()),+ frontend_node_id: node.frontend_node_id,+ },+ )+ .await,+ Attributes::MissingNode,+ "a frontend node ID must not inherit another session's binding"+ );+ page.run_async_command(RendererPageCommand::EvaluateExpression {+ expression: "document.querySelector('#probe').setAttribute('data-state', 'after')"+ .to_owned(),+ await_promise: false,+ })+ .await+ .expect("mutate the live node");+ let backend = RendererDomNodeReference::BackendNodeId(node.backend_node_id);+ assert_eq!(+ attributes(&page, frontend.clone()).await,+ attributes(&page, backend.clone()).await,+ "frontend and backend references must read the same live node"+ );+ assert!(matches!(+ attributes(&page, backend.clone()).await,+ Attributes::Found(values) if values.contains(&("data-state".to_owned(), "after".to_owned()))+ ));+ page.run_async_command(RendererPageCommand::DiscardDomAgentFrontendBindings {+ inspector_session_id: Some("attributes-a".to_owned()),+ })+ .await+ .expect("discard session A's frontend bindings");+ assert_eq!(attributes(&page, frontend).await, Attributes::MissingNode);++ let other_page = create_test_html_page(+ &runtime,+ &loader,+ url::Url::parse("https://example.test/other-attributes").unwrap(),+ "<!doctype html><html><body><input id='other'></body></html>",+ )+ .await;+ assert_eq!(+ attributes(&other_page, backend).await,+ Attributes::MissingNode,+ "backend references must belong to the queried Page document"+ );+}+#[tokio::test(flavor = "multi_thread")]async fn outer_html_document_command_includes_only_author_shadow_roots() {let runtime = JsRuntime::initialize();