-
Notifications
You must be signed in to change notification settings - Fork 5
feat: add streaming HTTP transport support #87
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
+80
−6
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -9,13 +9,20 @@ import ( | |
| "os" | ||
| "os/signal" | ||
| "strconv" | ||
| "strings" | ||
| "syscall" | ||
| "time" | ||
|
|
||
| "github.com/StacklokLabs/mkp/pkg/k8s" | ||
| "github.com/StacklokLabs/mkp/pkg/mcp" | ||
| ) | ||
|
|
||
| const ( | ||
| // Transport types | ||
| transportSSE = "sse" | ||
| transportStreamableHTTP = "streamable-http" | ||
| ) | ||
|
|
||
| func main() { | ||
| // Parse command line flags | ||
| kubeconfig := flag.String("kubeconfig", "", "Path to kubeconfig file. If not provided, in-cluster config will be used") | ||
|
|
@@ -28,6 +35,8 @@ func main() { | |
| "Interval to periodically re-read the kubeconfig (e.g., 5m for 5 minutes). If 0, no refresh will be performed") | ||
| enableRateLimiting := flag.Bool("enable-rate-limiting", true, | ||
| "Whether to enable rate limiting for tool calls. When false, no rate limiting will be applied") | ||
| transport := flag.String("transport", getDefaultTransport(), | ||
| "Transport protocol to use: 'sse' or 'streamable-http'. Can also be set via MCP_TRANSPORT environment variable") | ||
|
|
||
| flag.Parse() | ||
|
|
||
|
|
@@ -74,16 +83,30 @@ func main() { | |
| // Create MCP server using the helper function | ||
| mcpServer := mcp.CreateServer(k8sClient, config) | ||
|
|
||
| // Create SSE server | ||
| sseServer := mcp.CreateSSEServer(mcpServer) | ||
| // Create and start the appropriate transport server | ||
| var transportServer interface { | ||
| Start(string) error | ||
| Shutdown(context.Context) error | ||
| } | ||
|
|
||
| switch strings.ToLower(*transport) { | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. the string is alrady ToLowered (yeah, a nit, but I read the patch!) |
||
| case transportStreamableHTTP: | ||
| log.Println("Using streamable-http transport") | ||
| transportServer = mcp.CreateStreamableHTTPServer(mcpServer) | ||
| case transportSSE: | ||
| log.Println("Using SSE transport") | ||
| transportServer = mcp.CreateSSEServer(mcpServer) | ||
| default: | ||
| log.Fatalf("Invalid transport: %s. Must be 'sse' or 'streamable-http'", *transport) | ||
| } | ||
|
|
||
| // Channel to receive server errors | ||
| serverErrCh := make(chan error, 1) | ||
|
|
||
| // Start the server in a goroutine | ||
| go func() { | ||
| log.Printf("Starting MCP server on %s", *addr) | ||
| if err := sseServer.Start(*addr); err != nil { | ||
| log.Printf("Starting MCP server on %s with %s transport", *addr, *transport) | ||
| if err := transportServer.Start(*addr); err != nil { | ||
| log.Printf("Server error: %v", err) | ||
| serverErrCh <- err | ||
| } | ||
|
|
@@ -106,8 +129,8 @@ func main() { | |
| go func() { | ||
| log.Println("Initiating server shutdown...") | ||
|
|
||
| // Stop the SSE server | ||
| err := sseServer.Shutdown(shutdownCtx) | ||
| // Stop the transport server | ||
| err := transportServer.Shutdown(shutdownCtx) | ||
| if err != nil { | ||
| log.Printf("Error during shutdown: %v", err) | ||
| } | ||
|
|
@@ -166,3 +189,27 @@ func getDefaultAddress() string { | |
|
|
||
| return fmt.Sprintf(":%d", port) | ||
| } | ||
|
|
||
| // getDefaultTransport returns the transport to use based on MCP_TRANSPORT environment variable. | ||
| // If the environment variable is not set, returns "sse". | ||
| // Valid values are "sse" and "streamable-http". | ||
| func getDefaultTransport() string { | ||
| defaultTransport := transportSSE | ||
|
|
||
| transportEnv := os.Getenv("MCP_TRANSPORT") | ||
| if transportEnv == "" { | ||
| return defaultTransport | ||
| } | ||
|
|
||
| // Normalize the transport value | ||
| transport := strings.ToLower(strings.TrimSpace(transportEnv)) | ||
|
|
||
| // Validate the transport value | ||
| if transport != transportSSE && transport != transportStreamableHTTP { | ||
| log.Printf("Invalid MCP_TRANSPORT: %s, using default: %s", | ||
| transportEnv, defaultTransport) | ||
| return defaultTransport | ||
| } | ||
|
|
||
| return transport | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
every single one of our MCP servers defines an interface like this. thought: should we work on a library or enhance upstream?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yes, a library would be a good idea.