Develop (#76)
* refactor: rename queryannouncementhandler.go to queryAnnouncementLogic.go for clarity
* feat(panDomain): update subscription logic to use V2 handler for improved functionality
* refactor(subscribe): replace V2 handler with a unified Handler method for subscription logic
* feat(subscribe): implement user agent limit feature with configurable list
* fix(subscribe): improve error handling and logging for subscription requests
* feat(subscribe): add user agent limit configuration to system settings
* refactor(api): remove deprecated application-related endpoints and types
* refactor(swagger): remove deprecated app.json generation from swagger configuration
* refactor(swagger): remove deprecated app.json check from swagger configuration
* fix(subscribe): update delete method to use Where clause for improved query accuracy
* fix(subscribe): update Id field tag to use primaryKey and improve save method query
* fix(subscribe): update Id field tag to use primaryKey and improve model queries
* fix(subscribe): rename variable for clarity and add special handling for Stash user agent
* fix(email): convert RegisterStartTime and RegisterEndTime to time.Time for accurate query filtering
* refactor(log): consolidate logging models and update related logic for improved clarity and functionality
* fix(types): change Content field type in MessageLog to interface{} for improved flexibility
* fix(log): change MessageLog list to use value type for improved performance and memory efficiency
* fix(email): set EmailTypeVerify in task payload and update content type conversion for verification email
* fix(log): remove unused Id field from SystemLog during login log insertion
* fix(login): remove debug logs and error logging during user login process
* fix(log): add traffic reset logging for subscription resets
* fix(log): insert reset traffic log during subscription activation
* feat(log): add endpoints for retrieving and resetting subscribe traffic logs
* refactor(log): remove Reset Subscribe Traffic Log endpoint and related types
* feat(traffic): add traffic statistics logging and scheduling
* fix(subscribe): ensure active status and reset timestamps during traffic resets
* feat(api): enhance server and node management with new request/response structures
* refactor(api): rename OnlineUser to ServerOnlineUser for clarity
* feat(api): define OnlineUser type with SID and IP fields
* feat(server): implement server management handlers and database schema
* feat(api): add traffic log details filtering and enhance traffic log structures
* feat(api): migrate server and node data handling, update related structures and logic
* feat(server): implement server deletion logic with error handling
* feat(api): update log filtering to use ResetSubscribe type for subscription logs
* feat(api): standardize timestamp field across log structures
* feat(api): refactor cache key handling for server and user lists
* feat(api): enhance server status handling with protocol support and refactor related logic
* fix(traffic): adjust start date for traffic statistics and improve log deletion comment
* feat(api): implement daily traffic ranking for users and servers with error handling
* feat(api): update server total data response to use 'OnlineUsers' and implement daily traffic statistics logging
* feat(api): add log settings management with auto-clear and clear days configuration
* fix(log): correct category in log settings update query
* feat(routes): add handler for scheduled traffic statistics
* feat(model): add user counts struct and update queries for new and renewal users
* feat(api): add referral percentage and only first purchase fields to user model and requests
* feat(database): update user table to add referral percentage and only first purchase fields
* feat(api): add reset sort endpoints for server and node
* feat(api): add sort field to server model
* feat(api): implement sorting functionality for nodes and servers
* fix(database): add sort column to nodes table
* fix(model): enhance user statistics queries with new order and renewal order counts
* fix(log): update timestamp handling in login and registration logs
* fix(log): update sorting logic for server and user subscribe traffic logs
* fix(server): add server status handling based on last reported time
* fix(model): correct filter condition to use 'date' instead of 'data'
* fix(migration): add index for traffic log on timestamp, user_id, and subscribe_id
* fix(log): optimize user traffic rank data handling by using append instead of index assignment
* fix(filter): refactor node list creation to use append and remove duplicates from tags
* fix(node): add ServerId and Enabled fields to node update logic
* feat(tags): add endpoint to query all node tags
* fix(preview): add Preload parameter to FilterNodeList for improved data retrieval
* fix(log): date is empty
* feat(subscribe): add Language field to subscription models and update query logic
* feat(subscription): add Language parameter to GetSubscription request and update query logic
* fix(server): encode ServerKey in base64 and update last reported time for nodes
* feat: delete common GetSubscription
* feat(subscription): implement FilterList method for subscription queries and update related logic
* fix(subscribe): remove duplicate user agents in SubscribeHandler
* fix(push): initialize onlineUsers as a map in pushOnlineUsersLogic
* fix(reset): initialize subs as a map in clearCache method
* refactor(query): simplify node and tag filtering using InSet function
* feat(userlist): enhance GetServerUserListLogic with improved node and tag handling
* fix(userlist): correct node ID assignment and update query logic for tag filtering
* fix(userlist): correct node ID assignment in getServerUserListLogic
* refactor(query): streamline query construction for tag filtering
* fix(statistics): optimize server ranking data handling in QueryServerTotalDataLogic
* refactor(statistics): simplify server ranking data construction in QueryServerTotalDataLogic
* fix(statistics): correct server traffic data assignment in QueryServerTotalDataLogic
* fix(statistics): optimize yesterday's top 10 server traffic data assignment in QueryServerTotalDataLogic
* fix(middleware): remove duplicate elements from user agent list in PanDomainMiddleware
* feat(middleware): enhance user agent handling by querying client list in PanDomainMiddleware
* feat(client): subscribe_template
* feat(oauth): add user agent and IP logging to registration and login processes
* fix(balance): add timestamp to balance logs for payment, refund, and recharge transactions
* fix(log): correct comment for CommissionTypeRefund to improve clarity
* fix(log): replace magic number with constant for gift type in purchase checkout logic
* fix(log): rename OrderId to OrderNo for consistency in balance logging
* feat(log): add logging for balance, gift amount, and commission adjustments
* fix(user): correct placement of DeepCopy for user info update logic
* feat(log): add UserSubscribeId to FilterSubscribeLogRequest for enhanced filtering
* fix(purchase): streamline error handling and improve JSON marshaling for temporary orders
* fix(order): simplify commission handling and improve payload parsing logic
* fix(order): update commission calculation to actual payment amount minus gateway handling fee
* feat(payment): add support for CryptoSaaS payment platform and enhance configuration handling
* fix(balance): update QueryUserBalanceLog response structure to include balance log list
* fix(email): update task progress handling to use specific task ID for updates
* feat(quota): add quota task creation and querying endpoints with updated data structures
* fix(email): update task handling to use generic task model and improve error logging
* fix(order): improve error logging for database transaction and user cache updates
* feat(quota): enhance quota task management with new request structures and processing logic
* fix(quota): remove redundant quota task status endpoint from admin marketing routes
* fix(worker): update task completion status handling in worker logic
* fix(quota): update taskInfo to include current subscription count in quota logic
* doc(log): rename function for clarity and add cache cleanup comment
* fix(quota): update time handling in quota logic and correct subscriber ID query
* fix(quota): update time handling to use UnixMilli for start time in quota logic
* feat(protocol): add server protocol configuration query and enhance protocol options
* fix(quota): correct time range queries for start and expire times in quota logic
* fix(types): update plugin options to include 'none' in the plugin field
---------
Co-authored-by: Chang lue Tsen <tension@ppanel.dev>
This commit is contained in:
Leif Draven
+56
-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,55 @@ 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{
|
||||
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
|
||||
}
|
||||
|
||||
+14
-3
@@ -11,9 +11,10 @@ import (
|
||||
)
|
||||
|
||||
type Proxy struct {
|
||||
Sort int
|
||||
Name string
|
||||
Server string
|
||||
Port uint64
|
||||
Port uint16
|
||||
Type string
|
||||
Tags []string
|
||||
|
||||
@@ -33,20 +34,30 @@ type Proxy struct {
|
||||
Path string // For HTTP/HTTPS
|
||||
ServiceName string // For gRPC
|
||||
// Shadowsocks Options
|
||||
Method string
|
||||
ServerKey string // For Shadowsocks 2022
|
||||
Method string
|
||||
ServerKey string // For Shadowsocks 2022
|
||||
Plugin string // Plugin for Shadowsocks
|
||||
PluginOptions string // Plugin options for Shadowsocks
|
||||
// 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
|
||||
}
|
||||
|
||||
type User struct {
|
||||
|
||||
@@ -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