From 796b6380465e2d36a2920d7aefacb299f599895e Mon Sep 17 00:00:00 2001
From: LEAN-ESX <coolsnowwolf@gmail.com>
Date: Sat, 6 Jul 2019 07:08:15 -0700
Subject: [PATCH] plus: fix v2ray subscribe ws support

---
 package/lean/luci-app-ssr-plus/Makefile             |  2 +-
 .../root/usr/share/shadowsocksr/subscribe.sh        | 13 +++++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/package/lean/luci-app-ssr-plus/Makefile b/package/lean/luci-app-ssr-plus/Makefile
index daa1d033a..1097a0b1c 100644
--- a/package/lean/luci-app-ssr-plus/Makefile
+++ b/package/lean/luci-app-ssr-plus/Makefile
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-ssr-plus
 PKG_VERSION:=1
-PKG_RELEASE:=96
+PKG_RELEASE:=97
 
 PKG_CONFIG_DEPENDS:= CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_Shadowsocks \
 	CONFIG_PACKAGE_$(PKG_NAME)_INCLUDE_V2ray \
diff --git a/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/subscribe.sh b/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/subscribe.sh
index 9694d2b6f..3c73d36c3 100755
--- a/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/subscribe.sh
+++ b/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/subscribe.sh
@@ -41,10 +41,13 @@ Server_Update() {
     ${uci_set}security="$ssr_security"
     ${uci_set}transport="$ssr_transport"
     ${uci_set}tcp_guise="$ssr_tcp_guise"
+    ${uci_set}ws_host="$ssr_ws_host"
+    ${uci_set}ws_path="$ssr_ws_path"
+    ${uci_set}tls="$ssr_tls"
 }
 
 name=shadowsocksr
-subscribe_url=($(uci get $name.@server_subscribe[0].subscribe_url))
+subscribe_url=($(uci get $name.@server_subscribe[0].subscribe_url)) #订阅服务器地址
 [ ${#subscribe_url[@]} -eq 0 ] && exit 1
 [ $(uci -q get $name.@server_subscribe[0].proxy || echo 0) -eq 0 ] && /etc/init.d/$name stop >/dev/null 2>&1
 log_name=${name}_subscribe
@@ -148,6 +151,10 @@ do
 				json_get_var ssr_transport net
 				json_get_var ssr_remarks ps
 				ssr_tcp_guise="none"
+				json_get_var ssr_ws_host host
+				json_get_var ssr_ws_path path
+				json_get_var ssr_tls tls
+				
 			fi
 
 
@@ -160,7 +167,8 @@ do
 			subscribe_x=$subscribe_x$ssr_host" "
 			ssrtype=$(echo $ssr_type | tr '[a-z]' '[A-Z]')
 			echo_date "$ssrtype节点：【$ssr_remarks】"
-
+			
+			# SSR
 			# echo "服务器地址: $ssr_host"
 			# echo "服务器端口 $ssr_port"
 			# echo "密码: $ssr_passwd"
@@ -170,6 +178,7 @@ do
 			# echo "混淆: $ssr_obfs"
 			# echo "混淆参数: $ssr_obfsparam"
 			# echo "备注: $ssr_remarks"
+			
 		done
 		for ((x=0;x<${#temp_host_o[@]};x++)) # 新旧服务器信息匹配，如果旧服务器信息不存在于新服务器信息则删除
 		do