Best headless browser for AI agents. Lite, Fast, High-Compatibility. Built in Rust
Rust ai-agentsai-toolsbrowserbrowser-automationcloud-browserheadlessheadless-browserkitesurfplaywrightpuppeteerrustservoweb-crawlerweb-crawlingweb-scraperweb-scraping
fix(events): unify object-valued simple event handlers
ldm094186f6bb6cc
diff --git a/moli-renderer-v8/src/context_bootstrap/broadcast_channel.rs b/moli-renderer-v8/src/context_bootstrap/broadcast_channel.rsindex 4b9878bd4..55c93455a 100644--- a/moli-renderer-v8/src/context_bootstrap/broadcast_channel.rs+++ b/moli-renderer-v8/src/context_bootstrap/broadcast_channel.rs@@ -531,7 +531,7 @@ fn broadcast_channel_event_handler_setter_callback<'s>(return;};let value = args.get(0);- let stored = if value.is_function() {+ let stored = if value.is_object() {value} else {v8::null(scope).into()@@ -543,7 +543,7 @@ fn broadcast_channel_event_handler_setter_callback<'s>(BROADCAST_CHANNEL_LISTENERS_SLOT,handler.event_type,handler.slot_name,- stored.is_function(),+ stored.is_object(),);}diff --git a/moli-renderer-v8/src/context_bootstrap/css_fontface_runtime/events.rs b/moli-renderer-v8/src/context_bootstrap/css_fontface_runtime/events.rsindex 9010b91e8..64eabfae8 100644--- a/moli-renderer-v8/src/context_bootstrap/css_fontface_runtime/events.rs+++ b/moli-renderer-v8/src/context_bootstrap/css_fontface_runtime/events.rs@@ -144,9 +144,7 @@ fn font_face_set_event_handler_setter<'s>(return;};let value = args.get(0);- let active = v8::Local::<v8::Object>::try_from(value)- .ok()- .is_some_and(|callback| callback.is_callable());+ let active = value.is_object();let stored = if active {value} else {diff --git a/moli-renderer-v8/src/context_bootstrap/navigator_runtime/media_devices.rs b/moli-renderer-v8/src/context_bootstrap/navigator_runtime/media_devices.rsindex 4e6b65cad..ce2b44416 100644--- a/moli-renderer-v8/src/context_bootstrap/navigator_runtime/media_devices.rs+++ b/moli-renderer-v8/src/context_bootstrap/navigator_runtime/media_devices.rs@@ -118,7 +118,7 @@ fn ondevicechange_setter<'s>(return;}let value = args.get(0);- let stored = if value.is_function() {+ let stored = if value.is_object() {value} else {v8::null(scope).into()@@ -135,6 +135,6 @@ fn ondevicechange_setter<'s>(MEDIA_DEVICES_LISTENERS_SLOT,"devicechange",MEDIA_DEVICES_ONDEVICECHANGE_SLOT,- stored.is_function(),+ stored.is_object(),);}diff --git a/moli-renderer-v8/src/context_bootstrap/performance_runtime/resource_buffer.rs b/moli-renderer-v8/src/context_bootstrap/performance_runtime/resource_buffer.rsindex fed43d385..5b7c968d2 100644--- a/moli-renderer-v8/src/context_bootstrap/performance_runtime/resource_buffer.rs+++ b/moli-renderer-v8/src/context_bootstrap/performance_runtime/resource_buffer.rs@@ -137,7 +137,7 @@ fn on_resource_timing_buffer_full_getter<'s>(performance,PERFORMANCE_ON_RESOURCE_TIMING_BUFFER_FULL_SLOT,)- .filter(|value| value.is_function())+ .filter(|value| value.is_object()).unwrap_or_else(|| v8::null(scope).into());rv.set(handler);}@@ -151,7 +151,7 @@ fn on_resource_timing_buffer_full_setter<'s>(return;};let value = args.get(0);- let handler = if value.is_function() {+ let handler = if value.is_object() {value} else {v8::null(scope).into()@@ -168,7 +168,7 @@ fn on_resource_timing_buffer_full_setter<'s>(PERFORMANCE_EVENT_LISTENERS_SLOT,RESOURCE_TIMING_BUFFER_FULL_EVENT,PERFORMANCE_ON_RESOURCE_TIMING_BUFFER_FULL_SLOT,- handler.is_function(),+ handler.is_object(),);}diff --git a/moli-renderer-v8/src/context_bootstrap/shared_worker_host.rs b/moli-renderer-v8/src/context_bootstrap/shared_worker_host.rsindex 4c24c7d4e..3177fe784 100644--- a/moli-renderer-v8/src/context_bootstrap/shared_worker_host.rs+++ b/moli-renderer-v8/src/context_bootstrap/shared_worker_host.rs@@ -177,7 +177,7 @@ fn shared_worker_onerror_setter<'s>(_rv: v8::ReturnValue<'_, v8::Value>,) {let value = args.get(0);- let stored = if value.is_function() {+ let stored = if value.is_object() {value} else {v8::null(scope).into()@@ -189,7 +189,7 @@ fn shared_worker_onerror_setter<'s>(SHARED_WORKER_LISTENERS_SLOT,"error",SHARED_WORKER_ONERROR_SLOT,- stored.is_function(),+ stored.is_object(),);}diff --git a/moli-renderer-v8/src/context_bootstrap/speech_synthesis.rs b/moli-renderer-v8/src/context_bootstrap/speech_synthesis.rsindex 77ea1ee6e..4043fc1b2 100644--- a/moli-renderer-v8/src/context_bootstrap/speech_synthesis.rs+++ b/moli-renderer-v8/src/context_bootstrap/speech_synthesis.rs@@ -768,9 +768,7 @@ fn set_event_handler<'s>(event_type: &'static str,handler_slot: &'static str,) {- let active = v8::Local::<v8::Object>::try_from(value)- .ok()- .is_some_and(|callback| callback.is_callable());+ let active = value.is_object();let stored = if active {value} else {diff --git a/moli-renderer-v8/src/context_bootstrap/websocket/accessors.rs b/moli-renderer-v8/src/context_bootstrap/websocket/accessors.rsindex 35d94623e..409f3bb05 100644--- a/moli-renderer-v8/src/context_bootstrap/websocket/accessors.rs+++ b/moli-renderer-v8/src/context_bootstrap/websocket/accessors.rs@@ -273,7 +273,7 @@ fn websocket_event_handler_setter_function<'s>(return;};let value = args.get(0);- let stored = if value.is_function() || value.is_object() {+ let stored = if value.is_object() {value} else {v8::null(scope).into()@@ -285,6 +285,6 @@ fn websocket_event_handler_setter_function<'s>(WEBSOCKET_LISTENERS_SLOT,handler.event_type,handler.slot_name,- stored.is_function(),+ stored.is_object(),);}diff --git a/moli-renderer-v8/src/context_bootstrap/window_runtime/service_worker.rs b/moli-renderer-v8/src/context_bootstrap/window_runtime/service_worker.rsindex 6730023ed..69e116d4e 100644--- a/moli-renderer-v8/src/context_bootstrap/window_runtime/service_worker.rs+++ b/moli-renderer-v8/src/context_bootstrap/window_runtime/service_worker.rs@@ -1005,7 +1005,7 @@ pub(in crate::context_bootstrap) fn navigator_service_worker_message_handler_set_rv: v8::ReturnValue<'_, v8::Value>,) {let value = args.get(0);- let stored = if value.is_function() {+ let stored = if value.is_object() {value} else {v8::null(scope).into()@@ -1022,7 +1022,7 @@ pub(in crate::context_bootstrap) fn navigator_service_worker_message_handler_setSERVICE_WORKER_CONTAINER_LISTENERS_SLOT,"message",SERVICE_WORKER_CONTAINER_ONMESSAGE_SLOT,- stored.is_function(),+ stored.is_object(),);}@@ -1050,7 +1050,7 @@ pub(in crate::context_bootstrap) fn navigator_service_worker_messageerror_handle_rv: v8::ReturnValue<'_, v8::Value>,) {let value = args.get(0);- let stored = if value.is_function() {+ let stored = if value.is_object() {value} else {v8::null(scope).into()@@ -1067,7 +1067,7 @@ pub(in crate::context_bootstrap) fn navigator_service_worker_messageerror_handleSERVICE_WORKER_CONTAINER_LISTENERS_SLOT,"messageerror",SERVICE_WORKER_CONTAINER_ONMESSAGEERROR_SLOT,- stored.is_function(),+ stored.is_object(),);}@@ -1095,7 +1095,7 @@ pub(in crate::context_bootstrap) fn navigator_service_worker_controllerchange_ha_rv: v8::ReturnValue<'_, v8::Value>,) {let value = args.get(0);- let stored = if value.is_function() {+ let stored = if value.is_object() {value} else {v8::null(scope).into()@@ -1112,7 +1112,7 @@ pub(in crate::context_bootstrap) fn navigator_service_worker_controllerchange_haSERVICE_WORKER_CONTAINER_LISTENERS_SLOT,"controllerchange",SERVICE_WORKER_CONTAINER_ONCONTROLLERCHANGE_SLOT,- stored.is_function(),+ stored.is_object(),);}diff --git a/moli-renderer-v8/src/context_bootstrap/worker_host/constructor.rs b/moli-renderer-v8/src/context_bootstrap/worker_host/constructor.rsindex bfe217d2b..81e5f9ca0 100644--- a/moli-renderer-v8/src/context_bootstrap/worker_host/constructor.rs+++ b/moli-renderer-v8/src/context_bootstrap/worker_host/constructor.rs@@ -699,7 +699,7 @@ fn worker_event_handler_setter<'s>(return;};let value = args.get(0);- let stored = if value.is_function() {+ let stored = if value.is_object() {value} else {v8::null(scope).into()@@ -711,9 +711,9 @@ fn worker_event_handler_setter<'s>(WORKER_LISTENERS_SLOT,handler.event_type,handler.slot_name,- stored.is_function(),+ stored.is_object(),);- if handler.event_type == "message" && stored.is_function() {+ if handler.event_type == "message" && stored.is_object() {super::flush_pending_worker_messages_for_listener(scope, args.this());}}diff --git a/moli-renderer-v8/src/network_host/event_source/bindings.rs b/moli-renderer-v8/src/network_host/event_source/bindings.rsindex 17f9b1e0c..18898da88 100644--- a/moli-renderer-v8/src/network_host/event_source/bindings.rs+++ b/moli-renderer-v8/src/network_host/event_source/bindings.rs@@ -560,7 +560,7 @@ fn event_source_event_handler_setter<'s>(return;};let value = args.get(0);- let stored = if value.is_function() {+ let stored = if value.is_object() {value} else {v8::null(scope).into()@@ -572,7 +572,7 @@ fn event_source_event_handler_setter<'s>(EVENT_SOURCE_LISTENERS_SLOT,handler.event_type,handler.slot_name,- stored.is_function(),+ stored.is_object(),);}diff --git a/moli-renderer-v8/src/network_host/xhr/bindings/constants.rs b/moli-renderer-v8/src/network_host/xhr/bindings/constants.rsindex 8a22b234e..eaf5cca5c 100644--- a/moli-renderer-v8/src/network_host/xhr/bindings/constants.rs+++ b/moli-renderer-v8/src/network_host/xhr/bindings/constants.rs@@ -434,7 +434,7 @@ fn xhr_value_setter(v8::undefined(scope).into()};let stored = if xhr_event_type_for_handler_slot(key).is_some() {- if value.is_function() {+ if value.is_object() {value} else {v8::null(scope).into()@@ -451,7 +451,7 @@ fn xhr_value_setter(XHR_SIMPLE_EVENT_TARGET_LISTENERS_SLOT,event_type,key,- stored.is_function(),+ stored.is_object(),);}}diff --git a/moli-renderer-v8/src/script_vm/tests/browser_api/broadcast_channel.rs b/moli-renderer-v8/src/script_vm/tests/browser_api/broadcast_channel.rsindex 3de89d69e..3f32c8103 100644--- a/moli-renderer-v8/src/script_vm/tests/browser_api/broadcast_channel.rs+++ b/moli-renderer-v8/src/script_vm/tests/browser_api/broadcast_channel.rs@@ -779,7 +779,7 @@ fn broadcast_channel_ordered_handler_slot_ignores_reflection_and_spoofing() {}#[test]-fn broadcast_channel_event_handler_non_callable_assignment_clears_handler() {+fn broadcast_channel_event_handler_preserves_objects_and_clears_primitives() {let mut vm = new_broadcast_channel_test_vm("https://example.com/broadcast-wpt-handler-object");let result = vm@@ -789,16 +789,20 @@ fn broadcast_channel_event_handler_non_callable_assignment_clears_handler() {const channel = new BroadcastChannel("wpt-handler-object");const handlerObject = { handleEvent() {} };channel.onmessage = handlerObject;- const messageCleared = channel.onmessage === null;+ const messagePreserved = channel.onmessage === handlerObject;channel.onmessageerror = handlerObject;- const messageErrorCleared = channel.onmessageerror === null;- return `${messageCleared}:${messageErrorCleared}`;+ const messageErrorPreserved = channel.onmessageerror === handlerObject;+ channel.onmessage = 42;+ channel.onmessageerror = false;+ const primitivesCleared = channel.onmessage === null && channel.onmessageerror === null;+ channel.close();+ return `${messagePreserved}:${messageErrorPreserved}:${primitivesCleared}`;})()"#,).expect("BroadcastChannel non-callable handler probe should evaluate");- assert_eq!(result, "true:true");+ assert_eq!(result, "true:true:true");}#[test]fn broadcast_channel_postmessage_uncloneable_data_throws_data_clone_error() {diff --git a/moli-renderer-v8/src/script_vm/tests/browser_api/media_devices.rs b/moli-renderer-v8/src/script_vm/tests/browser_api/media_devices.rsindex 20115df56..9cd7481b8 100644--- a/moli-renderer-v8/src/script_vm/tests/browser_api/media_devices.rs+++ b/moli-renderer-v8/src/script_vm/tests/browser_api/media_devices.rs@@ -26,7 +26,10 @@ fn media_devices_enumeration_and_devicechange_live_on_a_branded_event_target_prodevices.ondevicechange = event => events.push(event.target === devices ? 'handler' : 'bad target');devices.dispatchEvent(new Event('devicechange'));checks.push(events.join(',') === 'first,handler,last');- devices.ondevicechange = {};+ const handlerObject = {};+ devices.ondevicechange = handlerObject;+ checks.push(devices.ondevicechange === handlerObject);+ devices.ondevicechange = 42;checks.push(devices.ondevicechange === null);for (const fake of [{}, prototype, Object.create(devices)]) {for (const callback of [() => handler.get.call(fake), () => handler.set.call(fake, null)]) {diff --git a/moli-renderer-v8/src/script_vm/tests/browser_api/misc.rs b/moli-renderer-v8/src/script_vm/tests/browser_api/misc.rsindex da586e8a3..ae3efe3b1 100644--- a/moli-renderer-v8/src/script_vm/tests/browser_api/misc.rs+++ b/moli-renderer-v8/src/script_vm/tests/browser_api/misc.rs@@ -22554,12 +22554,13 @@ fn window_event_source_constructor_exposes_connecting_instance() {() => new EventSource("/events"));const source = new EventSource("/events", { withCredentials: true });- source.onerror = { handleEvent() {} };+ const handlerObject = { handleEvent() {} };+ source.onerror = handlerObject;const state = [source.url,source.withCredentials,source.readyState,- source.onerror === null,+ source.onerror === handlerObject,Object.hasOwn(source, "addEventListener"),source.addEventListener.length,source.removeEventListener.length,diff --git a/moli-renderer-v8/src/script_vm/tests/browser_api/mod.rs b/moli-renderer-v8/src/script_vm/tests/browser_api/mod.rsindex 2850a8e67..4357c4f3e 100644--- a/moli-renderer-v8/src/script_vm/tests/browser_api/mod.rs+++ b/moli-renderer-v8/src/script_vm/tests/browser_api/mod.rs@@ -38,6 +38,7 @@ mod promise_rejection;mod security_policy;mod service_worker_drain;mod session_description;+mod simple_handler_object;mod speech_synthesis;mod storage_access;mod structured_clone;diff --git a/moli-renderer-v8/src/script_vm/tests/browser_api/simple_handler_object.rs b/moli-renderer-v8/src/script_vm/tests/browser_api/simple_handler_object.rsnew file mode 100644index 000000000..093ab160f--- /dev/null+++ b/moli-renderer-v8/src/script_vm/tests/browser_api/simple_handler_object.rs@@ -0,0 +1,370 @@+use super::service_worker_drain::drain_service_worker_test_turn;+use super::*;++const HANDLER_PROBE: &str = r#"+function exerciseHandler(target, type, w, checkException) {+ const holder = target;+ const property = 'on' + type;+ const trace = [];+ const errors = [];+ const errorListener = event => { errors.push(event.error instanceof w.TypeError); event.preventDefault(); };+ w.addEventListener('error', errorListener);+ const dispatch = () => target.dispatchEvent(new w.Event(type, {cancelable:true}));+ const objectValues = [{}, Object.create(null), new w.Number(42), new w.String('text'), [], /pattern/, Object.create(w.Function.prototype)];+ const objectIdentity = objectValues.map(value => { holder[property] = value; return holder[property] === value; });+ const primitiveNull = [undefined, null, false, 42, 'text', Symbol('value'), 1n].map(value => {+ holder[property] = value; return holder[property] === null;+ });++ const before = () => trace.push('before');+ const middle = () => trace.push('middle');+ const after = () => trace.push('after');+ const late = () => trace.push('late');+ const replacement = () => { trace.push('replacement'); return false; };+ target.addEventListener(type, before);+ holder[property] = {};+ target.addEventListener(type, middle);+ holder[property] = replacement;+ target.addEventListener(type, after);+ const firstResult = dispatch();+ const firstOrder = trace.splice(0);+ let operationReads = 0;+ const listenerObject = {get handleEvent() { operationReads++; return () => trace.push('object-listener'); }};+ holder[property] = listenerObject;+ const silentResult = dispatch();+ const silentOrder = trace.splice(0);+ const handlerReads = operationReads;+ target.addEventListener(type, listenerObject);+ dispatch();+ const interfaceOrder = trace.splice(0);+ const interfaceReads = operationReads;+ target.removeEventListener(type, listenerObject);+ holder[property] = replacement;+ dispatch();+ const preservedOrder = trace.splice(0);+ holder[property] = 42;+ target.addEventListener(type, late);+ holder[property] = replacement;+ dispatch();+ const reactivatedOrder = trace.splice(0);+ holder[property] = null;+ for (const listener of [before, middle, after, late]) target.removeEventListener(type, listener);++ let proxyGets = 0;+ let proxyCalls = 0;+ let receiverOK = false;+ const callable = new Proxy(function() { trace.push('called'); return false; }, {+ get() { proxyGets++; throw new Error('callback property read'); },+ apply(fn, receiver, args) {+ proxyCalls++; receiverOK = receiver === target && args.length === 1 && args[0].currentTarget === target;+ return Reflect.apply(fn, receiver, args);+ }+ });+ holder[property] = callable;+ const proxyIdentity = holder[property] === callable;+ const proxyResult = dispatch();+ const proxyTrace = trace.splice(0);+ const revokedObject = Proxy.revocable({}, {});+ revokedObject.revoke();+ holder[property] = revokedObject.proxy;+ const revokedObjectIdentity = holder[property] === revokedObject.proxy;+ const revokedObjectResult = dispatch();+ let revokedFunctionIdentity, revokedFunctionResult;+ if (checkException) {+ const revokedFunction = Proxy.revocable(function(){}, {});+ holder[property] = revokedFunction.proxy;+ revokedFunction.revoke();+ revokedFunctionIdentity = holder[property] === revokedFunction.proxy;+ revokedFunctionResult = dispatch();+ }+ holder[property] = null;+ w.removeEventListener('error', errorListener);+ return {objectIdentity, primitiveNull, firstResult, firstOrder, silentResult, silentOrder,+ handlerReads, interfaceOrder, interfaceReads, preservedOrder, reactivatedOrder,+ proxyIdentity, proxyResult, proxyTrace, proxyGets, proxyCalls, receiverOK,+ revokedObjectIdentity, revokedObjectResult, revokedFunctionIdentity, revokedFunctionResult, errors: checkException ? errors : undefined};+}+"#;++const PAGE_PROBE: &str = r#"+__EXERCISE__+(() => {+ const settings = __CASE__;+ const frame = settings.kind.startsWith('child-') ? document.createElement('iframe') : null;+ if (frame) document.body.appendChild(frame);+ const w = frame ? frame.contentWindow : window;+ let target, holder, type, cleanup = () => {};+ const kind = settings.kind.replace(/^child-/, '');+ switch (kind) {+ case 'xhr': target = new w.XMLHttpRequest(); type = 'load'; break;+ case 'xhr-upload': target = new w.XMLHttpRequest().upload; type = 'load'; break;+ case 'performance': target = w.performance; type = 'resourcetimingbufferfull'; break;+ case 'fonts': target = w.document.fonts; type = 'loadingdone'; break;+ case 'broadcast': target = new w.BroadcastChannel('handler-values'); type = 'message'; cleanup = () => target.close(); break;+ case 'speech': target = new w.SpeechSynthesisUtterance(''); type = 'end'; break;+ case 'synthesis': target = w.speechSynthesis; type = 'voiceschanged'; break;+ case 'devices': target = w.navigator.mediaDevices; type = 'devicechange'; break;+ case 'service-container': target = w.navigator.serviceWorker; type = 'message'; break;+ case 'event-source': target = new w.EventSource('/event-source'); type = 'open'; cleanup = () => target.close(); break;+ case 'websocket': target = new w.WebSocket((location.protocol === 'https:' ? 'wss://' : 'ws://') + location.host + '/socket'); type = 'open'; cleanup = () => target.close(); break;+ case 'worker-host': {+ const url = w.URL.createObjectURL(new w.Blob([''], {type:'text/javascript'}));+ target = new w.Worker(url); type = 'message'; cleanup = () => { target.terminate(); w.URL.revokeObjectURL(url); }; break;+ }+ case 'shared-worker-host': {+ const url = w.URL.createObjectURL(new w.Blob(['onconnect = e => e.ports[0].start();'], {type:'text/javascript'}));+ target = new w.SharedWorker(url); type = 'error'; cleanup = () => { target.port.close(); w.URL.revokeObjectURL(url); }; break;+ }+ default: throw new Error('unknown target ' + kind);+ }+ const value = exerciseHandler(target, type, w, settings.checkException);+ cleanup();+ if (frame) frame.remove();+ return value;+})()+"#;++const WORKER_PARENT_PROBE: &str = r#"+(async () => {+ const config = __CONFIG__;+ const source = __SOURCE__;+ let worker, url, registration, port, timer;+ const result = await new Promise(async (resolve, reject) => {+ timer = setTimeout(() => reject(new Error(config.name + ' timeout')), 8000);+ try {+ if (config.mode === 'service') {+ const listener = event => { navigator.serviceWorker.removeEventListener('message', listener); resolve(event.data); };+ navigator.serviceWorker.addEventListener('message', listener);+ registration = await navigator.serviceWorker.register('/handler-sw.js?case=' + encodeURIComponent(config.name), {scope:'./'});+ const active = registration.active || registration.installing || registration.waiting;+ if (active.state !== 'activated') await new Promise(done => active.addEventListener('statechange', () => { if (active.state === 'activated') done(); }));+ active.postMessage('probe');+ } else {+ url = URL.createObjectURL(new Blob([source], {type:'text/javascript'}));+ worker = config.mode === 'shared' ? new SharedWorker(url) : new Worker(url);+ port = config.mode === 'shared' ? worker.port : worker;+ port.onmessage = event => resolve(event.data);+ worker.onerror = event => reject(new Error(event.message || 'worker error'));+ }+ } catch (error) { reject(error); }+ }).finally(async () => {+ clearTimeout(timer);+ if (config.mode === 'shared') port?.close();+ else worker?.terminate();+ if (url) URL.revokeObjectURL(url);+ if (registration) await registration.unregister();+ });+ return result;+})()+"#;++fn expected_handler_value(check_exception: bool) -> serde_json::Value {+ let mut expected = serde_json::json!({+ "objectIdentity": vec![true; 7],+ "primitiveNull": vec![true; 7],+ "firstResult": false,+ "firstOrder": ["before", "replacement", "middle", "after"],+ "silentResult": true,+ "silentOrder": ["before", "middle", "after"],+ "handlerReads": 0,+ "interfaceOrder": ["before", "middle", "after", "object-listener"],+ "interfaceReads": 1,+ "preservedOrder": ["before", "replacement", "middle", "after"],+ "reactivatedOrder": ["before", "middle", "after", "late", "replacement"],+ "proxyIdentity": true, "proxyResult": false, "proxyTrace": ["called"],+ "proxyGets": 0, "proxyCalls": 1, "receiverOK": true,+ "revokedObjectIdentity": true, "revokedObjectResult": true,+ });+ if check_exception {+ expected["revokedFunctionIdentity"] = true.into();+ expected["revokedFunctionResult"] = true.into();+ expected["errors"] = serde_json::json!([true]);+ }+ expected+}++#[tokio::test]+async fn simple_handler_object_values_preserve_identity_and_listener_position() {+ for kind in [+ "xhr",+ "xhr-upload",+ "performance",+ "fonts",+ "broadcast",+ "speech",+ "synthesis",+ "devices",+ "service-container",+ "event-source",+ "websocket",+ "worker-host",+ "shared-worker-host",+ "child-xhr",+ "child-xhr-upload",+ "child-performance",+ "child-fonts",+ "child-broadcast",+ "child-speech",+ ] {+ // Child/error callback exception routing is independent of handler conversion.+ let check_exception = !kind.starts_with("child-") && kind != "shared-worker-host";+ let loader = ResourceRequestClient::new(&moli_fetch::FetchConfig::default()).unwrap();+ let (mut vm, _runtime) =+ new_service_worker_page_test_vm_with_loader_and_browser_context_runtime(+ "https://simple-handler-object.test/",+ &loader,+ );+ vm.eval("if (!document.body) document.documentElement.appendChild(document.createElement('body'))").unwrap();+ let source = PAGE_PROBE.replace("__EXERCISE__", HANDLER_PROBE).replace(+ "__CASE__",+ &serde_json::json!({"kind": kind, "checkException": check_exception}).to_string(),+ );+ let source = source.replacen("\n(() => {", "\nreturn (() => {", 1);+ let value = vm+ .eval(&format!("JSON.stringify((() => {{ {source} }})())"))+ .unwrap_or_else(|error| panic!("{kind}: {error:?}"));+ let value: serde_json::Value = serde_json::from_str(&value).unwrap();+ assert_eq!(value, expected_handler_value(check_exception), "{kind}");+ }+}++#[tokio::test]+async fn simple_handler_object_worker_globals_preserve_objects_and_order() {+ for (mode, event) in [+ ("dedicated", "message"),+ ("dedicated", "unhandledrejection"),+ ("dedicated", "online"),+ ("shared", "connect"),+ ] {+ // Synthetic worker exception reporting is independent of handler conversion.+ // This probe exercises legacy handler conversion and callback-interface separation.+ let expression = format!("exerciseHandler(self, {event:?}, self, false)");+ let source = if mode == "shared" {+ format!(+ "{HANDLER_PROBE} addEventListener('connect', e => {{ e.ports[0].postMessage({expression}); close(); }}, {{once:true}});"+ )+ } else {+ format!("{HANDLER_PROBE} postMessage({expression}); close();")+ };+ let probe = WORKER_PARENT_PROBE+ .replace(+ "__CONFIG__",+ &serde_json::json!({"mode": mode, "name": event}).to_string(),+ )+ .replace("__SOURCE__", &serde_json::to_string(&source).unwrap());+ let value = run_async_handler_probe("https://simple-handler-object.test/", &probe).await;+ assert_eq!(value, expected_handler_value(false), "{mode}/{event}");+ }+}++#[tokio::test]+async fn simple_handler_object_service_worker_fetch() {+ use tokio::io::{AsyncReadExt, AsyncWriteExt};++ let source = format!(+ "{HANDLER_PROBE} addEventListener('message', event => {{ event.source.postMessage(exerciseHandler(self, 'fetch', self, false)); }}, {{once:true}});"+ );+ let listener = tokio::net::TcpListener::bind("127.0.0.1:0").await.unwrap();+ let address = listener.local_addr().unwrap();+ let server = tokio::spawn(async move {+ let (mut stream, _) = listener.accept().await.unwrap();+ let mut request = Vec::new();+ let mut buffer = [0; 1024];+ while !request.windows(4).any(|bytes| bytes == b"\r\n\r\n") {+ let count = stream.read(&mut buffer).await.unwrap();+ assert_ne!(count, 0, "service worker request headers");+ request.extend_from_slice(&buffer[..count]);+ }+ assert!(+ String::from_utf8_lossy(&request)+ .starts_with("GET /handler-sw.js?case=service-values ")+ );+ let response = format!(+ "HTTP/1.1 200 OK\r\nContent-Type: text/javascript\r\nContent-Length: {}\r\nConnection: close\r\n\r\n{source}",+ source.len()+ );+ stream.write_all(response.as_bytes()).await.unwrap();+ });+ let probe = WORKER_PARENT_PROBE+ .replace(+ "__CONFIG__",+ r#"{"mode":"service","name":"service-values"}"#,+ )+ .replace("__SOURCE__", "''");+ let value = run_async_handler_probe(&format!("http://{address}/"), &probe).await;+ let expected = expected_handler_value(false);+ assert_eq!(value, expected);+ server.await.unwrap();+}++const NATIVE_PROBE: &str = r#"+(async () => {+ const frame = document.createElement('iframe');+ document.body.appendChild(frame);+ let reads = 0;+ const object = new frame.contentWindow.Object();+ Object.defineProperty(object, 'handleEvent', {get() { reads++; throw new Error('must not read handleEvent'); }});+ const channel = new BroadcastChannel('retired-handler-values');+ channel.onmessage = object;+ const identity = channel.onmessage === object;+ frame.remove();+ const retiredIdentity = channel.onmessage === object;+ const retiredResult = channel.dispatchEvent(new Event('message', {cancelable:true}));+ channel.close();+ const source = `+ const trace = [];+ onmessage = {get handleEvent() { throw new Error('must not read'); }};+ addEventListener('message', () => trace.push('after'));+ onmessage = () => trace.push('handler');+ addEventListener('message', () => setTimeout(() => postMessage(trace), 0));+ `;+ const url = URL.createObjectURL(new Blob([source], {type:'text/javascript'}));+ const worker = new Worker(url);+ const hostOrder = [];+ let timer;+ const workerOrder = await new Promise((resolve, reject) => {+ timer = setTimeout(() => reject(new Error('native worker timeout')), 4000);+ worker.onmessage = {};+ worker.addEventListener('message', event => { hostOrder.push('after'); resolve(event.data); });+ worker.onmessage = () => hostOrder.push('handler');+ worker.onerror = reject;+ worker.postMessage('go');+ }).finally(() => { clearTimeout(timer); worker.terminate(); URL.revokeObjectURL(url); });+ return {identity, retiredIdentity, retiredResult, reads, workerOrder, hostOrder};+})()+"#;++#[tokio::test]+async fn simple_handler_object_retired_realm_and_native_dispatch() {+ let value = run_async_handler_probe("https://simple-handler-object.test/", NATIVE_PROBE).await;+ assert_eq!(+ value,+ serde_json::json!({+ "identity": true, "retiredIdentity": true, "retiredResult": true, "reads": 0,+ "workerOrder": ["handler", "after"], "hostOrder": ["handler", "after"],+ })+ );+}++async fn run_async_handler_probe(url: &str, probe: &str) -> serde_json::Value {+ let loader = ResourceRequestClient::new(&moli_fetch::FetchConfig::default()).unwrap();+ let (mut vm, runtime) =+ new_service_worker_page_test_vm_with_loader_and_browser_context_runtime(url, &loader);+ vm.eval(+ "if (!document.body) document.documentElement.appendChild(document.createElement('body'))",+ )+ .unwrap();+ vm.eval(&format!("({probe}).then(value => globalThis.__handlerValue = value, error => globalThis.__handlerValue = String(error));")).unwrap();+ tokio::time::timeout(std::time::Duration::from_secs(10), async {+ while vm.eval("globalThis.__handlerValue !== undefined").unwrap() != "true" {+ runtime.drain_shared_worker_service_lane();+ drain_service_worker_test_turn(&mut vm, &runtime, &loader).await;+ }+ })+ .await+ .expect("handler probe should settle");+ let value = vm+ .eval("JSON.stringify(globalThis.__handlerValue)")+ .unwrap();+ serde_json::from_str(&value).unwrap()+}diff --git a/moli-renderer-v8/src/worker/global_scope/mod.rs b/moli-renderer-v8/src/worker/global_scope/mod.rsindex be1dc1f8d..4424efd90 100644--- a/moli-renderer-v8/src/worker/global_scope/mod.rs+++ b/moli-renderer-v8/src/worker/global_scope/mod.rs@@ -5009,14 +5009,13 @@ fn set_worker_global_event_handler<'s>(value: v8::Local<'s, v8::Value>,slot_name: &'static str,event_type: Option<&str>,- store_non_callable_objects: bool,) {- let stored = if value.is_function() || (store_non_callable_objects && value.is_object()) {+ let stored = if value.is_object() {value} else {v8::null(scope).into()};- let active = stored.is_function();+ let active = stored.is_object();set_private_value(scope, global, slot_name, stored);if let Some(event_type) = event_type {simple_object_event_set_ordered_handler(@@ -5053,7 +5052,6 @@ fn worker_global_onmessage_setter<'s>(args.get(0),WORKER_GLOBAL_ONMESSAGE_SLOT,Some("message"),- true,);}@@ -5080,7 +5078,6 @@ fn worker_global_onmessageerror_setter<'s>(args.get(0),WORKER_GLOBAL_ONMESSAGEERROR_SLOT,Some("messageerror"),- true,);}@@ -5107,7 +5104,6 @@ fn worker_global_oninstall_setter<'s>(args.get(0),WORKER_GLOBAL_ONINSTALL_SLOT,Some("install"),- true,);}@@ -5134,7 +5130,6 @@ fn worker_global_onactivate_setter<'s>(args.get(0),WORKER_GLOBAL_ONACTIVATE_SLOT,Some("activate"),- true,);}@@ -5161,7 +5156,6 @@ fn worker_global_onfetch_setter<'s>(args.get(0),WORKER_GLOBAL_ONFETCH_SLOT,Some("fetch"),- true,);}@@ -5188,7 +5182,6 @@ fn worker_global_onpush_setter<'s>(args.get(0),WORKER_GLOBAL_ONPUSH_SLOT,Some("push"),- true,);}@@ -5215,7 +5208,6 @@ fn worker_global_onsync_setter<'s>(args.get(0),WORKER_GLOBAL_ONSYNC_SLOT,Some("sync"),- true,);}@@ -5242,7 +5234,6 @@ fn worker_global_onperiodicsync_setter<'s>(args.get(0),WORKER_GLOBAL_ONPERIODICSYNC_SLOT,Some("periodicsync"),- true,);}@@ -5269,7 +5260,6 @@ fn worker_global_onnotificationclick_setter<'s>(args.get(0),WORKER_GLOBAL_ONNOTIFICATIONCLICK_SLOT,Some("notificationclick"),- true,);}@@ -5296,7 +5286,6 @@ fn worker_global_onnotificationclose_setter<'s>(args.get(0),WORKER_GLOBAL_ONNOTIFICATIONCLOSE_SLOT,Some("notificationclose"),- true,);}@@ -5323,7 +5312,6 @@ fn worker_global_onerror_setter<'s>(args.get(0),WORKER_GLOBAL_ONERROR_SLOT,None,- true,);}@@ -5350,7 +5338,6 @@ fn worker_global_onconnect_setter<'s>(args.get(0),WORKER_GLOBAL_ONCONNECT_SLOT,Some("connect"),- false,);}@@ -5377,7 +5364,6 @@ fn worker_global_onoffline_setter<'s>(args.get(0),WORKER_GLOBAL_ONOFFLINE_SLOT,Some("offline"),- true,);}@@ -5404,7 +5390,6 @@ fn worker_global_ononline_setter<'s>(args.get(0),WORKER_GLOBAL_ONONLINE_SLOT,Some("online"),- true,);}@@ -5431,7 +5416,6 @@ fn worker_global_onunhandledrejection_setter<'s>(args.get(0),WORKER_GLOBAL_ONUNHANDLEDREJECTION_SLOT,Some("unhandledrejection"),- false,);}@@ -5458,7 +5442,6 @@ fn worker_global_onrejectionhandled_setter<'s>(args.get(0),WORKER_GLOBAL_ONREJECTIONHANDLED_SLOT,Some("rejectionhandled"),- false,);}diff --git a/moli-wpt-compat/fixtures/wpt/ported/sharedworker/sharedworker-extended.html b/moli-wpt-compat/fixtures/wpt/ported/sharedworker/sharedworker-extended.htmlindex 30c9bd6aa..7b2f0bd54 100644--- a/moli-wpt-compat/fixtures/wpt/ported/sharedworker/sharedworker-extended.html+++ b/moli-wpt-compat/fixtures/wpt/ported/sharedworker/sharedworker-extended.html@@ -123,8 +123,9 @@ promise_test(async function () {" results.push(String(error));","}","try {",- " self.onconnect = { handleEvent: function () {} };",- " results.push(String(onconnect));",+ " const object = { handleEvent: function () {} };",+ " self.onconnect = object;",+ " results.push(onconnect === object);","} catch (error) {"," results.push(String(error));","}",@@ -138,8 +139,8 @@ promise_test(async function () {unique_name("onconnect"),);const event = await next_port_message(worker.port);- assert_array_equals(event.data, ["null", "null", "function", ""]);-}, "SharedWorkerGlobalScope.onconnect clears non-callable assignments and dispatches connect");+ assert_array_equals(event.data, ["null", true, "function", ""]);+}, "SharedWorkerGlobalScope.onconnect preserves objects, clears primitives, and dispatches connect");promise_test(async function () {const blobUrl = URL.createObjectURL(diff --git a/moli-wpt-compat/fixtures/wpt/ported/xhr/xmlhttprequest-upload-basic.html b/moli-wpt-compat/fixtures/wpt/ported/xhr/xmlhttprequest-upload-basic.htmlindex 92bc390c3..345e63d9e 100644--- a/moli-wpt-compat/fixtures/wpt/ported/xhr/xmlhttprequest-upload-basic.html+++ b/moli-wpt-compat/fixtures/wpt/ported/xhr/xmlhttprequest-upload-basic.html@@ -46,7 +46,8 @@ function send_upload_case(sendMode, payload) {uploadOrder.push("listener-after:" + event.type);});});- xhr.upload.onerror = {};+ const errorHandlerObject = {};+ xhr.upload.onerror = errorHandlerObject;return new Promise(function (resolve, reject) {xhr.onload = function () {@@ -54,7 +55,7 @@ function send_upload_case(sendMode, payload) {};xhr.onloadend = function () {xhrEvents.push("loadend");- resolve({ xhr, uploadEvents, uploadOrder, xhrEvents });+ resolve({ xhr, uploadEvents, uploadOrder, xhrEvents, errorHandlerObject });};xhr.onerror = function () {reject(new Error("XMLHttpRequest failed"));@@ -163,7 +164,9 @@ promise_test(async function () {assert_array_equals(result.xhrEvents, ["load", "loadend"], "XHR should still complete normally");assert_equals(result.xhr.status, 200, "upload POST status");assert_equals(result.xhr.response.body, payload, "upload POST should still send the body");- assert_equals(result.xhr.upload.onerror, null, "non-callable upload event handler should store null");+ assert_equals(result.xhr.upload.onerror, result.errorHandlerObject, "object upload event handler should retain its identity");+ result.xhr.upload.onerror = 42;+ assert_equals(result.xhr.upload.onerror, null, "primitive upload event handler should store null");assert_array_equals(Object.getOwnPropertyNames(result.xhr.upload),[],diff --git a/moli-wpt-compat/fixtures/wpt/upstream/workers/interfaces/SharedWorkerGlobalScope/onconnect.html b/moli-wpt-compat/fixtures/wpt/upstream/workers/interfaces/SharedWorkerGlobalScope/onconnect.htmlindex d01ad8f72..541121b56 100644--- a/moli-wpt-compat/fixtures/wpt/upstream/workers/interfaces/SharedWorkerGlobalScope/onconnect.html+++ b/moli-wpt-compat/fixtures/wpt/upstream/workers/interfaces/SharedWorkerGlobalScope/onconnect.html@@ -7,7 +7,7 @@async_test(function() {var w1 = new SharedWorker('onconnect.js', '');w1.port.addEventListener('message', this.step_func_done(function(e) {- assert_array_equals(e.data, ['null', 'null', 'function', '']);+ assert_array_equals(e.data, ['null', true, 'function', '']);}), false);w1.port.start();});diff --git a/moli-wpt-compat/fixtures/wpt/upstream/workers/interfaces/SharedWorkerGlobalScope/onconnect.js b/moli-wpt-compat/fixtures/wpt/upstream/workers/interfaces/SharedWorkerGlobalScope/onconnect.jsindex 34a2be51f..72a556578 100644--- a/moli-wpt-compat/fixtures/wpt/upstream/workers/interfaces/SharedWorkerGlobalScope/onconnect.js+++ b/moli-wpt-compat/fixtures/wpt/upstream/workers/interfaces/SharedWorkerGlobalScope/onconnect.js@@ -6,8 +6,11 @@ try {results.push(''+e);}try {- self.onconnect = {handleEvent:function(){}};- results.push(String(onconnect));+ // Local correction: EventHandler uses LegacyTreatNonObjectAsNull.+ // Non-callable objects retain their identity; only primitives become null.+ var object = {handleEvent:function(){}};+ self.onconnect = object;+ results.push(onconnect === object);} catch(e) {results.push(''+e);}