@zhaoshijun/compress 1.2.1 → 1.2.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhaoshijun/compress",
-  "version": "1.2.1",
+  "version": "1.2.3",
   "description": "Image compression CLI and Vite plugin",
   "type": "module",
   "bin": {

package/src/core/watermark.js

@@ -204,77 +204,81 @@ export async function addImageWatermark(sharpInstance, options) {
     throw new Error(`Watermark image not found: ${watermarkPath}`);
   }
   
-  const watermarkBuffer = await fs.readFile(watermarkPath);
-  let watermarkImage = sharp(watermarkBuffer);
-  const watermarkMeta = await watermarkImage.metadata();
-  
-  if (width || height) {
-    watermarkImage = watermarkImage.resize({
-      width: width || undefined,
-      height: height || undefined,
-      fit: 'inside'
-    });
-  }
-  
-  if (opacity < 1) {
-    const watermarkBuffer = await watermarkImage.toBuffer();
-    watermarkImage = sharp(watermarkBuffer).ensureAlpha();
-    const { data } = await watermarkImage.raw().toBuffer({ resolveWithObject: true });
+  try {
+    const watermarkBuffer = await fs.readFile(watermarkPath);
+    let watermarkImage = sharp(watermarkBuffer);
+    const watermarkMeta = await watermarkImage.metadata();
     
-    for (let i = 3; i < data.length; i += 4) {
-      data[i] = Math.floor(data[i] * opacity);
+    if (width || height) {
+      watermarkImage = watermarkImage.resize({
+        width: width || undefined,
+        height: height || undefined,
+        fit: 'inside'
+      });
     }
     
-    watermarkImage = sharp(data, {
-      raw: {
-        width: watermarkMeta.width,
-        height: watermarkMeta.height,
-        channels: 4
+    if (opacity < 1) {
+      const tempBuffer = await watermarkImage.toBuffer();
+      const tempSharp = sharp(tempBuffer);
+      const { data, info } = await tempSharp.ensureAlpha().raw().toBuffer({ resolveWithObject: true });
+      
+      for (let i = 3; i < data.length; i += 4) {
+        data[i] = Math.floor(data[i] * opacity);
+      }
+      
+      watermarkImage = sharp(data, {
+        raw: {
+          width: info.width,
+          height: info.height,
+          channels: 4
+        }
+      });
+    }
+    
+    const finalWatermarkBuffer = await watermarkImage.toBuffer();
+    const finalWatermarkMeta = await sharp(finalWatermarkBuffer).metadata();
+    
+    let compositeX = x;
+    let compositeY = y;
+    
+    if (position !== 'custom') {
+      switch (position) {
+        case 'top-left':
+          compositeX = padding;
+          compositeY = padding;
+          break;
+        case 'top-right':
+          compositeX = targetMetadata.width - finalWatermarkMeta.width - padding;
+          compositeY = padding;
+          break;
+        case 'bottom-left':
+          compositeX = padding;
+          compositeY = targetMetadata.height - finalWatermarkMeta.height - padding;
+          break;
+        case 'bottom-right':
+          compositeX = targetMetadata.width - finalWatermarkMeta.width - padding;
+          compositeY = targetMetadata.height - finalWatermarkMeta.height - padding;
+          break;
+        case 'center':
+          compositeX = Math.floor((targetMetadata.width - finalWatermarkMeta.width) / 2);
+          compositeY = Math.floor((targetMetadata.height - finalWatermarkMeta.height) / 2);
+          break;
       }
-    });
-  }
-  
-  const watermarkBuffer = await watermarkImage.toBuffer();
-  const finalWatermarkMeta = await sharp(watermarkBuffer).metadata();
-  
-  let compositeX = x;
-  let compositeY = y;
-  
-  if (position !== 'custom') {
-    switch (position) {
-      case 'top-left':
-        compositeX = padding;
-        compositeY = padding;
-        break;
-      case 'top-right':
-        compositeX = targetMetadata.width - finalWatermarkMeta.width - padding;
-        compositeY = padding;
-        break;
-      case 'bottom-left':
-        compositeX = padding;
-        compositeY = targetMetadata.height - finalWatermarkMeta.height - padding;
-        break;
-      case 'bottom-right':
-        compositeX = targetMetadata.width - finalWatermarkMeta.width - padding;
-        compositeY = targetMetadata.height - finalWatermarkMeta.height - padding;
-        break;
-      case 'center':
-        compositeX = Math.floor((targetMetadata.width - finalWatermarkMeta.width) / 2);
-        compositeY = Math.floor((targetMetadata.height - finalWatermarkMeta.height) / 2);
-        break;
     }
+    
+    const result = await sharpInstance
+      .composite([{ 
+        input: finalWatermarkBuffer, 
+        left: compositeX, 
+        top: compositeY,
+        blend: 'over'
+      }])
+      .toBuffer();
+    
+    return result;
+  } catch (error) {
+    throw new Error(`Failed to load watermark image: ${error.message}`);
   }
-  
-  const result = await sharpInstance
-    .composite([{ 
-      input: watermarkBuffer, 
-      left: compositeX, 
-      top: compositeY,
-      blend: 'over'
-    }])
-    .toBuffer();
-  
-  return result;
 }
 
 /**
@@ -335,9 +339,9 @@ export async function addTiledImageWatermark(sharpInstance, options, providedMet
   }
   
   if (opacity < 1) {
-    const watermarkBuffer = await watermarkImage.toBuffer();
-    watermarkImage = sharp(watermarkBuffer).ensureAlpha();
-    const { data, info } = await watermarkImage.raw().toBuffer({ resolveWithObject: true });
+    const tempBuffer = await watermarkImage.toBuffer();
+    const tempSharp = sharp(tempBuffer);
+    const { data, info } = await tempSharp.ensureAlpha().raw().toBuffer({ resolveWithObject: true });
     
     for (let i = 3; i < data.length; i += 4) {
       data[i] = Math.floor(data[i] * opacity);
@@ -353,21 +357,21 @@ export async function addTiledImageWatermark(sharpInstance, options, providedMet
   }
   
   if (angle !== 0) {
-    const watermarkBuffer = await watermarkImage.toBuffer();
-    const rotatedMeta = await sharp(watermarkBuffer).metadata();
+    const rotatedBuffer = await watermarkImage.toBuffer();
+    const rotatedMeta = await sharp(rotatedBuffer).metadata();
     const radians = angle * Math.PI / 180;
     const cos = Math.abs(Math.cos(radians));
     const sin = Math.abs(Math.sin(radians));
     const newWidth = Math.ceil(rotatedMeta.width * cos + rotatedMeta.height * sin);
     const newHeight = Math.ceil(rotatedMeta.width * sin + rotatedMeta.height * cos);
     
-    watermarkImage = sharp(watermarkBuffer).rotate(angle, {
+    watermarkImage = sharp(rotatedBuffer).rotate(angle, {
       background: { r: 0, g: 0, b: 0, alpha: 0 }
     }).resize(newWidth, newHeight);
   }
   
-  const watermarkBuffer = await watermarkImage.toBuffer();
-  const finalWatermarkMeta = await sharp(watermarkBuffer).metadata();
+  const finalWatermarkBuffer = await watermarkImage.toBuffer();
+  const finalWatermarkMeta = await sharp(finalWatermarkBuffer).metadata();
   
   const cols = Math.ceil(metadata.width / spacingX) + 1;
   const rows = Math.ceil(metadata.height / spacingY) + 1;
@@ -376,7 +380,7 @@ export async function addTiledImageWatermark(sharpInstance, options, providedMet
   for (let row = 0; row < rows; row++) {
     for (let col = 0; col < cols; col++) {
       composites.push({
-        input: watermarkBuffer,
+        input: finalWatermarkBuffer,
         left: col * spacingX,
         top: row * spacingY
       });