Skip to content

armgit / moli

Public Imported from GitHub
0

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

refactor(renderer): snapshot script execution by document owner

ldm066fd45517cf7
diff --git a/moli-renderer-v8/src/dynamic_script_owner.rs b/moli-renderer-v8/src/dynamic_script_owner.rs
index b23289833..9545f5cb3 100644
--- a/moli-renderer-v8/src/dynamic_script_owner.rs
+++ b/moli-renderer-v8/src/dynamic_script_owner.rs
@@ -2177,6 +2177,9 @@ impl DynamicScriptOwner {
mod tests {
use super::*;
use crate::{
+ frame_owner_model::{
+ DocumentId, FrameDocumentTaskOwner, FrameSchedulerLaneId, LocalWindowId,
+ },
planning::ScriptSource,
types::{ScriptKind, ScriptMode},
};
@@ -2213,6 +2216,10 @@ mod tests {
DynamicScriptOwnerId::from_u64(raw)
}
+ fn document_owner() -> FrameDocumentTaskOwner {
+ FrameDocumentTaskOwner::new(FrameSchedulerLaneId(0), LocalWindowId(0), DocumentId(0))
+ }
+
fn runtime_module_continuation(
id: u64,
position: usize,
@@ -2221,7 +2228,7 @@ mod tests {
Box::new(ModuleScriptContinuation::new_runtime(
prepared_module_script(position, mode),
owner_id(id),
- 0,
+ document_owner(),
))
}
diff --git a/moli-renderer-v8/src/module_script_continuation.rs b/moli-renderer-v8/src/module_script_continuation.rs
index cc9428b08..93f0b4fc9 100644
--- a/moli-renderer-v8/src/module_script_continuation.rs
+++ b/moli-renderer-v8/src/module_script_continuation.rs
@@ -18,7 +18,6 @@ use crate::types::ScriptErrorConstructorKind;
pub(crate) struct ModuleScriptContinuation {
pub(crate) script: PreparedScript,
owner: ModuleScriptContinuationOwner,
- pub(crate) runtime_reset_generation_before_run: u64,
active_fetch_load_id: Option<u64>,
resumed_graph_job: Option<crate::module_runtime::NativeModuleGraphJob>,
pub(crate) completed_graph: Option<crate::module_runtime::ModuleGraphHandle>,
@@ -28,7 +27,10 @@ pub(crate) struct ModuleScriptContinuation {
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
enum ModuleScriptContinuationOwner {
Parser(ParserPendingScriptId<MainParserDocumentOwner>),
- Runtime(DynamicScriptOwnerId),
+ Runtime {
+ owner_id: DynamicScriptOwnerId,
+ document_owner: FrameDocumentTaskOwner,
+ },
}
#[derive(Clone, Copy, Debug, PartialEq, Eq, PartialOrd, Ord)]
@@ -49,7 +51,6 @@ impl MainParserDocumentOwner {
#[derive(Debug)]
pub(crate) struct MainDocumentModuleGraphReadyTarget {
pending_script_id: ParserPendingScriptId<MainParserDocumentOwner>,
- runtime_reset_generation_before_run: u64,
main_document_load_delay_binding: Option<MainDocumentScriptLoadDelayLease>,
}
@@ -86,10 +87,6 @@ impl MainDocumentModuleGraphReadyTarget {
self.pending_script_id
}
- pub(crate) fn runtime_reset_generation_before_run(&self) -> u64 {
- self.runtime_reset_generation_before_run
- }
-
pub(crate) fn take_main_document_load_delay_binding(
&mut self,
) -> Option<MainDocumentScriptLoadDelayLease> {
@@ -109,10 +106,6 @@ impl fmt::Debug for ModuleScriptContinuation {
.debug_struct("ModuleScriptContinuation")
.field("script", &self.script)
.field("owner", &self.owner)
- .field(
- "runtime_reset_generation_before_run",
- &self.runtime_reset_generation_before_run,
- )
.field("active_fetch_load_id", &self.active_fetch_load_id)
.field("has_resumed_graph_job", &self.resumed_graph_job.is_some())
.field("has_completed_graph", &self.completed_graph.is_some())
@@ -168,14 +161,12 @@ impl ModuleScriptContinuation {
pub(crate) fn new_parser(
script: PreparedScript,
pending_script_id: ParserPendingScriptId<MainParserDocumentOwner>,
- runtime_reset_generation_before_run: u64,
) -> Self {
debug_assert_eq!(pending_script_id.script_node_id(), script.node_id);
debug_assert_eq!(pending_script_id.parser_position(), script.position);
Self {
script,
owner: ModuleScriptContinuationOwner::Parser(pending_script_id),
- runtime_reset_generation_before_run,
active_fetch_load_id: None,
resumed_graph_job: None,
completed_graph: None,
@@ -185,13 +176,15 @@ impl ModuleScriptContinuation {
pub(crate) fn new_runtime(
script: PreparedScript,
- owner: DynamicScriptOwnerId,
- runtime_reset_generation_before_run: u64,
+ owner_id: DynamicScriptOwnerId,
+ document_owner: FrameDocumentTaskOwner,
) -> Self {
Self {
script,
- owner: ModuleScriptContinuationOwner::Runtime(owner),
- runtime_reset_generation_before_run,
+ owner: ModuleScriptContinuationOwner::Runtime {
+ owner_id,
+ document_owner,
+ },
active_fetch_load_id: None,
resumed_graph_job: None,
completed_graph: None,
@@ -220,7 +213,7 @@ impl ModuleScriptContinuation {
pub(crate) fn completion_owner(&self) -> ModuleScriptCompletionOwner {
match self.owner {
ModuleScriptContinuationOwner::Parser(_) => ModuleScriptCompletionOwner::Parser,
- ModuleScriptContinuationOwner::Runtime(_) => ModuleScriptCompletionOwner::Runtime,
+ ModuleScriptContinuationOwner::Runtime { .. } => ModuleScriptCompletionOwner::Runtime,
}
}
@@ -229,7 +222,7 @@ impl ModuleScriptContinuation {
ModuleScriptContinuationOwner::Parser(pending_script_id) => {
Some(pending_script_id.owner())
}
- ModuleScriptContinuationOwner::Runtime(_) => None,
+ ModuleScriptContinuationOwner::Runtime { .. } => None,
}
}
@@ -238,14 +231,23 @@ impl ModuleScriptContinuation {
) -> Option<ParserPendingScriptId<MainParserDocumentOwner>> {
match self.owner {
ModuleScriptContinuationOwner::Parser(pending_script_id) => Some(pending_script_id),
- ModuleScriptContinuationOwner::Runtime(_) => None,
+ ModuleScriptContinuationOwner::Runtime { .. } => None,
}
}
pub(crate) fn dynamic_script_owner_id(&self) -> Option<DynamicScriptOwnerId> {
match self.owner {
ModuleScriptContinuationOwner::Parser(_) => None,
- ModuleScriptContinuationOwner::Runtime(owner) => Some(owner),
+ ModuleScriptContinuationOwner::Runtime { owner_id, .. } => Some(owner_id),
+ }
+ }
+
+ pub(crate) fn document_owner(&self) -> FrameDocumentTaskOwner {
+ match self.owner {
+ ModuleScriptContinuationOwner::Parser(pending_script_id) => {
+ pending_script_id.owner().task_owner()
+ }
+ ModuleScriptContinuationOwner::Runtime { document_owner, .. } => document_owner,
}
}
@@ -284,7 +286,6 @@ impl ModuleScriptContinuation {
pending_script_id: self
.parser_pending_script_id()
.expect("main graph-ready work requires a parser pending script id"),
- runtime_reset_generation_before_run: self.runtime_reset_generation_before_run,
main_document_load_delay_binding: self.main_document_load_delay_binding,
};
MainDocumentModuleGraphReadyWork::with_target(target, self.script, graph)
@@ -294,12 +295,8 @@ impl ModuleScriptContinuation {
work: MainDocumentModuleGraphReadyWork,
) -> Self {
let (mut target, script, graph) = work.into_parts();
- let runtime_reset_generation_before_run = target.runtime_reset_generation_before_run();
- let mut continuation = ModuleScriptContinuation::new_parser(
- script,
- target.pending_script_id(),
- runtime_reset_generation_before_run,
- );
+ let mut continuation =
+ ModuleScriptContinuation::new_parser(script, target.pending_script_id());
if let Some(binding) = target.take_main_document_load_delay_binding() {
continuation = continuation.with_main_document_load_delay_binding(binding);
}
@@ -454,12 +451,8 @@ impl DocumentScriptReadyActionDispatchRoute<MainDocumentReadyActionRoute>
impl From<MainDocumentModuleGraphReadyWork> for Box<MainParserOwnedModuleScriptContinuation> {
fn from(work: MainDocumentModuleGraphReadyWork) -> Self {
let (mut target, script, graph) = work.into_parts();
- let runtime_reset_generation_before_run = target.runtime_reset_generation_before_run();
- let mut continuation = ModuleScriptContinuation::new_parser(
- script,
- target.pending_script_id(),
- runtime_reset_generation_before_run,
- );
+ let mut continuation =
+ ModuleScriptContinuation::new_parser(script, target.pending_script_id());
if let Some(binding) = target.take_main_document_load_delay_binding() {
continuation = continuation.with_main_document_load_delay_binding(binding);
}
@@ -1106,7 +1099,7 @@ mod tests {
fn parser_continuation(script: PreparedScript) -> ModuleScriptContinuation {
let owner = MainParserDocumentOwner::new(main_task_owner());
let pending_script_id = ParserPendingScriptId::new(owner, &script);
- ModuleScriptContinuation::new_parser(script, pending_script_id, 1).with_completed_graph(
+ ModuleScriptContinuation::new_parser(script, pending_script_id).with_completed_graph(
crate::module_runtime::ModuleGraphHandle {
root_entry: crate::module_runtime::ModuleEntryId::for_test(1),
entries: vec![crate::module_runtime::ModuleEntryId::for_test(1)],
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 5548e6127..5aa700547 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
@@ -162,8 +162,7 @@ impl PageVm {
tracing::debug!(
url = %script_continuation.script.url,
completion_owner = ?script_continuation.completion_owner(),
- runtime_reset_generation_before_run =
- script_continuation.runtime_reset_generation_before_run,
+ document_owner_before_run = ?script_continuation.document_owner(),
active_fetch_load_id = ?script_continuation.active_fetch_load_id(),
"finishing completed module script graph"
);
@@ -253,8 +252,7 @@ impl PageVm {
) -> ModuleScriptCompletionOutcome {
let script = script_continuation.script.clone();
let settlement_script = script.clone();
- let runtime_reset_generation_before_run =
- script_continuation.runtime_reset_generation_before_run;
+ let document_owner_before_run = script_continuation.document_owner();
let completion_owner = script_continuation.completion_owner();
let parser_owner = script_continuation
.parser_document_owner()
@@ -266,7 +264,7 @@ impl PageVm {
.settle_prepared_module_success(
loader,
&script,
- runtime_reset_generation_before_run,
+ document_owner_before_run,
dynamic_script_owner_id,
evaluation,
terminal_disposition,
diff --git a/moli-renderer-v8/src/runtime/page_vm/tests/main_native_module_completion.rs b/moli-renderer-v8/src/runtime/page_vm/tests/main_native_module_completion.rs
index 3f4fe59cc..e9861b68d 100644
--- a/moli-renderer-v8/src/runtime/page_vm/tests/main_native_module_completion.rs
+++ b/moli-renderer-v8/src/runtime/page_vm/tests/main_native_module_completion.rs
@@ -278,7 +278,6 @@ for (let index = 0; index < 2; index++) {
Some(true),
"the admitted runtime modules must retain exact Window-load leases"
);
- let generation = page_vm.vm().document_runtime.runtime_reset_generation();
let mut actions = NativeModuleOwnerActions::empty();
for _ in 0..2 {
@@ -292,7 +291,7 @@ for (let index = 0; index < 2; index++) {
else {
panic!("runtime module admission must become concrete execution work");
};
- let continuation = ModuleScriptContinuation::new_runtime(script, id, generation);
+ let continuation = ModuleScriptContinuation::new_runtime(script, id, owner);
actions.merge(NativeModuleOwnerActions::from_runtime_module_failure(
continuation,
ModuleLoadError::new(ModuleLoadStage::Fetch, "shared dependency failed"),
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 02cf5a9ba..996f94666 100644
--- a/moli-renderer-v8/src/runtime/page_vm/tests/mod.rs
+++ b/moli-renderer-v8/src/runtime/page_vm/tests/mod.rs
@@ -13958,7 +13958,6 @@ async fn stale_main_parser_module_terminal_drops_after_pending_script_retirement
Vec::new(),
Url::parse("https://example.com/page.html").expect("document URL"),
);
- let old_generation = page_vm.vm().document_runtime.runtime_reset_generation();
let old_task_owner = page_vm
.vm()
.current_main_document_task_owner()
@@ -13981,12 +13980,6 @@ async fn stale_main_parser_module_terminal_drops_after_pending_script_retirement
)
.await
.expect("replacement script task should run");
- assert_ne!(
- page_vm.vm().document_runtime.runtime_reset_generation(),
- old_generation,
- "document replacement should advance the main runtime reset token"
- );
-
let stale_pending_script_id =
crate::document_script_scheduler::ParserPendingScriptId::new(
old_owner,
@@ -13995,7 +13988,6 @@ async fn stale_main_parser_module_terminal_drops_after_pending_script_retirement
let stale_continuation = ModuleScriptContinuation::new_parser(
module_script,
stale_pending_script_id,
- old_generation,
)
.with_completed_graph(ModuleGraphHandle {
root_entry: ModuleEntryId::for_test(1),
diff --git a/moli-renderer-v8/src/script_vm.rs b/moli-renderer-v8/src/script_vm.rs
index 8f5fd8f99..2a2ff0a54 100644
--- a/moli-renderer-v8/src/script_vm.rs
+++ b/moli-renderer-v8/src/script_vm.rs
@@ -5740,14 +5740,20 @@ impl ScriptVm {
parser_write_insertion_point_active: run_input.parser_write_insertion_point_active,
parser_insertion_controller: None,
});
- let runtime_reset_generation_before_run = self.document_runtime.runtime_reset_generation();
+ let document_owner_before_run =
+ self.current_main_document_task_owner().ok_or_else(|| {
+ PreparedScriptExecutionError::from_message(format!(
+ "prepared script `{}` has no current main Document owner",
+ script.url
+ ))
+ })?;
let result = self
.execute_prepared_script_run_body(script, run_input.body)
.await;
self.document_runtime.clear_current_script_handle();
let outcome = result?;
let body_activity = outcome.body_activity();
- if self.script_run_replaced_document(runtime_reset_generation_before_run, script) {
+ if self.script_run_replaced_document(document_owner_before_run, script) {
return Ok(PreparedScriptExecutionOutcome::Dropped(body_activity));
}
match outcome {
@@ -5757,7 +5763,7 @@ impl ScriptVm {
.module_script_continuation_for_prepared_script(
script,
dynamic_script_owner_id,
- runtime_reset_generation_before_run,
+ document_owner_before_run,
)?
.with_completed_graph(graph);
let actions = self.handle_module_script_graph_advance_for_owner(
@@ -5774,7 +5780,7 @@ impl ScriptVm {
let continuation = self.module_script_continuation_for_prepared_script(
script,
dynamic_script_owner_id,
- runtime_reset_generation_before_run,
+ document_owner_before_run,
)?;
let actions = self.handle_module_script_graph_advance_for_owner(
ModuleScriptContinuationGraphAdvance::NeedFetches {
@@ -5829,7 +5835,7 @@ impl ScriptVm {
&self,
script: &PreparedScript,
dynamic_script_owner_id: Option<crate::dynamic_script_owner::DynamicScriptOwnerId>,
- runtime_reset_generation_before_run: u64,
+ document_owner_before_run: crate::frame_owner_model::FrameDocumentTaskOwner,
) -> std::result::Result<ModuleScriptContinuation, PreparedScriptExecutionError> {
match self.completion_owner_for_prepared_module_script(script) {
ModuleScriptCompletionOwner::Parser => {
@@ -5843,10 +5849,14 @@ impl ScriptVm {
script.url
))
})?;
+ debug_assert_eq!(
+ pending_script_id.owner().task_owner(),
+ document_owner_before_run,
+ "parser module continuation must retain its admitted Document owner"
+ );
Ok(ModuleScriptContinuation::new_parser(
script.clone(),
pending_script_id,
- runtime_reset_generation_before_run,
))
}
ModuleScriptCompletionOwner::Runtime => {
@@ -5859,7 +5869,7 @@ impl ScriptVm {
Ok(ModuleScriptContinuation::new_runtime(
script.clone(),
owner,
- runtime_reset_generation_before_run,
+ document_owner_before_run,
))
}
}
@@ -5869,13 +5879,13 @@ impl ScriptVm {
&mut self,
loader: &ResourceRequestClient,
script: &PreparedScript,
- runtime_reset_generation_before_run: u64,
+ document_owner_before_run: crate::frame_owner_model::FrameDocumentTaskOwner,
dynamic_script_owner_id: Option<crate::dynamic_script_owner::DynamicScriptOwnerId>,
evaluation: ParserModuleEvaluationSettlement,
terminal_disposition: ParserModuleTerminalDisposition,
prepared_activity: PreparedScriptBodyActivity,
) -> std::result::Result<PreparedModuleSuccessSettlement, String> {
- if self.script_run_replaced_document(runtime_reset_generation_before_run, script) {
+ if self.script_run_replaced_document(document_owner_before_run, script) {
return Ok(PreparedModuleSuccessSettlement::Stale);
}
let uses_runtime_owned_page_task_execution =
@@ -6076,10 +6086,10 @@ impl ScriptVm {
fn script_run_replaced_document(
&mut self,
- runtime_reset_generation_before_run: u64,
+ document_owner_before_run: crate::frame_owner_model::FrameDocumentTaskOwner,
script: &PreparedScript,
) -> bool {
- if self.document_runtime.runtime_reset_generation() == runtime_reset_generation_before_run {
+ if self.current_main_document_task_owner() == Some(document_owner_before_run) {
return false;
}
self.refresh_script_vm_local_document_state();
@@ -7868,7 +7878,9 @@ impl ScriptVm {
parser_write_insertion_point_active,
parser_insertion_controller,
});
- let runtime_reset_generation_before_run = self.document_runtime.runtime_reset_generation();
+ let document_owner_before_run = self
+ .current_main_document_task_owner()
+ .expect("parser-owned classic execution requires a current main Document owner");
let result = {
let _parser_script_nesting = execution_context
.is_parser_blocking()
@@ -7923,7 +7935,7 @@ impl ScriptVm {
);
}
}
- if self.script_run_replaced_document(runtime_reset_generation_before_run, script) {
+ if self.script_run_replaced_document(document_owner_before_run, script) {
return ParserOwnedClassicScriptExecutionReport::new(
Ok(()),
None,
diff --git a/moli-renderer-v8/src/script_vm/eval_exec.rs b/moli-renderer-v8/src/script_vm/eval_exec.rs
index a4c44828e..fd186bedc 100644
--- a/moli-renderer-v8/src/script_vm/eval_exec.rs
+++ b/moli-renderer-v8/src/script_vm/eval_exec.rs
@@ -942,12 +942,14 @@ impl ScriptVm {
network_result,
);
}
- let runtime_reset_generation_before_run =
- self.document_runtime.runtime_reset_generation();
+ let document_owner_before_run =
+ self.current_main_document_task_owner().expect(
+ "runtime script execution requires a current main Document owner",
+ );
match self.execute_prepared_script_once(loader, &script).await {
Ok(true) => {
if self.script_run_replaced_document(
- runtime_reset_generation_before_run,
+ document_owner_before_run,
&script,
) {
return Ok(RuntimePendingWorkFlushOutcome::Complete);
diff --git a/moli-renderer-v8/src/script_vm/native_module.rs b/moli-renderer-v8/src/script_vm/native_module.rs
index de284558d..53f1ab7d3 100644
--- a/moli-renderer-v8/src/script_vm/native_module.rs
+++ b/moli-renderer-v8/src/script_vm/native_module.rs
@@ -1509,11 +1509,8 @@ impl ScriptVm {
}
return Ok(false);
}
- let mut continuation = ModuleScriptContinuation::new_parser(
- script.clone(),
- pending_script_id,
- self.document_runtime.runtime_reset_generation(),
- );
+ let mut continuation =
+ ModuleScriptContinuation::new_parser(script.clone(), pending_script_id);
if let Some(binding) = load_delay_binding.take() {
continuation = continuation.with_main_document_load_delay_binding(binding);
}
@@ -1587,11 +1584,13 @@ impl ScriptVm {
if script.kind != crate::types::ScriptKind::Module || script.url.scheme() == "data" {
return RuntimeModuleScriptGraphStart::NotModuleScript;
}
- let runtime_reset_generation_before_run = self.document_runtime.runtime_reset_generation();
+ let document_owner = self
+ .current_main_document_task_owner()
+ .expect("runtime module graph start requires a current main Document owner");
let continuation = ModuleScriptContinuation::new_runtime(
script.clone(),
dynamic_script_owner_id,
- runtime_reset_generation_before_run,
+ document_owner,
);
let job = match runtime_owned_module_script_graph_job_for_prepared_script(self, script) {
Ok(job) => job,