@lmcc-dev/mult-fetch-mcp-server 1.0.3 → 1.2.0

package/README.md

@@ -4,7 +4,7 @@
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
 [![Node.js Version](https://img.shields.io/node/v/@lmcc-dev/mult-fetch-mcp-server)](https://nodejs.org/)
 [![TypeScript](https://img.shields.io/badge/TypeScript-5.7-blue.svg)](https://www.typescriptlang.org/)
-[![MCP SDK](https://img.shields.io/badge/MCP%20SDK-1.6.1-brightgreen.svg)](https://github.com/modelcontextprotocol/typescript-sdk)
+[![MCP SDK](https://img.shields.io/badge/MCP%20SDK-1.7.0-brightgreen.svg)](https://github.com/modelcontextprotocol/typescript-sdk)
 [![GitHub Stars](https://img.shields.io/github/stars/lmcc-dev/mult-fetch-mcp-server)](https://github.com/lmcc-dev/mult-fetch-mcp-server/stargazers)
 [![GitHub Forks](https://img.shields.io/github/forks/lmcc-dev/mult-fetch-mcp-server)](https://github.com/lmcc-dev/mult-fetch-mcp-server/network/members)
 [![GitHub Issues](https://img.shields.io/github/issues/lmcc-dev/mult-fetch-mcp-server)](https://github.com/lmcc-dev/mult-fetch-mcp-server/issues)
@@ -13,10 +13,12 @@
 [![GitHub last commit](https://img.shields.io/github/last-commit/lmcc-dev/mult-fetch-mcp-server)](https://github.com/lmcc-dev/mult-fetch-mcp-server/commits/main)
 [![GitHub contributors](https://img.shields.io/github/contributors/lmcc-dev/mult-fetch-mcp-server)](https://github.com/lmcc-dev/mult-fetch-mcp-server/graphs/contributors)
 [![smithery badge](https://smithery.ai/badge/@lmcc-dev/mult-fetch-mcp-server)](https://smithery.ai/server/@lmcc-dev/mult-fetch-mcp-server)
+[![codecov](https://codecov.io/gh/lmcc-dev/mult-fetch-mcp-server/branch/main/graph/badge.svg)](https://codecov.io/gh/lmcc-dev/mult-fetch-mcp-server)
+[![CodeFactor](https://www.codefactor.io/repository/github/lmcc-dev/mult-fetch-mcp-server/badge)](https://www.codefactor.io/repository/github/lmcc-dev/mult-fetch-mcp-server)
+
 
 
 <!-- Future badges to consider:
-[![codecov](https://codecov.io/gh/lmcc-dev/mult-fetch-mcp-server/branch/main/graph/badge.svg)](https://codecov.io/gh/lmcc-dev/mult-fetch-mcp-server)
 [![CodeFactor](https://www.codefactor.io/repository/github/lmcc-dev/mult-fetch-mcp-server/badge)](https://www.codefactor.io/repository/github/lmcc-dev/mult-fetch-mcp-server)
 [![Maintainability](https://api.codeclimate.com/v1/badges/a99a88d28ad37a79dbf6/maintainability)](https://codeclimate.com/github/lmcc-dev/mult-fetch-mcp-server/maintainability)
 -->
@@ -89,16 +91,16 @@ npx -y @smithery/cli install @lmcc-dev/mult-fetch-mcp-server --client claude
 ### Local Installation
 
 ```bash
-npm install
+pnpm install
 ```
 
 ### Global Installation
 
 ```bash
-npm install -g @lmcc-dev/mult-fetch-mcp-server
+pnpm add -g @lmcc-dev/mult-fetch-mcp-server
 ```
 
-Or use npx to run directly (no installation required):
+Or run directly with npx (no installation required):
 
 ```bash
 npx @lmcc-dev/mult-fetch-mcp-server
@@ -173,13 +175,13 @@ After configuration, restart Claude desktop, and you can use the following tools
 ## Build
 
 ```bash
-npm run build
+pnpm run build
 ```
 
 ## Run Server
 
 ```bash
-npm run server
+pnpm run server
 # or
 node dist/index.js
 # if globally installed, you can run directly
@@ -191,9 +193,9 @@ npx @lmcc-dev/mult-fetch-mcp-server
 ## Run Client
 
 ```bash
-npm run client <method> <params_json>
+pnpm run client <method> <params_json>
 # example
-npm run client fetch_html '{"url": "https://example.com", "debug": true}'
+pnpm run client fetch_html '{"url": "https://example.com", "debug": true}'
 ```
 
 ## Run Tests

package/README.zh.md

@@ -4,7 +4,7 @@
 [![许可证: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
 [![Node.js 版本](https://img.shields.io/node/v/@lmcc-dev/mult-fetch-mcp-server)](https://nodejs.org/)
 [![TypeScript](https://img.shields.io/badge/TypeScript-5.7-blue.svg)](https://www.typescriptlang.org/)
-[![MCP SDK](https://img.shields.io/badge/MCP%20SDK-1.6.1-brightgreen.svg)](https://github.com/modelcontextprotocol/typescript-sdk)
+[![MCP SDK](https://img.shields.io/badge/MCP%20SDK-1.7.0-brightgreen.svg)](https://github.com/modelcontextprotocol/typescript-sdk)
 [![GitHub Stars](https://img.shields.io/github/stars/lmcc-dev/mult-fetch-mcp-server)](https://github.com/lmcc-dev/mult-fetch-mcp-server/stargazers)
 [![GitHub Forks](https://img.shields.io/github/forks/lmcc-dev/mult-fetch-mcp-server)](https://github.com/lmcc-dev/mult-fetch-mcp-server/network/members)
 [![GitHub Issues](https://img.shields.io/github/issues/lmcc-dev/mult-fetch-mcp-server)](https://github.com/lmcc-dev/mult-fetch-mcp-server/issues)
@@ -12,10 +12,11 @@
 [![npm 下载量](https://img.shields.io/badge/下载量-即将更新-lightgrey)](https://www.npmjs.com/package/@lmcc-dev/mult-fetch-mcp-server)
 [![GitHub 最后提交](https://img.shields.io/github/last-commit/lmcc-dev/mult-fetch-mcp-server)](https://github.com/lmcc-dev/mult-fetch-mcp-server/commits/main)
 [![GitHub 贡献者](https://img.shields.io/github/contributors/lmcc-dev/mult-fetch-mcp-server)](https://github.com/lmcc-dev/mult-fetch-mcp-server/graphs/contributors)
-
-<!-- 未来可考虑添加的徽章:
 [![codecov](https://codecov.io/gh/lmcc-dev/mult-fetch-mcp-server/branch/main/graph/badge.svg)](https://codecov.io/gh/lmcc-dev/mult-fetch-mcp-server)
 [![CodeFactor](https://www.codefactor.io/repository/github/lmcc-dev/mult-fetch-mcp-server/badge)](https://www.codefactor.io/repository/github/lmcc-dev/mult-fetch-mcp-server)
+
+
+<!-- 未来可考虑添加的徽章:
 [![Maintainability](https://api.codeclimate.com/v1/badges/a99a88d28ad37a79dbf6/maintainability)](https://codeclimate.com/github/lmcc-dev/mult-fetch-mcp-server/maintainability)
 -->
 
@@ -76,22 +77,30 @@ fetch-mcp/
 
 ## 安装
 
+### 通过 Smithery 安装
+
+要通过 [Smithery](https://smithery.ai/server/@lmcc-dev/mult-fetch-mcp-server) 自动为 Claude 桌面版安装 Mult Fetch MCP Server：
+
+```bash
+npx -y @smithery/cli install @lmcc-dev/mult-fetch-mcp-server --client claude
+```
+
 ### 本地安装
 
 ```bash
-npm install
+pnpm install
 ```
 
 ### 全局安装
 
 ```bash
-npm install -g mult-fetch-mcp-server
+pnpm add -g @lmcc-dev/mult-fetch-mcp-server
 ```
 
 或者直接使用 npx 运行（无需安装）：
 
 ```bash
-npx mult-fetch-mcp-server
+npx @lmcc-dev/mult-fetch-mcp-server
 ```
 
 ## 与 Claude 集成
@@ -163,13 +172,13 @@ npx mult-fetch-mcp-server
 ## 构建
 
 ```bash
-npm run build
+pnpm run build
 ```
 
 ## 运行服务器
 
 ```bash
-npm run server
+pnpm run server
 # 或者
 node dist/index.js
 # 如果全局安装，可以直接运行
@@ -181,9 +190,9 @@ npx mult-fetch-mcp-server
 ## 运行客户端
 
 ```bash
-npm run client <method> <params_json>
+pnpm run client <method> <params_json>
 # 例如
-npm run client fetch_html '{"url": "https://example.com", "debug": true}'
+pnpm run client fetch_html '{"url": "https://example.com", "debug": true}'
 ```
 
 ## 运行测试

package/dist/i18n-test-report.json

@@ -0,0 +1,8 @@
+{
+  "timestamp": "2025-03-15T11:54:45.602Z",
+  "totalKeys": 406,
+  "missingTranslations": [],
+  "emptyTranslations": [],
+  "placeholderMismatches": [],
+  "hasIssues": false
+}

package/dist/i18n-unused-keys-report.json

@@ -0,0 +1,8 @@
+{
+  "timestamp": "2025-03-15T11:54:15.658Z",
+  "totalKeys": 406,
+  "totalUsedKeys": 406,
+  "totalFiles": 195,
+  "unusedKeys": [],
+  "hasUnusedKeys": false
+}

package/dist/src/client.js

@@ -9,6 +9,7 @@ import path from 'path';
 import { fileURLToPath } from 'url';
 import { log, COMPONENTS } from './lib/logger.js';
 import { execSync } from 'child_process';
+import { isAccessDeniedError, isNetworkError } from './lib/utils/errorDetection.js';
 // 获取当前文件的目录路径 (Get the directory path of the current file)
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
@@ -25,43 +26,40 @@ const __dirname = path.dirname(__filename);
  */
 function responseRequiresBrowser(response, debug = false) {
     if (response.isError) {
-        const errorText = response.content[0].text.toLowerCase();
+        const errorText = response.content[0].text;
         if (debug) {
-            log('fetcher.fetchError', debug, { url: '', error: response.content[0].text }, COMPONENTS.CLIENT);
+            log('client.fetchError', debug, { url: '', error: errorText }, COMPONENTS.CLIENT);
             // 尝试从错误信息中提取HTTP状态码 (Try to extract HTTP status code from error message)
-            const statusCodeMatch = response.content[0].text.match(/(\b[45]\d\d\b)/);
+            const statusCodeMatch = errorText.match(/(\b[45]\d\d\b)/);
             if (statusCodeMatch) {
                 log('client.statusCodeDetected', debug, { code: statusCodeMatch[0] }, COMPONENTS.CLIENT);
             }
             // 尝试解析更详细的错误原因
-            if (errorText.includes('403') || errorText.includes('forbidden')) {
-                log('errors.forbidden', debug, {}, COMPONENTS.CLIENT);
-            }
-            else if (errorText.includes('cloudflare')) {
-                log('errors.cloudflareProtection', debug, {}, COMPONENTS.CLIENT);
-            }
-            else if (errorText.includes('captcha')) {
-                log('errors.captchaRequired', debug, {}, COMPONENTS.CLIENT);
-            }
-            else if (errorText.includes('timeout')) {
-                log('errors.timeout', debug, { timeout: '' }, COMPONENTS.CLIENT);
+            if (isAccessDeniedError(errorText)) {
+                if (errorText.toLowerCase().includes('403') || errorText.toLowerCase().includes('forbidden')) {
+                    log('errors.forbidden', debug, {}, COMPONENTS.CLIENT);
+                }
+                else if (errorText.toLowerCase().includes('cloudflare')) {
+                    log('errors.cloudflareProtection', debug, {}, COMPONENTS.CLIENT);
+                }
+                else if (errorText.toLowerCase().includes('captcha')) {
+                    log('errors.captchaRequired', debug, {}, COMPONENTS.CLIENT);
+                }
             }
-            else if (errorText.includes('socket') || errorText.includes('econnrefused')) {
-                log('errors.connectionProblem', debug, {}, COMPONENTS.CLIENT);
+            else if (isNetworkError(errorText)) {
+                if (errorText.toLowerCase().includes('timeout')) {
+                    log('errors.timeout', debug, { timeout: '' }, COMPONENTS.CLIENT);
+                }
+                else if (errorText.toLowerCase().includes('socket') || errorText.toLowerCase().includes('econnrefused')) {
+                    log('errors.connectionProblem', debug, {}, COMPONENTS.CLIENT);
+                }
             }
         }
-        return errorText.includes('403') ||
-            errorText.includes('forbidden') ||
-            errorText.includes('access denied') ||
-            errorText.includes('cloudflare') ||
-            errorText.includes('captcha') ||
-            errorText.includes('javascript required') ||
-            errorText.includes('timeout') ||
-            errorText.includes('connect timeout') ||
-            errorText.includes('socket') ||
-            errorText.includes('econnrefused') ||
-            errorText.includes('und_err_connect_timeout') ||
-            errorText.includes('fetch failed');
+        return isAccessDeniedError(errorText) ||
+            isNetworkError(errorText) ||
+            errorText.toLowerCase().includes('javascript required') ||
+            errorText.toLowerCase().includes('und_err_connect_timeout') ||
+            errorText.toLowerCase().includes('fetch failed');
     }
     return false;
 }
@@ -106,67 +104,60 @@ async function smartFetch(params) {
             // 在调试模式下打印响应结果的摘要 (Print response result summary in debug mode)
             if (debug) {
                 if (result.isError) {
-                    log('client.fetchFailed', debug, { error: result.content[0].text.substring(0, 150) + (result.content[0].text.length > 150 ? '...' : '') }, COMPONENTS.CLIENT);
+                    log('client.fetchFailed', debug, { url, error: result.content[0].text }, COMPONENTS.CLIENT);
                 }
                 else {
-                    const contentLength = result.content[0].text.length;
-                    log('client.fetchSuccess', debug, { length: contentLength }, COMPONENTS.CLIENT);
+                    log('client.fetchSuccess', debug, { url }, COMPONENTS.CLIENT);
                 }
             }
-            // 如果失败并且响应表明需要浏览器模式，且当前不是浏览器模式 (If failed and response indicates browser mode is needed, and current mode is not browser mode)
-            if (!params.useBrowser && responseRequiresBrowser(result, debug)) {
+            // 检查是否需要切换到浏览器模式 (Check if need to switch to browser mode)
+            if (result.isError && responseRequiresBrowser(result, debug) && !params.useBrowser) {
                 log('client.browserModeNeeded', debug, { url }, COMPONENTS.CLIENT);
-                // 切换到浏览器模式重试 (Switch to browser mode and retry)
-                params.useBrowser = true;
-                // 设置关闭浏览器选项，确保资源被释放 (Set close browser option to ensure resources are released)
-                params.closeBrowser = true;
                 log('client.retryingWithBrowser', debug, { url }, COMPONENTS.CLIENT);
+                // 切换到浏览器模式重试 (Switch to browser mode and retry)
                 const browserResult = await client.callTool({
                     name: method,
-                    arguments: params
-                });
-                // 在调试模式下打印浏览器模式的响应结果摘要 (Print browser mode response result summary in debug mode)
-                if (debug) {
-                    if (browserResult.isError) {
-                        log('client.browserModeFetchFailed', debug, { error: browserResult.content[0].text.substring(0, 150) + (browserResult.content[0].text.length > 150 ? '...' : '') }, COMPONENTS.CLIENT);
-                    }
-                    else {
-                        const contentLength = browserResult.content[0].text.length;
-                        log('client.browserModeFetchSuccess', debug, { length: contentLength }, COMPONENTS.CLIENT);
+                    arguments: {
+                        ...params,
+                        useBrowser: true
                     }
+                });
+                if (browserResult.isError) {
+                    log('client.browserModeFetchFailed', debug, { url, error: browserResult.content[0].text }, COMPONENTS.CLIENT);
+                }
+                else {
+                    log('client.browserModeFetchSuccess', debug, { url }, COMPONENTS.CLIENT);
                 }
                 return browserResult;
             }
+            if (result.isError) {
+                log('client.fetchFailed', debug, { url, error: result.content[0].text }, COMPONENTS.CLIENT);
+            }
+            else {
+                log('client.fetchSuccess', debug, { url }, COMPONENTS.CLIENT);
+            }
             return result;
         }
         else {
-            // 不启用自动检测，直接使用指定模式
+            // 直接使用指定的模式 (Directly use the specified mode)
             log('client.usingMode', debug, { mode: params.useBrowser ? 'browser' : 'standard', url }, COMPONENTS.CLIENT);
-            // 如果使用浏览器模式，设置关闭浏览器选项
-            if (params.useBrowser) {
-                params.closeBrowser = true;
-            }
             const result = await client.callTool({
                 name: method,
                 arguments: params
             });
-            // 在调试模式下打印响应结果的摘要
-            if (debug) {
-                if (result.isError) {
-                    log('client.fetchFailed', debug, { error: result.content[0].text.substring(0, 150) + (result.content[0].text.length > 150 ? '...' : '') }, COMPONENTS.CLIENT);
-                }
-                else {
-                    const contentLength = result.content[0].text.length;
-                    log('client.fetchSuccess', debug, { length: contentLength }, COMPONENTS.CLIENT);
-                }
+            if (result.isError) {
+                log('client.fetchFailed', debug, { url, error: result.content[0].text }, COMPONENTS.CLIENT);
+            }
+            else {
+                log('client.fetchSuccess', debug, { url }, COMPONENTS.CLIENT);
             }
             return result;
         }
     }
     finally {
         // 关闭客户端连接 (Close client connection)
-        await client.close();
         log('client.serverClosed', debug, {}, COMPONENTS.CLIENT);
+        await client.close();
     }
 }
 /**
@@ -188,6 +179,17 @@ async function main() {
     }
     catch (error) {
         log('client.invalidJson', true, {}, COMPONENTS.CLIENT);
+        // 返回标准错误结构体 (Return standard error structure)
+        const errorResult = {
+            isError: true,
+            content: [
+                {
+                    type: "text",
+                    text: `Invalid JSON parameter: ${paramsJson}`
+                }
+            ]
+        };
+        process.stdout.write(JSON.stringify(errorResult, null, 2));
         process.exit(1);
     }
     const debug = params.debug === true;
@@ -272,6 +274,17 @@ async function main() {
     }
     catch (error) {
         log('client.requestFailed', debug, { error: error.message }, COMPONENTS.CLIENT);
+        // 即使在出错的情况下也输出标准结构体 (Output standard structure even in case of error)
+        const errorResult = {
+            isError: true,
+            content: [
+                {
+                    type: "text",
+                    text: `Client error: ${error.message}`
+                }
+            ]
+        };
+        process.stdout.write(JSON.stringify(errorResult, null, 2));
         process.exit(1);
     }
 }

package/dist/src/lib/BrowserFetcher.js

@@ -88,7 +88,7 @@ export class BrowserFetcher {
             const heapTotal = Math.round(memoryUsage.heapTotal / 1024 / 1024);
             const rss = Math.round(memoryUsage.rss / 1024 / 1024);
             // 记录内存使用情况
-            log('browser.memoryUsage', debug, { heapUsed, heapTotal, rss }, COMPONENTS.BROWSER_FETCH);
+            log('browser.memoryUsage', debug, { usage: heapUsed }, COMPONENTS.BROWSER_FETCH);
             // 如果内存使用过高，记录警告
             if (heapUsed > 500 || rss > 1000) {
                 log('browser.memoryTooHigh', debug, { heapUsed, heapTotal, rss }, COMPONENTS.BROWSER_FETCH);
@@ -473,7 +473,7 @@ export class BrowserFetcher {
             const domain = this.getDomain(url);
             const storedCookies = this.getCookies(domain);
             if (storedCookies && saveCookies) {
-                log('browser.usingStoredCookies', debug, { domain: this.getDomain(url) }, COMPONENTS.BROWSER_FETCH);
+                log('browser.usingStoredCookies', debug, { domain }, COMPONENTS.BROWSER_FETCH);
                 await page.setExtraHTTPHeaders({
                     'Cookie': storedCookies
                 });
@@ -483,7 +483,7 @@ export class BrowserFetcher {
                 log('browser.usingProxy', debug, { proxy: effectiveProxy }, COMPONENTS.BROWSER_FETCH);
             }
             // 导航到URL
-            log('browser.navigating', debug, { debug }, COMPONENTS.BROWSER_FETCH);
+            log('browser.navigating', debug, { url }, COMPONENTS.BROWSER_FETCH);
             await page.goto(url, {
                 waitUntil: 'networkidle2',
                 timeout: timeout
@@ -491,27 +491,27 @@ export class BrowserFetcher {
             // 尝试处理Cloudflare保护
             const bypassedCloudflare = await this.handleCloudflareProtection(page, url, debug);
             if (!bypassedCloudflare) {
-                log('browser.continuingWithoutBypass', debug, { debug }, COMPONENTS.BROWSER_FETCH);
+                log('browser.continuingWithoutBypass', debug, {}, COMPONENTS.BROWSER_FETCH);
             }
             // 等待选择器
-            log('browser.waitingForSelector', debug, { selector: waitForSelector, debug }, COMPONENTS.BROWSER_FETCH);
+            log('browser.waitingForSelector', debug, { selector: waitForSelector }, COMPONENTS.BROWSER_FETCH);
             await page.waitForSelector(waitForSelector, {
                 timeout: timeout
             }).catch(() => { });
             // 等待额外时间
-            log('browser.waitingForTimeout', debug, { timeout: waitForTimeout, debug }, COMPONENTS.BROWSER_FETCH);
+            log('browser.waitingForTimeout', debug, { timeout: waitForTimeout }, COMPONENTS.BROWSER_FETCH);
             await new Promise(resolve => setTimeout(resolve, waitForTimeout));
             // 如果需要滚动到底部
             if (scrollToBottom) {
-                log('browser.scrolling', debug, { debug }, COMPONENTS.BROWSER_FETCH);
+                log('browser.scrolling', debug, {}, COMPONENTS.BROWSER_FETCH);
                 await this.autoScroll(page, debug);
             }
             // 获取页面内容
-            log('browser.gettingContent', debug, { debug }, COMPONENTS.BROWSER_FETCH);
+            log('browser.gettingContent', debug, {}, COMPONENTS.BROWSER_FETCH);
             const content = await page.content();
             // 如果需要保存cookies
             if (saveCookies) {
-                log('browser.savingCookies', debug, { debug }, COMPONENTS.BROWSER_FETCH);
+                log('browser.savingCookies', debug, { domain }, COMPONENTS.BROWSER_FETCH);
                 const cookies = await page.evaluate(() => document.cookie);
                 if (cookies) {
                     this.saveCookies(url, cookies);
@@ -519,16 +519,16 @@ export class BrowserFetcher {
             }
             // 记录内容长度
             const contentLength = content.length;
-            log('browser.contentLength', debug, { length: contentLength, debug }, COMPONENTS.BROWSER_FETCH);
+            log('browser.contentLength', debug, { length: contentLength }, COMPONENTS.BROWSER_FETCH);
             // 如果内容太长，截断它
             let finalContent = content;
             if (contentLength > 10 * 1024 * 1024) { // 10MB
                 finalContent = content.substring(0, 10 * 1024 * 1024);
-                log('browser.contentTruncated', debug, { debug }, COMPONENTS.BROWSER_FETCH);
+                log('browser.contentTruncated', debug, {}, COMPONENTS.BROWSER_FETCH);
             }
             // 关闭页面
             await page.close();
-            log('browser.pageClosed', debug, { debug }, COMPONENTS.BROWSER_FETCH);
+            log('browser.pageClosed', debug, {}, COMPONENTS.BROWSER_FETCH);
             // 如果需要关闭浏览器
             if (closeBrowser) {
                 await this.closeBrowser(debug);