feat: update client options to use optional fields

Author: TBXark

.golangci.yml

@@ -0,0 +1,14 @@
+severity:
+  default: error
+  rules:
+    - linters:
+        - errcheck
+        - unused
+      severity: info
+formatters:
+  enable:
+    - gci
+    - gofmt
+    - gofumpt
+    - goimports
+version: "2"

Makefile

@@ -15,4 +15,15 @@ buildLinuxX86:
 
 .PHONY: buildImage
 buildImage:
-	docker buildx build --platform=linux/amd64,linux/arm64 -t ghcr.io/tbxark/map-proxy:latest . --push --provenance=false
+	docker buildx build --platform=linux/amd64,linux/arm64 -t ghcr.io/tbxark/map-proxy:latest . --push --provenance=false
+
+.PHONY: lint
+lint:
+	golangci-lint run
+
+.PHONY: format
+format:
+	golangci-lint fmt
+	golangci-lint run --fix
+	go fmt ./...
+	go mod tidy

client.go

@@ -4,12 +4,13 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"log"
+	"time"
+
 	"github.com/mark3labs/mcp-go/client"
 	"github.com/mark3labs/mcp-go/client/transport"
 	"github.com/mark3labs/mcp-go/mcp"
 	"github.com/mark3labs/mcp-go/server"
