Skip to content

armgit / moli

Public Imported from GitHub
0

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

refactor(renderer): use one document serialization command

ldm0429847e98af6
diff --git a/moli-core/src/page/renderer_command_support.rs b/moli-core/src/page/renderer_command_support.rs
index 6dd8b9927..7162b76f3 100644
--- a/moli-core/src/page/renderer_command_support.rs
+++ b/moli-core/src/page/renderer_command_support.rs
@@ -1449,7 +1449,7 @@ impl Page {
}
pub fn start_serialize_html(&self) -> Result<PendingPageCommand> {
- self.start_page_command(RendererPageCommand::SerializeHtml)
+ self.start_page_command(RendererPageCommand::SerializeDocument)
}
/// Publishes current layout for subsequent geometry reads without painting.
@@ -1562,8 +1562,8 @@ impl Page {
expect_page_reply!(
reply,
"serialize HTML page command",
- "a string reply",
- RendererPageReply::OptionalString(Some(html)) => Ok(html),
+ "a serialized document reply",
+ RendererPageReply::SerializedDocument { html, .. } => Ok(html),
)
}
@@ -1576,8 +1576,8 @@ impl Page {
expect_page_reply!(
reply,
"serialize HTML page command",
- "a string reply",
- RendererPageReply::OptionalString(Some(html)) => Ok(html),
+ "a serialized document reply",
+ RendererPageReply::SerializedDocument { html, .. } => Ok(html),
)
}
diff --git a/moli-renderer-v8/src/devtools/command/nested.rs b/moli-renderer-v8/src/devtools/command/nested.rs
index 3e2464266..f37943dee 100644
--- a/moli-renderer-v8/src/devtools/command/nested.rs
+++ b/moli-renderer-v8/src/devtools/command/nested.rs
@@ -75,7 +75,6 @@ impl RendererPageCommand {
| Self::ResetCssAgentSession { .. }
| Self::OuterHtmlForDocument { .. }
| Self::OuterHtmlForBackendNodeId { .. }
- | Self::SerializeHtml
| Self::SerializeDocument
| Self::LayoutMetrics
| Self::PublishLayout
diff --git a/moli-renderer-v8/src/runtime/page_commands.rs b/moli-renderer-v8/src/runtime/page_commands.rs
index 1ac198518..75f758ef4 100644
--- a/moli-renderer-v8/src/runtime/page_commands.rs
+++ b/moli-renderer-v8/src/runtime/page_commands.rs
@@ -853,9 +853,6 @@ impl PageVm {
RendererPageCommand::RenderPageDump { options } => Ok(RendererPageReply::OptionalString(
Some(self.render_page_dump(options)),
)),
- RendererPageCommand::SerializeHtml => {
- Ok(RendererPageReply::OptionalString(Some(self.serialize_html())))
- }
RendererPageCommand::SerializeDocument => {
// Capture both from the live document in this handler turn.
// Browser admission metadata may precede a queued history update.
diff --git a/moli-renderer-v8/src/runtime/page_surface.rs b/moli-renderer-v8/src/runtime/page_surface.rs
index 70ec919be..21e045070 100644
--- a/moli-renderer-v8/src/runtime/page_surface.rs
+++ b/moli-renderer-v8/src/runtime/page_surface.rs
@@ -921,7 +921,6 @@ impl RendererRuntimeCommandOutput {
self.v8_state_update = Some(state);
}
- #[doc(hidden)]
#[doc(hidden)]
pub fn bind_renderer_agent_attachment(&mut self, id: RendererAgentAttachmentId) {
match self.renderer_agent_attachment_id {
@@ -5008,7 +5007,6 @@ pub enum RendererPageCommand {
RenderPageDump {
options: RendererPageDumpOptions,
},
- SerializeHtml,
SerializeDocument,
LayoutMetrics,
PublishLayout,
@@ -5623,7 +5621,6 @@ impl RendererPageCommand {
Self::OuterHtmlForDocument { .. } => Some("OuterHtmlForDocument"),
Self::OuterHtmlForBackendNodeId { .. } => Some("OuterHtmlForBackendNodeId"),
Self::RenderPageDump { .. } => Some("RenderPageDump"),
- Self::SerializeHtml => Some("SerializeHtml"),
Self::SerializeDocument => Some("SerializeDocument"),
Self::LayoutMetrics => Some("LayoutMetrics"),
Self::PublishLayout => Some("PublishLayout"),
diff --git a/moli-renderer-v8/src/runtime/tests.rs b/moli-renderer-v8/src/runtime/tests.rs
index 33fd865a8..3a32ec6b9 100644
--- a/moli-renderer-v8/src/runtime/tests.rs
+++ b/moli-renderer-v8/src/runtime/tests.rs
@@ -278,12 +278,12 @@ async fn recv_page_lifecycle_until(
async fn serialize_html_for_renderer_page(page: &RendererPageHandle) -> String {
let (reply, _) = page
- .run_async_command(RendererPageCommand::SerializeHtml)
+ .run_async_command(RendererPageCommand::SerializeDocument)
.await
.expect("renderer page should serialize HTML");
match reply {
- RendererPageReply::OptionalString(Some(html)) => html,
- _ => panic!("expected SerializeHtml string reply"),
+ RendererPageReply::SerializedDocument { html, .. } => html,
+ _ => panic!("expected serialized document reply"),
}
}