From 709930db741f0534b645a7e7d18981fbf9e7c163 Mon Sep 17 00:00:00 2001
From: CN_SZTL <cnsztl@project-openwrt.eu.org>
Date: Wed, 14 Oct 2020 00:19:18 +0800
Subject: [PATCH] luci-app-ssr-plus: bump to 180-10

---
 package/lean/luci-app-ssr-plus/Makefile            |  2 +-
 .../model/cbi/shadowsocksr/client-config.lua       | 14 ++++++++++++++
 .../lean/luci-app-ssr-plus/po/zh_Hans/ssr-plus.po  |  3 +++
 .../root/usr/share/shadowsocksr/genvlessconfig.lua |  2 +-
 4 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/package/lean/luci-app-ssr-plus/Makefile b/package/lean/luci-app-ssr-plus/Makefile
index 0ab2581c7a..67c9334fd6 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:=180
-PKG_RELEASE:=8
+PKG_RELEASE:=10
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client-config.lua b/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client-config.lua
index a9da19f4a7..654d033717 100644
--- a/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client-config.lua
+++ b/package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/client-config.lua
@@ -99,6 +99,13 @@ local securitys = {
 "chacha20-poly1305"
 }
 
+local flows = {
+"xtls-rprx-origin",
+"xtls-rprx-origin-udp443",
+"xtls-rprx-direct",
+"xtls-rprx-direct-udp443"
+}
+
 m = Map(shadowsocksr, translate("Edit ShadowSocksR Server"))
 m.redirect = luci.dispatcher.build_url("admin/services/shadowsocksr/servers")
 if m.uci:get(shadowsocksr, sid) ~= "servers" then
@@ -404,6 +411,13 @@ o.rmempty = true
 o.default = "0"
 o:depends({type="vless", tls="1"})
 
+-- Flow
+o = s:option(Value, "vless_flow", translate("Flow"))
+for _, v in ipairs(flows) do o:value(v, v) end
+o.rmempty = true
+o.default = "xtls-rprx-origin"
+o:depends("xtls", "1")
+
 -- [[ Mux ]]--
 o = s:option(Flag, "mux", translate("Mux"))
 o.rmempty = true
diff --git a/package/lean/luci-app-ssr-plus/po/zh_Hans/ssr-plus.po b/package/lean/luci-app-ssr-plus/po/zh_Hans/ssr-plus.po
index e7b2617826..0c9250cdd1 100644
--- a/package/lean/luci-app-ssr-plus/po/zh_Hans/ssr-plus.po
+++ b/package/lean/luci-app-ssr-plus/po/zh_Hans/ssr-plus.po
@@ -64,6 +64,9 @@ msgstr "加密方式"
 msgid "VLESS Encryption"
 msgstr "VLESS 加密"
 
+msgid "Flow"
+msgstr "流控 (Flow)"
+
 msgid "Transport"
 msgstr "传输协议"
 
diff --git a/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/genvlessconfig.lua b/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/genvlessconfig.lua
index 35e1e93c42..b5e99827dc 100644
--- a/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/genvlessconfig.lua
+++ b/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/genvlessconfig.lua
@@ -55,7 +55,7 @@ outbound = {
 				users = {
 					{
 						id = server.vmess_id,
-						flow = (server.xtls == '1') and "xtls-rprx-origin" or nil,
+						flow = (server.xtls == '1') and (server.vless_flow and server.vless_flow or "xtls-rprx-origin") or nil,
 						encryption = server.vless_encryption
 					}
 				}