-	"log"
-	"time"
 )
 
 type Client struct {
@@ -114,11 +115,12 @@ func (c *Client) addToMCPServer(ctx context.Context, clientInfo mcp.Implementati
 func (c *Client) startPingTask(ctx context.Context) {
 	ticker := time.NewTicker(30 * time.Second)
 	defer ticker.Stop()
+PingLoop:
 	for {
 		select {
 		case <-ctx.Done():
 			log.Printf("<%s> Context done, stopping ping", c.name)
-			break
+			break PingLoop
 		case <-ticker.C:
 			_ = c.client.Ping(ctx)
 		}
@@ -143,7 +145,7 @@ func (c *Client) addToolsToServer(ctx context.Context, mcpServer *server.MCPServ
 		if tools.NextCursor == "" {
 			break
 		}
-		toolsRequest.PaginatedRequest.Params.Cursor = tools.NextCursor
+		toolsRequest.Params.Cursor = tools.NextCursor
 	}
 	return nil
 }
@@ -166,7 +168,7 @@ func (c *Client) addPromptsToServer(ctx context.Context, mcpServer *server.MCPSe
 		if prompts.NextCursor == "" {
 			break
 		}
-		promptsRequest.PaginatedRequest.Params.Cursor = prompts.NextCursor
+		promptsRequest.Params.Cursor = prompts.NextCursor
 	}
 	return nil
 }
@@ -195,7 +197,7 @@ func (c *Client) addResourcesToServer(ctx context.Context, mcpServer *server.MCP
 		if resources.NextCursor == "" {
 			break
 		}
-		resourcesRequest.PaginatedRequest.Params.Cursor = resources.NextCursor
+		resourcesRequest.Params.Cursor = resources.NextCursor
 
 	}
 	return nil
@@ -225,7 +227,7 @@ func (c *Client) addResourceTemplatesToServer(ctx context.Context, mcpServer *se
 		if resourceTemplates.NextCursor == "" {
 			break
 		}
-		resourceTemplatesRequest.PaginatedRequest.Params.Cursor = resourceTemplates.NextCursor
+		resourceTemplatesRequest.Params.Cursor = resourceTemplates.NextCursor
 	}
 	return nil
 }
@@ -249,7 +251,7 @@ func newMCPServer(name, version, baseURL string, clientConfig *MCPClientConfigV2
 		server.WithRecovery(),
 	}
 
-	if *clientConfig.Options.LogEnabled {
+	if clientConfig.Options.LogEnabled.OrElse(false) {
 		serverOpts = append(serverOpts, server.WithLogging())
 	}
 	mcpServer := server.NewMCPServer(

config.go

@@ -3,8 +3,10 @@ package main
 import (
 	"encoding/json"
 	"errors"
-	"github.com/TBXark/confstore"
 	"time"
+
+	"github.com/TBXark/confstore"
+	"github.com/TBXark/optional-go"
 )
 
 type StdioMCPClientConfig struct {
@@ -81,9 +83,9 @@ func parseMCPClientConfigV1(conf *MCPClientConfigV1) (any, error) {
 // ---- V2 ----
 
 type OptionsV2 struct {
-	PanicIfInvalid *bool    `json:"panicIfInvalid,omitempty"`
-	LogEnabled     *bool    `json:"logEnabled,omitempty"`
-	AuthTokens     []string `json:"authTokens,omitempty"`
+	PanicIfInvalid optional.Field[bool] `json:"panicIfInvalid,omitempty"`
+	LogEnabled     optional.Field[bool] `json:"logEnabled,omitempty"`
+	AuthTokens     []string             `json:"authTokens,omitempty"`
 }
 
 type MCPProxyConfigV2 struct {
@@ -178,11 +180,8 @@ func load(path string) (*Config, error) {
 			if cErr != nil {
 				continue
 			}
-			falseVal := false
 			options := &OptionsV2{
-				PanicIfInvalid: &falseVal,
-				LogEnabled:     &falseVal,
-				AuthTokens:     clientConfig.AuthTokens,
+				AuthTokens: clientConfig.AuthTokens,
 			}
 			if conf.DeprecatedServerV1 != nil && len(conf.DeprecatedServerV1.GlobalAuthTokens) > 0 {
 				options.AuthTokens = append(options.AuthTokens, conf.DeprecatedServerV1.GlobalAuthTokens...)
@@ -217,11 +216,7 @@ func load(path string) (*Config, error) {
 		return nil, errors.New("mcpProxy is required")
 	}
 	if conf.McpProxy.Options == nil {
-		falseVal := false
-		conf.McpProxy.Options = &OptionsV2{
-			PanicIfInvalid: &falseVal,
-			LogEnabled:     &falseVal,
-		}
+		conf.McpProxy.Options = &OptionsV2{}
 	}
 	for _, clientConfig := range conf.McpServers {
 		if clientConfig.Options == nil {
@@ -230,10 +225,10 @@ func load(path string) (*Config, error) {
 		if clientConfig.Options.AuthTokens == nil {
 			clientConfig.Options.AuthTokens = conf.McpProxy.Options.AuthTokens
 		}
-		if clientConfig.Options.PanicIfInvalid == nil {
+		if !clientConfig.Options.PanicIfInvalid.Present() {
 			clientConfig.Options.PanicIfInvalid = conf.McpProxy.Options.PanicIfInvalid
 		}
-		if clientConfig.Options.LogEnabled == nil {
+		if !clientConfig.Options.LogEnabled.Present() {
 			clientConfig.Options.LogEnabled = conf.McpProxy.Options.LogEnabled
 		}
 	}

go.mod

@@ -6,6 +6,7 @@ toolchain go1.23.7
 
 require (
 	github.com/TBXark/confstore v0.0.3
+	github.com/TBXark/optional-go v0.0.1
 	github.com/mark3labs/mcp-go v0.23.1
 	golang.org/x/sync v0.13.0
 )

go.sum

@@ -1,7 +1,7 @@
-github.com/TBXark/confstore v0.0.2 h1:rmeho8xuUeJriJTC3q9iVuR7BJb4Fibnc3FiGKJNc9w=
-github.com/TBXark/confstore v0.0.2/go.mod h1:TOxM19Snt9wT02PJzyz66sgq7sWhr4AFzPEZIKvVnTE=
 github.com/TBXark/confstore v0.0.3 h1:d+djx1k6lh6E9UZsPKXpigYZk0z1j5KoMuhwgb2LLMg=
 github.com/TBXark/confstore v0.0.3/go.mod h1:TOxM19Snt9wT02PJzyz66sgq7sWhr4AFzPEZIKvVnTE=
+github.com/TBXark/optional-go v0.0.1 h1:ZIeoYfA7UWcpx+Otxdc0f0tvfSDkJuJVYmjnLfr2P8I=
+github.com/TBXark/optional-go v0.0.1/go.mod h1:skpoGkocQNq/IRct1T2rgwSrXEy1nUY+Sz28r68t4yE=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=

http.go

@@ -4,15 +4,16 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"github.com/mark3labs/mcp-go/mcp"
-	"golang.org/x/sync/errgroup"
 	"log"
 	"net/http"
 	"os"
 	"os/signal"
 	"strings"
 	"syscall"
 	"time"
+
+	"github.com/mark3labs/mcp-go/mcp"
+	"golang.org/x/sync/errgroup"
 )
 
 type MiddlewareFunc func(http.Handler) http.Handler
@@ -33,9 +34,7 @@ func newAuthMiddleware(tokens []string) MiddlewareFunc {
 		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 			if len(tokens) != 0 {
 				token := r.Header.Get("Authorization")
-				if strings.HasPrefix(token, "Bearer ") {
-					token = strings.TrimPrefix(token, "Bearer ")
-				}
+				token = strings.TrimSpace(strings.TrimPrefix(token, "Bearer "))
 				if token == "" {
 					http.Error(w, "Unauthorized", http.StatusUnauthorized)
 					return
@@ -50,8 +49,30 @@ func newAuthMiddleware(tokens []string) MiddlewareFunc {
 	}
 }
 
-func startHTTPServer(config *Config) {
+func loggerMiddleware(prefix string) MiddlewareFunc {
+	return func(next http.Handler) http.Handler {
+		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+			log.Printf("<%s> Request [%s] %s", prefix, r.Method, r.URL.Path)
+			next.ServeHTTP(w, r)
+		})
+	}
+}
 
+func recoverMiddleware(prefix string) MiddlewareFunc {
+	return func(next http.Handler) http.Handler {
+		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+			defer func() {
+				if err := recover(); err != nil {
+					log.Printf("<%s> Recovered from panic: %v", prefix, err)
+					http.Error(w, "Internal Server Error", http.StatusInternalServerError)
+				}
+			}()
+			next.ServeHTTP(w, r)
+		})
+	}
+}
+
+func startHTTPServer(config *Config) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 
@@ -77,13 +98,22 @@ func startHTTPServer(config *Config) {
 			addErr := mcpClient.addToMCPServer(ctx, info, server.mcpServer)
 			if addErr != nil {
 				log.Printf("<%s> Failed to add client to server: %v", name, addErr)
-				if *clientConfig.Options.PanicIfInvalid {
+				if clientConfig.Options.PanicIfInvalid.OrElse(false) {
 					return addErr
 				}
 				return nil
 			}
 			log.Printf("<%s> Connected", name)
-			httpMux.Handle(fmt.Sprintf("/%s/", name), chainMiddleware(server.sseServer, newAuthMiddleware(server.tokens)))
+
+			middlewares := make([]MiddlewareFunc, 0)
+			middlewares = append(middlewares, recoverMiddleware(name))
+			if clientConfig.Options.LogEnabled.OrElse(false) {
+				middlewares = append(middlewares, loggerMiddleware(name))
+			}
+			if len(clientConfig.Options.AuthTokens) > 0 {
+				middlewares = append(middlewares, newAuthMiddleware(clientConfig.Options.AuthTokens))
+			}
+			httpMux.Handle(fmt.Sprintf("/%s/", name), chainMiddleware(server.sseServer, middlewares...))
 			httpServer.RegisterOnShutdown(func() {
 				log.Printf("<%s> Shutting down", name)
 				_ = mcpClient.Close()