internal/mcp: client middleware
Implement middleware for clients. Make the middleware types generic so we can factor out code from both peers. I was able to make the request handler generic, with one weird trick (see handleRequest). The first three declarations of shared.go, and a few others as well, are copied unchanged from middleware.go. Change-Id: Ib3239d8fcfda022ddb5b554c38cff4cdbc3704c1 Reviewed-on: https://go-review.googlesource.com/c/tools/+/673635 Reviewed-by: Robert Findley <rfindley@google.com> LUCI-TryBot-Result: Go LUCI <golang-scoped@luci-project-accounts.iam.gserviceaccount.com>
This commit is contained in:
parent
8361df724d
commit
bac1b78b4a
1 changed files with 274 additions and 154 deletions
|
|
@ -9,6 +9,7 @@ import (
|
|||
"context"
|
||||
"errors"
|
||||
"fmt"
|
||||
"io"
|
||||
"path/filepath"
|
||||
"runtime"
|
||||
"slices"
|
||||
|
|
@ -27,8 +28,8 @@ type hiParams struct {
|
|||
Name string
|
||||
}
|
||||
|
||||
func sayHi(ctx context.Context, cc *ServerSession, v hiParams) ([]*Content, error) {
|
||||
if err := cc.Ping(ctx, nil); err != nil {
|
||||
func sayHi(ctx context.Context, ss *ServerSession, v hiParams) ([]*Content, error) {
|
||||
if err := ss.Ping(ctx, nil); err != nil {
|
||||
return nil, fmt.Errorf("ping failed: %v", err)
|
||||
}
|
||||
return []*Content{NewTextContent("hi " + v.Name)}, nil
|
||||
|
|
@ -398,7 +399,7 @@ func TestCancellation(t *testing.T) {
|
|||
}
|
||||
}
|
||||
|
||||
func TestAddMiddleware(t *testing.T) {
|
||||
func TestMiddleware(t *testing.T) {
|
||||
ctx := context.Background()
|
||||
ct, st := NewInMemoryTransports()
|
||||
s := NewServer("testServer", "v1.0.0", nil)
|
||||
|
|
@ -416,26 +417,17 @@ func TestAddMiddleware(t *testing.T) {
|
|||
clientWG.Done()
|
||||
}()
|
||||
|
||||
var buf bytes.Buffer
|
||||
buf.WriteByte('\n')
|
||||
|
||||
// traceCalls creates a middleware function that prints the method before and after each call
|
||||
// with the given prefix.
|
||||
traceCalls := func(prefix string) func(ServerMethodHandler) ServerMethodHandler {
|
||||
return func(d ServerMethodHandler) ServerMethodHandler {
|
||||
return func(ctx context.Context, ss *ServerSession, method string, params any) (any, error) {
|
||||
fmt.Fprintf(&buf, "%s >%s\n", prefix, method)
|
||||
defer fmt.Fprintf(&buf, "%s <%s\n", prefix, method)
|
||||
return d(ctx, ss, method, params)
|
||||
}
|
||||
}
|
||||
}
|
||||
var sbuf, cbuf bytes.Buffer
|
||||
sbuf.WriteByte('\n')
|
||||
cbuf.WriteByte('\n')
|
||||
|
||||
// "1" is the outer middleware layer, called first; then "2" is called, and finally
|
||||
// the default dispatcher.
|
||||
s.AddMiddleware(traceCalls("1"), traceCalls("2"))
|
||||
s.AddMiddleware(traceCalls[ServerSession](&sbuf, "1"), traceCalls[ServerSession](&sbuf, "2"))
|
||||
|
||||
c := NewClient("testClient", "v1.0.0", nil)
|
||||
c.AddMiddleware(traceCalls[ClientSession](&cbuf, "1"), traceCalls[ClientSession](&cbuf, "2"))
|
||||
|
||||
cs, err := c.Connect(ctx, ct)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
|
|
@ -453,9 +445,33 @@ func TestAddMiddleware(t *testing.T) {
|
|||
2 <tools/list
|
||||
1 <tools/list
|
||||
`
|
||||
if diff := cmp.Diff(want, buf.String()); diff != "" {
|
||||
if diff := cmp.Diff(want, sbuf.String()); diff != "" {
|
||||
t.Errorf("mismatch (-want, +got):\n%s", diff)
|
||||
}
|
||||
|
||||
_, _ = ss.ListRoots(ctx, nil)
|
||||
|
||||
want = `
|
||||
1 >roots/list
|
||||
2 >roots/list
|
||||
2 <roots/list
|
||||
1 <roots/list
|
||||
`
|
||||
if diff := cmp.Diff(want, cbuf.String()); diff != "" {
|
||||
t.Errorf("mismatch (-want, +got):\n%s", diff)
|
||||
}
|
||||
}
|
||||
|
||||
// traceCalls creates a middleware function that prints the method before and after each call
|
||||
// with the given prefix.
|
||||
func traceCalls[S ClientSession | ServerSession](w io.Writer, prefix string) Middleware[S] {
|
||||
return func(h MethodHandler[S]) MethodHandler[S] {
|
||||
return func(ctx context.Context, sess *S, method string, params any) (any, error) {
|
||||
fmt.Fprintf(w, "%s >%s\n", prefix, method)
|
||||
defer fmt.Fprintf(w, "%s <%s\n", prefix, method)
|
||||
return h(ctx, sess, method, params)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
var falseSchema = &jsonschema.Schema{Not: &jsonschema.Schema{}}
|
||||
|
|
|
|||
Loading…
Reference in a new issue