Skip to content

armgit / moli

Public Imported from GitHub
0

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

refactor(emulation): read viewport state natively

ldm0c96596790651
diff --git a/moli-protocol/src/conn.rs b/moli-protocol/src/conn.rs
index e10e84eaf..a92d770bc 100644
--- a/moli-protocol/src/conn.rs
+++ b/moli-protocol/src/conn.rs
@@ -578,7 +578,6 @@ pub(crate) use state::{
TargetServiceWorkerRuntimeAttachmentIdentity, TargetServiceWorkerVersionIdentity,
TargetServiceWorkerVersionRetirement, TargetSharedWorkerProtocolAttachmentIdentity,
TargetSharedWorkerProtocolAttachmentRetirement, TargetWindowSurfaceState,
- viewport_surface_install_script,
};
#[cfg(test)]
pub(crate) use state::{
diff --git a/moli-protocol/src/conn/page_state/fetch_state.rs b/moli-protocol/src/conn/page_state/fetch_state.rs
index 2a5597897..4c70c5507 100644
--- a/moli-protocol/src/conn/page_state/fetch_state.rs
+++ b/moli-protocol/src/conn/page_state/fetch_state.rs
@@ -41,12 +41,14 @@ impl BrowserContext {
self.page_targets.background_mut()
}
+ #[cfg(test)]
pub(crate) fn background_target_at(&self, index: usize) -> Option<&PageTargetHost> {
- self.page_targets.background_at(index)
+ self.background_targets().nth(index)
}
+ #[cfg(test)]
pub(crate) fn background_target_at_mut(&mut self, index: usize) -> Option<&mut PageTargetHost> {
- self.page_targets.background_at_mut(index)
+ self.background_targets_mut().nth(index)
}
pub(crate) fn background_target_count(&self) -> usize {
diff --git a/moli-protocol/src/conn/page_state/surfaces.rs b/moli-protocol/src/conn/page_state/surfaces.rs
index c22a4e4cd..0b33ad705 100644
--- a/moli-protocol/src/conn/page_state/surfaces.rs
+++ b/moli-protocol/src/conn/page_state/surfaces.rs
@@ -1,8 +1,7 @@
use super::super::cookie_manager_surface::BrowserContextCookieManagerSurfaceSnapshot;
use super::super::{
- BrowserContext, CdpConnection, DocumentStartScript, EmulatedDeviceMetrics,
- EmulatedGeolocationOverrideState, EmulatedNetworkConditions, EmulatedViewportSurface,
- PageTargetHost, viewport_surface_install_script,
+ BrowserContext, CdpConnection, DocumentStartScript, EmulatedGeolocationOverrideState,
+ EmulatedNetworkConditions, EmulatedViewportSurface, PageTargetHost,
};
#[cfg(test)]
use moli_cookie_jar::{BrowserCookieFacadeContextOverrides, BrowserCookieFacadeOverrides};
@@ -11,7 +10,6 @@ use serde_json::json;
struct SurfaceOverrideInputs {
network_conditions: Option<EmulatedNetworkConditions>,
geolocation_override: Option<EmulatedGeolocationOverrideState>,
- emulated_device_metrics: Option<EmulatedDeviceMetrics>,
max_touch_points: u32,
focus_emulation_enabled: bool,
active_target_surface: bool,
@@ -23,7 +21,6 @@ impl SurfaceOverrideInputs {
Self {
network_conditions: browser_context.effective_active_network_conditions(),
geolocation_override: browser_context.effective_active_geolocation_override(),
- emulated_device_metrics: browser_context.effective_active_emulated_device_metrics(),
max_touch_points: browser_context
.active_page_target()
.effective_emulation_state
@@ -44,7 +41,6 @@ impl SurfaceOverrideInputs {
state: &PageTargetHost,
default_network_conditions: Option<EmulatedNetworkConditions>,
default_geolocation_override: Option<EmulatedGeolocationOverrideState>,
- default_emulated_device_metrics: Option<EmulatedDeviceMetrics>,
) -> Self {
Self {
network_conditions: state
@@ -56,11 +52,6 @@ impl SurfaceOverrideInputs {
.geolocation_override
.clone()
.or(default_geolocation_override),
- emulated_device_metrics: state
- .effective_emulation_state
- .emulated_device_metrics
- .clone()
- .or(default_emulated_device_metrics),
max_touch_points: state.effective_emulation_state.max_touch_points,
focus_emulation_enabled: state.effective_emulation_state.focus_emulation_enabled,
active_target_surface: false,
@@ -138,7 +129,6 @@ impl BrowserContext {
self.default_geolocation_override
.clone()
.or_else(|| self.global_geolocation_override.clone()),
- self.default_emulated_device_metrics.clone(),
)
.navigator_overrides(),
)
@@ -410,7 +400,6 @@ impl BrowserContext {
self.default_geolocation_override
.clone()
.or_else(|| self.global_geolocation_override.clone()),
- self.default_emulated_device_metrics.clone(),
),
)
}
@@ -448,17 +437,6 @@ impl BrowserContext {
fn generated_surface_override_script_from_inputs(
inputs: &SurfaceOverrideInputs,
) -> Option<DocumentStartScript> {
- // Preserve the renderer's native Window/Screen descriptors unless a
- // client explicitly enabled device emulation. Installing the default
- // profile as JS getters makes otherwise native attributes observable
- // as closure-backed properties and can mask child-frame dimensions.
- // An explicit override retains the original descriptors so a later
- // CDP clear can restore the native WebIDL surface.
- let viewport_surface_script = inputs
- .emulated_device_metrics
- .as_ref()
- .map(|metrics| viewport_surface_install_script(&metrics.viewport_surface(), true))
- .unwrap_or_default();
let document_has_focus = inputs.document_has_focus();
let document_hidden = inputs.document_hidden();
let document_visibility_state = inputs.document_visibility_state();
@@ -471,7 +449,6 @@ impl BrowserContext {
Object.defineProperty(obj, key, {{ configurable: true, get: getter }});
}} catch (_error) {{}}
}};
- {viewport_surface_script}
if (document) {{
// The renderer's Document bridge currently installs these
// surfaces as own accessors, so CDP emulation must shadow
@@ -487,7 +464,6 @@ impl BrowserContext {
}} catch (_error) {{}}
}}
}})();",
- viewport_surface_script = viewport_surface_script,
document_hidden = document_hidden,
document_visibility_state = json!(document_visibility_state),
document_has_focus = document_has_focus,
diff --git a/moli-protocol/src/conn/state/emulation.rs b/moli-protocol/src/conn/state/emulation.rs
index a2824eb3a..c4f18fdba 100644
--- a/moli-protocol/src/conn/state/emulation.rs
+++ b/moli-protocol/src/conn/state/emulation.rs
@@ -1,5 +1,3 @@
-use serde_json::json;
-
#[derive(Debug, Clone, PartialEq)]
pub struct EmulatedDeviceMetrics {
pub width: u32,
@@ -78,21 +76,6 @@ impl EmulatedViewportSurface {
screen_avail_height: self.screen_avail_height,
}
}
-
- pub(crate) fn as_json_string(&self) -> String {
- json!({
- "innerWidth": self.inner_width,
- "innerHeight": self.inner_height,
- "outerWidth": self.outer_width,
- "outerHeight": self.outer_height,
- "devicePixelRatio": self.device_pixel_ratio,
- "screenWidth": self.screen_width,
- "screenHeight": self.screen_height,
- "screenAvailWidth": self.screen_avail_width,
- "screenAvailHeight": self.screen_avail_height,
- })
- .to_string()
- }
}
impl EmulatedDeviceMetrics {
@@ -123,95 +106,6 @@ impl EmulatedDeviceMetrics {
}
}
-pub(crate) fn viewport_surface_install_script(
- surface: &EmulatedViewportSurface,
- remember_original_descriptors: bool,
-) -> String {
- let descriptor_setup = if remember_original_descriptors {
- r#"
- const storeKey = '__moliDeviceMetricsOriginalDescriptors';
- const descriptors = globalThis[storeKey] || {};
- try {
- Object.defineProperty(globalThis, storeKey, {
- configurable: true,
- value: descriptors,
- });
- } catch (_) {
- }
- const rememberViewportSurfaceDescriptor = (scope, object, property) => {
- if (!object) {
- return;
- }
- const key = `${scope}.${property}`;
- if (Object.prototype.hasOwnProperty.call(descriptors, key)) {
- return;
- }
- descriptors[key] = {
- existed: Object.prototype.hasOwnProperty.call(object, property),
- descriptor: Object.getOwnPropertyDescriptor(object, property),
- };
- };
-"#
- } else {
- r#"
- const rememberViewportSurfaceDescriptor = (_scope, _object, _property) => {};
-"#
- };
- format!(
- r#"
-(() => {{
- const surface = {surface};
- {descriptor_setup}
- let isTopLevelWindow = true;
- try {{
- isTopLevelWindow = globalThis.parent === globalThis;
- }} catch (_) {{
- }}
- const defineViewportSurfaceGetter = (object, property, value) => {{
- if (!object) {{
- return;
- }}
- try {{
- Object.defineProperty(object, property, {{
- configurable: true,
- get: () => value,
- }});
- }} catch (_) {{
- }}
- }};
- const installViewportSurfaceGetter = (scope, object, property, value) => {{
- rememberViewportSurfaceDescriptor(scope, object, property);
- defineViewportSurfaceGetter(object, property, value);
- }};
- const windowValues = [
- ['innerWidth', surface.innerWidth, true],
- ['innerHeight', surface.innerHeight, true],
- ['outerWidth', surface.outerWidth, false],
- ['outerHeight', surface.outerHeight, false],
- ['devicePixelRatio', surface.devicePixelRatio, false],
- ];
- const screenValues = [
- ['width', surface.screenWidth],
- ['height', surface.screenHeight],
- ['availWidth', surface.screenAvailWidth],
- ['availHeight', surface.screenAvailHeight],
- ];
- for (const [property, value, topLevelOnly] of windowValues) {{
- if (topLevelOnly && !isTopLevelWindow) {{
- continue;
- }}
- installViewportSurfaceGetter('window', globalThis, property, value);
- }}
- for (const [property, value] of screenValues) {{
- installViewportSurfaceGetter('screen', globalThis.screen, property, value);
- }}
-}})();
-"#,
- surface = surface.as_json_string(),
- descriptor_setup = descriptor_setup,
- )
-}
-
#[derive(Debug, Clone, PartialEq)]
pub struct EmulatedGeolocationOverride {
pub latitude: f64,
@@ -381,10 +275,7 @@ impl EffectiveTargetEmulationState {
#[cfg(test)]
mod tests {
- use super::{
- EffectiveTargetEmulationState, EmulatedDeviceMetrics, EmulatedViewportSurface,
- viewport_surface_install_script,
- };
+ use super::{EffectiveTargetEmulationState, EmulatedDeviceMetrics};
#[test]
fn device_pixel_ratio_normalizes_non_positive_and_non_finite_values() {
@@ -412,16 +303,6 @@ mod tests {
assert_eq!(metrics.device_pixel_ratio(), 1.0);
}
- #[test]
- fn viewport_surface_install_script_uses_plain_helper_store() {
- let script = viewport_surface_install_script(&EmulatedViewportSurface::default(), true);
-
- assert!(!script.contains("Object.create(null)"));
- assert!(script.contains("globalThis.parent === globalThis"));
- assert!(script.contains("['innerWidth', surface.innerWidth, true]"));
- assert!(script.contains("if (topLevelOnly && !isTopLevelWindow)"));
- }
-
#[test]
fn handler_disable_uses_raw_state_for_conditional_target_resets() {
let mut effective = EffectiveTargetEmulationState {
diff --git a/moli-protocol/src/conn/state/mod.rs b/moli-protocol/src/conn/state/mod.rs
index 3f3ebe295..3751644d6 100644
--- a/moli-protocol/src/conn/state/mod.rs
+++ b/moli-protocol/src/conn/state/mod.rs
@@ -120,7 +120,7 @@ pub use navigation::{PageNavigationHistoryEntry, PendingNavigationHistoryUpdate}
pub(crate) use emulation::{
EffectiveTargetEmulationState, EffectiveTargetEmulationStateDelta, EmulatedNetworkConditions,
- EmulatedViewportSurface, viewport_surface_install_script,
+ EmulatedViewportSurface,
};
pub use emulation::{
EmulatedDeviceMetrics, EmulatedGeolocationOverride, EmulatedGeolocationOverrideState,
diff --git a/moli-protocol/src/conn/state/page_target_host.rs b/moli-protocol/src/conn/state/page_target_host.rs
index 8ccd1dae1..d7810335a 100644
--- a/moli-protocol/src/conn/state/page_target_host.rs
+++ b/moli-protocol/src/conn/state/page_target_host.rs
@@ -336,14 +336,6 @@ impl PageTargetRegistry {
.filter(move |host| Some(host.target_id()) != active_target_id.as_deref())
}
- pub(crate) fn background_at(&self, index: usize) -> Option<&PageTargetHost> {
- self.background().nth(index)
- }
-
- pub(crate) fn background_at_mut(&mut self, index: usize) -> Option<&mut PageTargetHost> {
- self.background_mut().nth(index)
- }
-
pub(crate) fn background_len(&self) -> usize {
self.background().count()
}
diff --git a/moli-protocol/src/domains/emulation.rs b/moli-protocol/src/domains/emulation.rs
index e8433c3b2..8eedbd3b4 100644
--- a/moli-protocol/src/domains/emulation.rs
+++ b/moli-protocol/src/domains/emulation.rs
@@ -1,8 +1,7 @@
use crate::conn::{
BrowserContext, CdpConnection, CdpSessionRoute, Cmd, CommandOwnerScope, EmulatedDeviceMetrics,
- EmulatedGeolocationOverrideState, EmulatedViewportSurface, PageTargetHost,
- RendererCommandCorrelation, RendererCommandDescriptor, RuntimeInspectorAsyncCompletionReceiver,
- TargetWindowSurfaceState,
+ EmulatedGeolocationOverrideState, EmulatedViewportSurface, RendererCommandCorrelation,
+ RendererCommandDescriptor, RuntimeInspectorAsyncCompletionReceiver, TargetWindowSurfaceState,
};
use crate::devtools_runtime::{
DevToolsCommand, DevToolsCommandResult, DevToolsDevicePixelRatioSetting, DevToolsError,
@@ -846,7 +845,12 @@ fn start_device_metrics_override_command(
}
let owner = CommandOwnerScope::capture(conn, cmd.session_id);
let previous = conn.target_session_owner_emulated_device_metrics_for_owner(&owner);
- let mut base = EmulatedViewportSurface::default();
+ let mut base = conn
+ .target_owner_identity_for_owner(&owner)
+ .and_then(|(context_id, _)| conn.browser_context_by_id(&context_id))
+ .and_then(|context| context.default_emulated_device_metrics.as_ref())
+ .map(EmulatedDeviceMetrics::viewport_surface)
+ .unwrap_or_default();
if let Some(state) = conn.target_owner_state_for_owner(&owner) {
let geometry = state.window_surface_geometry;
if geometry.width != 0 {
@@ -897,11 +901,13 @@ fn start_clear_device_metrics_override_command(
));
}
let owner_scope = CommandOwnerScope::capture(conn, cmd.session_id);
- let runtime_call_id = conn.next_internal_runtime_command_id();
+ let viewport_surface = conn
+ .navigation_load_inputs_for_owner(&owner_scope)
+ .viewport_surface;
let Some(page) = loaded_page_mut_for_target_configuration(conn, cmd.session_id) else {
return EmulationCommandTaskStep::Complete(CommandOutputPlan::result(json!({})));
};
- let pending_viewport = match page.start_set_viewport_surface(None) {
+ let pending_viewport = match page.start_set_viewport_surface(viewport_surface) {
Ok(pending) => pending,
Err(error) => {
return EmulationCommandTaskStep::Complete(CommandOutputPlan::error(
@@ -910,36 +916,13 @@ fn start_clear_device_metrics_override_command(
));
}
};
- match start_runtime_emulation_protocol_message(
- page,
- runtime_call_id,
- device::LIVE_DEVICE_METRICS_CLEAR_SCRIPT.to_owned(),
- ) {
- Ok((pending_runtime, runtime_response_rx)) => {
- let session_id = owner_scope.session_id().map(str::to_owned);
- EmulationCommandTaskStep::Pending(PendingEmulationCommandDispatch {
- command_id: cmd.id,
- session_id: session_id.clone(),
- pending: PendingEmulationRendererDispatch::Pages(vec![
- PendingEmulationPageCommand {
- target: PendingEmulationPageTarget::SessionOwner {
- owner_scope: owner_scope.clone(),
- },
- operation: PendingEmulationPageOperation::SetViewportSurface,
- pending: pending_viewport,
- runtime_response_rx: None,
- },
- PendingEmulationPageCommand {
- target: PendingEmulationPageTarget::SessionOwner { owner_scope },
- operation: PendingEmulationPageOperation::RuntimeProtocolMessage,
- pending: pending_runtime,
- runtime_response_rx,
- },
- ]),
- })
- }
- Err(error) => EmulationCommandTaskStep::Complete(CommandOutputPlan::error(-32000, error)),
- }
+ EmulationCommandTaskStep::Pending(single_pending_emulation_dispatch(
+ cmd.id,
+ owner_scope,
+ PendingEmulationPageOperation::SetViewportSurface,
+ pending_viewport,
+ None,
+ ))
}
fn start_devtools_set_viewport_command(
@@ -963,9 +946,6 @@ fn start_apply_device_metrics(
metrics: EmulatedDeviceMetrics,
owner_scope: CommandOwnerScope,
) -> Result<Option<PendingEmulationCommandDispatch>, DevToolsError> {
- let had_existing_device_metrics = conn
- .target_session_owner_emulated_device_metrics_for_owner(&owner_scope)
- .is_some();
if !conn.update_emulation_state_for_owner(&owner_scope, |state| {
if let Some(mut state) = state {
state.set_emulated_device_metrics(Some(metrics.clone()));
@@ -976,43 +956,23 @@ fn start_apply_device_metrics(
"BrowserContextNotLoaded",
));
}
- let runtime_call_id = conn.next_internal_runtime_command_id();
let Some(page) = conn
.loaded_page_mut_for_target_configuration_for_owner(&owner_scope)
.ok()
else {
return Ok(None);
};
- let session_id = owner_scope.session_id().map(str::to_owned);
let viewport_surface = Some(metrics.viewport_surface().to_page_viewport_surface());
let pending_viewport = page
.start_set_viewport_surface(viewport_surface)
.map_err(|error| DevToolsError::new(DevToolsErrorKind::Internal, error.to_string()))?;
- let script =
- device::live_device_metrics_override_script(&metrics, !had_existing_device_metrics);
- let (pending_runtime, runtime_response_rx) =
- start_runtime_emulation_protocol_message(page, runtime_call_id, script)
- .map_err(|error| DevToolsError::new(DevToolsErrorKind::Internal, error))?;
- Ok(Some(PendingEmulationCommandDispatch {
+ Ok(Some(single_pending_emulation_dispatch(
command_id,
- session_id: session_id.clone(),
- pending: PendingEmulationRendererDispatch::Pages(vec![
- PendingEmulationPageCommand {
- target: PendingEmulationPageTarget::SessionOwner {
- owner_scope: owner_scope.clone(),
- },
- operation: PendingEmulationPageOperation::SetViewportSurface,
- pending: pending_viewport,
- runtime_response_rx: None,
- },
- PendingEmulationPageCommand {
- target: PendingEmulationPageTarget::SessionOwner { owner_scope },
- operation: PendingEmulationPageOperation::RuntimeProtocolMessage,
- pending: pending_runtime,
- runtime_response_rx,
- },
- ]),
- }))
+ owner_scope,
+ PendingEmulationPageOperation::SetViewportSurface,
+ pending_viewport,
+ None,
+ )))
}
fn set_viewport_metrics_from_command(
@@ -2120,24 +2080,13 @@ async fn execute_devtools_set_viewport_for_browser_contexts(
.browser_context_by_id(&browser_context_id)
.and_then(|context| context.default_emulated_device_metrics.as_ref());
let metrics = set_viewport_metrics_from_current(current_default, &command)?;
- let browser_context = conn
- .browser_context_by_id(&browser_context_id)
- .expect("resolved browser context must remain addressable");
- let runtime_command_count =
- browser_context_default_device_metrics_runtime_command_count(browser_context);
- let mut runtime_call_ids = (0..runtime_command_count)
- .map(|_| conn.next_internal_runtime_command_id())
- .collect::<Vec<_>>();
let browser_context = conn
.browser_context_by_id_mut(&browser_context_id)
.expect("resolved browser context must remain addressable");
- let had_existing_default = browser_context.default_emulated_device_metrics.is_some();
browser_context.default_emulated_device_metrics = Some(metrics.clone());
pending.extend(start_browser_context_default_device_metrics_page_commands(
browser_context,
&metrics,
- had_existing_default,
- &mut runtime_call_ids,
)?);
}
if pending.is_empty() {
@@ -2204,98 +2153,29 @@ fn is_moli_internal_default_user_context(browser_context_id: &str) -> bool {
})
}
-fn browser_context_default_device_metrics_runtime_command_count(
- browser_context: &BrowserContext,
-) -> usize {
- browser_context
- .page_targets
- .iter()
- .filter(|target| {
- target
- .effective_emulation_state
- .emulated_device_metrics
- .is_none()
- && target.loaded_page().is_some()
- })
- .count()
-}
-
fn start_browser_context_default_device_metrics_page_commands(
browser_context: &mut BrowserContext,
metrics: &EmulatedDeviceMetrics,
- had_existing_default: bool,
- runtime_call_ids: &mut Vec<u64>,
) -> Result<Vec<PendingEmulationPageCommand>, DevToolsError> {
let browser_context_id = browser_context.id.clone();
- let active_target_id = browser_context.active_target_id_owned();
- let mut pending = Vec::new();
let viewport_surface = Some(metrics.viewport_surface().to_page_viewport_surface());
- if let Some(active_target_id) = active_target_id
- && let Some(active_target) = browser_context.page_targets.active_mut()
- && active_target
+ let mut pending = Vec::new();
+ for target in browser_context.page_targets.iter_mut() {
+ if target
.effective_emulation_state
.emulated_device_metrics
- .is_none()
- && let Some(page) = active_target.runtime_slot.loaded_page_mut()
- {
- pending.push(PendingEmulationPageCommand {
- target: PendingEmulationPageTarget::BrowserContextTarget {
- browser_context_id: browser_context_id.clone(),
- target_id: active_target_id.clone(),
- },
- operation: PendingEmulationPageOperation::SetViewportSurface,
- pending: page
- .start_set_viewport_surface(viewport_surface)
- .map_err(|error| {
- DevToolsError::new(DevToolsErrorKind::Internal, error.to_string())
- })?,
- runtime_response_rx: None,
- });
- let (pending_runtime, runtime_response_rx) = start_runtime_emulation_protocol_message(
- page,
- runtime_call_ids.pop().ok_or_else(|| {
- DevToolsError::new(DevToolsErrorKind::Internal, "MissingRuntimeInspectorCallId")
- })?,
- device::live_device_metrics_override_script(metrics, !had_existing_default),
- )
- .map_err(|error| DevToolsError::new(DevToolsErrorKind::Internal, error))?;
- pending.push(PendingEmulationPageCommand {
- target: PendingEmulationPageTarget::BrowserContextTarget {
- browser_context_id: browser_context_id.clone(),
- target_id: active_target_id,
- },
- operation: PendingEmulationPageOperation::RuntimeProtocolMessage,
- pending: pending_runtime,
- runtime_response_rx,
- });
- }
- for index in 0..browser_context.background_target_count() {
- let target_id = browser_context
- .background_target_at(index)
- .expect("background target index must remain valid")
- .target_id()
- .to_owned();
- let has_target_override = browser_context
- .page_target(&target_id)
- .is_some_and(|state| {
- state
- .effective_emulation_state
- .emulated_device_metrics
- .is_some()
- });
- if has_target_override {
+ .is_some()
+ {
continue;
}
- let Some(page) = browser_context
- .background_target_at_mut(index)
- .and_then(PageTargetHost::loaded_page_mut)
- else {
+ let target_id = target.target_id().to_owned();
+ let Some(page) = target.loaded_page_mut() else {
continue;
};
pending.push(PendingEmulationPageCommand {
target: PendingEmulationPageTarget::BrowserContextTarget {
browser_context_id: browser_context_id.clone(),
- target_id: target_id.clone(),
+ target_id,
},
operation: PendingEmulationPageOperation::SetViewportSurface,
pending: page
@@ -2305,23 +2185,6 @@ fn start_browser_context_default_device_metrics_page_commands(
})?,
runtime_response_rx: None,
});
- let (pending_runtime, runtime_response_rx) = start_runtime_emulation_protocol_message(
- page,
- runtime_call_ids.pop().ok_or_else(|| {
- DevToolsError::new(DevToolsErrorKind::Internal, "MissingRuntimeInspectorCallId")
- })?,
- device::live_device_metrics_override_script(metrics, !had_existing_default),
- )
- .map_err(|error| DevToolsError::new(DevToolsErrorKind::Internal, error))?;
- pending.push(PendingEmulationPageCommand {
- target: PendingEmulationPageTarget::BrowserContextTarget {
- browser_context_id: browser_context_id.clone(),
- target_id,
- },
- operation: PendingEmulationPageOperation::RuntimeProtocolMessage,
- pending: pending_runtime,
- runtime_response_rx,
- });
}
Ok(pending)
}
@@ -2598,14 +2461,6 @@ pub(crate) async fn dispose_page_session_async(
page.set_viewport_surface_async(load_inputs.viewport_surface)
.await,
);
- record_emulation_disposal_result(
- &mut first_error,
- "device metrics script",
- page.run_page_surface_override_script_async(
- device::LIVE_DEVICE_METRICS_CLEAR_SCRIPT,
- )
- .await,
- );
}
}
if delta.surface_changed() {
diff --git a/moli-protocol/src/domains/emulation/device.rs b/moli-protocol/src/domains/emulation/device.rs
index 2812c099e..d03144ce7 100644
--- a/moli-protocol/src/domains/emulation/device.rs
+++ b/moli-protocol/src/domains/emulation/device.rs
@@ -1,56 +1,4 @@
-use crate::conn::{EmulatedDeviceMetrics, viewport_surface_install_script};
-
-pub(super) fn live_device_metrics_override_script(
- metrics: &EmulatedDeviceMetrics,
- remember_original_descriptors: bool,
-) -> String {
- viewport_surface_install_script(&metrics.viewport_surface(), remember_original_descriptors)
-}
-
-pub(super) const LIVE_DEVICE_METRICS_CLEAR_SCRIPT: &str = r#"
-(() => {
- const storeKey = '__moliDeviceMetricsOriginalDescriptors';
- const descriptors = globalThis[storeKey] || {};
- let isTopLevelWindow = true;
- try {
- isTopLevelWindow = globalThis.parent === globalThis;
- } catch (_) {
- }
- const restoreDescriptor = (scope, object, property) => {
- if (!object) {
- return;
- }
- const key = `${scope}.${property}`;
- try {
- if (Object.prototype.hasOwnProperty.call(descriptors, key)) {
- const original = descriptors[key];
- if (original && original.existed && original.descriptor) {
- Object.defineProperty(object, property, original.descriptor);
- } else {
- delete object[property];
- }
- } else {
- delete object[property];
- }
- } catch (_) {
- }
- };
- const windowProperties = ['outerWidth', 'outerHeight', 'devicePixelRatio'];
- if (isTopLevelWindow) {
- windowProperties.unshift('innerWidth', 'innerHeight');
- }
- for (const property of windowProperties) {
- restoreDescriptor('window', globalThis, property);
- }
- for (const property of ['width', 'height', 'availWidth', 'availHeight']) {
- restoreDescriptor('screen', globalThis.screen, property);
- }
- try {
- delete globalThis[storeKey];
- } catch (_) {
- }
-})()
-"#;
+use crate::conn::EmulatedDeviceMetrics;
/// CDP zero dimensions remove the layout override for that axis. The actual
/// visible widget is resized only when both axes are supplied; it can differ
@@ -130,15 +78,3 @@ pub(super) fn metrics_from_cdp(
screen_avail_height: screen_height,
})
}
-
-#[cfg(test)]
-mod tests {
- use super::LIVE_DEVICE_METRICS_CLEAR_SCRIPT;
-
- #[test]
- fn live_device_metrics_clear_script_uses_plain_helper_store() {
- assert!(!LIVE_DEVICE_METRICS_CLEAR_SCRIPT.contains("Object.create(null)"));
- assert!(LIVE_DEVICE_METRICS_CLEAR_SCRIPT.contains("globalThis.parent === globalThis"));
- assert!(LIVE_DEVICE_METRICS_CLEAR_SCRIPT.contains("if (isTopLevelWindow)"));
- }
-}
diff --git a/moli-protocol/src/domains/emulation/tests/native_navigator.rs b/moli-protocol/src/domains/emulation/tests/native_navigator.rs
index 5574fbc77..1072b4644 100644
--- a/moli-protocol/src/domains/emulation/tests/native_navigator.rs
+++ b/moli-protocol/src/domains/emulation/tests/native_navigator.rs
@@ -1,4 +1,7 @@
use super::*;
+use crate::devtools_runtime::{
+ DevToolsDevicePixelRatioSetting, DevToolsSetViewportCommand, DevToolsViewportSetting,
+};
async fn evaluate(ctx: &mut TestContext, expression: &str) -> serde_json::Value {
ctx.process_async(json!({
@@ -472,3 +475,111 @@ async fn unsupported_throttling_rejects_before_changing_live_offline_state() {
1.0
);
}
+
+#[tokio::test(flavor = "multi_thread")]
+async fn native_viewport_overrides_preserve_getters_and_ignore_page_property_hooks() {
+ let mut ctx = setup().await;
+ assert_eq!(evaluate(&mut ctx,r#"
+ globalThis.originalInner = Object.getOwnPropertyDescriptor(globalThis, 'innerWidth').get;
+ globalThis.originalDpr = Object.getOwnPropertyDescriptor(globalThis, 'devicePixelRatio').get;
+ globalThis.originalScreenWidth = Object.getOwnPropertyDescriptor(Screen.prototype, 'width').get;
+ globalThis.heldScreen = screen;
+ globalThis.heldVisual = visualViewport;
+ globalThis.originalDefine = Object.defineProperty;
+ Object.defineProperty(globalThis, '__moliDeviceMetricsOriginalDescriptors', {
+ configurable: true, get() { throw new Error('page-owned property'); }
+ });
+ Object.defineProperty = () => { throw new Error('page-owned defineProperty'); };
+ true
+ "#).await,json!(true));
+ for width in [640, 800] {
+ expect_session_command_result(&mut ctx,88001,"SID-1","Emulation.setDeviceMetricsOverride",
+ json!({"width":width,"height":480,"deviceScaleFactor":2,"mobile":false,"screenWidth":1000,"screenHeight":700})).await;
+ assert_eq!(
+ evaluate(
+ &mut ctx,
+ r#"[
+ innerWidth, originalInner.call(globalThis), heldVisual.width,
+ devicePixelRatio, originalDpr.call(globalThis),
+ heldScreen.width, originalScreenWidth.call(heldScreen),
+ originalInner === Object.getOwnPropertyDescriptor(globalThis,'innerWidth').get,
+ originalScreenWidth === Object.getOwnPropertyDescriptor(Screen.prototype,'width').get,
+ Function.prototype.toString.call(originalInner).includes('[native code]')
+ ]"#
+ )
+ .await,
+ json!([width, width, width, 2, 2, 1000, 1000, true, true, true])
+ );
+ }
+ expect_session_command_result(
+ &mut ctx,
+ 88001,
+ "SID-1",
+ "Emulation.clearDeviceMetricsOverride",
+ json!({}),
+ )
+ .await;
+ assert_eq!(evaluate(&mut ctx,"[innerWidth === originalInner.call(globalThis), originalInner === Object.getOwnPropertyDescriptor(globalThis,'innerWidth').get, !Object.hasOwn(screen,'width')]").await,json!([true,true,true]));
+ evaluate(&mut ctx,"Object.defineProperty = originalDefine; delete globalThis.__moliDeviceMetricsOriginalDescriptors").await;
+ expect_session_command_result(&mut ctx,88001,"SID-1","Emulation.setDeviceMetricsOverride",
+ json!({"width":800,"height":600,"deviceScaleFactor":2,"mobile":false,"screenWidth":1000,"screenHeight":700})).await;
+ assert_eq!(evaluate(&mut ctx,r#"(async () => {
+ const frame = document.createElement('iframe');
+ frame.style.width = '321px'; frame.style.height = '123px'; frame.srcdoc = '<body>child</body>';
+ await new Promise(resolve => { frame.onload = resolve; document.body.append(frame); });
+ const child = frame.contentWindow;
+ return [child.innerWidth, child.visualViewport.width, child.devicePixelRatio, child.screen.width];
+ })()"#).await,json!([321,321,2,1000]));
+}
+
+#[tokio::test(flavor = "multi_thread")]
+async fn clearing_target_metrics_restores_browser_context_viewport_defaults() {
+ let mut ctx = setup().await;
+ let (result, _) = ctx
+ .conn
+ .execute_devtools_command(DevToolsCommand::SetViewport(DevToolsSetViewportCommand {
+ context: bidi_command_context(),
+ browser_context_ids: vec!["BID-1".into()],
+ viewport: DevToolsViewportSetting::Dimensions {
+ width: 900,
+ height: 700,
+ },
+ device_pixel_ratio: DevToolsDevicePixelRatioSetting::Scale(3.0),
+ screen_width: None,
+ screen_height: None,
+ }))
+ .await
+ .into_parts();
+ assert_eq!(
+ result.expect("context viewport default"),
+ DevToolsCommandResult::Empty
+ );
+ assert_eq!(
+ evaluate(&mut ctx, "[innerWidth, innerHeight, devicePixelRatio]").await,
+ json!([900, 700, 3])
+ );
+ expect_session_command_result(
+ &mut ctx,
+ 88001,
+ "SID-1",
+ "Emulation.setDeviceMetricsOverride",
+ json!({"width":640,"height":480,"deviceScaleFactor":0,"mobile":false}),
+ )
+ .await;
+ assert_eq!(
+ evaluate(&mut ctx, "[innerWidth, innerHeight, devicePixelRatio]").await,
+ json!([640, 480, 3])
+ );
+ expect_session_command_result(
+ &mut ctx,
+ 88001,
+ "SID-1",
+ "Emulation.clearDeviceMetricsOverride",
+ json!({}),
+ )
+ .await;
+ assert_eq!(
+ evaluate(&mut ctx, "[innerWidth, innerHeight, devicePixelRatio]").await,
+ json!([900, 700, 3])
+ );
+}
diff --git a/moli-renderer-v8/src/context_bootstrap/navigator_runtime/screen.rs b/moli-renderer-v8/src/context_bootstrap/navigator_runtime/screen.rs
index 9a3554180..d142c4900 100644
--- a/moli-renderer-v8/src/context_bootstrap/navigator_runtime/screen.rs
+++ b/moli-renderer-v8/src/context_bootstrap/navigator_runtime/screen.rs
@@ -397,6 +397,21 @@ fn screen_attribute_getter_callback<'s>(
rv.set(v8::Number::new(scope, 0.0).into());
return;
}
+ if let Some(host_ptr) = context_host_ptr_from_global_bridge(scope)
+ && let Some(viewport) = unsafe { &*host_ptr }.viewport_surface()
+ {
+ let dimension = match slot {
+ SCREEN_WIDTH_SLOT => Some(viewport.screen_width),
+ SCREEN_HEIGHT_SLOT => Some(viewport.screen_height),
+ SCREEN_AVAIL_WIDTH_SLOT => Some(viewport.screen_avail_width),
+ SCREEN_AVAIL_HEIGHT_SLOT => Some(viewport.screen_avail_height),
+ _ => None,
+ };
+ if let Some(dimension) = dimension {
+ rv.set_uint32(dimension);
+ return;
+ }
+ }
rv.set(
get_private_value(scope, args.this(), slot).unwrap_or_else(|| v8::undefined(scope).into()),
);
diff --git a/moli-renderer-v8/src/context_bootstrap/runtime_state.rs b/moli-renderer-v8/src/context_bootstrap/runtime_state.rs
index c6e7bbec7..16bd6b2e7 100644
--- a/moli-renderer-v8/src/context_bootstrap/runtime_state.rs
+++ b/moli-renderer-v8/src/context_bootstrap/runtime_state.rs
@@ -588,16 +588,16 @@ fn window_inner_width_replaceable_getter<'s>(
fn window_outer_height_replaceable_getter<'s>(
scope: &mut v8::PinScope<'s, '_>,
- _args: v8::FunctionCallbackArguments<'s>,
+ args: v8::FunctionCallbackArguments<'s>,
mut rv: v8::ReturnValue<'s, v8::Value>,
) {
- rv.set(
- v8::Number::new(
- scope,
+ let value = super::window_accessors::window_host_ptr(scope, args.this())
+ .and_then(|host_ptr| unsafe { &*host_ptr }.viewport_surface())
+ .map_or(
moli_browser_profile::DEFAULT_WINDOW_SURFACE_PROFILE.inner_height,
- )
- .into(),
- );
+ |surface| f64::from(surface.outer_height),
+ );
+ rv.set(v8::Number::new(scope, value).into());
}
fn window_length_replaceable_getter<'s>(
diff --git a/moli-renderer-v8/src/context_bootstrap/window_accessors.rs b/moli-renderer-v8/src/context_bootstrap/window_accessors.rs
index b6e1549cc..95abca0dc 100644
--- a/moli-renderer-v8/src/context_bootstrap/window_accessors.rs
+++ b/moli-renderer-v8/src/context_bootstrap/window_accessors.rs
@@ -21,6 +21,7 @@ pub(super) use child_context::{
window_frame_element_getter, window_length_getter,
};
pub(super) use helpers::window_child_context_handle;
+pub(crate) use helpers::window_host_ptr;
pub(super) use interceptors::{
window_indexed_property_descriptor, window_indexed_property_enumerator,
window_indexed_property_getter, window_indexed_property_query, window_named_property_getter,
diff --git a/moli-renderer-v8/src/context_bootstrap/window_accessors/helpers.rs b/moli-renderer-v8/src/context_bootstrap/window_accessors/helpers.rs
index 79e105357..2936eca3a 100644
--- a/moli-renderer-v8/src/context_bootstrap/window_accessors/helpers.rs
+++ b/moli-renderer-v8/src/context_bootstrap/window_accessors/helpers.rs
@@ -94,7 +94,7 @@ pub(in crate::context_bootstrap) fn window_child_context_handle<'s>(
}
}
-pub(super) fn window_host_ptr(
+pub(crate) fn window_host_ptr(
scope: &mut v8::PinScope<'_, '_>,
receiver: v8::Local<'_, v8::Object>,
) -> Option<*mut JsContextHost> {
diff --git a/moli-renderer-v8/src/context_bootstrap/window_accessors/surface.rs b/moli-renderer-v8/src/context_bootstrap/window_accessors/surface.rs
index 9fd97a50d..9c2f4ac53 100644
--- a/moli-renderer-v8/src/context_bootstrap/window_accessors/surface.rs
+++ b/moli-renderer-v8/src/context_bootstrap/window_accessors/surface.rs
@@ -138,9 +138,15 @@ pub(in crate::context_bootstrap) fn window_outer_width_getter<'s>(
args: v8::FunctionCallbackArguments<'s>,
mut rv: v8::ReturnValue<'_, v8::Value>,
) {
- if window_receiver(scope, &args).is_some() {
- rv.set(v8::Number::new(scope, DEFAULT_WINDOW_SURFACE_PROFILE.inner_width).into());
- }
+ let Some(receiver) = window_receiver(scope, &args) else {
+ return;
+ };
+ let value = window_host_ptr(scope, receiver)
+ .and_then(|host_ptr| unsafe { &*host_ptr }.viewport_surface())
+ .map_or(DEFAULT_WINDOW_SURFACE_PROFILE.inner_width, |v| {
+ f64::from(v.outer_width)
+ });
+ rv.set(v8::Number::new(scope, value).into());
}
pub(in crate::context_bootstrap) fn window_outer_height_getter<'s>(
@@ -148,9 +154,15 @@ pub(in crate::context_bootstrap) fn window_outer_height_getter<'s>(
args: v8::FunctionCallbackArguments<'s>,
mut rv: v8::ReturnValue<'_, v8::Value>,
) {
- if window_receiver(scope, &args).is_some() {
- rv.set(v8::Number::new(scope, DEFAULT_WINDOW_SURFACE_PROFILE.inner_height).into());
- }
+ let Some(receiver) = window_receiver(scope, &args) else {
+ return;
+ };
+ let value = window_host_ptr(scope, receiver)
+ .and_then(|host_ptr| unsafe { &*host_ptr }.viewport_surface())
+ .map_or(DEFAULT_WINDOW_SURFACE_PROFILE.inner_height, |v| {
+ f64::from(v.outer_height)
+ });
+ rv.set(v8::Number::new(scope, value).into());
}
pub(in crate::context_bootstrap) fn window_device_pixel_ratio_getter<'s>(
@@ -158,9 +170,15 @@ pub(in crate::context_bootstrap) fn window_device_pixel_ratio_getter<'s>(
args: v8::FunctionCallbackArguments<'s>,
mut rv: v8::ReturnValue<'_, v8::Value>,
) {
- if window_receiver(scope, &args).is_some() {
- rv.set(v8::Number::new(scope, DEFAULT_WINDOW_SURFACE_PROFILE.device_pixel_ratio).into());
- }
+ let Some(receiver) = window_receiver(scope, &args) else {
+ return;
+ };
+ let value = window_host_ptr(scope, receiver)
+ .and_then(|host_ptr| unsafe { &*host_ptr }.viewport_surface())
+ .map_or(DEFAULT_WINDOW_SURFACE_PROFILE.device_pixel_ratio, |v| {
+ v.device_pixel_ratio
+ });
+ rv.set(v8::Number::new(scope, value).into());
}
pub(in crate::context_bootstrap) fn window_scroll_x_getter<'s>(