diff --git a/luci-app-passwall/luasrc/model/cbi/passwall/client/type/ray.lua b/luci-app-passwall/luasrc/model/cbi/passwall/client/type/ray.lua index 0be45708..5a73d7aa 100644 --- a/luci-app-passwall/luasrc/model/cbi/passwall/client/type/ray.lua +++ b/luci-app-passwall/luasrc/model/cbi/passwall/client/type/ray.lua @@ -44,10 +44,10 @@ local header_type_list = { local xray_version = api.get_app_version("xray") o = s:option(ListValue, _n("protocol"), translate("Protocol")) +o:value("socks", translate("Socks")) +o:value("http", translate("HTTP")) o:value("vmess", translate("Vmess")) o:value("vless", translate("VLESS")) -o:value("http", translate("HTTP")) -o:value("socks", translate("Socks")) o:value("shadowsocks", translate("Shadowsocks")) o:value("trojan", translate("Trojan")) o:value("wireguard", translate("WireGuard")) @@ -399,8 +399,6 @@ o = s:option(Flag, _n("tls"), translate("TLS")) o.default = 0 o:depends({ [_n("protocol")] = "vmess" }) o:depends({ [_n("protocol")] = "vless" }) -o:depends({ [_n("protocol")] = "http" }) -o:depends({ [_n("protocol")] = "socks" }) o:depends({ [_n("protocol")] = "trojan" }) o:depends({ [_n("protocol")] = "shadowsocks" }) @@ -533,7 +531,6 @@ o:value("httpupgrade", "HttpUpgrade") o:value("xhttp", "XHTTP") o:depends({ [_n("protocol")] = "vmess" }) o:depends({ [_n("protocol")] = "vless" }) -o:depends({ [_n("protocol")] = "socks" }) o:depends({ [_n("protocol")] = "shadowsocks" }) o:depends({ [_n("protocol")] = "trojan" }) @@ -726,8 +723,6 @@ o:depends({ [_n("protocol")] = "vless", [_n("transport")] = "raw" }) o:depends({ [_n("protocol")] = "vless", [_n("transport")] = "ws" }) o:depends({ [_n("protocol")] = "vless", [_n("transport")] = "grpc" }) o:depends({ [_n("protocol")] = "vless", [_n("transport")] = "httpupgrade" }) -o:depends({ [_n("protocol")] = "http" }) -o:depends({ [_n("protocol")] = "socks" }) o:depends({ [_n("protocol")] = "shadowsocks" }) o:depends({ [_n("protocol")] = "trojan" }) 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 545011ff..78dc624a 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 @@ -560,7 +560,6 @@ if singbox_tags:find("with_utls") then o:depends({ [_n("protocol")] = "vless", [_n("tls")] = true }) o:depends({ [_n("protocol")] = "vmess", [_n("tls")] = true }) o:depends({ [_n("protocol")] = "shadowsocks", [_n("tls")] = true }) - o:depends({ [_n("protocol")] = "socks", [_n("tls")] = true }) o:depends({ [_n("protocol")] = "trojan", [_n("tls")] = true }) o:depends({ [_n("protocol")] = "anytls", [_n("tls")] = true }) @@ -585,7 +584,6 @@ else o:value("grpc", "gRPC-lite") end o:depends({ [_n("protocol")] = "vmess" }) o:depends({ [_n("protocol")] = "vless" }) -o:depends({ [_n("protocol")] = "socks" }) o:depends({ [_n("protocol")] = "shadowsocks" }) o:depends({ [_n("protocol")] = "trojan" }) diff --git a/luci-app-passwall/luasrc/model/cbi/passwall/server/type/ray.lua b/luci-app-passwall/luasrc/model/cbi/passwall/server/type/ray.lua index e12e3c7e..9c63beea 100644 --- a/luci-app-passwall/luasrc/model/cbi/passwall/server/type/ray.lua +++ b/luci-app-passwall/luasrc/model/cbi/passwall/server/type/ray.lua @@ -34,10 +34,10 @@ local header_type_list = { o = s:option(Flag, _n("custom"), translate("Use Custom Config")) o = s:option(ListValue, _n("protocol"), translate("Protocol")) +o:value("socks", "Socks") +o:value("http", "HTTP") o:value("vmess", "Vmess") o:value("vless", "VLESS") -o:value("http", "HTTP") -o:value("socks", "Socks") o:value("shadowsocks", "Shadowsocks") o:value("trojan", "Trojan") o:value("hysteria2", translate("Hysteria2")) @@ -181,8 +181,6 @@ o.validate = function(self, value, t) end o:depends({ [_n("protocol")] = "vmess" }) o:depends({ [_n("protocol")] = "vless" }) -o:depends({ [_n("protocol")] = "http" }) -o:depends({ [_n("protocol")] = "socks" }) o:depends({ [_n("protocol")] = "shadowsocks" }) o:depends({ [_n("protocol")] = "trojan" }) @@ -308,7 +306,6 @@ o:value("httpupgrade", "HttpUpgrade") o:value("xhttp", "XHTTP") o:depends({ [_n("protocol")] = "vmess" }) o:depends({ [_n("protocol")] = "vless" }) -o:depends({ [_n("protocol")] = "socks" }) o:depends({ [_n("protocol")] = "shadowsocks" }) o:depends({ [_n("protocol")] = "trojan" })