🍉 Sync 2026-09-25 18:00:12

luci-app-daede/Makefile

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

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

@@ -45,6 +45,7 @@ const DEFAULT_TEMPLATE =
 	'    }\n' +
 	'    routing {\n' +
 	'        request {\n' +
+	'            qname(suffix:googleapis.cn) -> fallbackdns\n' +
 	'            qname(geosite:cn) -> cndns\n' +
 	'            fallback: fallbackdns\n' +
 	'        }\n' +
@@ -70,6 +71,7 @@ const DEFAULT_TEMPLATE =
 	'    l4proto(udp) && dport(123) -> direct\n' +
 	'    domain(connectivitycheck.gstatic.com) -> direct\n' +
 	'    domain(msftconnecttest.com) -> direct\n' +
+	'    domain(suffix:googleapis.cn) -> proxy\n' +
 	'    dip(geoip:cn) -> direct\n' +
 	'    domain(geosite:cn) -> direct\n' +
 	'    fallback: proxy\n' +
@@ -704,7 +706,7 @@ function renderDaeEditor() {
 		save.disabled = true;
 		flashStatus(_('Validating…'));
 		fs.write(VALIDATE_PATH, textarea.value, 384)
-			.then(function() { return fs.exec('/usr/bin/dae', ['validate', '-c', VALIDATE_PATH]); })
+			.then(function() { return fs.exec('/usr/bin/env', ['DAE_LOCATION_ASSET=/usr/share/v2ray', '/usr/bin/dae', 'validate', '-c', VALIDATE_PATH]); })
 			.then(function(res) {
 				if (res && res.code !== 0) {
 					const err = (res.stderr || res.stdout || ('exit ' + res.code)).trim().split('\n')[0];

luci-app-daede/root/etc/uci-defaults/90-luci-app-daede-init

@@ -53,6 +53,7 @@ DAE_INIT="/etc/init.d/dae"
 if [ -f "$DAE_INIT" ]; then
 	sed -i 's/--disable-timestamp//' "$DAE_INIT"
 	sed -i '/procd_append_param command *$/d' "$DAE_INIT"
+	sed -i 's|^[[:space:]]*"$PROG" validate -c "$config_file"|    DAE_LOCATION_ASSET="/usr/share/v2ray" "$PROG" validate -c "$config_file"|' "$DAE_INIT"
 	sed -i 's|procd_set_param env DAE_LOCATION_ASSET="/usr/share/v2ray".*|procd_set_param env DAE_LOCATION_ASSET="/usr/share/v2ray" TZ="$(uci -q get system.@system[0].zonename)"|' "$DAE_INIT"
 fi
 

luci-app-daede/root/usr/share/luci-app-daede/gen-dae-config.sh

@@ -271,6 +271,7 @@ generate() {
 		echo "    routing {"
 		echo "        request {"
 		[ "$block_ads" = "1" ] && echo "            qname(geosite:category-ads-all) -> reject"
+		echo "            qname(suffix:googleapis.cn) -> fallbackdns"
 		echo "            qname(geosite:cn) -> cndns"
 		echo "            fallback: fallbackdns"
 		echo "        }"
@@ -295,6 +296,7 @@ generate() {
 		# OS connectivity checks direct (avoid captive-portal false positives)
 		echo "    domain(connectivitycheck.gstatic.com) -> direct"
 		echo "    domain(msftconnecttest.com) -> direct"
+		echo "    domain(suffix:googleapis.cn) -> ${fallback}"
 		if [ "$cn_direct" = "1" ]; then
 			echo "    dip(geoip:cn) -> direct"
 			echo "    domain(geosite:cn) -> direct"
@@ -308,7 +310,7 @@ generate() {
 
 	# overwrite live config only if validation passes
 	local out
-	out="$("$DAE_BIN" validate -c "$TMP_GEN" 2>&1)"
+	out="$(DAE_LOCATION_ASSET="/usr/share/v2ray" "$DAE_BIN" validate -c "$TMP_GEN" 2>&1)"
 	if [ $? -ne 0 ]; then
 		echo "validate failed: $(echo "$out" | head -1)" >&2
 		rm -f "$TMP_GEN"

luci-app-daede/root/usr/share/rpcd/acl.d/luci-app-daede.json

@@ -23,7 +23,7 @@
 				"/tmp/luci-app-daede.backup.log": [ "read" ],
 				"/bin/pidof dae": [ "exec" ],
 				"/bin/pidof daed": [ "exec" ],
-				"/usr/bin/dae validate -c /tmp/dae-validate.dae": [ "exec" ],
+				"/usr/bin/env DAE_LOCATION_ASSET=/usr/share/v2ray /usr/bin/dae validate -c /tmp/dae-validate.dae": [ "exec" ],
 				"/usr/bin/dae --version": [ "exec" ],
 				"/bin/rm -f /tmp/dae-validate.dae": [ "exec" ],
 				"/usr/share/luci-app-daede/pkg-info.sh dae": [ "exec" ],