lxh2875931338/frpc-console
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 7 Wiki Activity

2.6-Preview最后一批代码上线

Browse Source
This commit is contained in:
lxh2875931338
2026-08-07 21:18:28 +08:00
parent 41eb21f512
commit d7c27c513c
12 changed files with 322 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/api/handler.go
+5
View File
@@ -188,6 +188,11 @@ func UpdateConfigHandler(c *gin.Context) {
}
cfg.TcpMux = true
// AdminPort 已从 JSON 绑定，直接使用
if cfg.AdminPort <= 0 {
cfg.AdminPort = 7400 // 如果前端没传，默认 7400
}
if err := db.UpdateGlobalConfig(&cfg); err != nil {
c.JSON(http.StatusInternalServerError, gin.H{"code": 2, "msg": "更新配置失败: " + err.Error()})
return
internal/api/static/app.js
+1
View File
@@ -95,6 +95,7 @@ const defaultConfig = {
serverAddr: "frp.example.com",
serverPort: 7000,
token: "CHANGE_ME",
adminPort: 7400,
logLevel: "info",
logMaxDays: 3,
tcpMux: true,
internal/api/static/index.html
+4
View File
@@ -201,6 +201,10 @@
</button>
</div>
</div>
<div class="form-row">
<label>管理端口 (admin_port)</label>
<input type="number" v-model="globalConfig.adminPort" placeholder="7400" />
</div>
</div>
</div>
internal/db/db.go
+183 -52
View File
@@ -17,7 +17,7 @@ import (
var DB *sql.DB
const SchemaVersion = "v2"
const SchemaVersion = "v3"
// ================================================================
// 初始化
@@ -52,6 +52,7 @@ func InitDB() error {
}
func createTables() error {
// users 表
_, err := DB.Exec(`
CREATE TABLE IF NOT EXISTS users (
id INTEGER PRIMARY KEY AUTOINCREMENT,
@@ -65,12 +66,14 @@ func createTables() error {
return err
}
// global_config 表
_, err = DB.Exec(`
CREATE TABLE IF NOT EXISTS global_config (
id INTEGER PRIMARY KEY CHECK (id = 1),
server_addr TEXT NOT NULL DEFAULT 'frp.example.com',
server_port INTEGER NOT NULL DEFAULT 7000,
token TEXT NOT NULL DEFAULT 'CHANGE_ME',
admin_port INTEGER NOT NULL DEFAULT 7400,
log_level TEXT NOT NULL DEFAULT 'info',
log_max_days INTEGER NOT NULL DEFAULT 3,
tcp_mux INTEGER NOT NULL DEFAULT 1,
@@ -86,6 +89,7 @@ func createTables() error {
return err
}
// proxies 表
_, err = DB.Exec(`
CREATE TABLE IF NOT EXISTS proxies (
id INTEGER PRIMARY KEY AUTOINCREMENT,
@@ -103,6 +107,7 @@ func createTables() error {
return err
}
// app_config 表
_, err = DB.Exec(`
CREATE TABLE IF NOT EXISTS app_config (
key TEXT PRIMARY KEY,
@@ -114,15 +119,16 @@ func createTables() error {
return err
}
// 初始化 global_config 默认值（新数据库）
var count int
DB.QueryRow("SELECT COUNT(*) FROM global_config").Scan(&count)
if count == 0 {
_, err = DB.Exec(`
INSERT INTO global_config (
id, server_addr, server_port, token, log_level, log_max_days,
id, server_addr, server_port, token, admin_port, log_level, log_max_days,
tcp_mux, tcp_mux_keepalive, heartbeat_interval, heartbeat_timeout, pool_count,
wire_protocol_v2
) VALUES (1, 'frp.example.com', 7000, 'CHANGE_ME', 'info', 3, 1, 30, 15, 70, 8, 0)
) VALUES (1, 'frp.example.com', 7000, 'CHANGE_ME', 7400, 'info', 3, 1, 30, 15, 70, 8, 0)
`)
if err != nil {
return err
@@ -134,43 +140,113 @@ func createTables() error {
}
// ================================================================
// JWT 密钥管理
// v2 → v3 重型迁移：global_config 表添加 admin_port
// ================================================================
func ensureJwtSecret() error {
var value string
err := DB.QueryRow("SELECT value FROM app_config WHERE key = 'jwt_secret'").Scan(&value)
if err == nil && value != "" {
func migrateGlobalConfigToV3() error {
log.Println(" 开始 global_config 表迁移 (v2→v3)")
// 1. 检查 admin_port 列是否已存在
var hasAdminPort bool
rows, err := DB.Query("PRAGMA table_info(global_config)")
if err != nil {
return fmt.Errorf("查询表结构失败: %w", err)
}
defer rows.Close()
for rows.Next() {
var cid int
var name, ctype string
var notnull, pk int
var dflt sql.NullString
if err := rows.Scan(&cid, &name, &ctype, &notnull, &dflt, &pk); err != nil {
return err
}
if name == "admin_port" {
hasAdminPort = true
break
}
}
if hasAdminPort {
log.Println(" ✅ admin_port 列已存在，跳过迁移")
return nil
}
bytes := make([]byte, 32)
if _, err := rand.Read(bytes); err != nil {
return err
}
secret := hex.EncodeToString(bytes)
log.Println(" 创建 global_config_new 表...")
_, err = DB.Exec(`
INSERT INTO app_config (key, value) VALUES ('jwt_secret', ?)
`, secret)
CREATE TABLE global_config_new (
id INTEGER PRIMARY KEY CHECK (id = 1),
server_addr TEXT NOT NULL DEFAULT 'frp.example.com',
server_port INTEGER NOT NULL DEFAULT 7000,
token TEXT NOT NULL DEFAULT 'CHANGE_ME',
admin_port INTEGER NOT NULL DEFAULT 7400,
log_level TEXT NOT NULL DEFAULT 'info',
log_max_days INTEGER NOT NULL DEFAULT 3,
tcp_mux INTEGER NOT NULL DEFAULT 1,
tcp_mux_keepalive INTEGER NOT NULL DEFAULT 30,
heartbeat_interval INTEGER NOT NULL DEFAULT 15,
heartbeat_timeout INTEGER NOT NULL DEFAULT 70,
pool_count INTEGER NOT NULL DEFAULT 8,
wire_protocol_v2 INTEGER NOT NULL DEFAULT 0,
updated_at DATETIME DEFAULT CURRENT_TIMESTAMP
)
`)
if err != nil {
return err
return fmt.Errorf("创建 global_config_new 表失败: %w", err)
}
log.Printf("✅ JWT 密钥已生成")
log.Println(" 迁移数据 (admin_port = 7400)...")
_, err = DB.Exec(`
INSERT INTO global_config_new (
id, server_addr, server_port, token, admin_port,
log_level, log_max_days, tcp_mux, tcp_mux_keepalive,
heartbeat_interval, heartbeat_timeout, pool_count,
wire_protocol_v2, updated_at
)
SELECT
id, server_addr, server_port, token, 7400,
log_level, log_max_days, tcp_mux, tcp_mux_keepalive,
heartbeat_interval, heartbeat_timeout, pool_count,
wire_protocol_v2, updated_at
FROM global_config
`)
if err != nil {
return fmt.Errorf("复制数据失败: %w", err)
}
var oldCount, newCount int
DB.QueryRow("SELECT COUNT(*) FROM global_config").Scan(&oldCount)
DB.QueryRow("SELECT COUNT(*) FROM global_config_new").Scan(&newCount)
if oldCount != newCount {
return fmt.Errorf("数据迁移不完整: 旧表 %d 行，新表 %d 行", oldCount, newCount)
}
log.Printf(" 数据迁移验证通过: %d 行", newCount)
log.Println(" 交换表名...")
if _, err := DB.Exec("ALTER TABLE global_config RENAME TO global_config_old"); err != nil {
return fmt.Errorf("重命名旧表失败: %w", err)
}
if _, err := DB.Exec("ALTER TABLE global_config_new RENAME TO global_config"); err != nil {
DB.Exec("ALTER TABLE global_config_old RENAME TO global_config")
return fmt.Errorf("重命名新表失败: %w", err)
}
if _, err := DB.Exec("DROP TABLE global_config_old"); err != nil {
log.Printf("⚠️ 删除旧表失败（不影响使用）: %v", err)
}
log.Println(" ✅ global_config 表迁移完成")
return nil
}
func GetJwtSecret() (string, error) {
var secret string
err := DB.QueryRow("SELECT value FROM app_config WHERE key = 'jwt_secret'").Scan(&secret)
if err != nil {
return "", err
}
return secret, nil
}
// ================================================================
// 迁移引擎
// Schema 版本管理
// ================================================================
func getCurrentSchemaVersion() string {
@@ -249,6 +325,10 @@ func restoreDatabase(backupPath string) error {
return nil
}
// ================================================================
// runMigrations - 核心迁移入口
// ================================================================
func runMigrations() error {
currentVer := getCurrentSchemaVersion()
targetVer := SchemaVersion
@@ -276,33 +356,37 @@ func runMigrations() error {
log.Printf("📦 备份文件: %s", backupPath)
}
currentSchema := getSchemaDef(currentVer)
targetSchema := getSchemaDef(targetVer)
if targetSchema == nil {
return fmt.Errorf("目标 Schema 版本 %s 未定义", targetVer)
// ---- 阶段1: v1 → v2（proxies 表迁移） ----
if currentVer == "v1" {
oldDef := getSchemaDef("v1")
newDef := getSchemaDef("v2")
if oldDef == nil || newDef == nil {
return fmt.Errorf("v1 或 v2 schema 定义不存在")
}
if !schemaVersionsEqual(oldDef, newDef) {
log.Println(" 阶段1: v1→v2 重型迁移（proxies 表结构变更）")
if err := heavyMigration(oldDef, newDef); err != nil {
if backupPath != "" {
restoreDatabase(backupPath)
}
return fmt.Errorf("v1→v2 迁移失败: %w", err)
}
} else {
log.Println(" 阶段1: v1→v2 轻量迁移（proxies 表结构无变更）")
}
currentVer = "v2"
}
if currentSchema == nil || schemaVersionsEqual(currentSchema, targetSchema) {
log.Println(" 迁移类型: 轻量复制（Schema 无变更）")
var userCount int
err := DB.QueryRow("SELECT COUNT(*) FROM users").Scan(&userCount)
if err != nil || userCount == 0 {
log.Println(" 数据库为空或无效，跳过迁移，直接初始化")
return nil
}
log.Println(" 数据库有效，继续使用")
} else {
log.Println(" 迁移类型: 重型迁移（Schema 有变更，新建表 + 搬数据）")
if err := heavyMigration(currentSchema, targetSchema); err != nil {
// ---- 阶段2: v2 → v3（global_config 表新增 admin_port） ----
if currentVer == "v2" {
log.Println(" 阶段2: v2→v3 重型迁移（global_config 表新增 admin_port）")
if err := migrateGlobalConfigToV3(); err != nil {
if backupPath != "" {
log.Printf("❌ 迁移失败，尝试恢复备份: %s", backupPath)
if restoreErr := restoreDatabase(backupPath); restoreErr != nil {
log.Printf("⚠️ 恢复备份失败: %v", restoreErr)
}
restoreDatabase(backupPath)
}
return fmt.Errorf("重型迁移失败: %w", err)
return fmt.Errorf("v2→v3 迁移失败: %w", err)
}
currentVer = "v3"
}
if err := setSchemaVersion(targetVer); err != nil {
@@ -313,9 +397,13 @@ func runMigrations() error {
return nil
}
// ================================================================
// 重型迁移引擎（用于 proxies 表）
// ================================================================
func heavyMigration(oldDef, newDef *SchemaVersionDef) error {
if oldDef == nil {
return fmt.Errorf("旧 Schema 定义为空，无法执行重型迁移")
return fmt.Errorf("旧 Schema 定义为空")
}
oldTable := oldDef.TableName
@@ -364,7 +452,14 @@ func buildCreateTableSQL(tableName string, def *SchemaVersionDef) string {
var cols []string
var primaryKey string
for name, col := range def.Columns {
names := make([]string, 0, len(def.Columns))
for name := range def.Columns {
names = append(names, name)
}
sort.Strings(names)
for _, name := range names {
col := def.Columns[name]
parts := []string{name, col.Type}
if col.NotNull {
parts = append(parts, "NOT NULL")
@@ -387,7 +482,7 @@ func buildCreateTableSQL(tableName string, def *SchemaVersionDef) string {
}
func buildInsertSQL(oldTable, newTable string, oldDef, newDef *SchemaVersionDef) (string, error) {
var newCols []string
newCols := make([]string, 0, len(newDef.Columns))
for name := range newDef.Columns {
newCols = append(newCols, name)
}
@@ -422,3 +517,39 @@ func buildInsertSQL(oldTable, newTable string, oldDef, newDef *SchemaVersionDef)
oldTable,
), nil
}
// ================================================================
// JWT 密钥管理
// ================================================================
func ensureJwtSecret() error {
var value string
err := DB.QueryRow("SELECT value FROM app_config WHERE key = 'jwt_secret'").Scan(&value)
if err == nil && value != "" {
return nil
}
bytes := make([]byte, 32)
if _, err := rand.Read(bytes); err != nil {
return err
}
secret := hex.EncodeToString(bytes)
_, err = DB.Exec(`
INSERT INTO app_config (key, value) VALUES ('jwt_secret', ?)
`, secret)
if err != nil {
return err
}
log.Printf("✅ JWT 密钥已生成")
return nil
}
func GetJwtSecret() (string, error) {
var secret string
err := DB.QueryRow("SELECT value FROM app_config WHERE key = 'jwt_secret'").Scan(&secret)
if err != nil {
return "", err
}
return secret, nil
}
internal/db/models.go
+1
View File
@@ -6,6 +6,7 @@ type GlobalConfig struct {
ServerAddr string `json:"serverAddr"`
ServerPort int `json:"serverPort"`
Token string `json:"token"`
AdminPort int `json:"adminPort"` // ← 新增
LogLevel string `json:"logLevel"`
LogMaxDays int `json:"logMaxDays"`
TcpMux bool `json:"tcpMux"`
internal/db/repository.go
+11 -5
View File
@@ -4,16 +4,20 @@ package db
// 全局配置
// ================================================================
// internal/db/repository.go
func GetGlobalConfig() (*GlobalConfig, error) {
var cfg GlobalConfig
err := DB.QueryRow(`
SELECT id, server_addr, server_port, token, log_level, log_max_days,
SELECT id, server_addr, server_port, token, admin_port,
log_level, log_max_days,
tcp_mux, tcp_mux_keepalive, heartbeat_interval, heartbeat_timeout, pool_count,
wire_protocol_v2
FROM global_config WHERE id = 1
`).Scan(
&cfg.ID, &cfg.ServerAddr, &cfg.ServerPort, &cfg.Token,
&cfg.LogLevel, &cfg.LogMaxDays, &cfg.TcpMux, &cfg.TcpMuxKeepalive,
&cfg.ID, &cfg.ServerAddr, &cfg.ServerPort, &cfg.Token, &cfg.AdminPort,
&cfg.LogLevel, &cfg.LogMaxDays,
&cfg.TcpMux, &cfg.TcpMuxKeepalive,
&cfg.HeartbeatInterval, &cfg.HeartbeatTimeout, &cfg.PoolCount,
&cfg.WireProtocolV2,
)
@@ -27,13 +31,15 @@ func GetGlobalConfig() (*GlobalConfig, error) {
func UpdateGlobalConfig(cfg *GlobalConfig) error {
_, err := DB.Exec(`
UPDATE global_config SET
server_addr = ?, server_port = ?, token = ?, log_level = ?, log_max_days = ?,
server_addr = ?, server_port = ?, token = ?, admin_port = ?,
log_level = ?, log_max_days = ?,
tcp_mux = 1,
tcp_mux_keepalive = ?, heartbeat_interval = ?, heartbeat_timeout = ?, pool_count = ?,
wire_protocol_v2 = ?,
updated_at = CURRENT_TIMESTAMP
WHERE id = 1
`, cfg.ServerAddr, cfg.ServerPort, cfg.Token, cfg.LogLevel, cfg.LogMaxDays,
`, cfg.ServerAddr, cfg.ServerPort, cfg.Token, cfg.AdminPort,
cfg.LogLevel, cfg.LogMaxDays,
cfg.TcpMuxKeepalive, cfg.HeartbeatInterval, cfg.HeartbeatTimeout, cfg.PoolCount,
cfg.WireProtocolV2)
return err
internal/db/schema.go
+16
View File
@@ -50,6 +50,22 @@ var schemaHistory = []SchemaVersionDef{
"updated_at": {Type: "DATETIME", Default: "CURRENT_TIMESTAMP"},
},
},
{
Version: "v3",
TableName: "proxies",
Columns: map[string]ColumnDef{
"id": {Type: "INTEGER", Primary: true},
"name": {Type: "TEXT", NotNull: true},
"type": {Type: "TEXT", NotNull: true, Default: "'tcp'"},
"local_ip": {Type: "TEXT", NotNull: true},
"local_port": {Type: "INTEGER", NotNull: true},
"remote_port": {Type: "INTEGER", NotNull: true},
"enabled": {Type: "INTEGER", NotNull: true, Default: "1"},
"created_at": {Type: "DATETIME", Default: "CURRENT_TIMESTAMP"},
"updated_at": {Type: "DATETIME", Default: "CURRENT_TIMESTAMP"},
},
},
}
func getSchemaDef(version string) *SchemaVersionDef {
internal/frp/config.go
+8
View File
@@ -19,6 +19,14 @@ type ConfigData struct {
WireProtocolLine string
}
// ConfigData 中已包含 *db.GlobalConfig，AdminPort 会自动传递到模板
// 不需要额外修改，但模板 frpc.tmpl 需要支持 admin_port 输出
// 在 frpc.tmpl 中添加：
// {{- if .AdminPort }}
// admin_port = {{ .AdminPort }}
// {{- end }}
// GenerateConfig 生成 frpc.toml 配置文件
func GenerateConfig() error {
cfg, err := db.GetGlobalConfig()
internal/frp/frpc.tmpl
+1 -1
View File
@@ -20,7 +20,7 @@ poolCount = {{.PoolCount}}
{{end}}
[webServer]
addr = "127.0.0.1:7400"
addr = "127.0.0.1:{{.AdminPort}}"
{{range .Proxies}}
[[proxies]]
internal/process/manager.go
+57 -27
View File
@@ -1,4 +1,4 @@
// process/manager.go
// internal/process/manager.go
// frpc-console 进程管理模块
// 2.6-preview: 端口检测 + 单实例锁定 + 状态自述
@@ -11,6 +11,7 @@ import (
"encoding/json"
"fmt"
"io"
"log"
"net"
"net/http"
"os"
@@ -41,7 +42,6 @@ const (
// 数据结构
// ================================================================
// PortStatus 端口检测结果
type PortStatus struct {
Port int `json:"port"`
Occupied bool `json:"occupied"`
@@ -50,17 +50,15 @@ type PortStatus struct {
ProcessCmd string `json:"process_cmd,omitempty"`
}
// ProcessStatus frpc 进程状态
type ProcessStatus struct {
State string `json:"state"` // "running" | "stopped" | "unknown" | "conflict"
PID int `json:"pid"` // 进程 PID (如果运行中)
Port int `json:"port"` // 监听的端口
State string `json:"state"`
PID int `json:"pid"`
Port int `json:"port"`
Uptime string `json:"uptime,omitempty"`
Version string `json:"version,omitempty"`
Error string `json:"error,omitempty"`
}
// FRPCStatus 来自 frpc admin API 的状态响应
type FRPCStatus struct {
Version string `json:"version"`
RunID string `json:"run_id"`
@@ -91,7 +89,6 @@ var (
globalMu sync.Mutex
)
// NewManager 创建进程管理器
func NewManager(dataDir, configPath, frpcBinPath string) *ProcessManager {
return &ProcessManager{
dataDir: dataDir,
@@ -101,48 +98,62 @@ func NewManager(dataDir, configPath, frpcBinPath string) *ProcessManager {
}
}
// SetGlobalManager 设置全局管理器
func SetGlobalManager(pm *ProcessManager) {
globalMu.Lock()
defer globalMu.Unlock()
globalManager = pm
}
// GetGlobalManager 获取全局管理器
func GetGlobalManager() *ProcessManager {
globalMu.Lock()
defer globalMu.Unlock()
return globalManager
}
// AdminPort 获取 admin_port
func (pm *ProcessManager) AdminPort() int {
return pm.adminPort
}
// ================================================================
// 配置读取
// 配置读取 (带调试日志)
// ================================================================
// LoadConfig 从 frpc.toml 读取 admin_port 配置
// 兼容 frp 0.52.0 前后的配置格式
func (pm *ProcessManager) LoadConfig() error {
content, err := os.ReadFile(pm.configPath)
if err != nil {
return fmt.Errorf("读取配置文件失败: %w", err)
}
log.Printf("[DEBUG] LoadConfig 读取到文件，长度: %d 字节", len(content))
preview := string(content)
if len(preview) > 600 {
preview = preview[:600] + "\n... (截断)"
}
log.Printf("[DEBUG] 文件内容预览:\n%s", preview)
if port := extractIntValue(string(content), "admin_port"); port > 0 {
pm.adminPort = port
log.Printf("[DEBUG] ✅ 从 admin_port 解析到端口: %d", port)
return nil
}
log.Printf("[DEBUG] ❌ admin_port 未找到")
if port := extractIntValueFromSection(string(content), "webServer", "port"); port > 0 {
pm.adminPort = port
log.Printf("[DEBUG] ✅ 从 webServer.port 解析到端口: %d", port)
return nil
}
log.Printf("[DEBUG] ❌ webServer.port 未找到")
return fmt.Errorf("未找到 admin_port 或 webServer.port 配置")
if port := extractPortFromAddrSection(string(content), "webServer", "addr"); port > 0 {
pm.adminPort = port
log.Printf("[DEBUG] ✅ 从 webServer.addr 解析到端口: %d", port)
return nil
}
log.Printf("[DEBUG] ❌ webServer.addr 未找到或解析失败")
return fmt.Errorf("未找到 admin_port 或 webServer.port/addr 配置")
}
func extractIntValue(content, key string) int {
@@ -169,7 +180,8 @@ func extractIntValueFromSection(content, section, key string) int {
for _, line := range lines {
trimmed := strings.TrimSpace(line)
if strings.HasPrefix(trimmed, "[") && strings.HasSuffix(trimmed, "]") {
inSection = strings.Trim(trimmed, "[]") == section
sectionName := strings.TrimSpace(strings.Trim(trimmed, "[]"))
inSection = strings.EqualFold(sectionName, section)
continue
}
if inSection && strings.HasPrefix(trimmed, key) {
@@ -186,14 +198,40 @@ func extractIntValueFromSection(content, section, key string) int {
return 0
}
func extractPortFromAddrSection(content, section, key string) int {
lines := strings.Split(content, "\n")
inSection := false
for _, line := range lines {
trimmed := strings.TrimSpace(line)
if strings.HasPrefix(trimmed, "[") && strings.HasSuffix(trimmed, "]") {
sectionName := strings.TrimSpace(strings.Trim(trimmed, "[]"))
inSection = strings.EqualFold(sectionName, section)
continue
}
if inSection && strings.HasPrefix(trimmed, key) {
parts := strings.SplitN(trimmed, "=", 2)
if len(parts) == 2 {
val := strings.TrimSpace(parts[1])
val = strings.Trim(val, `"`)
if idx := strings.LastIndex(val, ":"); idx != -1 {
portStr := val[idx+1:]
if port, err := strconv.Atoi(portStr); err == nil && port > 0 {
return port
}
}
}
}
}
return 0
}
// ================================================================
// 端口检测
// ================================================================
// CheckPort 检测端口是否被占用
func (pm *ProcessManager) CheckPort() (bool, error) {
if pm.adminPort <= 0 {
return false, fmt.Errorf("admin_port 未配置")
return false, fmt.Errorf("admin_port 未配置 (当前值: %d)", pm.adminPort)
}
conn, err := net.DialTimeout("tcp", fmt.Sprintf("127.0.0.1:%d", pm.adminPort), PortCheckTimeout)
if err != nil {
@@ -203,7 +241,6 @@ func (pm *ProcessManager) CheckPort() (bool, error) {
return true, nil
}
// GetPortStatus 获取端口完整状态 (占用 + PID + 进程类型)
func (pm *ProcessManager) GetPortStatus() (*PortStatus, error) {
status := &PortStatus{Port: pm.adminPort, Occupied: false, PID: 0, IsFRPC: false}
occupied, err := pm.CheckPort()
@@ -389,11 +426,10 @@ func (pm *ProcessManager) deletePIDFile() error {
// 状态查询
// ================================================================
// Status 获取 frpc 进程实时状态
func (pm *ProcessManager) Status() (*ProcessStatus, error) {
status := &ProcessStatus{State: "unknown", PID: 0, Port: pm.adminPort}
if pm.adminPort <= 0 {
status.Error = "admin_port 未配置"
status.Error = fmt.Sprintf("admin_port 未配置 (当前值: %d)", pm.adminPort)
return status, nil
}
portStatus, err := pm.GetPortStatus()
@@ -460,7 +496,6 @@ func (pm *ProcessManager) getFRPCStatus(pid int) *FRPCStatus {
// 操作执行 (Start / Stop / Restart)
// ================================================================
// Start 启动 frpc (幂等)
func (pm *ProcessManager) Start(ctx context.Context) error {
if err := pm.Lock(); err != nil {
return fmt.Errorf("获取锁失败: %w", err)
@@ -483,10 +518,7 @@ func (pm *ProcessManager) startLocked(ctx context.Context) error {
}
cmd := exec.CommandContext(ctx, pm.frpcBinPath, "-c", pm.configPath)
// 设置进程属性 (平台相关)
setProcessAttributes(cmd)
cmd.Stdout = os.Stdout
cmd.Stderr = os.Stderr
@@ -508,7 +540,6 @@ func (pm *ProcessManager) startLocked(ctx context.Context) error {
return nil
}
// Stop 停止 frpc (幂等)
func (pm *ProcessManager) Stop(ctx context.Context) error {
if err := pm.Lock(); err != nil {
return fmt.Errorf("获取锁失败: %w", err)
@@ -565,7 +596,6 @@ func (pm *ProcessManager) stopLocked(ctx context.Context) error {
return nil
}
// Restart 重启 frpc (原子操作)
func (pm *ProcessManager) Restart(ctx context.Context) error {
if err := pm.Lock(); err != nil {
return fmt.Errorf("获取锁失败: %w", err)