Skip to content

Commit c9c9aa3

Browse files
zanderswaizanderswai
committed
Feature (http): Initialised server instance method with standard param support, interfaced as transport option on main
1 parent e1646d8 commit c9c9aa3

File tree

4 files changed

+221
-3
lines changed

4 files changed

+221
-3
lines changed

‎.vscode/launch.json‎

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@
1111
"mode": "auto",
1212
"cwd": "${workspaceFolder}",
1313
"program": "cmd/github-mcp-server/main.go",
14-
"args": ["stdio"],
14+
"args": [
15+
"stdio"
16+
],
1517
"console": "integratedTerminal",
1618
},
1719
{
@@ -21,7 +23,26 @@
2123
"mode": "auto",
2224
"cwd": "${workspaceFolder}",
2325
"program": "cmd/github-mcp-server/main.go",
24-
"args": ["stdio", "--read-only"],
26+
"args": [
27+
"stdio",
28+
"--read-only"
29+
],
30+
"console": "integratedTerminal",
31+
},
32+
{
33+
"name": "Launch HTTP server",
34+
"type": "go",
35+
"request": "launch",
36+
"mode": "auto",
37+
"cwd": "${workspaceFolder}",
38+
"program": "cmd/github-mcp-server/main.go",
39+
"args": [
40+
"http",
41+
"--http-port",
42+
"8080",
43+
"--http-address",
44+
"127.0.0.1"
45+
],
2546
"console": "integratedTerminal",
2647
}
2748
]

‎Dockerfile‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,8 @@ COPY --from=build /bin/github-mcp-server .
2929
# Set the entrypoint to the server binary
3030
ENTRYPOINT ["/server/github-mcp-server"]
3131
# Default arguments for ENTRYPOINT
32-
CMD ["http"]
32+
# Use "stdio" for stdio transport or "http" for HTTP transport
33+
CMD ["stdio"]
34+
35+
# Expose HTTP port (used when running with "http" command)
36+
EXPOSE 8080

‎cmd/github-mcp-server/main.go‎

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,50 @@ var (
6565
return ghmcp.RunStdioServer(stdioServerConfig)
6666
},
6767
}
68+
69+
httpCmd = &cobra.Command{
70+
Use: "http",
71+
Short: "Start HTTP server",
72+
Long: `Start a server that communicates via HTTP using JSON-RPC messages over streamable HTTP transport.`,
73+
RunE: func(_ *cobra.Command, _ []string) error {
74+
token := viper.GetString("personal_access_token")
75+
if token == "" {
76+
return errors.New("GITHUB_PERSONAL_ACCESS_TOKEN not set")
77+
}
78+
79+
// If you're wondering why we're not using viper.GetStringSlice("toolsets"),
80+
// it's because viper doesn't handle comma-separated values correctly for env
81+
// vars when using GetStringSlice.
82+
// https://github.com/spf13/viper/issues/380
83+
var enabledToolsets []string
84+
if err := viper.UnmarshalKey("toolsets", &enabledToolsets); err != nil {
85+
return fmt.Errorf("failed to unmarshal toolsets: %w", err)
86+
}
87+
88+
// No passed toolsets configuration means we enable the default toolset
89+
if len(enabledToolsets) == 0 {
90+
enabledToolsets = []string{github.ToolsetMetadataDefault.ID}
91+
}
92+
93+
httpServerConfig := ghmcp.HTTPServerConfig{
94+
Version: version,
95+
Host: viper.GetString("host"),
96+
Token: token,
97+
EnabledToolsets: enabledToolsets,
98+
DynamicToolsets: viper.GetBool("dynamic_toolsets"),
99+
ReadOnly: viper.GetBool("read-only"),
100+
ExportTranslations: viper.GetBool("export-translations"),
101+
EnableCommandLogging: viper.GetBool("enable-command-logging"),
102+
LogFilePath: viper.GetString("log-file"),
103+
ContentWindowSize: viper.GetInt("content-window-size"),
104+
Port: viper.GetInt("http-port"),
105+
Address: viper.GetString("http-address"),
106+
CertFile: viper.GetString("http-cert-file"),
107+
KeyFile: viper.GetString("http-key-file"),
108+
}
109+
return ghmcp.RunHTTPServer(httpServerConfig)
110+
},
111+
}
68112
)
69113

