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(renderer): disable subframe loading during document retirement
ldm085332301b2c2
diff --git a/moli-protocol-server/src/protocol_server/tests/cdp_dynamic_page/auxiliary_page_retirement.rs b/moli-protocol-server/src/protocol_server/tests/cdp_dynamic_page/auxiliary_page_retirement.rsindex ce3a8bbeb..fcad3aac6 100644--- a/moli-protocol-server/src/protocol_server/tests/cdp_dynamic_page/auxiliary_page_retirement.rs+++ b/moli-protocol-server/src/protocol_server/tests/cdp_dynamic_page/auxiliary_page_retirement.rs@@ -80,6 +80,87 @@ async fn popup_document_access_keeps_retained_functions_and_checks_borrowed_receabort_test_cdp_server(server).await;}+#[tokio::test(flavor = "multi_thread", worker_threads = 2)]+async fn initial_popup_retirement_rejects_frames_created_by_navigation_cancellation() {+ let release = Arc::new(tokio::sync::Notify::new());+ let response = Arc::clone(&release);+ let (fixture_addr, _fixture) = spawn_dedicated_fixture_server(+ Router::new().fallback(get(move |uri: axum::http::Uri| {+ let response = Arc::clone(&response);+ async move {+ if uri.path() == "/child" {+ response.notified().await;+ }+ axum::response::Html("<p>loaded</p>")+ }+ })),+ "popup-retirement-reentry",+ );+ let base = format!("http://{fixture_addr}");+ let (addr, server) = spawn_test_protocol_server().await;+ let (mut browser, _) =+ connect_async(format!("ws://{addr}/devtools/browser/{DEFAULT_BROWSER_ID}"))+ .await+ .unwrap();+ let opener_id = create_dynamic_target(&mut browser, 1).await;+ let mut opener = connect_dynamic_page(addr, &opener_id).await;+ send_cdp_command(&mut opener, 1, "Page.enable", None, json!({})).await;+ navigate_dynamic_page_and_wait_for_load(&mut opener, 2, &format!("{base}/opener")).await;+ let (_child_id, mut child) = open_auxiliary_with_url(+ addr,+ &mut opener,+ "/child",+ "p.document.body.innerHTML='<iframe src=/frame></iframe>'",+ )+ .await;+ wait_for_value(+ &mut opener,+ "p.document.querySelector('iframe').contentDocument.URL.endsWith('/frame') && p.document.querySelector('iframe').contentDocument.readyState==='complete'",+ json!(true),+ )+ .await;+ assert_eq!(+ evaluate_window_name_probe(+ &mut opener,+ 2,+ r#"+ p.eval(`(() => {+ const w = document.querySelector('iframe').contentWindow;+ w.navigation.addEventListener('navigate', event => {+ event.intercept({handler: () => new Promise(() => {})});+ }, {once: true});+ w.navigation.addEventListener('navigateerror', () => {+ const next = document.createElement('iframe');+ document.body.appendChild(next);+ window.canceled = true;+ window.saved = next.contentWindow;+ }, {once: true});+ w.navigation.navigate(w.location.href + '#pending').finished.catch(() => {});+ return true;+ })()`)+ "#,+ )+ .await,+ true+ );+ release.notify_one();+ wait_for_value(&mut child, "document.URL", json!(format!("{base}/child"))).await;+ assert_eq!(+ evaluate_window_name_probe(+ &mut child,+ 3,+ "[window.canceled,window.saved===null,document.querySelectorAll('iframe').length]",+ )+ .await,+ json!([true, true, 0])+ );+ assert_eq!(+ evaluate_window_name_probe(&mut opener, 3, "p.closed").await,+ false+ );+ abort_test_cdp_server(server).await;+}+#[tokio::test(flavor = "multi_thread", worker_threads = 2)]async fn initial_popup_commit_keeps_window_timers_and_service_worker_completion() {let release = Arc::new(tokio::sync::Notify::new());diff --git a/moli-renderer-v8/src/native_bridge/context_host/child_frames/discovery.rs b/moli-renderer-v8/src/native_bridge/context_host/child_frames/discovery.rsindex b5e8eb292..feaf72171 100644--- a/moli-renderer-v8/src/native_bridge/context_host/child_frames/discovery.rs+++ b/moli-renderer-v8/src/native_bridge/context_host/child_frames/discovery.rs@@ -97,6 +97,17 @@ impl JsContextHost {}pub(crate) fn child_browsing_context_host_is_active(&self, handle: DomHandle) -> bool {+ if self+ .dom_host()+ .owner_document_handle(handle)+ .is_some_and(|document| {+ self.subframe_loading_disabled_documents+ .borrow()+ .contains_key(&document)+ })+ {+ return false;+ }self.dom_host().is_connected(handle)|| self.lightweight_popup_id_for_node_owner_document(handle)diff --git a/moli-renderer-v8/src/native_bridge/context_host/child_frames/registry.rs b/moli-renderer-v8/src/native_bridge/context_host/child_frames/registry.rsindex 95d698b8a..328fb3fc5 100644--- a/moli-renderer-v8/src/native_bridge/context_host/child_frames/registry.rs+++ b/moli-renderer-v8/src/native_bridge/context_host/child_frames/registry.rs@@ -2,6 +2,30 @@ use super::super::child_documents::ChildInitialEmptyDocumentInit;use super::*;use crate::custom_elements::{CustomElementRegistryAssociation, CustomElementRegistryKey};use crate::document_script_scheduler::FrameDocumentClassicScriptSchedulerWork;+use std::{cell::RefCell, collections::HashMap, rc::Rc};++/// Own the loading prohibition without borrowing the host across author JS.+/// Counts preserve outer prohibitions when nested retirement exits first.+#[must_use]+pub(crate) struct SubframeLoadingDisabler {+ state: Rc<RefCell<HashMap<DomHandle, usize>>>,+ documents: Vec<DomHandle>,+}++impl Drop for SubframeLoadingDisabler {+ fn drop(&mut self) {+ let mut state = self.state.borrow_mut();+ for document in &self.documents {+ let count = state+ .get_mut(document)+ .expect("a loading disabler must retain its registered Document");+ *count -= 1;+ if *count == 0 {+ state.remove(document);+ }+ }+ }+}/// Identity captured before author callbacks. The DOM handle can be reused by/// a newly attached browsing context while the old Window is being canceled.@@ -12,6 +36,34 @@ struct ChildWindowRetirement {}impl JsContextHost {+ /// Stop every outgoing Document in this subtree from admitting another+ /// browsing context before cancellation dispatches author callbacks.+ pub(crate) fn disable_subframe_loading_for_document_subtree(+ &self,+ document: DomHandle,+ ) -> SubframeLoadingDisabler {+ let mut documents = HashSet::new();+ let mut pending = vec![document];+ while let Some(document) = pending.pop() {+ if !documents.insert(document) {+ continue;+ }+ let mut children = Vec::new();+ self.collect_child_browsing_context_host_handles(document, &mut children);+ for child in children {+ if let Some(document) = self.child_browsing_context_document_handle(child) {+ pending.push(document);+ }+ }+ }+ let documents = documents.into_iter().collect::<Vec<_>>();+ let state = self.subframe_loading_disabled_documents.clone();+ for document in &documents {+ *state.borrow_mut().entry(*document).or_default() += 1;+ }+ SubframeLoadingDisabler { state, documents }+ }+fn remove_child_browsing_context_entry(&mut self,handle: DomHandle,@@ -643,11 +695,12 @@ impl JsContextHost {host_ptr: *mut Self,root: DomHandle,) {- let retirements = {+ let (retirements, _subframe_loading_disablers) = {let host = unsafe { &mut *host_ptr };let mut handles = Vec::new();host.collect_child_browsing_context_host_handles(root, &mut handles);let mut retirements = Vec::new();+ let mut disablers = Vec::new();// Mark the whole batch before the first callback: a handler for A// can reattach B before B reaches its own cancellation boundary.for handle in handles {@@ -668,11 +721,14 @@ impl JsContextHost {.current_child_document_task_owner(handle).map(|owner| owner.local_window_id),};+ if let Some(document) = host.child_browsing_context_document_handle(handle) {+ disablers.push(host.disable_subframe_loading_for_document_subtree(document));+ }host.prepare_child_window_retirement(handle);let window = host.child_window_proxy_records.live_window(scope, handle);retirements.push((retirement, window));}- retirements+ (retirements, disablers)};for (retirement, window) in retirements {// Settle the captured old Window even if an earlier callback hasdiff --git a/moli-renderer-v8/src/native_bridge/context_host/core.rs b/moli-renderer-v8/src/native_bridge/context_host/core.rsindex f88cd1e47..d08750a0a 100644--- a/moli-renderer-v8/src/native_bridge/context_host/core.rs+++ b/moli-renderer-v8/src/native_bridge/context_host/core.rs@@ -424,6 +424,7 @@ impl JsContextHost {viewport_surface: None,document_activity: moli_page_types::DocumentActivity::default(),initial_empty_main_document: false,+ subframe_loading_disabled_documents: Rc::default(),wpt_extensions_enabled: false,network_offline: false,navigator_overrides: Default::default(),diff --git a/moli-renderer-v8/src/native_bridge/context_host/mod.rs b/moli-renderer-v8/src/native_bridge/context_host/mod.rsindex cbe35a0ec..4e304a956 100644--- a/moli-renderer-v8/src/native_bridge/context_host/mod.rs+++ b/moli-renderer-v8/src/native_bridge/context_host/mod.rs@@ -884,6 +884,7 @@ pub(crate) struct JsContextHost {viewport_surface: Option<crate::protocol_types::ViewportSurface>,document_activity: moli_page_types::DocumentActivity,initial_empty_main_document: bool,+ subframe_loading_disabled_documents: Rc<RefCell<HashMap<DomHandle, usize>>>,wpt_extensions_enabled: bool,network_offline: bool,navigator_overrides: moli_page_types::NavigatorOverrides,diff --git a/moli-renderer-v8/src/script_vm.rs b/moli-renderer-v8/src/script_vm.rsindex 83cfc6c54..76a465409 100644--- a/moli-renderer-v8/src/script_vm.rs+++ b/moli-renderer-v8/src/script_vm.rs@@ -2666,6 +2666,10 @@ impl ScriptVm {}pub(super) fn close_page_context_resources_for_context_teardown(&mut self) {+ let _subframe_loading_disabler = self+ ._context_host+ .borrow()+ .disable_subframe_loading_for_document_subtree(self.document_runtime.document_handle());self.clear_context_wrapper_caches_for_context_teardown();clear_promise_rejection_dispatch_state(&self.promise_reject_dispatch);self._context_hostdiff --git a/moli-renderer-v8/src/script_vm/document_context_transition.rs b/moli-renderer-v8/src/script_vm/document_context_transition.rsindex 96c738d8e..849dbf40d 100644--- a/moli-renderer-v8/src/script_vm/document_context_transition.rs+++ b/moli-renderer-v8/src/script_vm/document_context_transition.rs@@ -79,8 +79,12 @@ impl ScriptVm {if self.current_main_document_task_owner() != Some(transition.retired_owner()) {return Err(anyhow!("main Document changed before the prepared commit"));}- let prepared = self.prepare_document_context_transition(transition.context_transition());let retired_document = self.document_runtime.document_handle();+ let _subframe_loading_disabler = self+ ._context_host+ .borrow()+ .disable_subframe_loading_for_document_subtree(retired_document);+ let prepared = self.prepare_document_context_transition(transition.context_transition());self.with_default_context_scope(|scope, host_ptr| {JsContextHost::drop_child_browsing_context_subtree_with_window_realm(scope,diff --git a/moli-renderer-v8/src/script_vm/tests/dom_elements/dom_surface/extracted/window_and_frame_surfaces.rs b/moli-renderer-v8/src/script_vm/tests/dom_elements/dom_surface/extracted/window_and_frame_surfaces.rsindex 6c8d4bcfa..a2c9d1353 100644--- a/moli-renderer-v8/src/script_vm/tests/dom_elements/dom_surface/extracted/window_and_frame_surfaces.rs+++ b/moli-renderer-v8/src/script_vm/tests/dom_elements/dom_surface/extracted/window_and_frame_surfaces.rs@@ -1,5 +1,52 @@use super::*;+#[test]+fn subframe_loading_resumes_after_nested_and_canceled_document_retirement() {+ let mut vm = new_storage_html_test_vm("https://scoped-frame-retirement.test/");+ vm.exec(+ r#"+ globalThis.tryNewFrame = () => {+ const frame = document.createElement('iframe');+ document.body.appendChild(frame);+ const loaded = frame.contentWindow !== null;+ frame.remove();+ return loaded;+ };+ "#,+ None,+ )+ .unwrap();+ let outer = {+ let host = vm._context_host.borrow();+ host.disable_subframe_loading_for_document_subtree(host.document_handle())+ };+ assert_eq!(vm.eval("tryNewFrame()").unwrap(), "false");+ let canceled: anyhow::Result<()> = vm.with_default_context_scope(|scope, host_ptr| {+ let host = unsafe { &*host_ptr };+ let _inner = host.disable_subframe_loading_for_document_subtree(host.document_handle());+ let source = crate::util::v8str(scope, "tryNewFrame()");+ let script = v8::Script::compile(scope, source, None).unwrap();+ assert!(+ crate::script_execution::execute_compiled_script(scope, script)+ .unwrap()+ .is_false()+ );+ Err(anyhow::anyhow!(+ "retirement canceled before replacing the Document"+ ))+ });+ assert!(canceled.is_err());+ assert_eq!(vm.eval("tryNewFrame()").unwrap(), "false");+ drop(outer);+ assert_eq!(vm.eval("tryNewFrame()").unwrap(), "true");+ vm.exec(+ "document.open();document.write('<body>new document</body>');document.close();",+ None,+ )+ .unwrap();+ assert_eq!(vm.eval("tryNewFrame()").unwrap(), "true");+}+#[test]fn document_getter_checks_the_actual_access_context_and_preserves_function_realms() {let mut vm = new_storage_html_test_vm("https://document-access-context.test/");