tyc-cli 0.1.1 → 0.2.0

package/dist/mcpClient.js

@@ -0,0 +1,157 @@
+// MCP JSON-RPC over Streamable HTTP 客户端
+//
+// 职责：
+//   1. initialize：拿 Mcp-Session-Id（服务端在响应 header 下发）
+//   2. tools/call：透传 Authorization + Mcp-Session-Id，解析 SSE/JSON 响应
+//   3. Session 失效（404/410 或服务端 "session not found"）→ 清 session → 重试 1 次
+//
+// 不做：
+//   - 不维护 tools/list 缓存（CLI 命令树从本地 catalog.json 构建）
+//   - 不做业务聚合/时间戳格式化（由 MCP Server 完成）
+//   - 不做 Authorization 解析/验签
+import { clearSession, isSessionFresh, loadSession, saveSession } from "./session.js";
+const PROTOCOL_VERSION = "2024-11-05";
+function maskToken(v) {
+    if (!v)
+        return "";
+    if (v.length <= 8)
+        return "****";
+    return v.slice(0, 4) + "****" + v.slice(-4);
+}
+function logVerbose(cfg, title, extra) {
+    const masked = {};
+    for (const [k, v] of Object.entries(cfg.headers)) {
+        masked[k] = k.toLowerCase() === "authorization" ? maskToken(v) : v;
+    }
+    console.error(`> ${title}`);
+    console.error(`> headers: ${JSON.stringify(masked)}`);
+    if (extra)
+        console.error(extra);
+}
+/** 解析 MCP Streamable HTTP 响应：纯 JSON 或 SSE（`event:` + `data:` 行）。 */
+function parseJsonRpc(raw) {
+    const trimmed = raw.trim();
+    if (trimmed.startsWith("{")) {
+        return JSON.parse(trimmed);
+    }
+    // SSE 解析：抓第一个解析成功的 data 行
+    for (const line of trimmed.split(/\r?\n/)) {
+        const s = line.trim();
+        if (!s.startsWith("data:"))
+            continue;
+        const body = s.slice(5).trim();
+        if (!body.startsWith("{"))
+            continue;
+        try {
+            return JSON.parse(body);
+        }
+        catch { /* try next */ }
+    }
+    throw new Error(`Unparseable MCP response: ${trimmed.slice(0, 200)}`);
+}
+async function httpPost(url, headers, body, verbose) {
+    const h = {
+        "Content-Type": "application/json",
+        "Accept": "application/json, text/event-stream",
+        ...headers,
+    };
+    if (verbose) {
+        console.error(`> POST ${url}`);
+        const masked = {};
+        for (const [k, v] of Object.entries(h)) {
+            masked[k] = k.toLowerCase() === "authorization" ? maskToken(v) : v;
+        }
+        console.error(`> headers: ${JSON.stringify(masked)}`);
+        console.error(`> body: ${JSON.stringify(body)}`);
+    }
+    const resp = await fetch(url, {
+        method: "POST",
+        headers: h,
+        body: JSON.stringify(body),
+    });
+    const text = await resp.text();
+    if (verbose) {
+        console.error(`< ${resp.status} ${resp.statusText}`);
+        console.error(`< body: ${text.slice(0, 2000)}`);
+    }
+    return { status: resp.status, text, headers: resp.headers };
+}
+async function doInitialize(cfg, verbose) {
+    if (verbose)
+        logVerbose(cfg, `MCP initialize → ${cfg.url}`);
+    const { status, text, headers } = await httpPost(cfg.url, cfg.headers, {
+        jsonrpc: "2.0",
+        id: 1,
+        method: "initialize",
+        params: {
+            protocolVersion: PROTOCOL_VERSION,
+            capabilities: {},
+            clientInfo: { name: "tyc-cli", version: "0.2.0" },
+        },
+    }, verbose);
+    if (status < 200 || status >= 300) {
+        throw new Error(`initialize 失败：HTTP ${status}\n${text.slice(0, 500)}`);
+    }
+    const sessionId = headers.get("Mcp-Session-Id") || headers.get("mcp-session-id");
+    if (!sessionId) {
+        throw new Error(`initialize 响应未包含 Mcp-Session-Id header。请确认 ${cfg.url} 是 Streamable HTTP MCP Server。`);
+    }
+    const rpc = parseJsonRpc(text);
+    if (rpc.error) {
+        throw new Error(`initialize JSON-RPC error: ${rpc.error.message}`);
+    }
+    const s = {
+        url: cfg.url,
+        sessionId,
+        initializedAt: Date.now(),
+        protocolVersion: rpc.result?.protocolVersion,
+    };
+    saveSession(s);
+    return s;
+}
+/** 获取可用 session：若缓存新鲜则复用，否则 initialize + 落盘。 */
+export async function ensureSession(cfg, opts) {
+    const cached = loadSession();
+    if (isSessionFresh(cached, cfg.url))
+        return cached;
+    return doInitialize(cfg, !!opts?.verbose);
+}
+function isSessionInvalidResponse(status, text) {
+    if (status === 404 || status === 410)
+        return true;
+    const lower = text.toLowerCase();
+    return lower.includes("session not found") || lower.includes("invalid session");
+}
+/** 调用 MCP tool；透明处理 session 失效重建。 */
+export async function callTool(cfg, name, args, opts) {
+    const verbose = !!opts?.verbose;
+    let session = await ensureSession(cfg, opts);
+    const doCall = async (s) => {
+        const h = { ...cfg.headers, "Mcp-Session-Id": s.sessionId };
+        return httpPost(cfg.url, h, {
+            jsonrpc: "2.0",
+            id: 2,
+            method: "tools/call",
+            params: { name, arguments: args },
+        }, verbose);
+    };
+    let resp = await doCall(session);
+    if (isSessionInvalidResponse(resp.status, resp.text)) {
+        if (verbose)
+            console.error("> session invalid, re-initializing …");
+        clearSession();
+        session = await doInitialize(cfg, verbose);
+        resp = await doCall(session);
+    }
+    if (resp.status < 200 || resp.status >= 300) {
+        throw new Error(`tools/call HTTP ${resp.status}\n${resp.text.slice(0, 500)}`);
+    }
+    const rpc = parseJsonRpc(resp.text);
+    if (rpc.error) {
+        throw new Error(`MCP error ${rpc.error.code}: ${rpc.error.message}`);
+    }
+    if (!rpc.result) {
+        throw new Error("tools/call 响应缺少 result 字段");
+    }
+    return rpc.result;
+}

