From f6e54f57edec50804e205d71d3f8e8f69a9b14d7 Mon Sep 17 00:00:00 2001 From: Gzxhwq Date: Fri, 15 Sep 2023 23:07:49 +0800 Subject: [PATCH] luci: make sing-box gRPC-lite work MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 客户端不需要编译with_grpc也可以连接*ray的标准grpc，反之编译了with_grpc则不能连接sing-box的grpc-lite服务器。 所以客户端不需要编译with_grpc，sing-box grpc-lite兼容标准grpc，标准grpc不兼容grpc-lite --- .../cbi/passwall/client/type/sing-box.lua | 29 +++++++++---------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/luci-app-passwall/luasrc/model/cbi/passwall/client/type/sing-box.lua b/luci-app-passwall/luasrc/model/cbi/passwall/client/type/sing-box.lua index 5754052a8..302a117ca 100644 --- a/luci-app-passwall/luasrc/model/cbi/passwall/client/type/sing-box.lua +++ b/luci-app-passwall/luasrc/model/cbi/passwall/client/type/sing-box.lua @@ -433,6 +433,7 @@ if singbox_tags:find("with_quic") then end if singbox_tags:find("with_grpc") then o:value("grpc", "gRPC") +else o:value("grpc", "gRPC-lite") end o:depends({ [option_name("protocol")] = "vmess" }) o:depends({ [option_name("protocol")] = "vless" }) @@ -499,25 +500,23 @@ o = s:option(Value, option_name("ws_earlyDataHeaderName"), translate("Early data o:depends({ [option_name("ws_enableEarlyData")] = true }) -- [[ gRPC部分 ]]-- -if singbox_tags:find("with_grpc") then - o = s:option(Value, option_name("grpc_serviceName"), "ServiceName") - o:depends({ [option_name("transport")] = "grpc" }) +o = s:option(Value, option_name("grpc_serviceName"), "ServiceName") +o:depends({ [option_name("transport")] = "grpc" }) - o = s:option(Flag, option_name("grpc_health_check"), translate("Health check")) - o:depends({ [option_name("transport")] = "grpc" }) +o = s:option(Flag, option_name("grpc_health_check"), translate("Health check")) +o:depends({ [option_name("transport")] = "grpc" }) - o = s:option(Value, option_name("grpc_idle_timeout"), translate("Idle timeout")) - o.default = "10" - o:depends({ [option_name("grpc_health_check")] = true }) +o = s:option(Value, option_name("grpc_idle_timeout"), translate("Idle timeout")) +o.default = "10" +o:depends({ [option_name("grpc_health_check")] = true }) - o = s:option(Value, option_name("grpc_health_check_timeout"), translate("Health check timeout")) - o.default = "20" - o:depends({ [option_name("grpc_health_check")] = true }) +o = s:option(Value, option_name("grpc_health_check_timeout"), translate("Health check timeout")) +o.default = "20" +o:depends({ [option_name("grpc_health_check")] = true }) - o = s:option(Flag, option_name("grpc_permit_without_stream"), translate("Permit without stream")) - o.default = "0" - o:depends({ [option_name("grpc_health_check")] = true }) -end +o = s:option(Flag, option_name("grpc_permit_without_stream"), translate("Permit without stream")) +o.default = "0" +o:depends({ [option_name("grpc_health_check")] = true }) -- [[ Mux ]]-- o = s:option(Flag, option_name("mux"), translate("Mux"))