Add ECH config support to profile and UI

2dust · 2dust · commit 4562d4cf0076 · 2026-01-07T11:34:13.000+08:00
Introduces EchConfigList and EchForceQuery fields to ProfileItem and V2rayConfig models, updates related handlers and services to process these fields, and extends the AddServerWindow UI to allow user input for ECH configuration. Also adds localization entries for the new fields and updates extension methods for string handling.
diff --git a/v2rayN/ServiceLib/Common/Extension.cs b/v2rayN/ServiceLib/Common/Extension.cs
@@ -6,17 +6,17 @@ public static class Extension
 {
     public static bool IsNullOrEmpty([NotNullWhen(false)] this string? value)
     {
-        return string.IsNullOrEmpty(value) || string.IsNullOrWhiteSpace(value);
+        return string.IsNullOrWhiteSpace(value) || string.IsNullOrEmpty(value);
     }
 
-    public static bool IsNullOrWhiteSpace([NotNullWhen(false)] this string? value)
+    public static bool IsNotEmpty([NotNullWhen(false)] this string? value)
     {
-        return string.IsNullOrWhiteSpace(value);
+        return !string.IsNullOrWhiteSpace(value);
     }
 
-    public static bool IsNotEmpty([NotNullWhen(false)] this string? value)
+    public static string? NullIfEmpty(this string? value)
     {
-        return !string.IsNullOrEmpty(value);
+        return string.IsNullOrWhiteSpace(value) ? null : value;
     }
 
     public static bool BeginWithAny(this string s, IEnumerable<char> chars)
diff --git a/v2rayN/ServiceLib/Global.cs b/v2rayN/ServiceLib/Global.cs
@@ -626,5 +626,12 @@ public class Global
             ""
     ];
 
+    public static readonly List<string> EchForceQuerys =
+    [
+         "none",
+         "half",
+         "full",
+    ];
+
     #endregion const
 }
diff --git a/v2rayN/ServiceLib/Handler/ConfigHandler.cs b/v2rayN/ServiceLib/Handler/ConfigHandler.cs
@@ -253,6 +253,8 @@ public static async Task<int> AddServer(Config config, ProfileItem profileItem)
             item.Extra = profileItem.Extra;
             item.MuxEnabled = profileItem.MuxEnabled;
             item.Cert = profileItem.Cert;
+            item.EchConfigList = profileItem.EchConfigList;
+            item.EchForceQuery = profileItem.EchForceQuery;
         }
 
         var ret = item.ConfigType switch
diff --git a/v2rayN/ServiceLib/Handler/Fmt/BaseFmt.cs b/v2rayN/ServiceLib/Handler/Fmt/BaseFmt.cs
@@ -70,6 +70,10 @@ protected static int ToUriQuery(ProfileItem item, string? securityDef, ref Dicti
             }
             ToUriQueryAllowInsecure(item, ref dicQuery);
         }
+        if (item.EchConfigList.IsNotEmpty())
+        {
+            dicQuery.Add("ech", Utils.UrlEncode(item.EchConfigList));
+        }
 
         dicQuery.Add("type", item.Network.IsNotEmpty() ? item.Network : nameof(ETransport.tcp));
 
@@ -209,6 +213,7 @@ protected static int ResolveUriQuery(NameValueCollection query, ref ProfileItem
         item.ShortId = GetQueryDecoded(query, "sid");
         item.SpiderX = GetQueryDecoded(query, "spx");
         item.Mldsa65Verify = GetQueryDecoded(query, "pqv");
+        item.EchConfigList = GetQueryDecoded(query, "ech");
 
         if (_allowInsecureArray.Any(k => GetQueryDecoded(query, k) == "1"))
         {
diff --git a/v2rayN/ServiceLib/Models/ProfileItem.cs b/v2rayN/ServiceLib/Models/ProfileItem.cs
@@ -161,4 +161,6 @@ public bool IsValid()
     public string Extra { get; set; }
     public bool? MuxEnabled { get; set; }
     public string Cert { get; set; }
+    public string EchConfigList { get; set; }
+    public string EchForceQuery { get; set; }
 }
diff --git a/v2rayN/ServiceLib/Models/V2rayConfig.cs b/v2rayN/ServiceLib/Models/V2rayConfig.cs
@@ -356,6 +356,8 @@ public class TlsSettings4Ray
     public string? mldsa65Verify { get; set; }
     public List<CertificateSettings4Ray>? certificates { get; set; }
     public bool? disableSystemRoot { get; set; }
+    public string? echConfigList { get; set; }
+    public string? echForceQuery { get; set; }
 }
 
 public class CertificateSettings4Ray
