Add new admin panel, failover, dns fallback, providers, limiters. Update XHTTP

service/manager/constant/dto.go

@@ -9,6 +9,14 @@ type Squad struct {
 	UpdatedAt time.Time `json:"updated_at" validate:"required"`
 }
 
+type DeletedSquad struct {
+	Squad                        Squad
+	OrphanedNodeUUIDs            []string
+	OrphanedConnectionLimiterIDs []int
+	OrphanedTrafficLimiterIDs    []int
+	SurvivingNodeUUIDs           []string
+}
+
 type SquadCreate struct {
 	Name string `json:"name" validate:"required"`
 }
@@ -20,7 +28,7 @@ type SquadUpdate struct {
 type Node struct {
 	UUID      string    `json:"uuid" validate:"required,uuid4"`
 	Name      string    `json:"name" validate:"required"`
-	SquadIDs  []int     `json:"squad_ids" validate:"required"`
+	SquadIDs  []int     `json:"squad_ids" validate:"required,min=1"`
 	CreatedAt time.Time `json:"created_at" validate:"required"`
 	UpdatedAt time.Time `json:"updated_at" validate:"required"`
 }
@@ -28,7 +36,7 @@ type Node struct {
 type NodeCreate struct {
 	UUID     string `json:"uuid" validate:"required,uuid4"`
 	Name     string `json:"name" validate:"required"`
-	SquadIDs []int  `json:"squad_ids" validate:"required"`
+	SquadIDs []int  `json:"squad_ids" validate:"required,min=1"`
 }
 
 type NodeUpdate struct {
@@ -42,10 +50,10 @@ type BaseNode struct {
 
 type User struct {
 	ID        int       `json:"id" validate:"required"`
-	SquadIDs  []int     `json:"squad_ids" validate:"required"`
+	SquadIDs  []int     `json:"squad_ids" validate:"required,min=1"`
 	Username  string    `json:"username" validate:"required"`
-	Type      string    `json:"type" validate:"required"`
 	Inbound   string    `json:"inbound" validate:"required"`
+	Type      string    `json:"type" validate:"required"`
 	UUID      string    `json:"uuid" validate:"required"`
 	Password  string    `json:"password" validate:"required"`
 	Secret    string    `json:"secret" validate:"required"`
@@ -56,10 +64,10 @@ type User struct {
 }
 
 type UserCreate struct {
-	SquadIDs []int  `json:"squad_ids" validate:"required"`
+	SquadIDs []int  `json:"squad_ids" validate:"required,min=1"`
 	Username string `json:"username" validate:"required"`
-	Type     string `json:"type" validate:"required,oneof=hysteria hysteria2 mtproxy trojan tuic vless vmess"`
 	Inbound  string `json:"inbound" validate:"required"`
+	Type     string `json:"type" validate:"required,oneof=hysteria hysteria2 mtproxy trojan tuic vless vmess"`
 	UUID     string `json:"uuid" validate:"omitempty,uuid4"`
 	Password string `json:"password" validate:"omitempty"`
 	Secret   string `json:"secret" validate:"omitempty"`
@@ -85,53 +93,54 @@ type BaseUser struct {
 
 type ConnectionLimiter struct {
 	ID             int       `json:"id" validate:"required"`
-	SquadIDs       []int     `json:"squad_ids" validate:"required"`
-	Username       string    `json:"username" validate:"required"`
+	SquadIDs       []int     `json:"squad_ids" validate:"required,min=1"`
+	Username       string    `json:"username" validate:"omitempty"`
 	Outbound       string    `json:"outbound" validate:"required"`
-	Strategy       string    `json:"strategy" validate:"required,oneof=connection"`
-	ConnectionType string    `json:"connection_type" validate:"omitempty,oneof=hwid mux ip"`
-	LockType       string    `json:"lock_type" validate:"omitempty,oneof=manager"`
+	Strategy       string    `json:"strategy" validate:"required,oneof=connection bypass"`
+	ConnectionType string    `json:"connection_type" validate:"omitempty,oneof=default hwid mux ip"`
+	LockType       string    `json:"lock_type" validate:"required,oneof=manager default"`
 	Count          uint32    `json:"count" validate:"required"`
 	CreatedAt      time.Time `json:"created_at" validate:"required"`
 	UpdatedAt      time.Time `json:"updated_at" validate:"required"`
 }
 
 type ConnectionLimiterCreate struct {
-	SquadIDs       []int  `json:"squad_ids" validate:"required"`
-	Username       string `json:"username" validate:"required"`
+	SquadIDs       []int  `json:"squad_ids" validate:"required,min=1"`
+	Username       string `json:"username" validate:"omitempty"`
 	Outbound       string `json:"outbound" validate:"required"`
-	Strategy       string `json:"strategy" validate:"required,oneof=connection"`
-	ConnectionType string `json:"type" validate:"omitempty,oneof=hwid mux ip"`
-	LockType       string `json:"lock_type" validate:"omitempty,oneof=manager"`
-	Count          uint32 `json:"count" validate:"required"`
+	Strategy       string `json:"strategy" validate:"required,oneof=connection bypass"`
+	ConnectionType string `json:"connection_type" validate:"excluded_if=Strategy bypass,omitempty,oneof=default hwid mux ip"`
+	LockType       string `json:"lock_type" validate:"excluded_if=Strategy bypass,required_unless=Strategy bypass,omitempty,oneof=manager default"`
+	Count          uint32 `json:"count" validate:"excluded_if=Strategy bypass,required_unless=Strategy bypass"`
 }
 
 type ConnectionLimiterUpdate struct {
-	Username       string `json:"username" validate:"required"`
+	Username       string `json:"username" validate:"omitempty"`
 	Outbound       string `json:"outbound" validate:"required"`
-	Strategy       string `json:"strategy" validate:"required,oneof=connection"`
-	ConnectionType string `json:"type" validate:"omitempty,oneof=hwid mux ip"`
-	LockType       string `json:"lock_type" validate:"omitempty,oneof=manager"`
-	Count          uint32 `json:"count" validate:"required"`
+	Strategy       string `json:"strategy" validate:"required,oneof=connection bypass"`
+	ConnectionType string `json:"connection_type" validate:"excluded_if=Strategy bypass,omitempty,oneof=default hwid mux ip"`
+	LockType       string `json:"lock_type" validate:"excluded_if=Strategy bypass,required_unless=Strategy bypass,omitempty,oneof=manager default"`
+	Count          uint32 `json:"count" validate:"excluded_if=Strategy bypass,required_unless=Strategy bypass"`
 }
 
 type BaseConnectionLimiter struct {
-	Username       string `json:"username" validate:"required"`
+	Username       string `json:"username" validate:"omitempty"`
 	Outbound       string `json:"outbound" validate:"required"`
-	Strategy       string `json:"strategy" validate:"required,oneof=connection"`
-	ConnectionType string `json:"type" validate:"omitempty,oneof=hwid mux ip"`
-	LockType       string `json:"lock_type" validate:"omitempty,oneof=manager"`
-	Count          uint32 `json:"count" validate:"required"`
+	Strategy       string `json:"strategy" validate:"required,oneof=connection bypass"`
+	ConnectionType string `json:"connection_type" validate:"excluded_if=Strategy bypass,omitempty,oneof=default hwid mux ip"`
+	LockType       string `json:"lock_type" validate:"excluded_if=Strategy bypass,required_unless=Strategy bypass,omitempty,oneof=manager default"`
+	Count          uint32 `json:"count" validate:"excluded_if=Strategy bypass,required_unless=Strategy bypass"`
 }
 
 type BandwidthLimiter struct {
 	ID             int       `json:"id" validate:"required"`
-	SquadIDs       []int     `json:"squad_ids" validate:"required"`
-	Username       string    `json:"username" validate:"required"`
+	SquadIDs       []int     `json:"squad_ids" validate:"required,min=1"`
+	Username       string    `json:"username" validate:"omitempty"`
 	Outbound       string    `json:"outbound" validate:"required"`
 	Strategy       string    `json:"strategy" validate:"required"`
-	Mode           string    `json:"mode" validate:"required"`
 	ConnectionType string    `json:"connection_type" validate:"omitempty"`
+	Mode           string    `json:"mode" validate:"required"`
+	FlowKeys      []string  `json:"flow_keys" validate:"omitempty,dive,oneof=user destination ip hwid mux"`
 	Speed          string    `json:"speed" validate:"required"`
 	RawSpeed       uint64    `json:"raw_speed" validate:"required"`
 	CreatedAt      time.Time `json:"created_at" validate:"required"`
@@ -139,30 +148,116 @@ type BandwidthLimiter struct {
 }
 
 type BandwidthLimiterCreate struct {
-	SquadIDs       []int  `json:"squad_ids" validate:"required"`
-	Username       string `json:"username" validate:"required"`
-	Outbound       string `json:"outbound" validate:"required"`
-	Strategy       string `json:"strategy" validate:"required,oneof=global connection"`
-	Mode           string `json:"mode" validate:"required"`
-	ConnectionType string `json:"connection_type" validate:"omitempty"`
-	Speed          string `json:"speed" validate:"required"`
+	SquadIDs       []int    `json:"squad_ids" validate:"required,min=1"`
+	Username       string   `json:"username" validate:"omitempty"`
+	Outbound       string   `json:"outbound" validate:"required"`
+	Strategy       string   `json:"strategy" validate:"required,oneof=global connection bypass"`
+	ConnectionType string   `json:"connection_type" validate:"excluded_if=Strategy bypass,omitempty"`
+	Mode           string   `json:"mode" validate:"excluded_if=Strategy bypass,required_unless=Strategy bypass"`
+	FlowKeys      []string `json:"flow_keys" validate:"excluded_if=Strategy bypass,omitempty,dive,oneof=user destination ip hwid mux"`
+	Speed          string   `json:"speed" validate:"excluded_if=Strategy bypass,required_unless=Strategy bypass"`
 }
 
 type BandwidthLimiterUpdate struct {
-	Username       string `json:"username" validate:"required"`
-	Outbound       string `json:"outbound" validate:"required"`
-	Strategy       string `json:"strategy" validate:"required,oneof=global connection"`
-	Mode           string `json:"mode" validate:"required"`
-	ConnectionType string `json:"connection_type" validate:"omitempty"`
-	Speed          string `json:"speed" validate:"required"`
+	Username       string   `json:"username" validate:"omitempty"`
+	Outbound       string   `json:"outbound" validate:"required"`
+	Strategy       string   `json:"strategy" validate:"required,oneof=global connection bypass"`
+	ConnectionType string   `json:"connection_type" validate:"excluded_if=Strategy bypass,omitempty"`
+	Mode           string   `json:"mode" validate:"excluded_if=Strategy bypass,required_unless=Strategy bypass"`
+	FlowKeys      []string `json:"flow_keys" validate:"excluded_if=Strategy bypass,omitempty,dive,oneof=user destination ip hwid mux"`
+	Speed          string   `json:"speed" validate:"excluded_if=Strategy bypass,required_unless=Strategy bypass"`
 }
 
 type BaseBandwidthLimiter struct {
-	Username       string `json:"username" validate:"required"`
-	Outbound       string `json:"outbound" validate:"required"`
-	Strategy       string `json:"strategy" validate:"required,oneof=global connection"`
-	Mode           string `json:"mode" validate:"required"`
-	ConnectionType string `json:"connection_type" validate:"omitempty"`
-	Speed          string `json:"speed" validate:"required"`
-	RawSpeed       uint64 `json:"raw_speed" validate:"required"`
+	Username       string   `json:"username" validate:"omitempty"`
+	Outbound       string   `json:"outbound" validate:"required"`
+	Strategy       string   `json:"strategy" validate:"required,oneof=global connection bypass"`
+	ConnectionType string   `json:"connection_type" validate:"excluded_if=Strategy bypass,omitempty"`
+	Mode           string   `json:"mode" validate:"excluded_if=Strategy bypass,required_unless=Strategy bypass"`
+	FlowKeys      []string `json:"flow_keys" validate:"excluded_if=Strategy bypass,omitempty,dive,oneof=user destination ip hwid mux"`
+	Speed          string   `json:"speed" validate:"excluded_if=Strategy bypass,required_unless=Strategy bypass"`
+	RawSpeed       uint64   `json:"raw_speed" validate:"excluded_if=Strategy bypass,required_unless=Strategy bypass"`
+}
+
+type TrafficLimiter struct {
+	ID        int       `json:"id" validate:"required"`
+	SquadIDs  []int     `json:"squad_ids" validate:"required,min=1"`
+	Username  string    `json:"username" validate:"omitempty"`
+	Outbound  string    `json:"outbound" validate:"required"`
+	Strategy  string    `json:"strategy" validate:"required,oneof=global bypass"`
+	Mode      string    `json:"mode" validate:"required"`
+	RawUsed   uint64    `json:"raw_used" validate:"required"`
+	Quota     string    `json:"quota" validate:"required"`
+	RawQuota  uint64    `json:"raw_quota" validate:"required"`
+	Usage     uint8     `json:"usage"`
+	CreatedAt time.Time `json:"created_at" validate:"required"`
+	UpdatedAt time.Time `json:"updated_at" validate:"required"`
+}
+
+type TrafficLimiterCreate struct {
+	SquadIDs []int  `json:"squad_ids" validate:"required,min=1"`
+	Username string `json:"username" validate:"omitempty"`
+	Outbound string `json:"outbound" validate:"required"`
+	Strategy string `json:"strategy" validate:"required,oneof=global bypass"`
+	Mode     string `json:"mode" validate:"excluded_if=Strategy bypass,required_unless=Strategy bypass"`
+	Quota    string `json:"quota" validate:"excluded_if=Strategy bypass,required_unless=Strategy bypass"`
+}
+
+type TrafficLimiterUpdate struct {
+	Username string `json:"username" validate:"omitempty"`
+	Outbound string `json:"outbound" validate:"required"`
+	Strategy string `json:"strategy" validate:"required,oneof=global bypass"`
+	Mode     string `json:"mode" validate:"excluded_if=Strategy bypass,required_unless=Strategy bypass"`
+	Quota    string `json:"quota" validate:"excluded_if=Strategy bypass,required_unless=Strategy bypass"`
+}
+
+type BaseTrafficLimiter struct {
+	Username string `json:"username" validate:"omitempty"`
+	Outbound string `json:"outbound" validate:"required"`
+	Strategy string `json:"strategy" validate:"required,oneof=global bypass"`
+	Mode     string `json:"mode" validate:"excluded_if=Strategy bypass,required_unless=Strategy bypass"`
+	RawUsed  uint64 `json:"raw_used" validate:"excluded_if=Strategy bypass,required_unless=Strategy bypass"`
+	Quota    string `json:"quota" validate:"excluded_if=Strategy bypass,required_unless=Strategy bypass"`
+	RawQuota uint64 `json:"raw_quota" validate:"excluded_if=Strategy bypass,required_unless=Strategy bypass"`
+}
+
+type RateLimiter struct {
+	ID             int       `json:"id" validate:"required"`
+	SquadIDs       []int     `json:"squad_ids" validate:"required,min=1"`
+	Username       string    `json:"username" validate:"omitempty"`
+	Outbound       string    `json:"outbound" validate:"required"`
+	Strategy       string    `json:"strategy" validate:"required,oneof=fixed_window sliding_window token_bucket leaky_bucket bypass"`
+	ConnectionType string    `json:"connection_type" validate:"required,oneof=hwid mux ip default"`
+	Count          uint32    `json:"count" validate:"required"`
+	Interval       string    `json:"interval" validate:"required"`
+	CreatedAt      time.Time `json:"created_at" validate:"required"`
+	UpdatedAt      time.Time `json:"updated_at" validate:"required"`
+}
+
+type RateLimiterCreate struct {
+	SquadIDs       []int  `json:"squad_ids" validate:"required,min=1"`
+	Username       string `json:"username" validate:"omitempty"`
+	Outbound       string `json:"outbound" validate:"required"`
+	Strategy       string `json:"strategy" validate:"required,oneof=fixed_window sliding_window token_bucket leaky_bucket bypass"`
+	ConnectionType string `json:"connection_type" validate:"excluded_if=Strategy bypass,required_unless=Strategy bypass,omitempty,oneof=hwid mux ip default"`
+	Count          uint32 `json:"count" validate:"excluded_if=Strategy bypass,required_unless=Strategy bypass"`
+	Interval       string `json:"interval" validate:"excluded_if=Strategy bypass,required_unless=Strategy bypass"`
+}
+
+type RateLimiterUpdate struct {
+	Username       string `json:"username" validate:"omitempty"`
+	Outbound       string `json:"outbound" validate:"required"`
+	Strategy       string `json:"strategy" validate:"required,oneof=fixed_window sliding_window token_bucket leaky_bucket bypass"`
+	ConnectionType string `json:"connection_type" validate:"excluded_if=Strategy bypass,required_unless=Strategy bypass,omitempty,oneof=hwid mux ip default"`
+	Count          uint32 `json:"count" validate:"excluded_if=Strategy bypass,required_unless=Strategy bypass"`
+	Interval       string `json:"interval" validate:"excluded_if=Strategy bypass,required_unless=Strategy bypass"`
+}
+
+type BaseRateLimiter struct {
+	Username       string `json:"username" validate:"omitempty"`
+	Outbound       string `json:"outbound" validate:"required"`
+	Strategy       string `json:"strategy" validate:"required,oneof=fixed_window sliding_window token_bucket leaky_bucket bypass"`
+	ConnectionType string `json:"connection_type" validate:"excluded_if=Strategy bypass,required_unless=Strategy bypass,omitempty,oneof=hwid mux ip default"`
+	Count          uint32 `json:"count" validate:"excluded_if=Strategy bypass,required_unless=Strategy bypass"`
+	Interval       string `json:"interval" validate:"excluded_if=Strategy bypass,required_unless=Strategy bypass"`
 }

service/manager/constant/manager.go

@@ -1,15 +1,6 @@
 package constant
 
-type NodeManager interface {
-	AddNode(id string, node ConnectedNode) error
-	AcquireLock(limiterId int, id string) (string, error)
-	RefreshLock(limiterId int, id string, handleId string) error
-	ReleaseLock(limiterId int, id string, handleId string) error
-}
-
 type Manager interface {
-	NodeManager
-
 	CreateSquad(user SquadCreate) (Squad, error)
 	GetSquads(filters map[string][]string) ([]Squad, error)
 	GetSquadsCount(filters map[string][]string) (int, error)
@@ -21,7 +12,7 @@ type Manager interface {
 	GetNodes(filters map[string][]string) ([]Node, error)
 	GetNodesCount(filters map[string][]string) (int, error)
 	GetNode(uuid string) (Node, error)
-	GetNodeStatus(uuid string) string
+	GetNodeStatus(uuid string) (string, error)
 	UpdateNode(uuid string, node NodeUpdate) (Node, error)
 	DeleteNode(uuid string) (Node, error)
 
@@ -39,10 +30,35 @@ type Manager interface {
 	UpdateBandwidthLimiter(id int, limiter BandwidthLimiterUpdate) (BandwidthLimiter, error)
 	DeleteBandwidthLimiter(id int) (BandwidthLimiter, error)
 
+	CreateTrafficLimiter(limiter TrafficLimiterCreate) (TrafficLimiter, error)
+	GetTrafficLimiters(filters map[string][]string) ([]TrafficLimiter, error)
+	GetTrafficLimitersCount(filters map[string][]string) (int, error)
+	GetTrafficLimiter(id int) (TrafficLimiter, error)
+	UpdateTrafficLimiter(id int, limiter TrafficLimiterUpdate) (TrafficLimiter, error)
+	UpdateTrafficLimiterUsed(id int, used uint64) (TrafficLimiter, error)
+	DeleteTrafficLimiter(id int) (TrafficLimiter, error)
+
 	CreateConnectionLimiter(limiter ConnectionLimiterCreate) (ConnectionLimiter, error)
 	GetConnectionLimiters(filters map[string][]string) ([]ConnectionLimiter, error)
 	GetConnectionLimitersCount(filters map[string][]string) (int, error)
 	GetConnectionLimiter(id int) (ConnectionLimiter, error)
 	UpdateConnectionLimiter(id int, limiter ConnectionLimiterUpdate) (ConnectionLimiter, error)
 	DeleteConnectionLimiter(id int) (ConnectionLimiter, error)
+
+	CreateRateLimiter(limiter RateLimiterCreate) (RateLimiter, error)
+	GetRateLimiters(filters map[string][]string) ([]RateLimiter, error)
+	GetRateLimitersCount(filters map[string][]string) (int, error)
+	GetRateLimiter(id int) (RateLimiter, error)
+	UpdateRateLimiter(id int, limiter RateLimiterUpdate) (RateLimiter, error)
+	DeleteRateLimiter(id int) (RateLimiter, error)
+}
+
+type NodeManager interface {
+	AddNode(id string, node ConnectedNode) error
+
+	AcquireLock(limiterId int, id string) (string, error)
+	RefreshLock(limiterId int, id string, handleId string) error
+	ReleaseLock(limiterId int, id string, handleId string) error
+
+	AddTrafficUsage(limiterId int, n uint64) (uint64, error)
 }

service/manager/constant/node.go

@@ -13,6 +13,14 @@ type ConnectedNode interface {
 	UpdateBandwidthLimiters(limiter []BandwidthLimiter)
 	DeleteBandwidthLimiter(limiter BandwidthLimiter)
 
+	UpdateTrafficLimiter(limiter TrafficLimiter)
+	UpdateTrafficLimiters(limiter []TrafficLimiter)
+	DeleteTrafficLimiter(limiter TrafficLimiter)
+
+	UpdateRateLimiter(limiter RateLimiter)
+	UpdateRateLimiters(limiter []RateLimiter)
+	DeleteRateLimiter(limiter RateLimiter)
+
 	IsLocal() bool
 	IsOnline() bool
 

service/manager/constant/repository.go

@@ -6,7 +6,7 @@ type Repository interface {
 	GetSquadsCount(filters map[string][]string) (int, error)
 	GetSquad(id int) (Squad, error)
 	UpdateSquad(id int, user SquadUpdate) (Squad, error)
-	DeleteSquad(id int) (Squad, error)
+	DeleteSquad(id int) (DeletedSquad, error)
 
 	CreateNode(node NodeCreate) (Node, error)
 	GetNodes(filters map[string][]string) ([]Node, error)
@@ -35,4 +35,19 @@ type Repository interface {
 	GetBandwidthLimiter(id int) (BandwidthLimiter, error)
 	UpdateBandwidthLimiter(id int, limiter BandwidthLimiterUpdate) (BandwidthLimiter, error)
 	DeleteBandwidthLimiter(id int) (BandwidthLimiter, error)
+
+	CreateTrafficLimiter(limiter TrafficLimiterCreate) (TrafficLimiter, error)
+	GetTrafficLimiters(filters map[string][]string) ([]TrafficLimiter, error)
+	GetTrafficLimitersCount(filters map[string][]string) (int, error)
+	GetTrafficLimiter(id int) (TrafficLimiter, error)
+	UpdateTrafficLimiter(id int, limiter TrafficLimiterUpdate) (TrafficLimiter, error)
+	UpdateTrafficLimiterUsed(id int, used uint64) (TrafficLimiter, error)
+	DeleteTrafficLimiter(id int) (TrafficLimiter, error)
+
+	CreateRateLimiter(limiter RateLimiterCreate) (RateLimiter, error)
+	GetRateLimiters(filters map[string][]string) ([]RateLimiter, error)
+	GetRateLimitersCount(filters map[string][]string) (int, error)
+	GetRateLimiter(id int) (RateLimiter, error)
+	UpdateRateLimiter(id int, limiter RateLimiterUpdate) (RateLimiter, error)
+	DeleteRateLimiter(id int) (RateLimiter, error)
 }