Delete config directory

config/envexpand.go

@@ -1,66 +0,0 @@
-package config
-
-import (
-	"os"
-	"strings"
-)
-
-// expandEnvVar 展开字符串中的 ${VAR} 和 ${VAR:-default} 环境变量引用。
-// 与官方 MCP 配置格式一致（Claude Desktop / Cursor / VS Code 均支持此语法）。
-func expandEnvVar(s string) string {
-	var b strings.Builder
-	i := 0
-	for i < len(s) {
-		// 查找 ${
-		idx := strings.Index(s[i:], "${")
-		if idx < 0 {
-			b.WriteString(s[i:])
-			break
-		}
-		b.WriteString(s[i : i+idx])
-		i += idx + 2 // skip ${
-
-		// 查找对应的 }
-		end := strings.IndexByte(s[i:], '}')
-		if end < 0 {
-			// 没有 }，原样保留
-			b.WriteString("${")
-			continue
-		}
-		expr := s[i : i+end]
-		i += end + 1 // skip }
-
-		// 解析 VAR:-default
-		varName := expr
-		defaultVal := ""
-		hasDefault := false
-		if colonIdx := strings.Index(expr, ":-"); colonIdx >= 0 {
-			varName = expr[:colonIdx]
-			defaultVal = expr[colonIdx+2:]
-			hasDefault = true
-		}
-
-		val := os.Getenv(varName)
-		if val == "" && hasDefault {
-			val = defaultVal
-		}
-		b.WriteString(val)
-	}
-	return b.String()
-}
-
-// ExpandConfigEnv 展开 ExternalMCPServerConfig 中所有支持环境变量的字段。
-// 展开范围：Command、Args、Env values、URL、Headers values。
-func ExpandConfigEnv(cfg *ExternalMCPServerConfig) {
-	cfg.Command = expandEnvVar(cfg.Command)
-	for i, arg := range cfg.Args {
-		cfg.Args[i] = expandEnvVar(arg)
-	}
-	for k, v := range cfg.Env {
-		cfg.Env[k] = expandEnvVar(v)
-	}
-	cfg.URL = expandEnvVar(cfg.URL)
-	for k, v := range cfg.Headers {
-		cfg.Headers[k] = expandEnvVar(v)
-	}
-}

config/envexpand_test.go

