Skip to content

mcp: support sseEndpoint config #2724

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

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,11 @@ public List<NamedClientMcpTransport> mcpHttpClientTransports(McpSseClientPropert

for (Map.Entry<String, SseParameters> serverParameters : sseProperties.getConnections().entrySet()) {

var transport = new HttpClientSseClientTransport(HttpClient.newBuilder(), serverParameters.getValue().url(),
objectMapper);
var transport = HttpClientSseClientTransport.builder(serverParameters.getValue().url())
.sseEndpoint(serverParameters.getValue().sseEndpoint())
.clientBuilder(HttpClient.newBuilder())
.objectMapper(objectMapper)
.build();
sseTransports.add(new NamedClientMcpTransport(serverParameters.getKey(), transport));
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,8 @@ public List<NamedClientMcpTransport> webFluxClientTransports(McpSseClientPropert

for (Map.Entry<String, SseParameters> serverParameters : sseProperties.getConnections().entrySet()) {
var webClientBuilder = webClientBuilderTemplate.clone().baseUrl(serverParameters.getValue().url());
var transport = new WebFluxSseClientTransport(webClientBuilder, objectMapper);
var transport = new WebFluxSseClientTransport(webClientBuilder, objectMapper,
serverParameters.getValue().sseEndpoint());
sseTransports.add(new NamedClientMcpTransport(serverParameters.getKey(), transport));
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,10 @@
import java.util.HashMap;
import java.util.Map;

import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.boot.context.properties.bind.DefaultValue;

/**
* Configuration properties for Server-Sent Events (SSE) based MCP client connections.
Expand Down Expand Up @@ -50,8 +53,11 @@ public class McpSseClientProperties {
* Parameters for configuring an SSE connection to an MCP server.
*
* @param url the URL endpoint for SSE communication with the MCP server
* @param sseEndpoint the SSE endpoint for SSE communication with the MCP server
*/
public record SseParameters(String url) {
@JsonInclude(JsonInclude.Include.NON_ABSENT)
public record SseParameters(@JsonProperty("url") String url,
@JsonProperty("sse-endpoint") @DefaultValue("/sse") String sseEndpoint) {
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,8 @@ public class McpWebFluxServerAutoConfiguration {
public WebFluxSseServerTransportProvider webFluxTransport(ObjectProvider<ObjectMapper> objectMapperProvider,
McpServerProperties serverProperties) {
ObjectMapper objectMapper = objectMapperProvider.getIfAvailable(ObjectMapper::new);
return new WebFluxSseServerTransportProvider(objectMapper, serverProperties.getSseMessageEndpoint());
return new WebFluxSseServerTransportProvider(objectMapper, serverProperties.getBaseUrl(),
serverProperties.getSseMessageEndpoint(), serverProperties.getSseEndpoint());
}

// Router function for SSE transport used by Spring WebFlux to start an HTTP server.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,8 @@ public class McpWebMvcServerAutoConfiguration {
public WebMvcSseServerTransportProvider webMvcSseServerTransportProvider(
ObjectProvider<ObjectMapper> objectMapperProvider, McpServerProperties serverProperties) {
ObjectMapper objectMapper = objectMapperProvider.getIfAvailable(ObjectMapper::new);
return new WebMvcSseServerTransportProvider(objectMapper, serverProperties.getSseMessageEndpoint());
return new WebMvcSseServerTransportProvider(objectMapper, serverProperties.getBaseUrl(),
serverProperties.getSseMessageEndpoint(), serverProperties.getSseEndpoint());
}

@Bean
Expand Down