Wielded Claude Code to do this; across many iterations and have reviewed all the code + largely rewritten the PR commentary here. This PR implements the server ID consistency changes from [#396](https://github.com/modelcontextprotocol/registry/issues/396). Our goal is to: - Rename `id` to `versionId` to make it clear that it is the ID for a specific version, not a server - Introduce `serverId` as a net new concept. This will be 1:1 with `name`. While not strictly necessary (we could just use name as a PK), the convention of having a UUID as an ID on our objects is just a helpful subjective architecture decision. Plus also leaves open the door to reconsidering the "should we allow renames" question. ## Key Changes ### 🗄️ Database Schema Changes - **Renamed**: `id` column → `version_id` (unique identifier for each server version) ### 📋 Metadata Structure Updates - **JSON Schema**: Updated `_meta.io.modelcontextprotocol.registry/official` to include: - `serverId`: Consistent ID across all versions of a server - `versionId`: Unique ID for this specific version (renamed from `id`) ### 🔧 API Endpoint Updates - **New endpoint structure**: Changed from version-ID-based to server-ID-based URLs: - `GET /v0/servers/{server_id}` - Get latest version of server - `GET /v0/servers/{server_id}?version=X.X.X` - Get specific version - `GET /v0/servers/{server_id}/versions` - List all versions of a server - `PUT /v0/servers/{server_id}?version=X.X.X` - Edit specific version - **Consistent URL patterns**: All server endpoints now use `server_id` as the primary identifier ### Database Migration Strategy The migration (`005_add_server_id_rename_version_id.sql`): 1. Adds new `version_id` column 2. Generates deterministic UUIDs for servers with the same name 3. Updates JSON metadata to add `serverId` and rename `id` to `versionId` 4. Copies existing `id` values to `version_id` column 5. Drops old `id` column and makes `version_id` the new primary key ## Testing Besides of course automated tests passing, I: 1. Set up my local db with the pre-005-migration state, imported all the production data 2. Ran the migration 3. Spot checked some diffs of the data that resulted -- ```json // before { "name": "io.github.ruvnet/ruv-swarm", "_meta": { "io.modelcontextprotocol.registry/official": { "id": "0a9cda7f-2b73-4839-844b-6582f335de42", "is_latest": false, "updated_at": "2025-09-10T17:21:34.92137012Z", "published_at": "2025-09-10T17:15:32.69690433Z" } }, "version": "1.0.18", "repository": { "url": "", "source": "" }, "description": "Neural network swarm orchestration with WebAssembly acceleration and MCP integration" } // after { "name": "io.github.ruvnet/ruv-swarm", "_meta": { "io.modelcontextprotocol.registry/official": { "serverId": "e8538952-96af-4a33-9e31-7fbed012521e", "is_latest": false, "versionId": "0a9cda7f-2b73-4839-844b-6582f335de42", "updated_at": "2025-09-10T17:21:34.92137012Z", "published_at": "2025-09-10T17:15:32.69690433Z" } }, "version": "1.0.18", "repository": { "url": "", "source": "" }, "description": "Neural network swarm orchestration with WebAssembly acceleration and MCP integration" } ``` Servers that have multiple versions stayed consistent in their `serverId`: ```json // First version { "name": "app.getdialer/dialer", "_meta": { "io.modelcontextprotocol.registry/official": { "serverId": "80f08bdb-f3e4-4f19-b072-1676ae49b663", "is_latest": false, "versionId": "04f25b17-331d-48d7-b08b-37baece208a7", "updated_at": "2025-09-09T00:16:49.162620072Z", "published_at": "2025-09-08T23:47:09.452137971Z" } }, "status": "active", "$schema": "https://static.modelcontextprotocol.io/schemas/2025-07-09/server.schema.json", "remotes": [ { "url": "https://getdialer.app/mcp", "type": "streamable-http" }, { "url": "https://getdialer.app/sse", "type": "sse" } ], "version": "1.0.0", "repository": { "url": "", "source": "" }, "description": "An MCP server that provides your you make outbound phone calls using your own phone number" } // Second version { "name": "app.getdialer/dialer", "_meta": { "io.modelcontextprotocol.registry/official": { "serverId": "80f08bdb-f3e4-4f19-b072-1676ae49b663", "is_latest": true, "versionId": "faa26cb9-3aad-415e-aece-f715fff5fe5e", "updated_at": "2025-09-09T00:16:49.107842808Z", "published_at": "2025-09-09T00:16:49.107842808Z" } }, "status": "active", "$schema": "https://static.modelcontextprotocol.io/schemas/2025-07-09/server.schema.json", "remotes": [ { "url": "https://getdialer.app/mcp", "type": "streamable-http" }, { "url": "https://getdialer.app/sse", "type": "sse" } ], "version": "1.0.1", "repository": { "url": "", "source": "" }, "description": "An MCP server that provides lets you make outbound phone calls using your own phone number" } ``` And I also tried publishing a test server anew; looked good: ```bash ⏺ Bash(curl -s "http://localhost:8080/v0/servers/102dc4e4-6ca8-40e6-aa11-cd45763d3352" | jq '.') ⎿ { "$schema": "https://static.modelcontextprotocol.io/schemas/2025-07-09/server.schema.json", "name": "io.modelcontextprotocol.anonymous/test-claude-migration-server", "description": "A test server to verify the new migration and API endpoints work correctly", "status": "active", "repository": { "url": "https://github.com/example/test-claude-migration-server", "source": "github", "id": "example/test-claude-migration-server" }, "version": "1.0.0", "_meta": { "io.modelcontextprotocol.registry/official": { "serverId": "102dc4e4-6ca8-40e6-aa11-cd45763d3352", "versionId": "48c9cd55-7bc4-4ac2-896e-59e81eb653e4", "published_at": "2025-09-12T18:33:23.264203-07:00", "updated_at": "2025-09-12T18:33:23.264203-07:00", "is_latest": true } } } ⏺ Bash(curl -s "http://localhost:8080/v0/servers/102dc4e4-6ca8-40e6-aa11-cd45763d3352/versions" | jq '.') ⎿ { "servers": [ { "$schema": "https://static.modelcontextprotocol.io/schemas/2025-07-09/server.schema.json", "name": "io.modelcontextprotocol.anonymous/test-claude-migration-server", "description": "A test server to verify the new migration and API endpoints work correctly", "status": "active", "repository": { "url": "https://github.com/example/test-claude-migration-server", "source": "github", "id": "example/test-claude-migration-server" }, "version": "1.0.0", "_meta": { "io.modelcontextprotocol.registry/official": { "serverId": "102dc4e4-6ca8-40e6-aa11-cd45763d3352", "versionId": "48c9cd55-7bc4-4ac2-896e-59e81eb653e4", "published_at": "2025-09-12T18:33:23.264203-07:00", "updated_at": "2025-09-12T18:33:23.264203-07:00", "is_latest": true } } } ], "metadata": { "count": 1 } } ``` Co-Authored-By: Claude <noreply@anthropic.com> --------- Co-authored-by: Claude <noreply@anthropic.com> Co-authored-by: Preeti Dewani <preetidewani1990@gmail.com> Co-authored-by: adam jones <adamj+git@anthropic.com> Co-authored-by: Adam Jones <adamj@anthropic.com>
335 lines
8 KiB
Go
335 lines
8 KiB
Go
package database
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"sort"
|
|
"strings"
|
|
"sync"
|
|
|
|
apiv0 "github.com/modelcontextprotocol/registry/pkg/api/v0"
|
|
)
|
|
|
|
// MemoryDB is an in-memory implementation of the Database interface
|
|
type MemoryDB struct {
|
|
entries map[string]*apiv0.ServerJSON // maps registry metadata version_id to ServerJSON
|
|
mu sync.RWMutex
|
|
}
|
|
|
|
func NewMemoryDB() *MemoryDB {
|
|
// Convert input ServerJSON entries to have proper metadata
|
|
serverRecords := make(map[string]*apiv0.ServerJSON)
|
|
return &MemoryDB{
|
|
entries: serverRecords,
|
|
}
|
|
}
|
|
|
|
func (db *MemoryDB) List(
|
|
ctx context.Context,
|
|
filter *ServerFilter,
|
|
cursor string,
|
|
limit int,
|
|
) ([]*apiv0.ServerJSON, string, error) {
|
|
if ctx.Err() != nil {
|
|
return nil, "", ctx.Err()
|
|
}
|
|
|
|
if limit <= 0 {
|
|
limit = 10 // Default limit
|
|
}
|
|
|
|
db.mu.RLock()
|
|
defer db.mu.RUnlock()
|
|
|
|
// Convert all entries to a slice for pagination
|
|
var allEntries []*apiv0.ServerJSON
|
|
for _, entry := range db.entries {
|
|
allEntries = append(allEntries, entry)
|
|
}
|
|
|
|
// Apply filtering and sorting
|
|
filteredEntries := db.filterAndSort(allEntries, filter)
|
|
|
|
// Find starting point for cursor-based pagination
|
|
startIdx := 0
|
|
if cursor != "" {
|
|
for i, entry := range filteredEntries {
|
|
if db.getRegistryID(entry) == cursor {
|
|
startIdx = i + 1 // Start after the cursor
|
|
break
|
|
}
|
|
}
|
|
}
|
|
|
|
// Apply pagination
|
|
endIdx := min(startIdx+limit, len(filteredEntries))
|
|
|
|
var result []*apiv0.ServerJSON
|
|
if startIdx < len(filteredEntries) {
|
|
result = filteredEntries[startIdx:endIdx]
|
|
} else {
|
|
result = []*apiv0.ServerJSON{}
|
|
}
|
|
|
|
// Determine next cursor
|
|
nextCursor := ""
|
|
if endIdx < len(filteredEntries) && len(result) > 0 {
|
|
nextCursor = db.getRegistryID(result[len(result)-1])
|
|
}
|
|
|
|
return result, nextCursor, nil
|
|
}
|
|
|
|
func (db *MemoryDB) GetByVersionID(ctx context.Context, versionID string) (*apiv0.ServerJSON, error) {
|
|
if ctx.Err() != nil {
|
|
return nil, ctx.Err()
|
|
}
|
|
|
|
db.mu.RLock()
|
|
defer db.mu.RUnlock()
|
|
|
|
// Find entry by registry metadata version_id
|
|
if entry, exists := db.entries[versionID]; exists {
|
|
// Return a copy of the ServerRecord
|
|
entryCopy := *entry
|
|
return &entryCopy, nil
|
|
}
|
|
|
|
return nil, ErrNotFound
|
|
}
|
|
|
|
// GetByServerID retrieves the latest version of a server by server ID
|
|
func (db *MemoryDB) GetByServerID(ctx context.Context, serverID string) (*apiv0.ServerJSON, error) {
|
|
if ctx.Err() != nil {
|
|
return nil, ctx.Err()
|
|
}
|
|
|
|
db.mu.RLock()
|
|
defer db.mu.RUnlock()
|
|
|
|
// Find the latest version with the given server ID
|
|
var latestEntry *apiv0.ServerJSON
|
|
for _, entry := range db.entries {
|
|
if entry.Meta != nil && entry.Meta.Official != nil &&
|
|
entry.Meta.Official.ServerID == serverID &&
|
|
entry.Meta.Official.IsLatest {
|
|
latestEntry = entry
|
|
break
|
|
}
|
|
}
|
|
|
|
if latestEntry == nil {
|
|
return nil, ErrNotFound
|
|
}
|
|
|
|
// Return a copy
|
|
entryCopy := *latestEntry
|
|
return &entryCopy, nil
|
|
}
|
|
|
|
// GetByServerIDAndVersion retrieves a specific version of a server by server ID and version
|
|
func (db *MemoryDB) GetByServerIDAndVersion(ctx context.Context, serverID string, version string) (*apiv0.ServerJSON, error) {
|
|
if ctx.Err() != nil {
|
|
return nil, ctx.Err()
|
|
}
|
|
|
|
db.mu.RLock()
|
|
defer db.mu.RUnlock()
|
|
|
|
// Find the entry with matching server ID and version
|
|
for _, entry := range db.entries {
|
|
if entry.Meta != nil && entry.Meta.Official != nil &&
|
|
entry.Meta.Official.ServerID == serverID &&
|
|
entry.Version == version {
|
|
// Return a copy
|
|
entryCopy := *entry
|
|
return &entryCopy, nil
|
|
}
|
|
}
|
|
|
|
return nil, ErrNotFound
|
|
}
|
|
|
|
// GetAllVersionsByServerID retrieves all versions of a server by server ID
|
|
func (db *MemoryDB) GetAllVersionsByServerID(ctx context.Context, serverID string) ([]*apiv0.ServerJSON, error) {
|
|
if ctx.Err() != nil {
|
|
return nil, ctx.Err()
|
|
}
|
|
|
|
db.mu.RLock()
|
|
defer db.mu.RUnlock()
|
|
|
|
var results []*apiv0.ServerJSON
|
|
for _, entry := range db.entries {
|
|
if entry.Meta != nil && entry.Meta.Official != nil &&
|
|
entry.Meta.Official.ServerID == serverID {
|
|
// Add a copy
|
|
entryCopy := *entry
|
|
results = append(results, &entryCopy)
|
|
}
|
|
}
|
|
|
|
if len(results) == 0 {
|
|
return nil, ErrNotFound
|
|
}
|
|
|
|
// Sort by published date, latest first
|
|
sort.Slice(results, func(i, j int) bool {
|
|
iTime := results[i].Meta.Official.PublishedAt
|
|
jTime := results[j].Meta.Official.PublishedAt
|
|
return iTime.After(jTime)
|
|
})
|
|
|
|
return results, nil
|
|
}
|
|
|
|
func (db *MemoryDB) CreateServer(ctx context.Context, server *apiv0.ServerJSON) (*apiv0.ServerJSON, error) {
|
|
if ctx.Err() != nil {
|
|
return nil, ctx.Err()
|
|
}
|
|
|
|
// Get the VersionID from the registry metadata
|
|
if server.Meta == nil || server.Meta.Official == nil {
|
|
return nil, fmt.Errorf("server must have registry metadata with ServerID and VersionID")
|
|
}
|
|
|
|
versionID := server.Meta.Official.VersionID
|
|
|
|
if versionID == "" {
|
|
return nil, fmt.Errorf("server must have VersionID in registry metadata")
|
|
}
|
|
|
|
db.mu.Lock()
|
|
defer db.mu.Unlock()
|
|
|
|
// Store the record using registry metadata VersionID
|
|
db.entries[versionID] = server
|
|
|
|
return server, nil
|
|
}
|
|
|
|
func (db *MemoryDB) UpdateServer(ctx context.Context, id string, server *apiv0.ServerJSON) (*apiv0.ServerJSON, error) {
|
|
if ctx.Err() != nil {
|
|
return nil, ctx.Err()
|
|
}
|
|
|
|
// Validate that meta structure exists and VersionID matches path (consistent with PostgreSQL implementation)
|
|
if server.Meta == nil || server.Meta.Official == nil || server.Meta.Official.VersionID != id {
|
|
return nil, fmt.Errorf("%w: io.modelcontextprotocol.registry/official.version_id must match path id (%s)", ErrInvalidInput, id)
|
|
}
|
|
|
|
db.mu.Lock()
|
|
defer db.mu.Unlock()
|
|
|
|
_, exists := db.entries[id]
|
|
if !exists {
|
|
return nil, ErrNotFound
|
|
}
|
|
|
|
// Update the server
|
|
db.entries[id] = server
|
|
|
|
// Return the updated record
|
|
return server, nil
|
|
}
|
|
|
|
// For an in-memory database, this is a no-op
|
|
func (db *MemoryDB) Close() error {
|
|
return nil
|
|
}
|
|
|
|
// filterAndSort applies filtering and sorting to the entries
|
|
func (db *MemoryDB) filterAndSort(allEntries []*apiv0.ServerJSON, filter *ServerFilter) []*apiv0.ServerJSON {
|
|
// Apply filtering
|
|
var filteredEntries []*apiv0.ServerJSON
|
|
for _, entry := range allEntries {
|
|
if db.matchesFilter(entry, filter) {
|
|
filteredEntries = append(filteredEntries, entry)
|
|
}
|
|
}
|
|
|
|
// Sort by registry metadata ID for consistent pagination
|
|
sort.Slice(filteredEntries, func(i, j int) bool {
|
|
iID := db.getRegistryID(filteredEntries[i])
|
|
jID := db.getRegistryID(filteredEntries[j])
|
|
return iID < jID
|
|
})
|
|
|
|
return filteredEntries
|
|
}
|
|
|
|
// matchesFilter checks if an entry matches the provided filter
|
|
//
|
|
//nolint:cyclop // Filter matching logic is inherently complex but clear
|
|
func (db *MemoryDB) matchesFilter(entry *apiv0.ServerJSON, filter *ServerFilter) bool {
|
|
if filter == nil {
|
|
return true
|
|
}
|
|
|
|
// Check name filter
|
|
if filter.Name != nil && entry.Name != *filter.Name {
|
|
return false
|
|
}
|
|
|
|
// Check remote URL filter
|
|
if filter.RemoteURL != nil {
|
|
found := false
|
|
for _, remote := range entry.Remotes {
|
|
if remote.URL == *filter.RemoteURL {
|
|
found = true
|
|
break
|
|
}
|
|
}
|
|
if !found {
|
|
return false
|
|
}
|
|
}
|
|
|
|
// Check updatedSince filter
|
|
if filter.UpdatedSince != nil {
|
|
if entry.Meta == nil || entry.Meta.Official == nil {
|
|
return false
|
|
}
|
|
if entry.Meta.Official.UpdatedAt.Before(*filter.UpdatedSince) ||
|
|
entry.Meta.Official.UpdatedAt.Equal(*filter.UpdatedSince) {
|
|
return false
|
|
}
|
|
}
|
|
|
|
// Check name search filter (substring match)
|
|
if filter.SubstringName != nil {
|
|
// Case-insensitive substring search
|
|
searchLower := strings.ToLower(*filter.SubstringName)
|
|
nameLower := strings.ToLower(entry.Name)
|
|
if !strings.Contains(nameLower, searchLower) {
|
|
return false
|
|
}
|
|
}
|
|
|
|
// Check exact version filter
|
|
if filter.Version != nil {
|
|
if entry.Version != *filter.Version {
|
|
return false
|
|
}
|
|
}
|
|
|
|
// Check isLatest filter
|
|
if filter.IsLatest != nil {
|
|
if entry.Meta == nil || entry.Meta.Official == nil {
|
|
return false
|
|
}
|
|
if entry.Meta.Official.IsLatest != *filter.IsLatest {
|
|
return false
|
|
}
|
|
}
|
|
|
|
return true
|
|
}
|
|
|
|
// getRegistryID safely extracts the registry version ID from an entry
|
|
func (db *MemoryDB) getRegistryID(entry *apiv0.ServerJSON) string {
|
|
if entry.Meta != nil && entry.Meta.Official != nil {
|
|
return entry.Meta.Official.VersionID
|
|
}
|
|
return ""
|
|
}
|