Fix process daemon bug

luci-app-ssr-plus/Makefile

@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-ssr-plus
 PKG_VERSION:=182
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 define Package/$(PKG_NAME)/conffiles
 /etc/config/shadowsocksr
@@ -31,7 +31,7 @@ config PACKAGE_$(PKG_NAME)_INCLUDE_V2ray
 	bool "Include V2ray"
 	default n
 
-config PACKAGE_$(PKG_NAME)_INCLUDE_trojan-go
+config PACKAGE_$(PKG_NAME)_INCLUDE_Trojan-go
 	bool "Include trojan-go"
 	default n
 
@@ -56,7 +56,7 @@ LUCI_DEPENDS:=+shadowsocksr-libev-alt +ipset +ip-full +iptables-mod-tproxy +dnsm
 	+PACKAGE_$(PKG_NAME)_INCLUDE_V2ray:v2ray \
 	+PACKAGE_$(PKG_NAME)_INCLUDE_Xray:xray \
 	+PACKAGE_$(PKG_NAME)_INCLUDE_Trojan:trojan \
-	+PACKAGE_$(PKG_NAME)_INCLUDE_Trojan:trojan-go \
+	+PACKAGE_$(PKG_NAME)_INCLUDE_Trojan-go:trojan-go \
 	+PACKAGE_$(PKG_NAME)_INCLUDE_Trojan:ipt2socks \
 	+PACKAGE_$(PKG_NAME)_INCLUDE_NaiveProxy:naiveproxy \
 	+PACKAGE_$(PKG_NAME)_INCLUDE_Redsocks2:redsocks2 \

luci-app-ssr-plus/luasrc/controller/shadowsocksr.lua

@@ -4,7 +4,7 @@ module("luci.controller.shadowsocksr", package.seeall)
 
 function index()
 	if not nixio.fs.access("/etc/config/shadowsocksr") then
-		return
+		call("act_reset")
 	end
 	entry({"admin", "services", "shadowsocksr"}, alias("admin", "services", "shadowsocksr", "client"), _("ShadowSocksR Plus+"), 10).dependent = true
 	entry({"admin", "services", "shadowsocksr", "client"}, cbi("shadowsocksr/client"), _("SSR Client"), 10).leaf = true

luci-app-ssr-plus/luasrc/view/shadowsocksr/ssrurl.htm

@@ -218,7 +218,7 @@ function import_ssr_url(btn, urlname, sid) {
 			document.getElementsByName('cbid.shadowsocksr.' + sid + '.tls')[0].checked = true;
 			document.getElementsByName('cbid.shadowsocksr.' + sid + '.tls')[0].dispatchEvent(event);
 			document.getElementsByName('cbid.shadowsocksr.' + sid + '.tls_host')[0].value = queryParam.peer || '';
-			document.getElementsByName('cbid.shadowsocksr.' + sid + '.insecure')[0].checked = queryParam.allowInsecure === '1';
+			document.getElementsByName('cbid.shadowsocksr.' + sid + '.insecure')[0].checked = queryParam.allowInsecure == '1';
 			if (param != undefined) {
 				document.getElementsByName('cbid.shadowsocksr.' + sid + '.alias')[0].value = decodeURI(param);
 			}

luci-app-ssr-plus/root/etc/init.d/shadowsocksr

@@ -512,7 +512,7 @@ Start_Run() {
 		;;
 	trojan)
 		gen_config_file $GLOBAL_SERVER $type 1 $tcp_port
-			ln_start_bin $(first_type ${type}-go ${type}) $type --config $tcp_config_file
+		ln_start_bin $(first_type ${type}-go ${type}) $type --config $tcp_config_file
 		echolog "Main node:$($(first_type $type) --version 2>&1 | head -1) Started!"
 		;;
 	naiveproxy)
@@ -589,12 +589,14 @@ load_config() {
 		LOCAL_SERVER=$GLOBAL_SERVER
 		local_config_file=$TMP_PATH/tcp-udp-ssr-local.json
 		start_local
+		local_enable=0
 		;;
 	*)
 		if [ "$LOCAL_SERVER" == "$GLOBAL_SERVER" ]; then
 			_local="1"
 			local_config_file=$TMP_PATH/tcp-udp-ssr-local.json
 			start_local
