Skip to content

fix(mcp): 修复 Nacos MCP Gateway 解析 Nacos MCP 模版的若干问题 #2388

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Sep 14, 2025
Merged

fix(mcp): 修复 Nacos MCP Gateway 解析 Nacos MCP 模版的若干问题 #2388

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions ...common/src/main/java/com/alibaba/cloud/ai/mcp/nacos/service/NacosMcpOperationService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import com.alibaba.nacos.api.ai.model.mcp.McpServerDetailInfo;
import com.alibaba.nacos.api.ai.model.mcp.McpServiceRef;
import com.alibaba.nacos.api.ai.model.mcp.McpToolSpecification;
import com.alibaba.nacos.api.config.ConfigService;
import com.alibaba.nacos.api.exception.NacosException;
import com.alibaba.nacos.api.naming.NamingService;
import com.alibaba.nacos.api.naming.pojo.Instance;
Expand Down Expand Up @@ -54,13 +55,16 @@ public class NacosMcpOperationService {

private final NamingService namingService;

private final ConfigService configService;

private final String namespace;

private final Map<String, List<NacosMcpSubscriber>> subscribers;

public NacosMcpOperationService(Properties nacosProperties) throws NacosException {
this.aiMaintainerService = AiMaintainerFactory.createAiMaintainerService(nacosProperties);
this.namingService = NacosFactory.createNamingService(nacosProperties);
this.configService = NacosFactory.createConfigService(nacosProperties);
this.namespace = nacosProperties.getProperty(PropertyKeyConst.NAMESPACE, "public");
this.subscribers = new ConcurrentHashMap<>();
ScheduledExecutorService executorService = new ScheduledThreadPoolExecutor(1, r -> {
Expand All @@ -73,6 +77,10 @@ public NacosMcpOperationService(Properties nacosProperties) throws NacosExceptio
executorService.scheduleWithFixedDelay(this::getServerChange, 30, 30, TimeUnit.SECONDS);
}

public ConfigService getConfigService() {
return configService;
}

private void getServerChange() {
for (Map.Entry<String, List<NacosMcpSubscriber>> entry : subscribers.entrySet()) {
String mcpNameAndVersion = entry.getKey();
Expand Down
8 changes: 7 additions & 1 deletion ...src/main/java/com/alibaba/cloud/ai/mcp/gateway/core/jsontemplate/RequestTemplateInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@

import com.fasterxml.jackson.databind.JsonNode;

/**
* @author Sunrisea
*/
public class RequestTemplateInfo {

public String url;
Expand All @@ -36,8 +39,10 @@ public class RequestTemplateInfo {

public JsonNode rawNode;

public JsonNode argsPosition;

public RequestTemplateInfo(String url, String method, boolean argsToUrlParam, boolean argsToJsonBody,
boolean argsToFormBody, JsonNode headers, JsonNode body, JsonNode rawNode) {
boolean argsToFormBody, JsonNode headers, JsonNode body, JsonNode argsPosition, JsonNode rawNode) {
this.url = url;
this.method = method;
this.argsToUrlParam = argsToUrlParam;
Expand All @@ -46,6 +51,7 @@ public RequestTemplateInfo(String url, String method, boolean argsToUrlParam, bo
this.headers = headers;
this.body = body;
this.rawNode = rawNode;
this.argsPosition = argsPosition;
}

}
244 changes: 209 additions & 35 deletions ...c/main/java/com/alibaba/cloud/ai/mcp/gateway/core/jsontemplate/RequestTemplateParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@
package com.alibaba.cloud.ai.mcp.gateway.core.jsontemplate;

import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.slf4j.Logger;
import org.springframework.util.LinkedMultiValueMap;
import org.springframework.util.MultiValueMap;
import org.springframework.web.reactive.function.BodyInserters;
Expand All @@ -25,60 +27,202 @@

import java.net.URI;
import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
import java.util.function.BiFunction;
import java.util.regex.Matcher;
import java.util.regex.Pattern;

public class RequestTemplateParser {

public static RequestTemplateInfo parseRequestTemplate(JsonNode requestTemplate) {
public static final Pattern PATH_VARIABLES_PATTERN = Pattern.compile("(?<!\\{)\\{([^}]+)\\}(?!\\})");

public static RequestTemplateInfo parseRequestTemplate(JsonNode requestTemplate, JsonNode argsPosition) {
String url = requestTemplate.path("url").asText();
String method = requestTemplate.path("method").asText();
boolean argsToUrlParam = requestTemplate.path("argsToUrlParam").asBoolean(false);
boolean argsToJsonBody = requestTemplate.path("argsToJsonBody").asBoolean(false);
boolean argsToFormBody = requestTemplate.path("argsToFormBody").asBoolean(false);
JsonNode headers = requestTemplate.path("headers");
JsonNode body = requestTemplate.path("body");
if (body.isMissingNode() && !argsToJsonBody && !argsToFormBody) {
argsToUrlParam = true;
}
int optionCount = (argsToUrlParam ? 1 : 0) + (argsToJsonBody ? 1 : 0) + (argsToFormBody ? 1 : 0)
+ (body.isMissingNode() ? 0 : 1);
if (optionCount > 1) {
throw new IllegalArgumentException(
"Only one of urlToParam, argsToJsonBody, argsToFormBody, or argsToUrlParam should be specified");
}
return new RequestTemplateInfo(url, method, argsToUrlParam, argsToJsonBody, argsToFormBody, headers, body,
requestTemplate);
argsPosition, requestTemplate);
}

public static URI buildUri(UriBuilder builder, String processedUrl, RequestTemplateInfo info,
Map<String, Object> args) {
builder.path(processedUrl);
if (info.argsToUrlParam) {
for (Map.Entry<String, Object> entry : args.entrySet()) {
String key = entry.getKey();
Object value = entry.getValue();
if (value != null) {
if (value instanceof final Collection<?> collection) {
for (Object item : collection) {
builder.queryParam(key, item);
// 检查URL是否包含查询参数
if (processedUrl.contains("?")) {
// 如果URL包含查询参数，需要分别处理路径和查询参数
String[] urlParts = processedUrl.split("\\?", 2);
String path = urlParts[0];
String existingQuery = urlParts.length > 1 ? urlParts[1] : "";

// 设置路径
builder.path(path);

// 解析现有的查询参数
if (!existingQuery.isEmpty()) {
String[] queryPairs = existingQuery.split("&");
for (String pair : queryPairs) {
if (!pair.isEmpty()) {
String[] keyValue = pair.split("=", 2);
if (keyValue.length == 2) {
builder.queryParam(keyValue[0], keyValue[1]);
}
else if (keyValue.length == 1) {
builder.queryParam(keyValue[0], "");
}
}
else {
builder.queryParam(key, value);
}
}
}
else {
// 如果URL不包含查询参数，直接设置路径
builder.path(processedUrl);
}

// 添加额外的查询参数
for (Map.Entry<String, Object> entry : args.entrySet()) {
String key = entry.getKey();
Object value = entry.getValue();
boolean addToQuery = info.argsToUrlParam;
if (info.argsPosition != null && info.argsPosition.has(key)) {
String position = info.argsPosition.path(key).asText();
addToQuery = "query".equals(position);
}
if (addToQuery && value != null) {
if (value instanceof final Collection<?> collection) {
for (Object item : collection) {
builder.queryParam(key, item);
}
}
else if (value instanceof Map<?, ?> map) {
for (Map.Entry<?, ?> kvEntry : map.entrySet()) {
if (kvEntry.getKey() != null && kvEntry.getValue() != null) {
builder.queryParam(kvEntry.getKey().toString(), kvEntry.getValue());
}
}
}
else {
builder.queryParam(key, value);
}
}
}
return builder.build();
}

public static void addHeaders(WebClient.RequestBodySpec requestSpec, JsonNode headersNode, Map<String, Object> args,
java.util.function.BiFunction<String, Map<String, Object>, String> templateProcessor) {
private static void handleCookies(WebClient.RequestBodySpec requestSpec, MultiValueMap<String, String> headers,
RequestTemplateInfo info, Map<String, Object> args) {

// 从args中查找cookie相关参数
StringBuilder cookieBuilder = new StringBuilder();

for (Map.Entry<String, Object> entry : args.entrySet()) {
String key = entry.getKey();
Object value = entry.getValue();

if (value != null) {
// 检查是否指定了cookie位置
if (info.argsPosition != null && info.argsPosition.has(key)) {
String position = info.argsPosition.path(key).asText();
if ("cookie".equals(position)) {
if (!cookieBuilder.isEmpty()) {
cookieBuilder.append("; ");
}
cookieBuilder.append(key).append("=").append(value.toString());
}
}
}
}
// 如果有cookie，添加到请求头
if (!cookieBuilder.isEmpty()) {
String cookieHeader = cookieBuilder.toString();
requestSpec.header("Cookie", cookieHeader);
headers.add("Cookie", cookieHeader);
}
}

public static MultiValueMap<String, String> addHeaders(WebClient.RequestBodySpec requestSpec,
RequestTemplateInfo info, Map<String, Object> args,
BiFunction<String, Map<String, Object>, String> templateProcessor) {
MultiValueMap<String, String> headers = new LinkedMultiValueMap<>();
JsonNode headersNode = info.headers;
if (headersNode != null && headersNode.isArray()) {
for (JsonNode header : headersNode) {
String key = header.path("key").asText();
String valueTemplate = header.path("value").asText();
String value = templateProcessor.apply(valueTemplate, args);
Map<String, Object> params = new HashMap<>();
params.put("args", args);
params.put("extendedData", "");
String value = templateProcessor.apply(valueTemplate, params);
requestSpec.header(key, value);
headers.add(key, value);
}
}

handleCookies(requestSpec, headers, info, args);
for (Map.Entry<String, Object> entry : args.entrySet()) {
String key = entry.getKey();
Object value = entry.getValue();
boolean addToHeader = false;
if (info.argsPosition != null && info.argsPosition.has(key)) {
String position = info.argsPosition.path(key).asText();
addToHeader = "header".equals(position);
}
if (addToHeader && value != null) {
if (value instanceof final Collection<?> collection) {
for (Object item : collection) {
requestSpec.header(key, String.valueOf(item));
headers.add(key, String.valueOf(item));
}
}
else {
requestSpec.header(key, String.valueOf(value));
headers.add(key, String.valueOf(value));
}
}
}
return headers;
}

public static String addPathVariables(String url, RequestTemplateInfo info, Map<String, Object> args) {
if (url == null || url.isEmpty() || args == null || args.isEmpty()) {
return url;
}

Matcher matcher = PATH_VARIABLES_PATTERN.matcher(url);

StringBuilder result = new StringBuilder();
while (matcher.find()) {
String variableName = matcher.group(1);
if (info.argsPosition != null && info.argsPosition.has(variableName)) {
String position = info.argsPosition.path(variableName).asText();
if ("path".equals(position)) {
Object value = args.get(variableName);
String replacement = value != null ? value.toString() : matcher.group(0);
matcher.appendReplacement(result, java.util.regex.Matcher.quoteReplacement(replacement));
}
}
}
matcher.appendTail(result);

return result.toString();
}

public static WebClient.RequestHeadersSpec<?> addRequestBody(WebClient.RequestBodySpec requestSpec,
RequestTemplateInfo info, Map<String, Object> args,
MultiValueMap<String, String> headers, RequestTemplateInfo info, Map<String, Object> args,
java.util.function.BiFunction<String, Map<String, Object>, String> templateProcessor,
com.fasterxml.jackson.databind.ObjectMapper objectMapper, org.slf4j.Logger logger) {
ObjectMapper objectMapper, Logger logger) {
boolean hasBody = info.body != null && !info.body.asText().isEmpty();
int optionCount = (hasBody ? 1 : 0) + (info.argsToJsonBody ? 1 : 0) + (info.argsToFormBody ? 1 : 0)
+ (info.argsToUrlParam ? 1 : 0);
Expand All @@ -88,31 +232,61 @@ public static WebClient.RequestHeadersSpec<?> addRequestBody(WebClient.RequestBo
}
if (hasBody) {
String bodyTemplate = info.body.asText();
String processedBody = templateProcessor.apply(bodyTemplate, args);
Map<String, Object> params = new HashMap<>();
params.put("args", args);
params.put("extendedData", "");
String processedBody = templateProcessor.apply(bodyTemplate, params);
return requestSpec.contentType(org.springframework.http.MediaType.APPLICATION_JSON)
.bodyValue(processedBody);
}
else if (info.argsToJsonBody) {
try {
String jsonBody = objectMapper.writeValueAsString(args);
return requestSpec.contentType(org.springframework.http.MediaType.APPLICATION_JSON).bodyValue(jsonBody);
else {
String bodyType = info.argsToFormBody ? "form" : "json";
MultiValueMap<String, String> formData = new LinkedMultiValueMap<>();
Map<String, Object> jsonData = new HashMap<>();
if (!info.argsToJsonBody && !info.argsToFormBody) {
String contentType = headers.getFirst("Content-Type");
if (contentType != null && contentType.contains("application/x-www-form-urlencoded")) {
bodyType = "form";
}
else {
bodyType = "json";
}
}
for (Map.Entry<String, Object> entry : args.entrySet()) {
String key = entry.getKey();
Object value = entry.getValue();
if (value == null) {
continue;
}
boolean addToBody = info.argsToFormBody || info.argsToJsonBody;
if (info.argsPosition != null && info.argsPosition.has(key)) {
String position = info.argsPosition.path(key).asText();
addToBody = "body".equals(position);
}
if (addToBody) {
formData.add(key, value.toString());
jsonData.put(key, value);
}
}
catch (com.fasterxml.jackson.core.JsonProcessingException e) {
logger.error("Failed to create JSON request body", e);
if (formData.isEmpty()) {
return requestSpec;
}
}
else if (info.argsToFormBody) {
MultiValueMap<String, String> formData = new LinkedMultiValueMap<>();
args.forEach((key, value) -> {
if (value != null) {
formData.add(key, value.toString());
if ("json".equals(bodyType)) {
try {
String jsonBody = objectMapper.writeValueAsString(jsonData);
return requestSpec.contentType(org.springframework.http.MediaType.APPLICATION_JSON)
.bodyValue(jsonBody);
}
catch (com.fasterxml.jackson.core.JsonProcessingException e) {
logger.error("Failed to create JSON request body", e);
return requestSpec;
}
});
return requestSpec.contentType(org.springframework.http.MediaType.APPLICATION_FORM_URLENCODED)
.body(BodyInserters.fromFormData(formData));
}
else {
return requestSpec.contentType(org.springframework.http.MediaType.APPLICATION_FORM_URLENCODED)
.body(BodyInserters.fromFormData(formData));
}
}
return requestSpec;
}

}
Loading
Loading