From d82b7b1ca6cf0d21b03bc293fda5cbe52225ac34 Mon Sep 17 00:00:00 2001
From: CN-JS-HuiBai <huyang@littlediary.cn>
Date: Wed, 15 Apr 2026 14:17:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E9=97=AE=E9=A2=98=E9=82=A3=E4=B8=AA?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=AF=B9=E5=BA=94=E7=9A=84=E5=AE=A2=E6=88=B7?=
 =?UTF-8?q?=E7=AB=AF=E8=AE=A2=E9=98=85=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 install.sh                | 9 +--------
 option/xboard.go          | 2 +-
 service/xboard/service.go | 8 ++++----
 3 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/install.sh b/install.sh
index aea3ee9f..14b3dac2 100644
--- a/install.sh
+++ b/install.sh
@@ -135,12 +135,10 @@ if ! [[ "$NODE_COUNT" =~ ^[0-9]+$ ]] || [[ "$NODE_COUNT" -lt 1 ]]; then
 fi
 
 declare -a NODE_IDS
-declare -a NODE_TYPES
 declare -a NODE_TAGS
 
 for ((i=1; i<=NODE_COUNT; i++)); do
     DEFAULT_NODE_ID=""
-    DEFAULT_NODE_TYPE="${NODE_TYPE:-vless}"
     DEFAULT_NODE_TAG=""
     if [[ "$i" -eq 1 && -n "$NODE_ID" ]]; then
         DEFAULT_NODE_ID="$NODE_ID"
@@ -151,12 +149,9 @@ for ((i=1; i<=NODE_COUNT; i++)); do
         echo -e "${RED}Node ID is required for node #$i${NC}"
         exit 1
     fi
-    read -p "Enter Node Type for node #$i [${DEFAULT_NODE_TYPE}]: " INPUT_TYPE
-    CURRENT_NODE_TYPE=${INPUT_TYPE:-$DEFAULT_NODE_TYPE}
     read -p "Enter Tag for node #$i (optional) [${DEFAULT_NODE_TAG}]: " INPUT_TAG
     CURRENT_NODE_TAG=${INPUT_TAG:-$DEFAULT_NODE_TAG}
     NODE_IDS+=("$CURRENT_NODE_ID")
-    NODE_TYPES+=("$CURRENT_NODE_TYPE")
     NODE_TAGS+=("$CURRENT_NODE_TAG")
 done
 
@@ -190,7 +185,6 @@ if [[ "$NODE_COUNT" -eq 1 ]]; then
 SERVICE_JSON+=$(cat <<EOF
 ,
       "node_id": ${NODE_IDS[0]},
-      "node_type": "${NODE_TYPES[0]}",
       "config_node_id": ${NODE_IDS[0]},
       "user_node_id": ${NODE_IDS[0]}
 EOF
@@ -203,8 +197,7 @@ SERVICE_JSON+=$',
         {
           "node_id": ${NODE_IDS[$i]},
           "config_node_id": ${NODE_IDS[$i]},
-          "user_node_id": ${NODE_IDS[$i]},
-          "node_type": "${NODE_TYPES[$i]}"
+          "user_node_id": ${NODE_IDS[$i]}
 EOF
 )
         if [[ -n "${NODE_TAGS[$i]}" ]]; then
diff --git a/option/xboard.go b/option/xboard.go
index ea57ca15..ab343027 100644
--- a/option/xboard.go
+++ b/option/xboard.go
@@ -12,7 +12,7 @@ type XBoardServiceOptions struct {
 	NodeID         int                `json:"node_id"`
 	ConfigNodeID   int                `json:"config_node_id,omitempty"`
 	UserNodeID     int                `json:"user_node_id,omitempty"`
-	NodeType       string             `json:"node_type"`
+	NodeType       string             `json:"node_type,omitempty"`
 	SyncInterval   badoption.Duration `json:"sync_interval,omitempty"`
 	ReportInterval badoption.Duration `json:"report_interval,omitempty"`
 	Nodes          []XBoardNodeOptions `json:"nodes,omitempty"`
diff --git a/service/xboard/service.go b/service/xboard/service.go
index d5b28475..21355a95 100644
--- a/service/xboard/service.go
+++ b/service/xboard/service.go
@@ -1038,9 +1038,9 @@ func normalizePanelNodeType(nodeType string) string {
 
 func (s *Service) panelRequest(method string, baseURL string, endpoint string, nodeID int, payload []byte, contentType string) (http.Header, []byte, int, error) {
 	nodeType := normalizePanelNodeType(s.options.NodeType)
-	nodeTypeCandidates := []string{nodeType}
+	nodeTypeCandidates := []string{""}
 	if nodeType != "" {
-		nodeTypeCandidates = append(nodeTypeCandidates, "")
+		nodeTypeCandidates = append(nodeTypeCandidates, nodeType)
 	}
 
 	var lastHeader http.Header
@@ -1089,8 +1089,8 @@ func (s *Service) panelRequest(method string, baseURL string, endpoint string, n
 		lastBody = responseBody
 		lastStatus = resp.StatusCode
 
-		if resp.StatusCode == 400 && candidate != "" && strings.Contains(string(responseBody), "Server does not exist") && index+1 < len(nodeTypeCandidates) {
-			s.logger.Warn("Xboard panel request failed with node_type=", candidate, ", retrying without node_type")
+		if resp.StatusCode == 400 && candidate == "" && strings.Contains(string(responseBody), "Server does not exist") && index+1 < len(nodeTypeCandidates) {
+			s.logger.Warn("Xboard panel request failed without node_type, retrying with configured node_type=", nodeType)
 			continue
 		}