update 2024-02-27 16:21:09

homeproxy/htdocs/luci-static/resources/view/homeproxy/client.js

@@ -198,7 +198,7 @@ return view.extend({
 					var ipv6_support = this.map.lookupOption('ipv6_support', section_id)[0].formvalue(section_id);
 
 					if (dns_servers.length > 2)
-						return _('You can only have 2 servers set at maximum.');
+						return _('You can only have two servers set at maximum.');
 
 					for (var i of dns_servers)
 						if (!stubValidator.apply((ipv6_support === '1') ? 'ipaddr' : 'ip4addr', i))

homeproxy/htdocs/luci-static/resources/view/homeproxy/node.js

@@ -1154,7 +1154,7 @@ return view.extend({
 			so.default = so.disabled;
 			so.modalonly = true;
 
-			so = ss.option(form.Value, 'tls_ech_config', _('ECH config'));
+			so = ss.option(form.DynamicList, 'tls_ech_config', _('ECH config'));
 			so.depends('tls_ech', '1');
 			so.modalonly = true;
 		}

homeproxy/po/templates/homeproxy.pot

@@ -2316,15 +2316,12 @@ msgstr ""
 msgid "Xudp (Xray-core)"
 msgstr ""
 
-#: htdocs/luci-static/resources/view/homeproxy/client.js:201
-msgid "You can only have 2 servers set at maximum."
-msgstr ""
-
 #: htdocs/luci-static/resources/view/homeproxy/client.js:159
 msgid "You can only have one server set. It MUST support TCP query."
 msgstr ""
 
 #: htdocs/luci-static/resources/view/homeproxy/client.js:186
+#: htdocs/luci-static/resources/view/homeproxy/client.js:201
 msgid "You can only have two servers set at maximum."
 msgstr ""
 

homeproxy/po/zh_Hans/homeproxy.po

@@ -2375,17 +2375,14 @@ msgstr "信风公共 DNS（114.114.114.114）"
 msgid "Xudp (Xray-core)"
 msgstr "Xudp (Xray-core)"
 
-#: htdocs/luci-static/resources/view/homeproxy/client.js:201
-msgid "You can only have 2 servers set at maximum."
-msgstr "您最多只能设置两个服务器。"
-
 #: htdocs/luci-static/resources/view/homeproxy/client.js:159
 msgid "You can only have one server set. It MUST support TCP query."
 msgstr "您只能设置一个服务器。它必须支持 TCP 查询。"
 
 #: htdocs/luci-static/resources/view/homeproxy/client.js:186
+#: htdocs/luci-static/resources/view/homeproxy/client.js:201
 msgid "You can only have two servers set at maximum."
-msgstr ""
+msgstr "您最多只能设置两个服务器。"
 
 #: htdocs/luci-static/resources/homeproxy.js:228
 msgid "Your %s was successfully uploaded. Size: %sB."

luci-app-homeproxy/htdocs/luci-static/resources/view/homeproxy/client.js

@@ -170,7 +170,7 @@ return view.extend({
 		o.depends({'routing_mode': 'custom', '!reverse': true});
 		o.validate = function(section_id, value) {
 			if (section_id && !['wan'].includes(value)) {
-				let ipv6_support = this.map.lookupOption('ipv6_support', section_id)[0].formvalue(section_id);
+				var ipv6_support = this.map.lookupOption('ipv6_support', section_id)[0].formvalue(section_id);
 
 				if (!value)
 					return _('Expecting: %s').format(_('non-empty value'));
@@ -183,7 +183,7 @@ return view.extend({
 
 		if (features.hp_has_chinadns_ng) {
 			o = s.taboption('routing', form.Value, 'china_dns_server', _('China DNS server'),
-				_('You can only have one server set.'));
+				_('You can only have two servers set at maximum.'));
 			o.value('', _('Disable'));
 			o.value('wan', _('Use DNS server from WAN'));
 			o.value('wan_114', _('Use DNS server from WAN + 114DNS'));
@@ -194,10 +194,15 @@ return view.extend({
 			o.depends('routing_mode', 'bypass_mainland_china');
 			o.validate = function(section_id, value) {
 				if (section_id && value && !['wan', 'wan_114'].includes(value)) {
-					let ipv6_support = this.map.lookupOption('ipv6_support', section_id)[0].formvalue(section_id);
+					var dns_servers = value.split(',');
+					var ipv6_support = this.map.lookupOption('ipv6_support', section_id)[0].formvalue(section_id);
 
-					if (!stubValidator.apply((ipv6_support === '1') ? 'ipaddr' : 'ip4addr', value))
+					if (dns_servers.length > 2)
-						return _('Expecting: %s').format(_('valid IP address'));
+						return _('You can only have 2 servers set at maximum.');
+
+					for (var i of dns_servers)
+						if (!stubValidator.apply((ipv6_support === '1') ? 'ipaddr' : 'ip4addr', i))
+							return _('Expecting: %s').format(_('valid IP address'));
 				}
 
 				return true;

luci-app-homeproxy/htdocs/luci-static/resources/view/homeproxy/node.js

@@ -1154,7 +1154,7 @@ return view.extend({
 			so.default = so.disabled;
 			so.modalonly = true;
 
-			so = ss.option(form.Value, 'tls_ech_config', _('ECH config'));
+			so = ss.option(form.DynamicList, 'tls_ech_config', _('ECH config'));
 			so.depends('tls_ech', '1');
 			so.modalonly = true;
 		}

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

@@ -222,7 +222,7 @@ function generate_outbound(node) {
 			max_version: node.tls_max_version,
 			cipher_suites: node.tls_cipher_suites,
 			certificate_path: node.tls_cert_path,
-			ech: (node.enable_ech === '1') ? {
+			ech: (node.tls_ech === '1') ? {
 				enabled: true,
 				dynamic_record_sizing_disabled: (node.tls_ech_tls_disable_drs === '1'),
 				pq_signature_schemes_enabled: (node.tls_ech_enable_pqss === '1'),

quickstart/Makefile

@@ -10,11 +10,11 @@ include $(TOPDIR)/rules.mk
 PKG_ARCH_quickstart:=$(ARCH)
 
 PKG_NAME:=quickstart
-PKG_VERSION:=0.8.6
+PKG_VERSION:=0.8.7
 PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-binary-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://github.com/linkease/istore-packages/releases/download/prebuilt/
-PKG_HASH:=8d4c644af0b0413bff8e605c27d465a59f89869d92c1f3cfa00f9590d3a3b405
+PKG_HASH:=994ea38fcc4002e9dffd1ffe2d7cdf828e9365b6a2ba61c61c257f7c2af131a5
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-binary-$(PKG_VERSION)