smart-image-scraper-mcp 2.9.3 → 2.10.1

package/package.json

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

package/src/index.js

@@ -175,7 +175,10 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
     };
   }
 
-  try {
+  // MCP 层最外层超时保护（60秒硬限制）
+  const MCP_TIMEOUT = 60000;
+  
+  const executeWithTimeout = async () => {
     // 主流做法：每个请求创建新的 Orchestrator 实例，确保无状态
     const orchestrator = new Orchestrator();
     
@@ -211,13 +214,24 @@ server.setRequestHandler(CallToolRequestSchema, async (request) => {
     return {
       content: [{ type: 'text', text: formattedResult }],
     };
+  };
+
+  try {
+    // 使用 Promise.race 确保一定会在超时内返回
+    const result = await Promise.race([
+      executeWithTimeout(),
+      new Promise((_, reject) => 
+        setTimeout(() => reject(new Error('MCP_TIMEOUT: 请求超时(60秒)，请减少关键词数量或稍后重试')), MCP_TIMEOUT)
+      )
+    ]);
+    return result;
   } catch (error) {
     // 主流做法：简洁的错误处理，使用 stderr 输出日志
     console.error(`[MCP Error] ${error.message}`);
     return {
       content: [{ 
         type: 'text', 
-        text: `## ❌ 执行错误\n\n**错误信息**: ${error.message}\n\n请检查网络连接或稍后重试。` 
+        text: `## ❌ 执行错误\n\n**错误信息**: ${error.message}\n\n请减少关键词数量或稍后重试。` 
       }],
       isError: true,
     };

package/src/services/orchestrator.js

@@ -403,7 +403,7 @@ export class Orchestrator {
     const options = { size, safeSearch, aspect, targetSize, fit, position };
     
     const startTime = Date.now();
-    const keywords = this.parseKeywords(query);
+    let keywords = this.parseKeywords(query);
 
     if (keywords.length === 0) {
       return {
@@ -412,6 +412,13 @@ export class Orchestrator {
       };
     }
 
+    // 限制最大关键词数量为 10 个，避免阻塞
+    const MAX_KEYWORDS = 10;
+    if (keywords.length > MAX_KEYWORDS) {
+      logger.warn(`Too many keywords (${keywords.length}), limiting to ${MAX_KEYWORDS}`);
+      keywords = keywords.slice(0, MAX_KEYWORDS);
+    }
+
     logger.info(`Starting task: mode=${mode}, keywords=${keywords.join(', ')}, count=${count}, source=${source}`);
 
     // 根据模式选择处理函数
@@ -419,12 +426,23 @@ export class Orchestrator {
       ? this.processKeywordLink.bind(this)
       : this.processKeywordDownload.bind(this);
 
-    // 并发处理关键词
-    const results = await Promise.all(
-      keywords.map(keyword => 
-        this.keywordLimit(() => processFunc(keyword, count, source, options))
-      )
-    );
+    // 串行处理关键词，避免阻塞事件循环
+    const results = [];
+    for (const keyword of keywords) {
+      try {
+        const result = await processFunc(keyword, count, source, options);
+        results.push(result);
+        // 让出事件循环，确保 MCP 通信不被阻塞
+        await new Promise(resolve => setImmediate(resolve));
+      } catch (error) {
+        results.push({
+          keyword,
+          success: false,
+          error: error.message,
+          duration: 0,
+        });
+      }
+    }
 
     // 汇总结果
     const successResults = results.filter(r => r.success);