## Summary - Rename `interceptors/mcpserver/` → `interceptors/extension/`, replacing the `Server` wrapper with a lightweight `Extension` that can install itself on any `*mcp.Server` - Remove the stored `*mcp.Server` field — `Extension` is now a pure interceptor container with no server reference - Add `Install(server)` method to register JSON-RPC methods and init middleware on a given server - Update `LocalChain(ctx)` → `LocalChain(ctx, server)` to accept the server as a parameter - Remove `MCPServer()`, `Run()`, and `NewStreamableHTTPHandler()` wrapper methods — users interact with `mcp.Server` directly - Update all examples, tests, and documentation to use the new API ## Why `mcpserver.Server` pretended to *be* the server — it had `Run()`, `NewStreamableHTTPHandler()`, etc. — but it could never cover the full `*mcp.Server` API, so users constantly needed `MCPServer()` to unwrap it. `Extension` doesn't pretend to be the server. It's a pure interceptor container that can install itself on any server (or multiple servers) on the fly. No stored server reference, no wrapping, no delegation surface to maintain. ### Before ```go mcpServer := mcp.NewServer(...) srv := mcpserver.NewServer(mcpServer) srv.AddInterceptor(v) chain, err := srv.LocalChain(ctx) ``` ### After ```go mcpServer := mcp.NewServer(...) ext := extension.New() ext.AddInterceptor(v) ext.Install(mcpServer) chain, err := ext.LocalChain(ctx, mcpServer) ``` Signed-off-by: Kurt Degiorgio <kdegiorgio@bloomberg.net>
113 lines
2.9 KiB
Go
113 lines
2.9 KiB
Go
// Copyright 2025 The MCP Interceptors Authors. All rights reserved.
|
|
// Use of this source code is governed by an Apache-2.0
|
|
// license that can be found in the LICENSE file.
|
|
|
|
package extension
|
|
|
|
import (
|
|
"context"
|
|
"encoding/json"
|
|
"fmt"
|
|
"slices"
|
|
"time"
|
|
|
|
"github.com/modelcontextprotocol/go-sdk/jsonrpc"
|
|
"github.com/modelcontextprotocol/go-sdk/mcp"
|
|
|
|
"github.com/modelcontextprotocol/ext-interceptors/go/sdk/interceptors"
|
|
)
|
|
|
|
// handleList implements the "interceptors/list" JSON-RPC method.
|
|
// It returns all registered interceptors, optionally filtered by event.
|
|
func (e *Extension) handleList(_ context.Context, _ *mcp.ServerSession, raw json.RawMessage) (any, error) {
|
|
var params interceptors.ListParams
|
|
if len(raw) > 0 {
|
|
if err := json.Unmarshal(raw, ¶ms); err != nil {
|
|
return nil, err
|
|
}
|
|
}
|
|
|
|
all := e.getInterceptors()
|
|
infos := make([]interceptors.InterceptorInfo, 0, len(all))
|
|
for _, ri := range all {
|
|
if params.Event != "" && !slices.Contains(ri.GetMetadata().Hook.Events, params.Event) {
|
|
continue
|
|
}
|
|
infos = append(infos, interceptors.InfoFromInterceptor(ri))
|
|
}
|
|
|
|
return &interceptors.ListResult{Interceptors: infos}, nil
|
|
}
|
|
|
|
// handleInvoke implements the "interceptor/invoke" JSON-RPC method.
|
|
// It invokes a single interceptor by name and returns its result.
|
|
func (e *Extension) handleInvoke(ctx context.Context, _ *mcp.ServerSession, raw json.RawMessage) (any, error) {
|
|
var params interceptors.InvokeParams
|
|
if err := json.Unmarshal(raw, ¶ms); err != nil {
|
|
return nil, err
|
|
}
|
|
if params.Name == "" {
|
|
return nil, &jsonrpc.Error{
|
|
Code: jsonrpc.CodeInvalidParams,
|
|
Message: "name is required",
|
|
}
|
|
}
|
|
|
|
// Look up the interceptor by name.
|
|
i := e.findByName(params.Name)
|
|
if i == nil {
|
|
return nil, &jsonrpc.Error{
|
|
Code: jsonrpc.CodeInvalidParams,
|
|
Message: fmt.Sprintf("interceptor %q not found", params.Name),
|
|
}
|
|
}
|
|
|
|
// Apply timeout if specified.
|
|
if params.TimeoutMs > 0 {
|
|
var cancel context.CancelFunc
|
|
ctx, cancel = context.WithTimeout(ctx, time.Duration(params.TimeoutMs)*time.Millisecond)
|
|
defer cancel()
|
|
}
|
|
|
|
inv := &interceptors.Invocation{
|
|
Event: params.Event,
|
|
Phase: params.Phase,
|
|
Payload: params.Payload,
|
|
Config: params.Config,
|
|
Context: params.Context,
|
|
}
|
|
|
|
start := time.Now()
|
|
|
|
result := &interceptors.InvokeResult{
|
|
Interceptor: params.Name,
|
|
Type: i.GetType(),
|
|
Phase: params.Phase,
|
|
}
|
|
defer func() { result.DurationMs = time.Since(start).Milliseconds() }()
|
|
|
|
switch v := i.(type) {
|
|
case *interceptors.Validator:
|
|
vr, err := v.Handler(ctx, inv)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
result.Validation = vr
|
|
|
|
case *interceptors.Mutator:
|
|
mr, err := v.Handler(ctx, inv)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
result.Mutation = mr
|
|
result.Payload = mr.Payload
|
|
|
|
default:
|
|
return nil, &jsonrpc.Error{
|
|
Code: jsonrpc.CodeInternalError,
|
|
Message: fmt.Sprintf("unsupported interceptor type %T", i),
|
|
}
|
|
}
|
|
|
|
return result, nil
|
|
}
|