+			local_enable=0
 		else
 			_local="2"
 			local_config_file=$TMP_PATH/tcp-udp-ssr-local.json
@@ -840,6 +842,7 @@ stop() {
 
 reset() {
 	stop
+	set_lock
 	rm -rf /etc/config/shadowsocksr $LOG_FILE
 	touch /etc/config/shadowsocksr $LOG_FILE
 	uci -q batch <<-EOF >/dev/null
@@ -857,7 +860,7 @@ reset() {
 		set shadowsocksr.@global[0].switch_time='667'
 		set shadowsocksr.@global[0].switch_timeout='5'
 		set shadowsocksr.@global[0].switch_try_count='3'
-		set shadowsocksr.@global[0].gfwlist_url='https://cdn.jsdelivr.net/gh/v2fly/domain-list-community@release/gfwlist.txt'
+		set shadowsocksr.@global[0].gfwlist_url='https://cdn.jsdelivr.net/gh/YW5vbnltb3Vz/domain-list-community@release/gfwlist.txt'
 		set shadowsocksr.@global[0].chnroute_url='https://ispip.clang.cn/all_cn.txt'
 		set shadowsocksr.@global[0].nfip_url='https://cdn.jsdelivr.net/gh/QiuSimons/Netflix_IP/getflix.txt'
 		set shadowsocksr.@global[0].adblock_url='https://anti-ad.net/anti-ad-for-dnsmasq.conf'
@@ -882,4 +885,5 @@ reset() {
 		set shadowsocksr.@server_global[0].enable_server='0'
 		commit shadowsocksr
 	EOF
+	unset_lock
 }

luci-app-ssr-plus/root/etc/uci-defaults/luci-ssr-plus

@@ -24,46 +24,7 @@ touch /etc/ssrplus/oversea_list.conf
 touch /etc/ssrplus/ad.conf
 touch /etc/config/shadowsocksr
 if [ ! -s "/etc/config/shadowsocksr" ]; then
-uci -q batch <<-EOF >/dev/null
-add shadowsocksr global
-set shadowsocksr.@global[0].global_server='nil'
-set shadowsocksr.@global[0].netflix_server='nil'
-set shadowsocksr.@global[0].netflix_proxy='0'
-set shadowsocksr.@global[0].threads='0'
-set shadowsocksr.@global[0].run_mode='router'
-set shadowsocksr.@global[0].dports='2'
-set shadowsocksr.@global[0].pdnsd_enable='1'
-set shadowsocksr.@global[0].tunnel_forward='8.8.4.4:53'
-set shadowsocksr.@global[0].monitor_enable='1'
-set shadowsocksr.@global[0].enable_switch='1'
-set shadowsocksr.@global[0].switch_time='667'
-set shadowsocksr.@global[0].switch_timeout='5'
-set shadowsocksr.@global[0].switch_try_count='3'
-set shadowsocksr.@global[0].gfwlist_url='https://cdn.jsdelivr.net/gh/YW5vbnltb3Vz/domain-list-community@release/gfwlist.txt'
-set shadowsocksr.@global[0].chnroute_url='https://ispip.clang.cn/all_cn.txt'
-set shadowsocksr.@global[0].nfip_url='https://cdn.jsdelivr.net/gh/QiuSimons/Netflix_IP/getflix.txt'
-set shadowsocksr.@global[0].adblock_url='https://neodev.team/lite_host_dnsmasq.conf'
-add shadowsocksr server_subscribe
-set shadowsocksr.@server_subscribe[0].proxy='0'
-set shadowsocksr.@server_subscribe[0].auto_update_time='2'
-set shadowsocksr.@server_subscribe[0].auto_update='1'
-set shadowsocksr.@server_subscribe[0].filter_words='过期时间/剩余流量/QQ群/官网/防失联地址/回国'
-add shadowsocksr access_control
-set shadowsocksr.@access_control[0].lan_ac_mode='0'
-set shadowsocksr.@access_control[0].router_proxy='1'
-add_list shadowsocksr.@access_control[0].wan_fw_ips=149.154.160.0/20
-add_list shadowsocksr.@access_control[0].wan_fw_ips=67.198.55.0/24
-add_list shadowsocksr.@access_control[0].wan_fw_ips=91.108.4.0/22
-add_list shadowsocksr.@access_control[0].wan_fw_ips=91.108.56.0/22
-add_list shadowsocksr.@access_control[0].wan_fw_ips=109.239.140.0/24
-add_list shadowsocksr.@access_control[0].Interface='lan'
-add shadowsocksr socks5_proxy
-set shadowsocksr.@socks5_proxy[0].server='nil'
-set shadowsocksr.@socks5_proxy[0].local_port='1080'
-add shadowsocksr server_global
-set shadowsocksr.@server_global[0].enable_server='0'
-commit shadowsocksr
-EOF
+/etc/init.d/shadowsocksr reset
 fi
 rm -rf /tmp/luci-modulecache /tmp/luci-indexcache
 exit 0

luci-app-ssr-plus/root/usr/bin/ssr-monitor

@@ -34,8 +34,8 @@ while [ "1" == "1" ]; do #死循环
 	if [ "$redir_tcp_process" -gt 0 ]; then
 		icount=$(busybox ps -w | grep ssr-retcp | grep -v grep | wc -l)
 		if [ "$icount" == 0 ]; then
-			logger -t "$NAME" "ssr redir tcp error.restart!"
-			echolog "ssr redir tcp error.restart!"
+			logger -t "$NAME" "ssrplus redir tcp error.restart!"
+			echolog "ssrplus redir tcp error.restart!"
 			/etc/init.d/shadowsocksr restart
 			exit 0
 		fi
@@ -44,8 +44,8 @@ while [ "1" == "1" ]; do #死循环
 	if [ "$redir_udp_process" -gt 0 ]; then
 		icount=$(busybox ps -w | grep ssr-reudp | grep -v grep | wc -l)
 		if [ "$icount" == 0 ]; then
-			logger -t "$NAME" "ssr redir udp error.restart!"
-			echolog "ssr redir udp error.restart!"
+			logger -t "$NAME" "ssrplus redir udp error.restart!"
+			echolog "ssrplus redir udp error.restart!"
 			/etc/init.d/shadowsocksr restart
 			exit 0
 		fi
@@ -54,8 +54,8 @@ while [ "1" == "1" ]; do #死循环
 	if [ "$server_process_count" -gt 0 ]; then
 		icount=$(busybox ps -w | grep ssr-server | grep -v grep | wc -l)
 		if [ "$icount" -lt "$server_process_count" ]; then #如果进程挂掉就重启它
-			logger -t "$NAME" "ssr server error.restart!"
-			echolog "ssr server error.restart!"
+			logger -t "$NAME" "ssrplus server error.restart!"
+			echolog "ssrplus server error.restart!"
 			kill -9 $(busybox ps -w | grep ssr-server | grep -v grep | awk '{print $1}') >/dev/null 2>&1
 			/etc/init.d/shadowsocksr restart
 			exit 0
@@ -65,8 +65,8 @@ while [ "1" == "1" ]; do #死循环
 	if [ "$kcp_process" -gt 0 ]; then
 		icount=$(busybox ps -w | grep kcptun-client | grep -v grep | wc -l)
 		if [ "$icount" -lt "$kcp_process" ]; then #如果进程挂掉就重启它
-			logger -t "$NAME" "ssr kcptun error.restart!"
-			echolog "ssr kcptun error.restart!"
+			logger -t "$NAME" "ssrplus kcptun error.restart!"
+			echolog "ssrplus kcptun error.restart!"
 			killall -q -9 kcptun-client
 			(/usr/bin/kcptun-client -r $server:$kcp_port -l :$server_port $password $kcp_param &)
 		fi