Skip to content

armgit / moli

Public Imported from GitHub
0

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

feat(emulation): support native automation overrides

ldm0f6b2e4a0ef1b
diff --git a/moli-page-types/src/navigator_overrides.rs b/moli-page-types/src/navigator_overrides.rs
index 5c1fbca67..14f33d7cf 100644
--- a/moli-page-types/src/navigator_overrides.rs
+++ b/moli-page-types/src/navigator_overrides.rs
@@ -27,6 +27,7 @@ pub struct GeolocationPositionOverride {
pub struct NavigatorQueryOverrides {
pub hardware_concurrency: Option<std::num::NonZeroU32>,
pub data_saver: Option<bool>,
+ pub automation: bool,
}
/// Native query overrides in Inspector agent activation order. Page and Worker
@@ -55,6 +56,19 @@ impl NavigatorEmulationSessions {
&mut self.sessions[index].1
}
+ pub fn set_automation(&mut self, key: &crate::DevToolsSessionKey, enabled: bool) {
+ if enabled {
+ self.session_mut(key).automation = true;
+ } else if let Some((_, settings)) = self
+ .sessions
+ .iter_mut()
+ .find(|(existing, _)| existing == key)
+ {
+ // Disabling alone does not activate a new Inspector agent.
+ settings.automation = false;
+ }
+ }
+
pub fn remove(&mut self, key: &crate::DevToolsSessionKey) {
self.sessions.retain(|(existing, _)| existing != key);
}
@@ -66,6 +80,7 @@ impl NavigatorEmulationSessions {
pub fn effective(&self) -> NavigatorQueryOverrides {
let mut effective = NavigatorQueryOverrides::default();
for (_, settings) in &self.sessions {
+ effective.automation |= settings.automation;
effective.data_saver = settings.data_saver.or(effective.data_saver);
effective.hardware_concurrency = settings
.hardware_concurrency
diff --git a/moli-protocol/src/conn/browser_context/emulation_owner.rs b/moli-protocol/src/conn/browser_context/emulation_owner.rs
index 066a44186..e3600769c 100644
--- a/moli-protocol/src/conn/browser_context/emulation_owner.rs
+++ b/moli-protocol/src/conn/browser_context/emulation_owner.rs
@@ -237,21 +237,19 @@ impl CdpConnection {
.cloned()
}
- pub(crate) fn update_navigator_queries_for_session_owner(
+ pub(crate) fn update_navigator_emulation_for_session_owner(
&mut self,
session_id: Option<&str>,
- update: impl FnOnce(&mut moli_page_types::NavigatorQueryOverrides),
+ update: impl FnOnce(
+ &mut moli_page_types::NavigatorEmulationSessions,
+ &moli_page_types::DevToolsSessionKey,
+ ),
) -> Result<(), &'static str> {
let mut owner = self
.target_session_owner_mut(session_id)
.ok_or("BrowserContextNotLoaded")?;
owner.mutate_page_state(|target, key| {
- update(
- target
- .devtools_sessions
- .navigator_emulation
- .session_mut(key),
- )
+ update(&mut target.devtools_sessions.navigator_emulation, key)
});
Ok(())
}
diff --git a/moli-protocol/src/domains/actions.rs b/moli-protocol/src/domains/actions.rs
index 35a0b08a7..82f6f7b1f 100644
--- a/moli-protocol/src/domains/actions.rs
+++ b/moli-protocol/src/domains/actions.rs
@@ -178,6 +178,7 @@ pub(crate) enum EmulationAction {
SetTouchEmulationEnabled,
SetHardwareConcurrencyOverride,
SetDataSaverOverride,
+ SetAutomationOverride,
SetEmitTouchEventsForMouse,
SetScriptExecutionDisabled,
SetGeolocationOverride,
diff --git a/moli-protocol/src/domains/emulation.rs b/moli-protocol/src/domains/emulation.rs
index 2b0b8b75f..4b36a0c12 100644
--- a/moli-protocol/src/domains/emulation.rs
+++ b/moli-protocol/src/domains/emulation.rs
@@ -198,6 +198,9 @@ pub(crate) fn try_start_emulation_command_dispatch(
Some(EmulationAction::SetCpuThrottlingRate) => Some(EmulationCommandTaskStep::Complete(
cpu_throttling_rate_command_output_plan(cmd),
)),
+ Some(EmulationAction::SetAutomationOverride) => {
+ Some(start_automation_override_command(conn, cmd))
+ }
Some(EmulationAction::SetDataSaverOverride) => {
Some(start_data_saver_override_command(conn, cmd))
}
@@ -352,8 +355,8 @@ fn start_hardware_concurrency_override_command(
));
};
if let Err(message) =
- conn.update_navigator_queries_for_session_owner(cmd.session_id, |queries| {
- queries.hardware_concurrency = Some(value);
+ conn.update_navigator_emulation_for_session_owner(cmd.session_id, |sessions, key| {
+ sessions.session_mut(key).hardware_concurrency = Some(value);
})
{
return EmulationCommandTaskStep::Complete(CommandOutputPlan::error(-31998, message));
@@ -375,8 +378,31 @@ fn start_data_saver_override_command(
}
};
if let Err(message) =
- conn.update_navigator_queries_for_session_owner(cmd.session_id, |queries| {
- queries.data_saver = value;
+ conn.update_navigator_emulation_for_session_owner(cmd.session_id, |sessions, key| {
+ sessions.session_mut(key).data_saver = value;
+ })
+ {
+ return EmulationCommandTaskStep::Complete(CommandOutputPlan::error(-31998, message));
+ }
+ start_navigator_override_page_command(conn, cmd)
+}
+
+fn start_automation_override_command(
+ conn: &mut CdpConnection,
+ cmd: &Cmd<'_>,
+) -> EmulationCommandTaskStep {
+ let enabled = match cmd.get_params::<params::SetAutomationOverrideParams>() {
+ Ok(Some(params)) => params.enabled,
+ _ => {
+ return EmulationCommandTaskStep::Complete(CommandOutputPlan::error(
+ -32602,
+ "InvalidParams",
+ ));
+ }
+ };
+ if let Err(message) = conn
+ .update_navigator_emulation_for_session_owner(cmd.session_id, |sessions, key| {
+ sessions.set_automation(key, enabled)
})
{
return EmulationCommandTaskStep::Complete(CommandOutputPlan::error(-31998, message));
diff --git a/moli-protocol/src/domains/emulation/params.rs b/moli-protocol/src/domains/emulation/params.rs
index 178b14085..1e3051d1e 100644
--- a/moli-protocol/src/domains/emulation/params.rs
+++ b/moli-protocol/src/domains/emulation/params.rs
@@ -1,8 +1,9 @@
pub(super) use chromiumoxide_cdp::cdp::browser_protocol::emulation::{
- ClearGeolocationOverrideParams, ClearIdleOverrideParams, SetCpuThrottlingRateParams,
- SetDataSaverOverrideParams, SetDefaultBackgroundColorOverrideParams,
- SetDeviceMetricsOverrideParams, SetEmitTouchEventsForMouseParams, SetEmulatedMediaParams,
- SetFocusEmulationEnabledParams, SetGeolocationOverrideParams,
- SetHardwareConcurrencyOverrideParams, SetIdleOverrideParams, SetLocaleOverrideParams,
- SetScriptExecutionDisabledParams, SetTimezoneOverrideParams, SetTouchEmulationEnabledParams,
+ ClearGeolocationOverrideParams, ClearIdleOverrideParams, SetAutomationOverrideParams,
+ SetCpuThrottlingRateParams, SetDataSaverOverrideParams,
+ SetDefaultBackgroundColorOverrideParams, SetDeviceMetricsOverrideParams,
+ SetEmitTouchEventsForMouseParams, SetEmulatedMediaParams, SetFocusEmulationEnabledParams,
+ SetGeolocationOverrideParams, SetHardwareConcurrencyOverrideParams, SetIdleOverrideParams,
+ SetLocaleOverrideParams, SetScriptExecutionDisabledParams, SetTimezoneOverrideParams,
+ SetTouchEmulationEnabledParams,
};
diff --git a/moli-protocol/src/domains/emulation/tests/native_navigator.rs b/moli-protocol/src/domains/emulation/tests/native_navigator.rs
index 7d3ef29c4..21dc4f849 100644
--- a/moli-protocol/src/domains/emulation/tests/native_navigator.rs
+++ b/moli-protocol/src/domains/emulation/tests/native_navigator.rs
@@ -800,3 +800,88 @@ async fn data_saver_updates_held_native_objects_and_clears_session_contributions
json!(true)
);
}
+
+#[tokio::test(flavor = "multi_thread")]
+async fn automation_overrides_combine_sessions_without_replacing_native_getters() {
+ let mut ctx = setup().await;
+ evaluate(&mut ctx,"globalThis.webdriverGetter=Object.getOwnPropertyDescriptor(Navigator.prototype,'webdriver').get; undefined").await;
+ expect_session_command_result(
+ &mut ctx,
+ 88300,
+ "SID-1",
+ "Emulation.setAutomationOverride",
+ json!({"enabled":false}),
+ )
+ .await;
+ ctx.conn.register_top_level_page_target("TID-1");
+ ctx.process_async(json!({"id":88301,"method":"Target.attachToTarget","params":{"targetId":"TID-1","flatten":true}})).await;
+ let other = ctx.take_response_by_id(88301)["result"]["sessionId"]
+ .as_str()
+ .unwrap()
+ .to_owned();
+ expect_session_command_result(
+ &mut ctx,
+ 88302,
+ &other,
+ "Emulation.setHardwareConcurrencyOverride",
+ json!({"hardwareConcurrency":8}),
+ )
+ .await;
+ expect_session_command_result(
+ &mut ctx,
+ 88303,
+ "SID-1",
+ "Emulation.setHardwareConcurrencyOverride",
+ json!({"hardwareConcurrency":2}),
+ )
+ .await;
+ assert_eq!(
+ evaluate(
+ &mut ctx,
+ "[navigator.hardwareConcurrency,navigator.webdriver]"
+ )
+ .await,
+ json!([2, false]),
+ "automation=false must not activate an agent before its first query override"
+ );
+ for (session, enabled) in [
+ ("SID-1", true),
+ (other.as_str(), false),
+ (other.as_str(), true),
+ ("SID-1", false),
+ ] {
+ expect_session_command_result(
+ &mut ctx,
+ 88304,
+ session,
+ "Emulation.setAutomationOverride",
+ json!({"enabled":enabled}),
+ )
+ .await;
+ assert_eq!(evaluate(&mut ctx,"[navigator.webdriver,webdriverGetter.call(navigator),webdriverGetter===Object.getOwnPropertyDescriptor(Navigator.prototype,'webdriver').get]").await,json!([true,true,true]));
+ }
+ ctx.process_async(json!({"id":88305,"sessionId":other,"method":"Emulation.setAutomationOverride","params":{"enabled":0}})).await;
+ assert_eq!(ctx.take_response_by_id(88305)["error"]["code"], -32602);
+ ctx.install_navigation_fixture_for_session_owner("data:text/html,<script>globalThis.initialAutomation=navigator.webdriver</script><iframe></iframe>",Some("SID-1")).await;
+ assert_eq!(
+ evaluate(
+ &mut ctx,
+ "[initialAutomation,navigator.webdriver,frames[0].navigator.webdriver]"
+ )
+ .await,
+ json!([true, true, true])
+ );
+ ctx.process_async(
+ json!({"id":88306,"method":"Target.detachFromTarget","params":{"sessionId":other}}),
+ )
+ .await;
+ ctx.expect_result(88306, json!({}), None);
+ assert_eq!(
+ evaluate(
+ &mut ctx,
+ "[navigator.webdriver,navigator.hardwareConcurrency]"
+ )
+ .await,
+ json!([false, 2])
+ );
+}
diff --git a/moli-protocol/src/domains/runtime/dispatcher.rs b/moli-protocol/src/domains/runtime/dispatcher.rs
index 174b28875..dbf660bf4 100644
--- a/moli-protocol/src/domains/runtime/dispatcher.rs
+++ b/moli-protocol/src/domains/runtime/dispatcher.rs
@@ -922,6 +922,7 @@ pub(crate) fn try_start_worker_emulation_command_dispatch(
let action = match cmd.action {
"setHardwareConcurrencyOverride" => "Emulation.setHardwareConcurrencyOverride",
"setDataSaverOverride" => "Emulation.setDataSaverOverride",
+ "setAutomationOverride" => "Emulation.setAutomationOverride",
_ => return None,
};
let pending = match conn.session_route(cmd.session_id) {
diff --git a/moli-protocol/src/domains/runtime/tests/shared_worker.rs b/moli-protocol/src/domains/runtime/tests/shared_worker.rs
index 4d3916162..5925d0123 100644
--- a/moli-protocol/src/domains/runtime/tests/shared_worker.rs
+++ b/moli-protocol/src/domains/runtime/tests/shared_worker.rs
@@ -3674,6 +3674,13 @@ async fn worker_navigator_query_overrides_are_independent_of_the_page() {
"onconnect = () => {};",
)
.await;
+ ctx.process_and_wait_for_response_async(json!({"id":99019,"sessionId":worker,"method":"Emulation.setAutomationOverride","params":{"enabled":true}})).await;
+ ctx.expect_result(99019, json!({}), Some(&worker));
+ ctx.process_and_wait_for_response_async(json!({"id":99020,"sessionId":worker,"method":"Runtime.evaluate","params":{"expression":"'webdriver' in navigator","returnByValue":true}})).await;
+ assert_eq!(
+ take_response_by_id(&mut ctx, 99020)["result"]["result"]["value"],
+ json!(false)
+ );
for (params, worker_expected) in [
(json!({}), false),
(json!({"dataSaverEnabled":true}), true),
diff --git a/moli-renderer-v8/src/context_bootstrap/navigator_runtime/navigator.rs b/moli-renderer-v8/src/context_bootstrap/navigator_runtime/navigator.rs
index 0123a959f..0014ca607 100644
--- a/moli-renderer-v8/src/context_bootstrap/navigator_runtime/navigator.rs
+++ b/moli-renderer-v8/src/context_bootstrap/navigator_runtime/navigator.rs
@@ -672,6 +672,10 @@ fn navigator_runtime_data_getter_callback<'s>(
_ => {}
}
}
+ if key == "webdriver" && navigator_query_overrides(scope).automation {
+ rv.set_bool(true);
+ return;
+ }
if key == "hardwareConcurrency"
&& let Some(value) = navigator_query_overrides(scope).hardware_concurrency
{
diff --git a/moli-renderer-v8/src/script_vm/tests/browser_api/misc.rs b/moli-renderer-v8/src/script_vm/tests/browser_api/misc.rs
index dd85399cd..3c3f6ddfb 100644
--- a/moli-renderer-v8/src/script_vm/tests/browser_api/misc.rs
+++ b/moli-renderer-v8/src/script_vm/tests/browser_api/misc.rs
@@ -28469,3 +28469,41 @@ fn dom_matrix_exposes_webkit_css_matrix_alias() {
assert_eq!(result, "true|true|DOMMatrix|true|true|true,false,true");
}
+
+#[test]
+fn automation_override_preserves_the_native_webdriver_baseline() {
+ let mut vm = new_storage_test_vm("https://native-automation.test/");
+ for baseline in [false, true] {
+ // Seed the browser-owned baseline, independently of Emulation state.
+ vm.with_default_context_scope(|scope, _| {
+ let global = scope.get_current_context().global(scope);
+ let navigator_key = v8::String::new(scope, "navigator").unwrap();
+ let navigator =
+ v8::Local::<v8::Object>::try_from(global.get(scope, navigator_key.into()).unwrap())
+ .unwrap();
+ let backing = v8::Local::<v8::Object>::try_from(
+ crate::util::get_private_value(scope, navigator, "__moliNavigatorRuntimeData")
+ .unwrap(),
+ )
+ .unwrap();
+ let key = v8::String::new(scope, "webdriver").unwrap();
+ let value = v8::Boolean::new(scope, baseline);
+ assert_eq!(backing.set(scope, key.into(), value.into()), Some(true));
+ Ok(())
+ })
+ .unwrap();
+ for enabled in [false, true, false] {
+ vm.set_navigator_overrides(&moli_page_types::NavigatorOverrides {
+ queries: moli_page_types::NavigatorQueryOverrides {
+ automation: enabled,
+ ..Default::default()
+ },
+ ..Default::default()
+ });
+ assert_eq!(
+ vm.eval("navigator.webdriver").unwrap(),
+ (baseline || enabled).to_string()
+ );
+ }
+ }
+}
diff --git a/moli-renderer-v8/src/worker/thread/runtime_inspector.rs b/moli-renderer-v8/src/worker/thread/runtime_inspector.rs
index f1d1f17d0..789d61079 100644
--- a/moli-renderer-v8/src/worker/thread/runtime_inspector.rs
+++ b/moli-renderer-v8/src/worker/thread/runtime_inspector.rs
@@ -602,6 +602,14 @@ impl WorkerRuntimeInspector {
.session_mut(&key)
.hardware_concurrency = Some(value);
}
+ "Emulation.setAutomationOverride" => {
+ let Some(enabled) = command["params"]["enabled"].as_bool() else {
+ return invalid("InvalidParams");
+ };
+ self.navigator_emulation
+ .borrow_mut()
+ .set_automation(&key, enabled);
+ }
"Emulation.setDataSaverOverride" => {
let value = &command["params"]["dataSaverEnabled"];
if !value.is_null() && !value.is_boolean() {