|
|
@@ -8,6 +8,7 @@ const transportMocks = vi.hoisted(() => ({
|
|
|
|
|
|
const clientMocks = vi.hoisted(() => ({
|
|
|
call: vi.fn(),
|
|
|
+ notify: vi.fn(async () => {}),
|
|
|
close: vi.fn(async () => {}),
|
|
|
JsonRpcClient: vi.fn(),
|
|
|
}))
|
|
|
@@ -43,14 +44,19 @@ describe("RealMcpConnector", () => {
|
|
|
transportMocks.TauriStdioTransport.mockImplementation(function (this: { options: unknown }, options) {
|
|
|
this.options = options
|
|
|
})
|
|
|
- clientMocks.JsonRpcClient.mockImplementation(function (this: { call: unknown; close: unknown }) {
|
|
|
+ clientMocks.JsonRpcClient.mockImplementation(function (this: { call: unknown; notify: unknown; close: unknown }) {
|
|
|
this.call = clientMocks.call
|
|
|
+ this.notify = clientMocks.notify
|
|
|
this.close = clientMocks.close
|
|
|
})
|
|
|
- clientMocks.call.mockResolvedValue({})
|
|
|
+ clientMocks.call.mockImplementation(async (method: string) => {
|
|
|
+ if (method === "initialize") return {}
|
|
|
+ if (method === "tools/list") return { tools: [] }
|
|
|
+ return {}
|
|
|
+ })
|
|
|
})
|
|
|
|
|
|
- it("ensureConnected 首次调用时创建 stdio transport 并 initialize", async () => {
|
|
|
+ it("ensureConnected 首次调用时握手：initialize + notifications/initialized + tools/list", async () => {
|
|
|
const connector = new RealMcpConnector(config)
|
|
|
|
|
|
await connector.ensureConnected("graph")
|
|
|
@@ -62,21 +68,26 @@ describe("RealMcpConnector", () => {
|
|
|
env: undefined,
|
|
|
})
|
|
|
expect(clientMocks.call).toHaveBeenCalledWith("initialize", expect.any(Object))
|
|
|
+ expect(clientMocks.notify).toHaveBeenCalledWith("notifications/initialized")
|
|
|
+ expect(clientMocks.call).toHaveBeenCalledWith("tools/list", {})
|
|
|
})
|
|
|
|
|
|
- it("ensureConnected 已连接时复用 client", async () => {
|
|
|
+ it("ensureConnected 已连接时复用 client，不重复握手", async () => {
|
|
|
const connector = new RealMcpConnector(config)
|
|
|
|
|
|
await connector.ensureConnected("graph")
|
|
|
await connector.ensureConnected("graph")
|
|
|
|
|
|
expect(clientMocks.JsonRpcClient).toHaveBeenCalledTimes(1)
|
|
|
- expect(clientMocks.call).toHaveBeenCalledTimes(1)
|
|
|
+ // 握手期两枚 call（initialize + tools/list），notify 一枚；复用时不再增加
|
|
|
+ expect(clientMocks.call).toHaveBeenCalledTimes(2)
|
|
|
+ expect(clientMocks.notify).toHaveBeenCalledTimes(1)
|
|
|
})
|
|
|
|
|
|
it("call 成功时返回 ok 结果", async () => {
|
|
|
clientMocks.call.mockImplementation(async (method: string) => {
|
|
|
if (method === "initialize") return {}
|
|
|
+ if (method === "tools/list") return { tools: [] }
|
|
|
return { content: [{ type: "text", text: "图谱结果" }] }
|
|
|
})
|
|
|
const connector = new RealMcpConnector(config)
|
|
|
@@ -98,6 +109,7 @@ describe("RealMcpConnector", () => {
|
|
|
it("call 失败时返回中文降级信息", async () => {
|
|
|
clientMocks.call.mockImplementation(async (method: string) => {
|
|
|
if (method === "initialize") return {}
|
|
|
+ if (method === "tools/list") return { tools: [] }
|
|
|
throw new Error("连接断开")
|
|
|
})
|
|
|
const connector = new RealMcpConnector(config)
|
|
|
@@ -122,4 +134,79 @@ describe("RealMcpConnector", () => {
|
|
|
|
|
|
expect(clientMocks.close).toHaveBeenCalled()
|
|
|
})
|
|
|
+
|
|
|
+ it("listRemoteTools 返回握手拉取的远端工具列表", async () => {
|
|
|
+ clientMocks.call.mockImplementation(async (method: string) => {
|
|
|
+ if (method === "initialize") return {}
|
|
|
+ if (method === "tools/list") {
|
|
|
+ return {
|
|
|
+ tools: [
|
|
|
+ { name: "query_graph", description: "查询图谱", inputSchema: { type: "object" } },
|
|
|
+ { name: "analyze", description: "分析关系", inputSchema: { type: "object" } },
|
|
|
+ ],
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return {}
|
|
|
+ })
|
|
|
+ const connector = new RealMcpConnector(config)
|
|
|
+
|
|
|
+ const tools = await connector.listRemoteTools("graph")
|
|
|
+
|
|
|
+ expect(tools).toHaveLength(2)
|
|
|
+ expect(tools[0]).toEqual(expect.objectContaining({ name: "query_graph" }))
|
|
|
+ })
|
|
|
+
|
|
|
+ it("testConnection 成功时返回中文成功信息与工具数", async () => {
|
|
|
+ clientMocks.call.mockImplementation(async (method: string) => {
|
|
|
+ if (method === "initialize") return {}
|
|
|
+ if (method === "tools/list") {
|
|
|
+ return { tools: [{ name: "a" }, { name: "b" }, { name: "c" }] }
|
|
|
+ }
|
|
|
+ return {}
|
|
|
+ })
|
|
|
+ const connector = new RealMcpConnector(config)
|
|
|
+
|
|
|
+ const result = await connector.testConnection("graph")
|
|
|
+
|
|
|
+ expect(result.status).toBe("ok")
|
|
|
+ expect(result.toolCount).toBe(3)
|
|
|
+ expect(result.message).toContain("连接成功")
|
|
|
+ expect(result.message).toContain("3")
|
|
|
+ })
|
|
|
+
|
|
|
+ it("testConnection 启动命令缺失时返回中文错误信息", async () => {
|
|
|
+ const noCommandConfig: McpConfig = {
|
|
|
+ servers: [{ ...config.servers[0], command: undefined }],
|
|
|
+ }
|
|
|
+ const connector = new RealMcpConnector(noCommandConfig)
|
|
|
+
|
|
|
+ const result = await connector.testConnection("graph")
|
|
|
+
|
|
|
+ expect(result.status).toBe("error")
|
|
|
+ expect(result.message).toContain("未配置启动命令")
|
|
|
+ })
|
|
|
+
|
|
|
+ it("mergeRemoteTools 用远端 description 覆盖本地同名工具，保留本地 operation 权限", async () => {
|
|
|
+ clientMocks.call.mockImplementation(async (method: string) => {
|
|
|
+ if (method === "initialize") return {}
|
|
|
+ if (method === "tools/list") {
|
|
|
+ return {
|
|
|
+ tools: [{
|
|
|
+ name: "query_graph",
|
|
|
+ description: "Remote updated description",
|
|
|
+ inputSchema: { type: "object", properties: { q: { type: "string" } }, required: ["q"] },
|
|
|
+ }],
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return {}
|
|
|
+ })
|
|
|
+ const connector = new RealMcpConnector(config)
|
|
|
+ await connector.ensureConnected("graph")
|
|
|
+
|
|
|
+ const merged = connector.mergeRemoteTools("graph", config.servers[0].tools)
|
|
|
+
|
|
|
+ expect(merged[0].description).toBe("Remote updated description")
|
|
|
+ expect(merged[0].operation).toBe("read")
|
|
|
+ expect(merged[0].inputSchema.required).toEqual(["q"])
|
|
|
+ })
|
|
|
})
|
Mochocyang