@dahawa/hawa-cli-analysis 1.0.7 → 1.0.8

package/codex/mcpserverproxy.js

@@ -1,144 +1,144 @@
-import JsonRpcClient from "./mcpclient.js"
-import { pathToFileURL } from "url";
-import readline from 'node:readline';
-import {getOptions} from "../untils.js"
-import LogManager from "../logger-manager.js";
-const logger = LogManager.getSystemLogger();
-
-// ---- 2) JSON-RPC 帮助函数 ----
-function send(resultOrError, id) {
-  const msg = { jsonrpc: '2.0', ...(resultOrError.error ? { error: resultOrError.error } : { result: resultOrError.result }), id };
-  process.stdout.write(JSON.stringify(msg) + '\n');
-}
-
-function error(code, message, data) {
-  return { error: { code, message, ...(data !== undefined ? { data } : {}) } };
-}
-
-function ok(result) {
-  return { result };
-}
-let  mcpServerName = getOptions().mcpServerName;
-if(!mcpServerName){
-   logger.error("MCP server name is required --mcpServerName=supabase");
-   process.exit(1);
-}
-
-logger.debug("执行代理 MCPServer " + mcpServerName);
-
-// 这里执行异步连接 mcpServer，不需要启动的时候全部连接
-let  mcpclient  = new JsonRpcClient();
-
-logger.debug("执行代理 MCPServer , 创建客户端成功 " );
-
-
-// ---- 3) 处理 JSON-RPC 请求 ----
-async function handleRequest({ id, method, params }) {
-  logger.debug(` handleRequest  ${mcpServerName} ` + JSON.stringify({id,method,params}));
-  try {
-    // a) 初始化握手（极简实现）
-    if (method === 'initialize') {
-      /**   
-      return send(
-        ok({
-          protocolVersion: '2025-03-26', // 示例：协议版本字符串
-          capabilities: { tools: {} },   // 表示支持工具子协议
-          serverInfo: { name: 'Supabase', version: '0.0.1' },
-        }),
-        id,
-      );
-      */
-        let res = await mcpclient.call(`${mcpServerName}_initialize`);
-        logger.debug(" mcpclient result:  " + JSON.stringify(res));
-        return send(ok(res), id);
-    }
-
-    // b) 列出工具
-    if (method === 'tools/list') {
-        let tools = await mcpclient.call(`${mcpServerName}_list`);
-        return send(ok(tools), id);
-    }
-
-    // c) 调用工具
-    if (method === 'tools/call') {
-        let result = await mcpclient.call(`${mcpServerName}_call`, params);
-        return send(ok(result ?? { content: [] }), id);      
-    }
-
-    // d) 可选心跳
-    if (method === 'ping') return send(ok({}), id);
-
-    // e) 未实现的方法
-    return send(error(-32601, `Method not found: ${method}`), id);
-  } catch (e) {
-    logger.error(` handleRequest  ${mcpServerName}  error ` + e?.message + "  " + e + "\nStack trace: " + e.stack);
-    return send(error(-32603, 'Internal error ' + e?.message , { message: String(e?.message || e) }), id);
-  }
-}
-
-// ---- 4) 读 STDIN（每行一个 JSON-RPC 消息） ----
-const rl = readline.createInterface({ input: process.stdin, crlfDelay: Infinity });
-
-rl.on('line', async (line) => {
-  if (!line.trim()) return;
-  let msg;
-  try {
-    msg = JSON.parse(line);
-  } catch {
-    // 非法 JSON：按 JSON-RPC 返回解析错误
-    return send(error(-32700, 'Parse error'), null);
-  }
-
-  // 只处理 Request；Notification 没有 id
-  if (msg?.jsonrpc !== '2.0' || typeof msg?.method !== 'string') {
-    return send(error(-32600, 'Invalid Request'), msg?.id ?? null);
-  }
-  // 异步处理
-  handleRequest(msg);
-});
-
-// 可选：把错误打印到 stderr（不影响 JSON-RPC 数据流）
-process.on('uncaughtException', (e) => console.error('uncaught:', e));
-process.on('unhandledRejection', (e) => console.error('unhandled:', e));
-
-//console.log(`mcpclient.call('${mcpServerName}_list')`);
-//let tools = await mcpclient.call(`${mcpServerName}_list`);
-//console.log(JSON.stringify(tools, null, 2));
-async function main(){
-   logger.debug(`mcpclient.call('${mcpServerName}_initialize')`);
-   try {
-       let initialize = await mcpclient.call(`${mcpServerName}_initialize`);
-       logger.debug(JSON.stringify(initialize, null, 2));
-   } catch (error) {
-       logger.error("Error initializing MCP client:", error);
-   }
-}
-
-/**
- * 判断当前模块是否是主运行模块：
- * ✅ node xxx.js 直接执行 → true
- * 🚫 import 时 → false
- * 🚫 子进程 (spawn/fork) 启动时 → false
- */
-export function isMainModule() {
-  // 当前模块文件 URL
-  const currentFile = pathToFileURL(process.argv[1]).href;
-
-  // 是否为直接运行
-  const isDirectRun = import.meta.url === currentFile;
-
-  // 是否为子进程
-  const isChildProcess =
-    process.send !== undefined ||
-    process.env.__IS_SUBPROCESS__ === "1" ||
-    (process.ppid !== 1 && process.ppid !== process.pid);
-   logger.debug("isChildProcess:",  isDirectRun && !isChildProcess);
-  return isDirectRun && !isChildProcess;
-}
-
-//if(isMainModule()){
-// main();
-//}
-
-logger.debug("Environment Variables: " + JSON.stringify(process.env, null, 2));
+import JsonRpcClient from "./mcpclient.js"
+import { pathToFileURL } from "url";
+import readline from 'node:readline';
+import {getOptions} from "../untils.js"
+import LogManager from "../logger-manager.js";
+const logger = LogManager.getSystemLogger();
+
+// ---- 2) JSON-RPC 帮助函数 ----
+function send(resultOrError, id) {
+  const msg = { jsonrpc: '2.0', ...(resultOrError.error ? { error: resultOrError.error } : { result: resultOrError.result }), id };
+  process.stdout.write(JSON.stringify(msg) + '\n');
+}
+
+function error(code, message, data) {
+  return { error: { code, message, ...(data !== undefined ? { data } : {}) } };
+}
+
+function ok(result) {
+  return { result };
+}
+let  mcpServerName = getOptions().mcpServerName;
+if(!mcpServerName){
+   logger.error("MCP server name is required --mcpServerName=supabase");
+   process.exit(1);
+}
+
+logger.debug("执行代理 MCPServer " + mcpServerName);
+
+// 这里执行异步连接 mcpServer，不需要启动的时候全部连接
+let  mcpclient  = new JsonRpcClient();
+
+logger.debug("执行代理 MCPServer , 创建客户端成功 " );
+
+
+// ---- 3) 处理 JSON-RPC 请求 ----
+async function handleRequest({ id, method, params }) {
+  logger.debug(` handleRequest  ${mcpServerName} ` + JSON.stringify({id,method,params}));
+  try {
+    // a) 初始化握手（极简实现）
+    if (method === 'initialize') {
+      /**   
+      return send(
+        ok({
+          protocolVersion: '2025-03-26', // 示例：协议版本字符串
+          capabilities: { tools: {} },   // 表示支持工具子协议
+          serverInfo: { name: 'Supabase', version: '0.0.1' },
+        }),
+        id,
+      );
+      */
+        let res = await mcpclient.call(`${mcpServerName}_initialize`);
+        logger.debug(" mcpclient result:  " + JSON.stringify(res));
+        return send(ok(res), id);
+    }
+
+    // b) 列出工具
+    if (method === 'tools/list') {
+        let tools = await mcpclient.call(`${mcpServerName}_list`);
+        return send(ok(tools), id);
+    }
+
+    // c) 调用工具
+    if (method === 'tools/call') {
+        let result = await mcpclient.call(`${mcpServerName}_call`, params);
+        return send(ok(result ?? { content: [] }), id);      
+    }
+
+    // d) 可选心跳
+    if (method === 'ping') return send(ok({}), id);
+
+    // e) 未实现的方法
+    return send(error(-32601, `Method not found: ${method}`), id);
+  } catch (e) {
+    logger.error(` handleRequest  ${mcpServerName}  error ` + e?.message + "  " + e + "\nStack trace: " + e.stack);
+    return send(error(-32603, 'Internal error ' + e?.message , { message: String(e?.message || e) }), id);
+  }
+}
+
+// ---- 4) 读 STDIN（每行一个 JSON-RPC 消息） ----
+const rl = readline.createInterface({ input: process.stdin, crlfDelay: Infinity });
+
+rl.on('line', async (line) => {
+  if (!line.trim()) return;
+  let msg;
+  try {
+    msg = JSON.parse(line);
+  } catch {
+    // 非法 JSON：按 JSON-RPC 返回解析错误
+    return send(error(-32700, 'Parse error'), null);
+  }
+
+  // 只处理 Request；Notification 没有 id
+  if (msg?.jsonrpc !== '2.0' || typeof msg?.method !== 'string') {
+    return send(error(-32600, 'Invalid Request'), msg?.id ?? null);
+  }
+  // 异步处理
+  handleRequest(msg);
+});
+
+// 可选：把错误打印到 stderr（不影响 JSON-RPC 数据流）
+process.on('uncaughtException', (e) => console.error('uncaught:', e));
+process.on('unhandledRejection', (e) => console.error('unhandled:', e));
+
+//console.log(`mcpclient.call('${mcpServerName}_list')`);
+//let tools = await mcpclient.call(`${mcpServerName}_list`);
+//console.log(JSON.stringify(tools, null, 2));
+async function main(){
+   logger.debug(`mcpclient.call('${mcpServerName}_initialize')`);
+   try {
+       let initialize = await mcpclient.call(`${mcpServerName}_initialize`);
+       logger.debug(JSON.stringify(initialize, null, 2));
+   } catch (error) {
+       logger.error("Error initializing MCP client:", error);
+   }
+}
+
+/**
+ * 判断当前模块是否是主运行模块：
+ * ✅ node xxx.js 直接执行 → true
+ * 🚫 import 时 → false
+ * 🚫 子进程 (spawn/fork) 启动时 → false
+ */
+export function isMainModule() {
+  // 当前模块文件 URL
+  const currentFile = pathToFileURL(process.argv[1]).href;
+
+  // 是否为直接运行
+  const isDirectRun = import.meta.url === currentFile;
+
+  // 是否为子进程
+  const isChildProcess =
+    process.send !== undefined ||
+    process.env.__IS_SUBPROCESS__ === "1" ||
+    (process.ppid !== 1 && process.ppid !== process.pid);
+   logger.debug("isChildProcess:",  isDirectRun && !isChildProcess);
+  return isDirectRun && !isChildProcess;
+}
+
+//if(isMainModule()){
+// main();
+//}
+
+logger.debug("Environment Variables: " + JSON.stringify(process.env, null, 2));
 logger.debug("Process Arguments: " + JSON.stringify(process.argv, null, 2));

