Skip to content

armgit / moli

Public Imported from GitHub
0

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

fix(core): preserve newer Page state when commands settle out of order

ldm0041846069aaa
diff --git a/moli-core/src/page/page_state_cache.rs b/moli-core/src/page/page_state_cache.rs
index 1e7f1b9c2..3c57f67b4 100644
--- a/moli-core/src/page/page_state_cache.rs
+++ b/moli-core/src/page/page_state_cache.rs
@@ -15,7 +15,11 @@ impl PageStateCache {
}
pub(super) fn replace(&mut self, state: Arc<RendererPageState>) {
- self.state = state;
+ // Renderer completions retain their own frozen replies even when the
+ // caller consumes them after a newer capture of this Page.
+ if state.snapshot_revision >= self.state.snapshot_revision {
+ self.state = state;
+ }
}
pub(super) fn state(&self) -> &RendererPageState {
diff --git a/moli-core/src/runtime/tests.rs b/moli-core/src/runtime/tests.rs
index fe771498c..f1ab50af9 100644
--- a/moli-core/src/runtime/tests.rs
+++ b/moli-core/src/runtime/tests.rs
@@ -4500,6 +4500,7 @@ async fn renderer_owner_remove_unknown_page_keeps_never_tracked_state() -> Resul
vm_creation_id: 0,
view_generation: 0,
page_state: std::sync::Arc::new(crate::renderer::RendererPageState {
+ snapshot_revision: Default::default(),
requested_url: Url::parse("https://example.com/requested")?,
navigation_initiator_url: None,
navigation_redirected: false,
diff --git a/moli-core/tests/dom_bridge.rs b/moli-core/tests/dom_bridge.rs
index e42c21ded..b377ef1ed 100644
--- a/moli-core/tests/dom_bridge.rs
+++ b/moli-core/tests/dom_bridge.rs
@@ -118,6 +118,74 @@ async fn builds_dom_structure_and_exposes_script_nodes() -> Result<()> {
Ok(())
}
+#[tokio::test]
+async fn finishing_older_document_snapshot_preserves_newer_cached_page_state() -> Result<()> {
+ let server = FixtureServer::spawn().await?;
+ let browser = Browser::new(AppConfig::default())?;
+ let mut page = browser.fetch(&server.url("/static")).await?;
+ let document_isolate_identity = page.document_isolate_identity_for_diagnostics();
+ let document_url = page.final_url().clone();
+ let attachment = page.renderer_agent_attachment_id();
+ assert_eq!(attachment, None);
+
+ page.evaluate_runtime_expression_async("document.title = 'older'")
+ .await?;
+ assert_eq!(page.document_title(), "older");
+ let older = page
+ .start_document_node_snapshot_for_document(None, true, -1, true)?
+ .wait()
+ .await?;
+ assert_eq!(older.renderer_agent_attachment_id(), attachment);
+
+ // Hold the frozen older completion while the renderer captures the newer
+ // title in the same document and attachment.
+ page.evaluate_runtime_expression_async("document.title = 'newer'")
+ .await?;
+ let newer = page
+ .start_document_node_snapshot_for_document(None, true, -1, true)?
+ .wait()
+ .await?;
+ assert_eq!(newer.renderer_agent_attachment_id(), attachment);
+ assert_eq!(page.renderer_agent_attachment_id(), attachment);
+ assert_eq!(
+ page.document_isolate_identity_for_diagnostics(),
+ document_isolate_identity
+ );
+ assert_eq!(page.final_url(), &document_url);
+
+ let newer = page
+ .finish_document_node_snapshot_for_document(newer)?
+ .context("newer document snapshot should exist")?;
+ let newer_title = find_snapshot_node(&newer.snapshot, &mut |node| node.local_name == "title")
+ .context("newer document snapshot should contain its title")?;
+ assert_eq!(newer_title.children.len(), 1);
+ assert_eq!(newer_title.children[0].node_value, "newer");
+ assert_eq!(page.document_title(), "newer");
+
+ let older = page
+ .finish_document_node_snapshot_for_document(older)?
+ .context("older document snapshot should exist")?;
+ let older_title = find_snapshot_node(&older.snapshot, &mut |node| node.local_name == "title")
+ .context("older document snapshot should contain its title")?;
+ assert_eq!(older_title.children.len(), 1);
+ assert_eq!(older_title.children[0].node_value, "older");
+ assert_eq!(older.snapshot.node_id, newer.snapshot.node_id);
+ assert_eq!(page.renderer_agent_attachment_id(), attachment);
+ assert_eq!(
+ page.document_isolate_identity_for_diagnostics(),
+ document_isolate_identity
+ );
+ assert_eq!(page.final_url(), &document_url);
+ assert_eq!(
+ page.document_title(),
+ "newer",
+ "finishing an older snapshot must not roll back the cached Page state"
+ );
+
+ server.shutdown().await;
+ Ok(())
+}
+
#[tokio::test]
async fn range_exposes_constructor_create_range_and_clone_contents_basics() -> Result<()> {
let server = FixtureServer::spawn().await?;
diff --git a/moli-renderer-v8/src/devtools/ingress/main.rs b/moli-renderer-v8/src/devtools/ingress/main.rs
index b2b6c8f8f..f109006c2 100644
--- a/moli-renderer-v8/src/devtools/ingress/main.rs
+++ b/moli-renderer-v8/src/devtools/ingress/main.rs
@@ -774,6 +774,7 @@ mod tests {
fn page_state() -> Arc<RendererPageState> {
let url = url::Url::parse("about:blank").expect("test URL");
Arc::new(RendererPageState {
+ snapshot_revision: Default::default(),
requested_url: url.clone(),
navigation_initiator_url: None,
navigation_redirected: false,
diff --git a/moli-renderer-v8/src/lib.rs b/moli-renderer-v8/src/lib.rs
index 7a3ef57a0..1c3d379e8 100644
--- a/moli-renderer-v8/src/lib.rs
+++ b/moli-renderer-v8/src/lib.rs
@@ -294,13 +294,14 @@ pub use runtime::{
RendererPageDumpStripOptions, RendererPageHandle, RendererPageReplacementCommit,
RendererPageReplacementError, RendererPageReplacementFailureDisposition,
RendererPageReplacementReservationRequest, RendererPageReplacementTarget, RendererPageReply,
- RendererPageReservationToken, RendererPageState, RendererPageTestingHandle, RendererPageView,
- RendererPendingAuxiliaryPage, RendererPendingDownloadActivation,
- RendererPendingDownloadResponse, RendererPendingFileChooserActivation,
- RendererPendingJavaScriptDialog, RendererPendingPopupActivation,
- RendererPendingSameDocumentNavigation, RendererPendingTopLevelHistoryTraversal,
- RendererPendingWindowOpenEvent, RendererPerformanceMetricSnapshot,
- RendererPointerEventProperties, RendererPopupActivationSource, RendererPopupDisposition,
+ RendererPageReservationToken, RendererPageState, RendererPageStateRevision,
+ RendererPageTestingHandle, RendererPageView, RendererPendingAuxiliaryPage,
+ RendererPendingDownloadActivation, RendererPendingDownloadResponse,
+ RendererPendingFileChooserActivation, RendererPendingJavaScriptDialog,
+ RendererPendingPopupActivation, RendererPendingSameDocumentNavigation,
+ RendererPendingTopLevelHistoryTraversal, RendererPendingWindowOpenEvent,
+ RendererPerformanceMetricSnapshot, RendererPointerEventProperties,
+ RendererPopupActivationSource, RendererPopupDisposition,
RendererPreparedDocumentCommitConfiguration, RendererProtocolObservation,
RendererReservedServiceWorkerClient, RendererResourceContentBody,
RendererResourceSearchRequest, RendererResourceTextSearchOutcome,
diff --git a/moli-renderer-v8/src/runtime/mod.rs b/moli-renderer-v8/src/runtime/mod.rs
index 8ad75f89a..d65ef9878 100644
--- a/moli-renderer-v8/src/runtime/mod.rs
+++ b/moli-renderer-v8/src/runtime/mod.rs
@@ -328,7 +328,7 @@ pub use self::page_screenshot::{
pub(super) use self::page_state::RendererPageEntry;
pub use self::page_state::RendererPageRecord;
pub(crate) use self::page_state::RendererPageSlotHandle;
-pub use self::page_state::RendererPageState;
+pub use self::page_state::{RendererPageState, RendererPageStateRevision};
use self::page_surface::RendererPageTable;
pub use self::page_surface::{
CompletedWorkerRuntimeInspectorCommandDispatch, DevToolsSessionKey,
diff --git a/moli-renderer-v8/src/runtime/page.rs b/moli-renderer-v8/src/runtime/page.rs
index e06ec6dd8..ad94e36aa 100644
--- a/moli-renderer-v8/src/runtime/page.rs
+++ b/moli-renderer-v8/src/runtime/page.rs
@@ -20,8 +20,8 @@ use super::{
RendererDocumentIsolateAccountingDiagnostics, RendererInspectorSessionRestoreSnapshot,
RendererOwnerCommand, RendererOwnerHandle, RendererOwnerReply, RendererPageCreationArtifacts,
RendererPageCreationDiagnostics, RendererPageHandle, RendererPageReservationToken,
- RendererPageState, RendererPendingDownloadActivation, RendererPerformanceMetricSnapshot,
- RendererReservedServiceWorkerClient,
+ RendererPageState, RendererPageStateRevision, RendererPendingDownloadActivation,
+ RendererPerformanceMetricSnapshot, RendererReservedServiceWorkerClient,
};
/// Optional document bootstrap inputs shared by HTML and streaming creation.
@@ -44,6 +44,7 @@ pub struct RendererDocumentOptions {
}
pub(crate) struct PageVmStateCapture {
+ pub(crate) snapshot_revision: RendererPageStateRevision,
pub(crate) final_url: Url,
pub(crate) document_title: String,
pub(crate) document_activity: moli_page_types::DocumentActivity,
diff --git a/moli-renderer-v8/src/runtime/page_state.rs b/moli-renderer-v8/src/runtime/page_state.rs
index c09af276d..1b8cffbbe 100644
--- a/moli-renderer-v8/src/runtime/page_state.rs
+++ b/moli-renderer-v8/src/runtime/page_state.rs
@@ -1,5 +1,26 @@
use super::*;
+/// Orders successful Page VM captures within one renderer owner.
+///
+/// The first component orders replacement VMs, while every successful capture
+/// advances the second component, including nested captures.
+/// Callers must establish common renderer ownership before comparing revisions;
+/// creation IDs from different renderer owners do not define an ordering.
+#[derive(Clone, Copy, Debug, Default, Eq, Ord, PartialEq, PartialOrd)]
+pub struct RendererPageStateRevision {
+ vm_creation_id: u64,
+ capture_sequence: u64,
+}
+
+impl RendererPageStateRevision {
+ pub(crate) fn new(vm_creation_id: u64, capture_sequence: u64) -> Self {
+ Self {
+ vm_creation_id,
+ capture_sequence,
+ }
+ }
+}
+
#[derive(Debug, Clone)]
pub struct RendererPageRecord {
pub requested_url: Url,
@@ -9,6 +30,7 @@ pub struct RendererPageRecord {
#[derive(Debug, Clone)]
pub struct RendererPageState {
+ pub snapshot_revision: RendererPageStateRevision,
pub requested_url: Url,
pub navigation_initiator_url: Option<Url>,
pub navigation_redirected: bool,
@@ -48,6 +70,7 @@ impl RendererPageState {
}
Arc::new(Self {
+ snapshot_revision: state_capture.snapshot_revision,
requested_url,
navigation_initiator_url,
navigation_redirected,
diff --git a/moli-renderer-v8/src/runtime/page_surface.rs b/moli-renderer-v8/src/runtime/page_surface.rs
index be3919506..6f849fe6d 100644
--- a/moli-renderer-v8/src/runtime/page_surface.rs
+++ b/moli-renderer-v8/src/runtime/page_surface.rs
@@ -6181,6 +6181,7 @@ impl RendererPageTable {
vm_creation_id,
view_generation,
page_state: Arc::new(RendererPageState {
+ snapshot_revision: Default::default(),
requested_url,
navigation_initiator_url: None,
navigation_redirected: false,
diff --git a/moli-renderer-v8/src/runtime/page_vm/mod.rs b/moli-renderer-v8/src/runtime/page_vm/mod.rs
index 63eafe637..0c8b886d9 100644
--- a/moli-renderer-v8/src/runtime/page_vm/mod.rs
+++ b/moli-renderer-v8/src/runtime/page_vm/mod.rs
@@ -1636,6 +1636,7 @@ pub(super) enum ScannedScriptDeferral {
pub(crate) struct PageVm {
pub(super) page_id: PageId,
pub(super) creation_id: u64,
+ state_capture_sequence: u64,
pub(super) document_lifecycle: RendererDocumentLifecycleJournalHandle,
pub(super) runtime_command_settlement: super::RendererRuntimeCommandOutputSettlement,
pub(super) pending_runtime_command_output: Option<PageVmRuntimeCommandOutputScope>,
@@ -4072,7 +4073,15 @@ impl PageVm {
);
}
+ self.state_capture_sequence = self
+ .state_capture_sequence
+ .checked_add(1)
+ .expect("Page state capture sequence exhausted");
Ok(PageVmStateCapture {
+ snapshot_revision: super::RendererPageStateRevision::new(
+ self.creation_id,
+ self.state_capture_sequence,
+ ),
final_url,
document_title,
document_activity: self.document_settings.document_activity,
@@ -4455,6 +4464,7 @@ impl PageVm {
let page_vm = Self {
page_id,
creation_id,
+ state_capture_sequence: 0,
document_lifecycle,
runtime_command_settlement: super::RendererRuntimeCommandOutputSettlement::default(),
pending_runtime_command_output: None,
@@ -5294,7 +5304,10 @@ async fn wait_for_page_task_source_load_arrival(
fn register_page_vm_creation() -> u64 {
PAGE_VM_DROP_TRACKER.with(|tracker| {
let mut tracker = tracker.borrow_mut();
- tracker.next_id += 1;
+ tracker.next_id = tracker
+ .next_id
+ .checked_add(1)
+ .expect("Page VM creation sequence exhausted");
let id = tracker.next_id;
tracker.creation_order.push(id);
id