package/dist/registry.js

@@ -1,25 +1,23 @@
+// 从 src/catalog.json 加载命令树元数据
+//
+// catalog.json 由 apimcp 主仓 scripts/gen_cli_catalog 生成；仅包含 CLI
+// 需要的字段（name / group / layer / cliMethod / categoryNameZh /
+// description / params）。不含 sources / execution / summary 等服务端
+// 内部映射，服务端实现细节不泄露。
 import { readFileSync } from "node:fs";
 import { resolve, dirname } from "node:path";
 import { fileURLToPath } from "node:url";
 const __dirname = dirname(fileURLToPath(import.meta.url));
-const REGISTRY_PATH = resolve(__dirname, "generated/t1_1-registry.json");
-let _registry = null;
-let _byName = null;
+const CATALOG_PATH = resolve(__dirname, "catalog.json");
+let _catalog = null;
 let _byGroup = null;
+let _byLayer = null;
 function load() {
-    if (!_registry) {
-        const raw = readFileSync(REGISTRY_PATH, "utf-8");
-        _registry = JSON.parse(raw);
+    if (!_catalog) {
+        const raw = readFileSync(CATALOG_PATH, "utf-8");
+        _catalog = JSON.parse(raw);
     }
-    return _registry;
-}
-function byName() {
-    if (!_byName) {
-        _byName = new Map();
-        for (const t of load().tools)
-            _byName.set(t.name, t);
-    }
-    return _byName;
+    return _catalog;
 }
 function byGroup() {
     if (!_byGroup) {
@@ -32,6 +30,17 @@ function byGroup() {
     }
     return _byGroup;
 }
+function byLayer() {
+    if (!_byLayer) {
+        _byLayer = new Map();
+        for (const t of load().tools) {
+            const arr = _byLayer.get(t.layer) || [];
+            arr.push(t);
+            _byLayer.set(t.layer, arr);
+        }
+    }
+    return _byLayer;
+}
 export function getTotalCount() {
     return load().tools.length;
 }
@@ -41,6 +50,15 @@ export function getCategories() {
 export function getToolsByGroup(group) {
     return byGroup().get(group) || [];
 }
-export function getTool(name) {
-    return byName().get(name);
+export function getToolsByLayer(layer) {
+    return byLayer().get(layer) || [];
+}
+export function getLayerSummaries() {
+    return load().layers;
+}
+export function getLayerCount(layer) {
+    return getLayerSummaries().find((l) => l.layer === layer)?.count ?? 0;
+}
+export function getCategoryName(group) {
+    return getCategories().find((c) => c.group === group)?.name_zh ?? group;
 }

package/dist/session.js

@@ -0,0 +1,47 @@
+// ~/.tyc/session.json 读写 + 24h TTL
+//
+// TTL 规则（按字面 24h，从 initializedAt 起）：
+//   - 命中：复用 sessionId，跳过 initialize
+//   - 过期 / url 变化：强制重新 initialize
+//   - 服务端主动失效（4xx + session 提示）：mcpClient 调 clearSession 后重建
+import { readFileSync, writeFileSync, mkdirSync, existsSync, rmSync, chmodSync } from "node:fs";
+import { join } from "node:path";
+import { homedir } from "node:os";
+const SESSION_DIR = join(homedir(), ".tyc");
+const SESSION_FILE = join(SESSION_DIR, "session.json");
+export const SESSION_TTL_MS = 24 * 60 * 60 * 1000; // 24h 字面
+export function loadSession() {
+    if (!existsSync(SESSION_FILE))
+        return null;
+    try {
+        const raw = readFileSync(SESSION_FILE, "utf-8");
+        return JSON.parse(raw);
+    }
+    catch {
+        return null;
+    }
+}
+export function saveSession(s) {
+    if (!existsSync(SESSION_DIR))
+        mkdirSync(SESSION_DIR, { recursive: true, mode: 0o700 });
+    writeFileSync(SESSION_FILE, JSON.stringify(s, null, 2) + "\n", "utf-8");
+    try {
+        chmodSync(SESSION_FILE, 0o600);
+    }
+    catch { /* best effort */ }
+}
+export function clearSession() {
+    try {
+        rmSync(SESSION_FILE, { force: true });
+    }
+    catch { /* ignore */ }
+}
+export function isSessionFresh(s, url, now = Date.now()) {
+    if (!s)
+        return false;
+    if (s.url !== url)
+        return false;
+    if (!s.sessionId)
+        return false;
+    return now - s.initializedAt < SESSION_TTL_MS;
+}

package/dist/types.js

@@ -1 +1,9 @@
+// 共享类型定义
+//
+// CLI 运行时模型：
+//  - Catalog：构建时由 apimcp 主仓生成，打包在 src/catalog.json，用于构建命令树
+//  - MCP 层类型：JSON-RPC 请求/响应、tools/call 结果
+//  - Session：本地缓存的 MCP 会话状态（~/.tyc/session.json）
+//  - Config：CLI 配置（~/.tyc/config.json），与主流 MCP 客户端配置风格一致
+//    { url, headers }
 export {};

package/package.json

@@ -1,17 +1,16 @@
 {
   "name": "tyc-cli",
-  "version": "0.1.1",
-  "description": "天眼查 OpenAPI 业务语义层命令行工具 — 167 个聚合工具 / 15 个分类 / 命令行 30 秒直查企业数据",
+  "version": "0.2.0",
+  "description": "天眼查 MCP CLI — 167 个业务语义聚合工具 · 命令行直达企业数据 · 通过 MCP Server 调用",
   "main": "dist/index.js",
   "bin": {
     "tyc": "./dist/index.js"
   },
   "scripts": {
-    "prebuild": "tsx scripts/build-registry.ts",
-    "build": "npm run prebuild && tsc && mkdir -p dist/generated && cp src/generated/t1_1-registry.json dist/generated/",
+    "build": "tsc && cp src/catalog.json dist/catalog.json",
     "dev": "tsx src/index.ts",
-    "lint": "eslint src/ scripts/",
-    "lint:fix": "eslint src/ scripts/ --fix",
+    "lint": "eslint src/",
+    "lint:fix": "eslint src/ --fix",
     "test": "vitest run",
     "test:coverage": "vitest run --coverage",
     "prepublishOnly": "npm run build"
@@ -26,6 +25,7 @@
     "cli",
     "ai-agent",
     "mcp",
+    "mcp-client",
     "enterprise-data",
     "due-diligence",
     "kyb"
@@ -43,7 +43,6 @@
   },
   "files": [
     "dist/",
-    "api-registry.yaml",
     "LICENSE",
     "README.md",
     "CHANGELOG.md"
@@ -62,7 +61,6 @@
     "eslint": "^9.0.0",
     "tsx": "^4.0.0",
     "typescript": "^5.7.0",
-    "vitest": "^2.0.0",
-    "yaml": "^2.7.0"
+    "vitest": "^2.0.0"
   }
 }