feat: M1 高级传输参数（P0）

- store: Local 增加 useEncryption/useCompression/bandwidthLimit/poolCount/metadatas/annotations；Remote 增加 transportProtocol/transportTls/transportPool/transportTlsServerName；新增 migrate() ALTER TABLE 迁移旧库 - render: 输出 transport 段（protocol/tls/poolCount）与 proxy 高级字段；补 TestRenderTransportAdvanced/OmittedWhenEmpty - main: renderRemote 闭包透传 M1 字段到 render.Proxy - web: LocalNode/RemoteNode 折叠高级区表单，types.ts 接口扩展 - 验证：go test 全绿、vue-tsc/build 通过、端到端 PUT canvas→frpc JSON 输出完整
2026-09-20 00:47:57 +00:00 · 2026-08-17 12:28:54 +08:00
parent e73bd834a1
commit 07f25ea067
11 changed files with 460 additions and 62 deletions
--- a/internal/httpapi/dist/assets/index-B38pSFA7.css
+++ b/internal/httpapi/dist/assets/index-B38pSFA7.css
--- a/internal/httpapi/dist/assets/index-D5XN_p_5.js
+++ b/internal/httpapi/dist/assets/index-D5XN_p_5.js
--- a/internal/httpapi/dist/index.html
+++ b/internal/httpapi/dist/index.html
@ -4,8 +4,8 @@
    <meta charset="UTF-8" />
    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
    <title>webui-frpc</title>
-    <script type="module" crossorigin src="/assets/index-Db-ysDeU.js"></script>
-    <link rel="stylesheet" crossorigin href="/assets/index-D_HiVU-N.css">
+    <script type="module" crossorigin src="/assets/index-D5XN_p_5.js"></script>
+    <link rel="stylesheet" crossorigin href="/assets/index-B38pSFA7.css">
  </head>
  <body>
    <div id="app"></div>
--- a/internal/render/render.go
+++ b/internal/render/render.go
@ -24,6 +24,14 @@ type Proxy struct {
 	SubDomain string
 	// CustomDomains is used by http/https proxies when set.
 	CustomDomains []string
+
+	// Advanced transport knobs (M1): proxy-level encryption/compression/limit.
+	UseEncryption  bool
+	UseCompression bool
+	BandwidthLimit string
+	PoolCount      int
+	Metadatas      map[string]string
+	Annotations    map[string]string
 }

 // frpcAuth mirrors frpc's auth section.
