update 2026-08-08 00:47:38

luci-app-passwall2/luasrc/view/passwall2/node_config/footer.htm

@@ -1,8 +1,8 @@
-<%
-local api = self.api
--%>
 <script type="text/javascript">
 	//<![CDATA[
+	let node_id = "<%=self.section%>";
+	let node_config_url = '<%=self.api.url("node_config")%>/' + node_id;
+
 	document.addEventListener("DOMContentLoaded", function () {
 		waitForElement('select[name*="<%=self.config%>"][name*="type"]', function(el) {
 			let o_val = el.value;
@@ -11,13 +11,18 @@ local api = self.api
 				if (o_val != el.value) {
 					let save = true;
 					if (save) {
-						//document.getElementsByClassName('cbi-button-save')[0].click();
-						update_node({
-							remarks: getOption("remarks").value,
-							group: getOption("group").value,
-							type: getOption("type").value,
+						/*
+						const saveBtn = document.getElementsByClassName('cbi-button-save');
+						if (saveBtn && saveBtn.length > 0) {
+							saveBtn[saveBtn.length - 1].click();
+						}
+						*/
+						update_config(node_id, {
+							remarks: getOption("<%=self.config%>", "<%=self.section%>", "remarks").value,
+							group: getOption("<%=self.config%>", "<%=self.section%>", "group").value,
+							type: getOption("<%=self.config%>", "<%=self.section%>", "type").value,
 							protocol: ''
-						});
+						}, node_config_url);
 					}
 				}
 			});
@@ -31,12 +36,17 @@ local api = self.api
 					let name = name_split[name_split.length - 1];
 					let save = true;
 					if (save) {
-						//document.getElementsByClassName('cbi-button-save')[0].click();
-						update_node({
-							remarks: getOption("remarks").value,
-							group: getOption("group").value,
-							protocol: getOption(name).value
-						});
+						/*
+						const saveBtn = document.getElementsByClassName('cbi-button-save');
+						if (saveBtn && saveBtn.length > 0) {
+							saveBtn[saveBtn.length - 1].click();
+						}
+						*/
+						update_config(node_id, {
+							remarks: getOption("<%=self.config%>", "<%=self.section%>", "remarks").value,
+							group: getOption("<%=self.config%>", "<%=self.section%>", "group").value,
+							protocol: getOption("<%=self.config%>", "<%=self.section%>", name).value,
+						}, node_config_url);
 					} else {
 						window.location.href = node_config_url + "?select_proto=" + el.value;
 					}

luci-app-passwall2/luasrc/view/passwall2/node_config/header.htm

@@ -1,64 +1,11 @@
-<%
-local api = self.api
--%>
 <script type="text/javascript">
 	//<![CDATA[
-	let node_id = "<%=self.section%>";
-	let node_config_url = '<%=api.url("node_config")%>/' + node_id;
-
-	function waitForElement(selector, callback) {
-		const el = document.querySelector(selector);
-		if (el) return callback(el);
-		const observer = new MutationObserver(() => {
-			const el = document.querySelector(selector);
-			if (el) {
-				observer.disconnect();
-				callback(el);
-			}
-		});
-		observer.observe(document.body, { childList: true, subtree: true });
-	}
-
-	function getOption(opt) {
-		var obj;
-		var id = 'cbid.<%=self.config%>.' + node_id + '.' + opt;
-		obj = document.getElementsByName(id)[0] || document.getElementById(id);
-		if (obj) {
-			var combobox = document.getElementById('cbi.combobox.' + id);
-			if (combobox) {
-				obj.combobox = combobox;
-			}
-			var div = document.getElementById(id);
-			if (div && div.getElementsByTagName("li").length > 0) {
-				obj = div;
-			}
-			return obj;
-		} else {
-			return null;
-		}
-	}
-	
-	function update_node(data) {
-		XHR.get('<%=api.url("update_node")%>', {
-			id: node_id,
-			data: JSON.stringify(data)
-		},
-		function(x, data) {
-			if (x && x.status == 200 && data.code == 1) {
-				window.location.href = node_config_url;
-			}
-			else {
-				alert("<%:Error%>");
-			}
-		});
-	}
-
 	function fetchCertSha256(el) {
 		if (el.getAttribute("data-loading") === "1") return;
 		el.setAttribute("data-loading", "1");
 		el.style.pointerEvents = "none";
 		el.style.color = "red";
-		XHR.get('<%=api.url("fetch_certsha256")%>', { id: node_id }, function(x, res) {
+		XHR.get('<%=self.api.url("fetch_certsha256")%>', { id: "<%=self.section%>" }, function(x, res) {
 			el.setAttribute("data-loading", "0");
 			el.style.pointerEvents = "";
 			el.style.color = "";

luci-app-passwall2/luasrc/view/passwall2/node_config/link_share_man.htm

@@ -1750,7 +1750,7 @@ local current_node = map:get(section)
 					opt.set(dom_prefix + 'tls', true);
 					opt.set(dom_prefix + 'reality', false);
 					opt.set(dom_prefix + 'alpn', queryParam.alpn || 'default');
-					opt.set(dom_prefix + 'tls_serverName', queryParam.sni || '');
+					opt.set(dom_prefix + 'tls_serverName', queryParam.sni || queryParam.peer || '');
 					opt.set(dom_prefix + 'tls_allowInsecure', !((queryParam.allowinsecure ?? '0') === '0' && (queryParam.insecure ?? '0') === '0'));
 					if (queryParam.fp && queryParam.fp.trim() != "") {
 						opt.set(dom_prefix + 'utls', true);
@@ -1761,7 +1761,7 @@ local current_node = map:get(section)
 					opt.set(dom_prefix + 'tls', true);
 					opt.set(dom_prefix + 'reality', true);
 					opt.set(dom_prefix + 'alpn', queryParam.alpn || 'default');
-					opt.set(dom_prefix + 'tls_serverName', queryParam.sni || '');
+					opt.set(dom_prefix + 'tls_serverName', queryParam.sni || queryParam.peer || '');
 					if (queryParam.fp && queryParam.fp.trim() != "") {
 						opt.set(dom_prefix + 'utls', true);
 						opt.set(dom_prefix + 'fingerprint', queryParam.fp);