Skip to content

feat(server): add TimeoutMiddleware for tool handlers #204

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jesse-engineer merged 2 commits into from
Jun 29, 2026
Merged

feat(server): add TimeoutMiddleware for tool handlers #204

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
79f5e6d
feat(server): add TimeoutMiddleware for tool handlers
knightxiaoxi Jun 28, 2026
8b7976b
fix: correct spelling 'cancelled' -> 'canceled' in TimeoutMiddleware …
knightxiaoxi Jun 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions server/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,26 @@ func RateLimitMiddleware(limiter pkg.RateLimiter) ToolMiddleware {
}
}

// TimeoutMiddleware returns a middleware that enforces a per-tool execution timeout.
// If the tool handler does not complete within the given duration, the context is
// canceled and a timeout error is returned. This prevents slow or hanging tools
// from blocking the MCP server.
//
// Example:
//
// server.RegisterTool(&protocol.Tool{Name: "search"},
// server.TimeoutMiddleware(30*time.Second)(myHandler),
// )
func TimeoutMiddleware(timeout time.Duration) ToolMiddleware {
return func(next ToolHandlerFunc) ToolHandlerFunc {
return func(ctx context.Context, req *protocol.CallToolRequest) (*protocol.CallToolResult, error) {
ctx, cancel := context.WithTimeout(ctx, timeout)
defer cancel()
return next(ctx, req)
}
}
}

func WithPagination(limit int) Option {
return func(s *Server) {
s.paginationLimit = limit
Expand Down
Loading