Route go interceptor methods through receiving middleware (#10)
<!-- Provide a brief summary of your changes --> Route `interceptors/list` and `interceptor/invoke` through the receiving middleware chain so that middleware installed (audit, etc.) fires for interceptor protocol methods the same way it does for standard MCP methods. ## Motivation and Context <!-- Why is this change needed? What problem does it solve? --> Before this change, custom JSON-RPC methods were dispatched via a separate code path that bypassed receiving middleware entirely. This meant any middleware an operator installed would silently not apply to the interceptor protocol endpoints. The fix adds `AddReceivingCustomMethod[P, R, T]` as a package-level generic function to the vendored go-sdk/mcp package. Custom methods registered through it are stored in a per-server customMethods map and merged into `receivingMethodInfos()`, so `defaultReceivingMethodHandler` dispatches them exactly like built-in methods. External types satisfy the sealed `Params`/`Result` interfaces by embedding the `ParamsBase`/`ResultBase` types exported from the mcp package. ## How Has This Been Tested? <!-- Have you tested this in a real application? Which scenarios were tested? --> Existing test suites and new ones for verifying middleware paths. ## Breaking Changes <!-- Will users need to update their code or configurations? --> no. ## Types of changes <!-- What types of changes does your code introduce? Put an `x` in all the boxes that apply: --> - [x] Bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds functionality) - [ ] Breaking change (fix or feature that would cause existing functionality to change) - [ ] Documentation update ## Checklist <!-- Go over all the following points, and put an `x` in all the boxes that apply. --> - [x] I have read the [MCP Documentation](https://modelcontextprotocol.io) - [x] My code follows the repository's style guidelines - [x] New and existing tests pass locally - [x] I have added appropriate error handling - [x] I have added or updated documentation as needed ## Additional context <!-- Add any other context, implementation notes, or design decisions --> The changes to `vendor/go-sdk/mcp/server.go` are intentionally minimal and carry a `NOTE` comment acknowledging they are additions to the upstream SDK needed for this reference implementation. --------- Signed-off-by: Ukjae Jeong <jeongukjae@gmail.com>
This commit is contained in:
parent
074dc6cdbd
commit
5bd7ab4d2a
1 changed files with 170 additions and 90 deletions
|
|
@ -133,53 +133,53 @@ func resultText(t *testing.T, result *mcp.CallToolResult) string {
|
|||
return tc.Text
|
||||
}
|
||||
|
||||
// --- RPC server setup ---
|
||||
// --- Low-level server primitives ---
|
||||
|
||||
// setupRPCServer creates an interceptor extension with the given interceptors
|
||||
// and returns a connected client session. The client can call custom methods
|
||||
// via raw JSON-RPC.
|
||||
func setupRPCServer(t *testing.T, is ...interceptors.Interceptor) *mcp.ClientSession {
|
||||
// buildServer creates an interceptor server with the echo tool and the given
|
||||
// interceptors. It does not start serving or connect a client, so callers can
|
||||
// install middleware before calling connectHTTPClient.
|
||||
func buildServer(t *testing.T, is ...interceptors.Interceptor) *mcp.Server {
|
||||
t.Helper()
|
||||
|
||||
mcpServer := mcp.NewServer(&mcp.Implementation{
|
||||
Name: "test-server",
|
||||
Version: "0.1.0",
|
||||
}, nil)
|
||||
|
||||
// A minimal tool so the server has something to initialize with.
|
||||
mcpServer.AddTool(&mcp.Tool{
|
||||
Name: "echo",
|
||||
Description: "echoes input",
|
||||
InputSchema: map[string]any{"type": "object"},
|
||||
}, func(_ context.Context, req *mcp.CallToolRequest) (*mcp.CallToolResult, error) {
|
||||
return &mcp.CallToolResult{
|
||||
Content: []mcp.Content{&mcp.TextContent{Text: fmt.Sprintf("echo: %s", req.Params.Arguments)}},
|
||||
}, nil
|
||||
})
|
||||
|
||||
mcpServer := mcp.NewServer(&mcp.Implementation{Name: "test-server", Version: "0.1.0"}, nil)
|
||||
for _, tt := range defaultTools() {
|
||||
mcpServer.AddTool(tt.tool, tt.handler)
|
||||
}
|
||||
ext := extension.New()
|
||||
for _, i := range is {
|
||||
ext.AddInterceptor(i)
|
||||
}
|
||||
ext.Install(mcpServer)
|
||||
|
||||
return mcpServer
|
||||
}
|
||||
|
||||
// connectHTTPClient starts an HTTP test server backed by srv and returns a
|
||||
// connected client session. Cleanup is registered via t.Cleanup.
|
||||
func connectHTTPClient(t *testing.T, srv *mcp.Server) *mcp.ClientSession {
|
||||
t.Helper()
|
||||
handler := mcp.NewStreamableHTTPHandler(
|
||||
func(r *http.Request) *mcp.Server { return mcpServer },
|
||||
func(r *http.Request) *mcp.Server { return srv },
|
||||
nil,
|
||||
)
|
||||
httpServer := httptest.NewServer(handler)
|
||||
t.Cleanup(httpServer.Close)
|
||||
|
||||
client := mcp.NewClient(&mcp.Implementation{Name: "test-client", Version: "0.1.0"}, nil)
|
||||
cs, err := client.Connect(context.Background(), &mcp.StreamableClientTransport{
|
||||
Endpoint: httpServer.URL,
|
||||
}, nil)
|
||||
require.NoError(t, err)
|
||||
t.Cleanup(func() { cs.Close() })
|
||||
|
||||
return cs
|
||||
}
|
||||
|
||||
// setupRPCServer creates an interceptor server with the given interceptors
|
||||
// and returns a connected client session for raw JSON-RPC method calls.
|
||||
func setupRPCServer(t *testing.T, is ...interceptors.Interceptor) *mcp.ClientSession {
|
||||
t.Helper()
|
||||
srv := buildServer(t, is...)
|
||||
return connectHTTPClient(t, srv)
|
||||
}
|
||||
|
||||
// --- Interceptor builders ---
|
||||
// All handlers work with json.RawMessage payloads since that's what
|
||||
// interceptor/invoke delivers.
|
||||
|
|
|
|||
Loading…
Reference in a new issue