218b0b422d## Summary This PR implements the flattened `_meta` format for server extensions as discussed in #284, replacing the confusing wrapper format with a clean single-file approach. **Before (wrapper format):** ```json { "server": { "name": "my-server", "description": "..." }, "x-publisher": { "build_info": "..." }, "x-io.modelcontextprotocol.registry": { "id": "...", "published_at": "..." } } ``` **After (flattened format):** ```json { "name": "my-server", "description": "...", "_meta": { "publisher": { "build_info": "..." }, "io.modelcontextprotocol.registry": { "id": "...", "published_at": "..." } } } ``` ## Key Changes - **Flattened Format**: Single `ServerJSON` file with structured `_meta` field - **Better DX**: Publishers maintain one file instead of separate server.json + extensions.json - **MCP Compliance**: Uses standard `_meta` mechanism instead of `x-*` prefixes - **Simplified Database**: PostgreSQL now uses simple `id, value` table structure - **Type Safety**: Structured `ServerMeta` with known extension fields ## Database Migration Added migration `003_simplify_to_key_value.sql` that drops the complex relational structure and creates a simple key-value table. This significantly simplifies database management. ## Testing - All core tests passing (validators, service layer) - Schema validation working for all 10 examples - Seed data successfully migrated (396 entries) - Publishing functionality verified Fixes #284
102 lines
3.1 KiB
Go
102 lines
3.1 KiB
Go
package v0
|
|
|
|
import (
|
|
"context"
|
|
"net/http"
|
|
|
|
"github.com/danielgtaylor/huma/v2"
|
|
"github.com/google/uuid"
|
|
"github.com/modelcontextprotocol/registry/internal/service"
|
|
apiv0 "github.com/modelcontextprotocol/registry/pkg/api/v0"
|
|
)
|
|
|
|
// Metadata contains pagination metadata
|
|
type Metadata struct {
|
|
NextCursor string `json:"next_cursor,omitempty"`
|
|
Count int `json:"count,omitempty"`
|
|
Total int `json:"total,omitempty"`
|
|
}
|
|
|
|
// ListServersInput represents the input for listing servers
|
|
type ListServersInput struct {
|
|
Cursor string `query:"cursor" doc:"Pagination cursor (UUID)" format:"uuid" required:"false"`
|
|
Limit int `query:"limit" doc:"Number of items per page" default:"30" minimum:"1" maximum:"100"`
|
|
}
|
|
|
|
// ListServersBody represents the paginated server list response body
|
|
type ListServersBody struct {
|
|
Servers []apiv0.ServerJSON `json:"servers" doc:"List of MCP servers with extensions"`
|
|
Metadata *Metadata `json:"metadata,omitempty" doc:"Pagination metadata"`
|
|
}
|
|
|
|
// ServerDetailInput represents the input for getting server details
|
|
type ServerDetailInput struct {
|
|
ID string `path:"id" doc:"Server ID (UUID)" format:"uuid"`
|
|
}
|
|
|
|
// RegisterServersEndpoints registers all server-related endpoints
|
|
func RegisterServersEndpoints(api huma.API, registry service.RegistryService) {
|
|
// List servers endpoint
|
|
huma.Register(api, huma.Operation{
|
|
OperationID: "list-servers",
|
|
Method: http.MethodGet,
|
|
Path: "/v0/servers",
|
|
Summary: "List MCP servers",
|
|
Description: "Get a paginated list of MCP servers from the registry",
|
|
Tags: []string{"servers"},
|
|
}, func(_ context.Context, input *ListServersInput) (*Response[ListServersBody], error) {
|
|
// Validate cursor if provided
|
|
if input.Cursor != "" {
|
|
_, err := uuid.Parse(input.Cursor)
|
|
if err != nil {
|
|
return nil, huma.Error400BadRequest("Invalid cursor parameter")
|
|
}
|
|
}
|
|
|
|
// Get paginated results
|
|
servers, nextCursor, err := registry.List(input.Cursor, input.Limit)
|
|
if err != nil {
|
|
return nil, huma.Error500InternalServerError("Failed to get registry list", err)
|
|
}
|
|
|
|
// Build response body
|
|
body := ListServersBody{
|
|
Servers: servers,
|
|
}
|
|
|
|
// Add metadata if there's a next cursor
|
|
if nextCursor != "" {
|
|
body.Metadata = &Metadata{
|
|
NextCursor: nextCursor,
|
|
Count: len(servers),
|
|
}
|
|
}
|
|
|
|
return &Response[ListServersBody]{
|
|
Body: body,
|
|
}, nil
|
|
})
|
|
|
|
// Get server details endpoint
|
|
huma.Register(api, huma.Operation{
|
|
OperationID: "get-server",
|
|
Method: http.MethodGet,
|
|
Path: "/v0/servers/{id}",
|
|
Summary: "Get MCP server details",
|
|
Description: "Get detailed information about a specific MCP server",
|
|
Tags: []string{"servers"},
|
|
}, func(_ context.Context, input *ServerDetailInput) (*Response[apiv0.ServerJSON], error) {
|
|
// Get the server details from the registry service
|
|
serverDetail, err := registry.GetByID(input.ID)
|
|
if err != nil {
|
|
if err.Error() == "record not found" {
|
|
return nil, huma.Error404NotFound("Server not found")
|
|
}
|
|
return nil, huma.Error500InternalServerError("Failed to get server details", err)
|
|
}
|
|
|
|
return &Response[apiv0.ServerJSON]{
|
|
Body: *serverDetail,
|
|
}, nil
|
|
})
|
|
}
|