Nicholai/jan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: mcp supports env

Browse Source
This commit is contained in:
Louis 2025-04-09 09:08:17 +07:00
parent 9463ab4491
commit 0b26647d94
No known key found for this signature in database
GPG Key ID: 44FA9F4D33C37DE2
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src-tauri/src/core/mcp.rs
View File

@ -32,11 +32,16 @@ pub async fn run_mcp_commands(
log::info!("MCP Servers: {server_map:#?}"); log::info!("MCP Servers: {server_map:#?}");
for (name, config) in server_map { for (name, config) in server_map {
if let Some((command, args)) = extract_command_args(config) { if let Some((command, args, envs)) = extract_command_args(config) {
let mut cmd = Command::new(command); let mut cmd = Command::new(command);
args.iter().filter_map(Value::as_str).for_each(|arg| { args.iter().filter_map(Value::as_str).for_each(|arg| {
cmd.arg(arg); cmd.arg(arg);
}); });
envs.iter().for_each(|(k, v)| {
if let Some(v_str) = v.as_str() {
cmd.env(k, v_str);
}
});
let service = let service =
().serve(TokioChildProcess::new(&mut cmd).map_err(|e| e.to_string())?) ().serve(TokioChildProcess::new(&mut cmd).map_err(|e| e.to_string())?)
@ -58,11 +63,18 @@ pub async fn run_mcp_commands(
Ok(()) Ok(())
} }
fn extract_command_args(config: &Value) -> Option<(&str, &Vec<Value>)> { fn extract_command_args(
config: &Value,
) -> Option<(String, Vec<Value>, serde_json::Map<String, Value>)> {
let obj = config.as_object()?; let obj = config.as_object()?;
let command = obj.get("command")?.as_str()?; let command = obj.get("command")?.as_str()?.to_string();
let args = obj.get("args")?.as_array()?; let args = obj.get("args")?.as_array()?.clone();
Some((command, args)) let envs = obj
.get("env")
.unwrap_or(&Value::Object(serde_json::Map::new()))
.as_object()?
.clone();
Some((command, args, envs))
} }
#[cfg(test)] #[cfg(test)]