Skip to content

armgit / moli

Public Imported from GitHub
0

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

perf(parser): release script preloads at EOF

ldm0681476dbbf4e
diff --git a/moli-renderer-v8/src/document_runtime/lifecycle.rs b/moli-renderer-v8/src/document_runtime/lifecycle.rs
index cfe7535c4..d815bfb44 100644
--- a/moli-renderer-v8/src/document_runtime/lifecycle.rs
+++ b/moli-renderer-v8/src/document_runtime/lifecycle.rs
@@ -44,6 +44,10 @@ impl DocumentRuntime {
self.main_document_script_preloads = store;
}
+ pub(crate) fn clear_main_document_script_preload_store(&mut self) {
+ self.main_document_script_preloads.clear();
+ }
+
pub(super) fn bind_main_document_runtime_producer(
&mut self,
owner: crate::frame_owner_model::FrameDocumentTaskOwner,
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 6a5396f25..cac8d280f 100644
--- a/moli-renderer-v8/src/runtime/page_vm/tests/mod.rs
+++ b/moli-renderer-v8/src/runtime/page_vm/tests/mod.rs
@@ -2987,6 +2987,70 @@ async fn main_document_lifecycle_sets_interactive_before_defer_and_loads_later()
.await;
}
+#[test]
+fn parser_eof_releases_preloads_only_for_the_current_document_transition() {
+ fn ready_store(url: Url) -> crate::runtime::DocumentScriptPreloadStore {
+ let request = crate::runtime::BufferedScriptPreloadRequest {
+ url: url.clone(),
+ initiator_url: url,
+ kind_hint: ScriptKind::Classic,
+ mode_hint: ScriptMode::Normal,
+ resource_type_hint: moli_fetch::RequestResourceType::ParserBlockingScript,
+ fetch_metadata: ScriptFetchMetadata::default(),
+ };
+ let mut store = crate::runtime::DocumentScriptPreloadStore::default();
+ store.insert(
+ request.cache_key(),
+ crate::runtime::script_preloads::BufferedScriptPreloadEntry {
+ request,
+ load: SharedScriptSourceLoad::ready_ok("window.ready = true;"),
+ },
+ );
+ store
+ }
+
+ let mut page_vm = test_page_vm();
+ let owner = page_vm
+ .vm()
+ .current_main_document_task_owner()
+ .expect("test page should have a main document owner");
+ let live_store =
+ ready_store(Url::parse("https://example.test/preloaded.js").expect("preload URL"));
+ let live_store_observer = live_store.clone();
+ page_vm
+ .vm_mut()
+ .document_runtime
+ .bind_main_document_script_preload_store(live_store);
+
+ assert!(!live_store_observer.is_empty());
+ assert!(
+ page_vm
+ .vm_mut()
+ .finish_current_main_document_parsing(owner)
+ .is_some()
+ );
+ assert!(live_store_observer.is_empty());
+
+ let stale_store =
+ ready_store(Url::parse("https://example.test/stale.js").expect("preload URL"));
+ let stale_store_observer = stale_store.clone();
+ page_vm
+ .vm_mut()
+ .document_runtime
+ .bind_main_document_script_preload_store(stale_store);
+
+ assert!(
+ page_vm
+ .vm_mut()
+ .finish_current_main_document_parsing(owner)
+ .is_none()
+ );
+ assert!(
+ !stale_store_observer.is_empty(),
+ "a stale parser completion must not clear the current preload store"
+ );
+}
+
#[tokio::test(flavor = "current_thread")]
async fn main_document_replacement_during_interactive_retires_old_lifecycle_actions() {
run_page_vm_async_test(async move {
diff --git a/moli-renderer-v8/src/runtime/script_preloads.rs b/moli-renderer-v8/src/runtime/script_preloads.rs
index c5e97b8d1..d7b19e3d8 100644
--- a/moli-renderer-v8/src/runtime/script_preloads.rs
+++ b/moli-renderer-v8/src/runtime/script_preloads.rs
@@ -130,6 +130,10 @@ impl DocumentScriptPreloadStore {
self.entries.lock().len()
}
+ pub(crate) fn clear(&self) {
+ self.entries.lock().clear();
+ }
+
#[cfg(test)]
pub(super) fn is_empty(&self) -> bool {
self.entries.lock().is_empty()
diff --git a/moli-renderer-v8/src/script_vm/main_document_owner.rs b/moli-renderer-v8/src/script_vm/main_document_owner.rs
index d44e5eb54..66e69ceb6 100644
--- a/moli-renderer-v8/src/script_vm/main_document_owner.rs
+++ b/moli-renderer-v8/src/script_vm/main_document_owner.rs
@@ -70,9 +70,15 @@ impl ScriptVm {
&mut self,
owner: FrameDocumentTaskOwner,
) -> Option<MainDocumentInteractiveLifecycleAction> {
- self._context_host
+ let action = self
+ ._context_host
.borrow_mut()
- .finish_current_main_document_parsing(owner)
+ .finish_current_main_document_parsing(owner);
+ if action.is_some() {
+ self.document_runtime
+ .clear_main_document_script_preload_store();
+ }
+ action
}
pub(super) fn apply_pending_main_document_owner_transitions(&mut self) {