Skip to content

armgit / moli

Public Imported from GitHub
0

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

fix(dom): clear root handlers without invoking author setters

ldm0c491a1188555
diff --git a/moli-renderer-v8/src/native_bridge/document/lifecycle.rs b/moli-renderer-v8/src/native_bridge/document/lifecycle.rs
index 37b215e95..bb3fbd083 100644
--- a/moli-renderer-v8/src/native_bridge/document/lifecycle.rs
+++ b/moli-renderer-v8/src/native_bridge/document/lifecycle.rs
@@ -12,7 +12,6 @@ use crate::native_bridge::element::{
replace_text_control_selection, text_control_value,
};
use crate::{
- context_bootstrap::WINDOW_EVENT_HANDLER_PROPERTIES,
custom_elements,
document_runtime::DomHandle,
util::{
@@ -101,7 +100,6 @@ fn node_document_write_or_writeln_callback<'s>(
return;
}
if implicit_replacement_session {
- clear_window_event_handlers(scope);
JsContextHost::prepare_root_document_replacement(scope, runtime_ptr, handle);
}
for chunk in parsed.text {
@@ -184,21 +182,12 @@ pub(in crate::native_bridge) fn node_document_open_callback<'s>(
}
let runtime = unsafe { &mut *runtime_ptr };
if !runtime.has_active_parser_write_insertion_point() {
- clear_window_event_handlers(scope);
JsContextHost::prepare_root_document_replacement(scope, runtime_ptr, handle);
}
}
rv.set(args.this().into());
}
-fn clear_window_event_handlers(scope: &mut v8::PinScope<'_, '_>) {
- let global = scope.get_current_context().global(scope);
- let null = v8::null(scope).into();
- for name in WINDOW_EVENT_HANDLER_PROPERTIES {
- let _ = global.set(scope, v8str(scope, name).into(), null);
- }
-}
-
impl JsContextHost {
fn prepare_root_document_replacement(
scope: &mut v8::PinScope<'_, '_>,
@@ -237,7 +226,6 @@ impl JsContextHost {
html: &str,
) {
let document_handle = unsafe { &*host_ptr }.document_handle();
- clear_window_event_handlers(scope);
Self::prepare_root_document_replacement(scope, host_ptr, document_handle);
let _ = unsafe { &mut *host_ptr }.write_html(scope, host_ptr, document_handle, html);
unsafe { &mut *host_ptr }.close_document(scope, host_ptr);
diff --git a/moli-renderer-v8/src/script_vm/tests/browser_api/event_handlers.rs b/moli-renderer-v8/src/script_vm/tests/browser_api/event_handlers.rs
index 3b2789626..3b00001ce 100644
--- a/moli-renderer-v8/src/script_vm/tests/browser_api/event_handlers.rs
+++ b/moli-renderer-v8/src/script_vm/tests/browser_api/event_handlers.rs
@@ -191,3 +191,5 @@ fn parser_inserted_frameset_window_event_handlers_reflect_on_window() {
}
mod node_compilation;
+
+mod document_replacement;
diff --git a/moli-renderer-v8/src/script_vm/tests/browser_api/event_handlers/document_replacement.js b/moli-renderer-v8/src/script_vm/tests/browser_api/event_handlers/document_replacement.js
new file mode 100644
index 000000000..40c66de4b
--- /dev/null
+++ b/moli-renderer-v8/src/script_vm/tests/browser_api/event_handlers/document_replacement.js
@@ -0,0 +1,61 @@
+(() => {
+ const rows = [];
+ function check(name, run) {
+ let actual;
+ try { actual = run(); }
+ catch (error) { actual = {error: error.name, message: error.message}; }
+ rows.push({name, actual, pass: actual === true});
+ }
+ function sameDescriptor(before, after) {
+ if (!before || !after) return before === after;
+ const keys = ['value', 'writable', 'get', 'set', 'enumerable', 'configurable'];
+ return keys.every(key => Object.hasOwn(before, key) === Object.hasOwn(after, key) &&
+ before[key] === after[key]);
+ }
+ function withWindow(owner, run) {
+ if (owner !== 'root') throw new Error('unexpected document owner');
+ // Finish a replacement stream first so write() starts a destructive stream.
+ document.open();
+ document.close();
+ return run(window);
+ }
+ function replace(target, operation) {
+ if (operation === 'open') target.document.open();
+ else target.document.write('<!doctype html><body>replacement');
+ target.document.close();
+ }
+ for (const owner of ['root']) {
+ for (const operation of ['open', 'write']) {
+ for (const mode of ['native', 'deleted', 'replaced', 'throwing-setter', 'read-only']) {
+ check(`${owner}:${operation}:${mode}`, () => withWindow(owner, target => {
+ let callbacks = 0, writes = 0;
+ const native = Object.getOwnPropertyDescriptor(target, 'onresize');
+ try {
+ target.onresize = () => { ++callbacks; };
+ target.addEventListener('resize', () => { ++callbacks; });
+ if (mode === 'deleted') delete target.onresize;
+ if (mode === 'replaced' || mode === 'throwing-setter') {
+ Object.defineProperty(target, 'onresize', {set() {
+ ++writes;
+ if (mode === 'throwing-setter') throw new Error('author setter ran');
+ }});
+ }
+ if (mode === 'read-only') {
+ Object.defineProperty(target, 'onresize', {value: 17, writable: false});
+ }
+ const descriptor = Object.getOwnPropertyDescriptor(target, 'onresize');
+ replace(target, operation);
+ target.dispatchEvent(new Event('resize'));
+ return sameDescriptor(descriptor, Object.getOwnPropertyDescriptor(target, 'onresize')) &&
+ native.get.call(target) === null && callbacks === 0 && writes === 0;
+ } finally { Object.defineProperty(target, 'onresize', native); }
+ }));
+ }
+
+ }
+ }
+ const failures = rows.filter(row => !row.pass);
+ globalThis.__nodeReplacementResults = {total: rows.length,
+ passed: rows.length - failures.length, failures, rows};
+ return failures.length === 0;
+})()
diff --git a/moli-renderer-v8/src/script_vm/tests/browser_api/event_handlers/document_replacement.rs b/moli-renderer-v8/src/script_vm/tests/browser_api/event_handlers/document_replacement.rs
new file mode 100644
index 000000000..ffdaa6c16
--- /dev/null
+++ b/moli-renderer-v8/src/script_vm/tests/browser_api/event_handlers/document_replacement.rs
@@ -0,0 +1,49 @@
+use super::*;
+
+#[test]
+fn root_document_replacement_clears_native_handlers_without_changing_public_descriptors() {
+ let mut vm = new_storage_html_test_vm("https://document-handler-cleanup.test/");
+ vm.eval(include_str!("document_replacement.js")).unwrap();
+ assert_eq!(
+ vm.eval("JSON.stringify(__nodeReplacementResults.failures)")
+ .unwrap(),
+ "[]"
+ );
+}
+
+#[test]
+fn native_document_content_replacement_does_not_invoke_author_handler_setters() {
+ let mut vm = new_storage_html_test_vm("https://native-handler-cleanup.test/");
+ vm.root_frame_id = Some("handler-cleanup-root".to_owned());
+ vm.eval(
+ r#"
+(() => {
+ let callbacks = 0, writes = 0;
+ const descriptor = Object.getOwnPropertyDescriptor(window, 'onresize');
+ const setter = () => { ++writes; throw new Error('author setter ran'); };
+ window.onresize = () => { ++callbacks; };
+ window.addEventListener('resize', () => { ++callbacks; });
+ Object.defineProperty(window, 'onresize', {set: setter});
+ for (const name of ['open', 'write', 'close']) {
+ document[name] = () => { throw new Error('author document method ran'); };
+ }
+ globalThis.verifyNativeCleanup = () => {
+ window.dispatchEvent(new Event('resize'));
+ return callbacks === 0 && writes === 0 && descriptor.get.call(window) === null &&
+ Object.getOwnPropertyDescriptor(window, 'onresize').set === setter &&
+ document.getElementById('native-replacement').textContent === 'native';
+ };
+})()
+"#,
+ )
+ .unwrap();
+ assert_eq!(
+ vm.set_document_content_for_frame(
+ "handler-cleanup-root",
+ "<!doctype html><body><p id=native-replacement>native</p>",
+ )
+ .unwrap(),
+ crate::runtime::RendererSetDocumentContentResult::Updated
+ );
+ assert_eq!(vm.eval("verifyNativeCleanup()").unwrap(), "true");
+}