Best headless browser for AI agents. Lite, Fast, High-Compatibility. Built in Rust
Rust ai-agentsai-toolsbrowserbrowser-automationcloud-browserheadlessheadless-browserkitesurfplaywrightpuppeteerrustservoweb-crawlerweb-crawlingweb-scraperweb-scraping
refactor(events): separate listener storage from dispatch identity
ldm0fca4e005561c
diff --git a/moli-renderer-v8/src/context_bootstrap.rs b/moli-renderer-v8/src/context_bootstrap.rsindex 2020d5a47..b468ee5fc 100644--- a/moli-renderer-v8/src/context_bootstrap.rs+++ b/moli-renderer-v8/src/context_bootstrap.rs@@ -97,6 +97,8 @@ mod navigator_runtime;mod platform_object_worlds;mod session_history;mod shared_event_targets;+#[cfg(test)]+pub(crate) use shared_event_targets::bind_dispatch_target;mod world_wrappers;#[cfg(test)]pub(crate) use navigator_runtime::{diff --git a/moli-renderer-v8/src/context_bootstrap/file_api/file_reader/state.rs b/moli-renderer-v8/src/context_bootstrap/file_api/file_reader/state.rsindex 19181224a..a72c288ac 100644--- a/moli-renderer-v8/src/context_bootstrap/file_api/file_reader/state.rs+++ b/moli-renderer-v8/src/context_bootstrap/file_api/file_reader/state.rs@@ -162,9 +162,7 @@ pub(in crate::context_bootstrap::file_api::file_reader) fn initialize_file_readeFileReaderObjectDeclaration::default().initialize(scope, reader).expect("FileReader declaration should initialize");- crate::context_bootstrap::media_queries::bind_simple_event_target_dispatch_identity(- scope, reader, reader,- );+ crate::context_bootstrap::shared_event_targets::bind_dispatch_target(scope, reader, reader);}pub(in crate::context_bootstrap::file_api::file_reader) fn file_reader_ready_state<'s>(diff --git a/moli-renderer-v8/src/context_bootstrap/media_queries.rs b/moli-renderer-v8/src/context_bootstrap/media_queries.rsindex 46822e9ae..73ac3159f 100644--- a/moli-renderer-v8/src/context_bootstrap/media_queries.rs+++ b/moli-renderer-v8/src/context_bootstrap/media_queries.rs@@ -11,10 +11,9 @@ pub(super) use self::evaluation::{pub(in crate::context_bootstrap) use self::events::dispatch_media_query_list_event;pub(crate) use self::events::{SimpleObjectEventListenerInspectorSnapshot, SimpleObjectEventListenerSnapshot,- bind_simple_event_target_dispatch_identity, dispatch_simple_event_target_event,- dispatch_simple_event_target_event_collecting_errors, initialize_simple_event_target,- install_simple_event_target_handlers, install_simple_event_target_methods,- invoke_simple_event_listener, is_simple_event_target,+ dispatch_simple_event_target_event, dispatch_simple_event_target_event_collecting_errors,+ initialize_simple_event_target, install_simple_event_target_handlers,+ install_simple_event_target_methods, invoke_simple_event_listener, is_simple_event_target,simple_event_target_add_event_listener_callback, simple_event_target_dispatch_event_callback,simple_event_target_handler_getter_callback, simple_event_target_handler_setter_callback,simple_event_target_inspector_listener_snapshots,diff --git a/moli-renderer-v8/src/context_bootstrap/media_queries/events.rs b/moli-renderer-v8/src/context_bootstrap/media_queries/events.rsindex b5e4bcda1..d128e1130 100644--- a/moli-renderer-v8/src/context_bootstrap/media_queries/events.rs+++ b/moli-renderer-v8/src/context_bootstrap/media_queries/events.rs@@ -13,10 +13,9 @@ pub(in crate::context_bootstrap) use media_query_list::{};pub(crate) use simple_event_target::{SimpleObjectEventListenerInspectorSnapshot, SimpleObjectEventListenerSnapshot,- bind_simple_event_target_dispatch_identity, dispatch_simple_event_target_event,- dispatch_simple_event_target_event_collecting_errors, initialize_simple_event_target,- install_simple_event_target_handlers, install_simple_event_target_methods,- invoke_simple_event_listener, is_simple_event_target,+ dispatch_simple_event_target_event, dispatch_simple_event_target_event_collecting_errors,+ initialize_simple_event_target, install_simple_event_target_handlers,+ install_simple_event_target_methods, invoke_simple_event_listener, is_simple_event_target,simple_event_target_add_event_listener_callback, simple_event_target_dispatch_event_callback,simple_event_target_handler_getter_callback, simple_event_target_handler_setter_callback,simple_event_target_inspector_listener_snapshots,diff --git a/moli-renderer-v8/src/context_bootstrap/media_queries/events/simple_event_target.rs b/moli-renderer-v8/src/context_bootstrap/media_queries/events/simple_event_target.rsindex a4743c728..01bd6647e 100644--- a/moli-renderer-v8/src/context_bootstrap/media_queries/events/simple_event_target.rs+++ b/moli-renderer-v8/src/context_bootstrap/media_queries/events/simple_event_target.rs@@ -33,8 +33,5 @@ pub(crate) use listeners::{simple_object_event_target_remove_listener,simple_object_event_target_remove_listener_for_target,};-pub(crate) use state::{- bind_simple_event_target_dispatch_identity, initialize_simple_event_target,- is_simple_event_target,-};-use state::{simple_event_target_receiver, simple_object_event_listener_registry};+pub(crate) use state::{initialize_simple_event_target, is_simple_event_target};+use state::{resolve_simple_event_target, simple_object_event_listener_registry};diff --git a/moli-renderer-v8/src/context_bootstrap/media_queries/events/simple_event_target/callbacks.rs b/moli-renderer-v8/src/context_bootstrap/media_queries/events/simple_event_target/callbacks.rsindex f34737a03..d3501f8d9 100644--- a/moli-renderer-v8/src/context_bootstrap/media_queries/events/simple_event_target/callbacks.rs+++ b/moli-renderer-v8/src/context_bootstrap/media_queries/events/simple_event_target/callbacks.rs@@ -5,10 +5,10 @@ pub(crate) fn simple_event_target_add_event_listener_callback<'s>(args: v8::FunctionCallbackArguments<'s>,_rv: v8::ReturnValue<'s, v8::Value>,) {- let Some(target) = simple_event_target_receiver(scope, args.this()) else {+ let Some(target) = resolve_simple_event_target(scope, args.this()) else {return;};- simple_object_event_target_add_listener_for_target(scope, &args, target);+ simple_object_event_target_add_listener_for_target(scope, &args, target.listener_owner);}pub(crate) fn simple_event_target_remove_event_listener_callback<'s>(@@ -16,10 +16,10 @@ pub(crate) fn simple_event_target_remove_event_listener_callback<'s>(args: v8::FunctionCallbackArguments<'s>,_rv: v8::ReturnValue<'s, v8::Value>,) {- let Some(target) = simple_event_target_receiver(scope, args.this()) else {+ let Some(target) = resolve_simple_event_target(scope, args.this()) else {return;};- simple_object_event_target_remove_listener_for_target(scope, &args, target);+ simple_object_event_target_remove_listener_for_target(scope, &args, target.listener_owner);}pub(crate) fn simple_event_target_dispatch_event_callback<'s>(@@ -27,7 +27,7 @@ pub(crate) fn simple_event_target_dispatch_event_callback<'s>(args: v8::FunctionCallbackArguments<'s>,mut rv: v8::ReturnValue<'s, v8::Value>,) {- let Some(target) = simple_event_target_receiver(scope, args.this()) else {+ let Some(target) = resolve_simple_event_target(scope, args.this()) else {rv.set(v8::Boolean::new(scope, true).into());return;};diff --git a/moli-renderer-v8/src/context_bootstrap/media_queries/events/simple_event_target/dispatch.rs b/moli-renderer-v8/src/context_bootstrap/media_queries/events/simple_event_target/dispatch.rsindex 7f602de6e..923953bfa 100644--- a/moli-renderer-v8/src/context_bootstrap/media_queries/events/simple_event_target/dispatch.rs+++ b/moli-renderer-v8/src/context_bootstrap/media_queries/events/simple_event_target/dispatch.rs@@ -1,4 +1,5 @@use super::*;+use crate::context_bootstrap::shared_event_targets::{ResolvedEventTarget, resolve_event_target};use crate::{callback_invocation::{CallbackInvocation, CallbackInvocationOutcome, CallbackInvoker},context_bootstrap::events::{@@ -22,7 +23,7 @@ pub(in crate::context_bootstrap::media_queries::events::simple_event_target) fn>(scope: &mut v8::PinScope<'s, '_>,args: &v8::FunctionCallbackArguments<'s>,- target: v8::Local<'s, v8::Object>,+ target: ResolvedEventTarget<'s>,rv: &mut v8::ReturnValue<'s, v8::Value>,) {let Some((event, event_type)) =@@ -35,8 +36,8 @@ pub(in crate::context_bootstrap::media_queries::events::simple_event_target) fnreturn;};- let dispatch_result = dispatch_simple_event_target_event(scope, target, &event_type, event);- rv.set(v8::Boolean::new(scope, dispatch_result).into());+ let dispatch_result = dispatch_resolved_event(scope, target, &event_type, event, None);+ rv.set_bool(dispatch_result.uncanceled);}pub(crate) fn dispatch_simple_event_target_event<'s>(@@ -59,8 +60,26 @@ pub(crate) fn dispatch_simple_event_target_event_collecting_errors<'s>(target: v8::Local<'s, v8::Object>,event_type: &str,event: v8::Local<'s, v8::Object>,+ callback_errors: Option<&mut Vec<crate::exception_reporting::V8ExceptionReport>>,+) -> SimpleEventDispatchResult {+ let Some(target) = resolve_event_target(scope, target) else {+ return SimpleEventDispatchResult {+ uncanceled: true,+ dispatched: false,+ };+ };+ dispatch_resolved_event(scope, target, event_type, event, callback_errors)+}++fn dispatch_resolved_event<'s>(+ scope: &mut v8::PinScope<'s, '_>,+ target: ResolvedEventTarget<'s>,+ event_type: &str,+ event: v8::Local<'s, v8::Object>,mut callback_errors: Option<&mut Vec<crate::exception_reporting::V8ExceptionReport>>,) -> SimpleEventDispatchResult {+ let listener_owner = target.listener_owner;+ let target = target.dispatch_target;let mut dispatched = false;let can_invoke =crate::context_bootstrap::event_target_dispatch::begin_dispatch(scope, target, event);@@ -77,12 +96,14 @@ pub(crate) fn dispatch_simple_event_target_event_collecting_errors<'s>('phases: for capture_phase in [true, false] {// DOM clones the listener list for each invocation phase. A listener// added during capture can participate in the subsequent bubble phase.- let listeners = simple_object_event_listeners_snapshot(scope, target, event_type);+ let listeners =+ simple_object_event_listeners_snapshot(scope, listener_owner, event_type);for listener in listeners.iter().filter(|listener| listener.capture == capture_phase){- let Some(listener) = listener.prepare_for_invocation(scope, target, event_type)+ let Some(listener) =+ listener.prepare_for_invocation(scope, listener_owner, event_type)else {continue;};diff --git a/moli-renderer-v8/src/context_bootstrap/media_queries/events/simple_event_target/handlers.rs b/moli-renderer-v8/src/context_bootstrap/media_queries/events/simple_event_target/handlers.rsindex a9eb0f07e..9d3ed3c77 100644--- a/moli-renderer-v8/src/context_bootstrap/media_queries/events/simple_event_target/handlers.rs+++ b/moli-renderer-v8/src/context_bootstrap/media_queries/events/simple_event_target/handlers.rs@@ -36,13 +36,13 @@ fn handler_callback_data<'s>(scope: &mut v8::PinScope<'s, '_>,args: &v8::FunctionCallbackArguments<'s>,) -> Option<(v8::Local<'s, v8::Object>, String)> {- let Some(target) = simple_event_target_receiver(scope, args.this()) else {+ let Some(target) = resolve_simple_event_target(scope, args.this()) else {throw_type_error(scope, "Illegal invocation");return None;};v8::Local::<v8::String>::try_from(args.data()).ok()- .map(|property| (target, property.to_rust_string_lossy(scope)))+ .map(|property| (target.handler_owner, property.to_rust_string_lossy(scope)))}/// Install explicit EventHandler accessors on object-backed Window surfaces.diff --git a/moli-renderer-v8/src/context_bootstrap/media_queries/events/simple_event_target/state.rs b/moli-renderer-v8/src/context_bootstrap/media_queries/events/simple_event_target/state.rsindex 0ddaaf281..592dd5751 100644--- a/moli-renderer-v8/src/context_bootstrap/media_queries/events/simple_event_target/state.rs+++ b/moli-renderer-v8/src/context_bootstrap/media_queries/events/simple_event_target/state.rs@@ -1,18 +1,9 @@use super::*;-use crate::context_bootstrap::shared_event_targets::shared_target_owner;+use crate::context_bootstrap::shared_event_targets::{+ ResolvedEventTarget, resolve_event_target, shared_target_owner,+};use crate::util::{get_private_object, new_null_prototype_object, set_private_value};-const DISPATCH_IDENTITY_SLOT: &str = "__moliSimpleEventTargetDispatchIdentity";--pub(crate) fn bind_simple_event_target_dispatch_identity<'s>(- scope: &mut v8::PinScope<'s, '_>,- target: v8::Local<'s, v8::Object>,- identity: v8::Local<'s, v8::Object>,-) {- let target = moli_webapi_declare::web_api_object_target(scope, target).unwrap_or(target);- set_private_value(scope, target, DISPATCH_IDENTITY_SLOT, identity.into());-}-pub(crate) fn initialize_simple_event_target<'s>(scope: &mut v8::PinScope<'s, '_>,target: v8::Local<'s, v8::Object>,@@ -33,24 +24,22 @@ pub(crate) fn is_simple_event_target<'s>(scope: &mut v8::PinScope<'s, '_>,target: v8::Local<'s, v8::Object>,) -> bool {- simple_event_target_receiver(scope, target).is_some()+ resolve_simple_event_target(scope, target).is_some()}-pub(super) fn simple_event_target_receiver<'s>(+pub(super) fn resolve_simple_event_target<'s>(scope: &mut v8::PinScope<'s, '_>,target: v8::Local<'s, v8::Object>,-) -> Option<v8::Local<'s, v8::Object>> {+) -> Option<ResolvedEventTarget<'s>> {// Resolve registered native Proxies only for the simple-target branch.// DOM and Window targets keep their existing receiver resolution.- let native_target = if target.is_proxy() {- moli_webapi_declare::web_api_object_target(scope, target)?- } else {- target- };- simple_object_event_listener_registry(scope, native_target)?;- // Native producers can retain a fixed public identity independently of- // listener storage. Other native aliases dispatch on their own wrapper.- Some(get_private_object(scope, native_target, DISPATCH_IDENTITY_SLOT).unwrap_or(target))+ let target = resolve_event_target(scope, target)?;+ get_private_object(+ scope,+ target.listener_owner,+ SIMPLE_EVENT_TARGET_LISTENERS_SLOT,+ )?;+ Some(target)}pub(super) fn simple_object_event_listener_registry<'s>(diff --git a/moli-renderer-v8/src/context_bootstrap/shared_event_targets.rs b/moli-renderer-v8/src/context_bootstrap/shared_event_targets.rsindex 4b93b1169..6ae54a707 100644--- a/moli-renderer-v8/src/context_bootstrap/shared_event_targets.rs+++ b/moli-renderer-v8/src/context_bootstrap/shared_event_targets.rs@@ -1,6 +1,6 @@-//! A single listener list behind world-local Navigation and entry wrappers.-//! The list retains callback realms using the ordinary EventTarget machinery;-//! dispatch still runs once, with one cancellation/propagation state.+//! Resolve object-backed EventTarget identities independently of realm projection.+//! Shared wrappers retain one listener list and one dispatch state, while each+//! wrapper keeps its own EventHandler properties and callback realms.use super::{history_runtime::native, media_queries};use crate::context_bootstrap::navigation_entry::wrappers as entry_wrappers;@@ -8,6 +8,7 @@ use crate::util::{get_private_object, get_private_value, set_private_value, v8stconst OWNER: &str = "__moliSharedEventTargetOwner";const WRAPPERS: &str = "__moliSharedEventTargetWrappers";+const DISPATCH_TARGET: &str = "__moliEventTargetDispatchTarget";const HANDLERS: [(&str, &str); 5] = [("onnavigate", "navigate"),("onnavigatesuccess", "navigatesuccess"),@@ -16,6 +17,48 @@ const HANDLERS: [(&str, &str); 5] = [("ondispose", "dispose"),];+pub(super) struct ResolvedEventTarget<'s> {+ pub(super) listener_owner: v8::Local<'s, v8::Object>,+ // EventHandler values belong to the native receiver's wrapper, even when+ // its listener registry is shared with wrappers from other worlds.+ pub(super) handler_owner: v8::Local<'s, v8::Object>,+ // A logical target: realm projection and DOM retargeting remain separate.+ pub(super) dispatch_target: v8::Local<'s, v8::Object>,+}++fn native_target<'s>(+ scope: &mut v8::PinScope<'s, '_>,+ target: v8::Local<'s, v8::Object>,+) -> Option<v8::Local<'s, v8::Object>> {+ if target.is_proxy() {+ moli_webapi_declare::web_api_object_target(scope, target)+ } else {+ Some(target)+ }+}++pub(super) fn resolve_event_target<'s>(+ scope: &mut v8::PinScope<'s, '_>,+ receiver: v8::Local<'s, v8::Object>,+) -> Option<ResolvedEventTarget<'s>> {+ let handler_owner = native_target(scope, receiver)?;+ Some(ResolvedEventTarget {+ listener_owner: get_private_object(scope, handler_owner, OWNER).unwrap_or(handler_owner),+ handler_owner,+ dispatch_target: get_private_object(scope, handler_owner, DISPATCH_TARGET)+ .unwrap_or(receiver),+ })+}++pub(crate) fn bind_dispatch_target<'s>(+ scope: &mut v8::PinScope<'s, '_>,+ target: v8::Local<'s, v8::Object>,+ dispatch_target: v8::Local<'s, v8::Object>,+) {+ let target = native_target(scope, target).expect("native event target binding");+ set_private_value(scope, target, DISPATCH_TARGET, dispatch_target.into());+}+pub(super) fn is_shared_target<'s>(scope: &mut v8::PinScope<'s, '_>,target: v8::Local<'s, v8::Object>,@@ -29,7 +72,7 @@ pub(super) fn shared_target_owner<'s>() -> v8::Local<'s, v8::Object> {// Native aliases share the backing registry while dispatch keeps the// original wrapper for callback this and Event.target.- let target = moli_webapi_declare::web_api_object_target(scope, target).unwrap_or(target);+ let target = native_target(scope, target).unwrap_or(target);get_private_object(scope, target, OWNER).unwrap_or(target)}diff --git a/moli-renderer-v8/src/script_vm/tests/browser_api/event_target_prototype.rs b/moli-renderer-v8/src/script_vm/tests/browser_api/event_target_prototype.rsindex 6720e8925..88f46df28 100644--- a/moli-renderer-v8/src/script_vm/tests/browser_api/event_target_prototype.rs+++ b/moli-renderer-v8/src/script_vm/tests/browser_api/event_target_prototype.rs@@ -75,3 +75,120 @@ fn event_target_prototype_methods_accept_registered_native_proxies() {"true",);}++#[test]+fn event_target_prototype_methods_separate_listener_owner_from_dispatch_target() {+ let mut vm = new_storage_html_test_vm("https://event-target-dispatch-identity.test/");+ vm.eval(+ r#"+ globalThis.listenerOwner = new EventTarget();+ globalThis.dispatchTarget = new EventTarget();+ globalThis.identityTraps = 0;+ globalThis.nativeIdentityProxy = new Proxy(listenerOwner, {+ get() {identityTraps++; throw new Error('get trap');},+ getPrototypeOf() {identityTraps++; throw new Error('prototype trap');}+ });+ true;+ "#,+ )+ .unwrap();+ vm.with_default_context_scope_and_checkpoint_for_test(|scope, _| {+ let global = scope.get_current_context().global(scope);+ let owner = global+ .get(scope, crate::util::v8str(scope, "listenerOwner").into())+ .unwrap();+ let owner = v8::Local::<v8::Object>::try_from(owner).unwrap();+ let identity = global+ .get(scope, crate::util::v8str(scope, "dispatchTarget").into())+ .unwrap();+ let identity = v8::Local::<v8::Object>::try_from(identity).unwrap();+ let proxy = global+ .get(+ scope,+ crate::util::v8str(scope, "nativeIdentityProxy").into(),+ )+ .unwrap();+ let proxy = v8::Local::<v8::Proxy>::try_from(proxy).unwrap();+ moli_webapi_declare::register_web_api_proxy(scope, proxy).unwrap();+ crate::context_bootstrap::install_simple_event_target_handlers(scope, owner, &["onprobe"]);+ crate::context_bootstrap::bind_dispatch_target(scope, owner, identity);+ Ok(())+ })+ .unwrap();+ assert_eq!(vm.eval(r#"(() => {+ const assert = (ok, label) => {if (!ok) throw Error(label);};+ const {addEventListener: add, removeEventListener: remove, dispatchEvent: dispatch} = EventTarget.prototype;+ const handler = Object.getOwnPropertyDescriptor(listenerOwner, 'onprobe');+ const calls = [];+ let otherCalls = 0;+ dispatchTarget.addEventListener('probe', () => otherCalls++);+ const observe = (label, receiver, event) => {+ calls.push([label, receiver === dispatchTarget, event.target === dispatchTarget,+ event.currentTarget === dispatchTarget, event.composedPath()[0] === dispatchTarget]);+ event.preventDefault();+ };+ function listener(event) {observe('listener', this, event);}+ const onprobe = function(event) {observe('handler', this, event);};+ const object = {handleEvent(event) {+ observe(this === object ? 'object' : 'wrong-this', event.currentTarget, event);+ }};+ add.call(nativeIdentityProxy, 'probe', listener);+ add.call(listenerOwner, 'probe', listener);+ handler.set.call(nativeIdentityProxy, onprobe);+ add.call(listenerOwner, 'probe', object, {once: true});+ assert(handler.get.call(listenerOwner) === onprobe &&+ handler.get.call(nativeIdentityProxy) === onprobe &&+ handler.get.call(dispatchTarget) === null, 'handler state stays on native receiver');+ const event = new Event('probe', {cancelable: true});+ assert(dispatch.call(nativeIdentityProxy, event) === false, 'cancellation');+ assert(JSON.stringify(calls) === JSON.stringify(['listener','handler','object']+ .map(label => [label,true,true,true,true])), 'listener owner and public identity');+ assert(otherCalls === 0 && event.target === dispatchTarget && event.currentTarget === null &&+ event.composedPath().length === 0, 'dispatch does not use public target registry');+ remove.call(nativeIdentityProxy, 'probe', listener);+ handler.set.call(listenerOwner, null);+ calls.length = 0;+ assert(dispatch.call(listenerOwner, new Event('probe')) && calls.length === 0,+ 'once, remove and handler cleanup use listener owner');+ dispatchTarget.dispatchEvent(new Event('probe'));+ assert(otherCalls === 1, 'other registry is untouched');+ const controller = new AbortController();+ add.call(nativeIdentityProxy, 'probe', listener, {signal: controller.signal});+ controller.abort();+ dispatch.call(listenerOwner, new Event('probe'));+ assert(calls.length === 0, 'abort cleanup uses listener owner');+ globalThis.nativeIdentityCalls = 0;+ add.call(nativeIdentityProxy, 'native-probe', function(event) {+ if (this === dispatchTarget && event.target === dispatchTarget &&+ event.currentTarget === dispatchTarget && event.isTrusted) nativeIdentityCalls++;+ }, {once: true});+ return identityTraps === 0;+ })()"#).unwrap(), "true");+ vm.with_default_context_scope_and_checkpoint_for_test(|scope, _| {+ let global = scope.get_current_context().global(scope);+ let proxy = global+ .get(+ scope,+ crate::util::v8str(scope, "nativeIdentityProxy").into(),+ )+ .unwrap();+ let proxy = v8::Local::<v8::Object>::try_from(proxy).unwrap();+ let event =+ crate::context_bootstrap::construct_original_event(scope, "native-probe").unwrap();+ assert!(+ crate::context_bootstrap::dispatch_simple_event_target_event(+ scope,+ proxy,+ "native-probe",+ event,+ )+ );+ Ok(())+ })+ .unwrap();+ assert_eq!(+ vm.eval("JSON.stringify([nativeIdentityCalls, identityTraps])")+ .unwrap(),+ "[1,0]"+ );+}