Best headless browser for AI agents. Lite, Fast, High-Compatibility. Built in Rust
Rust ai-agentsai-toolsbrowserbrowser-automationcloud-browserheadlessheadless-browserkitesurfplaywrightpuppeteerrustservoweb-crawlerweb-crawlingweb-scraperweb-scraping
fix(devtools): preserve nested Main response order
ldm02c186e3c4abf
diff --git a/moli-core/src/page/js_evaluation.rs b/moli-core/src/page/js_evaluation.rsindex 584b2f351..7267ac648 100644--- a/moli-core/src/page/js_evaluation.rs+++ b/moli-core/src/page/js_evaluation.rs@@ -521,11 +521,6 @@ impl Page {) -> Result<PendingRuntimeInspectorCommandDispatch> {match inspector_route {RendererInspectorCommandRoute::MainThread => {- debug_assert_eq!(- response_delivery,- RendererInspectorResponseDelivery::CommandReply,- "Main Inspector responses have not migrated to session output"- );let route = self.handle.enqueue_runtime_inspector_main_command(RendererInspectorCommandEnvelope::new_main_protocol(RendererInspectorIngressTicket::new(@@ -536,6 +531,7 @@ impl Page {owner_context_resolution_action,raw_json,deferred_response,+ response_delivery,),);Ok(Self::pending_main_ingress_runtime_inspector_command_dispatch(route))diff --git a/moli-protocol/src/conn/runtime_eval.rs b/moli-protocol/src/conn/runtime_eval.rsindex faed0bfc2..2477b8b6a 100644--- a/moli-protocol/src/conn/runtime_eval.rs+++ b/moli-protocol/src/conn/runtime_eval.rs@@ -336,7 +336,12 @@ pub struct PendingRuntimeProtocolMessageDispatch {route: RuntimeProtocolMessagePageRoute,pending: PendingRuntimeProtocolMessageDispatchKind,deferred_response_rx: Option<RuntimeInspectorResponseReceiver>,- response_delivery: RendererInspectorResponseDelivery,+ // Main commands that fall back to the Page owner still complete through+ // the typed per-command reply capability.+ owner_response_delivery: RendererInspectorResponseDelivery,+ // A command claimed directly by the nested/IO Inspector receiver may use+ // the attachment-scoped DevTools session output capability instead.+ inspector_response_delivery: RendererInspectorResponseDelivery,}enum PendingRuntimeProtocolMessageDispatchKind {@@ -537,12 +542,20 @@ impl PendingRuntimeProtocolMessageDispatch {.await.map_err(|error| format!("runtime inspector dispatch failed: {error}"))?,};+ let response_delivery = if matches!(+ completion,+ moli_core::page::CompletedRuntimeInspectorCommandDispatch::Inspector+ ) {+ self.inspector_response_delivery+ } else {+ self.owner_response_delivery+ };Ok(CompletedRuntimeProtocolMessageDispatch {session_id: self.session_id,route: self.route,completion,deferred_response_rx: self.deferred_response_rx,- response_delivery: self.response_delivery,+ response_delivery,})}}@@ -861,6 +874,19 @@ impl CdpConnection {.renderer_call_for_frontend(cdp_request_id)}+ fn renderer_command_descriptor_for_renderer_if_attachment_matches_for_session_owner(+ &self,+ session_id: Option<&str>,+ renderer_call_id: RendererCallId,+ dispatched_attachment_id: RendererAgentAttachmentId,+ ) -> Option<RendererCommandDescriptor> {+ self.target_devtools_session_state_for_session(session_id)?+ .renderer_command_descriptor_for_renderer_if_attachment_matches(+ renderer_call_id,+ Some(dispatched_attachment_id),+ )+ }+pub(crate) fn renderer_runtime_command_cause_for_frontend(&self,session_id: Option<&str>,@@ -2995,6 +3021,18 @@ impl CdpConnection {let Some(renderer_call_id) = message.renderer_call_id() else {return true;};+ let result_object_group = self+ .renderer_command_descriptor_for_renderer_if_attachment_matches_for_session_owner(+ session_id,+ renderer_call_id,+ dispatched_attachment_id,+ )+ .and_then(|descriptor| {+ self.runtime_result_object_group_for_renderer_command_descriptor(+ session_id,+ &descriptor,+ )+ });let Some(correlation) = self.take_frontend_command_for_renderer_if_attachment_matches_for_session_owner(session_id,@@ -3011,10 +3049,51 @@ impl CdpConnection {return false;};message.value_mut()["id"] = json!(correlation.frontend_command_id().get());+ if message.value().get("result").is_some() {+ if let Some(object_group) = result_object_group.as_deref() {+ self.register_runtime_remote_object_ids_from_value_for_session_owner_with_group(+ session_id,+ message.value(),+ object_group,+ );+ } else {+ self.register_runtime_remote_object_ids_from_value_for_session_owner(+ session_id,+ message.value(),+ );+ }+ }true});}+ fn runtime_result_object_group_for_renderer_command_descriptor(+ &self,+ session_id: Option<&str>,+ descriptor: &RendererCommandDescriptor,+ ) -> Option<String> {+ let command = serde_json::from_str::<Value>(descriptor.frontend_payload()).ok()?;+ let method = command.get("method")?.as_str()?;+ let params = command.get("params")?.as_object()?;+ match method {+ "Runtime.evaluate" => params+ .get("objectGroup")+ .and_then(Value::as_str)+ .map(str::to_owned),+ "Runtime.callFunctionOn" => params+ .get("objectGroup")+ .and_then(Value::as_str)+ .map(str::to_owned)+ .or_else(|| {+ self.runtime_remote_object_group_for_session_owner(+ session_id,+ params.get("objectId")?.as_str()?,+ )+ }),+ _ => None,+ }+ }+fn start_or_enqueue_registered_runtime_inspector_response_ready(&self,command_id: u64,@@ -4377,7 +4456,8 @@ impl CdpConnection {route,pending,deferred_response_rx: None,- response_delivery: RendererInspectorResponseDelivery::CommandReply,+ owner_response_delivery: RendererInspectorResponseDelivery::CommandReply,+ inspector_response_delivery: RendererInspectorResponseDelivery::CommandReply,})}@@ -4464,7 +4544,8 @@ impl CdpConnection {route,pending: PendingRuntimeProtocolMessageDispatchKind::Routable(pending),deferred_response_rx: Some(response_receiver),- response_delivery,+ owner_response_delivery: response_delivery,+ inspector_response_delivery: response_delivery,})}@@ -4492,7 +4573,8 @@ impl CdpConnection {route,pending: PendingRuntimeProtocolMessageDispatchKind::Page(pending),deferred_response_rx: None,- response_delivery: RendererInspectorResponseDelivery::CommandReply,+ owner_response_delivery: RendererInspectorResponseDelivery::CommandReply,+ inspector_response_delivery: RendererInspectorResponseDelivery::CommandReply,})}@@ -4502,6 +4584,24 @@ impl CdpConnection {action: &str,descriptor: RendererCommandDescriptor,command_id: u64,+ ) -> Result<PendingRuntimeProtocolMessageDispatch, String> {+ let inspector_response_delivery = descriptor.response_delivery();+ self.start_runtime_protocol_message_with_context_resolution_for_session_owner_with_deferred_response_and_nested_delivery(+ session_id,+ action,+ descriptor,+ command_id,+ inspector_response_delivery,+ )+ }++ pub(crate) fn start_runtime_protocol_message_with_context_resolution_for_session_owner_with_deferred_response_and_nested_delivery(+ &mut self,+ session_id: Option<&str>,+ action: &str,+ descriptor: RendererCommandDescriptor,+ command_id: u64,+ inspector_response_delivery: RendererInspectorResponseDelivery,) -> Result<PendingRuntimeProtocolMessageDispatch, String> {let route = self.runtime_protocol_message_page_route_for_session_owner(session_id)?;let (correlation, raw_json, response_sender, response_receiver, response_delivery) = self@@ -4528,7 +4628,7 @@ impl CdpConnection {Some(action.to_owned()),raw_json,response_sender,- response_delivery,+ inspector_response_delivery,) {Ok(pending) => pending,Err(error) => {@@ -4543,7 +4643,8 @@ impl CdpConnection {route,pending: PendingRuntimeProtocolMessageDispatchKind::Routable(pending),deferred_response_rx: Some(response_receiver),- response_delivery,+ owner_response_delivery: response_delivery,+ inspector_response_delivery,})}@@ -4837,7 +4938,8 @@ impl CdpConnection {route,pending,deferred_response_rx: None,- response_delivery,+ owner_response_delivery: response_delivery,+ inspector_response_delivery: response_delivery,},Err(error) => {self.settle_renderer_replay_error(@@ -6132,7 +6234,7 @@ mod tests {let attachment_id = RendererAgentAttachmentId::allocate();let frontend = ParsedCdpCommand::parse_str(- r#"{"id":44,"method":"Debugger.getScriptSource","params":{"scriptId":"7"}}"#,+ r#"{"id":44,"method":"Runtime.evaluate","params":{"expression":"({ answer: 42 })","objectGroup":"nested-main"}}"#,).expect("frontend command should parse");let prepared = conn@@ -6156,7 +6258,12 @@ mod tests {})),RendererRuntimeInspectorMessage::protocol(json!({"id": correlation.renderer_call_id().get(),- "result": { "scriptSource": "source" },+ "result": {+ "result": {+ "type": "object",+ "objectId": "nested-main-object"+ }+ },})),RendererRuntimeInspectorMessage::protocol(json!({"id": correlation.renderer_call_id().get() + 1,@@ -6179,6 +6286,14 @@ mod tests {panic!("expected a protocol response");};assert_eq!(response.value()["id"], json!(44));+ assert_eq!(+ conn.runtime_remote_object_group_for_session_owner(+ Some("SID-session-output"),+ "nested-main-object",+ ),+ Some("nested-main".to_owned()),+ "session output must retain Runtime object ownership metadata",+ );assert!(conn.renderer_runtime_command_cause_for_frontend(Some("SID-session-output"), 44,).is_none(),diff --git a/moli-protocol/src/conn/state/devtools_session.rs b/moli-protocol/src/conn/state/devtools_session.rsindex 8b90413f2..e4b93157e 100644--- a/moli-protocol/src/conn/state/devtools_session.rs+++ b/moli-protocol/src/conn/state/devtools_session.rs@@ -232,6 +232,18 @@ impl DevToolsSessionState {.renderer_call_for_frontend(cdp_request_id)}+ pub(crate) fn renderer_command_descriptor_for_renderer_if_attachment_matches(+ &self,+ renderer_call_id: moli_page_types::RendererCallId,+ dispatched_attachment_id: Option<moli_page_types::RendererAgentAttachmentId>,+ ) -> Option<RendererCommandDescriptor> {+ self.pending_inspector_awaits+ .renderer_command_descriptor_for_renderer_if_attachment_matches(+ renderer_call_id,+ dispatched_attachment_id,+ )+ }+pub(crate) fn prepare_renderer_call_replays(&mut self,old_attachment_id: moli_page_types::RendererAgentAttachmentId,diff --git a/moli-protocol/src/conn/state/parking.rs b/moli-protocol/src/conn/state/parking.rsindex 329124c03..9e18ac57f 100644--- a/moli-protocol/src/conn/state/parking.rs+++ b/moli-protocol/src/conn/state/parking.rs@@ -602,6 +602,18 @@ impl TargetPendingInspectorAwaitRegistry {.renderer_call_for_frontend(FrontendCommandId::new(cdp_request_id))}+ pub(crate) fn renderer_command_descriptor_for_renderer_if_attachment_matches(+ &self,+ renderer_call_id: moli_page_types::RendererCallId,+ dispatched_attachment_id: Option<moli_page_types::RendererAgentAttachmentId>,+ ) -> Option<RendererCommandDescriptor> {+ self.entries+ .renderer_command_descriptor_for_renderer_if_attachment_matches(+ renderer_call_id,+ dispatched_attachment_id,+ )+ }+pub(crate) fn prepare_renderer_call_replays(&mut self,old_attachment_id: moli_page_types::RendererAgentAttachmentId,diff --git a/moli-protocol/src/conn/state/pending_renderer_command.rs b/moli-protocol/src/conn/state/pending_renderer_command.rsindex cab42bd28..de7f15f34 100644--- a/moli-protocol/src/conn/state/pending_renderer_command.rs+++ b/moli-protocol/src/conn/state/pending_renderer_command.rs@@ -578,6 +578,17 @@ impl<T> PendingRendererCommandRegistry<T> {})}+ pub(crate) fn renderer_command_descriptor_for_renderer_if_attachment_matches(+ &self,+ renderer_call_id: RendererCallId,+ dispatched_attachment_id: Option<RendererAgentAttachmentId>,+ ) -> Option<RendererCommandDescriptor> {+ let frontend_command_id = self.frontend_commands_by_renderer.get(&renderer_call_id)?;+ let registered_call = self.renderer_calls_by_frontend.get(frontend_command_id)?;+ (registered_call.dispatched_attachment_id == dispatched_attachment_id)+ .then(|| registered_call.descriptor.clone())+ }+#[cfg(test)]pub(crate) fn renderer_command_descriptor_for_frontend(&self,diff --git a/moli-protocol/src/domains/runtime/dispatcher.rs b/moli-protocol/src/domains/runtime/dispatcher.rsindex 36d439720..2f0037592 100644--- a/moli-protocol/src/domains/runtime/dispatcher.rs+++ b/moli-protocol/src/domains/runtime/dispatcher.rs@@ -1891,6 +1891,22 @@ fn start_pending_runtime_context_resolved_inspector_dispatch(cmd: &Cmd<'_>,action: &'static str,inspector_json: String,+) -> Result<PendingRuntimeProtocolMessageDispatch, String> {+ start_pending_runtime_context_resolved_inspector_dispatch_with_delivery(+ conn,+ cmd,+ action,+ inspector_json,+ RendererInspectorResponseDelivery::CommandReply,+ )+}++fn start_pending_runtime_context_resolved_inspector_dispatch_with_delivery(+ conn: &mut CdpConnection,+ cmd: &Cmd<'_>,+ action: &'static str,+ inspector_json: String,+ nested_response_delivery: RendererInspectorResponseDelivery,) -> Result<PendingRuntimeProtocolMessageDispatch, String> {if let Some(command_id) = cmd.id {let descriptor = RendererCommandDescriptor::from_frontend_policy(@@ -1898,12 +1914,13 @@ fn start_pending_runtime_context_resolved_inspector_dispatch(cmd.renderer_policy(),RendererInspectorResponseDelivery::CommandReply,);- conn.start_runtime_protocol_message_with_context_resolution_for_session_owner_with_deferred_response(- cmd.session_id,- action,- descriptor,- command_id,- )+ conn.start_runtime_protocol_message_with_context_resolution_for_session_owner_with_deferred_response_and_nested_delivery(+ cmd.session_id,+ action,+ descriptor,+ command_id,+ nested_response_delivery,+ )} else {conn.start_runtime_protocol_message_with_context_resolution_for_session_owner(cmd.session_id,@@ -1990,13 +2007,14 @@ fn start_cdp_devtools_script_runtime_command(let (browser_context_id, target_id) =devtools_runtime_owner_identity_for_session(conn, cmd.session_id);let action = command_kind.action();+ let await_promise = runtime_command_awaits_promise(cmd, action);let command = match command_kind {RuntimeDevToolsScriptCommand::Evaluate => {DevToolsCommand::EvaluateScript(build_cdp_evaluate_script_command(cmd,target_id.as_deref(),browser_context_id.as_deref(),- runtime_command_awaits_promise(cmd, action),+ await_promise,))}RuntimeDevToolsScriptCommand::CallFunctionOn => {@@ -2019,7 +2037,12 @@ fn start_cdp_devtools_script_runtime_command(cmd,command,inspector_json,- runtime_command_awaits_promise(cmd, action),+ await_promise,+ if await_promise {+ RendererInspectorResponseDelivery::CommandReply+ } else {+ RendererInspectorResponseDelivery::DevToolsSession+ },)}@@ -2043,6 +2066,7 @@ fn start_devtools_runtime_command(command: DevToolsCommand,inspector_json: String,wait_for_deferred_reply: bool,+ response_delivery: RendererInspectorResponseDelivery,) -> RuntimeCommandTaskStep {let (action, action_label, await_promise) = match &command {DevToolsCommand::EvaluateScript(command) => {@@ -2082,11 +2106,12 @@ fn start_devtools_runtime_command());}};- let pending = match start_pending_runtime_context_resolved_inspector_dispatch(+ let pending = match start_pending_runtime_context_resolved_inspector_dispatch_with_delivery(conn,cmd,action_label,inspector_json,+ response_delivery,) {Ok(pending) => pending,Err(message) => {@@ -4593,6 +4618,7 @@ async fn start_protocol_neutral_runtime_command(command,inspector_json,runtime_command_awaits_promise(&cmd, RuntimeAction::Evaluate),+ RendererInspectorResponseDelivery::CommandReply,),Err(message) => {RuntimeCommandTaskStep::Complete(runtime_inspector_error_plan(cmd.id, message))@@ -4649,6 +4675,7 @@ async fn start_protocol_neutral_runtime_command(command,inspector_json,runtime_command_awaits_promise(&cmd, RuntimeAction::CallFunctionOn),+ RendererInspectorResponseDelivery::CommandReply,),Err(message) => RuntimeCommandTaskStep::Complete(runtime_inspector_error_plan(cmd.id, message),@@ -10249,6 +10276,7 @@ mod protocol_neutral_tests {};use moli_core::RendererOwnerLocalHostId;use moli_core::page::{MAX_INSPECTOR_PROTOCOL_VALUE_DEPTH, RendererSharedWorkerConsoleMessage};+ use moli_page_types::RendererInspectorResponseDelivery;use moli_shared_worker::SharedWorkerInstanceId;use serde_json::{Value, json};@@ -11254,6 +11282,7 @@ mod protocol_neutral_tests {DevToolsCommand::EvaluateScript(command),cmd.json.to_owned(),false,+ RendererInspectorResponseDelivery::CommandReply,);let RuntimeCommandTaskStep::Complete(plan) = step else {@@ -11297,6 +11326,7 @@ mod protocol_neutral_tests {DevToolsCommand::EvaluateScript(command),cmd.json.to_owned(),true,+ RendererInspectorResponseDelivery::CommandReply,);let RuntimeCommandTaskStep::Complete(plan) = step else {diff --git a/moli-renderer-v8/src/devtools/command.rs b/moli-renderer-v8/src/devtools/command.rsindex 9db4b4ef8..edb3c54a5 100644--- a/moli-renderer-v8/src/devtools/command.rs+++ b/moli-renderer-v8/src/devtools/command.rs@@ -132,6 +132,9 @@ pub struct RendererInspectorCommandEnvelope {first_dispatch: RendererInspectorFirstDispatchLifecycle,pause_effect: RendererInspectorPauseCommandEffect,main_dispatch_boundary: RendererInspectorMainDispatchBoundary,+ /// Terminal sink when an Inspector session directly claims this command.+ /// A Main command claimed by the Page owner keeps its typed reply sink.+ inspector_response_delivery: RendererInspectorResponseDelivery,payload: RendererInspectorCommandPayload,}@@ -398,7 +401,6 @@ enum RendererInspectorCommandPayload {Io {raw_json: String,response: Option<RendererRuntimeInspectorResponseSender>,- response_delivery: RendererInspectorResponseDelivery,},}@@ -416,6 +418,7 @@ impl RendererInspectorCommandEnvelope {first_dispatch: RendererInspectorFirstDispatchLifecycle::OrderedUntilFirstDispatch,pause_effect: RendererInspectorPauseCommandEffect::None,main_dispatch_boundary: RendererInspectorMainDispatchBoundary::PageOwner,+ inspector_response_delivery: RendererInspectorResponseDelivery::CommandReply,payload: RendererInspectorCommandPayload::MainThread(command),}}@@ -426,6 +429,7 @@ impl RendererInspectorCommandEnvelope {owner_context_resolution_action: Option<String>,raw_json: String,response: RendererRuntimeInspectorResponseSender,+ inspector_response_delivery: RendererInspectorResponseDelivery,) -> Self {assert_eq!(ticket.route(),@@ -457,6 +461,7 @@ impl RendererInspectorCommandEnvelope {first_dispatch: RendererInspectorFirstDispatchLifecycle::OrderedUntilFirstDispatch,pause_effect: RendererInspectorPauseCommandEffect::from_message(message.as_ref()),main_dispatch_boundary,+ inspector_response_delivery,payload: RendererInspectorCommandPayload::MainThread(command),}}@@ -479,11 +484,8 @@ impl RendererInspectorCommandEnvelope {first_dispatch: RendererInspectorFirstDispatchLifecycle::OrderedUntilFirstDispatch,pause_effect: RendererInspectorPauseCommandEffect::from_message(message.as_ref()),main_dispatch_boundary: RendererInspectorMainDispatchBoundary::InspectorSession,- payload: RendererInspectorCommandPayload::Io {- raw_json,- response,- response_delivery,- },+ inspector_response_delivery: response_delivery,+ payload: RendererInspectorCommandPayload::Io { raw_json, response },}}@@ -499,6 +501,10 @@ impl RendererInspectorCommandEnvelope {self.pause_effect}+ pub(crate) fn inspector_response_delivery(&self) -> RendererInspectorResponseDelivery {+ self.inspector_response_delivery+ }+pub(crate) fn can_dispatch_at_nested_inspector_session_boundary(&self) -> bool {self.main_dispatch_boundary == RendererInspectorMainDispatchBoundary::InspectorSession}@@ -606,13 +612,10 @@ impl RendererInspectorCommandEnvelope {}pub(crate) fn io_response_delivery(&self) -> RendererInspectorResponseDelivery {- let RendererInspectorCommandPayload::Io {- response_delivery, ..- } = &self.payload- else {+ let RendererInspectorCommandPayload::Io { .. } = &self.payload else {panic!("a MainThread Inspector envelope cannot enter IO dispatch");};- *response_delivery+ self.inspector_response_delivery}pub(crate) fn take_io_response(&mut self) -> Option<RendererRuntimeInspectorResponseSender> {diff --git a/moli-renderer-v8/src/devtools/ingress/main.rs b/moli-renderer-v8/src/devtools/ingress/main.rsindex f9af35306..93292dc0d 100644--- a/moli-renderer-v8/src/devtools/ingress/main.rs+++ b/moli-renderer-v8/src/devtools/ingress/main.rs@@ -95,6 +95,15 @@ impl RendererInspectorMainCommand {.pause_effect()}+ pub(crate) fn inspector_response_delivery(+ &self,+ ) -> moli_page_types::RendererInspectorResponseDelivery {+ self.envelope+ .inspector_envelope()+ .expect("an Inspector response delivery requires an Inspector payload")+ .inspector_response_delivery()+ }+pub(crate) fn nested_dispatch(&self) -> RendererDevToolsMainNestedDispatch {self.envelope.nested_dispatch()}@@ -706,6 +715,7 @@ mod tests {action.map(str::to_owned),raw_json.to_owned(),RendererRuntimeInspectorResponseSender::new(1, response_tx),+ moli_page_types::RendererInspectorResponseDelivery::CommandReply,),)}diff --git a/moli-renderer-v8/src/devtools/target.rs b/moli-renderer-v8/src/devtools/target.rsindex 3a4e736e0..df75c3537 100644--- a/moli-renderer-v8/src/devtools/target.rs+++ b/moli-renderer-v8/src/devtools/target.rs@@ -155,6 +155,7 @@ mod tests {None,r#"{"id":1,"method":"Runtime.evaluate"}"#.to_owned(),RendererRuntimeInspectorResponseSender::new(1, response_tx),+ moli_page_types::RendererInspectorResponseDelivery::CommandReply,),);diff --git a/moli-renderer-v8/src/script_vm/inspector/v8_backend.rs b/moli-renderer-v8/src/script_vm/inspector/v8_backend.rsindex 56ec1d607..25d28bcf9 100644--- a/moli-renderer-v8/src/script_vm/inspector/v8_backend.rs+++ b/moli-renderer-v8/src/script_vm/inspector/v8_backend.rs@@ -312,8 +312,11 @@ impl RendererInspectorSessionExecutorLocal {command.pause_effect(),Some(command.response().call_id()),);+ let response_delivery = command.inspector_response_delivery();let (_, raw_json, response) = command.into_protocol_parts();- session.outbound.register_response_callback(response);+ session+ .outbound+ .register_frontend_response_callback(response, response_delivery);let _post_dispatch_wake = first_dispatch.release_for_dispatch();v8_session.dispatch_protocol_message(v8::inspector::StringView::from(raw_json.as_bytes()));self.target.pause_ref().record_v8_state_update(