@mcpcn/mcp-image-compressor 1.0.3 → 1.0.5

package/dist/index.js

@@ -146,7 +146,9 @@ function generateOutputPath(inputPath, outputPath, suffix, format) {
     const newName = `${parsedPath.name}${suffix}${newExt}`;
     if (outputPath) {
         // 确保输出目录存在
-        fs.mkdirSync(outputPath, { recursive: true });
+        if (!fs.existsSync(outputPath)) {
+            fs.mkdirSync(outputPath, { recursive: true });
+        }
         return path.join(outputPath, newName);
     }
     return path.join(parsedPath.dir, newName);
@@ -161,29 +163,45 @@ async function compressToSize(inputPaths, targetSize, overwrite = false, outputP
     const errors = [];
     for (const imagePath of images) {
         try {
-            const outputFilePath = overwrite
+            let outputFilePath = overwrite
                 ? imagePath
                 : generateOutputPath(imagePath, outputPath, `_${targetSize.toLowerCase()}`);
-            const image = sharp.default(imagePath);
-            const metadata = await image.metadata();
             const stats = fs.statSync(imagePath);
-            if (stats.size <= targetBytes) {
+            const originalSize = stats.size;
+            if (originalSize <= targetBytes) {
                 if (!overwrite) {
                     await fs.promises.copyFile(imagePath, outputFilePath);
                 }
                 results.push(outputFilePath);
                 continue;
             }
+            const ext = path.extname(imagePath).toLowerCase().slice(1);
+            const encodeWithQuality = async (q) => {
+                const img = sharp.default(imagePath);
+                if (ext === "jpg" || ext === "jpeg") {
+                    return img.jpeg({ quality: q, mozjpeg: true }).toBuffer();
+                }
+                if (ext === "png") {
+                    const clamped = Math.max(1, Math.min(q, 100));
+                    return img.png({ quality: clamped, compressionLevel: 9, palette: true }).toBuffer();
+                }
+                if (ext === "webp") {
+                    return img.webp({ quality: q }).toBuffer();
+                }
+                if (ext === "avif") {
+                    return img.avif({ quality: q }).toBuffer();
+                }
+                // 其他统一转jpeg
+                return img.jpeg({ quality: q, mozjpeg: true }).toBuffer();
+            };
             // 使用二分查找找到合适的质量值
-            let left = 1;
-            let right = 100;
-            let bestQuality = 100;
+            let left = 5;
+            let right = 95;
             let bestBuffer = null;
             while (left <= right) {
                 const quality = Math.floor((left + right) / 2);
-                const buffer = await image.jpeg({ quality }).toBuffer();
+                const buffer = await encodeWithQuality(quality);
                 if (buffer.length <= targetBytes) {
-                    bestQuality = quality;
                     bestBuffer = buffer;
                     left = quality + 1;
                 }
@@ -191,13 +209,61 @@ async function compressToSize(inputPaths, targetSize, overwrite = false, outputP
                     right = quality - 1;
                 }
             }
-            if (bestBuffer) {
-                await fs.promises.writeFile(outputFilePath, bestBuffer);
-                results.push(outputFilePath);
-            }
-            else {
-                throw new Error("Could not achieve target size while maintaining acceptable quality");
+            let outputBuffer = bestBuffer;
+            let outputExt = path.extname(outputFilePath).toLowerCase();
+            if (!outputBuffer) {
+                const fallback = await encodeWithQuality(Math.max(10, right));
+                if (fallback.length < originalSize) {
+                    outputBuffer = fallback;
+                }
+                else {
+                    // PNG等难以降体积时，尝试有损WebP再二分
+                    const tryWebp = async () => {
+                        let l = 5, r = 95;
+                        let buf = null;
+                        while (l <= r) {
+                            const q = Math.floor((l + r) / 2);
+                            const b = await sharp.default(imagePath).webp({ quality: q }).toBuffer();
+                            if (b.length <= targetBytes) {
+                                buf = b;
+                                l = q + 1;
+                            }
+                            else {
+                                r = q - 1;
+                            }
+                        }
+                        // 兜底：若仍未达到，但比原图小，也接受
+                        if (!buf) {
+                            const b = await sharp.default(imagePath).webp({ quality: Math.max(10, r) }).toBuffer();
+                            if (b.length < originalSize)
+                                return b;
+                        }
+                        return buf;
+                    };
+                    const webpBuf = await tryWebp();
+                    if (webpBuf) {
+                        outputBuffer = webpBuf;
+                        // 将输出后缀改为 .webp
+                        if (!overwrite) {
+                            const parsed = path.parse(outputFilePath);
+                            outputFilePath = path.join(parsed.dir, `${parsed.name}.webp`);
+                            outputExt = '.webp';
+                        }
+                        else {
+                            outputExt = '.webp';
+                        }
+                    }
+                    else {
+                        if (!overwrite) {
+                            await fs.promises.copyFile(imagePath, outputFilePath);
+                        }
+                        results.push(outputFilePath);
+                        continue;
+                    }
+                }
             }
+            await fs.promises.writeFile(outputFilePath, outputBuffer);
+            results.push(outputFilePath);
         }
         catch (error) {
             const errorMsg = `Error compressing ${imagePath}: ${error instanceof Error ? error.message : String(error)}`;
@@ -221,19 +287,40 @@ async function compressToPercent(inputPaths, percent, overwrite = false, outputP
                 ? imagePath
                 : generateOutputPath(imagePath, outputPath, `_${targetPercent}%`);
             const stats = fs.statSync(imagePath);
-            const targetBytes = Math.floor(stats.size * (targetPercent / 100));
-            const image = sharp.default(imagePath);
-            const metadata = await image.metadata();
-            // 使用二分查找找到合适的质量值
-            let left = 1;
-            let right = 100;
-            let bestQuality = 100;
+            const originalSize = stats.size;
+            if (targetPercent >= 100) {
+                if (!overwrite) {
+                    await fs.promises.copyFile(imagePath, outputFilePath);
+                }
+                results.push(outputFilePath);
+                continue;
+            }
+            const targetBytes = Math.floor(originalSize * (targetPercent / 100));
+            const ext = path.extname(imagePath).toLowerCase().slice(1);
+            const encodeWithQuality = async (q) => {
+                const img = sharp.default(imagePath);
+                if (ext === "jpg" || ext === "jpeg") {
+                    return img.jpeg({ quality: q, mozjpeg: true }).toBuffer();
+                }
+                if (ext === "png") {
+                    const clamped = Math.max(1, Math.min(q, 100));
+                    return img.png({ quality: clamped, compressionLevel: 9, palette: true }).toBuffer();
+                }
+                if (ext === "webp") {
+                    return img.webp({ quality: q }).toBuffer();
+                }
+                if (ext === "avif") {
+                    return img.avif({ quality: q }).toBuffer();
+                }
+                return img.jpeg({ quality: q, mozjpeg: true }).toBuffer();
+            };
+            let left = 5;
+            let right = 95;
             let bestBuffer = null;
             while (left <= right) {
                 const quality = Math.floor((left + right) / 2);
-                const buffer = await image.jpeg({ quality }).toBuffer();
+                const buffer = await encodeWithQuality(quality);
                 if (buffer.length <= targetBytes) {
-                    bestQuality = quality;
                     bestBuffer = buffer;
                     left = quality + 1;
                 }
@@ -241,13 +328,22 @@ async function compressToPercent(inputPaths, percent, overwrite = false, outputP
                     right = quality - 1;
                 }
             }
-            if (bestBuffer) {
-                await fs.promises.writeFile(outputFilePath, bestBuffer);
-                results.push(outputFilePath);
-            }
-            else {
-                throw new Error("Could not achieve target size while maintaining acceptable quality");
+            let outputBuffer = bestBuffer;
+            if (!outputBuffer) {
+                const fallback = await encodeWithQuality(Math.max(10, right));
+                if (fallback.length < originalSize) {
+                    outputBuffer = fallback;
+                }
+                else {
+                    if (!overwrite) {
+                        await fs.promises.copyFile(imagePath, outputFilePath);
+                    }
+                    results.push(outputFilePath);
+                    continue;
+                }
             }
+            await fs.promises.writeFile(outputFilePath, outputBuffer);
+            results.push(outputFilePath);
         }
         catch (error) {
             const errorMsg = `Error compressing ${imagePath}: ${error instanceof Error ? error.message : String(error)}`;

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@mcpcn/mcp-image-compressor",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "description": "MCP server for image compression",
   "main": "dist/index.js",
   "scripts": {
-    "build": "tsc && chmod +x dist/index.js",
+    "build": "tsc",
     "start": "node dist/index.js",
     "dev": "ts-node index.ts",
     "serve": "node dist/index.js"