luci-app-ssr-plus: combined v2nfconfig.lua

package/lean/luci-app-ssr-plus/Makefile

@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-ssr-plus
 PKG_VERSION:=171
-PKG_RELEASE:=5
+PKG_RELEASE:=6
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
 

package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/advanced.lua

@@ -32,15 +32,15 @@ o.default = "https://ispip.clang.cn/all_cn.txt"
 o = s:option(Flag, "adblock", translate("Enable adblock"))
 o.rmempty = false
 
+o = s:option(Value, "nfip_url", translate("nfip_url"))
+o.default = "https://raw.githubusercontent.com/QiuSimons/Netflix_IP/master/NF_only.txt"
+o.description = translate("Customize Netflix IP Url")
+
 o = s:option(Value, "adblock_url", translate("adblock_url"))
 o.default = "https://gitee.com/privacy-protection-tools/anti-ad/raw/master/anti-ad-for-dnsmasq.conf"
 o:depends("adblock", "1")
 o.description = translate("Support AdGuardHome and DNSMASQ format list")
 
-o = s:option(Value, "nfip_url", translate("nfip_url"))
-o.default = "https://raw.githubusercontent.com/QiuSimons/Netflix_IP/master/NF_only.txt"
-o.description = translate("Customize Netflix IP Url")
-
 -- [[ SOCKS Proxy ]]--
 if nixio.fs.access("/usr/bin/microsocks") then
 s = m:section(TypedSection, "socks5_proxy", translate("SOCKS5 Proxy Server Settings"))

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

@@ -409,7 +409,7 @@ start_redir() {
         dns2socks 127.0.0.1:1088 8.8.8.8:53 127.0.0.1:5555 -q >/dev/null 2>&1 &
         $ncmd -c /var/etc/shadowsocksr_n.json $ARG_OTA -f /var/run/ssr-netflix.pid >/dev/null 2>&1
     elif [ "$ntype" == "v2ray" ]; then
-        lua /usr/share/shadowsocksr/genv2nfconfig.lua $NETFLIX_SERVER tcp 4321 >/var/etc/v2-ssr-netflix.json
+        lua /usr/share/shadowsocksr/genv2config.lua $NETFLIX_SERVER tcp 4321 1088 >/var/etc/v2-ssr-netflix.json
         $ncmd -config /var/etc/v2-ssr-netflix.json >/dev/null 2>&1 &
         dns2socks 127.0.0.1:1088 8.8.8.8:53 127.0.0.1:5555 -q >/dev/null 2>&1 &
     elif [ "$ntype" == "trojan" ]; then

package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/genv2config.lua

@@ -3,6 +3,7 @@ local json = require "luci.jsonc"
 local server_section = arg[1]
 local proto = arg[2]
 local local_port = arg[3]
+local socks_port = arg[4] or "0"
 
 local server = ucursor:get_all("shadowsocksr", server_section)
 
@@ -11,20 +12,31 @@ log = {
 	-- error = "/var/ssrplus.log",
 	loglevel = "warning"
 },
-	-- 传入连接
+ -- 传入连接
-	inbound = {
+ inbound = {
-		port = local_port,
+     port = local_port,
-		protocol = "dokodemo-door",
+     protocol = "dokodemo-door",
-		settings = {
+     settings = {
-			network = proto,
+         network = proto,
-			followRedirect = true
+         followRedirect = true
-		},
+     },
-		sniffing = {
+     sniffing = {
-			enabled = true,
+         enabled = true,
-			destOverride = { "http", "tls" }
+         destOverride = { "http", "tls" }
-		}
+     }
-	},
+ },
-	-- 传出连接
+ -- 同时开启 socks 代理 
+ inboundDetour = (proto == "tcp" and socks_port ~= "0") and {
+   {
+     protocol = "socks",
+     port = 1088,
+     settings = {
+       auth = "noauth",
+       udp = true
+     }
+   }
+ } or nil,
+ -- 传出连接
 	outbound = {
 		protocol = "vmess",
 		settings = {

package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/genv2nfconfig.lua

@@ -1,106 +0,0 @@
-local ucursor = require "luci.model.uci".cursor()
-local json = require "luci.jsonc"
-local server_section = arg[1]
-local proto = arg[2]
-local local_port = arg[3]
-
-local server = ucursor:get_all("shadowsocksr", server_section)
-
-local v2ray = {
-log = {
-	-- error = "/var/ssrplus.log",
-	loglevel = "warning"
-},
- -- 传入连接
- inbound = {
-     port = local_port,
-     protocol = "dokodemo-door",
-     settings = {
-         network = proto,
-         followRedirect = true
-     },
-     sniffing = {
-         enabled = true,
-         destOverride = { "http", "tls" }
-     }
- },
- -- 同时开启 socks 代理 
- inboundDetour = (proto == "tcp") and {
-   {
-     protocol = "socks",
-     port = 1088,
-     settings = {
-       auth = "noauth",
-       udp = true
-     }
-   }
- } or nil,
- -- 传出连接
-	outbound = {
-		protocol = "vmess",
-		settings = {
-			vnext = {
-				{
-					address = server.server,
-					port = tonumber(server.server_port),
-					users = {
-						{
-							id = server.vmess_id,
-							alterId = tonumber(server.alter_id),
-							security = server.security
-						}
-					}
-				}
-			}
-		},
-	-- 底层传输配置
-		streamSettings = {
-			network = server.transport,
-			security = (server.tls == '1') and "tls" or "none",
-			tlsSettings = {allowInsecure = (server.insecure ~= "0") and true or false,serverName=server.tls_host,},
-			kcpSettings = (server.transport == "kcp") and {
-				mtu = tonumber(server.mtu),
-				tti = tonumber(server.tti),
-				uplinkCapacity = tonumber(server.uplink_capacity),
-				downlinkCapacity = tonumber(server.downlink_capacity),
-				congestion = (server.congestion == "1") and true or false,
-				readBufferSize = tonumber(server.read_buffer_size),
-				writeBufferSize = tonumber(server.write_buffer_size),
-				header = {
-					type = server.kcp_guise
-				}
-			} or nil,
-			wsSettings = (server.transport == "ws") and (server.ws_path ~= nil or server.ws_host ~= nil) and {
-				path = server.ws_path,
-				headers = (server.ws_host ~= nil) and {
-					Host = server.ws_host
-				} or nil,
-			} or nil,
-			httpSettings = (server.transport == "h2") and {
-				path = server.h2_path,
-				host = server.h2_host,
-			} or nil,
-			quicSettings = (server.transport == "quic") and {
-				security = server.quic_security,
-				key = server.quic_key,
-				header = {
-					type = server.quic_guise
-				}
-			} or nil
-		},
-		mux = {
-			enabled = (server.mux == "1") and true or false,
-			concurrency = tonumber(server.concurrency)
-		}
-	},
-
-	-- 额外传出连接
-	outboundDetour = {
-		{
-			protocol = "freedom",
-			tag = "direct",
-			settings = { keep = "" }
-		}
-	}
-}
-print(json.stringify(v2ray, 1))