@zhaoshijun/compress 1.2.0 → 1.2.2

package/package.json

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

package/src/core/watermark.js

@@ -204,7 +204,8 @@ export async function addImageWatermark(sharpInstance, options) {
     throw new Error(`Watermark image not found: ${watermarkPath}`);
   }
   
-  let watermarkImage = sharp(watermarkPath);
+  const watermarkBuffer = await fs.readFile(watermarkPath);
+  let watermarkImage = sharp(watermarkBuffer);
   const watermarkMeta = await watermarkImage.metadata();
   
   if (width || height) {
@@ -216,8 +217,8 @@ export async function addImageWatermark(sharpInstance, options) {
   }
   
   if (opacity < 1) {
-    const watermarkBuffer = await watermarkImage.toBuffer();
-    watermarkImage = sharp(watermarkBuffer).ensureAlpha();
+    const tempBuffer = await watermarkImage.toBuffer();
+    watermarkImage = sharp(tempBuffer).ensureAlpha();
     const { data } = await watermarkImage.raw().toBuffer({ resolveWithObject: true });
     
     for (let i = 3; i < data.length; i += 4) {
@@ -233,8 +234,8 @@ export async function addImageWatermark(sharpInstance, options) {
     });
   }
   
-  const watermarkBuffer = await watermarkImage.toBuffer();
-  const finalWatermarkMeta = await sharp(watermarkBuffer).metadata();
+  const finalWatermarkBuffer = await watermarkImage.toBuffer();
+  const finalWatermarkMeta = await sharp(finalWatermarkBuffer).metadata();
   
   let compositeX = x;
   let compositeY = y;
@@ -266,7 +267,7 @@ export async function addImageWatermark(sharpInstance, options) {
   
   const result = await sharpInstance
     .composite([{ 
-      input: watermarkBuffer, 
+      input: finalWatermarkBuffer, 
       left: compositeX, 
       top: compositeY,
       blend: 'over'
@@ -321,7 +322,8 @@ export async function addTiledImageWatermark(sharpInstance, options, providedMet
     throw new Error(`Watermark image not found: ${watermarkPath}`);
   }
   
-  let watermarkImage = sharp(watermarkPath);
+  const watermarkBuffer = await fs.readFile(watermarkPath);
+  let watermarkImage = sharp(watermarkBuffer);
   const watermarkMeta = await watermarkImage.metadata();
   
   if (width || height) {
@@ -333,8 +335,8 @@ export async function addTiledImageWatermark(sharpInstance, options, providedMet
   }
   
   if (opacity < 1) {
-    const watermarkBuffer = await watermarkImage.toBuffer();
-    watermarkImage = sharp(watermarkBuffer).ensureAlpha();
+    const tempBuffer = await watermarkImage.toBuffer();
+    watermarkImage = sharp(tempBuffer).ensureAlpha();
     const { data, info } = await watermarkImage.raw().toBuffer({ resolveWithObject: true });
     
     for (let i = 3; i < data.length; i += 4) {
@@ -351,21 +353,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;
@@ -374,7 +376,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
       });