-
Notifications
You must be signed in to change notification settings - Fork 60k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Support MCP( WIP) #5974
base: main
Are you sure you want to change the base?
Support MCP( WIP) #5974
Changes from 4 commits
e1c7c54
c3108ad
664879b
e1ba8f1
fe67f79
77be190
f2a2b40
0c14ce6
7d51bfd
b410ec3
125a71f
e95c94d
a3af563
ce13cf6
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1,2 @@ | ||
public/serviceWorker.js | ||
public/serviceWorker.js | ||
app/mcp/mcp_config.json |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,77 @@ | ||
"use server"; | ||
|
||
import { createClient, executeRequest } from "./client"; | ||
import { MCPClientLogger } from "./logger"; | ||
import conf from "./mcp_config.json"; | ||
|
||
const logger = new MCPClientLogger("MCP Server"); | ||
|
||
// Use Map to store all clients | ||
const clientsMap = new Map<string, any>(); | ||
|
||
// Whether initialized | ||
let initialized = false; | ||
|
||
// Store failed clients | ||
let errorClients: string[] = []; | ||
|
||
// Initialize all configured clients | ||
export async function initializeMcpClients() { | ||
// If already initialized, return | ||
if (initialized) { | ||
return; | ||
} | ||
|
||
logger.info("Starting to initialize MCP clients..."); | ||
|
||
// Initialize all clients, key is clientId, value is client config | ||
for (const [clientId, config] of Object.entries(conf.mcpServers)) { | ||
try { | ||
logger.info(`Initializing MCP client: ${clientId}`); | ||
const client = await createClient(config, clientId); | ||
clientsMap.set(clientId, client); | ||
logger.success(`Client ${clientId} initialized`); | ||
} catch (error) { | ||
errorClients.push(clientId); | ||
logger.error(`Failed to initialize client ${clientId}: ${error}`); | ||
} | ||
} | ||
|
||
initialized = true; | ||
|
||
if (errorClients.length > 0) { | ||
logger.warn(`Failed to initialize clients: ${errorClients.join(", ")}`); | ||
} else { | ||
logger.success("All MCP clients initialized"); | ||
} | ||
|
||
const availableClients = await getAvailableClients(); | ||
|
||
logger.info(`Available clients: ${availableClients.join(",")}`); | ||
} | ||
|
||
// Execute MCP request | ||
export async function executeMcpAction(clientId: string, request: any) { | ||
try { | ||
// Find the corresponding client | ||
const client = clientsMap.get(clientId); | ||
if (!client) { | ||
logger.error(`Client ${clientId} not found`); | ||
return; | ||
} | ||
|
||
logger.info(`Executing MCP request for ${clientId}`); | ||
// Execute request and return result | ||
return await executeRequest(client, request); | ||
} catch (error) { | ||
logger.error(`MCP execution error: ${error}`); | ||
throw error; | ||
} | ||
} | ||
|
||
// Get all available client IDs | ||
export async function getAvailableClients() { | ||
return Array.from(clientsMap.keys()).filter( | ||
(clientId) => !errorClients.includes(clientId), | ||
); | ||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,84 @@ | ||
import { Client } from "@modelcontextprotocol/sdk/client/index.js"; | ||
import { StdioClientTransport } from "@modelcontextprotocol/sdk/client/stdio.js"; | ||
import { MCPClientLogger } from "./logger"; | ||
import { z } from "zod"; | ||
|
||
export interface ServerConfig { | ||
command: string; | ||
args?: string[]; | ||
env?: Record<string, string>; | ||
} | ||
|
||
const logger = new MCPClientLogger(); | ||
|
||
export async function createClient( | ||
serverConfig: ServerConfig, | ||
name: string, | ||
): Promise<Client> { | ||
logger.info(`Creating client for server ${name}`); | ||
|
||
const transport = new StdioClientTransport({ | ||
command: serverConfig.command, | ||
args: serverConfig.args, | ||
env: serverConfig.env, | ||
}); | ||
const client = new Client( | ||
{ | ||
name: `nextchat-mcp-client-${name}`, | ||
version: "1.0.0", | ||
}, | ||
{ | ||
capabilities: { | ||
// roots: { | ||
// listChanged: true, | ||
// }, | ||
}, | ||
}, | ||
); | ||
await client.connect(transport); | ||
return client; | ||
} | ||
|
||
interface Primitive { | ||
type: "resource" | "tool" | "prompt"; | ||
value: any; | ||
} | ||
|
||
/** List all resources, tools, and prompts */ | ||
export async function listPrimitives(client: Client) { | ||
const capabilities = client.getServerCapabilities(); | ||
const primitives: Primitive[] = []; | ||
const promises = []; | ||
if (capabilities?.resources) { | ||
promises.push( | ||
client.listResources().then(({ resources }) => { | ||
resources.forEach((item) => | ||
primitives.push({ type: "resource", value: item }), | ||
); | ||
}), | ||
); | ||
} | ||
if (capabilities?.tools) { | ||
promises.push( | ||
client.listTools().then(({ tools }) => { | ||
tools.forEach((item) => primitives.push({ type: "tool", value: item })); | ||
}), | ||
); | ||
} | ||
if (capabilities?.prompts) { | ||
promises.push( | ||
client.listPrompts().then(({ prompts }) => { | ||
prompts.forEach((item) => | ||
primitives.push({ type: "prompt", value: item }), | ||
); | ||
}), | ||
); | ||
} | ||
await Promise.all(promises); | ||
return primitives; | ||
} | ||
|
||
/** Execute a request */ | ||
export async function executeRequest(client: Client, request: any) { | ||
return client.request(request, z.any()); | ||
} | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Improve request validation and error handling. The current implementation has several concerns:
Consider implementing proper validation and error handling: -export async function executeRequest(client: Client, request: any) {
- return client.request(request, z.any());
+export async function executeRequest(client: Client, request: unknown) {
+ const requestSchema = z.object({
+ // Define your request schema here
+ // Example:
+ // method: z.string(),
+ // params: z.record(z.unknown())
+ });
+
+ try {
+ const validatedRequest = requestSchema.parse(request);
+ return await client.request(validatedRequest, z.unknown());
+ } catch (error) {
+ if (error instanceof z.ZodError) {
+ throw new Error(`Invalid request format: ${error.message}`);
+ }
+ throw error;
+ }
+}
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
import { createClient, listPrimitives } from "@/app/mcp/client"; | ||
import { MCPClientLogger } from "@/app/mcp/logger"; | ||
import conf from "./mcp_config.json"; | ||
|
||
const logger = new MCPClientLogger("MCP Server Example", true); | ||
|
||
async function main() { | ||
logger.info("Connecting to server..."); | ||
|
||
const client = await createClient(conf.mcpServers.everything, "everything"); | ||
const primitives = await listPrimitives(client); | ||
|
||
logger.success(`Connected to server everything`); | ||
|
||
logger.info( | ||
`server capabilities: ${Object.keys( | ||
client.getServerCapabilities() ?? [], | ||
).join(", ")}`, | ||
); | ||
|
||
logger.info("Server supports the following primitives:"); | ||
|
||
primitives.forEach((primitive) => { | ||
logger.info("\n" + JSON.stringify(primitive, null, 2)); | ||
}); | ||
} | ||
|
||
main().catch((error) => { | ||
logger.error(error); | ||
process.exit(1); | ||
}); |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,65 @@ | ||
// ANSI color codes for terminal output | ||
const colors = { | ||
reset: "\x1b[0m", | ||
bright: "\x1b[1m", | ||
dim: "\x1b[2m", | ||
green: "\x1b[32m", | ||
yellow: "\x1b[33m", | ||
red: "\x1b[31m", | ||
blue: "\x1b[34m", | ||
}; | ||
|
||
export class MCPClientLogger { | ||
private readonly prefix: string; | ||
private readonly debugMode: boolean; | ||
|
||
constructor( | ||
prefix: string = "NextChat MCP Client", | ||
debugMode: boolean = false, | ||
) { | ||
this.prefix = prefix; | ||
this.debugMode = debugMode; | ||
} | ||
|
||
info(message: any) { | ||
this.print(colors.blue, message); | ||
} | ||
|
||
success(message: any) { | ||
this.print(colors.green, message); | ||
} | ||
|
||
error(message: any) { | ||
this.print(colors.red, message); | ||
} | ||
|
||
warn(message: any) { | ||
this.print(colors.yellow, message); | ||
} | ||
|
||
debug(message: any) { | ||
if (this.debugMode) { | ||
this.print(colors.dim, message); | ||
} | ||
} | ||
|
||
/** | ||
* Format message to string, if message is object, convert to JSON string | ||
*/ | ||
private formatMessage(message: any): string { | ||
return typeof message === "object" | ||
? JSON.stringify(message, null, 2) | ||
: message; | ||
} | ||
|
||
/** | ||
* Print formatted message to console | ||
*/ | ||
private print(color: string, message: any) { | ||
const formattedMessage = this.formatMessage(message); | ||
const logMessage = `${color}${colors.bright}[${this.prefix}]${colors.reset} ${formattedMessage}`; | ||
|
||
// 只使用 console.log,这样日志会显示在 Tauri 的终端中 | ||
console.log(logMessage); | ||
} | ||
} |
Original file line number | Diff line number | Diff line change | ||||||||||||||||||||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
@@ -0,0 +1,16 @@ | ||||||||||||||||||||||||||||||||||
{ | ||||||||||||||||||||||||||||||||||
"mcpServers": { | ||||||||||||||||||||||||||||||||||
"filesystem": { | ||||||||||||||||||||||||||||||||||
"command": "npx", | ||||||||||||||||||||||||||||||||||
"args": [ | ||||||||||||||||||||||||||||||||||
"-y", | ||||||||||||||||||||||||||||||||||
"@modelcontextprotocol/server-filesystem", | ||||||||||||||||||||||||||||||||||
"/Users/kadxy/Desktop" | ||||||||||||||||||||||||||||||||||
] | ||||||||||||||||||||||||||||||||||
}, | ||||||||||||||||||||||||||||||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Remove hardcoded filesystem path. The filesystem server configuration contains a hardcoded path Consider using environment variables or configuration parameters for the path: - "/Users/kadxy/Desktop"
+ "${MCP_FILESYSTEM_PATH}" 📝 Committable suggestion
Suggested change
|
||||||||||||||||||||||||||||||||||
"everything": { | ||||||||||||||||||||||||||||||||||
"command": "npx", | ||||||||||||||||||||||||||||||||||
"args": ["-y", "@modelcontextprotocol/server-everything"] | ||||||||||||||||||||||||||||||||||
} | ||||||||||||||||||||||||||||||||||
} | ||||||||||||||||||||||||||||||||||
} |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
export function isMcpJson(content: string) { | ||
return content.match(/```json:mcp:(\w+)([\s\S]*?)```/); | ||
} | ||
|
||
export function extractMcpJson(content: string) { | ||
const match = content.match(/```json:mcp:(\w+)([\s\S]*?)```/); | ||
if (match) { | ||
return { clientId: match[1], mcp: JSON.parse(match[2]) }; | ||
} | ||
return null; | ||
} |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🛠️ Refactor suggestion
Replace 'any' type with a more specific type.
Using 'any' type reduces type safety. Consider defining specific types for resource, tool, and prompt values.