cloudflare-mcp-smart-proxy 1.3.0 → 1.3.1

package/index.js

@@ -13,7 +13,7 @@ import {
   ListPromptsRequestSchema,
   GetPromptRequestSchema
 } from '@modelcontextprotocol/sdk/types.js';
-import { SmartRouter } from './src/router.js';
+import { sanitizeProxyError, SmartRouter } from './src/router.js';
 import { LocalToolExecutor } from './src/local-tools.js';
 import { ConnectorBridge } from './src/connector-bridge.js';
 
@@ -156,7 +156,7 @@ server.setRequestHandler(ListPromptsRequestSchema, async () => {
     
     return result.result || { prompts: [] };
   } catch (error) {
-    console.error('Error listing prompts:', error);
+    console.error('Error listing prompts:', { error: sanitizeProxyError(error) });
     return { prompts: [] };
   }
 });
@@ -198,7 +198,9 @@ server.setRequestHandler(GetPromptRequestSchema, async (request) => {
       messages: []
     };
   } catch (error) {
-    console.error(`Error getting prompt:`, error);
+    console.error('Error getting prompt:', {
+      error: sanitizeProxyError(error, request.params?.arguments || {})
+    });
     return {
       description: '',
       messages: []

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloudflare-mcp-smart-proxy",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "description": "Smart proxy for Cloudflare MCP - routes tools to cloud or local execution",
   "type": "module",
   "packageManager": "pnpm@10.33.0",
@@ -24,7 +24,17 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@modelcontextprotocol/sdk": "^1.0.0"
+    "@modelcontextprotocol/sdk": "^1.30.0"
+  },
+  "pnpm": {
+    "overrides": {
+      "@hono/node-server": "2.0.12",
+      "ajv": "8.20.0",
+      "body-parser": "2.3.0",
+      "fast-uri": "3.1.4",
+      "path-to-regexp": "8.4.0",
+      "qs": "6.15.3"
+    }
   },
   "engines": {
     "node": ">=18.0.0"

package/src/cloud-client.js

@@ -27,14 +27,16 @@ export class CloudClient {
 
   async request(path, { method = 'GET', body, query, idempotencyKey } = {}) {
     const serializedBody = body == null ? '' : JSON.stringify(body);
+    const requestUrl = new URL(this.buildUrl(path, query));
     const signedHeaders = this.deviceIdentity
       ? await this.deviceIdentity.buildSignedHeaders({
           method,
-          pathname: new URL(this.buildUrl(path, query)).pathname,
+          pathname: requestUrl.pathname,
+          search: requestUrl.search,
           body: serializedBody
         })
       : {};
-    const response = await fetch(this.buildUrl(path, query), {
+    const response = await fetch(requestUrl, {
       method,
       headers: {
         'Authorization': `Bearer ${this.cloudApiKey}`,

package/src/device-identity.js

@@ -4,7 +4,7 @@ import path from 'path';
 import { webcrypto } from 'crypto';
 
 const subtle = webcrypto.subtle;
-const DEVICE_SIGNATURE_VERSION = 'device_sig_v1';
+const DEVICE_SIGNATURE_VERSION = 'device_sig_v2';
 
 function bytesToBase64(bytes) {
   return Buffer.from(bytes).toString('base64');
@@ -59,7 +59,7 @@ export class DeviceIdentity {
     return this.record;
   }
 
-  async buildSignedHeaders({ method, pathname, body = '' }) {
+  async buildSignedHeaders({ method, pathname, search = '', body = '' }) {
     const record = await this.loadOrCreate();
     const timestamp = String(Date.now());
     const nonce = crypto.randomUUID();
@@ -67,7 +67,7 @@ export class DeviceIdentity {
     const canonical = [
       DEVICE_SIGNATURE_VERSION,
       String(method || 'GET').toUpperCase(),
-      pathname || '/',
+      `${pathname || '/'}${search || ''}`,
       bodyHash,
       timestamp,
       nonce
@@ -79,6 +79,7 @@ export class DeviceIdentity {
     );
     return {
       'X-CloudMCP-Device-ID': record.deviceId,
+      'X-CloudMCP-Device-Signature-Version': DEVICE_SIGNATURE_VERSION,
       'X-CloudMCP-Device-Timestamp': timestamp,
       'X-CloudMCP-Device-Nonce': nonce,
       'X-CloudMCP-Device-Signature': bytesToBase64(signature)

package/src/router.js

@@ -2,6 +2,41 @@
  * 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, deviceIdentity = null) {
     this.cloudUrl = cloudUrl.replace(/\/$/, ''); // 移除尾部斜杠
@@ -195,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);
       }
       
       // 提取结果内容
@@ -229,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}`);
     }
   }