@ -34,7 +42,15 @@ type frpcAuth struct {

 // frpcTransport is the transport section used by frpc.
 type frpcTransport struct {
-	Protocol string `json:"protocol,omitempty"`
+	Protocol  string   `json:"protocol,omitempty"`
+	TLS       *frpcTLS `json:"tls,omitempty"`
+	PoolCount int      `json:"poolCount,omitempty"`
+}
+
+// frpcTLS mirrors frpc's transport.tls section.
+type frpcTLS struct {
+	Enable     bool   `json:"enable,omitempty"`
+	ServerName string `json:"serverName,omitempty"`
 }

 // frpcProxy is the serialized proxy object. Different types use different
@ -47,6 +63,14 @@ type frpcProxy struct {
 	RemotePort    int      `json:"remotePort,omitempty"`
 	CustomDomains []string `json:"customDomains,omitempty"`
 	SubDomain     string   `json:"subdomain,omitempty"`
+
+	// M1 advanced transport fields.
+	UseEncryption  bool              `json:"useEncryption,omitempty"`
+	UseCompression bool              `json:"useCompression,omitempty"`
+	BandwidthLimit string            `json:"bandwidthLimit,omitempty"`
+	PoolCount      int               `json:"poolCount,omitempty"`
+	Metadatas      map[string]string `json:"metadatas,omitempty"`
+	Annotations    map[string]string `json:"annotations,omitempty"`
 }

 // Config is a complete frpc configuration document.
@ -69,15 +93,33 @@ func Render(remote store.Remote, proxies []Proxy) ([]byte, error) {
 		LoginFailExit: false,
 		Proxies:       make([]frpcProxy, 0, len(proxies)),
 	}
+	if remote.TransportProtocol != "" || remote.TransportTLS || remote.TransportPool > 0 || remote.TransportTLSServerName != "" {
+		cfg.Transport = frpcTransport{
+			Protocol:  remote.TransportProtocol,
+			PoolCount: remote.TransportPool,
+		}
+		if remote.TransportTLS || remote.TransportTLSServerName != "" {
+			cfg.Transport.TLS = &frpcTLS{
+				Enable:     remote.TransportTLS,
+				ServerName: remote.TransportTLSServerName,
+			}
+		}
+	}

 	nameCounts := make(map[string]int)
 	for _, p := range proxies {
 		frpcP := frpcProxy{
-			Name:      p.Name,
-			Type:      p.Type,
-			LocalIP:   p.LocalIP,
-			LocalPort: p.LocalPort,
-			SubDomain: p.SubDomain,
+			Name:           p.Name,
+			Type:           p.Type,
+			LocalIP:        p.LocalIP,
+			LocalPort:      p.LocalPort,
+			SubDomain:      p.SubDomain,
+			UseEncryption:  p.UseEncryption,
+			UseCompression: p.UseCompression,
+			BandwidthLimit: p.BandwidthLimit,
+			PoolCount:      p.PoolCount,
+			Metadatas:      p.Metadatas,
+			Annotations:    p.Annotations,
 		}
 		// http/https proxies use customDomains instead of remotePort. The
 		// default domain is <name>.local; frps matches it by Host header.
--- a/internal/render/render_test.go
+++ b/internal/render/render_test.go
@ -46,3 +46,58 @@ func TestRenderDuplicateServiceGetsPortSuffix(t *testing.T) {
 		t.Fatalf("second proxy name = %q", cfg.Proxies[1].Name)
 	}
 }
+
+func TestRenderTransportAdvanced(t *testing.T) {
+	remote := store.Remote{
+		Name: "srv", IP: "1.2.3.4", Port: 7000, Token: "secret",
+		TransportProtocol: "kcp", TransportTLS: true, TransportPool: 3, TransportTLSServerName: "frps.local",
+	}
+	data, err := Render(remote, []Proxy{
+		{Name: "web", Type: "tcp", LocalIP: "127.0.0.1", LocalPort: 8080, RemotePort: 8080,
+			UseEncryption: true, UseCompression: true, BandwidthLimit: "1MB", PoolCount: 2,
+			Metadatas: map[string]string{"env": "prod"}, Annotations: map[string]string{"owner": "ops"}},
+	})
+	if err != nil {
+		t.Fatal(err)
+	}
+	var cfg Config
+	if err := json.Unmarshal(data, &cfg); err != nil {
+		t.Fatal(err)
+	}
+	if cfg.Transport.Protocol != "kcp" {
+		t.Fatalf("transport.protocol = %q, want kcp", cfg.Transport.Protocol)
+	}
+	if cfg.Transport.TLS == nil || !cfg.Transport.TLS.Enable || cfg.Transport.TLS.ServerName != "frps.local" {
+		t.Fatalf("transport.tls = %+v", cfg.Transport.TLS)
+	}
+	if cfg.Transport.PoolCount != 3 {
+		t.Fatalf("transport.poolCount = %d, want 3", cfg.Transport.PoolCount)
+	}
+	p := cfg.Proxies[0]
+	if !p.UseEncryption || !p.UseCompression || p.BandwidthLimit != "1MB" || p.PoolCount != 2 {
+		t.Fatalf("proxy advanced fields = %+v", p)
+	}
+	if p.Metadatas["env"] != "prod" || p.Annotations["owner"] != "ops" {
+		t.Fatalf("proxy metadatas/annotations = %+v", p)
+	}
+}
+
+func TestRenderTransportOmittedWhenEmpty(t *testing.T) {
+	remote := store.Remote{Name: "srv", IP: "1.2.3.4", Port: 7000}
+	data, err := Render(remote, []Proxy{
+		{Name: "web", Type: "tcp", LocalIP: "127.0.0.1", LocalPort: 8080, RemotePort: 8080},
+	})
+	if err != nil {
+		t.Fatal(err)
+	}
+	var cfg Config
+	if err := json.Unmarshal(data, &cfg); err != nil {
+		t.Fatal(err)
+	}
+	if cfg.Transport.Protocol != "" || cfg.Transport.TLS != nil || cfg.Transport.PoolCount != 0 {
+		t.Fatalf("transport should be empty, got %+v", cfg.Transport)
+	}
+	if cfg.Proxies[0].UseEncryption || cfg.Proxies[0].BandwidthLimit != "" {
+		t.Fatalf("proxy advanced should be empty, got %+v", cfg.Proxies[0])
+	}
+}
--- a/internal/store/store.go
+++ b/internal/store/store.go
@ -8,6 +8,7 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
+	"strings"

 	_ "modernc.org/sqlite"
 )
