⛄ Sync 2026-09-15 17:04:17

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

@@ -11,8 +11,8 @@ import { writefile } from 'fs';
 import { cursor } from 'uci';
 
 import {
-	isEmpty, strToBool, strToInt, strToTime,
-	removeBlankAttrs, HP_DIR, RUN_DIR
+	strToBool, strToInt, strToTime,
+	removeBlankAttrs, buildTLSObject, buildTransportObject, HP_DIR, RUN_DIR
 } from 'homeproxy';
 
 /* UCI config start */
@@ -42,6 +42,26 @@ uci.foreach(uciconfig, uciserver, (cfg) => {
 	if (cfg.enabled !== '1')
 		return;
 
+	/* Snell (1.14): single-psk inbound; shape differs from the generic users[] block below */
+	if (cfg.type === 'snell') {
+		push(config.inbounds, {
+			type: 'snell',
+			tag: 'cfg-' + cfg['.name'] + '-in',
+
+			listen: cfg.address || '::',
+			listen_port: strToInt(cfg.port),
+			bind_interface: cfg.bind_interface,
+			reuse_addr: strToBool(cfg.reuse_addr),
+			tcp_fast_open: strToBool(cfg.tcp_fast_open),
+			tcp_multi_path: strToBool(cfg.tcp_multi_path),
+			version: strToInt(cfg.snell_version) || 5,
+			psk: cfg.password,
+			obfs_mode: cfg.snell_obfs_mode,
+			mode: cfg.snell_mode
+		});
+		return;
+	}
+
 	push(config.inbounds, {
 		type: cfg.type,
 		tag: 'cfg-' + cfg['.name'] + '-in',
@@ -59,17 +79,15 @@ uci.foreach(uciconfig, uciserver, (cfg) => {
 		/* AnyTLS */
 		padding_scheme: cfg.anytls_padding_scheme,
 
-		/* Hysteria */
+		/* Hysteria (2) */
 		up_mbps: strToInt(cfg.hysteria_up_mbps),
 		down_mbps: strToInt(cfg.hysteria_down_mbps),
 		obfs: cfg.hysteria_obfs_type ? {
 			type: cfg.hysteria_obfs_type,
-			password: cfg.hysteria_obfs_password
+			password: cfg.hysteria_obfs_password,
+			min_packet_size: strToInt(cfg.hysteria_obfs_min_packet_size),
+			max_packet_size: strToInt(cfg.hysteria_obfs_max_packet_size)
 		} : cfg.hysteria_obfs_password,
-		recv_window_conn: strToInt(cfg.hysteria_recv_window_conn),
-		recv_window_client: strToInt(cfg.hysteria_recv_window_client),
-		max_conn_client: strToInt(cfg.hysteria_max_conn_client),
-		disable_mtu_discovery: strToBool(cfg.hysteria_disable_mtu_discovery),
 		ignore_client_bandwidth: strToBool(cfg.hysteria_ignore_client_bandwidth),
 		masquerade: cfg.hysteria_masquerade,
 
@@ -113,73 +131,22 @@ uci.foreach(uciconfig, uciserver, (cfg) => {
 			} : null
 		} : null,
 
-		tls: (cfg.tls === '1') ? {
-			enabled: true,
-			server_name: cfg.tls_sni,
-			alpn: cfg.tls_alpn,
-			min_version: cfg.tls_min_version,
-			max_version: cfg.tls_max_version,
-			cipher_suites: cfg.tls_cipher_suites,
-			certificate_path: cfg.tls_cert_path,
-			key_path: cfg.tls_key_path,
-			acme: (cfg.tls_acme === '1') ? {
-				domain: cfg.tls_acme_domain,
-				data_directory: HP_DIR + '/certs',
-				default_server_name: cfg.tls_acme_dsn,
-				email: cfg.tls_acme_email,
-				provider: cfg.tls_acme_provider,
-				disable_http_challenge: strToBool(cfg.tls_acme_dhc),
-				disable_tls_alpn_challenge: (cfg.tls_acme_dtac),
-				alternative_http_port: strToInt(cfg.tls_acme_ahp),
-				alternative_tls_port: strToInt(cfg.tls_acme_atp),
-				external_account: (cfg.tls_acme_external_account === '1') ? {
-					key_id: cfg.tls_acme_ea_keyid,
-					mac_key: cfg.tls_acme_ea_mackey
-				} : null,
-				dns01_challenge: (cfg.tls_dns01_challenge === '1') ? {
-					provider: cfg.tls_dns01_provider,
-					access_key_id: cfg.tls_dns01_ali_akid,
-					access_key_secret: cfg.tls_dns01_ali_aksec,
-					region_id: cfg.tls_dns01_ali_rid,
-					api_token: cfg.tls_dns01_cf_api_token
-				} : null
-			} : null,
-			ech: (cfg.tls_ech_key) ? {
-				enabled: true,
-				key: split(cfg.tls_ech_key, '\n'),
-				// config: split(cfg.tls_ech_config, '\n')
-			} : null,
-			reality: (cfg.tls_reality === '1') ? {
-				enabled: true,
-				private_key: cfg.tls_reality_private_key,
-				short_id: cfg.tls_reality_short_id,
-				max_time_difference: strToTime(cfg.tls_reality_max_time_difference),
-				handshake: {
-					server: cfg.tls_reality_server_addr,
-					server_port: strToInt(cfg.tls_reality_server_port)
-					}
-			} : null
-		} : null,
+		tls: buildTLSObject(cfg, true),
 
-		transport: !isEmpty(cfg.transport) ? {
-			type: cfg.transport,
-			host: cfg.http_host || cfg.httpupgrade_host,
-			path: cfg.http_path || cfg.ws_path,
-			headers: cfg.ws_host ? {
-				Host: cfg.ws_host
-			} : null,
-			method: cfg.http_method,
-			max_early_data: strToInt(cfg.websocket_early_data),
-			early_data_header_name: cfg.websocket_early_data_header,
-			service_name: cfg.grpc_servicename,
-			idle_timeout: strToTime(cfg.http_idle_timeout),
-			ping_timeout: strToTime(cfg.http_ping_timeout)
-		} : null
+		transport: buildTransportObject(cfg, true)
 	});
 });
 
 if (length(config.inbounds) === 0)
 	exit(1);
 
+config['$schema'] = 'https://sing-box.sagernet.org/schema.json';
+
 system('mkdir -p ' + RUN_DIR);
-writefile(RUN_DIR + '/sing-box-s.json', sprintf('%.J\n', removeBlankAttrs(config)));
+const server_tmp = RUN_DIR + '/sing-box-s.json.tmp';
+writefile(server_tmp, sprintf('%.J\n', removeBlankAttrs(config)));
+if (system('/usr/bin/sing-box check --config ' + server_tmp) !== 0) {
+	system('rm -f ' + server_tmp);
+	exit(1);
+}
+system('mv -f ' + server_tmp + ' ' + RUN_DIR + '/sing-box-s.json');