🍉 Sync 2026-07-16 23:59:23

dae/Makefile

@@ -6,9 +6,9 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dae
 PKG_VERSION:=2026.07.08
-PKG_RELEASE:=16
+PKG_RELEASE:=17
 
-PKG_SOURCE:=dae-src-2026.07.08-6a60ae809f8b.tar.gz
+PKG_SOURCE:=dae-src-2026.07.08-1363b1a83f0b.tar.gz
 PKG_SOURCE_URL:=https://github.com/kenzok8/openwrt-daede/releases/download/dae-src
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_HASH:=skip

daed/Makefile

@@ -6,9 +6,9 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=daed
 PKG_VERSION:=2026.07.08
-PKG_RELEASE:=22
+PKG_RELEASE:=23
 
-PKG_SOURCE:=daed-src-2026.07.08-e83da9ff800e.tar.gz
+PKG_SOURCE:=daed-src-2026.07.08-68c0e0ce3077.tar.gz
 PKG_SOURCE_URL:=https://github.com/kenzok8/openwrt-daede/releases/download/daed-src
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_HASH:=skip

luci-app-ssr-plus/Makefile

@@ -4,7 +4,7 @@ LUCI_TITLE:=luci-app-ssr-plus
 LUCI_PKGARCH:=all
 PKG_NAME:=luci-app-ssr-plus
 PKG_VERSION:=196
-PKG_RELEASE:=45
+PKG_RELEASE:=46
 
 PKG_CONFIG_DEPENDS:= \
 	CONFIG_PACKAGE_$(PKG_NAME)_Iptables_Transparent_Proxy \

luci-app-ssr-plus/luasrc/view/shadowsocksr/clash_main_panel.htm

@@ -228,12 +228,24 @@ local current_sid = self.map:get(section, "global_server") or "nil"
 			filter: brightness(1.08);
 		}
 
-		@media (max-width: 700px) {
+		/* 手机端优化 */
+		#ssr-clash-main-buttons {
+			display: flex;
+			flex-wrap: wrap;
+			align-items: center;
+			gap: 8px;
+			padding: 6px 0;
+		}
+
+		@media (max-width: 900px) {
 			#ssr-clash-modal {
+				top: 8px;
+				left: 8px;
 				width: calc(100vw - 16px);
 				max-height: calc(100vh - 24px);
 				min-height: min(420px, calc(100vh - 24px));
 				padding: 10px 12px 12px;
+				transform: none;
 			}
 
 			#ssr-clash-modal-header {
@@ -249,21 +261,85 @@ local current_sid = self.map:get(section, "global_server") or "nil"
 				width: 100%;
 				justify-content: flex-start;
 				margin-left: 0;
+				flex-wrap: wrap;
+				gap: 8px; 
 			}
 
 			#ssr-clash-modal-header #ssr-clash-rules-add {
 				margin-left: 0;
 			}
+
+			#ssr-clash-modal-actions .btn,
+			#ssr-clash-main-buttons .btn {
+				flex: 1 1 0;
+				margin: 0 0;
+			}
 		}
 	</style>
 
 	<script type="text/javascript">
