拆分服务器地址配置为独立字段,支持CDN优选IP故障切换,新增重置数据库按钮
- model: ServerURL → Protocol/Host/ServerIPs/Port/Path 五个字段 - db: 自动迁移旧 server_url 列到新表结构 - ui: 配置窗口改为横向分组布局,保存失败时不再关闭窗口 - transport: 支持 TLS SNI + Host 头覆盖以连接 CDN 边缘节点 - session: CDN IP 列表连接失败自动切换到下一个 - 新增重置数据库按钮,一键清空所有配置
This commit is contained in:
+62
-2
@@ -2,7 +2,11 @@
|
||||
// exchanged between application layers.
|
||||
package model
|
||||
|
||||
import "time"
|
||||
import (
|
||||
"fmt"
|
||||
"strings"
|
||||
"time"
|
||||
)
|
||||
|
||||
// AuthMode selects how the client authenticates to a server.
|
||||
type AuthMode string
|
||||
@@ -26,7 +30,11 @@ const (
|
||||
type ServerProfile struct {
|
||||
ID int64 `json:"id"`
|
||||
Name string `json:"name"`
|
||||
ServerURL string `json:"server_url"` // e.g. wss://vpn.example.com/ws
|
||||
Protocol string `json:"protocol"` // "wss" (default) or "ws"
|
||||
Host string `json:"host"` // hostname for SNI, e.g. vpn.example.com
|
||||
ServerIPs string `json:"server_ips"` // comma-separated CDN IPs, first used by default
|
||||
Port int `json:"port"` // default 443
|
||||
Path string `json:"path"` // default "/ws"
|
||||
Username string `json:"username"`
|
||||
AuthMode AuthMode `json:"auth_mode"`
|
||||
RoutingMode RoutingMode `json:"routing_mode"`
|
||||
@@ -37,6 +45,58 @@ type ServerProfile struct {
|
||||
LastConnectedAt *time.Time `json:"last_connected_at"`
|
||||
}
|
||||
|
||||
// BuildServerURL constructs the WebSocket URL from the profile fields.
|
||||
// If ip is provided, it is used as the host portion instead of Host
|
||||
// (for CDN edge IP connections).
|
||||
// Default ports are omitted from the URL (443 for wss, 80 for ws).
|
||||
func (p *ServerProfile) BuildServerURL(ip ...string) string {
|
||||
protocol := p.Protocol
|
||||
if protocol == "" {
|
||||
protocol = "wss"
|
||||
}
|
||||
|
||||
host := p.Host
|
||||
if len(ip) > 0 && ip[0] != "" {
|
||||
host = ip[0]
|
||||
}
|
||||
|
||||
port := p.Port
|
||||
if port == 0 {
|
||||
port = 443
|
||||
}
|
||||
|
||||
path := p.Path
|
||||
if path == "" {
|
||||
path = "/ws"
|
||||
}
|
||||
if !strings.HasPrefix(path, "/") {
|
||||
path = "/" + path
|
||||
}
|
||||
|
||||
isDefaultPort := (protocol == "wss" && port == 443) || (protocol == "ws" && port == 80)
|
||||
|
||||
if isDefaultPort {
|
||||
return fmt.Sprintf("%s://%s%s", protocol, host, path)
|
||||
}
|
||||
return fmt.Sprintf("%s://%s:%d%s", protocol, host, port, path)
|
||||
}
|
||||
|
||||
// GetServerIPList parses ServerIPs into a string slice.
|
||||
func (p *ServerProfile) GetServerIPList() []string {
|
||||
if p.ServerIPs == "" {
|
||||
return nil
|
||||
}
|
||||
parts := strings.Split(p.ServerIPs, ",")
|
||||
var out []string
|
||||
for _, part := range parts {
|
||||
s := strings.TrimSpace(part)
|
||||
if s != "" {
|
||||
out = append(out, s)
|
||||
}
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
// ConnectionStatus records the outcome of a connection attempt.
|
||||
type ConnectionStatus string
|
||||
|
||||
|
||||
Reference in New Issue
Block a user