Skip to content

armgit / moli

Public Imported from GitHub
0

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

fix(events): preserve event constructor type code units

ldm096442e437ba3
diff --git a/moli-renderer-v8/src/context_bootstrap/events/base.rs b/moli-renderer-v8/src/context_bootstrap/events/base.rs
index a5aa67ec7..58602b41e 100644
--- a/moli-renderer-v8/src/context_bootstrap/events/base.rs
+++ b/moli-renderer-v8/src/context_bootstrap/events/base.rs
@@ -3,7 +3,6 @@ use super::*;
use crate::context_bootstrap::{current_performance_time_origin, dom_time_since_origin_millis};
use crate::util::{get_private_value, set_private_value};
use crate::web_api_interfaces;
-use crate::webidl;
use moli_webapi_declare::WebApiObject;
pub(crate) const EVENT_DISPATCHING_SLOT: &str = "__lmDispatching";
@@ -88,7 +87,7 @@ pub(in crate::context_bootstrap) fn event_type_argument<'s>(
scope: &mut v8::PinScope<'s, '_>,
args: &v8::FunctionCallbackArguments<'s>,
constructor_name: &'static str,
-) -> Option<String> {
+) -> Option<v8::Local<'s, v8::String>> {
if args.length() == 0 {
throw_type_error(
scope,
@@ -96,20 +95,7 @@ pub(in crate::context_bootstrap) fn event_type_argument<'s>(
);
return None;
}
- webidl::argument::<webidl::DomString>(
- scope,
- args,
- 0,
- webidl::Context::argument(constructor_name, 1),
- )
- .map(Into::into)
- .map_or_else(
- |error| {
- webidl::throw_error(scope, &error);
- None
- },
- Some,
- )
+ args.get(0).to_string(scope)
}
pub(crate) fn define_event_property(
@@ -476,7 +462,7 @@ pub(in crate::context_bootstrap) fn event_constructor_callback<'s>(
};
let (bubbles, cancelable, composed) = read_event_init(scope, &args);
- initialize_event_object(scope, event, &event_type, bubbles, cancelable);
+ initialize_event_object_with_type(scope, event, event_type, bubbles, cancelable);
define_event_property(
scope,
event,
diff --git a/moli-renderer-v8/src/context_bootstrap/events/subclasses.rs b/moli-renderer-v8/src/context_bootstrap/events/subclasses.rs
index fad7a1ea6..5ba707a78 100644
--- a/moli-renderer-v8/src/context_bootstrap/events/subclasses.rs
+++ b/moli-renderer-v8/src/context_bootstrap/events/subclasses.rs
@@ -1,4 +1,4 @@
-use super::base::{define_event_property, event_type_argument, initialize_event_object};
+use super::base::{define_event_property, event_type_argument, initialize_event_object_with_type};
use super::init::{
init_bool_property, init_number_property, init_string_property, init_value_property,
init_window_view_property, read_event_init,
diff --git a/moli-renderer-v8/src/context_bootstrap/events/subclasses/constructor.rs b/moli-renderer-v8/src/context_bootstrap/events/subclasses/constructor.rs
index 286de81d8..bfa3d850f 100644
--- a/moli-renderer-v8/src/context_bootstrap/events/subclasses/constructor.rs
+++ b/moli-renderer-v8/src/context_bootstrap/events/subclasses/constructor.rs
@@ -44,7 +44,7 @@ fn event_subclass_constructor_callback<'s>(
};
let (bubbles, cancelable, composed) = read_event_init(scope, &args);
- initialize_event_object(scope, event, &event_type, bubbles, cancelable);
+ initialize_event_object_with_type(scope, event, event_type, bubbles, cancelable);
define_event_property(
scope,
event,
diff --git a/moli-renderer-v8/src/script_vm/tests/browser_api/event_constructor_type.js b/moli-renderer-v8/src/script_vm/tests/browser_api/event_constructor_type.js
new file mode 100644
index 000000000..dd14c505d
--- /dev/null
+++ b/moli-renderer-v8/src/script_vm/tests/browser_api/event_constructor_type.js
@@ -0,0 +1,80 @@
+(() => {
+ const rows = [];
+ const check = (name, passed) => rows.push({name, passed: !!passed});
+ const throws = (fn, expected) => {
+ try { fn(); return false; } catch (error) { return expected(error); }
+ };
+ const raw = 'type\ud800\0\udc00';
+ const types = ['', 'load', '\ud800', '\udc00', raw, '\ud800\ud800',
+ '\udc00\ud800', '\ud83d\ude80', '\ufffd', '事件\0type'];
+ const names = ['Event', 'CustomEvent', 'UIEvent', 'FocusEvent', 'CompositionEvent',
+ 'MouseEvent', 'DragEvent', 'KeyboardEvent', 'WheelEvent', 'PointerEvent', 'TouchEvent',
+ 'MessageEvent', 'ErrorEvent', 'CloseEvent', 'SubmitEvent', 'InputEvent', 'PopStateEvent',
+ 'PageTransitionEvent', 'StorageEvent', 'SecurityPolicyViolationEvent', 'ClipboardEvent',
+ 'PromiseRejectionEvent', 'FormDataEvent'];
+ const init = w => ({bubbles: true, cancelable: true, composed: true,
+ promise: w.Promise.resolve(), formData: new w.FormData()});
+ for (const name of names) {
+ const Constructor = window[name];
+ for (const type of types) {
+ const event = new Constructor(type, init(window));
+ check(name + ' exact type ' + JSON.stringify(type), event.type === type &&
+ event.type.length === type.length && event instanceof Event);
+ }
+ const order = [];
+ const event = new Constructor({[Symbol.toPrimitive](hint) {
+ order.push(hint); return raw;
+ }}, {...init(window), get bubbles() { order.push('bubbles'); return true; }});
+ check(name + ' converts once before dictionary', event.type === raw &&
+ order.join(',') === 'string,bubbles');
+ check(name + ' retains flags and fresh state', event.bubbles && event.cancelable &&
+ event.composed && !event.isTrusted && !event.defaultPrevented && event.target === null);
+ let reads = 0;
+ const dictionary = {...init(window), get bubbles() { reads++; return true; }};
+ check(name + ' Symbol rejects before dictionary', throws(() => new Constructor(Symbol(), dictionary),
+ error => error instanceof TypeError) && reads === 0);
+ check(name + ' Symbol primitive rejects before dictionary', throws(() => new Constructor({
+ [Symbol.toPrimitive]() { return Symbol(); }
+ }, dictionary), error => error instanceof TypeError) && reads === 0);
+ const sentinel = new RangeError('type conversion');
+ check(name + ' preserves conversion exception', throws(() => new Constructor({
+ toString() { throw sentinel; }
+ }, dictionary), error => error === sentinel) && reads === 0);
+ check(name + ' missing type rejects', throws(() => new Constructor(),
+ error => error instanceof TypeError));
+ class Derived extends Constructor {}
+ const derived = new Derived(raw, init(window));
+ check(name + ' derived constructor retains type', derived.type === raw &&
+ Object.getPrototypeOf(derived) === Derived.prototype && derived instanceof Constructor);
+ }
+ for (const type of [undefined, null, true, false, 7, 1n, new String(raw)]) {
+ check('Event ToString ' + String(type), new Event(type).type === String(type));
+ check('CustomEvent ToString ' + String(type), new CustomEvent(type).type === String(type));
+ }
+ let conversions = 0;
+ const fallback = {toString() { conversions++; return {}; }, valueOf() { conversions++; return raw; }};
+ check('ordinary ToPrimitive fallback retains units', new Event(fallback).type === raw && conversions === 2);
+ const frozen = Object.freeze(new CustomEvent(raw, {detail: fallback}));
+ check('frozen wrapper retains type and payload', frozen.type === raw && frozen.detail === fallback);
+ const child = document.querySelector('#child').contentWindow;
+ for (const name of names) {
+ const Constructor = child[name];
+ const event = new Constructor({toString() { return raw; }}, init(child));
+ check(name + ' cross realm exact type', event.type === raw && event instanceof child.Event &&
+ Object.getPrototypeOf(event) === Constructor.prototype);
+ let reads = 0;
+ const dictionary = {...init(child), get bubbles() { reads++; return true; }};
+ check(name + ' conversion error belongs to callee realm', throws(() => new Constructor(Symbol(), dictionary),
+ error => error instanceof child.TypeError && !(error instanceof TypeError)) && reads === 0);
+ const sentinel = new RangeError('cross realm type conversion');
+ check(name + ' cross realm exception identity', throws(() => new Constructor({
+ toString() { throw sentinel; }
+ }, dictionary), error => error === sentinel) && reads === 0);
+ const withLocalPrototype = Reflect.construct(Constructor, [raw, init(child)], window[name]);
+ check(name + ' Reflect.construct retains type and newTarget', withLocalPrototype.type === raw &&
+ Object.getPrototypeOf(withLocalPrototype) === window[name].prototype);
+ }
+ globalThis.__eventConstructorTypeResults = {rows, passed: rows.filter(row => row.passed).length,
+ total: rows.length, constructors: names};
+ return rows.every(row => row.passed) || JSON.stringify(rows.filter(row => !row.passed));
+})()
diff --git a/moli-renderer-v8/src/script_vm/tests/browser_api/event_constructor_type.rs b/moli-renderer-v8/src/script_vm/tests/browser_api/event_constructor_type.rs
new file mode 100644
index 000000000..b3e3bebd7
--- /dev/null
+++ b/moli-renderer-v8/src/script_vm/tests/browser_api/event_constructor_type.rs
@@ -0,0 +1,13 @@
+use super::*;
+
+#[test]
+fn event_constructors_preserve_dom_string_code_units_and_conversion_order() {
+ let mut vm = new_parsed_test_vm(
+ "https://event-constructor-type.test/",
+ "<!doctype html><iframe id=child></iframe>",
+ );
+ let result = vm
+ .eval(include_str!("event_constructor_type.js"))
+ .expect("event constructors should preserve DOMString code units and conversion errors");
+ assert_eq!(result, "true");
+}
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.rs
index 700ba0e2b..62ac1ff68 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
@@ -16,6 +16,7 @@ mod crypto_subtle_other;
mod crypto_subtle_x25519;
mod date_locale;
mod details;
+mod event_constructor_type;
mod event_handlers;
mod event_listener_options;
mod events_selection_storage;