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): override native Data Saver queries

ldm06c0e1a64dc12
diff --git a/moli-page-types/src/navigator_overrides.rs b/moli-page-types/src/navigator_overrides.rs
index 9eb1f16f5..5c1fbca67 100644
--- a/moli-page-types/src/navigator_overrides.rs
+++ b/moli-page-types/src/navigator_overrides.rs
@@ -26,6 +26,7 @@ pub struct GeolocationPositionOverride {
#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)]
pub struct NavigatorQueryOverrides {
pub hardware_concurrency: Option<std::num::NonZeroU32>,
+ pub data_saver: Option<bool>,
}
/// Native query overrides in Inspector agent activation order. Page and Worker
@@ -65,6 +66,7 @@ impl NavigatorEmulationSessions {
pub fn effective(&self) -> NavigatorQueryOverrides {
let mut effective = NavigatorQueryOverrides::default();
for (_, settings) in &self.sessions {
+ effective.data_saver = settings.data_saver.or(effective.data_saver);
effective.hardware_concurrency = settings
.hardware_concurrency
.or(effective.hardware_concurrency);
diff --git a/moli-protocol/src/domains/actions.rs b/moli-protocol/src/domains/actions.rs
index 4a1339207..35a0b08a7 100644
--- a/moli-protocol/src/domains/actions.rs
+++ b/moli-protocol/src/domains/actions.rs
@@ -177,6 +177,7 @@ pub(crate) enum EmulationAction {
SetCpuThrottlingRate,
SetTouchEmulationEnabled,
SetHardwareConcurrencyOverride,
+ SetDataSaverOverride,
SetEmitTouchEventsForMouse,
SetScriptExecutionDisabled,
SetGeolocationOverride,
diff --git a/moli-protocol/src/domains/emulation.rs b/moli-protocol/src/domains/emulation.rs
index 066703268..2b0b8b75f 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::SetDataSaverOverride) => {
+ Some(start_data_saver_override_command(conn, cmd))
+ }
Some(EmulationAction::SetHardwareConcurrencyOverride) => {
Some(start_hardware_concurrency_override_command(conn, cmd))
}
@@ -358,6 +361,29 @@ fn start_hardware_concurrency_override_command(
start_navigator_override_page_command(conn, cmd)
}
+fn start_data_saver_override_command(
+ conn: &mut CdpConnection,
+ cmd: &Cmd<'_>,
+) -> EmulationCommandTaskStep {
+ let value = match cmd.get_params::<params::SetDataSaverOverrideParams>() {
+ Ok(params) => params.and_then(|params| params.data_saver_enabled),
+ Err(_) => {
+ return EmulationCommandTaskStep::Complete(CommandOutputPlan::error(
+ -32602,
+ "InvalidParams",
+ ));
+ }
+ };
+ if let Err(message) =
+ conn.update_navigator_queries_for_session_owner(cmd.session_id, |queries| {
+ queries.data_saver = value;
+ })
+ {
+ return EmulationCommandTaskStep::Complete(CommandOutputPlan::error(-31998, message));
+ }
+ start_navigator_override_page_command(conn, cmd)
+}
+
fn start_navigator_override_page_command(
conn: &mut CdpConnection,
cmd: &Cmd<'_>,
diff --git a/moli-protocol/src/domains/emulation/params.rs b/moli-protocol/src/domains/emulation/params.rs
index 565e1ee4b..178b14085 100644
--- a/moli-protocol/src/domains/emulation/params.rs
+++ b/moli-protocol/src/domains/emulation/params.rs
@@ -1,8 +1,8 @@
pub(super) use chromiumoxide_cdp::cdp::browser_protocol::emulation::{
ClearGeolocationOverrideParams, ClearIdleOverrideParams, SetCpuThrottlingRateParams,
- SetDefaultBackgroundColorOverrideParams, SetDeviceMetricsOverrideParams,
- SetEmitTouchEventsForMouseParams, SetEmulatedMediaParams, SetFocusEmulationEnabledParams,
- SetGeolocationOverrideParams, SetHardwareConcurrencyOverrideParams, SetIdleOverrideParams,
- SetLocaleOverrideParams, SetScriptExecutionDisabledParams, SetTimezoneOverrideParams,
- SetTouchEmulationEnabledParams,
+ 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 1a853b3e8..7d3ef29c4 100644
--- a/moli-protocol/src/domains/emulation/tests/native_navigator.rs
+++ b/moli-protocol/src/domains/emulation/tests/native_navigator.rs
@@ -730,3 +730,73 @@ async fn hardware_concurrency_sessions_follow_agent_activation_and_detach() {
);
}
}
+
+#[tokio::test(flavor = "multi_thread")]
+async fn data_saver_updates_held_native_objects_and_clears_session_contributions() {
+ let mut ctx = setup().await;
+ evaluate(&mut ctx, "globalThis.connection = navigator.connection; globalThis.saveDataGetter = Object.getOwnPropertyDescriptor(connection, 'saveData').get; undefined").await;
+ for (params, expected) in [
+ (json!({"dataSaverEnabled":true}), true),
+ (json!({"dataSaverEnabled":false}), false),
+ (json!({}), false),
+ ] {
+ expect_session_command_result(
+ &mut ctx,
+ 88200,
+ "SID-1",
+ "Emulation.setDataSaverOverride",
+ params,
+ )
+ .await;
+ assert_eq!(evaluate(&mut ctx, "[connection.saveData, saveDataGetter.call(connection), connection === navigator.connection, saveDataGetter === Object.getOwnPropertyDescriptor(connection, 'saveData').get]").await, json!([expected,expected,true,true]));
+ }
+ expect_session_command_result(
+ &mut ctx,
+ 88201,
+ "SID-1",
+ "Emulation.setDataSaverOverride",
+ json!({"dataSaverEnabled":true}),
+ )
+ .await;
+ ctx.process_async(json!({"id":88202,"sessionId":"SID-1","method":"Emulation.setDataSaverOverride","params":{"dataSaverEnabled":"false"}})).await;
+ assert_eq!(ctx.take_response_by_id(88202)["error"]["code"], -32602);
+ ctx.install_navigation_fixture_for_session_owner("data:text/html,<script>globalThis.initialSaveData=navigator.connection.saveData</script><iframe></iframe>",Some("SID-1")).await;
+ assert_eq!(evaluate(&mut ctx, "[initialSaveData,navigator.connection.saveData,frames[0].navigator.connection.saveData]").await, json!([true,true,true]));
+ ctx.conn.register_top_level_page_target("TID-1");
+ ctx.process_async(json!({"id":88203,"method":"Target.attachToTarget","params":{"targetId":"TID-1","flatten":true}})).await;
+ let other = ctx.take_response_by_id(88203)["result"]["sessionId"]
+ .as_str()
+ .unwrap()
+ .to_owned();
+ for (params, expected) in [
+ (json!({"dataSaverEnabled":false}), false),
+ (json!({}), true),
+ (json!({"dataSaverEnabled":false}), false),
+ ] {
+ expect_session_command_result(
+ &mut ctx,
+ 88204,
+ &other,
+ "Emulation.setDataSaverOverride",
+ params,
+ )
+ .await;
+ assert_eq!(
+ evaluate(
+ &mut ctx,
+ "[navigator.connection.saveData,frames[0].navigator.connection.saveData]"
+ )
+ .await,
+ json!([expected, expected])
+ );
+ }
+ ctx.process_async(
+ json!({"id":88205,"method":"Target.detachFromTarget","params":{"sessionId":other}}),
+ )
+ .await;
+ ctx.expect_result(88205, json!({}), None);
+ assert_eq!(
+ evaluate(&mut ctx, "navigator.connection.saveData").await,
+ json!(true)
+ );
+}
diff --git a/moli-protocol/src/domains/runtime/dispatcher.rs b/moli-protocol/src/domains/runtime/dispatcher.rs
index c854ba3c7..174b28875 100644
--- a/moli-protocol/src/domains/runtime/dispatcher.rs
+++ b/moli-protocol/src/domains/runtime/dispatcher.rs
@@ -921,6 +921,7 @@ pub(crate) fn try_start_worker_emulation_command_dispatch(
) -> Option<RuntimeCommandTaskStep> {
let action = match cmd.action {
"setHardwareConcurrencyOverride" => "Emulation.setHardwareConcurrencyOverride",
+ "setDataSaverOverride" => "Emulation.setDataSaverOverride",
_ => 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 442fa61dc..4d3916162 100644
--- a/moli-protocol/src/domains/runtime/tests/shared_worker.rs
+++ b/moli-protocol/src/domains/runtime/tests/shared_worker.rs
@@ -3660,11 +3660,13 @@ async fn shared_worker_discard_console_entries_is_target_local() {
}
#[tokio::test(flavor = "multi_thread")]
-async fn worker_hardware_concurrency_override_is_independent_of_the_page() {
+async fn worker_navigator_query_overrides_are_independent_of_the_page() {
let mut ctx = TestContext::new();
with_loaded_document_async(&mut ctx, "<!doctype html><body></body>").await;
ctx.process_and_wait_for_response_async(json!({"id":99000,"method":"Emulation.setHardwareConcurrencyOverride","params":{"hardwareConcurrency":2}})).await;
ctx.expect_result(99000, json!({}), None);
+ ctx.process_and_wait_for_response_async(json!({"id":99015,"method":"Emulation.setDataSaverOverride","params":{"dataSaverEnabled":true}})).await;
+ ctx.expect_result(99015, json!({}), None);
let worker = start_attached_shared_worker_session(
&mut ctx,
99001,
@@ -3672,6 +3674,24 @@ async fn worker_hardware_concurrency_override_is_independent_of_the_page() {
"onconnect = () => {};",
)
.await;
+ for (params, worker_expected) in [
+ (json!({}), false),
+ (json!({"dataSaverEnabled":true}), true),
+ (json!({"dataSaverEnabled":false}), false),
+ ] {
+ ctx.process_and_wait_for_response_async(json!({"id":99016,"sessionId":worker,"method":"Emulation.setDataSaverOverride","params":params})).await;
+ ctx.expect_result(99016, json!({}), Some(&worker));
+ for (id, session, expected) in [
+ (99017, None, true),
+ (99018, Some(worker.as_str()), worker_expected),
+ ] {
+ ctx.process_and_wait_for_response_async(json!({"id":id,"sessionId":session,"method":"Runtime.evaluate","params":{"expression":"globalThis.heldConnection ??= navigator.connection; [heldConnection.saveData, heldConnection === navigator.connection]","returnByValue":true}})).await;
+ assert_eq!(
+ take_response_by_id(&mut ctx, id)["result"]["result"]["value"],
+ json!([expected, true])
+ );
+ }
+ }
for (id, session, expected) in [(99010, None, 2), (99011, Some(worker.as_str()), 4)] {
ctx.process_and_wait_for_response_async(json!({"id":id,"sessionId":session,"method":"Runtime.evaluate","params":{"expression":"navigator.hardwareConcurrency","returnByValue":true}})).await;
assert_eq!(
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 becbc58db..0123a959f 100644
--- a/moli-renderer-v8/src/context_bootstrap/navigator_runtime/navigator.rs
+++ b/moli-renderer-v8/src/context_bootstrap/navigator_runtime/navigator.rs
@@ -257,6 +257,8 @@ struct WorkerNavigatorRuntimeDataPrototypeDeclaration {
languages: (),
#[webapi(accessor_property, getter = navigator_runtime_data_getter_callback, data = callback_data_index_value(scope, 18))]
device_memory: (),
+ #[webapi(accessor_property, getter = navigator_runtime_data_getter_callback, data = callback_data_index_value(scope, 20))]
+ connection: (),
#[webapi(accessor_property, getter = navigator_runtime_data_getter_callback, data = callback_data_index_value(scope, 21))]
user_agent_data: (),
#[webapi(accessor_property, getter = navigator_runtime_data_getter_callback, data = callback_data_index_value(scope, 23))]
@@ -299,7 +301,7 @@ struct NavigatorConnectionDeclaration {
#[webapi(data_property, enumerable, value = DEFAULT_CONNECTION_RTT)]
rtt: (),
- #[webapi(data_property, enumerable, value = DEFAULT_CONNECTION_SAVE_DATA)]
+ #[webapi(accessor_property, getter = navigator_connection_save_data_getter_callback, enumerable)]
save_data: (),
#[webapi(data_property, enumerable, init = "null")]
@@ -733,6 +735,22 @@ fn navigator_user_activation_state_getter_callback<'s>(
rv.set(v8::Boolean::new(scope, active).into());
}
+fn navigator_connection_save_data_getter_callback<'s>(
+ scope: &mut v8::PinScope<'s, '_>,
+ args: v8::FunctionCallbackArguments<'s>,
+ mut rv: v8::ReturnValue<'_, v8::Value>,
+) {
+ if !navigator_connection_receiver_branded(scope, args.this()) {
+ throw_type_error(scope, "Illegal invocation");
+ return;
+ }
+ rv.set_bool(
+ navigator_query_overrides(scope)
+ .data_saver
+ .unwrap_or(DEFAULT_CONNECTION_SAVE_DATA),
+ );
+}
+
fn navigator_connection_event_target_noop_callback<'s>(
scope: &mut v8::PinScope<'s, '_>,
args: v8::FunctionCallbackArguments<'s>,
diff --git a/moli-renderer-v8/src/worker/thread/runtime_inspector.rs b/moli-renderer-v8/src/worker/thread/runtime_inspector.rs
index 78eea6769..f1d1f17d0 100644
--- a/moli-renderer-v8/src/worker/thread/runtime_inspector.rs
+++ b/moli-renderer-v8/src/worker/thread/runtime_inspector.rs
@@ -583,26 +583,38 @@ impl WorkerRuntimeInspector {
fn dispatch_emulation(&self, session_id: Option<&str>, raw_json: &str) -> Option<Value> {
let command: Value = serde_json::from_str(raw_json).ok()?;
- if command["method"] != "Emulation.setHardwareConcurrencyOverride" {
- return None;
- }
- let value = command["params"]["hardwareConcurrency"]
- .as_u64()
- .filter(|value| *value <= i32::MAX as u64)
- .and_then(|value| std::num::NonZeroU32::new(value as u32));
- let Some(value) = value else {
- return Some(
- json!({"id": command["id"], "error": {"code": -32602, "message": "HardwareConcurrency must be a positive int32"}}),
- );
- };
let key = session_id
.map(|id| moli_page_types::DevToolsSessionKey::Attached(id.to_owned()))
.unwrap_or(moli_page_types::DevToolsSessionKey::Primary);
- self.navigator_emulation
- .borrow_mut()
- .session_mut(&key)
- .hardware_concurrency = Some(value);
- Some(json!({"id": command["id"], "result": {}}))
+ let invalid =
+ |message| Some(json!({"id":command["id"],"error":{"code":-32602,"message":message}}));
+ match command["method"].as_str()? {
+ "Emulation.setHardwareConcurrencyOverride" => {
+ let value = command["params"]["hardwareConcurrency"]
+ .as_u64()
+ .filter(|value| *value <= i32::MAX as u64)
+ .and_then(|value| std::num::NonZeroU32::new(value as u32));
+ let Some(value) = value else {
+ return invalid("HardwareConcurrency must be a positive int32");
+ };
+ self.navigator_emulation
+ .borrow_mut()
+ .session_mut(&key)
+ .hardware_concurrency = Some(value);
+ }
+ "Emulation.setDataSaverOverride" => {
+ let value = &command["params"]["dataSaverEnabled"];
+ if !value.is_null() && !value.is_boolean() {
+ return invalid("InvalidParams");
+ }
+ self.navigator_emulation
+ .borrow_mut()
+ .session_mut(&key)
+ .data_saver = value.as_bool();
+ }
+ _ => return None,
+ }
+ Some(json!({"id":command["id"],"result":{}}))
}
pub(super) fn execute_task(&self, isolate: &mut v8::Isolate, task: WorkerInspectorTask) {