Skip to content

armgit / moli

Public Imported from GitHub
0

Best headless browser for AI agents. Lite, Fast, High-Compatibility. Built in Rust

fix(inspector): make debugger pauses opt-in at session creation

ldm08942523b9eba
diff --git a/moli-core/src/config/mod.rs b/moli-core/src/config/mod.rs
index 3943c76e9..23c3f953d 100644
--- a/moli-core/src/config/mod.rs
+++ b/moli-core/src/config/mod.rs
@@ -14,6 +14,7 @@ pub struct BrowserConfig {
optional_resource_fetch_mask: OptionalResourceFetchMask,
subframe_loading_enabled: bool,
script_execution_disabled: bool,
+ debugger_enabled: bool,
author_styles_disabled: bool,
wpt_extensions_enabled: bool,
}
@@ -28,6 +29,7 @@ impl Default for BrowserConfig {
optional_resource_fetch_mask: OptionalResourceFetchMask::NONE,
subframe_loading_enabled: true,
script_execution_disabled: false,
+ debugger_enabled: false,
author_styles_disabled: false,
wpt_extensions_enabled: false,
}
@@ -160,6 +162,20 @@ impl BrowserConfig {
self.author_styles_disabled
}
+ /// Whether newly enabled Inspector Debugger agents allow pauses by default.
+ pub fn debugger_enabled(&self) -> bool {
+ self.debugger_enabled
+ }
+
+ pub fn set_debugger_enabled(&mut self, enabled: bool) {
+ self.debugger_enabled = enabled;
+ }
+
+ pub fn with_debugger_enabled(mut self, enabled: bool) -> Self {
+ self.set_debugger_enabled(enabled);
+ self
+ }
+
pub fn set_author_styles_disabled(&mut self, disabled: bool) {
self.author_styles_disabled = disabled;
}
diff --git a/moli-core/src/runtime/mod.rs b/moli-core/src/runtime/mod.rs
index cf35a9878..ab7e2d0e7 100644
--- a/moli-core/src/runtime/mod.rs
+++ b/moli-core/src/runtime/mod.rs
@@ -286,6 +286,7 @@ impl Browser {
RendererBrowserContextRuntime::new_owned_with_service_worker_resource_store_and_browser_resource_runtime(
partition.service_worker_resource_store(),
resource_runtime,
+ config.debugger_enabled(),
);
let browser_context_access = browser_context_owner.owner_access();
let resource_runtime = browser_context_access
@@ -1194,6 +1195,7 @@ impl Browser {
.document_settings
.script_execution_disabled = self.config.script_execution_disabled();
create_page_request.wpt_extensions_enabled = self.config.wpt_extensions_enabled();
+ create_page_request.document_settings.debugger_enabled = self.config.debugger_enabled();
create_page_request.reply_boundary = reply_boundary;
create_page_request.lifecycle_decider = lifecycle_decider;
create_page_request.indexed_db_manager = Some(self.partition.weak_indexed_db_manager());
@@ -1333,6 +1335,7 @@ impl Browser {
document_start_scripts,
document_settings: moli_page_types::DocumentSettings {
script_execution_disabled: self.config.script_execution_disabled(),
+ debugger_enabled: self.config.debugger_enabled(),
..Default::default()
},
..Default::default()
diff --git a/moli-core/src/runtime/navigation_engine.rs b/moli-core/src/runtime/navigation_engine.rs
index d4e20f7dc..f79e3a88b 100644
--- a/moli-core/src/runtime/navigation_engine.rs
+++ b/moli-core/src/runtime/navigation_engine.rs
@@ -382,6 +382,7 @@ pub struct NavigationRuntimeConfig {
optional_resource_fetch_mask: OptionalResourceFetchMask,
subframe_loading_enabled: bool,
layout_configuration: LayoutConfiguration,
+ debugger_enabled: bool,
}
impl NavigationRuntimeConfig {
@@ -413,6 +414,7 @@ impl NavigationRuntimeConfig {
optional_resource_fetch_mask,
subframe_loading_enabled,
layout_configuration,
+ debugger_enabled: false,
}
}
@@ -448,6 +450,15 @@ impl NavigationRuntimeConfig {
pub fn layout_configuration(&self) -> LayoutConfiguration {
self.layout_configuration
}
+
+ pub fn debugger_enabled(&self) -> bool {
+ self.debugger_enabled
+ }
+
+ pub fn with_debugger_enabled(mut self, enabled: bool) -> Self {
+ self.debugger_enabled = enabled;
+ self
+ }
}
impl Default for NavigationRuntimeConfig {
@@ -469,6 +480,7 @@ impl From<&crate::config::BrowserConfig> for NavigationRuntimeConfig {
config.subframe_loading_enabled(),
config.layout_configuration(),
)
+ .with_debugger_enabled(config.debugger_enabled())
}
}
@@ -477,6 +489,7 @@ pub struct NavigationEngine {
fetch_config: FetchConfig,
page_network_policy: PageNetworkPolicy,
layout_configuration: LayoutConfiguration,
+ debugger_enabled: bool,
emulated_scrollbars_hidden: bool,
js_runtime: JsRuntime,
resource_runtime: Option<BrowserResourceRuntime>,
@@ -566,6 +579,7 @@ impl NavigationEngine {
RendererBrowserContextRuntime::new_owned_with_service_worker_resource_store_and_browser_resource_runtime(
moli_renderer_v8::new_shared_service_worker_resource_store(),
resource_runtime,
+ config.debugger_enabled(),
);
let browser_context_access = browser_context_owner.owner_access();
Self::new_with_runtime_config_and_browser_context_access_inner(
@@ -630,6 +644,7 @@ impl NavigationEngine {
optional_resource_fetch_mask,
subframe_loading_enabled,
layout_configuration,
+ debugger_enabled,
} = config;
let resource_runtime = browser_context_access
.current_browser_resource_runtime()
@@ -665,6 +680,7 @@ impl NavigationEngine {
false,
),
layout_configuration,
+ debugger_enabled,
emulated_scrollbars_hidden: false,
js_runtime,
resource_runtime: Some(resource_runtime),
@@ -686,7 +702,8 @@ impl NavigationEngine {
optional_resource_fetch_mask,
subframe_loading_enabled,
renderer_owner_source.layout_configuration,
- ),
+ )
+ .with_debugger_enabled(renderer_owner_source.debugger_enabled),
renderer_owner_source,
)
}
@@ -700,6 +717,7 @@ impl NavigationEngine {
optional_resource_fetch_mask,
subframe_loading_enabled,
layout_configuration,
+ debugger_enabled,
} = config;
renderer_owner_source
.js_runtime
@@ -717,6 +735,7 @@ impl NavigationEngine {
false,
),
layout_configuration,
+ debugger_enabled,
emulated_scrollbars_hidden: false,
js_runtime: renderer_owner_source.js_runtime.clone(),
resource_runtime: Some(resource_runtime),
@@ -790,6 +809,11 @@ impl NavigationEngine {
self.subframe_loading_enabled(),
self.layout_configuration,
)
+ .with_debugger_enabled(self.debugger_enabled)
+ }
+
+ pub fn debugger_enabled(&self) -> bool {
+ self.debugger_enabled
}
pub fn layout_policy(&self) -> LayoutPolicy {
@@ -1605,6 +1629,7 @@ impl NavigationEngine {
extra_http_headers,
document_settings: moli_page_types::DocumentSettings {
script_execution_disabled,
+ debugger_enabled: self.debugger_enabled,
scrollbars_hidden: self.emulated_scrollbars_hidden,
bypass_content_security_policy,
emulated_media,
@@ -1760,6 +1785,7 @@ impl NavigationEngine {
extra_http_headers,
document_settings: moli_page_types::DocumentSettings {
script_execution_disabled,
+ debugger_enabled: self.debugger_enabled,
scrollbars_hidden: self.emulated_scrollbars_hidden,
bypass_content_security_policy,
emulated_media,
@@ -1894,6 +1920,7 @@ impl NavigationEngine {
extra_http_headers: options.extra_http_headers,
document_settings: moli_page_types::DocumentSettings {
script_execution_disabled: options.script_execution_disabled,
+ debugger_enabled: self.debugger_enabled,
scrollbars_hidden: self.emulated_scrollbars_hidden,
bypass_content_security_policy: options.bypass_content_security_policy,
emulated_media: options.emulated_media,
diff --git a/moli-page-types/src/document_settings.rs b/moli-page-types/src/document_settings.rs
index 1eb88ffd2..909fe7d62 100644
--- a/moli-page-types/src/document_settings.rs
+++ b/moli-page-types/src/document_settings.rs
@@ -11,6 +11,8 @@ use crate::{
#[derive(Clone, Debug, Default, PartialEq)]
pub struct DocumentSettings {
pub script_execution_disabled: bool,
+ /// Startup default for Inspector pauses; explicit CDP session settings remain authoritative.
+ pub debugger_enabled: bool,
/// Target emulation contribution; startup scrollbar hiding remains separate.
pub scrollbars_hidden: bool,
pub bypass_content_security_policy: bool,
diff --git a/moli-protocol-server/src/protocol_server/mod.rs b/moli-protocol-server/src/protocol_server/mod.rs
index af664c0b2..8075f6a5e 100644
--- a/moli-protocol-server/src/protocol_server/mod.rs
+++ b/moli-protocol-server/src/protocol_server/mod.rs
@@ -794,6 +794,7 @@ fn is_websocket_upgrade_request(request: &Request<Body>) -> bool {
#[derive(Clone)]
struct AppState {
control: BrowserInstanceControl,
+ debugger_enabled: bool,
browser_ws_url: String,
page_ws_url: String,
bidi_ws_url: String,
@@ -874,6 +875,7 @@ impl AppState {
Self {
control,
browser_ws_url: format!("ws://{addr}/devtools/browser/{DEFAULT_BROWSER_ID}"),
+ debugger_enabled: navigation_runtime_config.debugger_enabled(),
page_ws_url: format!("ws://{addr}/devtools/page/{DEFAULT_TARGET_ID}"),
bidi_ws_url: format!("ws://{addr}/session"),
bidi_session_registry: SharedBidiSessionRegistry::default(),
diff --git a/moli-protocol-server/src/protocol_server/tests/mod.rs b/moli-protocol-server/src/protocol_server/tests/mod.rs
index 8d043d857..c57c5a7ef 100644
--- a/moli-protocol-server/src/protocol_server/tests/mod.rs
+++ b/moli-protocol-server/src/protocol_server/tests/mod.rs
@@ -409,6 +409,8 @@ fn protocol_server_test_runtime_config(
true,
LayoutPolicy::OnDemand,
)
+ // Most protocol fixtures exercise Chromium-compatible debugging, including pauses.
+ .with_debugger_enabled(true)
}
async fn spawn_test_protocol_server_with_layout_policy(
diff --git a/moli-protocol-server/src/protocol_server/webdriver_bidi.rs b/moli-protocol-server/src/protocol_server/webdriver_bidi.rs
index 2ccffcf53..81ffe0d4c 100644
--- a/moli-protocol-server/src/protocol_server/webdriver_bidi.rs
+++ b/moli-protocol-server/src/protocol_server/webdriver_bidi.rs
@@ -77,7 +77,8 @@ pub(super) async fn ws_bidi_session_upgrade_handler(
state.optional_resource_fetch_mask,
state.subframe_loading_enabled,
state.layout_configuration,
- );
+ )
+ .with_debugger_enabled(state.debugger_enabled);
ws.on_upgrade(move |socket| {
handle_bidi_session_socket(
socket,
diff --git a/moli-protocol-server/src/protocol_server/webdriver_classic.rs b/moli-protocol-server/src/protocol_server/webdriver_classic.rs
index 79bf2b73a..57710d459 100644
--- a/moli-protocol-server/src/protocol_server/webdriver_classic.rs
+++ b/moli-protocol-server/src/protocol_server/webdriver_classic.rs
@@ -1676,7 +1676,8 @@ pub(super) async fn webdriver_classic_new_session(
state.optional_resource_fetch_mask,
state.subframe_loading_enabled,
state.layout_configuration,
- ),
+ )
+ .with_debugger_enabled(state.debugger_enabled),
instance_connection,
);
let create_context = ClassicDevToolsCommandContext::new(session.session_id.as_str());
diff --git a/moli-protocol/src/conn.rs b/moli-protocol/src/conn.rs
index 9d212ede6..4f3d8aa35 100644
--- a/moli-protocol/src/conn.rs
+++ b/moli-protocol/src/conn.rs
@@ -930,12 +930,14 @@ impl CdpInitialStoragePartitionOwner {
id: String,
http_cache_root: Option<PathBuf>,
http_cache_max_bytes: Option<u64>,
+ debugger_enabled: bool,
) -> BrowserContext {
BrowserContext::new_with_storage_partition_handles_and_http_cache(
id,
self.handles.clone(),
http_cache_root,
http_cache_max_bytes,
+ debugger_enabled,
)
}
@@ -3139,6 +3141,9 @@ impl CdpConnection {
id,
self.fetch_config().http_cache_dir().map(PathBuf::from),
self.fetch_config().http_cache_max_bytes(),
+ self.standalone_navigation_engine
+ .runtime_config()
+ .debugger_enabled(),
);
self.apply_global_browser_context_state(&mut browser_context);
browser_context
@@ -3168,6 +3173,9 @@ impl CdpConnection {
id,
self.fetch_config().http_cache_dir().map(PathBuf::from),
self.fetch_config().http_cache_max_bytes(),
+ self.standalone_navigation_engine
+ .runtime_config()
+ .debugger_enabled(),
);
self.apply_global_browser_context_state(&mut browser_context);
browser_context
diff --git a/moli-protocol/src/conn/browser_context/target_session_owner.rs b/moli-protocol/src/conn/browser_context/target_session_owner.rs
index 92b61dff1..53aecd5c5 100644
--- a/moli-protocol/src/conn/browser_context/target_session_owner.rs
+++ b/moli-protocol/src/conn/browser_context/target_session_owner.rs
@@ -195,9 +195,11 @@ impl TargetNavigationLoadInputs {
pub(crate) fn document_settings_snapshot(
&self,
idle_override: Option<moli_page_types::EmulatedIdleOverride>,
+ debugger_enabled: bool,
) -> moli_page_types::DocumentSettings {
moli_page_types::DocumentSettings {
script_execution_disabled: self.script_execution_disabled,
+ debugger_enabled,
scrollbars_hidden: self.scrollbars_hidden,
bypass_content_security_policy: self.bypass_content_security_policy,
emulated_media: self.emulated_media.clone(),
diff --git a/moli-protocol/src/conn/runtime_load.rs b/moli-protocol/src/conn/runtime_load.rs
index e70e53abb..b29114d37 100644
--- a/moli-protocol/src/conn/runtime_load.rs
+++ b/moli-protocol/src/conn/runtime_load.rs
@@ -1762,7 +1762,16 @@ impl CdpConnection {
) -> anyhow::Result<PreparedDocumentPageCommitConfiguration> {
let idle_override = self.idle_override_for_navigation(owner, final_url);
let load_inputs = self.navigation_load_inputs_for_owner(owner);
- let document_settings = load_inputs.document_settings_snapshot(idle_override);
+ let debugger_enabled = self
+ .page_navigation_engine_for_load_inputs(&load_inputs)
+ .map(NavigationEngine::debugger_enabled)
+ .unwrap_or_else(|| {
+ self.standalone_navigation_engine
+ .runtime_config()
+ .debugger_enabled()
+ });
+ let document_settings =
+ load_inputs.document_settings_snapshot(idle_override, debugger_enabled);
// The renderer runtime is shared by the BrowserContext, but each Page
// target owns its NavigationEngine and may have a different transport
// identity. Resolve through that target's engine at the commit
diff --git a/moli-protocol/src/conn/state/browser_context.rs b/moli-protocol/src/conn/state/browser_context.rs
index 49d7eb0fc..5445ee3bf 100644
--- a/moli-protocol/src/conn/state/browser_context.rs
+++ b/moli-protocol/src/conn/state/browser_context.rs
@@ -429,6 +429,7 @@ impl BrowserContext {
BrowserContextStoragePartitionHandles::with_initial_cookies(initial_cookies),
None,
None,
+ false,
)
}
@@ -437,6 +438,7 @@ impl BrowserContext {
partition: BrowserContextStoragePartitionHandles,
http_cache_root: Option<PathBuf>,
http_cache_max_bytes: Option<u64>,
+ debugger_enabled: bool,
) -> Self {
let storage_partition = BrowserContextStoragePartitionIdentity::ephemeral(id.as_str());
Self::new_with_storage_partition_and_storage_partition_identity(
@@ -445,6 +447,7 @@ impl BrowserContext {
http_cache_root,
http_cache_max_bytes,
storage_partition,
+ debugger_enabled,
)
}
@@ -452,12 +455,14 @@ impl BrowserContext {
id: String,
http_cache_root: Option<PathBuf>,
http_cache_max_bytes: Option<u64>,
+ debugger_enabled: bool,
) -> Self {
Self::new_ephemeral_with_storage_partition_handles(
id,
BrowserContextStoragePartitionHandles::memory(),
http_cache_root,
http_cache_max_bytes,
+ debugger_enabled,
)
}
@@ -466,6 +471,7 @@ impl BrowserContext {
partition: BrowserContextStoragePartitionHandles,
http_cache_root: Option<PathBuf>,
http_cache_max_bytes: Option<u64>,
+ debugger_enabled: bool,
) -> Self {
Self::new_with_storage_partition_and_storage_partition_identity(
id,
@@ -473,6 +479,7 @@ impl BrowserContext {
http_cache_root,
http_cache_max_bytes,
BrowserContextStoragePartitionIdentity::profile_backed_default(),
+ debugger_enabled,
)
}
@@ -481,12 +488,14 @@ impl BrowserContext {
partition: BrowserContextStoragePartitionHandles,
http_cache_root: Option<PathBuf>,
http_cache_max_bytes: Option<u64>,
+ debugger_enabled: bool,
) -> Self {
Self::new_with_storage_partition_and_http_cache(
id,
partition,
http_cache_root,
http_cache_max_bytes,
+ debugger_enabled,
)
}
@@ -496,6 +505,7 @@ impl BrowserContext {
http_cache_root: Option<PathBuf>,
http_cache_max_bytes: Option<u64>,
identity: BrowserContextStoragePartitionIdentity,
+ debugger_enabled: bool,
) -> Self {
let storage_partition = BrowserContextStoragePartition::new(identity, partition);
@@ -537,7 +547,9 @@ impl BrowserContext {
http_cache_max_bytes,
page_navigation_runtime_config: None,
renderer_output_transport_sender: None,
- renderer_runtime_owner: Some(RendererBrowserContextRuntime::new()),
+ renderer_runtime_owner: Some(RendererBrowserContextRuntime::new_with_debugger_enabled(
+ debugger_enabled,
+ )),
}
}
diff --git a/moli-protocol/src/domains/debugger.rs b/moli-protocol/src/domains/debugger.rs
index f4ed77d30..4c947e2ab 100644
--- a/moli-protocol/src/domains/debugger.rs
+++ b/moli-protocol/src/domains/debugger.rs
@@ -63,6 +63,42 @@ mod tests {
ctx.sent.remove(position)
}
+ #[tokio::test]
+ async fn default_connection_keeps_running_with_debugger_enabled() {
+ let conn = crate::conn::CdpConnection::new();
+ let mut ctx = TestContext::from_conn(conn);
+ with_loaded_document(&mut ctx).await;
+ for cycle in 0..2 {
+ let enable = command(&mut ctx, json!({"id": 1, "method": "Debugger.enable"}), 1).await;
+ assert!(enable["result"]["debuggerId"].is_string(), "{enable}");
+ let exceptions = command(
+ &mut ctx,
+ json!({
+ "id": 2, "method": "Debugger.setPauseOnExceptions", "params": {"state": "all"}
+ }),
+ 2,
+ )
+ .await;
+ assert_eq!(exceptions["result"], json!({}), "{exceptions}");
+ let evaluate = command(&mut ctx, json!({
+ "id": 3, "method": "Runtime.evaluate", "params": {
+ "expression": "(() => { debugger; try { throw new Error('caught'); } catch {} return 42; })()"
+ }
+ }), 3).await;
+ assert_eq!(
+ evaluate["result"]["result"]["value"], 42,
+ "cycle {cycle}: {evaluate}"
+ );
+ assert!(
+ ctx.sent
+ .iter()
+ .all(|message| message["method"] != "Debugger.paused"),
+ "{:?}",
+ ctx.sent
+ );
+ }
+ }
+
#[tokio::test]
async fn debugger_script_events_and_source_use_v8_inspector() {
let mut ctx = TestContext::new();
diff --git a/moli-protocol/src/testing.rs b/moli-protocol/src/testing.rs
index 1de192348..24fbfd16c 100644
--- a/moli-protocol/src/testing.rs
+++ b/moli-protocol/src/testing.rs
@@ -130,6 +130,8 @@ fn real_layout_test_runtime_config(
true,
LayoutPolicy::OnDemand,
)
+ // Debugger tests exercise actual pauses; production defaults are tested separately.
+ .with_debugger_enabled(true)
}
pub(crate) fn real_layout_test_connection() -> CdpConnection {
diff --git a/moli-renderer-v8/src/inspector_session/tests.rs b/moli-renderer-v8/src/inspector_session/tests.rs
index ca90bee38..1b78197a0 100644
--- a/moli-renderer-v8/src/inspector_session/tests.rs
+++ b/moli-renderer-v8/src/inspector_session/tests.rs
@@ -1,5 +1,48 @@
use serde_json::{Value, json};
+pub(crate) fn assert_debugger_defaults(mut dispatch: impl FnMut(&str) -> Vec<Value>) {
+ let request = json!({"id": -2, "method": "Debugger.enable"});
+ let enabled = dispatch(&request.to_string());
+ let responses = enabled
+ .iter()
+ .filter(|message| message.get("id").is_some())
+ .collect::<Vec<_>>();
+ assert_eq!(responses.len(), 1, "internal response escaped: {enabled:?}");
+ assert_eq!(responses[0]["id"], -2);
+ assert!(responses[0]["result"]["debuggerId"].is_string());
+ for request in [
+ json!({"id": 1, "method": "Debugger.setPauseOnExceptions", "params": {"state": "all"}}),
+ json!({"id": 2, "method": "Debugger.setBreakpointByUrl", "params": {"lineNumber": 0, "url": "default-debugger-probe.js"}}),
+ json!({"id": 3, "method": "Debugger.pause"}),
+ ] {
+ let messages = dispatch(&request.to_string());
+ assert!(
+ messages.iter().any(|message| {
+ message["id"] == request["id"] && message.get("result").is_some()
+ }),
+ "{messages:?}"
+ );
+ }
+ let evaluated = dispatch(
+ &json!({
+ "id": 4,
+ "method": "Runtime.evaluate",
+ "params": {"expression": "(() => { debugger; try { throw new Error('caught'); } catch {} return 42; })()\n//# sourceURL=default-debugger-probe.js"}
+ }).to_string(),
+ );
+ assert!(
+ evaluated
+ .iter()
+ .all(|message| message["method"] != "Debugger.paused"),
+ "default session paused: {evaluated:?}"
+ );
+ let response = evaluated
+ .iter()
+ .find(|message| message["id"] == 4)
+ .expect("evaluation response");
+ assert_eq!(response["result"]["result"]["value"], 42, "{response}");
+}
+
fn stack_probe() -> String {
json!({
"id": 100,
diff --git a/moli-renderer-v8/src/native_bridge/context_host/dom_debugger.rs b/moli-renderer-v8/src/native_bridge/context_host/dom_debugger.rs
index 105bed0b1..201190423 100644
--- a/moli-renderer-v8/src/native_bridge/context_host/dom_debugger.rs
+++ b/moli-renderer-v8/src/native_bridge/context_host/dom_debugger.rs
@@ -44,6 +44,10 @@ pub(super) struct DomDebuggerState {
}
impl DomDebuggerState {
+ pub(super) fn debugger_pauses_enabled(&self) -> bool {
+ self.pause_scheduler.debugger_pauses_enabled()
+ }
+
pub(super) fn rebind_pause_scheduler(&mut self, scheduler: RendererDomDebuggerPauseScheduler) {
self.pause_scheduler = scheduler;
}
diff --git a/moli-renderer-v8/src/native_bridge/context_host/popups/renderer_owned.rs b/moli-renderer-v8/src/native_bridge/context_host/popups/renderer_owned.rs
index ea437c39b..0ce3fd983 100644
--- a/moli-renderer-v8/src/native_bridge/context_host/popups/renderer_owned.rs
+++ b/moli-renderer-v8/src/native_bridge/context_host/popups/renderer_owned.rs
@@ -243,6 +243,7 @@ impl JsContextHost {
document_last_modified: None,
document_settings: moli_page_types::DocumentSettings {
script_execution_disabled: !policy.sandbox.allows_scripts,
+ debugger_enabled: self.dom_debugger_state.debugger_pauses_enabled(),
navigator_overrides: self.navigator_overrides().clone(),
viewport_surface: self.viewport_surface(),
..Default::default()
diff --git a/moli-renderer-v8/src/runtime/browser_context_runtime.rs b/moli-renderer-v8/src/runtime/browser_context_runtime.rs
index 533e01632..92c853634 100644
--- a/moli-renderer-v8/src/runtime/browser_context_runtime.rs
+++ b/moli-renderer-v8/src/runtime/browser_context_runtime.rs
@@ -159,6 +159,7 @@ impl RendererProducerRegistrar {
/// the SharedWorker constructor on Window.
#[derive(Clone, Debug)]
pub(crate) struct RendererWorkerContextRuntime {
+ debugger_enabled: bool,
message_port_registry: crate::message_port_runtime::SharedMessagePortRegistry,
broadcast_channel_registry: crate::broadcast_channel_runtime::SharedBroadcastChannelRegistry,
storage_partition_identity: RendererStoragePartitionIdentity,
@@ -189,6 +190,7 @@ pub(crate) struct ClipboardSnapshot {
#[derive(Debug)]
struct RendererBrowserContextRuntimeInner {
+ debugger_enabled: bool,
id: super::RendererBrowserContextRuntimeId,
// Commit style and representations together, independently of any page's
// V8 objects, so other pages can read a coherent snapshot in their own realm.
@@ -389,13 +391,19 @@ impl RendererBrowserContextRuntime {
// retained, so construction returns that owner rather than a bare handle.
#[allow(clippy::new_ret_no_self)]
pub fn new() -> RendererBrowserContextRuntimeOwner {
+ Self::new_with_debugger_enabled(false)
+ }
+
+ pub fn new_with_debugger_enabled(debugger_enabled: bool) -> RendererBrowserContextRuntimeOwner {
Self::new_with_service_worker_resource_store(
crate::new_shared_service_worker_resource_store(),
+ debugger_enabled,
)
}
pub fn new_with_service_worker_resource_store(
service_worker_resource_store: crate::SharedServiceWorkerResourceStore,
+ debugger_enabled: bool,
) -> RendererBrowserContextRuntimeOwner {
let browser_resource_runtime_owner = crate::network::BrowserResourceRuntimeOwner::new(
&moli_fetch::FetchConfig::default(),
@@ -404,12 +412,14 @@ impl RendererBrowserContextRuntime {
Self::new_owned_with_service_worker_resource_store_and_browser_resource_runtime(
service_worker_resource_store,
browser_resource_runtime_owner,
+ debugger_enabled,
)
}
pub fn new_owned_with_service_worker_resource_store_and_browser_resource_runtime(
service_worker_resource_store: crate::SharedServiceWorkerResourceStore,
browser_resource_runtime_owner: crate::network::BrowserResourceRuntimeOwnerRegistration,
+ debugger_enabled: bool,
) -> RendererBrowserContextRuntimeOwner {
let (resource_runtime_owner_root, browser_resource_runtime_binding) =
crate::network::BrowserResourceRuntimeOwnerRoot::new(browser_resource_runtime_owner);
@@ -417,6 +427,7 @@ impl RendererBrowserContextRuntime {
Self::new_with_service_worker_resource_store_and_browser_resource_runtime_binding(
service_worker_resource_store,
browser_resource_runtime_binding,
+ debugger_enabled,
);
RendererBrowserContextRuntimeOwner {
runtime: Some(runtime),
@@ -428,6 +439,7 @@ impl RendererBrowserContextRuntime {
fn new_with_service_worker_resource_store_and_browser_resource_runtime_binding(
service_worker_resource_store: crate::SharedServiceWorkerResourceStore,
browser_resource_runtime: crate::network::BrowserResourceRuntimeBinding,
+ debugger_enabled: bool,
) -> Self {
let message_port_registry = crate::message_port_runtime::new_message_port_registry();
let broadcast_channel_registry =
@@ -438,6 +450,7 @@ impl RendererBrowserContextRuntime {
None,
service_worker_resource_store,
browser_resource_runtime,
+ debugger_enabled,
)
}
@@ -458,6 +471,7 @@ impl RendererBrowserContextRuntime {
None,
crate::new_shared_service_worker_resource_store(),
browser_resource_runtime,
+ false,
);
RendererBrowserContextRuntimeOwner {
runtime: Some(runtime),
@@ -484,6 +498,7 @@ impl RendererBrowserContextRuntime {
Some(shared_worker_runtime),
crate::new_shared_service_worker_resource_store(),
browser_resource_runtime,
+ false,
);
RendererBrowserContextRuntimeOwner {
runtime: Some(runtime),
@@ -522,12 +537,14 @@ impl RendererBrowserContextRuntime {
shared_worker_runtime: Option<crate::shared_worker_runtime::SharedWorkerRuntimeService>,
service_worker_resource_store: crate::SharedServiceWorkerResourceStore,
browser_resource_runtime: crate::network::BrowserResourceRuntimeBinding,
+ debugger_enabled: bool,
) -> Self {
let storage_partition_identity = RendererStoragePartitionIdentity::new_process_local();
let service_worker_context_runtime = RendererWorkerContextRuntime::with_identity(
message_port_registry.clone(),
broadcast_channel_registry.clone(),
storage_partition_identity.clone(),
+ debugger_enabled,
);
Self::from_parts_with_worker_context_runtime(
service_worker_context_runtime,
@@ -548,6 +565,7 @@ impl RendererBrowserContextRuntime {
service_worker_context_runtime.broadcast_channel_registry();
let storage_partition_identity =
service_worker_context_runtime.storage_partition_identity();
+ let debugger_enabled = service_worker_context_runtime.debugger_enabled;
let id = super::RendererBrowserContextRuntimeId::new(
NEXT_RENDERER_BROWSER_CONTEXT_RUNTIME_ID.fetch_add(1, Ordering::Relaxed),
);
@@ -572,6 +590,7 @@ impl RendererBrowserContextRuntime {
);
Self {
inner: Arc::new(RendererBrowserContextRuntimeInner {
+ debugger_enabled,
id,
clipboard_snapshot: Mutex::new(ClipboardSnapshot::default()),
window_names: Mutex::new(HashMap::new()),
@@ -803,6 +822,7 @@ impl RendererBrowserContextRuntime {
pub(crate) fn worker_context_runtime(&self) -> RendererWorkerContextRuntime {
RendererWorkerContextRuntime {
+ debugger_enabled: self.inner.debugger_enabled,
message_port_registry: self.message_port_registry(),
broadcast_channel_registry: self.broadcast_channel_registry(),
storage_partition_identity: self.storage_partition_identity(),
@@ -1044,6 +1064,7 @@ impl RendererWorkerContextRuntime {
message_port_registry,
broadcast_channel_registry,
RendererStoragePartitionIdentity::new_process_local(),
+ false,
)
}
@@ -1051,8 +1072,10 @@ impl RendererWorkerContextRuntime {
message_port_registry: crate::message_port_runtime::SharedMessagePortRegistry,
broadcast_channel_registry: crate::broadcast_channel_runtime::SharedBroadcastChannelRegistry,
storage_partition_identity: RendererStoragePartitionIdentity,
+ debugger_enabled: bool,
) -> Self {
Self {
+ debugger_enabled,
message_port_registry,
broadcast_channel_registry,
storage_partition_identity,
@@ -1065,6 +1088,10 @@ impl RendererWorkerContextRuntime {
self.message_port_registry.clone()
}
+ pub(crate) fn debugger_enabled(&self) -> bool {
+ self.debugger_enabled
+ }
+
pub(crate) fn broadcast_channel_registry(
&self,
) -> crate::broadcast_channel_runtime::SharedBroadcastChannelRegistry {
@@ -1240,6 +1267,23 @@ mod tests {
assert!(!left.shares_state_with(&right));
}
+ #[test]
+ fn worker_debugger_setting_is_inherited_by_captured_and_nested_contexts() {
+ let runtime = RendererBrowserContextRuntime::new_with_debugger_enabled(true);
+ let captured = runtime.worker_context_runtime();
+ let nested = captured.clone();
+ assert!(captured.debugger_enabled());
+ assert!(nested.debugger_enabled());
+ assert!(runtime.worker_context_runtime().debugger_enabled());
+ assert!(
+ !RendererBrowserContextRuntime::new()
+ .worker_context_runtime()
+ .debugger_enabled()
+ );
+ drop(runtime);
+ assert!(nested.debugger_enabled());
+ }
+
#[test]
fn worker_context_runtime_can_outlive_browser_context_without_runtime_service_edge() {
let worker_runtime = {
diff --git a/moli-renderer-v8/src/runtime/page_vm/mod.rs b/moli-renderer-v8/src/runtime/page_vm/mod.rs
index 4467d86a7..ce467f84a 100644
--- a/moli-renderer-v8/src/runtime/page_vm/mod.rs
+++ b/moli-renderer-v8/src/runtime/page_vm/mod.rs
@@ -4403,7 +4403,7 @@ impl PageVm {
} else {
let vm_bootstrap = ScriptVmDefaultWorldBootstrap::from_dom_host_with_resource_completion_sender_browser_context_runtime_and_document_isolate(
bootstrap_document,
- env.document_settings.bypass_content_security_policy,
+ &env.document_settings,
post_domcontentloaded_page_task_sender,
script_event_parser_boundary_sender,
resource_completion_sender,
diff --git a/moli-renderer-v8/src/script_vm.rs b/moli-renderer-v8/src/script_vm.rs
index b680a393c..0a48a16d6 100644
--- a/moli-renderer-v8/src/script_vm.rs
+++ b/moli-renderer-v8/src/script_vm.rs
@@ -1955,7 +1955,7 @@ pub(crate) use document_environment::ScriptVmCapturedDocumentEnvironment;
impl ScriptVmPageRealmBootstrap {
fn new_from_dom_host(
mut dom_host: DomHost,
- bypass_content_security_policy: bool,
+ document_settings: &moli_page_types::DocumentSettings,
page_task_tx: RuntimePageTaskSender,
page_task_parser_boundary_injection_tx: tokio::sync::mpsc::UnboundedSender<PageTask>,
resource_completion_tx: RendererResourceCompletionSender,
@@ -2039,7 +2039,8 @@ impl ScriptVmPageRealmBootstrap {
document_runtime.set_initial_document_policy_container(initial_policy);
}
document_runtime.set_author_styles_disabled(author_styles_disabled);
- document_runtime.set_bypass_content_security_policy(bypass_content_security_policy);
+ document_runtime
+ .set_bypass_content_security_policy(document_settings.bypass_content_security_policy);
let (page_context_cancel_tx, page_context_cancel_rx) =
renderer_page_context_cancel_channel();
@@ -2057,6 +2058,7 @@ impl ScriptVmPageRealmBootstrap {
renderer_page_script_environment,
reuse_main_window_proxy,
} = renderer_document_isolate_bootstrap;
+ page_inspector.configure_debugger(document_settings.debugger_enabled);
if !runtime_inspector_session_restore_snapshots.is_empty() {
renderer_document_isolate.with_renderer_document_isolate_and_inspector_mut(
|_, backend| {
@@ -2370,7 +2372,7 @@ impl ScriptVmDefaultWorldBootstrap {
};
Self::from_dom_host_with_resource_completion_sender_browser_context_runtime_and_document_isolate(
bootstrap_dom_host,
- false,
+ &moli_page_types::DocumentSettings::default(),
page_task_tx,
page_task_parser_boundary_injection_tx,
resource_completion_tx,
@@ -2389,7 +2391,7 @@ impl ScriptVmDefaultWorldBootstrap {
pub(super) fn from_dom_host_with_resource_completion_sender_browser_context_runtime_and_document_isolate(
bootstrap_dom_host: DomHost,
- bypass_content_security_policy: bool,
+ document_settings: &moli_page_types::DocumentSettings,
page_task_tx: RuntimePageTaskSender,
page_task_parser_boundary_injection_tx: tokio::sync::mpsc::UnboundedSender<PageTask>,
resource_completion_tx: RendererResourceCompletionSender,
@@ -2409,7 +2411,7 @@ impl ScriptVmDefaultWorldBootstrap {
) -> std::result::Result<Self, ScriptVmBootstrapError> {
ScriptVmPageRealmBootstrap::new_from_dom_host(
bootstrap_dom_host,
- bypass_content_security_policy,
+ document_settings,
page_task_tx,
page_task_parser_boundary_injection_tx,
resource_completion_tx,
diff --git a/moli-renderer-v8/src/script_vm/document_settings.rs b/moli-renderer-v8/src/script_vm/document_settings.rs
index 500331b69..294d211c3 100644
--- a/moli-renderer-v8/src/script_vm/document_settings.rs
+++ b/moli-renderer-v8/src/script_vm/document_settings.rs
@@ -59,6 +59,8 @@ impl ScriptVm {
) -> anyhow::Result<()> {
let DocumentSettings {
script_execution_disabled,
+ // Applied before V8 Inspector sessions are restored during realm bootstrap.
+ debugger_enabled: _,
scrollbars_hidden,
bypass_content_security_policy,
emulated_media,
diff --git a/moli-renderer-v8/src/script_vm/inspector/agent.rs b/moli-renderer-v8/src/script_vm/inspector/agent.rs
index 12ee5c903..0cbc18aa2 100644
--- a/moli-renderer-v8/src/script_vm/inspector/agent.rs
+++ b/moli-renderer-v8/src/script_vm/inspector/agent.rs
@@ -34,6 +34,7 @@ impl std::fmt::Debug for RendererDevToolsAgent {
}
struct RendererDevToolsAgentState {
+ debugger_pauses_enabled: bool,
token: RendererDevToolsAgentToken,
context_group_id: DocumentInspectorContextGroupId,
isolate_backend: RendererInspectorIsolateBackendHandle,
@@ -103,6 +104,12 @@ impl Drop for RendererDomDebuggerScheduledPause {
}
impl RendererDomDebuggerPauseScheduler {
+ pub(crate) fn debugger_pauses_enabled(&self) -> bool {
+ self.state
+ .upgrade()
+ .is_some_and(|state| state.borrow().debugger_pauses_enabled)
+ }
+
pub(crate) fn schedule_pause_on_next_statement(
&self,
session_keys: &[DevToolsSessionKey],
@@ -176,6 +183,7 @@ impl RendererDevToolsAgent {
isolate_backend.bind_context_group(context_group_id);
Self {
state: Rc::new(RefCell::new(RendererDevToolsAgentState {
+ debugger_pauses_enabled: false,
token: RendererDevToolsAgentToken::allocate(),
context_group_id,
isolate_backend,
@@ -185,6 +193,10 @@ impl RendererDevToolsAgent {
}
}
+ pub(super) fn configure_debugger(&self, enabled: bool) {
+ self.state.borrow_mut().debugger_pauses_enabled = enabled;
+ }
+
pub(super) fn bind_output_journal(&self, output_journal: RendererTurnOutputJournal) {
let mut state = self.state.borrow_mut();
assert_eq!(
@@ -371,6 +383,7 @@ fn session_connection(state: &RendererDevToolsAgentState) -> RendererDevToolsSes
state.token,
state.output_journal.clone(),
)
+ .with_debugger_pauses_enabled(state.debugger_pauses_enabled)
}
#[cfg(test)]
diff --git a/moli-renderer-v8/src/script_vm/inspector/agent_sessions.rs b/moli-renderer-v8/src/script_vm/inspector/agent_sessions.rs
index 02c21b69e..def1753c8 100644
--- a/moli-renderer-v8/src/script_vm/inspector/agent_sessions.rs
+++ b/moli-renderer-v8/src/script_vm/inspector/agent_sessions.rs
@@ -55,6 +55,7 @@ impl RendererDevToolsSessionDispatch {
#[derive(Clone)]
pub(super) struct RendererDevToolsSessionConnection {
+ debugger_pauses_enabled: bool,
isolate_backend: RendererInspectorIsolateBackendHandle,
context_group_id: DocumentInspectorContextGroupId,
agent_token: RendererDevToolsAgentToken,
@@ -69,6 +70,7 @@ impl RendererDevToolsSessionConnection {
output_journal: Option<RendererTurnOutputJournal>,
) -> Self {
Self {
+ debugger_pauses_enabled: false,
isolate_backend,
context_group_id,
agent_token,
@@ -85,6 +87,12 @@ impl RendererDevToolsSessionConnection {
.outbound_route(self.agent_token, session_key),
self.output_journal.clone(),
)
+ .with_debugger_pauses_enabled(self.debugger_pauses_enabled)
+ }
+
+ pub(super) fn with_debugger_pauses_enabled(mut self, enabled: bool) -> Self {
+ self.debugger_pauses_enabled = enabled;
+ self
}
}
@@ -365,6 +373,7 @@ impl RendererDevToolsSession {
)>,
) -> Self {
let first_attach_state = b"{}";
+ let first_attach = state.is_none();
let state = state.map_or(
first_attach_state.as_slice(),
V8InspectorSessionState::as_bytes,
@@ -376,6 +385,11 @@ impl RendererDevToolsSession {
})),
state,
);
+ // Set the default before any route can publish frontend commands.
+ // Reattach restores opaque V8 state, including explicit pause settings.
+ if first_attach {
+ session.set_skip_all_pauses(!outbound.debugger_pauses_enabled());
+ }
let session = Rc::new(session);
let executor_registration =
frontend_session_route.map(|(page_backend, agent_token, session_key)| {
@@ -453,6 +467,146 @@ mod tests {
);
}
+ #[test]
+ fn debugger_pause_defaults_preserve_explicit_and_restored_settings() {
+ crate::ensure_v8_for_test();
+ let mut isolate = v8::Isolate::new(Default::default());
+ let mut backend = RendererInspectorIsolateBackend::new(&mut isolate);
+ let context_group_id = DocumentInspectorContextGroupId::next();
+ let registration_id = DocumentInspectorContextRegistrationId::next();
+ let default_context = {
+ let scope = pin!(v8::HandleScope::new(&mut isolate));
+ let scope = &mut scope.init();
+ let context = v8::Context::new(scope, Default::default());
+ backend.context_created_with_unique_id(
+ context,
+ context_group_id,
+ b"https://example.test/",
+ b"https://example.test",
+ br#"{"isDefault":true,"type":"default"}"#,
+ );
+ v8::Global::new(scope, context)
+ };
+ backend.context_registry.set_default_context(
+ context_group_id,
+ default_context,
+ registration_id,
+ );
+ for debugging in [false, true] {
+ let outbound = || {
+ InspectorOutbound::for_agent(RendererDevToolsAgentToken::allocate())
+ .with_debugger_pauses_enabled(debugging)
+ };
+ let session = RendererDevToolsSession::connect(
+ &mut backend,
+ context_group_id,
+ outbound(),
+ None,
+ None,
+ );
+ assert_eq!(
+ state_json(&session.v8_state())["Debugger"]["skipAllPauses"],
+ !debugging,
+ "the native default must exist before the first frontend command",
+ );
+ assert!(session.outbound.values_after(0).is_empty());
+ if !debugging {
+ crate::inspector_session::tests::assert_debugger_defaults(|request| {
+ dispatch(&session, request)
+ });
+ }
+ assert_successful_response(
+ &dispatch(&session, r#"{"id":6,"method":"Debugger.enable"}"#),
+ 6,
+ );
+ assert_eq!(
+ state_json(&session.v8_state())["Debugger"]["skipAllPauses"]
+ .as_bool()
+ .unwrap_or(false),
+ !debugging,
+ );
+ let initial_state = session.v8_state();
+ drop(session);
+ let session = RendererDevToolsSession::connect(
+ &mut backend,
+ context_group_id,
+ outbound(),
+ Some(&initial_state),
+ None,
+ );
+ assert_eq!(
+ state_json(&session.v8_state())["Debugger"]["skipAllPauses"],
+ !debugging,
+ "restoring a session must preserve its existing pause default",
+ );
+ assert_successful_response(
+ &dispatch(
+ &session,
+ r#"{"id":7,"method":"Debugger.setSkipAllPauses","params":{"skip":false}}"#,
+ ),
+ 7,
+ );
+ assert_successful_response(
+ &dispatch(&session, r#"{"id":8,"method":"Debugger.enable"}"#),
+ 8,
+ );
+ let state = session.v8_state();
+ assert_eq!(state_json(&state)["Debugger"]["skipAllPauses"], false);
+ drop(session);
+ let restored = RendererDevToolsSession::connect(
+ &mut backend,
+ context_group_id,
+ outbound(),
+ Some(&state),
+ None,
+ );
+ assert_successful_response(
+ &dispatch(&restored, r#"{"id":9,"method":"Debugger.enable"}"#),
+ 9,
+ );
+ assert_eq!(
+ state_json(&restored.v8_state())["Debugger"]["skipAllPauses"],
+ false
+ );
+ assert_successful_response(
+ &dispatch(&restored, r#"{"id":10,"method":"Debugger.disable"}"#),
+ 10,
+ );
+ assert_successful_response(
+ &dispatch(&restored, r#"{"id":11,"method":"Debugger.enable"}"#),
+ 11,
+ );
+ assert_eq!(
+ state_json(&restored.v8_state())["Debugger"]["skipAllPauses"],
+ false,
+ "disable and subsequent enable must follow V8's native reset behavior",
+ );
+ }
+ let session = RendererDevToolsSession::connect(
+ &mut backend,
+ context_group_id,
+ InspectorOutbound::for_agent(RendererDevToolsAgentToken::allocate()),
+ None,
+ None,
+ );
+ assert_successful_response(
+ &dispatch(
+ &session,
+ r#"{"id":12,"method":"Debugger.setSkipAllPauses","params":{"skip":false}}"#,
+ ),
+ 12,
+ );
+ assert_successful_response(
+ &dispatch(&session, r#"{"id":13,"method":"Debugger.enable"}"#),
+ 13,
+ );
+ assert_eq!(
+ state_json(&session.v8_state())["Debugger"]["skipAllPauses"],
+ false,
+ "a client override before first enable must not be reset",
+ );
+ }
+
#[test]
fn frontend_reattach_preserves_replay_state_without_exposing_internal_session() {
crate::ensure_v8_for_test();
diff --git a/moli-renderer-v8/src/script_vm/inspector/mod.rs b/moli-renderer-v8/src/script_vm/inspector/mod.rs
index cc9ae1828..31286f4a8 100644
--- a/moli-renderer-v8/src/script_vm/inspector/mod.rs
+++ b/moli-renderer-v8/src/script_vm/inspector/mod.rs
@@ -99,6 +99,10 @@ pub(super) struct ReportedExecutionContext {
}
impl DocumentInspectorBinding {
+ pub(crate) fn configure_debugger(&self, enabled: bool) {
+ self.agent.configure_debugger(enabled);
+ }
+
pub(crate) fn new(isolate_backend: RendererInspectorIsolateBackendHandle) -> Self {
let devtools_target = isolate_backend.devtools_target();
Self {
diff --git a/moli-renderer-v8/src/script_vm/inspector/outbound.rs b/moli-renderer-v8/src/script_vm/inspector/outbound.rs
index 97a519c78..8660610a7 100644
--- a/moli-renderer-v8/src/script_vm/inspector/outbound.rs
+++ b/moli-renderer-v8/src/script_vm/inspector/outbound.rs
@@ -63,6 +63,7 @@ type SharedInspectorResponseRoutingState = Rc<RefCell<InspectorResponseRoutingSt
#[derive(Clone)]
pub(in crate::script_vm) struct InspectorOutbound {
+ debugger_pauses_enabled: bool,
agent_token: RendererDevToolsAgentToken,
session: Option<DevToolsSessionKey>,
output_journal: Option<RendererTurnOutputJournal>,
@@ -92,6 +93,7 @@ impl InspectorSessionOutput for InspectorOutbound {
impl InspectorOutbound {
pub(super) fn for_agent(agent_token: RendererDevToolsAgentToken) -> Self {
Self {
+ debugger_pauses_enabled: false,
agent_token,
session: None,
output_journal: None,
@@ -114,6 +116,15 @@ impl InspectorOutbound {
outbound
}
+ pub(super) fn with_debugger_pauses_enabled(mut self, enabled: bool) -> Self {
+ self.debugger_pauses_enabled = enabled;
+ self
+ }
+
+ pub(super) fn debugger_pauses_enabled(&self) -> bool {
+ self.debugger_pauses_enabled
+ }
+
pub(super) fn with_output_journal(
mut self,
output_journal: Option<RendererTurnOutputJournal>,
diff --git a/moli-renderer-v8/src/script_vm/inspector/v8_backend/page_target_tests.rs b/moli-renderer-v8/src/script_vm/inspector/v8_backend/page_target_tests.rs
index d9eda5811..141a55303 100644
--- a/moli-renderer-v8/src/script_vm/inspector/v8_backend/page_target_tests.rs
+++ b/moli-renderer-v8/src/script_vm/inspector/v8_backend/page_target_tests.rs
@@ -206,6 +206,7 @@ fn closing_peer_preserves_debugger_pause_and_its_resume_route() {
let second = super::super::DocumentInspectorBinding::new(
backend.handle().new_page_handle(&mut isolate).unwrap(),
);
+ second.configure_debugger(true);
let context = context_for_page(&mut isolate, &backend, &second, None);
let journal = RendererTurnOutputJournal::new(RendererOutputStreamIdentity::new_page(
RendererOwnerLocalHostId::new_for_testing(1),
diff --git a/moli-renderer-v8/src/script_vm/related_page.rs b/moli-renderer-v8/src/script_vm/related_page.rs
index ddae6de29..8b797f570 100644
--- a/moli-renderer-v8/src/script_vm/related_page.rs
+++ b/moli-renderer-v8/src/script_vm/related_page.rs
@@ -22,7 +22,7 @@ impl ScriptVmDefaultWorldBootstrap {
.window_global_template(scope);
let bootstrap = ScriptVmPageRealmBootstrap::new_from_dom_host(
dom_host,
- env.document_settings.bypass_content_security_policy,
+ &env.document_settings,
page_task_tx,
parser_boundary_tx,
resource_completion_tx,
diff --git a/moli-renderer-v8/src/worker/thread/isolate.rs b/moli-renderer-v8/src/worker/thread/isolate.rs
index 1c1893ad0..a2b6a3c36 100644
--- a/moli-renderer-v8/src/worker/thread/isolate.rs
+++ b/moli-renderer-v8/src/worker/thread/isolate.rs
@@ -30,6 +30,7 @@ impl WorkerIsolateState {
inspector_task_runner: WorkerInspectorTaskRunner,
parent_tx: mpsc::UnboundedSender<WorkerToParentMessage>,
shared_worker: bool,
+ debugger_enabled: bool,
) -> Self {
let mut isolate = v8::Isolate::new(Default::default());
crate::context_bootstrap::install_agent_microtask_checkpoint_tasks(&mut isolate);
@@ -50,6 +51,7 @@ impl WorkerIsolateState {
inspector_task_runner.clone(),
parent_tx,
shared_worker,
+ debugger_enabled,
);
let platform_registration = V8PlatformIsolateRegistration::register(
&mut isolate,
diff --git a/moli-renderer-v8/src/worker/thread/mod.rs b/moli-renderer-v8/src/worker/thread/mod.rs
index 807e59668..0f1fdc82c 100644
--- a/moli-renderer-v8/src/worker/thread/mod.rs
+++ b/moli-renderer-v8/src/worker/thread/mod.rs
@@ -1556,6 +1556,7 @@ async fn worker_main(
inspector_task_runner.clone(),
parent_tx.clone(),
matches!(global_kind, WorkerGlobalKind::Shared { .. }),
+ worker_context_runtime.debugger_enabled(),
);
worker_isolate
.worker_runtime_inspector()
diff --git a/moli-renderer-v8/src/worker/thread/runtime_inspector.rs b/moli-renderer-v8/src/worker/thread/runtime_inspector.rs
index 2b0172aad..a3e068056 100644
--- a/moli-renderer-v8/src/worker/thread/runtime_inspector.rs
+++ b/moli-renderer-v8/src/worker/thread/runtime_inspector.rs
@@ -362,6 +362,7 @@ impl v8::inspector::V8InspectorClientImpl for WorkerInspectorClient {
}
pub(super) struct WorkerRuntimeInspector {
+ debugger_enabled: bool,
sessions: RefCell<HashMap<String, Rc<v8::inspector::V8InspectorSession>>>,
detached_sessions: RefCell<HashSet<String>>,
navigator_emulation: Rc<RefCell<moli_page_types::NavigatorEmulationSessions>>,
@@ -432,6 +433,7 @@ impl WorkerRuntimeInspector {
task_runner: WorkerInspectorTaskRunner,
parent_tx: mpsc::UnboundedSender<WorkerToParentMessage>,
shared_worker: bool,
+ debugger_enabled: bool,
) -> Rc<Self> {
let isolate_ptr = unsafe { isolate.as_raw_isolate_ptr() };
let default_context = Rc::new(RefCell::new(None));
@@ -454,6 +456,7 @@ impl WorkerRuntimeInspector {
executor.clone(),
)));
Self {
+ debugger_enabled,
inspector: v8::inspector::V8Inspector::create(isolate, inspector_client),
sessions: RefCell::new(HashMap::new()),
detached_sessions: RefCell::new(HashSet::new()),
@@ -471,12 +474,17 @@ impl WorkerRuntimeInspector {
#[cfg(test)]
fn new_for_test(isolate: &mut v8::Isolate) -> Rc<Self> {
+ Self::new_for_test_with_debugger(isolate, false)
+ }
+
+ #[cfg(test)]
+ fn new_for_test_with_debugger(isolate: &mut v8::Isolate, debugger_enabled: bool) -> Rc<Self> {
let (wake_tx, _wake_rx) = mpsc::unbounded_channel();
let (parent_tx, _parent_rx) = mpsc::unbounded_channel();
let isolate_handle =
std::sync::Arc::new(parking_lot::Mutex::new(Some(isolate.thread_safe_handle())));
let task_runner = WorkerInspectorTaskRunner::new(wake_tx, isolate_handle);
- Self::new(isolate, task_runner, parent_tx, false)
+ Self::new(isolate, task_runner, parent_tx, false, debugger_enabled)
}
pub(super) fn attach_context<'s>(
@@ -776,7 +784,7 @@ impl WorkerRuntimeInspector {
.borrow_mut()
.entry(session_key.to_owned())
.or_insert_with(|| {
- Rc::new(self.inspector.connect(
+ let session = self.inspector.connect(
WORKER_INSPECTOR_CONTEXT_GROUP_ID,
v8::inspector::Channel::new(Box::new(WorkerInspectorChannel {
outbound: self.outbound.clone(),
@@ -784,7 +792,9 @@ impl WorkerRuntimeInspector {
})),
v8::inspector::StringView::from(&b"{}"[..]),
v8::inspector::V8InspectorClientTrustLevel::FullyTrusted,
- ))
+ );
+ session.set_skip_all_pauses(!self.debugger_enabled);
+ Rc::new(session)
})
.clone()
}
@@ -947,7 +957,7 @@ mod tests {
std::sync::Arc::new(parking_lot::Mutex::new(Some(isolate.thread_safe_handle()))),
);
let inspector =
- WorkerRuntimeInspector::new(&mut isolate, task_runner.clone(), parent_tx, false);
+ WorkerRuntimeInspector::new(&mut isolate, task_runner.clone(), parent_tx, false, false);
let registration = moli_v8_platform::V8PlatformIsolateRegistration::register(
&mut isolate,
moli_v8_platform::V8ForegroundTaskWake::queued(|_| {}),
@@ -1147,6 +1157,56 @@ mod tests {
);
}
+ #[test]
+ fn worker_debugger_initializes_each_session_with_startup_setting() {
+ crate::ensure_v8_for_test();
+ for debugger_enabled in [false, true] {
+ let mut isolate = v8::Isolate::new(Default::default());
+ let inspector =
+ WorkerRuntimeInspector::new_for_test_with_debugger(&mut isolate, debugger_enabled);
+ let scope = pin!(v8::HandleScope::new(&mut isolate));
+ let scope = &mut scope.init();
+ let context = v8::Context::new(scope, Default::default());
+ inspector.attach_context(
+ context,
+ v8::Global::new(scope, context),
+ "https://worker-debugger.test/worker.js",
+ );
+ for key in ["", "peer"] {
+ let state = v8::crdtp::cbor_to_json(&inspector.ensure_session(key).state())
+ .expect("worker session state");
+ let state: Value = serde_json::from_slice(&state).expect("worker session JSON");
+ assert_eq!(state["Debugger"]["skipAllPauses"], !debugger_enabled);
+ }
+ assert!(inspector.take_pending_messages().is_empty());
+ let scope = &mut v8::ContextScope::new(scope, context);
+ if !debugger_enabled {
+ crate::inspector_session::tests::assert_debugger_defaults(|request| {
+ inspector
+ .dispatch_protocol_message(scope, None, request)
+ .expect("worker Inspector dispatch")
+ .into_iter()
+ .map(RendererRuntimeInspectorMessage::into_v8_inspector_message)
+ .collect()
+ });
+ }
+ inspector
+ .dispatch_protocol_message(
+ scope,
+ None,
+ r#"{"id":10,"method":"Debugger.setSkipAllPauses","params":{"skip":false}}"#,
+ )
+ .expect("explicit worker pause override");
+ inspector
+ .dispatch_protocol_message(scope, None, r#"{"id":11,"method":"Debugger.enable"}"#)
+ .expect("worker Debugger.enable");
+ let state = v8::crdtp::cbor_to_json(&inspector.ensure_session("").state())
+ .expect("worker state");
+ let state: Value = serde_json::from_slice(&state).expect("worker state JSON");
+ assert_eq!(state["Debugger"]["skipAllPauses"], false);
+ }
+ }
+
#[test]
fn worker_runtime_enable_hides_the_internal_stack_capture_limit_response() {
crate::ensure_v8_for_test();
diff --git a/moli/src/cli.rs b/moli/src/cli.rs
index 2591f6082..fcc08c1e2 100644
--- a/moli/src/cli.rs
+++ b/moli/src/cli.rs
@@ -432,6 +432,10 @@ fn parse_request_header_arg(raw: &str) -> Result<RequestHeaderArg, String> {
#[derive(Debug, Clone, PartialEq, Eq, Args)]
pub struct ServeArgs {
+ /// Enable debugger pauses. By default, debugger statements and breakpoints do not pause execution.
+ #[arg(long)]
+ pub debugger: bool,
+
#[arg(long, default_value = "127.0.0.1")]
pub host: String,
diff --git a/moli/src/config.rs b/moli/src/config.rs
index a99a263ce..51453ad58 100644
--- a/moli/src/config.rs
+++ b/moli/src/config.rs
@@ -68,6 +68,7 @@ impl AppConfig {
}
Commands::Serve(args) => {
apply_common_args(&mut config, &args.common)?;
+ config.browser.set_debugger_enabled(args.debugger);
config.server.host = args.host.clone();
config.server.port = args.port;
config.server.timeout_secs = args.timeout;
@@ -350,6 +351,20 @@ mod tests {
use clap::Parser;
use std::path::Path;
+ #[test]
+ fn serve_debugger_pauses_are_opt_in() {
+ for (arguments, expected) in [
+ (vec!["moli", "serve"], false),
+ (vec!["moli", "serve", "--debugger"], true),
+ ] {
+ let cli = Cli::parse_from(arguments);
+ let config = AppConfig::from_cli(&cli).expect("serve configuration");
+ assert_eq!(config.browser.debugger_enabled(), expected);
+ let runtime = moli_core::runtime::NavigationRuntimeConfig::from(&config.browser);
+ assert_eq!(runtime.debugger_enabled(), expected);
+ }
+ }
+
#[test]
fn tls_credentials_reach_fetch_config_for_fetch_and_serve() {
for command in ["fetch", "serve"] {
diff --git a/moli/tests/cli.rs b/moli/tests/cli.rs
index 1c5052f3b..d91f38cb5 100644
--- a/moli/tests/cli.rs
+++ b/moli/tests/cli.rs
@@ -659,6 +659,7 @@ fn infers_serve_mode_when_called_without_args() {
assert_eq!(
cli.command,
Commands::Serve(Box::new(ServeArgs {
+ debugger: false,
host: "127.0.0.1".to_owned(),
port: 9222,
timeout: 10,
@@ -685,6 +686,7 @@ fn parses_serve_flags_with_explicit_command() {
assert_eq!(
cli.command,
Commands::Serve(Box::new(ServeArgs {
+ debugger: false,
host: "0.0.0.0".to_owned(),
port: 9333,
timeout: 42,
diff --git a/vendor/v8-152.2.0/src/inspector.rs b/vendor/v8-152.2.0/src/inspector.rs
index e60c2142d..f3aaee43b 100644
--- a/vendor/v8-152.2.0/src/inspector.rs
+++ b/vendor/v8-152.2.0/src/inspector.rs
@@ -86,6 +86,10 @@ unsafe extern "C" {
session: *mut RawV8InspectorSession,
terminate_on_resume: bool,
);
+ fn v8_inspector__V8InspectorSession__setSkipAllPauses(
+ session: *mut RawV8InspectorSession,
+ skip: bool,
+ );
fn v8_inspector__V8InspectorSession__dispatchProtocolMessage(
session: *mut RawV8InspectorSession,
message: StringView,
@@ -979,6 +983,16 @@ impl V8InspectorSession {
}
}
+ /// Sets the session's pause policy, including before Debugger is enabled.
+ ///
+ /// This is the native equivalent of `Debugger.setSkipAllPauses`. Subsequent
+ /// protocol commands and session state restoration remain under V8's control.
+ pub fn set_skip_all_pauses(&self, skip: bool) {
+ unsafe {
+ v8_inspector__V8InspectorSession__setSkipAllPauses(self.raw.as_ptr(), skip);
+ }
+ }
+
/// Cancel a pause previously scheduled by
/// [`Self::schedule_pause_on_next_statement`] if it hasn't fired yet.
pub fn cancel_pause_on_next_statement(&self) {
diff --git a/vendor/v8-152.2.0/src/inspector_session_ext.cc b/vendor/v8-152.2.0/src/inspector_session_ext.cc
index 447f3a961..6a1527a26 100644
--- a/vendor/v8-152.2.0/src/inspector_session_ext.cc
+++ b/vendor/v8-152.2.0/src/inspector_session_ext.cc
@@ -7,6 +7,11 @@ using namespace support;
extern "C" {
+void v8_inspector__V8InspectorSession__setSkipAllPauses(
+ v8_inspector::V8InspectorSession* self, bool skip) {
+ self->setSkipAllPauses(skip);
+}
+
void v8_inspector__V8InspectorSession__resume(
v8_inspector::V8InspectorSession* self, bool terminate_on_resume) {
self->resume(terminate_on_resume);