zone5 1.6.3 → 1.6.5

package/dist/processor/index.js

@@ -1,7 +1,6 @@
 import { SpanStatusCode, trace } from '@opentelemetry/api';
 import { writeFile } from 'fs/promises';
 import { join, parse, relative } from 'path';
-import sharp from 'sharp';
 import { generateBlurhash } from './blurhash.js';
 import { getDominantColors } from './color.js';
 import { configHash, ProcessorConfigSchema } from './config.js';
@@ -30,12 +29,12 @@ const processor = async (options) => {
                 'zone5.forceOverwrite': forceOverwrite,
             });
             if (!(await fileExists(featureFile)) || clear || forceOverwrite) {
-                const [exifFeature, blurhash, averageColor, variants, metadata] = await Promise.all([
+                // Note: generateImageVariants returns source dimensions to avoid redundant metadata reads
+                const [exifFeature, blurhash, averageColor, variantsResult] = await Promise.all([
                     exifFromFilePath(sourceFile),
                     generateBlurhash(sourceFile),
                     getDominantColors(sourceFile),
                     generateImageVariants({ sourceFile, processor: processorConfig, cacheDir, clear, forceOverwrite }),
-                    sharp(sourceFile).metadata(),
                 ]);
                 // Strip GPS data if configured (for privacy)
                 const geometry = processorConfig.strip_gps ? null : exifFeature.geometry;
@@ -45,17 +44,17 @@ const processor = async (options) => {
                     id: sourceHash,
                     properties: {
                         ...exifFeature.properties,
-                        aspectRatio: metadata.width / metadata.height,
+                        aspectRatio: variantsResult.sourceWidth / variantsResult.sourceHeight,
                         blurhash,
                         averageColor,
                     },
-                    assets: variants.map((variant) => ({
+                    assets: variantsResult.variants.map((variant) => ({
                         href: relative(base.cache, variant.path),
                         width: variant.width,
                     })),
                 };
                 await writeFile(featureFile, JSON.stringify(feature));
-                span.setAttribute('zone5.variantsCount', variants.length);
+                span.setAttribute('zone5.variantsCount', variantsResult.variants.length);
             }
             else {
                 span.setAttribute('zone5.cached', true);

package/dist/processor/variants.d.ts

@@ -3,10 +3,15 @@ export interface GeneratedVariant {
     width: number;
     path: string;
 }
+export interface VariantsResult {
+    variants: GeneratedVariant[];
+    sourceWidth: number;
+    sourceHeight: number;
+}
 export declare function generateImageVariants(options: {
     processor: ProcessorConfigInput;
     sourceFile: string;
     cacheDir: string;
     clear?: boolean;
     forceOverwrite?: boolean;
-}): Promise<GeneratedVariant[]>;
+}): Promise<VariantsResult>;

package/dist/processor/variants.js

@@ -18,9 +18,9 @@ export async function generateImageVariants(options) {
             const processor = ProcessorConfigSchema.parse(processorInput);
             // Parse file path components
             const { name: fileBasename, ext: fileExtension } = parse(sourceFile);
-            // Get source image metadata to check dimensions
+            // Get source image metadata to check dimensions (returned to caller to avoid redundant reads)
             const sourceImage = sharp(sourceFile);
-            const { width: sourceWidth } = await sourceImage.metadata();
+            const { width: sourceWidth, height: sourceHeight } = await sourceImage.metadata();
             // Filter out widths that would be wider than the source image
             const validWidths = processor.variants.filter((width) => width <= sourceWidth);
             span.setAttributes({
@@ -36,14 +36,13 @@ export async function generateImageVariants(options) {
                 await rm(cacheDir, { recursive: true, force: true });
             }
             await ensureDirectoryExists(cacheDir);
-            // Generate variants for each valid width
-            const variants = [];
-            let generatedCount = 0;
-            for (const width of validWidths) {
+            // Generate variants for each valid width in parallel
+            const variantResults = await Promise.all(validWidths.map(async (width) => {
                 const variantFilename = `${fileBasename}-${width}${fileExtension}`;
                 const variantPath = join(cacheDir, variantFilename);
                 // Check if variant already exists and should be overwritten
                 const variantExists = await fileExists(variantPath);
+                let wasGenerated = false;
                 if (!variantExists || forceOverwrite) {
                     let img = sharp(sourceFile);
                     if (processor.resize_gamma) {
@@ -59,19 +58,21 @@ export async function generateImageVariants(options) {
                         img = await addDebugText(img, width, Math.ceil(h * scale));
                     }
                     await img.toFile(variantPath);
-                    generatedCount++;
+                    wasGenerated = true;
                 }
-                variants.push({
-                    width,
-                    path: variantPath,
-                });
-            }
+                return {
+                    variant: { width, path: variantPath },
+                    wasGenerated,
+                };
+            }));
+            const variants = variantResults.map((r) => r.variant);
+            const generatedCount = variantResults.filter((r) => r.wasGenerated).length;
             span.setAttributes({
                 'zone5.variantsGenerated': generatedCount,
                 'zone5.variantsTotal': variants.length,
             });
             span.setStatus({ code: SpanStatusCode.OK });
-            return variants;
+            return { variants, sourceWidth, sourceHeight };
         }
         catch (error) {
             span.setStatus({

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "zone5",
-	"version": "1.6.3",
+	"version": "1.6.5",
 	"repository": {
 		"url": "https://github.com/cwygoda/zone5"
 	},