From 40770dd2506ab08d261230a42078b8d678d9e3ae Mon Sep 17 00:00:00 2001 From: DHR60 Date: Sat, 28 Mar 2026 21:18:58 +0800 Subject: [PATCH 1/4] Refactor transport --- v2rayN/ServiceLib/Global.cs | 10 +- .../Builder/CoreConfigContextBuilder.cs | 5 +- .../Handler/Builder/NodeValidator.cs | 7 +- v2rayN/ServiceLib/Handler/ConfigHandler.cs | 38 +- v2rayN/ServiceLib/Handler/Fmt/BaseFmt.cs | 174 ++++--- .../ServiceLib/Handler/Fmt/ShadowsocksFmt.cs | 33 +- v2rayN/ServiceLib/Handler/Fmt/VmessFmt.cs | 58 ++- v2rayN/ServiceLib/Manager/AppManager.cs | 131 ++++- v2rayN/ServiceLib/Models/ProfileItem.cs | 19 +- v2rayN/ServiceLib/Models/ProtocolExtraItem.cs | 2 + v2rayN/ServiceLib/Models/TransportExtra.cs | 25 + .../Singbox/SingboxOutboundService.cs | 57 ++- .../CoreConfig/V2ray/V2rayOutboundService.cs | 104 ++-- .../ViewModels/AddServerViewModel.cs | 232 ++++++++- .../Views/AddServerWindow.axaml | 350 +++++++++----- .../Views/AddServerWindow.axaml.cs | 125 ++--- v2rayN/v2rayN/Views/AddServerWindow.xaml | 450 ++++++++++++------ v2rayN/v2rayN/Views/AddServerWindow.xaml.cs | 139 +++--- 18 files changed, 1341 insertions(+), 618 deletions(-) create mode 100644 v2rayN/ServiceLib/Models/TransportExtra.cs diff --git a/v2rayN/ServiceLib/Global.cs b/v2rayN/ServiceLib/Global.cs index bf8dd7ab..6988cd30 100644 --- a/v2rayN/ServiceLib/Global.cs +++ b/v2rayN/ServiceLib/Global.cs @@ -293,13 +293,11 @@ public class Global public static readonly List Networks = [ "tcp", - "kcp", - "ws", - "httpupgrade", "xhttp", - "h2", - "quic", - "grpc" + "kcp", + "grpc", + "ws", + "httpupgrade" ]; public static readonly List KcpHeaderTypes = diff --git a/v2rayN/ServiceLib/Handler/Builder/CoreConfigContextBuilder.cs b/v2rayN/ServiceLib/Handler/Builder/CoreConfigContextBuilder.cs index a8cca654..51664db3 100644 --- a/v2rayN/ServiceLib/Handler/Builder/CoreConfigContextBuilder.cs +++ b/v2rayN/ServiceLib/Handler/Builder/CoreConfigContextBuilder.cs @@ -340,8 +340,9 @@ public class CoreConfigContextBuilder } // xhttp downloadSettings address protect - if (!string.IsNullOrEmpty(node.Extra) - && JsonUtils.ParseJson(node.Extra) is JsonObject extra + var xhttpExtra = node.GetTransportExtra().XhttpExtra; + if (!string.IsNullOrEmpty(xhttpExtra) + && JsonUtils.ParseJson(xhttpExtra) is JsonObject extra && extra.TryGetPropertyValue("downloadSettings", out var dsNode) && dsNode is JsonObject downloadSettings && downloadSettings.TryGetPropertyValue("address", out var dAddrNode) diff --git a/v2rayN/ServiceLib/Handler/Builder/NodeValidator.cs b/v2rayN/ServiceLib/Handler/Builder/NodeValidator.cs index 65110b2a..0bec9d39 100644 --- a/v2rayN/ServiceLib/Handler/Builder/NodeValidator.cs +++ b/v2rayN/ServiceLib/Handler/Builder/NodeValidator.cs @@ -20,7 +20,7 @@ public class NodeValidator [EConfigType.VMess, EConfigType.VLESS, EConfigType.Trojan, EConfigType.Shadowsocks]; private static readonly HashSet SingboxShadowsocksAllowedTransports = - [nameof(ETransport.tcp), nameof(ETransport.ws), nameof(ETransport.quic)]; + [nameof(ETransport.tcp), nameof(ETransport.ws)]; public static NodeValidatorResult Validate(ProfileItem item, ECoreType coreType) { @@ -141,9 +141,10 @@ public class NodeValidator v.Assert(!item.PublicKey.IsNullOrEmpty(), string.Format(ResUI.MsgInvalidProperty, "PublicKey")); } - if (item.Network == nameof(ETransport.xhttp) && !item.Extra.IsNullOrEmpty()) + var transport = item.GetTransportExtra(); + if (item.Network == nameof(ETransport.xhttp) && !transport.XhttpExtra.IsNullOrEmpty()) { - if (JsonUtils.ParseJson(item.Extra) is null) + if (JsonUtils.ParseJson(transport.XhttpExtra) is null) { v.Error(string.Format(ResUI.MsgInvalidProperty, "XHTTP Extra")); } diff --git a/v2rayN/ServiceLib/Handler/ConfigHandler.cs b/v2rayN/ServiceLib/Handler/ConfigHandler.cs index c3d82043..144f359f 100644 --- a/v2rayN/ServiceLib/Handler/ConfigHandler.cs +++ b/v2rayN/ServiceLib/Handler/ConfigHandler.cs @@ -235,9 +235,6 @@ public static class ConfigHandler item.Password = profileItem.Password; item.Network = profileItem.Network; - item.HeaderType = profileItem.HeaderType; - item.RequestHost = profileItem.RequestHost; - item.Path = profileItem.Path; item.StreamSecurity = profileItem.StreamSecurity; item.Sni = profileItem.Sni; @@ -249,7 +246,6 @@ public static class ConfigHandler item.ShortId = profileItem.ShortId; item.SpiderX = profileItem.SpiderX; item.Mldsa65Verify = profileItem.Mldsa65Verify; - item.Extra = profileItem.Extra; item.MuxEnabled = profileItem.MuxEnabled; item.Cert = profileItem.Cert; item.CertSha = profileItem.CertSha; @@ -296,9 +292,6 @@ public static class ConfigHandler VmessSecurity = profileItem.GetProtocolExtra().VmessSecurity?.TrimEx() }); profileItem.Network = profileItem.Network.TrimEx(); - profileItem.HeaderType = profileItem.HeaderType.TrimEx(); - profileItem.RequestHost = profileItem.RequestHost.TrimEx(); - profileItem.Path = profileItem.Path.TrimEx(); profileItem.StreamSecurity = profileItem.StreamSecurity.TrimEx(); if (!Global.VmessSecurities.Contains(profileItem.GetProtocolExtra().VmessSecurity)) @@ -750,10 +743,12 @@ public static class ConfigHandler profileItem.Password = profileItem.Password.TrimEx(); profileItem.Network = string.Empty; - if (!Global.TuicCongestionControls.Contains(profileItem.HeaderType)) + var congestionControl = profileItem.GetProtocolExtra().CongestionControl; + if (!Global.TuicCongestionControls.Contains(congestionControl)) { - profileItem.HeaderType = Global.TuicCongestionControls.FirstOrDefault()!; + congestionControl = Global.TuicCongestionControls.FirstOrDefault()!; } + profileItem.SetProtocolExtra(profileItem.GetProtocolExtra() with { CongestionControl = congestionControl }); if (profileItem.StreamSecurity.IsNullOrEmpty()) { @@ -995,9 +990,6 @@ public static class ConfigHandler profileItem.Address = profileItem.Address.TrimEx(); profileItem.Password = profileItem.Password.TrimEx(); profileItem.Network = profileItem.Network.TrimEx(); - profileItem.HeaderType = profileItem.HeaderType.TrimEx(); - profileItem.RequestHost = profileItem.RequestHost.TrimEx(); - profileItem.Path = profileItem.Path.TrimEx(); profileItem.StreamSecurity = profileItem.StreamSecurity.TrimEx(); var vlessEncryption = profileItem.GetProtocolExtra().VlessEncryption?.TrimEx(); @@ -1066,7 +1058,7 @@ public static class ConfigHandler /// 0 if successful public static async Task AddServerCommon(Config config, ProfileItem profileItem, bool toFile = true) { - profileItem.ConfigVersion = 3; + profileItem.ConfigVersion = 4; if (profileItem.StreamSecurity.IsNotEmpty()) { @@ -1134,6 +1126,8 @@ public static class ConfigHandler var oProtocolExtra = o.GetProtocolExtra(); var nProtocolExtra = n.GetProtocolExtra(); + var oTransport = oProtocolExtra.Transport ?? new TransportExtra(); + var nTransport = nProtocolExtra.Transport ?? new TransportExtra(); return o.ConfigType == n.ConfigType && AreEqual(o.Address, n.Address) @@ -1144,9 +1138,21 @@ public static class ConfigHandler && AreEqual(oProtocolExtra.SsMethod, nProtocolExtra.SsMethod) && AreEqual(oProtocolExtra.VmessSecurity, nProtocolExtra.VmessSecurity) && AreEqual(o.Network, n.Network) - && AreEqual(o.HeaderType, n.HeaderType) - && AreEqual(o.RequestHost, n.RequestHost) - && AreEqual(o.Path, n.Path) + && AreEqual(oTransport.TcpHeaderType, nTransport.TcpHeaderType) + && AreEqual(oTransport.TcpHost, nTransport.TcpHost) + && AreEqual(oTransport.WsHost, nTransport.WsHost) + && AreEqual(oTransport.WsPath, nTransport.WsPath) + && AreEqual(oTransport.HttpupgradeHost, nTransport.HttpupgradeHost) + && AreEqual(oTransport.HttpupgradePath, nTransport.HttpupgradePath) + && AreEqual(oTransport.XhttpHost, nTransport.XhttpHost) + && AreEqual(oTransport.XhttpPath, nTransport.XhttpPath) + && AreEqual(oTransport.XhttpMode, nTransport.XhttpMode) + && AreEqual(oTransport.XhttpExtra, nTransport.XhttpExtra) + && AreEqual(oTransport.GrpcAuthority, nTransport.GrpcAuthority) + && AreEqual(oTransport.GrpcServiceName, nTransport.GrpcServiceName) + && AreEqual(oTransport.GrpcMode, nTransport.GrpcMode) + && AreEqual(oTransport.KcpHeaderType, nTransport.KcpHeaderType) + && AreEqual(oTransport.KcpSeed, nTransport.KcpSeed) && (o.ConfigType == EConfigType.Trojan || o.StreamSecurity == n.StreamSecurity) && AreEqual(oProtocolExtra.Flow, nProtocolExtra.Flow) && AreEqual(oProtocolExtra.SalamanderPass, nProtocolExtra.SalamanderPass) diff --git a/v2rayN/ServiceLib/Handler/Fmt/BaseFmt.cs b/v2rayN/ServiceLib/Handler/Fmt/BaseFmt.cs index b620cfe9..31bb22b8 100644 --- a/v2rayN/ServiceLib/Handler/Fmt/BaseFmt.cs +++ b/v2rayN/ServiceLib/Handler/Fmt/BaseFmt.cs @@ -21,6 +21,8 @@ public class BaseFmt protected static int ToUriQuery(ProfileItem item, string? securityDef, ref Dictionary dicQuery) { + var transport = item.GetTransportExtra(); + if (item.StreamSecurity.IsNotEmpty()) { dicQuery.Add("security", item.StreamSecurity); @@ -87,54 +89,70 @@ public class BaseFmt dicQuery.Add("fm", Utils.UrlEncode(finalmask)); } - dicQuery.Add("type", item.Network.IsNotEmpty() ? item.Network : nameof(ETransport.tcp)); + var network = item.GetNetwork(); + if (!Global.Networks.Contains(network)) + { + network = nameof(ETransport.tcp); + } - switch (item.Network) + dicQuery.Add("type", network); + + switch (network) { case nameof(ETransport.tcp): - dicQuery.Add("headerType", item.HeaderType.IsNotEmpty() ? item.HeaderType : Global.None); - if (item.RequestHost.IsNotEmpty()) + dicQuery.Add("headerType", transport.TcpHeaderType.IsNotEmpty() ? transport.TcpHeaderType : Global.None); + if (transport.TcpHost.IsNotEmpty()) { - dicQuery.Add("host", Utils.UrlEncode(item.RequestHost)); + dicQuery.Add("host", Utils.UrlEncode(transport.TcpHost)); } break; case nameof(ETransport.kcp): - dicQuery.Add("headerType", item.HeaderType.IsNotEmpty() ? item.HeaderType : Global.None); - if (item.Path.IsNotEmpty()) + dicQuery.Add("headerType", transport.KcpHeaderType.IsNotEmpty() ? transport.KcpHeaderType : Global.None); + if (transport.KcpSeed.IsNotEmpty()) { - dicQuery.Add("seed", Utils.UrlEncode(item.Path)); + dicQuery.Add("seed", Utils.UrlEncode(transport.KcpSeed)); } break; case nameof(ETransport.ws): - case nameof(ETransport.httpupgrade): - if (item.RequestHost.IsNotEmpty()) + if (transport.WsHost.IsNotEmpty()) { - dicQuery.Add("host", Utils.UrlEncode(item.RequestHost)); + dicQuery.Add("host", Utils.UrlEncode(transport.WsHost)); } - if (item.Path.IsNotEmpty()) + if (transport.WsPath.IsNotEmpty()) { - dicQuery.Add("path", Utils.UrlEncode(item.Path)); + dicQuery.Add("path", Utils.UrlEncode(transport.WsPath)); + } + break; + + case nameof(ETransport.httpupgrade): + if (transport.HttpupgradeHost.IsNotEmpty()) + { + dicQuery.Add("host", Utils.UrlEncode(transport.HttpupgradeHost)); + } + if (transport.HttpupgradePath.IsNotEmpty()) + { + dicQuery.Add("path", Utils.UrlEncode(transport.HttpupgradePath)); } break; case nameof(ETransport.xhttp): - if (item.RequestHost.IsNotEmpty()) + if (transport.XhttpHost.IsNotEmpty()) { - dicQuery.Add("host", Utils.UrlEncode(item.RequestHost)); + dicQuery.Add("host", Utils.UrlEncode(transport.XhttpHost)); } - if (item.Path.IsNotEmpty()) + if (transport.XhttpPath.IsNotEmpty()) { - dicQuery.Add("path", Utils.UrlEncode(item.Path)); + dicQuery.Add("path", Utils.UrlEncode(transport.XhttpPath)); } - if (item.HeaderType.IsNotEmpty() && Global.XhttpMode.Contains(item.HeaderType)) + if (transport.XhttpMode.IsNotEmpty() && Global.XhttpMode.Contains(transport.XhttpMode)) { - dicQuery.Add("mode", Utils.UrlEncode(item.HeaderType)); + dicQuery.Add("mode", Utils.UrlEncode(transport.XhttpMode)); } - if (item.Extra.IsNotEmpty()) + if (transport.XhttpExtra.IsNotEmpty()) { - var node = JsonUtils.ParseJson(item.Extra); + var node = JsonUtils.ParseJson(transport.XhttpExtra); var extra = node != null ? JsonUtils.Serialize(node, new JsonSerializerOptions { @@ -142,38 +160,19 @@ public class BaseFmt DefaultIgnoreCondition = JsonIgnoreCondition.Never, Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping }) - : item.Extra; + : transport.XhttpExtra; dicQuery.Add("extra", Utils.UrlEncode(extra)); } break; - case nameof(ETransport.http): - case nameof(ETransport.h2): - dicQuery["type"] = nameof(ETransport.http); - if (item.RequestHost.IsNotEmpty()) - { - dicQuery.Add("host", Utils.UrlEncode(item.RequestHost)); - } - if (item.Path.IsNotEmpty()) - { - dicQuery.Add("path", Utils.UrlEncode(item.Path)); - } - break; - - case nameof(ETransport.quic): - dicQuery.Add("headerType", item.HeaderType.IsNotEmpty() ? item.HeaderType : Global.None); - dicQuery.Add("quicSecurity", Utils.UrlEncode(item.RequestHost)); - dicQuery.Add("key", Utils.UrlEncode(item.Path)); - break; - case nameof(ETransport.grpc): - if (item.Path.IsNotEmpty()) + if (transport.GrpcServiceName.IsNotEmpty()) { - dicQuery.Add("authority", Utils.UrlEncode(item.RequestHost)); - dicQuery.Add("serviceName", Utils.UrlEncode(item.Path)); - if (item.HeaderType is Global.GrpcGunMode or Global.GrpcMultiMode) + dicQuery.Add("authority", Utils.UrlEncode(transport.GrpcAuthority)); + dicQuery.Add("serviceName", Utils.UrlEncode(transport.GrpcServiceName)); + if (transport.GrpcMode is Global.GrpcGunMode or Global.GrpcMultiMode) { - dicQuery.Add("mode", Utils.UrlEncode(item.HeaderType)); + dicQuery.Add("mode", Utils.UrlEncode(transport.GrpcMode)); } } break; @@ -216,6 +215,8 @@ public class BaseFmt protected static int ResolveUriQuery(NameValueCollection query, ref ProfileItem item) { + var transport = item.GetTransportExtra(); + item.StreamSecurity = GetQueryValue(query, "security"); item.Sni = GetQueryValue(query, "sni"); item.Alpn = GetQueryDecoded(query, "alpn"); @@ -258,36 +259,56 @@ public class BaseFmt item.AllowInsecure = string.Empty; } - item.Network = GetQueryValue(query, "type", nameof(ETransport.tcp)); + var net = GetQueryValue(query, "type", nameof(ETransport.tcp)); + if (!Global.Networks.Contains(net)) + { + net = nameof(ETransport.tcp); + } + + item.Network = net; switch (item.Network) { case nameof(ETransport.tcp): - item.HeaderType = GetQueryValue(query, "headerType", Global.None); - item.RequestHost = GetQueryDecoded(query, "host"); + transport = transport with + { + TcpHeaderType = GetQueryValue(query, "headerType", Global.None), + TcpHost = GetQueryDecoded(query, "host"), + }; break; case nameof(ETransport.kcp): - item.HeaderType = GetQueryValue(query, "headerType", Global.None); - item.Path = GetQueryDecoded(query, "seed"); + var kcpSeed = GetQueryDecoded(query, "seed"); + transport = transport with + { + KcpHeaderType = GetQueryValue(query, "headerType", Global.None), + KcpSeed = kcpSeed, + }; break; case nameof(ETransport.ws): + transport = transport with + { + WsHost = GetQueryDecoded(query, "host"), + WsPath = GetQueryDecoded(query, "path", "/"), + }; + break; + case nameof(ETransport.httpupgrade): - item.RequestHost = GetQueryDecoded(query, "host"); - item.Path = GetQueryDecoded(query, "path", "/"); + transport = transport with + { + HttpupgradeHost = GetQueryDecoded(query, "host"), + HttpupgradePath = GetQueryDecoded(query, "path", "/"), + }; break; case nameof(ETransport.xhttp): - item.RequestHost = GetQueryDecoded(query, "host"); - item.Path = GetQueryDecoded(query, "path", "/"); - item.HeaderType = GetQueryDecoded(query, "mode"); - var extraDecoded = GetQueryDecoded(query, "extra"); - if (extraDecoded.IsNotEmpty()) + var xhttpExtra = GetQueryDecoded(query, "extra"); + if (xhttpExtra.IsNotEmpty()) { - var node = JsonUtils.ParseJson(extraDecoded); + var node = JsonUtils.ParseJson(xhttpExtra); if (node != null) { - extraDecoded = JsonUtils.Serialize(node, new JsonSerializerOptions + xhttpExtra = JsonUtils.Serialize(node, new JsonSerializerOptions { WriteIndented = true, DefaultIgnoreCondition = JsonIgnoreCondition.Never, @@ -295,31 +316,32 @@ public class BaseFmt }); } } - item.Extra = extraDecoded; - break; - case nameof(ETransport.http): - case nameof(ETransport.h2): - item.Network = nameof(ETransport.h2); - item.RequestHost = GetQueryDecoded(query, "host"); - item.Path = GetQueryDecoded(query, "path", "/"); - break; - - case nameof(ETransport.quic): - item.HeaderType = GetQueryValue(query, "headerType", Global.None); - item.RequestHost = GetQueryValue(query, "quicSecurity", Global.None); - item.Path = GetQueryDecoded(query, "key"); + transport = transport with + { + XhttpHost = GetQueryDecoded(query, "host"), + XhttpPath = GetQueryDecoded(query, "path", "/"), + XhttpMode = GetQueryDecoded(query, "mode"), + XhttpExtra = xhttpExtra, + }; break; case nameof(ETransport.grpc): - item.RequestHost = GetQueryDecoded(query, "authority"); - item.Path = GetQueryDecoded(query, "serviceName"); - item.HeaderType = GetQueryDecoded(query, "mode", Global.GrpcGunMode); + transport = transport with + { + GrpcAuthority = GetQueryDecoded(query, "authority"), + GrpcServiceName = GetQueryDecoded(query, "serviceName"), + GrpcMode = GetQueryDecoded(query, "mode", Global.GrpcGunMode), + }; break; default: + item.Network = nameof(ETransport.tcp); break; } + + item.SetTransportExtra(transport); + return 0; } diff --git a/v2rayN/ServiceLib/Handler/Fmt/ShadowsocksFmt.cs b/v2rayN/ServiceLib/Handler/Fmt/ShadowsocksFmt.cs index 5b30fa46..ae3e6664 100644 --- a/v2rayN/ServiceLib/Handler/Fmt/ShadowsocksFmt.cs +++ b/v2rayN/ServiceLib/Handler/Fmt/ShadowsocksFmt.cs @@ -42,31 +42,28 @@ public class ShadowsocksFmt : BaseFmt //url = Utile.Base64Encode(url); //new Sip002 var pw = Utils.Base64Encode($"{item.GetProtocolExtra().SsMethod}:{item.Password}", true); + var transport = item.GetTransportExtra(); // plugin var plugin = string.Empty; var pluginArgs = string.Empty; - if (item.Network == nameof(ETransport.tcp) && item.HeaderType == Global.TcpHeaderHttp) + if (item.Network == nameof(ETransport.tcp) && transport.TcpHeaderType == Global.TcpHeaderHttp) { plugin = "obfs-local"; - pluginArgs = $"obfs=http;obfs-host={item.RequestHost};"; + pluginArgs = $"obfs=http;obfs-host={transport.TcpHost};"; } else { if (item.Network == nameof(ETransport.ws)) { pluginArgs += "mode=websocket;"; - pluginArgs += $"host={item.RequestHost};"; + pluginArgs += $"host={transport.WsHost};"; // https://github.com/shadowsocks/v2ray-plugin/blob/e9af1cdd2549d528deb20a4ab8d61c5fbe51f306/args.go#L172 // Equal signs and commas [and backslashes] must be escaped with a backslash. - var path = item.Path.Replace("\\", "\\\\").Replace("=", "\\=").Replace(",", "\\,"); + var path = (transport.WsPath ?? string.Empty).Replace("\\", "\\\\").Replace("=", "\\=").Replace(",", "\\,"); pluginArgs += $"path={path};"; } - else if (item.Network == nameof(ETransport.quic)) - { - pluginArgs += "mode=quic;"; - } if (item.StreamSecurity == Global.StreamSecurity) { pluginArgs += "tls;"; @@ -213,8 +210,11 @@ public class ShadowsocksFmt : BaseFmt { obfsHost = obfsHost.Replace("obfs-host=", ""); item.Network = Global.DefaultNetwork; - item.HeaderType = Global.TcpHeaderHttp; - item.RequestHost = obfsHost; + item.SetTransportExtra(item.GetTransportExtra() with + { + TcpHeaderType = Global.TcpHeaderHttp, + TcpHost = obfsHost, + }); } } // Parse v2ray-plugin @@ -231,21 +231,20 @@ public class ShadowsocksFmt : BaseFmt if (modeValue == "websocket") { item.Network = nameof(ETransport.ws); + var t = item.GetTransportExtra(); if (!host.IsNullOrEmpty()) { - item.RequestHost = host.Replace("host=", ""); - item.Sni = item.RequestHost; + var wsHost = host.Replace("host=", ""); + t = t with { WsHost = wsHost }; + item.Sni = wsHost; } if (!path.IsNullOrEmpty()) { var pathValue = path.Replace("path=", ""); pathValue = pathValue.Replace("\\=", "=").Replace("\\,", ",").Replace("\\\\", "\\"); - item.Path = pathValue; + t = t with { WsPath = pathValue }; } - } - else if (modeValue == "quic") - { - item.Network = nameof(ETransport.quic); + item.SetTransportExtra(t); } if (hasTls) diff --git a/v2rayN/ServiceLib/Handler/Fmt/VmessFmt.cs b/v2rayN/ServiceLib/Handler/Fmt/VmessFmt.cs index b8760a40..c5f98009 100644 --- a/v2rayN/ServiceLib/Handler/Fmt/VmessFmt.cs +++ b/v2rayN/ServiceLib/Handler/Fmt/VmessFmt.cs @@ -26,6 +26,7 @@ public class VmessFmt : BaseFmt var vmessQRCode = new VmessQRCode { + // vmess link keeps shared transport keys; map from new transport model on export. v = 2, ps = item.Remarks.TrimEx(), add = item.Address, @@ -34,9 +35,32 @@ public class VmessFmt : BaseFmt aid = int.TryParse(item.GetProtocolExtra()?.AlterId, out var result) ? result : 0, scy = item.GetProtocolExtra().VmessSecurity ?? "", net = item.Network, - type = item.HeaderType, - host = item.RequestHost, - path = item.Path, + type = item.GetNetwork() switch + { + nameof(ETransport.tcp) => item.GetTransportExtra().TcpHeaderType, + nameof(ETransport.kcp) => item.GetTransportExtra().KcpHeaderType, + nameof(ETransport.xhttp) => item.GetTransportExtra().XhttpMode, + nameof(ETransport.grpc) => item.GetTransportExtra().GrpcMode, + _ => Global.None, + }, + host = item.GetNetwork() switch + { + nameof(ETransport.tcp) => item.GetTransportExtra().TcpHost, + nameof(ETransport.ws) => item.GetTransportExtra().WsHost, + nameof(ETransport.httpupgrade) => item.GetTransportExtra().HttpupgradeHost, + nameof(ETransport.xhttp) => item.GetTransportExtra().XhttpHost, + nameof(ETransport.grpc) => item.GetTransportExtra().GrpcAuthority, + _ => null, + }, + path = item.GetNetwork() switch + { + nameof(ETransport.kcp) => item.GetTransportExtra().KcpSeed, + nameof(ETransport.ws) => item.GetTransportExtra().WsPath, + nameof(ETransport.httpupgrade) => item.GetTransportExtra().HttpupgradePath, + nameof(ETransport.xhttp) => item.GetTransportExtra().XhttpPath, + nameof(ETransport.grpc) => item.GetTransportExtra().GrpcServiceName, + _ => null, + }, tls = item.StreamSecurity, sni = item.Sni, alpn = item.Alpn, @@ -70,7 +94,10 @@ public class VmessFmt : BaseFmt } item.Network = Global.DefaultNetwork; - item.HeaderType = Global.None; + var transport = new TransportExtra + { + TcpHeaderType = Global.None, + }; //item.ConfigVersion = vmessQRCode.v; item.Remarks = Utils.ToString(vmessQRCode.ps); @@ -88,11 +115,26 @@ public class VmessFmt : BaseFmt } if (vmessQRCode.type.IsNotEmpty()) { - item.HeaderType = vmessQRCode.type; + transport = item.GetNetwork() switch + { + nameof(ETransport.tcp) => transport with { TcpHeaderType = vmessQRCode.type }, + nameof(ETransport.kcp) => transport with { KcpHeaderType = vmessQRCode.type }, + nameof(ETransport.xhttp) => transport with { XhttpMode = vmessQRCode.type }, + nameof(ETransport.grpc) => transport with { GrpcMode = vmessQRCode.type }, + _ => transport, + }; } - - item.RequestHost = Utils.ToString(vmessQRCode.host); - item.Path = Utils.ToString(vmessQRCode.path); + transport = item.GetNetwork() switch + { + nameof(ETransport.tcp) => transport with { TcpHost = Utils.ToString(vmessQRCode.host) }, + nameof(ETransport.kcp) => transport with { KcpSeed = Utils.ToString(vmessQRCode.path) }, + nameof(ETransport.ws) => transport with { WsHost = Utils.ToString(vmessQRCode.host), WsPath = Utils.ToString(vmessQRCode.path) }, + nameof(ETransport.httpupgrade) => transport with { HttpupgradeHost = Utils.ToString(vmessQRCode.host), HttpupgradePath = Utils.ToString(vmessQRCode.path) }, + nameof(ETransport.xhttp) => transport with { XhttpHost = Utils.ToString(vmessQRCode.host), XhttpPath = Utils.ToString(vmessQRCode.path) }, + nameof(ETransport.grpc) => transport with { GrpcAuthority = Utils.ToString(vmessQRCode.host), GrpcServiceName = Utils.ToString(vmessQRCode.path) }, + _ => transport, + }; + item.SetTransportExtra(transport); item.StreamSecurity = Utils.ToString(vmessQRCode.tls); item.Sni = Utils.ToString(vmessQRCode.sni); item.Alpn = Utils.ToString(vmessQRCode.alpn); diff --git a/v2rayN/ServiceLib/Manager/AppManager.cs b/v2rayN/ServiceLib/Manager/AppManager.cs index 35847d71..9c268eac 100644 --- a/v2rayN/ServiceLib/Manager/AppManager.cs +++ b/v2rayN/ServiceLib/Manager/AppManager.cs @@ -308,8 +308,15 @@ public sealed class AppManager #pragma warning disable CS0618 public async Task MigrateProfileExtra() { - await MigrateProfileExtraGroup(); + await MigrateProfileExtraGroupV2ToV3(); + await MigrateProfileExtraV2ToV3(); + + await MigrateProfileTransportV3ToV4(); + } + + private async Task MigrateProfileExtraV2ToV3() + { const int pageSize = 100; var offset = 0; @@ -325,7 +332,7 @@ public sealed class AppManager break; } - var batchSuccessCount = await MigrateProfileExtraSub(batch); + var batchSuccessCount = await MigrateProfileExtraV2ToV3Sub(batch); // Only increment offset by the number of failed items that remain in the result set // Successfully updated items are automatically excluded from future queries due to ConfigVersion = 3 @@ -335,7 +342,123 @@ public sealed class AppManager //await ProfileGroupItemManager.Instance.ClearAll(); } - private async Task MigrateProfileExtraSub(List batch) + private async Task MigrateProfileTransportV3ToV4() + { + const int pageSize = 100; + var offset = 0; + + while (true) + { + var sql = $"SELECT * FROM ProfileItem WHERE ConfigVersion = 3 LIMIT {pageSize} OFFSET {offset}"; + var batch = await SQLiteHelper.Instance.QueryAsync(sql); + if (batch is null || batch.Count == 0) + { + break; + } + + var updateProfileItems = new List(); + foreach (var item in batch) + { + try + { + var extra = item.GetProtocolExtra(); + var transport = extra.Transport ?? new TransportExtra(); + var network = item.GetNetwork(); + + switch (network) + { + case nameof(ETransport.tcp): + transport = transport with + { + TcpHeaderType = item.HeaderType.NullIfEmpty(), + TcpHost = item.RequestHost.NullIfEmpty(), + }; + break; + + case nameof(ETransport.ws): + transport = transport with + { + WsHost = item.RequestHost.NullIfEmpty(), + WsPath = item.Path.NullIfEmpty(), + }; + break; + + case nameof(ETransport.httpupgrade): + transport = transport with + { + HttpupgradeHost = item.RequestHost.NullIfEmpty(), + HttpupgradePath = item.Path.NullIfEmpty(), + }; + break; + + case nameof(ETransport.xhttp): + transport = transport with + { + XhttpHost = item.RequestHost.NullIfEmpty(), + XhttpPath = item.Path.NullIfEmpty(), + XhttpMode = item.HeaderType.NullIfEmpty(), + XhttpExtra = item.Extra.NullIfEmpty(), + }; + break; + + case nameof(ETransport.grpc): + transport = transport with + { + GrpcAuthority = item.RequestHost.NullIfEmpty(), + GrpcServiceName = item.Path.NullIfEmpty(), + GrpcMode = item.HeaderType.NullIfEmpty(), + }; + break; + + case nameof(ETransport.kcp): + transport = transport with + { + KcpHeaderType = item.HeaderType.NullIfEmpty(), + KcpSeed = item.Path.NullIfEmpty(), + }; + break; + + default: + item.Network = Global.DefaultNetwork; + transport = transport with + { + TcpHeaderType = item.HeaderType.NullIfEmpty(), + TcpHost = item.RequestHost.NullIfEmpty(), + }; + break; + } + + item.SetProtocolExtra(extra with { Transport = transport }); + item.ConfigVersion = 4; + updateProfileItems.Add(item); + } + catch (Exception ex) + { + Logging.SaveLog($"MigrateProfileTransportV3ToV4 Error: {ex}"); + } + } + + if (updateProfileItems.Count > 0) + { + try + { + var count = await SQLiteHelper.Instance.UpdateAllAsync(updateProfileItems); + offset += batch.Count - count; + } + catch (Exception ex) + { + Logging.SaveLog($"MigrateProfileTransportV3ToV4 update error: {ex}"); + offset += batch.Count; + } + } + else + { + offset += batch.Count; + } + } + } + + private async Task MigrateProfileExtraV2ToV3Sub(List batch) { var updateProfileItems = new List(); @@ -433,7 +556,7 @@ public sealed class AppManager } } - private async Task MigrateProfileExtraGroup() + private async Task MigrateProfileExtraGroupV2ToV3() { var list = await SQLiteHelper.Instance.TableAsync().ToListAsync(); var groupItems = new ConcurrentDictionary(list.Where(t => !string.IsNullOrEmpty(t.IndexId)).ToDictionary(t => t.IndexId!)); diff --git a/v2rayN/ServiceLib/Models/ProfileItem.cs b/v2rayN/ServiceLib/Models/ProfileItem.cs index 50ac8b90..2601b8e6 100644 --- a/v2rayN/ServiceLib/Models/ProfileItem.cs +++ b/v2rayN/ServiceLib/Models/ProfileItem.cs @@ -9,7 +9,7 @@ public class ProfileItem { IndexId = string.Empty; ConfigType = EConfigType.VMess; - ConfigVersion = 3; + ConfigVersion = 4; Subid = string.Empty; Address = string.Empty; Port = 0; @@ -17,9 +17,6 @@ public class ProfileItem Username = string.Empty; Network = string.Empty; Remarks = string.Empty; - HeaderType = string.Empty; - RequestHost = string.Empty; - Path = string.Empty; StreamSecurity = string.Empty; AllowInsecure = string.Empty; } @@ -142,6 +139,16 @@ public class ProfileItem return _protocolExtraCache ??= JsonUtils.Deserialize(ProtoExtra) ?? new ProtocolExtraItem(); } + public TransportExtra GetTransportExtra() + { + return GetProtocolExtra().Transport ?? new TransportExtra(); + } + + public void SetTransportExtra(TransportExtra transportExtra) + { + SetProtocolExtra(GetProtocolExtra() with { Transport = transportExtra }); + } + #endregion function [PrimaryKey] @@ -160,8 +167,11 @@ public class ProfileItem public string Password { get; set; } public string Username { get; set; } public string Network { get; set; } + [Obsolete("Use TransportExtra.TcpHeaderType/XhttpMode/GrpcMode/KcpHeaderType instead.")] public string HeaderType { get; set; } + [Obsolete("Use TransportExtra.TcpHost/WsHost/HttpupgradeHost/XhttpHost/GrpcAuthority instead.")] public string RequestHost { get; set; } + [Obsolete("Use TransportExtra.WsPath/HttpupgradePath/XhttpPath/GrpcServiceName/KcpSeed instead.")] public string Path { get; set; } public string StreamSecurity { get; set; } public string AllowInsecure { get; set; } @@ -172,6 +182,7 @@ public class ProfileItem public string ShortId { get; set; } public string SpiderX { get; set; } public string Mldsa65Verify { get; set; } + [Obsolete("Use TransportExtra.XhttpExtra instead.")] public string Extra { get; set; } public bool? MuxEnabled { get; set; } public string Cert { get; set; } diff --git a/v2rayN/ServiceLib/Models/ProtocolExtraItem.cs b/v2rayN/ServiceLib/Models/ProtocolExtraItem.cs index 03403f5b..27725f9e 100644 --- a/v2rayN/ServiceLib/Models/ProtocolExtraItem.cs +++ b/v2rayN/ServiceLib/Models/ProtocolExtraItem.cs @@ -2,6 +2,8 @@ namespace ServiceLib.Models; public record ProtocolExtraItem { + public TransportExtra? Transport { get; init; } + public bool? Uot { get; init; } public string? CongestionControl { get; init; } diff --git a/v2rayN/ServiceLib/Models/TransportExtra.cs b/v2rayN/ServiceLib/Models/TransportExtra.cs new file mode 100644 index 00000000..e5931eb7 --- /dev/null +++ b/v2rayN/ServiceLib/Models/TransportExtra.cs @@ -0,0 +1,25 @@ +namespace ServiceLib.Models; + +public record TransportExtra +{ + public string? TcpHeaderType { get; init; } + public string? TcpHost { get; init; } + + public string? WsHost { get; init; } + public string? WsPath { get; init; } + + public string? HttpupgradeHost { get; init; } + public string? HttpupgradePath { get; init; } + + public string? XhttpHost { get; init; } + public string? XhttpPath { get; init; } + public string? XhttpMode { get; init; } + public string? XhttpExtra { get; init; } + + public string? GrpcAuthority { get; init; } + public string? GrpcServiceName { get; init; } + public string? GrpcMode { get; init; } + + public string? KcpHeaderType { get; init; } + public string? KcpSeed { get; init; } +} \ No newline at end of file diff --git a/v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxOutboundService.cs b/v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxOutboundService.cs index 0fc9733c..c9ab8645 100644 --- a/v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxOutboundService.cs +++ b/v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxOutboundService.cs @@ -84,6 +84,8 @@ public partial class CoreConfigSingboxService try { var protocolExtra = _node.GetProtocolExtra(); + var transportExtra = _node.GetTransportExtra(); + var network = _node.GetNetwork(); outbound.server = _node.Address; outbound.server_port = _node.Port; outbound.type = Global.ProtocolTypes[_node.ConfigType]; @@ -114,27 +116,23 @@ public partial class CoreConfigSingboxService outbound.password = _node.Password; outbound.udp_over_tcp = protocolExtra.Uot == true ? true : null; - if (_node.Network == nameof(ETransport.tcp) && _node.HeaderType == Global.TcpHeaderHttp) + if (network == nameof(ETransport.tcp) && transportExtra.TcpHeaderType == Global.TcpHeaderHttp) { outbound.plugin = "obfs-local"; - outbound.plugin_opts = $"obfs=http;obfs-host={_node.RequestHost};"; + outbound.plugin_opts = $"obfs=http;obfs-host={transportExtra.TcpHost};"; } else { var pluginArgs = string.Empty; - if (_node.Network == nameof(ETransport.ws)) + if (network == nameof(ETransport.ws)) { pluginArgs += "mode=websocket;"; - pluginArgs += $"host={_node.RequestHost};"; + pluginArgs += $"host={transportExtra.WsHost};"; // https://github.com/shadowsocks/v2ray-plugin/blob/e9af1cdd2549d528deb20a4ab8d61c5fbe51f306/args.go#L172 // Equal signs and commas [and backslashes] must be escaped with a backslash. - var path = _node.Path.Replace("\\", "\\\\").Replace("=", "\\=").Replace(",", "\\,"); + var path = (transportExtra.WsPath ?? string.Empty).Replace("\\", "\\\\").Replace("=", "\\=").Replace(",", "\\,"); pluginArgs += $"path={path};"; } - else if (_node.Network == nameof(ETransport.quic)) - { - pluginArgs += "mode=quic;"; - } if (_node.StreamSecurity == Global.StreamSecurity) { pluginArgs += "tls;"; @@ -381,9 +379,18 @@ public partial class CoreConfigSingboxService { serverName = _node.Sni; } - else if (_node.RequestHost.IsNotEmpty()) + else { - serverName = Utils.String2List(_node.RequestHost)?.First(); + var host = _node.GetNetwork() switch + { + nameof(ETransport.tcp) => _node.GetTransportExtra().TcpHost, + nameof(ETransport.ws) => _node.GetTransportExtra().WsHost, + nameof(ETransport.httpupgrade) => _node.GetTransportExtra().HttpupgradeHost, + nameof(ETransport.xhttp) => _node.GetTransportExtra().XhttpHost, + nameof(ETransport.grpc) => _node.GetTransportExtra().GrpcAuthority, + _ => null, + }; + serverName = Utils.String2List(host)?.First(); } var tls = new Tls4Sbox() { @@ -438,27 +445,21 @@ public partial class CoreConfigSingboxService try { var transport = new Transport4Sbox(); + var transportExtra = _node.GetTransportExtra(); switch (_node.GetNetwork()) { - case nameof(ETransport.h2): - transport.type = nameof(ETransport.http); - transport.host = _node.RequestHost.IsNullOrEmpty() ? null : Utils.String2List(_node.RequestHost); - transport.path = _node.Path.NullIfEmpty(); - break; - case nameof(ETransport.tcp): //http - if (_node.HeaderType == Global.TcpHeaderHttp) + if (transportExtra.TcpHeaderType == Global.TcpHeaderHttp) { transport.type = nameof(ETransport.http); - transport.host = _node.RequestHost.IsNullOrEmpty() ? null : Utils.String2List(_node.RequestHost); - transport.path = _node.Path.NullIfEmpty(); + transport.host = transportExtra.TcpHost.IsNullOrEmpty() ? null : Utils.String2List(transportExtra.TcpHost); } break; case nameof(ETransport.ws): transport.type = nameof(ETransport.ws); - var wsPath = _node.Path; + var wsPath = transportExtra.WsPath; // Parse eh and ed parameters from path using regex if (!wsPath.IsNullOrEmpty()) @@ -487,29 +488,25 @@ public partial class CoreConfigSingboxService } transport.path = wsPath.NullIfEmpty(); - if (_node.RequestHost.IsNotEmpty()) + if (transportExtra.WsHost.IsNotEmpty()) { transport.headers = new() { - Host = _node.RequestHost + Host = transportExtra.WsHost }; } break; case nameof(ETransport.httpupgrade): transport.type = nameof(ETransport.httpupgrade); - transport.path = _node.Path.NullIfEmpty(); - transport.host = _node.RequestHost.NullIfEmpty(); + transport.path = transportExtra.HttpupgradePath.NullIfEmpty(); + transport.host = transportExtra.HttpupgradeHost.NullIfEmpty(); break; - case nameof(ETransport.quic): - transport.type = nameof(ETransport.quic); - break; - case nameof(ETransport.grpc): transport.type = nameof(ETransport.grpc); - transport.service_name = _node.Path; + transport.service_name = transportExtra.GrpcServiceName; transport.idle_timeout = _config.GrpcItem.IdleTimeout?.ToString("##s"); transport.ping_timeout = _config.GrpcItem.HealthCheckTimeout?.ToString("##s"); transport.permit_without_stream = _config.GrpcItem.PermitWithoutStream; diff --git a/v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayOutboundService.cs b/v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayOutboundService.cs index 5bf3f1dd..d493344d 100644 --- a/v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayOutboundService.cs +++ b/v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayOutboundService.cs @@ -348,8 +348,48 @@ public partial class CoreConfigV2rayService network = "hysteria"; } streamSettings.network = network; - var host = _node.RequestHost.TrimEx(); - var path = _node.Path.TrimEx(); + var transport = _node.GetTransportExtra(); + var host = string.Empty; + var path = string.Empty; + var kcpSeed = string.Empty; + var headerType = string.Empty; + var xhttpExtra = string.Empty; + switch (network) + { + case nameof(ETransport.tcp): + host = transport.TcpHost?.TrimEx() ?? string.Empty; + headerType = transport.TcpHeaderType?.TrimEx() ?? string.Empty; + break; + + case nameof(ETransport.kcp): + kcpSeed = transport.KcpSeed?.TrimEx() ?? string.Empty; + headerType = transport.KcpHeaderType?.TrimEx() ?? string.Empty; + break; + + case nameof(ETransport.ws): + host = transport.WsHost?.TrimEx() ?? string.Empty; + path = transport.WsPath?.TrimEx() ?? string.Empty; + break; + + case nameof(ETransport.httpupgrade): + host = transport.HttpupgradeHost?.TrimEx() ?? string.Empty; + path = transport.HttpupgradePath?.TrimEx() ?? string.Empty; + break; + + case nameof(ETransport.xhttp): + host = transport.XhttpHost?.TrimEx() ?? string.Empty; + path = transport.XhttpPath?.TrimEx() ?? string.Empty; + headerType = transport.XhttpMode?.TrimEx() ?? string.Empty; + xhttpExtra = transport.XhttpExtra?.TrimEx() ?? string.Empty; + break; + + case nameof(ETransport.grpc): + host = transport.GrpcAuthority?.TrimEx() ?? string.Empty; + path = transport.GrpcServiceName?.TrimEx() ?? string.Empty; + headerType = transport.GrpcMode?.TrimEx() ?? string.Empty; + break; + } + var sni = _node.Sni.TrimEx(); var useragent = _config.CoreBasicItem.DefUserAgent ?? string.Empty; @@ -435,19 +475,19 @@ public partial class CoreConfigV2rayService kcpSettings.readBufferSize = _config.KcpItem.ReadBufferSize; kcpSettings.writeBufferSize = _config.KcpItem.WriteBufferSize; var kcpFinalmask = new Finalmask4Ray(); - if (Global.KcpHeaderMaskMap.TryGetValue(_node.HeaderType, out var header)) + if (Global.KcpHeaderMaskMap.TryGetValue(headerType, out var header)) { kcpFinalmask.udp = [ new Mask4Ray { type = header, - settings = _node.HeaderType == "dns" && !host.IsNullOrEmpty() ? new MaskSettings4Ray { domain = host } : null + settings = null } ]; } kcpFinalmask.udp ??= []; - if (path.IsNullOrEmpty()) + if (kcpSeed.IsNullOrEmpty()) { kcpFinalmask.udp.Add(new Mask4Ray { @@ -459,7 +499,7 @@ public partial class CoreConfigV2rayService kcpFinalmask.udp.Add(new Mask4Ray { type = "mkcp-aes128gcm", - settings = new MaskSettings4Ray { password = path } + settings = new MaskSettings4Ray { password = kcpSeed } }); } streamSettings.kcpSettings = kcpSettings; @@ -517,63 +557,25 @@ public partial class CoreConfigV2rayService { xhttpSettings.host = host; } - if (_node.HeaderType.IsNotEmpty() && Global.XhttpMode.Contains(_node.HeaderType)) + if (headerType.IsNotEmpty() && Global.XhttpMode.Contains(headerType)) { - xhttpSettings.mode = _node.HeaderType; + xhttpSettings.mode = headerType; } - if (_node.Extra.IsNotEmpty()) + if (xhttpExtra.IsNotEmpty()) { - xhttpSettings.extra = JsonUtils.ParseJson(_node.Extra); + xhttpSettings.extra = JsonUtils.ParseJson(xhttpExtra); } streamSettings.xhttpSettings = xhttpSettings; FillOutboundMux(outbound); break; - //h2 - case nameof(ETransport.h2): - HttpSettings4Ray httpSettings = new(); - - if (host.IsNotEmpty()) - { - httpSettings.host = Utils.String2List(host); - } - httpSettings.path = path; - - streamSettings.httpSettings = httpSettings; - - break; - //quic - case nameof(ETransport.quic): - QuicSettings4Ray quicsettings = new() - { - security = host, - key = path, - header = new Header4Ray - { - type = _node.HeaderType - } - }; - streamSettings.quicSettings = quicsettings; - if (_node.StreamSecurity == Global.StreamSecurity) - { - if (sni.IsNotEmpty()) - { - streamSettings.tlsSettings.serverName = sni; - } - else - { - streamSettings.tlsSettings.serverName = _node.Address; - } - } - break; - case nameof(ETransport.grpc): GrpcSettings4Ray grpcSettings = new() { authority = host.NullIfEmpty(), serviceName = path, - multiMode = _node.HeaderType == Global.GrpcMultiMode, + multiMode = headerType == Global.GrpcMultiMode, idle_timeout = _config.GrpcItem.IdleTimeout, health_check_timeout = _config.GrpcItem.HealthCheckTimeout, permit_without_stream = _config.GrpcItem.PermitWithoutStream, @@ -641,13 +643,13 @@ public partial class CoreConfigV2rayService default: //tcp - if (_node.HeaderType == Global.TcpHeaderHttp) + if (headerType == Global.TcpHeaderHttp) { TcpSettings4Ray tcpSettings = new() { header = new Header4Ray { - type = _node.HeaderType + type = headerType } }; diff --git a/v2rayN/ServiceLib/ViewModels/AddServerViewModel.cs b/v2rayN/ServiceLib/ViewModels/AddServerViewModel.cs index e5c307c8..69445b9b 100644 --- a/v2rayN/ServiceLib/ViewModels/AddServerViewModel.cs +++ b/v2rayN/ServiceLib/ViewModels/AddServerViewModel.cs @@ -73,6 +73,167 @@ public class AddServerViewModel : MyReactiveObject [Reactive] public bool NaiveQuic { get; set; } + [Reactive] + public string TcpHeaderType { get; set; } + + [Reactive] + public string TcpHost { get; set; } + + [Reactive] + public string WsHost { get; set; } + + [Reactive] + public string WsPath { get; set; } + + [Reactive] + public string HttpupgradeHost { get; set; } + + [Reactive] + public string HttpupgradePath { get; set; } + + [Reactive] + public string XhttpHost { get; set; } + + [Reactive] + public string XhttpPath { get; set; } + + [Reactive] + public string XhttpMode { get; set; } + + [Reactive] + public string XhttpExtra { get; set; } + + [Reactive] + public string GrpcAuthority { get; set; } + + [Reactive] + public string GrpcServiceName { get; set; } + + [Reactive] + public string GrpcMode { get; set; } + + [Reactive] + public string KcpHeaderType { get; set; } + + [Reactive] + public string KcpSeed { get; set; } + + public string TransportHeaderType + { + get => SelectedSource.GetNetwork() switch + { + nameof(ETransport.tcp) => TcpHeaderType, + nameof(ETransport.kcp) => KcpHeaderType, + nameof(ETransport.xhttp) => XhttpMode, + nameof(ETransport.grpc) => GrpcMode, + _ => string.Empty, + }; + set + { + switch (SelectedSource.GetNetwork()) + { + case nameof(ETransport.tcp): + TcpHeaderType = value; + break; + case nameof(ETransport.kcp): + KcpHeaderType = value; + break; + case nameof(ETransport.xhttp): + XhttpMode = value; + break; + case nameof(ETransport.grpc): + GrpcMode = value; + break; + } + this.RaisePropertyChanged(); + } + } + + public string TransportHost + { + get => SelectedSource.GetNetwork() switch + { + nameof(ETransport.tcp) => TcpHost, + nameof(ETransport.ws) => WsHost, + nameof(ETransport.httpupgrade) => HttpupgradeHost, + nameof(ETransport.xhttp) => XhttpHost, + nameof(ETransport.grpc) => GrpcAuthority, + _ => string.Empty, + }; + set + { + switch (SelectedSource.GetNetwork()) + { + case nameof(ETransport.tcp): + TcpHost = value; + break; + case nameof(ETransport.ws): + WsHost = value; + break; + case nameof(ETransport.httpupgrade): + HttpupgradeHost = value; + break; + case nameof(ETransport.xhttp): + XhttpHost = value; + break; + case nameof(ETransport.grpc): + GrpcAuthority = value; + break; + } + this.RaisePropertyChanged(); + } + } + + public string TransportPath + { + get => SelectedSource.GetNetwork() switch + { + nameof(ETransport.kcp) => KcpSeed, + nameof(ETransport.ws) => WsPath, + nameof(ETransport.httpupgrade) => HttpupgradePath, + nameof(ETransport.xhttp) => XhttpPath, + nameof(ETransport.grpc) => GrpcServiceName, + _ => string.Empty, + }; + set + { + switch (SelectedSource.GetNetwork()) + { + case nameof(ETransport.kcp): + KcpSeed = value; + break; + case nameof(ETransport.ws): + WsPath = value; + break; + case nameof(ETransport.httpupgrade): + HttpupgradePath = value; + break; + case nameof(ETransport.xhttp): + XhttpPath = value; + break; + case nameof(ETransport.grpc): + GrpcServiceName = value; + break; + } + this.RaisePropertyChanged(); + } + } + + public string TransportExtraText + { + get => SelectedSource.GetNetwork() == nameof(ETransport.xhttp) + ? XhttpExtra + : string.Empty; + set + { + if (SelectedSource.GetNetwork() == nameof(ETransport.xhttp)) + { + XhttpExtra = value; + } + this.RaisePropertyChanged(); + } + } + public ReactiveCommand FetchCertCmd { get; } public ReactiveCommand FetchCertChainCmd { get; } public ReactiveCommand SaveCmd { get; } @@ -101,14 +262,21 @@ public class AddServerViewModel : MyReactiveObject this.WhenAnyValue(x => x.CertSha) .Subscribe(_ => UpdateCertTip()); + this.WhenAnyValue(x => x.SelectedSource.Network) + .Subscribe(_ => + { + this.RaisePropertyChanged(nameof(TransportHeaderType)); + this.RaisePropertyChanged(nameof(TransportHost)); + this.RaisePropertyChanged(nameof(TransportPath)); + this.RaisePropertyChanged(nameof(TransportExtraText)); + }); + this.WhenAnyValue(x => x.Cert) .Subscribe(_ => UpdateCertSha()); if (profileItem.IndexId.IsNullOrEmpty()) { profileItem.Network = Global.DefaultNetwork; - profileItem.HeaderType = Global.None; - profileItem.RequestHost = ""; profileItem.StreamSecurity = ""; SelectedSource = profileItem; } @@ -121,6 +289,7 @@ public class AddServerViewModel : MyReactiveObject CertSha = SelectedSource?.CertSha?.ToString() ?? string.Empty; var protocolExtra = SelectedSource?.GetProtocolExtra(); + var transport = protocolExtra?.Transport ?? new TransportExtra(); Ports = protocolExtra?.Ports ?? string.Empty; AlterId = int.TryParse(protocolExtra?.AlterId, out var result) ? result : 0; Flow = protocolExtra?.Flow ?? string.Empty; @@ -139,6 +308,23 @@ public class AddServerViewModel : MyReactiveObject CongestionControl = protocolExtra?.CongestionControl ?? string.Empty; InsecureConcurrency = protocolExtra?.InsecureConcurrency > 0 ? protocolExtra.InsecureConcurrency : null; NaiveQuic = protocolExtra?.NaiveQuic ?? false; + + TcpHeaderType = transport.TcpHeaderType ?? Global.None; + TcpHost = transport.TcpHost ?? string.Empty; + WsHost = transport.WsHost ?? string.Empty; + WsPath = transport.WsPath ?? string.Empty; + HttpupgradeHost = transport.HttpupgradeHost ?? string.Empty; + HttpupgradePath = transport.HttpupgradePath ?? string.Empty; + XhttpHost = transport.XhttpHost ?? string.Empty; + XhttpPath = transport.XhttpPath ?? string.Empty; + XhttpMode = transport.XhttpMode ?? string.Empty; + XhttpExtra = transport.XhttpExtra ?? string.Empty; + GrpcAuthority = transport.GrpcAuthority ?? string.Empty; + GrpcServiceName = transport.GrpcServiceName ?? string.Empty; + GrpcMode = transport.GrpcMode.IsNullOrEmpty() ? Global.GrpcGunMode : transport.GrpcMode; + KcpHeaderType = transport.KcpHeaderType.IsNullOrEmpty() ? Global.None : transport.KcpHeaderType; + KcpSeed = transport.KcpSeed ?? string.Empty; + } private async Task SaveServerAsync() @@ -185,8 +371,33 @@ public class AddServerViewModel : MyReactiveObject SelectedSource.CoreType = CoreType.IsNullOrEmpty() ? null : (ECoreType)Enum.Parse(typeof(ECoreType), CoreType); SelectedSource.Cert = Cert.IsNullOrEmpty() ? string.Empty : Cert; SelectedSource.CertSha = CertSha.IsNullOrEmpty() ? string.Empty : CertSha; + if (!Global.Networks.Contains(SelectedSource.Network)) + { + SelectedSource.Network = Global.DefaultNetwork; + } + + var transport = new TransportExtra + { + TcpHeaderType = TcpHeaderType.NullIfEmpty(), + TcpHost = TcpHost.NullIfEmpty(), + WsHost = WsHost.NullIfEmpty(), + WsPath = WsPath.NullIfEmpty(), + HttpupgradeHost = HttpupgradeHost.NullIfEmpty(), + HttpupgradePath = HttpupgradePath.NullIfEmpty(), + XhttpHost = XhttpHost.NullIfEmpty(), + XhttpPath = XhttpPath.NullIfEmpty(), + XhttpMode = XhttpMode.NullIfEmpty(), + XhttpExtra = XhttpExtra.NullIfEmpty(), + GrpcAuthority = GrpcAuthority.NullIfEmpty(), + GrpcServiceName = GrpcServiceName.NullIfEmpty(), + GrpcMode = GrpcMode.NullIfEmpty(), + KcpHeaderType = KcpHeaderType.NullIfEmpty(), + KcpSeed = KcpSeed.NullIfEmpty(), + }; + SelectedSource.SetProtocolExtra(SelectedSource.GetProtocolExtra() with { + Transport = transport, Ports = Ports.NullIfEmpty(), AlterId = AlterId > 0 ? AlterId.ToString() : null, Flow = Flow.NullIfEmpty(), @@ -261,7 +472,7 @@ public class AddServerViewModel : MyReactiveObject var serverName = SelectedSource.Sni; if (serverName.IsNullOrEmpty()) { - serverName = SelectedSource.RequestHost; + serverName = GetCurrentTransportHost(); } if (serverName.IsNullOrEmpty()) { @@ -286,7 +497,7 @@ public class AddServerViewModel : MyReactiveObject var serverName = SelectedSource.Sni; if (serverName.IsNullOrEmpty()) { - serverName = SelectedSource.RequestHost; + serverName = GetCurrentTransportHost(); } if (serverName.IsNullOrEmpty()) { @@ -301,4 +512,17 @@ public class AddServerViewModel : MyReactiveObject Cert = CertPemManager.ConcatenatePemChain(certs); UpdateCertTip(certError); } + + private string GetCurrentTransportHost() + { + return SelectedSource.GetNetwork() switch + { + nameof(ETransport.tcp) => TcpHost, + nameof(ETransport.ws) => WsHost, + nameof(ETransport.httpupgrade) => HttpupgradeHost, + nameof(ETransport.xhttp) => XhttpHost, + nameof(ETransport.grpc) => GrpcAuthority, + _ => string.Empty, + }; + } } diff --git a/v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml b/v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml index 4dc378b4..fe19b860 100644 --- a/v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml +++ b/v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml @@ -690,128 +690,258 @@ + RowDefinitions="Auto,Auto,Auto"> - - - - - - + + + + - - - + + + + + + + - - - + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + break; } this.Bind(ViewModel, vm => vm.SelectedSource.Network, v => v.cmbNetwork.SelectedValue).DisposeWith(disposables); - this.Bind(ViewModel, vm => vm.SelectedSource.HeaderType, v => v.cmbHeaderType.SelectedValue).DisposeWith(disposables); - this.Bind(ViewModel, vm => vm.SelectedSource.RequestHost, v => v.txtRequestHost.Text).DisposeWith(disposables); - this.Bind(ViewModel, vm => vm.SelectedSource.Path, v => v.txtPath.Text).DisposeWith(disposables); - this.Bind(ViewModel, vm => vm.SelectedSource.Extra, v => v.txtExtra.Text).DisposeWith(disposables); + this.Bind(ViewModel, vm => vm.TcpHeaderType, v => v.cmbHeaderTypeTcp.SelectedValue).DisposeWith(disposables); + this.Bind(ViewModel, vm => vm.TcpHost, v => v.txtRequestHostTcp.Text).DisposeWith(disposables); + + this.Bind(ViewModel, vm => vm.KcpHeaderType, v => v.cmbHeaderTypeKcp.SelectedValue).DisposeWith(disposables); + this.Bind(ViewModel, vm => vm.KcpSeed, v => v.txtKcpSeed.Text).DisposeWith(disposables); + + this.Bind(ViewModel, vm => vm.WsHost, v => v.txtRequestHostWs.Text).DisposeWith(disposables); + this.Bind(ViewModel, vm => vm.WsPath, v => v.txtPathWs.Text).DisposeWith(disposables); + + this.Bind(ViewModel, vm => vm.HttpupgradeHost, v => v.txtRequestHostHttpupgrade.Text).DisposeWith(disposables); + this.Bind(ViewModel, vm => vm.HttpupgradePath, v => v.txtPathHttpupgrade.Text).DisposeWith(disposables); + + this.Bind(ViewModel, vm => vm.XhttpMode, v => v.cmbHeaderTypeXhttp.SelectedValue).DisposeWith(disposables); + this.Bind(ViewModel, vm => vm.XhttpHost, v => v.txtRequestHostXhttp.Text).DisposeWith(disposables); + this.Bind(ViewModel, vm => vm.XhttpPath, v => v.txtPathXhttp.Text).DisposeWith(disposables); + this.Bind(ViewModel, vm => vm.XhttpExtra, v => v.txtExtraXhttp.Text).DisposeWith(disposables); + + this.Bind(ViewModel, vm => vm.GrpcMode, v => v.cmbHeaderTypeGrpc.SelectedValue).DisposeWith(disposables); + this.Bind(ViewModel, vm => vm.GrpcAuthority, v => v.txtRequestHostGrpc.Text).DisposeWith(disposables); + this.Bind(ViewModel, vm => vm.GrpcServiceName, v => v.txtPathGrpc.Text).DisposeWith(disposables); this.Bind(ViewModel, vm => vm.SelectedSource.StreamSecurity, v => v.cmbStreamSecurity.SelectedValue).DisposeWith(disposables); this.Bind(ViewModel, vm => vm.SelectedSource.Sni, v => v.txtSNI.Text).DisposeWith(disposables); @@ -285,99 +301,60 @@ public partial class AddServerWindow : WindowBase private void SetHeaderType() { - var lstHeaderType = new List(); + cmbHeaderTypeTcp.ItemsSource = new List { Global.None, Global.TcpHeaderHttp }; - var network = cmbNetwork.SelectedItem.ToString(); - if (network.IsNullOrEmpty()) - { - lstHeaderType.Add(Global.None); - cmbHeaderType.ItemsSource = lstHeaderType; - cmbHeaderType.SelectedIndex = 0; - return; - } + var kcpHeaderTypes = new List { Global.None }; + kcpHeaderTypes.AddRange(Global.KcpHeaderTypes); + cmbHeaderTypeKcp.ItemsSource = kcpHeaderTypes; - if (network == nameof(ETransport.tcp)) - { - lstHeaderType.Add(Global.None); - lstHeaderType.Add(Global.TcpHeaderHttp); - } - else if (network is nameof(ETransport.kcp) or nameof(ETransport.quic)) - { - lstHeaderType.Add(Global.None); - lstHeaderType.AddRange(Global.KcpHeaderTypes); - } - else if (network is nameof(ETransport.xhttp)) - { - lstHeaderType.AddRange(Global.XhttpMode); - } - else if (network == nameof(ETransport.grpc)) - { - lstHeaderType.Add(Global.GrpcGunMode); - lstHeaderType.Add(Global.GrpcMultiMode); - } - else - { - lstHeaderType.Add(Global.None); - } - cmbHeaderType.ItemsSource = lstHeaderType; - cmbHeaderType.SelectedIndex = 0; + cmbHeaderTypeXhttp.ItemsSource = Global.XhttpMode; + cmbHeaderTypeGrpc.ItemsSource = new List { Global.GrpcGunMode, Global.GrpcMultiMode }; + + SetTransportGridVisibility(); } private void SetTips() { - var network = cmbNetwork.SelectedItem.ToString(); + SetTransportGridVisibility(); + } + + private void SetTransportGridVisibility() + { + var network = cmbNetwork.SelectedItem?.ToString(); if (network.IsNullOrEmpty()) { network = Global.DefaultNetwork; } - labHeaderType.IsVisible = true; - btnExtra.IsVisible = false; - tipRequestHost.Text = - tipPath.Text = - tipHeaderType.Text = string.Empty; + + gridTransportTcp.IsVisible = false; + gridTransportKcp.IsVisible = false; + gridTransportWs.IsVisible = false; + gridTransportHttpupgrade.IsVisible = false; + gridTransportXhttp.IsVisible = false; + gridTransportGrpc.IsVisible = false; switch (network) { case nameof(ETransport.tcp): - tipRequestHost.Text = ResUI.TransportRequestHostTip1; - tipHeaderType.Text = ResUI.TransportHeaderTypeTip1; + gridTransportTcp.IsVisible = true; break; - case nameof(ETransport.kcp): - tipHeaderType.Text = ResUI.TransportHeaderTypeTip2; - tipPath.Text = ResUI.TransportPathTip5; + gridTransportKcp.IsVisible = true; break; - case nameof(ETransport.ws): + gridTransportWs.IsVisible = true; + break; case nameof(ETransport.httpupgrade): - tipRequestHost.Text = ResUI.TransportRequestHostTip2; - tipPath.Text = ResUI.TransportPathTip1; + gridTransportHttpupgrade.IsVisible = true; break; - case nameof(ETransport.xhttp): - tipRequestHost.Text = ResUI.TransportRequestHostTip2; - tipPath.Text = ResUI.TransportPathTip1; - tipHeaderType.Text = ResUI.TransportHeaderTypeTip5; - labHeaderType.IsVisible = false; - btnExtra.IsVisible = true; + gridTransportXhttp.IsVisible = true; break; - - case nameof(ETransport.h2): - tipRequestHost.Text = ResUI.TransportRequestHostTip3; - tipPath.Text = ResUI.TransportPathTip2; - break; - - case nameof(ETransport.quic): - tipRequestHost.Text = ResUI.TransportRequestHostTip4; - tipPath.Text = ResUI.TransportPathTip3; - tipHeaderType.Text = ResUI.TransportHeaderTypeTip3; - break; - case nameof(ETransport.grpc): - tipRequestHost.Text = ResUI.TransportRequestHostTip5; - tipPath.Text = ResUI.TransportPathTip4; - tipHeaderType.Text = ResUI.TransportHeaderTypeTip4; - labHeaderType.IsVisible = false; + gridTransportGrpc.IsVisible = true; + break; + default: + gridTransportTcp.IsVisible = true; break; } } diff --git a/v2rayN/v2rayN/Views/AddServerWindow.xaml b/v2rayN/v2rayN/Views/AddServerWindow.xaml index 1eb28d9d..b07f5d17 100644 --- a/v2rayN/v2rayN/Views/AddServerWindow.xaml +++ b/v2rayN/v2rayN/Views/AddServerWindow.xaml @@ -150,7 +150,7 @@ + Visibility="Collapsed"> @@ -234,7 +234,7 @@ + Visibility="Collapsed"> @@ -308,7 +308,7 @@ + Visibility="Collapsed"> @@ -353,7 +353,7 @@ + Visibility="Collapsed"> @@ -437,7 +437,7 @@ + Visibility="Collapsed"> @@ -497,7 +497,7 @@ + Visibility="Collapsed"> @@ -610,7 +610,7 @@ + Visibility="Collapsed"> @@ -670,7 +670,7 @@ + Visibility="Collapsed"> @@ -767,7 +767,7 @@ + Visibility="Collapsed"> @@ -796,7 +796,7 @@ + Visibility="Collapsed"> @@ -908,143 +908,325 @@ - - - - - - - - - - - - - - - - + + + + + + + + + - - - - - - - - + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1118,7 +1300,7 @@ + Visibility="Collapsed"> @@ -1307,7 +1489,7 @@ + Visibility="Collapsed"> diff --git a/v2rayN/v2rayN/Views/AddServerWindow.xaml.cs b/v2rayN/v2rayN/Views/AddServerWindow.xaml.cs index cc04b4c8..dabd9cbe 100644 --- a/v2rayN/v2rayN/Views/AddServerWindow.xaml.cs +++ b/v2rayN/v2rayN/Views/AddServerWindow.xaml.cs @@ -19,6 +19,10 @@ public partial class AddServerWindow cmbCoreType.ItemsSource = Global.CoreTypes.AppendEmpty(); cmbNetwork.ItemsSource = Global.Networks; + if (ViewModel.SelectedSource.Network.IsNullOrEmpty() || !Global.Networks.Contains(ViewModel.SelectedSource.Network)) + { + ViewModel.SelectedSource.Network = Global.DefaultNetwork; + } cmbFingerprint.ItemsSource = Global.Fingerprints; cmbFingerprint2.ItemsSource = Global.Fingerprints; cmbAllowInsecure.ItemsSource = Global.AllowInsecure; @@ -114,7 +118,7 @@ public partial class AddServerWindow } cmbStreamSecurity.ItemsSource = lstStreamSecurity; - gridTlsMore.Visibility = Visibility.Hidden; + gridTlsMore.Visibility = Visibility.Collapsed; this.WhenActivated(disposables => { @@ -195,10 +199,26 @@ public partial class AddServerWindow break; } this.Bind(ViewModel, vm => vm.SelectedSource.Network, v => v.cmbNetwork.Text).DisposeWith(disposables); - this.Bind(ViewModel, vm => vm.SelectedSource.HeaderType, v => v.cmbHeaderType.Text).DisposeWith(disposables); - this.Bind(ViewModel, vm => vm.SelectedSource.RequestHost, v => v.txtRequestHost.Text).DisposeWith(disposables); - this.Bind(ViewModel, vm => vm.SelectedSource.Path, v => v.txtPath.Text).DisposeWith(disposables); - this.Bind(ViewModel, vm => vm.SelectedSource.Extra, v => v.txtExtra.Text).DisposeWith(disposables); + this.Bind(ViewModel, vm => vm.TcpHeaderType, v => v.cmbHeaderTypeTcp.Text).DisposeWith(disposables); + this.Bind(ViewModel, vm => vm.TcpHost, v => v.txtRequestHostTcp.Text).DisposeWith(disposables); + + this.Bind(ViewModel, vm => vm.KcpHeaderType, v => v.cmbHeaderTypeKcp.Text).DisposeWith(disposables); + this.Bind(ViewModel, vm => vm.KcpSeed, v => v.txtKcpSeed.Text).DisposeWith(disposables); + + this.Bind(ViewModel, vm => vm.WsHost, v => v.txtRequestHostWs.Text).DisposeWith(disposables); + this.Bind(ViewModel, vm => vm.WsPath, v => v.txtPathWs.Text).DisposeWith(disposables); + + this.Bind(ViewModel, vm => vm.HttpupgradeHost, v => v.txtRequestHostHttpupgrade.Text).DisposeWith(disposables); + this.Bind(ViewModel, vm => vm.HttpupgradePath, v => v.txtPathHttpupgrade.Text).DisposeWith(disposables); + + this.Bind(ViewModel, vm => vm.XhttpMode, v => v.cmbHeaderTypeXhttp.Text).DisposeWith(disposables); + this.Bind(ViewModel, vm => vm.XhttpHost, v => v.txtRequestHostXhttp.Text).DisposeWith(disposables); + this.Bind(ViewModel, vm => vm.XhttpPath, v => v.txtPathXhttp.Text).DisposeWith(disposables); + this.Bind(ViewModel, vm => vm.XhttpExtra, v => v.txtExtraXhttp.Text).DisposeWith(disposables); + + this.Bind(ViewModel, vm => vm.GrpcMode, v => v.cmbHeaderTypeGrpc.Text).DisposeWith(disposables); + this.Bind(ViewModel, vm => vm.GrpcAuthority, v => v.txtRequestHostGrpc.Text).DisposeWith(disposables); + this.Bind(ViewModel, vm => vm.GrpcServiceName, v => v.txtPathGrpc.Text).DisposeWith(disposables); this.Bind(ViewModel, vm => vm.SelectedSource.StreamSecurity, v => v.cmbStreamSecurity.Text).DisposeWith(disposables); this.Bind(ViewModel, vm => vm.SelectedSource.Sni, v => v.txtSNI.Text).DisposeWith(disposables); @@ -259,17 +279,17 @@ public partial class AddServerWindow if (security == Global.StreamSecurityReality) { gridRealityMore.Visibility = Visibility.Visible; - gridTlsMore.Visibility = Visibility.Hidden; + gridTlsMore.Visibility = Visibility.Collapsed; } else if (security == Global.StreamSecurity) { - gridRealityMore.Visibility = Visibility.Hidden; + gridRealityMore.Visibility = Visibility.Collapsed; gridTlsMore.Visibility = Visibility.Visible; } else { - gridRealityMore.Visibility = Visibility.Hidden; - gridTlsMore.Visibility = Visibility.Hidden; + gridRealityMore.Visibility = Visibility.Collapsed; + gridTlsMore.Visibility = Visibility.Collapsed; } } @@ -281,99 +301,60 @@ public partial class AddServerWindow private void SetHeaderType() { - var lstHeaderType = new List(); + cmbHeaderTypeTcp.ItemsSource = new List { Global.None, Global.TcpHeaderHttp }; - var network = cmbNetwork.SelectedItem.ToString(); - if (network.IsNullOrEmpty()) - { - lstHeaderType.Add(Global.None); - cmbHeaderType.ItemsSource = lstHeaderType; - cmbHeaderType.SelectedIndex = 0; - return; - } + var kcpHeaderTypes = new List { Global.None }; + kcpHeaderTypes.AddRange(Global.KcpHeaderTypes); + cmbHeaderTypeKcp.ItemsSource = kcpHeaderTypes; - if (network == nameof(ETransport.tcp)) - { - lstHeaderType.Add(Global.None); - lstHeaderType.Add(Global.TcpHeaderHttp); - } - else if (network is nameof(ETransport.kcp) or nameof(ETransport.quic)) - { - lstHeaderType.Add(Global.None); - lstHeaderType.AddRange(Global.KcpHeaderTypes); - } - else if (network is nameof(ETransport.xhttp)) - { - lstHeaderType.AddRange(Global.XhttpMode); - } - else if (network == nameof(ETransport.grpc)) - { - lstHeaderType.Add(Global.GrpcGunMode); - lstHeaderType.Add(Global.GrpcMultiMode); - } - else - { - lstHeaderType.Add(Global.None); - } - cmbHeaderType.ItemsSource = lstHeaderType; - cmbHeaderType.SelectedIndex = 0; + cmbHeaderTypeXhttp.ItemsSource = Global.XhttpMode; + cmbHeaderTypeGrpc.ItemsSource = new List { Global.GrpcGunMode, Global.GrpcMultiMode }; + + SetTransportGridVisibility(); } private void SetTips() { - var network = cmbNetwork.SelectedItem.ToString(); + SetTransportGridVisibility(); + } + + private void SetTransportGridVisibility() + { + var network = cmbNetwork.SelectedItem?.ToString(); if (network.IsNullOrEmpty()) { network = Global.DefaultNetwork; } - labHeaderType.Visibility = Visibility.Visible; - popExtra.Visibility = Visibility.Hidden; - tipRequestHost.Text = - tipPath.Text = - tipHeaderType.Text = string.Empty; + + gridTransportTcp.Visibility = Visibility.Collapsed; + gridTransportKcp.Visibility = Visibility.Collapsed; + gridTransportWs.Visibility = Visibility.Collapsed; + gridTransportHttpupgrade.Visibility = Visibility.Collapsed; + gridTransportXhttp.Visibility = Visibility.Collapsed; + gridTransportGrpc.Visibility = Visibility.Collapsed; switch (network) { case nameof(ETransport.tcp): - tipRequestHost.Text = ResUI.TransportRequestHostTip1; - tipHeaderType.Text = ResUI.TransportHeaderTypeTip1; + gridTransportTcp.Visibility = Visibility.Visible; break; - case nameof(ETransport.kcp): - tipHeaderType.Text = ResUI.TransportHeaderTypeTip2; - tipPath.Text = ResUI.TransportPathTip5; + gridTransportKcp.Visibility = Visibility.Visible; break; - case nameof(ETransport.ws): + gridTransportWs.Visibility = Visibility.Visible; + break; case nameof(ETransport.httpupgrade): - tipRequestHost.Text = ResUI.TransportRequestHostTip2; - tipPath.Text = ResUI.TransportPathTip1; + gridTransportHttpupgrade.Visibility = Visibility.Visible; break; - case nameof(ETransport.xhttp): - tipRequestHost.Text = ResUI.TransportRequestHostTip2; - tipPath.Text = ResUI.TransportPathTip1; - tipHeaderType.Text = ResUI.TransportHeaderTypeTip5; - labHeaderType.Visibility = Visibility.Hidden; - popExtra.Visibility = Visibility.Visible; + gridTransportXhttp.Visibility = Visibility.Visible; break; - - case nameof(ETransport.h2): - tipRequestHost.Text = ResUI.TransportRequestHostTip3; - tipPath.Text = ResUI.TransportPathTip2; - break; - - case nameof(ETransport.quic): - tipRequestHost.Text = ResUI.TransportRequestHostTip4; - tipPath.Text = ResUI.TransportPathTip3; - tipHeaderType.Text = ResUI.TransportHeaderTypeTip3; - break; - case nameof(ETransport.grpc): - tipRequestHost.Text = ResUI.TransportRequestHostTip5; - tipPath.Text = ResUI.TransportPathTip4; - tipHeaderType.Text = ResUI.TransportHeaderTypeTip4; - labHeaderType.Visibility = Visibility.Hidden; + gridTransportGrpc.Visibility = Visibility.Visible; + break; + default: + gridTransportTcp.Visibility = Visibility.Visible; break; } } From 0458df7b69a0984ea65af95dcbc40683075964af Mon Sep 17 00:00:00 2001 From: DHR60 Date: Sat, 28 Mar 2026 22:51:04 +0800 Subject: [PATCH 2/4] Rename tcp to raw --- v2rayN/ServiceLib/Enums/ETransport.cs | 2 +- v2rayN/ServiceLib/Global.cs | 8 +++--- .../Handler/Builder/NodeValidator.cs | 4 +-- v2rayN/ServiceLib/Handler/ConfigHandler.cs | 4 +-- v2rayN/ServiceLib/Handler/Fmt/BaseFmt.cs | 22 ++++++++-------- .../ServiceLib/Handler/Fmt/ShadowsocksFmt.cs | 8 +++--- v2rayN/ServiceLib/Handler/Fmt/VmessFmt.cs | 10 +++---- v2rayN/ServiceLib/Manager/AppManager.cs | 15 +++++++---- v2rayN/ServiceLib/Models/ProfileItem.cs | 4 +-- v2rayN/ServiceLib/Models/TransportExtra.cs | 6 ++--- v2rayN/ServiceLib/Models/V2rayConfig.cs | 4 +-- .../Singbox/SingboxOutboundService.cs | 12 ++++----- .../CoreConfig/V2ray/V2rayOutboundService.cs | 22 +++++++++------- .../ViewModels/AddServerViewModel.cs | 26 +++++++++---------- .../Views/AddServerWindow.axaml | 6 ++--- .../Views/AddServerWindow.axaml.cs | 14 +++++----- v2rayN/v2rayN/Views/AddServerWindow.xaml | 6 ++--- v2rayN/v2rayN/Views/AddServerWindow.xaml.cs | 14 +++++----- 18 files changed, 97 insertions(+), 90 deletions(-) diff --git a/v2rayN/ServiceLib/Enums/ETransport.cs b/v2rayN/ServiceLib/Enums/ETransport.cs index b1166608..b315c5f0 100644 --- a/v2rayN/ServiceLib/Enums/ETransport.cs +++ b/v2rayN/ServiceLib/Enums/ETransport.cs @@ -2,7 +2,7 @@ namespace ServiceLib.Enums; public enum ETransport { - tcp, + raw, kcp, ws, httpupgrade, diff --git a/v2rayN/ServiceLib/Global.cs b/v2rayN/ServiceLib/Global.cs index 6988cd30..d758c5c9 100644 --- a/v2rayN/ServiceLib/Global.cs +++ b/v2rayN/ServiceLib/Global.cs @@ -42,8 +42,8 @@ public class Global public const string SingboxFakeIPFilterFileName = NamespaceSample + "singbox_fakeip_filter"; public const string DefaultSecurity = "auto"; - public const string DefaultNetwork = "tcp"; - public const string TcpHeaderHttp = "http"; + public const string DefaultNetwork = "raw"; + public const string RawHeaderHttp = "http"; public const string None = "none"; public const string ProxyTag = "proxy"; public const string DirectTag = "direct"; @@ -182,7 +182,7 @@ public class Global @"https://raw.githubusercontent.com/Chocolate4U/Iran-v2ray-rules/main/v2rayN/" ]; - public static readonly Dictionary TcpHttpUserAgentTexts = new() + public static readonly Dictionary RawHttpUserAgentTexts = new() { {"chrome","Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/92.0.4515.131 Safari/537.36" }, {"firefox","Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:90.0) Gecko/20100101 Firefox/90.0" }, @@ -292,7 +292,7 @@ public class Global public static readonly List Networks = [ - "tcp", + "raw", "xhttp", "kcp", "grpc", diff --git a/v2rayN/ServiceLib/Handler/Builder/NodeValidator.cs b/v2rayN/ServiceLib/Handler/Builder/NodeValidator.cs index 0bec9d39..92f2a4d7 100644 --- a/v2rayN/ServiceLib/Handler/Builder/NodeValidator.cs +++ b/v2rayN/ServiceLib/Handler/Builder/NodeValidator.cs @@ -20,7 +20,7 @@ public class NodeValidator [EConfigType.VMess, EConfigType.VLESS, EConfigType.Trojan, EConfigType.Shadowsocks]; private static readonly HashSet SingboxShadowsocksAllowedTransports = - [nameof(ETransport.tcp), nameof(ETransport.ws)]; + [nameof(ETransport.raw), nameof(ETransport.ws)]; public static NodeValidatorResult Validate(ProfileItem item, ECoreType coreType) { @@ -160,7 +160,7 @@ public class NodeValidator } // sing-box does not support non-tcp transports for protocols other than vmess/trojan/vless/shadowsocks - if (!SingboxTransportSupportedProtocols.Contains(configType) && net != nameof(ETransport.tcp)) + if (!SingboxTransportSupportedProtocols.Contains(configType) && net != nameof(ETransport.raw)) { return string.Format(ResUI.MsgCoreNotSupportProtocolTransport, nameof(ECoreType.sing_box), configType.ToString(), net); diff --git a/v2rayN/ServiceLib/Handler/ConfigHandler.cs b/v2rayN/ServiceLib/Handler/ConfigHandler.cs index 144f359f..1a0d61e1 100644 --- a/v2rayN/ServiceLib/Handler/ConfigHandler.cs +++ b/v2rayN/ServiceLib/Handler/ConfigHandler.cs @@ -1138,8 +1138,8 @@ public static class ConfigHandler && AreEqual(oProtocolExtra.SsMethod, nProtocolExtra.SsMethod) && AreEqual(oProtocolExtra.VmessSecurity, nProtocolExtra.VmessSecurity) && AreEqual(o.Network, n.Network) - && AreEqual(oTransport.TcpHeaderType, nTransport.TcpHeaderType) - && AreEqual(oTransport.TcpHost, nTransport.TcpHost) + && AreEqual(oTransport.RawHeaderType, nTransport.RawHeaderType) + && AreEqual(oTransport.RawHost, nTransport.RawHost) && AreEqual(oTransport.WsHost, nTransport.WsHost) && AreEqual(oTransport.WsPath, nTransport.WsPath) && AreEqual(oTransport.HttpupgradeHost, nTransport.HttpupgradeHost) diff --git a/v2rayN/ServiceLib/Handler/Fmt/BaseFmt.cs b/v2rayN/ServiceLib/Handler/Fmt/BaseFmt.cs index 31bb22b8..cff88584 100644 --- a/v2rayN/ServiceLib/Handler/Fmt/BaseFmt.cs +++ b/v2rayN/ServiceLib/Handler/Fmt/BaseFmt.cs @@ -92,18 +92,18 @@ public class BaseFmt var network = item.GetNetwork(); if (!Global.Networks.Contains(network)) { - network = nameof(ETransport.tcp); + network = nameof(ETransport.raw); } dicQuery.Add("type", network); switch (network) { - case nameof(ETransport.tcp): - dicQuery.Add("headerType", transport.TcpHeaderType.IsNotEmpty() ? transport.TcpHeaderType : Global.None); - if (transport.TcpHost.IsNotEmpty()) + case nameof(ETransport.raw): + dicQuery.Add("headerType", transport.RawHeaderType.IsNotEmpty() ? transport.RawHeaderType : Global.None); + if (transport.RawHost.IsNotEmpty()) { - dicQuery.Add("host", Utils.UrlEncode(transport.TcpHost)); + dicQuery.Add("host", Utils.UrlEncode(transport.RawHost)); } break; @@ -259,20 +259,20 @@ public class BaseFmt item.AllowInsecure = string.Empty; } - var net = GetQueryValue(query, "type", nameof(ETransport.tcp)); + var net = GetQueryValue(query, "type", nameof(ETransport.raw)); if (!Global.Networks.Contains(net)) { - net = nameof(ETransport.tcp); + net = nameof(ETransport.raw); } item.Network = net; switch (item.Network) { - case nameof(ETransport.tcp): + case nameof(ETransport.raw): transport = transport with { - TcpHeaderType = GetQueryValue(query, "headerType", Global.None), - TcpHost = GetQueryDecoded(query, "host"), + RawHeaderType = GetQueryValue(query, "headerType", Global.None), + RawHost = GetQueryDecoded(query, "host"), }; break; @@ -336,7 +336,7 @@ public class BaseFmt break; default: - item.Network = nameof(ETransport.tcp); + item.Network = nameof(ETransport.raw); break; } diff --git a/v2rayN/ServiceLib/Handler/Fmt/ShadowsocksFmt.cs b/v2rayN/ServiceLib/Handler/Fmt/ShadowsocksFmt.cs index ae3e6664..d24a9237 100644 --- a/v2rayN/ServiceLib/Handler/Fmt/ShadowsocksFmt.cs +++ b/v2rayN/ServiceLib/Handler/Fmt/ShadowsocksFmt.cs @@ -48,10 +48,10 @@ public class ShadowsocksFmt : BaseFmt var plugin = string.Empty; var pluginArgs = string.Empty; - if (item.Network == nameof(ETransport.tcp) && transport.TcpHeaderType == Global.TcpHeaderHttp) + if (item.Network == nameof(ETransport.raw) && transport.RawHeaderType == Global.RawHeaderHttp) { plugin = "obfs-local"; - pluginArgs = $"obfs=http;obfs-host={transport.TcpHost};"; + pluginArgs = $"obfs=http;obfs-host={transport.RawHost};"; } else { @@ -212,8 +212,8 @@ public class ShadowsocksFmt : BaseFmt item.Network = Global.DefaultNetwork; item.SetTransportExtra(item.GetTransportExtra() with { - TcpHeaderType = Global.TcpHeaderHttp, - TcpHost = obfsHost, + RawHeaderType = Global.RawHeaderHttp, + RawHost = obfsHost, }); } } diff --git a/v2rayN/ServiceLib/Handler/Fmt/VmessFmt.cs b/v2rayN/ServiceLib/Handler/Fmt/VmessFmt.cs index c5f98009..3f30b370 100644 --- a/v2rayN/ServiceLib/Handler/Fmt/VmessFmt.cs +++ b/v2rayN/ServiceLib/Handler/Fmt/VmessFmt.cs @@ -37,7 +37,7 @@ public class VmessFmt : BaseFmt net = item.Network, type = item.GetNetwork() switch { - nameof(ETransport.tcp) => item.GetTransportExtra().TcpHeaderType, + nameof(ETransport.raw) => item.GetTransportExtra().RawHeaderType, nameof(ETransport.kcp) => item.GetTransportExtra().KcpHeaderType, nameof(ETransport.xhttp) => item.GetTransportExtra().XhttpMode, nameof(ETransport.grpc) => item.GetTransportExtra().GrpcMode, @@ -45,7 +45,7 @@ public class VmessFmt : BaseFmt }, host = item.GetNetwork() switch { - nameof(ETransport.tcp) => item.GetTransportExtra().TcpHost, + nameof(ETransport.raw) => item.GetTransportExtra().RawHost, nameof(ETransport.ws) => item.GetTransportExtra().WsHost, nameof(ETransport.httpupgrade) => item.GetTransportExtra().HttpupgradeHost, nameof(ETransport.xhttp) => item.GetTransportExtra().XhttpHost, @@ -96,7 +96,7 @@ public class VmessFmt : BaseFmt item.Network = Global.DefaultNetwork; var transport = new TransportExtra { - TcpHeaderType = Global.None, + RawHeaderType = Global.None, }; //item.ConfigVersion = vmessQRCode.v; @@ -117,7 +117,7 @@ public class VmessFmt : BaseFmt { transport = item.GetNetwork() switch { - nameof(ETransport.tcp) => transport with { TcpHeaderType = vmessQRCode.type }, + nameof(ETransport.raw) => transport with { RawHeaderType = vmessQRCode.type }, nameof(ETransport.kcp) => transport with { KcpHeaderType = vmessQRCode.type }, nameof(ETransport.xhttp) => transport with { XhttpMode = vmessQRCode.type }, nameof(ETransport.grpc) => transport with { GrpcMode = vmessQRCode.type }, @@ -126,7 +126,7 @@ public class VmessFmt : BaseFmt } transport = item.GetNetwork() switch { - nameof(ETransport.tcp) => transport with { TcpHost = Utils.ToString(vmessQRCode.host) }, + nameof(ETransport.raw) => transport with { RawHost = Utils.ToString(vmessQRCode.host) }, nameof(ETransport.kcp) => transport with { KcpSeed = Utils.ToString(vmessQRCode.path) }, nameof(ETransport.ws) => transport with { WsHost = Utils.ToString(vmessQRCode.host), WsPath = Utils.ToString(vmessQRCode.path) }, nameof(ETransport.httpupgrade) => transport with { HttpupgradeHost = Utils.ToString(vmessQRCode.host), HttpupgradePath = Utils.ToString(vmessQRCode.path) }, diff --git a/v2rayN/ServiceLib/Manager/AppManager.cs b/v2rayN/ServiceLib/Manager/AppManager.cs index 9c268eac..d572b9a5 100644 --- a/v2rayN/ServiceLib/Manager/AppManager.cs +++ b/v2rayN/ServiceLib/Manager/AppManager.cs @@ -364,14 +364,19 @@ public sealed class AppManager var extra = item.GetProtocolExtra(); var transport = extra.Transport ?? new TransportExtra(); var network = item.GetNetwork(); + if (network == "tcp") + { + network = nameof(ETransport.raw); + item.Network = network; + } switch (network) { - case nameof(ETransport.tcp): + case nameof(ETransport.raw): transport = transport with { - TcpHeaderType = item.HeaderType.NullIfEmpty(), - TcpHost = item.RequestHost.NullIfEmpty(), + RawHeaderType = item.HeaderType.NullIfEmpty(), + RawHost = item.RequestHost.NullIfEmpty(), }; break; @@ -422,8 +427,8 @@ public sealed class AppManager item.Network = Global.DefaultNetwork; transport = transport with { - TcpHeaderType = item.HeaderType.NullIfEmpty(), - TcpHost = item.RequestHost.NullIfEmpty(), + RawHeaderType = item.HeaderType.NullIfEmpty(), + RawHost = item.RequestHost.NullIfEmpty(), }; break; } diff --git a/v2rayN/ServiceLib/Models/ProfileItem.cs b/v2rayN/ServiceLib/Models/ProfileItem.cs index 2601b8e6..f9a87025 100644 --- a/v2rayN/ServiceLib/Models/ProfileItem.cs +++ b/v2rayN/ServiceLib/Models/ProfileItem.cs @@ -167,9 +167,9 @@ public class ProfileItem public string Password { get; set; } public string Username { get; set; } public string Network { get; set; } - [Obsolete("Use TransportExtra.TcpHeaderType/XhttpMode/GrpcMode/KcpHeaderType instead.")] + [Obsolete("Use TransportExtra.RawHeaderType/XhttpMode/GrpcMode/KcpHeaderType instead.")] public string HeaderType { get; set; } - [Obsolete("Use TransportExtra.TcpHost/WsHost/HttpupgradeHost/XhttpHost/GrpcAuthority instead.")] + [Obsolete("Use TransportExtra.RawHost/WsHost/HttpupgradeHost/XhttpHost/GrpcAuthority instead.")] public string RequestHost { get; set; } [Obsolete("Use TransportExtra.WsPath/HttpupgradePath/XhttpPath/GrpcServiceName/KcpSeed instead.")] public string Path { get; set; } diff --git a/v2rayN/ServiceLib/Models/TransportExtra.cs b/v2rayN/ServiceLib/Models/TransportExtra.cs index e5931eb7..e9c764c9 100644 --- a/v2rayN/ServiceLib/Models/TransportExtra.cs +++ b/v2rayN/ServiceLib/Models/TransportExtra.cs @@ -2,8 +2,8 @@ namespace ServiceLib.Models; public record TransportExtra { - public string? TcpHeaderType { get; init; } - public string? TcpHost { get; init; } + public string? RawHeaderType { get; init; } + public string? RawHost { get; init; } public string? WsHost { get; init; } public string? WsPath { get; init; } @@ -22,4 +22,4 @@ public record TransportExtra public string? KcpHeaderType { get; init; } public string? KcpSeed { get; init; } -} \ No newline at end of file +} diff --git a/v2rayN/ServiceLib/Models/V2rayConfig.cs b/v2rayN/ServiceLib/Models/V2rayConfig.cs index 983cb4da..0444a2d3 100644 --- a/v2rayN/ServiceLib/Models/V2rayConfig.cs +++ b/v2rayN/ServiceLib/Models/V2rayConfig.cs @@ -317,7 +317,7 @@ public class StreamSettings4Ray public TlsSettings4Ray? tlsSettings { get; set; } - public TcpSettings4Ray? tcpSettings { get; set; } + public RawSettings4Ray? rawSettings { get; set; } public KcpSettings4Ray? kcpSettings { get; set; } @@ -371,7 +371,7 @@ public class CertificateSettings4Ray public string? usage { get; set; } } -public class TcpSettings4Ray +public class RawSettings4Ray { public Header4Ray header { get; set; } } diff --git a/v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxOutboundService.cs b/v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxOutboundService.cs index c9ab8645..8cf21ea9 100644 --- a/v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxOutboundService.cs +++ b/v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxOutboundService.cs @@ -116,10 +116,10 @@ public partial class CoreConfigSingboxService outbound.password = _node.Password; outbound.udp_over_tcp = protocolExtra.Uot == true ? true : null; - if (network == nameof(ETransport.tcp) && transportExtra.TcpHeaderType == Global.TcpHeaderHttp) + if (network == nameof(ETransport.raw) && transportExtra.RawHeaderType == Global.RawHeaderHttp) { outbound.plugin = "obfs-local"; - outbound.plugin_opts = $"obfs=http;obfs-host={transportExtra.TcpHost};"; + outbound.plugin_opts = $"obfs=http;obfs-host={transportExtra.RawHost};"; } else { @@ -383,7 +383,7 @@ public partial class CoreConfigSingboxService { var host = _node.GetNetwork() switch { - nameof(ETransport.tcp) => _node.GetTransportExtra().TcpHost, + nameof(ETransport.raw) => _node.GetTransportExtra().RawHost, nameof(ETransport.ws) => _node.GetTransportExtra().WsHost, nameof(ETransport.httpupgrade) => _node.GetTransportExtra().HttpupgradeHost, nameof(ETransport.xhttp) => _node.GetTransportExtra().XhttpHost, @@ -449,11 +449,11 @@ public partial class CoreConfigSingboxService switch (_node.GetNetwork()) { - case nameof(ETransport.tcp): //http - if (transportExtra.TcpHeaderType == Global.TcpHeaderHttp) + case nameof(ETransport.raw): //http + if (transportExtra.RawHeaderType == Global.RawHeaderHttp) { transport.type = nameof(ETransport.http); - transport.host = transportExtra.TcpHost.IsNullOrEmpty() ? null : Utils.String2List(transportExtra.TcpHost); + transport.host = transportExtra.RawHost.IsNullOrEmpty() ? null : Utils.String2List(transportExtra.RawHost); } break; diff --git a/v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayOutboundService.cs b/v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayOutboundService.cs index d493344d..a8ad213a 100644 --- a/v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayOutboundService.cs +++ b/v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayOutboundService.cs @@ -356,9 +356,9 @@ public partial class CoreConfigV2rayService var xhttpExtra = string.Empty; switch (network) { - case nameof(ETransport.tcp): - host = transport.TcpHost?.TrimEx() ?? string.Empty; - headerType = transport.TcpHeaderType?.TrimEx() ?? string.Empty; + case nameof(ETransport.raw): + host = transport.RawHost?.TrimEx() ?? string.Empty; + headerType = transport.RawHeaderType?.TrimEx() ?? string.Empty; break; case nameof(ETransport.kcp): @@ -641,11 +641,10 @@ public partial class CoreConfigV2rayService streamSettings.finalmask = hy2Finalmask; break; - default: - //tcp - if (headerType == Global.TcpHeaderHttp) + case nameof(ETransport.raw): + if (headerType == Global.RawHeaderHttp) { - TcpSettings4Ray tcpSettings = new() + RawSettings4Ray rawSettings = new() { header = new Header4Ray { @@ -655,7 +654,7 @@ public partial class CoreConfigV2rayService //request Host var request = EmbedUtils.GetEmbedText(Global.V2raySampleHttpRequestFileName); - var useragentValue = Global.TcpHttpUserAgentTexts.GetValueOrDefault(useragent, useragent); + var useragentValue = Global.RawHttpUserAgentTexts.GetValueOrDefault(useragent, useragent); var arrHost = host.Split(','); var host2 = string.Join(",".AppendQuotes(), arrHost); request = request.Replace("$requestHost$", $"{host2.AppendQuotes()}"); @@ -668,11 +667,14 @@ public partial class CoreConfigV2rayService pathHttp = string.Join(",".AppendQuotes(), arrPath); } request = request.Replace("$requestPath$", $"{pathHttp.AppendQuotes()}"); - tcpSettings.header.request = JsonUtils.Deserialize(request); + rawSettings.header.request = JsonUtils.Deserialize(request); - streamSettings.tcpSettings = tcpSettings; + streamSettings.rawSettings = rawSettings; } break; + + default: + break; } if (!_node.Finalmask.IsNullOrEmpty()) diff --git a/v2rayN/ServiceLib/ViewModels/AddServerViewModel.cs b/v2rayN/ServiceLib/ViewModels/AddServerViewModel.cs index 69445b9b..fdc96ad4 100644 --- a/v2rayN/ServiceLib/ViewModels/AddServerViewModel.cs +++ b/v2rayN/ServiceLib/ViewModels/AddServerViewModel.cs @@ -74,10 +74,10 @@ public class AddServerViewModel : MyReactiveObject public bool NaiveQuic { get; set; } [Reactive] - public string TcpHeaderType { get; set; } + public string RawHeaderType { get; set; } [Reactive] - public string TcpHost { get; set; } + public string RawHost { get; set; } [Reactive] public string WsHost { get; set; } @@ -122,7 +122,7 @@ public class AddServerViewModel : MyReactiveObject { get => SelectedSource.GetNetwork() switch { - nameof(ETransport.tcp) => TcpHeaderType, + nameof(ETransport.raw) => RawHeaderType, nameof(ETransport.kcp) => KcpHeaderType, nameof(ETransport.xhttp) => XhttpMode, nameof(ETransport.grpc) => GrpcMode, @@ -132,8 +132,8 @@ public class AddServerViewModel : MyReactiveObject { switch (SelectedSource.GetNetwork()) { - case nameof(ETransport.tcp): - TcpHeaderType = value; + case nameof(ETransport.raw): + RawHeaderType = value; break; case nameof(ETransport.kcp): KcpHeaderType = value; @@ -153,7 +153,7 @@ public class AddServerViewModel : MyReactiveObject { get => SelectedSource.GetNetwork() switch { - nameof(ETransport.tcp) => TcpHost, + nameof(ETransport.raw) => RawHost, nameof(ETransport.ws) => WsHost, nameof(ETransport.httpupgrade) => HttpupgradeHost, nameof(ETransport.xhttp) => XhttpHost, @@ -164,8 +164,8 @@ public class AddServerViewModel : MyReactiveObject { switch (SelectedSource.GetNetwork()) { - case nameof(ETransport.tcp): - TcpHost = value; + case nameof(ETransport.raw): + RawHost = value; break; case nameof(ETransport.ws): WsHost = value; @@ -309,8 +309,8 @@ public class AddServerViewModel : MyReactiveObject InsecureConcurrency = protocolExtra?.InsecureConcurrency > 0 ? protocolExtra.InsecureConcurrency : null; NaiveQuic = protocolExtra?.NaiveQuic ?? false; - TcpHeaderType = transport.TcpHeaderType ?? Global.None; - TcpHost = transport.TcpHost ?? string.Empty; + RawHeaderType = transport.RawHeaderType ?? Global.None; + RawHost = transport.RawHost ?? string.Empty; WsHost = transport.WsHost ?? string.Empty; WsPath = transport.WsPath ?? string.Empty; HttpupgradeHost = transport.HttpupgradeHost ?? string.Empty; @@ -378,8 +378,8 @@ public class AddServerViewModel : MyReactiveObject var transport = new TransportExtra { - TcpHeaderType = TcpHeaderType.NullIfEmpty(), - TcpHost = TcpHost.NullIfEmpty(), + RawHeaderType = RawHeaderType.NullIfEmpty(), + RawHost = RawHost.NullIfEmpty(), WsHost = WsHost.NullIfEmpty(), WsPath = WsPath.NullIfEmpty(), HttpupgradeHost = HttpupgradeHost.NullIfEmpty(), @@ -517,7 +517,7 @@ public class AddServerViewModel : MyReactiveObject { return SelectedSource.GetNetwork() switch { - nameof(ETransport.tcp) => TcpHost, + nameof(ETransport.raw) => RawHost, nameof(ETransport.ws) => WsHost, nameof(ETransport.httpupgrade) => HttpupgradeHost, nameof(ETransport.xhttp) => XhttpHost, diff --git a/v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml b/v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml index fe19b860..fe8d513f 100644 --- a/v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml +++ b/v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml @@ -717,7 +717,7 @@ @@ -728,7 +728,7 @@ VerticalAlignment="Center" Text="{x:Static resx:ResUI.TbHeaderType}" /> break; } this.Bind(ViewModel, vm => vm.SelectedSource.Network, v => v.cmbNetwork.SelectedValue).DisposeWith(disposables); - this.Bind(ViewModel, vm => vm.TcpHeaderType, v => v.cmbHeaderTypeTcp.SelectedValue).DisposeWith(disposables); - this.Bind(ViewModel, vm => vm.TcpHost, v => v.txtRequestHostTcp.Text).DisposeWith(disposables); + this.Bind(ViewModel, vm => vm.RawHeaderType, v => v.cmbHeaderTypeRaw.SelectedValue).DisposeWith(disposables); + this.Bind(ViewModel, vm => vm.RawHost, v => v.txtRequestHostRaw.Text).DisposeWith(disposables); this.Bind(ViewModel, vm => vm.KcpHeaderType, v => v.cmbHeaderTypeKcp.SelectedValue).DisposeWith(disposables); this.Bind(ViewModel, vm => vm.KcpSeed, v => v.txtKcpSeed.Text).DisposeWith(disposables); @@ -301,7 +301,7 @@ public partial class AddServerWindow : WindowBase private void SetHeaderType() { - cmbHeaderTypeTcp.ItemsSource = new List { Global.None, Global.TcpHeaderHttp }; + cmbHeaderTypeRaw.ItemsSource = new List { Global.None, Global.RawHeaderHttp }; var kcpHeaderTypes = new List { Global.None }; kcpHeaderTypes.AddRange(Global.KcpHeaderTypes); @@ -326,7 +326,7 @@ public partial class AddServerWindow : WindowBase network = Global.DefaultNetwork; } - gridTransportTcp.IsVisible = false; + gridTransportRaw.IsVisible = false; gridTransportKcp.IsVisible = false; gridTransportWs.IsVisible = false; gridTransportHttpupgrade.IsVisible = false; @@ -335,8 +335,8 @@ public partial class AddServerWindow : WindowBase switch (network) { - case nameof(ETransport.tcp): - gridTransportTcp.IsVisible = true; + case nameof(ETransport.raw): + gridTransportRaw.IsVisible = true; break; case nameof(ETransport.kcp): gridTransportKcp.IsVisible = true; @@ -354,7 +354,7 @@ public partial class AddServerWindow : WindowBase gridTransportGrpc.IsVisible = true; break; default: - gridTransportTcp.IsVisible = true; + gridTransportRaw.IsVisible = true; break; } } diff --git a/v2rayN/v2rayN/Views/AddServerWindow.xaml b/v2rayN/v2rayN/Views/AddServerWindow.xaml index b07f5d17..22aad17c 100644 --- a/v2rayN/v2rayN/Views/AddServerWindow.xaml +++ b/v2rayN/v2rayN/Views/AddServerWindow.xaml @@ -943,7 +943,7 @@ - + @@ -960,7 +960,7 @@ Style="{StaticResource ToolbarTextBlock}" Text="{x:Static resx:ResUI.TbHeaderType}" /> vm.SelectedSource.Network, v => v.cmbNetwork.Text).DisposeWith(disposables); - this.Bind(ViewModel, vm => vm.TcpHeaderType, v => v.cmbHeaderTypeTcp.Text).DisposeWith(disposables); - this.Bind(ViewModel, vm => vm.TcpHost, v => v.txtRequestHostTcp.Text).DisposeWith(disposables); + this.Bind(ViewModel, vm => vm.RawHeaderType, v => v.cmbHeaderTypeRaw.Text).DisposeWith(disposables); + this.Bind(ViewModel, vm => vm.RawHost, v => v.txtRequestHostRaw.Text).DisposeWith(disposables); this.Bind(ViewModel, vm => vm.KcpHeaderType, v => v.cmbHeaderTypeKcp.Text).DisposeWith(disposables); this.Bind(ViewModel, vm => vm.KcpSeed, v => v.txtKcpSeed.Text).DisposeWith(disposables); @@ -301,7 +301,7 @@ public partial class AddServerWindow private void SetHeaderType() { - cmbHeaderTypeTcp.ItemsSource = new List { Global.None, Global.TcpHeaderHttp }; + cmbHeaderTypeRaw.ItemsSource = new List { Global.None, Global.RawHeaderHttp }; var kcpHeaderTypes = new List { Global.None }; kcpHeaderTypes.AddRange(Global.KcpHeaderTypes); @@ -326,7 +326,7 @@ public partial class AddServerWindow network = Global.DefaultNetwork; } - gridTransportTcp.Visibility = Visibility.Collapsed; + gridTransportRaw.Visibility = Visibility.Collapsed; gridTransportKcp.Visibility = Visibility.Collapsed; gridTransportWs.Visibility = Visibility.Collapsed; gridTransportHttpupgrade.Visibility = Visibility.Collapsed; @@ -335,8 +335,8 @@ public partial class AddServerWindow switch (network) { - case nameof(ETransport.tcp): - gridTransportTcp.Visibility = Visibility.Visible; + case nameof(ETransport.raw): + gridTransportRaw.Visibility = Visibility.Visible; break; case nameof(ETransport.kcp): gridTransportKcp.Visibility = Visibility.Visible; @@ -354,7 +354,7 @@ public partial class AddServerWindow gridTransportGrpc.Visibility = Visibility.Visible; break; default: - gridTransportTcp.Visibility = Visibility.Visible; + gridTransportRaw.Visibility = Visibility.Visible; break; } } From 8de4ba082df8e8025dd6d9de44ae62fa306d6e67 Mon Sep 17 00:00:00 2001 From: DHR60 Date: Sat, 28 Mar 2026 23:09:30 +0800 Subject: [PATCH 3/4] Fix --- v2rayN/ServiceLib/Handler/ConfigHandler.cs | 8 +-- v2rayN/ServiceLib/Handler/Fmt/BaseFmt.cs | 36 +++++------ .../ServiceLib/Handler/Fmt/ShadowsocksFmt.cs | 8 +-- v2rayN/ServiceLib/Handler/Fmt/VmessFmt.cs | 18 +++--- v2rayN/ServiceLib/Manager/AppManager.cs | 24 +++---- v2rayN/ServiceLib/Models/ProfileItem.cs | 4 +- v2rayN/ServiceLib/Models/TransportExtra.cs | 10 +-- .../Singbox/SingboxOutboundService.cs | 20 +++--- .../CoreConfig/V2ray/V2rayOutboundService.cs | 12 ++-- .../ViewModels/AddServerViewModel.cs | 62 +++++++------------ .../Views/AddServerWindow.axaml.cs | 12 ++-- v2rayN/v2rayN/Views/AddServerWindow.xaml.cs | 12 ++-- 12 files changed, 94 insertions(+), 132 deletions(-) diff --git a/v2rayN/ServiceLib/Handler/ConfigHandler.cs b/v2rayN/ServiceLib/Handler/ConfigHandler.cs index 1a0d61e1..96d5cec9 100644 --- a/v2rayN/ServiceLib/Handler/ConfigHandler.cs +++ b/v2rayN/ServiceLib/Handler/ConfigHandler.cs @@ -1140,12 +1140,8 @@ public static class ConfigHandler && AreEqual(o.Network, n.Network) && AreEqual(oTransport.RawHeaderType, nTransport.RawHeaderType) && AreEqual(oTransport.RawHost, nTransport.RawHost) - && AreEqual(oTransport.WsHost, nTransport.WsHost) - && AreEqual(oTransport.WsPath, nTransport.WsPath) - && AreEqual(oTransport.HttpupgradeHost, nTransport.HttpupgradeHost) - && AreEqual(oTransport.HttpupgradePath, nTransport.HttpupgradePath) - && AreEqual(oTransport.XhttpHost, nTransport.XhttpHost) - && AreEqual(oTransport.XhttpPath, nTransport.XhttpPath) + && AreEqual(oTransport.Host, nTransport.Host) + && AreEqual(oTransport.Path, nTransport.Path) && AreEqual(oTransport.XhttpMode, nTransport.XhttpMode) && AreEqual(oTransport.XhttpExtra, nTransport.XhttpExtra) && AreEqual(oTransport.GrpcAuthority, nTransport.GrpcAuthority) diff --git a/v2rayN/ServiceLib/Handler/Fmt/BaseFmt.cs b/v2rayN/ServiceLib/Handler/Fmt/BaseFmt.cs index cff88584..6a0c43d6 100644 --- a/v2rayN/ServiceLib/Handler/Fmt/BaseFmt.cs +++ b/v2rayN/ServiceLib/Handler/Fmt/BaseFmt.cs @@ -116,35 +116,35 @@ public class BaseFmt break; case nameof(ETransport.ws): - if (transport.WsHost.IsNotEmpty()) + if (transport.Host.IsNotEmpty()) { - dicQuery.Add("host", Utils.UrlEncode(transport.WsHost)); + dicQuery.Add("host", Utils.UrlEncode(transport.Host)); } - if (transport.WsPath.IsNotEmpty()) + if (transport.Path.IsNotEmpty()) { - dicQuery.Add("path", Utils.UrlEncode(transport.WsPath)); + dicQuery.Add("path", Utils.UrlEncode(transport.Path)); } break; case nameof(ETransport.httpupgrade): - if (transport.HttpupgradeHost.IsNotEmpty()) + if (transport.Host.IsNotEmpty()) { - dicQuery.Add("host", Utils.UrlEncode(transport.HttpupgradeHost)); + dicQuery.Add("host", Utils.UrlEncode(transport.Host)); } - if (transport.HttpupgradePath.IsNotEmpty()) + if (transport.Path.IsNotEmpty()) { - dicQuery.Add("path", Utils.UrlEncode(transport.HttpupgradePath)); + dicQuery.Add("path", Utils.UrlEncode(transport.Path)); } break; case nameof(ETransport.xhttp): - if (transport.XhttpHost.IsNotEmpty()) + if (transport.Host.IsNotEmpty()) { - dicQuery.Add("host", Utils.UrlEncode(transport.XhttpHost)); + dicQuery.Add("host", Utils.UrlEncode(transport.Host)); } - if (transport.XhttpPath.IsNotEmpty()) + if (transport.Path.IsNotEmpty()) { - dicQuery.Add("path", Utils.UrlEncode(transport.XhttpPath)); + dicQuery.Add("path", Utils.UrlEncode(transport.Path)); } if (transport.XhttpMode.IsNotEmpty() && Global.XhttpMode.Contains(transport.XhttpMode)) { @@ -288,16 +288,16 @@ public class BaseFmt case nameof(ETransport.ws): transport = transport with { - WsHost = GetQueryDecoded(query, "host"), - WsPath = GetQueryDecoded(query, "path", "/"), + Host = GetQueryDecoded(query, "host"), + Path = GetQueryDecoded(query, "path", "/"), }; break; case nameof(ETransport.httpupgrade): transport = transport with { - HttpupgradeHost = GetQueryDecoded(query, "host"), - HttpupgradePath = GetQueryDecoded(query, "path", "/"), + Host = GetQueryDecoded(query, "host"), + Path = GetQueryDecoded(query, "path", "/"), }; break; @@ -319,8 +319,8 @@ public class BaseFmt transport = transport with { - XhttpHost = GetQueryDecoded(query, "host"), - XhttpPath = GetQueryDecoded(query, "path", "/"), + Host = GetQueryDecoded(query, "host"), + Path = GetQueryDecoded(query, "path", "/"), XhttpMode = GetQueryDecoded(query, "mode"), XhttpExtra = xhttpExtra, }; diff --git a/v2rayN/ServiceLib/Handler/Fmt/ShadowsocksFmt.cs b/v2rayN/ServiceLib/Handler/Fmt/ShadowsocksFmt.cs index d24a9237..fc60102c 100644 --- a/v2rayN/ServiceLib/Handler/Fmt/ShadowsocksFmt.cs +++ b/v2rayN/ServiceLib/Handler/Fmt/ShadowsocksFmt.cs @@ -58,10 +58,10 @@ public class ShadowsocksFmt : BaseFmt if (item.Network == nameof(ETransport.ws)) { pluginArgs += "mode=websocket;"; - pluginArgs += $"host={transport.WsHost};"; + pluginArgs += $"host={transport.Host};"; // https://github.com/shadowsocks/v2ray-plugin/blob/e9af1cdd2549d528deb20a4ab8d61c5fbe51f306/args.go#L172 // Equal signs and commas [and backslashes] must be escaped with a backslash. - var path = (transport.WsPath ?? string.Empty).Replace("\\", "\\\\").Replace("=", "\\=").Replace(",", "\\,"); + var path = (transport.Path ?? string.Empty).Replace("\\", "\\\\").Replace("=", "\\=").Replace(",", "\\,"); pluginArgs += $"path={path};"; } if (item.StreamSecurity == Global.StreamSecurity) @@ -235,14 +235,14 @@ public class ShadowsocksFmt : BaseFmt if (!host.IsNullOrEmpty()) { var wsHost = host.Replace("host=", ""); - t = t with { WsHost = wsHost }; + t = t with { Host = wsHost }; item.Sni = wsHost; } if (!path.IsNullOrEmpty()) { var pathValue = path.Replace("path=", ""); pathValue = pathValue.Replace("\\=", "=").Replace("\\,", ",").Replace("\\\\", "\\"); - t = t with { WsPath = pathValue }; + t = t with { Path = pathValue }; } item.SetTransportExtra(t); } diff --git a/v2rayN/ServiceLib/Handler/Fmt/VmessFmt.cs b/v2rayN/ServiceLib/Handler/Fmt/VmessFmt.cs index 3f30b370..e4f68a51 100644 --- a/v2rayN/ServiceLib/Handler/Fmt/VmessFmt.cs +++ b/v2rayN/ServiceLib/Handler/Fmt/VmessFmt.cs @@ -46,18 +46,18 @@ public class VmessFmt : BaseFmt host = item.GetNetwork() switch { nameof(ETransport.raw) => item.GetTransportExtra().RawHost, - nameof(ETransport.ws) => item.GetTransportExtra().WsHost, - nameof(ETransport.httpupgrade) => item.GetTransportExtra().HttpupgradeHost, - nameof(ETransport.xhttp) => item.GetTransportExtra().XhttpHost, + nameof(ETransport.ws) => item.GetTransportExtra().Host, + nameof(ETransport.httpupgrade) => item.GetTransportExtra().Host, + nameof(ETransport.xhttp) => item.GetTransportExtra().Host, nameof(ETransport.grpc) => item.GetTransportExtra().GrpcAuthority, _ => null, }, path = item.GetNetwork() switch { nameof(ETransport.kcp) => item.GetTransportExtra().KcpSeed, - nameof(ETransport.ws) => item.GetTransportExtra().WsPath, - nameof(ETransport.httpupgrade) => item.GetTransportExtra().HttpupgradePath, - nameof(ETransport.xhttp) => item.GetTransportExtra().XhttpPath, + nameof(ETransport.ws) => item.GetTransportExtra().Path, + nameof(ETransport.httpupgrade) => item.GetTransportExtra().Path, + nameof(ETransport.xhttp) => item.GetTransportExtra().Path, nameof(ETransport.grpc) => item.GetTransportExtra().GrpcServiceName, _ => null, }, @@ -128,9 +128,9 @@ public class VmessFmt : BaseFmt { nameof(ETransport.raw) => transport with { RawHost = Utils.ToString(vmessQRCode.host) }, nameof(ETransport.kcp) => transport with { KcpSeed = Utils.ToString(vmessQRCode.path) }, - nameof(ETransport.ws) => transport with { WsHost = Utils.ToString(vmessQRCode.host), WsPath = Utils.ToString(vmessQRCode.path) }, - nameof(ETransport.httpupgrade) => transport with { HttpupgradeHost = Utils.ToString(vmessQRCode.host), HttpupgradePath = Utils.ToString(vmessQRCode.path) }, - nameof(ETransport.xhttp) => transport with { XhttpHost = Utils.ToString(vmessQRCode.host), XhttpPath = Utils.ToString(vmessQRCode.path) }, + nameof(ETransport.ws) => transport with { Host = Utils.ToString(vmessQRCode.host), Path = Utils.ToString(vmessQRCode.path) }, + nameof(ETransport.httpupgrade) => transport with { Host = Utils.ToString(vmessQRCode.host), Path = Utils.ToString(vmessQRCode.path) }, + nameof(ETransport.xhttp) => transport with { Host = Utils.ToString(vmessQRCode.host), Path = Utils.ToString(vmessQRCode.path) }, nameof(ETransport.grpc) => transport with { GrpcAuthority = Utils.ToString(vmessQRCode.host), GrpcServiceName = Utils.ToString(vmessQRCode.path) }, _ => transport, }; diff --git a/v2rayN/ServiceLib/Manager/AppManager.cs b/v2rayN/ServiceLib/Manager/AppManager.cs index d572b9a5..e8a0c3cf 100644 --- a/v2rayN/ServiceLib/Manager/AppManager.cs +++ b/v2rayN/ServiceLib/Manager/AppManager.cs @@ -361,14 +361,13 @@ public sealed class AppManager { try { + if (item.Network == "tcp") + { + item.Network = nameof(ETransport.raw); + } var extra = item.GetProtocolExtra(); var transport = extra.Transport ?? new TransportExtra(); var network = item.GetNetwork(); - if (network == "tcp") - { - network = nameof(ETransport.raw); - item.Network = network; - } switch (network) { @@ -381,26 +380,19 @@ public sealed class AppManager break; case nameof(ETransport.ws): - transport = transport with - { - WsHost = item.RequestHost.NullIfEmpty(), - WsPath = item.Path.NullIfEmpty(), - }; - break; - case nameof(ETransport.httpupgrade): transport = transport with { - HttpupgradeHost = item.RequestHost.NullIfEmpty(), - HttpupgradePath = item.Path.NullIfEmpty(), + Host = item.RequestHost.NullIfEmpty(), + Path = item.Path.NullIfEmpty(), }; break; case nameof(ETransport.xhttp): transport = transport with { - XhttpHost = item.RequestHost.NullIfEmpty(), - XhttpPath = item.Path.NullIfEmpty(), + Host = item.RequestHost.NullIfEmpty(), + Path = item.Path.NullIfEmpty(), XhttpMode = item.HeaderType.NullIfEmpty(), XhttpExtra = item.Extra.NullIfEmpty(), }; diff --git a/v2rayN/ServiceLib/Models/ProfileItem.cs b/v2rayN/ServiceLib/Models/ProfileItem.cs index f9a87025..1164ce45 100644 --- a/v2rayN/ServiceLib/Models/ProfileItem.cs +++ b/v2rayN/ServiceLib/Models/ProfileItem.cs @@ -169,9 +169,9 @@ public class ProfileItem public string Network { get; set; } [Obsolete("Use TransportExtra.RawHeaderType/XhttpMode/GrpcMode/KcpHeaderType instead.")] public string HeaderType { get; set; } - [Obsolete("Use TransportExtra.RawHost/WsHost/HttpupgradeHost/XhttpHost/GrpcAuthority instead.")] + [Obsolete("Use TransportExtra.RawHost/Host/GrpcAuthority instead.")] public string RequestHost { get; set; } - [Obsolete("Use TransportExtra.WsPath/HttpupgradePath/XhttpPath/GrpcServiceName/KcpSeed instead.")] + [Obsolete("Use TransportExtra.Path/GrpcServiceName/KcpSeed instead.")] public string Path { get; set; } public string StreamSecurity { get; set; } public string AllowInsecure { get; set; } diff --git a/v2rayN/ServiceLib/Models/TransportExtra.cs b/v2rayN/ServiceLib/Models/TransportExtra.cs index e9c764c9..105b20d9 100644 --- a/v2rayN/ServiceLib/Models/TransportExtra.cs +++ b/v2rayN/ServiceLib/Models/TransportExtra.cs @@ -5,14 +5,8 @@ public record TransportExtra public string? RawHeaderType { get; init; } public string? RawHost { get; init; } - public string? WsHost { get; init; } - public string? WsPath { get; init; } - - public string? HttpupgradeHost { get; init; } - public string? HttpupgradePath { get; init; } - - public string? XhttpHost { get; init; } - public string? XhttpPath { get; init; } + public string? Host { get; init; } + public string? Path { get; init; } public string? XhttpMode { get; init; } public string? XhttpExtra { get; init; } diff --git a/v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxOutboundService.cs b/v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxOutboundService.cs index 8cf21ea9..fae7f0b8 100644 --- a/v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxOutboundService.cs +++ b/v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxOutboundService.cs @@ -127,10 +127,10 @@ public partial class CoreConfigSingboxService if (network == nameof(ETransport.ws)) { pluginArgs += "mode=websocket;"; - pluginArgs += $"host={transportExtra.WsHost};"; + pluginArgs += $"host={transportExtra.Host};"; // https://github.com/shadowsocks/v2ray-plugin/blob/e9af1cdd2549d528deb20a4ab8d61c5fbe51f306/args.go#L172 // Equal signs and commas [and backslashes] must be escaped with a backslash. - var path = (transportExtra.WsPath ?? string.Empty).Replace("\\", "\\\\").Replace("=", "\\=").Replace(",", "\\,"); + var path = (transportExtra.Path ?? string.Empty).Replace("\\", "\\\\").Replace("=", "\\=").Replace(",", "\\,"); pluginArgs += $"path={path};"; } if (_node.StreamSecurity == Global.StreamSecurity) @@ -384,9 +384,9 @@ public partial class CoreConfigSingboxService var host = _node.GetNetwork() switch { nameof(ETransport.raw) => _node.GetTransportExtra().RawHost, - nameof(ETransport.ws) => _node.GetTransportExtra().WsHost, - nameof(ETransport.httpupgrade) => _node.GetTransportExtra().HttpupgradeHost, - nameof(ETransport.xhttp) => _node.GetTransportExtra().XhttpHost, + nameof(ETransport.ws) => _node.GetTransportExtra().Host, + nameof(ETransport.httpupgrade) => _node.GetTransportExtra().Host, + nameof(ETransport.xhttp) => _node.GetTransportExtra().Host, nameof(ETransport.grpc) => _node.GetTransportExtra().GrpcAuthority, _ => null, }; @@ -459,7 +459,7 @@ public partial class CoreConfigSingboxService case nameof(ETransport.ws): transport.type = nameof(ETransport.ws); - var wsPath = transportExtra.WsPath; + var wsPath = transportExtra.Path; // Parse eh and ed parameters from path using regex if (!wsPath.IsNullOrEmpty()) @@ -488,19 +488,19 @@ public partial class CoreConfigSingboxService } transport.path = wsPath.NullIfEmpty(); - if (transportExtra.WsHost.IsNotEmpty()) + if (transportExtra.Host.IsNotEmpty()) { transport.headers = new() { - Host = transportExtra.WsHost + Host = transportExtra.Host }; } break; case nameof(ETransport.httpupgrade): transport.type = nameof(ETransport.httpupgrade); - transport.path = transportExtra.HttpupgradePath.NullIfEmpty(); - transport.host = transportExtra.HttpupgradeHost.NullIfEmpty(); + transport.path = transportExtra.Path.NullIfEmpty(); + transport.host = transportExtra.Host.NullIfEmpty(); break; diff --git a/v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayOutboundService.cs b/v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayOutboundService.cs index a8ad213a..e9a91416 100644 --- a/v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayOutboundService.cs +++ b/v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayOutboundService.cs @@ -367,18 +367,18 @@ public partial class CoreConfigV2rayService break; case nameof(ETransport.ws): - host = transport.WsHost?.TrimEx() ?? string.Empty; - path = transport.WsPath?.TrimEx() ?? string.Empty; + host = transport.Host?.TrimEx() ?? string.Empty; + path = transport.Path?.TrimEx() ?? string.Empty; break; case nameof(ETransport.httpupgrade): - host = transport.HttpupgradeHost?.TrimEx() ?? string.Empty; - path = transport.HttpupgradePath?.TrimEx() ?? string.Empty; + host = transport.Host?.TrimEx() ?? string.Empty; + path = transport.Path?.TrimEx() ?? string.Empty; break; case nameof(ETransport.xhttp): - host = transport.XhttpHost?.TrimEx() ?? string.Empty; - path = transport.XhttpPath?.TrimEx() ?? string.Empty; + host = transport.Host?.TrimEx() ?? string.Empty; + path = transport.Path?.TrimEx() ?? string.Empty; headerType = transport.XhttpMode?.TrimEx() ?? string.Empty; xhttpExtra = transport.XhttpExtra?.TrimEx() ?? string.Empty; break; diff --git a/v2rayN/ServiceLib/ViewModels/AddServerViewModel.cs b/v2rayN/ServiceLib/ViewModels/AddServerViewModel.cs index fdc96ad4..27f737d5 100644 --- a/v2rayN/ServiceLib/ViewModels/AddServerViewModel.cs +++ b/v2rayN/ServiceLib/ViewModels/AddServerViewModel.cs @@ -80,22 +80,10 @@ public class AddServerViewModel : MyReactiveObject public string RawHost { get; set; } [Reactive] - public string WsHost { get; set; } + public string Host { get; set; } [Reactive] - public string WsPath { get; set; } - - [Reactive] - public string HttpupgradeHost { get; set; } - - [Reactive] - public string HttpupgradePath { get; set; } - - [Reactive] - public string XhttpHost { get; set; } - - [Reactive] - public string XhttpPath { get; set; } + public string Path { get; set; } [Reactive] public string XhttpMode { get; set; } @@ -154,9 +142,9 @@ public class AddServerViewModel : MyReactiveObject get => SelectedSource.GetNetwork() switch { nameof(ETransport.raw) => RawHost, - nameof(ETransport.ws) => WsHost, - nameof(ETransport.httpupgrade) => HttpupgradeHost, - nameof(ETransport.xhttp) => XhttpHost, + nameof(ETransport.ws) => Host, + nameof(ETransport.httpupgrade) => Host, + nameof(ETransport.xhttp) => Host, nameof(ETransport.grpc) => GrpcAuthority, _ => string.Empty, }; @@ -168,13 +156,13 @@ public class AddServerViewModel : MyReactiveObject RawHost = value; break; case nameof(ETransport.ws): - WsHost = value; + Host = value; break; case nameof(ETransport.httpupgrade): - HttpupgradeHost = value; + Host = value; break; case nameof(ETransport.xhttp): - XhttpHost = value; + Host = value; break; case nameof(ETransport.grpc): GrpcAuthority = value; @@ -189,9 +177,9 @@ public class AddServerViewModel : MyReactiveObject get => SelectedSource.GetNetwork() switch { nameof(ETransport.kcp) => KcpSeed, - nameof(ETransport.ws) => WsPath, - nameof(ETransport.httpupgrade) => HttpupgradePath, - nameof(ETransport.xhttp) => XhttpPath, + nameof(ETransport.ws) => Path, + nameof(ETransport.httpupgrade) => Path, + nameof(ETransport.xhttp) => Path, nameof(ETransport.grpc) => GrpcServiceName, _ => string.Empty, }; @@ -203,13 +191,13 @@ public class AddServerViewModel : MyReactiveObject KcpSeed = value; break; case nameof(ETransport.ws): - WsPath = value; + Path = value; break; case nameof(ETransport.httpupgrade): - HttpupgradePath = value; + Path = value; break; case nameof(ETransport.xhttp): - XhttpPath = value; + Path = value; break; case nameof(ETransport.grpc): GrpcServiceName = value; @@ -311,12 +299,8 @@ public class AddServerViewModel : MyReactiveObject RawHeaderType = transport.RawHeaderType ?? Global.None; RawHost = transport.RawHost ?? string.Empty; - WsHost = transport.WsHost ?? string.Empty; - WsPath = transport.WsPath ?? string.Empty; - HttpupgradeHost = transport.HttpupgradeHost ?? string.Empty; - HttpupgradePath = transport.HttpupgradePath ?? string.Empty; - XhttpHost = transport.XhttpHost ?? string.Empty; - XhttpPath = transport.XhttpPath ?? string.Empty; + Host = transport.Host ?? string.Empty; + Path = transport.Path ?? string.Empty; XhttpMode = transport.XhttpMode ?? string.Empty; XhttpExtra = transport.XhttpExtra ?? string.Empty; GrpcAuthority = transport.GrpcAuthority ?? string.Empty; @@ -380,12 +364,8 @@ public class AddServerViewModel : MyReactiveObject { RawHeaderType = RawHeaderType.NullIfEmpty(), RawHost = RawHost.NullIfEmpty(), - WsHost = WsHost.NullIfEmpty(), - WsPath = WsPath.NullIfEmpty(), - HttpupgradeHost = HttpupgradeHost.NullIfEmpty(), - HttpupgradePath = HttpupgradePath.NullIfEmpty(), - XhttpHost = XhttpHost.NullIfEmpty(), - XhttpPath = XhttpPath.NullIfEmpty(), + Host = Host.NullIfEmpty(), + Path = Path.NullIfEmpty(), XhttpMode = XhttpMode.NullIfEmpty(), XhttpExtra = XhttpExtra.NullIfEmpty(), GrpcAuthority = GrpcAuthority.NullIfEmpty(), @@ -518,9 +498,9 @@ public class AddServerViewModel : MyReactiveObject return SelectedSource.GetNetwork() switch { nameof(ETransport.raw) => RawHost, - nameof(ETransport.ws) => WsHost, - nameof(ETransport.httpupgrade) => HttpupgradeHost, - nameof(ETransport.xhttp) => XhttpHost, + nameof(ETransport.ws) => Host, + nameof(ETransport.httpupgrade) => Host, + nameof(ETransport.xhttp) => Host, nameof(ETransport.grpc) => GrpcAuthority, _ => string.Empty, }; diff --git a/v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml.cs b/v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml.cs index 277448d0..e3df2132 100644 --- a/v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml.cs +++ b/v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml.cs @@ -207,15 +207,15 @@ public partial class AddServerWindow : WindowBase this.Bind(ViewModel, vm => vm.KcpHeaderType, v => v.cmbHeaderTypeKcp.SelectedValue).DisposeWith(disposables); this.Bind(ViewModel, vm => vm.KcpSeed, v => v.txtKcpSeed.Text).DisposeWith(disposables); - this.Bind(ViewModel, vm => vm.WsHost, v => v.txtRequestHostWs.Text).DisposeWith(disposables); - this.Bind(ViewModel, vm => vm.WsPath, v => v.txtPathWs.Text).DisposeWith(disposables); + this.Bind(ViewModel, vm => vm.Host, v => v.txtRequestHostWs.Text).DisposeWith(disposables); + this.Bind(ViewModel, vm => vm.Path, v => v.txtPathWs.Text).DisposeWith(disposables); - this.Bind(ViewModel, vm => vm.HttpupgradeHost, v => v.txtRequestHostHttpupgrade.Text).DisposeWith(disposables); - this.Bind(ViewModel, vm => vm.HttpupgradePath, v => v.txtPathHttpupgrade.Text).DisposeWith(disposables); + this.Bind(ViewModel, vm => vm.Host, v => v.txtRequestHostHttpupgrade.Text).DisposeWith(disposables); + this.Bind(ViewModel, vm => vm.Path, v => v.txtPathHttpupgrade.Text).DisposeWith(disposables); this.Bind(ViewModel, vm => vm.XhttpMode, v => v.cmbHeaderTypeXhttp.SelectedValue).DisposeWith(disposables); - this.Bind(ViewModel, vm => vm.XhttpHost, v => v.txtRequestHostXhttp.Text).DisposeWith(disposables); - this.Bind(ViewModel, vm => vm.XhttpPath, v => v.txtPathXhttp.Text).DisposeWith(disposables); + this.Bind(ViewModel, vm => vm.Host, v => v.txtRequestHostXhttp.Text).DisposeWith(disposables); + this.Bind(ViewModel, vm => vm.Path, v => v.txtPathXhttp.Text).DisposeWith(disposables); this.Bind(ViewModel, vm => vm.XhttpExtra, v => v.txtExtraXhttp.Text).DisposeWith(disposables); this.Bind(ViewModel, vm => vm.GrpcMode, v => v.cmbHeaderTypeGrpc.SelectedValue).DisposeWith(disposables); diff --git a/v2rayN/v2rayN/Views/AddServerWindow.xaml.cs b/v2rayN/v2rayN/Views/AddServerWindow.xaml.cs index 5126db8c..30f623cf 100644 --- a/v2rayN/v2rayN/Views/AddServerWindow.xaml.cs +++ b/v2rayN/v2rayN/Views/AddServerWindow.xaml.cs @@ -205,15 +205,15 @@ public partial class AddServerWindow this.Bind(ViewModel, vm => vm.KcpHeaderType, v => v.cmbHeaderTypeKcp.Text).DisposeWith(disposables); this.Bind(ViewModel, vm => vm.KcpSeed, v => v.txtKcpSeed.Text).DisposeWith(disposables); - this.Bind(ViewModel, vm => vm.WsHost, v => v.txtRequestHostWs.Text).DisposeWith(disposables); - this.Bind(ViewModel, vm => vm.WsPath, v => v.txtPathWs.Text).DisposeWith(disposables); + this.Bind(ViewModel, vm => vm.Host, v => v.txtRequestHostWs.Text).DisposeWith(disposables); + this.Bind(ViewModel, vm => vm.Path, v => v.txtPathWs.Text).DisposeWith(disposables); - this.Bind(ViewModel, vm => vm.HttpupgradeHost, v => v.txtRequestHostHttpupgrade.Text).DisposeWith(disposables); - this.Bind(ViewModel, vm => vm.HttpupgradePath, v => v.txtPathHttpupgrade.Text).DisposeWith(disposables); + this.Bind(ViewModel, vm => vm.Host, v => v.txtRequestHostHttpupgrade.Text).DisposeWith(disposables); + this.Bind(ViewModel, vm => vm.Path, v => v.txtPathHttpupgrade.Text).DisposeWith(disposables); this.Bind(ViewModel, vm => vm.XhttpMode, v => v.cmbHeaderTypeXhttp.Text).DisposeWith(disposables); - this.Bind(ViewModel, vm => vm.XhttpHost, v => v.txtRequestHostXhttp.Text).DisposeWith(disposables); - this.Bind(ViewModel, vm => vm.XhttpPath, v => v.txtPathXhttp.Text).DisposeWith(disposables); + this.Bind(ViewModel, vm => vm.Host, v => v.txtRequestHostXhttp.Text).DisposeWith(disposables); + this.Bind(ViewModel, vm => vm.Path, v => v.txtPathXhttp.Text).DisposeWith(disposables); this.Bind(ViewModel, vm => vm.XhttpExtra, v => v.txtExtraXhttp.Text).DisposeWith(disposables); this.Bind(ViewModel, vm => vm.GrpcMode, v => v.cmbHeaderTypeGrpc.Text).DisposeWith(disposables); From 366daef7c55f7929568c200f658b27d76d2d433f Mon Sep 17 00:00:00 2001 From: DHR60 Date: Sun, 29 Mar 2026 16:48:40 +0800 Subject: [PATCH 4/4] Fix Fix raw http ui Fill xhttp default mode Fix share uri Remove RawHost Fix singbox tcp http path Fix vmess share uri --- v2rayN/ServiceLib/Global.cs | 2 + v2rayN/ServiceLib/Handler/ConfigHandler.cs | 1 - v2rayN/ServiceLib/Handler/Fmt/BaseFmt.cs | 56 +++++------ .../ServiceLib/Handler/Fmt/ShadowsocksFmt.cs | 4 +- v2rayN/ServiceLib/Handler/Fmt/VmessFmt.cs | 11 ++- v2rayN/ServiceLib/Manager/AppManager.cs | 7 +- v2rayN/ServiceLib/Models/ProfileItem.cs | 2 +- v2rayN/ServiceLib/Models/TransportExtra.cs | 1 - .../Singbox/SingboxOutboundService.cs | 7 +- .../CoreConfig/V2ray/V2rayOutboundService.cs | 3 +- .../ViewModels/AddServerViewModel.cs | 13 +-- .../Views/AddServerWindow.axaml | 69 +++++++++----- .../Views/AddServerWindow.axaml.cs | 57 +++++++----- v2rayN/v2rayN/Views/AddServerWindow.xaml | 93 ++++++++++++------- v2rayN/v2rayN/Views/AddServerWindow.xaml.cs | 59 +++++++----- 15 files changed, 229 insertions(+), 156 deletions(-) diff --git a/v2rayN/ServiceLib/Global.cs b/v2rayN/ServiceLib/Global.cs index d758c5c9..bc5961cb 100644 --- a/v2rayN/ServiceLib/Global.cs +++ b/v2rayN/ServiceLib/Global.cs @@ -45,6 +45,8 @@ public class Global public const string DefaultNetwork = "raw"; public const string RawHeaderHttp = "http"; public const string None = "none"; + public const string RawNetworkAlias = "tcp"; + public const string DefaultXhttpMode = "auto"; public const string ProxyTag = "proxy"; public const string DirectTag = "direct"; public const string BlockTag = "block"; diff --git a/v2rayN/ServiceLib/Handler/ConfigHandler.cs b/v2rayN/ServiceLib/Handler/ConfigHandler.cs index 96d5cec9..302b29b3 100644 --- a/v2rayN/ServiceLib/Handler/ConfigHandler.cs +++ b/v2rayN/ServiceLib/Handler/ConfigHandler.cs @@ -1139,7 +1139,6 @@ public static class ConfigHandler && AreEqual(oProtocolExtra.VmessSecurity, nProtocolExtra.VmessSecurity) && AreEqual(o.Network, n.Network) && AreEqual(oTransport.RawHeaderType, nTransport.RawHeaderType) - && AreEqual(oTransport.RawHost, nTransport.RawHost) && AreEqual(oTransport.Host, nTransport.Host) && AreEqual(oTransport.Path, nTransport.Path) && AreEqual(oTransport.XhttpMode, nTransport.XhttpMode) diff --git a/v2rayN/ServiceLib/Handler/Fmt/BaseFmt.cs b/v2rayN/ServiceLib/Handler/Fmt/BaseFmt.cs index 6a0c43d6..3f07548f 100644 --- a/v2rayN/ServiceLib/Handler/Fmt/BaseFmt.cs +++ b/v2rayN/ServiceLib/Handler/Fmt/BaseFmt.cs @@ -5,6 +5,7 @@ namespace ServiceLib.Handler.Fmt; public class BaseFmt { private static readonly string[] _allowInsecureArray = new[] { "insecure", "allowInsecure", "allow_insecure" }; + private static string UrlEncodeSafe(string? value) => Utils.UrlEncode(value ?? string.Empty); protected static string GetIpv6(string address) { @@ -95,15 +96,20 @@ public class BaseFmt network = nameof(ETransport.raw); } - dicQuery.Add("type", network); + //dicQuery.Add("type", network); + dicQuery.Add("type", network == nameof(ETransport.raw) ? Global.RawNetworkAlias : network); switch (network) { case nameof(ETransport.raw): dicQuery.Add("headerType", transport.RawHeaderType.IsNotEmpty() ? transport.RawHeaderType : Global.None); - if (transport.RawHost.IsNotEmpty()) + if (transport.Host.IsNotEmpty()) { - dicQuery.Add("host", Utils.UrlEncode(transport.RawHost)); + dicQuery.Add("host", UrlEncodeSafe(transport.Host)); + } + if (transport.Path.IsNotEmpty()) + { + dicQuery.Add("path", UrlEncodeSafe(transport.Path)); } break; @@ -111,44 +117,34 @@ public class BaseFmt dicQuery.Add("headerType", transport.KcpHeaderType.IsNotEmpty() ? transport.KcpHeaderType : Global.None); if (transport.KcpSeed.IsNotEmpty()) { - dicQuery.Add("seed", Utils.UrlEncode(transport.KcpSeed)); + dicQuery.Add("seed", UrlEncodeSafe(transport.KcpSeed)); } break; case nameof(ETransport.ws): - if (transport.Host.IsNotEmpty()) - { - dicQuery.Add("host", Utils.UrlEncode(transport.Host)); - } - if (transport.Path.IsNotEmpty()) - { - dicQuery.Add("path", Utils.UrlEncode(transport.Path)); - } - break; - case nameof(ETransport.httpupgrade): if (transport.Host.IsNotEmpty()) { - dicQuery.Add("host", Utils.UrlEncode(transport.Host)); + dicQuery.Add("host", UrlEncodeSafe(transport.Host)); } if (transport.Path.IsNotEmpty()) { - dicQuery.Add("path", Utils.UrlEncode(transport.Path)); + dicQuery.Add("path", UrlEncodeSafe(transport.Path)); } break; case nameof(ETransport.xhttp): if (transport.Host.IsNotEmpty()) { - dicQuery.Add("host", Utils.UrlEncode(transport.Host)); + dicQuery.Add("host", UrlEncodeSafe(transport.Host)); } if (transport.Path.IsNotEmpty()) { - dicQuery.Add("path", Utils.UrlEncode(transport.Path)); + dicQuery.Add("path", UrlEncodeSafe(transport.Path)); } if (transport.XhttpMode.IsNotEmpty() && Global.XhttpMode.Contains(transport.XhttpMode)) { - dicQuery.Add("mode", Utils.UrlEncode(transport.XhttpMode)); + dicQuery.Add("mode", UrlEncodeSafe(transport.XhttpMode)); } if (transport.XhttpExtra.IsNotEmpty()) { @@ -161,18 +157,18 @@ public class BaseFmt Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping }) : transport.XhttpExtra; - dicQuery.Add("extra", Utils.UrlEncode(extra)); + dicQuery.Add("extra", UrlEncodeSafe(extra)); } break; case nameof(ETransport.grpc): if (transport.GrpcServiceName.IsNotEmpty()) { - dicQuery.Add("authority", Utils.UrlEncode(transport.GrpcAuthority)); - dicQuery.Add("serviceName", Utils.UrlEncode(transport.GrpcServiceName)); + dicQuery.Add("authority", UrlEncodeSafe(transport.GrpcAuthority)); + dicQuery.Add("serviceName", UrlEncodeSafe(transport.GrpcServiceName)); if (transport.GrpcMode is Global.GrpcGunMode or Global.GrpcMultiMode) { - dicQuery.Add("mode", Utils.UrlEncode(transport.GrpcMode)); + dicQuery.Add("mode", UrlEncodeSafe(transport.GrpcMode)); } } break; @@ -260,6 +256,10 @@ public class BaseFmt } var net = GetQueryValue(query, "type", nameof(ETransport.raw)); + if (net == Global.RawNetworkAlias) + { + net = nameof(ETransport.raw); + } if (!Global.Networks.Contains(net)) { net = nameof(ETransport.raw); @@ -272,7 +272,8 @@ public class BaseFmt transport = transport with { RawHeaderType = GetQueryValue(query, "headerType", Global.None), - RawHost = GetQueryDecoded(query, "host"), + Host = GetQueryDecoded(query, "host"), + Path = GetQueryDecoded(query, "path"), }; break; @@ -286,13 +287,6 @@ public class BaseFmt break; case nameof(ETransport.ws): - transport = transport with - { - Host = GetQueryDecoded(query, "host"), - Path = GetQueryDecoded(query, "path", "/"), - }; - break; - case nameof(ETransport.httpupgrade): transport = transport with { diff --git a/v2rayN/ServiceLib/Handler/Fmt/ShadowsocksFmt.cs b/v2rayN/ServiceLib/Handler/Fmt/ShadowsocksFmt.cs index fc60102c..ab805002 100644 --- a/v2rayN/ServiceLib/Handler/Fmt/ShadowsocksFmt.cs +++ b/v2rayN/ServiceLib/Handler/Fmt/ShadowsocksFmt.cs @@ -51,7 +51,7 @@ public class ShadowsocksFmt : BaseFmt if (item.Network == nameof(ETransport.raw) && transport.RawHeaderType == Global.RawHeaderHttp) { plugin = "obfs-local"; - pluginArgs = $"obfs=http;obfs-host={transport.RawHost};"; + pluginArgs = $"obfs=http;obfs-host={transport.Host};"; } else { @@ -213,7 +213,7 @@ public class ShadowsocksFmt : BaseFmt item.SetTransportExtra(item.GetTransportExtra() with { RawHeaderType = Global.RawHeaderHttp, - RawHost = obfsHost, + Host = obfsHost, }); } } diff --git a/v2rayN/ServiceLib/Handler/Fmt/VmessFmt.cs b/v2rayN/ServiceLib/Handler/Fmt/VmessFmt.cs index e4f68a51..eeb709ad 100644 --- a/v2rayN/ServiceLib/Handler/Fmt/VmessFmt.cs +++ b/v2rayN/ServiceLib/Handler/Fmt/VmessFmt.cs @@ -34,7 +34,7 @@ public class VmessFmt : BaseFmt id = item.Password, aid = int.TryParse(item.GetProtocolExtra()?.AlterId, out var result) ? result : 0, scy = item.GetProtocolExtra().VmessSecurity ?? "", - net = item.Network, + net = item.GetNetwork() == nameof(ETransport.raw) ? Global.RawNetworkAlias : item.Network, type = item.GetNetwork() switch { nameof(ETransport.raw) => item.GetTransportExtra().RawHeaderType, @@ -45,7 +45,7 @@ public class VmessFmt : BaseFmt }, host = item.GetNetwork() switch { - nameof(ETransport.raw) => item.GetTransportExtra().RawHost, + nameof(ETransport.raw) => item.GetTransportExtra().Host, nameof(ETransport.ws) => item.GetTransportExtra().Host, nameof(ETransport.httpupgrade) => item.GetTransportExtra().Host, nameof(ETransport.xhttp) => item.GetTransportExtra().Host, @@ -54,6 +54,7 @@ public class VmessFmt : BaseFmt }, path = item.GetNetwork() switch { + nameof(ETransport.raw) => item.GetTransportExtra().Path, nameof(ETransport.kcp) => item.GetTransportExtra().KcpSeed, nameof(ETransport.ws) => item.GetTransportExtra().Path, nameof(ETransport.httpupgrade) => item.GetTransportExtra().Path, @@ -111,7 +112,7 @@ public class VmessFmt : BaseFmt }); if (vmessQRCode.net.IsNotEmpty()) { - item.Network = vmessQRCode.net; + item.Network = vmessQRCode.net == Global.RawNetworkAlias ? nameof(ETransport.raw) : vmessQRCode.net; } if (vmessQRCode.type.IsNotEmpty()) { @@ -126,7 +127,7 @@ public class VmessFmt : BaseFmt } transport = item.GetNetwork() switch { - nameof(ETransport.raw) => transport with { RawHost = Utils.ToString(vmessQRCode.host) }, + nameof(ETransport.raw) => transport with { Host = Utils.ToString(vmessQRCode.host), Path = Utils.ToString(vmessQRCode.path) }, nameof(ETransport.kcp) => transport with { KcpSeed = Utils.ToString(vmessQRCode.path) }, nameof(ETransport.ws) => transport with { Host = Utils.ToString(vmessQRCode.host), Path = Utils.ToString(vmessQRCode.path) }, nameof(ETransport.httpupgrade) => transport with { Host = Utils.ToString(vmessQRCode.host), Path = Utils.ToString(vmessQRCode.path) }, @@ -164,7 +165,7 @@ public class VmessFmt : BaseFmt item.SetProtocolExtra(new ProtocolExtraItem { - VmessSecurity = "auto", + VmessSecurity = Global.DefaultSecurity, }); var query = Utils.ParseQueryString(url.Query); diff --git a/v2rayN/ServiceLib/Manager/AppManager.cs b/v2rayN/ServiceLib/Manager/AppManager.cs index e8a0c3cf..a0651dcf 100644 --- a/v2rayN/ServiceLib/Manager/AppManager.cs +++ b/v2rayN/ServiceLib/Manager/AppManager.cs @@ -361,7 +361,7 @@ public sealed class AppManager { try { - if (item.Network == "tcp") + if (item.Network == Global.RawNetworkAlias) { item.Network = nameof(ETransport.raw); } @@ -375,7 +375,8 @@ public sealed class AppManager transport = transport with { RawHeaderType = item.HeaderType.NullIfEmpty(), - RawHost = item.RequestHost.NullIfEmpty(), + Host = item.RequestHost.NullIfEmpty(), + Path = item.Path.NullIfEmpty(), }; break; @@ -420,7 +421,7 @@ public sealed class AppManager transport = transport with { RawHeaderType = item.HeaderType.NullIfEmpty(), - RawHost = item.RequestHost.NullIfEmpty(), + Host = item.RequestHost.NullIfEmpty(), }; break; } diff --git a/v2rayN/ServiceLib/Models/ProfileItem.cs b/v2rayN/ServiceLib/Models/ProfileItem.cs index 1164ce45..fa1945ca 100644 --- a/v2rayN/ServiceLib/Models/ProfileItem.cs +++ b/v2rayN/ServiceLib/Models/ProfileItem.cs @@ -169,7 +169,7 @@ public class ProfileItem public string Network { get; set; } [Obsolete("Use TransportExtra.RawHeaderType/XhttpMode/GrpcMode/KcpHeaderType instead.")] public string HeaderType { get; set; } - [Obsolete("Use TransportExtra.RawHost/Host/GrpcAuthority instead.")] + [Obsolete("Use TransportExtra.Host/GrpcAuthority instead.")] public string RequestHost { get; set; } [Obsolete("Use TransportExtra.Path/GrpcServiceName/KcpSeed instead.")] public string Path { get; set; } diff --git a/v2rayN/ServiceLib/Models/TransportExtra.cs b/v2rayN/ServiceLib/Models/TransportExtra.cs index 105b20d9..b382135e 100644 --- a/v2rayN/ServiceLib/Models/TransportExtra.cs +++ b/v2rayN/ServiceLib/Models/TransportExtra.cs @@ -3,7 +3,6 @@ namespace ServiceLib.Models; public record TransportExtra { public string? RawHeaderType { get; init; } - public string? RawHost { get; init; } public string? Host { get; init; } public string? Path { get; init; } diff --git a/v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxOutboundService.cs b/v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxOutboundService.cs index fae7f0b8..33af45ce 100644 --- a/v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxOutboundService.cs +++ b/v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxOutboundService.cs @@ -119,7 +119,7 @@ public partial class CoreConfigSingboxService if (network == nameof(ETransport.raw) && transportExtra.RawHeaderType == Global.RawHeaderHttp) { outbound.plugin = "obfs-local"; - outbound.plugin_opts = $"obfs=http;obfs-host={transportExtra.RawHost};"; + outbound.plugin_opts = $"obfs=http;obfs-host={transportExtra.Host};"; } else { @@ -383,7 +383,7 @@ public partial class CoreConfigSingboxService { var host = _node.GetNetwork() switch { - nameof(ETransport.raw) => _node.GetTransportExtra().RawHost, + nameof(ETransport.raw) => _node.GetTransportExtra().Host, nameof(ETransport.ws) => _node.GetTransportExtra().Host, nameof(ETransport.httpupgrade) => _node.GetTransportExtra().Host, nameof(ETransport.xhttp) => _node.GetTransportExtra().Host, @@ -453,7 +453,8 @@ public partial class CoreConfigSingboxService if (transportExtra.RawHeaderType == Global.RawHeaderHttp) { transport.type = nameof(ETransport.http); - transport.host = transportExtra.RawHost.IsNullOrEmpty() ? null : Utils.String2List(transportExtra.RawHost); + transport.host = transportExtra.Host.IsNullOrEmpty() ? null : Utils.String2List(transportExtra.Host); + transport.path = transportExtra.Path.NullIfEmpty(); } break; diff --git a/v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayOutboundService.cs b/v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayOutboundService.cs index e9a91416..5cea3eac 100644 --- a/v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayOutboundService.cs +++ b/v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayOutboundService.cs @@ -357,7 +357,8 @@ public partial class CoreConfigV2rayService switch (network) { case nameof(ETransport.raw): - host = transport.RawHost?.TrimEx() ?? string.Empty; + host = transport.Host?.TrimEx() ?? string.Empty; + path = transport.Path?.TrimEx() ?? string.Empty; headerType = transport.RawHeaderType?.TrimEx() ?? string.Empty; break; diff --git a/v2rayN/ServiceLib/ViewModels/AddServerViewModel.cs b/v2rayN/ServiceLib/ViewModels/AddServerViewModel.cs index 27f737d5..c4ea2fc0 100644 --- a/v2rayN/ServiceLib/ViewModels/AddServerViewModel.cs +++ b/v2rayN/ServiceLib/ViewModels/AddServerViewModel.cs @@ -76,9 +76,6 @@ public class AddServerViewModel : MyReactiveObject [Reactive] public string RawHeaderType { get; set; } - [Reactive] - public string RawHost { get; set; } - [Reactive] public string Host { get; set; } @@ -141,7 +138,7 @@ public class AddServerViewModel : MyReactiveObject { get => SelectedSource.GetNetwork() switch { - nameof(ETransport.raw) => RawHost, + nameof(ETransport.raw) => Host, nameof(ETransport.ws) => Host, nameof(ETransport.httpupgrade) => Host, nameof(ETransport.xhttp) => Host, @@ -153,7 +150,7 @@ public class AddServerViewModel : MyReactiveObject switch (SelectedSource.GetNetwork()) { case nameof(ETransport.raw): - RawHost = value; + Host = value; break; case nameof(ETransport.ws): Host = value; @@ -298,10 +295,9 @@ public class AddServerViewModel : MyReactiveObject NaiveQuic = protocolExtra?.NaiveQuic ?? false; RawHeaderType = transport.RawHeaderType ?? Global.None; - RawHost = transport.RawHost ?? string.Empty; Host = transport.Host ?? string.Empty; Path = transport.Path ?? string.Empty; - XhttpMode = transport.XhttpMode ?? string.Empty; + XhttpMode = transport.XhttpMode ?? Global.DefaultXhttpMode; XhttpExtra = transport.XhttpExtra ?? string.Empty; GrpcAuthority = transport.GrpcAuthority ?? string.Empty; GrpcServiceName = transport.GrpcServiceName ?? string.Empty; @@ -363,7 +359,6 @@ public class AddServerViewModel : MyReactiveObject var transport = new TransportExtra { RawHeaderType = RawHeaderType.NullIfEmpty(), - RawHost = RawHost.NullIfEmpty(), Host = Host.NullIfEmpty(), Path = Path.NullIfEmpty(), XhttpMode = XhttpMode.NullIfEmpty(), @@ -497,7 +492,7 @@ public class AddServerViewModel : MyReactiveObject { return SelectedSource.GetNetwork() switch { - nameof(ETransport.raw) => RawHost, + nameof(ETransport.raw) => Host, nameof(ETransport.ws) => Host, nameof(ETransport.httpupgrade) => Host, nameof(ETransport.xhttp) => Host, diff --git a/v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml b/v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml index fe8d513f..4ecb0a88 100644 --- a/v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml +++ b/v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml @@ -718,33 +718,54 @@ - - - + + + + + - + ColumnDefinitions="300,Auto" + IsVisible="False" + RowDefinitions="Auto,Auto"> + + + + + Loaded += Window_Loaded; btnCancel.Click += (s, e) => Close(); cmbNetwork.SelectionChanged += CmbNetwork_SelectionChanged; + cmbHeaderTypeRaw.SelectionChanged += CmbHeaderTypeRaw_SelectionChanged; cmbStreamSecurity.SelectionChanged += CmbStreamSecurity_SelectionChanged; btnGUID.Click += btnGUID_Click; btnGUID5.Click += btnGUID_Click; @@ -24,6 +25,16 @@ public partial class AddServerWindow : WindowBase cmbCoreType.ItemsSource = Global.CoreTypes.AppendEmpty(); cmbNetwork.ItemsSource = Global.Networks; + + cmbHeaderTypeRaw.ItemsSource = new List { Global.None, Global.RawHeaderHttp }; + + var kcpHeaderTypes = new List { Global.None }; + kcpHeaderTypes.AddRange(Global.KcpHeaderTypes); + cmbHeaderTypeKcp.ItemsSource = kcpHeaderTypes; + + cmbHeaderTypeXhttp.ItemsSource = Global.XhttpMode; + cmbHeaderTypeGrpc.ItemsSource = new List { Global.GrpcGunMode, Global.GrpcMultiMode }; + cmbFingerprint.ItemsSource = Global.Fingerprints; cmbFingerprint2.ItemsSource = Global.Fingerprints; cmbAllowInsecure.ItemsSource = Global.AllowInsecure; @@ -202,7 +213,8 @@ public partial class AddServerWindow : WindowBase } this.Bind(ViewModel, vm => vm.SelectedSource.Network, v => v.cmbNetwork.SelectedValue).DisposeWith(disposables); this.Bind(ViewModel, vm => vm.RawHeaderType, v => v.cmbHeaderTypeRaw.SelectedValue).DisposeWith(disposables); - this.Bind(ViewModel, vm => vm.RawHost, v => v.txtRequestHostRaw.Text).DisposeWith(disposables); + this.Bind(ViewModel, vm => vm.Host, v => v.txtRequestHostRaw.Text).DisposeWith(disposables); + this.Bind(ViewModel, vm => vm.Path, v => v.txtPathRaw.Text).DisposeWith(disposables); this.Bind(ViewModel, vm => vm.KcpHeaderType, v => v.cmbHeaderTypeKcp.SelectedValue).DisposeWith(disposables); this.Bind(ViewModel, vm => vm.KcpSeed, v => v.txtKcpSeed.Text).DisposeWith(disposables); @@ -269,8 +281,12 @@ public partial class AddServerWindow : WindowBase private void CmbNetwork_SelectionChanged(object? sender, SelectionChangedEventArgs e) { - SetHeaderType(); - SetTips(); + SetTransportGridVisibility(); + } + + private void CmbHeaderTypeRaw_SelectionChanged(object? sender, SelectionChangedEventArgs e) + { + SetRawHttpFieldsVisibility(); } private void CmbStreamSecurity_SelectionChanged(object? sender, SelectionChangedEventArgs e) @@ -299,25 +315,6 @@ public partial class AddServerWindow : WindowBase txtId5.Text = Utils.GetGuid(); } - private void SetHeaderType() - { - cmbHeaderTypeRaw.ItemsSource = new List { Global.None, Global.RawHeaderHttp }; - - var kcpHeaderTypes = new List { Global.None }; - kcpHeaderTypes.AddRange(Global.KcpHeaderTypes); - cmbHeaderTypeKcp.ItemsSource = kcpHeaderTypes; - - cmbHeaderTypeXhttp.ItemsSource = Global.XhttpMode; - cmbHeaderTypeGrpc.ItemsSource = new List { Global.GrpcGunMode, Global.GrpcMultiMode }; - - SetTransportGridVisibility(); - } - - private void SetTips() - { - SetTransportGridVisibility(); - } - private void SetTransportGridVisibility() { var network = cmbNetwork.SelectedItem?.ToString(); @@ -357,5 +354,21 @@ public partial class AddServerWindow : WindowBase gridTransportRaw.IsVisible = true; break; } + + SetRawHttpFieldsVisibility(); + } + + private void SetRawHttpFieldsVisibility() + { + var network = cmbNetwork.SelectedItem?.ToString(); + if (network.IsNullOrEmpty()) + { + network = Global.DefaultNetwork; + } + + var rawHeaderType = cmbHeaderTypeRaw.SelectedItem?.ToString(); + var showRawHttpFields = network == nameof(ETransport.raw) + && rawHeaderType == Global.RawHeaderHttp; + gridTransportRawHttp.IsVisible = showRawHttpFields; } } diff --git a/v2rayN/v2rayN/Views/AddServerWindow.xaml b/v2rayN/v2rayN/Views/AddServerWindow.xaml index 22aad17c..9ec98f77 100644 --- a/v2rayN/v2rayN/Views/AddServerWindow.xaml +++ b/v2rayN/v2rayN/Views/AddServerWindow.xaml @@ -944,42 +944,73 @@ - - - - - - - + + + + + + + + + - + Visibility="Collapsed"> + + + + + + + + + + + + + diff --git a/v2rayN/v2rayN/Views/AddServerWindow.xaml.cs b/v2rayN/v2rayN/Views/AddServerWindow.xaml.cs index 30f623cf..46f62a70 100644 --- a/v2rayN/v2rayN/Views/AddServerWindow.xaml.cs +++ b/v2rayN/v2rayN/Views/AddServerWindow.xaml.cs @@ -11,6 +11,7 @@ public partial class AddServerWindow Owner = Application.Current.MainWindow; Loaded += Window_Loaded; cmbNetwork.SelectionChanged += CmbNetwork_SelectionChanged; + cmbHeaderTypeRaw.SelectionChanged += CmbHeaderTypeRaw_SelectionChanged; cmbStreamSecurity.SelectionChanged += CmbStreamSecurity_SelectionChanged; btnGUID.Click += btnGUID_Click; btnGUID5.Click += btnGUID_Click; @@ -23,6 +24,16 @@ public partial class AddServerWindow { ViewModel.SelectedSource.Network = Global.DefaultNetwork; } + + cmbHeaderTypeRaw.ItemsSource = new List { Global.None, Global.RawHeaderHttp }; + + var kcpHeaderTypes = new List { Global.None }; + kcpHeaderTypes.AddRange(Global.KcpHeaderTypes); + cmbHeaderTypeKcp.ItemsSource = kcpHeaderTypes; + + cmbHeaderTypeXhttp.ItemsSource = Global.XhttpMode; + cmbHeaderTypeGrpc.ItemsSource = new List { Global.GrpcGunMode, Global.GrpcMultiMode }; + cmbFingerprint.ItemsSource = Global.Fingerprints; cmbFingerprint2.ItemsSource = Global.Fingerprints; cmbAllowInsecure.ItemsSource = Global.AllowInsecure; @@ -200,7 +211,8 @@ public partial class AddServerWindow } this.Bind(ViewModel, vm => vm.SelectedSource.Network, v => v.cmbNetwork.Text).DisposeWith(disposables); this.Bind(ViewModel, vm => vm.RawHeaderType, v => v.cmbHeaderTypeRaw.Text).DisposeWith(disposables); - this.Bind(ViewModel, vm => vm.RawHost, v => v.txtRequestHostRaw.Text).DisposeWith(disposables); + this.Bind(ViewModel, vm => vm.Host, v => v.txtRequestHostRaw.Text).DisposeWith(disposables); + this.Bind(ViewModel, vm => vm.Path, v => v.txtPathRaw.Text).DisposeWith(disposables); this.Bind(ViewModel, vm => vm.KcpHeaderType, v => v.cmbHeaderTypeKcp.Text).DisposeWith(disposables); this.Bind(ViewModel, vm => vm.KcpSeed, v => v.txtKcpSeed.Text).DisposeWith(disposables); @@ -269,8 +281,12 @@ public partial class AddServerWindow private void CmbNetwork_SelectionChanged(object sender, SelectionChangedEventArgs e) { - SetHeaderType(); - SetTips(); + SetTransportGridVisibility(); + } + + private void CmbHeaderTypeRaw_SelectionChanged(object sender, SelectionChangedEventArgs e) + { + SetRawHttpFieldsVisibility(); } private void CmbStreamSecurity_SelectionChanged(object sender, SelectionChangedEventArgs e) @@ -299,25 +315,6 @@ public partial class AddServerWindow txtId5.Text = Utils.GetGuid(); } - private void SetHeaderType() - { - cmbHeaderTypeRaw.ItemsSource = new List { Global.None, Global.RawHeaderHttp }; - - var kcpHeaderTypes = new List { Global.None }; - kcpHeaderTypes.AddRange(Global.KcpHeaderTypes); - cmbHeaderTypeKcp.ItemsSource = kcpHeaderTypes; - - cmbHeaderTypeXhttp.ItemsSource = Global.XhttpMode; - cmbHeaderTypeGrpc.ItemsSource = new List { Global.GrpcGunMode, Global.GrpcMultiMode }; - - SetTransportGridVisibility(); - } - - private void SetTips() - { - SetTransportGridVisibility(); - } - private void SetTransportGridVisibility() { var network = cmbNetwork.SelectedItem?.ToString(); @@ -357,5 +354,23 @@ public partial class AddServerWindow gridTransportRaw.Visibility = Visibility.Visible; break; } + + SetRawHttpFieldsVisibility(); + } + + private void SetRawHttpFieldsVisibility() + { + var network = cmbNetwork.SelectedItem?.ToString(); + if (network.IsNullOrEmpty()) + { + network = Global.DefaultNetwork; + } + + var rawHeaderType = cmbHeaderTypeRaw.SelectedItem?.ToString(); + var showRawHttpFields = network == nameof(ETransport.raw) + && rawHeaderType == Global.RawHeaderHttp; + gridTransportRawHttp.Visibility = showRawHttpFields + ? Visibility.Visible + : Visibility.Collapsed; } }