Skip to content

Commit dbf19b8

Browse files
learnerjohnlearnerjohn
committed
Merge remote-tracking branch 'upstream/main' into himarket_product
2 parents 08447a1 + 38d6191 commit dbf19b8

File tree

3 files changed

+105
-231
lines changed

3 files changed

+105
-231
lines changed

‎himarket-server/src/main/java/com/alibaba/himarket/service/impl/NacosServiceImpl.java‎

Lines changed: 105 additions & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@
4848
import com.alibaba.nacos.api.PropertyKeyConst;
4949
import com.alibaba.nacos.api.ai.model.a2a.AgentCard;
5050
import com.alibaba.nacos.api.ai.model.a2a.AgentCardVersionInfo;
51-
import com.alibaba.nacos.api.ai.model.mcp.McpEndpointInfo;
5251
import com.alibaba.nacos.api.ai.model.mcp.McpServerBasicInfo;
5352
import com.alibaba.nacos.api.ai.model.mcp.McpServerDetailInfo;
5453
import com.alibaba.nacos.api.exception.NacosException;
@@ -62,7 +61,6 @@
6261
import com.aliyun.mse20190531.models.ListClustersResponse;
6362
import com.aliyun.mse20190531.models.ListClustersResponseBody;
6463
import com.aliyun.teautil.models.RuntimeOptions;
65-
import java.net.URI;
6664
import java.util.HashMap;
6765
import java.util.List;
6866
import java.util.Map;
@@ -361,10 +359,11 @@ private MCPConfigResult buildMCPConfigResult(McpServerDetailInfo detail) {
361359
}
362360

