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): bind FileReader prototype handlers with native receivers
ldm0f117afa72634
diff --git a/moli-renderer-v8/src/context_bootstrap.rs b/moli-renderer-v8/src/context_bootstrap.rsindex b5b590251..2438b5d9f 100644--- a/moli-renderer-v8/src/context_bootstrap.rs+++ b/moli-renderer-v8/src/context_bootstrap.rs@@ -346,7 +346,8 @@ 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_remove_listener, simple_object_has_event_listeners,+ 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,};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/file_reader/events.rs b/moli-renderer-v8/src/context_bootstrap/file_api/file_reader/events.rsindex ab830fb4b..0fc50f245 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@@ -24,7 +24,9 @@ pub(in crate::context_bootstrap) fn file_reader_add_event_listener_callback<'s>(args: v8::FunctionCallbackArguments<'s>,mut rv: v8::ReturnValue<'_, v8::Value>,) {- simple_object_event_target_add_listener(scope, &args);+ 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();}@@ -33,7 +35,9 @@ pub(in crate::context_bootstrap) fn file_reader_remove_event_listener_callback<'args: v8::FunctionCallbackArguments<'s>,mut rv: v8::ReturnValue<'_, v8::Value>,) {- simple_object_event_target_remove_listener(scope, &args);+ 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();}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 329ecc1dd..dcf63670f 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@@ -195,6 +195,8 @@ fn file_reader_begin_read<'s>(reader: v8::Local<'s, v8::Object>,(result, total): (v8::Local<'s, v8::Value>, f64),) {+ let reader = moli_webapi_declare::web_api_object_target(scope, reader)+ .expect("FileReader receiver validated by WebIDL");set_file_reader_ready_state(scope, reader, 1.0);set_file_reader_result(scope, reader, v8::null(scope).into());set_file_reader_error(scope, reader, v8::null(scope).into());diff --git a/moli-renderer-v8/src/context_bootstrap/file_api/file_reader/state.rs b/moli-renderer-v8/src/context_bootstrap/file_api/file_reader/state.rsindex 7ef8b550c..328dd95c4 100644--- a/moli-renderer-v8/src/context_bootstrap/file_api/file_reader/state.rs+++ b/moli-renderer-v8/src/context_bootstrap/file_api/file_reader/state.rs@@ -39,7 +39,7 @@ struct FileReaderObjectDeclaration {}#[derive(WebApiFunctionTemplate)]-#[webapi(interface = web_api_interfaces::FileReader)]+#[webapi(interface = web_api_interfaces::FileReader, receiver)]struct FileReaderPrototypeAccessorsDeclaration {#[webapi(accessor_property = "onloadstart",@@ -47,8 +47,7 @@ struct FileReaderPrototypeAccessorsDeclaration {setter = simple_event_target_handler_setter_callback,data = v8str(scope, "onloadstart"),setter_data = v8str(scope, "onloadstart"),- enumerable,- receiver = web_api_interfaces::FileReader::is_instance+ enumerable)]onloadstart: (),#[webapi(@@ -57,8 +56,7 @@ struct FileReaderPrototypeAccessorsDeclaration {setter = simple_event_target_handler_setter_callback,data = v8str(scope, "onprogress"),setter_data = v8str(scope, "onprogress"),- enumerable,- receiver = web_api_interfaces::FileReader::is_instance+ enumerable)]onprogress: (),#[webapi(@@ -67,8 +65,7 @@ struct FileReaderPrototypeAccessorsDeclaration {setter = simple_event_target_handler_setter_callback,data = v8str(scope, "onload"),setter_data = v8str(scope, "onload"),- enumerable,- receiver = web_api_interfaces::FileReader::is_instance+ enumerable)]onload: (),#[webapi(@@ -77,8 +74,7 @@ struct FileReaderPrototypeAccessorsDeclaration {setter = simple_event_target_handler_setter_callback,data = v8str(scope, "onloadend"),setter_data = v8str(scope, "onloadend"),- enumerable,- receiver = web_api_interfaces::FileReader::is_instance+ enumerable)]onloadend: (),#[webapi(@@ -87,8 +83,7 @@ struct FileReaderPrototypeAccessorsDeclaration {setter = simple_event_target_handler_setter_callback,data = v8str(scope, "onerror"),setter_data = v8str(scope, "onerror"),- enumerable,- receiver = web_api_interfaces::FileReader::is_instance+ enumerable)]onerror: (),#[webapi(@@ -97,8 +92,7 @@ struct FileReaderPrototypeAccessorsDeclaration {setter = simple_event_target_handler_setter_callback,data = v8str(scope, "onabort"),setter_data = v8str(scope, "onabort"),- enumerable,- receiver = web_api_interfaces::FileReader::is_instance+ enumerable)]onabort: (),@@ -177,26 +171,26 @@ pub(in crate::context_bootstrap::file_api::file_reader) fn file_reader_ready_stafile_reader_slot_number(scope, reader, FILE_READER_READY_STATE_SLOT).unwrap_or(0.0)}-pub(in crate::context_bootstrap::file_api::file_reader) fn set_file_reader_ready_state(- scope: &mut v8::PinScope<'_, '_>,- reader: v8::Local<'_, v8::Object>,+pub(in crate::context_bootstrap::file_api::file_reader) fn set_file_reader_ready_state<'s>(+ scope: &mut v8::PinScope<'s, '_>,+ reader: v8::Local<'s, v8::Object>,ready_state: f64,) {set_file_reader_number_slot(scope, reader, FILE_READER_READY_STATE_SLOT, ready_state);}-pub(in crate::context_bootstrap::file_api::file_reader) fn set_file_reader_result(- scope: &mut v8::PinScope<'_, '_>,- reader: v8::Local<'_, v8::Object>,- result: v8::Local<'_, v8::Value>,+pub(in crate::context_bootstrap::file_api::file_reader) fn set_file_reader_result<'s>(+ scope: &mut v8::PinScope<'s, '_>,+ reader: v8::Local<'s, v8::Object>,+ result: v8::Local<'s, v8::Value>,) {set_file_reader_slot_value(scope, reader, FILE_READER_RESULT_SLOT, result);}-pub(in crate::context_bootstrap::file_api::file_reader) fn set_file_reader_error(- scope: &mut v8::PinScope<'_, '_>,- reader: v8::Local<'_, v8::Object>,- error: v8::Local<'_, v8::Value>,+pub(in crate::context_bootstrap::file_api::file_reader) fn set_file_reader_error<'s>(+ scope: &mut v8::PinScope<'s, '_>,+ reader: v8::Local<'s, v8::Object>,+ error: v8::Local<'s, v8::Value>,) {set_file_reader_slot_value(scope, reader, FILE_READER_ERROR_SLOT, error);}@@ -208,9 +202,9 @@ pub(in crate::context_bootstrap::file_api::file_reader) fn file_reader_read_id<'file_reader_slot_number(scope, reader, FILE_READER_READ_ID_SLOT).unwrap_or(0.0)}-pub(in crate::context_bootstrap::file_api::file_reader) fn set_file_reader_read_id(- scope: &mut v8::PinScope<'_, '_>,- reader: v8::Local<'_, v8::Object>,+pub(in crate::context_bootstrap::file_api::file_reader) fn set_file_reader_read_id<'s>(+ scope: &mut v8::PinScope<'s, '_>,+ reader: v8::Local<'s, v8::Object>,read_id: f64,) {set_file_reader_number_slot(scope, reader, FILE_READER_READ_ID_SLOT, read_id);@@ -223,10 +217,10 @@ pub(in crate::context_bootstrap::file_api::file_reader) fn file_reader_pending_rfile_reader_slot_value(scope, reader, FILE_READER_PENDING_RESULT_SLOT)}-pub(in crate::context_bootstrap::file_api::file_reader) fn set_file_reader_pending_result(- scope: &mut v8::PinScope<'_, '_>,- reader: v8::Local<'_, v8::Object>,- result: v8::Local<'_, v8::Value>,+pub(in crate::context_bootstrap::file_api::file_reader) fn set_file_reader_pending_result<'s>(+ scope: &mut v8::PinScope<'s, '_>,+ reader: v8::Local<'s, v8::Object>,+ result: v8::Local<'s, v8::Value>,) {set_file_reader_slot_value(scope, reader, FILE_READER_PENDING_RESULT_SLOT, result);}@@ -238,9 +232,9 @@ pub(in crate::context_bootstrap::file_api::file_reader) fn file_reader_pending_tfile_reader_slot_number(scope, reader, FILE_READER_PENDING_TOTAL_SLOT).unwrap_or(0.0)}-pub(in crate::context_bootstrap::file_api::file_reader) fn set_file_reader_pending_total(- scope: &mut v8::PinScope<'_, '_>,- reader: v8::Local<'_, v8::Object>,+pub(in crate::context_bootstrap::file_api::file_reader) fn set_file_reader_pending_total<'s>(+ scope: &mut v8::PinScope<'s, '_>,+ reader: v8::Local<'s, v8::Object>,total: f64,) {set_file_reader_number_slot(scope, reader, FILE_READER_PENDING_TOTAL_SLOT, total);@@ -253,9 +247,9 @@ pub(in crate::context_bootstrap::file_api::file_reader) fn file_reader_task_phasfile_reader_slot_number(scope, reader, FILE_READER_TASK_PHASE_SLOT).unwrap_or(0.0)}-pub(in crate::context_bootstrap::file_api::file_reader) fn set_file_reader_task_phase(- scope: &mut v8::PinScope<'_, '_>,- reader: v8::Local<'_, v8::Object>,+pub(in crate::context_bootstrap::file_api::file_reader) fn set_file_reader_task_phase<'s>(+ scope: &mut v8::PinScope<'s, '_>,+ reader: v8::Local<'s, v8::Object>,phase: f64,) {set_file_reader_number_slot(scope, reader, FILE_READER_TASK_PHASE_SLOT, phase);@@ -268,9 +262,9 @@ pub(in crate::context_bootstrap::file_api::file_reader) fn file_reader_scheduledfile_reader_slot_bool(scope, reader, FILE_READER_SCHEDULED_SLOT).unwrap_or(false)}-pub(in crate::context_bootstrap::file_api::file_reader) fn set_file_reader_scheduled(- scope: &mut v8::PinScope<'_, '_>,- reader: v8::Local<'_, v8::Object>,+pub(in crate::context_bootstrap::file_api::file_reader) fn set_file_reader_scheduled<'s>(+ scope: &mut v8::PinScope<'s, '_>,+ reader: v8::Local<'s, v8::Object>,scheduled: bool,) {set_file_reader_bool_slot(scope, reader, FILE_READER_SCHEDULED_SLOT, scheduled);@@ -281,6 +275,7 @@ fn file_reader_slot_value<'s>(reader: v8::Local<'s, v8::Object>,slot: &'static str,) -> Option<v8::Local<'s, v8::Value>> {+ let reader = moli_webapi_declare::web_api_object_target(scope, reader)?;get_private_value(scope, reader, slot)}@@ -300,18 +295,20 @@ fn file_reader_slot_bool<'s>(file_reader_slot_value(scope, reader, slot).map(|value| value.boolean_value(scope))}-fn set_file_reader_slot_value(- scope: &mut v8::PinScope<'_, '_>,- reader: v8::Local<'_, v8::Object>,+fn set_file_reader_slot_value<'s>(+ scope: &mut v8::PinScope<'s, '_>,+ reader: v8::Local<'s, v8::Object>,slot: &'static str,- value: v8::Local<'_, v8::Value>,+ value: v8::Local<'s, v8::Value>,) {+ let reader = moli_webapi_declare::web_api_object_target(scope, reader)+ .expect("FileReader state has a native receiver");set_private_value(scope, reader, slot, value);}-fn set_file_reader_number_slot(- scope: &mut v8::PinScope<'_, '_>,- reader: v8::Local<'_, v8::Object>,+fn set_file_reader_number_slot<'s>(+ scope: &mut v8::PinScope<'s, '_>,+ reader: v8::Local<'s, v8::Object>,slot: &'static str,value: f64,) {@@ -319,9 +316,9 @@ fn set_file_reader_number_slot(set_file_reader_slot_value(scope, reader, slot, value.into());}-fn set_file_reader_bool_slot(- scope: &mut v8::PinScope<'_, '_>,- reader: v8::Local<'_, v8::Object>,+fn set_file_reader_bool_slot<'s>(+ scope: &mut v8::PinScope<'s, '_>,+ reader: v8::Local<'s, v8::Object>,slot: &'static str,value: bool,) {diff --git a/moli-renderer-v8/src/context_bootstrap/media_file_template.rs b/moli-renderer-v8/src/context_bootstrap/media_file_template.rsindex dc3be189a..0102b5cdb 100644--- a/moli-renderer-v8/src/context_bootstrap/media_file_template.rs+++ b/moli-renderer-v8/src/context_bootstrap/media_file_template.rs@@ -99,7 +99,7 @@ struct FileListTemplateMethodsDeclaration {}#[derive(WebApiFunctionTemplate)]-#[webapi(interface = web_api_interfaces::FileReader, enumerable)]+#[webapi(interface = web_api_interfaces::FileReader, enumerable, receiver)]struct FileReaderTemplateMethodsDeclaration {#[webapi(method, length = 1, callback = file_reader_read_as_text_callback)]read_as_text: (),diff --git a/moli-renderer-v8/src/context_bootstrap/media_queries.rs b/moli-renderer-v8/src/context_bootstrap/media_queries.rsindex 73ac3159f..3339b7f17 100644--- a/moli-renderer-v8/src/context_bootstrap/media_queries.rs+++ b/moli-renderer-v8/src/context_bootstrap/media_queries.rs@@ -19,7 +19,8 @@ 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_remove_listener, simple_object_has_event_listeners,+ 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,};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 d128e1130..280454d96 100644--- a/moli-renderer-v8/src/context_bootstrap/media_queries/events.rs+++ b/moli-renderer-v8/src/context_bootstrap/media_queries/events.rs@@ -21,6 +21,8 @@ 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_register_webidl_listener,- simple_object_event_target_remove_listener, simple_object_has_event_listeners,+ 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,};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 f3d491fc3..f0a2f3fe5 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@@ -28,8 +28,10 @@ pub(crate) use listeners::{simple_object_has_event_listeners,};pub(crate) use listeners::{- simple_object_event_target_add_listener, simple_object_event_target_register_webidl_listener,+ 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,};use state::simple_object_event_listener_registry;pub(crate) use state::{initialize_simple_event_target, is_simple_event_target};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 bf7404ce4..87df93585 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@@ -9,12 +9,10 @@ pub(crate) fn simple_event_target_handler_getter_callback<'s>(args: v8::FunctionCallbackArguments<'s>,mut rv: v8::ReturnValue<'_, v8::Value>,) {- let Some(property) = handler_callback_data(scope, &args) else {+ let Some((target, property)) = handler_callback_data(scope, &args) else {return;};- rv.set(- get_private_value(scope, args.this(), &property).unwrap_or_else(|| v8::null(scope).into()),- );+ rv.set(get_private_value(scope, target, &property).unwrap_or_else(|| v8::null(scope).into()));}pub(crate) fn simple_event_target_handler_setter_callback<'s>(@@ -22,12 +20,12 @@ pub(crate) fn simple_event_target_handler_setter_callback<'s>(args: v8::FunctionCallbackArguments<'s>,_rv: v8::ReturnValue<'_, v8::Value>,) {- let Some(property) = handler_callback_data(scope, &args) else {+ let Some((target, property)) = handler_callback_data(scope, &args) else {return;};simple_object_event_set_handler(scope,- args.this(),+ target,property.strip_prefix("on").expect("event handler property"),&property,args.get(0),@@ -37,14 +35,16 @@ pub(crate) fn simple_event_target_handler_setter_callback<'s>(fn handler_callback_data<'s>(scope: &mut v8::PinScope<'s, '_>,args: &v8::FunctionCallbackArguments<'s>,-) -> Option<String> {- if !is_simple_event_target(scope, args.this()) {+) -> 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) {throw_type_error(scope, "Illegal invocation");return None;}v8::Local::<v8::String>::try_from(args.data()).ok()- .map(|property| property.to_rust_string_lossy(scope))+ .map(|property| (target, property.to_rust_string_lossy(scope)))}/// Install explicit EventHandler accessors on object-backed Window surfaces.diff --git a/moli-renderer-v8/src/context_bootstrap/media_queries/events/simple_event_target/listeners.rs b/moli-renderer-v8/src/context_bootstrap/media_queries/events/simple_event_target/listeners.rsindex 6a3193e1a..3bb476a9f 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@@ -179,6 +179,14 @@ impl<'s> SimpleObjectEventListenerSnapshot<'s> {pub(crate) fn simple_object_event_target_add_listener<'s>(scope: &mut v8::PinScope<'s, '_>,args: &v8::FunctionCallbackArguments<'s>,+) {+ simple_object_event_target_add_listener_for_target(scope, args, args.this());+}++pub(crate) fn simple_object_event_target_add_listener_for_target<'s>(+ scope: &mut v8::PinScope<'s, '_>,+ args: &v8::FunctionCallbackArguments<'s>,+ target: v8::Local<'s, v8::Object>,) {let Some(call) = parse_listener_args::<AddEventListenerArgs>(scope, args, "addEventListener")else {@@ -188,7 +196,6 @@ pub(crate) fn simple_object_event_target_add_listener<'s>(return;};let listener = simple_object_event_listener_parts(scope, listener);- let target = args.this();simple_object_event_target_register_resolved_listener(scope,target,@@ -288,6 +295,14 @@ fn simple_object_event_target_register_resolved_listener<'s>(pub(crate) fn simple_object_event_target_remove_listener<'s>(scope: &mut v8::PinScope<'s, '_>,args: &v8::FunctionCallbackArguments<'s>,+) {+ simple_object_event_target_remove_listener_for_target(scope, args, args.this());+}++pub(crate) fn simple_object_event_target_remove_listener_for_target<'s>(+ scope: &mut v8::PinScope<'s, '_>,+ args: &v8::FunctionCallbackArguments<'s>,+ target: v8::Local<'s, v8::Object>,) {let Some(call) =parse_listener_args::<RemoveEventListenerArgs>(scope, args, "removeEventListener")@@ -298,7 +313,6 @@ pub(crate) fn simple_object_event_target_remove_listener<'s>(return;};let listener = listener.value(scope);- let target = args.this();simple_object_event_remove_listener_value_for_type(scope,target,diff --git a/moli-renderer-v8/src/script_vm/tests/browser_api/misc/extracted/blob_file_reader.rs b/moli-renderer-v8/src/script_vm/tests/browser_api/misc/extracted/blob_file_reader.rsindex 3ce8f5f75..3f0c76b51 100644--- a/moli-renderer-v8/src/script_vm/tests/browser_api/misc/extracted/blob_file_reader.rs+++ b/moli-renderer-v8/src/script_vm/tests/browser_api/misc/extracted/blob_file_reader.rs@@ -62,6 +62,9 @@ fn file_reader_backing_state_is_not_own_property_surface() {].join(":");};const reader = new FileReader();+ const eventHandlerNames = [+ "onloadstart", "onprogress", "onload", "onabort", "onerror", "onloadend"+ ];const leaked = () => Object.getOwnPropertyNames(reader).filter(name => name.startsWith("__lmFileReader") ||name.startsWith("__moliFileReader"))@@ -74,6 +77,22 @@ fn file_reader_backing_state_is_not_own_property_surface() {__lmFileReaderResult: "spoofed",__lmFileReaderError: "spoofed"};+ const throwsTypeError = callback => {+ try {+ callback();+ return false;+ } catch (error) {+ return error instanceof TypeError;+ }+ };+ const handler = () => {};+ reader.onload = handler;+ const handlerRoundTrips = reader.onload === handler;+ const nonCallableHandler = {};+ reader.onload = nonCallableHandler;+ const nonCallableHandlerRoundTrips = reader.onload === nonCallableHandler;+ reader.onload = 42;+ const primitiveHandlerBecomesNull = reader.onload === null;const before = leaked();reader.addEventListener("load", () => {});reader.readAsText(new Blob(["abc"]));@@ -82,7 +101,8 @@ fn file_reader_backing_state_is_not_own_property_surface() {descriptors: [descriptorReport("readyState"),descriptorReport("result"),- descriptorReport("error")+ descriptorReport("error"),+ ...eventHandlerNames.map(descriptorReport)],constructorConstants: ["EMPTY", "LOADING", "DONE"].map(name =>constantDescriptor(FileReader, name)@@ -93,12 +113,19 @@ fn file_reader_backing_state_is_not_own_property_surface() {readerOwnConstants: ["EMPTY", "LOADING", "DONE"].filter(name =>Object.prototype.hasOwnProperty.call(reader, name)),+ readerOwnHandlers: eventHandlerNames.filter(name =>+ Object.prototype.hasOwnProperty.call(reader, name)+ ),before,during,resultIsNull: reader.result === null,- fakeReadyState: readyStateDescriptor.get.call(fake),- fakeResult: String(resultDescriptor.get.call(fake)),- fakeError: String(errorDescriptor.get.call(fake))+ handlerRoundTrips,+ nonCallableHandlerRoundTrips,+ primitiveHandlerBecomesNull,+ fakeReadyStateThrows: throwsTypeError(() => readyStateDescriptor.get.call(fake)),+ fakeResultThrows: throwsTypeError(() => resultDescriptor.get.call(fake)),+ fakeErrorThrows: throwsTypeError(() => errorDescriptor.get.call(fake)),+ fakeAbortThrows: throwsTypeError(() => FileReader.prototype.abort.call(fake))});})()"#,@@ -107,7 +134,7 @@ fn file_reader_backing_state_is_not_own_property_surface() {assert_eq!(result,- r#"{"descriptors":["readyState:function:get readyState:0:undefined:true:true","result:function:get result:0:undefined:true:true","error:function:get error:0:undefined:true:true"],"constructorConstants":["EMPTY:0:true:false:false","LOADING:1:true:false:false","DONE:2:true:false:false"],"prototypeConstants":["EMPTY:0:true:false:false","LOADING:1:true:false:false","DONE:2:true:false:false"],"readerOwnConstants":[],"before":[],"during":[],"resultIsNull":true,"fakeReadyState":0,"fakeResult":"null","fakeError":"null"}"#+ r#"{"descriptors":["readyState:function:get readyState:0:undefined:true:true","result:function:get result:0:undefined:true:true","error:function:get error:0:undefined:true:true","onloadstart:function:get onloadstart:0:function:true:true","onprogress:function:get onprogress:0:function:true:true","onload:function:get onload:0:function:true:true","onabort:function:get onabort:0:function:true:true","onerror:function:get onerror:0:function:true:true","onloadend:function:get onloadend:0:function:true:true"],"constructorConstants":["EMPTY:0:true:false:false","LOADING:1:true:false:false","DONE:2:true:false:false"],"prototypeConstants":["EMPTY:0:true:false:false","LOADING:1:true:false:false","DONE:2:true:false:false"],"readerOwnConstants":[],"readerOwnHandlers":[],"before":[],"during":[],"resultIsNull":true,"handlerRoundTrips":true,"nonCallableHandlerRoundTrips":true,"primitiveHandlerBecomesNull":true,"fakeReadyStateThrows":true,"fakeResultThrows":true,"fakeErrorThrows":true,"fakeAbortThrows":true}"#);}#[test]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.rsnew file mode 100644index 000000000..b619ab3b7--- /dev/null+++ b/moli-renderer-v8/src/script_vm/tests/file_reader_handlers.rs@@ -0,0 +1,70 @@+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/");+ 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);+ let key = crate::util::v8str(scope, "reader");+ let reader = global.get(scope, key.into()).unwrap();+ let reader = v8::Local::<v8::Object>::try_from(reader).unwrap();+ let handler = crate::util::new_null_prototype_object(scope);+ let proxy = v8::Proxy::new(scope, reader, handler).unwrap();+ moli_webapi_declare::register_web_api_proxy(scope, proxy).unwrap();+ let key = crate::util::v8str(scope, "nativeReaderProxy");+ assert_eq!(+ global.create_data_property(scope, key.into(), proxy.into()),+ Some(true)+ );+ Ok(())+ })+ .unwrap();+ assert_eq!(vm.eval(r#"(() => {+ const assert = (ok, name) => {if (!ok) throw Error(name);};+ const names = ['onloadstart','onprogress','onload','onabort','onerror','onloadend'];+ for (const callee of [window, foreign]) {+ for (const name of names) {+ const d = Object.getOwnPropertyDescriptor(callee.FileReader.prototype, name);+ assert(d.enumerable && d.configurable && d.get.length === 0 && d.set.length === 1, name + '/descriptor');+ assert(!Object.hasOwn(reader, name) && d.get.call(nativeReaderProxy) === null, name + '/prototype');+ const handler = () => {};+ d.set.call(nativeReaderProxy, handler);+ assert(reader[name] === handler && d.get.call(nativeReaderProxy) === handler, name + '/native-state');+ let objectHandlerCalls = 0;+ const nonCallable = {handleEvent() {objectHandlerCalls++;}};+ d.set.call(reader, nonCallable);+ assert(d.get.call(nativeReaderProxy) === nonCallable, name + '/object-handler');+ reader.dispatchEvent(new Event(name.slice(2)));+ assert(objectHandlerCalls === 0, name + '/object-is-not-event-listener');+ d.set.call(reader, 42);+ assert(d.get.call(nativeReaderProxy) === null, name + '/primitive-handler');+ let traps = 0;+ const author = new Proxy(reader, {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 callback of [() => d.get.call(receiver), () => d.set.call(receiver, handler)]) {+ let error; try {callback();} catch (caught) {error = caught;}+ assert(error && Object.getPrototypeOf(error) === callee.TypeError.prototype && traps === 0, name + '/receiver');+ }+ }+ }+ }+ assert(nativeReaderProxy.readyState === 0 && nativeReaderProxy.result === null && nativeReaderProxy.error === null, 'native getter state');+ const calls = [], listener = () => calls.push('listener');+ FileReader.prototype.addEventListener.call(nativeReaderProxy, 'load', listener);+ nativeReaderProxy.onload = () => calls.push('handler');+ reader.addEventListener('load', () => calls.push('tail'));+ reader.dispatchEvent(new Event('load'));+ assert(calls.join() === 'listener,handler,tail', 'ordered handler insertion');+ nativeReaderProxy.onload = () => calls.push('replacement');+ FileReader.prototype.removeEventListener.call(nativeReaderProxy, 'load', listener);+ calls.length = 0; reader.dispatchEvent(new Event('load'));+ assert(calls.join() === 'replacement,tail', 'replacement retains order and native removal');+ nativeReaderProxy.onload = null;+ nativeReaderProxy.onload = () => calls.push('readded');+ calls.length = 0; reader.dispatchEvent(new Event('load'));+ assert(calls.join() === 'tail,readded', 'readding follows later listeners');+ return true;+ })()"#).unwrap(), "true");+}diff --git a/moli-renderer-v8/src/script_vm/tests/mod.rs b/moli-renderer-v8/src/script_vm/tests/mod.rsindex 170a9dc37..6ac030d5c 100644--- a/moli-renderer-v8/src/script_vm/tests/mod.rs+++ b/moli-renderer-v8/src/script_vm/tests/mod.rs@@ -2259,3 +2259,5 @@ mod file_value_receivers;mod detached_node_producer_host;mod shadow_frame_unload_discovery;++mod file_reader_handlers;