Update

.github/workflows/codeql-analysis.yml

@@ -35,11 +35,11 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       # Initializes the CodeQL tools for scanning.
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v2
+        uses: github/codeql-action/init@v3
         with:
           languages: ${{ matrix.language }}
           # If you wish to specify custom queries, you can do so here or in a config file.
@@ -48,13 +48,13 @@ jobs:
           # queries: ./path/to/local/query, your-org/your-repo/queries@main
 
       - name: Install Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
           go-version-file: go.mod
       # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
       # If this step fails, then you should remove it and run the build manually (see below)
       - name: Autobuild
-        uses: github/codeql-action/autobuild@v2
+        uses: github/codeql-action/autobuild@v3
 
       # ℹ️ Command-line programs to run using the OS shell.
       # 📚 https://git.io/JvXDl
@@ -68,4 +68,4 @@ jobs:
       #   make release
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v2
+        uses: github/codeql-action/analyze@v3

.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:

.github/workflows/release.yml

@@ -99,7 +99,7 @@ jobs:
       CGO_ENABLED: 0
     steps:
       - name: Checkout codebase
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Show workflow information
         id: get_filename
         run: |
@@ -109,9 +109,9 @@ jobs:
           echo "ASSET_NAME=$_NAME" >> $GITHUB_ENV
 
       - name: Set up Go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v5
         with:
-          go-version: ^1.20
+          go-version-file: go.mod
 
       - name: Get project dependencies
         run: go mod download
@@ -133,7 +133,7 @@ jobs:
           mv XrayR XrayR.exe
 
       - name: Prepare to release
-        uses: nick-fields/retry@v2
+        uses: nick-fields/retry@v3
         with:
           timeout_minutes: 60
           retry_wait_seconds: 60

.github/workflows/stale.yml

@@ -10,7 +10,7 @@ jobs:
       issues: write
       pull-requests: write
     steps:
-      - uses: actions/stale@v5
+      - uses: actions/stale@v9
         with:
           days-before-issue-stale: 30
           days-before-issue-close: 14

api/api.go

