Add a github server factory to HTTPMcpHandler to allow dependency injection in remote

Author: omgitsads

pkg/github/server.go

@@ -5,7 +5,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"log/slog"
-	"os"
 	"strings"
 	"time"
 
@@ -100,7 +99,7 @@ func NewMCPServer(cfg *MCPServerConfig, deps ToolDependencies, inventory *invent
 	ghServer.AddReceivingMiddleware(InjectDepsMiddleware(deps))
 
 	if unrecognized := inventory.UnrecognizedToolsets(); len(unrecognized) > 0 {
-		fmt.Fprintf(os.Stderr, "Warning: unrecognized toolsets ignored: %s\n", strings.Join(unrecognized, ", "))
+		cfg.Logger.Warn("Warning: unrecognized toolsets ignored", "toolsets", strings.Join(unrecognized, ", "))
 	}
 
 	// Register GitHub tools/resources/prompts from the inventory.

pkg/http/handler.go

@@ -1,6 +1,7 @@
 package http
 
 import (
+	"context"
 	"log/slog"
 	"net/http"
 	"strings"
@@ -10,44 +11,86 @@ import (
 	"github.com/github/github-mcp-server/pkg/http/middleware"
 	"github.com/github/github-mcp-server/pkg/inventory"
 	"github.com/github/github-mcp-server/pkg/translations"
+	"github.com/go-chi/chi/v5"
 	"github.com/modelcontextprotocol/go-sdk/mcp"
 )
 
 type InventoryFactoryFunc func(r *http.Request) *inventory.Inventory
+type GitHubMCPServerFactoryFunc func(ctx context.Context, r *http.Request, deps github.ToolDependencies, inventory *inventory.Inventory, cfg *github.MCPServerConfig) (*mcp.Server, error)
 
 type HTTPMcpHandler struct {
-	config               *HTTPServerConfig
-	deps                 github.ToolDependencies
-	logger               *slog.Logger
-	t                    translations.TranslationHelperFunc
-	inventoryFactoryFunc InventoryFactoryFunc
+	config                 *HTTPServerConfig
+	deps                   github.ToolDependencies
+	logger                 *slog.Logger
+	t                      translations.TranslationHelperFunc
+	githubMcpServerFactory GitHubMCPServerFactoryFunc
+	inventoryFactoryFunc   InventoryFactoryFunc
+}
+
+type HTTPMcpHandlerOptions struct {
+	GitHubMcpServerFactory GitHubMCPServerFactoryFunc
+	InventoryFactory       InventoryFactoryFunc
+}
+
+type HTTPMcpHandlerOption func(*HTTPMcpHandlerOptions)
+
+func WithGitHubMCPServerFactory(f GitHubMCPServerFactoryFunc) HTTPMcpHandlerOption {
+	return func(o *HTTPMcpHandlerOptions) {
+		o.GitHubMcpServerFactory = f
+	}
+}
+
+func WithInventoryFactory(f InventoryFactoryFunc) HTTPMcpHandlerOption {
+	return func(o *HTTPMcpHandlerOptions) {
+		o.InventoryFactory = f
+	}
 }
 
 func NewHTTPMcpHandler(cfg *HTTPServerConfig,
 	deps github.ToolDependencies,
 	t translations.TranslationHelperFunc,
 	logger *slog.Logger,
-	inventoryFactory InventoryFactoryFunc) *HTTPMcpHandler {
+	options ...HTTPMcpHandlerOption) *HTTPMcpHandler {
+	opts := &HTTPMcpHandlerOptions{}
+	for _, o := range options {
+		o(opts)
+	}
+
+	githubMcpServerFactory := opts.GitHubMcpServerFactory
+	if githubMcpServerFactory == nil {
+		githubMcpServerFactory = DefaultGitHubMCPServerFactory
+	}
+
+	inventoryFactory := opts.InventoryFactory
+	if inventoryFactory == nil {
+		inventoryFactory = DefaultInventoryFactory(cfg, t, nil)
+	}
+
 	return &HTTPMcpHandler{
-		config:               cfg,
-		deps:                 deps,
-		logger:               logger,
-		t:                    t,
-		inventoryFactoryFunc: inventoryFactory,
+		config:                 cfg,
+		deps:                   deps,
+		logger:                 logger,
+		t:                      t,
+		githubMcpServerFactory: githubMcpServerFactory,
+		inventoryFactoryFunc:   inventoryFactory,
 	}
 }
 
-func (s *HTTPMcpHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
-	inventory := s.inventoryFactoryFunc(r)
-
-	ghServer, err := github.NewMCPServer(&github.MCPServerConfig{
-		Version:           s.config.Version,
-		Host:              s.config.Host,
-		Translator:        s.t,
-		ContentWindowSize: s.config.ContentWindowSize,
-		Logger:            s.logger,
-		RepoAccessTTL:     s.config.RepoAccessCacheTTL,
-	}, s.deps, inventory)
+func (h *HTTPMcpHandler) RegisterRoutes(r chi.Router) {
+	r.Mount("/", h)
+}
+
+func (h *HTTPMcpHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+	inventory := h.inventoryFactoryFunc(r)
+
+	ghServer, err := h.githubMcpServerFactory(r.Context(), r, h.deps, inventory, &github.MCPServerConfig{
+		Version:           h.config.Version,
+		Translator:        h.t,
+		ContentWindowSize: h.config.ContentWindowSize,
+		Logger:            h.logger,
+		RepoAccessTTL:     h.config.RepoAccessCacheTTL,
+	})
+
 	if err != nil {
 		w.WriteHeader(http.StatusInternalServerError)
 	}
@@ -61,6 +104,16 @@ func (s *HTTPMcpHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	middleware.ExtractUserToken()(mcpHandler).ServeHTTP(w, r)
 }
 
+func DefaultGitHubMCPServerFactory(ctx context.Context, _ *http.Request, deps github.ToolDependencies, inventory *inventory.Inventory, cfg *github.MCPServerConfig) (*mcp.Server, error) {
+	return github.NewMCPServer(&github.MCPServerConfig{
+		Version:           cfg.Version,
+		Translator:        cfg.Translator,
+		ContentWindowSize: cfg.ContentWindowSize,
+		Logger:            cfg.Logger,
+		RepoAccessTTL:     cfg.RepoAccessTTL,
+	}, deps, inventory)
+}
+
 func DefaultInventoryFactory(cfg *HTTPServerConfig, t translations.TranslationHelperFunc, staticChecker inventory.FeatureFlagChecker) InventoryFactoryFunc {
 	return func(r *http.Request) *inventory.Inventory {
 		b := github.NewInventory(t).WithDeprecatedAliases(github.DeprecatedToolAliases)

pkg/http/server.go

@@ -95,10 +95,10 @@ func RunHTTPServer(cfg HTTPServerConfig) error {
 		cfg.ContentWindowSize,
 	)
 
-	handler := NewHTTPMcpHandler(&cfg, deps, t, logger, DefaultInventoryFactory(&cfg, t, nil))
-
 	r := chi.NewRouter()
-	r.Mount("/", handler)
+
+	handler := NewHTTPMcpHandler(&cfg, deps, t, logger)
+	handler.RegisterRoutes(r)
 
 	addr := fmt.Sprintf(":%d", cfg.Port)
 	httpSvr := http.Server{