@zhaoshijun/compress 1.4.3 → 1.5.0

package/bin/compress.js

@@ -387,6 +387,32 @@ ${chalk.bold('💧 使用示例:')}
         process.exit(1);
       }
       
+      // 验证数值参数范围
+      const validations = [
+        { value: config.watermark.opacity, name: '--watermark-opacity', min: 0, max: 1 },
+        { value: config.watermark.density, name: '--watermark-density', min: 1, max: 10 },
+        { value: config.watermark.fontSize, name: '--watermark-font-size', min: 8, max: 200 },
+        { value: config.watermark.width, name: '--watermark-width', min: 1 },
+        { value: config.watermark.height, name: '--watermark-height', min: 1 },
+        { value: config.watermark.padding, name: '--watermark-padding', min: 0 },
+        { value: config.watermark.angle, name: '--watermark-angle', min: -180, max: 180 },
+        { value: config.watermark.spacingX, name: '--watermark-spacing-x', min: 1 },
+        { value: config.watermark.spacingY, name: '--watermark-spacing-y', min: 1 }
+      ];
+      
+      for (const validation of validations) {
+        if (validation.value !== undefined && validation.value !== null) {
+          if (validation.min !== undefined && validation.value < validation.min) {
+            console.error(chalk.red(`Error: ${validation.name} must be >= ${validation.min}, got ${validation.value}`));
+            process.exit(1);
+          }
+          if (validation.max !== undefined && validation.value > validation.max) {
+            console.error(chalk.red(`Error: ${validation.name} must be <= ${validation.max}, got ${validation.value}`));
+            process.exit(1);
+          }
+        }
+      }
+      
       // 确定输入源
       const inputPattern = config.input || ['**/*.{jpg,jpeg,png,webp}'];
       const ignorePattern = [...DEFAULT_EXCLUDES];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhaoshijun/compress",
-  "version": "1.4.3",
+  "version": "1.5.0",
   "description": "Image compression CLI and Vite plugin",
   "type": "module",
   "bin": {
@@ -12,7 +12,9 @@
     "./vite": "./vite/index.js"
   },
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "test": "vitest run",
+    "test:watch": "vitest",
+    "test:coverage": "vitest run --coverage"
   },
   "dependencies": {
     "chalk": "^5.3.0",
@@ -37,6 +39,7 @@
     "node": ">=18.0.0"
   },
   "devDependencies": {
-    "vite": "^7.3.1"
+    "vite": "^7.3.1",
+    "vitest": "^4.1.2"
   }
 }

package/src/config/defaults.js

