refactor: 更新项目引用路径从perfect-panel/ppanel-server到perfect-panel/server
Build docker and publish / build (20.15.1) (push) Failing after 6m27s
Build docker and publish / build (20.15.1) (push) Failing after 6m27s
feat: 添加版本和构建时间变量 fix: 修正短信队列类型注释错误 style: 清理未使用的代码和测试文件 docs: 更新安装文档中的下载链接 chore: 迁移数据库脚本添加日志和订阅配置
This commit is contained in:
@@ -0,0 +1,140 @@
|
||||
package adapter
|
||||
|
||||
import (
|
||||
"strings"
|
||||
|
||||
"github.com/perfect-panel/server/internal/model/node"
|
||||
"github.com/perfect-panel/server/pkg/logger"
|
||||
)
|
||||
|
||||
type Adapter struct {
|
||||
SiteName string // 站点名称
|
||||
Servers []*node.Node // 服务器列表
|
||||
UserInfo User // 用户信息
|
||||
ClientTemplate string // 客户端配置模板
|
||||
OutputFormat string // 输出格式,默认是 base64
|
||||
SubscribeName string // 订阅名称
|
||||
}
|
||||
|
||||
type Option func(*Adapter)
|
||||
|
||||
// WithServers 设置服务器列表
|
||||
func WithServers(servers []*node.Node) Option {
|
||||
return func(opts *Adapter) {
|
||||
opts.Servers = servers
|
||||
}
|
||||
}
|
||||
|
||||
// WithUserInfo 设置用户信息
|
||||
func WithUserInfo(user User) Option {
|
||||
return func(opts *Adapter) {
|
||||
opts.UserInfo = user
|
||||
}
|
||||
}
|
||||
|
||||
// WithOutputFormat 设置输出格式
|
||||
func WithOutputFormat(format string) Option {
|
||||
return func(opts *Adapter) {
|
||||
opts.OutputFormat = format
|
||||
}
|
||||
}
|
||||
|
||||
// WithSiteName 设置站点名称
|
||||
func WithSiteName(name string) Option {
|
||||
return func(opts *Adapter) {
|
||||
opts.SiteName = name
|
||||
}
|
||||
}
|
||||
|
||||
// WithSubscribeName 设置订阅名称
|
||||
func WithSubscribeName(name string) Option {
|
||||
return func(opts *Adapter) {
|
||||
opts.SubscribeName = name
|
||||
}
|
||||
}
|
||||
|
||||
func NewAdapter(tpl string, opts ...Option) *Adapter {
|
||||
adapter := &Adapter{
|
||||
Servers: []*node.Node{},
|
||||
UserInfo: User{},
|
||||
ClientTemplate: tpl,
|
||||
OutputFormat: "base64", // 默认输出格式
|
||||
}
|
||||
|
||||
for _, opt := range opts {
|
||||
opt(adapter)
|
||||
}
|
||||
|
||||
return adapter
|
||||
}
|
||||
|
||||
func (adapter *Adapter) Client() (*Client, error) {
|
||||
client := &Client{
|
||||
SiteName: adapter.SiteName,
|
||||
SubscribeName: adapter.SubscribeName,
|
||||
ClientTemplate: adapter.ClientTemplate,
|
||||
OutputFormat: adapter.OutputFormat,
|
||||
Proxies: []Proxy{},
|
||||
UserInfo: adapter.UserInfo,
|
||||
}
|
||||
|
||||
proxies, err := adapter.Proxies(adapter.Servers)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
client.Proxies = proxies
|
||||
return client, nil
|
||||
}
|
||||
|
||||
func (adapter *Adapter) Proxies(servers []*node.Node) ([]Proxy, error) {
|
||||
var proxies []Proxy
|
||||
|
||||
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{
|
||||
Sort: item.Sort,
|
||||
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
|
||||
}
|
||||
@@ -0,0 +1,34 @@
|
||||
package adapter
|
||||
|
||||
import (
|
||||
"testing"
|
||||
"time"
|
||||
)
|
||||
|
||||
func TestAdapter_Client(t *testing.T) {
|
||||
servers := getServers()
|
||||
if len(servers) == 0 {
|
||||
t.Errorf("[Test] No servers found")
|
||||
return
|
||||
}
|
||||
a := NewAdapter(tpl, WithServers(servers), WithUserInfo(User{
|
||||
Password: "test-password",
|
||||
ExpiredAt: time.Now().AddDate(1, 0, 0),
|
||||
Download: 0,
|
||||
Upload: 0,
|
||||
Traffic: 1000,
|
||||
SubscribeURL: "https://example.com/subscribe",
|
||||
}))
|
||||
client, err := a.Client()
|
||||
if err != nil {
|
||||
t.Errorf("[Test] Failed to get client: %v", err.Error())
|
||||
return
|
||||
}
|
||||
bytes, err := client.Build()
|
||||
if err != nil {
|
||||
t.Errorf("[Test] Failed to build client config: %v", err.Error())
|
||||
return
|
||||
}
|
||||
t.Logf("[Test] Client config built successfully: %s", string(bytes))
|
||||
|
||||
}
|
||||
@@ -0,0 +1,146 @@
|
||||
package adapter
|
||||
|
||||
import (
|
||||
"bytes"
|
||||
"encoding/base64"
|
||||
"reflect"
|
||||
"text/template"
|
||||
"time"
|
||||
|
||||
"github.com/Masterminds/sprig/v3"
|
||||
)
|
||||
|
||||
type Proxy struct {
|
||||
Sort int
|
||||
Name string
|
||||
Server string
|
||||
Port uint16
|
||||
Type string
|
||||
Tags []string
|
||||
|
||||
// Security Options
|
||||
Security string
|
||||
SNI string // Server Name Indication for TLS
|
||||
AllowInsecure bool // Allow insecure connections (skip certificate verification)
|
||||
Fingerprint string // Client fingerprint for TLS connections
|
||||
RealityServerAddr string // Reality server address
|
||||
RealityServerPort int // Reality server port
|
||||
RealityPrivateKey string // Reality private key for authentication
|
||||
RealityPublicKey string // Reality public key for authentication
|
||||
RealityShortId string // Reality short ID for authentication
|
||||
// Transport Options
|
||||
Transport string // Transport protocol (e.g., ws, http, grpc)
|
||||
Host string // For WebSocket/HTTP/HTTPS
|
||||
Path string // For HTTP/HTTPS
|
||||
ServiceName string // For gRPC
|
||||
// Shadowsocks Options
|
||||
Method string
|
||||
ServerKey string // For Shadowsocks 2022
|
||||
|
||||
// Vmess/Vless/Trojan Options
|
||||
Flow string // Flow for Vmess/Vless/Trojan
|
||||
// Hysteria2 Options
|
||||
HopPorts string // Comma-separated list of hop ports
|
||||
HopInterval int // Interval for hop ports in seconds
|
||||
ObfsPassword string // Obfuscation password for Hysteria2
|
||||
UpMbps int // Upload speed in Mbps
|
||||
DownMbps int // Download speed in Mbps
|
||||
|
||||
// Tuic Options
|
||||
DisableSNI bool // Disable SNI
|
||||
ReduceRtt bool // Reduce RTT
|
||||
UDPRelayMode string // UDP relay mode (e.g., "full", "partial")
|
||||
CongestionController string // Congestion controller (e.g., "cubic", "bbr")
|
||||
|
||||
// AnyTLS
|
||||
PaddingScheme string
|
||||
|
||||
// Mieru
|
||||
Multiplex string
|
||||
|
||||
// Obfs
|
||||
//Obfs string // obfs, 'none', 'http', 'tls'
|
||||
//ObfsHost string // obfs host
|
||||
//ObfsPath string // obfs path
|
||||
|
||||
// Vless
|
||||
XhttpMode string // xhttp mode
|
||||
XhttpExtra string // xhttp path
|
||||
|
||||
// encryption
|
||||
Encryption string // encryption,'none', 'mlkem768x25519plus'
|
||||
EncryptionMode string // encryption mode,'native', 'xorpub', 'random'
|
||||
EncryptionRtt string // encryption rtt,'0rtt', '1rtt'
|
||||
EncryptionTicket string // encryption ticket
|
||||
EncryptionServerPadding string // encryption server padding
|
||||
EncryptionPrivateKey string // encryption private key
|
||||
EncryptionClientPadding string // encryption client padding
|
||||
EncryptionPassword string // encryption password
|
||||
|
||||
Ratio float64 // Traffic ratio, default is 1
|
||||
CertMode string // Certificate mode, `none`|`http`|`dns`|`self`
|
||||
CertDNSProvider string // DNS provider for certificate
|
||||
CertDNSEnv string // Environment for DNS provider
|
||||
}
|
||||
|
||||
type User struct {
|
||||
Password string
|
||||
ExpiredAt time.Time
|
||||
Download int64
|
||||
Upload int64
|
||||
Traffic int64
|
||||
SubscribeURL string
|
||||
}
|
||||
|
||||
type Client struct {
|
||||
SiteName string // Name of the site
|
||||
SubscribeName string // Name of the subscription
|
||||
ClientTemplate string // Template for the entire client configuration
|
||||
OutputFormat string // json, yaml, etc.
|
||||
Proxies []Proxy // List of proxy configurations
|
||||
UserInfo User // User information
|
||||
}
|
||||
|
||||
func (c *Client) Build() ([]byte, error) {
|
||||
var buf bytes.Buffer
|
||||
tmpl, err := template.New("client").Funcs(sprig.TxtFuncMap()).Parse(c.ClientTemplate)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
proxies := make([]map[string]interface{}, len(c.Proxies))
|
||||
for i, p := range c.Proxies {
|
||||
proxies[i] = StructToMap(p)
|
||||
}
|
||||
|
||||
err = tmpl.Execute(&buf, map[string]interface{}{
|
||||
"SiteName": c.SiteName,
|
||||
"SubscribeName": c.SubscribeName,
|
||||
"OutputFormat": c.OutputFormat,
|
||||
"Proxies": proxies,
|
||||
"UserInfo": c.UserInfo,
|
||||
})
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
result := buf.String()
|
||||
if c.OutputFormat == "base64" {
|
||||
encoded := base64.StdEncoding.EncodeToString([]byte(result))
|
||||
return []byte(encoded), nil
|
||||
}
|
||||
|
||||
return buf.Bytes(), nil
|
||||
}
|
||||
|
||||
func StructToMap(obj interface{}) map[string]interface{} {
|
||||
m := make(map[string]interface{})
|
||||
v := reflect.ValueOf(obj)
|
||||
t := reflect.TypeOf(obj)
|
||||
|
||||
for i := 0; i < v.NumField(); i++ {
|
||||
field := t.Field(i)
|
||||
m[field.Name] = v.Field(i).Interface()
|
||||
}
|
||||
return m
|
||||
}
|
||||
@@ -0,0 +1,153 @@
|
||||
package adapter
|
||||
|
||||
import (
|
||||
"testing"
|
||||
"time"
|
||||
)
|
||||
|
||||
var tpl = `
|
||||
{{- range $n := .Proxies }}
|
||||
{{- $dn := urlquery (default "node" $n.Name) -}}
|
||||
{{- $sni := default $n.Host $n.SNI -}}
|
||||
|
||||
{{- if eq $n.Type "shadowsocks" -}}
|
||||
{{- $userinfo := b64enc (print $n.Method ":" $.UserInfo.Password) -}}
|
||||
{{- printf "ss://%s@%s:%v#%s" $userinfo $n.Host $n.Port $dn -}}
|
||||
{{- "\n" -}}
|
||||
{{- end -}}
|
||||
|
||||
{{- if eq $n.Type "trojan" -}}
|
||||
{{- $qs := "security=tls" -}}
|
||||
{{- if $sni }}{{ $qs = printf "%s&sni=%s" $qs (urlquery $sni) }}{{ end -}}
|
||||
{{- if $n.AllowInsecure }}{{ $qs = printf "%s&allowInsecure=%v" $qs $n.AllowInsecure }}{{ end -}}
|
||||
{{- if $n.Fingerprint }}{{ $qs = printf "%s&fp=%s" $qs (urlquery $n.Fingerprint) }}{{ end -}}
|
||||
{{- printf "trojan://%s@%s:%v?%s#%s" $.UserInfo.Password $n.Host $n.Port $qs $dn -}}
|
||||
{{- "\n" -}}
|
||||
{{- end -}}
|
||||
|
||||
{{- if eq $n.Type "vless" -}}
|
||||
{{- $qs := "encryption=none" -}}
|
||||
{{- if $n.RealityPublicKey -}}
|
||||
{{- $qs = printf "%s&security=reality" $qs -}}
|
||||
{{- $qs = printf "%s&pbk=%s" $qs (urlquery $n.RealityPublicKey) -}}
|
||||
{{- if $n.RealityShortId }}{{ $qs = printf "%s&sid=%s" $qs (urlquery $n.RealityShortId) }}{{ end -}}
|
||||
{{- else -}}
|
||||
{{- if or $n.SNI $n.Fingerprint $n.AllowInsecure }}
|
||||
{{- $qs = printf "%s&security=tls" $qs -}}
|
||||
{{- end -}}
|
||||
{{- end -}}
|
||||
{{- if $n.SNI }}{{ $qs = printf "%s&sni=%s" $qs (urlquery $n.SNI) }}{{ end -}}
|
||||
{{- if $n.AllowInsecure }}{{ $qs = printf "%s&allowInsecure=%v" $qs $n.AllowInsecure }}{{ end -}}
|
||||
{{- if $n.Fingerprint }}{{ $qs = printf "%s&fp=%s" $qs (urlquery $n.Fingerprint) }}{{ end -}}
|
||||
{{- if $n.Network }}{{ $qs = printf "%s&type=%s" $qs $n.Network }}{{ end -}}
|
||||
{{- if $n.Path }}{{ $qs = printf "%s&path=%s" $qs (urlquery $n.Path) }}{{ end -}}
|
||||
{{- if $n.ServiceName }}{{ $qs = printf "%s&serviceName=%s" $qs (urlquery $n.ServiceName) }}{{ end -}}
|
||||
{{- if $n.Flow }}{{ $qs = printf "%s&flow=%s" $qs (urlquery $n.Flow) }}{{ end -}}
|
||||
{{- printf "vless://%s@%s:%v?%s#%s" $n.ServerKey $n.Host $n.Port $qs $dn -}}
|
||||
{{- "\n" -}}
|
||||
{{- end -}}
|
||||
|
||||
{{- if eq $n.Type "vmess" -}}
|
||||
{{- $obj := dict
|
||||
"v" "2"
|
||||
"ps" $n.Name
|
||||
"add" $n.Host
|
||||
"port" $n.Port
|
||||
"id" $n.ServerKey
|
||||
"aid" 0
|
||||
"net" (or $n.Network "tcp")
|
||||
"type" "none"
|
||||
"path" (or $n.Path "")
|
||||
"host" $n.Host
|
||||
-}}
|
||||
{{- if or $n.SNI $n.Fingerprint $n.AllowInsecure }}{{ set $obj "tls" "tls" }}{{ end -}}
|
||||
{{- if $n.SNI }}{{ set $obj "sni" $n.SNI }}{{ end -}}
|
||||
{{- if $n.Fingerprint }}{{ set $obj "fp" $n.Fingerprint }}{{ end -}}
|
||||
{{- printf "vmess://%s" (b64enc (toJson $obj)) -}}
|
||||
{{- "\n" -}}
|
||||
{{- end -}}
|
||||
|
||||
{{- if or (eq $n.Type "hysteria2") (eq $n.Type "hy2") -}}
|
||||
{{- $qs := "" -}}
|
||||
{{- if $n.SNI }}{{ $qs = printf "sni=%s" (urlquery $n.SNI) }}{{ end -}}
|
||||
{{- if $n.AllowInsecure }}{{ $qs = printf "%s&insecure=%v" $qs $n.AllowInsecure }}{{ end -}}
|
||||
{{- if $n.ObfsPassword }}{{ $qs = printf "%s&obfs-password=%s" $qs (urlquery $n.ObfsPassword) }}{{ end -}}
|
||||
{{- printf "hy2://%s@%s:%v%s#%s"
|
||||
$.UserInfo.Password
|
||||
$n.Host
|
||||
$n.Port
|
||||
(ternary (gt (len $qs) 0) (print "?" $qs) "")
|
||||
$dn -}}
|
||||
{{- "\n" -}}
|
||||
{{- end -}}
|
||||
|
||||
{{- if eq $n.Type "tuic" -}}
|
||||
{{- $qs := "" -}}
|
||||
{{- if $n.SNI }}{{ $qs = printf "sni=%s" (urlquery $n.SNI) }}{{ end -}}
|
||||
{{- if $n.AllowInsecure }}{{ $qs = printf "%s&insecure=%v" $qs $n.AllowInsecure }}{{ end -}}
|
||||
{{- printf "tuic://%s:%s@%s:%v%s#%s"
|
||||
$n.ServerKey
|
||||
$.UserInfo.Password
|
||||
$n.Host
|
||||
$n.Port
|
||||
(ternary (gt (len $qs) 0) (print "?" $qs) "")
|
||||
$dn -}}
|
||||
{{- "\n" -}}
|
||||
{{- end -}}
|
||||
|
||||
{{- if eq $n.Type "anytls" -}}
|
||||
{{- $qs := "" -}}
|
||||
{{- if $n.SNI }}{{ $qs = printf "sni=%s" (urlquery $n.SNI) }}{{ end -}}
|
||||
{{- printf "anytls://%s@%s:%v%s#%s"
|
||||
$.UserInfo.Password
|
||||
$n.Host
|
||||
$n.Port
|
||||
(ternary (gt (len $qs) 0) (print "?" $qs) "")
|
||||
$dn -}}
|
||||
{{- "\n" -}}
|
||||
{{- end -}}
|
||||
|
||||
{{- end }}
|
||||
`
|
||||
|
||||
func TestClient_Build(t *testing.T) {
|
||||
client := &Client{
|
||||
SiteName: "TestSite",
|
||||
SubscribeName: "TestSubscribe",
|
||||
ClientTemplate: tpl,
|
||||
Proxies: []Proxy{
|
||||
{
|
||||
Name: "TestShadowSocks",
|
||||
Type: "shadowsocks",
|
||||
Host: "127.0.0.1",
|
||||
Port: 1234,
|
||||
Method: "aes-256-gcm",
|
||||
},
|
||||
{
|
||||
Name: "TestTrojan",
|
||||
Type: "trojan",
|
||||
Host: "example.com",
|
||||
Port: 443,
|
||||
AllowInsecure: true,
|
||||
Security: "tls",
|
||||
Transport: "tcp",
|
||||
SNI: "v1-dy.ixigua.com",
|
||||
},
|
||||
},
|
||||
UserInfo: User{
|
||||
Password: "testpassword",
|
||||
ExpiredAt: time.Now().Add(24 * time.Hour),
|
||||
Download: 1000000,
|
||||
Upload: 500000,
|
||||
Traffic: 1500000,
|
||||
SubscribeURL: "https://example.com/subscribe",
|
||||
},
|
||||
}
|
||||
buf, err := client.Build()
|
||||
if err != nil {
|
||||
t.Fatalf("Failed to build client: %v", err)
|
||||
}
|
||||
|
||||
t.Logf("[测试] 输出: %s", buf)
|
||||
|
||||
}
|
||||
@@ -0,0 +1 @@
|
||||
package adapter
|
||||
@@ -0,0 +1,46 @@
|
||||
package adapter
|
||||
|
||||
import (
|
||||
"testing"
|
||||
|
||||
"github.com/perfect-panel/server/internal/model/server"
|
||||
"gorm.io/driver/mysql"
|
||||
"gorm.io/gorm"
|
||||
)
|
||||
|
||||
func TestAdapterProxy(t *testing.T) {
|
||||
|
||||
servers := getServers()
|
||||
if len(servers) == 0 {
|
||||
t.Fatal("no servers found")
|
||||
}
|
||||
for _, srv := range servers {
|
||||
proxy, err := adapterProxy(*srv, "example.com", 0)
|
||||
if err != nil {
|
||||
t.Errorf("failed to adapt server %s: %v", srv.Name, err)
|
||||
}
|
||||
t.Logf("[测试] 适配服务器 %s 成功: %+v", srv.Name, proxy)
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
func getServers() []*server.Server {
|
||||
db, err := connectMySQL("root:mylove520@tcp(localhost:3306)/perfectlink?charset=utf8mb4&parseTime=True&loc=Local")
|
||||
if err != nil {
|
||||
return nil
|
||||
}
|
||||
var servers []*server.Server
|
||||
if err = db.Model(&server.Server{}).Find(&servers).Error; err != nil {
|
||||
return nil
|
||||
}
|
||||
return servers
|
||||
}
|
||||
func connectMySQL(dsn string) (*gorm.DB, error) {
|
||||
db, err := gorm.Open(mysql.New(mysql.Config{
|
||||
DSN: dsn,
|
||||
}), &gorm.Config{})
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return db, nil
|
||||
}
|
||||
Reference in New Issue
Block a user