Skip to content

fix(ssr-plus): 修复 gRPC 节点订阅更新后 serviceName 丢失导致 xray 启动失败 #2042

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fordjkhjk wants to merge 1 commit into
base: dev
Choose a base branch
from
+4 −4
Open

fix(ssr-plus): 修复 gRPC 节点订阅更新后 serviceName 丢失导致 xray 启动失败 #2042

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion luci-app-ssr-plus/root/usr/share/shadowsocksr/gen_config.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -636,7 +636,7 @@ Xray.outbounds = {
} or nil,
grpcSettings = (server.transport == "grpc") and {
-- grpc
serviceName = (server.serviceName and server.serviceName ~= "") and server.serviceName or nil,
serviceName = (server.serviceName and server.serviceName ~= "") and server.serviceName or "",
multiMode = (server.grpc_mode == "multi") and true or nil,
idle_timeout = server.idle_timeout and (tonumber(server.idle_timeout) < 10 and 10 or tonumber(server.idle_timeout)) or nil,
health_check_timeout = server.health_check_timeout and tonumber(server.health_check_timeout) or nil,
Expand Down
6 changes: 3 additions & 3 deletions luci-app-ssr-plus/root/usr/share/shadowsocksr/subscribe.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1379,7 +1379,7 @@ local function processData(szType, content, cfgid)
result.quic_security = params.quicSecurity or "none"
result.quic_key = params.key
elseif result.transport == "grpc" then
result.serviceName = params.serviceName
result.serviceName = params.serviceName or params.servicename or params.path
result.grpc_mode = params.mode or "gun"
elseif result.transport == "tcp" or result.transport == "raw" then
result.tcp_guise = params.headerType or "none"
Expand Down Expand Up @@ -1714,7 +1714,7 @@ local function processData(szType, content, cfgid)
result.quic_security = params.quicSecurity or "none"
result.quic_key = params.key
elseif result.transport == "grpc" then
result.serviceName = params.serviceName
result.serviceName = params.serviceName or params.servicename or params.path
result.grpc_mode = params.mode or "gun"
elseif result.transport == "tcp" or result.transport == "raw" then
result.tcp_guise = params.headerType and params.headerType ~= "" and params.headerType or "none"
Expand Down Expand Up @@ -1852,7 +1852,7 @@ local function processData(szType, content, cfgid)
result.quic_security = params.quicSecurity or "none"
result.quic_key = params.key
elseif result.transport == "grpc" then
result.serviceName = params.serviceName
result.serviceName = params.serviceName or params.servicename or params.path
result.grpc_mode = params.mode or "gun"
elseif result.transport == "raw" then
result.tcp_guise = params.headerType or "none"
Expand Down
Loading