@zhaoshijun/compress 1.2.3 → 1.2.4

package/package.json

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

package/src/core/watermark.js

@@ -218,21 +218,25 @@ export async function addImageWatermark(sharpInstance, options) {
     }
     
     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
+      try {
+        const tempBuffer = await watermarkImage.ensureAlpha().png().toBuffer();
+        const tempSharp = sharp(tempBuffer);
+        const { data, info } = await tempSharp.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
+          }
+        });
+      } catch (error) {
+        console.warn('Failed to apply opacity, using original image:', error.message);
+      }
     }
     
     const finalWatermarkBuffer = await watermarkImage.toBuffer();
@@ -339,21 +343,25 @@ export async function addTiledImageWatermark(sharpInstance, options, providedMet
   }
   
   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
+    try {
+      const tempBuffer = await watermarkImage.ensureAlpha().png().toBuffer();
+      const tempSharp = sharp(tempBuffer);
+      const { data, info } = await tempSharp.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
+        }
+      });
+    } catch (error) {
+      console.warn('Failed to apply opacity, using original image:', error.message);
+    }
   }
   
   if (angle !== 0) {