fix: fix some obvious simplifications (#267)

Author: pottekkat

examples/everything/main.go

@@ -2,9 +2,11 @@ package main
 
 import (
 	"context"
+	"encoding/base64"
 	"flag"
 	"fmt"
 	"log"
+	"strconv"
 	"time"
 
 	"github.com/mark3labs/mcp-go/mcp"
@@ -64,6 +66,7 @@ func NewMCPServer() *server.MCPServer {
 		"1.0.0",
 		server.WithResourceCapabilities(true, true),
 		server.WithPromptCapabilities(true),
+		server.WithToolCapabilities(true),
 		server.WithLogging(),
 		server.WithHooks(hooks),
 	)
@@ -79,6 +82,12 @@ func NewMCPServer() *server.MCPServer {
 		),
 		handleResourceTemplate,
 	)
+
+	resources := generateResources()
+	for _, resource := range resources {
+		mcpServer.AddResource(resource, handleGeneratedResource)
+	}
+
 	mcpServer.AddPrompt(mcp.NewPrompt(string(SIMPLE),
 		mcp.WithPromptDescription("A simple prompt"),
 	), handleSimplePrompt)
@@ -180,27 +189,6 @@ func generateResources() []mcp.Resource {
 	return resources
 }
 
-func runUpdateInterval() {
-	// for range s.updateTicker.C {
-	// 	for uri := range s.subscriptions {
-	// 		s.server.HandleMessage(
-	// 			context.Background(),
-	// 			mcp.JSONRPCNotification{
-	// 				JSONRPC: mcp.JSONRPC_VERSION,
-	// 				Notification: mcp.Notification{
-	// 					Method: "resources/updated",
-	// 					Params: struct {
-	// 						Meta map[string]any `json:"_meta,omitempty"`
-	// 					}{
-	// 						Meta: map[string]any{"uri": uri},
-	// 					},
-	// 				},
-	// 			},
-	// 		)
-	// 	}
-	// }
-}
-
 func handleReadResource(
 	ctx context.Context,
 	request mcp.ReadResourceRequest,
@@ -227,6 +215,43 @@ func handleResourceTemplate(
 	}, nil
 }
 
+func handleGeneratedResource(
+	ctx context.Context,
+	request mcp.ReadResourceRequest,
+) ([]mcp.ResourceContents, error) {
+	uri := request.Params.URI
+
+	var resourceNumber string
+	if _, err := fmt.Sscanf(uri, "test://static/resource/%s", &resourceNumber); err != nil {
+		return nil, fmt.Errorf("invalid resource URI format: %w", err)
+	}
+
+	num, err := strconv.Atoi(resourceNumber)
+	if err != nil {
+		return nil, fmt.Errorf("invalid resource number: %w", err)
+	}
+
+	index := num - 1
+
+	if index%2 == 0 {
+		return []mcp.ResourceContents{
+			mcp.TextResourceContents{
+				URI:      uri,
+				MIMEType: "text/plain",
+				Text:     fmt.Sprintf("Text content for resource %d", num),
+			},
+		}, nil
+	} else {
+		return []mcp.ResourceContents{
+			mcp.BlobResourceContents{
+				URI:      uri,
+				MIMEType: "application/octet-stream",
+				Blob:     base64.StdEncoding.EncodeToString([]byte(fmt.Sprintf("Binary content for resource %d", num))),
+			},
+		}, nil
+	}
+}
+
 func handleSimplePrompt(
 	ctx context.Context,
 	request mcp.GetPromptRequest,

server/session.go

@@ -231,10 +231,8 @@ func (s *MCPServer) AddSessionTools(sessionID string, tools ...ServerTool) error
 	newSessionTools := make(map[string]ServerTool, len(sessionTools)+len(tools))
 
 	// Copy existing tools
-	if sessionTools != nil {
-		for k, v := range sessionTools {
-			newSessionTools[k] = v
-		}
+	for k, v := range sessionTools {
+		newSessionTools[k] = v
 	}
 
 	// Add new tools

server/sse.go

@@ -451,7 +451,7 @@ func (s *SSEServer) handleMessage(w http.ResponseWriter, r *http.Request) {
 			if eventData, err := json.Marshal(response); err != nil {
 				// If there is an error marshalling the response, send a generic error response
 				log.Printf("failed to marshal response: %v", err)
-				message = fmt.Sprintf("event: message\ndata: {\"error\": \"internal error\",\"jsonrpc\": \"2.0\", \"id\": null}\n\n")
+				message = "event: message\ndata: {\"error\": \"internal error\",\"jsonrpc\": \"2.0\", \"id\": null}\n\n"
 			} else {
 				message = fmt.Sprintf("event: message\ndata: %s\n\n", eventData)
 			}

server/sse_test.go

@@ -197,7 +197,8 @@ func TestSSEServer(t *testing.T) {
 
 				endpointEvent, err = readSSEEvent(sseResp)
 				if err != nil {
-					t.Fatalf("Failed to read SSE response: %v", err)
+					t.Errorf("Failed to read SSE response: %v", err)
+					return
 				}
 				respFromSee := strings.TrimSpace(
 					strings.Split(strings.Split(endpointEvent, "data: ")[1], "\n")[0],