70114
func init() {
@@ -93,8 +137,21 @@ func init() {
93137
_ = viper.BindPFlag("host", rootCmd.PersistentFlags().Lookup("gh-host"))
94138
_ = viper.BindPFlag("content-window-size", rootCmd.PersistentFlags().Lookup("content-window-size"))
95139

140+
// Add HTTP-specific flags
141+
httpCmd.Flags().Int("http-port", 8080, "Port to listen on for HTTP server")
142+
httpCmd.Flags().String("http-address", "0.0.0.0", "Address to bind to for HTTP server")
143+
httpCmd.Flags().String("http-cert-file", "", "Path to TLS certificate file for HTTPS")
144+
httpCmd.Flags().String("http-key-file", "", "Path to TLS key file for HTTPS")
145+
146+
// Bind HTTP flags to viper
147+
_ = viper.BindPFlag("http-port", httpCmd.Flags().Lookup("http-port"))
148+
_ = viper.BindPFlag("http-address", httpCmd.Flags().Lookup("http-address"))
149+
_ = viper.BindPFlag("http-cert-file", httpCmd.Flags().Lookup("http-cert-file"))
150+
_ = viper.BindPFlag("http-key-file", httpCmd.Flags().Lookup("http-key-file"))
151+
96152
// Add subcommands
97153
rootCmd.AddCommand(stdioCmd)
154+
rootCmd.AddCommand(httpCmd)
98155
}
99156

100157
func initConfig() {

‎internal/ghmcp/server.go‎

Lines changed: 136 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,48 @@ type StdioServerConfig struct {
190190
ContentWindowSize int
191191
}
192192

193+
type HTTPServerConfig struct {
194+
// Version of the server
195+
Version string
196+
197+
// GitHub Host to target for API requests (e.g. github.com or github.enterprise.com)
198+
Host string
199+
200+
// GitHub Token to authenticate with the GitHub API
201+
Token string
202+
203+
// EnabledToolsets is a list of toolsets to enable
204+
// See: https://github.com/github/github-mcp-server?tab=readme-ov-file#tool-configuration
205+
EnabledToolsets []string
206+
207+
// Whether to enable dynamic toolsets
208+
// See: https://github.com/github/github-mcp-server?tab=readme-ov-file#dynamic-tool-discovery
209+
DynamicToolsets bool
210+
211+
// ReadOnly indicates if we should only register read-only tools
212+
ReadOnly bool
213+
214+
// ExportTranslations indicates if we should export translations
215+
ExportTranslations bool
216+
217+
// EnableCommandLogging indicates if we should log commands
218+
EnableCommandLogging bool
219+
220+
// Path to the log file if not stderr
221+
LogFilePath string
222+
223+
// Content window size
224+
ContentWindowSize int
225+
226+
// HTTP Server Configuration
227+
Port int // Port to listen on (e.g., 8080)
228+
Address string // Address to bind to (e.g., "0.0.0.0")
229+
230+
// Optional TLS configuration
231+
CertFile string // Path to TLS certificate file
232+
KeyFile string // Path to TLS key file
233+
}
234+
193235
// RunStdioServer is not concurrent safe.
194236
func RunStdioServer(cfg StdioServerConfig) error {
195237
// Create app context
@@ -268,6 +310,100 @@ func RunStdioServer(cfg StdioServerConfig) error {
268310
return nil
269311
}
270312

313+
// RunHTTPServer starts an HTTP server for MCP communication
314+
func RunHTTPServer(cfg HTTPServerConfig) error {
315+
// Create app context
316+
ctx, stop := signal.NotifyContext(context.Background(), os.Interrupt, syscall.SIGTERM)
317+
defer stop()
318+
319+
t, dumpTranslations := translations.TranslationHelper()
320+
321+
ghServer, err := NewMCPServer(MCPServerConfig{
322+
Version: cfg.Version,
323+
Host: cfg.Host,
324+
Token: cfg.Token,
325+
EnabledToolsets: cfg.EnabledToolsets,
326+
DynamicToolsets: cfg.DynamicToolsets,
327+
ReadOnly: cfg.ReadOnly,
328+
Translator: t,
329+
ContentWindowSize: cfg.ContentWindowSize,
330+
})
331+
if err != nil {
332+
return fmt.Errorf("failed to create MCP server: %w", err)
333+
}
334+
335+
var slogHandler slog.Handler
336+
var logOutput io.Writer
337+
if cfg.LogFilePath != "" {
338+
file, err := os.OpenFile(cfg.LogFilePath, os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0600)
339+
if err != nil {
340+
return fmt.Errorf("failed to open log file: %w", err)
341+
}
342+
logOutput = file
343+
slogHandler = slog.NewTextHandler(logOutput, &slog.HandlerOptions{Level: slog.LevelDebug})
344+
} else {
345+
logOutput = os.Stderr
346+
slogHandler = slog.NewTextHandler(logOutput, &slog.HandlerOptions{Level: slog.LevelInfo})
347+
}
348+
logger := slog.New(slogHandler)
349+
logger.Info("starting HTTP server",
350+
"version", cfg.Version,
351+
"host", cfg.Host,
352+
"port", cfg.Port,
353+
"address", cfg.Address,
354+
"dynamicToolsets", cfg.DynamicToolsets,
355+
"readOnly", cfg.ReadOnly,
356+
)
357+
358+
if cfg.ExportTranslations {
359+
dumpTranslations()
360+
}
361+
362+
// Output startup message
363+
addr := fmt.Sprintf("%s:%d", cfg.Address, cfg.Port)
364+
_, _ = fmt.Fprintf(os.Stderr, "GitHub MCP Server running on HTTP at %s\n", addr)
365+
366+
// Create HTTP server using mcp-go library
367+
httpServer := server.NewStreamableHTTPServer(ghServer)
368+
369+
// Set TLS configuration if provided
370+
if cfg.CertFile != "" && cfg.KeyFile != "" {
371+
// Verify TLS files exist
372+
if _, err := os.Stat(cfg.CertFile); err != nil {
373+
return fmt.Errorf("failed to find TLS certificate file: %w", err)
374+
}
375+
if _, err := os.Stat(cfg.KeyFile); err != nil {
376+
return fmt.Errorf("failed to find TLS key file: %w", err)
377+
}
378+
// Note: TLS configuration is handled by the StreamableHTTPServer.Start() method
379+
// when tlsCertFile and tlsKeyFile are set via reflection or direct field access
380+
// For now, we'll use the Start method which handles TLS internally
381+
}
382+
383+
// Start listening on HTTP
384+
errC := make(chan error, 1)
385+
go func() {
386+
logger.Info("starting HTTP server", "address", addr)
387+
errC <- httpServer.Start(addr)
388+
}()
389+
390+
// Wait for shutdown signal
391+
select {
392+
case <-ctx.Done():
393+
logger.Info("shutting down server", "signal", "context done")
394+
shutdownCtx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
395+
defer cancel()
396+
httpServer.Shutdown(shutdownCtx)
397+
case err := <-errC:
398+
if err != nil {
399+
logger.Error("error running server", "error", err)
400+
return fmt.Errorf("error running server: %w", err)
401+
}
402+
}
403+
404+
return nil
405+
}
406+
271407
type apiHost struct {
272408
baseRESTURL *url.URL
273409
graphqlURL *url.URL

0 commit comments

Comments
 (0)