@@ -1,81 +0,0 @@
-package config
-
-import (
-	"os"
-	"testing"
-)
-
-func TestExpandEnvVar(t *testing.T) {
-	os.Setenv("TEST_MCP_VAR", "hello")
-	os.Setenv("TEST_MCP_PATH", "/usr/local/bin")
-	defer os.Unsetenv("TEST_MCP_VAR")
-	defer os.Unsetenv("TEST_MCP_PATH")
-
-	tests := []struct {
-		name   string
-		input  string
-		expect string
-	}{
-		{"plain string", "no vars here", "no vars here"},
-		{"empty string", "", ""},
-		{"simple var", "${TEST_MCP_VAR}", "hello"},
-		{"var in middle", "prefix-${TEST_MCP_VAR}-suffix", "prefix-hello-suffix"},
-		{"multiple vars", "${TEST_MCP_PATH}/${TEST_MCP_VAR}", "/usr/local/bin/hello"},
-		{"missing var empty", "${NONEXISTENT_MCP_VAR_XYZ}", ""},
-		{"default value used", "${NONEXISTENT_MCP_VAR_XYZ:-fallback}", "fallback"},
-		{"default not used", "${TEST_MCP_VAR:-unused}", "hello"},
-		{"default with path", "${NONEXISTENT_MCP_VAR_XYZ:-/tmp/default}", "/tmp/default"},
-		{"unclosed brace", "${UNCLOSED", "${UNCLOSED"},
-		{"dollar without brace", "$PLAIN", "$PLAIN"},
-		{"empty var name", "${}", ""},
-		{"default empty var", "${:-default}", "default"},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			got := expandEnvVar(tt.input)
-			if got != tt.expect {
-				t.Errorf("expandEnvVar(%q) = %q, want %q", tt.input, got, tt.expect)
-			}
-		})
-	}
-}
-
-func TestExpandConfigEnv(t *testing.T) {
-	os.Setenv("TEST_MCP_CMD", "python3")
-	os.Setenv("TEST_MCP_TOKEN", "secret123")
-	defer os.Unsetenv("TEST_MCP_CMD")
-	defer os.Unsetenv("TEST_MCP_TOKEN")
-
-	cfg := &ExternalMCPServerConfig{
-		Command: "${TEST_MCP_CMD}",
-		Args:    []string{"--token", "${TEST_MCP_TOKEN}", "${MISSING:-default_arg}"},
-		Env:     map[string]string{"API_KEY": "${TEST_MCP_TOKEN}", "LEVEL": "${MISSING:-INFO}"},
-		URL:     "https://${MISSING:-example.com}/mcp",
-		Headers: map[string]string{"Authorization": "Bearer ${TEST_MCP_TOKEN}"},
-	}
-
-	ExpandConfigEnv(cfg)
-
-	if cfg.Command != "python3" {
-		t.Errorf("Command = %q, want %q", cfg.Command, "python3")
-	}
-	if cfg.Args[1] != "secret123" {
-		t.Errorf("Args[1] = %q, want %q", cfg.Args[1], "secret123")
-	}
-	if cfg.Args[2] != "default_arg" {
-		t.Errorf("Args[2] = %q, want %q", cfg.Args[2], "default_arg")
-	}
-	if cfg.Env["API_KEY"] != "secret123" {
-		t.Errorf("Env[API_KEY] = %q, want %q", cfg.Env["API_KEY"], "secret123")
-	}
-	if cfg.Env["LEVEL"] != "INFO" {
-		t.Errorf("Env[LEVEL] = %q, want %q", cfg.Env["LEVEL"], "INFO")
-	}
-	if cfg.URL != "https://example.com/mcp" {
-		t.Errorf("URL = %q, want %q", cfg.URL, "https://example.com/mcp")
-	}
-	if cfg.Headers["Authorization"] != "Bearer secret123" {
-		t.Errorf("Headers[Authorization] = %q, want %q", cfg.Headers["Authorization"], "Bearer secret123")
-	}
-}

config/server_https_bootstrap.go

@@ -1,46 +0,0 @@
-package config
-
-import "strings"
-
-// MainWebUIUsesHTTPS 判断主 Web UI 是否以 HTTPS 监听（与 internal/app.prepareMainServerTLS 前置条件一致）。
-func MainWebUIUsesHTTPS(s *ServerConfig) bool {
-	if s == nil {
-		return false
-	}
-	if s.TLSEnabled {
-		return true
-	}
-	if s.TLSAutoSelfSign {
-		return true
-	}
-	cert := strings.TrimSpace(s.TLSCertPath)
-	key := strings.TrimSpace(s.TLSKeyPath)
-	return cert != "" && key != ""
-}
-
-// ServerHTTPRedirectEnabled 是否在主站启用 HTTPS 时把明文 HTTP 请求重定向到 HTTPS（默认开启）。
-func ServerHTTPRedirectEnabled(s *ServerConfig) bool {
-	if s == nil || !MainWebUIUsesHTTPS(s) {
-		return false
-	}
-	if s.TLSHTTPRedirect == nil {
-		return true
-	}
-	return *s.TLSHTTPRedirect
-}
-
-// ApplyDevHTTPSBootstrap 供 --https / 一键脚本使用：强制开启主站 TLS。
-// 若已配置 tls_cert_path 与 tls_key_path 则仅用 PEM，不开启自签；否则启用 tls_auto_self_sign（内存证书，仅本地测试）。
-func ApplyDevHTTPSBootstrap(cfg *Config) {
-	if cfg == nil {
-		return
-	}
-	cfg.Server.TLSEnabled = true
-	cert := strings.TrimSpace(cfg.Server.TLSCertPath)
-	key := strings.TrimSpace(cfg.Server.TLSKeyPath)
-	if cert != "" && key != "" {
-		cfg.Server.TLSAutoSelfSign = false
-		return
-	}
-	cfg.Server.TLSAutoSelfSign = true
-}