+	if (!window.ssrXHR) {
+		window.ssrXHR = (function() {
+			function encode(data) {
+				var pairs = [];
+				var key;
+				for (key in (data || {})) {
+					if (Object.prototype.hasOwnProperty.call(data, key)) {
+						pairs.push(encodeURIComponent(key) + '=' + encodeURIComponent(data[key] == null ? '' : data[key]));
+					}
+				}
+				return pairs.join('&');
+			}
+
+			function request(method, url, data, callback) {
+				var lower = method.toLowerCase();
+				if (window.XHR && typeof window.XHR[lower] === 'function') {
+					return window.XHR[lower](url, data, callback);
+				}
+
+				var xhr = new XMLHttpRequest();
+				var payload = encode(data);
+				var finalUrl = url;
+
+				if (lower === 'get' && payload) {
+					finalUrl += (url.indexOf('?') === -1 ? '?' : '&') + payload;
+				}
+
+				xhr.open(method, finalUrl, true);
+				xhr.setRequestHeader('X-Requested-With', 'XMLHttpRequest');
+				if (lower !== 'get') {
+					xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded; charset=UTF-8');
+				}
+				xhr.onreadystatechange = function() {
+					if (xhr.readyState !== 4) return;
+
+					var rv = null;
+					try {
+						rv = JSON.parse(xhr.responseText || 'null');
+					} catch (e) {}
+
+					if (callback) callback(xhr, rv);
+				};
+				xhr.send(lower === 'get' ? null : payload);
+			}
+
+			return {
+				get: function(url, data, callback) {
+					return request('GET', url, data, callback);
+				},
+				post: function(url, data, callback) {
+					return request('POST', url, data, callback);
+				}
+			};
+		})();
+	}
+
 	if (typeof(window.ssrClashRefreshSubscription) !== "function") {
 		window.ssrClashRefreshSubscription = function(btn, sid) {
 			var original = btn.value;
 			btn.disabled = true;
 			btn.value = '<%:Reloading YAML...%>';
-			XHR.get('<%=luci.dispatcher.build_url("admin", "services", "shadowsocksr", "clash_refresh")%>', {
+			window.ssrXHR.get('<%=luci.dispatcher.build_url("admin", "services", "shadowsocksr", "clash_refresh")%>', {
 				sid: sid
 			}, function(x, result) {
 				btn.disabled = false;
@@ -288,7 +364,7 @@ local current_sid = self.map:get(section, "global_server") or "nil"
 			}
 			btn.disabled = true;
 			btn.value = '<%:Resetting Defaults...%>';
-			XHR.get('<%=luci.dispatcher.build_url("admin", "services", "shadowsocksr", "clash_reset_defaults")%>', {
+			window.ssrXHR.get('<%=luci.dispatcher.build_url("admin", "services", "shadowsocksr", "clash_reset_defaults")%>', {
 				sid: sid
 			}, function(x, result) {
 				btn.disabled = false;
@@ -642,7 +718,7 @@ local current_sid = self.map:get(section, "global_server") or "nil"
 
 				select.onchange = function() {
 					setPanelStatus('<%:Switching...%>', '#0072c3');
-					XHR.get('<%=luci.dispatcher.build_url("admin", "services", "shadowsocksr", "clash_switch")%>', {
+						window.ssrXHR.get('<%=luci.dispatcher.build_url("admin", "services", "shadowsocksr", "clash_switch")%>', {
 						sid: currentPanelSid,
 						group: group.name,
 						name: select.value
@@ -699,7 +775,7 @@ local current_sid = self.map:get(section, "global_server") or "nil"
 				payload['rule_' + index + '_policy_group'] = rule.policy_group || '';
 			});
 
-			XHR.post('<%=luci.dispatcher.build_url("admin", "services", "shadowsocksr", "clash_client_rule_save")%>', payload, function(x, result) {
+			window.ssrXHR.post('<%=luci.dispatcher.build_url("admin", "services", "shadowsocksr", "clash_client_rule_save")%>', payload, function(x, result) {
 				btn.disabled = false;
 				btn.value = original;
 				if (result && result.success) {
@@ -733,7 +809,7 @@ local current_sid = self.map:get(section, "global_server") or "nil"
 			if (importBtn) importBtn.style.display = '';
 			if (refreshBtn) refreshBtn.style.display = 'none';
 
-			XHR.get('<%=luci.dispatcher.build_url("admin", "services", "shadowsocksr", "clash_client_policies")%>', {
+			window.ssrXHR.get('<%=luci.dispatcher.build_url("admin", "services", "shadowsocksr", "clash_client_policies")%>', {
 				sid: sid
 			}, function(x, result) {
 				if (!result || !result.active) {
@@ -785,7 +861,7 @@ local current_sid = self.map:get(section, "global_server") or "nil"
 			if (exportBtn) exportBtn.style.display = 'none';
 			if (importBtn) importBtn.style.display = 'none';
 			if (refreshBtn) refreshBtn.style.display = '';
-			XHR.get('<%=luci.dispatcher.build_url("admin", "services", "shadowsocksr", "clash_groups")%>', {
+			window.ssrXHR.get('<%=luci.dispatcher.build_url("admin", "services", "shadowsocksr", "clash_groups")%>', {
 				sid: sid
 			}, function(x, result) {
 				if (result && result.sid) {
@@ -842,6 +918,7 @@ local current_sid = self.map:get(section, "global_server") or "nil"
 			var customRulesBtn = document.getElementById('ssr-clash-main-client-rules');
 			var resetBtn = document.getElementById('ssr-clash-main-reset-defaults');
 			var panelBtn = document.getElementById('ssr-clash-main-open');
+			var btnContainer = document.getElementById('ssr-clash-main-buttons');
 			if (!select || !row || !customRulesBtn || !resetBtn || !panelBtn) {
 				return;
 			}
@@ -852,11 +929,13 @@ local current_sid = self.map:get(section, "global_server") or "nil"
 				customRulesBtn.setAttribute('data-sid', sid);
 				resetBtn.setAttribute('data-sid', sid);
 				panelBtn.setAttribute('data-sid', sid);
+				if (btnContainer) btnContainer.style.display = 'flex';
 			} else {
 				row.style.display = 'none';
 				customRulesBtn.setAttribute('data-sid', '');
 				resetBtn.setAttribute('data-sid', '');
 				panelBtn.setAttribute('data-sid', '');
+				if (btnContainer) btnContainer.style.display = 'none';
 			}
 		}
 
@@ -872,9 +951,11 @@ local current_sid = self.map:get(section, "global_server") or "nil"
 			var modalMask = document.getElementById('ssr-clash-modal-mask');
 			var wrap = document.getElementById('ssr-clash-main-panel-wrap');
 			var row = wrap ? wrap.closest('.cbi-value') : null;
+			var btnContainer = document.getElementById('ssr-clash-main-buttons');
 
 			if (row && !clashNodes['<%=current_sid%>']) {
 				row.style.display = 'none';
+				if (btnContainer) btnContainer.style.display = 'none';
 			}
 
 			if (select) {
@@ -955,7 +1036,7 @@ local current_sid = self.map:get(section, "global_server") or "nil"
 						return false;
 					}
 					modalRulesClearBtn.disabled = true;
-					XHR.post('<%=luci.dispatcher.build_url("admin", "services", "shadowsocksr", "clash_client_rule_clear")%>', {
+					window.ssrXHR.post('<%=luci.dispatcher.build_url("admin", "services", "shadowsocksr", "clash_client_rule_clear")%>', {
 						sid: currentEditorSid
 					}, function(x, result) {
 						modalRulesClearBtn.disabled = false;
@@ -984,27 +1065,29 @@ local current_sid = self.map:get(section, "global_server") or "nil"
 	})();
 	</script>
 
-	<input
+	<div id="ssr-clash-main-buttons">
-		type="button"
+		<input
-		id="ssr-clash-main-client-rules"
+			type="button"
-		class="btn cbi-button"
+			id="ssr-clash-main-client-rules"
-		value="<%:Custom Client Proxies Rules%>"
+			class="btn cbi-button"
-		title="<%:Custom Client Proxies Rules%>"
+			value="<%:Custom Client Proxies Rules%>"
-		data-sid="<%=current_sid%>" />
+			title="<%:Custom Client Proxies Rules%>"
-	<input
+			data-sid="<%=current_sid%>" />
-		type="button"
+		<input
-		id="ssr-clash-main-reset-defaults"
+			type="button"
-		class="btn cbi-button"
+			id="ssr-clash-main-reset-defaults"
-		value="<%:Reset Default Proxies Rules%>"
+			class="btn cbi-button"
-		title="<%:Reset Default Proxies Rules%>"
+			value="<%:Reset Default Proxies Rules%>"
-		data-sid="<%=current_sid%>" />
+			title="<%:Reset Default Proxies Rules%>"
-	<input
+			data-sid="<%=current_sid%>" />
-		type="button"
+		<input
-		id="ssr-clash-main-open"
+			type="button"
-		class="btn cbi-button cbi-button-apply"
+			id="ssr-clash-main-open"
-		value="<%:Mihomo Pannel%>"
+			class="btn cbi-button cbi-button-apply"
-		title="<%:Mihomo Pannel%>"
+			value="<%:Mihomo Pannel%>"
-		data-sid="<%=current_sid%>" />
+			title="<%:Mihomo Pannel%>"
+			data-sid="<%=current_sid%>" />
+	</div>
 
 	<div id="ssr-clash-modal-mask"></div>
 	<div id="ssr-clash-modal" role="dialog" aria-modal="true" aria-labelledby="ssr-clash-modal-title">

luci-app-ssr-plus/luasrc/view/shadowsocksr/server_list.htm

@@ -59,6 +59,62 @@ end
 
 <script type="text/javascript">
 		//<![CDATA[
+		if (!window.ssrXHR) {
+			window.ssrXHR = (function() {
+				function encode(data) {
+					var pairs = [];
+					var key;
+					for (key in (data || {})) {
+						if (Object.prototype.hasOwnProperty.call(data, key)) {
+							pairs.push(encodeURIComponent(key) + '=' + encodeURIComponent(data[key] == null ? '' : data[key]));
+						}
+					}
+					return pairs.join('&');
+				}
+
+				function request(method, url, data, callback) {
+					var lower = method.toLowerCase();
+					if (window.XHR && typeof window.XHR[lower] === "function") {
+						return window.XHR[lower](url, data, callback);
+					}
+
+					var xhr = new XMLHttpRequest();
+					var payload = encode(data);
+					var finalUrl = url;
+
+					if (lower === "get" && payload) {
+						finalUrl += (url.indexOf('?') === -1 ? '?' : '&') + payload;
+					}
+
+					xhr.open(method, finalUrl, true);
+					xhr.setRequestHeader('X-Requested-With', 'XMLHttpRequest');
+					if (lower !== "get") {
+						xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded; charset=UTF-8');
+					}
+					xhr.onreadystatechange = function() {
+						if (xhr.readyState !== 4) return;
+
+						var rv = null;
+						try {
+							rv = JSON.parse(xhr.responseText || 'null');
+						} catch (e) {}
+
+						if (callback) callback(xhr, rv);
+					};
+					xhr.send(lower === "get" ? null : payload);
+				}
+
+				return {
+					get: function(url, data, callback) {
+						return request('GET', url, data, callback);
+					},
+					post: function(url, data, callback) {
+						return request('POST', url, data, callback);
+					}
+				};
+			})();
+		}
+
 		window.addEventListener('load', function () {
 			const doms = document.getElementsByClassName('pingtime');
 			const ports = document.getElementsByClassName("socket-connected");
@@ -165,7 +221,7 @@ end
 						return;
 					}
 					port.innerHTML = '<font style=\"color:#0072c3\">connect</font>';
-						XHR.get('<%=luci.dispatcher.build_url("admin", "services", "shadowsocksr", "ping")%>', {
+							window.ssrXHR.get('<%=luci.dispatcher.build_url("admin", "services", "shadowsocksr", "ping")%>', {
 							index,
 							sid: dom.getAttribute("data-sid"),
 							domain: dom.getAttribute("hint"),
@@ -280,7 +336,7 @@ end
 		var server_page = pageElem ? pageElem.value : '<%=self.server_page or 1%>';
 		var server_page_size = pageSizeElem ? pageSizeElem.value : '<%=self.server_page_size or 0%>';
 		if (input) input.value = order;
-		XHR.post('<%=luci.dispatcher.build_url("admin", "services", "shadowsocksr", "save_order")%>', {
+		window.ssrXHR.post('<%=luci.dispatcher.build_url("admin", "services", "shadowsocksr", "save_order")%>', {
 			order: order,
 			page: server_page,
 			page_size: server_page_size

luci-app-ssr-plus/luasrc/view/shadowsocksr/server_table.htm

@@ -197,6 +197,77 @@ end
 
 <!-- tblsection -->
 <div class="cbi-section cbi-tblsection" id="cbi-<%=self.config%>-<%=self.sectiontype%>">
+	<script type="text/javascript">
+		if (!window.ssrXHR) {
+			window.ssrXHR = (function() {
+				function encode(data) {
+					var pairs = [];
+					var key;
+					for (key in (data || {})) {
+						if (Object.prototype.hasOwnProperty.call(data, key)) {
+							pairs.push(encodeURIComponent(key) + '=' + encodeURIComponent(data[key] == null ? '' : data[key]));
+						}
+					}
+					return pairs.join('&');
+				}
+
+				function request(method, url, data, callback) {
+					var lower = method.toLowerCase();
+					if (window.XHR && typeof window.XHR[lower] === "function") {
+						return window.XHR[lower](url, data, callback);
+					}
+
+					var xhr = new XMLHttpRequest();
+					var payload = encode(data);
+					var finalUrl = url;
+
+					if (lower === "get" && payload) {
+						finalUrl += (url.indexOf('?') === -1 ? '?' : '&') + payload;
+					}
+
+					xhr.open(method, finalUrl, true);
+					xhr.setRequestHeader('X-Requested-With', 'XMLHttpRequest');
+					if (lower !== "get") {
+						xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded; charset=UTF-8');
+					}
+					xhr.onreadystatechange = function() {
+						if (xhr.readyState !== 4) return;
+
+						var rv = null;
+						try {
+							rv = JSON.parse(xhr.responseText || 'null');
+						} catch (e) {}
+
+						if (callback) callback(xhr, rv);
+					};
+					xhr.send(lower === "get" ? null : payload);
+				}
+
+				return {
+					get: function(url, data, callback) {
+						return request('GET', url, data, callback);
+					},
+					post: function(url, data, callback) {
+						return request('POST', url, data, callback);
+					}
+				};
+			})();
+		}
+
+		if (typeof window.ssrDeleteNode !== "function") {
+			window.ssrDeleteNode = function(sid) {
+				window.ssrXHR.post('<%=luci.dispatcher.build_url("admin", "services", "shadowsocksr", "delete_node")%>', {
+					sid: sid
+				}, function(x, result) {
+					result = result || {};
+					if (result.ret == 1) {
+						window.location.reload();
+					}
+				});
+				return false;
+			};
+		}
+	</script>
 	<% if self.title and #self.title > 0 then -%>
 		<h3><%=self.title%></h3>
 	<%- end %>
@@ -244,22 +315,10 @@ end
 							%> onclick="location.href='<%=self:extedit(section)%>'"
 							<%- end
 							%> alt="<%:Edit%>" title="<%:Edit%>" />
-						<% end; if self.addremove then %>
+							<% end; if self.addremove then %>
-							<input class="btn cbi-button cbi-button-remove" type="button" value="<%:Delete%>"
+								<input class="btn cbi-button cbi-button-remove" type="button" value="<%:Delete%>"
-								onclick="
+									onclick="return window.ssrDeleteNode('<%=k%>')"
-									var sid = '<%=k%>';
+								/>
-									XHR.post('<%=luci.dispatcher.build_url("admin", "services", "shadowsocksr", "delete_node")%>', {
-										sid: sid
-									}, function(x, result) {
-										result = result || {};
-										if (result.ret == 1) {
-											window.location.reload();
-											return;
-										}
-									});
-									return false;
-								"
-							/>
 						<%- end -%>
 					</div>
 				</td>

luci-app-ssr-plus/luasrc/view/shadowsocksr/subscribe_actions_footer.htm

@@ -20,6 +20,36 @@ local function width(o)
 end
 -%>
 <script type="text/javascript">//<![CDATA[
+	function ssrPost(url, data, callback) {
+		if (window.XHR && typeof window.XHR.post === 'function') {
+			return window.XHR.post(url, data, callback);
+		}
+
+		var xhr = new XMLHttpRequest();
+		var payload = [];
+		var key;
+		for (key in (data || {})) {
+			if (Object.prototype.hasOwnProperty.call(data, key)) {
+				payload.push(encodeURIComponent(key) + '=' + encodeURIComponent(data[key] == null ? '' : data[key]));
+			}
+		}
+
+		xhr.open('POST', url, true);
+		xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded; charset=UTF-8');
+		xhr.setRequestHeader('X-Requested-With', 'XMLHttpRequest');
+		xhr.onreadystatechange = function() {
+			if (xhr.readyState !== 4) return;
+
+			var rv = null;
+			try {
+				rv = JSON.parse(xhr.responseText || 'null');
+			} catch (e) {}
+
+			if (callback) callback(xhr, rv);
+		};
+		xhr.send(payload.join('&'));
+	}
+
 	window.ssrUpdateSubscribeItem = window.ssrUpdateSubscribeItem || function(btn) {
 		if (!btn) return false;
 
@@ -72,9 +102,9 @@ end
 			for (var field in fields) {
 				var value = fields[field];
 				var promise = new Promise(function(resolve, reject) {
-					XHR.post(
+					ssrPost(
-						'<%=luci.dispatcher.build_url("admin", "services", "shadowsocksr", "toggle_subscribe_item_enabled")%>',
+							'<%=luci.dispatcher.build_url("admin", "services", "shadowsocksr", "toggle_subscribe_item_enabled")%>',
-						{ sid: sid, field: field, value: value },
+							{ sid: sid, field: field, value: value },
 						function(x, rv) {
 							if (rv && Number(rv.ret) === 1) {
 								resolve();
@@ -112,7 +142,7 @@ end
 		if (!confirm('<%:Are you sure you want to delete subscribe link: %s ?%>'.replace('%s', sid))) return;
 
 		btn.disabled = true;
-		XHR.post('<%=luci.dispatcher.build_url("admin", "services", "shadowsocksr", "delete_subscribe_item")%>',
+		ssrPost('<%=luci.dispatcher.build_url("admin", "services", "shadowsocksr", "delete_subscribe_item")%>',
 			{ sid: sid },
 			function(x, rv) {
 				btn.disabled = false;
@@ -218,7 +248,7 @@ end
 		btn.disabled = true;
 		btn.value = '<%:Adding...%>';
 
-		XHR.post(
+		ssrPost(
 			'<%=luci.dispatcher.build_url("admin", "services", "shadowsocksr", "add_subscribe_item")%>',
 			{},
 			function(x, rv) {

luci-app-ssr-plus/luasrc/view/shadowsocksr/subscribe_enabled_autosave.htm

@@ -1,5 +1,35 @@
 <script type="text/javascript">//<![CDATA[
 	(function() {
+		function ssrPost(url, data, callback) {
+			if (window.XHR && typeof window.XHR.post === 'function') {
+				return window.XHR.post(url, data, callback);
+			}
+
+			var xhr = new XMLHttpRequest();
+			var payload = [];
+			var key;
+			for (key in (data || {})) {
+				if (Object.prototype.hasOwnProperty.call(data, key)) {
+					payload.push(encodeURIComponent(key) + '=' + encodeURIComponent(data[key] == null ? '' : data[key]));
+				}
+			}
+
+			xhr.open('POST', url, true);
+			xhr.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded; charset=UTF-8');
+			xhr.setRequestHeader('X-Requested-With', 'XMLHttpRequest');
+			xhr.onreadystatechange = function() {
+				if (xhr.readyState !== 4) return;
+
+				var rv = null;
+				try {
+					rv = JSON.parse(xhr.responseText || 'null');
+				} catch (e) {}
+
+				if (callback) callback(xhr, rv);
+			};
+			xhr.send(payload.join('&'));
+		}
+
 		function bindSubscribeItemEnabledAutoSave() {
 			var root = document.getElementById('cbi-shadowsocksr-server_subscribe_item');
 			if (!root || root.getAttribute('data-enabled-autosave-bound') === '1') {
@@ -21,7 +51,7 @@
 				var original = target.checked;
 				target.disabled = true;
 
-				XHR.post(
+				ssrPost(
 					'<%=luci.dispatcher.build_url("admin", "services", "shadowsocksr", "toggle_subscribe_item_enabled")%>',
 					{ sid: sid, enabled: original ? '1' : '0' },
 					function(x, rv) {