diff --git a/v2rayN/ServiceLib/Resx/ResUI.Designer.cs b/v2rayN/ServiceLib/Resx/ResUI.Designer.cs
diff --git a/v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx b/v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx
@@ -1641,4 +1641,10 @@ The "Get Certificate" action may fail if a self-signed certificate is used or if
   <data name="menuServerList2" xml:space="preserve">
     <value>Configuration Item 2, Select and add from self-built</value>
   </data>
+  <data name="TbEchConfigList" xml:space="preserve">
+    <value>EchConfigList</value>
+  </data>
+  <data name="TbEchForceQuery" xml:space="preserve">
+    <value>EchForceQuery</value>
+  </data>
 </root>
diff --git a/v2rayN/ServiceLib/Resx/ResUI.fr.resx b/v2rayN/ServiceLib/Resx/ResUI.fr.resx
@@ -1638,4 +1638,10 @@ Si un certificat auto-signé est utilisé ou si le système contient une CA non
   <data name="menuServerList2" xml:space="preserve">
     <value>Élément de config 2 : choisir et ajouter depuis self-hosted</value>
   </data>
-</root>
+  <data name="TbEchConfigList" xml:space="preserve">
+    <value>EchConfigList</value>
+  </data>
+  <data name="TbEchForceQuery" xml:space="preserve">
+    <value>EchForceQuery</value>
+  </data>
+</root>
diff --git a/v2rayN/ServiceLib/Resx/ResUI.hu.resx b/v2rayN/ServiceLib/Resx/ResUI.hu.resx
@@ -1641,4 +1641,10 @@ The "Get Certificate" action may fail if a self-signed certificate is used or if
   <data name="menuServerList2" xml:space="preserve">
     <value>Configuration Item 2, Select and add from self-built</value>
   </data>
+  <data name="TbEchConfigList" xml:space="preserve">
+    <value>EchConfigList</value>
+  </data>
+  <data name="TbEchForceQuery" xml:space="preserve">
+    <value>EchForceQuery</value>
+  </data>
 </root>
diff --git a/v2rayN/ServiceLib/Resx/ResUI.resx b/v2rayN/ServiceLib/Resx/ResUI.resx
@@ -1641,4 +1641,10 @@ The "Get Certificate" action may fail if a self-signed certificate is used or if
   <data name="menuServerList2" xml:space="preserve">
     <value>Configuration Item 2, Select and add from self-built</value>
   </data>
+  <data name="TbEchConfigList" xml:space="preserve">
+    <value>EchConfigList</value>
+  </data>
+  <data name="TbEchForceQuery" xml:space="preserve">
+    <value>EchForceQuery</value>
+  </data>
 </root>
diff --git a/v2rayN/ServiceLib/Resx/ResUI.ru.resx b/v2rayN/ServiceLib/Resx/ResUI.ru.resx
@@ -1641,4 +1641,10 @@ The "Get Certificate" action may fail if a self-signed certificate is used or if
   <data name="menuServerList2" xml:space="preserve">
     <value>Configuration Item 2, Select and add from self-built</value>
   </data>
+  <data name="TbEchConfigList" xml:space="preserve">
+    <value>EchConfigList</value>
+  </data>
+  <data name="TbEchForceQuery" xml:space="preserve">
+    <value>EchForceQuery</value>
+  </data>
 </root>
diff --git a/v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx b/v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx
@@ -1638,4 +1638,10 @@
   <data name="menuServerList2" xml:space="preserve">
     <value>子配置项二，从自建中选择添加</value>
   </data>
+  <data name="TbEchConfigList" xml:space="preserve">
+    <value>EchConfigList</value>
+  </data>
+  <data name="TbEchForceQuery" xml:space="preserve">
+    <value>EchForceQuery</value>
+  </data>
 </root>
diff --git a/v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx b/v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx
@@ -1638,4 +1638,10 @@
   <data name="menuServerList2" xml:space="preserve">
     <value>子配置項二，從自建中選擇新增</value>
   </data>
+  <data name="TbEchConfigList" xml:space="preserve">
+    <value>EchConfigList</value>
+  </data>
+  <data name="TbEchForceQuery" xml:space="preserve">
+    <value>EchForceQuery</value>
+  </data>
 </root>
