v4.37.0

cary-sas · Jan 5, 2023 · dd4dee2 · dd4dee2
1 parent 46eaa3a
commit dd4dee2
Show file tree

Hide file tree

Showing 10 changed files with 56 additions and 26 deletions.
diff --git a/380_armv5_packge/4.37.0/md5sum.txt b/380_armv5_packge/4.37.0/md5sum.txt
@@ -0,0 +1 @@
+10690dfa39f78ea08b977da74e64f7c6
diff --git a/380_armv5_packge/4.37.0/shadowsocks.tar.gz b/380_armv5_packge/4.37.0/shadowsocks.tar.gz
diff --git a/380_armv5_packge/config.json.js b/380_armv5_packge/config.json.js
@@ -1,9 +1,9 @@
 {
-"build_date":"2022-12-31_16:31:31",
+"build_date":"2023-01-05_21:11:47",
 "description":"科学上网",
 "home_url":"Main_Ss_Content.asp",
-"md5":"6bf3c531178e03d5cb6d88860d0ae3f3",
+"md5":"10690dfa39f78ea08b977da74e64f7c6",
 "name":"shadowsocks",
-"tar_url": "https://github.com/cary-sas/v2ray_bin/raw/main/380_armv5_packge/4.36.9/shadowsocks.tar.gz",
-"version":"4.36.9"
+"tar_url": "https://github.com/cary-sas/v2ray_bin/raw/main/380_armv5_packge/4.37.0/shadowsocks.tar.gz",
+"version":"4.37.0"
 }
diff --git a/380_armv5_packge/latest.txt b/380_armv5_packge/latest.txt
@@ -1 +1 @@
-4.36.9
+4.37.0
diff --git a/shadowsocks/bin/xray b/shadowsocks/bin/xray
diff --git a/shadowsocks/scripts/ss_online_update.sh b/shadowsocks/scripts/ss_online_update.sh
@@ -1000,7 +1000,7 @@ add_vless_servers(){
 		# tcp协议设置【 tcp伪装类型 (type)】和【tls/xtls域名 (SNI)】
 		# tcp + xtls 会比较多，别的组合不熟悉
 		dbus set ssconf_basic_v2ray_headtype_tcp_$v2rayindex="$v2ray_type"
-		[ "$v2ray_tls" = "xtls" ] && dbus set ssconf_basic_v2ray_network_flow_$v2rayindex=$v2ray_flow	
+		[ "${v2ray_tls#*x}" = "tls" ] && dbus set ssconf_basic_v2ray_network_flow_$v2rayindex=$v2ray_flow	
 
 		#  @@ 不确定这个变量是否需要添加
 		# [ -n "$v2ray_host" ] && dbus set ssconf_basic_v2ray_network_host_$v2rayindex=$v2ray_host 

diff --git a/shadowsocks/scripts/ss_webtest.sh b/shadowsocks/scripts/ss_webtest.sh
@@ -103,6 +103,7 @@ rm -f /tmp/tmp_v2ray.json
 					\"allowInsecure\":  $(get_function_switch $(eval echo \$ssconf_basic_allowinsecure_$nu)),
 					\"serverName\": \"$(eval echo \$ssconf_basic_v2ray_network_tlshost_$nu)\"
 					}"
+					[ "$(eval echo \$ssconf_basic_v2ray_network_flow_$nu)" != "none" -a "$(eval echo \$ssconf_basic_v2ray_network_flow_$nu)" != "" ] && local vless_flow="\"flow\": \"$(eval echo \$ssconf_basic_v2ray_network_flow_$nu)\","	|| 	local vless_flow=""		
 			;;
 		xtls)
 			local xtls="{

diff --git a/shadowsocks/ss/ssconfig.sh b/shadowsocks/ss/ssconfig.sh
@@ -1375,6 +1375,7 @@ create_v2ray_json(){
 					\"allowInsecure\": $(get_function_switch $ss_basic_allowinsecure),
 					\"serverName\": \"$ss_basic_v2ray_network_tlshost\"
 					}"
