kimhyungsik/ax_hub_mcp_tool
0
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Deep Agent Builder 호환성을 위한 mcp-http Warm Pool 세션 버그 및 CORS 헤더 수정

Browse Source
This commit is contained in:
jade
2026-07-20 09:36:15 +09:00
parent 2e6b28e1c1
commit d6801b7ba0
4 changed files with 71 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
dap-common/src/main/java/io/shinhanlife/dap/common/config/CorsConfig.java
View File

@@ -27,6 +27,7 @@ public class CorsConfig implements WebMvcConfigurer {
.allowedOriginPatterns("*") // 외부 Agent Builder 등 모든 오리진 허용
.allowedMethods("GET", "POST", "PUT", "DELETE", "OPTIONS", "HEAD", "PATCH") // 허용할 HTTP 메서드
.allowedHeaders("*") // 모든 헤더 허용
.exposedHeaders("Mcp-Session-Id") // MCP-HTTP 세션 아이디 노출 허용
.allowCredentials(true) // 쿠키/인증 정보 허용
.maxAge(3600); // preflight 요청 캐시 시간 (초 단위)
}

1
dap-common/src/main/java/io/shinhanlife/dap/common/mcp/config/WebConfig.java
View File

@@ -48,6 +48,7 @@ public class WebConfig implements WebMvcConfigurer {
.allowedOriginPatterns("*")
.allowedMethods("GET", "POST", "PUT", "DELETE", "OPTIONS")
.allowedHeaders("*")
.exposedHeaders("Mcp-Session-Id")
.allowCredentials(true);
}
}

61
dap-gateway/src/main/java/io/shinhanlife/dap/biz/mcp/gateway/sync/CustomWebMvcSseServerTransportProvider.java
View File

