refactor: Update routing prefixes from '/mcp' to '/gateway' across configuration and code files

iFurySt · iFurySt · commit 0ac99d35b69e · 2025-07-09T23:55:15.000+08:00
diff --git a/configs/proxy-mcp-exp.yaml b/configs/proxy-mcp-exp.yaml
@@ -3,7 +3,7 @@ tenant: "default"
 
 routers:
   - server: "amap-maps"
-    prefix: "/mcp/stdio-proxy"
+    prefix: "/gateway/stdio-proxy"
     cors:
       allowOrigins:
         - "*"
@@ -15,13 +15,13 @@ routers:
         - "Content-Type"
         - "Authorization"
         - "Mcp-Session-Id"
-        - "mcp-protocol-version"        
+        - "mcp-protocol-version"
       exposeHeaders:
         - "Mcp-Session-Id"
         - "mcp-protocol-version"
       allowCredentials: true
   - server: "mock-user-sse"
-    prefix: "/mcp/sse-proxy"
+    prefix: "/gateway/sse-proxy"
     cors:
       allowOrigins:
         - "*"
@@ -39,7 +39,7 @@ routers:
         - "mcp-protocol-version"
       allowCredentials: true
   - server: "mock-user-mcp"
-    prefix: "/mcp/streamable-http-proxy"
+    prefix: "/gateway/streamable-http-proxy"
     cors:
       allowOrigins:
         - "*"
diff --git a/configs/proxy-mock-server.yaml b/configs/proxy-mock-server.yaml
@@ -3,7 +3,7 @@ tenant: "default"
 
 routers:
   - server: "mock-server"
-    prefix: "/mcp/user"
+    prefix: "/gateway/user"
     cors:
       allowOrigins:
         - "*"
diff --git a/deploy/docker/allinone/nginx.conf b/deploy/docker/allinone/nginx.conf
@@ -50,7 +50,7 @@ http {
             proxy_set_header X-Forwarded-Proto $scheme;
         }
 