@ -18,6 +19,14 @@ type Local struct {
 	IP       string `json:"ip"`
 	Port     int    `json:"port"`
 	Protocol string `json:"protocol"` // tcp | udp | http | https
+
+	// Advanced transport knobs (M1). All optional; empty/zero = frpc defaults.
+	UseEncryption  bool              `json:"useEncryption,omitempty"`
+	UseCompression bool              `json:"useCompression,omitempty"`
+	BandwidthLimit string            `json:"bandwidthLimit,omitempty"` // e.g. "1MB", "2KB"
+	PoolCount      int               `json:"poolCount,omitempty"`
+	Metadatas      map[string]string `json:"metadatas,omitempty"`
+	Annotations    map[string]string `json:"annotations,omitempty"`
 }

 // Remote is a remote server node on the canvas.
@ -28,6 +37,12 @@ type Remote struct {
 	Token   string `json:"token,omitempty"`
 	URL     string `json:"url,omitempty"`
 	Enabled bool   `json:"enabled"`
+
+	// Transport section (M1). Protocol: tcp | quic | kcp | websocket.
+	TransportProtocol      string `json:"transportProtocol,omitempty"`
+	TransportTLS           bool   `json:"transportTls,omitempty"`
+	TransportPool          int    `json:"transportPool,omitempty"`
+	TransportTLSServerName string `json:"transportTlsServerName,omitempty"`
 }

 // Link connects one local to one remote.
@ -110,11 +125,65 @@ func New(path string) (*Store, error) {
 		db.Close()
 		return nil, fmt.Errorf("enable fk: %w", err)
 	}
+	st := &Store{db: db}
+	if err := st.migrate(); err != nil {
+		db.Close()
+		return nil, fmt.Errorf("migrate schema: %w", err)
+	}
 	if err := os.Chmod(path, 0o600); err != nil {
 		db.Close()
 		return nil, fmt.Errorf("secure db: %w", err)
 	}
-	return &Store{db: db}, nil
+	return st, nil
+}
+
+// migrate adds columns introduced after the initial schema so old databases
+// keep working (CREATE TABLE IF NOT EXISTS does not touch existing tables).
+func (s *Store) migrate() error {
+	tables := map[string][]string{
+		"locals": {
+			"use_encryption INTEGER NOT NULL DEFAULT 0",
+			"use_compression INTEGER NOT NULL DEFAULT 0",
+			"bandwidth_limit TEXT NOT NULL DEFAULT ''",
+			"pool_count INTEGER NOT NULL DEFAULT 0",
+			"metadatas TEXT NOT NULL DEFAULT ''",
+			"annotations TEXT NOT NULL DEFAULT ''",
+		},
+		"remotes": {
+			"transport_protocol TEXT NOT NULL DEFAULT ''",
+			"transport_tls INTEGER NOT NULL DEFAULT 0",
+			"transport_pool INTEGER NOT NULL DEFAULT 0",
+			"transport_tls_server_name TEXT NOT NULL DEFAULT ''",
+		},
+	}
+	for table, cols := range tables {
+		rows, err := s.db.Query("PRAGMA table_info(" + table + ")")
+		if err != nil {
+			return err
+		}
+		have := map[string]bool{}
+		for rows.Next() {
+			var cid int
+			var name, typ string
+			var notnull, pk int
+			var dflt sql.NullString
+			if err := rows.Scan(&cid, &name, &typ, &notnull, &dflt, &pk); err != nil {
+				rows.Close()
+				return err
+			}
+			have[name] = true
+		}
+		rows.Close()
+		for _, def := range cols {
+			name := def[:strings.Index(def, " ")]
+			if !have[name] {
+				if _, err := s.db.Exec("ALTER TABLE " + table + " ADD COLUMN " + def); err != nil {
+					return fmt.Errorf("migrate %s.%s: %w", table, name, err)
+				}
+			}
+		}
+	}
+	return nil
 }

 func (s *Store) Close() error { return s.db.Close() }
