⛄ Sync 2026-07-31 00:04:03

luci-app-daede/Makefile

@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-daede
 PKG_VERSION:=1.14.7
-PKG_RELEASE:=35
+PKG_RELEASE:=36
 PKG_MAINTAINER:=kenzok8
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
 

luci-app-daede/htdocs/luci-static/resources/view/daede/dae.js

@@ -15,6 +15,7 @@ const RE_PLACEHOLDER_URL = /(['"])(?:(?:https?|https-file|file):\/\/[^'"]*?(?:ex
 const DEFAULT_TEMPLATE =
 	'# luci-app-daede 默认配置：把 subscription 里的占位链接换成你的机场订阅，保存即可运行。\n' +
 	'global {\n' +
+	'    # 端口与网卡：lan_interface 填内网桥（通常 br-lan），wan_interface 保持 auto 即可。\n' +
 	'    tproxy_port: 12345\n' +
 	'    tproxy_port_protect: true\n' +
 	'    so_mark_from_dae: 0\n' +
@@ -35,6 +36,7 @@ const DEFAULT_TEMPLATE =
 	'}\n' +
 	'\n' +
 	'dns {\n' +
+	'    # 国内域名走 cndns 解析，其余走 fallbackdns，避免 DNS 污染。\n' +
 	'    ipversion_prefer: 4\n' +
 	'    response_ttl: 0\n' +
 	'    upstream {\n' +
@@ -50,6 +52,7 @@ const DEFAULT_TEMPLATE =
 	'}\n' +
 	'\n' +
 	'group {\n' +
+	'    # 节点分组：filter 决定用订阅里的哪些节点，policy 决定怎么选（min_moving_avg = 自动挑最快）。\n' +
 	'    proxy {\n' +
 	'        filter: subtag(my_airport)\n' +
 	'        policy: min_moving_avg\n' +
@@ -57,6 +60,8 @@ const DEFAULT_TEMPLATE =
 	'}\n' +
 	'\n' +
 	'routing {\n' +
+	'    # 分流规则：从上往下匹配，命中即停，最后由 fallback 兜底。\n' +
+	'    # 想让某个网站直连，在 fallback 之前加一行，例如：domain(example.com) -> direct\n' +
 	'    pname(NetworkManager) -> direct\n' +
 	'    dip(224.0.0.0/3) -> direct\n' +
 	'    dip(255.255.255.255/32) -> direct\n' +
@@ -577,8 +582,12 @@ function renderDaeEditor() {
 	function syncHL() {
 		hlCode.innerHTML = highlightDae(textarea.value) + '\n';
 		hlPre.scrollTop = textarea.scrollTop;
+		hlPre.scrollLeft = textarea.scrollLeft;
 	}
-	textarea.addEventListener('scroll', function() { hlPre.scrollTop = textarea.scrollTop; });
+	textarea.addEventListener('scroll', function() {
+		hlPre.scrollTop = textarea.scrollTop;
+		hlPre.scrollLeft = textarea.scrollLeft;
+	});
 	const save = E('button', { 'class': 'cbi-button cbi-button-positive' }, _('Save manual config'));
 	const init = E('button', { 'class': 'cbi-button cbi-button-action' }, _('Load default config'));
 	const status = E('span', { 'class': 'dd-editor-status' }, '');

luci-app-daede/htdocs/luci-static/resources/view/daede/styles.js

@@ -116,6 +116,7 @@ const CSS = [
 	/* keep selected text transparent too — else the browser force-colors it and
 	   it ghosts over the highlight pre underneath */
 	'.dd-edit-wrap .dd-editor-hl::selection{background:rgba(56,134,161,.25);color:transparent}',
+	'@media screen and (max-device-width:600px){.dd-edit-wrap .dd-editor,.dd-edit-wrap .dd-hl,.dd-edit-wrap .dd-hl code{font-size:16px}}',
 	'.dh-c{color:#8a919a;font-style:italic}',
 	'.dh-s{color:#2a8a4a}',
 	'.dh-k{color:#9a3fb5;font-weight:600}',

luci-app-daede/root/usr/share/luci-app-daede/update-geo.sh

@@ -28,6 +28,34 @@ esac
 
 LOCK="/tmp/luci-app-daede.${TYPE}.lock"
 LOG="/tmp/luci-app-daede.${TYPE}.log"
+RLOCK="/tmp/luci-app-daede.geo-reload.lock"
+
+schedule_backend_reload() {
+	if [ -d "$RLOCK" ]; then
+		rmt=$(date -r "$RLOCK" +%s 2>/dev/null || echo 0)
+		[ $(( $(date +%s) - rmt )) -gt 300 ] && rmdir "$RLOCK" 2>/dev/null
+	fi
+	mkdir "$RLOCK" 2>/dev/null || return 0
+	(
+		sleep 25
+		ab="$(uci -q get daede.config.active_backend 2>/dev/null || echo daed)"
+		if [ "$ab" = dae ]; then
+			bin=dae; act=hot_reload
+		else
+			bin=daed; act=reload
+		fi
+		if /bin/pidof "$bin" >/dev/null 2>&1; then
+			if "/etc/init.d/$bin" "$act" >/dev/null 2>&1; then
+				echo "$(date '+%F %T') reloaded $bin"
+			else
+				echo "$(date '+%F %T') $bin reload failed"
+			fi
+		else
+			echo "$(date '+%F %T') $bin not running; skip reload"
+		fi
+		rmdir "$RLOCK" 2>/dev/null
+	) </dev/null >>"$LOG" 2>&1 &
+}
 
 if [ -f "$LOCK" ]; then
 	# Lock is fresh (< 5 min)? Refuse. Stale? Remove and proceed.
@@ -73,6 +101,7 @@ fi
 		else
 			mv "$TMP" "$DEST"
 			echo "$(date '+%F %T') updated $DEST ($size bytes)"
+			schedule_backend_reload
 		fi
 	fi
 	if [ "$rc" = 0 ]; then echo "$(date '+%F %T') ✓ 完成"; else echo "$(date '+%F %T') ✗ 失败 (rc=$rc)"; fi