@@ -49,6 +49,7 @@ public class CustomWebMvcSseServerTransportProvider implements McpServerTranspor
private final String sseEndpoint;
private final String messageEndpoint;
private final Map<String, McpServerSession> sessions = new ConcurrentHashMap<>();
private final Map<String, CustomMcpSessionTransport> customTransports = new ConcurrentHashMap<>();
private final ObjectMapper objectMapper;
public CustomWebMvcSseServerTransportProvider(String sseEndpoint, String messageEndpoint, ObjectMapper objectMapper) {
@@ -71,6 +72,7 @@ public class CustomWebMvcSseServerTransportProvider implements McpServerTranspor
} catch (Exception ignored) {}
});
sessions.clear();
customTransports.clear();
});
}
@@ -108,27 +110,38 @@ public class CustomWebMvcSseServerTransportProvider implements McpServerTranspor
return emitter;
}
public SseEmitter handleCustomSse(String sessionId, String body) {
public org.springframework.web.servlet.mvc.method.annotation.SseEmitter handleCustomSse(String sessionId, String body) {
if (sessionFactory == null) {
throw new IllegalStateException("SessionFactory not configured");
}
SseEmitter emitter = new SseEmitter(-1L);
org.springframework.web.servlet.mvc.method.annotation.SseEmitter emitter = new org.springframework.web.servlet.mvc.method.annotation.SseEmitter(-1L);
boolean isNew = !sessions.containsKey(sessionId);
if (isNew) {
CustomMcpSessionTransport sessionTransport = new CustomMcpSessionTransport(emitter, sessionId);
customTransports.put(sessionId, sessionTransport);
McpServerSession session = sessionFactory.create(sessionTransport);
sessions.put(sessionId, session);
emitter.onCompletion(() -> sessions.remove(sessionId));
emitter.onTimeout(() -> sessions.remove(sessionId));
// 주의: 클라이언트가 단일 POST 응답 후 연결을 끊더라도,
// 웜 풀(Warm Pool) 스펙상 세션은 살려둬야 하므로 세션 삭제 로직 제외
} else {
// 기존 세션인 경우 Emitter 파이프만 덮어씌움 (Switching)
CustomMcpSessionTransport sessionTransport = customTransports.get(sessionId);
if (sessionTransport != null) {
sessionTransport.setEmitter(emitter);
}
}
new Thread(() -> {
try {
// 커스텀 클라이언트는 endpoint 이벤트를 무시할 수 있지만, 표준 호환성을 위해 전송
// 커스텀 클라이언트는 endpoint 이벤트를 무시할 수 있지만 표준 호환성을 위해 전송
Thread.sleep(100);
emitter.send(SseEmitter.event().name("endpoint").data(messageEndpoint + "?sessionId=" + sessionId));
emitter.send(org.springframework.web.servlet.mvc.method.annotation.SseEmitter.event().name("endpoint").data(messageEndpoint + "?sessionId=" + sessionId));
// Body로 들어온 initialize 등 즉시 처리
// Body로 들어온 메시지 즉시 비동기 처리
if (body != null && !body.trim().isEmpty()) {
handleMessage(sessionId, body);
}
@@ -140,10 +153,10 @@ public class CustomWebMvcSseServerTransportProvider implements McpServerTranspor
return emitter;
}
public ResponseEntity<String> handleMessage(String sessionId, String body) {
public org.springframework.http.ResponseEntity<String> handleMessage(String sessionId, String body) {
log.info("Received POST message for sessionId: " + sessionId + ", body: " + body);
if (sessionId == null || !sessions.containsKey(sessionId)) {
return ResponseEntity.badRequest().body("Missing or invalid sessionId");
return ResponseEntity.badRequest().body("Unexpected request body");
}
McpServerSession session = sessions.get(sessionId);
@@ -171,15 +184,23 @@ public class CustomWebMvcSseServerTransportProvider implements McpServerTranspor
}
}
public boolean hasSession(String sessionId) {
return sessionId != null && sessions.containsKey(sessionId);
}
private class CustomMcpSessionTransport implements McpServerTransport {
private final SseEmitter emitter;
private volatile org.springframework.web.servlet.mvc.method.annotation.SseEmitter emitter;
private final String sessionId;
public CustomMcpSessionTransport(SseEmitter emitter, String sessionId) {
public CustomMcpSessionTransport(org.springframework.web.servlet.mvc.method.annotation.SseEmitter emitter, String sessionId) {
this.emitter = emitter;
this.sessionId = sessionId;
}
public void setEmitter(org.springframework.web.servlet.mvc.method.annotation.SseEmitter emitter) {
this.emitter = emitter;
}
@Override
public Mono<Void> sendMessage(McpSchema.JSONRPCMessage message) {
return Mono.fromRunnable(() -> {
@@ -187,18 +208,30 @@ public class CustomWebMvcSseServerTransportProvider implements McpServerTranspor
try {
String json = objectMapper.writeValueAsString(message);
log.info("Serialized message: " + json);
emitter.send(SseEmitter.event().name("message").data(json));
if (this.emitter != null) {
this.emitter.send(org.springframework.web.servlet.mvc.method.annotation.SseEmitter.event().name("message").data(json));
log.info("Message successfully sent to SSE emitter");
// Custom 프로토콜: 1회 요청당 1응답 후 종료 (스트림을 닫아버림)
// 클라이언트가 한 번의 POST 후 응답을 받고 연결을 끊기 때문
this.emitter.complete();
}
} catch (Exception e) {
log.error("Error sending message to SSE emitter", e);
emitter.completeWithError(e);
if (this.emitter != null) {
this.emitter.completeWithError(e);
}
}
});
}
@Override
public Mono<Void> closeGracefully() {
return Mono.fromRunnable(emitter::complete);
return Mono.fromRunnable(() -> {
if (this.emitter != null) {
this.emitter.complete();
}
});
}
@Override

20
dap-gateway/src/main/java/io/shinhanlife/dap/biz/mcp/gateway/sync/DynamicMcpController.java
View File

@@ -70,18 +70,18 @@ public class DynamicMcpController {
return ResponseEntity.badRequest().body("Unknown category: " + category);
}
if (sessionId == null || sessionId.isEmpty()) {
// 새 세션 생성 (initialize 요청)
String newSessionId = UUID.randomUUID().toString();
SseEmitter emitter = transport.handleCustomSse(newSessionId, body);
boolean isNew = (sessionId == null || sessionId.isEmpty());
String activeSessionId = isNew ? java.util.UUID.randomUUID().toString() : sessionId;
if (!isNew && !transport.hasSession(activeSessionId)) {
// 클라이언트가 보낸 세션 ID가 만료되었거나 존재하지 않는 경우 (Warm Pool 스펙: 404 Not Found 반환)
return ResponseEntity.notFound().build();
}
org.springframework.web.servlet.mvc.method.annotation.SseEmitter emitter = transport.handleCustomSse(activeSessionId, body);
return ResponseEntity.ok()
.header("Mcp-Session-Id", newSessionId)
.header("Mcp-Session-Id", activeSessionId)
.body(emitter);
} else {
// 기존 세션 메시지 전송 (tools/call 등)
transport.handleMessage(sessionId, body);
return ResponseEntity.accepted().build();
}
}
}