修改transportProvider的handlePOST方法

Author: relat-ivity

framework/fel/java/plugins/tool-mcp-server/README.md

@@ -65,14 +65,15 @@
 
 #### 根据请求类型调用处理逻辑的方法
 
-| 方法名                            | 处理的请求类型 | 说明                                   |
-|--------------------------------|---------|--------------------------------------|
-| `handleReplaySseRequest()`     | GET     | 处理 SSE 消息重放请求，用于断线重连后恢复错过的消息        |
-| `handleEstablishSseRequest()`  | GET     | 处理 SSE 连接建立请求，创建新的持久化 SSE 监听流      |
-| `handleInitializeRequest()`    | POST    | 处理客户端初始化连接请求，创建新的 MCP 会话           |
-| `handleJsonRpcResponse()`      | POST    | 处理 JSON-RPC 响应消息（如 Elicitation 中的客户端响应） |
-| `handleJsonRpcNotification()`  | POST    | 处理 JSON-RPC 通知消息（客户端单向通知）           |
-| `handleJsonRpcRequest()`       | POST    | 处理 JSON-RPC 请求消息，返回 SSE 流式响应         |
+| 方法名                             | 处理的请求类型 | 说明                                       |
+|---------------------------------|---------|------------------------------------------|
+| `handleReplaySseRequest()`      | GET     | 处理 SSE 消息重放请求，用于断线重连后恢复错过的消息             |
+| `handleEstablishSseRequest()`   | GET     | 处理 SSE 连接建立请求，创建新的持久化 SSE 监听流            |
+| `handleInitializeRequest()`     | POST    | 处理客户端初始化连接请求，创建新的 MCP 会话                 |
+| `handleJsonRpcMessage()`        | POST    | 把非Initialize的客户端消息分流给下面三个方法，包含Session验证。 |
+| `handleJsonRpcResponse()`       | POST    | 处理 JSON-RPC 响应消息（如 Elicitation 中的客户端响应）  |
+| `handleJsonRpcNotification()`   | POST    | 处理 JSON-RPC 通知消息（客户端单向通知）                |
+| `handleJsonRpcRequest()`        | POST    | 处理 JSON-RPC 请求消息，返回 SSE 流式响应             |
 
 ### 内部类
 

framework/fel/java/plugins/tool-mcp-server/src/main/java/modelengine/fel/tool/mcp/server/transport/FitMcpStreamableServerTransportProvider.java

@@ -249,35 +249,13 @@ public Object handlePost(HttpClassicServerRequest request, HttpClassicServerResp
             String requestBody = new String(request.entityBytes(), StandardCharsets.UTF_8);
             McpSchema.JSONRPCMessage message = McpSchema.deserializeJsonRpcMessage(jsonMapper, requestBody);
 
-            // Handle initialization request
+            // Handle JSONRPCMessage
             if (message instanceof McpSchema.JSONRPCRequest jsonrpcRequest && jsonrpcRequest.method()
                     .equals(McpSchema.METHOD_INITIALIZE)) {
                 logger.info("[POST] Handling initialize method, with receiving message: {}", requestBody);
                 return handleInitializeRequest(request, response, jsonrpcRequest);
-            }
-
-            // Get session ID and session
-            Object sessionError = validateRequestSessionId(request, response);
-            if (sessionError != null) {
-                return sessionError;
-            }
-            String sessionId = request.headers().first(HttpHeaders.MCP_SESSION_ID).orElse("");
-            McpStreamableServerSession session = this.sessions.get(sessionId);
-            logger.info("[POST] Receiving message from session {}: {}", sessionId, requestBody);
-
-            // Handle JSONRPCMessage
-            if (message instanceof McpSchema.JSONRPCResponse jsonrpcResponse) {
-                handleJsonRpcResponse(jsonrpcResponse, session, transportContext, response);
-                return null;
-            } else if (message instanceof McpSchema.JSONRPCNotification jsonrpcNotification) {
-                handleJsonRpcNotification(jsonrpcNotification, session, transportContext, response);
-                return null;
-            } else if (message instanceof McpSchema.JSONRPCRequest jsonrpcRequest) {
-                return handleJsonRpcRequest(jsonrpcRequest, session, sessionId, transportContext, response);
             } else {
-                response.statusCode(HttpResponseStatus.INTERNAL_SERVER_ERROR.statusCode());
-                return Entity.createObject(response,
-                        McpError.builder(McpSchema.ErrorCodes.INTERNAL_ERROR).message("Unknown message type").build());
+                return handleJsonRpcMessage(message, request, requestBody, transportContext, response);
             }
         } catch (IllegalArgumentException | IOException e) {
             logger.error("Failed to deserialize message: {}", e.getMessage(), e);
@@ -517,6 +495,43 @@ private Object handleInitializeRequest(HttpClassicServerRequest request, HttpCla
         }
     }
 
+    /**
+     * Handles different types of JSON-RPC messages (Response, Notification, Request).
+     * Routes the message to the appropriate handler method based on its type.
+     *
+     * @param message The {@link McpSchema.JSONRPCMessage} to handle
+     * @param request The incoming {@link HttpClassicServerRequest}
+     * @param requestBody The {@link String} of request body.
+     * @param transportContext The {@link McpTransportContext} for request context propagation
+     * @param response The {@link HttpClassicServerResponse} to set status code and return data
+     * @return An {@link Entity} or {@link Choir} containing the response data, or {@code null} for accepted messages
+     */
+    private Object handleJsonRpcMessage(McpSchema.JSONRPCMessage message, HttpClassicServerRequest request,
+            String requestBody, McpTransportContext transportContext, HttpClassicServerResponse response) {
+        // Get session ID and session
+        Object sessionError = validateRequestSessionId(request, response);
+        if (sessionError != null) {
+            return sessionError;
+        }
+        String sessionId = request.headers().first(HttpHeaders.MCP_SESSION_ID).orElse("");
+        McpStreamableServerSession session = this.sessions.get(sessionId);
+        logger.info("[POST] Receiving message from session {}: {}", sessionId, requestBody);
+
+        if (message instanceof McpSchema.JSONRPCResponse jsonrpcResponse) {
+            handleJsonRpcResponse(jsonrpcResponse, session, transportContext, response);
+            return null;
+        } else if (message instanceof McpSchema.JSONRPCNotification jsonrpcNotification) {
+            handleJsonRpcNotification(jsonrpcNotification, session, transportContext, response);
+            return null;
+        } else if (message instanceof McpSchema.JSONRPCRequest jsonrpcRequest) {
+            return handleJsonRpcRequest(jsonrpcRequest, session, sessionId, transportContext, response);
+        } else {
+            response.statusCode(HttpResponseStatus.INTERNAL_SERVER_ERROR.statusCode());
+            return Entity.createObject(response,
+                    McpError.builder(McpSchema.ErrorCodes.INTERNAL_ERROR).message("Unknown message type").build());
+        }
+    }
+
     /**
      * Handles incoming JSON-RPC response messages from clients.
      * Accepts the response and delivers it to the corresponding pending request within the session.