smart-image-scraper-mcp 2.13.0 → 2.13.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "smart-image-scraper-mcp",
-  "version": "2.13.0",
+  "version": "2.13.1",
   "description": "全网智能图片抓取 MCP 服务器 - 支持 Bing/Google 图片搜索、验证和下载",
   "main": "src/index.js",
   "type": "module",

package/src/services/orchestrator.js

@@ -481,27 +481,21 @@ export class Orchestrator {
 
       if (signal?.aborted) throw new Error('操作已取消');
 
-      // 防盗链过滤（用于链接列表展示）
-      let linkUrls = rawUrls;
-      let hotlinkCount = 0;
-      if (shouldFilterHotlink) {
-        linkUrls = rawUrls.filter(url => !this.linkValidator.isHotlinkProtected(url));
-        hotlinkCount = rawUrls.length - linkUrls.length;
-        if (hotlinkCount > 0) {
-          logger.warn(`[HOTLINK] "${keyword}" - filtered ${hotlinkCount} hotlink-protected URLs`);
-        }
-      }
-
-      // 验证链接
-      let validatedUrls;
+      // both 模式：对所有原始 URL 统一验证一次，然后分别用于链接展示和下载
+      let allValidUrls;  // 所有验证通过的 URL
+      let validatedUrls;  // 链接列表（可能过滤防盗链）
+      let downloadUrls;   // 下载列表（不过滤防盗链，下载时加 Referer）
       let qualityModeLabel;
+      let hotlinkCount = 0;
       
       if (fastMode) {
-        validatedUrls = linkUrls.slice(0, count);
+        // fast 模式：不验证
+        allValidUrls = rawUrls.slice(0, count * 2 + 5);
         qualityModeLabel = '快速模式（跳过验证）';
       } else {
-        const maxValidate = Math.min(linkUrls.length, count * 2 + 5);
-        const urlsToValidate = linkUrls.slice(0, maxValidate);
+        // balanced/high 模式：统一验证所有原始 URL
+        const maxValidate = Math.min(rawUrls.length, count * 2 + 5);
+        const urlsToValidate = rawUrls.slice(0, maxValidate);
         const { valid } = await this.linkValidator.validateMany(urlsToValidate, {
           fetchQuality: prioritizeQuality,
           sortByQuality: prioritizeQuality,
@@ -517,14 +511,27 @@ export class Orchestrator {
           });
         }
         
-        validatedUrls = filteredValid.slice(0, count).map(v => v.url);
+        allValidUrls = filteredValid.map(v => v.url);
         qualityModeLabel = prioritizeQuality ? '高质量模式（验证+排序）' : '平衡模式（验证）';
       }
 
+      // 链接列表：根据 filterHotlink 参数决定是否过滤防盗链
+      if (shouldFilterHotlink) {
+        const filtered = allValidUrls.filter(url => !this.linkValidator.isHotlinkProtected(url));
+        hotlinkCount = allValidUrls.length - filtered.length;
+        validatedUrls = filtered.slice(0, count);
+        if (hotlinkCount > 0) {
+          logger.warn(`[HOTLINK] "${keyword}" - filtered ${hotlinkCount} hotlink-protected URLs from links`);
+        }
+      } else {
+        validatedUrls = allValidUrls.slice(0, count);
+      }
+
+      // 下载列表：使用所有验证通过的 URL（不过滤防盗链，下载时加 Referer 绕过）
+      downloadUrls = allValidUrls.slice(0, count * 2);
+
       if (signal?.aborted) throw new Error('操作已取消');
 
-      // 下载图片（使用所有原始 URL，不受防盗链过滤影响，因为下载时会加 Referer）
-      const downloadUrls = fastMode ? rawUrls.slice(0, count * 2 + 5) : validatedUrls;
       const { success, failed } = await this.fileManager.downloadMany(downloadUrls, keyword);
       
       let resultDownloads = success.slice(0, count);