dynimg 0.1.10__tar.gz → 0.1.11__tar.gz

{dynimg-0.1.10 → dynimg-0.1.11}/Cargo.lock

@@ -630,7 +630,7 @@ dependencies = [
 
 [[package]]
 name = "dynimg"
-version = "0.1.10"
+version = "0.1.11"
 dependencies = [
  "anyhow",
  "anyrender",

{dynimg-0.1.10 → dynimg-0.1.11}/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "dynimg"
-version = "0.1.10"
+version = "0.1.11"
 edition = "2024"
 description = "A fast library and CLI for rendering HTML/CSS to images"
 license = "MIT"

{dynimg-0.1.10 → dynimg-0.1.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dynimg
-Version: 0.1.10
+Version: 0.1.11
 Classifier: Development Status :: 4 - Beta
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License

{dynimg-0.1.10 → dynimg-0.1.11}/examples/google-fonts.html

@@ -62,7 +62,7 @@
             <h1>Google Fonts Example</h1>
             <p>
                 This example attempts to use
-                <span class="highlight">Playfair Display</span> and
+                <span class="highlight">Playwrite IN Guides</span> and
                 <span class="highlight">Inter</span> from Google Fonts.
             </p>
             <div class="note">

{dynimg-0.1.10 → dynimg-0.1.11}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "maturin"
 
 [project]
 name = "dynimg"
-version = "0.1.10"
+version = "0.1.11"
 description = "A fast library for rendering HTML/CSS to images"
 readme = "README.md"
 license = { text = "MIT" }

{dynimg-0.1.10 → dynimg-0.1.11}/scripts/render-examples.sh

@@ -71,6 +71,7 @@ echo ""
 echo "--- Mixed Assets (requires both flags) ---"
 run_test "Without flags" false "$DYNIMG" "$EXAMPLES_DIR/mixed-assets.html" -o "$OUTPUT_DIR/mixed-no-flags.png"
 run_test "With --allow-net only" false "$DYNIMG" "$EXAMPLES_DIR/mixed-assets.html" -o "$OUTPUT_DIR/mixed-net-only.png" --allow-net
+run_test "With --allow-net only" false "$DYNIMG" "$EXAMPLES_DIR/mixed-assets.html" -o "$OUTPUT_DIR/mixed-net-only.webp" --allow-net
 run_test "With --assets only" false "$DYNIMG" "$EXAMPLES_DIR/mixed-assets.html" -o "$OUTPUT_DIR/mixed-assets-only.png" --assets "$ASSETS_DIR"
 run_test "With both flags" false "$DYNIMG" "$EXAMPLES_DIR/mixed-assets.html" -o "$OUTPUT_DIR/mixed-both-flags.png" --allow-net --assets "$ASSETS_DIR"
 run_test "With both flags" false "$DYNIMG" "$EXAMPLES_DIR/google-fonts.html" -o "$OUTPUT_DIR/google-fonts.png" --allow-net --assets "$ASSETS_DIR"
@@ -78,6 +79,7 @@ run_test "With both flags" false "$DYNIMG" "$EXAMPLES_DIR/google-fonts.html" -o
 echo ""
 echo "--- OG Image Templates ---"
 run_test "og-image.html" false "$DYNIMG" "$EXAMPLES_DIR/og-image.html" -o "$OUTPUT_DIR/og-image.png"
+run_test "og-image.html" false "$DYNIMG" "$EXAMPLES_DIR/og-image.html" -o "$OUTPUT_DIR/og-image.webp"
 run_test "social-card.html" false "$DYNIMG" "$EXAMPLES_DIR/social-card.html" -o "$OUTPUT_DIR/social-card.png"
 run_test "quote.html" false "$DYNIMG" "$EXAMPLES_DIR/quote.html" -o "$OUTPUT_DIR/quote.png"
 

{dynimg-0.1.10 → dynimg-0.1.11}/src/lib.rs

@@ -451,18 +451,22 @@ async fn render_document(
 ) -> Result<RenderedImage, Error> {
     // Resolve resource requests
     if let Some(p) = provider {
-        loop {
+        // Wait for all network requests including cascading requests.
+        // CSS stylesheets may trigger font fetches when processed, so we need
+        // multiple consecutive "empty" checks to ensure all cascading requests complete.
+        // Using 5 cycles provides safety margin for complex pages with many resources.
+        let mut consecutive_empty = 0u32;
+        const REQUIRED_EMPTY_CYCLES: u32 = 5;
+
+        while consecutive_empty < REQUIRED_EMPTY_CYCLES {
             document.resolve(0.0);
-            if p.is_empty() {
-                break;
-            }
             tokio::time::sleep(std::time::Duration::from_millis(1)).await;
-        }
 
-        // Extra resolve cycles for font registration
-        for _ in 0..3 {
-            tokio::time::sleep(std::time::Duration::from_millis(5)).await;
-            document.resolve(0.0);
+            if p.is_empty() {
+                consecutive_empty += 1;
+            } else {
+                consecutive_empty = 0;
+            }
         }
     }
 
@@ -521,11 +525,13 @@ fn write_png(path: &Path, buffer: &[u8], width: u32, height: u32) -> Result<(),
 fn encode_png(buffer: &[u8], width: u32, height: u32) -> Result<Vec<u8>, Error> {
     const PPM: u32 = (144.0 * 39.3701) as u32;
 
-    let mut output = Vec::new();
+    // Pre-allocate output (PNG is typically 10-50% of raw size after compression)
+    let mut output = Vec::with_capacity(buffer.len() / 4);
     {
         let mut encoder = png::Encoder::new(&mut output, width, height);
         encoder.set_color(png::ColorType::Rgba);
         encoder.set_depth(png::BitDepth::Eight);
+        encoder.set_compression(png::Compression::Fast);
         encoder.set_pixel_dims(Some(png::PixelDimensions {
             xppu: PPM,
             yppu: PPM,
@@ -552,14 +558,19 @@ fn write_jpeg(
 }
 
 fn encode_jpeg(buffer: &[u8], width: u32, height: u32, quality: u8) -> Result<Vec<u8>, Error> {
-    let rgb_buffer: Vec<u8> = buffer
-        .chunks(4)
-        .flat_map(|rgba| [rgba[0], rgba[1], rgba[2]])
-        .collect();
+    // Pre-allocate RGB buffer (3 bytes per pixel instead of 4)
+    let pixel_count = (width * height) as usize;
+    let mut rgb_buffer = Vec::with_capacity(pixel_count * 3);
+
+    // Convert RGBA to RGB in-place
+    for chunk in buffer.chunks_exact(4) {
+        rgb_buffer.extend_from_slice(&chunk[..3]);
+    }
 
     let img = image::RgbImage::from_raw(width, height, rgb_buffer).ok_or(Error::InvalidBuffer)?;
 
-    let mut output = Vec::new();
+    // Pre-allocate output (estimate ~10% of raw size for compressed JPEG)
+    let mut output = Vec::with_capacity(pixel_count / 10);
     let mut encoder = image::codecs::jpeg::JpegEncoder::new_with_quality(&mut output, quality);
     encoder.encode_image(&img)?;