Skip to content

armgit / moli

Public Imported from GitHub
0

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

refactor(runtime): calculate wait deadlines from an explicit clock

ldm0b21b4f05615c
diff --git a/moli-renderer-v8/src/runtime/owner.rs b/moli-renderer-v8/src/runtime/owner.rs
index 10cafb8ee..b50918c1c 100644
--- a/moli-renderer-v8/src/runtime/owner.rs
+++ b/moli-renderer-v8/src/runtime/owner.rs
@@ -660,10 +660,13 @@ impl RendererPostResponseOwnerWork {
}
}
-fn checked_live_page_wait_deadline(timeout_ms: u64, operation: &str) -> Result<Instant> {
+fn checked_live_page_wait_deadline(
+ now: Instant,
+ timeout_ms: u64,
+ operation: &str,
+) -> Result<Instant> {
let timeout = std::time::Duration::from_millis(timeout_ms);
- Instant::now()
- .checked_add(timeout)
+ now.checked_add(timeout)
.ok_or_else(|| anyhow!("{operation} timeout is too large"))
}
@@ -1224,7 +1227,7 @@ mod tests {
#[test]
fn live_page_wait_deadline_does_not_convert_huge_timeout_to_now() {
let before = Instant::now();
- let result = checked_live_page_wait_deadline(u64::MAX, "selector");
+ let result = checked_live_page_wait_deadline(before, u64::MAX, "selector");
match result {
Ok(deadline) => assert!(
@@ -1237,10 +1240,15 @@ mod tests {
#[test]
fn live_page_wait_deadline_accepts_regular_timeout() {
- let deadline = checked_live_page_wait_deadline(1, "selector")
+ let now = Instant::now();
+ let deadline = checked_live_page_wait_deadline(now, 1, "selector")
.expect("small timeout should fit in Instant range");
- assert!(deadline > Instant::now());
+ assert!(deadline > now);
+ assert_eq!(
+ deadline.duration_since(now),
+ std::time::Duration::from_millis(1)
+ );
}
#[test]
diff --git a/moli-renderer-v8/src/runtime/owner/lifecycle_decision.rs b/moli-renderer-v8/src/runtime/owner/lifecycle_decision.rs
index c24837245..47fe08dc1 100644
--- a/moli-renderer-v8/src/runtime/owner/lifecycle_decision.rs
+++ b/moli-renderer-v8/src/runtime/owner/lifecycle_decision.rs
@@ -162,6 +162,7 @@ impl RendererOwnerHandle {
),
};
let navigation_deadline = match checked_live_page_wait_deadline(
+ Instant::now(),
navigation_grace_ms,
"lifecycle-target successor navigation grace",
) {
diff --git a/moli-renderer-v8/src/runtime/owner/owner_commands.rs b/moli-renderer-v8/src/runtime/owner/owner_commands.rs
index 75fd4ecfb..096628c6a 100644
--- a/moli-renderer-v8/src/runtime/owner/owner_commands.rs
+++ b/moli-renderer-v8/src/runtime/owner/owner_commands.rs
@@ -717,7 +717,11 @@ impl RendererOwnerHandle {
timeout_ms,
loader,
} => {
- let deadline = match checked_live_page_wait_deadline(timeout_ms, "networkidle") {
+ let deadline = match checked_live_page_wait_deadline(
+ Instant::now(),
+ timeout_ms,
+ "networkidle",
+ ) {
Ok(deadline) => deadline,
Err(error) => return Err(error).into(),
};
@@ -735,7 +739,11 @@ impl RendererOwnerHandle {
timeout_ms,
loader,
} => {
- let deadline = match checked_live_page_wait_deadline(timeout_ms, "domstable") {
+ let deadline = match checked_live_page_wait_deadline(
+ Instant::now(),
+ timeout_ms,
+ "domstable",
+ ) {
Ok(deadline) => deadline,
Err(error) => return Err(error).into(),
};
diff --git a/moli-renderer-v8/src/runtime/owner/page_commands.rs b/moli-renderer-v8/src/runtime/owner/page_commands.rs
index 1013ec588..fef0957a4 100644
--- a/moli-renderer-v8/src/runtime/owner/page_commands.rs
+++ b/moli-renderer-v8/src/runtime/owner/page_commands.rs
@@ -78,7 +78,11 @@ impl RendererOwnerHandle {
timeout_ms,
loader,
} => {
- let deadline = match checked_live_page_wait_deadline(timeout_ms, "selector") {
+ let deadline = match checked_live_page_wait_deadline(
+ Instant::now(),
+ timeout_ms,
+ "selector",
+ ) {
Ok(deadline) => deadline,
Err(error) => return Err(error).into(),
};
@@ -97,7 +101,11 @@ impl RendererOwnerHandle {
timeout_ms,
loader,
} => {
- let deadline = match checked_live_page_wait_deadline(timeout_ms, "script truthy") {
+ let deadline = match checked_live_page_wait_deadline(
+ Instant::now(),
+ timeout_ms,
+ "script truthy",
+ ) {
Ok(deadline) => deadline,
Err(error) => return Err(error).into(),
};
@@ -117,8 +125,11 @@ impl RendererOwnerHandle {
timeout_ms,
loader,
} => {
- let deadline =
- match checked_live_page_wait_deadline(timeout_ms, "subresource response") {
+ let deadline = match checked_live_page_wait_deadline(
+ Instant::now(),
+ timeout_ms,
+ "subresource response",
+ ) {
Ok(deadline) => deadline,
Err(error) => return Err(error).into(),
};
@@ -137,6 +148,7 @@ impl RendererOwnerHandle {
loader: _,
} => {
let deadline = match checked_live_page_wait_deadline(
+ Instant::now(),
timeout_ms,
"child-frame lifecycle best-effort observation",
) {
@@ -166,6 +178,7 @@ impl RendererOwnerHandle {
capture_policy: super::RendererPageStateCapturePolicy,
) -> RenderRuntimeDispatchOutcome {
let deadline = match checked_live_page_wait_deadline(
+ Instant::now(),
LIVE_PAGE_RUNTIME_EXPRESSION_AWAIT_TIMEOUT_MS,
"runtime expression awaitPromise",
) {