363361
private Object buildRemoteConnectionConfig(McpServerDetailInfo detail) {
364-
List<McpEndpointInfo> backendEndpoints = detail.getBackendEndpoints();
362+
List<?> backendEndpoints = detail.getBackendEndpoints();
365363

366364
if (backendEndpoints != null && !backendEndpoints.isEmpty()) {
367-
McpEndpointInfo firstEndpoint = backendEndpoints.get(0);
365+
Object firstEndpoint = backendEndpoints.get(0);
366+
368367
Map<String, Object> connectionConfig = new HashMap<>();
369368
Map<String, Object> mcpServers = new HashMap<>();
370369
Map<String, Object> serverConfig = new HashMap<>();
@@ -387,117 +386,132 @@ private Object buildRemoteConnectionConfig(McpServerDetailInfo detail) {
387386
return basicConfig;
388387
}
389388

390-
private String extractEndpointUrl(McpEndpointInfo endpoint) {
389+
private String extractEndpointUrl(Object endpoint) {
391390
if (endpoint == null) {
392391
return null;
393392
}
394393

395-
String address = endpoint.getAddress();
396-
if (StrUtil.isBlank(address)) {
397-
return null;
394+
if (endpoint instanceof String) {
395+
return (String) endpoint;
398396
}
399397

400-
String protocol = StrUtil.blankToDefault(endpoint.getProtocol(), "http");
401-
int endpointPort = endpoint.getPort() > 0 ? endpoint.getPort() : -1;
402-
String normalizedPath = normalizeUrlPath(endpoint.getPath());
398+
if (endpoint instanceof Map) {
399+
Map<?, ?> endpointMap = (Map<?, ?>) endpoint;
403400

404-
// If address is already a full URL, prefer it and only fill missing port/path.
405-
if (address.contains("://")) {
406-
try {
407-
URI uri = URI.create(address);
408-
String scheme = StrUtil.blankToDefault(uri.getScheme(), protocol);
409-
String host = uri.getHost();
410-
int port = uri.getPort() != -1 ? uri.getPort() : endpointPort;
411-
String path = StrUtil.isBlank(uri.getPath()) ? normalizedPath : uri.getPath();
412-
if (host != null) {
413-
return new URI(scheme, null, host, port, path, null, null).toString();
401+
String url = getStringValue(endpointMap, "url");
402+
if (url != null) return url;
403+
404+
String endpointUrl = getStringValue(endpointMap, "endpointUrl");
405+
if (endpointUrl != null) return endpointUrl;
406+
407+
String host = getStringValue(endpointMap, "host");
408+
String port = getStringValue(endpointMap, "port");
409+
String path = getStringValue(endpointMap, "path");
410+
411+
if (host != null) {
412+
StringBuilder urlBuilder = new StringBuilder();
413+
String protocol = getStringValue(endpointMap, "protocol");
414+
urlBuilder.append(protocol != null ? protocol : "http").append("://");
415+
urlBuilder.append(host);
416+
417+
if (port != null && !port.isEmpty()) {
418+
urlBuilder.append(":").append(port);
414419
}
415-
} catch (Exception ignored) {
416-
// fall back to simple concatenation
420+
421+
if (path != null && !path.isEmpty()) {
422+
if (!path.startsWith("/")) {
423+
urlBuilder.append("/");
424+
}
425+
urlBuilder.append(path);
426+
}
427+
428+
return urlBuilder.toString();
417429
}
418-
return appendPath(address, normalizedPath);
419-
}
420-
421-
// Address might be host or host:port (IPv4/hostname). Handle simple host:port.
422-
String host = address;
423-
int port = endpointPort;
424-
425-
// Handle bracketed IPv6 forms like "[::1]" or "[::1]:8848".
426-
if (address.startsWith("[") && address.contains("]")) {
427-
int endBracket = address.indexOf(']');
428-
host = address.substring(1, endBracket);
429-
if (port == -1) {
430-
String rest = address.substring(endBracket + 1);
431-
if (rest.startsWith(":")) {
432-
Integer parsedPort = tryParsePort(rest.substring(1));
433-
if (parsedPort != null) {
434-
port = parsedPort;
430+
}
431+
432+
if (endpoint.getClass().getName().contains("McpEndpointInfo")) {
433+
return extractUrlFromMcpEndpointInfo(endpoint);
434+
}
435+
436+
return endpoint.toString();
437+
}
438+
439+
private String getStringValue(Map<?, ?> map, String key) {
440+
Object value = map.get(key);
441+
return value != null ? value.toString() : null;
442+
}
443+
444+
private String extractUrlFromMcpEndpointInfo(Object endpoint) {
445+
String[] possibleFieldNames = {"url", "endpointUrl", "address", "host", "endpoint"};
446+
447+
for (String fieldName : possibleFieldNames) {
448+
try {
449+
java.lang.reflect.Field field = endpoint.getClass().getDeclaredField(fieldName);
450+
field.setAccessible(true);
451+
Object value = field.get(endpoint);
452+
if (value != null && !value.toString().trim().isEmpty()) {
453+
if (value.toString().contains("://") || value.toString().contains(":")) {
454+
return value.toString();
435455
}
436456
}
457+
} catch (Exception e) {
458+
continue;
437459
}
438-
} else {
439-
int lastColon = address.lastIndexOf(':');
440-
if (lastColon > 0 && address.indexOf(':') == lastColon) {
441-
Integer parsedPort = tryParsePort(address.substring(lastColon + 1));
442-
if (parsedPort != null) {
443-
host = address.substring(0, lastColon);
444-
if (port == -1) {
445-
port = parsedPort;
460+
}
461+
462+
java.lang.reflect.Field[] fields = endpoint.getClass().getDeclaredFields();
463+
464+
String host = null;
465+
String port = null;
466+
String path = null;
467+
String protocol = null;
468+
469+
for (java.lang.reflect.Field field : fields) {
470+
try {
471+
field.setAccessible(true);
472+
Object value = field.get(endpoint);
473+
if (value != null && !value.toString().trim().isEmpty()) {
474+
String fieldName = field.getName().toLowerCase();
475+
476+
if (fieldName.contains("host")
477+
|| fieldName.contains("ip")
478+
|| fieldName.contains("address")) {
479+
host = value.toString();
480+
} else if (fieldName.contains("port")) {
481+
port = value.toString();
482+
} else if (fieldName.contains("path")
483+
|| fieldName.contains("endpoint")
484+
|| fieldName.contains("uri")) {
485+
path = value.toString();
486+
} else if (fieldName.contains("protocol") || fieldName.contains("scheme")) {
487+
protocol = value.toString();
446488
}
447489
}
490+
} catch (Exception e) {
491+
continue;
448492
}
449493
}
450494

451-
try {
452-
return new URI(protocol, null, host, port, normalizedPath, null, null).toString();
453-
} catch (Exception e) {
495+
if (host != null) {
454496
StringBuilder urlBuilder = new StringBuilder();
455-
urlBuilder.append(protocol).append("://").append(address);
456-
if (port > 0 && !address.contains(":")) {
497+
urlBuilder.append(protocol != null ? protocol : "http").append("://");
498+
urlBuilder.append(host);
499+
500+
if (port != null && !port.isEmpty()) {
457501
urlBuilder.append(":").append(port);
458502
}
459-
if (normalizedPath != null) {
460-
urlBuilder.append(normalizedPath);
461-
}
462-
return urlBuilder.toString();
463-
}
464-
}
465-
466-
private String normalizeUrlPath(String path) {
467-
if (StrUtil.isBlank(path)) {
468-
return null;
469-
}
470-
return path.startsWith("/") ? path : "/" + path;
471-
}
472503

473-
private Integer tryParsePort(String portStr) {
474-
if (StrUtil.isBlank(portStr)) {
475-
return null;
476-
}
477-
for (int i = 0; i < portStr.length(); i++) {
478-
if (!Character.isDigit(portStr.charAt(i))) {
479-
return null;
504+
if (path != null && !path.isEmpty()) {
505+
if (!path.startsWith("/")) {
506+
urlBuilder.append("/");
507+
}
508+
urlBuilder.append(path);
480509
}
481-
}
482-
try {
483-
int port = Integer.parseInt(portStr);
484-
return port > 0 && port <= 65535 ? port : null;
485-
} catch (NumberFormatException e) {
486-
return null;
487-
}
488-
}
489510

490-
private String appendPath(String baseUrl, String normalizedPath) {
491-
if (normalizedPath == null) {
492-
return baseUrl;
493-
}
494-
if (baseUrl.endsWith("/") && normalizedPath.startsWith("/")) {
495-
return baseUrl + normalizedPath.substring(1);
496-
}
497-
if (!baseUrl.endsWith("/") && !normalizedPath.startsWith("/")) {
498-
return baseUrl + "/" + normalizedPath;
511+
return urlBuilder.toString();
499512
}
500-
return baseUrl + normalizedPath;
513+
514+
return endpoint.toString();
501515
}
502516

503517
private NacosInstance findNacosInstance(String nacosId) {

‎himarket-server/src/test/java/com/alibaba/himarket/service/impl/NacosServiceImplEndpointTest.java‎

Lines changed: 0 additions & 129 deletions
This file was deleted.

0 commit comments

Comments
 (0)