luci-app-ssr-plus: fix v2ray gPRC multi support

Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
This commit is contained in:
Tianling Shen 2022-06-08 18:19:16 +08:00 committed by sbwml
parent 381a80100a
commit 61babe0f10
3 changed files with 13 additions and 2 deletions

View File

@ -438,6 +438,14 @@ o = s:option(Value, "serviceName", translate("gRPC Service Name"))
o:depends("transport", "grpc") o:depends("transport", "grpc")
o.rmempty = true o.rmempty = true
-- gPRC模式
o = s:option(ListValue, "grpc_mode", translate("gRPC Mode"))
o:depends("transport", "grpc")
o:value("gun", translate("Gun"))
o:value("multi", translate("Multi"))
o:value("raw", translate("Raw"))
o.rmempty = true
-- gRPC初始窗口 -- gRPC初始窗口
o = s:option(Value, "initial_windows_size", translate("Initial Windows Size")) o = s:option(Value, "initial_windows_size", translate("Initial Windows Size"))
o.datatype = "uinteger" o.datatype = "uinteger"

View File

@ -739,6 +739,9 @@ msgstr "HTTP/2 路径"
msgid "gRPC Service Name" msgid "gRPC Service Name"
msgstr "gRPC 服务名称" msgstr "gRPC 服务名称"
msgid "gRPC Mode"
msgstr "gRPC 模式"
msgid "Initial Windows Size" msgid "Initial Windows Size"
msgstr "初始窗口大小" msgstr "初始窗口大小"

View File

@ -176,11 +176,11 @@ local Xray = {
} or nil, } or nil,
wsSettings = (server.transport == "ws") and (server.ws_path or server.ws_host or server.tls_host) and { wsSettings = (server.transport == "ws") and (server.ws_path or server.ws_host or server.tls_host) and {
-- ws -- ws
path = server.ws_path,
headers = (server.ws_host or server.tls_host) and { headers = (server.ws_host or server.tls_host) and {
-- headers -- headers
Host = server.ws_host or server.tls_host Host = server.ws_host or server.tls_host
} or nil, } or nil,
path = server.ws_path,
maxEarlyData = tonumber(server.ws_ed) or nil, maxEarlyData = tonumber(server.ws_ed) or nil,
earlyDataHeaderName = server.ws_ed_header or nil earlyDataHeaderName = server.ws_ed_header or nil
} or nil, } or nil,
@ -200,7 +200,7 @@ local Xray = {
grpcSettings = (server.transport == "grpc") and { grpcSettings = (server.transport == "grpc") and {
-- grpc -- grpc
serviceName = server.serviceName or "", serviceName = server.serviceName or "",
multiMode = (server.mux == "1") and true or false, mode = (server.grpc_mode ~= "gun") and server.grpc_mode or nil,
idle_timeout = tonumber(server.idle_timeout) or nil, idle_timeout = tonumber(server.idle_timeout) or nil,
health_check_timeout = tonumber(server.health_check_timeout) or nil, health_check_timeout = tonumber(server.health_check_timeout) or nil,
permit_without_stream = (server.permit_without_stream == "1") and true or nil, permit_without_stream = (server.permit_without_stream == "1") and true or nil,