Use correct mutex

Author: ezynda3

client/transport/stdio_test.go

@@ -32,10 +32,10 @@ func compileTestServer(outputPath string) error {
 func TestStdio(t *testing.T) {
 	// Compile mock server
 	mockServerPath := filepath.Join(os.TempDir(), "mockstdio_server")
-		// Add .exe suffix on Windows
-		if runtime.GOOS == "windows" {
-			mockServerPath += ".exe"
-		}
+	// Add .exe suffix on Windows
+	if runtime.GOOS == "windows" {
+		mockServerPath += ".exe"
+	}
 	if err := compileTestServer(mockServerPath); err != nil {
 		t.Fatalf("Failed to compile mock server: %v", err)
 	}

server/server.go

@@ -421,9 +421,9 @@ func (s *MCPServer) AddResource(
 
 // RemoveResource removes a resource from the server
 func (s *MCPServer) RemoveResource(uri string) {
-	s.mu.Lock()
+	s.resourcesMu.Lock()
 	delete(s.resources, uri)
-	s.mu.Unlock()
+	s.resourcesMu.Unlock()
 
 	// Send notification to all initialized sessions if listChanged capability is enabled
 	if s.capabilities.resources != nil && s.capabilities.resources.listChanged {

server/sse.go

@@ -54,20 +54,20 @@ var _ ClientSession = (*sseSession)(nil)
 // SSEServer implements a Server-Sent Events (SSE) based MCP server.
 // It provides real-time communication capabilities over HTTP using the SSE protocol.
 type SSEServer struct {
-	server          *MCPServer
-	baseURL         string
-	basePath        string
-  useFullURLForMessageEndpoint bool
-	messageEndpoint string
-	sseEndpoint     string
-	sessions        sync.Map
-	srv             *http.Server
-	contextFunc     SSEContextFunc
+	server                       *MCPServer
+	baseURL                      string
+	basePath                     string
+	useFullURLForMessageEndpoint bool
+	messageEndpoint              string
+	sseEndpoint                  string
+	sessions                     sync.Map
+	srv                          *http.Server
+	contextFunc                  SSEContextFunc
 
 	keepAlive         bool
 	keepAliveInterval time.Duration
-	
-	mu               sync.RWMutex
+
+	mu sync.RWMutex
 }
 
 // SSEOption defines a function type for configuring SSEServer
@@ -161,12 +161,12 @@ func WithSSEContextFunc(fn SSEContextFunc) SSEOption {
 // NewSSEServer creates a new SSE server instance with the given MCP server and options.
 func NewSSEServer(server *MCPServer, opts ...SSEOption) *SSEServer {
 	s := &SSEServer{
-		server:            server,
-		sseEndpoint:       "/sse",
-		messageEndpoint:   "/message",
-    useFullURLForMessageEndpoint: true,
-		keepAlive:         false,
-		keepAliveInterval: 10 * time.Second,
+		server:                       server,
+		sseEndpoint:                  "/sse",
+		messageEndpoint:              "/message",
+		useFullURLForMessageEndpoint: true,
+		keepAlive:                    false,
+		keepAliveInterval:            10 * time.Second,
 	}
 
 	// Apply all options
@@ -310,7 +310,6 @@ func (s *SSEServer) handleSSE(w http.ResponseWriter, r *http.Request) {
 		}()
 	}
 
-
 	// Send the initial endpoint event
 	fmt.Fprintf(w, "event: endpoint\ndata: %s\r\n\r\n", s.GetMessageEndpointForClient(sessionID))
 	flusher.Flush()

server/sse_test.go

@@ -5,8 +5,8 @@ import (
 	"bytes"
 	"context"
 	"encoding/json"
-	"io"
 	"fmt"
+	"io"
 	"math/rand"
 	"net/http"
 	"net/http/httptest"
@@ -744,7 +744,7 @@ func TestSSEServer(t *testing.T) {
 
 	t.Run("Client receives and can respond to ping messages", func(t *testing.T) {
 		mcpServer := NewMCPServer("test", "1.0.0")
-		testServer := NewTestServer(mcpServer, 
+		testServer := NewTestServer(mcpServer,
 			WithKeepAlive(true),
 			WithKeepAliveInterval(50*time.Millisecond),
 		)
@@ -757,73 +757,73 @@ func TestSSEServer(t *testing.T) {
 		defer sseResp.Body.Close()
 
 		reader := bufio.NewReader(sseResp.Body)
-		
+
 		var messageURL string
 		var pingID float64
-		
+
 		for {
 			line, err := reader.ReadString('\n')
 			if err != nil {
 				t.Fatalf("Failed to read SSE event: %v", err)
 			}
-			
+
 			if strings.HasPrefix(line, "event: endpoint") {
 				dataLine, err := reader.ReadString('\n')
 				if err != nil {
 					t.Fatalf("Failed to read endpoint data: %v", err)
 				}
 				messageURL = strings.TrimSpace(strings.TrimPrefix(dataLine, "data: "))
-				
+
 				_, err = reader.ReadString('\n')
 				if err != nil {
 					t.Fatalf("Failed to read blank line: %v", err)
 				}
 			}
-			
+
 			if strings.HasPrefix(line, "event: message") {
 				dataLine, err := reader.ReadString('\n')
 				if err != nil {
 					t.Fatalf("Failed to read message data: %v", err)
 				}
-				
+
 				pingData := strings.TrimSpace(strings.TrimPrefix(dataLine, "data:"))
 				var pingMsg mcp.JSONRPCRequest
 				if err := json.Unmarshal([]byte(pingData), &pingMsg); err != nil {
 					t.Fatalf("Failed to parse ping message: %v", err)
 				}
-				
+
 				if pingMsg.Method == "ping" {
 					pingID = pingMsg.ID.(float64)
 					t.Logf("Received ping with ID: %f", pingID)
 					break // We got the ping, exit the loop
 				}
-				
+
 				_, err = reader.ReadString('\n')
 				if err != nil {
 					t.Fatalf("Failed to read blank line: %v", err)
 				}
 			}
-			
+
 			if messageURL != "" && pingID != 0 {
 				break
 			}
 		}
-		
+
 		if messageURL == "" {
 			t.Fatal("Did not receive message endpoint URL")
 		}
-		
+
 		pingResponse := map[string]any{
 			"jsonrpc": "2.0",
 			"id":      pingID,
 			"result":  map[string]any{},
 		}
-		
+
 		requestBody, err := json.Marshal(pingResponse)
 		if err != nil {
 			t.Fatalf("Failed to marshal ping response: %v", err)
 		}
-		
+
 		resp, err := http.Post(
 			messageURL,
 			"application/json",
@@ -833,22 +833,22 @@ func TestSSEServer(t *testing.T) {
 			t.Fatalf("Failed to send ping response: %v", err)
 		}
 		defer resp.Body.Close()
-		
+
 		if resp.StatusCode != http.StatusAccepted {
 			t.Errorf("Expected status 202 for ping response, got %d", resp.StatusCode)
 		}
-		
+
 		body, err := io.ReadAll(resp.Body)
 		if err != nil {
 			t.Fatalf("Failed to read response body: %v", err)
 		}
-		
+
 		if len(body) > 0 {
 			var response map[string]any
 			if err := json.Unmarshal(body, &response); err != nil {
 				t.Fatalf("Failed to parse response body: %v", err)
 			}
-			
+
 			if response["error"] != nil {
 				t.Errorf("Expected no error in response, got %v", response["error"])
 			}