-        location /mcp/ {
+        location /gateway/ {
             proxy_pass http://mcp-gateway/;
             proxy_set_header Host $host;
             proxy_set_header X-Real-IP $remote_addr;
diff --git a/deploy/docker/multi/nginx.conf b/deploy/docker/multi/nginx.conf
@@ -50,7 +50,7 @@ http {
             proxy_set_header X-Forwarded-Proto $scheme;
         }
 
-        location /mcp/ {
+        location /gateway/ {
             proxy_pass http://mcp-gateway;
             proxy_set_header Host $host;
             proxy_set_header X-Real-IP $remote_addr;
diff --git a/deploy/helm/values.yaml b/deploy/helm/values.yaml
@@ -217,7 +217,7 @@ config:
 
   VITE_API_BASE_URL: "/api"
   VITE_WS_BASE_URL: "/ws"
-  VITE_MCP_GATEWAY_BASE_URL: "/mcp"
+  VITE_MCP_GATEWAY_BASE_URL: "/gateway"
   VITE_BASE_URL: "/"
   APISERVER_JWT_SECRET_KEY: ""
   APISERVER_JWT_DURATION: "24h"
diff --git a/deploy/k8s/multi/ingress/ingress.yaml b/deploy/k8s/multi/ingress/ingress.yaml
@@ -8,7 +8,7 @@ spec:
     - host: localhost
       http:
         paths:
-          - path: /mcp
+          - path: /gateway
             pathType: Prefix
             backend:
               service:
diff --git a/deploy/k8s/multi/referernce/proxy-mock-server.yaml b/deploy/k8s/multi/referernce/proxy-mock-server.yaml
@@ -3,7 +3,7 @@ tenant: "default"
 
 routers:
   - server: "mock-server"
-    prefix: "/mcp/user"
+    prefix: "/gateway/user"
     cors:
       allowOrigins:
         - "*"
diff --git a/deploy/k8s/multi/traefik/traefik.yaml b/deploy/k8s/multi/traefik/traefik.yaml
@@ -7,7 +7,7 @@ spec:
   entryPoints:
     - web
   routes:
-    - match: Host(`localhost`) && PathPrefix(`/mcp`)
+    - match: Host(`localhost`) && PathPrefix(`/gateway`)
       kind: Rule
       services:
         - name: mcp-gateway
diff --git a/internal/apiserver/database/util.go b/internal/apiserver/database/util.go
@@ -26,7 +26,7 @@ func InitDefaultTenant(db *gorm.DB) error {
 	// Create default tenant
 	defaultTenant := &Tenant{
 		Name:        "default",
-		Prefix:      "/mcp",
+		Prefix:      "/gateway",
 		Description: "Default tenant for MCP Gateway",
 		IsActive:    true,
 		CreatedAt:   time.Now(),
diff --git a/internal/core/state/state.go b/internal/core/state/state.go
@@ -3,6 +3,7 @@ package state
 import (
 	"context"
 	"fmt"
+	"time"
 
 	"github.com/ifuryst/lol"
 	"github.com/amoylab/unla/internal/common/cnst"
@@ -244,7 +245,11 @@ func startMCPServer(ctx context.Context, logger *zap.Logger, prefix string, mcpS
 		return
 	}
 
-	if err := transport.Start(ctx, template.NewContext()); err != nil {
+	// Create a new context to avoid being canceled when the main context is canceled during shutdown
+	startCtx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
+	defer cancel()
+
+	if err := transport.Start(startCtx, template.NewContext()); err != nil {
 		logger.Error("failed to start server for preinstall",
 			zap.String("prefix", prefix),
 			zap.String("command", mcpServer.Command),
@@ -258,7 +263,7 @@ func startMCPServer(ctx context.Context, logger *zap.Logger, prefix string, mcpS
 
 		if needStop {
 			// Stop the server after successful start
-			if err := transport.Stop(ctx); err != nil {
+			if err := transport.Stop(startCtx); err != nil {
 				logger.Error("failed to stop server for preinstall",
 					zap.String("prefix", prefix),
 					zap.String("command", mcpServer.Command),
diff --git a/pkg/openapi/converter.go b/pkg/openapi/converter.go
@@ -98,11 +98,11 @@ func (c *Converter) Convert(specData []byte) (*config.MCPConfig, error) {
 	// Create a default router for the server
 	router := config.RouterConfig{
 		Server: mcpConfig.Name,
-		Prefix: fmt.Sprintf("/mcp/%s", rs), // Generate a random prefix for each router
+		Prefix: fmt.Sprintf("/gateway/%s", rs), // Generate a random prefix for each router
 		CORS: &config.CORSConfig{
 			AllowOrigins:     []string{"*"},
 			AllowMethods:     []string{"GET", "POST", "OPTIONS"},
-			AllowHeaders:     []string{"Content-Type", "Authorization", "Mcp-Session-Id" ,"mcp-protocol-version"},
+			AllowHeaders:     []string{"Content-Type", "Authorization", "Mcp-Session-Id", "mcp-protocol-version"},
 			ExposeHeaders:    []string{"Mcp-Session-Id", "mcp-protocol-version"},
 			AllowCredentials: true,
 		},
@@ -336,13 +336,13 @@ func (c *Converter) ConvertWithOptions(specData []byte, tenant, prefix string) (
 	if err != nil {
 		return nil, err
 	}
-    // Remove leading / from tenant if present
+	// Remove leading / from tenant if present
 	cleanTenant := tenant
 	if strings.HasPrefix(cleanTenant, "/") {
 		cleanTenant = strings.TrimPrefix(cleanTenant, "/")
-	}	
+	}
 	if tenant != "" && prefix != "" {
-		config.Tenant = cleanTenant 
+		config.Tenant = cleanTenant
 		if len(config.Routers) > 0 {
 			config.Routers[0].Prefix = cleanTenant + "/" + prefix
 		}
diff --git a/pkg/openapi/converter_test.go b/pkg/openapi/converter_test.go
@@ -52,7 +52,7 @@ func TestConverter_Convert(t *testing.T) {
 	// Verify the converted configuration
 	//assert.Equal(t, "Test API", config.Name)
 	assert.Equal(t, 1, len(config.Routers))
-	assert.True(t, strings.HasPrefix(config.Routers[0].Prefix, "/mcp/"))
+	assert.True(t, strings.HasPrefix(config.Routers[0].Prefix, "/gateway/"))
 	assert.NotNil(t, config.Routers[0].CORS)
 
 	assert.Equal(t, 1, len(config.Servers))
@@ -92,7 +92,7 @@ paths:
 	// Verify the converted configuration
 	//assert.Equal(t, "Test API", config.Name)
 	assert.Equal(t, 1, len(config.Routers))
-	assert.True(t, strings.HasPrefix(config.Routers[0].Prefix, "/mcp/"))
+	assert.True(t, strings.HasPrefix(config.Routers[0].Prefix, "/gateway/"))
 	assert.NotNil(t, config.Routers[0].CORS)
 
 	assert.Equal(t, 1, len(config.Servers))
@@ -162,7 +162,7 @@ func TestConverter_ConvertOpenapi2(t *testing.T) {
 
 	// Verify the converted configuration
 	assert.Equal(t, 1, len(config.Routers))
-	assert.True(t, strings.HasPrefix(config.Routers[0].Prefix, "/mcp/"))
+	assert.True(t, strings.HasPrefix(config.Routers[0].Prefix, "/gateway/"))
 	assert.NotNil(t, config.Routers[0].CORS)
 
 	assert.Equal(t, 1, len(config.Servers))
@@ -205,7 +205,7 @@ paths:
 
 	// Verify the converted configuration
 	assert.Equal(t, 1, len(config.Routers))
-	assert.True(t, strings.HasPrefix(config.Routers[0].Prefix, "/mcp/"))
+	assert.True(t, strings.HasPrefix(config.Routers[0].Prefix, "/gateway/"))
 	assert.NotNil(t, config.Routers[0].CORS)
 
 	assert.Equal(t, 1, len(config.Servers))
@@ -370,7 +370,7 @@ func TestConverter_ConvertOpenapi31(t *testing.T) {
 
 	// Verify the converted configuration
 	assert.Equal(t, 1, len(config.Routers))
-	assert.True(t, strings.HasPrefix(config.Routers[0].Prefix, "/mcp/"))
+	assert.True(t, strings.HasPrefix(config.Routers[0].Prefix, "/gateway/"))
 	assert.NotNil(t, config.Routers[0].CORS)
 
 	assert.Equal(t, 1, len(config.Servers))
@@ -491,7 +491,7 @@ components:
 
 	// Verify the converted configuration
 	assert.Equal(t, 1, len(config.Routers))
-	assert.True(t, strings.HasPrefix(config.Routers[0].Prefix, "/mcp/"))
+	assert.True(t, strings.HasPrefix(config.Routers[0].Prefix, "/gateway/"))
 	assert.NotNil(t, config.Routers[0].CORS)
 
 	assert.Equal(t, 1, len(config.Servers))
diff --git a/web/src/services/mcp.ts b/web/src/services/mcp.ts
@@ -53,7 +53,7 @@ class MCPService {
     try {
       // Create transport and client
       const gatewayBaseUrl = window.RUNTIME_CONFIG?.VITE_MCP_GATEWAY_BASE_URL || '';
-      const serverUrl = new URL(`${gatewayBaseUrl}${prefix}/mcp`, window.location.origin);
+      const serverUrl = new URL(`${gatewayBaseUrl}${prefix}/gateway`, window.location.origin);
 
       // Build headers for auth
       let headers: Record<string, string> = {};

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ http {`
`50`	`50`	`proxy_set_header X-Forwarded-Proto $scheme;`
`51`	`51`	`}`
`52`	`52`
`53`		`- location /mcp/ {`
	`53`	`+ location /gateway/ {`
`54`	`54`	`proxy_pass http://mcp-gateway/;`
`55`	`55`	`proxy_set_header Host $host;`
`56`	`56`	`proxy_set_header X-Real-IP $remote_addr;`