@@ -1,6 +1,5 @@
 export const defaultConfig = {
   output: './compressed',
-  quality: 88,
   keepMetadata: false,
   jpegOptions: {
     quality: 88,

package/src/core/compressor.js

@@ -2,6 +2,23 @@ import sharp from 'sharp';
 import path from 'path';
 import { addWatermark, addImageWatermark, addTiledImageWatermark } from './watermark.js';
 
+export function getWatermarkMode(watermarkConfig) {
+  if (!watermarkConfig) return null;
+  
+  const mode = watermarkConfig.mode || 'text';
+  
+  if (mode === 'text' && watermarkConfig.text?.trim()) return 'text';
+  if (mode === 'image' && watermarkConfig.imagePath) return 'image';
+  if (mode === 'tiled' && watermarkConfig.imagePath) return 'tiled';
+  
+  if (watermarkConfig.text?.trim()) return 'text';
+  if (watermarkConfig.imagePath) {
+    return watermarkConfig.mode === 'tiled' ? 'tiled' : 'image';
+  }
+  
+  return null;
+}
+
 /**
  * 只添加水印（不压缩）
  * @param {string|Buffer} input - 图片路径或 Buffer
@@ -15,22 +32,16 @@ export async function addWatermarkOnly(input, options, filePath) {
   const metadata = await instance.metadata();
   
   // 添加水印
-  if (options.watermark) {
-    // 文本水印
-    if (options.watermark.mode === 'text' || (options.watermark.text && options.watermark.text.trim() !== '')) {
-      const watermarkedBuffer = await addWatermark(instance, options.watermark, metadata);
-      instance = sharp(watermarkedBuffer);
-    }
-    // 单个图片水印
-    else if (options.watermark.mode === 'image' || (options.watermark.imagePath && options.watermark.mode !== 'tiled')) {
-      const watermarkedBuffer = await addImageWatermark(instance, options.watermark);
-      instance = sharp(watermarkedBuffer);
-    }
-    // 平铺图片水印
-    else if (options.watermark.mode === 'tiled' || (options.watermark.imagePath && options.watermark.mode === 'tiled')) {
-      const watermarkedBuffer = await addTiledImageWatermark(instance, options.watermark, metadata);
-      instance = sharp(watermarkedBuffer);
-    }
+  const watermarkMode = getWatermarkMode(options.watermark);
+  if (watermarkMode === 'text') {
+    const watermarkedBuffer = await addWatermark(instance, options.watermark, metadata);
+    instance = sharp(watermarkedBuffer);
+  } else if (watermarkMode === 'image') {
+    const watermarkedBuffer = await addImageWatermark(instance, options.watermark);
+    instance = sharp(watermarkedBuffer);
+  } else if (watermarkMode === 'tiled') {
+    const watermarkedBuffer = await addTiledImageWatermark(instance, options.watermark, metadata);
+    instance = sharp(watermarkedBuffer);
   }
   
   // 保持原始格式，不进行压缩
@@ -89,22 +100,16 @@ export async function compressImage(input, options, filePath) {
   const format = resizedMetadata.format;
   
   // 先添加水印（如果需要）
-  if (options.watermark) {
-    // 文本水印
-    if (options.watermark.text && options.watermark.text.trim() !== '') {
-      const watermarkedBuffer = await addWatermark(instance, options.watermark, resizedMetadata);
-      instance = sharp(watermarkedBuffer);
-    }
-    // 单个图片水印
-    else if (options.watermark.imagePath && options.watermark.mode !== 'tiled') {
-      const watermarkedBuffer = await addImageWatermark(instance, options.watermark);
-      instance = sharp(watermarkedBuffer);
-    }
-    // 平铺图片水印
-    else if (options.watermark.imagePath && options.watermark.mode === 'tiled') {
-      const watermarkedBuffer = await addTiledImageWatermark(instance, options.watermark, resizedMetadata);
-      instance = sharp(watermarkedBuffer);
-    }
+  const watermarkMode = getWatermarkMode(options.watermark);
+  if (watermarkMode === 'text') {
+    const watermarkedBuffer = await addWatermark(instance, options.watermark, resizedMetadata);
+    instance = sharp(watermarkedBuffer);
+  } else if (watermarkMode === 'image') {
+    const watermarkedBuffer = await addImageWatermark(instance, options.watermark);
+    instance = sharp(watermarkedBuffer);
+  } else if (watermarkMode === 'tiled') {
+    const watermarkedBuffer = await addTiledImageWatermark(instance, options.watermark, resizedMetadata);
+    instance = sharp(watermarkedBuffer);
   }
 
   // 再进行压缩
@@ -120,11 +125,7 @@ export async function compressImage(input, options, filePath) {
       instance = instance.webp(options.webpOptions || { quality: 88 });
       break;
     default:
-      if (['jpeg', 'jpg', 'png', 'webp'].includes(format)) {
-          // fallthrough
-      } else {
-         throw new Error(`Unsupported format: ${format}`);
-      }
+      throw new Error(`Unsupported format: ${format}`);
   }
 
   // 如果需要保留元数据

package/src/core/watermark.js

@@ -2,6 +2,40 @@ import sharp from 'sharp';
 import path from 'path';
 import fs from 'fs-extra';
 
+/**
+ * 应用透明度到图片（优化版：使用 sharp 内置方法）
+ * @param {Sharp} watermarkImage - sharp 实例
+ * @param {number} opacity - 透明度 (0-1)
+ * @returns {Promise<Sharp>} 处理后的 sharp 实例
+ */
+async function applyOpacity(watermarkImage, opacity) {
+  if (opacity >= 1) return watermarkImage;
+  
+  try {
+    const buffer = await watermarkImage.ensureAlpha().png().toBuffer();
+    const { data, info } = await sharp(buffer).raw().toBuffer({ resolveWithObject: true });
+    
+    const channelCount = info.channels;
+    const alphaChannelIndex = channelCount - 1;
+    const length = data.length;
+    
+    for (let i = alphaChannelIndex; i < length; i += channelCount) {
+      data[i] = (data[i] * opacity + 0.5) | 0;
+    }
+    
+    return sharp(data, {
+      raw: {
+        width: info.width,
+        height: info.height,
+        channels: channelCount
+      }
+    });
+  } catch (error) {
+    console.warn('Failed to apply opacity, using original image:', error.message);
+    return watermarkImage;
+  }
+}
+
 /**
  * 创建单个水印文本的 SVG
  * @param {string} text - 水印文本
@@ -11,7 +45,7 @@ import fs from 'fs-extra';
  * @param {number} options.fontSize - 字体大小
  * @returns {string} SVG 字符串
  */
-function createWatermarkSVG(text, options) {
+export function createWatermarkSVG(text, options) {
   const { opacity, color, fontSize } = options;
   const rgbaColor = convertToRGBA(color, opacity);
   
@@ -37,7 +71,7 @@ function createWatermarkSVG(text, options) {
  * @param {number} opacity - 透明度
  * @returns {string} RGBA 颜色字符串
  */
-function convertToRGBA(color, opacity) {
+export function convertToRGBA(color, opacity) {
   if (color.startsWith('rgba')) {
     return color.replace(/[\d.]+\)$/, `${opacity})`);
   }
@@ -218,25 +252,7 @@ export async function addImageWatermark(sharpInstance, options) {
     }
     
     if (opacity < 1) {
-      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);
-      }
+      watermarkImage = await applyOpacity(watermarkImage, opacity);
     }
     
     const finalWatermarkBuffer = await watermarkImage.toBuffer();
@@ -343,25 +359,7 @@ export async function addTiledImageWatermark(sharpInstance, options, providedMet
   }
   
   if (opacity < 1) {
-    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);
-    }
+    watermarkImage = await applyOpacity(watermarkImage, opacity);
   }
   
   if (angle !== 0) {

package/src/utils/cache.js

@@ -4,7 +4,7 @@ import crypto from 'crypto';
 
 const CACHE_DIR = path.resolve('node_modules/.cache/@zhaoshijun/compress');
 
-export async function getCache(content, watermarkOptions, resizeOptions) {
+function generateCacheKey(content, watermarkOptions, resizeOptions) {
   const hash = crypto.createHash('sha256').update(content).digest('hex');
 
   let cacheKey = hash;
@@ -21,6 +21,11 @@ export async function getCache(content, watermarkOptions, resizeOptions) {
     cacheKey = `${cacheKey}-${resizeHash}`;
   }
 
+  return cacheKey;
+}
+
+export async function getCache(content, watermarkOptions, resizeOptions) {
+  const cacheKey = generateCacheKey(content, watermarkOptions, resizeOptions);
   const cachePath = path.join(CACHE_DIR, cacheKey);
   
   if (await fs.pathExists(cachePath)) {
@@ -30,22 +35,7 @@ export async function getCache(content, watermarkOptions, resizeOptions) {
 }
 
 export async function setCache(content, compressedContent, watermarkOptions, resizeOptions) {
-  const hash = crypto.createHash('sha256').update(content).digest('hex');
-
-  let cacheKey = hash;
-  if (watermarkOptions && watermarkOptions.text) {
-    const watermarkHash = crypto.createHash('sha256')
-      .update(JSON.stringify(watermarkOptions))
-      .digest('hex');
-    cacheKey = `${cacheKey}-${watermarkHash}`;
-  }
-  if (resizeOptions) {
-    const resizeHash = crypto.createHash('sha256')
-      .update(JSON.stringify(resizeOptions))
-      .digest('hex');
-    cacheKey = `${cacheKey}-${resizeHash}`;
-  }
-
+  const cacheKey = generateCacheKey(content, watermarkOptions, resizeOptions);
   const cachePath = path.join(CACHE_DIR, cacheKey);
   
   await fs.ensureDir(CACHE_DIR);