The headless browser for AI agents and web scraping
fix: address reviewed PR 1027 validation finding
SGavrl3f8a8d15eee2
diff --git a/crates/obscura-cdp/src/dispatch.rs b/crates/obscura-cdp/src/dispatch.rsindex 0806111c..f2a2ebd7 100644--- a/crates/obscura-cdp/src/dispatch.rs+++ b/crates/obscura-cdp/src/dispatch.rs@@ -84,6 +84,8 @@ pub struct CdpContext {/// Sessions that called Runtime.enable. Console and exception events are/// page-scoped but only delivered to these subscribers.pub runtime_enabled_sessions: HashSet<String>,+ /// Page.setLifecycleEventsEnabled subscriptions, independent of Runtime.+ pub(crate) lifecycle_enabled_sessions: HashSet<String>,// Legacy direct-embedder configuration. Protocol-created worlds live only// in `page_isolated_worlds`, so this vector does not grow with page churn.pub isolated_worlds: Vec<String>,@@ -188,6 +190,7 @@ impl CdpContext {preload_scripts: Vec::new(),binding_sessions: HashMap::new(),runtime_enabled_sessions: HashSet::new(),+ lifecycle_enabled_sessions: HashSet::new(),preload_counter: 0,fetch_intercept: FetchInterceptState::new(),intercept_tx: None,@@ -345,6 +348,7 @@ impl CdpContext {}for session_id in &removed_sessions {self.runtime_enabled_sessions.remove(session_id);+ self.lifecycle_enabled_sessions.remove(session_id);}if let Some(context_ids) = self.page_contexts.remove(id) {for context_id in context_ids {@@ -865,7 +869,7 @@ pub(crate) fn drain_runtime_events(ctx: &mut CdpContext) {}let mut page_to_sessions: HashMap<&str, Vec<&str>> = HashMap::new();- for session_id in &ctx.runtime_enabled_sessions {+ for session_id in ctx.runtime_enabled_sessions.union(&ctx.lifecycle_enabled_sessions) {if let Some(page_id) = ctx.sessions.get(session_id) {page_to_sessions.entry(page_id.as_str())@@ -883,7 +887,15 @@ pub(crate) fn drain_runtime_events(ctx: &mut CdpContext) {};let execution_context_id = ctx.default_context_id(&page_id).unwrap_or(1);for runtime_event in runtime_events {+ let subscribers = if matches!(&runtime_event, obscura_js::ops::RuntimeEvent::DocumentLifecycle { .. }) {+ &ctx.lifecycle_enabled_sessions+ } else {+ &ctx.runtime_enabled_sessions+ };for session_id in sessions {+ if !subscribers.contains(*session_id) {+ continue;+ }let (method, params) = match &runtime_event {obscura_js::ops::RuntimeEvent::DocumentLifecycle { name, timestamp } => ("Page.lifecycleEvent",diff --git a/crates/obscura-cdp/src/domains/page.rs b/crates/obscura-cdp/src/domains/page.rsindex e6d8ff11..f168a311 100644--- a/crates/obscura-cdp/src/domains/page.rs+++ b/crates/obscura-cdp/src/domains/page.rs@@ -1360,7 +1360,21 @@ pub async fn handle(Ok(json!({ "executionContextId": context.id }))}- "setLifecycleEventsEnabled" => Ok(json!({})),+ "setLifecycleEventsEnabled" => {+ let enabled = params.get("enabled").and_then(Value::as_bool)+ .ok_or("enabled must be a boolean")?;+ if let Some(session) = session_id {+ if !ctx.sessions.contains_key(session) {+ return Err("Unknown page session".to_string());+ }+ if enabled {+ ctx.lifecycle_enabled_sessions.insert(session.clone());+ } else {+ ctx.lifecycle_enabled_sessions.remove(session);+ }+ }+ Ok(json!({}))+ }"addScriptToEvaluateOnNewDocument" => {let source = params.get("source").and_then(|v| v.as_str()).unwrap_or("");ctx.preload_counter += 1;diff --git a/crates/obscura-cdp/src/domains/target.rs b/crates/obscura-cdp/src/domains/target.rsindex a554d5ba..3276f67d 100644--- a/crates/obscura-cdp/src/domains/target.rs+++ b/crates/obscura-cdp/src/domains/target.rs@@ -245,6 +245,7 @@ pub async fn handle(let page_id = ctx.sessions.get(session_id).cloned();ctx.sessions.remove(session_id);ctx.runtime_enabled_sessions.remove(session_id);+ ctx.lifecycle_enabled_sessions.remove(session_id);if let Some(page_id) = page_id {ctx.refresh_runtime_event_collection(&page_id);}diff --git a/crates/obscura-cdp/tests/document_write_lifecycle.rs b/crates/obscura-cdp/tests/document_write_lifecycle.rsindex 1d3e415a..45284d55 100644--- a/crates/obscura-cdp/tests/document_write_lifecycle.rs+++ b/crates/obscura-cdp/tests/document_write_lifecycle.rs@@ -16,6 +16,7 @@ async fn document_replacement_emits_ordered_lifecycle_without_replacing_the_contlet page = ctx.create_page();ctx.sessions.insert("write-session".into(), page.clone());call(&mut ctx, "Page.enable", json!({}), "write-session").await;+ call(&mut ctx, "Page.setLifecycleEventsEnabled", json!({"enabled":true}), "write-session").await;call(&mut ctx, "Runtime.enable", json!({}), "write-session").await;call(&mut ctx, "Page.navigate", json!({"url":"data:text/html,<title>old</title><p>old</p>"}), "write-session").await;ctx.pending_events.clear();@@ -42,3 +43,61 @@ async fn document_replacement_emits_ordered_lifecycle_without_replacing_the_contctx.pending_events.clear();}}+++#[tokio::test(flavor = "current_thread")]+async fn document_lifecycle_subscriptions_are_independent_of_runtime() {+ let mut ctx = CdpContext::new();+ let page = ctx.create_page();+ ctx.sessions.insert("lifecycle".into(), page.clone());+ ctx.sessions.insert("console".into(), page.clone());+ call(&mut ctx, "Page.enable", json!({}), "lifecycle").await;+ call(&mut ctx, "Page.navigate", json!({"url":"data:text/html,<p>old</p>"}), "lifecycle").await;+ call(&mut ctx, "Page.setLifecycleEventsEnabled", json!({"enabled":true}), "lifecycle").await;+ ctx.pending_events.clear();++ // No Runtime subscriber: document completion must still be delivered.+ // Then add a distinct Runtime-only subscriber, and finally disable it.+ for phase in 0..3 {+ if phase == 1 {+ call(&mut ctx, "Runtime.enable", json!({}), "console").await;+ } else if phase == 2 {+ call(&mut ctx, "Runtime.disable", json!({}), "console").await;+ }+ ctx.pending_events.clear();+ call(&mut ctx, "Runtime.evaluate", json!({"expression":r#"(() => {+ document.open(); console.debug('subscription-marker');+ document.write('<p>replacement</p>'); document.close();+ })()"#}), "lifecycle").await;+ ctx.get_session_page_mut(&Some("lifecycle".into())).unwrap().settle(40).await;+ call(&mut ctx, "Runtime.evaluate", json!({"expression":"document.readyState"}), "lifecycle").await;+ let lifecycle: Vec<_> = ctx.pending_events.iter()+ .filter(|event| event.method == "Page.lifecycleEvent")+ .map(|event| (event.session_id.as_deref(), event.params["name"].as_str().unwrap()))+ .collect();+ assert_eq!(lifecycle, vec![+ (Some("lifecycle"), "init"),+ (Some("lifecycle"), "DOMContentLoaded"),+ (Some("lifecycle"), "load"),+ ], "phase {phase}");+ let console: Vec<_> = ctx.pending_events.iter()+ .filter(|event| event.method == "Runtime.consoleAPICalled")+ .map(|event| event.session_id.as_deref()).collect();+ if phase == 1 {+ assert_eq!(console, vec![Some("console")]);+ } else {+ assert!(console.is_empty(), "Runtime events without a subscriber");+ }+ }++ // Disabling Page lifecycle must not be undone by enabling Runtime.+ call(&mut ctx, "Page.setLifecycleEventsEnabled", json!({"enabled":false}), "lifecycle").await;+ call(&mut ctx, "Runtime.enable", json!({}), "console").await;+ ctx.pending_events.clear();+ call(&mut ctx, "Runtime.evaluate", json!({"expression":+ "document.open(); document.write('<p>quiet</p>'); document.close()"+ }), "lifecycle").await;+ ctx.get_session_page_mut(&Some("lifecycle".into())).unwrap().settle(40).await;+ call(&mut ctx, "Runtime.evaluate", json!({"expression":"document.readyState"}), "lifecycle").await;+ assert!(!ctx.pending_events.iter().any(|event| event.method == "Page.lifecycleEvent"));+}diff --git a/crates/obscura-js/src/ops.rs b/crates/obscura-js/src/ops.rsindex bc144b6d..335e7e58 100644--- a/crates/obscura-js/src/ops.rs+++ b/crates/obscura-js/src/ops.rs@@ -1468,7 +1468,9 @@ fn op_dom(fn op_dom_inner(shared: SharedState, cmd: String, arg1: String, arg2: String) -> String {if cmd == "document_lifecycle" {let mut state = shared.borrow_mut();- if state.runtime_events_enabled && matches!(arg1.as_str(), "init" | "DOMContentLoaded" | "load") {+ // Page lifecycle collection is independent of Runtime.enable.+ // The queue remains bounded; CDP filters delivery by Page subscription.+ if matches!(arg1.as_str(), "init" | "DOMContentLoaded" | "load") {if state.pending_runtime_events.len() >= 1_024 {state.pending_runtime_events.pop_front();}