🔥 Sync 2026-06-21 03:09:38

luci-app-homeproxy/root/etc/config/homeproxy

@@ -33,6 +33,9 @@ config homeproxy 'config'
 	option ipv6_support '1'
 	option github_token ''
 	option log_level 'warn'
+	option dashboard_enabled '0'
+	option dashboard_port '9090'
+	option dashboard_secret ''
 
 config homeproxy 'control'
 	option lan_proxy_mode 'disabled'

luci-app-homeproxy/root/etc/homeproxy/scripts/generate_client.uc

@@ -52,6 +52,12 @@ const dns_port = uci.get(uciconfig, uciinfra, 'dns_port') || '5333';
 
 const ntp_server = uci.get(uciconfig, uciinfra, 'ntp_server') || 'time.apple.com';
 
+const dashboard_enabled = uci.get(uciconfig, ucimain, 'dashboard_enabled') || '0';
+const dashboard_port = uci.get(uciconfig, ucimain, 'dashboard_port') || '9090';
+const dashboard_secret = uci.get(uciconfig, ucimain, 'dashboard_secret');
+const dashboard_url = uci.get(uciconfig, ucimain, 'dashboard_url');
+const dashboard_detour = uci.get(uciconfig, ucimain, 'dashboard_detour');
+
 const ipv6_support = uci.get(uciconfig, ucimain, 'ipv6_support') || '0';
 
 let main_node, main_udp_node, dedicated_udp_node, default_outbound, default_outbound_dns,
@@ -327,8 +333,8 @@ function generate_outbound(node) {
 			max_early_data: strToInt(node.websocket_early_data),
 			early_data_header_name: node.websocket_early_data_header,
 			service_name: node.grpc_servicename,
-			idle_timeout: (node.http_idle_timeout),
-			ping_timeout: (node.http_ping_timeout),
+			idle_timeout: strToTime(node.http_idle_timeout),
+			ping_timeout: strToTime(node.http_ping_timeout),
 			permit_without_stream: strToBool(node.grpc_permit_without_stream)
 		} : null,
 		udp_over_tcp: (node.udp_over_tcp === '1') ? {
@@ -565,6 +571,7 @@ if (!isEmpty(main_node)) {
 			user: cfg.user,
 			rule_set: get_ruleset(cfg.rule_set),
 			rule_set_ip_cidr_match_source: strToBool(cfg.rule_set_ip_cidr_match_source),
+			rule_set_ip_cidr_accept_empty: strToBool(cfg.rule_set_ip_cidr_accept_empty),
 			invert: strToBool(cfg.invert),
 			outbound: get_outbound(cfg.outbound),
 			action: cfg.action,
@@ -969,6 +976,28 @@ if (routing_mode in ['bypass_mainland_china', 'custom']) {
 		}
 	};
 }
+
+if (dashboard_enabled === '1') {
+	if (!config.experimental)
+		config.experimental = {};
+
+	let download_detour = 'direct-out';
+	if (!isEmpty(dashboard_detour)) {
+		if (dashboard_detour in ['direct-out', 'main-out'])
+			download_detour = dashboard_detour;
+		else
+			download_detour = get_outbound(dashboard_detour);
+	}
+
+	config.experimental.clash_api = {
+		external_controller: '0.0.0.0:' + dashboard_port,
+		secret: !isEmpty(dashboard_secret) ? dashboard_secret : null,
+		external_ui: RUN_DIR + '/ui',
+		external_ui_download_url: !isEmpty(dashboard_url) ? dashboard_url :
+			'https://github.com/Zephyruso/zashboard/releases/latest/download/dist-cdn.zip',
+		external_ui_download_detour: download_detour,
+	};
+}
 /* Experimental end */
 
 system('mkdir -p ' + RUN_DIR);

luci-app-homeproxy/root/usr/share/rpcd/ucode/luci.homeproxy

@@ -137,7 +137,12 @@ const methods = {
 				break;
 			}
 
-			return { result: (system(`/usr/bin/wget --spider -qT3 ${url} 2>"/dev/null"`, 3100) === 0) };
+			let start = clock(true);
+			let ret = system(`/usr/bin/wget --spider -qT3 ${url} 2>"/dev/null"`, 3100);
+			let end = clock(true);
+			let elapsed = (end[0] - start[0]) * 1000 + int((end[1] - start[1]) / 1000000);
+
+			return { result: (ret === 0), elapsed: elapsed };
 		}
 	},
 
@@ -163,7 +168,7 @@ const methods = {
 			const type = req.args?.type;
 			let result = {};
 
-			const fd = popen('/usr/bin/sing-box generate ' + type + ` ${req.args?.params || ''}`);
+			const fd = popen(`/usr/bin/sing-box generate ${type} ${shellquote(req.args?.params || '')}`);
 			if (fd) {
 				let ech_cfg_set = false;
 				let ech_key_set = false;