Skip to content

armgit / moli

Public Imported from GitHub
0

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

fix(runtime): publish owner output during awaited expressions

ldm0cf8e4fcab6f4
diff --git a/moli-renderer-v8/src/runtime/owner/page_commands.rs b/moli-renderer-v8/src/runtime/owner/page_commands.rs
index fef0957a4..85518c722 100644
--- a/moli-renderer-v8/src/runtime/owner/page_commands.rs
+++ b/moli-renderer-v8/src/runtime/owner/page_commands.rs
@@ -385,10 +385,16 @@ impl RendererOwnerHandle {
if should_follow_pending_navigation
&& entry.page_vm().vm().has_pending_location_navigation()
{
- debug_assert!(
- turn_records.is_empty(),
- "commands that follow a pending navigation cannot drop command-turn output records"
- );
+ // Preserve the old Document's ordered actions before following its
+ // navigation, including stop() actions and no-document responses.
+ if !turn_records.is_empty() {
+ entry
+ .page_vm()
+ .append_renderer_command_output_records(turn_records);
+ if let Some(output) = entry.page_vm_mut().settle_renderer_output_publication() {
+ self.publish_renderer_output(output);
+ }
+ }
return self.continue_live_page_pending_navigation(
token,
entry,
@@ -879,7 +885,12 @@ impl RendererOwnerHandle {
}
}
Ok(PageVmRuntimeExpressionAwaitAdvance::Progressed { pending_call }) => {
+ entry.page_vm().vm().append_live_command_output_prefix();
+ let output = entry.page_vm_mut().settle_renderer_output_publication();
self.restore_live_page_entry(token, entry);
+ if let Some(output) = output {
+ self.publish_renderer_output(output);
+ }
RenderRuntimeDispatchOutcome::ContinueNextTurn(Box::new(
RenderRuntimeTurn::WaitLivePageRuntimeExpressionAwait {
token,
@@ -907,7 +918,12 @@ impl RendererOwnerHandle {
))
.into()
} else {
+ entry.page_vm().vm().append_live_command_output_prefix();
+ let output = entry.page_vm_mut().settle_renderer_output_publication();
self.restore_live_page_entry(token, entry);
+ if let Some(output) = output {
+ self.publish_renderer_output(output);
+ }
let ready_at = Instant::now()
.checked_add(sleep_for)
.unwrap_or(deadline)
diff --git a/moli-renderer-v8/src/runtime/tests/extracted/runtime_scripts.rs b/moli-renderer-v8/src/runtime/tests/extracted/runtime_scripts.rs
index 291b9d364..e68f2c3cd 100644
--- a/moli-renderer-v8/src/runtime/tests/extracted/runtime_scripts.rs
+++ b/moli-renderer-v8/src/runtime/tests/extracted/runtime_scripts.rs
@@ -4036,3 +4036,46 @@ fn parse_time_scaffold_lane_is_rejected_on_named_executor_lane() {
.await;
});
}
+
+#[tokio::test(flavor = "multi_thread")]
+async fn pending_expression_publishes_console_output_before_settlement() {
+ let runtime = JsRuntime::initialize();
+ let (output_tx, mut output_rx) = renderer_external_activity_test_channel();
+ runtime.set_renderer_output_transport_sender(output_tx);
+ let loader = ResourceRequestClient::new(&moli_fetch::FetchConfig::default()).unwrap();
+ let url = url::Url::parse("https://example.test/pending-expression-output").unwrap();
+ let mut page = create_test_html_page(
+ &runtime,
+ &loader,
+ url,
+ "<!doctype html><body>pending</body>",
+ )
+ .await;
+ dispatch_runtime_protocol_with_output_for_test(
+ &page,
+ serde_json::json!({"id":731,"method":"Runtime.enable"}),
+ )
+ .await
+ .unwrap();
+ output_rx.drain();
+ let pending=page.enqueue_async_command(RendererPageCommand::EvaluateExpression {
+ expression:"new Promise(resolve => setTimeout(() => { console.log('owner-output-during-await'); setTimeout(() => resolve('done'), 60000); }, 0))".to_owned(),
+ await_promise:true,
+ }).unwrap();
+ let observed=tokio::time::timeout(Duration::from_secs(3),async {
+ while let Some(output)=output_rx.recv().await {
+ if output.records().iter().any(|record|matches!(record.item(),
+ RendererOutputItem::Observation(RendererProtocolObservation::RuntimeInspector(batch))
+ if batch.messages.iter().any(|message|matches!(message,
+ RendererRuntimeInspectorMessage::Protocol(message)
+ if message.get("method")==Some(&serde_json::json!("Runtime.consoleAPICalled"))
+ && message.to_string().contains("owner-output-during-await"))))) {return true;}
+ }
+ false
+ }).await;
+ page.close_async()
+ .await
+ .expect("close pending-expression page");
+ let _ = pending.wait().await;
+ assert!(observed.expect("output must arrive without promise settlement"));
+}