@ -122,7 +191,7 @@ func (s *Store) Close() error { return s.db.Close() }
 // ---- Locals ----

 func (s *Store) ListLocals() ([]Local, error) {
-	rows, err := s.db.Query("SELECT name, ip, port, protocol FROM locals ORDER BY name")
+	rows, err := s.db.Query("SELECT name, ip, port, protocol, use_encryption, use_compression, bandwidth_limit, pool_count, metadatas, annotations FROM locals ORDER BY name")
 	if err != nil {
 		return nil, err
 	}
@ -130,9 +199,15 @@ func (s *Store) ListLocals() ([]Local, error) {
 	var out []Local
 	for rows.Next() {
 		var l Local
-		if err := rows.Scan(&l.Name, &l.IP, &l.Port, &l.Protocol); err != nil {
+		var enc, comp int
+		var metaRaw, annoRaw string
+		if err := rows.Scan(&l.Name, &l.IP, &l.Port, &l.Protocol, &enc, &comp, &l.BandwidthLimit, &l.PoolCount, &metaRaw, &annoRaw); err != nil {
 			return nil, err
 		}
+		l.UseEncryption = enc != 0
+		l.UseCompression = comp != 0
+		l.Metadatas = decodeMap(metaRaw)
+		l.Annotations = decodeMap(annoRaw)
 		out = append(out, l)
 	}
 	return out, rows.Err()
@ -140,22 +215,52 @@ func (s *Store) ListLocals() ([]Local, error) {

 func (s *Store) GetLocal(name string) (Local, bool) {
 	var l Local
-	row := s.db.QueryRow("SELECT name, ip, port, protocol FROM locals WHERE name = ?", name)
-	if err := row.Scan(&l.Name, &l.IP, &l.Port, &l.Protocol); err != nil {
+	var enc, comp int
+	var metaRaw, annoRaw string
+	row := s.db.QueryRow("SELECT name, ip, port, protocol, use_encryption, use_compression, bandwidth_limit, pool_count, metadatas, annotations FROM locals WHERE name = ?", name)
+	if err := row.Scan(&l.Name, &l.IP, &l.Port, &l.Protocol, &enc, &comp, &l.BandwidthLimit, &l.PoolCount, &metaRaw, &annoRaw); err != nil {
 		return Local{}, false
 	}
+	l.UseEncryption = enc != 0
+	l.UseCompression = comp != 0
+	l.Metadatas = decodeMap(metaRaw)
+	l.Annotations = decodeMap(annoRaw)
 	return l, true
 }

 func (s *Store) UpsertLocal(l Local) error {
 	_, err := s.db.Exec(
-		"INSERT INTO locals(name, ip, port, protocol) VALUES(?,?,?,?) "+
-			"ON CONFLICT(name) DO UPDATE SET ip=excluded.ip, port=excluded.port, protocol=excluded.protocol",
-		l.Name, l.IP, l.Port, l.Protocol,
+		"INSERT INTO locals(name, ip, port, protocol, use_encryption, use_compression, bandwidth_limit, pool_count, metadatas, annotations) VALUES(?,?,?,?,?,?,?,?,?,?) "+
+			"ON CONFLICT(name) DO UPDATE SET ip=excluded.ip, port=excluded.port, protocol=excluded.protocol, use_encryption=excluded.use_encryption, use_compression=excluded.use_compression, bandwidth_limit=excluded.bandwidth_limit, pool_count=excluded.pool_count, metadatas=excluded.metadatas, annotations=excluded.annotations",
+		l.Name, l.IP, l.Port, l.Protocol, boolToInt(l.UseEncryption), boolToInt(l.UseCompression), l.BandwidthLimit, l.PoolCount, encodeMap(l.Metadatas), encodeMap(l.Annotations),
 	)
 	return err
 }

+// encodeMap serializes an optional JSON map so nil stays an empty string.
+func encodeMap(m map[string]string) string {
+	if len(m) == 0 {
+		return ""
+	}
+	b, err := json.Marshal(m)
+	if err != nil {
+		return ""
+	}
+	return string(b)
+}
+
+// decodeMap reads a JSON map column; empty/invalid becomes nil.
+func decodeMap(raw string) map[string]string {
+	if raw == "" {
+		return nil
+	}
+	var m map[string]string
+	if err := json.Unmarshal([]byte(raw), &m); err != nil {
+		return nil
+	}
+	return m
+}
+
 func (s *Store) DeleteLocal(name string) error {
 	_, err := s.db.Exec("DELETE FROM locals WHERE name = ?", name)
 	return err
@ -164,7 +269,7 @@ func (s *Store) DeleteLocal(name string) error {
 // ---- Remotes ----

 func (s *Store) ListRemotes() ([]Remote, error) {
-	rows, err := s.db.Query("SELECT name, ip, port, token, url, enabled FROM remotes ORDER BY name")
+	rows, err := s.db.Query("SELECT name, ip, port, token, url, enabled, transport_protocol, transport_tls, transport_pool, transport_tls_server_name FROM remotes ORDER BY name")
 	if err != nil {
 		return nil, err
 	}
@ -172,11 +277,12 @@ func (s *Store) ListRemotes() ([]Remote, error) {
 	var out []Remote
 	for rows.Next() {
 		var r Remote
-		var en int
-		if err := rows.Scan(&r.Name, &r.IP, &r.Port, &r.Token, &r.URL, &en); err != nil {
+		var en, tls int
+		if err := rows.Scan(&r.Name, &r.IP, &r.Port, &r.Token, &r.URL, &en, &r.TransportProtocol, &tls, &r.TransportPool, &r.TransportTLSServerName); err != nil {
 			return nil, err
 		}
 		r.Enabled = en != 0
+		r.TransportTLS = tls != 0
 		out = append(out, r)
 	}
 	return out, rows.Err()
@ -184,20 +290,21 @@ func (s *Store) ListRemotes() ([]Remote, error) {

 func (s *Store) GetRemote(name string) (Remote, bool) {
 	var r Remote
-	var en int
-	row := s.db.QueryRow("SELECT name, ip, port, token, url, enabled FROM remotes WHERE name = ?", name)
-	if err := row.Scan(&r.Name, &r.IP, &r.Port, &r.Token, &r.URL, &en); err != nil {
+	var en, tls int
+	row := s.db.QueryRow("SELECT name, ip, port, token, url, enabled, transport_protocol, transport_tls, transport_pool, transport_tls_server_name FROM remotes WHERE name = ?", name)
+	if err := row.Scan(&r.Name, &r.IP, &r.Port, &r.Token, &r.URL, &en, &r.TransportProtocol, &tls, &r.TransportPool, &r.TransportTLSServerName); err != nil {
 		return Remote{}, false
 	}
 	r.Enabled = en != 0
+	r.TransportTLS = tls != 0
 	return r, true
 }

 func (s *Store) UpsertRemote(r Remote) error {
 	_, err := s.db.Exec(
-		"INSERT INTO remotes(name, ip, port, token, url, enabled) VALUES(?,?,?,?,?,?) "+
-			"ON CONFLICT(name) DO UPDATE SET ip=excluded.ip, port=excluded.port, token=excluded.token, url=excluded.url, enabled=excluded.enabled",
-		r.Name, r.IP, r.Port, r.Token, r.URL, boolToInt(r.Enabled),
+		"INSERT INTO remotes(name, ip, port, token, url, enabled, transport_protocol, transport_tls, transport_pool, transport_tls_server_name) VALUES(?,?,?,?,?,?,?,?,?,?) "+
+			"ON CONFLICT(name) DO UPDATE SET ip=excluded.ip, port=excluded.port, token=excluded.token, url=excluded.url, enabled=excluded.enabled, transport_protocol=excluded.transport_protocol, transport_tls=excluded.transport_tls, transport_pool=excluded.transport_pool, transport_tls_server_name=excluded.transport_tls_server_name",
+		r.Name, r.IP, r.Port, r.Token, r.URL, boolToInt(r.Enabled), r.TransportProtocol, boolToInt(r.TransportTLS), r.TransportPool, r.TransportTLSServerName,
 	)
 	return err
 }