2.6-Preview最后一批代码上线

2026-08-07 21:18:28 +08:00
parent 41eb21f512
commit d7c27c513c
12 changed files with 322 additions and 122 deletions
@@ -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
+}