modelcontextprotocol/go-sdk
Watch
1
0
Fork
You've already forked go-sdk
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

mcp: NewClient and NewServer take Implementation (#113)

Browse source 
Change the name and version arguments to NewClient and NewServer to a
`*Implementation`, to future-proof against the spec.

Fixes #109.
This commit is contained in:
Jonathan Amsterdam 2025-07-10 16:57:38 -04:00 • committed by GitHub
commit 6c6243c0b0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 76 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

30
mcp/mcp_test.go
View file

@ -64,7 +64,7 @@ func TestEndToEnd(t *testing.T) {
notificationChans["progress_server"] <- 0
},
}
s := NewServer("testServer", "v1.0.0", sopts)
s := NewServer(testImpl, sopts)
AddTool(s, &Tool{
Name: "greet",
Description: "say hi",
@ -125,7 +125,7 @@ func TestEndToEnd(t *testing.T) {
notificationChans["progress_client"] <- 0
},
}
c := NewClient("testClient", "v1.0.0", opts)
c := NewClient(testImpl, opts)
rootAbs, err := filepath.Abs(filepath.FromSlash("testdata/files"))
if err != nil {
t.Fatal(err)
@ -510,7 +510,7 @@ func basicConnection(t *testing.T, config func(*Server)) (*ServerSession, *Clien
ctx := context.Background()
ct, st := NewInMemoryTransports()
s := NewServer("testServer", "v1.0.0", nil)
s := NewServer(testImpl, nil)
if config != nil {
config(s)
}
@ -519,7 +519,7 @@ func basicConnection(t *testing.T, config func(*Server)) (*ServerSession, *Clien
t.Fatal(err)
}
c := NewClient("testClient", "v1.0.0", nil)
c := NewClient(testImpl, nil)
cs, err := c.Connect(ctx, ct)
if err != nil {
t.Fatal(err)
@ -562,13 +562,13 @@ func TestBatching(t *testing.T) {
ctx := context.Background()
ct, st := NewInMemoryTransports()
s := NewServer("testServer", "v1.0.0", nil)
s := NewServer(testImpl, nil)
_, err := s.Connect(ctx, st)
if err != nil {
t.Fatal(err)
}
c := NewClient("testClient", "v1.0.0", nil)
c := NewClient(testImpl, nil)
// TODO: this test is broken, because increasing the batch size here causes
// 'initialize' to block. Therefore, we can only test with a size of 1.
// Since batching is being removed, we can probably just delete this.
@ -632,7 +632,7 @@ func TestMiddleware(t *testing.T) {
ctx := context.Background()
ct, st := NewInMemoryTransports()
s := NewServer("testServer", "v1.0.0", nil)
s := NewServer(testImpl, nil)
ss, err := s.Connect(ctx, st)
if err != nil {
t.Fatal(err)
@ -656,7 +656,7 @@ func TestMiddleware(t *testing.T) {
s.AddSendingMiddleware(traceCalls[*ServerSession](&sbuf, "S1"), traceCalls[*ServerSession](&sbuf, "S2"))
s.AddReceivingMiddleware(traceCalls[*ServerSession](&sbuf, "R1"), traceCalls[*ServerSession](&sbuf, "R2"))
c := NewClient("testClient", "v1.0.0", nil)
c := NewClient(testImpl, nil)
c.AddSendingMiddleware(traceCalls[*ClientSession](&cbuf, "S1"), traceCalls[*ClientSession](&cbuf, "S2"))
c.AddReceivingMiddleware(traceCalls[*ClientSession](&cbuf, "R1"), traceCalls[*ClientSession](&cbuf, "R2"))
@ -741,13 +741,13 @@ func TestNoJSONNull(t *testing.T) {
var logbuf safeBuffer
ct = NewLoggingTransport(ct, &logbuf)
s := NewServer("testServer", "v1.0.0", nil)
s := NewServer(testImpl, nil)
ss, err := s.Connect(ctx, st)
if err != nil {
t.Fatal(err)
}
c := NewClient("testClient", "v1.0.0", nil)
c := NewClient(testImpl, nil)
cs, err := c.Connect(ctx, ct)
if err != nil {
t.Fatal(err)
@ -810,7 +810,7 @@ func TestKeepAlive(t *testing.T) {
serverOpts := &ServerOptions{
KeepAlive: 100 * time.Millisecond,
}
s := NewServer("testServer", "v1.0.0", serverOpts)
s := NewServer(testImpl, serverOpts)
AddTool(s, greetTool(), sayHi)
ss, err := s.Connect(ctx, st)
@ -822,7 +822,7 @@ func TestKeepAlive(t *testing.T) {
clientOpts := &ClientOptions{
KeepAlive: 100 * time.Millisecond,
}
c := NewClient("testClient", "v1.0.0", clientOpts)
c := NewClient(testImpl, clientOpts)
cs, err := c.Connect(ctx, ct)
if err != nil {
t.Fatal(err)
@ -855,7 +855,7 @@ func TestKeepAliveFailure(t *testing.T) {
ct, st := NewInMemoryTransports()
// Server without keepalive (to test one-sided keepalive)
s := NewServer("testServer", "v1.0.0", nil)
s := NewServer(testImpl, nil)
AddTool(s, greetTool(), sayHi)
ss, err := s.Connect(ctx, st)
if err != nil {
@ -866,7 +866,7 @@ func TestKeepAliveFailure(t *testing.T) {
clientOpts := &ClientOptions{
KeepAlive: 50 * time.Millisecond,
}
c := NewClient("testClient", "v1.0.0", clientOpts)
c := NewClient(testImpl, clientOpts)
cs, err := c.Connect(ctx, ct)
if err != nil {
t.Fatal(err)
@ -895,3 +895,5 @@ func TestKeepAliveFailure(t *testing.T) {
t.Errorf("expected connection to be closed by keepalive, but it wasn't. Last error: %v", err)
}
var testImpl = &Implementation{Name: "test", Version: "v1.0.0"}