@duoyun/md-img-pull 1.0.1 → 1.1.0

package/dist/main.cjs

@@ -30846,64 +30846,74 @@ var DownloadProgressManager = class {
 };
 var downloadProgress = new DownloadProgressManager();
 
-// utils/imageCompression.ts
-var SHARP_OPTIONS = {
-  animated: true,
-  limitInputPixels: false,
-  sequentialRead: true
-};
-var DynamicDots = class {
-  timer = null;
-  dots = "";
-  direction = 1;
-  // 1 = 增加, -1 = 减少
-  spinner;
-  baseText;
-  constructor(spinner, baseText) {
-    this.spinner = spinner;
-    this.baseText = baseText;
-  }
+// utils/compressionProgress.ts
+var CompressionProgressManager = class {
+  spinner = null;
+  activeCount = 0;
+  // 当前正在压缩的任务数
+  currentTask = "";
+  // 当前显示的任务信息
   /**
-   * 开始动画
-   * @param interval 更新间隔（毫秒），默认 300ms
+   * 开始一个压缩任务
+   * @param taskInfo 任务信息（如 "10.81MB → 转换为 WebP"）
+   * @returns 更新函数，用于更新当前任务的进度
    */
-  start(interval = 300) {
-    this.updateText();
-    this.timer = setInterval(() => {
-      if (this.direction === 1) {
-        this.dots += ".";
-        if (this.dots.length >= 3) this.direction = -1;
-      } else {
-        this.dots = this.dots.slice(0, -1);
-        if (this.dots.length <= 0) this.direction = 1;
+  start(taskInfo) {
+    this.activeCount++;
+    if (this.activeCount === 1) {
+      downloadProgress.pause();
+      this.currentTask = taskInfo;
+      this.spinner = ora({
+        text: `\u538B\u7F29\u4E2D: ${taskInfo}`,
+        spinner: "dots",
+        color: "yellow"
+      }).start();
+    }
+    const updateFn = (newInfo) => {
+      if (this.spinner && this.currentTask === taskInfo) {
+        this.currentTask = newInfo;
+        this.spinner.text = `\u538B\u7F29\u4E2D: ${newInfo}`;
       }
-      this.updateText();
-    }, interval);
-  }
-  /**
-   * 更新显示文字
-   */
-  updateText() {
-    const paddedDots = this.dots.padEnd(3, " ");
-    this.spinner.text = `${this.baseText}${paddedDots}`;
+    };
+    return updateFn;
   }
   /**
-   * 更新基础文字（不包含省略号）
+   * 完成一个压缩任务
+   * @param successMsg 成功消息
    */
-  setBaseText(text4) {
-    this.baseText = text4;
-    this.updateText();
+  complete(successMsg) {
+    this.activeCount--;
+    if (this.activeCount === 0 && this.spinner) {
+      this.spinner.succeed(successMsg);
+      this.spinner = null;
+      downloadProgress.resume();
+    }
   }
   /**
-   * 停止动画
+   * 压缩任务失败
+   * @param errorMsg 错误消息
    */
-  stop() {
-    if (this.timer) {
-      clearInterval(this.timer);
-      this.timer = null;
+  fail(errorMsg) {
+    this.activeCount--;
+    if (this.activeCount === 0 && this.spinner) {
+      this.spinner.fail(errorMsg);
+      this.spinner = null;
+      downloadProgress.resume();
     }
   }
 };
+var compressionProgress = new CompressionProgressManager();
+
+// utils/imageCompression.ts
+var SHARP_OPTIONS = {
+  animated: true,
+  limitInputPixels: false,
+  sequentialRead: true
+};
+async function convertToWebp(inputBuffer) {
+  const image2 = (0, import_sharp.default)(inputBuffer, SHARP_OPTIONS);
+  return await image2.webp({ quality: 80, effort: 6 }).toBuffer();
+}
 async function compressImage(inputBuffer) {
   const MAX_SIZE = 10 * 1024 * 1024;
   const image2 = (0, import_sharp.default)(inputBuffer, SHARP_OPTIONS);
@@ -30912,41 +30922,24 @@ async function compressImage(inputBuffer) {
     return inputBuffer;
   }
   const originalSize = (inputBuffer.length / 1024 / 1024).toFixed(2);
-  downloadProgress.pause();
-  const spinner = ora({
-    text: `\u538B\u7F29\u4E2D: ${originalSize}MB \u2192 \u8F6C\u6362\u4E3A WebP`,
-    spinner: "dots",
-    color: "yellow"
-  }).start();
-  const dynamicDots = new DynamicDots(
-    spinner,
-    `\u538B\u7F29\u4E2D: ${originalSize}MB \u2192 \u8F6C\u6362\u4E3A WebP`
-  );
-  dynamicDots.start(300);
+  const taskInfo = `${originalSize}MB \u2192 \u8F6C\u6362\u4E3A WebP`;
+  const updateProgress = compressionProgress.start(taskInfo);
   try {
     let currentBuffer = await image2.webp({ quality: 80, effort: 6 }).toBuffer();
     if (currentBuffer.length > MAX_SIZE) {
-      dynamicDots.setBaseText(
-        `\u538B\u7F29\u4E2D: ${originalSize}MB \u2192 \u7F29\u5C0F\u5206\u8FA8\u7387\u81F3 2560px`
-      );
+      updateProgress(`${originalSize}MB \u2192 \u7F29\u5C0F\u5206\u8FA8\u7387\u81F3 2560px`);
       currentBuffer = await (0, import_sharp.default)(inputBuffer, SHARP_OPTIONS).resize(2560, void 0, { withoutEnlargement: true }).webp({ quality: 75 }).toBuffer();
     }
     if (currentBuffer.length > MAX_SIZE) {
-      dynamicDots.setBaseText(
-        `\u538B\u7F29\u4E2D: ${originalSize}MB \u2192 \u6781\u9650\u538B\u7F29 (quality: 60)`
-      );
+      updateProgress(`${originalSize}MB \u2192 \u6781\u9650\u538B\u7F29 (quality: 60)`);
       currentBuffer = await (0, import_sharp.default)(currentBuffer, SHARP_OPTIONS).webp({ quality: 60 }).toBuffer();
     }
-    dynamicDots.stop();
     const finalSize = (currentBuffer.length / 1024 / 1024).toFixed(2);
-    spinner.succeed(`\u538B\u7F29\u5B8C\u6210: ${originalSize}MB \u2192 ${finalSize}MB`);
+    compressionProgress.complete(`\u538B\u7F29\u5B8C\u6210: ${originalSize}MB \u2192 ${finalSize}MB`);
     return currentBuffer;
   } catch (error2) {
-    dynamicDots.stop();
-    spinner.fail(`\u538B\u7F29\u5931\u8D25: ${error2}`);
+    compressionProgress.fail(`\u538B\u7F29\u5931\u8D25: ${error2}`);
     throw error2;
-  } finally {
-    downloadProgress.resume();
   }
 }
 
@@ -31124,7 +31117,8 @@ var mimeMap = {
   "image/jpeg": ".jpg",
   "image/png": ".png",
   "image/gif": ".gif",
-  "image/svg+xml": ".svg"
+  "image/svg+xml": ".svg",
+  "image/webp": ".webp"
 };
 async function downloadAndLocalize(node2, assetDir) {
   const currentUrl = node2.url;
@@ -31168,10 +31162,12 @@ async function downloadAndLocalize(node2, assetDir) {
     }
     let imageData = Buffer.from(response.data);
     const MAX_SIZE = 10 * 1024 * 1024;
-    if (imageData.length > MAX_SIZE && contentType !== "image/svg+xml") {
-      imageData = await compressImage(imageData);
-    }
-    if (imageData.length !== response.data.byteLength) {
+    if (contentType !== "image/svg+xml") {
+      if (imageData.length > MAX_SIZE) {
+        imageData = await compressImage(imageData);
+      } else {
+        imageData = await convertToWebp(imageData);
+      }
       finalExt = ".webp";
     }
     const fileName = `${hash}${finalExt}`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@duoyun/md-img-pull",
-  "version": "1.0.1",
+  "version": "1.1.0",
   "description": "Markdown 媒体资源本地化与压缩工具",
   "main": "./dist/main.cjs",
   "repository": {