smart-image-scraper-mcp 2.9.0 → 2.9.2

package/package.json

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

package/src/services/orchestrator.js

@@ -79,6 +79,30 @@ export class Orchestrator {
    */
   async processKeywordLink(keyword, count, source, options = {}) {
     const startTime = Date.now();
+    const KEYWORD_TIMEOUT = 20000; // 单个关键词20秒超时
+    
+    // 为单个关键词添加超时保护
+    const timeoutPromise = new Promise((_, reject) => 
+      setTimeout(() => reject(new Error(`关键词 "${keyword}" 处理超时(20秒)`)), KEYWORD_TIMEOUT)
+    );
+    
+    try {
+      return await Promise.race([
+        this._processKeywordLinkInternal(keyword, count, source, options, startTime),
+        timeoutPromise
+      ]);
+    } catch (error) {
+      logger.error(`Process keyword error: ${keyword}`, { error: error.message });
+      return {
+        keyword,
+        success: false,
+        error: error.message,
+        duration: Date.now() - startTime,
+      };
+    }
+  }
+
+  async _processKeywordLinkInternal(keyword, count, source, options, startTime) {
     // 根据 quality 参数决定模式
     const qualityMode = options.quality || 'balanced';
     const fastMode = qualityMode === 'fast';
@@ -163,13 +187,7 @@ export class Orchestrator {
         duration: Date.now() - startTime,
       };
     } catch (error) {
-      logger.error(`Process keyword error: ${keyword}`, { error: error.message });
-      return {
-        keyword,
-        success: false,
-        error: error.message,
-        duration: Date.now() - startTime,
-      };
+      throw error; // 抛出让外层处理
     }
   }
 
@@ -183,6 +201,30 @@ export class Orchestrator {
    */
   async processKeywordDownload(keyword, count, source, options = {}) {
     const startTime = Date.now();
+    const KEYWORD_TIMEOUT = 45000; // 下载模式45秒超时（比link模式长）
+    
+    // 为单个关键词添加超时保护
+    const timeoutPromise = new Promise((_, reject) => 
+      setTimeout(() => reject(new Error(`关键词 "${keyword}" 下载超时(45秒)`)), KEYWORD_TIMEOUT)
+    );
+    
+    try {
+      return await Promise.race([
+        this._processKeywordDownloadInternal(keyword, count, source, options, startTime),
+        timeoutPromise
+      ]);
+    } catch (error) {
+      logger.error(`Process keyword download error: ${keyword}`, { error: error.message });
+      return {
+        keyword,
+        success: false,
+        error: error.message,
+        duration: Date.now() - startTime,
+      };
+    }
+  }
+
+  async _processKeywordDownloadInternal(keyword, count, source, options, startTime) {
     // 根据 quality 参数决定模式（download 模式默认高质量）
     const qualityMode = options.quality || 'balanced';
     const prioritizeQuality = qualityMode !== 'fast';
@@ -292,13 +334,7 @@ export class Orchestrator {
         duration: Date.now() - startTime,
       };
     } catch (error) {
-      logger.error(`Process keyword error: ${keyword}`, { error: error.message });
-      return {
-        keyword,
-        success: false,
-        error: error.message,
-        duration: Date.now() - startTime,
-      };
+      throw error; // 抛出让外层处理
     }
   }
 
@@ -310,16 +346,20 @@ export class Orchestrator {
   async execute(params) {
     metrics.recordRequest();
     const requestId = `req_${Date.now()}_${Math.random().toString(36).substr(2, 6)}`;
-    const GLOBAL_TIMEOUT = 30000; // 30秒全局超时
+    
+    // 根据关键词数量动态计算超时时间（每个关键词 10 秒，最少 30 秒，最多 120 秒）
+    const keywords = this.parseKeywords(params.query);
+    const keywordCount = keywords.length;
+    const GLOBAL_TIMEOUT = Math.min(Math.max(keywordCount * 10000, 30000), 120000);
     
     try {
-      logger.info(`[Orchestrator] Starting request: ${requestId}`);
+      logger.info(`[Orchestrator] Starting request: ${requestId}, keywords: ${keywordCount}, timeout: ${GLOBAL_TIMEOUT/1000}s`);
       
       // 添加全局超时熔断机制
       const result = await Promise.race([
         this._executeInternal(params),
         new Promise((_, reject) => 
-          setTimeout(() => reject(new Error('REQUEST_TIMEOUT: 请求超时(30秒)，请稍后重试')), GLOBAL_TIMEOUT)
+          setTimeout(() => reject(new Error(`REQUEST_TIMEOUT: 请求超时(${GLOBAL_TIMEOUT/1000}秒)，关键词过多请减少数量`)), GLOBAL_TIMEOUT)
         )
       ]);