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(file-api): unify native proxy FileReader event dispatch
ldm0d18964087006
diff --git a/moli-renderer-v8/src/context_bootstrap.rs b/moli-renderer-v8/src/context_bootstrap.rsindex 2438b5d9f..b5b590251 100644--- a/moli-renderer-v8/src/context_bootstrap.rs+++ b/moli-renderer-v8/src/context_bootstrap.rs@@ -346,8 +346,7 @@ pub(crate) use self::media_queries::{simple_event_target_inspector_listener_snapshots,simple_event_target_remove_event_listener_callback, simple_object_event_listeners_snapshot,simple_object_event_set_handler, simple_object_event_target_add_listener,- simple_object_event_target_add_listener_for_target, simple_object_event_target_remove_listener,- simple_object_event_target_remove_listener_for_target, simple_object_has_event_listeners,+ simple_object_event_target_remove_listener, simple_object_has_event_listeners,};pub(crate) use self::message_ports::{MessagePortDeliveryRunResult, MessagePortRealmBinding, detach_message_port_owner_for_transfer,diff --git a/moli-renderer-v8/src/context_bootstrap/file_api.rs b/moli-renderer-v8/src/context_bootstrap/file_api.rsindex 219e22432..a3ecfe0a9 100644--- a/moli-renderer-v8/src/context_bootstrap/file_api.rs+++ b/moli-renderer-v8/src/context_bootstrap/file_api.rs@@ -44,10 +44,9 @@ pub(crate) use file_list::{};pub(crate) use file_reader::flush_one_pending_file_reader;pub(super) use file_reader::{- file_reader_abort_callback, file_reader_add_event_listener_callback,- file_reader_constructor_callback, file_reader_read_as_array_buffer_callback,- file_reader_read_as_binary_string_callback, file_reader_read_as_data_url_callback,- file_reader_read_as_text_callback, file_reader_remove_event_listener_callback,+ file_reader_abort_callback, file_reader_constructor_callback,+ file_reader_read_as_array_buffer_callback, file_reader_read_as_binary_string_callback,+ file_reader_read_as_data_url_callback, file_reader_read_as_text_callback,};pub(super) use file_reader_sync::file_reader_sync_constructor_callback;pub(super) use install::{initialize_file_api_runtime_queues, install_file_api_template_bindings};diff --git a/moli-renderer-v8/src/context_bootstrap/file_api/file_reader.rs b/moli-renderer-v8/src/context_bootstrap/file_api/file_reader.rsindex dbd17ec14..90bc37006 100644--- a/moli-renderer-v8/src/context_bootstrap/file_api/file_reader.rs+++ b/moli-renderer-v8/src/context_bootstrap/file_api/file_reader.rs@@ -8,9 +8,6 @@ mod state;mod task;pub(in crate::context_bootstrap) use constructor::file_reader_constructor_callback;-pub(in crate::context_bootstrap) use events::{- file_reader_add_event_listener_callback, file_reader_remove_event_listener_callback,-};pub(in crate::context_bootstrap) use read::{file_reader_abort_callback, file_reader_read_as_array_buffer_callback,file_reader_read_as_binary_string_callback, file_reader_read_as_data_url_callback,diff --git a/moli-renderer-v8/src/context_bootstrap/file_api/file_reader/events.rs b/moli-renderer-v8/src/context_bootstrap/file_api/file_reader/events.rsindex 0fc50f245..d5348f445 100644--- a/moli-renderer-v8/src/context_bootstrap/file_api/file_reader/events.rs+++ b/moli-renderer-v8/src/context_bootstrap/file_api/file_reader/events.rs@@ -19,28 +19,6 @@ struct FileReaderEventFallbackDeclaration<'scope, 'event> {length_computable: bool,}-pub(in crate::context_bootstrap) fn file_reader_add_event_listener_callback<'s>(- scope: &mut v8::PinScope<'s, '_>,- args: v8::FunctionCallbackArguments<'s>,- mut rv: v8::ReturnValue<'_, v8::Value>,-) {- let reader = moli_webapi_declare::web_api_object_target(scope, args.this())- .expect("FileReader receiver validated by WebIDL");- simple_object_event_target_add_listener_for_target(scope, &args, reader);- rv.set_undefined();-}--pub(in crate::context_bootstrap) fn file_reader_remove_event_listener_callback<'s>(- scope: &mut v8::PinScope<'s, '_>,- args: v8::FunctionCallbackArguments<'s>,- mut rv: v8::ReturnValue<'_, v8::Value>,-) {- let reader = moli_webapi_declare::web_api_object_target(scope, args.this())- .expect("FileReader receiver validated by WebIDL");- simple_object_event_target_remove_listener_for_target(scope, &args, reader);- rv.set_undefined();-}-pub(in crate::context_bootstrap::file_api::file_reader) fn dispatch_file_reader_event<'s>(scope: &mut v8::PinScope<'s, '_>,reader: v8::Local<'s, v8::Object>,diff --git a/moli-renderer-v8/src/context_bootstrap/file_api/file_reader/read.rs b/moli-renderer-v8/src/context_bootstrap/file_api/file_reader/read.rsindex dcf63670f..4b84e8005 100644--- a/moli-renderer-v8/src/context_bootstrap/file_api/file_reader/read.rs+++ b/moli-renderer-v8/src/context_bootstrap/file_api/file_reader/read.rs@@ -126,16 +126,18 @@ pub(in crate::context_bootstrap) fn file_reader_abort_callback<'s>(args: v8::FunctionCallbackArguments<'s>,mut rv: v8::ReturnValue<'_, v8::Value>,) {- if file_reader_ready_state(scope, args.this()) != 1.0 {+ let reader = moli_webapi_declare::web_api_object_target(scope, args.this())+ .expect("FileReader receiver validated by WebIDL");+ if file_reader_ready_state(scope, reader) != 1.0 {rv.set_undefined();return;}- let next_read_id = file_reader_read_id(scope, args.this()) + 1.0;- set_file_reader_read_id(scope, args.this(), next_read_id);- set_file_reader_ready_state(scope, args.this(), 2.0);- set_file_reader_result(scope, args.this(), v8::null(scope).into());- dispatch_file_reader_event(scope, args.this(), "abort", 0.0, 0.0);- dispatch_file_reader_event(scope, args.this(), "loadend", 0.0, 0.0);+ let next_read_id = file_reader_read_id(scope, reader) + 1.0;+ set_file_reader_read_id(scope, reader, next_read_id);+ set_file_reader_ready_state(scope, reader, 2.0);+ set_file_reader_result(scope, reader, v8::null(scope).into());+ dispatch_file_reader_event(scope, reader, "abort", 0.0, 0.0);+ dispatch_file_reader_event(scope, reader, "loadend", 0.0, 0.0);rv.set_undefined();}diff --git a/moli-renderer-v8/src/context_bootstrap/media_file_template.rs b/moli-renderer-v8/src/context_bootstrap/media_file_template.rsindex 0102b5cdb..3421c2349 100644--- a/moli-renderer-v8/src/context_bootstrap/media_file_template.rs+++ b/moli-renderer-v8/src/context_bootstrap/media_file_template.rs@@ -47,10 +47,9 @@ use super::canvas::{webgl2_get_supported_extensions_callback,};use super::file_api::{- file_list_item_callback, file_reader_abort_callback, file_reader_add_event_listener_callback,- file_reader_read_as_array_buffer_callback, file_reader_read_as_binary_string_callback,- file_reader_read_as_data_url_callback, file_reader_read_as_text_callback,- file_reader_remove_event_listener_callback,+ file_list_item_callback, file_reader_abort_callback, file_reader_read_as_array_buffer_callback,+ file_reader_read_as_binary_string_callback, file_reader_read_as_data_url_callback,+ file_reader_read_as_text_callback,};use crate::web_api_interfaces;use crate::{blob, util::callback_data_index_value, xml_serializer};@@ -123,16 +122,6 @@ struct FileReaderTemplateMethodsDeclaration {#[webapi(method, length = 0, callback = file_reader_abort_callback)]abort: (),-- #[webapi(method, length = 2, callback = file_reader_add_event_listener_callback)]- add_event_listener: (),-- #[webapi(- method,- length = 2,- callback = file_reader_remove_event_listener_callback- )]- remove_event_listener: (),}#[derive(WebApiFunctionTemplate)]diff --git a/moli-renderer-v8/src/context_bootstrap/media_queries.rs b/moli-renderer-v8/src/context_bootstrap/media_queries.rsindex 3339b7f17..73ac3159f 100644--- a/moli-renderer-v8/src/context_bootstrap/media_queries.rs+++ b/moli-renderer-v8/src/context_bootstrap/media_queries.rs@@ -19,8 +19,7 @@ pub(crate) use self::events::{simple_event_target_inspector_listener_snapshots,simple_event_target_remove_event_listener_callback, simple_object_event_listeners_snapshot,simple_object_event_set_handler, simple_object_event_target_add_listener,- simple_object_event_target_add_listener_for_target, simple_object_event_target_remove_listener,- simple_object_event_target_remove_listener_for_target, simple_object_has_event_listeners,+ simple_object_event_target_remove_listener, simple_object_has_event_listeners,};pub(super) use self::events::{media_query_list_add_listener_callback, media_query_list_remove_listener_callback,diff --git a/moli-renderer-v8/src/context_bootstrap/media_queries/events.rs b/moli-renderer-v8/src/context_bootstrap/media_queries/events.rsindex 280454d96..d128e1130 100644--- a/moli-renderer-v8/src/context_bootstrap/media_queries/events.rs+++ b/moli-renderer-v8/src/context_bootstrap/media_queries/events.rs@@ -21,8 +21,6 @@ pub(crate) use simple_event_target::{simple_event_target_inspector_listener_snapshots,simple_event_target_remove_event_listener_callback, simple_object_event_listeners_snapshot,simple_object_event_remove_listener_value_for_type, simple_object_event_set_handler,- simple_object_event_target_add_listener, simple_object_event_target_add_listener_for_target,- simple_object_event_target_register_webidl_listener,- simple_object_event_target_remove_listener,- simple_object_event_target_remove_listener_for_target, simple_object_has_event_listeners,+ simple_object_event_target_add_listener, simple_object_event_target_register_webidl_listener,+ simple_object_event_target_remove_listener, simple_object_has_event_listeners,};diff --git a/moli-renderer-v8/src/context_bootstrap/media_queries/events/simple_event_target.rs b/moli-renderer-v8/src/context_bootstrap/media_queries/events/simple_event_target.rsindex f0a2f3fe5..cd26f66db 100644--- a/moli-renderer-v8/src/context_bootstrap/media_queries/events/simple_event_target.rs+++ b/moli-renderer-v8/src/context_bootstrap/media_queries/events/simple_event_target.rs@@ -33,5 +33,5 @@ pub(crate) use listeners::{simple_object_event_target_remove_listener,simple_object_event_target_remove_listener_for_target,};-use state::simple_object_event_listener_registry;pub(crate) use state::{initialize_simple_event_target, is_simple_event_target};+use state::{simple_event_target_receiver, simple_object_event_listener_registry};diff --git a/moli-renderer-v8/src/context_bootstrap/media_queries/events/simple_event_target/callbacks.rs b/moli-renderer-v8/src/context_bootstrap/media_queries/events/simple_event_target/callbacks.rsindex eda501058..f34737a03 100644--- a/moli-renderer-v8/src/context_bootstrap/media_queries/events/simple_event_target/callbacks.rs+++ b/moli-renderer-v8/src/context_bootstrap/media_queries/events/simple_event_target/callbacks.rs@@ -5,11 +5,10 @@ pub(crate) fn simple_event_target_add_event_listener_callback<'s>(args: v8::FunctionCallbackArguments<'s>,_rv: v8::ReturnValue<'s, v8::Value>,) {- let target = args.this();- if !is_simple_event_target(scope, target) {+ let Some(target) = simple_event_target_receiver(scope, args.this()) else {return;- }- simple_object_event_target_add_listener(scope, &args);+ };+ simple_object_event_target_add_listener_for_target(scope, &args, target);}pub(crate) fn simple_event_target_remove_event_listener_callback<'s>(@@ -17,11 +16,10 @@ pub(crate) fn simple_event_target_remove_event_listener_callback<'s>(args: v8::FunctionCallbackArguments<'s>,_rv: v8::ReturnValue<'s, v8::Value>,) {- let target = args.this();- if !is_simple_event_target(scope, target) {+ let Some(target) = simple_event_target_receiver(scope, args.this()) else {return;- }- simple_object_event_target_remove_listener(scope, &args);+ };+ simple_object_event_target_remove_listener_for_target(scope, &args, target);}pub(crate) fn simple_event_target_dispatch_event_callback<'s>(@@ -29,10 +27,9 @@ pub(crate) fn simple_event_target_dispatch_event_callback<'s>(args: v8::FunctionCallbackArguments<'s>,mut rv: v8::ReturnValue<'s, v8::Value>,) {- let target = args.this();- if !is_simple_event_target(scope, target) {+ let Some(target) = simple_event_target_receiver(scope, args.this()) else {rv.set(v8::Boolean::new(scope, true).into());return;- }- simple_object_event_target_dispatch(scope, &args, &mut rv);+ };+ simple_object_event_target_dispatch(scope, &args, target, &mut rv);}diff --git a/moli-renderer-v8/src/context_bootstrap/media_queries/events/simple_event_target/dispatch.rs b/moli-renderer-v8/src/context_bootstrap/media_queries/events/simple_event_target/dispatch.rsindex fb6593fb2..7f602de6e 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@@ -22,6 +22,7 @@ pub(in crate::context_bootstrap::media_queries::events::simple_event_target) fn>(scope: &mut v8::PinScope<'s, '_>,args: &v8::FunctionCallbackArguments<'s>,+ target: v8::Local<'s, v8::Object>,rv: &mut v8::ReturnValue<'s, v8::Value>,) {let Some((event, event_type)) =@@ -34,7 +35,6 @@ pub(in crate::context_bootstrap::media_queries::events::simple_event_target) fnreturn;};- let target = args.this();let dispatch_result = dispatch_simple_event_target_event(scope, target, &event_type, event);rv.set(v8::Boolean::new(scope, dispatch_result).into());}diff --git a/moli-renderer-v8/src/context_bootstrap/media_queries/events/simple_event_target/handlers.rs b/moli-renderer-v8/src/context_bootstrap/media_queries/events/simple_event_target/handlers.rsindex 87df93585..a9eb0f07e 100644--- a/moli-renderer-v8/src/context_bootstrap/media_queries/events/simple_event_target/handlers.rs+++ b/moli-renderer-v8/src/context_bootstrap/media_queries/events/simple_event_target/handlers.rs@@ -36,12 +36,10 @@ fn handler_callback_data<'s>(scope: &mut v8::PinScope<'s, '_>,args: &v8::FunctionCallbackArguments<'s>,) -> Option<(v8::Local<'s, v8::Object>, String)> {- let target = moli_webapi_declare::web_api_object_target(scope, args.this())- .unwrap_or_else(|| args.this());- if !is_simple_event_target(scope, target) {+ let Some(target) = simple_event_target_receiver(scope, args.this()) else {throw_type_error(scope, "Illegal invocation");return None;- }+ };v8::Local::<v8::String>::try_from(args.data()).ok().map(|property| (target, property.to_rust_string_lossy(scope)))diff --git a/moli-renderer-v8/src/context_bootstrap/media_queries/events/simple_event_target/state.rs b/moli-renderer-v8/src/context_bootstrap/media_queries/events/simple_event_target/state.rsindex f1d44d42c..bea948728 100644--- a/moli-renderer-v8/src/context_bootstrap/media_queries/events/simple_event_target/state.rs+++ b/moli-renderer-v8/src/context_bootstrap/media_queries/events/simple_event_target/state.rs@@ -22,7 +22,21 @@ pub(crate) fn is_simple_event_target<'s>(scope: &mut v8::PinScope<'s, '_>,target: v8::Local<'s, v8::Object>,) -> bool {- simple_object_event_listener_registry(scope, target).is_some()+ simple_event_target_receiver(scope, target).is_some()+}++pub(super) fn simple_event_target_receiver<'s>(+ scope: &mut v8::PinScope<'s, '_>,+ target: v8::Local<'s, v8::Object>,+) -> Option<v8::Local<'s, v8::Object>> {+ // Resolve registered native Proxies only for the simple-target branch.+ // DOM and Window targets keep their existing receiver resolution.+ let target = if target.is_proxy() {+ moli_webapi_declare::web_api_object_target(scope, target)?+ } else {+ target+ };+ simple_object_event_listener_registry(scope, target).map(|_| target)}pub(super) fn simple_object_event_listener_registry<'s>(diff --git a/moli-renderer-v8/src/script_vm/tests/file_reader_handlers.rs b/moli-renderer-v8/src/script_vm/tests/file_reader_handlers.rsindex b619ab3b7..39eb944d0 100644--- a/moli-renderer-v8/src/script_vm/tests/file_reader_handlers.rs+++ b/moli-renderer-v8/src/script_vm/tests/file_reader_handlers.rs@@ -1,8 +1,9 @@use super::*;-#[test]-fn file_reader_prototype_handlers_share_native_proxy_state_and_listener_order() {- let mut vm = new_storage_page_task_executor_test_vm("https://file-reader-handlers.test/");+fn new_native_proxy_file_reader_test_vm(+ url: &str,+) -> crate::runtime::PageVmTaskExecutorTestHarness {+ let mut vm = new_storage_page_task_executor_test_vm(url);vm.eval("document.body.innerHTML = '<iframe></iframe>'; globalThis.foreign = document.querySelector('iframe').contentWindow; globalThis.reader = new foreign.FileReader();").unwrap();vm.with_default_context_scope_and_checkpoint_for_test(|scope, _| {let global = scope.get_current_context().global(scope);@@ -20,6 +21,12 @@ fn file_reader_prototype_handlers_share_native_proxy_state_and_listener_order()Ok(())}).unwrap();+ vm+}++#[test]+fn file_reader_prototype_handlers_share_native_proxy_state_and_listener_order() {+ let mut vm = new_native_proxy_file_reader_test_vm("https://file-reader-handlers.test/");assert_eq!(vm.eval(r#"(() => {const assert = (ok, name) => {if (!ok) throw Error(name);};const names = ['onloadstart','onprogress','onload','onabort','onerror','onloadend'];@@ -68,3 +75,90 @@ fn file_reader_prototype_handlers_share_native_proxy_state_and_listener_order()return true;})()"#).unwrap(), "true");}++#[test]+fn file_reader_native_proxy_abort_dispatches_on_backing_reader() {+ let mut vm = new_native_proxy_file_reader_test_vm("https://file-reader-proxy-abort.test/");+ assert_eq!(vm.eval(r#"(() => {+ const assert = (ok, name) => {if (!ok) throw Error(name);};+ const calls = [];+ const record = label => function(event) {+ calls.push([label, this === reader, event.target === reader,+ event.currentTarget === reader, reader.readyState === FileReader.DONE,+ nativeReaderProxy.result === null, nativeReaderProxy.error === null].join(':'));+ };+ reader.addEventListener('abort', record('abort'));+ nativeReaderProxy.onabort = record('abort-handler');+ nativeReaderProxy.addEventListener('loadend', record('loadend'));+ reader.onloadend = record('loadend-handler');+ const expected = ['abort', 'abort-handler', 'loadend', 'loadend-handler']+ .map(label => label + ':true:true:true:true:true:true').join();+ for (const abort of [() => nativeReaderProxy.abort(),+ () => FileReader.prototype.abort.call(nativeReaderProxy),+ () => foreign.FileReader.prototype.abort.call(nativeReaderProxy)]) {+ nativeReaderProxy.readAsText(new Blob(['test']));+ assert(reader.readyState === FileReader.LOADING, 'proxy starts reading');+ calls.length = 0;+ abort();+ assert(calls.join() === expected, 'proxy abort dispatch: ' + calls.join());+ assert(reader.readyState === FileReader.DONE && nativeReaderProxy.readyState === FileReader.DONE,+ 'shared aborted state');+ abort();+ assert(calls.join() === expected, 'second abort does not dispatch');+ }+ return true;+ })()"#).unwrap(), "true");+}++#[test]+fn file_reader_native_proxy_inherited_event_target_methods_share_listener_registry() {+ let mut vm = new_native_proxy_file_reader_test_vm("https://file-reader-proxy-dispatch.test/");+ assert_eq!(vm.eval(r#"(() => {+ const assert = (ok, name) => {if (!ok) throw Error(name);};+ const calls = [];+ const listener = function(event) {+ calls.push([this === reader, event.target === reader, event.currentTarget === reader].join(':'));+ event.preventDefault();+ };+ for (const callee of [window, foreign]) {+ const prototype = callee.EventTarget.prototype;+ for (const name of ['addEventListener', 'removeEventListener', 'dispatchEvent']) {+ assert(!Object.hasOwn(callee.FileReader.prototype, name) &&+ callee.FileReader.prototype[name] === prototype[name], name + '/inherited');+ }+ prototype.addEventListener.call(nativeReaderProxy, 'custom', listener);+ reader.addEventListener('custom', listener);+ calls.length = 0;+ const event = new callee.Event('custom', {cancelable: true});+ assert(prototype.dispatchEvent.call(nativeReaderProxy, event) === false, 'canceled proxy dispatch');+ assert(calls.join() === 'true:true:true', 'shared listener identity and duplicate suppression');+ assert(event.target === reader && event.currentTarget === null && event.defaultPrevented,+ 'event target and dispatch cleanup');+ prototype.removeEventListener.call(nativeReaderProxy, 'custom', listener);+ calls.length = 0;+ assert(reader.dispatchEvent(new Event('custom')) === true && calls.length === 0,+ 'inherited proxy removal updates reader');+ reader.addEventListener('custom', listener);+ assert(nativeReaderProxy.dispatchEvent(new Event('custom', {cancelable: true})) === false,+ 'inherited dispatchEvent through proxy');+ assert(calls.join() === 'true:true:true', 'proxy dispatch reaches reader listener');+ nativeReaderProxy.removeEventListener('custom', listener);+ let traps = 0;+ const author = new Proxy(nativeReaderProxy, {+ get() {traps++; throw 42;}, getPrototypeOf() {traps++; throw 42;}+ });+ const revoked = Proxy.revocable(reader, {}); revoked.revoke();+ for (const receiver of [{}, Object.create(reader), author, revoked.proxy]) {+ for (const [method, args] of [+ ['addEventListener', ['custom', listener]],+ ['removeEventListener', ['custom', listener]],+ ['dispatchEvent', [new Event('custom')]]]) {+ let error; try {prototype[method].call(receiver, ...args);} catch (caught) {error = caught;}+ assert(error && Object.getPrototypeOf(error) === callee.TypeError.prototype && traps === 0,+ method + '/receiver');+ }+ }+ }+ return true;+ })()"#).unwrap(), "true");+}