@@ -6,6 +6,8 @@ package api
 // API is the interface for different panel's api.
 type API interface {
 	GetNodeInfo() (nodeInfo *NodeInfo, err error)
+	// GetXrayRCertConfig returns optional global certificate settings from panel
+	GetXrayRCertConfig() (certConfig *XrayRCertConfig, err error)
 	GetUserList() (userList *[]UserInfo, err error)
 	ReportNodeStatus(nodeStatus *NodeStatus) (err error)
 	ReportNodeOnlineUsers(onlineUser *[]OnlineUser) (err error)

api/apimodel.go

@@ -39,14 +39,15 @@ type NodeStatus struct {
 type NodeInfo struct {
 	AcceptProxyProtocol bool
 	Authority           string
-	NodeType            string // Must be V2ray, Trojan, and Shadowsocks
+	NodeType            string // V2ray/Vmess, VLESS, Trojan, Shadowsocks, Hysteria2, AnyTLS, Tuic, Socks, HTTP
 	NodeID              int
 	Port                uint32
 	SpeedLimit          uint64 // Bps
 	AlterID             uint16
 	TransportProtocol   string
 	FakeType            string
 	Host                string
+	SNI                 string
 	Path                string
 	EnableTLS           bool
 	EnableSniffing      bool
@@ -78,6 +79,40 @@ type NodeInfo struct {
 	Security            string
 	Key                 string
 	RejectUnknownSni    bool
+	Hysteria2Config     *Hysteria2Config
+	AnyTLSConfig        *AnyTLSConfig
+	TuicConfig          *TuicConfig
+
+	// XHTTP (SplitHTTP) bypass CDN fields — new in Xray-core v26.2+
+	XHTTPMode             string          // auto, packet-up, stream-up, stream-one
+	XHTTPExtra            json.RawMessage // raw "extra" JSON for full override
+	XPaddingBytes         *[2]int32       // [from, to] range for xPaddingBytes
+	XPaddingObfsMode      bool            // xPaddingObfsMode
+	XPaddingKey           string          // xPaddingKey
+	XPaddingHeader        string          // xPaddingHeader
+	XPaddingPlacement     string          // queryInHeader, cookie, header, query
+	XPaddingMethod        string          // repeat-x, tokenish
+	UplinkHTTPMethod      string          // POST, GET
+	SessionPlacement      string          // path, cookie, header, query
+	SessionKey            string          // key for session placement
+	SeqPlacement          string          // path, cookie, header, query
+	SeqKey                string          // key for seq placement
+	UplinkDataPlacement   string          // body, cookie, header
+	UplinkDataKey         string          // key for uplink data placement
+	UplinkChunkSize       uint32          // chunk size for non-body uplink
+	NoGRPCHeader          bool            // disable gRPC header
+	NoSSEHeader           bool            // disable SSE header
+	ScMaxEachPostBytes    *[2]int32       // [from, to] range
+	ScMinPostsIntervalMs  *[2]int32       // [from, to] range
+	ScMaxBufferedPosts    int64           // max buffered posts
+	ScStreamUpServerSecs  *[2]int32       // [from, to] range
+	XmuxMaxConcurrency    *[2]int32       // [from, to] range
+	XmuxMaxConnections    *[2]int32       // [from, to] range
+	XmuxCMaxReuseTimes    *[2]int32       // [from, to] range
+	XmuxHMaxRequestTimes  *[2]int32       // [from, to] range
+	XmuxHMaxReusableSecs  *[2]int32       // [from, to] range
+	XmuxHKeepAlivePeriod  int64           // keep alive period
+	XHTTPDownloadSettings json.RawMessage // downloadSettings raw JSON
 }
 
 type UserInfo struct {
@@ -119,6 +154,38 @@ type DetectRule struct {
 type DetectResult struct {
 	UID    int
 	RuleID int
+	IP     string
+}
+
+// XrayRCertConfig carries optional panel-provided certificate settings
+// (e.g., DNS provider, ACME email, and DNS-01 environment variables).
+type XrayRCertConfig struct {
+	Provider string            `json:"provider"`
+	Email    string            `json:"email"`
+	DNSEnv   map[string]string `json:"dns_env"`
+}
+
+type Hysteria2Config struct {
+	Obfs                  string
+	ObfsPassword          string
+	UpMbps                int
+	DownMbps              int
+	IgnoreClientBandwidth bool
+	PortHopEnabled        bool
+	PortHopPorts          string
+}
+
+type AnyTLSConfig struct {
+	PaddingScheme []string
+}
+
+type TuicConfig struct {
+	CongestionControl string
+	UDPRelayMode      string
+	ZeroRTTHandshake  bool
+	Heartbeat         int
+	AuthTimeout       int
+	ALPN              []string
 }
 
 type REALITYConfig struct {

api/bunpanel/bunpanel.go

@@ -46,6 +46,11 @@ func (*APIClient) ReportNodeStatus(nodeStatus *api.NodeStatus) (err error) {
 	return nil
 }
 
+// GetXrayRCertConfig is not supported by BunPanel; return nil to indicate absence.
+func (*APIClient) GetXrayRCertConfig() (*api.XrayRCertConfig, error) {
+	return nil, nil
+}
+
 // GetNodeRule implements api.API.
 func (c *APIClient) GetNodeRule() (*[]api.DetectRule, error) {
 	ruleList := c.LocalRuleList
@@ -110,9 +115,14 @@ func readLocalRuleList(path string) (LocalRuleList []api.DetectRule) {
 
 		// read line by line
 		for fileScanner.Scan() {
+			pattern, err := regexp.Compile(fileScanner.Text())
+			if err != nil {
+				log.Printf("Invalid rule regex: %s, skipping", err)
+				continue
+			}
 			LocalRuleList = append(LocalRuleList, api.DetectRule{
 				ID:      -1,
-				Pattern: regexp.MustCompile(fileScanner.Text()),
+				Pattern: pattern,
 			})
 		}
 		// handle first encountered error while reading
@@ -127,7 +137,7 @@ func readLocalRuleList(path string) (LocalRuleList []api.DetectRule) {
 
 // Describe return a description of the client
 func (c *APIClient) Describe() api.ClientInfo {
-	return api.ClientInfo{APIHost: c.APIHost, NodeID: c.NodeID, Key: c.Key, NodeType: c.NodeType}
+	return api.ClientInfo{APIHost: c.APIHost, NodeID: c.NodeID, Key: "", NodeType: c.NodeType}
 }
 
 // Debug set the client debug for client
@@ -144,7 +154,7 @@ func (c *APIClient) parseResponse(res *resty.Response, path string, err error) (
 		return nil, fmt.Errorf("request %s failed: %s", c.assembleURL(path), err)
 	}
 
-	if res.StatusCode() > 400 {
+	if res.StatusCode() >= 400 {
 		body := res.Body()
 		return nil, fmt.Errorf("request %s failed: %s, %v", c.assembleURL(path), string(body), err)
 	}
@@ -190,11 +200,6 @@ func (c *APIClient) GetNodeInfo() (nodeInfo *api.NodeInfo, err error) {
 		return nil, fmt.Errorf("parse node info failed: %s, \nError: %s, \nPlease check the doc of custom_config for help: https://xrayr-project.github.io/XrayR-doc/dui-jie-sspanel/sspanel/sspanel_custom_config", string(res), err)
 	}
 
-	if err != nil {
-		res, _ := json.Marshal(nodeInfoResponse)
-		return nil, fmt.Errorf("parse node info failed: %s, \nError: %s", string(res), err)
-	}
-
 	return nodeInfo, nil
 }
 
@@ -403,6 +408,46 @@ func (c *APIClient) ParseNodeInfo(nodeInfoResponse *Server) (*api.NodeInfo, erro
 		json.Unmarshal(nodeConfig.TcpSettings, tcpConfig)
 	}
 
+	// Parse SplitHTTP/XHTTP settings
+	splithttpConfig := new(SplitHTTPSettings)
+	if nodeConfig.XHTTPSettings != nil {
+		json.Unmarshal(nodeConfig.XHTTPSettings, splithttpConfig)
+	} else if nodeConfig.SplitHTTPSettings != nil {
+		json.Unmarshal(nodeConfig.SplitHTTPSettings, splithttpConfig)
+	}
+
+	// Parse HttpUpgrade settings
+	httpupgradeConfig := new(HttpUpgradeSettings)
+	if nodeConfig.HttpUpgradeSettings != nil {
+		json.Unmarshal(nodeConfig.HttpUpgradeSettings, httpupgradeConfig)
+	}
+
+	// Determine Host and Path based on transport protocol
+	var host, path, serviceName string
+	var header json.RawMessage
+	var headers map[string]string
+
+	switch transportProtocol {
+	case "ws":
+		host = wsConfig.Headers.Host
+		path = wsConfig.Path
+	case "grpc":
+		serviceName = grpcConfig.ServiceName
+	case "tcp":
+		header = tcpConfig.Header
+	case "splithttp", "xhttp":
+		host = splithttpConfig.Host
+		path = splithttpConfig.Path
+		headers = splithttpConfig.Headers
+	case "httpupgrade":
+		host = httpupgradeConfig.Host
+		path = httpupgradeConfig.Path
+		headers = httpupgradeConfig.Headers
+	default:
+		host = wsConfig.Headers.Host
+		path = wsConfig.Path
+	}
+
 	// Create GeneralNodeInfo
 	nodeInfo := &api.NodeInfo{
 		NodeType:          c.NodeType,
@@ -411,16 +456,36 @@ func (c *APIClient) ParseNodeInfo(nodeInfoResponse *Server) (*api.NodeInfo, erro
 		SpeedLimit:        speedLimit,
 		AlterID:           alterID,
 		TransportProtocol: transportProtocol,
-		Host:              wsConfig.Headers.Host,
-		Path:              wsConfig.Path,
+		Host:              host,
+		Path:              path,
 		EnableTLS:         enableTLS,
 		EnableVless:       enableVless,
 		VlessFlow:         nodeConfig.Flow,
 		CypherMethod:      nodeConfig.Method,
-		ServiceName:       grpcConfig.ServiceName,
-		Header:            tcpConfig.Header,
+		ServiceName:       serviceName,
+		Header:            header,
+		Headers:           headers,
 		EnableREALITY:     enableREALITY,
 		REALITYConfig:     realityConfig,
+		// XHTTP bypass CDN fields
+		XHTTPMode:           splithttpConfig.Mode,
+		XHTTPExtra:          splithttpConfig.Extra,
+		XPaddingBytes:       splithttpConfig.XPaddingBytes,
+		XPaddingObfsMode:    splithttpConfig.XPaddingObfsMode,
+		XPaddingKey:         splithttpConfig.XPaddingKey,
+		XPaddingHeader:      splithttpConfig.XPaddingHeader,
+		XPaddingPlacement:   splithttpConfig.XPaddingPlacement,
+		XPaddingMethod:      splithttpConfig.XPaddingMethod,
+		UplinkHTTPMethod:    splithttpConfig.UplinkHTTPMethod,
+		SessionPlacement:    splithttpConfig.SessionPlacement,
+		SessionKey:          splithttpConfig.SessionKey,
+		SeqPlacement:        splithttpConfig.SeqPlacement,
+		SeqKey:              splithttpConfig.SeqKey,
+		UplinkDataPlacement: splithttpConfig.UplinkDataPlacement,
+		UplinkDataKey:       splithttpConfig.UplinkDataKey,
+		UplinkChunkSize:     splithttpConfig.UplinkChunkSize,
+		NoGRPCHeader:        splithttpConfig.NoGRPCHeader,
+		NoSSEHeader:         splithttpConfig.NoSSEHeader,
 	}
 
 	return nodeInfo, nil

api/bunpanel/model.go

@@ -12,6 +12,9 @@ type Server struct {
 	RealitySettings json.RawMessage `json:"realitySettings"`
 	GrpcSettings json.RawMessage `json:"grpcSettings"`
 	TcpSettings json.RawMessage `json:"tcpSettings"`
+	SplitHTTPSettings json.RawMessage `json:"splithttpSettings"`
+	XHTTPSettings json.RawMessage `json:"xhttpSettings"`
+	HttpUpgradeSettings json.RawMessage `json:"httpupgradeSettings"`
 }
 
 type WsSettings struct {
@@ -29,6 +32,36 @@ type TcpSettings struct {
 	Header json.RawMessage `json:"header"`
 }
 
+type SplitHTTPSettings struct {
+	Path                string            `json:"path"`
+	Host                string            `json:"host"`
+	Headers             map[string]string `json:"headers"`
+	Mode                string            `json:"mode"`
+	Extra               json.RawMessage   `json:"extra"`
+	XPaddingBytes       *[2]int32         `json:"xPaddingBytes"`
+	XPaddingObfsMode    bool              `json:"xPaddingObfsMode"`
+	XPaddingKey         string            `json:"xPaddingKey"`
+	XPaddingHeader      string            `json:"xPaddingHeader"`
+	XPaddingPlacement   string            `json:"xPaddingPlacement"`
+	XPaddingMethod      string            `json:"xPaddingMethod"`
+	UplinkHTTPMethod    string            `json:"uplinkHTTPMethod"`
+	SessionPlacement    string            `json:"sessionPlacement"`
+	SessionKey          string            `json:"sessionKey"`
+	SeqPlacement        string            `json:"seqPlacement"`
+	SeqKey              string            `json:"seqKey"`
+	UplinkDataPlacement string            `json:"uplinkDataPlacement"`
+	UplinkDataKey       string            `json:"uplinkDataKey"`
+	UplinkChunkSize     uint32            `json:"uplinkChunkSize"`
+	NoGRPCHeader        bool              `json:"noGRPCHeader"`
+	NoSSEHeader         bool              `json:"noSSEHeader"`
+}
+
+type HttpUpgradeSettings struct {
+	Path    string            `json:"path"`
+	Host    string            `json:"host"`
+	Headers map[string]string `json:"headers"`
+}
+
 type RealitySettings struct {
 	Show    bool            `json:"show"`
 	Dest    string          `json:"dest"`