From 8ee45ed3ff761cb6232c7b5dce83156754243bfb Mon Sep 17 00:00:00 2001 From: ldm0 Date: Tue, 8 Sep 2026 12:11:35 +0800 Subject: [PATCH] fix(modules): preserve original exceptions through error reporting --- ...ow_error_payload_does_not_abort_queue.html | 11 +- moli-core/tests/scripts.rs | 8 + moli-module-script-tree/src/job.rs | 21 ++ .../src/document_module_graph/diagnostics.rs | 13 +- .../script_scheduling/script_handles.rs | 21 +- .../document_script_scheduler/owner_work.rs | 18 +- .../src/document_script_scheduler/store.rs | 6 +- moli-renderer-v8/src/dynamic_script_owner.rs | 78 ++++--- moli-renderer-v8/src/host/scripts.rs | 16 +- moli-renderer-v8/src/host/scripts/policy.rs | 28 ++- moli-renderer-v8/src/host/scripts/tests.rs | 2 +- .../src/module_script_continuation.rs | 4 +- .../src/native_bridge/context_host/core.rs | 8 +- .../src/native_bridge/context_host/mod.rs | 2 +- .../src/page_task_queue/module_reaction.rs | 12 +- moli-renderer-v8/src/page_task_queue/tasks.rs | 12 +- .../src/parser_module_evaluation.rs | 6 +- moli-renderer-v8/src/runtime/page_vm/mod.rs | 77 +++---- .../page_owned_document_script_hooks.rs | 4 +- .../page_vm/parser_owned_module_completion.rs | 10 +- .../src/runtime/page_vm/tests/mod.rs | 1 + .../page_vm/tests/module_error_reporting.rs | 197 ++++++++++++++++++ .../child_document_script_scheduler.rs | 6 +- moli-renderer-v8/src/script_vm/eval_exec.rs | 24 +-- .../src/script_vm/input_helpers.rs | 16 +- .../main_document_post_parse_body.rs | 2 +- .../src/script_vm/native_module.rs | 52 +++-- .../native_module/child_parser_module/mod.rs | 4 +- .../src/script_vm/native_module/load_error.rs | 32 +-- .../script_vm/native_module/module_fetch.rs | 6 +- .../native_module/module_reactions.rs | 16 +- .../src/script_vm/page_task_enqueue.rs | 12 +- .../src/script_vm/post_parse_lifecycle.rs | 64 +++--- .../src/script_vm/runtime_bindings.rs | 6 + .../src/script_vm/script_event_body.rs | 30 ++- .../script_vm/script_terminal_completion.rs | 36 ++-- .../tests/browser_api/promise_rejection.rs | 24 +++ .../tests/script_terminal_completion.rs | 46 ++++ moli-renderer-v8/src/types.rs | 15 ++ 39 files changed, 635 insertions(+), 311 deletions(-) create mode 100644 moli-renderer-v8/src/runtime/page_vm/tests/module_error_reporting.rs diff --git a/moli-core/tests/fixtures/runtime/dynamic_module_tla_exotic_rejection_reports_window_error_payload_does_not_abort_queue.html b/moli-core/tests/fixtures/runtime/dynamic_module_tla_exotic_rejection_reports_window_error_payload_does_not_abort_queue.html index ebf3ec6309e..bfd2f7bbea0 100644 --- a/moli-core/tests/fixtures/runtime/dynamic_module_tla_exotic_rejection_reports_window_error_payload_does_not_abort_queue.html +++ b/moli-core/tests/fixtures/runtime/dynamic_module_tla_exotic_rejection_reports_window_error_payload_does_not_abort_queue.html @@ -6,10 +6,13 @@ window.addEventListener("error", (event) => { window.dynamicModuleTlaPayloadOrder.push("window-error"); window.dynamicModuleTlaPayloadErrorMessageMatches = Boolean( - event.error && - typeof event.error.message === "string" && - event.error.message.length > 0, + typeof event.message === "string" && event.message.length > 0, ); + window.dynamicModuleTlaPayloadErrorIdentityMatches = + event.error === window.dynamicModuleTlaPayloadReason && + Object.getPrototypeOf(event.error) === null && + !Object.hasOwn(event.error, "message") && + !Object.hasOwn(event.error, "fileName"); window.dynamicModuleTlaPayloadFilenameMatches = typeof event.filename === "string" && event.filename.includes( @@ -23,7 +26,7 @@ window.dynamicModuleTlaPayloadOrder.push("script-error"); }; broken.text = - 'const reason = Object.create(null); await Promise.reject(reason);'; + 'const reason = window.dynamicModuleTlaPayloadReason = Object.create(null); await Promise.reject(reason);'; document.body.appendChild(broken); const later = document.createElement("script"); diff --git a/moli-core/tests/scripts.rs b/moli-core/tests/scripts.rs index fa91177f8a4..3351704db04 100644 --- a/moli-core/tests/scripts.rs +++ b/moli-core/tests/scripts.rs @@ -3217,6 +3217,10 @@ async fn dynamic_module_tla_exotic_rejection_reports_window_error_payload_withou diagnostic_global(&page, "dynamicModuleTlaPayloadErrorMessageMatches"), Some(&JsValueSnapshot::Bool(true)) ); + assert_eq!( + diagnostic_global(&page, "dynamicModuleTlaPayloadErrorIdentityMatches"), + Some(&JsValueSnapshot::Bool(true)) + ); assert_eq!( diagnostic_global(&page, "dynamicModuleTlaPayloadFilenameMatches"), Some(&JsValueSnapshot::Bool(true)) @@ -3909,6 +3913,10 @@ async fn parser_owned_module_tla_exotic_rejection_reports_window_error_payload_w diagnostic_global(&page, "parserOwnedModuleTlaPayloadErrorMessageMatches"), Some(&JsValueSnapshot::Bool(true)) ); + assert_eq!( + diagnostic_global(&page, "parserOwnedModuleTlaPayloadErrorIdentityMatches"), + Some(&JsValueSnapshot::Bool(true)) + ); assert_eq!( diagnostic_global(&page, "parserOwnedModuleTlaPayloadFilenameMatches"), Some(&JsValueSnapshot::Bool(true)) diff --git a/moli-module-script-tree/src/job.rs b/moli-module-script-tree/src/job.rs index 09d61db4ce3..b91edb608b1 100644 --- a/moli-module-script-tree/src/job.rs +++ b/moli-module-script-tree/src/job.rs @@ -707,4 +707,25 @@ struct DependencyCandidate { fn is_creation_error(error: &ModuleLoadError) -> bool { error.stage == ModuleLoadStage::Compile + || (error.stage == ModuleLoadStage::Resolve && error.exception_id.is_some()) +} + +#[cfg(test)] +mod tests { + use super::*; + + #[test] + fn retained_values_do_not_turn_link_or_evaluation_failures_into_parse_errors() { + for (stage, expected) in [ + (ModuleLoadStage::Compile, true), + (ModuleLoadStage::Resolve, true), + (ModuleLoadStage::Fetch, false), + (ModuleLoadStage::Instantiate, false), + (ModuleLoadStage::Evaluate, false), + ] { + let error = ModuleLoadError::new(stage, "retained error") + .with_exception_id(crate::ModuleExceptionId(1)); + assert_eq!(is_creation_error(&error), expected, "{stage:?}"); + } + } } diff --git a/moli-renderer-v8/src/document_module_graph/diagnostics.rs b/moli-renderer-v8/src/document_module_graph/diagnostics.rs index f73e89e03bf..003a410c87c 100644 --- a/moli-renderer-v8/src/document_module_graph/diagnostics.rs +++ b/moli-renderer-v8/src/document_module_graph/diagnostics.rs @@ -1,5 +1,5 @@ use super::key::ModuleMapKey; -use crate::types::ScriptErrorConstructorKind; +use crate::types::{ScriptErrorConstructorKind, ScriptErrorValue}; use moli_module_script_tree::ModuleExceptionId; #[derive(Debug, Clone, Copy, PartialEq, Eq)] @@ -76,6 +76,17 @@ impl ModuleLoadError { &self.message } + pub(crate) fn with_message(mut self, message: String) -> Self { + self.message = message; + self + } + + pub(crate) fn error_value(&self) -> Option { + self.exception_id + .map(ScriptErrorValue::Retained) + .or_else(|| self.error_constructor.map(ScriptErrorValue::Constructor)) + } + pub(crate) fn error_constructor(&self) -> Option { self.error_constructor } diff --git a/moli-renderer-v8/src/document_runtime/script_scheduling/script_handles.rs b/moli-renderer-v8/src/document_runtime/script_scheduling/script_handles.rs index a018bfc89d2..3590754bef8 100644 --- a/moli-renderer-v8/src/document_runtime/script_scheduling/script_handles.rs +++ b/moli-renderer-v8/src/document_runtime/script_scheduling/script_handles.rs @@ -8,7 +8,7 @@ use crate::host::{ }; use crate::page_task_queue::PostParseLifecycleWork; use crate::planning::PreparedScript; -use crate::types::{ScriptErrorConstructorKind, ScriptKind}; +use crate::types::{ScriptErrorValue, ScriptKind}; use tracing::warn; impl DocumentRuntime { @@ -156,7 +156,7 @@ impl DocumentRuntime { script: &PreparedScript, message: &str, module_failure_policy: Option, - error_constructor: Option, + error_value: Option, ) -> Vec { if script.host_script_handle.is_none() && matches!(script.kind, ScriptKind::Module | ScriptKind::ImportMap) @@ -186,7 +186,7 @@ impl DocumentRuntime { message, Some(script.url.as_str()), module_failure_policy, - error_constructor, + error_value, ) } @@ -196,17 +196,12 @@ impl DocumentRuntime { script: &PreparedScript, message: &str, module_failure_policy: Option, - error_constructor: Option, + error_value: Option, ) -> Vec { - self.plan_script_failure_lifecycle_work( - script, - message, - module_failure_policy, - error_constructor, - ) - .into_iter() - .map(PostParseLifecycleWork::into_page_task) - .collect() + self.plan_script_failure_lifecycle_work(script, message, module_failure_policy, error_value) + .into_iter() + .map(PostParseLifecycleWork::into_page_task) + .collect() } pub(crate) fn enqueue_parser_boundary_lifecycle_work(&mut self, work: PostParseLifecycleWork) { diff --git a/moli-renderer-v8/src/document_script_scheduler/owner_work.rs b/moli-renderer-v8/src/document_script_scheduler/owner_work.rs index c7c103baaa7..b38a5c0f556 100644 --- a/moli-renderer-v8/src/document_script_scheduler/owner_work.rs +++ b/moli-renderer-v8/src/document_script_scheduler/owner_work.rs @@ -6,7 +6,7 @@ use crate::{ PreparedScript, PreparedScriptSourceLoadOutcome, SharedScriptSourceLoad, prepared_script_with_loaded_source, }, - types::{ScriptErrorConstructorKind, SharedNavigationResponseResult}, + types::{ScriptErrorValue, SharedNavigationResponseResult}, }; use super::{DocumentScriptExecutionLane, DocumentScriptSourceFailureLane}; @@ -22,7 +22,7 @@ pub(crate) struct PageOwnedDocumentScriptSourceFailure { message: String, source_load: bool, module_failure_policy: Option, - error_constructor: Option, + error_value: Option, } impl PageOwnedDocumentScriptSourceFailure { @@ -31,20 +31,20 @@ impl PageOwnedDocumentScriptSourceFailure { message, source_load: true, module_failure_policy: None, - error_constructor: None, + error_value: None, } } pub(crate) fn runtime_terminal( message: String, module_failure_policy: Option, - error_constructor: Option, + error_value: Option, ) -> Self { Self { message, source_load: false, module_failure_policy, - error_constructor, + error_value, } } @@ -62,13 +62,9 @@ impl PageOwnedDocumentScriptSourceFailure { ) -> ( String, Option, - Option, + Option, ) { - ( - self.message, - self.module_failure_policy, - self.error_constructor, - ) + (self.message, self.module_failure_policy, self.error_value) } } diff --git a/moli-renderer-v8/src/document_script_scheduler/store.rs b/moli-renderer-v8/src/document_script_scheduler/store.rs index ec2f9381daf..d4cc00e8150 100644 --- a/moli-renderer-v8/src/document_script_scheduler/store.rs +++ b/moli-renderer-v8/src/document_script_scheduler/store.rs @@ -19,7 +19,7 @@ use crate::parser_module_evaluation::{ use crate::parser_script::action::ParserClassicScriptNextOwnerAction; use crate::planning::{PreparedScript, SharedScriptSourceLoad}; use crate::stylesheet_blocking::DocumentBlockingStylesheetSignature; -use crate::types::ScriptErrorConstructorKind; +use crate::types::ScriptErrorValue; #[derive(Clone, Copy, Debug, Eq, PartialEq)] pub(crate) struct ParserModuleEvaluationReactionUpdate { @@ -620,7 +620,7 @@ where &mut self, reaction_id: u64, reason: String, - error_constructor: Option, + error_value: Option, mut convert: Convert, ) -> Option where @@ -631,7 +631,7 @@ where { let root_entry = self.parser_module_evaluations - .mark_rejected(reaction_id, reason, error_constructor)?; + .mark_rejected(reaction_id, reason, error_value)?; let queued_ready_action_count = self.promote_ready_parser_module_evaluations(&mut convert); Some(ParserModuleEvaluationReactionUpdate { root_entry, diff --git a/moli-renderer-v8/src/dynamic_script_owner.rs b/moli-renderer-v8/src/dynamic_script_owner.rs index 2f1c9620cd3..c7a0017d0eb 100644 --- a/moli-renderer-v8/src/dynamic_script_owner.rs +++ b/moli-renderer-v8/src/dynamic_script_owner.rs @@ -24,8 +24,7 @@ use super::{ prepared_script_with_loaded_source, }, types::{ - ScriptErrorConstructorKind, ScriptKind, ScriptMode, ScriptSourceKind, - SharedNavigationResponseResult, + ScriptErrorValue, ScriptKind, ScriptMode, ScriptSourceKind, SharedNavigationResponseResult, }, }; use crate::frame_owner_model::MainDocumentScriptLoadDelayLease; @@ -165,7 +164,7 @@ struct DynamicScriptFailure { kind: DynamicScriptFailureKind, module_failure_policy: Option, source_network_result: Option, - error_constructor: Option, + error_value: Option, } #[derive(Debug, Clone, Copy, PartialEq, Eq)] @@ -187,7 +186,7 @@ impl DynamicScriptFailure { kind, module_failure_policy, source_network_result: None, - error_constructor: None, + error_value: None, } } @@ -199,11 +198,8 @@ impl DynamicScriptFailure { self } - fn with_error_constructor( - mut self, - error_constructor: Option, - ) -> Self { - self.error_constructor = error_constructor; + fn with_error_value(mut self, error_value: Option) -> Self { + self.error_value = error_value; self } @@ -335,7 +331,7 @@ pub(super) enum DynamicScriptRunnable { kind: DynamicScriptFailureKind, module_failure_policy: Option, source_network_result: Option, - error_constructor: Option, + error_value: Option, }, } @@ -354,7 +350,7 @@ pub(super) struct DynamicScriptFailureTerminal { pub(super) kind: DynamicScriptFailureKind, pub(super) module_failure_policy: Option, pub(super) source_network_result: Option, - pub(super) error_constructor: Option, + pub(super) error_value: Option, } #[derive(Debug)] @@ -582,7 +578,7 @@ impl DynamicScriptOwner { kind, module_failure_policy, source_network_result, - error_constructor, + error_value, }) = self.followup_work.pop_front() else { unreachable!("owned error terminal changed after an immutable front check") @@ -594,7 +590,7 @@ impl DynamicScriptOwner { kind, module_failure_policy, source_network_result, - error_constructor, + error_value, }) } @@ -642,33 +638,33 @@ impl DynamicScriptOwner { message: String, kind: DynamicScriptFailureKind, module_failure_policy: Option, - error_constructor: Option, + error_value: Option, ) { - self.note_script_failed_with_kind_and_error_constructor( + self.note_script_failed_with_kind_and_error_value( id, script, message, kind, module_failure_policy, - error_constructor, + error_value, ); } - pub(super) fn note_script_failed_with_kind_and_error_constructor( + pub(super) fn note_script_failed_with_kind_and_error_value( &mut self, id: DynamicScriptOwnerId, script: &PreparedScript, message: String, kind: DynamicScriptFailureKind, module_failure_policy: Option, - error_constructor: Option, + error_value: Option, ) { assert!( script.host_script_handle.is_some(), "runtime dynamic script should carry host handle before failure dispatch planning" ); let failure = DynamicScriptFailure::with_kind(message, kind, module_failure_policy) - .with_error_constructor(error_constructor); + .with_error_value(error_value); if failure.is_deferrable_module() { self.note_script_failed_in_queue_or_enqueue(id, script.clone(), failure); self.refresh_followup_work(); @@ -1189,13 +1185,13 @@ impl DynamicScriptOwner { &mut self, reaction_id: u64, reason: String, - error_constructor: Option, + error_value: Option, ) -> Option { let update = self.mark_module_script_evaluation_reaction( reaction_id, ModuleScriptEvaluationReactionState::Rejected { reason, - error_constructor, + error_value, }, ); if update.is_some() { @@ -1279,21 +1275,21 @@ impl DynamicScriptOwner { message: String, kind: DynamicScriptFailureKind, module_failure_policy: Option, - error_constructor: Option, + error_value: Option, source_network_result: Option, ) { - self.requeue_failed_script_front_with_error_constructor( + self.requeue_failed_script_front_with_error_value( id, script, message, kind, module_failure_policy, source_network_result, - error_constructor, + error_value, ); } - pub(super) fn requeue_failed_script_front_with_error_constructor( + pub(super) fn requeue_failed_script_front_with_error_value( &mut self, id: DynamicScriptOwnerId, script: PreparedScript, @@ -1301,11 +1297,11 @@ impl DynamicScriptOwner { kind: DynamicScriptFailureKind, module_failure_policy: Option, source_network_result: Option, - error_constructor: Option, + error_value: Option, ) { let failure = DynamicScriptFailure::with_kind(message, kind, module_failure_policy) .with_source_network_result(source_network_result) - .with_error_constructor(error_constructor); + .with_error_value(error_value); self.requeue_script_failure_front(id, script, failure); } @@ -1953,11 +1949,11 @@ impl DynamicScriptOwner { kind, module_failure_policy, source_network_result, - error_constructor, + error_value, } => { let failure = DynamicScriptFailure::with_kind(message, kind, module_failure_policy) .with_source_network_result(source_network_result) - .with_error_constructor(error_constructor); + .with_error_value(error_value); if failure.is_deferrable_module() { self.enqueue_script_failure_with_id(id, script, failure); return; @@ -2151,7 +2147,7 @@ impl DynamicScriptOwner { kind: failure.kind, module_failure_policy: failure.module_failure_policy, source_network_result: failure.source_network_result, - error_constructor: failure.error_constructor, + error_value: failure.error_value, }) } DynamicScriptReadyState::Loading @@ -3484,7 +3480,7 @@ mod tests { "opaque typed module graph failure".to_owned(), DynamicScriptFailureKind::ModuleResolve, Some(ModuleFailurePolicy::GraphFailure), - Some(ScriptErrorConstructorKind::SyntaxError), + Some(crate::types::ScriptErrorConstructorKind::SyntaxError.into()), ); let second = owner @@ -3501,7 +3497,7 @@ mod tests { let DynamicScriptRunnable::DispatchError { id: failure_id, message, - error_constructor, + error_value, .. } = failure else { @@ -3510,8 +3506,8 @@ mod tests { assert_eq!(failure_id, first_id); assert_eq!(message, "opaque typed module graph failure"); assert_eq!( - error_constructor, - Some(ScriptErrorConstructorKind::SyntaxError), + error_value, + Some(crate::types::ScriptErrorConstructorKind::SyntaxError.into()), "deferred dynamic module failures must retain their original error constructor" ); } @@ -3817,7 +3813,7 @@ mod tests { } #[test] - fn owner_terminal_failure_preserves_error_constructor() { + fn owner_terminal_failure_preserves_error_value() { let mut owner = DynamicScriptOwner::default(); owner.enqueue_batch(DynamicScriptBatch { async_scripts: VecDeque::from([prepared_script(0, ScriptMode::Async)]), @@ -3830,26 +3826,24 @@ mod tests { panic!("expected executable dynamic script"); }; - owner.note_script_failed_with_kind_and_error_constructor( + owner.note_script_failed_with_kind_and_error_value( id, &script, "typed failure".to_owned(), DynamicScriptFailureKind::Immediate, None, - Some(ScriptErrorConstructorKind::SyntaxError), + Some(crate::types::ScriptErrorConstructorKind::SyntaxError.into()), ); - let DynamicScriptRunnable::DispatchError { - error_constructor, .. - } = owner + let DynamicScriptRunnable::DispatchError { error_value, .. } = owner .next_runnable_script() .expect("typed failure should become owner terminal work") else { panic!("expected dynamic script error dispatch"); }; assert_eq!( - error_constructor, - Some(ScriptErrorConstructorKind::SyntaxError) + error_value, + Some(crate::types::ScriptErrorConstructorKind::SyntaxError.into()) ); } diff --git a/moli-renderer-v8/src/host/scripts.rs b/moli-renderer-v8/src/host/scripts.rs index e92c19c8e5f..c092bf0f105 100644 --- a/moli-renderer-v8/src/host/scripts.rs +++ b/moli-renderer-v8/src/host/scripts.rs @@ -21,7 +21,7 @@ use crate::{ { module_runtime::ModuleOwnerState, planning::{PreparedScript, ScriptSource}, - types::{ScriptErrorConstructorKind, ScriptKind, ScriptMode, ScriptSourceKind}, + types::{ScriptErrorValue, ScriptKind, ScriptMode, ScriptSourceKind}, }, }; use std::collections::HashMap; @@ -1074,13 +1074,13 @@ impl HostScriptScheduler { &self, message: &str, filename: Option<&str>, - error_constructor: Option, + error_value: Option, ) -> PostParseLifecycleWork { PostParseLifecycleWork::ReportWindowScriptFailure( - WindowScriptFailureReportTask::new_with_error_constructor( + WindowScriptFailureReportTask::new_with_error_value( message, filename.map(std::borrow::ToOwned::to_owned), - error_constructor, + error_value, ), ) } @@ -1093,7 +1093,7 @@ impl HostScriptScheduler { message: &str, filename: Option<&str>, module_failure_policy: Option, - error_constructor: Option, + error_value: Option, ) -> Vec { let mut tasks = Vec::new(); let message = normalize_module_link_failure_message(message, filename); @@ -1127,7 +1127,7 @@ impl HostScriptScheduler { tasks.push(self.plan_window_script_failure_report_lifecycle_work( &message, filename, - error_constructor, + error_value, )); } @@ -1163,7 +1163,7 @@ impl HostScriptScheduler { message: &str, filename: Option<&str>, module_failure_policy: Option, - error_constructor: Option, + error_value: Option, ) -> Vec { self.plan_script_failure_lifecycle_work( kind, @@ -1172,7 +1172,7 @@ impl HostScriptScheduler { message, filename, module_failure_policy, - error_constructor, + error_value, ) .into_iter() .map(PostParseLifecycleWork::into_page_task) diff --git a/moli-renderer-v8/src/host/scripts/policy.rs b/moli-renderer-v8/src/host/scripts/policy.rs index 50ddb11bf6b..94b858a30c5 100644 --- a/moli-renderer-v8/src/host/scripts/policy.rs +++ b/moli-renderer-v8/src/host/scripts/policy.rs @@ -131,22 +131,18 @@ impl ScriptFailurePageTaskPolicy { report_window_failure: false, load_event_after_window_failure: false, }, - ModuleFailurePolicy::GraphFailure => Self { - load_event: event_policy.dispatch_policy(ScriptEventKind::Load), - error_event: ScriptEventDispatchPolicy::Skip( - ScriptEventSkipReason::ModuleGraphFailure, - ), - report_window_failure: true, - load_event_after_window_failure: true, - }, - ModuleFailurePolicy::EvaluationFailure => Self { - load_event: event_policy.dispatch_policy(ScriptEventKind::Load), - error_event: ScriptEventDispatchPolicy::Skip( - ScriptEventSkipReason::ModuleGraphFailure, - ), - report_window_failure: true, - load_event_after_window_failure: false, - }, + // A script with a fetched module graph still completes its + // external-script load step when running that graph rejects. + ModuleFailurePolicy::GraphFailure | ModuleFailurePolicy::EvaluationFailure => { + Self { + load_event: event_policy.dispatch_policy(ScriptEventKind::Load), + error_event: ScriptEventDispatchPolicy::Skip( + ScriptEventSkipReason::ModuleGraphFailure, + ), + report_window_failure: true, + load_event_after_window_failure: true, + } + } }; } Self { diff --git a/moli-renderer-v8/src/host/scripts/tests.rs b/moli-renderer-v8/src/host/scripts/tests.rs index 73cdfffab86..8b24cf56569 100644 --- a/moli-renderer-v8/src/host/scripts/tests.rs +++ b/moli-renderer-v8/src/host/scripts/tests.rs @@ -2590,7 +2590,7 @@ fn explicit_module_failure_policy_overrides_opaque_message_text() { load_event: ScriptEventDispatchPolicy::Dispatch, error_event: ScriptEventDispatchPolicy::Skip(ScriptEventSkipReason::ModuleGraphFailure), report_window_failure: true, - load_event_after_window_failure: false, + load_event_after_window_failure: true, } ); } diff --git a/moli-renderer-v8/src/module_script_continuation.rs b/moli-renderer-v8/src/module_script_continuation.rs index 93f0b4fc96e..fbd9b7de61b 100644 --- a/moli-renderer-v8/src/module_script_continuation.rs +++ b/moli-renderer-v8/src/module_script_continuation.rs @@ -13,7 +13,7 @@ use crate::dom::NodeId; use crate::dynamic_script_owner::DynamicScriptOwnerId; use crate::frame_owner_model::{FrameDocumentTaskOwner, MainDocumentScriptLoadDelayLease}; use crate::planning::PreparedScript; -use crate::types::ScriptErrorConstructorKind; +use crate::types::ScriptErrorValue; pub(crate) struct ModuleScriptContinuation { pub(crate) script: PreparedScript, @@ -830,7 +830,7 @@ pub(crate) enum ModuleScriptEvaluationReactionState { Fulfilled, Rejected { reason: String, - error_constructor: Option, + error_value: Option, }, } diff --git a/moli-renderer-v8/src/native_bridge/context_host/core.rs b/moli-renderer-v8/src/native_bridge/context_host/core.rs index 04a248951aa..0840fc64d68 100644 --- a/moli-renderer-v8/src/native_bridge/context_host/core.rs +++ b/moli-renderer-v8/src/native_bridge/context_host/core.rs @@ -1314,14 +1314,14 @@ impl PageScriptHost { document_owner: FrameDocumentTaskOwner, reaction_id: u64, reason: String, - error_constructor: Option, + error_value: Option, ) { self.queue_page_module_reaction( RendererPageModuleReactionEvent::DocumentModuleScriptEvaluationRejected { document_owner, reaction_id, reason, - error_constructor, + error_value, }, ); } @@ -1347,7 +1347,7 @@ impl PageScriptHost { realm_id: crate::frame_owner_model::FrameRealmId, reaction_id: u64, reason: String, - error_constructor: Option, + error_value: Option, ) { self.queue_page_module_reaction( RendererPageModuleReactionEvent::ChildParserModuleEvaluationRejected { @@ -1355,7 +1355,7 @@ impl PageScriptHost { realm_id, reaction_id, reason, - error_constructor, + error_value, }, ); } diff --git a/moli-renderer-v8/src/native_bridge/context_host/mod.rs b/moli-renderer-v8/src/native_bridge/context_host/mod.rs index e6c6a86a4f9..0e4d309e510 100644 --- a/moli-renderer-v8/src/native_bridge/context_host/mod.rs +++ b/moli-renderer-v8/src/native_bridge/context_host/mod.rs @@ -38,7 +38,7 @@ use crate::{ BroadcastChannelId, DedicatedWorkerId, ImageRequestKey, MessagePortId, NetworkBodySourceId, PendingSubresourceAuthState, PendingSubresourceFetchState, PendingSubresourceResponseState, PendingWebSocketResponseState, - RunningSubresourceFetchState, ScriptErrorConstructorKind, ScriptNetworkOutputItem, + RunningSubresourceFetchState, ScriptNetworkOutputItem, StreamingSubresourceFetchState, SubresourceNetworkRequestHandle, }, util::{ diff --git a/moli-renderer-v8/src/page_task_queue/module_reaction.rs b/moli-renderer-v8/src/page_task_queue/module_reaction.rs index 569abbb49ec..8fc80908bc6 100644 --- a/moli-renderer-v8/src/page_task_queue/module_reaction.rs +++ b/moli-renderer-v8/src/page_task_queue/module_reaction.rs @@ -7,7 +7,7 @@ use crate::{ module_runtime::DynamicModuleImportOwner, resource_ready::{ReadyPageTask, RendererPageTaskReadyMetadata}, runtime::{PageOwnerTurnOutcome, RendererDocumentToken}, - types::ScriptErrorConstructorKind, + types::ScriptErrorValue, }; use super::{RendererOwnerWakeSender, RendererOwnerWakeSource, RendererPageTaskReadySignal}; @@ -43,7 +43,7 @@ pub(crate) enum RendererPageModuleReactionEvent { document_owner: FrameDocumentTaskOwner, reaction_id: u64, reason: String, - error_constructor: Option, + error_value: Option, }, ChildParserModuleEvaluationFulfilled { document_owner: FrameDocumentTaskOwner, @@ -55,7 +55,7 @@ pub(crate) enum RendererPageModuleReactionEvent { realm_id: FrameRealmId, reaction_id: u64, reason: String, - error_constructor: Option, + error_value: Option, }, DynamicModuleEvaluationFulfilled { import_owner: DynamicModuleImportOwner, @@ -120,17 +120,17 @@ impl fmt::Debug for RendererPageModuleReactionEvent { match self { Self::DocumentModuleScriptEvaluationRejected { reason, - error_constructor, + error_value, .. } | Self::ChildParserModuleEvaluationRejected { reason, - error_constructor, + error_value, .. } => { debug .field("reason", reason) - .field("error_constructor", error_constructor); + .field("error_value", error_value); } Self::DynamicModuleEvaluationRejected { .. } => { debug.field("reason", &">"); diff --git a/moli-renderer-v8/src/page_task_queue/tasks.rs b/moli-renderer-v8/src/page_task_queue/tasks.rs index 2dd391745a0..6fdd030a106 100644 --- a/moli-renderer-v8/src/page_task_queue/tasks.rs +++ b/moli-renderer-v8/src/page_task_queue/tasks.rs @@ -6,7 +6,7 @@ use crate::{ host::ScriptEventTask, planning::PreparedScript, stylesheet_blocking::DocumentOwnedStylesheetDiscoveryInput, - types::ScriptErrorConstructorKind, + types::ScriptErrorValue, types::ScriptRun, }; @@ -60,23 +60,23 @@ pub(crate) enum PageOwnedInternalLoadingTaskEffect { pub(crate) struct WindowScriptFailureReportTask { pub(crate) message: String, pub(crate) filename: Option, - pub(crate) error_constructor: Option, + pub(crate) error_value: Option, } impl WindowScriptFailureReportTask { pub(crate) fn new(message: impl Into, filename: Option) -> Self { - Self::new_with_error_constructor(message, filename, None) + Self::new_with_error_value(message, filename, None) } - pub(crate) fn new_with_error_constructor( + pub(crate) fn new_with_error_value( message: impl Into, filename: Option, - error_constructor: Option, + error_value: Option, ) -> Self { Self { message: message.into(), filename, - error_constructor, + error_value, } } } diff --git a/moli-renderer-v8/src/parser_module_evaluation.rs b/moli-renderer-v8/src/parser_module_evaluation.rs index 63efffa21ab..cc09ab95c83 100644 --- a/moli-renderer-v8/src/parser_module_evaluation.rs +++ b/moli-renderer-v8/src/parser_module_evaluation.rs @@ -4,7 +4,7 @@ use crate::document_script_scheduler::{ use crate::document_task_lane::DocumentTaskQueue; use crate::module_runtime::ModuleEntryId; use crate::module_script_continuation::ModuleScriptEvaluationReactionState; -use crate::types::ScriptErrorConstructorKind; +use crate::types::ScriptErrorValue; #[derive(Debug)] pub(crate) struct ParserModuleEvaluationContinuation { @@ -150,7 +150,7 @@ impl ParserModuleEvaluationStore { &mut self, reaction_id: u64, reason: String, - error_constructor: Option, + error_value: Option, ) -> Option { let evaluation = self .evaluations @@ -158,7 +158,7 @@ impl ParserModuleEvaluationStore { .find(|evaluation| evaluation.reaction_id == reaction_id)?; evaluation.reaction_state = ModuleScriptEvaluationReactionState::Rejected { reason, - error_constructor, + error_value, }; Some(evaluation.root_entry) } diff --git a/moli-renderer-v8/src/runtime/page_vm/mod.rs b/moli-renderer-v8/src/runtime/page_vm/mod.rs index 6e26d394870..b382db35383 100644 --- a/moli-renderer-v8/src/runtime/page_vm/mod.rs +++ b/moli-renderer-v8/src/runtime/page_vm/mod.rs @@ -34,7 +34,7 @@ use crate::script_vm::{ #[cfg(test)] use crate::script_vm::{PostParseLifecycleAdvance, PostParsePageOwnedTask, RendererIsolateHandle}; use crate::script_vm::{PreparedScriptExecutionOutcome, RendererDocumentIsolateBootstrap}; -use crate::types::ScriptErrorConstructorKind; +use crate::types::ScriptErrorValue; use crate::types::ScriptSkipReason; use moli_page_types::{ ContentSecurityPolicyIssueSnapshot, ContentSecurityPolicyViolationType, InspectorIssueSnapshot, @@ -438,14 +438,8 @@ fn wrap_native_esm_module_load_error( prefix: &str, error: crate::module_runtime::ModuleLoadError, ) -> crate::module_runtime::ModuleLoadError { - let wrapped = crate::module_runtime::ModuleLoadError::new( - error.stage(), - format!("{prefix}: {}", error.message()), - ); - match error.error_constructor() { - Some(error_constructor) => wrapped.with_error_constructor(error_constructor), - None => wrapped, - } + let message = format!("{prefix}: {}", error.message()); + error.with_message(message) } #[derive(Clone, Copy, Debug, PartialEq, Eq)] @@ -498,7 +492,7 @@ enum PageOwnedScriptFailureClassification { Typed { dynamic_kind: crate::dynamic_script_owner::DynamicScriptFailureKind, module_failure_policy: Option, - error_constructor: Option, + error_value: Option, failed_module: Option, }, } @@ -516,7 +510,7 @@ impl PageOwnedScriptFailureClassification { script, stage, ), module_failure_policy: error.module_failure_policy(), - error_constructor: error.error_constructor(), + error_value: error.error_value(), failed_module: None, }, ) @@ -543,7 +537,7 @@ impl PageOwnedScriptFailureClassification { error.stage(), ), module_failure_policy: Some(module_failure_policy), - error_constructor: error.error_constructor(), + error_value: error.error_value(), failed_module, } } @@ -622,7 +616,7 @@ fn complete_prepared_script_execution_failure( PageOwnedScriptFailureClassification::Typed { dynamic_kind, module_failure_policy, - error_constructor, + error_value, .. } => vm.finish_runtime_owned_script_failure_with_kind( dynamic_script_owner_id, @@ -630,7 +624,7 @@ fn complete_prepared_script_execution_failure( &error, dynamic_kind, module_failure_policy, - error_constructor, + error_value, ), PageOwnedScriptFailureClassification::LegacyMessageText => { vm.finish_runtime_owned_script_failure(dynamic_script_owner_id, &script, &error); @@ -642,37 +636,36 @@ fn complete_prepared_script_execution_failure( Some(script.url.as_str()), ); } else if vm.parser_owned_module_reports_failure_immediately(&script) { - let (module_failure_policy, error_constructor, failed_module) = match failure_classification - { + let (module_failure_policy, error_value, failed_module) = match failure_classification { PageOwnedScriptFailureClassification::Typed { module_failure_policy, - error_constructor, + error_value, failed_module, .. - } => (module_failure_policy, error_constructor, failed_module), + } => (module_failure_policy, error_value, failed_module), PageOwnedScriptFailureClassification::LegacyMessageText => (None, None, None), }; vm.dispatch_parser_owned_module_failure_and_finish_settlement_best_effort( &script, &error, module_failure_policy, - error_constructor, + error_value, failed_module, ); } else { - let (module_failure_policy, error_constructor) = match failure_classification { + let (module_failure_policy, error_value) = match failure_classification { PageOwnedScriptFailureClassification::Typed { module_failure_policy, - error_constructor, + error_value, .. - } => (module_failure_policy, error_constructor), + } => (module_failure_policy, error_value), PageOwnedScriptFailureClassification::LegacyMessageText => (None, None), }; vm.enqueue_script_failure_lifecycle_work_best_effort( &script, &error, module_failure_policy, - error_constructor, + error_value, ); } complete_prepared_script_execution_failure_report(script, error) @@ -688,14 +681,13 @@ fn complete_page_owned_prepared_script_execution_failure_body( prepared_script_activity: crate::script_vm::PreparedScriptBodyActivity, ) -> PageOwnedScriptExecutionOutcome { let terminal_activity = if completion_owner.is_runtime_owned() { - let (dynamic_kind, module_failure_policy, error_constructor) = match failure_classification - { + let (dynamic_kind, module_failure_policy, error_value) = match failure_classification { PageOwnedScriptFailureClassification::Typed { dynamic_kind, module_failure_policy, - error_constructor, + error_value, .. - } => (dynamic_kind, module_failure_policy, error_constructor), + } => (dynamic_kind, module_failure_policy, error_value), PageOwnedScriptFailureClassification::LegacyMessageText => ( crate::dynamic_script_owner::DynamicScriptOwner::legacy_message_failure_kind( &script, &error, @@ -710,43 +702,42 @@ fn complete_page_owned_prepared_script_execution_failure_body( &error, dynamic_kind, module_failure_policy, - error_constructor, + error_value, ) } else if vm.parser_owned_inline_importmap_reports_window_error_immediately(&script) { vm.report_window_error_body_best_effort(&error, Some(script.url.as_str()), None, None); crate::script_vm::ScriptTerminalBodyActivity::EventDispatchAttempted } else if vm.parser_owned_module_reports_failure_immediately(&script) { - let (module_failure_policy, error_constructor, failed_module) = match failure_classification - { + let (module_failure_policy, error_value, failed_module) = match failure_classification { PageOwnedScriptFailureClassification::Typed { module_failure_policy, - error_constructor, + error_value, failed_module, .. - } => (module_failure_policy, error_constructor, failed_module), + } => (module_failure_policy, error_value, failed_module), PageOwnedScriptFailureClassification::LegacyMessageText => (None, None, None), }; vm.dispatch_current_prepared_script_error_body_best_effort( &script, &error, module_failure_policy, - error_constructor, + error_value, failed_module, ) } else { - let (module_failure_policy, error_constructor) = match failure_classification { + let (module_failure_policy, error_value) = match failure_classification { PageOwnedScriptFailureClassification::Typed { module_failure_policy, - error_constructor, + error_value, .. - } => (module_failure_policy, error_constructor), + } => (module_failure_policy, error_value), PageOwnedScriptFailureClassification::LegacyMessageText => (None, None), }; vm.enqueue_script_failure_lifecycle_work_best_effort( &script, &error, module_failure_policy, - error_constructor, + error_value, ); crate::script_vm::ScriptTerminalBodyActivity::NoEventDispatch }; @@ -835,13 +826,13 @@ async fn execute_prepared_script_on_script_execution_lane( let failure_classification = PageOwnedScriptFailureClassification::from_prepared_script_error(&script, &error); if let Some(claim) = runtime_script_claim.take() { - let (module_failure_policy, error_constructor) = match failure_classification { + let (module_failure_policy, error_value) = match failure_classification { PageOwnedScriptFailureClassification::LegacyMessageText => (None, None), PageOwnedScriptFailureClassification::Typed { module_failure_policy, - error_constructor, + error_value, .. - } => (module_failure_policy, error_constructor), + } => (module_failure_policy, error_value), }; let message = error.into_message(); let terminal_activity = vm.finish_claimed_runtime_owned_script_failure_body( @@ -849,7 +840,7 @@ async fn execute_prepared_script_on_script_execution_lane( &script, &message, module_failure_policy, - error_constructor, + error_value, ); return complete_prepared_script_execution_failure_report_with_activity( script, @@ -2655,7 +2646,7 @@ impl PageVm { PageOwnedScriptFailureClassification::Typed { dynamic_kind, module_failure_policy, - error_constructor, + error_value, .. }, ) if dynamic_kind.is_deferrable_module() => { @@ -2666,7 +2657,7 @@ impl PageVm { message.clone(), dynamic_kind, module_failure_policy, - error_constructor, + error_value, ); ( complete_prepared_script_execution_failure_report( diff --git a/moli-renderer-v8/src/runtime/page_vm/page_owned_document_script_hooks.rs b/moli-renderer-v8/src/runtime/page_vm/page_owned_document_script_hooks.rs index cc022107016..e1ed9bf0ff6 100644 --- a/moli-renderer-v8/src/runtime/page_vm/page_owned_document_script_hooks.rs +++ b/moli-renderer-v8/src/runtime/page_vm/page_owned_document_script_hooks.rs @@ -113,7 +113,7 @@ impl PageOwnedDocumentScriptHooks for MainPageOwnedDocumentScriptHooks<'_, '_> { runtime_script_claim: Option, ) -> PageOwnedDocumentScriptBodyExecution { let source_load = failure.is_source_load(); - let (error, module_failure_policy, error_constructor) = failure.into_parts(); + let (error, module_failure_policy, error_value) = failure.into_parts(); if source_load { self.page_vm .vm() @@ -128,7 +128,7 @@ impl PageOwnedDocumentScriptHooks for MainPageOwnedDocumentScriptHooks<'_, '_> { &script, &error, module_failure_policy, - error_constructor, + error_value, ); return complete_prepared_script_execution_failure_report_with_activity( script, diff --git a/moli-renderer-v8/src/runtime/page_vm/parser_owned_module_completion.rs b/moli-renderer-v8/src/runtime/page_vm/parser_owned_module_completion.rs index 28f078eb6b5..5037e03b953 100644 --- a/moli-renderer-v8/src/runtime/page_vm/parser_owned_module_completion.rs +++ b/moli-renderer-v8/src/runtime/page_vm/parser_owned_module_completion.rs @@ -416,7 +416,7 @@ impl PageVm { } ModuleScriptEvaluationReactionState::Rejected { reason, - error_constructor, + error_value, } => { let message = format!( "NativeEsmEvaluateFailed: native module graph evaluation rejected: {reason}" @@ -442,7 +442,7 @@ impl PageVm { self.vm_mut().report_window_error_body_best_effort( &message, Some(evaluation.script_continuation.script.url.as_str()), - error_constructor, + error_value, Some(evaluation.root_entry), ); MainParserContinuationTaskEffect::applied( @@ -455,7 +455,7 @@ impl PageVm { evaluation.root_entry, &message, Some(evaluation.script_continuation.script.url.as_str()), - error_constructor, + error_value, ); MainParserContinuationTaskEffect::NotApplied }; @@ -490,7 +490,7 @@ impl PageVm { } ModuleScriptEvaluationReactionState::Rejected { reason, - error_constructor, + error_value, } => Some( self.complete_module_script_failure_for_terminal_disposition( evaluation.script_continuation, @@ -503,7 +503,7 @@ impl PageVm { module_failure_policy: Some( crate::host::ModuleFailurePolicy::EvaluationFailure, ), - error_constructor, + error_value, failed_module: Some(evaluation.root_entry), }, PreparedScriptBodyActivity::NotEntered, diff --git a/moli-renderer-v8/src/runtime/page_vm/tests/mod.rs b/moli-renderer-v8/src/runtime/page_vm/tests/mod.rs index 5f922a169ed..ba5da5305c3 100644 --- a/moli-renderer-v8/src/runtime/page_vm/tests/mod.rs +++ b/moli-renderer-v8/src/runtime/page_vm/tests/mod.rs @@ -160,6 +160,7 @@ mod markdown_dump; mod media_element_event; mod message_port_delivery; mod misc_platform_api; +mod module_error_reporting; mod module_reaction; mod modulepreload_start_completion; mod navigation_api_task; diff --git a/moli-renderer-v8/src/runtime/page_vm/tests/module_error_reporting.rs b/moli-renderer-v8/src/runtime/page_vm/tests/module_error_reporting.rs new file mode 100644 index 00000000000..49bdaddbf8e --- /dev/null +++ b/moli-renderer-v8/src/runtime/page_vm/tests/module_error_reporting.rs @@ -0,0 +1,197 @@ +use super::*; + +fn bound_parser_module(page_vm: &mut PageVm, position: u32, url: Url) -> PreparedScript { + let mut script = prepared_external_module_for_page_vm_test_with_node(page_vm, position, url); + let runtime = &mut page_vm.vm_mut().document_runtime; + let body = runtime.snapshot_document().document_body_handle().unwrap(); + let node = runtime + .dom_host_mut() + .create_parser_element_without_attributes( + "script".to_owned(), + "http://www.w3.org/1999/xhtml".to_owned(), + None, + ); + assert!(runtime.dom_host_mut().append_child(body, node)); + script.node_id = node; + script.host_script_handle = Some(runtime.bind_parser_owned_script_handle_for_node(node)); + script +} + +async fn assert_parser_module_reports_original_value(value: &str, reject_later: bool) { + let loader = + crate::network::ResourceRequestClient::new(&FetchConfig::default()).expect("loader"); + let mut page_vm = test_page_vm_with_loader_and_document_url( + &loader, + Vec::new(), + Url::parse("https://example.com/module-reporting.html").unwrap(), + ); + page_vm + .vm_mut() + .eval(&format!( + r#" + globalThis.__thrown = {value}; + globalThis.__hadFileName = Object.hasOwn(Object(__thrown), 'fileName'); + globalThis.__errors = []; + globalThis.__onerrors = []; + globalThis.__coercions = 0; + globalThis.__unhandled = 0; + globalThis.__loads = 0; + addEventListener('unhandledrejection', event => {{ + ++__unhandled; + event.preventDefault(); + }}); + addEventListener('error', event => {{ + __errors.push(event.error); + event.preventDefault(); + }}); + onerror = (message, filename, line, column, error) => {{ + __onerrors.push(error); + return true; + }}; + "#, + )) + .expect("install original exception and both observers"); + let module_url = Url::parse("https://example.com/report-original.mjs").unwrap(); + let script = bound_parser_module(&mut page_vm, 9101, module_url.clone()); + page_vm + .vm_mut() + .eval("document.querySelector('script').addEventListener('load', () => ++__loads);") + .unwrap(); + let work = install_parser_module_defer_work(&mut page_vm, script); + page_vm + .execute_post_parse_page_owned_task_on_named_owner_lane(&loader, work) + .await + .expect("module waits for its graph"); + let source = if reject_later { + "await new Promise((_, reject) => { globalThis.__rejectModule = reject; });" + } else { + "throw globalThis.__thrown;" + }; + enqueue_parser_owned_module_script_fetch_completion_for_test( + &mut page_vm, + 0, + &module_url, + source, + ); + assert!( + run_next_main_module_fetch_terminal_for_test(&mut page_vm) + .unwrap() + .is_some() + ); + run_ready_parser_deferred_body_for_test(&mut page_vm, &loader, "original module exception") + .await; + if reject_later { + assert_eq!(page_vm.vm_mut().eval("__errors.length").unwrap(), "0"); + page_vm + .vm_mut() + .eval("__rejectModule(__thrown); 'rejected'") + .unwrap(); + } + run_parser_module_completion_turns_for_test( + &mut page_vm, + &loader, + usize::from(reject_later), + "original module exception", + ) + .await; + assert_eq!( + page_vm.vm_mut().eval( + "JSON.stringify([__errors.length, __onerrors.length, Object.is(__errors[0], __thrown), Object.is(__onerrors[0], __thrown), __coercions, Object.hasOwn(Object(__thrown), 'fileName') === __hadFileName])" + ).unwrap(), + "[1,1,true,true,0,true]", + "module error reporting must preserve {value}, reject_later={reject_later}", + ); + assert_eq!( + page_vm + .vm_mut() + .eval("[__loads, __unhandled].join('|')") + .unwrap(), + "1|0", + "module scripts must load once without leaking their internal rejection" + ); + assert_eq!( + page_vm + .report + .runs + .iter() + .filter(|run| run.url() == &module_url) + .count(), + 1, + "reporting must not complete a module script twice", + ); +} + +const THROWN_VALUES: &[&str] = &[ + "Object.freeze({ marker: 42 })", + "Object.freeze(new TypeError('original'))", + "undefined", + "null", + "false", + "-0", + "NaN", + "17n", + "Symbol('original')", + "'original string'", + "({ toString() { ++__coercions; throw new Error('must not coerce'); } })", + "({ get fileName() { ++__coercions; throw new Error('must not read'); }, set fileName(value) { ++__coercions; throw new Error('must not write'); } })", +]; + +#[tokio::test(flavor = "current_thread")] +async fn parser_module_error_reporting_preserves_synchronous_thrown_values() { + run_page_vm_async_test(async { + for value in THROWN_VALUES { + assert_parser_module_reports_original_value(value, false).await; + } + }) + .await; +} + +#[tokio::test(flavor = "current_thread")] +async fn parser_module_error_reporting_preserves_deferred_rejection_values() { + run_page_vm_async_test(async { + for value in THROWN_VALUES { + assert_parser_module_reports_original_value(value, true).await; + } + }) + .await; +} + +#[tokio::test(flavor = "current_thread")] +async fn parser_module_error_reporting_reuses_the_cached_parse_exception() { + run_page_vm_async_test(async { + let loader = crate::network::ResourceRequestClient::new(&FetchConfig::default()).unwrap(); + let mut page_vm = test_page_vm_with_loader_and_document_url( + &loader, Vec::new(), Url::parse("https://example.com/parse-error.html").unwrap(), + ); + page_vm.vm_mut().eval(r#" + globalThis.__errors = []; + addEventListener('error', event => { + __errors.push(event.error); + event.preventDefault(); + }); + "#).unwrap(); + let url = Url::parse("https://example.com/shared-syntax-error.mjs").unwrap(); + let owner = page_vm.vm().current_main_document_task_owner().unwrap(); + for position in [9101, 9102] { + let script = bound_parser_module(&mut page_vm, position, url.clone()); + assert!(page_vm.vm_mut().claim_main_parser_deferred_script( + owner, script, None, None, Default::default(), + ).unwrap()); + } + let work = page_vm.seal_main_parser_deferred_scripts(owner).unwrap(); + page_vm.execute_post_parse_page_owned_task_on_named_owner_lane(&loader, work).await.unwrap(); + enqueue_parser_owned_module_script_fetch_completion_for_test( + &mut page_vm, 0, &url, "export const broken = ;", + ); + run_next_main_module_fetch_terminal_for_test(&mut page_vm).unwrap(); + while page_vm.vm_mut().has_ready_native_module_owner_actions() { + run_next_native_module_owner_event_for_test(&mut page_vm, &loader, "shared syntax error").await; + } + for _ in 0..2 { + run_ready_parser_deferred_body_for_test(&mut page_vm, &loader, "shared syntax error").await; + } + assert_eq!(page_vm.vm_mut().eval( + "[__errors.length, __errors[0] instanceof SyntaxError, __errors[0] === __errors[1]].join('|')", + ).unwrap(), "2|true|true"); + }).await; +} diff --git a/moli-renderer-v8/src/script_vm/child_document_script_scheduler.rs b/moli-renderer-v8/src/script_vm/child_document_script_scheduler.rs index d71e79b45bd..f35cbe8855a 100644 --- a/moli-renderer-v8/src/script_vm/child_document_script_scheduler.rs +++ b/moli-renderer-v8/src/script_vm/child_document_script_scheduler.rs @@ -8,7 +8,7 @@ use crate::{ FrameDocumentModuleScriptGraphNotification, FrameDocumentModuleScriptTerminalFollowup, }, module_runtime::ModuleEntryId, - types::ScriptErrorConstructorKind, + types::ScriptErrorValue, }; pub(super) struct ChildDocumentScriptSchedulerOwner<'vm> { @@ -231,7 +231,7 @@ impl<'vm> ChildDocumentScriptSchedulerOwner<'vm> { &mut self, reaction_id: u64, reason: String, - error_constructor: Option, + error_value: Option, ) -> usize { let mut host = self.vm._context_host.borrow_mut(); let queued_ready_action_count = host @@ -239,7 +239,7 @@ impl<'vm> ChildDocumentScriptSchedulerOwner<'vm> { .mark_parser_module_evaluation_rejected( reaction_id, reason, - error_constructor, + error_value, |evaluation| evaluation, ) .map(|update| update.queued_ready_action_count()) diff --git a/moli-renderer-v8/src/script_vm/eval_exec.rs b/moli-renderer-v8/src/script_vm/eval_exec.rs index 0472966085c..259b49e6322 100644 --- a/moli-renderer-v8/src/script_vm/eval_exec.rs +++ b/moli-renderer-v8/src/script_vm/eval_exec.rs @@ -1085,7 +1085,7 @@ impl ScriptVm { ) }, ); - let error_constructor = error.error_constructor(); + let error_value = error.error_value(); let error = error.into_message(); if failure_kind == crate::dynamic_script_owner::DynamicScriptFailureKind::Immediate @@ -1103,7 +1103,7 @@ impl ScriptVm { self.apply_runtime_script_failure_terminal(&script, &error, module_failure_policy, - error_constructor, + error_value, lease, ); } @@ -1111,13 +1111,13 @@ impl ScriptVm { self.document_runtime .runtime_script_work_mut() .dynamic_scripts - .note_script_failed_with_kind_and_error_constructor( + .note_script_failed_with_kind_and_error_value( id, &script, error, failure_kind, module_failure_policy, - error_constructor, + error_value, ); } processed_runnable_this_turn = true; @@ -1145,20 +1145,20 @@ impl ScriptVm { kind, module_failure_policy, source_network_result, - error_constructor, + error_value, } => { if yield_after_one_runnable && processed_runnable_this_turn { self.document_runtime .runtime_script_work_mut() .dynamic_scripts - .requeue_failed_script_front_with_error_constructor( + .requeue_failed_script_front_with_error_value( id, script, message, kind, module_failure_policy, source_network_result, - error_constructor, + error_value, ); return Ok(RuntimePendingWorkFlushOutcome::Complete); } @@ -1173,14 +1173,14 @@ impl ScriptVm { self.document_runtime .runtime_script_work_mut() .dynamic_scripts - .requeue_failed_script_front_with_error_constructor( + .requeue_failed_script_front_with_error_value( id, script, message, kind, module_failure_policy, source_network_result, - error_constructor, + error_value, ); return Ok(RuntimePendingWorkFlushOutcome::Complete); } @@ -1208,7 +1208,7 @@ impl ScriptVm { &script, &message, module_failure_policy, - error_constructor, + error_value, lease, ); } @@ -1276,7 +1276,7 @@ impl ScriptVm { self.document_runtime .runtime_script_work_mut() .dynamic_scripts - .requeue_failed_script_front_with_error_constructor( + .requeue_failed_script_front_with_error_value( owner_id, continuation.script, error.message().to_owned(), @@ -1285,7 +1285,7 @@ impl ScriptVm { &error, )), None, - error.error_constructor(), + error.error_value(), ); } } diff --git a/moli-renderer-v8/src/script_vm/input_helpers.rs b/moli-renderer-v8/src/script_vm/input_helpers.rs index 227864f7f16..b2b460c9b7f 100644 --- a/moli-renderer-v8/src/script_vm/input_helpers.rs +++ b/moli-renderer-v8/src/script_vm/input_helpers.rs @@ -2,7 +2,7 @@ use super::ScriptVm; use crate::document_runtime::DomHandle; use crate::host::ModuleFailurePolicy; use crate::module_runtime::{ModuleGraphHandle, ModuleLoadError, ModuleLoadStage}; -use crate::types::ScriptErrorConstructorKind; +use crate::types::ScriptErrorValue; pub(super) fn clear_input_dispatch_state(vm: &mut ScriptVm) { vm.pressed_mouse_buttons = 0; @@ -55,7 +55,7 @@ pub(crate) struct PreparedScriptExecutionError { message: String, module_load_stage: Option, module_failure_policy: Option, - error_constructor: Option, + error_value: Option, body_activity: PreparedScriptBodyActivity, } @@ -65,7 +65,7 @@ impl PreparedScriptExecutionError { message: message.into(), module_load_stage: None, module_failure_policy: None, - error_constructor: None, + error_value: None, body_activity: PreparedScriptBodyActivity::NotEntered, } } @@ -75,7 +75,7 @@ impl PreparedScriptExecutionError { message: message.into(), module_load_stage: None, module_failure_policy: None, - error_constructor: None, + error_value: None, body_activity: PreparedScriptBodyActivity::Entered, } } @@ -91,7 +91,7 @@ impl PreparedScriptExecutionError { message: error.message().to_owned(), module_load_stage: Some(error.stage()), module_failure_policy: Some(module_failure_policy), - error_constructor: error.error_constructor(), + error_value: error.error_value(), body_activity: PreparedScriptBodyActivity::NotEntered, } } @@ -101,7 +101,7 @@ impl PreparedScriptExecutionError { message: message.into(), module_load_stage: Some(ModuleLoadStage::Fetch), module_failure_policy: Some(ModuleFailurePolicy::TopLevelLoadFailure), - error_constructor: None, + error_value: None, body_activity: PreparedScriptBodyActivity::NotEntered, } } @@ -118,8 +118,8 @@ impl PreparedScriptExecutionError { self.module_failure_policy } - pub(crate) fn error_constructor(&self) -> Option { - self.error_constructor + pub(crate) fn error_value(&self) -> Option { + self.error_value } pub(crate) fn body_activity(&self) -> PreparedScriptBodyActivity { diff --git a/moli-renderer-v8/src/script_vm/main_document_post_parse_body.rs b/moli-renderer-v8/src/script_vm/main_document_post_parse_body.rs index b0b20eb7dcc..4daac8bbbd8 100644 --- a/moli-renderer-v8/src/script_vm/main_document_post_parse_body.rs +++ b/moli-renderer-v8/src/script_vm/main_document_post_parse_body.rs @@ -128,7 +128,7 @@ impl ScriptVm { let settlement = match self.report_window_error_body( &task.message, task.filename.as_deref(), - task.error_constructor, + task.error_value, None, ) { Ok(()) => MainDocumentPostParseCallbackSettlement::Completed, diff --git a/moli-renderer-v8/src/script_vm/native_module.rs b/moli-renderer-v8/src/script_vm/native_module.rs index a3c4cc44eca..2c09742a868 100644 --- a/moli-renderer-v8/src/script_vm/native_module.rs +++ b/moli-renderer-v8/src/script_vm/native_module.rs @@ -69,8 +69,8 @@ use crate::page_task_queue::{ }; use crate::planning::PreparedScript; use crate::types::{ - ChildDynamicImportFetchCompletion, ScriptErrorConstructorKind, SubresourceRequestInitiatorType, - SubresourceResourceType, + ChildDynamicImportFetchCompletion, ScriptErrorConstructorKind, ScriptErrorValue, + SubresourceRequestInitiatorType, SubresourceResourceType, }; #[cfg(test)] use crate::types::{ @@ -92,6 +92,7 @@ mod child_ready_document_script; mod dynamic_import_selected_task_body; mod load_error; mod main_selected_task; +pub(super) use load_error::retained_module_exception; use load_error::{module_load_error_value, retain_module_exception}; pub(crate) use main_selected_task::{ MainDynamicImportGraphFetchBodySettlement, MainNativeModuleSelectedTaskApplication, @@ -736,17 +737,12 @@ fn native_module_script_reaction_rejected_callback<'s>( let Some(host_ptr) = context_host_ptr_from_global_bridge(scope) else { return; }; - let reason = args.get(0); - let error_constructor = script_error_constructor_kind_from_value(scope, reason); - let reason = reason - .to_string(scope) - .map(|value| value.to_rust_string_lossy(scope)) - .unwrap_or_else(|| "unknown promise rejection".to_owned()); + let error = native_module_evaluation_exception_error(scope, args.get(0), ""); unsafe { &mut *host_ptr }.queue_document_module_script_evaluation_rejected( document_owner, reaction_id, - reason, - error_constructor, + error.message().to_owned(), + error.error_value(), ); } @@ -783,18 +779,13 @@ fn child_parser_module_reaction_rejected_callback<'s>( let Some(host_ptr) = context_host_ptr_from_global_bridge(scope) else { return; }; - let reason = args.get(0); - let error_constructor = script_error_constructor_kind_from_value(scope, reason); - let reason = reason - .to_string(scope) - .map(|value| value.to_rust_string_lossy(scope)) - .unwrap_or_else(|| "unknown promise rejection".to_owned()); + let error = native_module_evaluation_exception_error(scope, args.get(0), ""); unsafe { &mut *host_ptr }.queue_child_parser_module_script_evaluation_rejected( document_owner, realm_id, reaction_id, - reason, - error_constructor, + error.message().to_owned(), + error.error_value(), ); } @@ -1103,11 +1094,26 @@ fn native_module_evaluation_exception_error( exception: v8::Local<'_, v8::Value>, prefix: &str, ) -> ModuleLoadError { - let message = exception - .to_string(scope) - .map(|message| message.to_rust_string_lossy(scope)) - .unwrap_or_else(|| "unknown module evaluation exception".to_owned()); - let error = ModuleLoadError::new(ModuleLoadStage::Evaluate, format!("{prefix}: {message}")); + let id = match retain_module_exception(scope, exception) { + Ok(id) => id, + Err(error) => { + return ModuleLoadError::new( + ModuleLoadStage::Evaluate, + format!("failed to retain module evaluation exception: {error}"), + ); + } + }; + // V8's internal diagnostic does not invoke author-defined toString or + // location getters. The diagnostic text never substitutes for the value. + let message = v8::Exception::create_message(scope, exception) + .get(scope) + .to_rust_string_lossy(scope); + let message = if prefix.is_empty() { + message + } else { + format!("{prefix}: {message}") + }; + let error = ModuleLoadError::new(ModuleLoadStage::Evaluate, message).with_exception_id(id); match script_error_constructor_kind_from_value(scope, exception) { Some(error_constructor) => error.with_error_constructor(error_constructor), None => error, diff --git a/moli-renderer-v8/src/script_vm/native_module/child_parser_module/mod.rs b/moli-renderer-v8/src/script_vm/native_module/child_parser_module/mod.rs index 050ba5ee60d..cee51f252e7 100644 --- a/moli-renderer-v8/src/script_vm/native_module/child_parser_module/mod.rs +++ b/moli-renderer-v8/src/script_vm/native_module/child_parser_module/mod.rs @@ -183,9 +183,9 @@ impl ScriptVm { &mut self, reaction_id: u64, reason: String, - error_constructor: Option, + error_value: Option, ) -> usize { super::super::child_document_script_scheduler::ChildDocumentScriptSchedulerOwner::new(self) - .mark_parser_module_evaluation_rejected(reaction_id, reason, error_constructor) + .mark_parser_module_evaluation_rejected(reaction_id, reason, error_value) } } diff --git a/moli-renderer-v8/src/script_vm/native_module/load_error.rs b/moli-renderer-v8/src/script_vm/native_module/load_error.rs index 5b51d481969..683371f9caf 100644 --- a/moli-renderer-v8/src/script_vm/native_module/load_error.rs +++ b/moli-renderer-v8/src/script_vm/native_module/load_error.rs @@ -46,20 +46,7 @@ pub(super) fn module_load_error_value<'s>( error: &ModuleLoadError, ) -> Result> { if let Some(id) = error.exception_id() { - let global = scope.get_current_context().global(scope); - let map = get_private_value(scope, global, MODULE_EXCEPTIONS_SLOT) - .and_then(|value| v8::Local::::try_from(value).ok()) - .ok_or_else(|| { - anyhow::anyhow!("module exception registry missing from request realm") - })?; - let key = v8::BigInt::new_from_u64(scope, id.0); - anyhow::ensure!( - map.has(scope, key.into()) == Some(true), - "module exception {id:?} does not belong to request realm" - ); - return map - .get(scope, key.into()) - .ok_or_else(|| anyhow::anyhow!("failed to read retained module exception")); + return retained_module_exception(scope, id); } let message = v8_string(scope, error.message()) .ok_or_else(|| anyhow::anyhow!("failed to allocate module error message"))?; @@ -73,6 +60,23 @@ pub(super) fn module_load_error_value<'s>( .ok_or_else(|| anyhow::anyhow!("failed to create module error")) } +pub(in crate::script_vm) fn retained_module_exception<'s>( + scope: &mut v8::PinScope<'s, '_>, + id: ModuleExceptionId, +) -> Result> { + let global = scope.get_current_context().global(scope); + let map = get_private_value(scope, global, MODULE_EXCEPTIONS_SLOT) + .and_then(|value| v8::Local::::try_from(value).ok()) + .ok_or_else(|| anyhow::anyhow!("module exception registry missing from request realm"))?; + let key = v8::BigInt::new_from_u64(scope, id.0); + anyhow::ensure!( + map.has(scope, key.into()) == Some(true), + "module exception {id:?} does not belong to request realm" + ); + map.get(scope, key.into()) + .ok_or_else(|| anyhow::anyhow!("failed to read retained module exception")) +} + impl ScriptVm { pub(crate) fn preserve_native_module_load_error( &mut self, diff --git a/moli-renderer-v8/src/script_vm/native_module/module_fetch.rs b/moli-renderer-v8/src/script_vm/native_module/module_fetch.rs index 198136bc101..6db1b89b03c 100644 --- a/moli-renderer-v8/src/script_vm/native_module/module_fetch.rs +++ b/moli-renderer-v8/src/script_vm/native_module/module_fetch.rs @@ -925,7 +925,7 @@ impl ScriptVm { &mut self, reaction_id: u64, reason: String, - error_constructor: Option, + error_value: Option, ) -> Option { let parser_update = self .document_runtime @@ -933,7 +933,7 @@ impl ScriptVm { .mark_parser_module_evaluation_rejected( reaction_id, reason.clone(), - error_constructor, + error_value, parser_module_evaluation_continuation_into_ready_action, ) .map(DocumentModuleReactionUpdate::ParserOwned); @@ -941,7 +941,7 @@ impl ScriptVm { self.mark_runtime_owned_module_script_evaluation_rejected( reaction_id, reason, - error_constructor, + error_value, ) .map(DocumentModuleReactionUpdate::RuntimeOwned) }) diff --git a/moli-renderer-v8/src/script_vm/native_module/module_reactions.rs b/moli-renderer-v8/src/script_vm/native_module/module_reactions.rs index 0a10a91d407..c0c199d9330 100644 --- a/moli-renderer-v8/src/script_vm/native_module/module_reactions.rs +++ b/moli-renderer-v8/src/script_vm/native_module/module_reactions.rs @@ -341,14 +341,10 @@ impl ScriptVm { RendererPageModuleReactionEvent::DocumentModuleScriptEvaluationRejected { reaction_id, reason, - error_constructor, + error_value, .. } => self - .apply_native_module_script_evaluation_rejected( - reaction_id, - reason, - error_constructor, - ) + .apply_native_module_script_evaluation_rejected(reaction_id, reason, error_value) .map(PageModuleReactionApplication::module_state_updated), RendererPageModuleReactionEvent::ChildParserModuleEvaluationFulfilled { reaction_id, @@ -361,12 +357,12 @@ impl ScriptVm { RendererPageModuleReactionEvent::ChildParserModuleEvaluationRejected { reaction_id, reason, - error_constructor, + error_value, .. } => (self.apply_child_parser_module_evaluation_rejected( reaction_id, reason, - error_constructor, + error_value, ) > 0) .then_some(PageModuleReactionApplication::module_state_updated( PageModuleReactionFollowup::None, @@ -501,12 +497,12 @@ impl ScriptVm { &mut self, reaction_id: u64, reason: String, - error_constructor: Option, + error_value: Option, ) -> Option { let update = self.mark_module_evaluation_reaction_rejected_for_owner( reaction_id, reason, - error_constructor, + error_value, )?; Some(match update { DocumentModuleReactionUpdate::ParserOwned(update) => { diff --git a/moli-renderer-v8/src/script_vm/page_task_enqueue.rs b/moli-renderer-v8/src/script_vm/page_task_enqueue.rs index 4ec1168a700..aae835541a8 100644 --- a/moli-renderer-v8/src/script_vm/page_task_enqueue.rs +++ b/moli-renderer-v8/src/script_vm/page_task_enqueue.rs @@ -554,13 +554,13 @@ impl ScriptVm { script: &PreparedScript, message: &str, module_failure_policy: Option, - error_constructor: Option, + error_value: Option, ) -> Result { self.enqueue_script_failure_lifecycle_work_with_load_delay_binding( script, message, module_failure_policy, - error_constructor, + error_value, None, ) } @@ -570,14 +570,14 @@ impl ScriptVm { script: &PreparedScript, message: &str, module_failure_policy: Option, - error_constructor: Option, + error_value: Option, load_delay_binding: Option, ) -> Result { let mut planned_failure_work = self.document_runtime.plan_script_failure_lifecycle_work( script, message, module_failure_policy, - error_constructor, + error_value, ); if let Some(binding) = load_delay_binding { planned_failure_work.push(PostParseLifecycleWork::SettleMainDocumentScriptLoadDelay( @@ -595,13 +595,13 @@ impl ScriptVm { script: &PreparedScript, message: &str, module_failure_policy: Option, - error_constructor: Option, + error_value: Option, ) { match self.enqueue_script_failure_lifecycle_work_for_prepared_script( script, message, module_failure_policy, - error_constructor, + error_value, ) { Ok(FollowupPageTaskDisposition::Skipped) => {} Ok(FollowupPageTaskDisposition::Deferred | FollowupPageTaskDisposition::Enqueued) => {} diff --git a/moli-renderer-v8/src/script_vm/post_parse_lifecycle.rs b/moli-renderer-v8/src/script_vm/post_parse_lifecycle.rs index b8be2bcb360..25ab087473a 100644 --- a/moli-renderer-v8/src/script_vm/post_parse_lifecycle.rs +++ b/moli-renderer-v8/src/script_vm/post_parse_lifecycle.rs @@ -346,7 +346,7 @@ impl ScriptVm { message, module_failure_policy, source_network_result, - error_constructor, + error_value, .. }) if self.prepared_script_uses_runtime_owned_page_task_execution(&script) => { self.record_runtime_warning(format_args!( @@ -368,7 +368,7 @@ impl ScriptVm { failure: crate::document_script_scheduler::PageOwnedDocumentScriptSourceFailure::runtime_terminal( message, module_failure_policy, - error_constructor, + error_value, ), source_network_result, runtime_script_claim: Some(runtime_script_claim), @@ -384,7 +384,7 @@ impl ScriptVm { kind, module_failure_policy, source_network_result, - error_constructor, + error_value, }) => { let _ = ( id, @@ -392,7 +392,7 @@ impl ScriptVm { kind, module_failure_policy, source_network_result, - error_constructor, + error_value, ); panic!( "production DynamicScriptOwner failures must carry runtime-owned Page execution identity: {}", @@ -531,12 +531,12 @@ impl ScriptVm { &mut self, reaction_id: u64, reason: String, - error_constructor: Option, + error_value: Option, ) -> Option { self.document_runtime .runtime_script_work_mut() .dynamic_scripts - .mark_module_script_evaluation_rejected(reaction_id, reason, error_constructor) + .mark_module_script_evaluation_rejected(reaction_id, reason, error_value) } #[cfg(test)] @@ -1160,14 +1160,14 @@ impl ScriptVm { script: &PreparedScript, message: &str, module_failure_policy: Option, - error_constructor: Option, + error_value: Option, ) -> crate::script_vm::ScriptTerminalBodyActivity { let (dynamic_script_owner_id, lease) = claim.into_parts(); let settlement = self.apply_runtime_script_failure_terminal_body( script, message, module_failure_policy, - error_constructor, + error_value, lease, ); debug!( @@ -1211,14 +1211,14 @@ impl ScriptVm { script: &PreparedScript, message: &str, module_failure_policy: Option, - error_constructor: Option, + error_value: Option, lease: MainDocumentScriptLoadDelayLease, ) { let work = self.document_runtime.plan_script_failure_lifecycle_work( script, message, module_failure_policy, - error_constructor, + error_value, ); for terminal in work { match terminal { @@ -1262,14 +1262,14 @@ impl ScriptVm { script: &PreparedScript, message: &str, module_failure_policy: Option, - error_constructor: Option, + error_value: Option, lease: MainDocumentScriptLoadDelayLease, ) -> RuntimeScriptFailureTerminalBodySettlement { let work = self.document_runtime.plan_script_failure_lifecycle_work( script, message, module_failure_policy, - error_constructor, + error_value, ); let mut activity = crate::script_vm::ScriptTerminalBodyActivity::NoEventDispatch; for terminal in work { @@ -1282,7 +1282,7 @@ impl ScriptVm { self.report_window_error_body_best_effort( &task.message, task.filename.as_deref(), - task.error_constructor, + task.error_value, None, ); activity = crate::script_vm::ScriptTerminalBodyActivity::EventDispatchAttempted; @@ -1415,7 +1415,7 @@ impl ScriptVm { message: &str, kind: crate::dynamic_script_owner::DynamicScriptFailureKind, module_failure_policy: Option, - error_constructor: Option, + error_value: Option, ) -> crate::script_vm::ScriptTerminalBodyActivity { if let Some(id) = dynamic_script_owner_id { if kind == crate::dynamic_script_owner::DynamicScriptFailureKind::Immediate { @@ -1434,7 +1434,7 @@ impl ScriptVm { script, message, module_failure_policy, - error_constructor, + error_value, lease, ) .activity; @@ -1442,13 +1442,13 @@ impl ScriptVm { self.document_runtime .runtime_script_work_mut() .dynamic_scripts - .note_script_failed_with_kind_and_error_constructor( + .note_script_failed_with_kind_and_error_value( id, script, message.to_owned(), kind, module_failure_policy, - error_constructor, + error_value, ); self.enqueue_immediate_runtime_script_work_if_needed(); return crate::script_vm::ScriptTerminalBodyActivity::NoEventDispatch; @@ -1463,7 +1463,7 @@ impl ScriptVm { script, message, module_failure_policy, - error_constructor, + error_value, None, ); self.enqueue_immediate_runtime_script_work_if_needed(); @@ -1473,7 +1473,7 @@ impl ScriptVm { script, message, module_failure_policy, - error_constructor, + error_value, ) { Ok(FollowupPageTaskDisposition::Skipped) => {} Ok( @@ -1512,7 +1512,7 @@ impl ScriptVm { message: String, kind: crate::dynamic_script_owner::DynamicScriptFailureKind, module_failure_policy: Option, - error_constructor: Option, + error_value: Option, ) { debug_assert!( kind.is_deferrable_module(), @@ -1521,13 +1521,13 @@ impl ScriptVm { self.document_runtime .runtime_script_work_mut() .dynamic_scripts - .note_script_failed_with_kind_and_error_constructor( + .note_script_failed_with_kind_and_error_value( dynamic_script_owner_id, script, message, kind, module_failure_policy, - error_constructor, + error_value, ); } @@ -1585,14 +1585,14 @@ impl ScriptVm { kind, module_failure_policy, source_network_result: _, - error_constructor, + error_value, } = terminal; if let Some(lease) = lease { self.apply_runtime_script_failure_terminal( &script, &message, module_failure_policy, - error_constructor, + error_value, lease, ); } @@ -1629,7 +1629,7 @@ impl ScriptVm { kind, module_failure_policy, source_network_result: _, - error_constructor, + error_value, } = terminal; if let Some(lease) = lease { let lease_owner = lease.owner(); @@ -1637,7 +1637,7 @@ impl ScriptVm { &script, &message, module_failure_policy, - error_constructor, + error_value, lease, ); if terminal.activity @@ -1676,7 +1676,7 @@ impl ScriptVm { message: &str, kind: crate::dynamic_script_owner::DynamicScriptFailureKind, module_failure_policy: Option, - error_constructor: Option, + error_value: Option, ) { if let Some(id) = dynamic_script_owner_id { if kind == crate::dynamic_script_owner::DynamicScriptFailureKind::Immediate { @@ -1692,7 +1692,7 @@ impl ScriptVm { script, message, module_failure_policy, - error_constructor, + error_value, lease, ); } @@ -1701,13 +1701,13 @@ impl ScriptVm { self.document_runtime .runtime_script_work_mut() .dynamic_scripts - .note_script_failed_with_kind_and_error_constructor( + .note_script_failed_with_kind_and_error_value( id, script, message.to_owned(), kind, module_failure_policy, - error_constructor, + error_value, ); debug!( dynamic_script_owner_id = ?id, @@ -1727,7 +1727,7 @@ impl ScriptVm { script, message, module_failure_policy, - error_constructor, + error_value, ); self.enqueue_immediate_runtime_script_work_if_needed(); return; @@ -1736,7 +1736,7 @@ impl ScriptVm { script, message, module_failure_policy, - error_constructor, + error_value, ) { Ok(FollowupPageTaskDisposition::Skipped) => {} Ok( diff --git a/moli-renderer-v8/src/script_vm/runtime_bindings.rs b/moli-renderer-v8/src/script_vm/runtime_bindings.rs index af23bdfee0a..94793ba1800 100644 --- a/moli-renderer-v8/src/script_vm/runtime_bindings.rs +++ b/moli-renderer-v8/src/script_vm/runtime_bindings.rs @@ -151,6 +151,12 @@ fn flush_promise_rejection_state( .realm .with_current_scope(scope, host_ptr, |scope, dispatch_scope| { let promise = v8::Local::new(scope, &rejection.promise); + // HTML rechecks PromiseIsHandled immediately before notifying. + // The host, or an earlier notification in this detached batch, + // may have handled it since it was first queued. + if promise.has_handler() { + return; + } let reason = rejection .reason .as_ref() diff --git a/moli-renderer-v8/src/script_vm/script_event_body.rs b/moli-renderer-v8/src/script_vm/script_event_body.rs index dcd24caa05c..ad8d46669d6 100644 --- a/moli-renderer-v8/src/script_vm/script_event_body.rs +++ b/moli-renderer-v8/src/script_vm/script_event_body.rs @@ -14,6 +14,8 @@ use crate::context_bootstrap::{ }; use crate::host::ScriptEventTask; use crate::module_runtime::{ModuleEntryId, ModuleLoadError}; +use crate::native_bridge::PageScriptHost; +use crate::types::ScriptErrorValue; use crate::util::{get_private_value, v8_string, v8str}; impl ScriptVm { @@ -70,11 +72,11 @@ impl ScriptVm { &mut self, message: &str, filename: Option<&str>, - error_constructor: Option, + error_value: Option, failed_module: Option, ) { if let Err(error) = - self.report_window_error_body(message, filename, error_constructor, failed_module) + self.report_window_error_body(message, filename, error_value, failed_module) { self.record_runtime_warning(format_args!( "window script failure body dispatch failed for `{}`: {error}", @@ -87,14 +89,15 @@ impl ScriptVm { &mut self, message: &str, filename: Option<&str>, - error_constructor: Option, + error_value: Option, failed_module: Option, ) -> Result<()> { // An evaluated module keeps the original thrown value, including a TLA // rejection, in its V8 module record. Read it only at the existing error // reporting boundary, after module evaluation has finished unwinding. - let failed_module = - failed_module.and_then(|entry| self.document_runtime.native_compiled_module(entry)); + let failed_module = failed_module + .filter(|_| !matches!(error_value, Some(ScriptErrorValue::Retained(_)))) + .and_then(|entry| self.document_runtime.native_compiled_module(entry)); self.with_default_context_scope(|scope, host_ptr| { if let Some(module) = &failed_module { let module = v8::Local::new(scope, module); @@ -122,9 +125,20 @@ impl ScriptVm { let global = scope.get_current_context().global(scope); let message_value = v8_string(scope, message) .ok_or_else(|| anyhow!("failed to allocate reportError message"))?; - let error_value = - window_script_failure_error_value(scope, global, error_constructor, message_value); - if let Some(filename) = filename + let retained = matches!(error_value, Some(ScriptErrorValue::Retained(_))); + let error_value = match error_value { + Some(ScriptErrorValue::Retained(id)) => { + super::native_module::retained_module_exception(scope, id)? + } + Some(ScriptErrorValue::Constructor(kind)) => { + window_script_failure_error_value(scope, global, Some(kind), message_value) + } + None => window_script_failure_error_value(scope, global, None, message_value), + }; + // Location metadata belongs to the ErrorEvent. Never mutate + // the original exception (or invoke an author's setter). + if !retained + && let Some(filename) = filename && let Some(filename_value) = v8_string(scope, filename) && let Ok(error_object) = v8::Local::::try_from(error_value) { diff --git a/moli-renderer-v8/src/script_vm/script_terminal_completion.rs b/moli-renderer-v8/src/script_vm/script_terminal_completion.rs index ce979ee4343..d1736b4dc7b 100644 --- a/moli-renderer-v8/src/script_vm/script_terminal_completion.rs +++ b/moli-renderer-v8/src/script_vm/script_terminal_completion.rs @@ -30,11 +30,11 @@ impl ScriptVm { &mut self, message: &str, filename: Option<&str>, - error_constructor: Option, + error_value: Option, failed_module: Option, boundary: &'static str, ) -> Result<()> { - self.report_window_error_body(message, filename, error_constructor, failed_module)?; + self.report_window_error_body(message, filename, error_value, failed_module)?; self.perform_owner_lane_task_microtask_checkpoints() .with_context(|| format!("{boundary} checkpoint failed")) } @@ -44,7 +44,7 @@ impl ScriptVm { script: &PreparedScript, message: &str, module_failure_policy: Option, - error_constructor: Option, + error_value: Option, failed_module: Option, boundary: &'static str, ) { @@ -52,7 +52,7 @@ impl ScriptVm { script, message, module_failure_policy, - error_constructor, + error_value, ); for work in planned_failure_work { let result = match work { @@ -63,7 +63,7 @@ impl ScriptVm { .report_window_error_and_finish_synchronous_checkpoint( &task.message, task.filename.as_deref(), - task.error_constructor, + task.error_value, failed_module, boundary, ), @@ -106,14 +106,14 @@ impl ScriptVm { script: &PreparedScript, message: &str, module_failure_policy: Option, - error_constructor: Option, + error_value: Option, failed_module: Option, ) { self.dispatch_planned_script_failure_and_finish_each_synchronous_checkpoint( script, message, module_failure_policy, - error_constructor, + error_value, failed_module, "parser-owned module failure settlement", ); @@ -127,13 +127,13 @@ impl ScriptVm { script: &PreparedScript, message: &str, module_failure_policy: Option, - error_constructor: Option, + error_value: Option, ) { self.dispatch_planned_script_failure_and_finish_each_synchronous_checkpoint( script, message, module_failure_policy, - error_constructor, + error_value, None, "unclaimed runtime-script terminal", ); @@ -146,12 +146,12 @@ impl ScriptVm { root_entry: ModuleEntryId, message: &str, filename: Option<&str>, - error_constructor: Option, + error_value: Option, ) { if let Err(error) = self.report_window_error_and_finish_synchronous_checkpoint( message, filename, - error_constructor, + error_value, Some(root_entry), "module TLA rejection reaction", ) { @@ -189,7 +189,7 @@ impl ScriptVm { if let Err(error) = self.report_window_error_and_finish_synchronous_checkpoint( &task.message, task.filename.as_deref(), - task.error_constructor, + task.error_value, None, "runtime script failure terminal", ) { @@ -206,14 +206,14 @@ impl ScriptVm { script: &PreparedScript, message: &str, module_failure_policy: Option, - error_constructor: Option, + error_value: Option, failed_module: Option, ) -> ScriptTerminalBodyActivity { let planned_failure_work = self.document_runtime.plan_script_failure_lifecycle_work( script, message, module_failure_policy, - error_constructor, + error_value, ); let mut activity = ScriptTerminalBodyActivity::NoEventDispatch; for work in planned_failure_work { @@ -226,7 +226,7 @@ impl ScriptVm { self.report_window_error_body_best_effort( &task.message, task.filename.as_deref(), - task.error_constructor, + task.error_value, failed_module, ); activity = ScriptTerminalBodyActivity::EventDispatchAttempted; @@ -258,7 +258,7 @@ impl ScriptVm { self.report_window_script_failure_and_checkpoint_for_test( &task.message, task.filename.as_deref(), - task.error_constructor, + task.error_value, ); } @@ -267,12 +267,12 @@ impl ScriptVm { &mut self, message: &str, filename: Option<&str>, - error_constructor: Option, + error_value: Option, ) { if let Err(error) = self.report_window_error_and_finish_synchronous_checkpoint( message, filename, - error_constructor, + error_value, None, "test-only Window error", ) { diff --git a/moli-renderer-v8/src/script_vm/tests/browser_api/promise_rejection.rs b/moli-renderer-v8/src/script_vm/tests/browser_api/promise_rejection.rs index 697fa54c673..20a9179c7c6 100644 --- a/moli-renderer-v8/src/script_vm/tests/browser_api/promise_rejection.rs +++ b/moli-renderer-v8/src/script_vm/tests/browser_api/promise_rejection.rs @@ -1,5 +1,29 @@ use super::*; +#[test] +fn rejection_notification_rechecks_handlers_added_by_an_earlier_notification() { + let mut vm = new_storage_test_vm("https://promise-notification-batch.test/"); + vm.eval( + r#" + globalThis.__notifications = []; + const first = Promise.reject('first'); + const second = Promise.reject('second'); + onunhandledrejection = event => { + __notifications.push(event.reason); + event.preventDefault(); + if (event.promise === first) second.catch(() => {}); + }; + onrejectionhandled = () => __notifications.push('rejectionhandled'); + "#, + ) + .unwrap(); + vm.eval("0").unwrap(); + assert_eq!( + vm.eval("JSON.stringify(__notifications)").unwrap(), + r#"["first"]"# + ); +} + #[test] fn main_window_unhandled_rejection_dispatches_to_main_window() { let mut vm = new_storage_test_vm("https://main-promise-rejection.test/"); diff --git a/moli-renderer-v8/src/script_vm/tests/script_terminal_completion.rs b/moli-renderer-v8/src/script_vm/tests/script_terminal_completion.rs index aef844f421a..b89535f0439 100644 --- a/moli-renderer-v8/src/script_vm/tests/script_terminal_completion.rs +++ b/moli-renderer-v8/src/script_vm/tests/script_terminal_completion.rs @@ -1,6 +1,52 @@ use super::*; use crate::parser::{PreparedImportMap, PreparedImportMapSource}; +#[test] +fn retained_window_error_body_preserves_identity_without_owning_the_checkpoint() { + let mut vm = new_storage_test_vm("https://script-terminal.test/retained.html"); + vm.eval( + r#" + globalThis.__errors = []; + globalThis.__order = []; + addEventListener('error', event => { + __errors.push(event.error); + __order.push('error'); + queueMicrotask(() => __order.push('microtask')); + event.preventDefault(); + }); + "#, + ) + .unwrap(); + let error = vm + .preserve_native_module_load_error( + None, + crate::module_runtime::ModuleLoadError::new( + crate::module_runtime::ModuleLoadStage::Compile, + "remembered syntax error", + ) + .with_error_constructor(crate::types::ScriptErrorConstructorKind::SyntaxError), + ) + .unwrap(); + for _ in 0..2 { + vm.report_window_error_body( + error.message(), + Some("module.js"), + error.error_value(), + None, + ) + .unwrap(); + } + assert_eq!(vm.eval_without_microtask_checkpoint_for_test( + "[__order.join('|'), __errors[0] === __errors[1], __errors[0] instanceof SyntaxError, Object.hasOwn(__errors[0], 'fileName')].join(',')", + ).unwrap(), "error|error,true,true,false"); + vm.perform_script_task_checkpoint(None).unwrap(); + assert_eq!( + vm.eval_without_microtask_checkpoint_for_test("__order.join('|')") + .unwrap(), + "error|error|microtask|microtask" + ); +} + #[test] fn window_error_body_leaves_checkpoint_to_its_carrier() { let mut vm = new_storage_test_vm("https://script-terminal.test/body.html"); diff --git a/moli-renderer-v8/src/types.rs b/moli-renderer-v8/src/types.rs index 6fdab19e0d4..75a5f58ec00 100644 --- a/moli-renderer-v8/src/types.rs +++ b/moli-renderer-v8/src/types.rs @@ -60,6 +60,21 @@ pub(crate) enum ScriptErrorConstructorKind { WebAssemblyLinkError, } +/// The value carried by script-failure reporting tasks. Constructor metadata +/// remains a fallback for failures originating in the host; a JavaScript +/// exception must instead retain its original value in the reporting realm. +#[derive(Debug, Clone, Copy, PartialEq, Eq)] +pub(crate) enum ScriptErrorValue { + Constructor(ScriptErrorConstructorKind), + Retained(moli_module_script_tree::ModuleExceptionId), +} + +impl From for ScriptErrorValue { + fn from(constructor: ScriptErrorConstructorKind) -> Self { + Self::Constructor(constructor) + } +} + pub use moli_script::{ ScriptElementClassificationInput, ScriptPreparationClassificationInput, classify_script_preparation,