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(cdp): align target handler and activation semantics
ldm03438613f8f60
diff --git a/moli-protocol/src/conn.rs b/moli-protocol/src/conn.rsindex ea8ef8571..bd04ca427 100644--- a/moli-protocol/src/conn.rs+++ b/moli-protocol/src/conn.rs@@ -72,7 +72,7 @@ pub(crate) use bidi_channel_work::{BidiChannelPageOwner,};pub(crate) use body_spool::{CapturedBody, CapturedBodyWriter};-pub(crate) use browser_context::CdpSessionRoute;+pub(crate) use browser_context::{CdpSessionRoute, TargetHandlerAccessMode};pub(crate) use browser_context::{PageLifecycleEventsEnableResult, SessionOwnerInspectorEnableResult,SessionOwnerRuntimeFrontendEnableResult, TargetEmulationSessionStateMut,@@ -2730,7 +2730,10 @@ impl CdpConnection {Ok(Some(CompletedTargetActivation::new(protocol_events)))}- fn page_screencast_session_ids_for_target(&mut self, target_id: &str) -> Vec<Option<String>> {+ pub(crate) fn page_screencast_session_ids_for_target(+ &mut self,+ target_id: &str,+ ) -> Vec<Option<String>> {let Some(route) = self.target_session_route_for_target_id(target_id) else {return Vec::new();};diff --git a/moli-protocol/src/conn/browser_context/lookup.rs b/moli-protocol/src/conn/browser_context/lookup.rsindex f98c63b10..95f924589 100644--- a/moli-protocol/src/conn/browser_context/lookup.rs+++ b/moli-protocol/src/conn/browser_context/lookup.rs@@ -83,4 +83,18 @@ impl CdpConnection {.find(|bc| bc.is_active_target(target_id) || bc.background_target(target_id).is_some()).map(|bc| bc.id.as_str())}++ pub(crate) async fn apply_parked_target_surface_overrides_async(+ &mut self,+ target_id: &str,+ ) -> Result<bool, String> {+ let browser_context_id = self+ .browser_context_id_for_target(target_id)+ .map(str::to_owned)+ .ok_or_else(|| "UnknownTargetId".to_owned())?;+ self.browser_context_by_id_mut(&browser_context_id)+ .ok_or_else(|| "UnknownBrowserContextId".to_owned())?+ .apply_parked_target_surface_overrides_async(target_id)+ .await+ }}diff --git a/moli-protocol/src/conn/browser_context/mod.rs b/moli-protocol/src/conn/browser_context/mod.rsindex e90751cac..1ae7a6c7b 100644--- a/moli-protocol/src/conn/browser_context/mod.rs+++ b/moli-protocol/src/conn/browser_context/mod.rs@@ -18,5 +18,5 @@ pub(crate) use page_owner::PageLifecycleEventsEnableResult;pub(crate) use runtime_owner::{SessionOwnerInspectorEnableResult, SessionOwnerRuntimeFrontendEnableResult,};-pub(crate) use session_owner::CdpSessionRoute;+pub(crate) use session_owner::{CdpSessionRoute, TargetHandlerAccessMode};pub(crate) use target_session_owner::TargetNavigationLoadInputs;diff --git a/moli-protocol/src/conn/browser_context/session_owner.rs b/moli-protocol/src/conn/browser_context/session_owner.rsindex a88f19208..b16c24c9e 100644--- a/moli-protocol/src/conn/browser_context/session_owner.rs+++ b/moli-protocol/src/conn/browser_context/session_owner.rs@@ -2,6 +2,13 @@ use super::*;use crate::conn::{ServiceWorkerTargetState, SharedWorkerTargetState};use crate::devtools_runtime::DevToolsTargetInfo;+#[derive(Clone, Copy, Debug, PartialEq, Eq)]+pub(crate) enum TargetHandlerAccessMode {+ Browser,+ Regular,+ AutoAttachOnly,+}+#[derive(Clone, Debug, PartialEq, Eq)]pub(crate) enum CdpSessionRoute {Browser,@@ -91,6 +98,19 @@ impl CdpSessionRoute {| Self::ServiceWorkerTarget { .. } => true,}}++ pub(crate) fn target_handler_access_mode(&self) -> TargetHandlerAccessMode {+ match self {+ Self::Browser => TargetHandlerAccessMode::Browser,+ Self::TabTarget { .. }+ | Self::ActiveTarget { .. }+ | Self::AuxiliaryTarget { .. }+ | Self::BackgroundTarget { .. } => TargetHandlerAccessMode::Regular,+ Self::SharedWorkerTarget { .. }+ | Self::DedicatedWorkerTarget { .. }+ | Self::ServiceWorkerTarget { .. } => TargetHandlerAccessMode::AutoAttachOnly,+ }+ }}pub(super) enum TargetSessionOwner {@@ -107,6 +127,57 @@ pub(super) enum TargetSessionOwner {}impl CdpConnection {+ pub(crate) fn target_handler_access_mode(+ &self,+ session_id: Option<&str>,+ ) -> TargetHandlerAccessMode {+ let Some(session_id) = session_id else {+ return TargetHandlerAccessMode::Browser;+ };+ self.session_route(Some(session_id))+ .map(|route| route.target_handler_access_mode())+ .unwrap_or(TargetHandlerAccessMode::Regular)+ }++ pub(crate) fn target_handler_may_get_target_info(+ &self,+ session_id: Option<&str>,+ target_id: Option<&str>,+ ) -> bool {+ if self.target_handler_access_mode(session_id) != TargetHandlerAccessMode::AutoAttachOnly {+ return true;+ }+ let Some(session_id) = session_id else {+ return false;+ };+ let owner_target_id = self.non_browser_target_id_for_session(Some(session_id));+ let Some(target_id) = target_id.or(owner_target_id.as_deref()) else {+ return false;+ };+ owner_target_id.as_deref() == Some(target_id)+ }++ pub(crate) fn target_handler_may_close_target(+ &self,+ session_id: Option<&str>,+ target_id: &str,+ ) -> bool {+ if self.target_handler_access_mode(session_id) != TargetHandlerAccessMode::AutoAttachOnly {+ return true;+ }+ let Some(session_id) = session_id else {+ return false;+ };+ self.non_browser_target_id_for_session(Some(session_id))+ .as_deref()+ == Some(target_id)+ || self+ .target_control+ .auto_attached_target_ids_for_owner(Some(session_id))+ .iter()+ .any(|attached_target_id| attached_target_id == target_id)+ }+pub(crate) fn session_route(&self, session_id: Option<&str>) -> Option<CdpSessionRoute> {let session_id = session_id?;if self.browser_session_ids.contains(session_id) {diff --git a/moli-protocol/src/conn/page_state/surfaces.rs b/moli-protocol/src/conn/page_state/surfaces.rsindex 2c28cabf2..8b89d2964 100644--- a/moli-protocol/src/conn/page_state/surfaces.rs+++ b/moli-protocol/src/conn/page_state/surfaces.rs@@ -392,6 +392,26 @@ impl BrowserContext {.map_err(|error| format!("failed to hide demoted page surface: {error}"))}+ pub(crate) async fn apply_parked_target_surface_overrides_async(+ &mut self,+ target_id: &str,+ ) -> Result<bool, String> {+ let Some(script) = self.generated_surface_override_script_for_parked_target(target_id)+ else {+ return Ok(false);+ };+ let Some(page) = self+ .background_target_mut(target_id)+ .and_then(|target| target.runtime_slot.loaded_page_mut())+ else {+ return Ok(false);+ };+ page.run_page_surface_override_script_async(&script.source)+ .await+ .map_err(|error| format!("failed to hide demoted page surface: {error}"))?;+ Ok(true)+ }+pub(crate) fn generated_surface_override_script_for_active_target(&self,) -> Option<DocumentStartScript> {diff --git a/moli-protocol/src/conn/target/control.rs b/moli-protocol/src/conn/target/control.rsindex 4ace53b1b..a437e4925 100644--- a/moli-protocol/src/conn/target/control.rs+++ b/moli-protocol/src/conn/target/control.rs@@ -490,6 +490,14 @@ impl TargetControlPlane {.auto_attached_sessions_for_owner(owner_session_id)}+ pub(crate) fn auto_attached_target_ids_for_owner(+ &self,+ owner_session_id: Option<&str>,+ ) -> Vec<String> {+ self.sessions+ .auto_attached_target_ids_for_owner(owner_session_id)+ }+pub(crate) fn attached_session_cascade_for_owner(&self,owner_session_id: Option<&str>,diff --git a/moli-protocol/src/domains/target.rs b/moli-protocol/src/domains/target.rsindex af52a2332..f480d37e8 100644--- a/moli-protocol/src/domains/target.rs+++ b/moli-protocol/src/domains/target.rs@@ -1,6 +1,8 @@use serde::Deserialize;-use crate::conn::{BackgroundProtocolEvent, BrowserContext, CdpConnection, Cmd};+use crate::conn::{+ BackgroundProtocolEvent, BrowserContext, CdpConnection, Cmd, TargetHandlerAccessMode,+};use crate::devtools_runtime::{DevToolsActivateTargetCommand, DevToolsCloseTargetCommand, DevToolsCommand,DevToolsCommandResult, DevToolsCreateTargetCommand, DevToolsError, DevToolsErrorKind,@@ -91,6 +93,39 @@ pub(super) fn target_command_error(code: i32, message: impl Into<String>) -> TarTargetCommandTaskStep::Complete(CommandOutputPlan::error(code, message))}+fn target_handler_access_error(+ conn: &CdpConnection,+ cmd: &Cmd<'_>,+ action: TargetAction,+) -> Option<TargetCommandTaskStep> {+ let access_mode = conn.target_handler_access_mode(cmd.session_id);+ let allowed = match action {+ TargetAction::GetBrowserContexts+ | TargetAction::CreateBrowserContext+ | TargetAction::AttachToBrowserTarget+ | TargetAction::AutoAttachRelated+ | TargetAction::DisposeBrowserContext => access_mode == TargetHandlerAccessMode::Browser,+ TargetAction::GetTargets+ | TargetAction::CreateTarget+ | TargetAction::AttachToTarget+ | TargetAction::SetDiscoverTargets+ | TargetAction::ActivateTarget => access_mode != TargetHandlerAccessMode::AutoAttachOnly,+ TargetAction::GetTargetInfo+ | TargetAction::SetAutoAttach+ | TargetAction::DetachFromTarget+ | TargetAction::CloseTarget+ | TargetAction::SendMessageToTarget => true,+ };+ (!allowed).then(|| {+ let message = if action == TargetAction::AutoAttachRelated {+ "Target.autoAttachRelated is only supported on the Browser target"+ } else {+ "Not allowed"+ };+ target_command_error(-32000, message)+ })+}+fn transient_no_page_devtools_target_info_error(conn: &CdpConnection,target_info: &DevToolsTargetInfo,@@ -274,7 +309,6 @@ enum PendingTargetCommandKind {SetAutoAttach {auto_attach: bool,owner_session_id: Option<String>,- owner_was_enabled: bool,legacy_disable_all: bool,},CreateTarget {@@ -316,7 +350,6 @@ enum CompletedTargetCommandKind {SetAutoAttach {auto_attach: bool,owner_session_id: Option<String>,- owner_was_enabled: bool,legacy_disable_all: bool,},CreateTarget {@@ -367,12 +400,10 @@ impl PendingTargetCommandDispatch {PendingTargetCommandKind::SetAutoAttach {auto_attach,owner_session_id,- owner_was_enabled,legacy_disable_all,} => CompletedTargetCommandKind::SetAutoAttach {auto_attach,owner_session_id,- owner_was_enabled,legacy_disable_all,},PendingTargetCommandKind::CreateTarget {@@ -432,7 +463,13 @@ pub(crate) fn try_start_target_command_dispatch(conn: &mut CdpConnection,cmd: &Cmd<'_>,) -> Option<TargetCommandTaskStep> {- match cmd.parse_action::<TargetAction>() {+ let action = cmd.parse_action::<TargetAction>();+ if let Some(action) = action+ && let Some(error) = target_handler_access_error(conn, cmd, action)+ {+ return Some(error);+ }+ match action {Some(TargetAction::GetTargets) => {Some(browser_context::start_get_targets_command(conn, cmd))}@@ -612,6 +649,10 @@ pub(crate) async fn execute_devtools_create_target_command_async_with_protocol_e.ensure_created_target_initial_document_page(&result.target_id).await;protocol_events.extend(initial_document_events);+ protocol_events.extend(+ lifecycle::synchronize_created_target_activation_async(conn, &execution.protocol_events)+ .await,+ );if let Err(error) = lifecycle::emit_created_target_protocol_events(conn,execution.protocol_events,@@ -688,10 +729,11 @@ async fn created_target_response_plan_after_initial_document(conn: &mut CdpConnection,response_plan: CommandOutputPlan,protocol_events: lifecycle::CreatedTargetProtocolEvents,+ activation_events: Vec<BackgroundProtocolEvent>,) -> CommandOutputPlan {let target_id = protocol_events.page_target_id().to_owned();let mut plan = CommandOutputPlan::default();- let mut events = Vec::new();+ let mut events = activation_events;if let Err(error) =lifecycle::emit_created_target_protocol_events(conn, protocol_events, &mut events){@@ -740,7 +782,6 @@ pub(crate) async fn complete_pending_target_command(CompletedTargetCommandKind::SetAutoAttach {auto_attach,owner_session_id,- owner_was_enabled,legacy_disable_all,} => {return TargetCommandTaskStep::Complete(@@ -748,7 +789,6 @@ pub(crate) async fn complete_pending_target_command(conn,auto_attach,owner_session_id.as_deref(),- owner_was_enabled,legacy_disable_all,command_context,)@@ -761,6 +801,9 @@ pub(crate) async fn complete_pending_target_command(initial_document_route,initial_document,} => {+ let activation_events =+ lifecycle::synchronize_created_target_activation_async(conn, &protocol_events)+ .await;match initial_document {Some(Ok(completed_initial_document)) => {let completed_initial_document = *completed_initial_document;@@ -804,6 +847,7 @@ pub(crate) async fn complete_pending_target_command(conn,response_plan,protocol_events,+ activation_events,).await,)@@ -873,7 +917,6 @@ fn pending_set_auto_attach_command(session_id: Option<&str>,auto_attach: bool,owner_session_id: Option<&str>,- owner_was_enabled: bool,legacy_disable_all: bool,) -> TargetCommandTaskStep {TargetCommandTaskStep::Pending(PendingTargetCommandDispatch {@@ -882,7 +925,6 @@ fn pending_set_auto_attach_command(kind: Box::new(PendingTargetCommandKind::SetAutoAttach {auto_attach,owner_session_id: owner_session_id.map(str::to_owned),- owner_was_enabled,legacy_disable_all,}),})diff --git a/moli-protocol/src/domains/target/lifecycle.rs b/moli-protocol/src/domains/target/lifecycle.rsindex 14d1e3f34..40e40a24b 100644--- a/moli-protocol/src/domains/target/lifecycle.rs+++ b/moli-protocol/src/domains/target/lifecycle.rs@@ -24,6 +24,7 @@ pub(super) struct DevToolsCreateTargetExecution {pub(super) struct CreatedTargetProtocolEvents {page_target_id: String,tab_target_id: String,+ demoted_target_id: Option<String>,attached_tab_sessions: Vec<TargetAttachSessionCommit>,attached_sessions: Vec<TargetAttachSessionCommit>,}@@ -32,6 +33,40 @@ impl CreatedTargetProtocolEvents {pub(super) fn page_target_id(&self) -> &str {&self.page_target_id}++ pub(super) fn demoted_target_id(&self) -> Option<&str> {+ self.demoted_target_id.as_deref()+ }+}++pub(super) async fn synchronize_created_target_activation_async(+ conn: &mut CdpConnection,+ events: &CreatedTargetProtocolEvents,+) -> Vec<BackgroundProtocolEvent> {+ let Some(demoted_target_id) = events.demoted_target_id() else {+ return Vec::new();+ };+ let screencast_visibility_events = conn+ .page_screencast_session_ids_for_target(demoted_target_id)+ .into_iter()+ .map(|session_id| {+ BackgroundProtocolEvent::page_screencast_visibility_changed(+ session_id.as_deref(),+ false,+ )+ })+ .collect();+ if let Err(error) = conn+ .apply_parked_target_surface_overrides_async(demoted_target_id)+ .await+ {+ tracing::warn!(+ target_id = demoted_target_id,+ %error,+ "failed to update Page visibility after createTarget activation"+ );+ }+ screencast_visibility_events}#[derive(Clone, Copy)]@@ -114,6 +149,8 @@ struct CreateTargetParams {url: String,browser_context_id: Option<String>,for_tab: Option<bool>,+ background: Option<bool>,+ focus: Option<bool>,}fn default_blank() -> String {@@ -142,6 +179,8 @@ pub(super) fn start_create_target_command(url: "about:blank".into(),browser_context_id: None,for_tab: None,+ background: None,+ focus: None,},Err(e) => {return super::target_command_error(-32602, e);@@ -152,7 +191,10 @@ pub(super) fn start_create_target_command(} else {CreateTargetResultHost::Page};- let command = build_cdp_create_target_command(cmd, params);+ let command = match build_cdp_create_target_command(cmd, params) {+ Ok(command) => command,+ Err(message) => return super::target_command_error(-32602, message),+ };start_devtools_create_target_command_with_result_host(conn,cmd.id,@@ -165,15 +207,20 @@ pub(super) fn start_create_target_command(fn build_cdp_create_target_command(cmd: &Cmd<'_>,params: CreateTargetParams,-) -> DevToolsCreateTargetCommand {- DevToolsCreateTargetCommand {+) -> Result<DevToolsCreateTargetCommand, &'static str> {+ let should_focus = params.focus.unwrap_or(!params.background.unwrap_or(false));+ let create_in_background = params.background.unwrap_or(false) || params.focus == Some(false);+ if should_focus && create_in_background {+ return Err("Can't focus a target in the background. Use background=false instead.");+ }+ Ok(DevToolsCreateTargetCommand {context: cmd.devtools_command_context(None::<&str>, params.browser_context_id.as_deref()),url: params.url,browser_context_id: params.browser_context_id.map(DevToolsBrowserContextId::from),- activate: false,- }+ activate: !create_in_background,+ })}pub(super) fn start_devtools_create_target_command(@@ -282,12 +329,18 @@ pub(super) fn execute_devtools_create_target_command(let target_id = conn.gen_target_id();let default_target_id = conn.default_target_id();- let browser_context = conn- .browser_context- .as_ref()- .expect("browser context must exist before target creation");- let has_active_target = browser_context.active_target_identity().is_some()- && !browser_context.active_target_is_unclaimed_default_placeholder(default_target_id);+ let (has_active_target, previous_active_target_id) = {+ let browser_context = conn+ .browser_context+ .as_ref()+ .expect("browser context must exist before target creation");+ (+ browser_context.active_target_identity().is_some()+ && !browser_context+ .active_target_is_unclaimed_default_placeholder(default_target_id),+ browser_context.active_target_id_owned(),+ )+ };let auto_attach_page_owners = top_level_page_auto_attach_owner_sessions(conn);let auto_attach_tab_owners = top_level_tab_auto_attach_owner_sessions(conn);let auto_attached_page_sessions = auto_attach_page_owners@@ -307,6 +360,11 @@ pub(super) fn execute_devtools_create_target_command(None};let activating_created_target = has_active_target && command.activate;+ let demoted_target_id = if activating_created_target {+ previous_active_target_id+ } else {+ None+ };let initial_empty_document_url = create_target_initial_empty_document_url(&command.url);if activating_created_target {conn.handoff_navigation_engine_for_active_target_demotion();@@ -408,6 +466,7 @@ pub(super) fn execute_devtools_create_target_command(protocol_events: CreatedTargetProtocolEvents {page_target_id: target_id,tab_target_id,+ demoted_target_id,attached_tab_sessions,attached_sessions,},@@ -1136,6 +1195,9 @@ pub(super) fn start_close_target_command(return super::target_command_error(-32602, "InvalidParams");}};+ if !conn.target_handler_may_close_target(cmd.session_id, ¶ms.target_id) {+ return super::target_command_error(-32000, "Not allowed");+ }let command = build_cdp_close_target_command(cmd, params);super::start_devtools_target_command(conn,@@ -1401,6 +1463,9 @@ pub(super) fn get_target_info(conn: &mut CdpConnection, cmd: &Cmd<'_>) -> Commanreturn CommandOutputPlan::error_without_session(-32602, e);}};+ if !conn.target_handler_may_get_target_info(cmd.session_id, params.target_id.as_deref()) {+ return CommandOutputPlan::error(-32000, "Not allowed");+ }let command = build_cdp_get_target_info_command(cmd, params);match super::start_devtools_target_command(conn,@@ -1509,6 +1574,7 @@ struct AutoAttachParams {auto_attach: bool,#[serde(rename = "waitForDebuggerOnStart")]wait_for_debugger_on_start: bool,+ flatten: Option<bool>,filter: Option<Vec<TargetFilterEntry>>,}@@ -1657,6 +1723,17 @@ fn owner_already_auto_attached_to_target(})}+fn owner_already_auto_attached_to_exact_target(+ conn: &CdpConnection,+ owner_session_id: Option<&str>,+ target_id: &str,+) -> bool {+ let attached_sessions = conn.attached_sessions_for_target(target_id);+ conn.auto_attached_sessions_for_owner(owner_session_id)+ .iter()+ .any(|session_id| attached_sessions.contains(session_id))+}+fn owner_already_auto_attached_to_page_target(conn: &CdpConnection,owner_session_id: Option<&str>,@@ -1799,6 +1876,16 @@ pub(super) fn start_set_auto_attach_command(return super::target_command_error(-32602, "InvalidParams");}};+ if cmd+ .session_id+ .is_some_and(|session_id| conn.is_browser_session_id(Some(session_id)))+ && params.flatten != Some(true)+ {+ return super::target_command_error(+ -32602,+ "Only flatten protocol is supported with browser level auto-attach",+ );+ }if !params.auto_attach&& params.filter@@ -1833,7 +1920,8 @@ pub(super) fn start_set_auto_attach_command(}let pause_service_workers_on_start = params.auto_attach&& params.wait_for_debugger_on_start- && target_filter.matches("service_worker");+ && target_filter.matches("service_worker")+ && super::browser_level_auto_attach_owner_session_allowed(conn, cmd.session_id);let pause_dedicated_workers_on_start =params.auto_attach && params.wait_for_debugger_on_start && target_filter.matches("worker");conn.set_auto_attach_owner(@@ -1857,7 +1945,6 @@ pub(super) fn start_set_auto_attach_command(cmd.session_id,params.auto_attach,cmd.session_id,- owner_was_enabled,legacy_disable_all,)}@@ -1866,7 +1953,6 @@ pub(super) async fn complete_set_auto_attach_command_async(conn: &mut CdpConnection,auto_attach: bool,owner_session_id: Option<&str>,- owner_was_enabled: bool,legacy_disable_all: bool,command_context: &mut crate::conn::CommandDispatchContext,) -> CommandOutputPlan {@@ -1877,7 +1963,6 @@ pub(super) async fn complete_set_auto_attach_command_async(&mut side_effects,auto_attach,owner_session_id,- owner_was_enabled,legacy_disable_all,command_context,)@@ -1897,7 +1982,6 @@ async fn set_auto_attach_inner_async(out: &mut events::TargetProtocolSideEffects,auto_attach: bool,owner_session_id: Option<&str>,- owner_was_enabled: bool,legacy_disable_all: bool,command_context: &mut crate::conn::CommandDispatchContext,) {@@ -1907,7 +1991,6 @@ async fn set_auto_attach_inner_async(return;}if auto_attach- && !owner_was_enabled&& let Some(owner_session_id) = owner_session_id&& let Some(tab_target_id) = conn.tab_target_id_for_session_id(owner_session_id)@@ -1924,9 +2007,6 @@ async fn set_auto_attach_inner_async(continue;}if auto_attach {- if owner_was_enabled {- continue;- }let attach_page_targets = conn.auto_attach_owner_allows_target_type(owner_session_id, "page")&& super::browser_level_auto_attach_owner_session_allowed(conn, owner_session_id);@@ -1938,8 +2018,9 @@ async fn set_auto_attach_inner_async(&& super::browser_level_auto_attach_owner_session_allowed(conn, owner_session_id);let attach_dedicated_worker_targets =conn.auto_attach_owner_allows_target_type(owner_session_id, "worker");- let attach_service_worker_targets =- conn.auto_attach_owner_allows_target_type(owner_session_id, "service_worker");+ let attach_service_worker_targets = conn+ .auto_attach_owner_allows_target_type(owner_session_id, "service_worker")+ && super::browser_level_auto_attach_owner_session_allowed(conn, owner_session_id);// waitForDebuggerOnStart applies to targets created after the// policy is installed. Chromium reports every target found by the// initial AddClient sweep as already running.@@ -2020,6 +2101,13 @@ async fn set_auto_attach_inner_async(if attach_shared_worker_targets {bc.shared_worker_targets.values()+ .filter(|target| {+ !owner_already_auto_attached_to_exact_target(+ conn,+ owner_session_id,+ &target.target_id,+ )+ }).map(|target| target.target_id.clone()).collect::<Vec<_>>()} else {@@ -2034,6 +2122,13 @@ async fn set_auto_attach_inner_async(if attach_service_worker_targets {bc.service_worker_targets.values()+ .filter(|target| {+ !owner_already_auto_attached_to_exact_target(+ conn,+ owner_session_id,+ &target.target_id,+ )+ }).map(|target| target.target_id.clone()).collect::<Vec<_>>()} else {@@ -2053,6 +2148,10 @@ async fn set_auto_attach_inner_async(conn,owner_session_id,&target.owner_page,+ ) && !owner_already_auto_attached_to_exact_target(+ conn,+ owner_session_id,+ &target.target_id,)}).map(|target| target.target_id.clone())@@ -3071,8 +3170,11 @@ mod protocol_neutral_tests {url: "https://example.com/new".to_owned(),browser_context_id: Some("BID-create".to_owned()),for_tab: None,+ background: None,+ focus: None,},- );+ )+ .expect("valid target disposition");assert_eq!(command.context.protocol, DevToolsProtocol::Cdp);assert_eq!(@@ -3093,7 +3195,7 @@ mod protocol_neutral_tests {command.browser_context_id.as_ref().map(|id| id.as_str()),Some("BID-create"));- assert!(!command.activate);+ assert!(command.activate);}#[test]diff --git a/moli-protocol/src/domains/target/tests/tests_background_auto_attach.rs b/moli-protocol/src/domains/target/tests/tests_background_auto_attach.rsindex 00ea8ce35..bf0cceac8 100644--- a/moli-protocol/src/domains/target/tests/tests_background_auto_attach.rs+++ b/moli-protocol/src/domains/target/tests/tests_background_auto_attach.rs@@ -163,7 +163,8 @@ async fn runtime_add_binding_on_auto_attached_background_target_session_routes_wctx.process_async(json!({"id": 1034,"method": "Target.createTarget",- "params": {"browserContextId": "BID-9", "url": "about:blank#second"}+ "params": {+ "background": true, "browserContextId": "BID-9", "url": "about:blank#second"}})).await;let created = ctx.take_one();@@ -227,7 +228,8 @@ async fn runtime_add_binding_then_navigation_on_auto_attached_background_target_ctx.process_async(json!({"id": 10351,"method": "Target.createTarget",- "params": {"browserContextId": "BID-9", "url": "about:blank#second"}+ "params": {+ "background": true, "browserContextId": "BID-9", "url": "about:blank#second"}})).await;let created = ctx.take_one();@@ -315,7 +317,8 @@ async fn runtime_add_binding_and_preload_on_auto_attached_background_target_sessctx.process_async(json!({"id": 10355,"method": "Target.createTarget",- "params": {"browserContextId": "BID-9", "url": "about:blank#second"}+ "params": {+ "background": true, "browserContextId": "BID-9", "url": "about:blank#second"}})).await;let created = ctx.take_one();@@ -426,7 +429,8 @@ async fn runtime_add_binding_and_utility_preload_on_auto_attached_background_tarctx.process_async(json!({"id": 10369,"method": "Target.createTarget",- "params": {"browserContextId": "BID-9", "url": "about:blank#second"}+ "params": {+ "background": true, "browserContextId": "BID-9", "url": "about:blank#second"}})).await;let created = ctx.take_one();@@ -574,7 +578,8 @@ async fn runtime_add_binding_and_utility_preload_then_remove_on_auto_attached_bactx.process_async(json!({"id": 10375,"method": "Target.createTarget",- "params": {"browserContextId": "BID-9", "url": "about:blank#second"}+ "params": {+ "background": true, "browserContextId": "BID-9", "url": "about:blank#second"}})).await;let created = ctx.take_one();diff --git a/moli-protocol/src/domains/target/tests/tests_background_staging.rs b/moli-protocol/src/domains/target/tests/tests_background_staging.rsindex a0814f6e2..63811bdfe 100644--- a/moli-protocol/src/domains/target/tests/tests_background_staging.rs+++ b/moli-protocol/src/domains/target/tests/tests_background_staging.rs@@ -104,7 +104,8 @@ async fn same_context_background_session_can_stage_its_own_pre_document_state_bectx.process_async(json!({"id": 104186,"method": "Target.createTarget",- "params": {"browserContextId": "BID-9-PRE", "url": "about:blank#second"}+ "params": {+ "background": true, "browserContextId": "BID-9-PRE", "url": "about:blank#second"}})).await;let created = ctx.take_one();@@ -298,7 +299,8 @@ async fn same_context_background_session_can_stage_its_own_utility_pre_document_ctx.process_async(json!({"id": 104194121,"method": "Target.createTarget",- "params": {"browserContextId": "BID-9-PRE-UTILITY", "url": "about:blank#second"}+ "params": {+ "background": true, "browserContextId": "BID-9-PRE-UTILITY", "url": "about:blank#second"}})).await;let created = ctx.take_one();@@ -546,7 +548,8 @@ async fn same_context_background_session_can_remove_its_own_binding_before_promoctx.process_async(json!({"id": 104194101,"method": "Target.createTarget",- "params": {"browserContextId": "BID-9-PRE-REMOVE", "url": "about:blank#second"}+ "params": {+ "background": true, "browserContextId": "BID-9-PRE-REMOVE", "url": "about:blank#second"}})).await;let created = ctx.take_one();@@ -703,7 +706,8 @@ async fn same_context_background_session_can_remove_its_own_preload_before_promoctx.process_async(json!({"id": 104194111,"method": "Target.createTarget",- "params": {"browserContextId": "BID-9-PRE-REMOVE-SCRIPT", "url": "about:blank#second"}+ "params": {+ "background": true, "browserContextId": "BID-9-PRE-REMOVE-SCRIPT", "url": "about:blank#second"}})).await;let created = ctx.take_one();@@ -851,7 +855,8 @@ async fn same_context_background_session_can_remove_its_own_utility_binding_befoctx.process_async(json!({"id": 104194131,"method": "Target.createTarget",- "params": {"browserContextId": "BID-9-PRE-REMOVE-UTILITY-BINDING", "url": "about:blank#second"}+ "params": {+ "background": true, "browserContextId": "BID-9-PRE-REMOVE-UTILITY-BINDING", "url": "about:blank#second"}})).await;let created = ctx.take_one();assert_eq!(created["method"], "Target.targetCreated");@@ -1033,7 +1038,8 @@ async fn same_context_background_session_can_remove_its_own_utility_preload_befoctx.process_async(json!({"id": 104194141,"method": "Target.createTarget",- "params": {"browserContextId": "BID-9-PRE-REMOVE-UTILITY-SCRIPT", "url": "about:blank#second"}+ "params": {+ "background": true, "browserContextId": "BID-9-PRE-REMOVE-UTILITY-SCRIPT", "url": "about:blank#second"}})).await;let created = ctx.take_one();assert_eq!(created["method"], "Target.targetCreated");@@ -1222,7 +1228,8 @@ async fn same_context_background_session_can_stage_its_own_emulated_media_beforectx.process_async(json!({"id": 1041942,"method": "Target.createTarget",- "params": {"browserContextId": "BID-9-PRE-MEDIA", "url": "about:blank#second"}+ "params": {+ "background": true, "browserContextId": "BID-9-PRE-MEDIA", "url": "about:blank#second"}})).await;let created = ctx.take_one();@@ -1355,7 +1362,8 @@ async fn same_context_background_session_can_clear_its_own_emulated_media_beforectx.process_async(json!({"id": 10419443,"method": "Target.createTarget",- "params": {"browserContextId": "BID-9-PRE-MEDIA-CLEAR", "url": "about:blank#second"}+ "params": {+ "background": true, "browserContextId": "BID-9-PRE-MEDIA-CLEAR", "url": "about:blank#second"}})).await;let created = ctx.take_one();@@ -1496,7 +1504,8 @@ async fn same_context_background_session_can_stage_its_own_network_conditions_bectx.process_async(json!({"id": 10419452,"method": "Target.createTarget",- "params": {"browserContextId": "BID-9-PRE-NET", "url": "about:blank#second"}+ "params": {+ "background": true, "browserContextId": "BID-9-PRE-NET", "url": "about:blank#second"}})).await;let created = ctx.take_one();@@ -1640,7 +1649,8 @@ async fn same_context_background_session_can_stage_its_own_blocked_urls_before_pctx.process_async(json!({"id": 10419458,"method": "Target.createTarget",- "params": {"browserContextId": "BID-9-PRE-NET-BLOCK", "url": "about:blank#second"}+ "params": {+ "background": true, "browserContextId": "BID-9-PRE-NET-BLOCK", "url": "about:blank#second"}})).await;let created = ctx.take_one();@@ -1760,7 +1770,8 @@ async fn same_context_background_session_can_reset_its_own_network_conditions_bectx.process_async(json!({"id": 104194502,"method": "Target.createTarget",- "params": {"browserContextId": "BID-9-PRE-NET-RESET", "url": "about:blank#second"}+ "params": {+ "background": true, "browserContextId": "BID-9-PRE-NET-RESET", "url": "about:blank#second"}})).await;let created = ctx.take_one();@@ -1948,7 +1959,8 @@ async fn same_context_background_session_can_stage_its_own_extra_headers_before_ctx.process_async(json!({"id": 10419462,"method": "Target.createTarget",- "params": {"browserContextId": "BID-9-PRE-HEADERS", "url": "about:blank#second"}+ "params": {+ "background": true, "browserContextId": "BID-9-PRE-HEADERS", "url": "about:blank#second"}})).await;let created = ctx.take_one();@@ -2127,7 +2139,8 @@ async fn same_context_background_session_can_clear_its_own_extra_headers_before_ctx.process_async(json!({"id": 104194663,"method": "Target.createTarget",- "params": {"browserContextId": "BID-9-PRE-HEADERS-CLEAR", "url": "about:blank#second"}+ "params": {+ "background": true, "browserContextId": "BID-9-PRE-HEADERS-CLEAR", "url": "about:blank#second"}})).await;let created = ctx.take_one();@@ -2310,7 +2323,8 @@ async fn same_context_background_session_can_stage_its_own_user_agent_before_proctx.process_async(json!({"id": 10419472,"method": "Target.createTarget",- "params": {"browserContextId": "BID-9-PRE-UA", "url": "about:blank#second"}+ "params": {+ "background": true, "browserContextId": "BID-9-PRE-UA", "url": "about:blank#second"}})).await;let created = ctx.take_one();@@ -2502,7 +2516,8 @@ async fn same_context_background_session_can_clear_its_own_user_agent_before_proctx.process_async(json!({"id": 104194703,"method": "Target.createTarget",- "params": {"browserContextId": "BID-9-PRE-UA-CLEAR", "url": "about:blank#second"}+ "params": {+ "background": true, "browserContextId": "BID-9-PRE-UA-CLEAR", "url": "about:blank#second"}})).await;let created = ctx.take_one();@@ -2676,7 +2691,8 @@ async fn same_context_background_session_can_stage_its_own_locale_and_timezone_bctx.process_async(json!({"id": 10419483,"method": "Target.createTarget",- "params": {"browserContextId": "BID-9-PRE-LOCALE-TZ", "url": "about:blank#second"}+ "params": {+ "background": true, "browserContextId": "BID-9-PRE-LOCALE-TZ", "url": "about:blank#second"}})).await;let created = ctx.take_one();@@ -2868,7 +2884,8 @@ async fn same_context_background_session_can_clear_its_own_locale_before_promotictx.process_async(json!({"id": 104194802,"method": "Target.createTarget",- "params": {"browserContextId": "BID-9-PRE-LOCALE-CLEAR", "url": "about:blank#second"}+ "params": {+ "background": true, "browserContextId": "BID-9-PRE-LOCALE-CLEAR", "url": "about:blank#second"}})).await;let created = ctx.take_one();@@ -3027,7 +3044,8 @@ async fn same_context_background_session_can_clear_its_own_timezone_before_promoctx.process_async(json!({"id": 104194809,"method": "Target.createTarget",- "params": {"browserContextId": "BID-9-PRE-TIMEZONE-CLEAR", "url": "about:blank#second"}+ "params": {+ "background": true, "browserContextId": "BID-9-PRE-TIMEZONE-CLEAR", "url": "about:blank#second"}})).await;let created = ctx.take_one();@@ -3203,7 +3221,8 @@ async fn same_context_background_session_can_stage_its_own_emulation_overrides_bctx.process_async(json!({"id": 104194905,"method": "Target.createTarget",- "params": {"browserContextId": "BID-9-PRE-EMU", "url": "about:blank#second"}+ "params": {+ "background": true, "browserContextId": "BID-9-PRE-EMU", "url": "about:blank#second"}})).await;let created = ctx.take_one();@@ -3413,7 +3432,8 @@ async fn same_context_background_session_can_stage_its_own_page_settings_before_ctx.process_async(json!({"id": 104194915,"method": "Target.createTarget",- "params": {"browserContextId": "BID-9-PRE-PAGE", "url": "about:blank#second"}+ "params": {+ "background": true, "browserContextId": "BID-9-PRE-PAGE", "url": "about:blank#second"}})).await;let created = ctx.take_one();@@ -3570,7 +3590,8 @@ async fn same_context_background_session_can_clear_its_own_device_metrics_beforectx.process_async(json!({"id": 1041949132,"method": "Target.createTarget",- "params": {"browserContextId": "BID-9-PRE-EMU-CLEAR", "url": "about:blank#second"}+ "params": {+ "background": true, "browserContextId": "BID-9-PRE-EMU-CLEAR", "url": "about:blank#second"}})).await;let created = ctx.take_one();@@ -3729,7 +3750,8 @@ async fn same_context_background_session_can_clear_its_own_touch_and_focus_beforctx.process_async(json!({"id": 1041949142,"method": "Target.createTarget",- "params": {"browserContextId": "BID-9-PRE-EMU-CLEAR-TF", "url": "about:blank#second"}+ "params": {+ "background": true, "browserContextId": "BID-9-PRE-EMU-CLEAR-TF", "url": "about:blank#second"}})).await;let created = ctx.take_one();@@ -3906,7 +3928,8 @@ async fn same_context_background_session_can_stage_its_own_script_execution_disactx.process_async(json!({"id": 104194921,"method": "Target.createTarget",- "params": {"browserContextId": "BID-9-PRE-SCRIPT-DISABLED", "url": "about:blank#second"}+ "params": {+ "background": true, "browserContextId": "BID-9-PRE-SCRIPT-DISABLED", "url": "about:blank#second"}})).await;let created = ctx.take_one();@@ -4062,7 +4085,8 @@ async fn same_context_background_session_can_reenable_its_own_script_execution_bctx.process_async(json!({"id": 1041949271,"method": "Target.createTarget",- "params": {"browserContextId": "BID-9-PRE-SCRIPT-REENABLE", "url": "about:blank#second"}+ "params": {+ "background": true, "browserContextId": "BID-9-PRE-SCRIPT-REENABLE", "url": "about:blank#second"}})).await;let created = ctx.take_one();@@ -4233,7 +4257,8 @@ async fn same_context_background_session_can_stage_its_own_lifecycle_events_befoctx.process_async(json!({"id": 104194931,"method": "Target.createTarget",- "params": {"browserContextId": "BID-9-PRE-LIFECYCLE", "url": "about:blank#second"}+ "params": {+ "background": true, "browserContextId": "BID-9-PRE-LIFECYCLE", "url": "about:blank#second"}})).await;let created = ctx.take_one();@@ -4409,7 +4434,8 @@ async fn same_context_background_session_can_disable_its_own_lifecycle_events_bectx.process_async(json!({"id": 1041949321,"method": "Target.createTarget",- "params": {"browserContextId": "BID-9-PRE-LIFECYCLE-DISABLE", "url": "about:blank#second"}+ "params": {+ "background": true, "browserContextId": "BID-9-PRE-LIFECYCLE-DISABLE", "url": "about:blank#second"}})).await;let created = ctx.take_one();@@ -4555,7 +4581,8 @@ async fn same_context_background_session_can_stage_its_own_runtime_enable_beforectx.process_async(json!({"id": 104194937,"method": "Target.createTarget",- "params": {"browserContextId": "BID-9-PRE-RUNTIME", "url": "about:blank#second"}+ "params": {+ "background": true, "browserContextId": "BID-9-PRE-RUNTIME", "url": "about:blank#second"}})).await;let created = ctx.take_one();@@ -4719,7 +4746,8 @@ async fn same_context_loaded_background_session_runtime_enable_replays_context_wctx.process_async(json!({"id": 1041949311,"method": "Target.createTarget",- "params": {"browserContextId": "BID-9-RUNTIME-DIRECT", "url": "about:blank#second"}+ "params": {+ "background": true, "browserContextId": "BID-9-RUNTIME-DIRECT", "url": "about:blank#second"}})).await;let created = ctx.take_one();@@ -4861,7 +4889,8 @@ async fn load_same_context_loaded_background_runtime_owner_async(ctx.process_async(json!({"id": command_id_base + 1,"method": "Target.createTarget",- "params": {"browserContextId": browser_context_id, "url": "about:blank#second"}+ "params": {+ "background": true, "browserContextId": browser_context_id, "url": "about:blank#second"}})).await;let created = ctx.take_one();@@ -5472,7 +5501,8 @@ async fn same_context_background_session_can_disable_its_own_runtime_before_promctx.process_async(json!({"id": 1041949370,"method": "Target.createTarget",- "params": {"browserContextId": "BID-9-PRE-RUNTIME-DISABLE", "url": "about:blank#second"}+ "params": {+ "background": true, "browserContextId": "BID-9-PRE-RUNTIME-DISABLE", "url": "about:blank#second"}})).await;let created = ctx.take_one();@@ -5621,7 +5651,8 @@ async fn same_context_background_session_can_stage_its_own_inspector_enable_befoctx.process_async(json!({"id": 1041949396,"method": "Target.createTarget",- "params": {"browserContextId": "BID-9-PRE-INSPECTOR", "url": "about:blank#second"}+ "params": {+ "background": true, "browserContextId": "BID-9-PRE-INSPECTOR", "url": "about:blank#second"}})).await;let created = ctx.take_one();@@ -5762,7 +5793,8 @@ async fn same_context_background_session_can_disable_its_own_inspector_before_prctx.process_async(json!({"id": 1041949401,"method": "Target.createTarget",- "params": {"browserContextId": "BID-9-PRE-INSPECTOR-DISABLE", "url": "about:blank#second"}+ "params": {+ "background": true, "browserContextId": "BID-9-PRE-INSPECTOR-DISABLE", "url": "about:blank#second"}})).await;let created = ctx.take_one();@@ -5892,7 +5924,8 @@ async fn same_context_background_session_can_stage_its_own_css_enable_before_proctx.process_async(json!({"id": 1041949407,"method": "Target.createTarget",- "params": {"browserContextId": "BID-9-PRE-CSS", "url": "about:blank#second"}+ "params": {+ "background": true, "browserContextId": "BID-9-PRE-CSS", "url": "about:blank#second"}})).await;let created = ctx.take_one();@@ -6000,7 +6033,8 @@ async fn same_context_background_session_can_disable_its_own_css_before_promotioctx.process_async(json!({"id": 1041949412,"method": "Target.createTarget",- "params": {"browserContextId": "BID-9-PRE-CSS-DISABLE", "url": "about:blank#second"}+ "params": {+ "background": true, "browserContextId": "BID-9-PRE-CSS-DISABLE", "url": "about:blank#second"}})).await;let created = ctx.take_one();@@ -6136,7 +6170,8 @@ async fn same_context_background_session_can_stage_its_own_fetch_enable_before_pctx.process_async(json!({"id": 104194941,"method": "Target.createTarget",- "params": {"browserContextId": "BID-9-PRE-FETCH", "url": "about:blank#second"}+ "params": {+ "background": true, "browserContextId": "BID-9-PRE-FETCH", "url": "about:blank#second"}})).await;let created = ctx.take_one();@@ -6316,6 +6351,7 @@ async fn same_context_background_fetch_continue_request_keeps_target_parked() {"id": 104194963,"method": "Target.createTarget","params": {+ "background": true,"browserContextId": "BID-9-PRE-FETCH-CONTINUE","url": "about:blank#second"}@@ -6481,7 +6517,8 @@ async fn same_context_background_session_can_stage_its_own_fetch_auth_handling_bctx.process_async(json!({"id": 104194955,"method": "Target.createTarget",- "params": {"browserContextId": "BID-9-PRE-FETCH-AUTH", "url": "about:blank#second"}+ "params": {+ "background": true, "browserContextId": "BID-9-PRE-FETCH-AUTH", "url": "about:blank#second"}})).await;let created = ctx.take_one();@@ -6660,7 +6697,8 @@ async fn same_context_background_session_can_disable_its_own_fetch_before_promotctx.process_async(json!({"id": 104194948,"method": "Target.createTarget",- "params": {"browserContextId": "BID-9-PRE-FETCH-DISABLE", "url": "about:blank#second"}+ "params": {+ "background": true, "browserContextId": "BID-9-PRE-FETCH-DISABLE", "url": "about:blank#second"}})).await;let created = ctx.take_one();@@ -6830,7 +6868,8 @@ async fn same_context_background_session_can_stage_its_own_network_enable_beforectx.process_async(json!({"id": 104194951,"method": "Target.createTarget",- "params": {"browserContextId": "BID-9-PRE-NET", "url": "about:blank#second"}+ "params": {+ "background": true, "browserContextId": "BID-9-PRE-NET", "url": "about:blank#second"}})).await;let created = ctx.take_one();@@ -7014,7 +7053,8 @@ async fn same_context_background_session_can_disable_its_own_network_before_promctx.process_async(json!({"id": 104194959,"method": "Target.createTarget",- "params": {"browserContextId": "BID-9-PRE-NET-DISABLE", "url": "about:blank#second"}+ "params": {+ "background": true, "browserContextId": "BID-9-PRE-NET-DISABLE", "url": "about:blank#second"}})).await;let created = ctx.take_one();@@ -7188,7 +7228,8 @@ async fn same_context_background_session_can_stage_its_own_cache_and_service_worctx.process_async(json!({"id": 104194957,"method": "Target.createTarget",- "params": {"browserContextId": "BID-9-PRE-NET-POLICY", "url": "about:blank#second"}+ "params": {+ "background": true, "browserContextId": "BID-9-PRE-NET-POLICY", "url": "about:blank#second"}})).await;let created = ctx.take_first_matching(@@ -7410,7 +7451,8 @@ async fn same_context_background_session_can_disable_its_own_cache_and_service_wctx.process_async(json!({"id": 104194966,"method": "Target.createTarget",- "params": {"browserContextId": "BID-9-PRE-NET-POLICY-DISABLE", "url": "about:blank#second"}+ "params": {+ "background": true, "browserContextId": "BID-9-PRE-NET-POLICY-DISABLE", "url": "about:blank#second"}})).await;let created = ctx.take_first_matching(diff --git a/moli-protocol/src/domains/target/tests/tests_cdp_chromium_imports/p1_target_multipage.rs b/moli-protocol/src/domains/target/tests/tests_cdp_chromium_imports/p1_target_multipage.rsindex 7ca3030cb..4d564b0bb 100644--- a/moli-protocol/src/domains/target/tests/tests_cdp_chromium_imports/p1_target_multipage.rs+++ b/moli-protocol/src/domains/target/tests/tests_cdp_chromium_imports/p1_target_multipage.rs@@ -325,7 +325,17 @@ async fn create_isolated_world_restart_does_not_inherit_the_stale_renderer_streaasync fn rust_cdp_chromiumoxide_loaded_background_target_replays_own_renderer_lifecycle() {let mut ctx = TestContext::new_with_target_discovery(false);let active_target_id = create_target(&mut ctx, 2_600_066, None, "about:blank").await;- let background_target_id = create_target(&mut ctx, 2_600_067, None, "about:blank").await;+ ctx.process_async(json!({+ "id": 2_600_067,+ "method": "Target.createTarget",+ "params": { "url": "about:blank", "background": true }+ }))+ .await;+ let background_target_id = take_response_by_id(&mut ctx, 2_600_067)["result"]["targetId"]+ .as_str()+ .expect("background target id")+ .to_owned();+ ctx.take_all();assert_ne!(background_target_id, active_target_id);let session_id =attach_to_target(&mut ctx, 2_600_068, None, background_target_id.as_str()).await;@@ -512,9 +522,15 @@ async fn rust_cdp_chromium_target_create_target_auto_attach_marks_get_targets_at// Chromium source:// third_party/blink/web_tests/http/tests/inspector-protocol/target/target-setAutoAttach-new-page.js#[tokio::test(flavor = "multi_thread")]-async fn rust_cdp_chromium_target_second_create_target_stages_background_target() {+async fn rust_cdp_chromium_target_second_create_target_activates_new_target_by_default() {let mut ctx = TestContext::new_with_target_discovery(false);- load_bc_with_target(&mut ctx, "BID-multi", "TID-000000000A");+ load_bc_with_titled_page_async(+ &mut ctx,+ "BID-multi",+ "TID-000000000A",+ "<main>first target</main>",+ )+ .await;let target_id = create_target(&mut ctx,@@ -525,9 +541,29 @@ async fn rust_cdp_chromium_target_second_create_target_stages_background_target(.await;let browser_context = ctx.conn.browser_context.as_ref().expect("browser context");- assert_eq!(browser_context.active_target_id(), Some("TID-000000000A"));+ assert_eq!(browser_context.active_target_id(), Some(target_id.as_str()));assert_eq!(browser_context.background_targets.len(), 1);- assert_eq!(browser_context.background_targets[0].target_id(), target_id);+ assert_eq!(+ browser_context.background_targets[0].target_id(),+ "TID-000000000A"+ );++ let first_session_id = attach_to_target(&mut ctx, 2_600_171, None, "TID-000000000A").await;+ ctx.process_async(json!({+ "id": 2_600_172,+ "sessionId": first_session_id,+ "method": "Runtime.evaluate",+ "params": {+ "expression": "JSON.stringify({ hidden: document.hidden, visibilityState: document.visibilityState })",+ "returnByValue": true+ }+ }))+ .await;+ let visibility = take_response_by_id(&mut ctx, 2_600_172);+ assert_eq!(+ visibility["result"]["result"]["value"],+ json!(r#"{"hidden":true,"visibilityState":"hidden"}"#)+ );}// Chromium source:diff --git a/moli-protocol/src/domains/target/tests/tests_playwright_cdp.rs b/moli-protocol/src/domains/target/tests/tests_playwright_cdp.rsindex 9273617ab..9756c249d 100644--- a/moli-protocol/src/domains/target/tests/tests_playwright_cdp.rs+++ b/moli-protocol/src/domains/target/tests/tests_playwright_cdp.rs@@ -1214,6 +1214,7 @@ async fn playwright_connect_over_cdp_second_page_window_query_keeps_background_t"id": 53192,"method": "Target.createTarget","params": {+ "background": true,"browserContextId": "BID-PW-WINDOW","url": "about:blank"}diff --git a/moli-protocol/src/domains/target/tests/tests_same_context_bindings.rs b/moli-protocol/src/domains/target/tests/tests_same_context_bindings.rsindex 653551214..400162010 100644--- a/moli-protocol/src/domains/target/tests/tests_same_context_bindings.rs+++ b/moli-protocol/src/domains/target/tests/tests_same_context_bindings.rs@@ -28,7 +28,8 @@ async fn same_context_targets_allocate_document_start_script_identifiers_target_ctx.process_async(json!({"id": 104195,"method": "Target.createTarget",- "params": {"browserContextId": "BID-9-SCRIPT-ID", "url": "about:blank#second"}+ "params": {+ "background": true, "browserContextId": "BID-9-SCRIPT-ID", "url": "about:blank#second"}})).await;let created = ctx.take_one();@@ -116,7 +117,8 @@ async fn same_context_targets_allocate_document_start_script_identifiers_target_ctx.process_async(json!({"id": 1041942,"method": "Target.createTarget",- "params": {"browserContextId": "BID-9-SCRIPT-ID-SESSION", "url": "about:blank#second"}+ "params": {+ "background": true, "browserContextId": "BID-9-SCRIPT-ID-SESSION", "url": "about:blank#second"}})).await;let created = loop {@@ -259,7 +261,8 @@ async fn same_context_targets_allocate_utility_pre_document_script_identifiers_tctx.process_async(json!({"id": 1041952,"method": "Target.createTarget",- "params": {"browserContextId": "BID-9-UTILITY-SCRIPT-ID-SESSION", "url": "about:blank#second"}+ "params": {+ "background": true, "browserContextId": "BID-9-UTILITY-SCRIPT-ID-SESSION", "url": "about:blank#second"}})).await;let created = loop {let message = ctx.take_one();@@ -407,7 +410,8 @@ async fn same_context_targets_remove_only_their_own_pre_document_script_identifictx.process_async(json!({"id": 104201,"method": "Target.createTarget",- "params": {"browserContextId": "BID-9-SCRIPT-REMOVE", "url": "about:blank#second"}+ "params": {+ "background": true, "browserContextId": "BID-9-SCRIPT-REMOVE", "url": "about:blank#second"}})).await;let created = ctx.take_one();@@ -564,7 +568,8 @@ async fn same_context_targets_remove_only_their_own_utility_pre_document_script_ctx.process_async(json!({"id": 104210,"method": "Target.createTarget",- "params": {"browserContextId": "BID-9-UTILITY-SCRIPT-REMOVE", "url": "about:blank#second"}+ "params": {+ "background": true, "browserContextId": "BID-9-UTILITY-SCRIPT-REMOVE", "url": "about:blank#second"}})).await;let created = ctx.take_one();@@ -742,7 +747,8 @@ async fn same_context_targets_remove_only_their_own_utility_binding_definition_actx.process_async(json!({"id": 104220,"method": "Target.createTarget",- "params": {"browserContextId": "BID-9-UTILITY-BINDING-REMOVE", "url": "about:blank#second"}+ "params": {+ "background": true, "browserContextId": "BID-9-UTILITY-BINDING-REMOVE", "url": "about:blank#second"}})).await;let created = ctx.take_one();@@ -932,7 +938,8 @@ async fn same_context_targets_remove_only_their_own_main_world_binding_definitioctx.process_async(json!({"id": 104231,"method": "Target.createTarget",- "params": {"browserContextId": "BID-9-MAIN-BINDING-REMOVE", "url": "about:blank#second"}+ "params": {+ "background": true, "browserContextId": "BID-9-MAIN-BINDING-REMOVE", "url": "about:blank#second"}})).await;let created = ctx.take_one();@@ -1128,7 +1135,8 @@ async fn same_context_targets_remove_only_their_own_dual_world_binding_definitioctx.process_async(json!({"id": 104243,"method": "Target.createTarget",- "params": {"browserContextId": "BID-9-DUAL-BINDING-REMOVE", "url": "about:blank#second"}+ "params": {+ "background": true, "browserContextId": "BID-9-DUAL-BINDING-REMOVE", "url": "about:blank#second"}})).await;let created = ctx.take_one();@@ -1358,7 +1366,8 @@ async fn same_context_targets_replay_only_their_own_pre_document_binding_and_prectx.process_async(json!({"id": 10418,"method": "Target.createTarget",- "params": {"browserContextId": "BID-9", "url": "about:blank#second"}+ "params": {+ "background": true, "browserContextId": "BID-9", "url": "about:blank#second"}})).await;let created = ctx.take_one();@@ -1589,7 +1598,8 @@ async fn same_context_targets_replay_only_their_own_pre_document_binding_and_prectx.process_async(json!({"id": 10472,"method": "Target.createTarget",- "params": {"browserContextId": "BID-9", "url": "about:blank#second"}+ "params": {+ "background": true, "browserContextId": "BID-9", "url": "about:blank#second"}})).await;let created = ctx.take_one();@@ -1811,7 +1821,8 @@ async fn same_context_targets_materialize_only_their_own_utility_pre_document_bictx.process_async(json!({"id": 10430,"method": "Target.createTarget",- "params": {"browserContextId": "BID-9", "url": "about:blank#second"}+ "params": {+ "background": true, "browserContextId": "BID-9", "url": "about:blank#second"}})).await;let created = ctx.take_one();@@ -2161,7 +2172,8 @@ async fn same_context_targets_materialize_only_their_own_utility_pre_document_bictx.process_async(json!({"id": 10484,"method": "Target.createTarget",- "params": {"browserContextId": "BID-9", "url": "about:blank#second"}+ "params": {+ "background": true, "browserContextId": "BID-9", "url": "about:blank#second"}})).await;let created = ctx.take_one();@@ -2483,7 +2495,8 @@ async fn same_context_targets_restore_only_their_own_pre_document_binding_and_prctx.process_async(json!({"id": 10445,"method": "Target.createTarget",- "params": {"browserContextId": "BID-9", "url": "about:blank#second"}+ "params": {+ "background": true, "browserContextId": "BID-9", "url": "about:blank#second"}})).await;let created = ctx.take_one();diff --git a/moli-protocol/src/domains/target/tests/tests_same_context_target_local.rs b/moli-protocol/src/domains/target/tests/tests_same_context_target_local.rsindex 294169179..f142dc88d 100644--- a/moli-protocol/src/domains/target/tests/tests_same_context_target_local.rs+++ b/moli-protocol/src/domains/target/tests/tests_same_context_target_local.rs@@ -14,7 +14,11 @@ async fn activate_target_promotes_auto_attached_background_session_into_page_runctx.process_async(json!({"id": 103,"method": "Target.createTarget",- "params": {"browserContextId": "BID-9", "url": "about:blank#second"}+ "params": {+ "browserContextId": "BID-9",+ "url": "about:blank#second",+ "background": true+ }})).await;let created = ctx.take_one();@@ -80,7 +84,8 @@ async fn create_target_allows_second_target_in_same_browser_context_for_frame_sectx.process_async(json!({"id": 10,"method": "Target.createTarget",- "params": {"browserContextId": "BID-9", "url": "about:blank#second"}+ "params": {+ "background": true, "browserContextId": "BID-9", "url": "about:blank#second"}})).await;let target_created = ctx.take_one();@@ -126,7 +131,11 @@ async fn get_target_info_reports_background_target_in_same_browser_context() {ctx.process_async(json!({"id": 10,"method": "Target.createTarget",- "params": {"browserContextId": "BID-9", "url": "about:blank#second"}+ "params": {+ "browserContextId": "BID-9",+ "url": "about:blank#second",+ "background": true+ }})).await;let second_target_id = take_created_target_id(&mut ctx, 10);@@ -309,7 +318,8 @@ async fn attach_to_target_keeps_background_target_parked_when_active_target_has_ctx.process_async(json!({"id": 10,"method": "Target.createTarget",- "params": {"browserContextId": "BID-9", "url": "about:blank#second"}+ "params": {+ "background": true, "browserContextId": "BID-9", "url": "about:blank#second"}})).await;let second_target_id = take_created_target_id(&mut ctx, 10);@@ -372,7 +382,8 @@ async fn background_target_session_can_navigate_enable_and_evaluate_after_attachctx.process_async(json!({"id": 1010,"method": "Target.createTarget",- "params": {"browserContextId": "BID-9", "url": "about:blank#second"}+ "params": {+ "background": true, "browserContextId": "BID-9", "url": "about:blank#second"}})).await;let second_target_id = take_created_target_id(&mut ctx, 1010);@@ -477,7 +488,8 @@ async fn close_target_removes_background_target_without_disturbing_active_targetctx.process_async(json!({"id": 10,"method": "Target.createTarget",- "params": {"browserContextId": "BID-9", "url": "about:blank#second"}+ "params": {+ "background": true, "browserContextId": "BID-9", "url": "about:blank#second"}})).await;let second_target_id = take_created_target_id(&mut ctx, 10);@@ -517,7 +529,8 @@ async fn close_active_target_promotes_background_target_to_active_slot() {ctx.process_async(json!({"id": 10,"method": "Target.createTarget",- "params": {"browserContextId": "BID-9", "url": "about:blank#second"}+ "params": {+ "background": true, "browserContextId": "BID-9", "url": "about:blank#second"}})).await;let second_target_id = take_created_target_id(&mut ctx, 10);@@ -574,7 +587,8 @@ async fn close_active_target_exposes_promoted_target_screencast() {ctx.process_async(json!({"id": 20,"method": "Target.createTarget",- "params": {"browserContextId": "BID-9", "url": "about:blank#parked"}+ "params": {+ "background": true, "browserContextId": "BID-9", "url": "about:blank#parked"}})).await;let parked_target_id = take_created_target_id(&mut ctx, 20);@@ -627,6 +641,54 @@ async fn close_active_target_exposes_promoted_target_screencast() {);}+#[tokio::test(flavor = "multi_thread")]+async fn create_foreground_target_hides_demoted_target_screencast() {+ let mut ctx = TestContext::new();+ load_bc_with_titled_page_async(&mut ctx, "BID-9", "TID-active", "<title>active</title>").await;+ ctx.conn+ .browser_context+ .as_mut()+ .unwrap()+ .attach_active_session("SID-active");++ ctx.process_async(json!({+ "id": 24,+ "sessionId": "SID-active",+ "method": "Page.startScreencast",+ "params": {}+ }))+ .await;+ let initially_visible = ctx+ .take_first_matching("active screencast starts visible", |message| {+ message["method"] == json!("Page.screencastVisibilityChanged")+ });+ assert_eq!(initially_visible["params"]["visible"], json!(true));+ ctx.expect_result(24, json!({}), Some("SID-active"));++ ctx.process_async(json!({+ "id": 25,+ "method": "Target.createTarget",+ "params": { "browserContextId": "BID-9", "url": "about:blank#foreground" }+ }))+ .await;+ let hidden = ctx.take_first_matching("demoted screencast becomes hidden", |message| {+ message["method"] == json!("Page.screencastVisibilityChanged")+ && message["sessionId"] == json!("SID-active")+ });+ assert_eq!(hidden["params"]["visible"], json!(false));+ let created_target_id = take_response_by_id(&mut ctx, 25)["result"]["targetId"]+ .as_str()+ .expect("created target id")+ .to_owned();+ assert_eq!(+ ctx.conn+ .browser_context+ .as_ref()+ .and_then(BrowserContext::active_target_id),+ Some(created_target_id.as_str())+ );+}+#[tokio::test(flavor = "multi_thread")]async fn close_active_target_promoted_background_session_can_navigate_and_evaluate() {let mut ctx = TestContext::new();@@ -645,7 +707,8 @@ async fn close_active_target_promoted_background_session_can_navigate_and_evaluactx.process_async(json!({"id": 12,"method": "Target.createTarget",- "params": {"browserContextId": "BID-9", "url": "about:blank#second"}+ "params": {+ "background": true, "browserContextId": "BID-9", "url": "about:blank#second"}})).await;let second_target_id = take_created_target_id(&mut ctx, 12);@@ -736,7 +799,8 @@ async fn close_active_target_restores_background_loaded_page_runtime_without_renctx.process_async(json!({"id": 120,"method": "Target.createTarget",- "params": {"browserContextId": "BID-9", "url": "about:blank#second"}+ "params": {+ "background": true, "browserContextId": "BID-9", "url": "about:blank#second"}})).await;let second_target_id = take_created_target_id(&mut ctx, 120);@@ -837,7 +901,8 @@ async fn close_active_target_promotes_auto_attached_background_session_into_pagectx.process_async(json!({"id": 17,"method": "Target.createTarget",- "params": {"browserContextId": "BID-9", "url": "about:blank#second"}+ "params": {+ "background": true, "browserContextId": "BID-9", "url": "about:blank#second"}})).await;let created = ctx.take_one();@@ -923,7 +988,8 @@ async fn close_targets_chain_promotes_multiple_auto_attached_background_sessionsctx.process_async(json!({"id": 1801,"method": "Target.createTarget",- "params": {"browserContextId": "BID-9", "url": "about:blank#second"}+ "params": {+ "background": true, "browserContextId": "BID-9", "url": "about:blank#second"}})).await;let created_second = ctx.take_one();@@ -943,7 +1009,8 @@ async fn close_targets_chain_promotes_multiple_auto_attached_background_sessionsctx.process_async(json!({"id": 1802,"method": "Target.createTarget",- "params": {"browserContextId": "BID-9", "url": "about:blank#third"}+ "params": {+ "background": true, "browserContextId": "BID-9", "url": "about:blank#third"}})).await;let created_third = ctx.take_first_matching("third targetCreated", |message| {@@ -1092,7 +1159,8 @@ async fn activate_target_chain_restores_multiple_auto_attached_loaded_page_runtictx.process_async(json!({"id": 1822,"method": "Target.createTarget",- "params": {"browserContextId": "BID-9", "url": "about:blank#second"}+ "params": {+ "background": true, "browserContextId": "BID-9", "url": "about:blank#second"}})).await;let created_second = ctx.take_one();@@ -1137,7 +1205,8 @@ async fn activate_target_chain_restores_multiple_auto_attached_loaded_page_runtictx.process_async(json!({"id": 1825,"method": "Target.createTarget",- "params": {"browserContextId": "BID-9", "url": "about:blank#third"}+ "params": {+ "background": true, "browserContextId": "BID-9", "url": "about:blank#third"}})).await;let created_third = ctx.take_one();@@ -1662,7 +1731,8 @@ async fn detach_from_target_clears_background_target_session() {ctx.process_async(json!({"id": 10,"method": "Target.createTarget",- "params": {"browserContextId": "BID-9", "url": "about:blank#second"}+ "params": {+ "background": true, "browserContextId": "BID-9", "url": "about:blank#second"}})).await;let second_target_id = take_created_target_id(&mut ctx, 10);@@ -2384,6 +2454,7 @@ async fn playwright_over_cdp_context_target_attach_and_navigate_smoke() {"id": 201,"method": "Target.createTarget","params": {+ "background": true,"browserContextId": browser_context_id,"url": "about:blank"}diff --git a/moli-protocol/src/domains/target/tests/tests_target_attachment.rs b/moli-protocol/src/domains/target/tests/tests_target_attachment.rsindex bdbee6d49..4b2c52f0a 100644--- a/moli-protocol/src/domains/target/tests/tests_target_attachment.rs+++ b/moli-protocol/src/domains/target/tests/tests_target_attachment.rs@@ -2,6 +2,23 @@ use super::*;use crate::conn::CdpSessionRoute;use moli_shared_worker::SharedWorkerInstanceId;+fn expect_session_error(+ ctx: &mut TestContext,+ id: u64,+ session_id: &str,+ code: i32,+ message: &str,+) {+ assert_eq!(+ take_response_by_id(ctx, id),+ json!({+ "id": id,+ "sessionId": session_id,+ "error": { "code": code, "message": message }+ })+ );+}+/// cdp.target: attachToTarget – no browser context#[tokio::test(flavor = "multi_thread")]async fn attach_to_target_no_bc() {@@ -263,6 +280,228 @@ async fn attach_to_target_tab_returns_control_plane_session() {);}+#[tokio::test(flavor = "multi_thread")]+async fn tab_and_page_target_handlers_cannot_manage_browser_contexts() {+ let mut ctx = TestContext::new();+ ctx.process_async(json!({+ "id": 11020,+ "method": "Target.createTarget",+ "params": { "url": "about:blank" }+ }))+ .await;+ let page_target_id = take_response_by_id(&mut ctx, 11020)["result"]["targetId"]+ .as_str()+ .expect("created Page target id")+ .to_owned();+ let tab_target_id = tab_id_for_page(&ctx, &page_target_id);+ ctx.sent.clear();++ ctx.process_async(json!({+ "id": 11021,+ "method": "Target.attachToTarget",+ "params": { "targetId": tab_target_id }+ }))+ .await;+ let tab_session_id = take_response_by_id(&mut ctx, 11021)["result"]["sessionId"]+ .as_str()+ .expect("attached Tab session id")+ .to_owned();+ ctx.sent.clear();++ ctx.process_async(json!({+ "id": 11022,+ "sessionId": tab_session_id,+ "method": "Target.getBrowserContexts"+ }))+ .await;+ expect_session_error(&mut ctx, 11022, &tab_session_id, -32000, "Not allowed");++ ctx.process_async(json!({+ "id": 11025,+ "sessionId": tab_session_id,+ "method": "Target.autoAttachRelated",+ "params": {+ "targetId": page_target_id,+ "waitForDebuggerOnStart": false+ }+ }))+ .await;+ expect_session_error(+ &mut ctx,+ 11025,+ &tab_session_id,+ -32000,+ "Target.autoAttachRelated is only supported on the Browser target",+ );++ ctx.process_async(json!({+ "id": 11023,+ "method": "Target.attachToTarget",+ "params": { "targetId": page_target_id }+ }))+ .await;+ let page_session_id = take_response_by_id(&mut ctx, 11023)["result"]["sessionId"]+ .as_str()+ .expect("attached Page session id")+ .to_owned();+ ctx.sent.clear();++ ctx.process_async(json!({+ "id": 11024,+ "sessionId": page_session_id,+ "method": "Target.createBrowserContext"+ }))+ .await;+ expect_session_error(&mut ctx, 11024, &page_session_id, -32000, "Not allowed");+ assert!(ctx.sent.is_empty());+}++#[tokio::test(flavor = "multi_thread")]+async fn worker_target_handler_is_auto_attach_only() {+ let mut ctx = TestContext::new();+ load_bc(&mut ctx, "BID-worker-access");+ push_shared_worker_target(+ &mut ctx,+ SharedWorkerInstanceId::from_u64(11030),+ "TID-worker-access",+ "https://example.test/worker.js",+ "worker-access",+ None,+ );+ ctx.process_async(json!({+ "id": 11031,+ "method": "Target.attachToTarget",+ "params": { "targetId": "TID-worker-access", "flatten": true }+ }))+ .await;+ let worker_session_id = take_response_by_id(&mut ctx, 11031)["result"]["sessionId"]+ .as_str()+ .expect("attached worker session id")+ .to_owned();+ ctx.sent.clear();++ ctx.process_async(json!({+ "id": 11032,+ "sessionId": worker_session_id,+ "method": "Target.getTargets"+ }))+ .await;+ expect_session_error(&mut ctx, 11032, &worker_session_id, -32000, "Not allowed");++ ctx.process_async(json!({+ "id": 11033,+ "sessionId": worker_session_id,+ "method": "Target.getTargetInfo"+ }))+ .await;+ let own_info = take_response_by_id(&mut ctx, 11033);+ assert_eq!(own_info["sessionId"], json!(worker_session_id));+ assert_eq!(+ own_info["result"]["targetInfo"]["targetId"],+ json!("TID-worker-access")+ );++ push_shared_worker_target(+ &mut ctx,+ SharedWorkerInstanceId::from_u64(11035),+ "TID-worker-child",+ "https://example.test/worker-child.js",+ "worker-child",+ Some("SID-worker-child"),+ );+ ctx.conn.register_auto_attached_session_for_target(+ "SID-worker-child".to_owned(),+ Some(&worker_session_id),+ Some("TID-worker-child"),+ );+ assert!(+ ctx.conn+ .target_handler_may_close_target(Some(&worker_session_id), "TID-worker-child"),+ "an AutoAttachOnly handler may close its auto-attached child"+ );++ ctx.process_async(json!({+ "id": 11035,+ "sessionId": worker_session_id,+ "method": "Target.getTargetInfo",+ "params": { "targetId": "TID-worker-child" }+ }))+ .await;+ expect_session_error(&mut ctx, 11035, &worker_session_id, -32000, "Not allowed");++ ctx.process_async(json!({+ "id": 11036,+ "sessionId": worker_session_id,+ "method": "Target.getTargetInfo",+ "params": { "targetId": "browser" }+ }))+ .await;+ expect_session_error(&mut ctx, 11036, &worker_session_id, -32000, "Not allowed");+ assert!(ctx.sent.is_empty());++ ctx.process_async(json!({+ "id": 11037,+ "sessionId": worker_session_id,+ "method": "Target.closeTarget",+ "params": { "targetId": "TID-worker-child" }+ }))+ .await;+ assert_eq!(+ take_response_by_id(&mut ctx, 11037),+ json!({+ "id": 11037,+ "sessionId": worker_session_id,+ "result": { "success": true }+ })+ );+}++#[tokio::test(flavor = "multi_thread")]+async fn browser_target_auto_attach_requires_explicit_flatten_true() {+ let mut ctx = TestContext::new();+ ctx.conn+ .register_browser_session("SID-browser-flatten".to_owned());++ for (id, flatten) in [(11040, None), (11041, Some(false))] {+ let mut params = json!({+ "autoAttach": true,+ "waitForDebuggerOnStart": false+ });+ if let Some(flatten) = flatten {+ params["flatten"] = json!(flatten);+ }+ ctx.process_async(json!({+ "id": id,+ "sessionId": "SID-browser-flatten",+ "method": "Target.setAutoAttach",+ "params": params+ }))+ .await;+ expect_session_error(+ &mut ctx,+ id,+ "SID-browser-flatten",+ -32602,+ "Only flatten protocol is supported with browser level auto-attach",+ );+ }++ ctx.process_async(json!({+ "id": 11042,+ "sessionId": "SID-browser-flatten",+ "method": "Target.setAutoAttach",+ "params": {+ "autoAttach": true,+ "waitForDebuggerOnStart": false,+ "flatten": true,+ "filter": [{ "type": "page", "exclude": true }]+ }+ }))+ .await;+ ctx.expect_result(11042, json!({}), Some("SID-browser-flatten"));+ assert!(ctx.sent.is_empty());+}+#[tokio::test(flavor = "multi_thread")]async fn detach_tab_session_detaches_auto_attached_child_page_session() {let mut ctx = TestContext::new_with_target_discovery(false);@@ -692,8 +931,8 @@ async fn shared_worker_target_session_does_not_fall_back_to_active_page_commandslet response = ctx.take_response_by_id(14);assert_eq!(response["sessionId"], "SID-shared-worker");- assert_eq!(response["error"]["code"], -31998);- assert_eq!(response["error"]["message"], "DirectSessionRouteRequired");+ assert_eq!(response["error"]["code"], -32000);+ assert_eq!(response["error"]["message"], "Not allowed");let bc = ctx.conn.browser_context.as_ref().unwrap();assert_eq!(bc.active_target_id(), Some("TID-active"));}@@ -1801,7 +2040,8 @@ async fn set_auto_attach_false_detaches_existing_target() {"method": "Target.setAutoAttach","params": {"autoAttach": false,- "waitForDebuggerOnStart": false+ "waitForDebuggerOnStart": false,+ "flatten": true}})).await;@@ -1991,7 +2231,7 @@ async fn set_auto_attach_false_cleans_shared_worker_runtime_state_before_detache}#[tokio::test(flavor = "multi_thread")]-async fn set_auto_attach_false_detaches_only_matching_service_worker_auto_attach_owner() {+async fn set_auto_attach_false_detaches_only_matching_browser_service_worker_owner() {let mut ctx = TestContext::new();load_bc(&mut ctx, "BID-9");push_service_worker_target(@@ -2008,7 +2248,8 @@ async fn set_auto_attach_false_detaches_only_matching_service_worker_auto_attach"method": "Target.setAutoAttach","params": {"autoAttach": true,- "waitForDebuggerOnStart": false+ "waitForDebuggerOnStart": false,+ "flatten": true}})).await;@@ -2027,37 +2268,17 @@ async fn set_auto_attach_false_detaches_only_matching_service_worker_auto_attachctx.process_async(json!({"id": 19,- "method": "Target.attachToTarget",- "params": {- "targetId": "TID-service-worker",- "flatten": true- }+ "method": "Target.attachToBrowserTarget"})).await;-- let attach_result = take_response_by_id(&mut ctx, 19);- let owner_session_id = attach_result["result"]["sessionId"]+ let browser_attached = ctx.take_first_matching("browser attachedToTarget", |message| {+ message["method"] == json!("Target.attachedToTarget")+ });+ let owner_session_id = browser_attached["params"]["sessionId"].as_str()- .expect("manual owner session")+ .expect("browser owner session").to_owned();- let manual_attached = ctx.take_one();- assert_eq!(manual_attached["method"], "Target.attachedToTarget");- assert_eq!(- manual_attached["params"]["sessionId"],- json!(owner_session_id)- );- let manual_attach_changed = ctx.take_first_matching(- "root service worker targetInfoChanged after manual attach",- |message| {- message.get("sessionId").is_none()- && message["method"] == json!("Target.targetInfoChanged")- && message["params"]["targetInfo"]["targetId"] == json!("TID-service-worker")- },- );- assert_eq!(- manual_attach_changed["params"]["targetInfo"]["attached"],- json!(true)- );+ ctx.expect_result(19, json!({ "sessionId": owner_session_id.as_str() }), None);ctx.process_async(json!({"id": 20,@@ -2065,7 +2286,8 @@ async fn set_auto_attach_false_detaches_only_matching_service_worker_auto_attach"method": "Target.setAutoAttach","params": {"autoAttach": true,- "waitForDebuggerOnStart": false+ "waitForDebuggerOnStart": false,+ "flatten": true}})).await;@@ -2104,7 +2326,8 @@ async fn set_auto_attach_false_detaches_only_matching_service_worker_auto_attach"method": "Target.setAutoAttach","params": {"autoAttach": false,- "waitForDebuggerOnStart": false+ "waitForDebuggerOnStart": false,+ "flatten": true}})).await;@@ -2152,7 +2375,7 @@ async fn set_auto_attach_false_detaches_only_matching_service_worker_auto_attach));assert!(matches!(ctx.conn.session_route(Some(&owner_session_id)),- Some(CdpSessionRoute::ServiceWorkerTarget { .. })+ Some(CdpSessionRoute::Browser)));assert_eq!(ctx.conn.session_route(Some(&owner_auto_session_id)), None);}@@ -2284,7 +2507,8 @@ async fn set_auto_attach_true_attaches_existing_unattached_target() {"method": "Target.setAutoAttach","params": {"autoAttach": true,- "waitForDebuggerOnStart": false+ "waitForDebuggerOnStart": false,+ "flatten": true}})).await;@@ -2381,7 +2605,8 @@ async fn set_auto_attach_true_attaches_existing_page_target_for_each_owner() {"method": "Target.setAutoAttach","params": {"autoAttach": true,- "waitForDebuggerOnStart": false+ "waitForDebuggerOnStart": false,+ "flatten": true}})).await;@@ -2451,7 +2676,8 @@ async fn set_auto_attach_true_attaches_existing_page_target_for_each_owner() {"method": "Target.setAutoAttach","params": {"autoAttach": false,- "waitForDebuggerOnStart": false+ "waitForDebuggerOnStart": false,+ "flatten": true}})).await;@@ -2737,6 +2963,82 @@ async fn set_auto_attach_filter_excludes_existing_page_target() {assert!(ctx.conn.auto_attach);}+#[tokio::test(flavor = "multi_thread")]+async fn repeated_tab_auto_attach_reconciles_a_newly_matching_existing_page() {+ let mut ctx = TestContext::new();+ ctx.process_async(json!({+ "id": 1706,+ "method": "Target.createTarget",+ "params": { "url": "about:blank" }+ }))+ .await;+ let page_target_id = take_response_by_id(&mut ctx, 1706)["result"]["targetId"]+ .as_str()+ .expect("created Page target id")+ .to_owned();+ let tab_target_id = tab_id_for_page(&ctx, &page_target_id);+ ctx.sent.clear();++ ctx.process_async(json!({+ "id": 1707,+ "method": "Target.attachToTarget",+ "params": { "targetId": tab_target_id }+ }))+ .await;+ let tab_session_id = take_response_by_id(&mut ctx, 1707)["result"]["sessionId"]+ .as_str()+ .expect("attached Tab session id")+ .to_owned();+ ctx.sent.clear();++ ctx.process_async(json!({+ "id": 1708,+ "sessionId": tab_session_id,+ "method": "Target.setAutoAttach",+ "params": {+ "autoAttach": true,+ "waitForDebuggerOnStart": false,+ "flatten": true,+ "filter": [{ "type": "page", "exclude": true }]+ }+ }))+ .await;+ ctx.expect_result(1708, json!({}), Some(&tab_session_id));+ assert!(ctx.sent.is_empty());++ ctx.process_async(json!({+ "id": 1709,+ "sessionId": tab_session_id,+ "method": "Target.setAutoAttach",+ "params": {+ "autoAttach": true,+ "waitForDebuggerOnStart": false,+ "flatten": true,+ "filter": [{ "type": "page" }]+ }+ }))+ .await;++ let attached = ctx.take_one();+ assert_eq!(attached["method"], json!("Target.attachedToTarget"));+ assert_eq!(attached["sessionId"], json!(tab_session_id));+ assert_eq!(+ attached["params"]["targetInfo"]["targetId"],+ json!(page_target_id)+ );+ assert_eq!(attached["params"]["targetInfo"]["type"], json!("page"));+ let info_changed = ctx.take_first_matching("attached Page targetInfoChanged", |message| {+ message["method"] == json!("Target.targetInfoChanged")+ && message["params"]["targetInfo"]["targetId"] == json!(page_target_id)+ });+ assert_eq!(+ info_changed["params"]["targetInfo"]["attached"],+ json!(true)+ );+ ctx.expect_result(1709, json!({}), Some(&tab_session_id));+ assert!(ctx.sent.is_empty());+}+#[tokio::test(flavor = "multi_thread")]async fn set_auto_attach_filter_page_exclude_catchall_auto_attaches_existing_tab() {let mut ctx = TestContext::new_with_target_discovery(false);@@ -2843,6 +3145,70 @@ async fn set_auto_attach_filter_allows_only_existing_service_worker_target() {assert!(ctx.conn.auto_attach);}+#[tokio::test(flavor = "multi_thread")]+async fn tab_auto_attach_does_not_capture_an_existing_service_worker() {+ let mut ctx = TestContext::new();+ ctx.process_async(json!({+ "id": 17100,+ "method": "Target.createTarget",+ "params": { "url": "about:blank" }+ }))+ .await;+ let page_target_id = take_response_by_id(&mut ctx, 17100)["result"]["targetId"]+ .as_str()+ .expect("created Page target id")+ .to_owned();+ let tab_target_id = tab_id_for_page(&ctx, &page_target_id);+ push_service_worker_target(+ &mut ctx,+ 17101,+ "TID-tab-unrelated-service-worker",+ "https://example.test/service-worker.js",+ "https://example.test/",+ None,+ );+ ctx.sent.clear();++ ctx.process_async(json!({+ "id": 17102,+ "method": "Target.attachToTarget",+ "params": { "targetId": tab_target_id }+ }))+ .await;+ let tab_session_id = take_response_by_id(&mut ctx, 17102)["result"]["sessionId"]+ .as_str()+ .expect("attached Tab session id")+ .to_owned();+ ctx.sent.clear();++ ctx.process_async(json!({+ "id": 17103,+ "sessionId": tab_session_id,+ "method": "Target.setAutoAttach",+ "params": {+ "autoAttach": true,+ "waitForDebuggerOnStart": true,+ "flatten": true,+ "filter": [{ "type": "service_worker" }]+ }+ }))+ .await;++ ctx.expect_result(17103, json!({}), Some(&tab_session_id));+ assert!(ctx.sent.is_empty());+ assert!(+ !ctx.conn+ .attached_sessions_for_target("TID-tab-unrelated-service-worker")+ .iter()+ .any(|session_id| {+ ctx.conn+ .auto_attached_sessions_for_owner(Some(&tab_session_id))+ .contains(session_id)+ })+ );+ assert_eq!(ctx.conn.service_worker_pause_on_start_owner_count(), 0);+}+#[tokio::test(flavor = "multi_thread")]async fn set_auto_attach_filter_excludes_existing_service_worker_target() {let mut ctx = TestContext::new();diff --git a/moli-protocol/src/domains/target/tests/tests_target_basics.rs b/moli-protocol/src/domains/target/tests/tests_target_basics.rsindex 936daba6b..67f60de3e 100644--- a/moli-protocol/src/domains/target/tests/tests_target_basics.rs+++ b/moli-protocol/src/domains/target/tests/tests_target_basics.rs@@ -434,7 +434,8 @@ async fn create_target_for_inactive_browser_context_keeps_previously_active_contctx.process_async(json!({"id": 1010,"method": "Target.createTarget",- "params": {"browserContextId": "BID-B", "url": "about:blank"}+ "params": {+ "background": true, "browserContextId": "BID-B", "url": "about:blank"}})).await;@@ -467,7 +468,8 @@ async fn create_target_with_auto_attach_attaches_second_target_in_same_browser_cctx.conn.auto_attach = true;ctx.process_async(json!({"id": 10, "method": "Target.createTarget",- "params": {"browserContextId": "BID-9", "url": "about:blank"}}))+ "params": {+ "background": true, "browserContextId": "BID-9", "url": "about:blank"}})).await;let created = ctx.take_one();assert_eq!(created["method"], "Target.targetCreated");@@ -518,7 +520,8 @@ async fn page_command_on_auto_attached_background_target_session_routes_without_ctx.process_async(json!({"id": 101,"method": "Target.createTarget",- "params": {"browserContextId": "BID-9", "url": "about:blank#second"}+ "params": {+ "background": true, "browserContextId": "BID-9", "url": "about:blank#second"}})).await;let created = ctx.take_one();@@ -600,7 +603,8 @@ async fn page_bring_to_front_promotes_background_session_explicitly() {ctx.process_async(json!({"id": 1021,"method": "Target.createTarget",- "params": {"browserContextId": "BID-9", "url": "about:blank#second"}+ "params": {+ "background": true, "browserContextId": "BID-9", "url": "about:blank#second"}})).await;let created = ctx.take_one();@@ -691,7 +695,8 @@ async fn page_navigate_on_auto_attached_background_target_session_routes_withoutctx.process_async(json!({"id": 1031,"method": "Target.createTarget",- "params": {"browserContextId": "BID-9", "url": "about:blank#second"}+ "params": {+ "background": true, "browserContextId": "BID-9", "url": "about:blank#second"}})).await;let created = ctx.take_one();@@ -779,7 +784,8 @@ async fn page_stop_loading_aborts_background_pending_fetch_without_promotion() {ctx.process_async(json!({"id": 1034,"method": "Target.createTarget",- "params": {"browserContextId": "BID-9", "url": "about:blank#second"}+ "params": {+ "background": true, "browserContextId": "BID-9", "url": "about:blank#second"}})).await;let created = ctx.take_one();@@ -880,7 +886,8 @@ async fn runtime_add_binding_and_preload_then_remove_on_auto_attached_backgroundctx.process_async(json!({"id": 10360,"method": "Target.createTarget",- "params": {"browserContextId": "BID-9", "url": "about:blank#second"}+ "params": {+ "background": true, "browserContextId": "BID-9", "url": "about:blank#second"}})).await;let created = ctx.take_one();@@ -1017,7 +1024,8 @@ async fn runtime_remove_binding_on_background_target_session_routes_without_promctx.process_async(json!({"id": 1036,"method": "Target.createTarget",- "params": {"browserContextId": "BID-9", "url": "about:blank#second"}+ "params": {+ "background": true, "browserContextId": "BID-9", "url": "about:blank#second"}})).await;let created = ctx.take_one();@@ -1119,7 +1127,8 @@ async fn same_context_targets_replay_only_their_own_pre_document_binding_and_prectx.process_async(json!({"id": 10392,"method": "Target.createTarget",- "params": {"browserContextId": "BID-9", "url": "about:blank#second"}+ "params": {+ "background": true, "browserContextId": "BID-9", "url": "about:blank#second"}})).await;let created = ctx.take_one();@@ -1334,7 +1343,8 @@ async fn same_context_targets_materialize_only_their_own_utility_pre_document_bictx.process_async(json!({"id": 10404,"method": "Target.createTarget",- "params": {"browserContextId": "BID-9", "url": "about:blank#second"}+ "params": {+ "background": true, "browserContextId": "BID-9", "url": "about:blank#second"}})).await;let created = ctx.take_one();@@ -1645,7 +1655,8 @@ async fn same_context_targets_do_not_replay_bare_isolated_worlds_after_switchingctx.process_async(json!({"id": 104151,"method": "Target.createTarget",- "params": {"browserContextId": "BID-9", "url": "about:blank#second"}+ "params": {+ "background": true, "browserContextId": "BID-9", "url": "about:blank#second"}})).await;let created = ctx.take_one();diff --git a/moli-protocol/src/domains/target/tests/tests_target_creation.rs b/moli-protocol/src/domains/target/tests/tests_target_creation.rsindex 71cca5ece..b1ab30fc9 100644--- a/moli-protocol/src/domains/target/tests/tests_target_creation.rs+++ b/moli-protocol/src/domains/target/tests/tests_target_creation.rs@@ -2492,7 +2492,7 @@ async fn create_target_with_puppeteer_tab_filter_auto_attaches_tab() {}#[tokio::test(flavor = "multi_thread")]-async fn closing_puppeteer_tab_auto_attach_clears_service_worker_pause_owner() {+async fn tab_auto_attach_does_not_own_browser_level_service_worker_pause() {let mut ctx = TestContext::new();ctx.process_async(json!({"id": 9030,@@ -2547,7 +2547,7 @@ async fn closing_puppeteer_tab_auto_attach_clears_service_worker_pause_owner() {})).await;ctx.expect_result(9032, json!({}), None);- assert_eq!(ctx.conn.service_worker_pause_on_start_owner_count(), 2);+ assert_eq!(ctx.conn.service_worker_pause_on_start_owner_count(), 1);ctx.process_async(json!({"id": 9033,@@ -3439,7 +3439,11 @@ async fn create_target_with_auto_attach_emits_attached_event_for_each_owner() {"id": 9003,"sessionId": browser_session_id.as_str(),"method": "Target.setAutoAttach",- "params": { "autoAttach": true, "waitForDebuggerOnStart": true }+ "params": {+ "autoAttach": true,+ "waitForDebuggerOnStart": true,+ "flatten": true+ }})).await;ctx.expect_result(9003, json!({}), Some(&browser_session_id));@@ -3509,12 +3513,12 @@ async fn create_target_with_bc_id() {}#[tokio::test(flavor = "multi_thread")]-async fn create_target_stages_second_target_in_background_slot() {+async fn create_target_with_background_true_stages_second_target_in_background_slot() {let mut ctx = TestContext::new();load_bc_with_target(&mut ctx, "BID-9", "TID-000000000A");ctx.process_async(json!({"id": 10, "method": "Target.createTarget",- "params": {"browserContextId": "BID-9", "url": "about:blank"}}))+ "params": {"browserContextId": "BID-9", "url": "about:blank", "background": true}})).await;let created = take_created_target_id(&mut ctx, 10);let bc = ctx.conn.browser_context.as_ref().unwrap();@@ -3522,3 +3526,52 @@ async fn create_target_stages_second_target_in_background_slot() {assert_eq!(bc.background_targets.len(), 1);assert_eq!(bc.background_targets[0].target_id(), created);}++#[tokio::test(flavor = "multi_thread")]+async fn create_target_with_focus_false_stages_second_target_in_background_slot() {+ let mut ctx = TestContext::new();+ load_bc_with_target(&mut ctx, "BID-9", "TID-000000000A");++ ctx.process_async(json!({+ "id": 11,+ "method": "Target.createTarget",+ "params": {+ "browserContextId": "BID-9",+ "url": "about:blank#unfocused",+ "background": false,+ "focus": false+ }+ }))+ .await;+ let created = take_created_target_id(&mut ctx, 11);+ let bc = ctx.conn.browser_context.as_ref().unwrap();+ assert_eq!(bc.active_target_id(), Some("TID-000000000A"));+ assert_eq!(bc.background_targets.len(), 1);+ assert_eq!(bc.background_targets[0].target_id(), created);+}++#[tokio::test(flavor = "multi_thread")]+async fn create_target_rejects_focus_in_background() {+ let mut ctx = TestContext::new();+ load_bc_with_target(&mut ctx, "BID-9", "TID-000000000A");++ ctx.process_async(json!({+ "id": 12,+ "method": "Target.createTarget",+ "params": {+ "browserContextId": "BID-9",+ "url": "about:blank#invalid-disposition",+ "background": true,+ "focus": true+ }+ }))+ .await;+ ctx.expect_error(+ 12,+ -32602,+ "Can't focus a target in the background. Use background=false instead.",+ );+ let bc = ctx.conn.browser_context.as_ref().unwrap();+ assert_eq!(bc.active_target_id(), Some("TID-000000000A"));+ assert!(bc.background_targets.is_empty());+}diff --git a/moli-protocol/src/domains/target/worker_target.rs b/moli-protocol/src/domains/target/worker_target.rsindex 6c51cf164..3da1456ac 100644--- a/moli-protocol/src/domains/target/worker_target.rs+++ b/moli-protocol/src/domains/target/worker_target.rs@@ -962,6 +962,18 @@ fn shared_worker_auto_attach_owner_sessions(conn: &CdpConnection) -> Vec<Option<.collect()}+fn service_worker_auto_attach_owner_sessions(conn: &CdpConnection) -> Vec<Option<String>> {+ conn.auto_attach_owner_sessions_for_target_type("service_worker")+ .into_iter()+ .filter(|owner_session_id| {+ super::browser_level_auto_attach_owner_session_allowed(+ conn,+ owner_session_id.as_deref(),+ )+ })+ .collect()+}+fn dedicated_worker_auto_attach_owner_sessions(conn: &CdpConnection,owner_page: &TargetPageResidenceIdentity,@@ -1608,8 +1620,7 @@ fn register_service_worker_target_with_active_run(}let target_id = conn.gen_target_id();let should_emit_created = conn.has_any_target_discovery();- let mut auto_attach_owners = conn- .auto_attach_owner_sessions_for_target_type("service_worker")+ let mut auto_attach_owners = service_worker_auto_attach_owner_sessions(conn).into_iter().map(|owner_session_id| {let waiting_for_debugger =