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

package/README.md

@@ -12,6 +12,8 @@
 [![npm downloads](https://img.shields.io/badge/downloads-coming%20soon-lightgrey)](https://www.npmjs.com/package/@lmcc-dev/mult-fetch-mcp-server)
 [![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)
+
 
 <!-- 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)
@@ -76,6 +78,14 @@ This project implements the Standard Input/Output (Stdio) transport method.
 
 ## Installation
 
+### Installing via Smithery
+
+To install Mult Fetch MCP Server for Claude Desktop automatically via [Smithery](https://smithery.ai/server/@lmcc-dev/mult-fetch-mcp-server):
+
+```bash
+npx -y @smithery/cli install @lmcc-dev/mult-fetch-mcp-server --client claude
+```
+
 ### Local Installation
 
 ```bash
@@ -509,4 +519,4 @@ MIT
 
 ---
 
-Updated by lmcc-dev
+Updated by lmcc-dev

package/dist/src/lib/BrowserFetcher.js

@@ -46,6 +46,30 @@ export class BrowserFetcher {
      * 内存检查间隔（毫秒） (Memory check interval in milliseconds)
      */
     static memoryCheckInterval = 60000;
+    /**
+     * 常用浏览器的User-Agent列表 (List of common browser User-Agents)
+     * 用于模拟不同浏览器的请求 (Used to simulate requests from different browsers)
+     */
+    static userAgents = [
+        // Chrome
+        'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36',
+        'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36',
+        // Firefox
+        'Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:89.0) Gecko/20100101 Firefox/89.0',
+        'Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:89.0) Gecko/20100101 Firefox/89.0',
+        // Safari
+        'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/14.1.1 Safari/605.1.15',
+        // Edge
+        'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36 Edg/91.0.864.59'
+    ];
+    /**
+     * 获取随机User-Agent (Get random User-Agent)
+     * @returns 随机的User-Agent字符串 (Random User-Agent string)
+     */
+    static getRandomUserAgent() {
+        const index = Math.floor(Math.random() * this.userAgents.length);
+        return this.userAgents[index];
+    }
     /**
      * 检查内存使用情况 (Check memory usage)
      * 定期监控浏览器内存使用，必要时关闭浏览器释放资源 (Periodically monitor browser memory usage, close browser to release resources when necessary)
@@ -156,88 +180,98 @@ export class BrowserFetcher {
         }
         return undefined;
     }
-    // 获取或启动浏览器实例
-    static async getBrowser({ proxy, debug = false, useSystemProxy = true }) {
-        // 如果浏览器正在启动，等待启动完成
-        if (this.browserStarting) {
-            log('browser.waiting', debug, {}, COMPONENTS.BROWSER_FETCH);
-            return this.browserStartPromise;
-        }
-        // 如果浏览器已经启动，直接返回
+    /**
+     * 获取浏览器实例 (Get browser instance)
+     * 如果浏览器未启动，则启动浏览器 (Start browser if not started)
+     * @param debug 是否启用调试输出 (Whether to enable debug output)
+     * @returns 浏览器实例 (Browser instance)
+     */
+    static async getBrowser(debug = false) {
+        // 检查内存使用情况 (Check memory usage)
+        this.checkMemoryUsage(debug);
+        // 如果浏览器已经存在，直接返回 (If browser already exists, return directly)
         if (this.browser) {
-            log('browser.starting', debug, { debug }, COMPONENTS.BROWSER_FETCH);
+            log('browser.reusingExistingBrowser', debug, {}, COMPONENTS.BROWSER_FETCH);
             return this.browser;
         }
+        // 如果浏览器正在启动中，等待启动完成 (If browser is starting, wait for startup to complete)
+        if (this.browserStarting && this.browserStartPromise) {
+            log('browser.waitingForBrowserStart', debug, {}, COMPONENTS.BROWSER_FETCH);
+            return this.browserStartPromise;
+        }
+        // 标记浏览器正在启动 (Mark browser as starting)
         this.browserStarting = true;
-        this.browserStartPromise = (async () => {
+        // 创建启动Promise (Create startup Promise)
+        this.browserStartPromise = new Promise(async (resolve, reject) => {
             try {
-                // 获取代理设置 - 优先使用用户指定的代理，其次使用系统代理
-                const proxyServer = proxy || (useSystemProxy ? this.getSystemProxy(useSystemProxy, debug) : undefined);
-                // 详细记录代理设置情况
-                if (proxy) {
-                    log('fetcher.usingSpecifiedProxy', debug, { proxy }, COMPONENTS.BROWSER_FETCH);
-                }
-                else if (useSystemProxy) {
-                    log('fetcher.attemptingToUseSystemProxy', debug, {}, COMPONENTS.BROWSER_FETCH);
-                }
-                else {
-                    log('fetcher.notUsingProxy', debug, {}, COMPONENTS.BROWSER_FETCH);
-                }
-                log('fetcher.finalProxyUsed', debug, { proxy: proxyServer || t('fetcher.none') }, COMPONENTS.BROWSER_FETCH);
-                // 启动浏览器
-                const args = [
-                    '--no-sandbox',
-                    '--disable-setuid-sandbox',
-                    '--disable-dev-shm-usage',
-                    '--disable-accelerated-2d-canvas',
-                    '--no-first-run',
-                    '--no-zygote',
-                    '--single-process',
-                    '--disable-gpu',
-                    '--disable-infobars',
-                    '--window-position=0,0',
-                    '--ignore-certifcate-errors',
-                    '--ignore-certifcate-errors-spki-list',
-                    '--disable-features=site-per-process',
-                    '--disable-web-security',
-                    '--disable-features=IsolateOrigins,site-per-process',
-                    '--allow-running-insecure-content',
-                    '--disable-blink-features=AutomationControlled',
-                ];
-                // 如果有代理，添加代理参数
-                if (proxyServer) {
-                    args.push(`--proxy-server=${proxyServer}`);
-                    log('browser.usingProxy', debug, { proxy: proxyServer }, COMPONENTS.BROWSER_FETCH);
-                }
-                // 启动浏览器
-                // @ts-ignore - 忽略puppeteer-extra的类型错误
-                const browser = await puppeteerExtra.launch({
+                log('browser.startingBrowser', debug, {}, COMPONENTS.BROWSER_FETCH);
+                // 准备浏览器启动参数 (Prepare browser startup parameters)
+                const launchOptions = {
                     headless: 'new',
-                    args,
+                    args: [
+                        '--no-sandbox',
+                        '--disable-setuid-sandbox',
+                        '--disable-dev-shm-usage',
+                        '--disable-accelerated-2d-canvas',
+                        '--no-first-run',
+                        '--no-zygote',
+                        '--disable-gpu',
+                        '--disable-infobars',
+                        '--window-position=0,0',
+                        '--ignore-certificate-errors',
+                        '--ignore-certificate-errors-spki-list',
+                        '--disable-extensions',
+                        '--disable-default-apps',
+                        '--enable-features=NetworkService',
+                        '--disable-features=IsolateOrigins,site-per-process',
+                        '--disable-web-security',
+                        '--disable-site-isolation-trials',
+                        '--disable-features=BlockInsecurePrivateNetworkRequests',
+                        '--disable-features=IsolateOrigins',
+                        '--disable-features=site-per-process',
+                        '--disable-blink-features=AutomationControlled',
+                        '--user-agent=' + this.getRandomUserAgent()
+                    ],
                     ignoreHTTPSErrors: true,
                     defaultViewport: {
                         width: 1920,
                         height: 1080
                     }
-                });
-                this.browser = browser;
-                log('browser.startupSuccess', debug, {}, COMPONENTS.BROWSER_FETCH);
-                // 设置浏览器关闭事件
-                browser.on('disconnected', () => {
+                };
+                // 检查是否有环境变量指定的Chrome路径 (Check if there is a Chrome path specified by environment variables)
+                const executablePath = process.env.PUPPETEER_EXECUTABLE_PATH;
+                if (executablePath) {
+                    log('browser.usingCustomChromePath', debug, { path: executablePath }, COMPONENTS.BROWSER_FETCH);
+                    launchOptions.executablePath = executablePath;
+                    launchOptions.channel = undefined;
+                }
+                // 启动浏览器 (Launch browser)
+                // @ts-ignore - 忽略puppeteer-extra的类型错误
+                this.browser = await puppeteerExtra.launch(launchOptions);
+                log('browser.browserStarted', debug, {}, COMPONENTS.BROWSER_FETCH);
+                // 设置浏览器关闭事件处理 (Set browser close event handling)
+                this.browser.on('disconnected', () => {
+                    log('browser.browserDisconnected', debug, {}, COMPONENTS.BROWSER_FETCH);
                     this.browser = null;
-                    log('browser.closed', debug, {}, COMPONENTS.BROWSER_FETCH);
+                    this.browserStarting = false;
+                    this.browserStartPromise = null;
                 });
-                return browser;
+                // 重置标志 (Reset flags)
+                this.browserStarting = false;
+                // 解析Promise (Resolve Promise)
+                resolve(this.browser);
             }
             catch (error) {
+                // 记录错误 (Log error)
+                log('browser.browserStartError', true, { error: String(error) }, COMPONENTS.BROWSER_FETCH);
+                // 重置标志 (Reset flags)
                 this.browser = null;
-                log('browser.startingFailed', debug, { error: String(error) }, COMPONENTS.BROWSER_FETCH);
-                throw error;
-            }
-            finally {
                 this.browserStarting = false;
+                this.browserStartPromise = null;
+                // 拒绝Promise (Reject Promise)
+                reject(error);
             }
-        })();
+        });
         return this.browserStartPromise;
     }
     // 关闭浏览器
@@ -426,7 +460,7 @@ export class BrowserFetcher {
                 };
             }
             // 获取浏览器实例
-            const browser = await this.getBrowser({ proxy: effectiveProxy, debug, useSystemProxy });
+            const browser = await this.getBrowser(debug);
             // 创建新页面
             const page = await browser.newPage();
             // 设置页面超时

package/dist/src/lib/NodeFetcher.js

@@ -339,10 +339,15 @@ export class NodeFetcher {
             }
             catch (parseError) {
                 // 处理JSON解析错误 (Handle JSON parse error)
-                const error = new Error(`Invalid JSON: ${parseError instanceof Error ? parseError.message : String(parseError)}`);
+                const textPreview = text.length > 100 ? `${text.substring(0, 100)}...` : text;
+                const error = new Error(`Invalid JSON: ${parseError instanceof Error ? parseError.message : String(parseError)}. Text preview: "${textPreview}", length: ${text.length}`);
                 error.text = text;
                 error.originalError = parseError;
-                log('node.jsonParseError', debug, { error: String(parseError) }, COMPONENTS.NODE_FETCH);
+                log('fetcher.jsonParseError', debug, {
+                    error: String(parseError),
+                    textPreview,
+                    textLength: text.length
+                }, COMPONENTS.NODE_FETCH);
                 throw error;
             }
             // 返回JSON内容 (Return JSON content)

package/dist/src/lib/i18n/locales/en/browser.js

@@ -49,5 +49,14 @@ export const browser = {
     usingStoredCookies: "Using stored cookies for domain: {{domain}}",
     closingInstance: "Closing browser instance",
     fetchErrorWithAttempt: "Error in browser fetch (attempt {{attempt}}/{{maxAttempts}}): {{error}}",
-    retryingAfterDelay: "Retrying after {{delayMs}}ms delay..."
+    retryingAfterDelay: "Retrying after {{delayMs}}ms delay...",
+    browserStartupSuccess: "Browser started successfully",
+    browserStartupFailed: "Browser startup failed: {{error}}",
+    usingCustomChromePath: "Using custom Chrome path: {{path}}",
+    browserDisconnected: "Browser disconnected",
+    waitingForBrowserStart: "Waiting for browser to start",
+    reusingExistingBrowser: "Reusing existing browser instance",
+    startingBrowser: "Starting browser",
+    browserStarted: "Browser started successfully",
+    browserStartError: "Browser startup error: {{error}}"
 };

package/dist/src/lib/i18n/locales/en/fetcher.js

@@ -39,7 +39,7 @@ export const fetcher = {
     startingJsonFetch: "Starting JSON fetch",
     parsingJson: "Parsing JSON",
     jsonParsed: "JSON parsed successfully",
-    jsonParseError: "JSON parse error: {{error}}",
+    jsonParseError: "JSON parse error: {{error}}. Text preview: \"{{textPreview}}\", length: {{textLength}} bytes",
     startingTxtFetch: "Starting text fetch",
     textContentLength: "Text content length: {{length}} bytes",
     startingMarkdownFetch: "Starting Markdown fetch",

package/dist/src/lib/i18n/locales/zh/browser.js

@@ -49,5 +49,14 @@ export const browser = {
     usingStoredCookies: "使用存储的域名Cookie: {{domain}}",
     closingInstance: "关闭浏览器实例",
     fetchErrorWithAttempt: "浏览器获取错误（尝试 {{attempt}}/{{maxAttempts}}）: {{error}}",
-    retryingAfterDelay: "延迟 {{delayMs}}ms 后重试..."
+    retryingAfterDelay: "延迟 {{delayMs}}ms 后重试...",
+    browserStartupSuccess: "浏览器启动成功",
+    browserStartupFailed: "浏览器启动失败: {{error}}",
+    usingCustomChromePath: "使用自定义Chrome路径: {{path}}",
+    browserDisconnected: "浏览器已断开连接",
+    waitingForBrowserStart: "等待浏览器启动",
+    reusingExistingBrowser: "复用现有浏览器实例",
+    startingBrowser: "正在启动浏览器",
+    browserStarted: "浏览器启动成功",
+    browserStartError: "浏览器启动错误: {{error}}"
 };

package/dist/src/lib/i18n/locales/zh/fetcher.js

@@ -39,7 +39,7 @@ export const fetcher = {
     startingJsonFetch: "开始JSON获取",
     parsingJson: "解析JSON",
     jsonParsed: "JSON解析成功",
-    jsonParseError: "JSON解析错误: {{error}}",
+    jsonParseError: "JSON解析错误: {{error}}。文本预览: \"{{textPreview}}\", 长度: {{textLength}} 字节",
     startingTxtFetch: "开始文本获取",
     textContentLength: "文本内容长度: {{length}} 字节",
     startingMarkdownFetch: "开始Markdown获取",

package/dist/src/lib/server/prompts.js

@@ -8,7 +8,7 @@ import { log, COMPONENTS } from '../logger.js';
 import { t } from '../i18n/index.js';
 // 定义提示模板 (Define prompt templates)
 const PROMPTS = {
-    "fetch-website": {
+    "mult-fetch-mcp:prompt:fetch-website": {
         name: "mult-fetch-mcp:prompt:fetch-website",
         description: t('prompts.fetchWebsite.description'),
         arguments: [
@@ -29,7 +29,7 @@ const PROMPTS = {
             }
         ]
     },
-    "extract-content": {
+    "mult-fetch-mcp:prompt:extract-content": {
         name: "mult-fetch-mcp:prompt:extract-content",
         description: t('prompts.extractContent.description'),
         arguments: [
@@ -50,7 +50,7 @@ const PROMPTS = {
             }
         ]
     },
-    "debug-fetch": {
+    "mult-fetch-mcp:prompt:debug-fetch": {
         name: "mult-fetch-mcp:prompt:debug-fetch",
         description: t('prompts.debugFetch.description'),
         arguments: [
@@ -99,7 +99,7 @@ export function registerPrompts(server) {
             }
         }
         // 根据提示名称和参数生成消息
-        if (promptName === "fetch-website") {
+        if (promptName === "mult-fetch-mcp:prompt:fetch-website") {
             const url = args.url;
             const format = args.format || "html";
             let useBrowser = false;
@@ -152,7 +152,7 @@ export function registerPrompts(server) {
                 ]
             };
         }
-        else if (promptName === "extract-content") {
+        else if (promptName === "mult-fetch-mcp:prompt:extract-content") {
             const url = args.url;
             const selector = args.selector || "main";
             const dataType = args.dataType || "text";
@@ -171,7 +171,7 @@ export function registerPrompts(server) {
                 ]
             };
         }
-        else if (promptName === "debug-fetch") {
+        else if (promptName === "mult-fetch-mcp:prompt:debug-fetch") {
             const url = args.url;
             const error = args.error;
             return {

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@lmcc-dev/mult-fetch-mcp-server",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "An MCP protocol-based web content fetching tool that supports multiple modes and formats, can be integrated with AI assistants like Claude",
   "type": "module",
   "main": "dist/index.js",
   "bin": {
-    "mult-fetch-mcp-server": "./dist/index.js"
+    "mult-fetch-mcp-server": "dist/index.js"
   },
   "license": "MIT",
   "author": "Martin (@lmcc.dev)",
@@ -31,7 +31,7 @@
     "client": "node dist/src/client.js",
     "server": "node dist/index.js",
     "prepublishOnly": "npm run build",
-    "publish": "npm publish --access public"
+    "release": "npm publish --access public"
   },
   "keywords": [
     "mcp",