Best headless browser for AI agents. Lite, Fast, High-Compatibility. Built in Rust
Rust ai-agentsai-toolsbrowserbrowser-automationcloud-browserheadlessheadless-browserkitesurfplaywrightpuppeteerrustservoweb-crawlerweb-crawlingweb-scraperweb-scraping
Retain image references without inferring content from pixels
kevin107c1536cb32
diff --git a/Cargo.lock b/Cargo.lockindex bd28f0ef1..8a7194f3d 100644--- a/Cargo.lock+++ b/Cargo.lock@@ -2718,14 +2718,9 @@ dependencies = [name = "moli-html2md"version = "0.1.0"dependencies = [- "base64 0.22.1",- "gif","html5ever","markup5ever_rcdom",- "percent-encoding",- "png","pulldown-cmark",- "roxmltree 0.21.1","serde_json",]diff --git a/moli-html2md/Cargo.toml b/moli-html2md/Cargo.tomlindex bcdf86c5d..1698234b1 100644--- a/moli-html2md/Cargo.toml+++ b/moli-html2md/Cargo.toml@@ -8,13 +8,6 @@ description = "Read-only DOM to Markdown conversion with an iterative state mach[lints]workspace = true-[dependencies]-base64 = "0.22"-gif = "0.14"-percent-encoding = "2.3"-png = "0.18"-roxmltree = "0.21"-[dev-dependencies]html5ever = "0.39"markup5ever_rcdom = "0.39"diff --git a/moli-html2md/src/machine.rs b/moli-html2md/src/machine.rsindex 67dcbdf61..990cda4c5 100644--- a/moli-html2md/src/machine.rs+++ b/moli-html2md/src/machine.rs@@ -14,7 +14,6 @@ enum Task<'a, Id> {EndList(usize),EndItem(String),RawChildren(Option<Id>, usize, bool),- EndPicture,EndRawBlock,EndCode,EndPre(Option<&'a str>),@@ -37,7 +36,6 @@ struct Machine<'a, D: Dom + ?Sized> {lists: Vec<List>,tables: Vec<Table<D::NodeId>>,raw: String,- picture_sources: Vec<bool>,serial: usize,}@@ -50,7 +48,6 @@ pub(crate) fn convert<D: Dom + ?Sized>(dom: &D, root: D::NodeId, options: &Optiolists: Vec::new(),tables: Vec::new(),raw: String::new(),- picture_sources: Vec::new(),serial: 0,};machine.run();@@ -134,9 +131,6 @@ impl<'a, D: Dom + ?Sized> Machine<'a, D> {self.writer().block(item.into(), separation, separation);}Task::RawChildren(Some(node), depth, inline) => self.raw_node(node, depth, inline),- Task::EndPicture => {- self.picture_sources.pop();- }Task::EndRawBlock => {if !self.raw.ends_with('\n') {self.raw.push('\n');@@ -246,45 +240,8 @@ impl<'a, D: Dom + ?Sized> Machine<'a, D> {.attribute(node, "src").filter(|src| !src.is_empty()){- // Embedded placeholders carry no useful image. Keep- // accessible alternate text without emitting a data URI.- let alternate = self- .dom- .attribute(node, "srcset")- .is_some_and(|s| !s.trim().is_empty())- || self.picture_sources.last().copied().unwrap_or(false);- if !alternate && is_noncontent_data_image(src) {- if !alt.is_empty()- && !self- .dom- .attribute(node, "aria-hidden")- .is_some_and(|value| value.trim().eq_ignore_ascii_case("true"))- {- self.writer().text(alt);- }- } else {- self.writer().image(alt, src, title);- }- }- return;- }- "picture" => {- let mut child = self.dom.first_child(node);- let mut alternate = false;- while let Some(id) = child {- if self.dom.node_kind(id) == NodeKind::Element("source")- && self- .dom- .attribute(id, "srcset")- .is_some_and(|s| !s.trim().is_empty())- {- alternate = true;- }- child = self.dom.next_sibling(id);+ self.writer().image(alt, src, title);}- self.picture_sources.push(alternate);- self.tasks.push(Task::EndPicture);- self.children(node, depth + 1);return;}"code" | "pre" => {@@ -485,116 +442,6 @@ impl<'a, D: Dom + ?Sized> Machine<'a, D> {}}-fn is_noncontent_data_image(src: &str) -> bool {- use base64::Engine as _;-- let Some((media_type, payload)) = src- .get(5..)- .filter(|_| {- src.get(..5)- .is_some_and(|scheme| scheme.eq_ignore_ascii_case("data:"))- })- .and_then(|uri| uri.split_once(','))- else {- return false;- };- let mut parts = media_type.split(';');- let Some(kind) = parts.next() else {- return false;- };- if !["image/svg+xml", "image/gif", "image/png"]- .iter()- .any(|supported| kind.eq_ignore_ascii_case(supported))- || payload.len() > 1_000_000- {- return false;- }- let encoded = parts.any(|part| part.eq_ignore_ascii_case("base64"));- let bytes = if encoded {- let Ok(bytes) = base64::engine::general_purpose::STANDARD.decode(payload) else {- return false;- };- bytes- } else {- percent_encoding::percent_decode_str(payload).collect::<Vec<_>>()- };- if kind.eq_ignore_ascii_case("image/gif") {- return transparent_gif(&bytes);- }- if kind.eq_ignore_ascii_case("image/png") {- return transparent_png(&bytes);- }- let Ok(svg) = std::str::from_utf8(&bytes) else {- return false;- };- let Ok(document) = roxmltree::Document::parse(svg) else {- return false;- };- let root = document.root_element();- root.tag_name().name() == "svg"- && root.attributes().all(|attr| {- matches!(- attr.name(),- "xmlns" | "width" | "height" | "viewBox" | "preserveAspectRatio"- )- })- && root.children().all(|child| {- child.is_comment()- || child.is_text() && child.text().is_none_or(|text| text.trim().is_empty())- })-}--fn transparent_gif(bytes: &[u8]) -> bool {- if bytes.get(6..10) != Some(&[1, 0, 1, 0][..]) {- return false;- }- let mut options = gif::DecodeOptions::new();- options.set_color_output(gif::ColorOutput::RGBA);- let Ok(mut decoder) = options.read_info(std::io::Cursor::new(bytes)) else {- return false;- };- let mut found = false;- loop {- match decoder.read_next_frame() {- Ok(Some(frame)) => {- found = true;- if frame.width != 1 || frame.height != 1 || frame.buffer.get(3) != Some(&0) {- return false;- }- }- Ok(None) => return found,- Err(_) => return false,- }- }-}--fn transparent_png(bytes: &[u8]) -> bool {- if bytes.get(16..24) != Some(&[0, 0, 0, 1, 0, 0, 0, 1][..]) {- return false;- }- let mut decoder =- png::Decoder::new_with_limits(std::io::Cursor::new(bytes), png::Limits { bytes: 64 });- decoder.set_transformations(png::Transformations::EXPAND | png::Transformations::STRIP_16);- let Ok(mut reader) = decoder.read_info() else {- return false;- };- if reader.info().animation_control.is_some() {- return false;- }- let Some(size) = reader.output_buffer_size() else {- return false;- };- let mut buffer = vec![0; size];- let Ok(frame) = reader.next_frame(&mut buffer) else {- return false;- };- match frame.color_type {- png::ColorType::Rgba => buffer.get(3) == Some(&0),- png::ColorType::GrayscaleAlpha => buffer.get(1) == Some(&0),- _ => false,- }-}-fn class_language(class: Option<&str>) -> Option<&str> {class?.split_ascii_whitespace()diff --git a/moli-html2md/tests/regressions.rs b/moli-html2md/tests/regressions.rsindex 714a5179d..7f8fc20c7 100644--- a/moli-html2md/tests/regressions.rs+++ b/moli-html2md/tests/regressions.rs@@ -251,80 +251,19 @@ fn images_without_sources_do_not_emit_placeholder_markdown() {}#[test]-fn empty_svg_lazy_image_placeholders_do_not_emit_data_uris() {- let placeholder = "data:image/svg+xml,%3Csvg%20xmlns='http://www.w3.org/2000/svg'%20viewBox='0%200%20720%20960'%3E%3C/svg%3E";- let html = format!("before<img alt='Recipe photo' src=\"{placeholder}\">after");- assert_eq!(markdown(&html, false), "beforeRecipe photoafter");-- for src in [- "data:image/svg+xml,<svg xmlns='http://www.w3.org/2000/svg'/>",- "data:image/svg+xml;charset=utf-8,%3Csvg%3E%20%3C!--empty--%3E%20%3C/svg%3E",- "data:image/svg+xml;base64,PHN2Zy8+",- ] {- let html = format!("before<img src=\"{src}\">after");- assert_eq!(markdown(&html, false), "beforeafter");- }-- let html =- format!("before<img alt='Recipe photo' aria-hidden='true' src=\"{placeholder}\">after");- assert_eq!(markdown(&html, false), "beforeafter");-- let real_svg = "data:image/svg+xml,%3Csvg%3E%3Cpath%20d='M0%200'/%3E%3C/svg%3E";- let html = format!("<img alt='Logo' src=\"{real_svg}\">");- assert!(markdown(&html, false).contains(real_svg));- let text_svg = "data:image/svg+xml,%3Csvg%3E%3Ctext%3ELogo%3C/text%3E%3C/svg%3E";- let html = format!("<img alt='Logo' src=\"{text_svg}\">");- assert!(markdown(&html, false).contains(text_svg));- let styled_svg = "data:image/svg+xml,%3Csvg%20xmlns='http://www.w3.org/2000/svg'%20style='background:red'%20width='32'%20height='32'/%3E";- let html = format!("<img alt='Color' src=\"{styled_svg}\">");- assert!(markdown(&html, false).contains(styled_svg));-}--#[test]-fn single_pixel_embedded_raster_placeholders_do_not_emit_data_uris() {- let malformed_gif =- "data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==";- let transparent_gif =- "data:image/gif;base64,R0lGODlhAQABAIAAAAAAAAAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==";- let html = format!("before<img alt='Product photo' src=\"{transparent_gif}\">after");- assert_eq!(markdown(&html, false), "beforeProduct photoafter");- // An invalid image cannot be shown to be transparent; retain its reference.- let html = format!("before<img alt='Product photo' src=\"{malformed_gif}\">after");- assert!(markdown(&html, false).contains(malformed_gif));- let png = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR4nGNgYGBgAAAABQABpfZFQAAAAABJRU5ErkJggg==";- let html = format!("before<img aria-hidden='true' src=\"{png}\">after");- assert_eq!(markdown(&html, false), "beforeafter");-+fn embedded_image_references_survive_regardless_of_pixel_content() {for src in [+ "data:image/svg+xml,%3Csvg%20xmlns='http://www.w3.org/2000/svg'%20viewBox='0%200%20720%20960'%3E%3C/svg%3E",+ "data:image/svg+xml,%3Csvg%20style='background:red'%20width='32'%20height='32'/%3E",+ "data:image/gif;base64,R0lGODlhAQABAIAAAAAAAAAAACH5BAEAAAAALAAAAAABAAEAAAICRAEAOw==","data:image/gif;base64,R0lGODdhAQABAIEAAP8AAAAAAAAAAAAAACwAAAAAAQABAAAIBAABBAQAOw==",- "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR4nGP4z8DwHwAFAAH/iZk9HQAAAABJRU5ErkJggg==",+ "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR4nGNgYGBgAAAABQABpfZFQAAAAABJRU5ErkJggg==",] {- let html = format!("<img alt='Red status pixel' src=\"{src}\">");+ let html = format!("<img alt='Status image' src=\"{src}\">");assert!(markdown(&html, false).contains(src), "{src}");+ let responsive = format!("<picture><source srcset='/status-2x.png 2x'>{html}</picture>");+ assert!(markdown(&responsive, false).contains(src), "{responsive}");}-- let html = format!(- "<img alt='Product' src=\"{}\" srcset='/product.png 2x'>",- transparent_gif- );- assert!(markdown(&html, false).contains(transparent_gif));- let html = format!(- "<picture><source srcset='/product.png 2x'><img alt='Product' src=\"{}\"></picture>",- transparent_gif- );- assert!(markdown(&html, false).contains(transparent_gif));-- use base64::Engine as _;- let mut wide = base64::engine::general_purpose::STANDARD- .decode(transparent_gif.split_once(',').unwrap().1)- .unwrap();- wide[6] = 2;- let wide = format!(- "data:image/gif;base64,{}",- base64::engine::general_purpose::STANDARD.encode(wide)- );- let html = format!("<img alt='Wide image' src=\"{wide}\">");- assert!(markdown(&html, false).contains(&wide));}#[test]