Best headless browser for AI agents. Lite, Fast, High-Compatibility. Built in Rust
Rust ai-agentsai-toolsbrowserbrowser-automationcloud-browserheadlessheadless-browserkitesurfplaywrightpuppeteerrustservoweb-crawlerweb-crawlingweb-scraperweb-scraping
fix(devtools): keep non-V8 IO agents owner-independent
ldm08cd6dac0d4d5
diff --git a/moli-core/src/page/js_evaluation.rs b/moli-core/src/page/js_evaluation.rsindex 5b95413d3..b7257c225 100644--- a/moli-core/src/page/js_evaluation.rs+++ b/moli-core/src/page/js_evaluation.rs@@ -826,6 +826,10 @@ impl Page {self.start_page_command(RendererPageCommand::PerformanceMetricSnapshot)}+ pub fn cached_performance_metric_snapshot(&self) -> RendererPerformanceMetricSnapshot {+ self.page_state.performance_metric_snapshot().clone()+ }+pub fn finish_performance_metric_snapshot(&mut self,completion: CompletedPageCommand,diff --git a/moli-core/src/page/page_state_cache.rs b/moli-core/src/page/page_state_cache.rsindex eea18ecab..c01cedc60 100644--- a/moli-core/src/page/page_state_cache.rs+++ b/moli-core/src/page/page_state_cache.rs@@ -3,7 +3,7 @@ use std::sync::Arc;use url::Url;use super::protocol_support::ScriptExecutionReport;-use crate::renderer::RendererPageState;+use crate::renderer::{RendererPageState, RendererPerformanceMetricSnapshot};pub(super) struct PageStateCache {state: Arc<RendererPageState>,@@ -61,4 +61,8 @@ impl PageStateCache {pub(super) fn lifecycle_errors(&self) -> &[String] {self.state().script_execution.lifecycle_errors()}++ pub(super) fn performance_metric_snapshot(&self) -> &RendererPerformanceMetricSnapshot {+ &self.state().performance_metric_snapshot+ }}diff --git a/moli-core/src/page/settings_support.rs b/moli-core/src/page/settings_support.rsindex 9a0f5f589..94396c170 100644--- a/moli-core/src/page/settings_support.rs+++ b/moli-core/src/page/settings_support.rs@@ -235,24 +235,10 @@ impl Page {.await}- pub fn start_set_script_execution_disabled(- &self,- disabled: bool,- ) -> Result<PendingPageCommand> {- self.start_page_command(RendererPageCommand::SetScriptExecutionDisabled(disabled))- }-- pub fn finish_set_script_execution_disabled(- &mut self,- completion: CompletedPageCommand,- ) -> Result<()> {- let reply = self.finish_page_command(completion);- expect_page_reply!(- reply,- "set script execution disabled",- "a unit reply",- RendererPageReply::Unit => Ok(()),- )+ /// Applies the DevTools IO-agent setting without entering the renderer+ /// owner's Main command queue.+ pub fn set_script_execution_disabled_from_io(&self, disabled: bool) {+ self.handle.set_script_execution_disabled_from_io(disabled);}pub async fn set_bypass_content_security_policy_async(&mut self, bypass: bool) -> Result<()> {diff --git a/moli-core/src/runtime/tests.rs b/moli-core/src/runtime/tests.rsindex 44d986392..e3ea96e7d 100644--- a/moli-core/src/runtime/tests.rs+++ b/moli-core/src/runtime/tests.rs@@ -4238,6 +4238,7 @@ async fn renderer_owner_remove_unknown_page_keeps_never_tracked_state() -> Resulidle_override: None,service_worker_client_id: 0,dedicated_worker_running_worker_isolate_count: 0,+ performance_metric_snapshot: Default::default(),script_execution: Arc::new(crate::page::ScriptExecutionReport::default()),}),})diff --git a/moli-protocol/src/domains/emulation.rs b/moli-protocol/src/domains/emulation.rsindex 72d11f061..38c01e1b2 100644--- a/moli-protocol/src/domains/emulation.rs+++ b/moli-protocol/src/domains/emulation.rs@@ -76,7 +76,6 @@ enum PendingEmulationPageOperation {SetExtraHttpHeaders,SetLocaleOverride,SetNetworkConditions,- SetScriptExecutionDisabled,SetCpuThrottlingRate,SetIdleOverride,SetTimezoneOverride,@@ -323,22 +322,11 @@ fn start_script_execution_disabled_command("BrowserContextNotLoaded",));}- let owner_scope = CommandOwnerScope::capture(conn, cmd.session_id);let Some(page) = loaded_page_mut_for_session(conn, cmd.session_id) else {return EmulationCommandTaskStep::Complete(CommandOutputPlan::result(json!({})));};- match page.start_set_script_execution_disabled(params.value) {- Ok(pending) => EmulationCommandTaskStep::Pending(single_pending_emulation_dispatch(- cmd.id,- owner_scope,- PendingEmulationPageOperation::SetScriptExecutionDisabled,- pending,- None,- )),- Err(error) => {- EmulationCommandTaskStep::Complete(CommandOutputPlan::error(-32000, error.to_string()))- }- }+ page.set_script_execution_disabled_from_io(params.value);+ EmulationCommandTaskStep::Complete(CommandOutputPlan::result(json!({})))}fn start_locale_override_command(@@ -2380,13 +2368,18 @@ pub(crate) async fn clear_emulated_media_for_detached_session_async(// though the resulting settings are observable by every session on the// target. Match that contract when detach preserves the loaded page.let overrides = crate::conn::EmulatedMediaOverrides::default();+ let mut changed = false;if !conn.mutate_emulation_session_state_for_session_owner(Some(session_id), |state| {if let Some(state) = state {+ changed = *state.emulated_media != overrides;*state.emulated_media = overrides.clone();}}) {return Ok(());}+ if !changed {+ return Ok(());+ }let page_overrides: moli_core::page::EmulatedMediaOverrides = (&overrides).into();let Some(page) = loaded_page_mut_for_session(conn, Some(session_id)) else {@@ -2771,9 +2764,6 @@ fn finish_emulation_page_operation(PendingEmulationPageOperation::SetNetworkConditions => page.finish_set_network_offline(completion).map_err(|error| error.to_string()),- PendingEmulationPageOperation::SetScriptExecutionDisabled => page- .finish_set_script_execution_disabled(completion)- .map_err(|error| error.to_string()),PendingEmulationPageOperation::SetCpuThrottlingRate => page.finish_set_cpu_throttling_rate(completion).map_err(|error| error.to_string()),diff --git a/moli-protocol/src/domains/emulation/tests.rs b/moli-protocol/src/domains/emulation/tests.rsindex b14f79646..280fc567d 100644--- a/moli-protocol/src/domains/emulation/tests.rs+++ b/moli-protocol/src/domains/emulation/tests.rs@@ -183,7 +183,7 @@ async fn bidi_set_extra_headers_merges_global_user_context_and_context_layers()}#[tokio::test(flavor = "multi_thread")]-async fn script_execution_disabled_can_complete_through_pending_command_dispatch() {+async fn script_execution_disabled_completes_without_waiting_for_main_owner() {let mut ctx = TestContext::new();load_session_page_for_pending_emulation_test(&mut ctx).await;@@ -194,11 +194,10 @@ async fn script_execution_disabled_can_complete_through_pending_command_dispatch"params": { "value": true }}).to_string();- let pending = ctx- .conn- .try_start_pending_command_dispatch(&raw)- .expect("script execution override should use pending command dispatch");- let messages = complete_pending_command_task_for_test(&mut ctx, pending).await;+ let CdpCommandTaskStep::Complete(outcome) = ctx.conn.start_command_dispatch(&raw) else {+ panic!("the IO-routed script execution override must not wait for the Main owner");+ };+ let messages = outcome.into_parts().0;assert!(messages.iter().any(|message| {message["id"] == json!(9101)diff --git a/moli-protocol/src/domains/performance.rs b/moli-protocol/src/domains/performance.rsindex c58627dc1..05223bf32 100644--- a/moli-protocol/src/domains/performance.rs+++ b/moli-protocol/src/domains/performance.rs@@ -197,6 +197,11 @@ pub(crate) fn try_start_performance_command_dispatch(return PerformanceCommandTaskStep::Complete(default_metrics_command_output_plan());}};+ if renderer_access == CdpRendererCommandAccess::Io {+ return PerformanceCommandTaskStep::Complete(performance_metrics_command_output_plan(+ &page.cached_performance_metric_snapshot(),+ ));+ }let renderer_page = crate::conn::RendererPageResidenceIdentity::from_page(page);let pending = match page.start_performance_metric_snapshot() {Ok(pending) => pending,@@ -218,9 +223,13 @@ fn empty_metrics_command_output_plan() -> CommandOutputPlan {}fn default_metrics_command_output_plan() -> CommandOutputPlan {- CommandOutputPlan::result(json!({- "metrics": build_performance_metrics(&RendererPerformanceMetricSnapshot::default())- }))+ performance_metrics_command_output_plan(&RendererPerformanceMetricSnapshot::default())+}++fn performance_metrics_command_output_plan(+ snapshot: &RendererPerformanceMetricSnapshot,+) -> CommandOutputPlan {+ CommandOutputPlan::result(json!({ "metrics": build_performance_metrics(snapshot) }))}pub(crate) async fn complete_pending_performance_command(@@ -725,7 +734,7 @@ mod tests {}#[tokio::test(flavor = "multi_thread")]- async fn performance_get_metrics_does_not_apply_old_page_completion_to_replacement() {+ async fn performance_get_metrics_reads_the_snapshot_bound_at_each_replacement() {let mut ctx = TestContext::new();load_document(&mut ctx,@@ -747,10 +756,15 @@ mod tests {"sessionId": "SID-1"}).to_string();- let pending = match ctx.conn.start_command_dispatch(&raw) {- CdpCommandTaskStep::Pending(pending) => pending,- CdpCommandTaskStep::Complete(_) => panic!("getMetrics should start a Page command"),- };+ let old_messages =+ complete_immediate_command_task_step_for_test(ctx.conn.start_command_dispatch(&raw));+ let old_response = old_messages+ .iter()+ .find(|message| message["id"] == json!(4_011))+ .expect("old-page getMetrics response");+ let old_metrics = metric_map(old_response);+ assert!(old_metrics["Documents"] >= 1.0);+ assert!(old_metrics["Nodes"] >= 6.0);let replacement = ctx.conn@@ -769,17 +783,22 @@ mod tests {.replace_loaded_page(Some(replacement));drop(previous);- let completed = pending.wait().await;- let step = ctx.conn.complete_pending_command_dispatch(completed).await;- let mut messages = complete_command_task_step_for_test(&mut ctx, step).await;- let response = messages+ let replacement_raw = json!({+ "id": 4_012,+ "method": "Performance.getMetrics",+ "sessionId": "SID-1"+ })+ .to_string();+ let replacement_messages = complete_immediate_command_task_step_for_test(+ ctx.conn.start_command_dispatch(&replacement_raw),+ );+ let replacement_response = replacement_messages.iter()- .position(|message| message["id"] == json!(4_011))- .map(|index| messages.remove(index))- .expect("stale getMetrics command should still receive a response");- let metrics = metric_map(&response);- assert_eq!(metrics["Documents"], 0.0);- assert_eq!(metrics["Nodes"], 0.0);+ .find(|message| message["id"] == json!(4_012))+ .expect("replacement getMetrics response");+ let replacement_metrics = metric_map(replacement_response);+ assert!(replacement_metrics["Documents"] >= 1.0);+ assert!(replacement_metrics["Nodes"] < old_metrics["Nodes"]);}#[tokio::test(flavor = "multi_thread")]diff --git a/moli-renderer-v8/src/document_runtime.rs b/moli-renderer-v8/src/document_runtime.rsindex 606d0034c..4cea24e1a 100644--- a/moli-renderer-v8/src/document_runtime.rs+++ b/moli-renderer-v8/src/document_runtime.rs@@ -678,7 +678,7 @@ pub(super) struct DocumentRuntime {selector_debug: SelectorDebugCounters,document: HostDocumentState,design_mode_documents: HashSet<DomHandle>,- script_execution_disabled: bool,+ script_execution_control: crate::script_execution_control::RendererScriptExecutionControl,bypass_content_security_policy: bool,policy_container: DocumentPolicyContainer,delivered_meta_content_security_policies: RefCell<HashMap<(u64, DomHandle), Vec<String>>>,diff --git a/moli-renderer-v8/src/document_runtime/runtime_core.rs b/moli-renderer-v8/src/document_runtime/runtime_core.rsindex 747bca3ca..9d3ba5ecd 100644--- a/moli-renderer-v8/src/document_runtime/runtime_core.rs+++ b/moli-renderer-v8/src/document_runtime/runtime_core.rs@@ -40,7 +40,7 @@ impl DocumentRuntime {selector_debug: SelectorDebugCounters::default(),document,design_mode_documents: HashSet::new(),- script_execution_disabled: false,+ script_execution_control: Default::default(),bypass_content_security_policy: false,policy_container: DocumentPolicyContainer::default(),delivered_meta_content_security_policies: RefCell::new(HashMap::new()),@@ -168,7 +168,7 @@ impl DocumentRuntime {selector_debug: _,document: _,design_mode_documents: _,- script_execution_disabled: _,+ script_execution_control: _,bypass_content_security_policy: _,policy_container: _,delivered_meta_content_security_policies: _,@@ -229,11 +229,24 @@ impl DocumentRuntime {}pub(crate) fn set_script_execution_disabled(&mut self, disabled: bool) {- self.script_execution_disabled = disabled;+ self.script_execution_control.set_disabled(disabled);}pub(crate) fn script_execution_disabled(&self) -> bool {- self.script_execution_disabled+ self.script_execution_control.is_disabled()+ }++ pub(crate) fn script_execution_control(+ &self,+ ) -> crate::script_execution_control::RendererScriptExecutionControl {+ self.script_execution_control.clone()+ }++ pub(crate) fn bind_script_execution_control(+ &mut self,+ control: crate::script_execution_control::RendererScriptExecutionControl,+ ) {+ self.script_execution_control = control;}pub(crate) fn set_document_character_set(&mut self, character_set: impl Into<String>) {diff --git a/moli-renderer-v8/src/lib.rs b/moli-renderer-v8/src/lib.rsindex 6145adf17..98c2fcd3e 100644--- a/moli-renderer-v8/src/lib.rs+++ b/moli-renderer-v8/src/lib.rs@@ -86,6 +86,7 @@ mod resource_owner;mod resource_ready;mod runtime;mod runtime_binding_data;+mod script_execution_control;mod script_provenance;mod script_vm;mod service_worker_runtime;diff --git a/moli-renderer-v8/src/runtime/owner_local.rs b/moli-renderer-v8/src/runtime/owner_local.rsindex b32674887..ca08b1832 100644--- a/moli-renderer-v8/src/runtime/owner_local.rs+++ b/moli-renderer-v8/src/runtime/owner_local.rs@@ -25,6 +25,8 @@ pub struct RendererAttachedPage {pub(super) inspector_main_ingress:crate::script_vm::inspector_main::RendererInspectorMainIngress,pub(super) inspector_io_ingress: crate::script_vm::inspector_io::RendererInspectorIoIngress,+ pub(super) script_execution_control:+ crate::script_execution_control::RendererScriptExecutionControl,pub(super) page_state: Arc<RendererPageState>,pub(super) creation_diagnostics: RendererPageCreationDiagnostics,pub(super) creation_artifacts: RendererPageCreationArtifacts,@@ -74,6 +76,7 @@ impl RendererAttachedPage {inspector_pause_bridge: self.inspector_pause_bridge,inspector_main_ingress: self.inspector_main_ingress,inspector_io_ingress: self.inspector_io_ingress,+ script_execution_control: self.script_execution_control,committed_document_post_response_continuation: self.committed_document_post_response_continuation,_not_send: PhantomData,@@ -96,6 +99,7 @@ pub struct RendererPageHandle {inspector_pause_bridge: crate::script_vm::inspector_pause::RendererInspectorPauseBridge,inspector_main_ingress: crate::script_vm::inspector_main::RendererInspectorMainIngress,inspector_io_ingress: crate::script_vm::inspector_io::RendererInspectorIoIngress,+ script_execution_control: crate::script_execution_control::RendererScriptExecutionControl,committed_document_post_response_continuation:Option<RendererPageCommandPostResponseContinuation>,_not_send: PhantomData<Rc<()>>,@@ -198,6 +202,12 @@ impl RendererPageHandle {self.inspector_pause_bridge.is_pause_active()}+ /// Publishes the DevTools IO-agent script policy without borrowing the+ /// owner-resident `PageVm` that may currently be executing JavaScript.+ pub fn set_script_execution_disabled_from_io(&self, disabled: bool) {+ self.script_execution_control.set_disabled(disabled);+ }+pub fn arm_runtime_inspector_session_detach(&self,) -> RendererRuntimeInspectorSessionDetachGuard {diff --git a/moli-renderer-v8/src/runtime/owner_local_store.rs b/moli-renderer-v8/src/runtime/owner_local_store.rsindex e554d2d91..9b65cf0c3 100644--- a/moli-renderer-v8/src/runtime/owner_local_store.rs+++ b/moli-renderer-v8/src/runtime/owner_local_store.rs@@ -834,7 +834,8 @@ impl Drop for RendererDocumentIsolateReservationState {}impl RendererPageLocalEntry {- fn new(slot: RendererPageSlotHandle, vm: PageVm) -> Result<Self> {+ fn new(slot: RendererPageSlotHandle, mut vm: PageVm) -> Result<Self> {+ vm.bind_script_execution_control(slot.script_execution_control());Ok(Self {slot,top_level_navigation_dispatch:@@ -852,6 +853,9 @@ impl RendererPageLocalEntry {slot: RendererPageSlotHandle,mut pending: PageVmPendingPhaseOneNavigation,) -> Result<Self> {+ pending+ .page_vm_mut()+ .bind_script_execution_control(slot.script_execution_control());let mut entry = Self {slot,top_level_navigation_dispatch:@@ -1006,12 +1010,16 @@ impl RendererPageLocalEntry {}pub(super) fn page_vm_mut(&mut self) -> &mut PageVm {- if let Some(pending) = self.pending_phase_one_navigation.as_mut() {- return pending.page_vm_mut();- }- self.vm- .as_mut()- .expect("resident renderer page entry must retain an active PageVm")+ let control = self.slot.script_execution_control();+ let page_vm = if let Some(pending) = self.pending_phase_one_navigation.as_mut() {+ pending.page_vm_mut()+ } else {+ self.vm+ .as_mut()+ .expect("resident renderer page entry must retain an active PageVm")+ };+ page_vm.bind_script_execution_control(control);+ page_vm}pub(super) fn pending_phase_one_navigation_has_ready_streaming_input(&mut self) -> bool {@@ -1172,6 +1180,9 @@ impl RendererPageLocalEntry {&self,pending: &mut PageVmPendingPhaseOneNavigation,) -> Result<RendererPageToken> {+ pending+ .page_vm_mut()+ .bind_script_execution_control(self.slot.script_execution_control());let validation = if self.pending_phase_one_navigation.is_some() {Err(anyhow!("renderer page already owns a pending phase-one navigation"@@ -1228,12 +1239,13 @@ impl RendererPageLocalEntry {Ok(wake_token)}- fn install_resumed_phase_one_page_vm(&mut self, page_vm: PageVm) {+ fn install_resumed_phase_one_page_vm(&mut self, mut page_vm: PageVm) {debug_assert!(self.pending_phase_one_navigation.is_none(),"a resumed phase-one PageVm cannot coexist with its consumed residence");self.retire_document_lifecycle_turn();+ page_vm.bind_script_execution_control(self.slot.script_execution_control());self.vm = Some(page_vm);}@@ -3422,6 +3434,7 @@ impl RendererOwnerLocalStore {let inspector_pause_bridge = entry.page_vm().inspector_pause_bridge();let inspector_main_ingress = entry.page_vm().inspector_main_ingress();let inspector_io_ingress = entry.page_vm().inspector_io_ingress();+ let script_execution_control = entry.slot.script_execution_control();let page_state = Self::commit_current_vm_page_state_on_entry(&mut entry)?;let initial_runtime_realms = entry.page_vm_mut().vm_mut().runtime_realm_inventory();let devtools_agent_token = entry.page_vm().devtools_agent_token();@@ -3435,6 +3448,7 @@ impl RendererOwnerLocalStore {inspector_pause_bridge,inspector_main_ingress,inspector_io_ingress,+ script_execution_control,page_state,devtools_agent_token,creation_diagnostics,@@ -3464,6 +3478,7 @@ impl RendererOwnerLocalStore {inspector_pause_bridge,inspector_main_ingress,inspector_io_ingress,+ script_execution_control,page_state,devtools_agent_token,mut creation_diagnostics,@@ -3479,6 +3494,7 @@ impl RendererOwnerLocalStore {inspector_pause_bridge,inspector_main_ingress,inspector_io_ingress,+ script_execution_control,page_state,creation_diagnostics,creation_artifacts,@@ -3762,6 +3778,7 @@ impl RendererOwnerLocalStore {Arc::downgrade(&owner.owner_state),RendererPageEntry::active(page_id, vm.creation_id, 0, 0, page_state),vm.vm().page_context_cancel_sender(),+ vm.script_execution_control(),)}@@ -4537,6 +4554,7 @@ mod navigation_dispatch_tests {std::sync::Weak::new(),RendererPageEntry::removed(page_id),page_context_cancel_tx,+ Default::default(),);RendererPageLocalEntry {slot,diff --git a/moli-renderer-v8/src/runtime/page.rs b/moli-renderer-v8/src/runtime/page.rsindex 25e05fa6c..3fe54faae 100644--- a/moli-renderer-v8/src/runtime/page.rs+++ b/moli-renderer-v8/src/runtime/page.rs@@ -28,7 +28,7 @@ use super::{RendererOwnerCommand, RendererOwnerHandle, RendererOwnerReply, RendererPageCreationArtifacts,RendererPageCreationDiagnostics, RendererPageHandle, RendererPageReservationToken,RendererPageState, RendererPendingDownloadActivation, RendererPendingDownloadResponse,- RendererReservedServiceWorkerClient,+ RendererPerformanceMetricSnapshot, RendererReservedServiceWorkerClient,page_vm::{PageVm, PageVmEnvConfig, PageVmRuntimeHooks},phase_one::{ConcurrentParseTimeRuntime, ParseTimePageVmCreationOutcome,@@ -44,6 +44,7 @@ pub(crate) struct PageVmStateCapture {pub(crate) idle_override: Option<crate::protocol_types::EmulatedIdleOverride>,pub(crate) service_worker_client_id: u64,pub(crate) dedicated_worker_running_worker_isolate_count: usize,+ pub(crate) performance_metric_snapshot: RendererPerformanceMetricSnapshot,}#[derive(Debug, Clone)]@@ -276,6 +277,7 @@ impl JsRuntime {Arc::downgrade(&self.inner.renderer_owner.state),super::RendererPageEntry::removed(page_id),cancel_tx,+ Default::default(),);let result = self.innerdiff --git a/moli-renderer-v8/src/runtime/page_network.rs b/moli-renderer-v8/src/runtime/page_network.rsindex baef60fd7..b2b516001 100644--- a/moli-renderer-v8/src/runtime/page_network.rs+++ b/moli-renderer-v8/src/runtime/page_network.rs@@ -159,7 +159,6 @@ impl PageVm {}pub(crate) fn set_script_execution_disabled(&mut self, disabled: bool) {- self.script_execution_disabled = disabled;self.vm_mut().set_script_execution_disabled(disabled);}diff --git a/moli-renderer-v8/src/runtime/page_state.rs b/moli-renderer-v8/src/runtime/page_state.rsindex bad64bf7c..6ab872fbc 100644--- a/moli-renderer-v8/src/runtime/page_state.rs+++ b/moli-renderer-v8/src/runtime/page_state.rs@@ -21,6 +21,7 @@ pub struct RendererPageState {pub idle_override: Option<crate::protocol_types::EmulatedIdleOverride>,pub service_worker_client_id: u64,pub dedicated_worker_running_worker_isolate_count: usize,+ pub performance_metric_snapshot: RendererPerformanceMetricSnapshot,}impl RendererPageState {@@ -53,6 +54,7 @@ impl RendererPageState {service_worker_client_id: state_capture.service_worker_client_id,dedicated_worker_running_worker_isolate_count: state_capture.dedicated_worker_running_worker_isolate_count,+ performance_metric_snapshot: state_capture.performance_metric_snapshot,})}@@ -160,6 +162,7 @@ pub struct RendererPageSlotHandle {owner: std::sync::Weak<RendererOwnerState>,inner: Arc<Mutex<RendererPageEntry>>,page_context_cancel_tx: RendererPageContextCancelSender,+ script_execution_control: crate::script_execution_control::RendererScriptExecutionControl,}impl RendererPageSlotHandle {@@ -167,11 +170,13 @@ impl RendererPageSlotHandle {owner: std::sync::Weak<RendererOwnerState>,entry: RendererPageEntry,page_context_cancel_tx: RendererPageContextCancelSender,+ script_execution_control: crate::script_execution_control::RendererScriptExecutionControl,) -> Self {Self {owner,inner: Arc::new(Mutex::new(entry)),page_context_cancel_tx,+ script_execution_control,}}@@ -231,6 +236,12 @@ impl RendererPageSlotHandle {self.page_context_cancel_tx.clone()}+ pub(crate) fn script_execution_control(+ &self,+ ) -> crate::script_execution_control::RendererScriptExecutionControl {+ self.script_execution_control.clone()+ }+pub(crate) fn page_id(&self) -> PageId {self.entry().page_id}diff --git a/moli-renderer-v8/src/runtime/page_surface.rs b/moli-renderer-v8/src/runtime/page_surface.rsindex ce1814f1f..8d9f9cf55 100644--- a/moli-renderer-v8/src/runtime/page_surface.rs+++ b/moli-renderer-v8/src/runtime/page_surface.rs@@ -5639,6 +5639,7 @@ impl RendererPageTable {idle_override: None,service_worker_client_id: 0,dedicated_worker_running_worker_isolate_count: 0,+ performance_metric_snapshot: RendererPerformanceMetricSnapshot::default(),}),})}diff --git a/moli-renderer-v8/src/runtime/page_vm/mod.rs b/moli-renderer-v8/src/runtime/page_vm/mod.rsindex d6ea52e4e..d3cf64a96 100644--- a/moli-renderer-v8/src/runtime/page_vm/mod.rs+++ b/moli-renderer-v8/src/runtime/page_vm/mod.rs@@ -1559,7 +1559,6 @@ pub(crate) struct PageVm {pub(super) extra_http_headers: Vec<(String, String)>,pub(super) locale_override: Option<String>,pub(super) timezone_override: Option<String>,- pub(super) script_execution_disabled: bool,pub(super) bypass_content_security_policy: bool,pub(super) cpu_throttling_rate: f64,pub(super) emulated_media: crate::protocol_types::EmulatedMediaOverrides,@@ -2870,7 +2869,7 @@ impl PageVm {document_last_modified: None,locale_override: self.locale_override.clone(),timezone_override: self.timezone_override.clone(),- script_execution_disabled: self.script_execution_disabled,+ script_execution_disabled: self.script_execution_disabled(),bypass_content_security_policy: self.bypass_content_security_policy,cpu_throttling_rate: self.cpu_throttling_rate,emulated_media: self.emulated_media.clone(),@@ -4466,6 +4465,10 @@ impl PageVm {let dedicated_worker_running_worker_isolate_count = self.vm().dedicated_worker_running_worker_isolate_count_for_diagnostics();+ let performance_metric_snapshot = self.vm().performance_metric_snapshot_without_script(+ self.document_lifecycle.current_snapshot(),+ report.subresource_network_records().len(),+ );if let Some(started) = total_started {tracing::info!(@@ -4488,6 +4491,7 @@ impl PageVm {idle_override: self.idle_override,service_worker_client_id: self.vm().service_worker_client_id().as_u64(),dedicated_worker_running_worker_isolate_count,+ performance_metric_snapshot,})}@@ -4826,7 +4830,6 @@ impl PageVm {extra_http_headers: env.extra_http_headers.clone(),locale_override: env.locale_override.clone(),timezone_override: env.timezone_override.clone(),- script_execution_disabled: env.script_execution_disabled,bypass_content_security_policy: env.bypass_content_security_policy,cpu_throttling_rate: env.cpu_throttling_rate,emulated_media: env.emulated_media.clone(),@@ -5561,7 +5564,20 @@ impl PageVm {}pub(super) fn script_execution_disabled(&self) -> bool {- self.script_execution_disabled+ self.vm().script_execution_disabled()+ }++ pub(crate) fn script_execution_control(+ &self,+ ) -> crate::script_execution_control::RendererScriptExecutionControl {+ self.vm().script_execution_control()+ }++ pub(crate) fn bind_script_execution_control(+ &mut self,+ control: crate::script_execution_control::RendererScriptExecutionControl,+ ) {+ self.vm_mut().bind_script_execution_control(control);}pub(super) fn set_target_stage(&mut self, stage: PageVmInitStage) {diff --git a/moli-renderer-v8/src/runtime/page_vm/tests/document_script_completion.rs b/moli-renderer-v8/src/runtime/page_vm/tests/document_script_completion.rsindex c97ce1def..8dfcbf2b7 100644--- a/moli-renderer-v8/src/runtime/page_vm/tests/document_script_completion.rs+++ b/moli-renderer-v8/src/runtime/page_vm/tests/document_script_completion.rs@@ -362,7 +362,7 @@ async fn selected_disabled_document_script_does_not_flush_unrelated_runtime_workUrl::parse("https://example.com/disabled-document-script.html").expect("document URL"),);- page_vm.script_execution_disabled = true;+ page_vm.set_script_execution_disabled(true);page_vm.vm_mut().enqueue_test_pending_runtime_source_load();diff --git a/moli-renderer-v8/src/script_execution_control.rs b/moli-renderer-v8/src/script_execution_control.rsnew file mode 100644index 000000000..16d8df993--- /dev/null+++ b/moli-renderer-v8/src/script_execution_control.rs@@ -0,0 +1,37 @@+use std::sync::{+ Arc,+ atomic::{AtomicBool, Ordering},+};++/// Thread-safe script-execution policy shared by a stable Page residence and+/// whichever Document runtime is currently installed in that Page.+///+/// DevTools may update this setting from its IO agent while the renderer owner+/// is executing JavaScript. Publishing the policy must therefore neither+/// borrow the active `PageVm` nor wait for the owner lane.+#[derive(Clone, Debug)]+pub(crate) struct RendererScriptExecutionControl {+ disabled: Arc<AtomicBool>,+}++impl RendererScriptExecutionControl {+ pub(crate) fn new(disabled: bool) -> Self {+ Self {+ disabled: Arc::new(AtomicBool::new(disabled)),+ }+ }++ pub(crate) fn is_disabled(&self) -> bool {+ self.disabled.load(Ordering::Acquire)+ }++ pub(crate) fn set_disabled(&self, disabled: bool) {+ self.disabled.store(disabled, Ordering::Release);+ }+}++impl Default for RendererScriptExecutionControl {+ fn default() -> Self {+ Self::new(false)+ }+}diff --git a/moli-renderer-v8/src/script_vm.rs b/moli-renderer-v8/src/script_vm.rsindex 6c81f0cd4..4c193779b 100644--- a/moli-renderer-v8/src/script_vm.rs+++ b/moli-renderer-v8/src/script_vm.rs@@ -7111,6 +7111,34 @@ impl ScriptVm {serde_json::from_str(&snapshot_json).context("failed to decode performance metric snapshot")}+ pub(crate) fn performance_metric_snapshot_without_script(+ &self,+ lifecycle: crate::runtime::RendererDocumentLifecycleSnapshot,+ resource_count: usize,+ ) -> RendererPerformanceMetricSnapshot {+ let started_micros = lifecycle.started.timestamp_micros;+ let timestamp_ms = |timestamp_micros: u64| timestamp_micros as f64 / 1_000.0;+ let dom = moli_dom_memory_counters(self.document_runtime.dom_host().dom());+ RendererPerformanceMetricSnapshot {+ time_origin_ms: Some(timestamp_ms(started_micros)),+ now_ms: Some(+ moli_time::monotonic_timestamp_micros().saturating_sub(started_micros) as f64+ / 1_000.0,+ ),+ navigation_start_ms: Some(timestamp_ms(started_micros)),+ dom_content_loaded_ms: lifecycle+ .dom_content_loaded+ .map(|stamp| timestamp_ms(stamp.timestamp_micros)),+ load_event_ms: lifecycle+ .load+ .map(|stamp| timestamp_ms(stamp.timestamp_micros)),+ document_count: Some(1.0),+ frame_count: Some((1 + dom.iframe_element_count) as f64),+ node_count: Some(dom.node_count as f64),+ resource_count: Some(resource_count as f64),+ }+ }+pub(super) fn begin_runtime_evaluate(&mut self,execution_context_id: Option<i64>,diff --git a/moli-renderer-v8/src/script_vm/document_content.rs b/moli-renderer-v8/src/script_vm/document_content.rsindex 4e9f1bc74..15a78c1d6 100644--- a/moli-renderer-v8/src/script_vm/document_content.rs+++ b/moli-renderer-v8/src/script_vm/document_content.rs@@ -8,6 +8,23 @@ impl ScriptVm {.set_script_execution_disabled(disabled);}+ pub(crate) fn script_execution_disabled(&self) -> bool {+ self.document_runtime.script_execution_disabled()+ }++ pub(crate) fn script_execution_control(+ &self,+ ) -> crate::script_execution_control::RendererScriptExecutionControl {+ self.document_runtime.script_execution_control()+ }++ pub(crate) fn bind_script_execution_control(+ &mut self,+ control: crate::script_execution_control::RendererScriptExecutionControl,+ ) {+ self.document_runtime.bind_script_execution_control(control);+ }+pub(crate) fn set_document_content_for_frame(&mut self,frame_id: &str,