sync

Author: trend-winter-wang

README.md

@@ -12,6 +12,10 @@
 
 [![Tutorial](http://img.youtube.com/vi/qoaeYMrXJH0/0.jpg)](http://www.youtube.com/watch?v=qoaeYMrXJH0 "Tutorial")
 
+<br>
+
+Discuss the SDK on [Discord](https://discord.gg/RqSS2NQVsY)
+
 </div>
 
 ```go
@@ -122,6 +126,7 @@ func main() {
         "1.0.0",
         server.WithResourceCapabilities(true, true),
         server.WithLogging(),
+        server.WithRecovery(),
     )
 
     // Add a calculator tool
@@ -522,6 +527,12 @@ initialization.
 Add the `Hooks` to the server at the time of creation using the
 `server.WithHooks` option.
 
+### Tool Handler Middleware
+
+Add middleware to tool call handlers using the `server.WithToolHandlerMiddleware` option. Middlewares can be registered on server creation and are applied on every tool call.
+
+A recovery middleware option is available to recover from panics in a tool call and can be added to the server with the `server.WithRecovery` option.
+
 ## Contributing
 
 <details>

client/client.go

@@ -3,6 +3,8 @@ package client
 
 import (
 	"context"
+	"encoding/json"
+	"fmt"
 
 	"github.com/mark3labs/mcp-go/mcp"
 )
@@ -18,12 +20,25 @@ type MCPClient interface {
 	// Ping checks if the server is alive
 	Ping(ctx context.Context) error
 
+	// ListResourcesByPage manually list resources by page.
+	ListResourcesByPage(
+		ctx context.Context,
+		request mcp.ListResourcesRequest,
+	) (*mcp.ListResourcesResult, error)
+
 	// ListResources requests a list of available resources from the server
 	ListResources(
 		ctx context.Context,
 		request mcp.ListResourcesRequest,
 	) (*mcp.ListResourcesResult, error)
 
+	// ListResourceTemplatesByPage manually list resource templates by page.
+	ListResourceTemplatesByPage(
+		ctx context.Context,
+		request mcp.ListResourceTemplatesRequest,
+	) (*mcp.ListResourceTemplatesResult,
+		error)
+
 	// ListResourceTemplates requests a list of available resource templates from the server
 	ListResourceTemplates(
 		ctx context.Context,
@@ -43,6 +58,12 @@ type MCPClient interface {
 	// Unsubscribe cancels notifications for a specific resource
 	Unsubscribe(ctx context.Context, request mcp.UnsubscribeRequest) error
 
+	// ListPromptsByPage manually list prompts by page.
+	ListPromptsByPage(
+		ctx context.Context,
+		request mcp.ListPromptsRequest,
+	) (*mcp.ListPromptsResult, error)
+
 	// ListPrompts requests a list of available prompts from the server
 	ListPrompts(
 		ctx context.Context,
@@ -55,6 +76,12 @@ type MCPClient interface {
 		request mcp.GetPromptRequest,
 	) (*mcp.GetPromptResult, error)
 
+	// ListToolsByPage manually list tools by page.
+	ListToolsByPage(
+		ctx context.Context,
+		request mcp.ListToolsRequest,
+	) (*mcp.ListToolsResult, error)
+
 	// ListTools requests a list of available tools from the server
 	ListTools(
 		ctx context.Context,
@@ -82,3 +109,26 @@ type MCPClient interface {
 	// OnNotification registers a handler for notifications
 	OnNotification(handler func(notification mcp.JSONRPCNotification))
 }
+
+type mcpClient interface {
+	MCPClient
+
+	sendRequest(ctx context.Context, method string, params interface{}) (*json.RawMessage, error)
+}
+
+func listByPage[T any](
+	ctx context.Context,
+	client mcpClient,
+	request mcp.PaginatedRequest,
+	method string,
+) (*T, error) {
+	response, err := client.sendRequest(ctx, method, request.Params)
+	if err != nil {
+		return nil, err
+	}
+	var result T
+	if err := json.Unmarshal(*response, &result); err != nil {
+		return nil, fmt.Errorf("failed to unmarshal response: %w", err)
+	}
+	return &result, nil
+}