Skip to content

armgit / moli

Public Imported from GitHub
0

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

fix(modules): share synthetic source text and release map references

ldm0bfa903ab437b
diff --git a/moli-module-script-tree/src/types.rs b/moli-module-script-tree/src/types.rs
index 593bf485b..d2164ef19 100644
--- a/moli-module-script-tree/src/types.rs
+++ b/moli-module-script-tree/src/types.rs
@@ -1,4 +1,5 @@
use std::collections::HashMap;
+use std::sync::Arc;
use url::Url;
@@ -516,7 +517,8 @@ impl FetchedModuleSource {
#[derive(Debug, Clone, PartialEq, Eq)]
pub enum ModuleSource {
- Text(String),
+ /// Share decoded text across fetch clients and the renderer's compiled record.
+ Text(Arc<str>),
Binary(Vec<u8>),
}
diff --git a/moli-module-script-tree/tests/module_tree.rs b/moli-module-script-tree/tests/module_tree.rs
index ccc969d81..f6c0df3fc 100644
--- a/moli-module-script-tree/tests/module_tree.rs
+++ b/moli-module-script-tree/tests/module_tree.rs
@@ -511,7 +511,7 @@ fn network_fetch_source_is_compiled_by_tree_before_link() {
key: root_key.clone(),
client: fetches[0].client,
requested_phase: ModuleImportPhase::Evaluation,
- outcome: fetched_outcome(root_key, ModuleSource::Text("export {};".to_owned())),
+ outcome: fetched_outcome(root_key, ModuleSource::Text("export {};".into())),
};
let ModuleScriptTreePoll::Complete(graph) =
@@ -749,7 +749,7 @@ fn parse_error_waits_for_pending_sibling_fetches_before_failing() {
key: a_key.clone(),
client: a_fetch.client,
requested_phase: ModuleImportPhase::Evaluation,
- outcome: fetched_outcome(a_key.clone(), ModuleSource::Text("bad".to_owned())),
+ outcome: fetched_outcome(a_key.clone(), ModuleSource::Text("bad".into())),
},
);
assert_waiting_for_clients(wait, 1);
@@ -768,7 +768,7 @@ fn parse_error_waits_for_pending_sibling_fetches_before_failing() {
key: b_key.clone(),
client: b_fetch.client,
requested_phase: ModuleImportPhase::Evaluation,
- outcome: fetched_outcome(b_key, ModuleSource::Text("export {};".to_owned())),
+ outcome: fetched_outcome(b_key, ModuleSource::Text("export {};".into())),
},
) else {
panic!("tree should fail with delayed parse error after sibling completion");
@@ -943,7 +943,7 @@ fn parse_error_result_uses_module_discovery_order_not_completion_order() {
key: b_key.clone(),
client: b_fetch.client,
requested_phase: ModuleImportPhase::Evaluation,
- outcome: fetched_outcome(b_key.clone(), ModuleSource::Text("bad b".to_owned())),
+ outcome: fetched_outcome(b_key.clone(), ModuleSource::Text("bad b".into())),
},
);
assert_waiting_for_clients(wait, 1);
@@ -957,7 +957,7 @@ fn parse_error_result_uses_module_discovery_order_not_completion_order() {
key: a_key.clone(),
client: a_fetch.client,
requested_phase: ModuleImportPhase::Evaluation,
- outcome: fetched_outcome(a_key, ModuleSource::Text("bad a".to_owned())),
+ outcome: fetched_outcome(a_key, ModuleSource::Text("bad a".into())),
},
) else {
panic!("tree should fail once all sibling fetches finish");
@@ -1090,7 +1090,7 @@ fn joined_fetch_fetched_module_map_entry_compiles_from_fanout_completion() {
key: child_key.clone(),
client,
requested_phase: ModuleImportPhase::Evaluation,
- outcome: fetched_outcome(child_key, ModuleSource::Text("export {};".to_owned())),
+ outcome: fetched_outcome(child_key, ModuleSource::Text("export {};".into())),
};
let ModuleScriptTreePoll::Complete(graph) = job.resume_single_module(&mut host, client, result)
diff --git a/moli-renderer-v8/src/document_module_graph/entry.rs b/moli-renderer-v8/src/document_module_graph/entry.rs
index 812bb026e..2fc417e09 100644
--- a/moli-renderer-v8/src/document_module_graph/entry.rs
+++ b/moli-renderer-v8/src/document_module_graph/entry.rs
@@ -3,7 +3,7 @@ use std::fmt;
use moli_module_script_tree as module_tree;
use super::{
- ModuleCompiledRecordId, ModuleFetchMetadata, ModuleIdentityHash, ModuleKind, ModuleLoadError,
+ ModuleCompiledRecordId, ModuleFetchMetadata, ModuleIdentityHash, ModuleLoadError,
ModuleMapEntryState, ModuleMapFetchClient, ModuleMapKey, ModuleMapTerminalClients,
ModuleResolvedDependency, ModuleSource,
};
@@ -149,10 +149,7 @@ impl ModuleMapEntry {
identity: ModuleIdentityHash,
effective_fetch_metadata: ModuleFetchMetadata,
) {
- // V8 owns the compiled JavaScript module from this point onward. Keep
- // synthetic-module sources because their evaluation callbacks still
- // consume them after compilation.
- if effective_key.kind() == ModuleKind::JavaScript {
+ if !effective_key.kind().retains_source_after_compilation() {
self.source = None;
}
self.key = request_key;
@@ -262,12 +259,12 @@ mod tests {
use crate::document_module_graph::ModuleAttributesKey;
use url::Url;
- fn compiled_entry_for(key: ModuleMapKey) -> ModuleMapEntry {
+ fn compiled_entry_for(key: ModuleMapKey, source: ModuleSource) -> ModuleMapEntry {
let mut entry = ModuleMapEntry::new(key.clone(), ModuleMapEntryState::Fetching);
entry.set_fetched_source(
key.clone(),
key.clone(),
- ModuleSource::text("export default 1;".to_owned()),
+ source,
ModuleFetchMetadata::default(),
);
entry.set_compiled_record(
@@ -286,16 +283,49 @@ mod tests {
Url::parse("https://example.test/module.js").expect("module URL"),
);
- assert!(compiled_entry_for(key).source().is_none());
+ assert!(
+ compiled_entry_for(key, ModuleSource::text("export default 1;"))
+ .source()
+ .is_none()
+ );
}
#[test]
- fn compiled_synthetic_entry_retains_source_for_evaluation() {
- let key = ModuleMapKey::json_with_attributes(
- Url::parse("https://example.test/data.json").expect("module URL"),
- ModuleAttributesKey::from_pairs(vec![("type".to_owned(), "json".to_owned())]),
- );
+ fn compiled_synthetic_entry_releases_source_owned_by_record() {
+ for (key, source) in [
+ (
+ ModuleMapKey::json_with_attributes(
+ Url::parse("https://example.test/data.json").unwrap(),
+ ModuleAttributesKey::from_pairs(vec![("type".to_owned(), "json".to_owned())]),
+ ),
+ "{\"answer\":42}",
+ ),
+ (
+ ModuleMapKey::css_with_attributes(
+ Url::parse("https://example.test/style.css").unwrap(),
+ ModuleAttributesKey::from_pairs(vec![("type".to_owned(), "css".to_owned())]),
+ ),
+ "body { color: red; }",
+ ),
+ ] {
+ assert!(
+ compiled_entry_for(key, ModuleSource::text(source))
+ .source()
+ .is_none()
+ );
+ }
+ }
- assert!(compiled_entry_for(key).source().is_some());
+ #[test]
+ fn compiled_wasm_entry_retains_binary_source() {
+ let key =
+ ModuleMapKey::webassembly(Url::parse("https://example.test/module.wasm").unwrap());
+ let bytes = b"\0asm\x01\0\0\0";
+ let entry = compiled_entry_for(key, ModuleSource::binary(bytes.to_vec()));
+
+ assert_eq!(
+ entry.source().unwrap().binary_source(),
+ Some(bytes.as_slice())
+ );
}
}
diff --git a/moli-renderer-v8/src/document_module_graph/key.rs b/moli-renderer-v8/src/document_module_graph/key.rs
index 90e77fec9..5742ab6b7 100644
--- a/moli-renderer-v8/src/document_module_graph/key.rs
+++ b/moli-renderer-v8/src/document_module_graph/key.rs
@@ -76,6 +76,18 @@ pub(crate) enum ModuleKind {
WebAssembly,
}
+impl ModuleKind {
+ /// Whether the module map still needs the fetched source after compilation.
+ pub(crate) fn retains_source_after_compilation(self) -> bool {
+ match self {
+ // V8 owns JavaScript source; synthetic text records own JSON/CSS source.
+ Self::JavaScript | Self::Json | Self::Css => false,
+ // Preserve the separate source semantics of Wasm and text preloads.
+ Self::WebAssembly | Self::ModulePreloadText => true,
+ }
+ }
+}
+
#[derive(Debug, Clone, PartialEq, Eq, Hash)]
pub(crate) struct ModuleMapKey {
url: Url,
diff --git a/moli-renderer-v8/src/document_module_graph/record.rs b/moli-renderer-v8/src/document_module_graph/record.rs
index c3232c71c..f26f779c5 100644
--- a/moli-renderer-v8/src/document_module_graph/record.rs
+++ b/moli-renderer-v8/src/document_module_graph/record.rs
@@ -1,10 +1,13 @@
+use std::sync::Arc;
+
use url::Url;
use super::{ModuleAttributesKey, ModuleKind, ModuleMapKey};
#[derive(Debug, Clone, PartialEq, Eq)]
pub(crate) enum ModuleSource {
- Text(String),
+ /// The fetch pipeline and synthetic evaluation share this immutable allocation.
+ Text(Arc<str>),
Binary(Vec<u8>),
}
@@ -82,8 +85,8 @@ impl ModuleGraphFetchedSource {
}
impl ModuleSource {
- pub(crate) fn text(source: String) -> Self {
- Self::Text(source)
+ pub(crate) fn text(source: impl Into<Arc<str>>) -> Self {
+ Self::Text(source.into())
}
pub(crate) fn binary(bytes: Vec<u8>) -> Self {
diff --git a/moli-renderer-v8/src/module_runtime/graph.rs b/moli-renderer-v8/src/module_runtime/graph.rs
index e376f1702..0a8ed57bb 100644
--- a/moli-renderer-v8/src/module_runtime/graph.rs
+++ b/moli-renderer-v8/src/module_runtime/graph.rs
@@ -2655,6 +2655,57 @@ mod tests {
.expect("script vm finish should succeed")
}
+ #[test]
+ fn synthetic_text_module_compilation_shares_fetched_source_and_releases_map_reference() {
+ for (module_type, text) in [
+ ("json", r#"{"answer":42}"#),
+ ("css", "body { color: red; }"),
+ ] {
+ let mut vm = new_test_vm("https://app.example.test/page");
+ let source_url = url(&format!("https://app.example.test/source.{module_type}"));
+ let attributes =
+ ModuleAttributesKey::from_pairs(vec![("type".to_owned(), module_type.to_owned())]);
+ let key = ModuleMapKey::from_url_and_attributes(&source_url, &attributes).unwrap();
+ let text_source: std::sync::Arc<str> = text.into();
+ let weak_source = std::sync::Arc::downgrade(&text_source);
+ let source = ModuleSource::text(text_source);
+ let fetched = module_tree::FetchedModuleSource::new(
+ chromium_module_key(&key),
+ chromium_module_key(&key),
+ source_url.clone(),
+ source_url,
+ chromium_source(source.clone()),
+ module_tree::ModuleFetchMetadata::default(),
+ );
+ let snapshot = {
+ let mut host =
+ RendererModuleScriptTreeHost::new(NativeModuleTreeDocumentOwner::new(&mut vm));
+ module_tree::ModuleScriptTreeHost::compile_module_source(
+ &mut host,
+ fetched.clone(),
+ module_tree::ModuleImportPhase::Evaluation,
+ )
+ .expect("synthetic module should compile")
+ };
+ let entry = local_entry_id(snapshot.entry);
+ assert!(vm.document_runtime.native_compiled_module(entry).is_some());
+ assert!(
+ vm.document_runtime.native_module_source(entry).is_none(),
+ "{module_type}: compiled module map must release its fetched source",
+ );
+ drop(fetched);
+ drop(source);
+ assert_eq!(
+ weak_source.strong_count(),
+ 1,
+ "{module_type}: only the compiled record should own the original text allocation",
+ );
+ assert_eq!(weak_source.upgrade().unwrap().as_ref(), text);
+ drop(vm);
+ assert!(weak_source.upgrade().is_none());
+ }
+ }
+
#[test]
fn native_json_module_fetch_request_uses_json_destination_metadata() {
let fetch_request = NativeModuleGraphFetchRequest::new_for_test(
diff --git a/moli-renderer-v8/src/module_runtime/synthetic_text.rs b/moli-renderer-v8/src/module_runtime/synthetic_text.rs
index 2906395af..dad39e870 100644
--- a/moli-renderer-v8/src/module_runtime/synthetic_text.rs
+++ b/moli-renderer-v8/src/module_runtime/synthetic_text.rs
@@ -1,6 +1,7 @@
use std::cell::RefCell;
use std::collections::HashMap;
use std::rc::{Rc, Weak};
+use std::sync::Arc;
use super::{ModuleIdentityHash, ModuleMapKey, module_identity_hash_from_v8_module};
@@ -11,7 +12,7 @@ use super::{ModuleIdentityHash, ModuleMapKey, module_identity_hash_from_v8_modul
pub(crate) struct SyntheticTextModuleSource {
module: v8::Global<v8::Module>,
key: ModuleMapKey,
- source: String,
+ source: Arc<str>,
}
#[derive(Default)]
@@ -24,7 +25,7 @@ impl SyntheticTextModuleSource {
scope: &mut v8::PinScope<'_, '_>,
module: v8::Local<'_, v8::Module>,
key: ModuleMapKey,
- source: &str,
+ source: Arc<str>,
) -> Rc<Self> {
let context = scope.get_current_context();
let sources = context
@@ -37,7 +38,7 @@ impl SyntheticTextModuleSource {
let record = Rc::new(Self {
module: v8::Global::new(scope, module),
key,
- source: source.to_owned(),
+ source,
});
let mut entries = sources.entries.borrow_mut();
let candidates = entries
@@ -100,8 +101,9 @@ mod tests {
Url::parse("https://example.test/shared.json").unwrap(),
ModuleAttributesKey::empty(),
);
- let first_source = SyntheticTextModuleSource::register(scope, first, key.clone(), "1");
- let second_source = SyntheticTextModuleSource::register(scope, second, key, "2");
+ let first_source =
+ SyntheticTextModuleSource::register(scope, first, key.clone(), "1".into());
+ let second_source = SyntheticTextModuleSource::register(scope, second, key, "2".into());
// Inject a conflicting candidate deterministically instead of waiting
// for a random V8 identity-hash collision.
@@ -134,12 +136,15 @@ mod tests {
Url::parse("https://example.test/value.json").unwrap(),
ModuleAttributesKey::empty(),
);
- let source = SyntheticTextModuleSource::register(scope, module, key.clone(), "42");
+ let text: Arc<str> = "42".into();
+ let weak_text = Arc::downgrade(&text);
+ let source = SyntheticTextModuleSource::register(scope, module, key.clone(), text);
let weak = Rc::downgrade(&source);
let record = ModuleRecordEntry::new(key, v8::Global::new(scope, module), Vec::new())
.with_synthetic_text_module_source(source);
let clone = record.clone();
drop(record);
+ assert_eq!(weak_text.strong_count(), 1);
assert_eq!(
SyntheticTextModuleSource::for_module(context, module)
.unwrap()
@@ -148,6 +153,7 @@ mod tests {
);
drop(clone);
assert!(weak.upgrade().is_none());
+ assert!(weak_text.upgrade().is_none());
assert!(SyntheticTextModuleSource::for_module(context, module).is_none());
}
}
diff --git a/moli-renderer-v8/src/page_task_queue/child_frame_task.rs b/moli-renderer-v8/src/page_task_queue/child_frame_task.rs
index fecb0960b..fd5e38d49 100644
--- a/moli-renderer-v8/src/page_task_queue/child_frame_task.rs
+++ b/moli-renderer-v8/src/page_task_queue/child_frame_task.rs
@@ -871,7 +871,7 @@ mod tests {
task.kind(),
crate::frame_owner_model::FrameDocumentParserModuleRootStartKind::LoadedSource(
crate::module_runtime::ModuleSource::Text(source)
- ) if source == "export const value = 1;"
+ ) if source.as_ref() == "export const value = 1;"
));
assert_eq!(task.child_handle(), child_handle);
assert_eq!(task.owner(), owner);
diff --git a/moli-renderer-v8/src/script_vm/native_module/module_graph.rs b/moli-renderer-v8/src/script_vm/native_module/module_graph.rs
index a811f9f0f..3e77ab913 100644
--- a/moli-renderer-v8/src/script_vm/native_module/module_graph.rs
+++ b/moli-renderer-v8/src/script_vm/native_module/module_graph.rs
@@ -1,3 +1,5 @@
+use std::sync::Arc;
+
use super::*;
impl ScriptVm {
@@ -67,7 +69,7 @@ impl ScriptVm {
)
}
ModuleKind::Json | ModuleKind::Css => {
- let Some(source) = source.text_source() else {
+ let ModuleSource::Text(source) = source else {
return Err(ModuleLoadError::new(
ModuleLoadStage::Compile,
format!("synthetic text module `{source_url}` did not retain text source"),
@@ -76,7 +78,7 @@ impl ScriptVm {
self.compile_synthetic_module_record_in_context(
context_ptr,
key,
- source,
+ Arc::clone(source),
source_url,
)
}
@@ -237,7 +239,7 @@ impl ScriptVm {
&mut self,
context_ptr: *const v8::Global<v8::Context>,
key: ModuleMapKey,
- source: &str,
+ source: Arc<str>,
source_url: &Url,
) -> std::result::Result<(ModuleRecordEntry, ModuleIdentityHash), ModuleLoadError> {
self.renderer_document_isolate