* 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>
141 lines
3.8 KiB
Go
141 lines
3.8 KiB
Go
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
|
|
}
|