cloudflare-mcp-smart-proxy 1.2.0 → 1.3.1

package/src/router.js

@@ -2,12 +2,48 @@
  * Smart Router - 智能路由工具请求到云端或本地
  */
 
+function collectArgumentStrings(value, output = new Set(), seen = new WeakSet()) {
+  if (typeof value === 'string') {
+    const normalized = value.trim();
+    if (normalized.length >= 2) output.add(normalized);
+    return output;
+  }
+  if (value == null || typeof value !== 'object' || seen.has(value)) return output;
+  seen.add(value);
+  for (const item of Array.isArray(value) ? value : Object.values(value)) {
+    collectArgumentStrings(item, output, seen);
+  }
+  return output;
+}
+
+export function sanitizeProxyError(error, params = {}) {
+  let message = typeof error === 'string'
+    ? error
+    : (error?.message || JSON.stringify(error || 'Unknown error'));
+  const values = Array.from(collectArgumentStrings(params))
+    .sort((left, right) => right.length - left.length);
+  for (const value of values) {
+    const variants = new Set([value]);
+    try {
+      variants.add(encodeURIComponent(value));
+    } catch {}
+    for (const variant of variants) {
+      message = message.split(variant).join('[REDACTED_PARAM]');
+    }
+  }
+  return String(message)
+    .replace(/Bearer\s+[A-Za-z0-9._~+\/-]+=*/gi, 'Bearer [REDACTED]')
+    .replace(/mcp_[A-Za-z0-9]{16,}/g, '[REDACTED]')
+    .slice(0, 512);
+}
+
 export class SmartRouter {
-  constructor(cloudUrl, cloudApiKey, localTools, workspaceRoot = null) {
+  constructor(cloudUrl, cloudApiKey, localTools, workspaceRoot = null, deviceIdentity = null) {
     this.cloudUrl = cloudUrl.replace(/\/$/, ''); // 移除尾部斜杠
     this.cloudApiKey = cloudApiKey;
     this.localTools = localTools;
     this.workspaceRoot = workspaceRoot || process.cwd();
+    this.deviceIdentity = deviceIdentity;
     
     // 工具路由规则
     this.routingRules = {
@@ -27,7 +63,12 @@ export class SmartRouter {
         'get_document_symbols',
         'replace_lines',
         'execute_command',
-        'execute_shell_command'
+        'execute_shell_command',
+        'connector_bridge_status',
+        'connector_sync_profile',
+        'connector_report_status',
+        'connector_discover_project_probe',
+        'connector_report_project_probe'
       ],
       
       // 云端工具（需要网络或云端资源）
@@ -151,21 +192,26 @@ export class SmartRouter {
     }
     
     try {
+      const body = JSON.stringify({
+        jsonrpc: '2.0',
+        id: Date.now(),
+        method: 'tools/call',
+        params: {
+          name: toolName,
+          arguments: params
+        }
+      });
+      const signedHeaders = this.deviceIdentity
+        ? await this.deviceIdentity.buildSignedHeaders({ method: 'POST', pathname: '/mcp', body })
+        : {};
       const response = await fetch(`${this.cloudUrl}/mcp`, {
         method: 'POST',
         headers: {
           'Authorization': `Bearer ${this.cloudApiKey}`,
-          'Content-Type': 'application/json'
+          'Content-Type': 'application/json',
+          ...signedHeaders
         },
-        body: JSON.stringify({
-          jsonrpc: '2.0',
-          id: Date.now(),
-          method: 'tools/call',
-          params: {
-            name: toolName,
-            arguments: params
-          }
-        })
+        body
       });
 
       if (!response.ok) {
@@ -184,15 +230,13 @@ export class SmartRouter {
           errorMessage = errorMessage.message || JSON.stringify(errorMessage, null, 2);
         }
         
-        // 记录详细错误信息用于调试
+        const safeErrorMessage = sanitizeProxyError(errorMessage, params);
         console.error(`[SmartRouter] Cloud tool error for ${toolName}:`, {
           code: result.error.code,
-          message: result.error.message,
-          data: result.error.data,
-          fullError: result.error
+          message: safeErrorMessage
         });
         
-        throw new Error(errorMessage);
+        throw new Error(safeErrorMessage);
       }
       
       // 提取结果内容
@@ -218,19 +262,17 @@ export class SmartRouter {
         return result;
       }
     } catch (error) {
-      // 记录完整错误信息用于调试
+      const safeErrorMessage = sanitizeProxyError(error, params);
       console.error(`[SmartRouter] Error calling cloud tool ${toolName}:`, {
-        error: error.message,
-        stack: error.stack,
-        params: params
+        error: safeErrorMessage
       });
       
       // 如果错误信息已经包含 "Cloud tool call failed"，直接抛出
       // 否则添加前缀
-      if (error.message && error.message.includes('Cloud tool call failed')) {
-        throw error;
+      if (safeErrorMessage.includes('Cloud tool call failed')) {
+        throw new Error(safeErrorMessage);
       }
-      throw new Error(`Cloud tool call failed: ${error.message}`);
+      throw new Error(`Cloud tool call failed: ${safeErrorMessage}`);
     }
   }
 
@@ -263,18 +305,23 @@ export class SmartRouter {
    */
   async getCloudTools() {
     try {
+      const body = JSON.stringify({
+        jsonrpc: '2.0',
+        id: Date.now(),
+        method: 'tools/list',
+        params: {}
+      });
+      const signedHeaders = this.deviceIdentity
+        ? await this.deviceIdentity.buildSignedHeaders({ method: 'POST', pathname: '/mcp', body })
+        : {};
       const response = await fetch(`${this.cloudUrl}/mcp`, {
         method: 'POST',
         headers: {
           'Authorization': `Bearer ${this.cloudApiKey}`,
-          'Content-Type': 'application/json'
+          'Content-Type': 'application/json',
+          ...signedHeaders
         },
-        body: JSON.stringify({
-          jsonrpc: '2.0',
-          id: Date.now(),
-          method: 'tools/list',
-          params: {}
-        })
+        body
       });
 
       if (!response.ok) {
@@ -294,4 +341,3 @@ export class SmartRouter {
     }
   }
 }
-

package/package-personal.json

@@ -1,28 +0,0 @@
-{
-  "name": "cloudflare-mcp-smart-proxy",
-  "version": "1.1.1",
-  "description": "Smart proxy for Cloudflare MCP - routes tools to cloud or local execution",
-  "type": "module",
-  "main": "index.js",
-  "bin": {
-    "cloudflare-mcp-proxy": "./index.js"
-  },
-  "scripts": {
-    "start": "node index.js"
-  },
-  "keywords": [
-    "mcp",
-    "cloudflare",
-    "proxy",
-    "local",
-    "filesystem"
-  ],
-  "author": "",
-  "license": "MIT",
-  "dependencies": {
-    "@modelcontextprotocol/sdk": "^1.0.0"
-  },
-  "engines": {
-    "node": ">=18.0.0"
-  }
-}

package/publish-now.sh

@@ -1,230 +0,0 @@
-#!/bin/bash
-
-# 快速发布脚本 - 自动版本管理
-
-set -e
-
-cd "$(dirname "$0")"
-
-echo "📦 发布 Cloudflare MCP Smart Proxy"
-echo "=================================="
-echo ""
-
-# 读取当前版本
-CURRENT_VERSION=$(node -p "require('./package.json').version" 2>/dev/null || echo "1.0.0")
-echo "当前版本: $CURRENT_VERSION"
-
-# 检查 npm 上已发布的版本
-PUBLISHED_VERSION=$(npm view cloudflare-mcp-smart-proxy version 2>/dev/null || echo "0.0.0")
-echo "npm 上最新版本: $PUBLISHED_VERSION"
-
-# 如果当前版本已发布，自动递增
-if [ "$CURRENT_VERSION" == "$PUBLISHED_VERSION" ]; then
-  echo ""
-  echo "⚠️  当前版本 $CURRENT_VERSION 已发布，需要升级版本"
-  echo ""
-  echo "选择版本升级类型:"
-  echo "1. patch (1.0.0 -> 1.0.1) - 修复 bug"
-  echo "2. minor (1.0.0 -> 1.1.0) - 新功能"
-  echo "3. major (1.0.0 -> 2.0.0) - 重大变更"
-  echo "4. 手动指定版本号"
-  echo ""
-  read -p "请选择 (1/2/3/4) [默认: 1]: " version_choice
-  version_choice=${version_choice:-1}
-  
-  case $version_choice in
-    1)
-      NEW_VERSION=$(node -e "
-        const v = '$CURRENT_VERSION'.split('.');
-        v[2] = parseInt(v[2] || 0) + 1;
-        console.log(v.join('.'));
-      ")
-      ;;
-    2)
-      NEW_VERSION=$(node -e "
-        const v = '$CURRENT_VERSION'.split('.');
-        v[1] = parseInt(v[1] || 0) + 1;
-        v[2] = 0;
-        console.log(v.join('.'));
-      ")
-      ;;
-    3)
-      NEW_VERSION=$(node -e "
-        const v = '$CURRENT_VERSION'.split('.');
-        v[0] = parseInt(v[0] || 0) + 1;
-        v[1] = 0;
-        v[2] = 0;
-        console.log(v.join('.'));
-      ")
-      ;;
-    4)
-      read -p "请输入新版本号 (例如: 1.0.2): " NEW_VERSION
-      if [ -z "$NEW_VERSION" ]; then
-        echo "❌ 版本号不能为空"
-        exit 1
-      fi
-      ;;
-    *)
-      echo "❌ 无效选择"
-      exit 1
-      ;;
-  esac
-  
-  echo ""
-  echo "将升级版本: $CURRENT_VERSION -> $NEW_VERSION"
-  read -p "确认升级？(y/n) " -n 1 -r
-  echo ""
-  if [[ ! $REPLY =~ ^[Yy]$ ]]; then
-    echo "❌ 取消"
-    exit 1
-  fi
-  
-  # 更新所有 package 文件的版本号
-  echo "更新版本号..."
-  
-  # 更新 package.json
-  node -e "
-    const fs = require('fs');
-    const pkg = JSON.parse(fs.readFileSync('package.json', 'utf-8'));
-    pkg.version = '$NEW_VERSION';
-    fs.writeFileSync('package.json', JSON.stringify(pkg, null, 2) + '\n');
-  "
-  
-  # 更新 package-personal.json
-  if [ -f "package-personal.json" ]; then
-    node -e "
-      const fs = require('fs');
-      const pkg = JSON.parse(fs.readFileSync('package-personal.json', 'utf-8'));
-      pkg.version = '$NEW_VERSION';
-      fs.writeFileSync('package-personal.json', JSON.stringify(pkg, null, 2) + '\n');
-    "
-  fi
-  
-  echo "✅ 版本号已更新为: $NEW_VERSION"
-  CURRENT_VERSION=$NEW_VERSION
-  echo ""
-fi
-
-# 检查登录
-if ! npm whoami &> /dev/null; then
-  echo "⚠️  需要先登录 npm"
-  echo ""
-  echo "运行: npm login"
-  echo ""
-  read -p "是否现在登录？(y/n) " -n 1 -r
-  echo ""
-  if [[ $REPLY =~ ^[Yy]$ ]]; then
-    npm login
-  else
-    echo "❌ 取消"
-    exit 1
-  fi
-fi
-
-echo "✅ 已登录为: $(npm whoami)"
-echo ""
-
-# 选择发布方式
-echo "选择发布方式:"
-echo "1. 组织包 (@cloudflare-mcp/smart-proxy) - 需要组织权限"
-echo "2. 个人包 (cloudflare-mcp-smart-proxy) - 无需组织权限"
-echo ""
-read -p "请选择 (1/2) [默认: 2]: " choice
-choice=${choice:-2}
-
-if [ "$choice" == "1" ]; then
-  PACKAGE_NAME="@cloudflare-mcp/smart-proxy"
-  echo "使用组织包名: $PACKAGE_NAME"
-  echo "⚠️  需要 @cloudflare-mcp 组织权限"
-else
-  PACKAGE_NAME="cloudflare-mcp-smart-proxy"
-  echo "使用个人包名: $PACKAGE_NAME"
-  
-  # 备份原 package.json
-  if [ -f "package.json" ]; then
-    cp package.json package.json.backup
-    echo "✅ 已备份 package.json"
-  fi
-  
-  # 使用个人包名，但保持当前版本号
-  node -e "
-    const fs = require('fs');
-    const currentPkg = JSON.parse(fs.readFileSync('package.json', 'utf-8'));
-    const personalPkg = JSON.parse(fs.readFileSync('package-personal.json', 'utf-8'));
-    
-    // 使用个人包名，但保持当前版本号
-    personalPkg.version = currentPkg.version;
-    fs.writeFileSync('package.json', JSON.stringify(personalPkg, null, 2) + '\n');
-  "
-  echo "✅ 已切换到个人包名（版本: $CURRENT_VERSION）"
-fi
-
-echo ""
-read -p "确认发布？(y/n) " -n 1 -r
-echo ""
-if [[ ! $REPLY =~ ^[Yy]$ ]]; then
-  echo "❌ 取消"
-  # 恢复原配置
-  if [ -f "package.json.backup" ]; then
-    mv package.json.backup package.json
-  fi
-  exit 1
-fi
-
-echo ""
-echo "🚀 发布中..."
-echo ""
-echo "📱 如果启用 2FA，npm 会自动打开浏览器进行认证"
-echo "   请按 ENTER 键打开浏览器（如果提示）"
-echo ""
-
-# 尝试发布，如果需要 2FA，npm 会自动打开浏览器
-# macOS 保存的 2FA 会通过浏览器自动完成认证
-npm publish --access public
-
-if [ $? -eq 0 ]; then
-  echo ""
-  echo "=================================="
-  echo "✅ 发布成功！"
-  echo ""
-  echo "包地址: https://www.npmjs.com/package/$PACKAGE_NAME"
-  echo "版本: $CURRENT_VERSION"
-  echo ""
-  
-  # 如果版本已更新，同步到 package-personal.json
-  if [ -f "package-personal.json" ] && [ "$choice" == "2" ]; then
-    node -e "
-      const fs = require('fs');
-      const pkg = JSON.parse(fs.readFileSync('package.json', 'utf-8'));
-      const personalPkg = JSON.parse(fs.readFileSync('package-personal.json', 'utf-8'));
-      personalPkg.version = pkg.version;
-      fs.writeFileSync('package-personal.json', JSON.stringify(personalPkg, null, 2) + '\n');
-    "
-    echo "✅ 已同步版本号到 package-personal.json"
-  fi
-  echo ""
-  echo "安装方式:"
-  if [ "$choice" == "1" ]; then
-    echo "  npx -y @cloudflare-mcp/smart-proxy"
-  else
-    echo "  npx -y cloudflare-mcp-smart-proxy"
-    echo ""
-    echo "⚠️  注意: 如果使用个人包名，需要更新 CURSOR_配置示例.json 中的包名"
-  fi
-  echo ""
-  
-  # 恢复原配置
-  if [ -f "package.json.backup" ]; then
-    mv package.json.backup package.json
-    echo "✅ 已恢复原 package.json"
-  fi
-else
-  echo ""
-  echo "❌ 发布失败"
-  # 恢复原配置
-  if [ -f "package.json.backup" ]; then
-    mv package.json.backup package.json
-  fi
-  exit 1
-fi
-

package/publish-with-2fa.sh

@@ -1,134 +0,0 @@
-#!/bin/bash
-
-# 发布脚本 - 带 2FA 检查
-
-set -e
-
-cd "$(dirname "$0")"
-
-echo "📦 发布 Cloudflare MCP Smart Proxy"
-echo "=================================="
-echo ""
-
-# 检查登录
-if ! npm whoami &> /dev/null; then
-  echo "⚠️  需要先登录 npm"
-  npm login
-fi
-
-echo "✅ 已登录为: $(npm whoami)"
-echo ""
-
-# 检查 2FA 状态
-echo "检查 2FA 状态..."
-PROFILE=$(npm profile get 2>&1)
-if echo "$PROFILE" | grep -q '"twoFactor":"auth-and-writes"'; then
-  echo "✅ 2FA 已启用（发布权限）"
-elif echo "$PROFILE" | grep -q '"twoFactor":"auth-only"'; then
-  echo "⚠️  2FA 已启用，但可能没有发布权限"
-  echo "   请访问: https://www.npmjs.com/settings/$(npm whoami)/two-factor"
-  echo "   确保选择了 'Authorization and Publishing'"
-  read -p "继续发布？(y/n) " -n 1 -r
-  echo ""
-  if [[ ! $REPLY =~ ^[Yy]$ ]]; then
-    exit 1
-  fi
-else
-  echo "❌ 2FA 未启用"
-  echo ""
-  echo "npm 现在要求启用 2FA 才能发布包。"
-  echo ""
-  echo "请执行以下步骤："
-  echo "1. 访问: https://www.npmjs.com/settings/$(npm whoami)/two-factor"
-  echo "2. 启用 2FA，选择 'Authorization and Publishing'"
-  echo "3. 使用手机应用（如 Google Authenticator）扫描二维码"
-  echo "4. 完成后重新运行此脚本"
-  echo ""
-  read -p "是否已启用 2FA？(y/n) " -n 1 -r
-  echo ""
-  if [[ ! $REPLY =~ ^[Yy]$ ]]; then
-    echo "请先启用 2FA，然后重新运行此脚本"
-    exit 1
-  fi
-  
-  # 重新登录以启用 2FA
-  echo "重新登录以应用 2FA..."
-  npm logout
-  npm login
-fi
-
-echo ""
-
-# 选择发布方式
-echo "选择发布方式:"
-echo "1. 组织包 (@cloudflare-mcp/smart-proxy) - 需要组织权限"
-echo "2. 个人包 (cloudflare-mcp-smart-proxy) - 无需组织权限"
-echo ""
-read -p "请选择 (1/2) [默认: 2]: " choice
-choice=${choice:-2}
-
-if [ "$choice" == "1" ]; then
-  PACKAGE_NAME="@cloudflare-mcp/smart-proxy"
-  echo "使用组织包名: $PACKAGE_NAME"
-  echo "⚠️  需要 @cloudflare-mcp 组织权限"
-else
-  PACKAGE_NAME="cloudflare-mcp-smart-proxy"
-  echo "使用个人包名: $PACKAGE_NAME"
-  
-  # 备份原 package.json
-  if [ -f "package.json" ] && ! grep -q "cloudflare-mcp-smart-proxy" package.json; then
-    cp package.json package.json.backup
-    echo "✅ 已备份 package.json"
-    
-    # 使用个人包名
-    cp package-personal.json package.json
-    echo "✅ 已切换到个人包名"
-  fi
-fi
-
-echo ""
-read -p "确认发布？(y/n) " -n 1 -r
-echo ""
-if [[ ! $REPLY =~ ^[Yy]$ ]]; then
-  echo "❌ 取消"
-  # 恢复原配置
-  if [ -f "package.json.backup" ]; then
-    mv package.json.backup package.json
-  fi
-  exit 1
-fi
-
-echo ""
-echo "🚀 发布中..."
-npm publish --access public
-
-if [ $? -eq 0 ]; then
-  echo ""
-  echo "=================================="
-  echo "✅ 发布成功！"
-  echo ""
-  echo "包地址: https://www.npmjs.com/package/$PACKAGE_NAME"
-  echo ""
-  echo "安装方式:"
-  if [ "$choice" == "1" ]; then
-    echo "  npx -y @cloudflare-mcp/smart-proxy"
-  else
-    echo "  npx -y cloudflare-mcp-smart-proxy"
-  fi
-  echo ""
-  
-  # 恢复原配置
-  if [ -f "package.json.backup" ]; then
-    mv package.json.backup package.json
-    echo "✅ 已恢复原 package.json"
-  fi
-else
-  echo ""
-  echo "❌ 发布失败"
-  # 恢复原配置
-  if [ -f "package.json.backup" ]; then
-    mv package.json.backup package.json
-  fi
-  exit 1
-fi
-

package/publish.sh

@@ -1,90 +0,0 @@
-#!/bin/bash
-
-# 发布脚本 - 发布 @cloudflare-mcp/smart-proxy 到 npm
-
-set -e
-
-echo "📦 准备发布 cloudflare-mcp-smart-proxy 到 npm"
-echo "=============================================="
-echo ""
-
-# 检查是否在正确的目录
-if [ ! -f "package.json" ]; then
-  echo "❌ 错误: 请在 local-proxy 目录中运行此脚本"
-  exit 1
-fi
-
-# 检查 npm 是否安装
-if ! command -v npm &> /dev/null; then
-  echo "❌ 错误: 需要安装 npm"
-  exit 1
-fi
-
-echo "✅ npm 版本: $(npm -v)"
-echo ""
-
-# 检查是否登录
-echo "检查 npm 登录状态..."
-if ! npm whoami &> /dev/null; then
-  echo "⚠️  未登录 npm，请先登录："
-  echo ""
-  echo "运行: npm login"
-  echo ""
-  read -p "是否现在登录？(y/n) " -n 1 -r
-  echo ""
-  if [[ $REPLY =~ ^[Yy]$ ]]; then
-    npm login
-  else
-    echo "❌ 取消发布"
-    exit 1
-  fi
-else
-  echo "✅ 已登录为: $(npm whoami)"
-fi
-
-echo ""
-
-# 检查包名
-PACKAGE_NAME=$(node -p "require('./package.json').name")
-echo "包名: $PACKAGE_NAME"
-
-# 检查版本
-CURRENT_VERSION=$(node -p "require('./package.json').version")
-echo "当前版本: $CURRENT_VERSION"
-echo ""
-
-# 确认发布
-read -p "确认发布到 npm？(y/n) " -n 1 -r
-echo ""
-if [[ ! $REPLY =~ ^[Yy]$ ]]; then
-  echo "❌ 取消发布"
-  exit 1
-fi
-
-# 运行测试（如果有）
-if [ -f "package.json" ] && grep -q '"test"' package.json; then
-  echo "运行测试..."
-  npm test || echo "⚠️  测试失败，但继续发布..."
-fi
-
-# 发布
-echo ""
-echo "🚀 发布中..."
-npm publish --access public
-
-if [ $? -eq 0 ]; then
-  echo ""
-  echo "=============================================="
-  echo "✅ 发布成功！"
-  echo ""
-  echo "包地址: https://www.npmjs.com/package/$PACKAGE_NAME"
-  echo ""
-  echo "安装方式:"
-  echo "  npx -y $PACKAGE_NAME"
-  echo ""
-else
-  echo ""
-  echo "❌ 发布失败"
-  exit 1
-fi
-