feat(api): migrate server and node data handling, update related structures and logic
This commit is contained in:
Chang lue Tsen
+55
-53
@@ -1,26 +1,25 @@
|
||||
package adapter
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"strings"
|
||||
|
||||
"github.com/perfect-panel/server/internal/model/server"
|
||||
"github.com/perfect-panel/server/internal/model/node"
|
||||
"github.com/perfect-panel/server/pkg/logger"
|
||||
"github.com/perfect-panel/server/pkg/random"
|
||||
)
|
||||
|
||||
type Adapter struct {
|
||||
SiteName string // 站点名称
|
||||
Servers []*server.Server // 服务器列表
|
||||
UserInfo User // 用户信息
|
||||
ClientTemplate string // 客户端配置模板
|
||||
OutputFormat string // 输出格式，默认是 base64
|
||||
SubscribeName string // 订阅名称
|
||||
SiteName string // 站点名称
|
||||
Servers []*node.Node // 服务器列表
|
||||
UserInfo User // 用户信息
|
||||
ClientTemplate string // 客户端配置模板
|
||||
OutputFormat string // 输出格式，默认是 base64
|
||||
SubscribeName string // 订阅名称
|
||||
}
|
||||
|
||||
type Option func(*Adapter)
|
||||
|
||||
// WithServers 设置服务器列表
|
||||
func WithServers(servers []*server.Server) Option {
|
||||
func WithServers(servers []*node.Node) Option {
|
||||
return func(opts *Adapter) {
|
||||
opts.Servers = servers
|
||||
}
|
||||
@@ -56,7 +55,7 @@ func WithSubscribeName(name string) Option {
|
||||
|
||||
func NewAdapter(tpl string, opts ...Option) *Adapter {
|
||||
adapter := &Adapter{
|
||||
Servers: []*server.Server{},
|
||||
Servers: []*node.Node{},
|
||||
UserInfo: User{},
|
||||
ClientTemplate: tpl,
|
||||
OutputFormat: "base64", // 默认输出格式
|
||||
@@ -87,51 +86,54 @@ func (adapter *Adapter) Client() (*Client, error) {
|
||||
return client, nil
|
||||
}
|
||||
|
||||
func (adapter *Adapter) Proxies(servers []*server.Server) ([]Proxy, error) {
|
||||
func (adapter *Adapter) Proxies(servers []*node.Node) ([]Proxy, error) {
|
||||
var proxies []Proxy
|
||||
for _, srv := range servers {
|
||||
switch srv.RelayMode {
|
||||
case server.RelayModeAll:
|
||||
var relays []server.NodeRelay
|
||||
if err := json.Unmarshal([]byte(srv.RelayNode), &relays); err != nil {
|
||||
logger.Errorw("Unmarshal RelayNode", logger.Field("error", err.Error()), logger.Field("node", srv.Name), logger.Field("relayNode", srv.RelayNode))
|
||||
continue
|
||||
}
|
||||
for _, relay := range relays {
|
||||
proxy, err := adapterProxy(*srv, relay.Host, uint64(relay.Port))
|
||||
if err != nil {
|
||||
logger.Errorw("Adapter Proxy", logger.Field("error", err.Error()), logger.Field("node", srv.Name), logger.Field("relayNode", relay))
|
||||
continue
|
||||
}
|
||||
proxies = append(proxies, proxy)
|
||||
}
|
||||
|
||||
case server.RelayModeRandom:
|
||||
var relays []server.NodeRelay
|
||||
if err := json.Unmarshal([]byte(srv.RelayNode), &relays); err != nil {
|
||||
logger.Errorw("Unmarshal RelayNode", logger.Field("error", err.Error()), logger.Field("node", srv.Name), logger.Field("relayNode", srv.RelayNode))
|
||||
continue
|
||||
}
|
||||
randNum := random.RandomInRange(0, len(relays)-1)
|
||||
relay := relays[randNum]
|
||||
proxy, err := adapterProxy(*srv, relay.Host, uint64(relay.Port))
|
||||
if err != nil {
|
||||
logger.Errorw("Adapter Proxy", logger.Field("error", err.Error()), logger.Field("node", srv.Name), logger.Field("relayNode", relay))
|
||||
continue
|
||||
}
|
||||
proxies = append(proxies, proxy)
|
||||
|
||||
case server.RelayModeNone:
|
||||
proxy, err := adapterProxy(*srv, srv.ServerAddr, 0)
|
||||
if err != nil {
|
||||
logger.Errorw("Adapter Proxy", logger.Field("error", err.Error()), logger.Field("node", srv.Name), logger.Field("serverAddr", srv.ServerAddr))
|
||||
continue
|
||||
}
|
||||
proxies = append(proxies, proxy)
|
||||
default:
|
||||
logger.Errorw("Unknown RelayMode", logger.Field("node", srv.Name), logger.Field("relayMode", srv.RelayMode))
|
||||
for _, item := range servers {
|
||||
if item.Server == nil {
|
||||
logger.Errorf("[Adapter] Server is nil for node ID: %d", item.Id)
|
||||
continue
|
||||
}
|
||||
protocols, err := item.Server.UnmarshalProtocols()
|
||||
if err != nil {
|
||||
logger.Errorf("[Adapter] Unmarshal Protocols error: %s; server id : %d", err.Error(), item.ServerId)
|
||||
continue
|
||||
}
|
||||
for _, protocol := range protocols {
|
||||
if protocol.Type == item.Protocol {
|
||||
proxies = append(proxies, Proxy{
|
||||
Name: item.Name,
|
||||
Server: item.Address,
|
||||
Port: item.Port,
|
||||
Type: item.Protocol,
|
||||
Tags: strings.Split(item.Tags, ","),
|
||||
Security: protocol.Security,
|
||||
SNI: protocol.SNI,
|
||||
AllowInsecure: protocol.AllowInsecure,
|
||||
Fingerprint: protocol.Fingerprint,
|
||||
RealityServerAddr: protocol.RealityServerAddr,
|
||||
RealityServerPort: protocol.RealityServerPort,
|
||||
RealityPrivateKey: protocol.RealityPrivateKey,
|
||||
RealityPublicKey: protocol.RealityPublicKey,
|
||||
RealityShortId: protocol.RealityShortId,
|
||||
Transport: protocol.Transport,
|
||||
Host: protocol.Host,
|
||||
Path: protocol.Path,
|
||||
ServiceName: protocol.ServiceName,
|
||||
Method: protocol.Cipher,
|
||||
ServerKey: protocol.ServerKey,
|
||||
Flow: protocol.Flow,
|
||||
HopPorts: protocol.HopPorts,
|
||||
HopInterval: protocol.HopInterval,
|
||||
ObfsPassword: protocol.ObfsPassword,
|
||||
DisableSNI: protocol.DisableSNI,
|
||||
ReduceRtt: protocol.ReduceRtt,
|
||||
UDPRelayMode: protocol.UDPRelayMode,
|
||||
CongestionController: protocol.CongestionController,
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
return proxies, nil
|
||||
}
|
||||
|
||||
+1
-1
@@ -13,7 +13,7 @@ import (
|
||||
type Proxy struct {
|
||||
Name string
|
||||
Server string
|
||||
Port uint64
|
||||
Port uint16
|
||||
Type string
|
||||
Tags []string
|
||||
|
||||
|
||||
@@ -1,113 +1 @@
|
||||
package adapter
|
||||
|
||||
import (
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"strings"
|
||||
|
||||
"github.com/perfect-panel/server/internal/model/server"
|
||||
"github.com/perfect-panel/server/pkg/tool"
|
||||
)
|
||||
|
||||
func adapterProxy(svr server.Server, host string, port uint64) (Proxy, error) {
|
||||
tags := strings.Split(svr.Tags, ",")
|
||||
if len(tags) > 0 {
|
||||
tags = tool.RemoveDuplicateElements(tags...)
|
||||
}
|
||||
node := Proxy{
|
||||
Name: svr.Name,
|
||||
Host: host,
|
||||
Port: port,
|
||||
Type: svr.Protocol,
|
||||
Tags: tags,
|
||||
}
|
||||
switch svr.Protocol {
|
||||
case "shadowsocks":
|
||||
var ss server.Shadowsocks
|
||||
if err := json.Unmarshal([]byte(svr.Config), &ss); err != nil {
|
||||
return node, fmt.Errorf("unmarshal shadowsocks config: %v", err.Error())
|
||||
}
|
||||
if port == 0 {
|
||||
node.Port = uint64(ss.Port)
|
||||
}
|
||||
node.Method = ss.Method
|
||||
node.ServerKey = ss.ServerKey
|
||||
case "vless":
|
||||
var vless server.Vless
|
||||
if err := json.Unmarshal([]byte(svr.Config), &vless); err != nil {
|
||||
return node, fmt.Errorf("unmarshal vless config: %v", err.Error())
|
||||
}
|
||||
if port == 0 {
|
||||
node.Port = uint64(vless.Port)
|
||||
}
|
||||
node.Flow = vless.Flow
|
||||
node.Transport = vless.Transport
|
||||
tool.DeepCopy(&node, vless.TransportConfig)
|
||||
node.Security = vless.Security
|
||||
tool.DeepCopy(&node, vless.SecurityConfig)
|
||||
case "vmess":
|
||||
var vmess server.Vmess
|
||||
if err := json.Unmarshal([]byte(svr.Config), &vmess); err != nil {
|
||||
return node, fmt.Errorf("unmarshal vmess config: %v", err.Error())
|
||||
}
|
||||
if port == 0 {
|
||||
node.Port = uint64(vmess.Port)
|
||||
}
|
||||
node.Flow = vmess.Flow
|
||||
node.Transport = vmess.Transport
|
||||
tool.DeepCopy(&node, vmess.TransportConfig)
|
||||
node.Security = vmess.Security
|
||||
tool.DeepCopy(&node, vmess.SecurityConfig)
|
||||
case "trojan":
|
||||
var trojan server.Trojan
|
||||
if err := json.Unmarshal([]byte(svr.Config), &trojan); err != nil {
|
||||
return node, fmt.Errorf("unmarshal trojan config: %v", err.Error())
|
||||
}
|
||||
if port == 0 {
|
||||
node.Port = uint64(trojan.Port)
|
||||
|
||||
}
|
||||
|
||||
node.Flow = trojan.Flow
|
||||
node.Transport = trojan.Transport
|
||||
tool.DeepCopy(&node, trojan.TransportConfig)
|
||||
node.Security = trojan.Security
|
||||
tool.DeepCopy(&node, trojan.SecurityConfig)
|
||||
case "hysteria2":
|
||||
var hysteria2 server.Hysteria2
|
||||
if err := json.Unmarshal([]byte(svr.Config), &hysteria2); err != nil {
|
||||
return node, fmt.Errorf("unmarshal hysteria2 config: %v", err.Error())
|
||||
}
|
||||
if port == 0 {
|
||||
node.Port = uint64(hysteria2.Port)
|
||||
}
|
||||
node.HopPorts = hysteria2.HopPorts
|
||||
node.HopInterval = hysteria2.HopInterval
|
||||
node.ObfsPassword = hysteria2.ObfsPassword
|
||||
tool.DeepCopy(&node, hysteria2.SecurityConfig)
|
||||
case "tuic":
|
||||
var tuic server.Tuic
|
||||
if err := json.Unmarshal([]byte(svr.Config), &tuic); err != nil {
|
||||
return node, fmt.Errorf("unmarshal tuic config: %v", err.Error())
|
||||
}
|
||||
if port == 0 {
|
||||
node.Port = uint64(tuic.Port)
|
||||
}
|
||||
node.DisableSNI = tuic.DisableSNI
|
||||
node.ReduceRtt = tuic.ReduceRtt
|
||||
node.UDPRelayMode = tuic.UDPRelayMode
|
||||
node.CongestionController = tuic.CongestionController
|
||||
case "anytls":
|
||||
var anytls server.AnyTLS
|
||||
if err := json.Unmarshal([]byte(svr.Config), &anytls); err != nil {
|
||||
return node, fmt.Errorf("unmarshal anytls config: %v", err.Error())
|
||||
}
|
||||
if port == 0 {
|
||||
node.Port = uint64(anytls.Port)
|
||||
}
|
||||
tool.DeepCopy(&node, anytls.SecurityConfig)
|
||||
default:
|
||||
return node, fmt.Errorf("unsupported protocol: %s", svr.Protocol)
|
||||
}
|
||||
return node, nil
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user