package/codex/test.js

@@ -1,30 +1,30 @@
-import { Client, StreamableHTTPClientTransport } from './mcp-client.js';
-import LogManager from '../logger-manager.js';
-
-const logger = LogManager.getSystemLogger();
-
-const issuer = 'https://radar.mcp.cloudflare.com';
-const client = new Client({ name: 'radar-demo', version: '1.0.0' });
-const transport = new StreamableHTTPClientTransport(`${issuer}/mcp`, {
-
-  oauth: {
-    issuer,
-    // 显式覆盖端点（根据你调试日志里看到的为准）
-    //authorizationUrl: `${issuer}/oauth/authorize`,
-    //tokenUrl:        `${issuer}/oauth/token`,
-    //registrationUrl: `${issuer}/oauth/register`,
-
-    // 先尝试动态注册；如报“no registration_endpoint”，请改为手动 clientId
-    // clientId: '从门户或运维处获得',
-    scopes: ['openid','profile','email','offline_access'],
-    redirectUri: 'http://127.0.0.1:53175/callback',
-    tokenStorePath: '.mcp_oauth_tokens.json',
-    clientName: 'demo-radar-auto-reg',
-    debug: true
-  }
-    
-});
-
-
-await client.connect(transport);             // 需要登录时会自动拉起浏览器
-logger.debug('Radar tools:', await client.listTools());
+import { Client, StreamableHTTPClientTransport } from './mcp-client.js';
+import LogManager from '../logger-manager.js';
+
+const logger = LogManager.getSystemLogger();
+
+const issuer = 'https://radar.mcp.cloudflare.com';
+const client = new Client({ name: 'radar-demo', version: '1.0.0' });
+const transport = new StreamableHTTPClientTransport(`${issuer}/mcp`, {
+
+  oauth: {
+    issuer,
+    // 显式覆盖端点（根据你调试日志里看到的为准）
+    //authorizationUrl: `${issuer}/oauth/authorize`,
+    //tokenUrl:        `${issuer}/oauth/token`,
+    //registrationUrl: `${issuer}/oauth/register`,
+
+    // 先尝试动态注册；如报“no registration_endpoint”，请改为手动 clientId
+    // clientId: '从门户或运维处获得',
+    scopes: ['openid','profile','email','offline_access'],
+    redirectUri: 'http://127.0.0.1:53175/callback',
+    tokenStorePath: '.mcp_oauth_tokens.json',
+    clientName: 'demo-radar-auto-reg',
+    debug: true
+  }
+    
+});
+
+
+await client.connect(transport);             // 需要登录时会自动拉起浏览器
+logger.debug('Radar tools:', await client.listTools());

package/mcp/claude-mcpproxy-launcher.js

@@ -1,5 +1,5 @@
-import {startMCPServerProxy} from "../codex/mcpserver.js"
-
-startMCPServerProxy();
-
+import {startMCPServerProxy} from "../codex/mcpserver.js"
+
+startMCPServerProxy();
+
 process.stdout.write("ok_ok\n");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dahawa/hawa-cli-analysis",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "main": "index",
   "bin": {
     "uclaude": "uclaude.js",
@@ -8,6 +8,7 @@
   },
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
+    "start": "node uclaude.js",
     "publish": "npm publish --access public"
   },
   "type": "module",