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): share native Worker dispatch and lifecycle cleanup

ldm06212d06aa3e9
diff --git a/moli-renderer-v8/src/context_bootstrap.rs b/moli-renderer-v8/src/context_bootstrap.rs
index 52d426172..d750f8d01 100644
--- a/moli-renderer-v8/src/context_bootstrap.rs
+++ b/moli-renderer-v8/src/context_bootstrap.rs
@@ -344,11 +344,11 @@ pub(crate) use self::location_runtime::{
};
pub(crate) use self::media_cues::set_text_track_cue_track;
pub(crate) use self::media_queries::{
- SimpleObjectEventListenerInspectorSnapshot, SimpleObjectEventListenerSnapshot,
- dispatch_media_query_list_change_events, dispatch_simple_event_target_event,
- dispatch_simple_event_target_event_collecting_errors,
+ SimpleObjectEventListenerInspectorSnapshot, dispatch_media_query_list_change_events,
+ dispatch_simple_event_target_event, dispatch_simple_event_target_event_collecting_errors,
+ dispatch_simple_event_target_event_with_checkpoint,
evaluate_match_media_query_list_with_viewport, initialize_simple_event_target,
- install_simple_event_target_handlers, invoke_simple_event_listener, is_simple_event_target,
+ install_simple_event_target_handlers, 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.rs b/moli-renderer-v8/src/context_bootstrap/media_queries.rs
index 74ce77484..e610a3a5b 100644
--- a/moli-renderer-v8/src/context_bootstrap/media_queries.rs
+++ b/moli-renderer-v8/src/context_bootstrap/media_queries.rs
@@ -10,10 +10,10 @@ 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,
- dispatch_simple_event_target_event, dispatch_simple_event_target_event_collecting_errors,
- initialize_simple_event_target, install_simple_event_target_handlers,
- invoke_simple_event_listener, is_simple_event_target,
+ SimpleObjectEventListenerInspectorSnapshot, dispatch_simple_event_target_event,
+ dispatch_simple_event_target_event_collecting_errors,
+ dispatch_simple_event_target_event_with_checkpoint, initialize_simple_event_target,
+ install_simple_event_target_handlers, 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.rs
index e3a873da0..00d8461fa 100644
--- a/moli-renderer-v8/src/context_bootstrap/media_queries/events.rs
+++ b/moli-renderer-v8/src/context_bootstrap/media_queries/events.rs
@@ -12,10 +12,10 @@ pub(in crate::context_bootstrap) use media_query_list::{
media_query_list_remove_listener_callback,
};
pub(crate) use simple_event_target::{
- SimpleObjectEventListenerInspectorSnapshot, SimpleObjectEventListenerSnapshot,
- dispatch_simple_event_target_event, dispatch_simple_event_target_event_collecting_errors,
- initialize_simple_event_target, install_simple_event_target_handlers,
- invoke_simple_event_listener, is_simple_event_target,
+ SimpleObjectEventListenerInspectorSnapshot, dispatch_simple_event_target_event,
+ dispatch_simple_event_target_event_collecting_errors,
+ dispatch_simple_event_target_event_with_checkpoint, initialize_simple_event_target,
+ install_simple_event_target_handlers, 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.rs
index 1e91315c0..f65b8fa6b 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
@@ -13,18 +13,18 @@ pub(crate) use callbacks::{
pub(in crate::context_bootstrap::media_queries::events::simple_event_target) use dispatch::simple_object_event_target_dispatch;
pub(crate) use dispatch::{
dispatch_simple_event_target_event, dispatch_simple_event_target_event_collecting_errors,
- invoke_simple_event_listener,
+ dispatch_simple_event_target_event_with_checkpoint,
};
pub(crate) use handlers::{
install_simple_event_target_handlers, simple_event_target_handler_getter_callback,
simple_event_target_handler_setter_callback,
};
+use listeners::SimpleObjectEventListenerSnapshot;
pub(crate) use listeners::simple_object_event_target_register_webidl_listener;
pub(crate) use listeners::{
- SimpleObjectEventListenerInspectorSnapshot, SimpleObjectEventListenerSnapshot,
- simple_event_target_inspector_listener_snapshots, simple_object_event_listeners_snapshot,
- simple_object_event_remove_listener_value_for_type, simple_object_event_set_handler,
- simple_object_has_event_listeners,
+ SimpleObjectEventListenerInspectorSnapshot, simple_event_target_inspector_listener_snapshots,
+ simple_object_event_listeners_snapshot, simple_object_event_remove_listener_value_for_type,
+ simple_object_event_set_handler, simple_object_has_event_listeners,
};
use listeners::{
simple_object_event_listeners_snapshot_in_registry,
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 63ec05e7a..fcc17f750 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
@@ -43,6 +43,7 @@ pub(in crate::context_bootstrap::media_queries::events::simple_event_target) fn
&event_type,
event,
None,
+ None,
);
rv.set_bool(dispatch_result.uncanceled);
}
@@ -68,6 +69,30 @@ pub(crate) fn dispatch_simple_event_target_event_collecting_errors<'s>(
event_type: &str,
event: v8::Local<'s, v8::Object>,
callback_errors: Option<&mut Vec<crate::exception_reporting::V8ExceptionReport>>,
+) -> SimpleEventDispatchResult {
+ dispatch_object_event(scope, target, event_type, event, callback_errors, None)
+}
+
+/// Run the caller's microtask checkpoint while the native event is still
+/// dispatching. ExtendableEvent.waitUntil and Worker error cancellation depend
+/// on this boundary; the shared dispatcher always finishes the event afterward.
+pub(crate) fn dispatch_simple_event_target_event_with_checkpoint<'s>(
+ scope: &mut v8::PinScope<'s, '_>,
+ target: v8::Local<'s, v8::Object>,
+ event_type: &str,
+ event: v8::Local<'s, v8::Object>,
+ checkpoint: fn(&mut v8::PinScope<'s, '_>),
+) -> SimpleEventDispatchResult {
+ dispatch_object_event(scope, target, event_type, event, None, Some(checkpoint))
+}
+
+fn dispatch_object_event<'s>(
+ scope: &mut v8::PinScope<'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>>,
+ checkpoint: Option<fn(&mut v8::PinScope<'s, '_>)>,
) -> SimpleEventDispatchResult {
let Some(target) = resolve_event_target(scope, target) else {
return SimpleEventDispatchResult {
@@ -76,7 +101,15 @@ pub(crate) fn dispatch_simple_event_target_event_collecting_errors<'s>(
};
};
let registry = SimpleEventListenerRegistry::from_owner(scope, target.listener_owner);
- dispatch_resolved_event(scope, target, registry, event_type, event, callback_errors)
+ dispatch_resolved_event(
+ scope,
+ target,
+ registry,
+ event_type,
+ event,
+ callback_errors,
+ checkpoint,
+ )
}
fn dispatch_resolved_event<'s>(
@@ -86,6 +119,7 @@ fn dispatch_resolved_event<'s>(
event_type: &str,
event: v8::Local<'s, v8::Object>,
mut callback_errors: Option<&mut Vec<crate::exception_reporting::V8ExceptionReport>>,
+ checkpoint: Option<fn(&mut v8::PinScope<'s, '_>)>,
) -> SimpleEventDispatchResult {
let target = target.dispatch_target;
let mut dispatched = false;
@@ -101,81 +135,69 @@ fn dispatch_resolved_event<'s>(
None
};
if let (true, Some(registry)) = (can_invoke, registry) {
- '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.
- // Reuse only the registry; fetch the current array for each phase
- // and each registration check after callbacks mutate that array.
- let listeners =
- simple_object_event_listeners_snapshot_in_registry(scope, registry, event_type);
- for listener in listeners
- .iter()
- .filter(|listener| listener.capture == capture_phase)
+ // Object-backed EventTargets clone their list once at AT_TARGET.
+ // Capture remains part of listener identity; invocation follows
+ // registration order, including EventHandler entries.
+ let listeners =
+ simple_object_event_listeners_snapshot_in_registry(scope, registry, event_type);
+ for listener in &listeners {
+ let Some(listener) = listener.prepare_in_registry(scope, registry, event_type) else {
+ continue;
+ };
+ set_event_internal_flag(scope, event, EVENT_PASSIVE_SLOT, listener.passive);
+ let callback_target = crate::context_bootstrap::shared_event_targets::target_in_realm(
+ scope,
+ target,
+ listener.relevant_context(),
+ );
+ let Some(callback_event) =
+ crate::context_bootstrap::navigation_event_worlds::event_in_realm(
+ scope,
+ target,
+ event,
+ listener.relevant_context(),
+ )
+ else {
+ continue;
+ };
+ let callback_arguments = [callback_event.into()];
+ let outcome = invoke_simple_event_listener_collecting_errors(
+ scope,
+ event_type,
+ &format!("simple event target {event_type} listener"),
+ &listener,
+ callback_target.into(),
+ if listener.handler_slot.is_some() {
+ error_arguments
+ .as_ref()
+ .map_or(callback_arguments.as_slice(), |values| values.as_slice())
+ } else {
+ &callback_arguments
+ },
+ callback_event,
+ callback_errors.as_deref_mut(),
+ );
+ dispatched |= outcome.invoked;
+ if listener.handler_slot.is_some()
+ && let Some(returned) = outcome.value
{
- let Some(listener) = listener.prepare_in_registry(scope, registry, event_type)
- else {
- continue;
- };
- set_event_internal_flag(scope, event, EVENT_PASSIVE_SLOT, listener.passive);
- let callback_target =
- crate::context_bootstrap::shared_event_targets::target_in_realm(
- scope,
- target,
- listener.relevant_context(),
- );
- let Some(callback_event) =
- crate::context_bootstrap::navigation_event_worlds::event_in_realm(
- scope,
- target,
- event,
- listener.relevant_context(),
- )
- else {
- continue;
- };
- let callback_arguments = [callback_event.into()];
- let outcome = invoke_simple_event_listener_collecting_errors(
+ apply_handler_return_value(
scope,
- event_type,
- &format!("simple event target {event_type} listener"),
- &listener,
- callback_target.into(),
- if listener.handler_slot.is_some() {
- error_arguments
- .as_ref()
- .map_or(callback_arguments.as_slice(), |values| values.as_slice())
- } else {
- &callback_arguments
- },
- callback_event,
- callback_errors.as_deref_mut(),
+ event,
+ v8::Local::new(scope, &returned),
+ error_arguments.is_some(),
);
- dispatched |= outcome.invoked;
- if listener.handler_slot.is_some()
- && let Some(returned) = outcome.value
- {
- apply_handler_return_value(
- scope,
- event,
- v8::Local::new(scope, &returned),
- error_arguments.is_some(),
- );
- }
- set_event_internal_flag(scope, event, EVENT_PASSIVE_SLOT, false);
- if event_stop_immediate_propagation(scope, event) {
- break 'phases;
- }
}
- if event_internal_bool_flag(
- scope,
- event,
- crate::context_bootstrap::EVENT_STOP_PROPAGATION_SLOT,
- ) {
+ set_event_internal_flag(scope, event, EVENT_PASSIVE_SLOT, false);
+ if event_stop_immediate_propagation(scope, event) {
break;
}
}
}
+ 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");
@@ -185,28 +207,6 @@ fn dispatch_resolved_event<'s>(
}
}
-pub(crate) fn invoke_simple_event_listener<'s>(
- scope: &mut v8::PinScope<'s, '_>,
- event_type: &str,
- callback_name: &str,
- listener: &SimpleObjectEventListenerSnapshot<'s>,
- callback_this: v8::Local<'s, v8::Value>,
- arguments: &[v8::Local<'s, v8::Value>],
- current_event: v8::Local<'s, v8::Object>,
-) -> Option<v8::Global<v8::Value>> {
- invoke_simple_event_listener_collecting_errors(
- scope,
- event_type,
- callback_name,
- listener,
- callback_this,
- arguments,
- current_event,
- None,
- )
- .value
-}
-
struct SimpleEventCallbackResult {
invoked: bool,
value: Option<v8::Global<v8::Value>>,
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 4145c0e95..962fc6c7a 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
@@ -113,16 +113,6 @@ struct SimpleObjectResolvedEventListener<'s> {
}
impl<'s> SimpleObjectEventListenerSnapshot<'s> {
- pub(crate) fn prepare_for_invocation(
- &self,
- scope: &mut v8::PinScope<'s, '_>,
- target: v8::Local<'s, v8::Object>,
- event_type: &str,
- ) -> Option<Self> {
- let registry = simple_object_event_listener_registry(scope, target)?;
- self.prepare_in_registry(scope, registry, event_type)
- }
-
pub(super) fn prepare_in_registry(
&self,
scope: &mut v8::PinScope<'s, '_>,
diff --git a/moli-renderer-v8/src/context_bootstrap/shared_worker_host.rs b/moli-renderer-v8/src/context_bootstrap/shared_worker_host.rs
index db5eb55e6..48660ddbb 100644
--- a/moli-renderer-v8/src/context_bootstrap/shared_worker_host.rs
+++ b/moli-renderer-v8/src/context_bootstrap/shared_worker_host.rs
@@ -4,14 +4,13 @@ use crate::webidl;
use super::{
CHILD_BROWSING_CONTEXT_HANDLE_SLOT, MessagePortRealmBinding,
ensure_message_port_wrapper_for_id_in_realm,
- events::{clear_event_dispatch_fields, construct_original_event, set_event_dispatch_fields},
- invoke_simple_event_listener,
+ events::construct_original_event,
navigation_serialize::{
current_document_content_security_policies, current_document_referrer_policy,
document_referrer_policy_for_native_document,
},
shared::SIMPLE_EVENT_TARGET_LISTENERS_SLOT,
- simple_object_event_listeners_snapshot, simple_object_event_set_handler,
+ simple_object_event_set_handler,
worker_host::{
document_query_encoding_override, is_cross_origin_http_worker_script,
materialize_worker_script_source, resolve_worker_script_url, throw_worker_dom_exception,
@@ -712,39 +711,10 @@ fn dispatch_shared_worker_error_event<'s>(
};
let Some(event) = event else { return false };
crate::context_bootstrap::mark_event_trusted(scope, event);
- set_event_dispatch_fields(scope, worker, event);
-
- let listeners = simple_object_event_listeners_snapshot(scope, worker, "error");
- let mut dispatched = false;
- for listener in listeners {
- let Some(listener) = listener.prepare_for_invocation(scope, worker, "error") else {
- continue;
- };
- dispatched = true;
- let callback_result = invoke_simple_event_listener(
- scope,
- "error",
- "SharedWorker error listener",
- &listener,
- worker.into(),
- &[event.into()],
- event,
- );
- if event_kind == crate::worker::WorkerParentErrorEventKind::ErrorEvent
- && listener.handler_slot.as_deref() == Some(SHARED_WORKER_ONERROR_SLOT)
- && let Some(returned) = callback_result
- && v8::Local::new(scope, &returned).boolean_value(scope)
- {
- let _ = crate::context_bootstrap::event_backing(scope, event).set(
- scope,
- v8str(scope, "defaultPrevented").into(),
- v8::Boolean::new(scope, true).into(),
- );
- }
- }
-
- clear_event_dispatch_fields(scope, event);
- dispatched
+ crate::context_bootstrap::dispatch_simple_event_target_event_collecting_errors(
+ scope, worker, "error", event, None,
+ )
+ .dispatched
}
fn new_error_event<'s>(
diff --git a/moli-renderer-v8/src/context_bootstrap/worker_host/dispatch.rs b/moli-renderer-v8/src/context_bootstrap/worker_host/dispatch.rs
index 08051c782..888ac55b5 100644
--- a/moli-renderer-v8/src/context_bootstrap/worker_host/dispatch.rs
+++ b/moli-renderer-v8/src/context_bootstrap/worker_host/dispatch.rs
@@ -3,11 +3,9 @@ use std::pin::pin;
use moli_webapi_declare::WebApiObject;
-use super::WORKER_ONERROR_SLOT;
use crate::context_bootstrap::{
- dispatch_simple_event_target_event,
- events::{clear_event_dispatch_fields, construct_original_event, set_event_dispatch_fields},
- invoke_simple_event_listener, simple_object_event_listeners_snapshot,
+ dispatch_simple_event_target_event, events::construct_original_event,
+ simple_object_event_listeners_snapshot,
};
use crate::structured_clone::V8StructuredClonePayload;
use crate::util::v8str;
@@ -219,47 +217,20 @@ pub(crate) fn dispatch_worker_error_event_with_kind<'s>(
};
let Some(event) = event else { return false };
crate::context_bootstrap::mark_event_trusted(scope, event);
- set_event_dispatch_fields(scope, worker, event);
-
- let listeners = simple_object_event_listeners_snapshot(scope, worker, "error");
- for listener in listeners {
- let Some(listener) = listener.prepare_for_invocation(scope, worker, "error") else {
- continue;
- };
- let callback_result = invoke_simple_event_listener(
- scope,
- "error",
- "simple event target error listener",
- &listener,
- worker.into(),
- &[event.into()],
- event,
- );
- if event_kind == WorkerParentErrorEventKind::ErrorEvent
- && listener.handler_slot.as_deref() == Some(WORKER_ONERROR_SLOT)
- && let Some(returned) = callback_result
- && v8::Local::new(scope, &returned).boolean_value(scope)
- {
- let _ = crate::context_bootstrap::event_backing(scope, event).set(
- scope,
- v8str(scope, "defaultPrevented").into(),
- v8::Boolean::new(scope, true).into(),
- );
- }
- }
+ crate::context_bootstrap::dispatch_simple_event_target_event_with_checkpoint(
+ scope,
+ worker,
+ "error",
+ event,
+ worker_error_microtask_checkpoint,
+ )
+ .uncanceled
+}
- // Blink runs the microtasks queued by Worker error listeners before it
- // observes the dispatch result and propagates an uncanceled error to the
- // owning context. This matters when an error listener resolves a Promise
- // and the reaction calls preventDefault() on the same event.
+fn worker_error_microtask_checkpoint(scope: &mut v8::PinScope<'_, '_>) {
+ // Blink observes cancellation after microtasks queued by error listeners.
scope.perform_microtask_checkpoint();
crate::context_bootstrap::run_end_of_microtask_checkpoint_tasks(scope);
-
- clear_event_dispatch_fields(scope, event);
- let default_prevented = crate::context_bootstrap::event_backing(scope, event)
- .get(scope, v8str(scope, "defaultPrevented").into())
- .is_some_and(|value| value.boolean_value(scope));
- !default_prevented
}
fn new_message_event<'s>(
diff --git a/moli-renderer-v8/src/context_bootstrap/worker_host/tests.rs b/moli-renderer-v8/src/context_bootstrap/worker_host/tests.rs
index 1a1dd4797..51913993b 100644
--- a/moli-renderer-v8/src/context_bootstrap/worker_host/tests.rs
+++ b/moli-renderer-v8/src/context_bootstrap/worker_host/tests.rs
@@ -1684,3 +1684,97 @@ async fn constructor_message_event_uses_intrinsic_constructor_after_global_repla
}
panic!("timed out waiting for MessageEvent constructor path");
}
+
+#[test]
+fn native_worker_errors_share_dispatch_state_and_handler_cancellation() {
+ ensure_v8();
+ let (mut isolate, ctx) = setup_worker_context();
+ eval_ok(
+ &mut isolate,
+ &ctx,
+ r#"
+ var worker = new Worker('1');
+ var facts = [];
+ var retained;
+ worker.addEventListener('error', function(event) {
+ retained = event;
+ facts.push(this === worker && event.target === worker &&
+ event.currentTarget === worker && event.composedPath()[0] === worker && event.isTrusted);
+ event.stopImmediatePropagation();
+ Promise.resolve().then(() => {
+ facts.push(event.currentTarget === worker && event.composedPath()[0] === worker);
+ event.preventDefault();
+ });
+ }, {once: true});
+ worker.addEventListener('error', () => facts.push('later'), {once: true});
+ "#,
+ );
+ {
+ let scope = pin!(v8::HandleScope::new(&mut isolate));
+ let scope = &mut scope.init();
+ let context = v8::Local::new(scope, &ctx);
+ let scope = &mut v8::ContextScope::new(scope, context);
+ let worker = context
+ .global(scope)
+ .get(scope, crate::util::v8str(scope, "worker").into())
+ .unwrap();
+ let worker = v8::Local::<v8::Object>::try_from(worker).unwrap();
+ let error = v8::null(scope).into();
+ assert!(
+ !crate::context_bootstrap::worker_host::dispatch::dispatch_worker_error_event_with_kind(
+ scope,
+ worker,
+ "probe",
+ "https://worker.test/worker.js",
+ 1,
+ 1,
+ error,
+ crate::worker::WorkerParentErrorEventKind::ErrorEvent,
+ )
+ );
+ }
+ assert_eq!(
+ eval_ok(
+ &mut isolate,
+ &ctx,
+ r#"(() => {
+ const clean = retained.currentTarget === null && retained.composedPath().length === 0;
+ worker.dispatchEvent(retained);
+ return JSON.stringify([facts, clean, retained.isTrusted]);
+ })()"#
+ ),
+ r#"[[true,true,"later"],true,false]"#
+ );
+ for (returned, uncanceled) in [("true", true), ("false", false), ("1", true)] {
+ eval_ok(
+ &mut isolate,
+ &ctx,
+ &format!("worker.onerror = () => {returned};"),
+ );
+ let scope = pin!(v8::HandleScope::new(&mut isolate));
+ let scope = &mut scope.init();
+ let context = v8::Local::new(scope, &ctx);
+ let scope = &mut v8::ContextScope::new(scope, context);
+ let worker = context
+ .global(scope)
+ .get(scope, crate::util::v8str(scope, "worker").into())
+ .unwrap();
+ let worker = v8::Local::<v8::Object>::try_from(worker).unwrap();
+ let error = v8::null(scope).into();
+ assert_eq!(
+ crate::context_bootstrap::worker_host::dispatch::dispatch_worker_error_event_with_kind(
+ scope,
+ worker,
+ "probe",
+ "https://worker.test/worker.js",
+ 1,
+ 1,
+ error,
+ crate::worker::WorkerParentErrorEventKind::ErrorEvent,
+ ),
+ uncanceled,
+ "onerror returned {returned}"
+ );
+ }
+ eval_ok(&mut isolate, &ctx, "worker.terminate()");
+}
diff --git a/moli-renderer-v8/src/host/events.rs b/moli-renderer-v8/src/host/events.rs
index ec4105da4..db40b04ae 100644
--- a/moli-renderer-v8/src/host/events.rs
+++ b/moli-renderer-v8/src/host/events.rs
@@ -438,7 +438,7 @@ fn call_event_target_listeners_filtered<'s>(
invocation_target_in_shadow_tree: bool,
event_type: &str,
event: v8::Local<'s, v8::Object>,
- capture_only: bool,
+ capture_only: Option<bool>,
at_target: bool,
) -> std::result::Result<DispatchStatus, String> {
if let EventTargetHandle::ChildWindow(target) = target {
@@ -448,7 +448,7 @@ fn call_event_target_listeners_filtered<'s>(
target,
event_type,
event,
- capture_only,
+ capture_only.expect("child Window propagation uses a capture filter"),
at_target,
),
);
@@ -1059,7 +1059,7 @@ impl HostEventTargetRegistry {
invocation_target_in_shadow_tree: bool,
event_type: &str,
event: v8::Local<'s, v8::Object>,
- capture_only: bool,
+ capture_only: Option<bool>,
at_target: bool,
) -> std::result::Result<DispatchStatus, String> {
let snapshot: Vec<(
@@ -1083,11 +1083,7 @@ impl HostEventTargetRegistry {
entries
.iter()
.filter(|entry| !entry.removed)
- .filter(|entry| {
- (at_target && entry.capture == capture_only)
- || (capture_only && entry.capture)
- || (!capture_only && !entry.capture)
- })
+ .filter(|entry| capture_only.is_none_or(|capture| entry.capture == capture))
.map(|entry| {
(
entry.id,
@@ -1116,7 +1112,7 @@ impl HostEventTargetRegistry {
stage = "event_listener_batch_start",
event_type,
?target,
- capture_only,
+ ?capture_only,
at_target,
listener_count = snapshot.len(),
);
@@ -1207,7 +1203,7 @@ impl HostEventTargetRegistry {
listener_id,
event_type,
?target,
- capture_only,
+ ?capture_only,
at_target,
listener_index,
function_name = function_name.as_str(),
@@ -1388,7 +1384,7 @@ fn dispatch_public_event_with_original_target_impl<'s, 'i>(
invocation_targets_in_shadow_tree.contains(ancestor),
&event_type,
event,
- true,
+ Some(true),
false,
)?;
if status == DispatchStatus::StopImmediate || status == DispatchStatus::StopPropagation
@@ -1444,7 +1440,24 @@ fn dispatch_public_event_with_original_target_impl<'s, 'i>(
let stop_immediate = event_internal_bool_flag(scope, event, EVENT_STOP_IMMEDIATE_SLOT);
let stop_prop = event_internal_bool_flag(scope, event, EVENT_STOP_PROPAGATION_SLOT);
- if !stop_immediate {
+ if !stop_immediate && dispatch_target == EventTargetHandle::Window {
+ // A Window dispatches to itself once, in registration order. DOM
+ // Node paths retain their capture/bubble and retargeting passes.
+ let status = registry.call_listeners_filtered(
+ scope,
+ host_ptr,
+ dispatch_target,
+ invocation_targets_in_shadow_tree.contains(&dispatch_target),
+ &event_type,
+ event,
+ None,
+ true,
+ )?;
+ stopped = matches!(
+ status,
+ DispatchStatus::StopPropagation | DispatchStatus::StopImmediate
+ );
+ } else if !stop_immediate {
if stop_prop {
stopped = true;
}
@@ -1456,7 +1469,7 @@ fn dispatch_public_event_with_original_target_impl<'s, 'i>(
invocation_targets_in_shadow_tree.contains(&dispatch_target),
&event_type,
event,
- true,
+ Some(true),
true,
)?;
if status == DispatchStatus::StopPropagation {
@@ -1473,7 +1486,7 @@ fn dispatch_public_event_with_original_target_impl<'s, 'i>(
invocation_targets_in_shadow_tree.contains(&dispatch_target),
&event_type,
event,
- false,
+ Some(false),
true,
)?;
if status == DispatchStatus::StopImmediate
@@ -1535,7 +1548,7 @@ fn dispatch_public_event_with_original_target_impl<'s, 'i>(
invocation_targets_in_shadow_tree.contains(ancestor),
&event_type,
event,
- true,
+ Some(true),
true,
)?;
if status == DispatchStatus::StopImmediate || status == DispatchStatus::StopPropagation
@@ -1551,7 +1564,7 @@ fn dispatch_public_event_with_original_target_impl<'s, 'i>(
invocation_targets_in_shadow_tree.contains(ancestor),
&event_type,
event,
- false,
+ Some(false),
true,
)?;
if status == DispatchStatus::StopImmediate || status == DispatchStatus::StopPropagation
@@ -1634,7 +1647,7 @@ fn dispatch_public_event_with_original_target_impl<'s, 'i>(
invocation_targets_in_shadow_tree.contains(ancestor),
&event_type,
event,
- false,
+ Some(false),
false,
)?;
if status == DispatchStatus::StopImmediate
@@ -1771,6 +1784,20 @@ fn run_host_event_dispatch<'s>(
event,
);
+ if dispatch_target == EventTargetHandle::Window {
+ registry.call_listeners_filtered(
+ scope,
+ host_ptr,
+ dispatch_target,
+ invocation_target_in_shadow_tree,
+ event_type,
+ event,
+ None,
+ true,
+ )?;
+ return Ok(());
+ }
+
let status = registry.call_listeners_filtered(
scope,
host_ptr,
@@ -1778,7 +1805,7 @@ fn run_host_event_dispatch<'s>(
invocation_target_in_shadow_tree,
event_type,
event,
- true,
+ Some(true),
true,
)?;
if status != DispatchStatus::StopImmediate {
@@ -1789,7 +1816,7 @@ fn run_host_event_dispatch<'s>(
invocation_target_in_shadow_tree,
event_type,
event,
- false,
+ Some(false),
true,
)?;
}
diff --git a/moli-renderer-v8/src/runtime/page_vm/tests/fetch_xhr/workers.rs b/moli-renderer-v8/src/runtime/page_vm/tests/fetch_xhr/workers.rs
index 8023d8a2a..65be238fa 100644
--- a/moli-renderer-v8/src/runtime/page_vm/tests/fetch_xhr/workers.rs
+++ b/moli-renderer-v8/src/runtime/page_vm/tests/fetch_xhr/workers.rs
@@ -590,7 +590,7 @@ async fn worker_runtime_error_promise_reaction_can_prevent_window_propagation()
}
#[tokio::test]
-async fn worker_runtime_error_return_truthy_suppresses_window_onerror() {
+async fn worker_runtime_error_return_truthy_still_reaches_window_onerror() {
run_page_vm_async_test(async move {
let (base_url, server) = spawn_single_response_http_server(
"HTTP/1.1 200 OK",
@@ -628,7 +628,7 @@ async fn worker_runtime_error_return_truthy_suppresses_window_onerror() {
drive_websocket_until_done(
&mut page_vm,
"String(globalThis.__workerDone === true)",
- "truthy worker onerror should suppress window.onerror",
+ "truthy worker onerror must not cancel window error propagation",
)
.await?;
page_vm.vm_mut().eval(
@@ -636,14 +636,14 @@ async fn worker_runtime_error_return_truthy_suppresses_window_onerror() {
)
})
.await
- .expect("worker truthy onerror suppression test should run on owner lane");
+ .expect("worker truthy onerror propagation test should run on owner lane");
server
.await
- .expect("worker truthy onerror suppression server should finish");
+ .expect("worker truthy onerror propagation server should finish");
assert_eq!(
result,
- r#"{"windowErrorCalled":false,"listenerSawDefaultPrevented":true}"#
+ r#"{"windowErrorCalled":true,"listenerSawDefaultPrevented":false}"#
);
})
.await;
diff --git a/moli-renderer-v8/src/script_vm/tests/browser_api/abort_signal_events.js b/moli-renderer-v8/src/script_vm/tests/browser_api/abort_signal_events.js
index bb61f5266..811e091e3 100644
--- a/moli-renderer-v8/src/script_vm/tests/browser_api/abort_signal_events.js
+++ b/moli-renderer-v8/src/script_vm/tests/browser_api/abort_signal_events.js
@@ -42,7 +42,7 @@ function abortSignalEventTargetProbe(realm = globalThis, methods = realm.EventTa
signal.addEventListener('abort', () => calls.push('capture'), true);
const event = new realm.Event('abort', {cancelable: true});
check(methods.dispatchEvent.call(signal, event) === false && event.defaultPrevented, 'handler cancels event');
- check(calls.join() === 'capture,handler,bubble', 'listener order: ' + calls);
+ check(calls.join() === 'handler,bubble,capture', 'listener order: ' + calls);
check(!signal.aborted && signal.reason === undefined, 'synthetic abort preserves signal state');
check(event.target === signal && event.currentTarget === null && event.eventPhase === 0 &&
event.composedPath().length === 0, 'dispatch cleanup');
@@ -50,18 +50,18 @@ function abortSignalEventTargetProbe(realm = globalThis, methods = realm.EventTa
signal.onabort = () => calls.push('last');
calls.length = 0;
signal.dispatchEvent(new realm.Event('abort'));
- check(calls.join() === 'capture,bubble,last', 'handler reactivation: ' + calls);
+ check(calls.join() === 'bubble,capture,last', 'handler reactivation: ' + calls);
const handler = {handleEvent() { failures.push('EventHandler invoked handleEvent'); }};
signal.onabort = handler;
check(signal.onabort === handler, 'noncallable EventHandler identity');
calls.length = 0;
signal.dispatchEvent(new realm.Event('abort'));
- check(calls.join() === 'capture,bubble', 'object replaces callable handler: ' + calls);
+ check(calls.join() === 'bubble,capture', 'object replaces callable handler: ' + calls);
signal.addEventListener('abort', () => calls.push('tail'));
signal.onabort = () => calls.push('restored');
calls.length = 0;
signal.dispatchEvent(new realm.Event('abort'));
- check(calls.join() === 'capture,bubble,restored,tail', 'object preserves handler position: ' + calls);
+ check(calls.join() === 'bubble,capture,restored,tail', 'object preserves handler position: ' + calls);
signal.onabort = 4;
check(signal.onabort === null, 'primitive EventHandler conversion');
});
@@ -81,7 +81,7 @@ function abortSignalEventTargetProbe(realm = globalThis, methods = realm.EventTa
owner.signal.addEventListener('abort', () => failures.push('self-signal listener'), {signal: owner.signal});
owner.abort();
});
- scenario('dispatch phase mutation', () => {
+ scenario('dispatch snapshot mutation', () => {
const signal = new realm.AbortController().signal;
const calls = [];
const removed = () => calls.push('removed');
@@ -93,7 +93,7 @@ function abortSignalEventTargetProbe(realm = globalThis, methods = realm.EventTa
}, {capture: true, once: true});
signal.addEventListener('x', () => calls.push('bubble'));
methods.dispatchEvent.call(signal, new realm.Event('x'));
- check(calls.join() === 'capture,bubble,late', 'phase snapshot: ' + calls);
+ check(calls.join() === 'removed,capture,bubble', 'dispatch snapshot: ' + calls);
calls.length = 0;
signal.dispatchEvent(new realm.Event('x'));
check(calls.join() === 'bubble,late', 'once listener removed: ' + calls);
diff --git a/moli-renderer-v8/src/script_vm/tests/browser_api/media_query_list_events.js b/moli-renderer-v8/src/script_vm/tests/browser_api/media_query_list_events.js
index fb446a262..e09157afb 100644
--- a/moli-renderer-v8/src/script_vm/tests/browser_api/media_query_list_events.js
+++ b/moli-renderer-v8/src/script_vm/tests/browser_api/media_query_list_events.js
@@ -100,20 +100,20 @@ function mediaQueryListEventTargetProbe() {
methods.addEventListener.call(target, "change", () => calls.push("capture"), true);
const event = new Event("change", {cancelable: true});
check(methods.dispatchEvent.call(target, event) === false, name + ":cancellation");
- check(calls.join() === "capture,legacy,handler,modern", name + ":handler order " + calls);
+ check(calls.join() === "legacy,handler,modern,capture", name + ":handler order " + calls);
check(event.currentTarget === null && event.eventPhase === 0 && event.target === target,
name + ":dispatch cleanup");
target.onchange = null;
target.onchange = () => calls.push("last-handler");
calls.length = 0;
target.dispatchEvent(new Event("change"));
- check(calls.join() === "capture,legacy,modern,last-handler", name + ":handler re-add " + calls);
+ check(calls.join() === "legacy,modern,capture,last-handler", name + ":handler re-add " + calls);
methods.removeEventListener.call(target, "change", legacy);
target.onchange = 12;
check(target.onchange === null, name + ":handler conversion");
calls.length = 0;
target.dispatchEvent(new Event("change"));
- check(calls.join() === "capture,modern", name + ":legacy removal " + calls);
+ check(calls.join() === "modern,capture", name + ":legacy removal " + calls);
let once = 0;
const controller = new AbortController();
methods.addEventListener.call(target, "probe", () => ++once, {once: true});
diff --git a/moli-renderer-v8/src/script_vm/tests/browser_api/message_port_events.rs b/moli-renderer-v8/src/script_vm/tests/browser_api/message_port_events.rs
index 5fafbfada..0f46a5440 100644
--- a/moli-renderer-v8/src/script_vm/tests/browser_api/message_port_events.rs
+++ b/moli-renderer-v8/src/script_vm/tests/browser_api/message_port_events.rs
@@ -7,7 +7,7 @@ fn assert_dispatch_rows(value: &serde_json::Value) {
let rows = value.as_array().expect("MessagePort dispatch rows");
assert_eq!(rows.len(), 46);
for row in &rows[..32] {
- let mut labels = vec!["capture", "bubble"];
+ let mut labels = vec!["bubble", "capture"];
if matches!(row["type"].as_str(), Some("message" | "messageerror")) {
labels.push("handler");
}
@@ -36,9 +36,9 @@ fn assert_dispatch_rows(value: &serde_json::Value) {
],
"reactivate-handler" => &["first", "later", "first", "later"],
"capture-add" => &[
- "first", "handler", "later", "added", "first", "handler", "later", "added", "added",
+ "first", "handler", "later", "first", "handler", "later", "added",
],
- "stop" | "stopImmediate" => &["first", "first"],
+ "stopImmediate" => &["first", "first"],
"recursive" => &[
"first",
"InvalidStateError",
@@ -48,7 +48,7 @@ fn assert_dispatch_rows(value: &serde_json::Value) {
"handler",
"later",
],
- "prevent" | "passive" | "return-false" | "close" | "transfer" => {
+ "stop" | "prevent" | "passive" | "return-false" | "close" | "transfer" => {
&["first", "handler", "later", "first", "handler", "later"]
}
_ => panic!("unexpected action: {row}"),
diff --git a/moli-renderer-v8/src/script_vm/tests/browser_api/simple_event_target_handlers.js b/moli-renderer-v8/src/script_vm/tests/browser_api/simple_event_target_handlers.js
index eb9792fab..814a70933 100644
--- a/moli-renderer-v8/src/script_vm/tests/browser_api/simple_event_target_handlers.js
+++ b/moli-renderer-v8/src/script_vm/tests/browser_api/simple_event_target_handlers.js
@@ -17,34 +17,34 @@ function checkHandlerDispatch(target, type, realm = globalThis) {
target.addEventListener(type, last);
target.addEventListener(type, capture, true);
check(fire(), false, 'handler cancellation');
- check(trace.splice(0), ['capture', 'first', 'handler', 'last'], 'capture and registration order');
+ check(trace.splice(0), ['first', 'handler', 'last', 'capture'], 'registration order');
during = () => { target[property] = () => trace.push('replacement'); };
check(fire(), true, 'replacement cancellation');
- check(trace.splice(0), ['capture', 'first', 'replacement', 'last'], 'replacement during dispatch');
+ check(trace.splice(0), ['first', 'replacement', 'last', 'capture'], 'replacement during dispatch');
during = () => { target[property] = null; target[property] = handler; };
fire();
- check(trace.splice(0), ['capture', 'first', 'last'], 'removed entry stays inactive in snapshot');
+ check(trace.splice(0), ['first', 'last', 'capture'], 'removed entry stays inactive in snapshot');
during = () => {};
fire();
- check(trace.splice(0), ['capture', 'first', 'last', 'handler'], 'reactivation appends');
+ check(trace.splice(0), ['first', 'last', 'capture', 'handler'], 'reactivation appends');
during = event => event.stopImmediatePropagation();
fire();
- check(trace.splice(0), ['capture', 'first'], 'earlier listener stops handler');
+ check(trace.splice(0), ['first'], 'earlier listener stops handler');
during = () => {};
target[property] = null;
target.removeEventListener(type, last);
target[property] = event => { trace.push('handler'); event.stopImmediatePropagation(); };
target.addEventListener(type, last);
fire();
- check(trace.splice(0), ['capture', 'first', 'handler'], 'handler stops later listener');
+ check(trace.splice(0), ['first', 'capture', 'handler'], 'handler stops later listener');
target[property] = handler;
during = event => event.stopPropagation();
fire();
- check(trace.splice(0), ['capture', 'first', 'handler', 'last'], 'stopPropagation keeps same phase');
+ check(trace.splice(0), ['first', 'capture', 'handler', 'last'], 'stopPropagation keeps same target');
during = () => {};
// Dispatch uses the registered handler even when script shadows its IDL
@@ -53,7 +53,7 @@ function checkHandlerDispatch(target, type, realm = globalThis) {
const ownDescriptor = Object.getOwnPropertyDescriptor(target, property);
Object.defineProperty(target, property, {configurable: true, get() { reads++; throw new Error('handler getter read'); }});
fire();
- check(trace.splice(0), ['capture', 'first', 'handler', 'last'], 'shadowed accessor retains listener');
+ check(trace.splice(0), ['first', 'capture', 'handler', 'last'], 'shadowed accessor retains listener');
check(reads, 0, 'no property lookup during dispatch');
delete target[property];
if (ownDescriptor) Object.defineProperty(target, property, ownDescriptor);
diff --git a/moli-renderer-v8/src/worker/thread/dispatch.rs b/moli-renderer-v8/src/worker/thread/dispatch.rs
index a8b8c6ded..a3ac39a63 100644
--- a/moli-renderer-v8/src/worker/thread/dispatch.rs
+++ b/moli-renderer-v8/src/worker/thread/dispatch.rs
@@ -9,18 +9,14 @@ use tokio::sync::mpsc;
use moli_webapi_declare::WebApiObject;
-use crate::callback_invocation::{CallbackInvocationOutcome, CallbackInvoker};
use crate::context_bootstrap::{
- EVENT_DISPATCHING_SLOT, EVENT_STOP_IMMEDIATE_PROPAGATION_SLOT, EVENT_STOP_PROPAGATION_SLOT,
- SimpleObjectEventListenerSnapshot, dispatch_message_port_events_for_port_collecting_errors,
+ EVENT_STOP_IMMEDIATE_PROPAGATION_SLOT, EVENT_STOP_PROPAGATION_SLOT,
+ dispatch_message_port_events_for_port_collecting_errors,
dispatch_service_worker_controller_change, ensure_message_port_wrapper_for_id,
- event_internal_bool_flag, mark_event_trusted, runtime_message_allowed_for_current_target,
- set_event_internal_flag, simple_object_event_listeners_snapshot,
+ mark_event_trusted, runtime_message_allowed_for_current_target, set_event_internal_flag,
structured_deserialize_value_for_message_event,
};
-use crate::exception_reporting::{
- CallbackExceptionLogLevel, V8ExceptionReport, log_unhandled_promise_rejection,
-};
+use crate::exception_reporting::{V8ExceptionReport, log_unhandled_promise_rejection};
use crate::network_host::{
MaterializedResponseBody, MaterializedResponseHead,
build_navigation_preload_response_object_from_stream_for_request_mode,
@@ -71,7 +67,6 @@ use super::super::handle::{
};
use super::super::timer_callback::WorkerTimerCallbackOutcome;
use super::ActiveTimer;
-use super::WorkerExceptionError;
const SERVICE_WORKER_LIFECYCLE_EVENT_ID_SLOT: &str = "__lmServiceWorkerLifecycleEventId";
const SERVICE_WORKER_FETCH_EVENT_ID_SLOT: &str = "__lmServiceWorkerFetchEventId";
@@ -348,9 +343,7 @@ struct PendingWorkerPromiseRejection {
}
struct WorkerPromiseRejectDispatchSlot {
- parent_tx: mpsc::UnboundedSender<WorkerToParentMessage>,
worker_wake_tx: mpsc::UnboundedSender<WorkerMessage>,
- script_url: String,
pending_unhandled_rejections: Rc<RefCell<Vec<PendingWorkerPromiseRejection>>>,
reported_unhandled_rejections: Rc<RefCell<Vec<PendingWorkerPromiseRejection>>>,
unhandled_rejection_task_queued: Rc<Cell<bool>>,
@@ -358,14 +351,10 @@ struct WorkerPromiseRejectDispatchSlot {
pub(super) fn install_worker_promise_rejection_dispatch(
isolate: &mut v8::OwnedIsolate,
- parent_tx: mpsc::UnboundedSender<WorkerToParentMessage>,
worker_wake_tx: mpsc::UnboundedSender<WorkerMessage>,
- script_url: String,
) {
isolate.set_slot(WorkerPromiseRejectDispatchSlot {
- parent_tx,
worker_wake_tx,
- script_url,
pending_unhandled_rejections: Rc::new(RefCell::new(Vec::new())),
reported_unhandled_rejections: Rc::new(RefCell::new(Vec::new())),
unhandled_rejection_task_queued: Rc::new(Cell::new(false)),
@@ -376,8 +365,6 @@ pub(super) fn install_worker_promise_rejection_dispatch(
fn worker_promise_reject_dispatch_state(
scope: &mut v8::PinScope<'_, '_>,
) -> Option<(
- mpsc::UnboundedSender<WorkerToParentMessage>,
- String,
Rc<RefCell<Vec<PendingWorkerPromiseRejection>>>,
Rc<RefCell<Vec<PendingWorkerPromiseRejection>>>,
Rc<Cell<bool>>,
@@ -386,8 +373,6 @@ fn worker_promise_reject_dispatch_state(
.get_slot::<WorkerPromiseRejectDispatchSlot>()
.map(|slot| {
(
- slot.parent_tx.clone(),
- slot.script_url.clone(),
slot.pending_unhandled_rejections.clone(),
slot.reported_unhandled_rejections.clone(),
slot.unhandled_rejection_task_queued.clone(),
@@ -450,13 +435,8 @@ pub(super) fn dispatch_queued_worker_promise_rejections(scope: &mut v8::PinScope
}
fn flush_pending_worker_promise_rejections(scope: &mut v8::PinScope<'_, '_>) {
- let Some((
- parent_tx,
- script_url,
- pending_unhandled_rejections,
- reported_unhandled_rejections,
- _task_queued,
- )) = worker_promise_reject_dispatch_state(scope)
+ let Some((pending_unhandled_rejections, reported_unhandled_rejections, _task_queued)) =
+ worker_promise_reject_dispatch_state(scope)
else {
return;
};
@@ -468,14 +448,8 @@ fn flush_pending_worker_promise_rejections(scope: &mut v8::PinScope<'_, '_>) {
.reason
.as_ref()
.map(|reason| v8::Local::new(scope, reason));
- let allows_default = dispatch_worker_promise_rejection_event(
- scope,
- "unhandledrejection",
- promise,
- reason,
- &parent_tx,
- &script_url,
- );
+ let allows_default =
+ dispatch_worker_promise_rejection_event(scope, "unhandledrejection", promise, reason);
// Do not expose a `rejectionhandled` transition when the handler was
// attached by the `unhandledrejection` listener itself.
if !promise.has_handler() {
@@ -507,13 +481,8 @@ unsafe extern "C" fn worker_promise_reject_callback(message: v8::PromiseRejectMe
let context = scope.get_current_context();
let scope = &mut v8::ContextScope::new(scope, context);
- let Some((
- parent_tx,
- script_url,
- pending_unhandled_rejections,
- reported_unhandled_rejections,
- _task_queued,
- )) = worker_promise_reject_dispatch_state(scope)
+ let Some((pending_unhandled_rejections, reported_unhandled_rejections, _task_queued)) =
+ worker_promise_reject_dispatch_state(scope)
else {
return;
};
@@ -562,14 +531,8 @@ unsafe extern "C" fn worker_promise_reject_callback(message: v8::PromiseRejectMe
.as_ref()
.map(|reason| v8::Local::new(scope, reason))
.or_else(|| message.get_value());
- let _ = dispatch_worker_promise_rejection_event(
- scope,
- "rejectionhandled",
- promise,
- reason,
- &parent_tx,
- &script_url,
- );
+ let _ =
+ dispatch_worker_promise_rejection_event(scope, "rejectionhandled", promise, reason);
}
_ => {}
}
@@ -586,13 +549,6 @@ pub(super) fn event_bool_property(
.is_some_and(|value| value.is_true())
}
-fn event_stop_immediate_propagation<'s>(
- scope: &mut v8::PinScope<'s, '_>,
- event: v8::Local<'s, v8::Object>,
-) -> bool {
- event_internal_bool_flag(scope, event, EVENT_STOP_IMMEDIATE_PROPAGATION_SLOT)
-}
-
fn set_event_stop_immediate_propagation(
scope: &mut v8::PinScope<'_, '_>,
event: v8::Local<'_, v8::Object>,
@@ -601,59 +557,6 @@ fn set_event_stop_immediate_propagation(
set_event_internal_flag(scope, event, EVENT_STOP_IMMEDIATE_PROPAGATION_SLOT, true);
}
-fn set_event_dispatch_fields<'s>(
- scope: &mut v8::PinScope<'s, '_>,
- target: v8::Local<'s, v8::Object>,
- event: v8::Local<'s, v8::Object>,
-) {
- mark_event_trusted(scope, event);
- let _ = crate::context_bootstrap::event_backing(scope, event).set(
- scope,
- v8str(scope, "target").into(),
- target.into(),
- );
- let _ = crate::context_bootstrap::event_backing(scope, event).set(
- scope,
- v8str(scope, "srcElement").into(),
- target.into(),
- );
- let _ = crate::context_bootstrap::event_backing(scope, event).set(
- scope,
- v8str(scope, "currentTarget").into(),
- target.into(),
- );
- let _ = crate::context_bootstrap::event_backing(scope, event).set(
- scope,
- v8str(scope, "eventPhase").into(),
- v8::Integer::new_from_unsigned(scope, 2).into(),
- );
- crate::context_bootstrap::set_event_private_value(
- scope,
- event,
- EVENT_DISPATCHING_SLOT,
- v8::Boolean::new(scope, true).into(),
- );
-}
-
-fn clear_event_dispatch_fields(scope: &mut v8::PinScope<'_, '_>, event: v8::Local<'_, v8::Object>) {
- let _ = crate::context_bootstrap::event_backing(scope, event).set(
- scope,
- v8str(scope, "currentTarget").into(),
- v8::null(scope).into(),
- );
- let _ = crate::context_bootstrap::event_backing(scope, event).set(
- scope,
- v8str(scope, "eventPhase").into(),
- v8::Integer::new_from_unsigned(scope, 0).into(),
- );
- crate::context_bootstrap::set_event_private_value(
- scope,
- event,
- EVENT_DISPATCHING_SLOT,
- v8::Boolean::new(scope, false).into(),
- );
-}
-
fn worker_event_prevent_default_callback(
scope: &mut v8::PinScope<'_, '_>,
args: v8::FunctionCallbackArguments<'_>,
@@ -748,45 +651,41 @@ fn new_worker_promise_rejection_event<'s>(
event
}
+fn dispatch_worker_event<'s>(
+ scope: &mut v8::PinScope<'s, '_>,
+ target: v8::Local<'s, v8::Object>,
+ event: v8::Local<'s, v8::Object>,
+ event_type: &str,
+ checkpoint: bool,
+) {
+ mark_event_trusted(scope, event);
+ if checkpoint {
+ crate::context_bootstrap::dispatch_simple_event_target_event_with_checkpoint(
+ scope,
+ target,
+ event_type,
+ event,
+ perform_worker_microtask_checkpoint_and_report_pending_promise_rejections,
+ );
+ } else {
+ crate::context_bootstrap::dispatch_simple_event_target_event(
+ scope, target, event_type, event,
+ );
+ }
+}
+
fn dispatch_worker_promise_rejection_event<'s>(
scope: &mut v8::PinScope<'s, '_>,
event_type: &str,
promise: v8::Local<'s, v8::Promise>,
reason: Option<v8::Local<'s, v8::Value>>,
- parent_tx: &mpsc::UnboundedSender<WorkerToParentMessage>,
- script_url: &str,
) -> bool {
let global = scope.get_current_context().global(scope);
let event = new_worker_promise_rejection_event(scope, event_type, promise, reason);
- set_event_dispatch_fields(scope, global, event);
- let listeners = simple_object_event_listeners_snapshot(scope, global, event_type);
- for listener in &listeners {
- if let Err(error) = invoke_worker_listener(
- scope,
- listener,
- global,
- event,
- event_type,
- "WorkerGlobalScope promise rejection listener",
- ) {
- let (report, exception) = *error;
- let exception = exception.as_ref().map(|value| v8::Local::new(scope, value));
- dispatch_worker_exception(
- scope,
- global,
- report,
- exception,
- WorkerParentErrorEventKind::ErrorEvent,
- parent_tx,
- script_url,
- );
- }
- }
+ dispatch_worker_event(scope, global, event, event_type, false);
- let allows_default = !event_bool_property(scope, event, "defaultPrevented");
- clear_event_dispatch_fields(scope, event);
- allows_default
+ !event_bool_property(scope, event, "defaultPrevented")
}
pub(super) fn report_exception_to_parent(
@@ -891,41 +790,6 @@ fn apply_worker_exception_location_overrides<'s>(
}
}
-fn invoke_worker_listener<'s>(
- scope: &mut v8::PinScope<'s, '_>,
- listener: &SimpleObjectEventListenerSnapshot<'s>,
- target: v8::Local<'s, v8::Object>,
- event: v8::Local<'s, v8::Object>,
- event_type: &str,
- callback_name: &str,
-) -> Result<(), WorkerExceptionError> {
- if event_stop_immediate_propagation(scope, event) {
- return Ok(());
- }
- let Some(listener) = listener.prepare_for_invocation(scope, target, event_type) else {
- return Ok(());
- };
- let arguments = [event.into()];
- let invocation = listener.invocation(target.into(), &arguments, Some(event));
- match CallbackInvoker::invoke(
- scope,
- "event listener",
- "worker event listener threw",
- CallbackExceptionLogLevel::Debug,
- callback_name,
- invocation,
- ) {
- CallbackInvocationOutcome::Returned(_) | CallbackInvocationOutcome::Retired => Ok(()),
- CallbackInvocationOutcome::Threw(report) => {
- let exception = report
- .exception
- .as_ref()
- .map(|exception| v8::Global::new(scope, v8::Local::new(scope, exception)));
- Err(Box::new((*report, exception)))
- }
- }
-}
-
struct WorkerErrorReportingScope(Rc<RefCell<super::WorkerGlobalState>>);
impl Drop for WorkerErrorReportingScope {
@@ -962,17 +826,13 @@ pub(super) fn dispatch_service_worker_lifecycle_event(
context: &v8::Global<v8::Context>,
state: &Rc<RefCell<super::WorkerGlobalState>>,
event: ServiceWorkerLifecycleEvent,
- parent_tx: &mpsc::UnboundedSender<WorkerToParentMessage>,
- script_url: &str,
) {
let scope = pin!(v8::HandleScope::new(isolate));
let scope = &mut scope.init();
let ctx = v8::Local::new(scope, context);
let scope = &mut v8::ContextScope::new(scope, ctx);
let global = ctx.global(scope);
- dispatch_service_worker_lifecycle_event_in_context(
- scope, global, state, event, parent_tx, script_url,
- );
+ dispatch_service_worker_lifecycle_event_in_context(scope, global, state, event);
perform_worker_microtask_checkpoint_and_report_pending_promise_rejections(scope);
}
@@ -982,16 +842,13 @@ pub(super) fn dispatch_service_worker_fetch_event(
state: &Rc<RefCell<super::WorkerGlobalState>>,
event: ServiceWorkerFetchEvent,
parent_tx: &mpsc::UnboundedSender<WorkerToParentMessage>,
- script_url: &str,
) {
let scope = pin!(v8::HandleScope::new(isolate));
let scope = &mut scope.init();
let ctx = v8::Local::new(scope, context);
let scope = &mut v8::ContextScope::new(scope, ctx);
let global = ctx.global(scope);
- dispatch_service_worker_fetch_event_in_context(
- scope, global, state, event, parent_tx, script_url,
- );
+ dispatch_service_worker_fetch_event_in_context(scope, global, state, event, parent_tx);
perform_worker_microtask_checkpoint_and_report_pending_promise_rejections(scope);
}
@@ -1030,17 +887,13 @@ pub(super) fn dispatch_service_worker_message_event(
context: &v8::Global<v8::Context>,
state: &Rc<RefCell<super::WorkerGlobalState>>,
event: ServiceWorkerMessageEvent,
- parent_tx: &mpsc::UnboundedSender<WorkerToParentMessage>,
- script_url: &str,
) {
let scope = pin!(v8::HandleScope::new(isolate));
let scope = &mut scope.init();
let ctx = v8::Local::new(scope, context);
let scope = &mut v8::ContextScope::new(scope, ctx);
let global = ctx.global(scope);
- dispatch_service_worker_message_event_in_context(
- scope, global, state, event, parent_tx, script_url,
- );
+ dispatch_service_worker_message_event_in_context(scope, global, state, event);
perform_worker_microtask_checkpoint_and_report_pending_promise_rejections(scope);
}
@@ -1062,16 +915,13 @@ pub(super) fn dispatch_service_worker_notification_event(
state: &Rc<RefCell<super::WorkerGlobalState>>,
event: ServiceWorkerNotificationEvent,
parent_tx: &mpsc::UnboundedSender<WorkerToParentMessage>,
- script_url: &str,
) {
let scope = pin!(v8::HandleScope::new(isolate));
let scope = &mut scope.init();
let ctx = v8::Local::new(scope, context);
let scope = &mut v8::ContextScope::new(scope, ctx);
let global = ctx.global(scope);
- dispatch_service_worker_notification_event_in_context(
- scope, global, state, event, parent_tx, script_url,
- );
+ dispatch_service_worker_notification_event_in_context(scope, global, state, event, parent_tx);
perform_worker_microtask_checkpoint_and_report_pending_promise_rejections(scope);
}
@@ -1081,16 +931,13 @@ pub(super) fn dispatch_service_worker_push_event(
state: &Rc<RefCell<super::WorkerGlobalState>>,
event: ServiceWorkerPushEvent,
parent_tx: &mpsc::UnboundedSender<WorkerToParentMessage>,
- script_url: &str,
) {
let scope = pin!(v8::HandleScope::new(isolate));
let scope = &mut scope.init();
let ctx = v8::Local::new(scope, context);
let scope = &mut v8::ContextScope::new(scope, ctx);
let global = ctx.global(scope);
- dispatch_service_worker_push_event_in_context(
- scope, global, state, event, parent_tx, script_url,
- );
+ dispatch_service_worker_push_event_in_context(scope, global, state, event, parent_tx);
perform_worker_microtask_checkpoint_and_report_pending_promise_rejections(scope);
}
@@ -1100,16 +947,13 @@ pub(super) fn dispatch_service_worker_sync_event(
state: &Rc<RefCell<super::WorkerGlobalState>>,
event: ServiceWorkerSyncEvent,
parent_tx: &mpsc::UnboundedSender<WorkerToParentMessage>,
- script_url: &str,
) {
let scope = pin!(v8::HandleScope::new(isolate));
let scope = &mut scope.init();
let ctx = v8::Local::new(scope, context);
let scope = &mut v8::ContextScope::new(scope, ctx);
let global = ctx.global(scope);
- dispatch_service_worker_sync_event_in_context(
- scope, global, state, event, parent_tx, script_url,
- );
+ dispatch_service_worker_sync_event_in_context(scope, global, state, event, parent_tx);
perform_worker_microtask_checkpoint_and_report_pending_promise_rejections(scope);
}
@@ -1119,16 +963,13 @@ pub(super) fn dispatch_service_worker_periodic_sync_event(
state: &Rc<RefCell<super::WorkerGlobalState>>,
event: ServiceWorkerPeriodicSyncEvent,
parent_tx: &mpsc::UnboundedSender<WorkerToParentMessage>,
- script_url: &str,
) {
let scope = pin!(v8::HandleScope::new(isolate));
let scope = &mut scope.init();
let ctx = v8::Local::new(scope, context);
let scope = &mut v8::ContextScope::new(scope, ctx);
let global = ctx.global(scope);
- dispatch_service_worker_periodic_sync_event_in_context(
- scope, global, state, event, parent_tx, script_url,
- );
+ dispatch_service_worker_periodic_sync_event_in_context(scope, global, state, event, parent_tx);
perform_worker_microtask_checkpoint_and_report_pending_promise_rejections(scope);
}
@@ -1137,12 +978,9 @@ fn dispatch_service_worker_lifecycle_event_in_context<'s>(
global: v8::Local<'s, v8::Object>,
state: &Rc<RefCell<super::WorkerGlobalState>>,
event: ServiceWorkerLifecycleEvent,
- parent_tx: &mpsc::UnboundedSender<WorkerToParentMessage>,
- script_url: &str,
) {
let event_object = new_service_worker_lifecycle_event(scope, event.kind);
set_service_worker_event_id(scope, event_object, event.event_id);
- set_event_dispatch_fields(scope, global, event_object);
{
let mut state = state.borrow_mut();
state.pending_service_worker_lifecycle_events.insert(
@@ -1161,31 +999,7 @@ fn dispatch_service_worker_lifecycle_event_in_context<'s>(
}
let event_type = event.kind.as_str();
- let listeners = simple_object_event_listeners_snapshot(scope, global, event_type);
- for listener in &listeners {
- if let Err(error) = invoke_worker_listener(
- scope,
- listener,
- global,
- event_object,
- event_type,
- "ServiceWorkerGlobalScope lifecycle listener",
- ) {
- let (report, exception) = *error;
- let exception = exception.as_ref().map(|value| v8::Local::new(scope, value));
- dispatch_worker_exception(
- scope,
- global,
- report,
- exception,
- WorkerParentErrorEventKind::ErrorEvent,
- parent_tx,
- script_url,
- );
- }
- }
- perform_worker_microtask_checkpoint_and_report_pending_promise_rejections(scope);
- clear_event_dispatch_fields(scope, event_object);
+ dispatch_worker_event(scope, global, event_object, event_type, true);
mark_service_worker_lifecycle_dispatch_finished(state, event.event_id);
maybe_send_service_worker_lifecycle_completion(state, event.event_id);
}
@@ -1196,7 +1010,6 @@ fn dispatch_service_worker_fetch_event_in_context<'s>(
state: &Rc<RefCell<super::WorkerGlobalState>>,
event: ServiceWorkerFetchEvent,
parent_tx: &mpsc::UnboundedSender<WorkerToParentMessage>,
- script_url: &str,
) {
let Some((request, request_signal_id)) =
new_service_worker_fetch_request(scope, global, &event)
@@ -1243,7 +1056,6 @@ fn dispatch_service_worker_fetch_event_in_context<'s>(
let event_object =
new_service_worker_fetch_event(scope, &event, request, handled, preload_response);
set_service_worker_fetch_event_id(scope, event_object, event.event_id);
- set_event_dispatch_fields(scope, global, event_object);
{
let mut state = state.borrow_mut();
let mut pending = PendingServiceWorkerFetchEvent::fallback(
@@ -1273,39 +1085,12 @@ fn dispatch_service_worker_fetch_event_in_context<'s>(
.insert(event.event_id, pending);
}
- let listeners = simple_object_event_listeners_snapshot(scope, global, "fetch");
- for listener in &listeners {
- if let Err(error) = invoke_worker_listener(
- scope,
- listener,
- global,
- event_object,
- "fetch",
- "ServiceWorkerGlobalScope fetch listener",
- ) {
- let (report, exception) = *error;
- let exception = exception.as_ref().map(|value| v8::Local::new(scope, value));
- dispatch_worker_exception(
- scope,
- global,
- report,
- exception,
- WorkerParentErrorEventKind::ErrorEvent,
- parent_tx,
- script_url,
- );
- }
- if event_stop_immediate_propagation(scope, event_object) {
- break;
- }
- }
- perform_worker_microtask_checkpoint_and_report_pending_promise_rejections(scope);
+ dispatch_worker_event(scope, global, event_object, "fetch", true);
let default_prevented_without_response =
event_bool_property(scope, event_object, "defaultPrevented");
if default_prevented_without_response {
mark_service_worker_fetch_default_prevented(state, event.event_id);
}
- clear_event_dispatch_fields(scope, event_object);
mark_service_worker_fetch_dispatch_finished(state, event.event_id);
settle_service_worker_fetch_handled_after_dispatch(scope, state, event.event_id);
maybe_send_service_worker_fetch_completion(state, event.event_id, scope);
@@ -1316,8 +1101,6 @@ fn dispatch_service_worker_message_event_in_context<'s>(
global: v8::Local<'s, v8::Object>,
state: &Rc<RefCell<super::WorkerGlobalState>>,
event: ServiceWorkerMessageEvent,
- parent_tx: &mpsc::UnboundedSender<WorkerToParentMessage>,
- script_url: &str,
) {
let (event_type, event_object) = new_service_worker_message_event(scope, &event)
.unwrap_or_else(|| {
@@ -1327,7 +1110,6 @@ fn dispatch_service_worker_message_event_in_context<'s>(
)
});
set_service_worker_message_event_id(scope, event_object, event.event_id);
- set_event_dispatch_fields(scope, global, event_object);
{
let mut state = state.borrow_mut();
state.pending_service_worker_message_events.insert(
@@ -1350,31 +1132,7 @@ fn dispatch_service_worker_message_event_in_context<'s>(
}
}
- let listeners = simple_object_event_listeners_snapshot(scope, global, event_type);
- for listener in &listeners {
- if let Err(error) = invoke_worker_listener(
- scope,
- listener,
- global,
- event_object,
- event_type,
- "ServiceWorkerGlobalScope message listener",
- ) {
- let (report, exception) = *error;
- let exception = exception.as_ref().map(|value| v8::Local::new(scope, value));
- dispatch_worker_exception(
- scope,
- global,
- report,
- exception,
- WorkerParentErrorEventKind::ErrorEvent,
- parent_tx,
- script_url,
- );
- }
- }
- perform_worker_microtask_checkpoint_and_report_pending_promise_rejections(scope);
- clear_event_dispatch_fields(scope, event_object);
+ dispatch_worker_event(scope, global, event_object, event_type, true);
mark_service_worker_message_dispatch_finished(state, event.event_id);
maybe_send_service_worker_message_completion(state, event.event_id);
}
@@ -1385,7 +1143,6 @@ fn dispatch_service_worker_notification_event_in_context<'s>(
state: &Rc<RefCell<super::WorkerGlobalState>>,
event: ServiceWorkerNotificationEvent,
parent_tx: &mpsc::UnboundedSender<WorkerToParentMessage>,
- script_url: &str,
) {
let Some(event_object) = new_service_worker_notification_event(scope, global, &event) else {
let _ = parent_tx.send(WorkerToParentMessage::ServiceWorkerNotificationCompleted(
@@ -1398,7 +1155,6 @@ fn dispatch_service_worker_notification_event_in_context<'s>(
return;
};
set_service_worker_notification_event_id(scope, event_object, event.event_id);
- set_event_dispatch_fields(scope, global, event_object);
{
let mut state = state.borrow_mut();
let window_interaction_allowed = event.kind.grants_window_interaction();
@@ -1423,31 +1179,7 @@ fn dispatch_service_worker_notification_event_in_context<'s>(
}
let event_type = event.kind.as_str();
- let listeners = simple_object_event_listeners_snapshot(scope, global, event_type);
- for listener in &listeners {
- if let Err(error) = invoke_worker_listener(
- scope,
- listener,
- global,
- event_object,
- event_type,
- "ServiceWorkerGlobalScope notification listener",
- ) {
- let (report, exception) = *error;
- let exception = exception.as_ref().map(|value| v8::Local::new(scope, value));
- dispatch_worker_exception(
- scope,
- global,
- report,
- exception,
- WorkerParentErrorEventKind::ErrorEvent,
- parent_tx,
- script_url,
- );
- }
- }
- perform_worker_microtask_checkpoint_and_report_pending_promise_rejections(scope);
- clear_event_dispatch_fields(scope, event_object);
+ dispatch_worker_event(scope, global, event_object, event_type, true);
mark_service_worker_notification_dispatch_finished(state, event.event_id);
maybe_send_service_worker_notification_completion(state, event.event_id);
}
@@ -1458,7 +1190,6 @@ fn dispatch_service_worker_push_event_in_context<'s>(
state: &Rc<RefCell<super::WorkerGlobalState>>,
event: ServiceWorkerPushEvent,
parent_tx: &mpsc::UnboundedSender<WorkerToParentMessage>,
- script_url: &str,
) {
let Some(event_object) = new_service_worker_push_event(scope, &event) else {
let _ = parent_tx.send(WorkerToParentMessage::ServiceWorkerPushCompleted(
@@ -1471,7 +1202,6 @@ fn dispatch_service_worker_push_event_in_context<'s>(
return;
};
set_service_worker_push_event_id(scope, event_object, event.event_id);
- set_event_dispatch_fields(scope, global, event_object);
{
let mut state = state.borrow_mut();
state.pending_service_worker_push_events.insert(
@@ -1488,31 +1218,7 @@ fn dispatch_service_worker_push_event_in_context<'s>(
);
}
- let listeners = simple_object_event_listeners_snapshot(scope, global, "push");
- for listener in &listeners {
- if let Err(error) = invoke_worker_listener(
- scope,
- listener,
- global,
- event_object,
- "push",
- "ServiceWorkerGlobalScope push listener",
- ) {
- let (report, exception) = *error;
- let exception = exception.as_ref().map(|value| v8::Local::new(scope, value));
- dispatch_worker_exception(
- scope,
- global,
- report,
- exception,
- WorkerParentErrorEventKind::ErrorEvent,
- parent_tx,
- script_url,
- );
- }
- }
- perform_worker_microtask_checkpoint_and_report_pending_promise_rejections(scope);
- clear_event_dispatch_fields(scope, event_object);
+ dispatch_worker_event(scope, global, event_object, "push", true);
mark_service_worker_push_dispatch_finished(state, event.event_id);
maybe_send_service_worker_push_completion(state, event.event_id);
}
@@ -1523,7 +1229,6 @@ fn dispatch_service_worker_sync_event_in_context<'s>(
state: &Rc<RefCell<super::WorkerGlobalState>>,
event: ServiceWorkerSyncEvent,
parent_tx: &mpsc::UnboundedSender<WorkerToParentMessage>,
- script_url: &str,
) {
let Some(event_object) = new_service_worker_sync_event(scope, &event) else {
let _ = parent_tx.send(WorkerToParentMessage::ServiceWorkerSyncCompleted(
@@ -1538,7 +1243,6 @@ fn dispatch_service_worker_sync_event_in_context<'s>(
return;
};
set_service_worker_sync_event_id(scope, event_object, event.event_id);
- set_event_dispatch_fields(scope, global, event_object);
{
let mut state = state.borrow_mut();
state.pending_service_worker_sync_events.insert(
@@ -1557,31 +1261,7 @@ fn dispatch_service_worker_sync_event_in_context<'s>(
);
}
- let listeners = simple_object_event_listeners_snapshot(scope, global, "sync");
- for listener in &listeners {
- if let Err(error) = invoke_worker_listener(
- scope,
- listener,
- global,
- event_object,
- "sync",
- "ServiceWorkerGlobalScope sync listener",
- ) {
- let (report, exception) = *error;
- let exception = exception.as_ref().map(|value| v8::Local::new(scope, value));
- dispatch_worker_exception(
- scope,
- global,
- report,
- exception,
- WorkerParentErrorEventKind::ErrorEvent,
- parent_tx,
- script_url,
- );
- }
- }
- perform_worker_microtask_checkpoint_and_report_pending_promise_rejections(scope);
- clear_event_dispatch_fields(scope, event_object);
+ dispatch_worker_event(scope, global, event_object, "sync", true);
mark_service_worker_sync_dispatch_finished(state, event.event_id);
maybe_send_service_worker_sync_completion(state, event.event_id);
}
@@ -1592,7 +1272,6 @@ fn dispatch_service_worker_periodic_sync_event_in_context<'s>(
state: &Rc<RefCell<super::WorkerGlobalState>>,
event: ServiceWorkerPeriodicSyncEvent,
parent_tx: &mpsc::UnboundedSender<WorkerToParentMessage>,
- script_url: &str,
) {
let Some(event_object) = new_service_worker_periodic_sync_event(scope, &event) else {
let _ = parent_tx.send(WorkerToParentMessage::ServiceWorkerPeriodicSyncCompleted(
@@ -1607,7 +1286,6 @@ fn dispatch_service_worker_periodic_sync_event_in_context<'s>(
return;
};
set_service_worker_periodic_sync_event_id(scope, event_object, event.event_id);
- set_event_dispatch_fields(scope, global, event_object);
{
let mut state = state.borrow_mut();
state.pending_service_worker_periodic_sync_events.insert(
@@ -1626,31 +1304,7 @@ fn dispatch_service_worker_periodic_sync_event_in_context<'s>(
);
}
- let listeners = simple_object_event_listeners_snapshot(scope, global, "periodicsync");
- for listener in &listeners {
- if let Err(error) = invoke_worker_listener(
- scope,
- listener,
- global,
- event_object,
- "periodicsync",
- "ServiceWorkerGlobalScope periodicsync listener",
- ) {
- let (report, exception) = *error;
- let exception = exception.as_ref().map(|value| v8::Local::new(scope, value));
- dispatch_worker_exception(
- scope,
- global,
- report,
- exception,
- WorkerParentErrorEventKind::ErrorEvent,
- parent_tx,
- script_url,
- );
- }
- }
- perform_worker_microtask_checkpoint_and_report_pending_promise_rejections(scope);
- clear_event_dispatch_fields(scope, event_object);
+ dispatch_worker_event(scope, global, event_object, "periodicsync", true);
mark_service_worker_periodic_sync_dispatch_finished(state, event.event_id);
maybe_send_service_worker_periodic_sync_completion(state, event.event_id);
}
@@ -4153,37 +3807,10 @@ fn dispatch_worker_global_message_event<'s>(
event_type: &str,
data: v8::Local<'s, v8::Value>,
ports: v8::Local<'s, v8::Array>,
- parent_tx: &mpsc::UnboundedSender<WorkerToParentMessage>,
- script_url: &str,
) {
let event = new_worker_message_event(scope, event_type, data, None, ports);
- set_event_dispatch_fields(scope, global, event);
- let listeners = simple_object_event_listeners_snapshot(scope, global, event_type);
- for listener in &listeners {
- if let Err(error) = invoke_worker_listener(
- scope,
- listener,
- global,
- event,
- event_type,
- "WorkerGlobalScope message listener",
- ) {
- let (report, exception) = *error;
- let exception = exception.as_ref().map(|value| v8::Local::new(scope, value));
- dispatch_worker_exception(
- scope,
- global,
- report,
- exception,
- WorkerParentErrorEventKind::ErrorEvent,
- parent_tx,
- script_url,
- );
- }
- }
-
- clear_event_dispatch_fields(scope, event);
+ dispatch_worker_event(scope, global, event, event_type, false);
}
/// Dispatch a parent `postMessage()` delivery into the worker global.
@@ -4191,8 +3818,6 @@ pub(super) fn dispatch_message_event(
isolate: &mut v8::OwnedIsolate,
context: &v8::Global<v8::Context>,
payload: &V8StructuredClonePayload,
- parent_tx: &mpsc::UnboundedSender<WorkerToParentMessage>,
- script_url: &str,
) {
let scope = pin!(v8::HandleScope::new(isolate));
let scope = &mut scope.init();
@@ -4207,9 +3832,7 @@ pub(super) fn dispatch_message_event(
if let Some((data, ports)) =
structured_deserialize_value_for_message_event(&mut scope, payload)
{
- dispatch_worker_global_message_event(
- &mut scope, global, "message", data, ports, parent_tx, script_url,
- );
+ dispatch_worker_global_message_event(&mut scope, global, "message", data, ports);
} else {
// `postMessage` delivery failures are reported to the receiver as a
// `messageerror` event. This matters for secure-context-only host
@@ -4221,15 +3844,7 @@ pub(super) fn dispatch_message_event(
}
let data = v8::null(&scope).into();
let ports = v8::Array::new(&scope, 0);
- dispatch_worker_global_message_event(
- &mut scope,
- global,
- "messageerror",
- data,
- ports,
- parent_tx,
- script_url,
- );
+ dispatch_worker_global_message_event(&mut scope, global, "messageerror", data, ports);
}
}
@@ -4240,8 +3855,6 @@ pub(super) fn dispatch_shared_worker_connect_event(
isolate: &mut v8::OwnedIsolate,
context: &v8::Global<v8::Context>,
port_id: MessagePortId,
- parent_tx: &mpsc::UnboundedSender<WorkerToParentMessage>,
- script_url: &str,
) {
let scope = pin!(v8::HandleScope::new(isolate));
let scope = &mut scope.init();
@@ -4260,33 +3873,9 @@ pub(super) fn dispatch_shared_worker_connect_event(
let _ = ports.set_integrity_level(scope, v8::IntegrityLevel::Frozen);
let data = v8str(scope, "").into();
let event = new_worker_message_event(scope, "connect", data, source, ports);
- set_event_dispatch_fields(scope, global, event);
- let listeners = simple_object_event_listeners_snapshot(scope, global, "connect");
- for listener in &listeners {
- if let Err(error) = invoke_worker_listener(
- scope,
- listener,
- global,
- event,
- "connect",
- "SharedWorkerGlobalScope connect listener",
- ) {
- let (report, exception) = *error;
- let exception = exception.as_ref().map(|value| v8::Local::new(scope, value));
- dispatch_worker_exception(
- scope,
- global,
- report,
- exception,
- WorkerParentErrorEventKind::ErrorEvent,
- parent_tx,
- script_url,
- );
- }
- }
+ dispatch_worker_event(scope, global, event, "connect", false);
- clear_event_dispatch_fields(scope, event);
perform_worker_microtask_checkpoint_and_report_pending_promise_rejections(scope);
}
diff --git a/moli-renderer-v8/src/worker/thread/mod.rs b/moli-renderer-v8/src/worker/thread/mod.rs
index 243a51e7e..2ca3434d8 100644
--- a/moli-renderer-v8/src/worker/thread/mod.rs
+++ b/moli-renderer-v8/src/worker/thread/mod.rs
@@ -113,8 +113,6 @@ use super::module_runtime::{
worker_has_pending_dynamic_module_imports, worker_has_runnable_dynamic_module_imports,
};
-pub(super) type WorkerExceptionError = Box<(V8ExceptionReport, Option<v8::Global<v8::Value>>)>;
-
const WORKER_STACK_SIZE: usize = 4 * 1024 * 1024; // 4 MiB
#[derive(Debug, Clone, Copy, PartialEq, Eq, strum::EnumString, crate::webidl::WebIdlEnum)]
@@ -1568,9 +1566,7 @@ async fn worker_main(
.bind_request_client(loader.request_client().clone());
install_worker_promise_rejection_dispatch(
worker_isolate.worker_isolate_mut(),
- parent_tx.clone(),
worker_wake_tx.clone(),
- script_url.clone(),
);
// Worker-owned isolate timer queues are shared between V8 callbacks and the
@@ -2019,13 +2015,7 @@ async fn worker_main(
pending_bootstrap_messages.push_back(WorkerMessage::Post(payload));
continue;
}
- dispatch_message_event(
- worker_isolate.worker_isolate_mut(),
- &context,
- &payload,
- &parent_tx,
- &script_url,
- );
+ dispatch_message_event(worker_isolate.worker_isolate_mut(), &context, &payload);
drain_worker_dynamic_module_imports_for_context(
worker_isolate.worker_isolate_mut(),
&context,
@@ -2066,8 +2056,6 @@ async fn worker_main(
worker_isolate.worker_isolate_mut(),
&context,
port_id,
- &parent_tx,
- &script_url,
);
drain_worker_dynamic_module_imports_for_context(
worker_isolate.worker_isolate_mut(),
@@ -2105,8 +2093,6 @@ async fn worker_main(
&context,
&state,
*event,
- &parent_tx,
- &script_url,
);
drain_worker_dynamic_module_imports_for_context(
worker_isolate.worker_isolate_mut(),
@@ -2127,7 +2113,6 @@ async fn worker_main(
&state,
*event,
&parent_tx,
- &script_url,
);
drain_worker_dynamic_module_imports_for_context(
worker_isolate.worker_isolate_mut(),
@@ -2285,8 +2270,6 @@ async fn worker_main(
&context,
&state,
*event,
- &parent_tx,
- &script_url,
);
drain_worker_dynamic_module_imports_for_context(
worker_isolate.worker_isolate_mut(),
@@ -2307,7 +2290,6 @@ async fn worker_main(
&state,
*event,
&parent_tx,
- &script_url,
);
drain_worker_dynamic_module_imports_for_context(
worker_isolate.worker_isolate_mut(),
@@ -2328,7 +2310,6 @@ async fn worker_main(
&state,
*event,
&parent_tx,
- &script_url,
);
drain_worker_dynamic_module_imports_for_context(
worker_isolate.worker_isolate_mut(),
@@ -2349,7 +2330,6 @@ async fn worker_main(
&state,
*event,
&parent_tx,
- &script_url,
);
drain_worker_dynamic_module_imports_for_context(
worker_isolate.worker_isolate_mut(),
@@ -2370,7 +2350,6 @@ async fn worker_main(
&state,
*event,
&parent_tx,
- &script_url,
);
drain_worker_dynamic_module_imports_for_context(
worker_isolate.worker_isolate_mut(),
diff --git a/moli-renderer-v8/src/worker/thread/tests/event_target_prototype.rs b/moli-renderer-v8/src/worker/thread/tests/event_target_prototype.rs
index 6f71e4db0..9a3c99cb7 100644
--- a/moli-renderer-v8/src/worker/thread/tests/event_target_prototype.rs
+++ b/moli-renderer-v8/src/worker/thread/tests/event_target_prototype.rs
@@ -37,3 +37,30 @@ async fn worker_event_target_prototype_methods_preserve_native_state() {
assert_eq!(result["total"], 56, "{result}");
assert_eq!(result["passed"], result["total"], "{result}");
}
+
+#[tokio::test]
+async fn native_promise_rejection_events_finish_shared_dispatch_state() {
+ ensure_v8();
+ let mut handle = spawn_worker(r#"
+ let retained;
+ let calls = 0;
+ let identity = false;
+ addEventListener('unhandledrejection', function(event) {
+ retained = event;
+ identity = this === self && event.target === self && event.currentTarget === self &&
+ event.composedPath()[0] === self && event.isTrusted;
+ calls++;
+ event.preventDefault();
+ setTimeout(() => {
+ const finished = retained.currentTarget === null && retained.composedPath().length === 0;
+ self.dispatchEvent(retained);
+ postMessage([identity, finished, calls, retained.isTrusted]);
+ close();
+ }, 0);
+ }, {once: true});
+ addEventListener('unhandledrejection', () => calls += 10, {once: true});
+ Promise.reject('dispatch-state-probe');
+ "#.into(), "https://worker.test/native-rejection.js".into());
+ let message = timeout(TIMEOUT, handle.recv()).await.unwrap().unwrap();
+ assert_eq!(expect_post_json(message), "[true,true,11,false]");
+}
diff --git a/moli-renderer-v8/tests/fixtures/event-target-inheritance.js b/moli-renderer-v8/tests/fixtures/event-target-inheritance.js
index 9d296abd9..abc8f3784 100644
--- a/moli-renderer-v8/tests/fixtures/event-target-inheritance.js
+++ b/moli-renderer-v8/tests/fixtures/event-target-inheritance.js
@@ -22,6 +22,19 @@
check(!target.dispatchEvent(event) && calls.length === 1 && calls[0], label + ': dispatch identity');
check(target.dispatchEvent(new Event('inheritance-probe')) && calls.length === 1, label + ': once');
check(event.currentTarget === null && event.composedPath().length === 0, label + ': cleanup');
+ const order = [];
+ target.addEventListener('order-probe', () => order.push('normal'), {once: true});
+ target.addEventListener('order-probe', event => {
+ order.push('capture');
+ event.stopPropagation();
+ target.addEventListener('order-probe', () => order.push('late'), {once: true});
+ }, {capture: true, once: true});
+ target.addEventListener('order-probe', () => order.push('last'), {once: true});
+ target.dispatchEvent(new Event('order-probe'));
+ check(order.join(',') === 'normal,capture,last', label + ': registration order and stopPropagation');
+ order.length = 0;
+ target.dispatchEvent(new Event('order-probe'));
+ check(order.join(',') === 'late', label + ': list snapshot and stop flag cleanup');
const original = EventTarget.prototype.addEventListener;
let inheritedCalls = 0;
try {
diff --git a/moli-renderer-v8/tests/fixtures/event-target-prototype.js b/moli-renderer-v8/tests/fixtures/event-target-prototype.js
index e4cc364f1..d24472794 100644
--- a/moli-renderer-v8/tests/fixtures/event-target-prototype.js
+++ b/moli-renderer-v8/tests/fixtures/event-target-prototype.js
@@ -118,7 +118,7 @@
dispatch.call(target, event('x')); remove.call(target, 'x', capture, true);
dispatch.call(target, event('x'));
observations.captureOrder = trace.join(',');
- return observations.captureOrder === 'capture,bubble,bubble';
+ return observations.captureOrder === 'bubble,capture,bubble';
});
check('cancellation and passive listeners are preserved', () => {
const a = make(), b = make(), ea = event('x'), eb = event('x');
diff --git a/moli-renderer-v8/tests/fixtures/fontfaceset-bindings.js b/moli-renderer-v8/tests/fixtures/fontfaceset-bindings.js
index 07632551a..dedae53f2 100644
--- a/moli-renderer-v8/tests/fixtures/fontfaceset-bindings.js
+++ b/moli-renderer-v8/tests/fixtures/fontfaceset-bindings.js
@@ -102,7 +102,7 @@ async function fontFaceSetBindingsProbe(realm, fonts) {
controller.abort();
const event = new realm.Event('loading', {cancelable: true});
check(methods.dispatchEvent.call(fonts, event) === false, 'event cancellation');
- check(calls.join() === 'capture,listener,handler,once', 'event handler order: ' + calls);
+ check(calls.join() === 'listener,handler,once,capture', 'event handler order: ' + calls);
check(event.currentTarget === null && event.eventPhase === 0, 'dispatch cleanup');
methods.removeEventListener.call(fonts, 'loading', listener);
fonts.onloading = null;
diff --git a/moli-wpt-compat/fixtures/wpt/manifest.toml b/moli-wpt-compat/fixtures/wpt/manifest.toml
index e5671bf1e..7c4908bf4 100644
--- a/moli-wpt-compat/fixtures/wpt/manifest.toml
+++ b/moli-wpt-compat/fixtures/wpt/manifest.toml
@@ -11799,7 +11799,7 @@ wait_until = "load"
timeout_ms = 30000
suite = "smoke"
tags = ["worker", "events"]
-notes = "Manual smoke port for page-global window.onerror propagation from unhandled dedicated worker runtime errors, and suppression through Worker error preventDefault() or truthy worker.onerror."
+notes = "Manual smoke port for page-global window.onerror propagation from unhandled dedicated worker runtime errors, and suppression through Worker error preventDefault() or false-returning Worker.onerror."
[[test]]
id = "worker-load-failure-basic"
diff --git a/moli-wpt-compat/fixtures/wpt/ported/worker/worker-error-basic.html b/moli-wpt-compat/fixtures/wpt/ported/worker/worker-error-basic.html
index da4946dd4..a2f125d93 100644
--- a/moli-wpt-compat/fixtures/wpt/ported/worker/worker-error-basic.html
+++ b/moli-wpt-compat/fixtures/wpt/ported/worker/worker-error-basic.html
@@ -65,6 +65,45 @@ promise_test(async function () {
}
}, "Dedicated worker runtime errors reach worker.onerror with ErrorEvent details");
+promise_test(async function () {
+ const workerUrl = new URL(
+ "/wpt/ported/worker/resources/worker-error.js",
+ location.href,
+ ).href;
+ const previousOnerror = window.onerror;
+ window.onerror = function () {
+ return true;
+ };
+
+ const worker = new Worker(workerUrl);
+ try {
+ const handlerSeen = new Promise(function (resolve) {
+ worker.onerror = function () {
+ resolve();
+ return false;
+ };
+ });
+ const listenerSeen = new Promise(function (resolve) {
+ worker.addEventListener(
+ "error",
+ function (event) {
+ resolve(event.defaultPrevented);
+ },
+ { once: true },
+ );
+ });
+
+ const defaultPrevented = await wait_for(listenerSeen, "worker error listener");
+ await wait_for(handlerSeen, "worker.onerror false-returning handler");
+ await wait(30);
+
+ assert_true(defaultPrevented, "false-returning worker.onerror should mark the error as handled");
+ } finally {
+ window.onerror = previousOnerror;
+ worker.terminate();
+ }
+}, "False-returning worker.onerror marks the worker error as handled for later listeners");
+
promise_test(async function () {
const workerUrl = new URL(
"/wpt/ported/worker/resources/worker-error.js",
@@ -97,10 +136,10 @@ promise_test(async function () {
await wait_for(handlerSeen, "worker.onerror truthy handler");
await wait(30);
- assert_true(defaultPrevented, "truthy worker.onerror should mark the error as handled");
+ assert_false(defaultPrevented, "truthy worker.onerror must not mark the error as handled");
} finally {
window.onerror = previousOnerror;
worker.terminate();
}
-}, "Truthy worker.onerror marks the worker error as handled for later listeners");
+}, "Truthy worker.onerror leaves the worker error uncanceled for later listeners");
</script>
diff --git a/moli-wpt-compat/fixtures/wpt/ported/worker/worker-window-error-basic.html b/moli-wpt-compat/fixtures/wpt/ported/worker/worker-window-error-basic.html
index 8b9aa9c01..73afcf3f8 100644
--- a/moli-wpt-compat/fixtures/wpt/ported/worker/worker-window-error-basic.html
+++ b/moli-wpt-compat/fixtures/wpt/ported/worker/worker-window-error-basic.html
@@ -97,7 +97,7 @@ async function assert_worker_error_prevent_default_suppresses_window() {
}
}
-async function assert_truthy_worker_onerror_suppresses_window() {
+async function assert_false_worker_onerror_suppresses_window() {
const previousOnerror = window.onerror;
let worker = null;
let windowErrorCalled = false;
@@ -112,7 +112,7 @@ async function assert_truthy_worker_onerror_suppresses_window() {
worker = new Worker(worker_error_url());
worker.onerror = function () {
handlerSeen = true;
- return 1;
+ return false;
};
const listenerDefaultPrevented = await wait_for(
@@ -125,12 +125,12 @@ async function assert_truthy_worker_onerror_suppresses_window() {
{ once: true },
);
}),
- "worker error listener after truthy onerror",
+ "worker error listener after false-returning onerror",
);
assert_true(handlerSeen, "worker.onerror should run before the later listener");
- assert_true(listenerDefaultPrevented, "truthy worker.onerror should mark the worker error handled");
- assert_false(windowErrorCalled, "truthy worker.onerror should suppress window.onerror");
+ assert_true(listenerDefaultPrevented, "false-returning worker.onerror should mark the worker error handled");
+ assert_false(windowErrorCalled, "false-returning worker.onerror should suppress window.onerror");
} finally {
window.onerror = previousOnerror;
if (worker) {
@@ -142,6 +142,6 @@ async function assert_truthy_worker_onerror_suppresses_window() {
promise_test(async function () {
await assert_unhandled_worker_error_propagates_to_window();
await assert_worker_error_prevent_default_suppresses_window();
- await assert_truthy_worker_onerror_suppresses_window();
+ await assert_false_worker_onerror_suppresses_window();
}, "Dedicated worker runtime errors propagate to page window.onerror unless handled");
</script>