+			[ "$ss_basic_v2ray_network_flow" != "none" -a "$ss_basic_v2ray_network_flow" != "" ] && local vless_flow="\"flow\": \"$ss_basic_v2ray_network_flow\","	|| 	local vless_flow=""
 			;;
 		xtls)
 			local xtls="{

diff --git a/shadowsocks/ss/version b/shadowsocks/ss/version
@@ -1 +1 @@
-4.36.9
+4.37.0
diff --git a/shadowsocks/webs/Main_Ss_Content.asp b/shadowsocks/webs/Main_Ss_Content.asp
@@ -610,6 +610,8 @@ function verifyFields(r) {
 	var path_on = E("ss_basic_v2ray_network").value == "ws" || E("ss_basic_v2ray_network").value == "h2" || E("ss_basic_trojan_network").value == "1" || E("ss_basic_v2ray_network").value == "kcp";
 	var tls_on = E("ss_basic_v2ray_network_security").value == "xtls" || E("ss_basic_v2ray_network_security").value == "tls";
 	var xtls_on = E("ss_basic_v2ray_network_security").value == "xtls";
+	var vision_on = E("ss_basic_v2ray_protocol").value == "vless" && E("ss_basic_v2ray_network").value == "tcp" && E("ss_basic_v2ray_network_security").value == "tls";
+		
 	showhide("pass_tr", (!v2ray_on));
 	showhide("method_tr", (!v2ray_on) && (!trojan_on) && (!naive_on));
 	showhide("server_tr", (json_off));
@@ -627,7 +629,10 @@ function verifyFields(r) {
 	showhide("v2ray_network_host_basic_tr", ((v2ray_on && json_off && host_on) || (trojan_on && E("ss_basic_trojan_binary").value == "Trojan-Go" && host_on)));
 	showhide("v2ray_network_path_basic_tr", ((v2ray_on && json_off && path_on) || (trojan_on && E("ss_basic_trojan_binary").value == "Trojan-Go" && path_on)));
 	showhide("v2ray_network_tlshost_basic_tr", (v2ray_on && json_off && tls_on));
-	showhide("v2ray_network_flow_basic_tr", (v2ray_on && json_off && xtls_on));
+	showhide("v2ray_network_flow_basic_tr", (v2ray_on && json_off && (xtls_on || vision_on)));
+	showhide("xtls_flow_opt_basic" , (v2ray_on && json_off && xtls_on));
+	showhide("vision_flow_opt_basic" , (v2ray_on && json_off && vision_on));
+	
 	showhide("v2ray_network_security_basic_tr", (v2ray_on && json_off));
 	showhide("v2ray_mux_enable_basic_tr", ((trojan_on &&  E("ss_basic_trojan_binary").value == "Trojan-Go")|| (v2ray_on && json_off)));
 	showhide("v2ray_mux_concurrency_basic_tr", (((trojan_on && E("ss_basic_trojan_binary").value == "Trojan-Go") || (v2ray_on && json_off)) && E("ss_basic_v2ray_mux_enable").checked));
@@ -725,13 +730,17 @@ function verifyFields(r) {
 			var path_on_2 = E("ss_node_table_v2ray_network").value == "ws" || E("ss_node_table_v2ray_network").value == "h2" || E("ss_node_table_v2ray_network").value == "kcp" ;
 			var tls_on_2 = E("ss_node_table_v2ray_network_security").value == "tls" || E("ss_node_table_v2ray_network_security").value == "xtls";
 			var xtls_on_2 = E("ss_node_table_v2ray_network_security").value == "xtls";
+			var vision_on_2 = E("ss_node_table_v2ray_protocol").value == "vless" && E("ss_node_table_v2ray_network").value == "tcp" && E("ss_node_table_v2ray_network_security").value == "tls";	
+
 			showhide("v2ray_headtype_tcp_tr", (E("ss_node_table_v2ray_network").value == "tcp"));
 			showhide("v2ray_headtype_kcp_tr", (E("ss_node_table_v2ray_network").value == "kcp"));
 			showhide("v2ray_serviceName_tr", serviceName_on_2);
 			showhide("v2ray_network_host_tr", host_on_2);
 			showhide("v2ray_network_tlshost_tr", tls_on_2);
 			showhide("allowinsecure_tr", tls_on_2);
-			showhide("v2ray_network_flow_tr", xtls_on_2);
+			showhide("v2ray_network_flow_tr", xtls_on_2 || vision_on_2);
+			showhide("xtls_flow_opt" , xtls_on_2);
+			showhide("vision_flow_opt" , vision_on_2);
 			showhide("v2ray_network_path_tr", path_on_2);
 			showhide("v2ray_mux_concurrency_tr", (E("ss_node_table_v2ray_mux_enable").checked));
 			showhide("v2ray_json_tr", (E("ss_node_table_v2ray_use_json").checked));
@@ -1497,15 +1506,19 @@ function tabclickhandler(_type) {
 			var host_on_2 = E("ss_node_table_v2ray_network").value == "ws" || E("ss_node_table_v2ray_network").value == "h2" || http_on_2;
 			var serviceName_on_2 =  E("ss_node_table_v2ray_network").value == "grpc";
 			var path_on_2 = E("ss_node_table_v2ray_network").value == "ws" || E("ss_node_table_v2ray_network").value == "h2" || E("ss_node_table_v2ray_network").value == "kcp";
-			var tlshost_on_2 = E("ss_node_table_v2ray_network_security").value == "tls" || E("ss_node_table_v2ray_network_security").value == "xtls"
-			var xtlshost_on_2 = E("ss_node_table_v2ray_network_security").value == "xtls"
+			var tlshost_on_2 = E("ss_node_table_v2ray_network_security").value == "tls" || E("ss_node_table_v2ray_network_security").value == "xtls";
+			var xtlshost_on_2 = E("ss_node_table_v2ray_network_security").value == "xtls";
+			var visionhost_on_2 = E("ss_node_table_v2ray_protocol").value == "vless" && E("ss_node_table_v2ray_network").value == "tcp" && E("ss_node_table_v2ray_network_security").value == "tls";	
 			showhide("v2ray_headtype_tcp_tr", (E("ss_node_table_v2ray_network").value == "tcp"));
 			showhide("v2ray_headtype_kcp_tr", (E("ss_node_table_v2ray_network").value == "kcp"));
 			showhide("v2ray_network_host_tr", host_on_2);
 			showhide("v2ray_serviceName_tr", serviceName_on_2);
 			showhide("v2ray_network_path_tr", path_on_2);
 			showhide("v2ray_network_tlshost_tr", tlshost_on_2);
-			showhide("v2ray_network_flow_tr", xtlshost_on_2);
+			showhide("v2ray_network_flow_tr", xtlshost_on_2 || visionhost_on_2 );
+			showhide("xtls_flow_opt", xtlshost_on_2 );
+			showhide("vision_flow_opt", visionhost_on_2 );
+			
 			showhide("allowinsecure_tr", (xtlshost_on_2 || tlshost_on_2 ));
 			showhide("v2ray_mux_concurrency_tr", (E("ss_node_table_v2ray_mux_enable").checked));
 			showhide("v2ray_json_tr", (E("ss_node_table_v2ray_use_json").checked));
@@ -3945,12 +3958,19 @@ function set_cron(action) {
 																<th width="35%">流控 (flow)</th>
 																<td>
 																	<select id="ss_node_table_v2ray_network_flow" name="ss_node_table_v2ray_network_flow" onchange="verifyFields(this, 1);" style="width:350px;margin:0px 0px 0px 2px;" class="input_option">
-																		<option value="xtls-rprx-direct">xtls-rprx-direct</option>
-																		<option value="xtls-rprx-splice">xtls-rprx-splice</option>
-																		<option value="xtls-rprx-origin">xtls-rprx-origin</option>
-																		<option value="xtls-rprx-direct-udp443">xtls-rprx-direct-udp443</option>
-																		<option value="xtls-rprx-splice-udp443">xtls-rprx-splice-udp443</option>
-																		<option value="xtls-rprx-origin-udp443">xtls-rprx-origin-udp443</option>
+																		<option value=""></option>
+																		<optgroup label="xtls" id="xtls_flow_opt">
+																			<option value="xtls-rprx-direct">xtls-rprx-direct</option>
+																			<option value="xtls-rprx-splice">xtls-rprx-splice</option>
+																			<option value="xtls-rprx-origin">xtls-rprx-origin</option>
+																			<option value="xtls-rprx-direct-udp443">xtls-rprx-direct-udp443</option>
+																			<option value="xtls-rprx-splice-udp443">xtls-rprx-splice-udp443</option>
+																			<option value="xtls-rprx-origin-udp443">xtls-rprx-origin-udp443</option>
+																		</optgroup>
+																		<optgroup label="xtls-vision" id="vision_flow_opt">
+																			<option value="xtls-rprx-vision">xtls-rprx-vision</option>
+																			<option value="xtls-rprx-vision-udp443">xtls-rprx-vision-udp443</option>
+																		</optgroup>	
 																	</select>
 																</td>
 															</tr>
@@ -3992,7 +4012,7 @@ function set_cron(action) {
 																<th width="35%">指纹 (fingerprint)</th>
 																<td>
 																	<select id="ss_node_table_fingerprint" name="ss_node_table_fingerprint" onchange="verifyFields(this, 1);" style="width:350px;margin:0px 0px 0px 2px;" class="input_option">
-																		<option value="none" selected>关闭</option>
+																		<option value="none">关闭</option>
 																		<option value="firefox">firefox</option>
 																		<option value="chrome">chrome</option>
 																		<option value="ios">ios</option>
@@ -4353,12 +4373,19 @@ function set_cron(action) {
 													</th>
 													<td>
 														<select id="ss_basic_v2ray_network_flow" name="ss_basic_v2ray_network_flow" onchange="verifyFields(this, 1);" style="width:164px;margin:0px 0px 0px 2px;" class="input_option">
-															<option value="xtls-rprx-direct">xtls-rprx-direct</option>
-															<option value="xtls-rprx-splice">xtls-rprx-splice</option>
-															<option value="xtls-rprx-origin">xtls-rprx-origin</option>
-															<option value="xtls-rprx-direct-udp443">xtls-rprx-direct-udp443</option>
-															<option value="xtls-rprx-splice-udp443">xtls-rprx-splice-udp443</option>
-															<option value="xtls-rprx-origin-udp443">xtls-rprx-origin-udp443</option>
+															<option value=""></option>
+															<optgroup label="xtls" id="xtls_flow_opt_basic">
+																<option value="xtls-rprx-direct">xtls-rprx-direct</option>
+																<option value="xtls-rprx-splice">xtls-rprx-splice</option>
+																<option value="xtls-rprx-origin">xtls-rprx-origin</option>
+																<option value="xtls-rprx-direct-udp443">xtls-rprx-direct-udp443</option>
+																<option value="xtls-rprx-splice-udp443">xtls-rprx-splice-udp443</option>
+																<option value="xtls-rprx-origin-udp443">xtls-rprx-origin-udp443</option>
+															</optgroup>
+															<optgroup label="xtls-vision" id="vision_flow_opt_basic">
+																<option value="xtls-rprx-vision">xtls-rprx-vision</option>
+																<option value="xtls-rprx-vision-udp443">xtls-rprx-vision-udp443</option>
+															</optgroup>	
 														</select>
 													</td>
 												</tr>
@@ -4405,7 +4432,7 @@ function set_cron(action) {
 													<th width="35%">指纹 (fingerprint)</th>
 													<td>
 														<select id="ss_basic_fingerprint" name="ss_basic_fingerprint" onchange="verifyFields(this, 1);" style="width:164px;margin:0px 0px 0px 2px;" class="input_option">
-															<option value="none" selected>关闭</option>
+															<option value="none">关闭</option>
 															<option value="firefox">firefox</option>
 															<option value="chrome">chrome</option>
 															<option value="ios">ios</option>