diff --git a/v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxDnsService.cs b/v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxDnsService.cs
@@ -157,13 +157,13 @@ private async Task<int> GenDnsRules(SingboxConfig singboxConfig, SimpleDNSItem s
             new Rule4Sbox
             {
                 server = Global.SingboxRemoteDNSTag,
-                strategy = simpleDNSItem.SingboxStrategy4Proxy.IsNullOrEmpty() ? null : simpleDNSItem.SingboxStrategy4Proxy,
+                strategy = simpleDNSItem.SingboxStrategy4Proxy.NullIfEmpty(),
                 clash_mode = ERuleMode.Global.ToString()
             },
             new Rule4Sbox
             {
                 server = Global.SingboxDirectDNSTag,
-                strategy = simpleDNSItem.SingboxStrategy4Direct.IsNullOrEmpty() ? null : simpleDNSItem.SingboxStrategy4Direct,
+                strategy = simpleDNSItem.SingboxStrategy4Direct.NullIfEmpty(),
                 clash_mode = ERuleMode.Direct.ToString()
             }
         });
diff --git a/v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxOutboundService.cs b/v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxOutboundService.cs
@@ -354,15 +354,15 @@ private async Task<int> GenOutboundTransport(ProfileItem node, Outbound4Sbox out
                 case nameof(ETransport.h2):
                     transport.type = nameof(ETransport.http);
                     transport.host = node.RequestHost.IsNullOrEmpty() ? null : Utils.String2List(node.RequestHost);
-                    transport.path = node.Path.IsNullOrEmpty() ? null : node.Path;
+                    transport.path = node.Path.NullIfEmpty();
                     break;
 
                 case nameof(ETransport.tcp):   //http
                     if (node.HeaderType == Global.TcpHeaderHttp)
                     {
                         transport.type = nameof(ETransport.http);
                         transport.host = node.RequestHost.IsNullOrEmpty() ? null : Utils.String2List(node.RequestHost);
-                        transport.path = node.Path.IsNullOrEmpty() ? null : node.Path;
+                        transport.path = node.Path.NullIfEmpty();
                     }
                     break;
 
@@ -396,7 +396,7 @@ private async Task<int> GenOutboundTransport(ProfileItem node, Outbound4Sbox out
                         }
                     }
 
-                    transport.path = wsPath.IsNullOrEmpty() ? null : wsPath;
+                    transport.path = wsPath.NullIfEmpty();
                     if (node.RequestHost.IsNotEmpty())
                     {
                         transport.headers = new()
@@ -408,8 +408,8 @@ private async Task<int> GenOutboundTransport(ProfileItem node, Outbound4Sbox out
 
                 case nameof(ETransport.httpupgrade):
                     transport.type = nameof(ETransport.httpupgrade);
-                    transport.path = node.Path.IsNullOrEmpty() ? null : node.Path;
-                    transport.host = node.RequestHost.IsNullOrEmpty() ? null : node.RequestHost;
+                    transport.path = node.Path.NullIfEmpty();
+                    transport.host = node.RequestHost.NullIfEmpty();
 
                     break;
 
diff --git a/v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxRoutingService.cs b/v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxRoutingService.cs
@@ -113,7 +113,7 @@ private async Task<int> GenRouting(SingboxConfig singboxConfig)
                 clash_mode = ERuleMode.Global.ToString()
             });
 
