From 8593430f1d0ac35668115b75e3702f19769a0f8b Mon Sep 17 00:00:00 2001
From: action <actions@github.com>
Date: Thu, 14 May 2026 21:57:57 +0800
Subject: [PATCH] update 2026-05-14 21:57:57

---
 .../luasrc/view/passwall/global/footer.htm    | 112 +++++++++++-------
 .../root/usr/share/passwall/app.sh            |   4 +-
 2 files changed, 68 insertions(+), 48 deletions(-)

diff --git a/luci-app-passwall/luasrc/view/passwall/global/footer.htm b/luci-app-passwall/luasrc/view/passwall/global/footer.htm
index 7aee20c2..7c7b1b4d 100644
--- a/luci-app-passwall/luasrc/view/passwall/global/footer.htm
+++ b/luci-app-passwall/luasrc/view/passwall/global/footer.htm
@@ -35,22 +35,25 @@ local appname = api.appname
 </style>
 <script type="text/javascript">
 	//<![CDATA[
-	var shunt_list = JSON.parse('<%=self.shunt_list%>');
+	const shunt_list = JSON.parse('<%=self.shunt_list%>');
 
 	function to_edit_node(btn) {
 		if (!btn) return;
-		const idReg = /^cbid\.<%=appname%>\..*node$/;
+		const idReg = /^cbid\..*\..*node$/;
 		let hidden_select = null;
 		const container = btn.closest('#cbi-<%=appname%>-global') || btn.closest('#cbi-<%=appname%>-socks');
 		if (!container) return null;
-		const selects = container.querySelectorAll('select[id^="cbid.<%=appname%>."]');
+		const selects = container.querySelectorAll('select[id^="cbid."][id*="."][id$="node"]');
 		for (const sel of selects) {
 			if ( idReg.test(sel.id) && getComputedStyle(sel).display === "none" && (sel.compareDocumentPosition(btn) & Node.DOCUMENT_POSITION_FOLLOWING)) {
 				hidden_select = sel;
 			}
 		}
 		if (!hidden_select) return;
-		let node_select_value = hidden_select ? hidden_select.options[0].value : "";
+		let node_select_value = hidden_select?.options[0]?.value;
+		if (!node_select_value || node_select_value.indexOf("_default") === 0 || node_select_value.indexOf("_direct") === 0 || node_select_value.indexOf("_blackhole") === 0) {
+			return;
+		}
 		let to_url = '<%=api.url("node_config")%>/' + node_select_value;
 		if (node_select_value.indexOf("Socks_") === 0) {
 			to_url = '<%=api.url("socks_config")%>/' + node_select_value.substring("Socks_".length);
@@ -58,19 +61,21 @@ local appname = api.appname
 		location.href = to_url;
 	}
 
-	function go() {
-		var _status = document.getElementsByClassName('_status');
-		for (var i = 0; i < _status.length; i++) {
-			var id = _status[i].getAttribute("socks_id");
+	const delay = (ms) => new Promise(resolve => setTimeout(resolve, ms));
+
+	async function go() {
+		const _status = document.getElementsByClassName('_status');
+		for (let i = 0; i < _status.length; i++) {
+			const id = _status[i].getAttribute("socks_id");
 			XHR.get('<%=api.url("socks_status")%>', {
 					index: i,
 					id: id
 				},
 				function(x, result) {
-					var index = result.index;
-					var div = '';
-					var div1 = '<font style="font-weight:bold;" color="green">✓</font>&nbsp';
-					var div2 = '<font style="font-weight:bold;" color="red">X</font>&nbsp';
+					const index = result.index;
+					let div = '';
+					const div1 = '<font style="font-weight:bold;" color="green">✓</font>&nbsp';
+					const div2 = '<font style="font-weight:bold;" color="red">X</font>&nbsp';
 
 					if (result.socks_status) {
 						div += div1;
@@ -89,62 +94,77 @@ local appname = api.appname
 			);
 		}
 
-		var global_id = null;
-		var global = document.getElementById("cbi-<%=appname%>-global");
+		let global_id = null;
+		const global = document.getElementById("cbi-<%=appname%>-global");
 		if (global) {
-			var node = global.getElementsByClassName("cbi-section-node")[0];
-			var node_id = node.getAttribute("id");
-			global_id = node_id;
-			var all_node = node.querySelectorAll("[id]");
-			//var reg1 = /^cbid\..*node\.main$/;
-			var reg1 = /^cbid\..*\.(tcp_node|udp_node)\.main$/;
+			// 分流规则节点提前加入 “编辑” 占位符，以保证节点列表左对齐
+			document.querySelectorAll('.td[data-widget="nodes_listvalue"][data-name="_node"] > div').forEach(container => {
+				if (!container.querySelector('.shunt-node-placeholder')) {
+					const placeholder = document.createElement('div');
+					placeholder.className = 'shunt-node-placeholder';
+					placeholder.style.cssText = 'display:inline-flex; width:40px; flex-shrink:0;';
+					container.appendChild(placeholder);
+				}
+			});
 
-			for (var i = 0; i < all_node.length; i++) {
-				var el = all_node[i];
+			await delay(100);
+
+			const node = global.getElementsByClassName("cbi-section-node")[0];
+			const node_id = node.getAttribute("id");
+			global_id = node_id;
+			const all_node = node.querySelectorAll("[id]");
+			const reg1 = /^cbid\..*node\.main$/;
+			//const reg1 = /^cbid\..*\.(tcp_node|udp_node)\.main$/;
+
+			for (let i = 0; i < all_node.length; i++) {
+				const el = all_node[i];
 				if (!reg1.test(el.id)) continue;
 
-				var node_select = el;
+				const node_select = el;
 				if (!node_select) continue;
-				var cbid = el.id.replace(/\.main$/, "");
-				var hidden_select = document.getElementById(cbid);
-				var node_select_value = hidden_select ? hidden_select.options[0].value : "";
-				if (!node_select_value || node_select_value === "" || node_select_value.indexOf("tcp") === 0) {
+				const cbid = el.id.replace(/\.main$/, "");
+				const hidden_select = document.getElementById(cbid);
+				const node_select_value = hidden_select?.options[0]?.value;
+				if (!node_select_value || node_select_value.indexOf("tcp") === 0 || node_select_value.indexOf("_default") === 0 || node_select_value.indexOf("_direct") === 0 || node_select_value.indexOf("_blackhole") === 0) {
 					continue;
 				}
 
-				var html = '<a href="#" onclick="return to_edit_node(this);"><%:Edit%></a>';
+				let html = '<a href="#" onclick="return to_edit_node(this);"><%:Edit%></a>';
 
-				var m = cbid.match(/\.(tcp|udp)_node$/);
+				const m = cbid.match(/\.(tcp|udp)_node$/);
 				if (m && (m[1] === "tcp" || m[1] === "udp")) {
 					html += '<a href="#" onclick="window.open(\'' + '<%=api.url("get_redir_log")%>?name=default&proto=' + m[1] + '\', \'_blank\')"><%:Log%></a>';
 				}
 
-				node_select.insertAdjacentHTML("beforeend",
-					'<div class="node-actions" style="display:inline-flex; align-items:center; gap:4px; flex-wrap:wrap; margin-left:4px;">'  
-					+ html + '</div>'
-				);
+				html = '<div class="node-actions" style="display:inline-flex; align-items:center; gap:4px; flex-wrap:wrap; margin-left:4px;">' + html + '</div>'
+
+				const placeholder = node_select.parentElement.querySelector('.shunt-node-placeholder');
+				if (placeholder) {
+					placeholder.innerHTML = html;
+				} else {
+					node_select.insertAdjacentHTML("beforeend", html);
+				}
 			}
 		}
 
-		var socks = document.getElementById("cbi-<%=appname%>-socks");
+		const socks = document.getElementById("cbi-<%=appname%>-socks");
 		if (socks) {
-			var socks_enabled_dom = document.getElementById(global_id + "-socks_enabled");
-			socks_enabled_dom.parentNode.removeChild(socks_enabled_dom);
-			var descr = socks.getElementsByClassName("cbi-section-descr")[0];
-			descr.outerHTML = socks_enabled_dom.outerHTML;
-			rows = socks.getElementsByClassName("cbi-section-table-row");
-			for (var i = 0; i < rows.length; i++) {
+			const socks_enabled_dom = document.getElementById(global_id + "-socks_enabled");
+			const descr = socks.getElementsByClassName("cbi-section-descr")[0];
+			descr.replaceWith(socks_enabled_dom);
+			const rows = socks.getElementsByClassName("cbi-section-table-row");
+			for (let i = 0; i < rows.length; i++) {
 				try {
-					var row = rows[i];
-					var id = row.id;
+					const row = rows[i];
+					const id = row.id;
 					if (!id) continue;
-					var dom_id = id + "-node";
-					var cbid = dom_id.replace("cbi-", "cbid-").replace(new RegExp("-", 'g'), ".");
+					let dom_id = id + "-node";
+					const cbid = dom_id.replace("cbi-", "cbid-").replace(new RegExp("-", 'g'), ".");
 					dom_id = cbid + ".main";
-					var node_select = document.getElementById(dom_id);
+					const node_select = document.getElementById(dom_id);
 					if (!node_select) continue;
 
-					var html = '<a href="#" onclick="return to_edit_node(this);"><%:Edit%></a>';
+					let html = '<a href="#" onclick="return to_edit_node(this);"><%:Edit%></a>';
 					html += '<a href="#" onclick="window.open(\'' + '<%=api.url("get_socks_log")%>?name=' + id.replace("cbi-<%=appname%>-", "") + '\', \'_blank\')"><%:Log%></a>';
 
 					node_select.insertAdjacentHTML("afterend",
diff --git a/luci-app-passwall/root/usr/share/passwall/app.sh b/luci-app-passwall/root/usr/share/passwall/app.sh
index 9aa3ab01..d29cf2d3 100755
--- a/luci-app-passwall/root/usr/share/passwall/app.sh
+++ b/luci-app-passwall/root/usr/share/passwall/app.sh
@@ -1037,7 +1037,7 @@ start_socks() {
 				NO_REC_PROCESS=$no_rec $APP_PATH/app.sh run_socks flag=$id node=$node bind=$bind socks_port=$port config_file=$config_file http_port=$http_port http_config_file=$http_config_file log_file=$log_file
 				set_cache_var "socks_${id}" "$node"
 				#自动切换逻辑
-				[ "$enable_autoswitch" = "1" ] && $APP_PATH/socks_auto_switch.sh ${id} > /dev/null 2>&1 &
+				[ "$enable_autoswitch" = "1" ] && { $APP_PATH/socks_auto_switch.sh ${id} > /dev/null 2>&1 & }
 			done
 		}
 	}
@@ -1101,7 +1101,7 @@ start_crontab() {
 
 	if [ "$ENABLED_DEFAULT_ACL" = "1" ] || [ "$ENABLED_ACLS" = "1" ]; then
 		local start_daemon=$(config_t_get global_delay start_daemon 0)
-		[ "$start_daemon" = "1" ] && $APP_PATH/monitor.sh >/dev/null 2>&1 &
+		[ "$start_daemon" = "1" ] && { $APP_PATH/monitor.sh >/dev/null 2>&1 & }
 	fi
 
 	if [ -f "${LOCK_PATH}/${CONFIG}_cron.lock" ]; then