Skip to content

armgit / moli

Public Imported from GitHub
0

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

feat(renderer): allow lifecycle navigation fallback

ldm0e2fdb906004c
diff --git a/moli-core/tests/lifecycle_decision.rs b/moli-core/tests/lifecycle_decision.rs
index 5e2c25be0..13d61cca0 100644
--- a/moli-core/tests/lifecycle_decision.rs
+++ b/moli-core/tests/lifecycle_decision.rs
@@ -106,6 +106,46 @@ async fn lifecycle_decider_finishes_without_extra_owner_command() -> Result<()>
Ok(())
}
+#[tokio::test(flavor = "multi_thread")]
+async fn immediate_lifecycle_fallback_resumes_page_work_after_domcontentloaded() -> Result<()> {
+ let server = FixtureServer::spawn().await?;
+ let browser = Browser::new(AppConfig::default())?;
+ let url = server.url("/wait-until-domcontentloaded-runtime-script-slow");
+
+ let mut page = executable_page(
+ browser
+ .fetch_document_with_lifecycle_decider(
+ Request::get(&url)?,
+ RenderedDomWaitUntil::DomContentLoaded,
+ Duration::from_secs(5),
+ |_| {
+ Ok(RendererLifecycleDecision::FollowNextDocumentOrFinish {
+ navigation_grace_ms: 0,
+ })
+ },
+ )
+ .await?,
+ )?;
+ assert!(
+ !page
+ .serialize_html_async()
+ .await?
+ .contains("id=\"late-dcl-script-slow\"")
+ );
+
+ browser
+ .wait_for_page_delay(&mut page, Duration::from_millis(500))
+ .await?;
+ assert!(
+ page.serialize_html_async()
+ .await?
+ .contains("id=\"late-dcl-script-slow\"")
+ );
+
+ server.shutdown().await;
+ Ok(())
+}
+
#[tokio::test(flavor = "multi_thread")]
async fn lifecycle_decider_supports_static_about_blank() -> Result<()> {
let browser = Browser::new(AppConfig::default())?;
@@ -448,6 +488,36 @@ async fn http_error_navigation_wait_reports_no_navigation_without_refetching() -
Ok(())
}
+#[tokio::test(flavor = "multi_thread")]
+async fn http_error_navigation_wait_can_finish_the_current_document() -> Result<()> {
+ let server = FixtureServer::spawn().await?;
+ let browser = Browser::new(AppConfig::default())?;
+ let url = server.url("/net/upstream/xhr/404");
+
+ let page = executable_page(
+ browser
+ .fetch_document_with_lifecycle_decider(
+ Request::get(&url)?,
+ RenderedDomWaitUntil::Load,
+ Duration::from_secs(5),
+ |target| {
+ assert_eq!(target.status, 404);
+ Ok(RendererLifecycleDecision::FollowNextDocumentOrFinish {
+ navigation_grace_ms: 100,
+ })
+ },
+ )
+ .await?,
+ )?;
+
+ assert_eq!(page.status(), 404);
+ let html = page.serialize_html_async().await?;
+ assert!(html.contains("Not Found"), "html={html}");
+
+ server.shutdown().await;
+ Ok(())
+}
+
#[tokio::test(flavor = "multi_thread")]
async fn same_document_navigation_does_not_satisfy_http_error_replacement_wait() -> Result<()> {
let server = FixtureServer::spawn().await?;
diff --git a/moli-renderer-v8/src/runtime/lifecycle_decision.rs b/moli-renderer-v8/src/runtime/lifecycle_decision.rs
index f7f8287d9..37e6f679f 100644
--- a/moli-renderer-v8/src/runtime/lifecycle_decision.rs
+++ b/moli-renderer-v8/src/runtime/lifecycle_decision.rs
@@ -32,6 +32,11 @@ pub enum RendererLifecycleDecision {
/// period, then follow its successor to the same lifecycle target before
/// page creation replies.
FollowNextDocument { navigation_grace_ms: u64 },
+ /// Observe one cross-Document navigation within the supplied grace
+ /// period and follow it to the same lifecycle target. If no successor
+ /// starts in time, accept the current Document instead of failing page
+ /// creation.
+ FollowNextDocumentOrFinish { navigation_grace_ms: u64 },
}
/// Synchronous, one-shot policy decider for a page-creation lifecycle target.
diff --git a/moli-renderer-v8/src/runtime/owner/lifecycle_decision.rs b/moli-renderer-v8/src/runtime/owner/lifecycle_decision.rs
index e2a85de97..3f43824de 100644
--- a/moli-renderer-v8/src/runtime/owner/lifecycle_decision.rs
+++ b/moli-renderer-v8/src/runtime/owner/lifecycle_decision.rs
@@ -25,6 +25,7 @@ pub(super) struct PendingLifecycleNavigation {
snapshot: RendererLifecycleSnapshot,
navigation_grace_ms: u64,
navigation_deadline: Instant,
+ finish_on_timeout: bool,
resume_parked_page_turn: bool,
}
@@ -147,9 +148,19 @@ impl RendererOwnerHandle {
RendererLifecycleDecision::Finish => {
self.finalize_pending_page_creation_reply(pending).await
}
- RendererLifecycleDecision::FollowNextDocument {
- navigation_grace_ms,
- } => {
+ decision @ (RendererLifecycleDecision::FollowNextDocument { .. }
+ | RendererLifecycleDecision::FollowNextDocumentOrFinish { .. }) => {
+ let (navigation_grace_ms, finish_on_timeout) = match decision {
+ RendererLifecycleDecision::FollowNextDocument {
+ navigation_grace_ms,
+ } => (navigation_grace_ms, false),
+ RendererLifecycleDecision::FollowNextDocumentOrFinish {
+ navigation_grace_ms,
+ } => (navigation_grace_ms, true),
+ RendererLifecycleDecision::Finish => unreachable!(
+ "the Finish lifecycle decision is handled by the preceding match arm"
+ ),
+ };
let navigation_deadline = match checked_live_page_wait_deadline(
navigation_grace_ms,
"lifecycle-target successor navigation grace",
@@ -180,6 +191,7 @@ impl RendererOwnerHandle {
snapshot,
navigation_grace_ms,
navigation_deadline,
+ finish_on_timeout,
resume_parked_page_turn: released.resume_parked_page_turn,
}),
))
@@ -196,6 +208,7 @@ impl RendererOwnerHandle {
snapshot,
navigation_grace_ms,
navigation_deadline,
+ finish_on_timeout,
resume_parked_page_turn,
} = wait;
let token = pending.token;
@@ -235,6 +248,19 @@ impl RendererOwnerHandle {
}
if Instant::now() >= navigation_deadline {
self.restore_live_page_entry(token, entry);
+ if finish_on_timeout {
+ if resume_parked_page_turn {
+ // The lifecycle gate was released before this wait so
+ // timers and other Page work could start a replacement
+ // navigation. Preserve any scheduler wake parked behind
+ // that gate when an immediate deadline accepts the Page.
+ self.signal_internal_page_turn_source(
+ token,
+ RendererOwnerWakeSource::SchedulerContinuation,
+ );
+ }
+ return self.finalize_pending_page_creation_reply(pending).await;
+ }
return self
.retire_failed_page_creation(
token,
@@ -260,6 +286,7 @@ impl RendererOwnerHandle {
snapshot,
navigation_grace_ms,
navigation_deadline,
+ finish_on_timeout,
resume_parked_page_turn: false,
},
)),