Skip to content

armgit / moli

Public Imported from GitHub
0

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

refactor(events): require resolved listener registries in core operations

ldm06fa8b7dede48
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.rs
index f65b8fa6b..2c6cb2d02 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
@@ -30,7 +30,7 @@ use listeners::{
simple_object_event_listeners_snapshot_in_registry,
simple_object_event_set_handler_in_registry,
simple_object_event_target_add_listener_for_target,
- simple_object_event_target_remove_listener_for_target,
+ simple_object_event_target_remove_listener_in_registry,
};
use state::{
ResolvedSimpleEventTarget, SimpleEventListenerRegistry, resolve_simple_event_target,
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.rs
index 0449dff37..7aa5be744 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
@@ -12,7 +12,7 @@ pub(crate) fn simple_event_target_add_event_listener_callback<'s>(
scope,
&args,
target.identity.listener_owner,
- Some(target.registry),
+ target.registry,
);
}
@@ -24,12 +24,7 @@ pub(crate) fn simple_event_target_remove_event_listener_callback<'s>(
let Some(target) = resolve_simple_event_target(scope, args.this()) else {
return;
};
- simple_object_event_target_remove_listener_for_target(
- scope,
- &args,
- target.identity.listener_owner,
- Some(target.registry),
- );
+ simple_object_event_target_remove_listener_in_registry(scope, &args, target.registry);
}
pub(crate) fn simple_event_target_dispatch_event_callback<'s>(
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.rs
index fcc17f750..1706d8aae 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
@@ -39,7 +39,7 @@ pub(in crate::context_bootstrap::media_queries::events::simple_event_target) fn
let dispatch_result = dispatch_resolved_event(
scope,
target.identity,
- Some(target.registry),
+ target.registry,
&event_type,
event,
None,
@@ -100,7 +100,20 @@ fn dispatch_object_event<'s>(
dispatched: false,
};
};
- let registry = SimpleEventListenerRegistry::from_owner(scope, target.listener_owner);
+ let Some(registry) = SimpleEventListenerRegistry::from_owner(scope, target.listener_owner)
+ else {
+ // A native producer may dispatch before listener state is initialized.
+ // It still owes the event its target, checkpoint and dispatch cleanup.
+ crate::context_bootstrap::event_target_dispatch::begin_dispatch(
+ scope,
+ target.dispatch_target,
+ event,
+ );
+ return SimpleEventDispatchResult {
+ uncanceled: finish_event_dispatch(scope, event, checkpoint),
+ dispatched: false,
+ };
+ };
dispatch_resolved_event(
scope,
target,
@@ -115,7 +128,7 @@ fn dispatch_object_event<'s>(
fn dispatch_resolved_event<'s>(
scope: &mut v8::PinScope<'s, '_>,
target: ResolvedEventTarget<'s>,
- registry: Option<SimpleEventListenerRegistry<'s>>,
+ registry: SimpleEventListenerRegistry<'s>,
event_type: &str,
event: v8::Local<'s, v8::Object>,
mut callback_errors: Option<&mut Vec<crate::exception_reporting::V8ExceptionReport>>,
@@ -134,7 +147,7 @@ fn dispatch_resolved_event<'s>(
} else {
None
};
- if let (true, Some(registry)) = (can_invoke, registry) {
+ if can_invoke {
// Object-backed EventTargets clone their list once at AT_TARGET.
// Capture remains part of listener identity; invocation follows
// registration order, including EventHandler entries.
@@ -195,16 +208,22 @@ fn dispatch_resolved_event<'s>(
}
}
+ SimpleEventDispatchResult {
+ uncanceled: finish_event_dispatch(scope, event, checkpoint),
+ dispatched,
+ }
+}
+
+fn finish_event_dispatch<'s>(
+ scope: &mut v8::PinScope<'s, '_>,
+ event: v8::Local<'s, v8::Object>,
+ checkpoint: Option<fn(&mut v8::PinScope<'s, '_>)>,
+) -> bool {
if let Some(checkpoint) = checkpoint {
checkpoint(scope);
}
crate::context_bootstrap::event_target_dispatch::finish_dispatch(scope, event);
- let default_prevented =
- crate::context_bootstrap::event_bool_attribute(scope, event, "defaultPrevented");
- SimpleEventDispatchResult {
- uncanceled: !default_prevented,
- dispatched,
- }
+ !crate::context_bootstrap::event_bool_attribute(scope, event, "defaultPrevented")
}
struct SimpleEventCallbackResult {
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.rs
index 685aba1a1..18a388e50 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
@@ -32,7 +32,7 @@ pub(crate) fn simple_event_target_handler_setter_callback<'s>(
property.strip_prefix("on").expect("event handler property"),
&property,
args.get(0),
- Some(target.registry),
+ target.registry,
);
}
diff --git a/moli-renderer-v8/src/context_bootstrap/media_queries/events/simple_event_target/listeners.rs b/moli-renderer-v8/src/context_bootstrap/media_queries/events/simple_event_target/listeners.rs
index 962fc6c7a..a2d76bcbe 100644
--- a/moli-renderer-v8/src/context_bootstrap/media_queries/events/simple_event_target/listeners.rs
+++ b/moli-renderer-v8/src/context_bootstrap/media_queries/events/simple_event_target/listeners.rs
@@ -180,7 +180,7 @@ pub(super) fn simple_object_event_target_add_listener_for_target<'s>(
scope: &mut v8::PinScope<'s, '_>,
args: &v8::FunctionCallbackArguments<'s>,
target: v8::Local<'s, v8::Object>,
- registry: Option<SimpleEventListenerRegistry<'s>>,
+ registry: SimpleEventListenerRegistry<'s>,
) {
let Some(call) = parse_listener_args::<AddEventListenerArgs>(scope, args, "addEventListener")
else {
@@ -216,9 +216,12 @@ pub(crate) fn simple_object_event_target_register_webidl_listener<'s>(
listener: webidl::WebIdlCallbackInterface,
options: webidl::EventListenerOptions,
) {
+ let Some(registry) = simple_object_event_listener_registry(scope, target) else {
+ return;
+ };
let listener = simple_object_event_listener_parts(scope, listener);
simple_object_event_target_register_resolved_listener(
- scope, target, event_type, listener, options, None, None,
+ scope, target, event_type, listener, options, None, registry,
);
}
@@ -229,15 +232,11 @@ fn simple_object_event_target_register_resolved_listener<'s>(
listener: SimpleObjectResolvedEventListener<'s>,
options: webidl::EventListenerOptions,
signal: Option<ResolvedAbortSignal<'s>>,
- registry: Option<SimpleEventListenerRegistry<'s>>,
+ registry: SimpleEventListenerRegistry<'s>,
) {
if signal.is_some_and(|signal| signal.is_aborted(scope)) {
return;
}
- let Some(registry) = registry.or_else(|| simple_object_event_listener_registry(scope, target))
- else {
- return;
- };
let Some(listeners) = simple_object_event_listener_array(scope, registry, &event_type, true)
else {
return;
@@ -292,11 +291,10 @@ fn simple_object_event_target_register_resolved_listener<'s>(
}
}
-pub(super) fn simple_object_event_target_remove_listener_for_target<'s>(
+pub(super) fn simple_object_event_target_remove_listener_in_registry<'s>(
scope: &mut v8::PinScope<'s, '_>,
args: &v8::FunctionCallbackArguments<'s>,
- target: v8::Local<'s, v8::Object>,
- registry: Option<SimpleEventListenerRegistry<'s>>,
+ registry: SimpleEventListenerRegistry<'s>,
) {
let Some(call) =
parse_listener_args::<RemoveEventListenerArgs>(scope, args, "removeEventListener")
@@ -307,10 +305,6 @@ pub(super) fn simple_object_event_target_remove_listener_for_target<'s>(
return;
};
let listener = listener.value(scope);
- let Some(registry) = registry.or_else(|| simple_object_event_listener_registry(scope, target))
- else {
- return;
- };
simple_object_event_remove_listener_from_registry(
scope,
registry,
@@ -548,7 +542,10 @@ pub(crate) fn simple_object_event_set_handler<'s>(
handler_slot_name: &str,
value: v8::Local<'s, v8::Value>,
) {
- let registry = simple_object_event_listener_registry(scope, target);
+ let Some(registry) = simple_object_event_listener_registry(scope, target) else {
+ let _ = store_event_handler_value(scope, target, handler_slot_name, value);
+ return;
+ };
simple_object_event_set_handler_in_registry(
scope,
target,
@@ -559,27 +556,34 @@ pub(crate) fn simple_object_event_set_handler<'s>(
);
}
-pub(super) fn simple_object_event_set_handler_in_registry<'s>(
+fn store_event_handler_value<'s>(
scope: &mut v8::PinScope<'s, '_>,
target: v8::Local<'s, v8::Object>,
- event_type: &str,
handler_slot_name: &str,
value: v8::Local<'s, v8::Value>,
- registry: Option<SimpleEventListenerRegistry<'s>>,
-) {
+) -> Option<v8::Local<'s, v8::Object>> {
// EventHandler uses [LegacyTreatNonObjectAsNull]. Non-callable objects still
// activate the handler, but must never be treated as handleEvent listeners.
let callback = v8::Local::<v8::Object>::try_from(value).ok();
- let active = callback.is_some();
set_private_value(
scope,
target,
handler_slot_name,
callback.map_or_else(|| v8::null(scope).into(), |callback| callback.into()),
);
- let Some(registry) = registry else {
- return;
- };
+ callback
+}
+
+pub(super) fn simple_object_event_set_handler_in_registry<'s>(
+ scope: &mut v8::PinScope<'s, '_>,
+ target: v8::Local<'s, v8::Object>,
+ event_type: &str,
+ handler_slot_name: &str,
+ value: v8::Local<'s, v8::Value>,
+ registry: SimpleEventListenerRegistry<'s>,
+) {
+ let callback = store_event_handler_value(scope, target, handler_slot_name, value);
+ let active = callback.is_some();
let Some(listeners) = simple_object_event_listener_array(scope, registry, event_type, active)
else {
return;
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.rs
index 5914ca0cb..d60c34ee3 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
@@ -627,3 +627,49 @@ fn simple_event_target_registry_reuse_preserves_reentrant_listener_mutations() {
return trace.join(',') === 'new';
})()"#).unwrap(), "true");
}
+
+#[test]
+fn empty_native_event_targets_preserve_dispatch_lifecycle_with_or_without_registry() {
+ fn checkpoint(scope: &mut v8::PinScope<'_, '_>) {
+ let source = v8::String::new(scope, "emptyNativeCheckpoint = emptyNativeEvent.target === emptyNativeTarget && emptyNativeEvent.currentTarget === emptyNativeTarget && emptyNativeEvent.composedPath()[0] === emptyNativeTarget;").unwrap();
+ let script = v8::Script::compile(scope, source, None).unwrap();
+ assert!(
+ crate::script_execution::execute_compiled_script(scope, script)
+ .unwrap()
+ .is_true()
+ );
+ }
+
+ let mut vm = new_storage_html_test_vm("https://event-target-empty-native.test/");
+ for initialized in [false, true] {
+ for canceled in [false, true] {
+ vm.eval(&format!(
+ "globalThis.emptyNativeTarget = {}; globalThis.emptyNativeEvent = new Event('empty', {{cancelable: true}}); globalThis.emptyNativeCheckpoint = false; {}; true;",
+ if initialized { "new EventTarget()" } else { "{}" },
+ if canceled { "emptyNativeEvent.preventDefault(); emptyNativeEvent.stopImmediatePropagation();" } else { "" },
+ )).unwrap();
+ vm.with_default_context_scope_and_checkpoint_for_test(|scope, _| {
+ let global = scope.get_current_context().global(scope);
+ let target = global
+ .get(scope, crate::util::v8str(scope, "emptyNativeTarget").into())
+ .unwrap();
+ let target = v8::Local::<v8::Object>::try_from(target).unwrap();
+ let event = global
+ .get(scope, crate::util::v8str(scope, "emptyNativeEvent").into())
+ .unwrap();
+ let event = v8::Local::<v8::Object>::try_from(event).unwrap();
+ crate::context_bootstrap::mark_event_trusted(scope, event);
+ let result =
+ crate::context_bootstrap::dispatch_simple_event_target_event_with_checkpoint(
+ scope, target, "empty", event, checkpoint,
+ );
+ assert!(!result.dispatched);
+ assert_eq!(result.uncanceled, !canceled);
+ Ok(())
+ })
+ .unwrap();
+ assert_eq!(vm.eval("String(emptyNativeCheckpoint && emptyNativeEvent.target === emptyNativeTarget && emptyNativeEvent.currentTarget === null && emptyNativeEvent.eventPhase === 0 && emptyNativeEvent.composedPath().length === 0 && !emptyNativeEvent.cancelBubble && emptyNativeEvent.isTrusted)").unwrap(), "true");
+ }
+ }
+ assert_eq!(vm.eval("(() => { const target = new EventTarget(); const event = new Event('empty'); return target.dispatchEvent(event) && event.target === target && event.currentTarget === null && event.composedPath().length === 0; })()").unwrap(), "true");
+}