重构进行中，preview通道尚未完全恢复全部功能

2026-08-07 19:16:08 +08:00
parent 5bce105bd6
commit 3a381c85ed
21 changed files with 889 additions and 2416 deletions
@@ -0,0 +1,85 @@
+package frp
+
+import (
+	"embed"
+	"fmt"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"runtime"
+	"sync"
+)
+
+//go:embed bin/*
+var embeddedFrpc embed.FS
+
+var (
+	cachedFrpcPath string
+	frpcPathMutex  sync.Mutex
+)
+
+// GetFrpcPath 获取 frpc 二进制路径
+// 优先级: 本地缓存 > 内嵌二进制 > 系统 PATH
+func GetFrpcPath() (string, error) {
+	frpcPathMutex.Lock()
+	defer frpcPathMutex.Unlock()
+
+	if cachedFrpcPath != "" {
+		if _, err := os.Stat(cachedFrpcPath); err == nil {
+			return cachedFrpcPath, nil
+		}
+		cachedFrpcPath = ""
+	}
+
+	var fileName string
+	switch {
+	case runtime.GOOS == "windows" && runtime.GOARCH == "amd64":
+		fileName = "frpc_windows_amd64.exe"
+	case runtime.GOOS == "linux" && runtime.GOARCH == "amd64":
+		fileName = "frpc_linux_amd64"
+	case runtime.GOOS == "linux" && runtime.GOARCH == "arm64":
+		fileName = "frpc_linux_arm64"
+	case runtime.GOOS == "linux" && runtime.GOARCH == "arm":
+		fileName = "frpc_linux_arm_hf"
+	default:
+		path, err := exec.LookPath("frpc")
+		if err == nil {
+			cachedFrpcPath = path
+			return path, nil
+		}
+		return "", fmt.Errorf("不支持的平台: %s/%s", runtime.GOOS, runtime.GOARCH)
+	}
+
+	// 尝试从本地 bin 目录加载
+	localPath := filepath.Join(".", "bin", fileName)
+	if _, err := os.Stat(localPath); err == nil {
+		cachedFrpcPath = localPath
+		return localPath, nil
+	}
+
+	// 尝试从 embed 提取到临时目录
+	data, err := embeddedFrpc.ReadFile("bin/" + fileName)
+	if err == nil {
+		tmpPath := filepath.Join(os.TempDir(), "frpc")
+		if runtime.GOOS == "windows" {
+			tmpPath += ".exe"
+		}
+		if err := os.WriteFile(tmpPath, data, 0755); err == nil {
+			cachedFrpcPath = tmpPath
+			return tmpPath, nil
+		}
+		if _, statErr := os.Stat(tmpPath); statErr == nil {
+			cachedFrpcPath = tmpPath
+			return tmpPath, nil
+		}
+	}
+
+	// 最后尝试从系统 PATH 查找
+	path, err := exec.LookPath("frpc")
+	if err == nil {
+		cachedFrpcPath = path
+		return path, nil
+	}
+
+	return "", fmt.Errorf("未找到 frpc 文件")
+}
@@ -0,0 +1,285 @@
+package frp
+
+import (
+	"context"
+	"log"
+	"os"
+	"os/exec"
+	"runtime"
+	"strconv"
+	"strings"
+	"syscall"
+
+	"frpc-console/internal/process"
+)
+
+// ================================================================
+// 兼容层：保持对外接口不变
+// 这些函数供 api 和外部调用，实际委托给 process.Manager
+// ================================================================
+
+// IsRunning 检查 frpc 是否在运行
+func IsRunning() bool {
+	pm := process.GetGlobalManager()
+	if pm != nil {
+		status, err := pm.Status()
+		if err != nil {
+			log.Printf("[WARN] ProcessManager.Status() 失败: %v，降级到 PID 文件", err)
+			return isRunningLegacy()
+		}
+		return status.State == "running"
+	}
+	return isRunningLegacy()
+}
+
+// Start 启动 frpc (幂等)
+func Start() error {
+	pm := process.GetGlobalManager()
+	if pm != nil {
+		log.Println("[INFO] 使用 ProcessManager 启动 frpc")
+		return pm.Start(context.Background())
+	}
+	log.Println("[WARN] ProcessManager 未初始化，使用兼容模式启动 frpc")
+	return startLegacy()
+}
+
+// Stop 停止 frpc (幂等)
+func Stop() error {
+	pm := process.GetGlobalManager()
+	if pm != nil {
+		log.Println("[INFO] 使用 ProcessManager 停止 frpc")
+		return pm.Stop(context.Background())
+	}
+	log.Println("[WARN] ProcessManager 未初始化，使用兼容模式停止 frpc")
+	return stopLegacy()
+}
+
+// Restart 重启 frpc (原子操作)
+func Restart() error {
+	pm := process.GetGlobalManager()
+	if pm != nil {
+		log.Println("[INFO] 使用 ProcessManager 重启 frpc")
+		return pm.Restart(context.Background())
+	}
+	log.Println("[WARN] ProcessManager 未初始化，使用兼容模式重启 frpc")
+	if err := stopLegacy(); err != nil {
+		return err
+	}
+	return startLegacy()
+}
+
+// GetStatus 获取 frpc 详细状态 (供 API 调用)
+func GetStatus() (map[string]interface{}, error) {
+	pm := process.GetGlobalManager()
+	if pm != nil {
+		status, err := pm.Status()
+		if err != nil {
+			return nil, err
+		}
+		return map[string]interface{}{
+			"state": status.State,
+			"pid":   status.PID,
+			"port":  status.Port,
+		}, nil
+	}
+
+	running := isRunningLegacy()
+	return map[string]interface{}{
+		"state":  map[bool]string{true: "running", false: "stopped"}[running],
+		"pid":    0,
+		"port":   0,
+		"legacy": true,
+	}, nil
+}
+
+// Reload 热加载 frpc 配置
+func Reload() error {
+	pm := process.GetGlobalManager()
+	if pm == nil {
+		return reloadLegacy()
+	}
+
+	status, err := pm.Status()
+	if err != nil {
+		return err
+	}
+
+	if status.State != "running" {
+		return pm.Start(context.Background())
+	}
+
+	frpcPath, err := GetFrpcPath()
+	if err != nil {
+		return err
+	}
+
+	cmd := exec.Command(frpcPath, "reload", "-c", "./data/frpc.toml")
+	output, err := cmd.CombinedOutput()
+	if err != nil {
+		log.Printf("⚠️ 热加载失败 (%v)，降级为重启 frpc", err)
+		log.Printf("   reload 输出: %s", string(output))
+		if err := pm.Restart(context.Background()); err != nil {
+			return err
+		}
+		return nil
+	}
+
+	log.Printf("✅ frpc 热加载成功: %s", string(output))
+	return nil
+}
+
+// ================================================================
+// 旧版实现 (降级方案)
+// ================================================================
+
+func isRunningLegacy() bool {
+	pidData, err := os.ReadFile("./data/frpc.pid")
+	if err != nil {
+		return false
+	}
+	pid, err := strconv.Atoi(strings.TrimSpace(string(pidData)))
+	if err != nil {
+		return false
+	}
+
+	if runtime.GOOS == "windows" {
+		cmd := exec.Command("tasklist", "/FI", "PID eq", strconv.Itoa(pid))
+		output, err := cmd.CombinedOutput()
+		if err != nil {
+			return false
+		}
+		return strings.Contains(string(output), strconv.Itoa(pid))
+	}
+
+	proc, err := os.FindProcess(pid)
+	if err != nil {
+		return false
+	}
+	return proc.Signal(syscall.Signal(0)) == nil
+}
+
+func startLegacy() error {
+	frpcPath, err := GetFrpcPath()
+	if err != nil {
+		return err
+	}
+
+	if err := os.MkdirAll("./data", 0755); err != nil {
+		return err
+	}
+
+	if _, err := os.Stat("./data/frpc.toml"); os.IsNotExist(err) {
+		if err := GenerateConfig(); err != nil {
+			return err
+		}
+	}
+
+	if isRunningLegacy() {
+		return nil
+	}
+
+	os.Remove("./data/frpc.pid")
+
+	cmd := exec.Command(frpcPath, "-c", "./data/frpc.toml")
+	setWindowHide(cmd)
+	setSysProcAttr(cmd)
+
+	logFile, err := os.OpenFile("./data/frpc.log", os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0644)
+	if err != nil {
+		return err
+	}
+	cmd.Stdout = logFile
+	cmd.Stderr = logFile
+
+	if err := cmd.Start(); err != nil {
+		return err
+	}
+
+	go func() {
+		if err := cmd.Wait(); err != nil {
+			log.Printf("frpc 子进程退出: %v", err)
+		}
+		os.Remove("./data/frpc.pid")
+	}()
+
+	return os.WriteFile("./data/frpc.pid", []byte(strconv.Itoa(cmd.Process.Pid)), 0644)
+}
+
+func stopLegacy() error {
+	if runtime.GOOS == "windows" {
+		cmd := exec.Command("taskkill", "/F", "/IM", "frpc.exe")
+		if err := cmd.Run(); err != nil && !strings.Contains(err.Error(), "not found") {
+			return err
+		}
+		os.Remove("./data/frpc.pid")
+		return nil
+	}
+
+	pidData, err := os.ReadFile("./data/frpc.pid")
+	if err != nil {
+		cmd := exec.Command("pkill", "-f", "frpc")
+		if err := cmd.Run(); err != nil && !strings.Contains(err.Error(), "no process") {
+			return err
+		}
+		return nil
+	}
+
+	pid, _ := strconv.Atoi(strings.TrimSpace(string(pidData)))
+	proc, err := os.FindProcess(pid)
+	if err != nil {
+		os.Remove("./data/frpc.pid")
+		return nil
+	}
+
+	if err := proc.Kill(); err != nil {
+		return err
+	}
+
+	os.Remove("./data/frpc.pid")
+	return nil
+}
+
+func reloadLegacy() error {
+	if !isRunningLegacy() {
+		return startLegacy()
+	}
+
+	frpcPath, err := GetFrpcPath()
+	if err != nil {
+		return err
+	}
+
+	cmd := exec.Command(frpcPath, "reload", "-c", "./data/frpc.toml")
+	output, err := cmd.CombinedOutput()
+	if err != nil {
+		log.Printf("⚠️ 热加载失败 (%v)，降级为重启 frpc", err)
+		log.Printf("   reload 输出: %s", string(output))
+		if stopErr := stopLegacy(); stopErr != nil {
+			return stopErr
+		}
+		return startLegacy()
+	}
+
+	log.Printf("✅ frpc 热加载成功 (兼容模式): %s", string(output))
+	return nil
+}
+
+// ================================================================
+// 辅助函数 (平台相关)
+// ================================================================
+
+func setWindowHide(cmd *exec.Cmd) {
+	if runtime.GOOS == "windows" {
+		cmd.SysProcAttr = &syscall.SysProcAttr{
+			HideWindow: true,
+		}
+	}
+}
+
+func setSysProcAttr(cmd *exec.Cmd) {
+	if runtime.GOOS != "windows" {
+		cmd.SysProcAttr = &syscall.SysProcAttr{
+			Setpgid: true,
+		}
+	}
+}