🌈 Sync 2026-07-29 14:47:30

luci-app-homeproxy/root/etc/init.d/homeproxy

@@ -27,13 +27,82 @@ log() {
 	echo -e "$(date "+%Y-%m-%d %H:%M:%S") [DAEMON] $*" >> "$LOG_PATH"
 }
 
+init_logs() {
+	mkdir -p "$RUN_DIR"
+	mkdir -p "$HP_DIR/run/ui"
+	touch "$LOG_PATH" "$RUN_DIR/sing-box-c.log" "$RUN_DIR/sing-box-s.log"
+	chown -R sing-box:sing-box "$RUN_DIR" 2>"/dev/null"
+	chown -R sing-box:sing-box "$HP_DIR/run" 2>"/dev/null"
+}
+
+valid_update_cron() {
+	echo "$1" | grep -Eq '^([0-9]|[0-5][0-9]) ([0-9]|[01][0-9]|2[0-3]) \* \* ([0-7]|\*)$'
+}
+
+has_ruleset_cron() {
+	printf '%s\n' "$ruleset_cron_list" | grep -Fxq -- "$1"
+}
+
+add_ruleset_cron() {
+	local section="$1"
+	local enabled auto_update type update_time
+
+	config_get_bool enabled "$section" "enabled" "0"
+	config_get_bool auto_update "$section" "auto_update" "1"
+	config_get type "$section" "type" "local"
+	config_get update_time "$section" "update_interval" ""
+
+	[ "$enabled" = "1" ] || return
+	[ "$auto_update" = "1" ] || return
+	[ "$type" = "remote" ] || return
+	[ -n "$update_time" ] || return
+	valid_update_cron "$update_time" || return
+	has_ruleset_cron "$update_time" && return
+
+	echo -e "$update_time sh $HP_DIR/scripts/update_rulesets.sh #${CONF}_autosetup" >> "/etc/crontabs/root"
+	ruleset_cron_list="${ruleset_cron_list}
+${update_time}"
+	cron_reload="1"
+}
+
+setup_auto_update_cron() {
+	local cron_reload="0"
+	mkdir -p "/etc/crontabs"
+	touch "/etc/crontabs/root"
+	grep -q "#${CONF}_autosetup" "/etc/crontabs/root" 2>"/dev/null" && cron_reload="1"
+	sed -i "/#${CONF}_autosetup/d" "/etc/crontabs/root" 2>"/dev/null"
+
+	local auto_update auto_update_time
+	config_get_bool auto_update "subscription" "auto_update" "0"
+	if [ "$auto_update" = "1" ]; then
+		config_get auto_update_time "subscription" "auto_update_time" "0 0 * * *"
+		if valid_update_cron "$auto_update_time"; then
+			echo -e "$auto_update_time sh $HP_DIR/scripts/update_crond.sh #${CONF}_autosetup" >> "/etc/crontabs/root"
+			cron_reload="1"
+		fi
+	fi
+
+	local ruleset_cron_list=""
+	config_foreach add_ruleset_cron "ruleset"
+	[ "$cron_reload" = "1" ] && /etc/init.d/cron restart
+}
+
 start_service() {
+	init_logs
+
 	config_load "$CONF"
+	setup_auto_update_cron
 
 	local routing_mode proxy_mode
 	config_get routing_mode "config" "routing_mode" "bypass_mainland_china"
 	config_get proxy_mode "config" "proxy_mode" "redirect_tproxy"
 
+	local cache_path
+	config_get cache_path "cache" "path" "$HP_DIR/cache.db"
+	mkdir -p "$(dirname "$cache_path")"
+	[ -e "$cache_path" ] || touch "$cache_path"
+	chown sing-box:sing-box "$cache_path" 2>"/dev/null"
+
 	local outbound_node
 	if [ "$routing_mode" != "custom" ]; then
 		config_get outbound_node "config" "main_node" "nil"
@@ -48,8 +117,6 @@ start_service() {
 		return 1
 	fi
 
-	mkdir -p "$RUN_DIR"
-
 	if [ "$outbound_node" != "nil" ]; then
 		# Generate/Validate client config
 		ucode -S "$HP_DIR/scripts/generate_client.uc" 2>>"$LOG_PATH"
@@ -62,16 +129,6 @@ start_service() {
 			return 1
 		fi
 
-		# Auto update
-		local auto_update auto_update_time
-		config_get_bool auto_update "subscription" "auto_update" "0"
-		if [ "$auto_update" = "1" ]; then
-			config_get auto_update_time "subscription" "auto_update_time" "2"
-			sed -i "/#${CONF}_autosetup/d" "/etc/crontabs/root" 2>"/dev/null"
-			echo -e "0 $auto_update_time * * * $HP_DIR/scripts/update_crond.sh #${CONF}_autosetup" >> "/etc/crontabs/root"
-			/etc/init.d/cron restart
-		fi
-
 		# DNSMasq rules
 		local ipv6_support dns_port
 		config_get_bool ipv6_support "config" "ipv6_support" "0"
@@ -104,8 +161,6 @@ start_service() {
 			sed -r -e '/^\s*$/d' -e "s/(.*)/server=\/\1\/127.0.0.1#$dns_port\nnftset=\/\1\\/4#inet#fw4#homeproxy_wan_proxy_addr_v4$wan_nftset_v6/g" \
 				"$HP_DIR/resources/proxy_list.txt" > "$DNSMASQ_DIR/proxy_list.conf"
 		fi
-		/etc/init.d/dnsmasq restart >"/dev/null" 2>&1
-
 		# Setup routing table
 		local table_mark
 		config_get table_mark "infra" "table_mark" "100"
@@ -156,7 +211,8 @@ start_service() {
 			procd_add_jail "sing-box-c" log procfs
 			procd_add_jail_mount "$RUN_DIR/sing-box-c.json"
 			procd_add_jail_mount_rw "$RUN_DIR/sing-box-c.log"
-			[ "$routing_mode" != "bypass_mainland_china" ] || procd_add_jail_mount_rw "$RUN_DIR/cache.db"
+			procd_add_jail_mount_rw "$cache_path"
+			procd_add_jail_mount_rw "$HP_DIR/run/"
 			procd_add_jail_mount "$HP_DIR/certs/"
 			procd_add_jail_mount "/etc/ssl/"
 			procd_add_jail_mount "/etc/localtime"
@@ -226,19 +282,15 @@ start_service() {
 	procd_close_instance
 
 	case "$routing_mode" in
-	"bypass_mainland_china")
-		# Prepare cache db
-		[ -e "$RUN_DIR/cache.db" ] || touch "$RUN_DIR/cache.db"
-		;;
 	"custom")
 		# Prepare ruleset directory
 		[ -d "$HP_DIR/ruleset" ] || mkdir -p "$HP_DIR/ruleset"
 		;;
 	esac
 
-	[ "$outbound_node" = "nil" ] || echo > "$RUN_DIR/sing-box-c.log"
+	[ "$outbound_node" = "nil" ] || : > "$RUN_DIR/sing-box-c.log"
 	if [ "$server_enabled" = "1" ]; then
-		echo > "$RUN_DIR/sing-box-s.log"
+		: > "$RUN_DIR/sing-box-s.log"
 		mkdir -p "$HP_DIR/certs"
 	fi
 
@@ -249,6 +301,7 @@ start_service() {
 	ucode "$HP_DIR/scripts/firewall_pre.uc"
 	[ "$outbound_node" = "nil" ] || utpl -S "$HP_DIR/scripts/firewall_post.ut" > "$RUN_DIR/fw4_post.nft"
 	fw4 reload >"/dev/null" 2>&1
+	/etc/init.d/dnsmasq restart >"/dev/null" 2>&1
 
 	log "sing-box $(sing-box version -n) started."
 }
@@ -308,8 +361,8 @@ stop_service() {
 	rm -rf "$DNSMASQ_DIR/../dnsmasq-homeproxy.conf" "$DNSMASQ_DIR"
 	/etc/init.d/dnsmasq restart >"/dev/null" 2>&1
 
-	rm -f "$RUN_DIR/sing-box-c.json" "$RUN_DIR/sing-box-c.log" \
-		"$RUN_DIR/sing-box-s.json" "$RUN_DIR/sing-box-s.log"
+	rm -f "$RUN_DIR/sing-box-c.json" "$RUN_DIR/sing-box-s.json"
+	init_logs
 
 	log "Service stopped."
 }