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): build parse diagnostics without author stack access

ldm0281111efdd24
diff --git a/moli-renderer-v8/src/exception_reporting.rs b/moli-renderer-v8/src/exception_reporting.rs
index 59de4fe1b..85240e859 100644
--- a/moli-renderer-v8/src/exception_reporting.rs
+++ b/moli-renderer-v8/src/exception_reporting.rs
@@ -116,11 +116,11 @@ fn exception_stack_property<'s>(
local_value_to_string(scope, stack).filter(|stack| !stack.is_empty())
}
-pub(super) fn build_event_handler_exception_report<'s>(
+/// Build parse-error diagnostics without evaluating author-provided stack hooks.
+pub(super) fn build_exception_report_without_stack<'s>(
scope: &mut v8::PinScope<'s, '_>,
exception: Option<v8::Local<'s, v8::Value>>,
message: Option<v8::Local<'s, v8::Message>>,
- stack_value: Option<v8::Local<'s, v8::Value>>,
) -> V8ExceptionReport {
// Prefer v8::Message when it exists because it carries richer source text, but do not
// assume it is present or complete for every exception path.
@@ -149,24 +149,31 @@ pub(super) fn build_event_handler_exception_report<'s>(
.and_then(|message| message.get_source_line(scope))
.map(|line| line.to_rust_string_lossy(scope))
.filter(|line| !line.is_empty());
- let stack = stack_value
- .and_then(|value| local_value_to_string(scope, value))
- .filter(|stack| !stack.is_empty())
- .or_else(|| exception.and_then(|exception| exception_stack_property(scope, exception)));
-
- let mut report = V8ExceptionReport {
+ V8ExceptionReport {
summary,
source,
line,
column,
source_line,
- stack,
+ stack: None,
callback_context: None,
exception: exception.map(|exception| v8::Global::new(scope, exception)),
- };
+ }
+}
+
+pub(super) fn build_event_handler_exception_report<'s>(
+ scope: &mut v8::PinScope<'s, '_>,
+ exception: Option<v8::Local<'s, v8::Value>>,
+ message: Option<v8::Local<'s, v8::Message>>,
+ stack_value: Option<v8::Local<'s, v8::Value>>,
+) -> V8ExceptionReport {
+ let mut report = build_exception_report_without_stack(scope, exception, message);
+ report.stack = stack_value
+ .and_then(|value| local_value_to_string(scope, value))
+ .filter(|stack| !stack.is_empty())
+ .or_else(|| exception.and_then(|exception| exception_stack_property(scope, exception)));
if let Some(stack_trace) = v8::StackTrace::current_stack_trace(scope, 32) {
- // Use the current stack only to fill holes; when v8::Message already gave us a
- // location, keep that as the primary source of truth.
+ // Preserve the existing diagnostic fallback for callers that request a stack.
fill_location_from_stack_trace(scope, &mut report, stack_trace);
}
report
diff --git a/moli-renderer-v8/src/native_bridge/element/event_handlers/shared.rs b/moli-renderer-v8/src/native_bridge/element/event_handlers/shared.rs
index a9c1d73ac..ac57c86d4 100644
--- a/moli-renderer-v8/src/native_bridge/element/event_handlers/shared.rs
+++ b/moli-renderer-v8/src/native_bridge/element/event_handlers/shared.rs
@@ -1,7 +1,7 @@
use crate::{
context_bootstrap::dispatch_window_error_event_with_details,
document_runtime::DomHandle,
- exception_reporting::build_event_handler_exception_report,
+ exception_reporting::build_exception_report_without_stack,
native_bridge::{JsContextHost, OwnerDispatchScope},
util::{create_script_origin_with_base_url, v8_string},
};
@@ -126,8 +126,9 @@ fn compile_event_attribute_function<'s>(
let exception = scope.exception();
let message = scope.message();
- let stack_trace = scope.stack_trace();
- let report = build_event_handler_exception_report(&mut scope, exception, message, stack_trace);
+ // Reporting a parse error must not invoke an author's Error.prepareStackTrace
+ // hook. ErrorEvent only needs the exception and its native source location.
+ let report = build_exception_report_without_stack(&mut scope, exception, message);
scope.reset();
let error_value = report
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 34c47314c..3b2789626 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
@@ -189,3 +189,5 @@ fn parser_inserted_frameset_window_event_handlers_reflect_on_window() {
r#"{"beforeInvocation":["function","function",true,true],"loadResult":true,"errorResult":"message|source|3|4|error"}"#,
);
}
+
+mod node_compilation;
diff --git a/moli-renderer-v8/src/script_vm/tests/browser_api/event_handlers/node_compilation.rs b/moli-renderer-v8/src/script_vm/tests/browser_api/event_handlers/node_compilation.rs
new file mode 100644
index 000000000..46a162888
--- /dev/null
+++ b/moli-renderer-v8/src/script_vm/tests/browser_api/event_handlers/node_compilation.rs
@@ -0,0 +1,46 @@
+use super::*;
+
+#[test]
+fn handler_parse_errors_report_native_details_without_author_stack_hooks() {
+ let mut vm = new_parsed_test_vm(
+ "https://handler-compilation-stack.test/",
+ "<!doctype html><body></body>",
+ );
+ let result = vm.eval(r#"
+(() => {
+ const frame = document.body.appendChild(document.createElement('iframe'));
+ const results = [];
+ for (const w of [window, frame.contentWindow]) {
+ let reads = 0;
+ const errors = [];
+ const previous = Object.getOwnPropertyDescriptor(w.Error, 'prepareStackTrace');
+ const onError = event => {
+ event.preventDefault();
+ errors.push([event.error instanceof w.SyntaxError, typeof event.message === 'string', event.message.length > 0]);
+ };
+ w.addEventListener('error', onError);
+ Object.defineProperty(w.Error, 'prepareStackTrace', {
+ configurable: true,
+ get() { reads++; throw new Error('author stack getter must not run'); }
+ });
+ try {
+ const element = w.document.body.appendChild(w.document.createElement('button'));
+ element.setAttribute('onclick', '}');
+ const handler = element.onclick;
+ results.push({isNull: handler === null, reads, errors});
+ element.remove();
+ } finally {
+ w.removeEventListener('error', onError);
+ if (previous) Object.defineProperty(w.Error, 'prepareStackTrace', previous);
+ else delete w.Error.prepareStackTrace;
+ }
+ }
+ frame.remove();
+ return JSON.stringify(results);
+})()
+"#).expect("parse error diagnostics should not execute author stack hooks");
+ assert_eq!(
+ result,
+ r#"[{"isNull":true,"reads":0,"errors":[[true,true,true]]},{"isNull":true,"reads":0,"errors":[[true,true,true]]}]"#
+ );
+}