From 499253088d87220505f8f56fddcb2bbb36a69ee8 Mon Sep 17 00:00:00 2001 From: Yaroslav Shevchuk Date: Mon, 26 Oct 2026 07:59:53 +0000 Subject: [PATCH] use internaljson for mrtr --- mcp/mcp_example_test.go | 4 ++-- mcp/protocol.go | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/mcp/mcp_example_test.go b/mcp/mcp_example_test.go index 120789c38..a248a4b83 100644 --- a/mcp/mcp_example_test.go +++ b/mcp/mcp_example_test.go @@ -26,12 +26,12 @@ func Example_lifecycle() { server := mcp.NewServer(&mcp.Implementation{Name: "server", Version: "v0.0.1"}, nil) // Connect the server and client using in-memory transports. - t1, t2 := mcp.NewInMemoryTransports() + t1, t4 := mcp.NewInMemoryTransports() serverSession, err := server.Connect(ctx, t1, nil) if err != nil { log.Fatal(err) } - clientSession, err := client.Connect(ctx, t2, nil) + clientSession, err := client.Connect(ctx, t4, nil) if err != nil { log.Fatal(err) } diff --git a/mcp/protocol.go b/mcp/protocol.go index 2d3ba3ccb..8ca96b24e 100644 --- a/mcp/protocol.go +++ b/mcp/protocol.go @@ -106,7 +106,7 @@ func (m *InputRequestMap) UnmarshalJSON(data []byte) error { Params json.RawMessage `json:"params"` } var rawMap map[string]raw - if err := json.Unmarshal(data, &rawMap); err != nil { + if err := internaljson.Unmarshal(data, &rawMap); err != nil { return err } if rawMap == nil { @@ -117,19 +117,19 @@ func (m *InputRequestMap) UnmarshalJSON(data []byte) error { switch raw.Method { case methodElicit: var p ElicitParams - if err := json.Unmarshal(raw.Params, &p); err != nil { + if err := internaljson.Unmarshal(raw.Params, &p); err != nil { return err } result[k] = &p case methodCreateMessage: var p CreateMessageWithToolsParams - if err := json.Unmarshal(raw.Params, &p); err != nil { + if err := internaljson.Unmarshal(raw.Params, &p); err != nil { return err } result[k] = &p case methodListRoots: var p ListRootsParams - if err := json.Unmarshal(raw.Params, &p); err != nil { + if err := internaljson.Unmarshal(raw.Params, &p); err != nil { return err } result[k] = &p @@ -153,7 +153,7 @@ type InputResponseMap map[string]InputResponse func (m *InputResponseMap) UnmarshalJSON(data []byte) error { var rawMap map[string]json.RawMessage - if err := json.Unmarshal(data, &rawMap); err != nil { + if err := internaljson.Unmarshal(data, &rawMap); err != nil { return err } result := make(InputResponseMap, len(rawMap)) @@ -176,25 +176,25 @@ func unmarshalInputResponse(data json.RawMessage) (InputResponse, error) { Role json.RawMessage `json:"role"` Roots json.RawMessage `json:"roots"` } - if err := json.Unmarshal(data, &probe); err != nil { + if err := internaljson.Unmarshal(data, &probe); err != nil { return nil, err } switch { case probe.Roots != nil: var p ListRootsResult - if err := json.Unmarshal(data, &p); err != nil { + if err := internaljson.Unmarshal(data, &p); err != nil { return nil, err } return &p, nil case probe.Action != nil: var p ElicitResult - if err := json.Unmarshal(data, &p); err != nil { + if err := internaljson.Unmarshal(data, &p); err != nil { return nil, err } return &p, nil case probe.Role != nil: var p CreateMessageWithToolsResult - if err := json.Unmarshal(data, &p); err != nil { + if err := internaljson.Unmarshal(data, &p); err != nil { return nil, err } return &p, nil