Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
21 changes: 21 additions & 0 deletions internal/api/handlers/v0/list_errors.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
package v0

import (
"context"
"errors"
"log"

"github.com/danielgtaylor/huma/v2"
)

// ListServersError maps ListServers failures; client disconnects must not log as 500s.
func ListServersError(ctx context.Context, err error) error {
if err == nil {
return nil
}
if errors.Is(err, context.Canceled) || errors.Is(ctx.Err(), context.Canceled) {
return huma.NewError(499, "Client closed request", err)
}
log.Printf("list servers failed: %v", err)
return huma.Error500InternalServerError("Failed to get registry list", err)
}
31 changes: 31 additions & 0 deletions internal/api/handlers/v0/list_errors_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
package v0_test

import (
"context"
"errors"
"testing"

"github.com/danielgtaylor/huma/v2"
v0 "github.com/modelcontextprotocol/registry/internal/api/handlers/v0"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)

func TestListServersError_clientCanceled(t *testing.T) {
ctx, cancel := context.WithCancel(context.Background())
cancel()

err := v0.ListServersError(ctx, errors.New("error iterating rows: context canceled"))
require.Error(t, err)
var se huma.StatusError
require.True(t, errors.As(err, &se))
assert.Equal(t, 499, se.GetStatus())
}

func TestListServersError_realFailure(t *testing.T) {
err := v0.ListServersError(context.Background(), errors.New("database unavailable"))
require.Error(t, err)
var se huma.StatusError
require.True(t, errors.As(err, &se))
assert.Equal(t, 500, se.GetStatus())
}
3 changes: 1 addition & 2 deletions internal/api/handlers/v0/servers.go
Original file line number Diff line number Diff line change
Expand Up @@ -132,8 +132,7 @@ func RegisterServersEndpoints(api huma.API, pathPrefix string, registry service.
// Get paginated results with filtering
servers, nextCursor, err := registry.ListServers(ctx, filter, input.Cursor, input.Limit)
if err != nil {
log.Printf("list servers failed: %v", err)
return nil, huma.Error500InternalServerError("Failed to get registry list")
return nil, ListServersError(ctx, err)
}

// Convert []*ServerResponse to []ServerResponse
Expand Down
Loading