daguands-mcp 1.0.21 → 1.0.23

package/dist/config.js

@@ -0,0 +1,56 @@
+/**
+ * 守护进程和MCP服务器配置
+ */
+/**
+ * 默认配置
+ */
+export const defaultConfig = {
+    timeouts: {
+        httpRequest: 900000, // 15分钟 (MCP Server → daemon)
+        wsRequest: 900000, // 15分钟 (daemon → 扩展)
+        extensionMessage: 900000, // 15分钟 (扩展 → content script)
+    },
+    ports: {
+        ws: 28765, // WebSocket端口
+        http: 28766, // HTTP API端口
+    },
+    logging: {
+        enableDataSizeLog: true, // 记录数据大小
+        enableDataPreview: true, // 记录数据预览
+    },
+};
+/**
+ * 从环境变量加载配置
+ */
+export function loadConfig() {
+    const config = { ...defaultConfig };
+    // 从环境变量覆盖超时配置
+    if (process.env.DAGUAN_HTTP_TIMEOUT) {
+        config.timeouts.httpRequest = parseInt(process.env.DAGUAN_HTTP_TIMEOUT);
+    }
+    if (process.env.DAGUAN_WS_TIMEOUT) {
+        config.timeouts.wsRequest = parseInt(process.env.DAGUAN_WS_TIMEOUT);
+    }
+    if (process.env.DAGUAN_EXT_TIMEOUT) {
+        config.timeouts.extensionMessage = parseInt(process.env.DAGUAN_EXT_TIMEOUT);
+    }
+    // 从环境变量覆盖端口配置
+    if (process.env.DAGUAN_WS_PORT) {
+        config.ports.ws = parseInt(process.env.DAGUAN_WS_PORT);
+    }
+    if (process.env.DAGUAN_HTTP_PORT) {
+        config.ports.http = parseInt(process.env.DAGUAN_HTTP_PORT);
+    }
+    // 日志配置
+    if (process.env.DAGUAN_LOG_DATA_SIZE === 'false') {
+        config.logging.enableDataSizeLog = false;
+    }
+    if (process.env.DAGUAN_LOG_DATA_PREVIEW === 'false') {
+        config.logging.enableDataPreview = false;
+    }
+    return config;
+}
+/**
+ * 全局配置实例
+ */
+export const config = loadConfig();

package/dist/daemon.js

@@ -3,8 +3,9 @@ import express from 'express';
 import { createServer } from 'http';
 import { getAllTools } from './tools/index.js';
 import { daemonLog as log } from './logger.js';
-const WS_PORT = 28765;
-const HTTP_PORT = 28766;
+import { config } from './config.js';
+const WS_PORT = config.ports.ws;
+const HTTP_PORT = config.ports.http;
 /**
  * 扩展连接管理
  */
@@ -43,22 +44,40 @@ class ExtensionManager {
     }
     handleExtensionMessage(message) {
         const { requestId, type, data, error } = message;
-        log('收到扩展消息:', JSON.stringify(message).substring(0, 200) + '...');
+        // 计算数据大小
+        let dataSize = 0;
+        if (data !== undefined && data !== null) {
+            try {
+                dataSize = JSON.stringify(data).length;
+            }
+            catch (e) {
+                log('⚠️ 无法计算数据大小:', e);
+            }
+        }
+        if (config.logging.enableDataSizeLog) {
+            log(`收到扩展消息: requestId=${requestId}, type=${type}, dataSize=${dataSize}bytes`);
+        }
+        if (config.logging.enableDataPreview && dataSize > 0) {
+            const preview = JSON.stringify(data).substring(0, 100);
+            log(`数据预览: ${preview}${dataSize > 100 ? '...' : ''}`);
+        }
         if (type === 'response') {
             const pending = this.pendingRequests.get(requestId);
             if (pending) {
                 this.pendingRequests.delete(requestId);
                 if (error) {
-                    log(`请求 ${requestId} 失败:`, error);
+                    log(`❌ 请求 ${requestId} 失败:`, error);
                     pending.reject(new Error(error));
                 }
                 else {
-                    log(`请求 ${requestId} 成功，返回数据:`, JSON.stringify(data).substring(0, 100) + '...');
+                    log(`✅ 请求 ${requestId} 成功，数据大小: ${dataSize}bytes`);
+                    // 直接传递data对象，不要再次序列化
+                    // data已经是从JSON.parse解析出来的对象
                     pending.resolve(data);
                 }
             }
             else {
-                log(`警告：收到未知请求的响应: ${requestId}`);
+                log(`⚠️ 警告：收到未知请求的响应: ${requestId}`);
             }
         }
     }