-            var domainStrategy = _config.RoutingBasicItem.DomainStrategy4Singbox.IsNullOrEmpty() ? null : _config.RoutingBasicItem.DomainStrategy4Singbox;
+            var domainStrategy = _config.RoutingBasicItem.DomainStrategy4Singbox.NullIfEmpty();
             var defaultRouting = await ConfigHandler.GetDefaultRouting(_config);
             if (defaultRouting.DomainStrategy4Singbox.IsNotEmpty())
             {
diff --git a/v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayOutboundService.cs b/v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayOutboundService.cs
@@ -272,7 +272,9 @@ private async Task<int> GenBoundStreamSettings(ProfileItem node, Outbounds4Ray o
                 {
                     allowInsecure = Utils.ToBool(node.AllowInsecure.IsNullOrEmpty() ? _config.CoreBasicItem.DefAllowInsecure.ToString().ToLower() : node.AllowInsecure),
                     alpn = node.GetAlpn(),
-                    fingerprint = node.Fingerprint.IsNullOrEmpty() ? _config.CoreBasicItem.DefFingerprint : node.Fingerprint
+                    fingerprint = node.Fingerprint.IsNullOrEmpty() ? _config.CoreBasicItem.DefFingerprint : node.Fingerprint,
+                    echConfigList = node.EchConfigList.NullIfEmpty(),
+                    echForceQuery = node.EchForceQuery.NullIfEmpty()
                 };
                 if (sni.IsNotEmpty())
                 {
@@ -340,7 +342,7 @@ private async Task<int> GenBoundStreamSettings(ProfileItem node, Outbounds4Ray o
                     kcpSettings.header = new Header4Ray
                     {
                         type = node.HeaderType,
-                        domain = host.IsNullOrEmpty() ? null : host
+                        domain = host.NullIfEmpty()
                     };
                     if (path.IsNotEmpty())
                     {
@@ -450,7 +452,7 @@ private async Task<int> GenBoundStreamSettings(ProfileItem node, Outbounds4Ray o
                 case nameof(ETransport.grpc):
                     GrpcSettings4Ray grpcSettings = new()
                     {
-                        authority = host.IsNullOrEmpty() ? null : host,
+                        authority = host.NullIfEmpty(),
                         serviceName = path,
                         multiMode = node.HeaderType == Global.GrpcMultiMode,
                         idle_timeout = _config.GrpcItem.IdleTimeout,
diff --git a/v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml b/v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml
@@ -713,7 +713,7 @@
                     Grid.Row="7"
                     ColumnDefinitions="300,Auto"
                     IsVisible="False"
-                    RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto">
+                    RowDefinitions="Auto,Auto,Auto,Auto,Auto,Auto,Auto,Auto">
 
                     <TextBlock
                         Grid.Row="1"
@@ -768,15 +768,41 @@
                         Width="200"
                         Margin="{StaticResource Margin4}" />
 
-
                     <TextBlock
                         Grid.Row="5"
                         Grid.Column="0"
                         Margin="{StaticResource Margin4}"
                         VerticalAlignment="Center"
+                        Text="{x:Static resx:ResUI.TbEchConfigList}" />
+                    <TextBox
+                        x:Name="txtEchConfigList"
+                        Grid.Row="5"
+                        Grid.Column="1"
+                        Width="400"
+                        Margin="{StaticResource Margin4}"
+                        HorizontalAlignment="Left" />
+
+                    <TextBlock
+                        Grid.Row="6"
+                        Grid.Column="0"
+                        Margin="{StaticResource Margin4}"
+                        VerticalAlignment="Center"
+                        Text="{x:Static resx:ResUI.TbEchForceQuery}" />
+                    <ComboBox
+                        x:Name="cmbEchForceQuery"
+                        Grid.Row="6"
+                        Grid.Column="1"
+                        Width="200"
+                        Margin="{StaticResource Margin4}" />
+
+                    <TextBlock
+                        Grid.Row="7"
+                        Grid.Column="0"
+                        Margin="{StaticResource Margin4}"
+                        VerticalAlignment="Center"
                         Text="{x:Static resx:ResUI.TbCertPinning}" />
                     <StackPanel
-                        Grid.Row="5"
+                        Grid.Row="7"
                         Grid.Column="1"
                         VerticalAlignment="Center"
                         Orientation="Horizontal">
diff --git a/v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml.cs b/v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml.cs
@@ -28,6 +28,7 @@ public AddServerWindow(ProfileItem profileItem)
         cmbFingerprint2.ItemsSource = Global.Fingerprints;
         cmbAllowInsecure.ItemsSource = Global.AllowInsecure;
         cmbAlpn.ItemsSource = Global.Alpns;
+        cmbEchForceQuery.ItemsSource = Global.EchForceQuerys;
 
         var lstStreamSecurity = new List<string>();
         lstStreamSecurity.Add(string.Empty);
@@ -187,6 +188,9 @@ public AddServerWindow(ProfileItem profileItem)
             this.Bind(ViewModel, vm => vm.SelectedSource.Alpn, v => v.cmbAlpn.SelectedValue).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.CertTip, v => v.labCertPinning.Text).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.Cert, v => v.txtCert.Text).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.SelectedSource.EchConfigList, v => v.txtEchConfigList.Text).DisposeWith(disposables);
+            this.Bind(ViewModel, vm => vm.SelectedSource.EchForceQuery, v => v.cmbEchForceQuery.SelectedValue).DisposeWith(disposables);
+
             //reality
             this.Bind(ViewModel, vm => vm.SelectedSource.Sni, v => v.txtSNI2.Text).DisposeWith(disposables);
             this.Bind(ViewModel, vm => vm.SelectedSource.Fingerprint, v => v.cmbFingerprint2.SelectedValue).DisposeWith(disposables);
diff --git a/v2rayN/v2rayN/Views/AddServerWindow.xaml b/v2rayN/v2rayN/Views/AddServerWindow.xaml
diff --git a/v2rayN/v2rayN/Views/AddServerWindow.xaml.cs b/v2rayN/v2rayN/Views/AddServerWindow.xaml.cs

Original file line number	Diff line number	Diff line change
`@@ -6,17 +6,17 @@ public static class Extension`
`6`	`6`	`{`
`7`	`7`	`public static bool IsNullOrEmpty([NotNullWhen(false)] this string? value)`
`8`	`8`	`{`
`9`		`- return string.IsNullOrEmpty(value) \|\| string.IsNullOrWhiteSpace(value);`
	`9`	`+ return string.IsNullOrWhiteSpace(value) \|\| string.IsNullOrEmpty(value);`
`10`	`10`	`}`
`11`	`11`
`12`		`- public static bool IsNullOrWhiteSpace([NotNullWhen(false)] this string? value)`
	`12`	`+ public static bool IsNotEmpty([NotNullWhen(false)] this string? value)`
`13`	`13`	`{`
`14`		`- return string.IsNullOrWhiteSpace(value);`
	`14`	`+ return !string.IsNullOrWhiteSpace(value);`
`15`	`15`	`}`
`16`	`16`
`17`		`- public static bool IsNotEmpty([NotNullWhen(false)] this string? value)`
	`17`	`+ public static string? NullIfEmpty(this string? value)`
`18`	`18`	`{`
`19`		`- return !string.IsNullOrEmpty(value);`
	`19`	`+ return string.IsNullOrWhiteSpace(value) ? null : value;`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`public static bool BeginWithAny(this string s, IEnumerable<char> chars)`
Original file line number	Diff line number	Diff line change
`@@ -253,6 +253,8 @@ public static async Task<int> AddServer(Config config, ProfileItem profileItem)`
`253`	`253`	`item.Extra = profileItem.Extra;`
`254`	`254`	`item.MuxEnabled = profileItem.MuxEnabled;`
`255`	`255`	`item.Cert = profileItem.Cert;`
	`256`	`+ item.EchConfigList = profileItem.EchConfigList;`
	`257`	`+ item.EchForceQuery = profileItem.EchForceQuery;`
`256`	`258`	`}`
`257`	`259`
`258`	`260`	`var ret = item.ConfigType switch`
Original file line number	Diff line number	Diff line change
`@@ -70,6 +70,10 @@ protected static int ToUriQuery(ProfileItem item, string? securityDef, ref Dicti`
`70`	`70`	`}`
`71`	`71`	`ToUriQueryAllowInsecure(item, ref dicQuery);`
`72`	`72`	`}`
	`73`	`+ if (item.EchConfigList.IsNotEmpty())`
	`74`	`+ {`
	`75`	`+ dicQuery.Add("ech", Utils.UrlEncode(item.EchConfigList));`
	`76`	`+ }`
`73`	`77`
`74`	`78`	`dicQuery.Add("type", item.Network.IsNotEmpty() ? item.Network : nameof(ETransport.tcp));`
`75`	`79`
`@@ -209,6 +213,7 @@ protected static int ResolveUriQuery(NameValueCollection query, ref ProfileItem`
`209`	`213`	`item.ShortId = GetQueryDecoded(query, "sid");`
`210`	`214`	`item.SpiderX = GetQueryDecoded(query, "spx");`
`211`	`215`	`item.Mldsa65Verify = GetQueryDecoded(query, "pqv");`
	`216`	`+ item.EchConfigList = GetQueryDecoded(query, "ech");`
`212`	`217`
`213`	`218`	`if (_allowInsecureArray.Any(k => GetQueryDecoded(query, k) == "1"))`
`214`	`219`	`{`
Original file line number	Diff line number	Diff line change
`@@ -161,4 +161,6 @@ public bool IsValid()`
`161`	`161`	`public string Extra { get; set; }`
`162`	`162`	`public bool? MuxEnabled { get; set; }`
`163`	`163`	`public string Cert { get; set; }`
	`164`	`+ public string EchConfigList { get; set; }`
	`165`	`+ public string EchForceQuery { get; set; }`
`164`	`166`	`}`
Original file line number	Diff line number	Diff line change
`@@ -356,6 +356,8 @@ public class TlsSettings4Ray`
`356`	`356`	`public string? mldsa65Verify { get; set; }`
`357`	`357`	`public List<CertificateSettings4Ray>? certificates { get; set; }`
`358`	`358`	`public bool? disableSystemRoot { get; set; }`
	`359`	`+ public string? echConfigList { get; set; }`
	`360`	`+ public string? echForceQuery { get; set; }`
`359`	`361`	`}`
`360`	`362`
`361`	`363`	`public class CertificateSettings4Ray`