update

Author: Mtoly

.github/workflows/docker.yml

@@ -5,7 +5,7 @@ on:
       - published
 env:
   REGISTRY: ghcr.io
-  IMAGE_NAME: xrayr-project/xrayr
+  IMAGE_NAME: XrayR-project/XrayR
 
 jobs:
   build:

api/api.go

@@ -6,6 +6,10 @@ package api
 // API is the interface for different panel's api.
 type API interface {
 	GetNodeInfo() (nodeInfo *NodeInfo, err error)
+	// GetXrayRCertConfig returns optional panel-provided certificate config
+	// (e.g., ACME/lego DNS provider and env vars). Implementations may return nil
+	// when unsupported.
+	GetXrayRCertConfig() (certConfig *XrayRCertConfig, err error)
 	GetUserList() (userList *[]UserInfo, err error)
 	ReportNodeStatus(nodeStatus *NodeStatus) (err error)
 	ReportNodeOnlineUsers(onlineUser *[]OnlineUser) (err error)

api/apimodel.go

@@ -14,6 +14,9 @@ const (
 )
 
 // Config API config
+//
+// Note: VLESS-related behavior should primarily follow panel custom_config and
+// NodeType definitions to avoid divergence between local settings and panel data.
 type Config struct {
 	APIHost             string  `mapstructure:"ApiHost"`
 	NodeID              int     `mapstructure:"NodeID"`
@@ -39,7 +42,7 @@ type NodeStatus struct {
 type NodeInfo struct {
 	AcceptProxyProtocol bool
 	Authority           string
-	NodeType            string // Must be V2ray, Trojan, and Shadowsocks
+	NodeType            string // Must be V2ray, Trojan, Shadowsocks, VLESS, Hysteria2, AnyTLS, Tuic
 	NodeID              int
 	Port                uint32
 	SpeedLimit          uint64 // Bps
@@ -48,6 +51,7 @@ type NodeInfo struct {
 	FakeType            string
 	Host                string
 	Path                string
+	SNI                 string
 	EnableTLS           bool
 	EnableSniffing      bool
 	RouteOnly           bool
@@ -78,6 +82,9 @@ type NodeInfo struct {
 	Security            string
 	Key                 string
 	RejectUnknownSni    bool
+	Hysteria2Config     *Hysteria2Config
+	AnyTLSConfig        *AnyTLSConfig
+	TuicConfig          *TuicConfig
 }
 
 type UserInfo struct {
@@ -119,6 +126,7 @@ type DetectRule struct {
 type DetectResult struct {
 	UID    int
 	RuleID int
+	IP     string
 }
 
 type REALITYConfig struct {
@@ -131,3 +139,36 @@ type REALITYConfig struct {
 	MaxTimeDiff      uint64
 	ShortIds         []string
 }
+
+// XrayRCertConfig describes certificate-related options sourced from the panel.
+// Useful for provider-specific ACME/lego flows (e.g., Cloudflare DNS envs).
+type XrayRCertConfig struct {
+	Provider string            `json:"provider"`
+	Email    string            `json:"email"`
+	DNSEnv   map[string]string `json:"dns_env"`
+}
+
+// Hysteria2Config holds optional Hysteria2-specific settings.
+type Hysteria2Config struct {
+	Obfs                  string
+	ObfsPassword          string
+	UpMbps                int
+	DownMbps              int
+	IgnoreClientBandwidth bool
+	PortHopEnabled        bool
+	PortHopPorts          string
+}
+
+// AnyTLSConfig holds AnyTLS-specific tuning options.
+type AnyTLSConfig struct {
+	PaddingScheme []string
+}
+
+// TuicConfig holds TUIC-specific settings.
+type TuicConfig struct {
+	CongestionControl string
+	UDPRelayMode      string
+	ZeroRTTHandshake  bool
+	Heartbeat         int
+	ALPN              []string
+}

api/bunpanel/bunpanel_test.go

@@ -7,7 +7,7 @@ import (
 	"github.com/XrayR-project/XrayR/api/bunpanel"
 )
 
-func CreateClient() api.API {
+func CreateClient() *bunpanel.APIClient {
 	apiConfig := &api.Config{
 		APIHost:  "http://localhost:8080",
 		Key:      "123456",

api/bunpanel/model.go

@@ -69,4 +69,4 @@ type Response struct {
 
 type PostData struct {
 	Data interface{} `json:"data"`
-}
+}

api/gov2panel/gov2panel.go

@@ -54,7 +54,7 @@ func New(apiConfig *api.Config) *APIClient {
 		RuleListPath:        apiConfig.RuleListPath,
 		DisableCustomConfig: apiConfig.DisableCustomConfig,
 
-		LocalRuleList: readLocalRuleList(apiConfig.RuleListPath), //加载本地路由规则
+		LocalRuleList: readLocalRuleList(apiConfig.RuleListPath), // load local route rules
 	}
 	return apiClient
 }
@@ -280,7 +280,7 @@ func (c *APIClient) Debug() {
 
 }
 
-// request 统一请求接口
+// request helper
 func (c *APIClient) sendRequest(headerM map[string]string, method string, url string, data g.Map) (reslutJson *gjson.Json, err error) {
 	url = c.APIHost + url
 
@@ -289,11 +289,11 @@ func (c *APIClient) sendRequest(headerM map[string]string, method string, url st
 	var gResponse *gclient.Response
 
 	if c.Timeout > 0 {
-		client.SetTimeout(time.Duration(c.Timeout) * time.Second) //方法用于设置当前请求超时时间
+		client.SetTimeout(time.Duration(c.Timeout) * time.Second) // set per-request timeout
 	} else {
 		client.SetTimeout(5 * time.Second)
 	}
-	client.Retry(3, 10*time.Second) //方法用于设置请求失败时重连次数和重连间隔。
+	client.Retry(3, 10*time.Second) // retry up to 3 times with backoff
 
 	client.SetHeaderMap(headerM)
 	client.SetHeader("Content-Type", "application/json")

api/gov2panel/gov2panel_test.go

@@ -9,7 +9,7 @@ import (
 	"github.com/gogf/gf/v2/util/gconv"
 )
 
-func CreateClient() api.API {
+func CreateClient() *gov2panel.APIClient {
 	apiConfig := &api.Config{
 		APIHost:  "http://localhost:8080",
 		Key:      "123456",

api/newV2board/v2board_test.go

@@ -7,7 +7,7 @@ import (
 	"github.com/XrayR-project/XrayR/api/newV2board"
 )
 
-func CreateClient() api.API {
+func CreateClient() *newV2board.APIClient {
 	apiConfig := &api.Config{
 		APIHost:  "http://localhost:9897",
 		Key:      "qwertyuiopasdfghjkl",

api/pmpanel/pmpanel_test.go

@@ -8,7 +8,7 @@ import (
 	"github.com/XrayR-project/XrayR/api/pmpanel"
 )
 
-func CreateClient() api.API {
+func CreateClient() *pmpanel.APIClient {
 	apiConfig := &api.Config{
 		APIHost:  "http://webapi.yyds.me",
 		Key:      "123456",
@@ -150,8 +150,8 @@ func TestReportIllegal(t *testing.T) {
 	client := CreateClient()
 
 	detectResult := []api.DetectResult{
-		{1, 2},
-		{1, 3},
+		{UID: 1, RuleID: 2},
+		{UID: 1, RuleID: 3},
 	}
 	client.Debug()
 	err := client.ReportIllegal(&detectResult)

api/proxypanel/proypanel_test.go

@@ -8,7 +8,7 @@ import (
 	"github.com/XrayR-project/XrayR/api/proxypanel"
 )
 
-func CreateClient() api.API {
+func CreateClient() *proxypanel.APIClient {
 	apiConfig := &api.Config{
 		APIHost:  "http://127.0.0.1:8888",
 		Key:      "naBDpLvREiwY9qPr",