@@ -88,14 +107,14 @@ class ExtensionManager {
             log('发送消息内容:', message.substring(0, 200));
             this.ws.send(message);
             log('✅ 消息已发送，等待响应...');
-            // 超时
+            // 使用配置的超时时间
             setTimeout(() => {
                 if (this.pendingRequests.has(requestId)) {
-                    log('⏰ 请求超时:', requestId);
+                    log(`⏰ 请求超时: ${requestId} (${config.timeouts.wsRequest}ms)`);
                     this.pendingRequests.delete(requestId);
-                    reject(new Error('请求超时'));
+                    reject(new Error(`请求超时 (${config.timeouts.wsRequest / 1000}秒)`));
                 }
-            }, 600000);
+            }, config.timeouts.wsRequest);
         });
     }
     isConnected() {
@@ -107,6 +126,15 @@ class ExtensionManager {
  */
 export async function startDaemon() {
     log('🚀 守护进程启动中...');
+    log('='.repeat(60));
+    log('配置信息:');
+    log(`  WebSocket端口: ${WS_PORT}`);
+    log(`  HTTP API端口: ${HTTP_PORT}`);
+    log(`  HTTP请求超时: ${config.timeouts.httpRequest}ms (${config.timeouts.httpRequest / 1000}秒)`);
+    log(`  WebSocket请求超时: ${config.timeouts.wsRequest}ms (${config.timeouts.wsRequest / 1000}秒)`);
+    log(`  记录数据大小: ${config.logging.enableDataSizeLog ? '是' : '否'}`);
+    log(`  记录数据预览: ${config.logging.enableDataPreview ? '是' : '否'}`);
+    log('='.repeat(60));
     // 创建WebSocket服务器
     const wss = new WebSocketServer({ port: WS_PORT });
     log(`🌐 WebSocket服务器启动在端口 ${WS_PORT}`);

package/dist/index.js

@@ -7,7 +7,8 @@ import { fileURLToPath } from 'url';
 import { dirname, join } from 'path';
 import { getAllTools } from './tools/index.js';
 import { mcpLog as log } from './logger.js';
-const DAEMON_HTTP_PORT = 28766;
+import { config } from './config.js';
+const DAEMON_HTTP_PORT = config.ports.http;
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
 async function checkDaemon() {
@@ -44,11 +45,19 @@ async function startDaemon() {
     throw new Error('守护进程启动超时');
 }
 async function callDaemonTool(name, args) {
+    // 计算参数大小
+    const argsSize = JSON.stringify(args).length;
     log(`📤 调用守护进程工具: ${name}`);
-    log(`参数:`, JSON.stringify(args).substring(0, 200));
+    if (config.logging.enableDataSizeLog) {
+        log(`参数大小: ${argsSize}bytes`);
+    }
+    if (config.logging.enableDataPreview) {
+        log(`参数预览:`, JSON.stringify(args).substring(0, 100) + (argsSize > 100 ? '...' : ''));
+    }
     try {
         const url = `http://127.0.0.1:${DAEMON_HTTP_PORT}/tool_call`;
         log(`发送HTTP请求到: ${url}`);
+        log(`使用超时: ${config.timeouts.httpRequest}ms (${config.timeouts.httpRequest / 1000}秒)`);
         const response = await fetch(url, {
             method: 'POST',
             headers: {
@@ -58,7 +67,7 @@ async function callDaemonTool(name, args) {
                 name,
                 arguments: args,
             }),
-            signal: AbortSignal.timeout(30000),
+            signal: AbortSignal.timeout(config.timeouts.httpRequest),
         });
         log(`收到HTTP响应: status=${response.status} ${response.statusText}`);
         if (!response.ok) {
@@ -67,18 +76,25 @@ async function callDaemonTool(name, args) {
             throw new Error(`HTTP ${response.status}: ${response.statusText}`);
         }
         const result = await response.json();
-        log(`守护进程返回:`, JSON.stringify(result).substring(0, 200));
+        // 计算返回结果大小
+        const resultSize = JSON.stringify(result.result || {}).length;
+        if (config.logging.enableDataSizeLog) {
+            log(`守护进程返回数据大小: ${resultSize}bytes`);
+        }
+        if (config.logging.enableDataPreview) {
+            log(`返回数据预览:`, JSON.stringify(result).substring(0, 200) + (resultSize > 200 ? '...' : ''));
+        }
         if (!result.success) {
             log(`❌ 工具调用失败:`, result.error);
             throw new Error(result.error || '工具调用失败');
         }
-        log(`✅ 工具调用成功`);
+        log(`✅ 工具调用成功，数据大小: ${resultSize}bytes`);
         return result.result;
     }
     catch (error) {
         if (error instanceof Error && error.name === 'AbortError') {
-            log(`⏰ 请求超时`);
-            throw new Error('请求超时');
+            log(`⏰ HTTP请求超时 (${config.timeouts.httpRequest / 1000}秒)`);
+            throw new Error(`请求超时 (${config.timeouts.httpRequest / 1000}秒)`);
         }
         log(`❌ 调用守护进程失败:`, error);
         throw error;
@@ -89,6 +105,13 @@ async function callDaemonTool(name, args) {
  */
 async function main() {
     log('🚀 MCP Server启动中...');
+    log('='.repeat(60));
+    log('配置信息:');
+    log(`  守护进程地址: http://127.0.0.1:${DAEMON_HTTP_PORT}`);
+    log(`  HTTP请求超时: ${config.timeouts.httpRequest}ms (${config.timeouts.httpRequest / 1000}秒)`);
+    log(`  记录数据大小: ${config.logging.enableDataSizeLog ? '是' : '否'}`);
+    log(`  记录数据预览: ${config.logging.enableDataPreview ? '是' : '否'}`);
+    log('='.repeat(60));
     // 检查守护进程
     let daemonRunning = await checkDaemon();
     if (!daemonRunning) {
@@ -149,8 +172,24 @@ async function main() {
 }
 // 错误处理
 process.on('uncaughtException', (error) => {
-    log('❌ 未捕获的异常:', error);
-    process.exit(1);
+    // 检查是否是客户端断连相关的错误
+    const isClientDisconnect = error.code === 'EPIPE' ||
+        error.code === 'ECONNRESET' ||
+        (error.errno === -4047 && error.syscall === 'write');
+    if (isClientDisconnect) {
+        // 客户端断连是正常情况，不退出
+        log('⚠️ 客户端断开连接:', JSON.stringify({
+            code: error.code,
+            errno: error.errno,
+            syscall: error.syscall
+        }));
+        log('这通常表示客户端已获取结果并关闭连接，服务继续运行');
+    }
+    else {
+        // 其他异常才退出
+        log('❌ 未捕获的异常:', error);
+        process.exit(1);
+    }
 });
 process.on('unhandledRejection', (reason) => {
     log('❌ 未处理的Promise拒绝:', reason);

package/dist/tools/taobao.js

@@ -54,15 +54,6 @@ export const TAOBAO_TOOLS = [
                 goodsId: {
                     type: 'string',
                     description: '淘宝商品Id',
-                },
-                pageCount: {
-                    type: 'string',
-                    default: '30',
-                    description: '要获取的总页数',
-                },
-                filterRate: {
-                    type: 'boolean',
-                    description: '是否过滤掉无效评价',
                 }
             },
             required: ['productUrl'],

package/package.json

@@ -1,39 +1,39 @@
-{
-  "name": "daguands-mcp",
-  "version": "1.0.21",
-  "description": "daguands mcp",
-  "type": "module",
-  "main": "dist/index.js",
-  "bin": {
-    "daguan-mcp": "dist/index.js"
-  },
-  "files": [
-    "dist"
-  ],
-  "scripts": {
-    "build": "tsc",
-    "dev": "tsc --watch",
-    "start": "node dist/index.js",
-    "prepublishOnly": "npm run build"
-  },
-  "dependencies": {
-    "@modelcontextprotocol/sdk": "^1.0.4",
-    "@types/express": "^5.0.6",
-    "express": "^5.2.1",
-    "ws": "^8.14.2"
-  },
-  "devDependencies": {
-    "@types/node": "^20.10.5",
-    "@types/ws": "^8.5.10",
-    "typescript": "^5.3.3"
-  },
-  "keywords": [
-    "mcp",
-    "openclaw",
-    "taobao",
-    "ecommerce",
-    "chrome-extension"
-  ],
-  "author": "Daguands",
-  "license": "MIT"
-}
+{
+  "name": "daguands-mcp",
+  "version": "1.0.23",
+  "description": "daguands mcp",
+  "type": "module",
+  "main": "dist/index.js",
+  "bin": {
+    "daguan-mcp": "dist/index.js"
+  },
+  "files": [
+    "dist"
+  ],
+  "scripts": {
+    "build": "tsc",
+    "dev": "tsc --watch",
+    "start": "node dist/index.js",
+    "prepublishOnly": "npm run build"
+  },
+  "dependencies": {
+    "@modelcontextprotocol/sdk": "^1.0.4",
+    "@types/express": "^5.0.6",
+    "express": "^5.2.1",
+    "ws": "^8.14.2"
+  },
+  "devDependencies": {
+    "@types/node": "^20.10.5",
+    "@types/ws": "^8.5.10",
+    "typescript": "^5.3.3"
+  },
+  "keywords": [
+    "mcp",
+    "openclaw",
+    "taobao",
+    "ecommerce",
+    "chrome-extension"
+  ],
+  "author": "Daguands",
+  "license": "MIT"
+}