up 7.1.0

https://github.com/XTLS/Xray-core/pull/4000

README.md

@@ -1,5 +1,5 @@
 # v2rayN
-A GUI client for Windows, support [Xray core](https://github.com/XTLS/Xray-core) and [v2fly core](https://github.com/v2fly/v2ray-core) and [others](https://github.com/2dust/v2rayN/wiki/List-of-supported-cores)
+A GUI client for Windows and Linux, support [Xray core](https://github.com/XTLS/Xray-core) and [v2fly core](https://github.com/v2fly/v2ray-core) and [others](https://github.com/2dust/v2rayN/wiki/List-of-supported-cores)
 
 
 [![GitHub commit activity](https://img.shields.io/github/commit-activity/m/2dust/v2rayN)](https://github.com/2dust/v2rayN/commits/master)

v2rayN/ServiceLib/Common/HttpClientHelper.cs

@@ -1,4 +1,4 @@
-using System.Net.Http.Headers;
+using System.Net.Http.Headers;
 using System.Net.Mime;
 using System.Text;
 
@@ -98,7 +98,7 @@ namespace ServiceLib.Common
                 totalRead += read;
 
                 if (read == 0) break;
-                await file.WriteAsync(buffer, 0, read, token);
+                await file.WriteAsync(buffer.AsMemory(0, read), token);
 
                 if (canReportProgress)
                 {

v2rayN/ServiceLib/Common/Utils.cs

@@ -1,4 +1,4 @@
-using CliWrap;
+using CliWrap;
 using CliWrap.Buffered;
 using System.Collections.Specialized;
 using System.Diagnostics;
@@ -185,7 +185,7 @@ namespace ServiceLib.Common
 
                 if (plainText.Length % 4 > 0)
                 {
-                    plainText = plainText.PadRight(plainText.Length + 4 - plainText.Length % 4, '=');
+                    plainText = plainText.PadRight(plainText.Length + 4 - (plainText.Length % 4), '=');
                 }
 
                 var data = Convert.FromBase64String(plainText);

v2rayN/ServiceLib/Enums/ECoreType.cs

@@ -4,12 +4,8 @@
     {
         v2fly = 1,
         Xray = 2,
-
-        //SagerNet = 3,
         v2fly_v5 = 4,
 
-        //clash = 11,
-        //clash_meta = 12,
         mihomo = 13,
 
         hysteria = 21,

v2rayN/ServiceLib/Enums/ETransport.cs

@@ -7,6 +7,7 @@
         ws,
         httpupgrade,
         splithttp,
+        xhttp,
         h2,
         http,
         quic,

v2rayN/ServiceLib/Global.cs

@@ -175,11 +175,10 @@
 
         public static readonly List<string> VmessSecurities = new() { "aes-128-gcm", "chacha20-poly1305", "auto", "none", "zero" };
         public static readonly List<string> SsSecurities = new() { "aes-256-gcm", "aes-128-gcm", "chacha20-poly1305", "chacha20-ietf-poly1305", "none", "plain" };
-        public static readonly List<string> SsSecuritiesInSagerNet = new() { "none", "2022-blake3-aes-128-gcm", "2022-blake3-aes-256-gcm", "2022-blake3-chacha20-poly1305", "aes-128-gcm", "aes-192-gcm", "aes-256-gcm", "chacha20-ietf-poly1305", "xchacha20-ietf-poly1305", "rc4", "rc4-md5", "aes-128-ctr", "aes-192-ctr", "aes-256-ctr", "aes-128-cfb", "aes-192-cfb", "aes-256-cfb", "aes-128-cfb8", "aes-192-cfb8", "aes-256-cfb8", "aes-128-ofb", "aes-192-ofb", "aes-256-ofb", "bf-cfb", "cast5-cfb", "des-cfb", "idea-cfb", "rc2-cfb", "seed-cfb", "camellia-128-cfb", "camellia-192-cfb", "camellia-256-cfb", "camellia-128-cfb8", "camellia-192-cfb8", "camellia-256-cfb8", "salsa20", "chacha20", "chacha20-ietf", "xchacha20" };
         public static readonly List<string> SsSecuritiesInXray = new() { "aes-256-gcm", "aes-128-gcm", "chacha20-poly1305", "chacha20-ietf-poly1305", "xchacha20-poly1305", "xchacha20-ietf-poly1305", "none", "plain", "2022-blake3-aes-128-gcm", "2022-blake3-aes-256-gcm", "2022-blake3-chacha20-poly1305" };
         public static readonly List<string> SsSecuritiesInSingbox = new() { "aes-256-gcm", "aes-192-gcm", "aes-128-gcm", "chacha20-ietf-poly1305", "xchacha20-ietf-poly1305", "none", "2022-blake3-aes-128-gcm", "2022-blake3-aes-256-gcm", "2022-blake3-chacha20-poly1305", "aes-128-ctr", "aes-192-ctr", "aes-256-ctr", "aes-128-cfb", "aes-192-cfb", "aes-256-cfb", "rc4-md5", "chacha20-ietf", "xchacha20" };
         public static readonly List<string> Flows = new() { "", "xtls-rprx-vision", "xtls-rprx-vision-udp443" };
-        public static readonly List<string> Networks = new() { "tcp", "kcp", "ws", "httpupgrade", "splithttp", "h2", "quic", "grpc" };
+        public static readonly List<string> Networks = new() { "tcp", "kcp", "ws", "httpupgrade", "xhttp", "splithttp", "h2", "quic", "grpc" };
         public static readonly List<string> KcpHeaderTypes = new() { "srtp", "utp", "wechat-video", "dtls", "wireguard" };
         public static readonly List<string> CoreTypes = new() { "v2fly", "Xray", "sing_box" };
         public static readonly List<string> CoreTypes4VLESS = new() { "Xray", "sing_box" };
@@ -188,6 +187,7 @@
         public static readonly List<string> DomainMatchers = new() { "linear", "mph", "" };
         public static readonly List<string> Fingerprints = new() { "chrome", "firefox", "safari", "ios", "android", "edge", "360", "qq", "random", "randomized", "" };
         public static readonly List<string> UserAgent = new() { "chrome", "firefox", "safari", "edge", "none" };
+        public static readonly List<string> XhttpMode = new() { "auto", "packet-up", "stream-up" };
 
         public static readonly List<string> AllowInsecure = new() { "true", "false", "" };
         public static readonly List<string> DomainStrategy4Freedoms = new() { "AsIs", "UseIP", "UseIPv4", "UseIPv6", "" };
@@ -207,9 +207,9 @@
         public static readonly List<string> SingboxMuxs = new() { "h2mux", "smux", "yamux", "" };
         public static readonly List<string> TuicCongestionControls = new() { "cubic", "new_reno", "bbr" };
 
-        public static readonly List<string> allowSelectType = new List<string> { "selector", "urltest", "loadbalance", "fallback" };
-        public static readonly List<string> notAllowTestType = new List<string> { "selector", "urltest", "direct", "reject", "compatible", "pass", "loadbalance", "fallback" };
-        public static readonly List<string> proxyVehicleType = new List<string> { "file", "http" };
+        public static readonly List<string> allowSelectType = new() { "selector", "urltest", "loadbalance", "fallback" };
+        public static readonly List<string> notAllowTestType = new() { "selector", "urltest", "direct", "reject", "compatible", "pass", "loadbalance", "fallback" };
+        public static readonly List<string> proxyVehicleType = new() { "file", "http" };
 
         #endregion const
     }

v2rayN/ServiceLib/Handler/AppHandler.cs

@@ -247,7 +247,7 @@
                 case ECoreType.sing_box:
                     return Global.SsSecuritiesInSingbox;
             }
-            return Global.SsSecuritiesInSagerNet;
+            return Global.SsSecuritiesInSingbox;
         }
 
         public ECoreType GetCoreType(ProfileItem profileItem, EConfigType eConfigType)

v2rayN/ServiceLib/Handler/ConfigHandler.cs

@@ -1,4 +1,4 @@
-using System.Data;
+using System.Data;
 using System.Text.RegularExpressions;
 
 namespace ServiceLib.Handler
@@ -240,6 +240,7 @@ namespace ServiceLib.Handler
                 item.PublicKey = profileItem.PublicKey;
                 item.ShortId = profileItem.ShortId;
                 item.SpiderX = profileItem.SpiderX;
+                item.Extra = profileItem.Extra;
             }
 
             var ret = item.ConfigType switch
@@ -466,7 +467,7 @@ namespace ServiceLib.Handler
                         break;
                     }
                 case EMove.Position:
-                    sort = pos * 10 + 1;
+                    sort = (pos * 10) + 1;
                     break;
             }
 

v2rayN/ServiceLib/Handler/CoreHandler.cs

@@ -59,7 +59,7 @@ namespace ServiceLib.Handler
 
             var fileName = Utils.GetConfigPath(Global.CoreConfigFileName);
             var result = await CoreConfigHandler.GenerateClientConfig(node, fileName);
-            ShowMsg(false, result.Msg);
+            ShowMsg(true, result.Msg);
             if (result.Success != true)
             {
                 return;
@@ -68,6 +68,7 @@ namespace ServiceLib.Handler
             {
                 ShowMsg(true, $"{node.GetSummary()}");
                 await CoreStop();
+                await Task.Delay(100);
                 await CoreStart(node);
 
                 //In tun mode, do a delay check and restart the core
@@ -145,7 +146,7 @@ namespace ServiceLib.Handler
 
         private string CoreFindExe(CoreInfo coreInfo)
         {
-            string fileName = string.Empty;
+            var fileName = string.Empty;
             foreach (var name in coreInfo.CoreExes)
             {
                 var vName = Utils.GetBinPath(Utils.GetExeName(name), coreInfo.CoreType.ToString());
@@ -157,7 +158,7 @@ namespace ServiceLib.Handler
             }
             if (Utils.IsNullOrEmpty(fileName))
             {
-                string msg = string.Format(ResUI.NotFoundCore, Utils.GetBinPath("", coreInfo.CoreType.ToString()), string.Join(", ", coreInfo.CoreExes.ToArray()), coreInfo.Url);
+                var msg = string.Format(ResUI.NotFoundCore, Utils.GetBinPath("", coreInfo.CoreType.ToString()), string.Join(", ", coreInfo.CoreExes.ToArray()), coreInfo.Url);
                 Logging.SaveLog(msg);
                 ShowMsg(false, msg);
             }
@@ -169,21 +170,12 @@ namespace ServiceLib.Handler
             ShowMsg(false, $"{Environment.OSVersion} - {(Environment.Is64BitOperatingSystem ? 64 : 32)}");
             ShowMsg(false, string.Format(ResUI.StartService, DateTime.Now.ToString("yyyy/MM/dd HH:mm:ss")));
 
-            //ECoreType coreType;
-            //if (node.configType != EConfigType.Custom && _config.tunModeItem.enableTun)
-            //{
-            //    coreType = ECoreType.sing_box;
-            //}
-            //else
-            //{
-            //    coreType = LazyConfig.Instance.GetCoreType(node, node.configType);
-            //}
             var coreType = AppHandler.Instance.GetCoreType(node, node.ConfigType);
             _config.RunningCoreType = coreType;
             var coreInfo = CoreInfoHandler.Instance.GetCoreInfo(coreType);
 
             var displayLog = node.ConfigType != EConfigType.Custom || node.DisplayLog;
-            var proc = await RunProcess(node, coreInfo, "", displayLog);
+            var proc = await RunProcess(coreInfo, Global.CoreConfigFileName, displayLog, true);
             if (proc is null)
             {
                 return;
@@ -220,12 +212,12 @@ namespace ServiceLib.Handler
                 }
                 if (itemSocks != null)
                 {
-                    string fileName2 = Utils.GetConfigPath(Global.CorePreConfigFileName);
+                    var fileName2 = Utils.GetConfigPath(Global.CorePreConfigFileName);
                     var result = await CoreConfigHandler.GenerateClientConfig(itemSocks, fileName2);
                     if (result.Success)
                     {
                         var coreInfo2 = CoreInfoHandler.Instance.GetCoreInfo(preCoreType);
-                        var proc2 = await RunProcess(node, coreInfo2, $" -c {Global.CorePreConfigFileName}", true);
+                        var proc2 = await RunProcess(coreInfo2, Global.CorePreConfigFileName, true, true);
                         if (proc2 is not null)
                         {
                             _processPre = proc2;
@@ -243,7 +235,7 @@ namespace ServiceLib.Handler
             try
             {
                 var coreInfo = CoreInfoHandler.Instance.GetCoreInfo(coreType);
-                var proc = await RunProcess(new(), coreInfo, $" -c {Global.CoreSpeedtestConfigFileName}", true);
+                var proc = await RunProcess(coreInfo, Global.CoreSpeedtestConfigFileName, true, false);
                 if (proc is null)
                 {
                     return -1;
@@ -254,8 +246,7 @@ namespace ServiceLib.Handler
             catch (Exception ex)
             {
                 Logging.SaveLog(ex.Message, ex);
-                string msg = ex.Message;
-                ShowMsg(false, msg);
+                ShowMsg(false, ex.Message);
                 return -1;
             }
         }
@@ -265,19 +256,30 @@ namespace ServiceLib.Handler
             _updateFunc?.Invoke(notify, msg);
         }
 
+        private bool IsNeedSudo(ECoreType eCoreType)
+        {
+            return _config.TunModeItem.EnableTun
+                   && eCoreType == ECoreType.sing_box
+                   && Utils.IsLinux()
+                   && _config.TunModeItem.LinuxSudoPassword.IsNotEmpty()
+                ;
+        }
+
         #endregion Private
 
         #region Process
 
-        private async Task<Process?> RunProcess(ProfileItem node, CoreInfo coreInfo, string configPath, bool displayLog)
+        private async Task<Process?> RunProcess(CoreInfo coreInfo, string configPath, bool displayLog, bool mayNeedSudo)
         {
+            var fileName = CoreFindExe(coreInfo);
+            if (Utils.IsNullOrEmpty(fileName))
+            {
+                return null;
+            }
+
+            var isNeedSudo = mayNeedSudo && IsNeedSudo(coreInfo.CoreType);
             try
             {
-                string fileName = CoreFindExe(coreInfo);
-                if (Utils.IsNullOrEmpty(fileName))
-                {
-                    return null;
-                }
                 Process proc = new()
                 {
                     StartInfo = new()
@@ -293,33 +295,45 @@ namespace ServiceLib.Handler
                         StandardErrorEncoding = displayLog ? Encoding.UTF8 : null,
                     }
                 };
+
+                if (isNeedSudo)
+                {
+                    proc.StartInfo.FileName = $"/bin/sudo";
+                    proc.StartInfo.Arguments = $"-S {fileName} {string.Format(coreInfo.Arguments, configPath)}";
+                    proc.StartInfo.StandardInputEncoding = Encoding.UTF8;
+                    proc.StartInfo.RedirectStandardInput = true;
+                }
+
                 var startUpErrorMessage = new StringBuilder();
                 var startUpSuccessful = false;
                 if (displayLog)
                 {
                     proc.OutputDataReceived += (sender, e) =>
                     {
-                        if (Utils.IsNotEmpty(e.Data))
-                        {
-                            string msg = e.Data + Environment.NewLine;
-                            ShowMsg(false, msg);
-                        }
+                        if (Utils.IsNullOrEmpty(e.Data)) return;
+                        ShowMsg(false, e.Data + Environment.NewLine);
                     };
                     proc.ErrorDataReceived += (sender, e) =>
                     {
-                        if (Utils.IsNotEmpty(e.Data))
-                        {
-                            string msg = e.Data + Environment.NewLine;
-                            ShowMsg(false, msg);
+                        if (Utils.IsNullOrEmpty(e.Data)) return;
+                        ShowMsg(false, e.Data + Environment.NewLine);
 
-                            if (!startUpSuccessful)
-                            {
-                                startUpErrorMessage.Append(msg);
-                            }
+                        if (!startUpSuccessful)
+                        {
+                            startUpErrorMessage.Append(e.Data + Environment.NewLine);
                         }
                     };
                 }
                 proc.Start();
+
+                if (isNeedSudo)
+                {
+                    await Task.Delay(10);
+                    await proc.StandardInput.WriteLineAsync(_config.TunModeItem.LinuxSudoPassword);
+                    await Task.Delay(10);
+                    await proc.StandardInput.WriteLineAsync(_config.TunModeItem.LinuxSudoPassword);
+                }
+
                 if (displayLog)
                 {
                     proc.BeginOutputReadLine();
@@ -342,8 +356,7 @@ namespace ServiceLib.Handler
             catch (Exception ex)
             {
                 Logging.SaveLog(ex.Message, ex);
-                string msg = ex.Message;
-                ShowMsg(true, msg);
+                ShowMsg(true, ex.Message);
                 return null;
             }
         }
@@ -354,20 +367,26 @@ namespace ServiceLib.Handler
             {
                 return;
             }
+            var timeout = new CancellationTokenSource(TimeSpan.FromSeconds(1));
             try
+            {
+                await proc.WaitForExitAsync(timeout.Token);
+            }
+            catch (OperationCanceledException)
             {
                 proc.Kill();
-                proc.WaitForExit(100);
-                if (!proc.HasExited)
+            }
+            if (!proc.HasExited)
+            {
+                try
+                {
+                    await proc.WaitForExitAsync(timeout.Token);
+                }
+                catch (Exception)
                 {
                     proc.Kill();
-                    proc.WaitForExit(100);
                 }
             }
-            catch (Exception ex)
-            {
-                Logging.SaveLog(ex.Message, ex);
-            }
         }
 
         #endregion Process

v2rayN/ServiceLib/Handler/CoreInfoHandler.cs

@@ -1,6 +1,4 @@
-using System.Runtime.Intrinsics.X86;
-
-namespace ServiceLib.Handler
+namespace ServiceLib.Handler
 {
     public sealed class CoreInfoHandler
     {
@@ -74,7 +72,7 @@ namespace ServiceLib.Handler
             {
                 CoreType = ECoreType.Xray,
                 CoreExes = new List<string> { "xray", "wxray" },
-                Arguments = "run {0}",
+                Arguments = "run -c {0}",
                 Url = Global.XrayCoreUrl,
                 ReleaseApiUrl = Global.XrayCoreUrl.Replace(Global.GithubUrl, Global.GithubApiUrl),
                 DownloadUrlWin64 = Global.XrayCoreUrl + "/download/{0}/Xray-windows-64.zip",
@@ -89,7 +87,7 @@ namespace ServiceLib.Handler
             _coreInfo.Add(new CoreInfo
             {
                 CoreType = ECoreType.mihomo,
-                CoreExes = new List<string> { $"mihomo-windows-amd64{(Avx2.X64.IsSupported ? "" : "-compatible")}", "mihomo-windows-amd64-compatible", "mihomo-windows-amd64", "mihomo-windows-386", "mihomo", "clash" },
+                CoreExes = new List<string> { "mihomo-windows-amd64-compatible", "mihomo-windows-amd64", "mihomo-linux-amd64", "mihomo", "clash" },
                 Arguments = "-f config.json" + PortableMode(),
                 Url = Global.MihomoCoreUrl,
                 ReleaseApiUrl = Global.MihomoCoreUrl.Replace(Global.GithubUrl, Global.GithubApiUrl),
@@ -105,7 +103,7 @@ namespace ServiceLib.Handler
             _coreInfo.Add(new CoreInfo
             {
                 CoreType = ECoreType.hysteria,
-                CoreExes = new List<string> { "hysteria-windows-amd64", "hysteria-windows-386", "hysteria" },
+                CoreExes = new List<string> { "hysteria-windows-amd64", "hysteria" },
                 Arguments = "",
                 Url = Global.HysteriaCoreUrl,
                 ReleaseApiUrl = Global.HysteriaCoreUrl.Replace(Global.GithubUrl, Global.GithubApiUrl),
@@ -134,7 +132,7 @@ namespace ServiceLib.Handler
             {
                 CoreType = ECoreType.sing_box,
                 CoreExes = new List<string> { "sing-box-client", "sing-box" },
-                Arguments = "run {0} --disable-color",
+                Arguments = "run -c {0} --disable-color",
                 Url = Global.SingboxCoreUrl,
                 RedirectInfo = true,
                 ReleaseApiUrl = Global.SingboxCoreUrl.Replace(Global.GithubUrl, Global.GithubApiUrl),
@@ -157,7 +155,7 @@ namespace ServiceLib.Handler
             _coreInfo.Add(new CoreInfo
             {
                 CoreType = ECoreType.hysteria2,
-                CoreExes = new List<string> { "hysteria-windows-amd64", "hysteria-windows-386", "hysteria" },
+                CoreExes = new List<string> { "hysteria-windows-amd64", "hysteria-linux-amd64", "hysteria" },
                 Arguments = "",
                 Url = Global.HysteriaCoreUrl,
                 ReleaseApiUrl = Global.HysteriaCoreUrl.Replace(Global.GithubUrl, Global.GithubApiUrl),

v2rayN/ServiceLib/Handler/Fmt/BaseFmt.cs

@@ -83,7 +83,6 @@ namespace ServiceLib.Handler.Fmt
 
                 case nameof(ETransport.ws):
                 case nameof(ETransport.httpupgrade):
-                case nameof(ETransport.splithttp):
                     if (Utils.IsNotEmpty(item.RequestHost))
                     {
                         dicQuery.Add("host", Utils.UrlEncode(item.RequestHost));
@@ -94,6 +93,26 @@ namespace ServiceLib.Handler.Fmt
                     }
                     break;
 
+                case nameof(ETransport.splithttp):
+                case nameof(ETransport.xhttp):
+                    if (Utils.IsNotEmpty(item.RequestHost))
+                    {
+                        dicQuery.Add("host", Utils.UrlEncode(item.RequestHost));
+                    }
+                    if (Utils.IsNotEmpty(item.Path))
+                    {
+                        dicQuery.Add("path", Utils.UrlEncode(item.Path));
+                    }
+                    if (Utils.IsNotEmpty(item.HeaderType) && Global.XhttpMode.Contains(item.HeaderType))
+                    {
+                        dicQuery.Add("mode", Utils.UrlEncode(item.HeaderType));
+                    }
+                    if (Utils.IsNotEmpty(item.Extra))
+                    {
+                        dicQuery.Add("extra", Utils.UrlEncode(item.Extra));
+                    }
+                    break;
+
                 case nameof(ETransport.http):
                 case nameof(ETransport.h2):
                     dicQuery["type"] = nameof(ETransport.http);
@@ -156,11 +175,18 @@ namespace ServiceLib.Handler.Fmt
 
                 case nameof(ETransport.ws):
                 case nameof(ETransport.httpupgrade):
-                case nameof(ETransport.splithttp):
                     item.RequestHost = Utils.UrlDecode(query["host"] ?? "");
                     item.Path = Utils.UrlDecode(query["path"] ?? "/");
                     break;
 
+                case nameof(ETransport.splithttp):
+                case nameof(ETransport.xhttp):
+                    item.RequestHost = Utils.UrlDecode(query["host"] ?? "");
+                    item.Path = Utils.UrlDecode(query["path"] ?? "/");
+                    item.HeaderType = Utils.UrlDecode(query["mode"] ?? "");
+                    item.Extra = Utils.UrlDecode(query["extra"] ?? "");
+                    break;
+
                 case nameof(ETransport.http):
                 case nameof(ETransport.h2):
                     item.Network = nameof(ETransport.h2);

v2rayN/ServiceLib/Handler/StatisticsHandler.cs

@@ -9,7 +9,8 @@
         private ServerStatItem? _serverStatItem;
         private List<ServerStatItem> _lstServerStat;
         private Action<ServerSpeedItem>? _updateFunc;
-        private StatisticsV2rayService? _statisticsV2Ray;
+        //private StatisticsV2rayService? _statisticsV2Ray;
+        private StatisticsXrayService? _statisticsXray;
         private StatisticsSingboxService? _statisticsSingbox;
 
         public List<ServerStatItem> ServerStat => _lstServerStat;
@@ -25,7 +26,8 @@
 
             await InitData();
 
-            _statisticsV2Ray = new StatisticsV2rayService(config, UpdateServerStatHandler);
+            //_statisticsV2Ray = new StatisticsV2rayService(config, UpdateServerStatHandler);
+            _statisticsXray = new StatisticsXrayService(config, UpdateServerStatHandler);
             _statisticsSingbox = new StatisticsSingboxService(config, UpdateServerStatHandler);
         }
 
@@ -33,7 +35,8 @@
         {
             try
             {
-                _statisticsV2Ray?.Close();
+                //_statisticsV2Ray?.Close();
+                _statisticsXray?.Close();
                 _statisticsSingbox?.Close();
             }
             catch (Exception ex)

v2rayN/ServiceLib/Handler/SysProxy/ProxySettingOSX.cs

@@ -2,12 +2,81 @@
 {
     public class ProxySettingOSX
     {
+        /*
+         * 仅测试了，MacOS 13.7.1 x86 版本，其他版本有待确认
+         */
+        /// <summary>
+        /// 应用接口类型
+        /// </summary>
+        private static readonly List<string> LstInterface = ["Ethernet", "Wi-Fi", "Thunderbolt Bridge"];
+
+        /// <summary>
+        /// 代理类型，对应 http,https,socks
+        /// </summary>
+        private static readonly List<string> LstTypes = ["setwebproxy", "setsecurewebproxy", "setsocksfirewallproxy"];
+
         public static async Task SetProxy(string host, int port)
         {
+            var lstCmd = GetSetCmds(host, port);
+            await ExecCmd(lstCmd);
         }
 
+
         public static async Task UnsetProxy()
         {
+            var lstCmd = GetUnsetCmds();
+            await ExecCmd(lstCmd);
+        }
+
+
+        private static async Task ExecCmd(List<CmdItem> lstCmd)
+        {
+            foreach (var cmd in lstCmd)
+            {
+                if (cmd is null || cmd.Cmd.IsNullOrEmpty() || cmd.Arguments is null)
+                {
+                    continue;
+                }
+
+                await Task.Delay(10);
+                await Utils.GetCliWrapOutput(cmd.Cmd, cmd.Arguments);
+            }
+        }
+
+        private static List<CmdItem> GetSetCmds(string host, int port)
+        {
+            List<CmdItem> lstCmd = [];
+            foreach (var interf in LstInterface)
+            {
+                foreach (var type in LstTypes)
+                {
+                    lstCmd.Add(new CmdItem()
+                    {
+                        Cmd = "networksetup",
+                        Arguments = [$"-{type}", interf, host, (type.Contains("socks") ? (port - 1) : port).ToString()]
+                    });
+                }
+            }
+
+            return lstCmd;
+        }
+
+        private static List<CmdItem> GetUnsetCmds()
+        {
+            List<CmdItem> lstCmd = [];
+            foreach (var interf in LstInterface)
+            {
+                foreach (var type in LstTypes)
+                {
+                    lstCmd.Add(new CmdItem()
+                    {
+                        Cmd = "networksetup",
+                        Arguments = [$"-{type}state", interf, "off"]
+                    });
+                }
+            }
+
+            return lstCmd;
         }
     }
 }

v2rayN/ServiceLib/Handler/SysProxy/ProxySettingWindows.cs

@@ -1,4 +1,4 @@
-using System.Runtime.InteropServices;
+using System.Runtime.InteropServices;
 using static ServiceLib.Handler.SysProxy.ProxySettingWindows.InternetConnectionOption;
 
 namespace ServiceLib.Handler.SysProxy
@@ -144,12 +144,12 @@ namespace ServiceLib.Handler.SysProxy
             {
                 if (Environment.Is64BitOperatingSystem)
                 {
-                    nint opt = new(optionsPtr.ToInt64() + i * optSize);
+                    nint opt = new(optionsPtr.ToInt64() + (i * optSize));
                     Marshal.StructureToPtr(options[i], opt, false);
                 }
                 else
                 {
-                    nint opt = new(optionsPtr.ToInt32() + i * optSize);
+                    nint opt = new(optionsPtr.ToInt32() + (i * optSize));
                     Marshal.StructureToPtr(options[i], opt, false);
                 }
             }
@@ -247,7 +247,7 @@ namespace ServiceLib.Handler.SysProxy
 
             //[MarshalAs(UnmanagedType.)]
             public nint options;
-        };
+        }
 
         [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto)]
         public struct InternetConnectionOption

v2rayN/ServiceLib/Models/ConfigItems.cs

@@ -161,6 +161,7 @@
         public int Mtu { get; set; }
         public bool EnableExInbound { get; set; }
         public bool EnableIPv6Address { get; set; }
+        public string? LinuxSudoPassword { get; set; }
     }
 
     [Serializable]

v2rayN/ServiceLib/Models/ProfileItem.cs

@@ -30,44 +30,25 @@ namespace ServiceLib.Models
 
         public string GetSummary()
         {
-            string summary = string.Format("[{0}] ", (ConfigType).ToString());
-            string[] arrAddr = Address.Split('.');
-            string addr;
-            if (arrAddr.Length > 2)
+            var summary = $"[{(ConfigType).ToString()}] ";
+            var arrAddr = Address.Split('.');
+            var addr = arrAddr.Length switch
             {
-                addr = $"{arrAddr.First()}***{arrAddr.Last()}";
-            }
-            else if (arrAddr.Length > 1)
+                > 2 => $"{arrAddr.First()}***{arrAddr.Last()}",
+                > 1 => $"***{arrAddr.Last()}",
+                _ => Address
+            };
+            summary += ConfigType switch
             {
-                addr = $"***{arrAddr.Last()}";
-            }
-            else
-            {
-                addr = Address;
-            }
-            switch (ConfigType)
-            {
-                case EConfigType.Custom:
-                    summary += string.Format("[{1}]{0}", Remarks, CoreType.ToString());
-                    break;
-
-                default:
-                    summary += string.Format("{0}({1}:{2})", Remarks, addr, Port);
-                    break;
-            }
+                EConfigType.Custom => $"[{CoreType.ToString()}]{Remarks}",
+                _ => $"{Remarks}({addr}:{Port})"
+            };
             return summary;
         }
 
         public List<string>? GetAlpn()
         {
-            if (Utils.IsNullOrEmpty(Alpn))
-            {
-                return null;
-            }
-            else
-            {
-                return Utils.String2List(Alpn);
-            }
+            return Utils.IsNullOrEmpty(Alpn) ? null : Utils.String2List(Alpn);
         }
 
         public string GetNetwork()
@@ -110,5 +91,6 @@ namespace ServiceLib.Models
         public string PublicKey { get; set; }
         public string ShortId { get; set; }
         public string SpiderX { get; set; }
+        public string Extra { get; set; }
     }
 }

v2rayN/ServiceLib/Models/SingboxConfig.cs

@@ -78,8 +78,7 @@
         public int? listen_port { get; set; }
         public string? domain_strategy { get; set; }
         public string interface_name { get; set; }
-        public string inet4_address { get; set; }
-        public string? inet6_address { get; set; }
+        public List<string>? address { get; set; }
         public int? mtu { get; set; }
         public bool? auto_route { get; set; }
         public bool? strict_route { get; set; }

v2rayN/ServiceLib/Models/V2rayConfig.cs

@@ -1,61 +1,34 @@
-using System.Text.Json.Serialization;
+using System.Text.Json.Serialization;
 
 namespace ServiceLib.Models
 {
-    /// <summary>
-    /// v2ray配置文件实体类 例子SampleConfig.txt
-    /// </summary>
     public class V2rayConfig
     {
-        /// <summary>
-        /// Properties that do not belong to Ray
-        /// </summary>
         public string? remarks { get; set; }
 
-        /// <summary>
-        /// 日志配置
-        /// </summary>
         public Log4Ray log { get; set; }
 
-        /// <summary>
-        /// 传入连接配置
-        /// </summary>
         public List<Inbounds4Ray> inbounds { get; set; }
 
-        /// <summary>
-        /// 传出连接配置
-        /// </summary>
         public List<Outbounds4Ray> outbounds { get; set; }
 
-        /// <summary>
-        /// 统计需要， 空对象
-        /// </summary>
-        public Stats4Ray stats { get; set; }
+        public Stats4Ray? stats { get; set; }
 
-        /// </summary>
-        public API4Ray api { get; set; }
+        public Metrics4Ray? metrics { get; set; }
 
-        /// </summary>
-        public Policy4Ray policy { get; set; }
+        public Policy4Ray? policy { get; set; }
 
-        /// <summary>
-        /// DNS 配置
-        /// </summary>
         public object dns { get; set; }
 
-        /// <summary>
-        /// 路由配置
-        /// </summary>
         public Routing4Ray routing { get; set; }
     }
 
     public class Stats4Ray
-    { };
+    { }
 
-    public class API4Ray
+    public class Metrics4Ray
     {
         public string tag { get; set; }
-        public List<string> services { get; set; }
     }
 
     public class Policy4Ray
@@ -71,124 +44,59 @@ namespace ServiceLib.Models
 
     public class Log4Ray
     {
-        /// <summary>
-        ///
-        /// </summary>
-        public string access { get; set; }
+        public string? access { get; set; }
 
-        /// <summary>
-        ///
-        /// </summary>
-        public string error { get; set; }
+        public string? error { get; set; }
 
-        /// <summary>
-        ///
-        /// </summary>
-        public string loglevel { get; set; }
+        public string? loglevel { get; set; }
     }
 
     public class Inbounds4Ray
     {
         public string tag { get; set; }
 
-        /// <summary>
-        ///
-        /// </summary>
         public int port { get; set; }
 
-        /// <summary>
-        ///
-        /// </summary>
         public string listen { get; set; }
 
-        /// <summary>
-        ///
-        /// </summary>
         public string protocol { get; set; }
 
-        /// <summary>
-        ///
-        /// </summary>
         public Sniffing4Ray sniffing { get; set; }
 
-        /// <summary>
-        ///
-        /// </summary>
         public Inboundsettings4Ray settings { get; set; }
-
-        /// <summary>
-        ///
-        /// </summary>
-        public StreamSettings4Ray streamSettings { get; set; }
     }
 
     public class Inboundsettings4Ray
     {
-        /// <summary>
-        ///
-        /// </summary>
-        public string auth { get; set; }
+        public string? auth { get; set; }
 
-        /// <summary>
-        ///
-        /// </summary>
-        public bool udp { get; set; }
+        public bool? udp { get; set; }
 
-        /// <summary>
-        ///
-        /// </summary>
-        public string ip { get; set; }
+        public string? ip { get; set; }
 
-        /// <summary>
-        /// api 使用
-        /// </summary>
-        public string address { get; set; }
+        public string? address { get; set; }
 
-        /// <summary>
-        ///
-        /// </summary>
-        public List<UsersItem4Ray> clients { get; set; }
+        public List<UsersItem4Ray>? clients { get; set; }
 
-        /// <summary>
-        /// VLESS
-        /// </summary>
-        public string decryption { get; set; }
+        public string? decryption { get; set; }
 
-        public bool allowTransparent { get; set; }
+        public bool? allowTransparent { get; set; }
 
-        public List<AccountsItem4Ray> accounts { get; set; }
+        public List<AccountsItem4Ray>? accounts { get; set; }
     }
 
     public class UsersItem4Ray
     {
-        /// <summary>
-        ///
-        /// </summary>
-        public string id { get; set; }
+        public string? id { get; set; }
 
-        /// <summary>
-        ///
-        /// </summary>
-        public int alterId { get; set; }
+        public int? alterId { get; set; }
 
-        /// <summary>
-        ///
-        /// </summary>
-        public string email { get; set; }
+        public string? email { get; set; }
 
-        /// <summary>
-        ///
-        /// </summary>
-        public string security { get; set; }
+        public string? security { get; set; }
 
-        /// <summary>
-        /// VLESS
-        /// </summary>
-        public string encryption { get; set; }
+        public string? encryption { get; set; }
 
-        /// <summary>
-        /// VLESS
-        /// </summary>
         public string? flow { get; set; }
     }
 
@@ -201,57 +109,27 @@ namespace ServiceLib.Models
 
     public class Outbounds4Ray
     {
-        /// <summary>
-        /// 默认值agentout
-        /// </summary>
         public string tag { get; set; }
 
-        /// <summary>
-        ///
-        /// </summary>
         public string protocol { get; set; }
 
-        /// <summary>
-        ///
-        /// </summary>
         public Outboundsettings4Ray settings { get; set; }
 
-        /// <summary>
-        ///
-        /// </summary>
         public StreamSettings4Ray streamSettings { get; set; }
 
-        /// <summary>
-        ///
-        /// </summary>
         public Mux4Ray mux { get; set; }
     }
 
     public class Outboundsettings4Ray
     {
-        /// <summary>
-        ///
-        /// </summary>
         public List<VnextItem4Ray>? vnext { get; set; }
 
-        /// <summary>
-        ///
-        /// </summary>
-        public List<ServersItem4Ray> servers { get; set; }
+        public List<ServersItem4Ray>? servers { get; set; }
 
-        /// <summary>
-        ///
-        /// </summary>
-        public Response4Ray response { get; set; }
+        public Response4Ray? response { get; set; }
 
-        /// <summary>
-        ///
-        /// </summary>
         public string domainStrategy { get; set; }
 
-        /// <summary>
-        ///
-        /// </summary>
         public int? userLevel { get; set; }
 
         public FragmentItem4Ray? fragment { get; set; }
@@ -259,85 +137,40 @@ namespace ServiceLib.Models
 
     public class VnextItem4Ray
     {
-        /// <summary>
-        ///
-        /// </summary>
         public string address { get; set; }
 
-        /// <summary>
-        ///
-        /// </summary>
         public int port { get; set; }
 
-        /// <summary>
-        ///
-        /// </summary>
         public List<UsersItem4Ray> users { get; set; }
     }
 
     public class ServersItem4Ray
     {
-        /// <summary>
-        ///
-        /// </summary>
         public string email { get; set; }
 
-        /// <summary>
-        ///
-        /// </summary>
         public string address { get; set; }
 
-        /// <summary>
-        ///
-        /// </summary>
         public string? method { get; set; }
 
-        /// <summary>
-        ///
-        /// </summary>
         public bool? ota { get; set; }
 
-        /// <summary>
-        ///
-        /// </summary>
         public string? password { get; set; }
 
-        /// <summary>
-        ///
-        /// </summary>
         public int port { get; set; }
 
-        /// <summary>
-        ///
-        /// </summary>
         public int? level { get; set; }
 
-        /// <summary>
-        /// trojan
-        /// </summary>
         public string flow { get; set; }
 
-        /// <summary>
-        ///
-        /// </summary>
         public List<SocksUsersItem4Ray> users { get; set; }
     }
 
     public class SocksUsersItem4Ray
     {
-        /// <summary>
-        ///
-        /// </summary>
         public string user { get; set; }
 
-        /// <summary>
-        ///
-        /// </summary>
         public string pass { get; set; }
 
-        /// <summary>
-        ///
-        /// </summary>
         public int? level { get; set; }
     }
 
@@ -351,17 +184,11 @@ namespace ServiceLib.Models
 
     public class Response4Ray
     {
-        /// <summary>
-        ///
-        /// </summary>
         public string type { get; set; }
     }
 
     public class Dns4Ray
     {
-        /// <summary>
-        ///
-        /// </summary>
         public List<string> servers { get; set; }
     }
 
@@ -373,19 +200,10 @@ namespace ServiceLib.Models
 
     public class Routing4Ray
     {
-        /// <summary>
-        ///
-        /// </summary>
         public string domainStrategy { get; set; }
 
-        /// <summary>
-        ///
-        /// </summary>
         public string? domainMatcher { get; set; }
 
-        /// <summary>
-        ///
-        /// </summary>
         public List<RulesItem4Ray> rules { get; set; }
 
         public List<BalancersItem4Ray>? balancers { get; set; }
@@ -426,87 +244,39 @@ namespace ServiceLib.Models
 
     public class StreamSettings4Ray
     {
-        /// <summary>
-        ///
-        /// </summary>
         public string network { get; set; }
 
-        /// <summary>
-        ///
-        /// </summary>
         public string security { get; set; }
 
-        /// <summary>
-        ///
-        /// </summary>
         public TlsSettings4Ray? tlsSettings { get; set; }
 
-        /// <summary>
-        /// Tcp传输额外设置
-        /// </summary>
         public TcpSettings4Ray? tcpSettings { get; set; }
 
-        /// <summary>
-        /// Kcp传输额外设置
-        /// </summary>
         public KcpSettings4Ray? kcpSettings { get; set; }
 
-        /// <summary>
-        /// ws传输额外设置
-        /// </summary>
         public WsSettings4Ray? wsSettings { get; set; }
 
-        /// <summary>
-        ///
-        /// </summary>
         public HttpupgradeSettings4Ray? httpupgradeSettings { get; set; }
 
-        /// <summary>
-        ///
-        /// </summary>
-        public SplithttpSettings4Ray? splithttpSettings { get; set; }
+        public XhttpSettings4Ray? xhttpSettings { get; set; }
 
-        /// <summary>
-        /// h2传输额外设置
-        /// </summary>
         public HttpSettings4Ray? httpSettings { get; set; }
 
-        /// <summary>
-        /// QUIC
-        /// </summary>
         public QuicSettings4Ray? quicSettings { get; set; }
 
-        /// <summary>
-        /// VLESS only
-        /// </summary>
         public TlsSettings4Ray? realitySettings { get; set; }
 
-        /// <summary>
-        /// grpc
-        /// </summary>
         public GrpcSettings4Ray? grpcSettings { get; set; }
 
-        /// <summary>
-        /// sockopt
-        /// </summary>
         public Sockopt4Ray? sockopt { get; set; }
     }
 
     public class TlsSettings4Ray
     {
-        /// <summary>
-        /// 是否允许不安全连接（用于客户端）
-        /// </summary>
         public bool? allowInsecure { get; set; }
 
-        /// <summary>
-        ///
-        /// </summary>
         public string? serverName { get; set; }
 
-        /// <summary>
-        ///
-        /// </summary>
         public List<string>? alpn { get; set; }
 
         public string? fingerprint { get; set; }
@@ -519,157 +289,94 @@ namespace ServiceLib.Models
 
     public class TcpSettings4Ray
     {
-        /// <summary>
-        /// 数据包头部伪装设置
-        /// </summary>
         public Header4Ray header { get; set; }
     }
 
     public class Header4Ray
     {
-        /// <summary>
-        /// 伪装
-        /// </summary>
         public string type { get; set; }
 
-        /// <summary>
-        /// 结构复杂，直接存起来
-        /// </summary>
         public object request { get; set; }
 
-        /// <summary>
-        /// 结构复杂，直接存起来
-        /// </summary>
         public object response { get; set; }
     }
 
     public class KcpSettings4Ray
     {
-        /// <summary>
-        ///
-        /// </summary>
         public int mtu { get; set; }
 
-        /// <summary>
-        ///
-        /// </summary>
         public int tti { get; set; }
 
-        /// <summary>
-        ///
-        /// </summary>
         public int uplinkCapacity { get; set; }
 
-        /// <summary>
-        ///
-        /// </summary>
         public int downlinkCapacity { get; set; }
 
-        /// <summary>
-        ///
-        /// </summary>
         public bool congestion { get; set; }
 
-        /// <summary>
-        ///
-        /// </summary>
         public int readBufferSize { get; set; }
 
-        /// <summary>
-        ///
-        /// </summary>
         public int writeBufferSize { get; set; }
 
-        /// <summary>
-        ///
-        /// </summary>
         public Header4Ray header { get; set; }
 
-        /// <summary>
-        ///
-        /// </summary>
         public string seed { get; set; }
     }
 
     public class WsSettings4Ray
     {
-        /// <summary>
-        ///
-        /// </summary>
         public string path { get; set; }
 
-        /// <summary>
-        ///
-        /// </summary>
         public Headers4Ray headers { get; set; }
     }
 
     public class Headers4Ray
     {
-        /// <summary>
-        ///
-        /// </summary>
         public string Host { get; set; }
 
-        /// <summary>
-        /// 用户代理
-        /// </summary>
         [JsonPropertyName("User-Agent")]
         public string UserAgent { get; set; }
     }
 
     public class HttpupgradeSettings4Ray
     {
-        /// <summary>
-        ///
-        /// </summary>
         public string? path { get; set; }
 
-        /// <summary>
-        ///
-        /// </summary>
         public string? host { get; set; }
     }
 
-    public class SplithttpSettings4Ray
+    public class XhttpSettings4Ray
     {
         public string? path { get; set; }
-
         public string? host { get; set; }
+        public string? mode { get; set; }
+        public string? scMaxEachPostBytes { get; set; }
+        public string? scMaxConcurrentPosts { get; set; }
+        public string? scMinPostsIntervalMs { get; set; }
+        public Xmux4Ray? xmux { get; set; }
+        public object? extra { get; set; }
+    }
 
-        public int? maxUploadSize { get; set; }
-
-        public int? maxConcurrentUploads { get; set; }
+    public class Xmux4Ray
+    {
+        public int? maxConcurrency { get; set; }
+        public int? maxConnections { get; set; }
+        public int? cMaxReuseTimes { get; set; }
+        public int? cMaxLifetimeMs { get; set; }
     }
 
     public class HttpSettings4Ray
     {
-        /// <summary>
-        ///
-        /// </summary>
         public string? path { get; set; }
 
-        /// <summary>
-        ///
-        /// </summary>
         public List<string>? host { get; set; }
     }
 
     public class QuicSettings4Ray
     {
-        /// <summary>
-        ///
-        /// </summary>
         public string security { get; set; }
 
-        /// <summary>
-        ///
-        /// </summary>
         public string key { get; set; }
 
-        /// <summary>
-        ///
-        /// </summary>
         public Header4Ray header { get; set; }
     }
 
@@ -686,14 +393,8 @@ namespace ServiceLib.Models
 
     public class AccountsItem4Ray
     {
-        /// <summary>
-        ///
-        /// </summary>
         public string user { get; set; }
 
-        /// <summary>
-        ///
-        /// </summary>
         public string pass { get; set; }
     }
 

v2rayN/ServiceLib/Models/V2rayMetricsVars.cs

@@ -0,0 +1,20 @@
+using System.Collections;
+
+namespace ServiceLib.Models
+{
+    internal class V2rayMetricsVars
+    {
+        public V2rayMetricsVarsStats? stats { get; set; }
+    }
+}
+
+public class V2rayMetricsVarsStats
+{
+    public Hashtable? outbound { get; set; }
+}
+
+public class V2rayMetricsVarsLink
+{
+    public long downlink { get; set; }
+    public long uplink { get; set; }
+}

v2rayN/ServiceLib/Resx/ResUI.Designer.cs

@@ -3148,6 +3148,42 @@ namespace ServiceLib.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Linux system sudo password 的本地化字符串。
+        /// </summary>
+        public static string TbSettingsLinuxSudoPassword {
+            get {
+                return ResourceManager.GetString("TbSettingsLinuxSudoPassword", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Please set the sudo password in Tun mode settings first 的本地化字符串。
+        /// </summary>
+        public static string TbSettingsLinuxSudoPasswordIsEmpty {
+            get {
+                return ResourceManager.GetString("TbSettingsLinuxSudoPasswordIsEmpty", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Please do not run this app with sudo 的本地化字符串。
+        /// </summary>
+        public static string TbSettingsLinuxSudoPasswordNotSudoRunApp {
+            get {
+                return ResourceManager.GetString("TbSettingsLinuxSudoPasswordNotSudoRunApp", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 The password will only be stored in the local file. 的本地化字符串。
+        /// </summary>
+        public static string TbSettingsLinuxSudoPasswordTip {
+            get {
+                return ResourceManager.GetString("TbSettingsLinuxSudoPasswordTip", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Enable Log 的本地化字符串。
         /// </summary>
@@ -3661,6 +3697,15 @@ namespace ServiceLib.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 XHTTP Extra raw JSON, format: { XHTTPObject } 的本地化字符串。
+        /// </summary>
+        public static string TransportExtraTip {
+            get {
+                return ResourceManager.GetString("TransportExtraTip", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 *tcp camouflage type 的本地化字符串。
         /// </summary>
@@ -3698,7 +3743,16 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 *ws/httpupgrade/splithttp path 的本地化字符串。
+        ///   查找类似 *xhttp mode 的本地化字符串。
+        /// </summary>
+        public static string TransportHeaderTypeTip5 {
+            get {
+                return ResourceManager.GetString("TransportHeaderTypeTip5", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 *ws/httpupgrade/xhttp path 的本地化字符串。
         /// </summary>
         public static string TransportPathTip1 {
             get {
@@ -3752,7 +3806,7 @@ namespace ServiceLib.Resx {
         }
         
         /// <summary>
-        ///   查找类似 *ws/httpupgrade/splithttp host 的本地化字符串。
+        ///   查找类似 *ws/httpupgrade/xhttp host 的本地化字符串。
         /// </summary>
         public static string TransportRequestHostTip2 {
             get {

v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx

@@ -1033,4 +1033,358 @@
   <data name="menuProxiesSelectActivity" xml:space="preserve">
     <value>Select active node (Enter)</value>
   </data>
+  <data name="menuRemoteBackup" xml:space="preserve">
+    <value>Backup to remote (WebDAV)</value>
+  </data>
+  <data name="menuRemoteRestore" xml:space="preserve">
+    <value>Restore from remote (WebDAV)</value>
+  </data>
+  <data name="TbSettingsDomainStrategy4Out" xml:space="preserve">
+    <value>Default domain strategy for outbound</value>
+  </data>
+  <data name="menuSetDefaultMultipleServer" xml:space="preserve">
+    <value>Multi-Server lowest latency</value>
+  </data>
+  <data name="TbSettingsMainGirdOrientation" xml:space="preserve">
+    <value>Main layout orientation(Require restart)</value>
+  </data>
+  <data name="menuSetDefaultLoadBalanceServer" xml:space="preserve">
+    <value>Multi-server load balancing</value>
+  </data>
+  <data name="TbSettingsDomainDNSAddress" xml:space="preserve">
+    <value>Outbound DNS address</value>
+  </data>
+  <data name="menuProfileAutofitColumnWidth" xml:space="preserve">
+    <value>Auto column width adjustment</value>
+  </data>
+  <data name="menuExport2ShareUrlBase64" xml:space="preserve">
+    <value>Export Base64-encoded Share Links to Clipboard</value>
+  </data>
+  <data name="menuExport2ClientConfigClipboard" xml:space="preserve">
+    <value>Export selected server for complete configuration to clipboard</value>
+  </data>
+  <data name="menuShowOrHideMainWindow" xml:space="preserve">
+    <value>Show or hide the main window</value>
+  </data>
+  <data name="UpdateStandalonePackageTip" xml:space="preserve">
+    <value>You are currently running a standalone package, please manually download the SelfContained.7z file to unzip and overwrite it!</value>
+  </data>
+  <data name="TbPreSocksPort4Sub" xml:space="preserve">
+    <value>Custom config socks port</value>
+  </data>
+  <data name="menuBackupAndRestore" xml:space="preserve">
+    <value>Backup and Restore</value>
+  </data>
+  <data name="menuLocalBackup" xml:space="preserve">
+    <value>Backup to local</value>
+  </data>
+  <data name="menuLocalRestore" xml:space="preserve">
+    <value>Restore from local</value>
+  </data>
+  <data name="menuLocalBackupAndRestore" xml:space="preserve">
+    <value>Local</value>
+  </data>
+  <data name="menuRemoteBackupAndRestore" xml:space="preserve">
+    <value>Remote (WebDAV)</value>
+  </data>
+  <data name="LvWebDavUrl" xml:space="preserve">
+    <value>WebDav Url</value>
+  </data>
+  <data name="LvWebDavUserName" xml:space="preserve">
+    <value>WebDav User Name</value>
+  </data>
+  <data name="LvWebDavPassword" xml:space="preserve">
+    <value>WebDav Password</value>
+  </data>
+  <data name="LvWebDavCheck" xml:space="preserve">
+    <value>WebDav Check</value>
+  </data>
+  <data name="LvWebDavDirName" xml:space="preserve">
+    <value>Remote folder name (optional)</value>
+  </data>
+  <data name="LocalRestoreInvalidZipTips" xml:space="preserve">
+    <value>Invalid backup file</value>
+  </data>
+  <data name="ConnectionsHostFilterTitle" xml:space="preserve">
+    <value>Host filter</value>
+  </data>
+  <data name="TipActiveServer" xml:space="preserve">
+    <value>Active</value>
+  </data>
+  <data name="menuStorageUI" xml:space="preserve">
+    <value>Save Interface Layout</value>
+  </data>
+  <data name="TbSettingsGeoFilesSource" xml:space="preserve">
+    <value>Geo files source (optional)</value>
+  </data>
+  <data name="TbSettingsSrsFilesSource" xml:space="preserve">
+    <value>sing-box ruleset files source (optional)</value>
+  </data>
+  <data name="UpgradeAppNotExistTip" xml:space="preserve">
+    <value>UpgradeApp does not exist</value>
+  </data>
+  <data name="TbSettingsRoutingRulesSource" xml:space="preserve">
+    <value>Routing rules source (optional)</value>
+  </data>
+  <data name="menuRegionalPresets" xml:space="preserve">
+    <value>Regional presets setting</value>
+  </data>
+  <data name="menuRegionalPresetsDefault" xml:space="preserve">
+    <value>Default</value>
+  </data>
+  <data name="menuRegionalPresetsRussia" xml:space="preserve">
+    <value>Russia</value>
+  </data>
+  <data name="TbSettingsChinaUserTip" xml:space="preserve">
+    <value>Users in China region can ignore this item</value>
+  </data>
+  <data name="menuAddServerViaImage" xml:space="preserve">
+    <value>Scan QR code in the image</value>
+  </data>
+  <data name="InvalidUrlTip" xml:space="preserve">
+    <value>Invalid address (Url)</value>
+  </data>
+  <data name="InsecureUrlProtocol" xml:space="preserve">
+    <value>Please do not use the insecure HTTP protocol subscription address</value>
+  </data>
+  <data name="TbSettingsCurrentFontFamilyLinuxTip" xml:space="preserve">
+    <value>Install the font to the system and restart the settings</value>
+  </data>
+  <data name="menuExitTips" xml:space="preserve">
+    <value>Are you sure to exit?</value>
+  </data>
+  <data name="LvMemo" xml:space="preserve">
+    <value>Remarks Memo</value>
+  </data>
+  <data name="TbSettingsLogEnabledToFile" xml:space="preserve">
+    <value>Enable logging to file</value>
+  </data>
+  <data name="MsgSkipSubscriptionUpdate" xml:space="preserve">
+    <value>Updates are not enabled, skip this subscription</value>
+  </data>
+  <data name="menuRebootAsAdmin" xml:space="preserve">
+    <value>Restart as Administrator</value>
+  </data>
+  <data name="LvMoreUrl" xml:space="preserve">
+    <value>More URLs, separated by commas; Subscription conversion will be invalid</value>
+  </data>
+  <data name="SpeedDisplayText" xml:space="preserve">
+    <value>{0} : {1}/s↑ | {2}/s↓</value>
+  </data>
+  <data name="LvAutoUpdateInterval" xml:space="preserve">
+    <value>Automatic update interval (minutes)</value>
+  </data>
+  <data name="LvConvertTarget" xml:space="preserve">
+    <value>Convert target type</value>
+  </data>
+  <data name="LvConvertTargetTip" xml:space="preserve">
+    <value>Please leave blank if no conversion is required</value>
+  </data>
+  <data name="TipDisplayLog" xml:space="preserve">
+    <value>Please turn off when there is an abnormal disconnection</value>
+  </data>
+  <data name="menuDNSSetting" xml:space="preserve">
+    <value>DNS Settings</value>
+  </data>
+  <data name="TbDnsSingboxObjectDoc" xml:space="preserve">
+    <value>Please fill in DNS Structure, Click to view the document</value>
+  </data>
+  <data name="TbSettingDnsImportDefConfig" xml:space="preserve">
+    <value>Click to import default DNS config</value>
+  </data>
+  <data name="TbdomainStrategy4Singbox" xml:space="preserve">
+    <value>sing-box domain strategy</value>
+  </data>
+  <data name="TbSettingsMux4SboxProtocol" xml:space="preserve">
+    <value>sing-box Mux Protocol</value>
+  </data>
+  <data name="TbRoutingRuleProcess" xml:space="preserve">
+    <value>Full process name (Tun mode)</value>
+  </data>
+  <data name="TbRoutingRuleIP" xml:space="preserve">
+    <value>IP or IP CIDR</value>
+  </data>
+  <data name="TbRoutingRuleDomain" xml:space="preserve">
+    <value>Domain</value>
+  </data>
+  <data name="TbSettingsCoreDnsSingbox" xml:space="preserve">
+    <value>sing-box DNS settings</value>
+  </data>
+  <data name="SpeedtestingWait" xml:space="preserve">
+    <value>Waiting for testing (press ESC to terminate)...</value>
+  </data>
+  <data name="TbSpiderX" xml:space="preserve">
+    <value>SpiderX</value>
+  </data>
+  <data name="TbShortId" xml:space="preserve">
+    <value>ShortId</value>
+  </data>
+  <data name="menuMoveToGroup" xml:space="preserve">
+    <value>Move to group</value>
+  </data>
+  <data name="TbSettingsEnableDragDropSort" xml:space="preserve">
+    <value>Enable Server Drag Drop Sort(Require restart)</value>
+  </data>
+  <data name="TbAutoRefresh" xml:space="preserve">
+    <value>AutoRefresh</value>
+  </data>
+  <data name="SpeedtestingSkip" xml:space="preserve">
+    <value>Skip test</value>
+  </data>
+  <data name="menuEditServer" xml:space="preserve">
+    <value>Edit Server (Ctrl+D)</value>
+  </data>
+  <data name="TbSettingsDoubleClick2Activate" xml:space="preserve">
+    <value>Double-click server make active</value>
+  </data>
+  <data name="SpeedtestingCompleted" xml:space="preserve">
+    <value>Test completed</value>
+  </data>
+  <data name="TbSettingsDefFingerprint" xml:space="preserve">
+    <value>Default TLS fingerprint</value>
+  </data>
+  <data name="TbSettingsCurrentFontFamily" xml:space="preserve">
+    <value>FontFamily(Require restart)</value>
+  </data>
+  <data name="TbSettingsCurrentFontFamilyTip" xml:space="preserve">
+    <value>Copy the font TTF/TTC file to the directory guiFonts, restart the settings</value>
+  </data>
+  <data name="TbSettingsSocksPortTip" xml:space="preserve">
+    <value>http port = +1; Pac port = +4; *ray API port = +5; mihomo API port = +6;</value>
+  </data>
+  <data name="TbSettingsStartBootTip" xml:space="preserve">
+    <value>Set this with admin privileges, get admin privileges after startup</value>
+  </data>
+  <data name="TbSettingsFontSize" xml:space="preserve">
+    <value>Font Size</value>
+  </data>
+  <data name="TbSettingsSpeedTestTimeout" xml:space="preserve">
+    <value>SpeedTest Single Timeout Value</value>
+  </data>
+  <data name="TbSettingsSpeedTestUrl" xml:space="preserve">
+    <value>SpeedTest URL</value>
+  </data>
+  <data name="menuMoveTo" xml:space="preserve">
+    <value>Move up and down</value>
+  </data>
+  <data name="TbPublicKey" xml:space="preserve">
+    <value>PublicKey</value>
+  </data>
+  <data name="menuAddHysteria2Server" xml:space="preserve">
+    <value>Add [Hysteria2] server</value>
+  </data>
+  <data name="TbSettingsHysteriaBandwidth" xml:space="preserve">
+    <value>Hysteria Max bandwidth (Up/Dw)</value>
+  </data>
+  <data name="TbSettingsFollowSystemTheme" xml:space="preserve">
+    <value>Follow System Theme</value>
+  </data>
+  <data name="menuAddTuicServer" xml:space="preserve">
+    <value>Add [TUIC] server</value>
+  </data>
+  <data name="TbSettingsEnableUpdateSubOnlyRemarksExist" xml:space="preserve">
+    <value>Updating subscription, only determine remarks exists</value>
+  </data>
+  <data name="menuProxiesReload" xml:space="preserve">
+    <value>Refresh Proxies</value>
+  </data>
+  <data name="TbSortingNetwork" xml:space="preserve">
+    <value>Network</value>
+  </data>
+  <data name="TbSortingType" xml:space="preserve">
+    <value>Type</value>
+  </data>
+  <data name="TransportRequestHostTip5" xml:space="preserve">
+    <value>*grpc Authority</value>
+  </data>
+  <data name="menuAddHttpServer" xml:space="preserve">
+    <value>Add [HTTP] server</value>
+  </data>
+  <data name="TbSettingsSpeedPingTestUrl" xml:space="preserve">
+    <value>Speed Ping Test URL</value>
+  </data>
+  <data name="TbSettingsEnableFragmentTips" xml:space="preserve">
+    <value>Use Xray and enable non-Tun mode, which conflicts with the group previous proxy</value>
+  </data>
+  <data name="LvCustomRulesetPath4Singbox" xml:space="preserve">
+    <value>Custom the rule-set of sing-box</value>
+  </data>
+  <data name="NeedRebootTips" xml:space="preserve">
+    <value>Successful operation. Click the settings menu to reboot the app.</value>
+  </data>
+  <data name="menuOpenTheFileLocation" xml:space="preserve">
+    <value>Open the storage location</value>
+  </data>
+  <data name="TbSortingChain" xml:space="preserve">
+    <value>Chain</value>
+  </data>
+  <data name="TbSortingHost" xml:space="preserve">
+    <value>Host</value>
+  </data>
+  <data name="TbSettingsUseSystemHosts" xml:space="preserve">
+    <value>Use System Hosts</value>
+  </data>
+  <data name="TbSettingsEnableFragment" xml:space="preserve">
+    <value>Enable fragment</value>
+  </data>
+  <data name="TbAutoScrollToEnd" xml:space="preserve">
+    <value>Auto ScrollToEnd</value>
+  </data>
+  <data name="SpeedtestingStop" xml:space="preserve">
+    <value>Test terminating...</value>
+  </data>
+  <data name="LvNextProfile" xml:space="preserve">
+    <value>Next proxy remarks</value>
+  </data>
+  <data name="TbPath7" xml:space="preserve">
+    <value>obfs password</value>
+  </data>
+  <data name="TbHeaderType8" xml:space="preserve">
+    <value>Congestion control</value>
+  </data>
+  <data name="LvPrevProfile" xml:space="preserve">
+    <value>Previous proxy remarks</value>
+  </data>
+  <data name="TbLocalAddress" xml:space="preserve">
+    <value>Address(Ip,Ipv6)</value>
+  </data>
+  <data name="TbReserved" xml:space="preserve">
+    <value>Reserved(2,3,4)</value>
+  </data>
+  <data name="TbPrivateKey" xml:space="preserve">
+    <value>PrivateKey</value>
+  </data>
+  <data name="menuAddWireguardServer" xml:space="preserve">
+    <value>Add [WireGuard] server</value>
+  </data>
+  <data name="TbSettingsEnableIPv6Address" xml:space="preserve">
+    <value>Enable IPv6 Address</value>
+  </data>
+  <data name="TbSettingsEnableExInbound" xml:space="preserve">
+    <value>Enable additional Inbound</value>
+  </data>
+  <data name="LvPrevProfileTip" xml:space="preserve">
+    <value>Please make sure the remarks exists and is unique</value>
+  </data>
+  <data name="TbRuleMatchingTips" xml:space="preserve">
+    <value>(Domain or IP or ProcName) and Port and Protocol and InboundTag =&gt; OutboundTag</value>
+  </data>
+  <data name="TbSettingsLinuxSudoPassword" xml:space="preserve">
+    <value>Linux system sudo password</value>
+  </data>
+  <data name="TbSettingsLinuxSudoPasswordTip" xml:space="preserve">
+    <value>The password will only be stored in the local file.</value>
+  </data>
+  <data name="TbSettingsLinuxSudoPasswordIsEmpty" xml:space="preserve">
+    <value>Please set the sudo password in Tun mode settings first</value>
+  </data>
+  <data name="TbSettingsLinuxSudoPasswordNotSudoRunApp" xml:space="preserve">
+    <value>Please do not run this app with sudo</value>
+  </data>
+  <data name="TransportHeaderTypeTip5" xml:space="preserve">
+    <value>*xhttp mode</value>
+  </data>
+  <data name="TransportExtraTip" xml:space="preserve">
+    <value>XHTTP Extra raw JSON, format: { XHTTPObject }</value>
+  </data>
 </root>

v2rayN/ServiceLib/Resx/ResUI.resx

@@ -344,7 +344,7 @@
     <value>Please fill in the correct custom DNS</value>
   </data>
   <data name="TransportPathTip1" xml:space="preserve">
-    <value>*ws/httpupgrade/splithttp path</value>
+    <value>*ws/httpupgrade/xhttp path</value>
   </data>
   <data name="TransportPathTip2" xml:space="preserve">
     <value>*h2 path</value>
@@ -359,7 +359,7 @@
     <value>*http host Separated by commas (,)</value>
   </data>
   <data name="TransportRequestHostTip2" xml:space="preserve">
-    <value>*ws/httpupgrade/splithttp host</value>
+    <value>*ws/httpupgrade/xhttp host</value>
   </data>
   <data name="TransportRequestHostTip3" xml:space="preserve">
     <value>*h2 host Separated by commas (,)</value>
@@ -1369,4 +1369,22 @@
   <data name="LvMemo" xml:space="preserve">
     <value>Remarks Memo</value>
   </data>
+  <data name="TbSettingsLinuxSudoPassword" xml:space="preserve">
+    <value>Linux system sudo password</value>
+  </data>
+  <data name="TbSettingsLinuxSudoPasswordTip" xml:space="preserve">
+    <value>The password will only be stored in the local file.</value>
+  </data>
+  <data name="TbSettingsLinuxSudoPasswordIsEmpty" xml:space="preserve">
+    <value>Please set the sudo password in Tun mode settings first</value>
+  </data>
+  <data name="TbSettingsLinuxSudoPasswordNotSudoRunApp" xml:space="preserve">
+    <value>Please do not run this app with sudo</value>
+  </data>
+  <data name="TransportHeaderTypeTip5" xml:space="preserve">
+    <value>*xhttp mode</value>
+  </data>
+  <data name="TransportExtraTip" xml:space="preserve">
+    <value>XHTTP Extra raw JSON, format: { XHTTPObject }</value>
+  </data>
 </root>

v2rayN/ServiceLib/Resx/ResUI.ru.resx

@@ -1046,6 +1046,345 @@
     <value>Россия</value>
   </data>
   <data name="TbSettingsChinaUserTip" xml:space="preserve">
-    <value>Используйте Настройки -> Региональные пресеты вместо изменения этого поля</value>
+    <value>Используйте Настройки -&gt; Региональные пресеты вместо изменения этого поля</value>
+  </data>
+  <data name="LvMemo" xml:space="preserve">
+    <value>Remarks Memo</value>
+  </data>
+  <data name="TbSettingsSpeedPingTestUrl" xml:space="preserve">
+    <value>Speed Ping Test URL</value>
+  </data>
+  <data name="menuProxiesDelaytestPart" xml:space="preserve">
+    <value>Part Node Latency Test</value>
+  </data>
+  <data name="menuProxiesReload" xml:space="preserve">
+    <value>Refresh Proxies</value>
+  </data>
+  <data name="TbAutoScrollToEnd" xml:space="preserve">
+    <value>Auto ScrollToEnd</value>
+  </data>
+  <data name="menuProxiesSelectActivity" xml:space="preserve">
+    <value>Select active node (Enter)</value>
+  </data>
+  <data name="TbRuleMatchingTips" xml:space="preserve">
+    <value>(Domain or IP or ProcName) and Port and Protocol and InboundTag =&gt; OutboundTag</value>
+  </data>
+  <data name="TbPath7" xml:space="preserve">
+    <value>obfs password</value>
+  </data>
+  <data name="TbLocalAddress" xml:space="preserve">
+    <value>Address(Ip,Ipv6)</value>
+  </data>
+  <data name="TbSettingsDomainStrategy4Out" xml:space="preserve">
+    <value>Default domain strategy for outbound</value>
+  </data>
+  <data name="menuSetDefaultMultipleServer" xml:space="preserve">
+    <value>Multi-Server lowest latency</value>
+  </data>
+  <data name="TbSettingsMainGirdOrientation" xml:space="preserve">
+    <value>Main layout orientation(Require restart)</value>
+  </data>
+  <data name="menuSetDefaultLoadBalanceServer" xml:space="preserve">
+    <value>Multi-server load balancing</value>
+  </data>
+  <data name="menuProxiesDelaytest" xml:space="preserve">
+    <value>Latency Test</value>
+  </data>
+  <data name="TbReserved" xml:space="preserve">
+    <value>Reserved(2,3,4)</value>
+  </data>
+  <data name="TbPrivateKey" xml:space="preserve">
+    <value>PrivateKey</value>
+  </data>
+  <data name="menuAddWireguardServer" xml:space="preserve">
+    <value>Add [WireGuard] server</value>
+  </data>
+  <data name="menuProfileAutofitColumnWidth" xml:space="preserve">
+    <value>Auto column width adjustment</value>
+  </data>
+  <data name="menuExport2ShareUrlBase64" xml:space="preserve">
+    <value>Export Base64-encoded Share Links to Clipboard</value>
+  </data>
+  <data name="TbSortingDelay" xml:space="preserve">
+    <value>Delay</value>
+  </data>
+  <data name="TbSettingsEnableExInbound" xml:space="preserve">
+    <value>Enable additional Inbound</value>
+  </data>
+  <data name="LvPrevProfileTip" xml:space="preserve">
+    <value>Please make sure the remarks exists and is unique</value>
+  </data>
+  <data name="menuExport2ClientConfigClipboard" xml:space="preserve">
+    <value>Export selected server for complete configuration to clipboard</value>
+  </data>
+  <data name="LvNextProfile" xml:space="preserve">
+    <value>Next proxy remarks</value>
+  </data>
+  <data name="menuShowOrHideMainWindow" xml:space="preserve">
+    <value>Show or hide the main window</value>
+  </data>
+  <data name="LvPrevProfile" xml:space="preserve">
+    <value>Previous proxy remarks</value>
+  </data>
+  <data name="TbHeaderType8" xml:space="preserve">
+    <value>Congestion control</value>
+  </data>
+  <data name="TbSettingsDomainDNSAddress" xml:space="preserve">
+    <value>Outbound DNS address</value>
+  </data>
+  <data name="TbSettingsEnableUpdateSubOnlyRemarksExist" xml:space="preserve">
+    <value>Updating subscription, only determine remarks exists</value>
+  </data>
+  <data name="SpeedtestingStop" xml:space="preserve">
+    <value>Test terminating...</value>
+  </data>
+  <data name="TransportRequestHostTip5" xml:space="preserve">
+    <value>*grpc Authority</value>
+  </data>
+  <data name="TbSortingDefault" xml:space="preserve">
+    <value>Default</value>
+  </data>
+  <data name="TbSortingChain" xml:space="preserve">
+    <value>Chain</value>
+  </data>
+  <data name="TbSorting" xml:space="preserve">
+    <value>Sorting</value>
+  </data>
+  <data name="menuOpenTheFileLocation" xml:space="preserve">
+    <value>Open the storage location</value>
+  </data>
+  <data name="NeedRebootTips" xml:space="preserve">
+    <value>Successful operation. Click the settings menu to reboot the app.</value>
+  </data>
+  <data name="LvCustomRulesetPath4Singbox" xml:space="preserve">
+    <value>Custom the rule-set of sing-box</value>
+  </data>
+  <data name="TbSortingDownTraffic" xml:space="preserve">
+    <value>Download Traffic</value>
+  </data>
+  <data name="TbSortingHost" xml:space="preserve">
+    <value>Host</value>
+  </data>
+  <data name="TbSortingName" xml:space="preserve">
+    <value>Name</value>
+  </data>
+  <data name="TbSortingNetwork" xml:space="preserve">
+    <value>Network</value>
+  </data>
+  <data name="TbSortingTime" xml:space="preserve">
+    <value>Time</value>
+  </data>
+  <data name="TbSortingType" xml:space="preserve">
+    <value>Type</value>
+  </data>
+  <data name="TbSettingsEnableCacheFile4Sbox" xml:space="preserve">
+    <value>Enable cache file for sing-box (ruleset files)</value>
+  </data>
+  <data name="TbSortingUpSpeed" xml:space="preserve">
+    <value>Upload Speed</value>
+  </data>
+  <data name="TbSortingUpTraffic" xml:space="preserve">
+    <value>Upload Traffic</value>
+  </data>
+  <data name="TbConnections" xml:space="preserve">
+    <value>Connections</value>
+  </data>
+  <data name="menuConnectionClose" xml:space="preserve">
+    <value>Close Connection</value>
+  </data>
+  <data name="menuConnectionCloseAll" xml:space="preserve">
+    <value>Close All Connection</value>
+  </data>
+  <data name="TbProxies" xml:space="preserve">
+    <value>Proxies</value>
+  </data>
+  <data name="menuRulemode" xml:space="preserve">
+    <value>Rule mode</value>
+  </data>
+  <data name="menuModeDirect" xml:space="preserve">
+    <value>Direct</value>
+  </data>
+  <data name="menuModeGlobal" xml:space="preserve">
+    <value>Global</value>
+  </data>
+  <data name="menuModeNothing" xml:space="preserve">
+    <value>Do not change</value>
+  </data>
+  <data name="TbSettingsEnableFragment" xml:space="preserve">
+    <value>Enable fragment</value>
+  </data>
+  <data name="TbSettingsEnableFragmentTips" xml:space="preserve">
+    <value>Use Xray and enable non-Tun mode, which conflicts with the group previous proxy</value>
+  </data>
+  <data name="menuModeRule" xml:space="preserve">
+    <value>Rule</value>
+  </data>
+  <data name="menuAddHttpServer" xml:space="preserve">
+    <value>Add [HTTP] server</value>
+  </data>
+  <data name="menuAddTuicServer" xml:space="preserve">
+    <value>Add [TUIC] server</value>
+  </data>
+  <data name="UpdateStandalonePackageTip" xml:space="preserve">
+    <value>You are currently running a standalone package, please manually download the SelfContained.7z file to unzip and overwrite it!</value>
+  </data>
+  <data name="TbSettingsEnableIPv6Address" xml:space="preserve">
+    <value>Enable IPv6 Address</value>
+  </data>
+  <data name="TbPreSocksPort4Sub" xml:space="preserve">
+    <value>Custom config socks port</value>
+  </data>
+  <data name="LvWebDavCheck" xml:space="preserve">
+    <value>WebDav Check</value>
+  </data>
+  <data name="TbRoutingRuleDomain" xml:space="preserve">
+    <value>Domain</value>
+  </data>
+  <data name="TbRoutingRuleIP" xml:space="preserve">
+    <value>IP or IP CIDR</value>
+  </data>
+  <data name="TbRoutingRuleProcess" xml:space="preserve">
+    <value>Full process name (Tun mode)</value>
+  </data>
+  <data name="TbSettingsMux4SboxProtocol" xml:space="preserve">
+    <value>sing-box Mux Protocol</value>
+  </data>
+  <data name="LocalRestoreInvalidZipTips" xml:space="preserve">
+    <value>Invalid backup file</value>
+  </data>
+  <data name="TbdomainStrategy4Singbox" xml:space="preserve">
+    <value>sing-box domain strategy</value>
+  </data>
+  <data name="ConnectionsHostFilterTitle" xml:space="preserve">
+    <value>Host filter</value>
+  </data>
+  <data name="TbSettingDnsImportDefConfig" xml:space="preserve">
+    <value>Click to import default DNS config</value>
+  </data>
+  <data name="TipActiveServer" xml:space="preserve">
+    <value>Active</value>
+  </data>
+  <data name="TbDnsSingboxObjectDoc" xml:space="preserve">
+    <value>Please fill in DNS Structure, Click to view the document</value>
+  </data>
+  <data name="LvConvertTargetTip" xml:space="preserve">
+    <value>Please leave blank if no conversion is required</value>
+  </data>
+  <data name="LvConvertTarget" xml:space="preserve">
+    <value>Convert target type</value>
+  </data>
+  <data name="menuStorageUI" xml:space="preserve">
+    <value>Save Interface Layout</value>
+  </data>
+  <data name="SpeedDisplayText" xml:space="preserve">
+    <value>{0} : {1}/s↑ | {2}/s↓</value>
+  </data>
+  <data name="LvMoreUrl" xml:space="preserve">
+    <value>More URLs, separated by commas; Subscription conversion will be invalid</value>
+  </data>
+  <data name="MsgSkipSubscriptionUpdate" xml:space="preserve">
+    <value>Updates are not enabled, skip this subscription</value>
+  </data>
+  <data name="UpgradeAppNotExistTip" xml:space="preserve">
+    <value>UpgradeApp does not exist</value>
+  </data>
+  <data name="menuAddServerViaImage" xml:space="preserve">
+    <value>Scan QR code in the image</value>
+  </data>
+  <data name="TipDisplayLog" xml:space="preserve">
+    <value>Please turn off when there is an abnormal disconnection</value>
+  </data>
+  <data name="SpeedtestingWait" xml:space="preserve">
+    <value>Waiting for testing (press ESC to terminate)...</value>
+  </data>
+  <data name="TbSpiderX" xml:space="preserve">
+    <value>SpiderX</value>
+  </data>
+  <data name="TbShortId" xml:space="preserve">
+    <value>ShortId</value>
+  </data>
+  <data name="InvalidUrlTip" xml:space="preserve">
+    <value>Invalid address (Url)</value>
+  </data>
+  <data name="InsecureUrlProtocol" xml:space="preserve">
+    <value>Please do not use the insecure HTTP protocol subscription address</value>
+  </data>
+  <data name="TbPublicKey" xml:space="preserve">
+    <value>PublicKey</value>
+  </data>
+  <data name="menuMoveTo" xml:space="preserve">
+    <value>Move up and down</value>
+  </data>
+  <data name="TbSettingsSocksPortTip" xml:space="preserve">
+    <value>http port = +1; Pac port = +4; *ray API port = +5; mihomo API port = +6;</value>
+  </data>
+  <data name="TbSettingsCurrentFontFamilyLinuxTip" xml:space="preserve">
+    <value>Install the font to the system and restart the settings</value>
+  </data>
+  <data name="menuAddHysteria2Server" xml:space="preserve">
+    <value>Add [Hysteria2] server</value>
+  </data>
+  <data name="LvWebDavPassword" xml:space="preserve">
+    <value>WebDav Password</value>
+  </data>
+  <data name="LvWebDavDirName" xml:space="preserve">
+    <value>Remote folder name (optional)</value>
+  </data>
+  <data name="TbSortingDownSpeed" xml:space="preserve">
+    <value>Download Speed</value>
+  </data>
+  <data name="menuRemoteRestore" xml:space="preserve">
+    <value>Restore from remote (WebDAV)</value>
+  </data>
+  <data name="menuRemoteBackup" xml:space="preserve">
+    <value>Backup to remote (WebDAV)</value>
+  </data>
+  <data name="LvWebDavUserName" xml:space="preserve">
+    <value>WebDav User Name</value>
+  </data>
+  <data name="menuLocalRestore" xml:space="preserve">
+    <value>Restore from local</value>
+  </data>
+  <data name="menuLocalBackup" xml:space="preserve">
+    <value>Backup to local</value>
+  </data>
+  <data name="TbSettingsUseSystemHosts" xml:space="preserve">
+    <value>Use System Hosts</value>
+  </data>
+  <data name="menuBackupAndRestore" xml:space="preserve">
+    <value>Backup and Restore</value>
+  </data>
+  <data name="menuLocalBackupAndRestore" xml:space="preserve">
+    <value>Local</value>
+  </data>
+  <data name="menuExitTips" xml:space="preserve">
+    <value>Are you sure to exit?</value>
+  </data>
+  <data name="TbSettingsHysteriaBandwidth" xml:space="preserve">
+    <value>Hysteria Max bandwidth (Up/Dw)</value>
+  </data>
+  <data name="LvWebDavUrl" xml:space="preserve">
+    <value>WebDav Url</value>
+  </data>
+  <data name="menuRemoteBackupAndRestore" xml:space="preserve">
+    <value>Remote (WebDAV)</value>
+  </data>
+  <data name="TbSettingsLinuxSudoPassword" xml:space="preserve">
+    <value>Linux system sudo password</value>
+  </data>
+  <data name="TbSettingsLinuxSudoPasswordTip" xml:space="preserve">
+    <value>The password will only be stored in the local file.</value>
+  </data>
+  <data name="TbSettingsLinuxSudoPasswordIsEmpty" xml:space="preserve">
+    <value>Please set the sudo password in Tun mode settings first</value>
+  </data>
+  <data name="TbSettingsLinuxSudoPasswordNotSudoRunApp" xml:space="preserve">
+    <value>Please do not run this app with sudo</value>
+  </data>
+  <data name="TransportHeaderTypeTip5" xml:space="preserve">
+    <value>*xhttp mode</value>
+  </data>
+  <data name="TransportExtraTip" xml:space="preserve">
+    <value>XHTTP Extra raw JSON, format: { XHTTPObject }</value>
   </data>
 </root>

v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx

@@ -344,7 +344,7 @@
     <value>请填写正确的自定义DNS</value>
   </data>
   <data name="TransportPathTip1" xml:space="preserve">
-    <value>*ws/httpupgrade/splithttp path</value>
+    <value>*ws/httpupgrade/xhttp path</value>
   </data>
   <data name="TransportPathTip2" xml:space="preserve">
     <value>*h2 path</value>
@@ -359,7 +359,7 @@
     <value>*http host中间逗号(,)分隔</value>
   </data>
   <data name="TransportRequestHostTip2" xml:space="preserve">
-    <value>*ws/httpupgrade/splithttp host</value>
+    <value>*ws/httpupgrade/xhttp host</value>
   </data>
   <data name="TransportRequestHostTip3" xml:space="preserve">
     <value>*h2 host中间逗号(,)分隔</value>
@@ -1271,7 +1271,7 @@
     <value>显示或隐藏主界面</value>
   </data>
   <data name="UpdateStandalonePackageTip" xml:space="preserve">
-    <value>您当前运行的是独立包，请手动下载 SelfContained.7z文件解压覆盖</value>
+    <value>您当前运行的是独立包，请手动下载 SelfContained.7z文件解压覆盖！</value>
   </data>
   <data name="TbPreSocksPort4Sub" xml:space="preserve">
     <value>自定义配置的Socks端口</value>
@@ -1366,4 +1366,22 @@
   <data name="LvMemo" xml:space="preserve">
     <value>备注备忘</value>
   </data>
+  <data name="TbSettingsLinuxSudoPassword" xml:space="preserve">
+    <value>Linux系统的sudo密码</value>
+  </data>
+  <data name="TbSettingsLinuxSudoPasswordTip" xml:space="preserve">
+    <value>密码只会存储在本地文件中，没有密码无法开启Tun</value>
+  </data>
+  <data name="TbSettingsLinuxSudoPasswordIsEmpty" xml:space="preserve">
+    <value>请先在Tun模式设置中设置sudo密码</value>
+  </data>
+  <data name="TbSettingsLinuxSudoPasswordNotSudoRunApp" xml:space="preserve">
+    <value>请不要用sudo运行本app</value>
+  </data>
+  <data name="TransportHeaderTypeTip5" xml:space="preserve">
+    <value>*xhttp 模式</value>
+  </data>
+  <data name="TransportExtraTip" xml:space="preserve">
+    <value>XHTTP Extra 原始 JSON，格式： { XHTTPObject }</value>
+  </data>
 </root>

v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx

@@ -301,7 +301,7 @@
     <value>掃描匯入分享链接成功</value>
   </data>
   <data name="TestMeOutput" xml:space="preserve">
-    <value>目前服務的真連接延遲: {0} ms</value>
+    <value>目前服務的真連線延遲: {0} ms</value>
   </data>
   <data name="OperationSuccess" xml:space="preserve">
     <value>操作成功</value>
@@ -343,7 +343,7 @@
     <value>請填寫正確的自訂DNS</value>
   </data>
   <data name="TransportPathTip1" xml:space="preserve">
-    <value>*ws/httpupgrade/splithttp path</value>
+    <value>*ws/httpupgrade/xhttp path</value>
   </data>
   <data name="TransportPathTip2" xml:space="preserve">
     <value>*h2 path</value>
@@ -358,7 +358,7 @@
     <value>*http host中間逗號(,)分隔</value>
   </data>
   <data name="TransportRequestHostTip2" xml:space="preserve">
-    <value>*ws/httpupgrade/splithttp host</value>
+    <value>*ws/httpupgrade/xhttp host</value>
   </data>
   <data name="TransportRequestHostTip3" xml:space="preserve">
     <value>*h2 host中間逗號(,)分隔</value>
@@ -511,7 +511,7 @@
     <value>清除所有服務統計資料</value>
   </data>
   <data name="menuRealPingServer" xml:space="preserve">
-    <value>測試伺服器真連接延遲(多選) (Ctrl+R)</value>
+    <value>測試伺服器真連線延遲(多選) (Ctrl+R)</value>
   </data>
   <data name="menuSortServerResult" xml:space="preserve">
     <value>按測試結果排序</value>
@@ -683,7 +683,7 @@
     <value>進階代理設定, 協定選擇(可選)</value>
   </data>
   <data name="TbSettingsAllowLAN" xml:space="preserve">
-    <value>允許來自區域網路的連接</value>
+    <value>允許來自區域網路的連線</value>
   </data>
   <data name="TbSettingsAutoHideStartup" xml:space="preserve">
     <value>啟動後隱藏視窗</value>
@@ -1106,7 +1106,7 @@
     <value>自动滚动到末尾</value>
   </data>
   <data name="TbSettingsSpeedPingTestUrl" xml:space="preserve">
-    <value>真連接測試地址</value>
+    <value>真連線測試位址</value>
   </data>
   <data name="TbSettingsEnableUpdateSubOnlyRemarksExist" xml:space="preserve">
     <value>更新訂閱時只判斷別名是否存在</value>
@@ -1151,7 +1151,7 @@
     <value>顯示或隱藏主介面</value>
   </data>
   <data name="UpdateStandalonePackageTip" xml:space="preserve">
-    <value>您目前運行的是獨立包，請手動下載 SelfContained.7z檔案解壓縮覆蓋</value>
+    <value>您目前運行的是獨立包，請手動下載 SelfContained.7z檔案解壓縮覆蓋！</value>
   </data>
   <data name="TbPreSocksPort4Sub" xml:space="preserve">
     <value>自訂設定的Socks端口</value>
@@ -1187,7 +1187,7 @@
     <value>WebDav 密碼</value>
   </data>
   <data name="LvWebDavUrl" xml:space="preserve">
-    <value>WebDav 伺服器地址</value>
+    <value>WebDav 伺服器位址</value>
   </data>
   <data name="LvWebDavDirName" xml:space="preserve">
     <value>遠端資料夾名稱(可選)</value>
@@ -1205,25 +1205,25 @@
     <value>儲存介面佈局</value>
   </data>
   <data name="TbSettingsGeoFilesSource" xml:space="preserve">
-    <value>Geo文件來源(可選)</value>
+    <value>Geo檔案來源(可選)</value>
   </data>
   <data name="UpgradeAppNotExistTip" xml:space="preserve">
-    <value>升级工具App不存在</value>
+    <value>升級工具App不存在</value>
   </data>
   <data name="TbSettingsSrsFilesSource" xml:space="preserve">
-    <value>sing-box ruleset文件來源(可選)</value>
+    <value>sing-box ruleset檔案來源(可選)</value>
   </data>
   <data name="TbSettingsRoutingRulesSource" xml:space="preserve">
-    <value>路由规则集来源(可选)</value>
+    <value>路由規則集來源(可選)</value>
   </data>
   <data name="TbSettingsChinaUserTip" xml:space="preserve">
-    <value>中国区域用户可忽略此项</value>
+    <value>中國區域用戶可忽略此項</value>
   </data>
   <data name="menuRegionalPresets" xml:space="preserve">
-    <value>区域预置设置</value>
+    <value>區域預置設定</value>
   </data>
   <data name="menuRegionalPresetsDefault" xml:space="preserve">
-    <value>默认区域</value>
+    <value>預設區域</value>
   </data>
   <data name="menuRegionalPresetsRussia" xml:space="preserve">
     <value>俄羅斯</value>
@@ -1232,13 +1232,13 @@
     <value>掃描圖片中的二維碼</value>
   </data>
   <data name="InvalidUrlTip" xml:space="preserve">
-    <value>地址(Url)無效</value>
+    <value>位址(Url)無效</value>
   </data>
   <data name="InsecureUrlProtocol" xml:space="preserve">
     <value>請不要使用不安全的HTTP協定訂閱位址</value>
   </data>
   <data name="TbSettingsCurrentFontFamilyLinuxTip" xml:space="preserve">
-    <value>安裝字體到系統中，重新啟動設定</value>
+    <value>安裝字型到系統中，重新啟動設定</value>
   </data>
   <data name="menuExitTips" xml:space="preserve">
     <value>是否確定退出？</value>
@@ -1246,4 +1246,142 @@
   <data name="LvMemo" xml:space="preserve">
     <value>備註備忘</value>
   </data>
+  <data name="TbHeaderType8" xml:space="preserve">
+    <value>擁塞控制算法</value>
+  </data>
+  <data name="menuProxiesSelectActivity" xml:space="preserve">
+    <value>設為活動節點 (Enter)</value>
+  </data>
+  <data name="menuProxiesReload" xml:space="preserve">
+    <value>重新整理</value>
+  </data>
+  <data name="TbSorting" xml:space="preserve">
+    <value>排序</value>
+  </data>
+  <data name="menuProxiesDelaytest" xml:space="preserve">
+    <value>延遲測試</value>
+  </data>
+  <data name="menuModeRule" xml:space="preserve">
+    <value>規則</value>
+  </data>
+  <data name="menuModeNothing" xml:space="preserve">
+    <value>随原配置</value>
+  </data>
+  <data name="menuModeGlobal" xml:space="preserve">
+    <value>全局</value>
+  </data>
+  <data name="menuModeDirect" xml:space="preserve">
+    <value>直連</value>
+  </data>
+  <data name="menuRulemode" xml:space="preserve">
+    <value>規則模式</value>
+  </data>
+  <data name="TbProxies" xml:space="preserve">
+    <value>目前代理</value>
+  </data>
+  <data name="menuConnectionCloseAll" xml:space="preserve">
+    <value>關閉所有連線</value>
+  </data>
+  <data name="TbSettingsDomainStrategy4Out" xml:space="preserve">
+    <value>Outbound預設解析策略</value>
+  </data>
+  <data name="menuConnectionClose" xml:space="preserve">
+    <value>關閉連線</value>
+  </data>
+  <data name="TbSortingUpTraffic" xml:space="preserve">
+    <value>上傳流量</value>
+  </data>
+  <data name="TbSortingUpSpeed" xml:space="preserve">
+    <value>上傳速度</value>
+  </data>
+  <data name="TbSortingType" xml:space="preserve">
+    <value>類型</value>
+  </data>
+  <data name="TbSortingTime" xml:space="preserve">
+    <value>時間</value>
+  </data>
+  <data name="TbSortingNetwork" xml:space="preserve">
+    <value>網路</value>
+  </data>
+  <data name="TbSortingName" xml:space="preserve">
+    <value>名稱</value>
+  </data>
+  <data name="TbSortingHost" xml:space="preserve">
+    <value>主機</value>
+  </data>
+  <data name="TbSortingDownTraffic" xml:space="preserve">
+    <value>下載流量</value>
+  </data>
+  <data name="TbSortingDownSpeed" xml:space="preserve">
+    <value>下載速度</value>
+  </data>
+  <data name="TbSortingDelay" xml:space="preserve">
+    <value>延遲</value>
+  </data>
+  <data name="TbSortingDefault" xml:space="preserve">
+    <value>預設</value>
+  </data>
+  <data name="TbConnections" xml:space="preserve">
+    <value>目前連線</value>
+  </data>
+  <data name="menuSetDefaultMultipleServer" xml:space="preserve">
+    <value>多伺服器最低延遲 (多選)</value>
+  </data>
+  <data name="menuProxiesDelaytestPart" xml:space="preserve">
+    <value>目前部分節點延遲測試</value>
+  </data>
+  <data name="menuSetDefaultLoadBalanceServer" xml:space="preserve">
+    <value>多伺服器負載平衡 (多選)</value>
+  </data>
+  <data name="menuAddHysteria2Server" xml:space="preserve">
+    <value>添加[Hysteria2]伺服器</value>
+  </data>
+  <data name="TbSettingsHysteriaBandwidth" xml:space="preserve">
+    <value>Hysteria 最大頻寬(Up/Dw)</value>
+  </data>
+  <data name="TbSettingsMainGirdOrientation" xml:space="preserve">
+    <value>主界面佈局方向(需重啟)</value>
+  </data>
+  <data name="menuAddWireguardServer" xml:space="preserve">
+    <value>添加[WireGuard]伺服器</value>
+  </data>
+  <data name="TbPrivateKey" xml:space="preserve">
+    <value>PrivateKey</value>
+  </data>
+  <data name="TbReserved" xml:space="preserve">
+    <value>Reserved(2,3,4)</value>
+  </data>
+  <data name="TbLocalAddress" xml:space="preserve">
+    <value>Address(Ip,Ipv6)</value>
+  </data>
+  <data name="TbSettingsUseSystemHosts" xml:space="preserve">
+    <value>使用系統hosts</value>
+  </data>
+  <data name="TbSortingChain" xml:space="preserve">
+    <value>路由鏈</value>
+  </data>
+  <data name="TbSettingsDomainDNSAddress" xml:space="preserve">
+    <value>Outbound域名解析位址</value>
+  </data>
+  <data name="TbPath7" xml:space="preserve">
+    <value>混淆密碼(obfs password)</value>
+  </data>
+  <data name="TbSettingsLinuxSudoPassword" xml:space="preserve">
+    <value>Linux系統的sudo密碼</value>
+  </data>
+  <data name="TbSettingsLinuxSudoPasswordTip" xml:space="preserve">
+    <value>密碼只會儲存在本機檔案中，沒有密碼無法開啟Tun</value>
+  </data>
+  <data name="TbSettingsLinuxSudoPasswordIsEmpty" xml:space="preserve">
+    <value>請先在Tun模式設定中設定sudo密碼</value>
+  </data>
+  <data name="TbSettingsLinuxSudoPasswordNotSudoRunApp" xml:space="preserve">
+    <value>請不要用sudo來運行本app</value>
+  </data>
+  <data name="TransportHeaderTypeTip5" xml:space="preserve">
+    <value>*xhttp 模式</value>
+  </data>
+  <data name="TransportExtraTip" xml:space="preserve">
+    <value>XHTTP Extra 原始 JSON，格式： { XHTTPObject }</value>
+  </data>
 </root>

v2rayN/ServiceLib/Sample/custom_routing_black

@@ -1,73 +1,149 @@
 [
-  {
-    "remarks": "绕过bittorrent",
-    "outboundTag": "direct",
-    "protocol": [
-      "bittorrent"
-    ]
-  },
-  {
-    "remarks": "Google cn",
-    "outboundTag": "proxy",
-    "domain": [
-      "domain:googleapis.cn",
-      "domain:gstatic.com"
-    ]
-  },
-  {
-    "remarks": "阻断udp443",
-    "outboundTag": "block",
-    "port": "443",
-    "network": "udp"
-  },
-  {
-    "remarks": "阻断广告",
-    "outboundTag": "block",
-    "domain": [
-      "geosite:category-ads-all"
-    ]
-  },
-  {
-    "remarks": "绕过局域网IP",
-    "outboundTag": "direct",
-    "ip": [
-      "geoip:private"
-    ]
-  },
-  {
-    "remarks": "绕过局域网域名",
-    "outboundTag": "direct",
-    "domain": [
-      "geosite:private"
-    ]
-  },
-  {
-    "remarks": "代理IP",
-    "outboundTag": "proxy",
-    "ip": [
-      "1.0.0.1",
-      "1.1.1.1",
-      "8.8.8.8",
-      "8.8.4.4",
-      "geoip:facebook",
-      "geoip:fastly",
-      "geoip:google",
-      "geoip:netflix",
-      "geoip:telegram",
-      "geoip:twitter"
-    ]
-  },
-  {
-    "remarks": "代理GFW",
-    "outboundTag": "proxy",
-    "domain": [
-      "geosite:gfw",
-      "geosite:greatfire"
-    ]
-  },
-  {
-    "remarks": "最终直连",
-    "port": "0-65535",
-    "outboundTag": "direct"
-  }
+    {
+        "remarks": "绕过bittorrent",
+        "outboundTag": "direct",
+        "protocol": [
+            "bittorrent"
+        ]
+    },
+    {
+        "remarks": "Google cn",
+        "outboundTag": "proxy",
+        "domain": [
+            "domain:googleapis.cn",
+            "domain:gstatic.com"
+        ]
+    },
+    {
+        "remarks": "阻断udp443",
+        "outboundTag": "block",
+        "port": "443",
+        "network": "udp"
+    },
+    {
+        "remarks": "阻断广告",
+        "outboundTag": "block",
+        "domain": [
+            "geosite:category-ads-all"
+        ]
+    },
+    {
+        "remarks": "绕过局域网IP",
+        "outboundTag": "direct",
+        "ip": [
+            "geoip:private"
+        ]
+    },
+    {
+        "remarks": "绕过局域网域名",
+        "outboundTag": "direct",
+        "domain": [
+            "geosite:private"
+        ]
+    },
+    {
+        "remarks": "代理海外公共DNSIP",
+        "outboundTag": "proxy",
+        "ip": [
+            "1.1.1.1",
+            "1.0.0.1",
+            "2606:4700:4700::1111",
+            "2606:4700:4700::1001",
+            "1.1.1.2",
+            "1.0.0.2",
+            "2606:4700:4700::1112",
+            "2606:4700:4700::1002",
+            "1.1.1.3",
+            "1.0.0.3",
+            "2606:4700:4700::1113",
+            "2606:4700:4700::1003",
+            "8.8.8.8",
+            "8.8.4.4",
+            "2001:4860:4860::8888",
+            "2001:4860:4860::8844",
+            "94.140.14.14",
+            "94.140.15.15",
+            "2a10:50c0::ad1:ff",
+            "2a10:50c0::ad2:ff",
+            "94.140.14.15",
+            "94.140.15.16",
+            "2a10:50c0::bad1:ff",
+            "2a10:50c0::bad2:ff",
+            "94.140.14.140",
+            "94.140.14.141",
+            "2a10:50c0::1:ff",
+            "2a10:50c0::2:ff",
+            "208.67.222.222",
+            "208.67.220.220",
+            "2620:119:35::35",
+            "2620:119:53::53",
+            "208.67.222.123",
+            "208.67.220.123",
+            "2620:119:35::123",
+            "2620:119:53::123",
+            "9.9.9.9",
+            "149.112.112.112",
+            "2620:fe::9",
+            "2620:fe::fe",
+            "9.9.9.11",
+            "149.112.112.11",
+            "2620:fe::11",
+            "2620:fe::fe:11",
+            "9.9.9.10",
+            "149.112.112.10",
+            "2620:fe::10",
+            "2620:fe::fe:10",
+            "77.88.8.8",
+            "77.88.8.1",
+            "2a02:6b8::feed:0ff",
+            "2a02:6b8:0:1::feed:0ff",
+            "77.88.8.88",
+            "77.88.8.2",
+            "2a02:6b8::feed:bad",
+            "2a02:6b8:0:1::feed:bad",
+            "77.88.8.7",
+            "77.88.8.3",
+            "2a02:6b8::feed:a11",
+            "2a02:6b8:0:1::feed:a11"
+        ]
+    },
+    {
+        "remarks": "代理海外公共DNS域名",
+        "outboundTag": "proxy",
+        "domain": [
+            "domain:cloudflare-dns.com",
+            "domain:one.one.one.one",
+            "domain:dns.google",
+            "domain:adguard-dns.com",
+            "domain:opendns.com",
+            "domain:umbrella.com",
+            "domain:quad9.net",
+            "domain:yandex.net"
+        ]
+    },
+    {
+        "remarks": "代理IP",
+        "outboundTag": "proxy",
+        "ip": [
+            "geoip:facebook",
+            "geoip:fastly",
+            "geoip:google",
+            "geoip:netflix",
+            "geoip:telegram",
+            "geoip:twitter"
+        ]
+    },
+    {
+        "remarks": "代理GFW",
+        "outboundTag": "proxy",
+        "domain": [
+            "geosite:gfw",
+            "geosite:greatfire"
+        ]
+    },
+    {
+        "remarks": "最终直连",
+        "port": "0-65535",
+        "outboundTag": "direct"
+    }
 ]

v2rayN/ServiceLib/Sample/custom_routing_rules

@@ -1,4 +1,5 @@
-[{
+[
+	{
 		"remarks": "block",
 		"outboundTag": "block",
 		"domain": [
@@ -12,14 +13,14 @@
 			"geosite:cn"
 		]
 	},
-  {
-    "remarks": "direct",
-    "outboundTag": "direct",
-    "ip": [
-      "geoip:private",
-      "geoip:cn"
-    ]
-  },
+	{
+		"remarks": "direct",
+		"outboundTag": "direct",
+		"ip": [
+			"geoip:private",
+			"geoip:cn"
+		]
+	},
 	{
 		"remarks": "proxy",
 		"port": "0-65535",

v2rayN/ServiceLib/Sample/custom_routing_white

@@ -34,29 +34,62 @@
       "geosite:private"
     ]
   },
+  {
+    "remarks": "绕过中国公共DNSIP",
+    "outboundTag": "direct",
+    "ip": [
+      "223.5.5.5",
+      "223.6.6.6",
+      "2400:3200::1",
+      "2400:3200:baba::1",
+      "119.29.29.29",
+      "1.12.12.12",
+      "120.53.53.53",
+      "2402:4e00::",
+      "2402:4e00:1::",
+      "180.76.76.76",
+      "2400:da00::6666",
+      "114.114.114.114",
+      "114.114.115.115",
+      "114.114.114.119",
+      "114.114.115.119",
+      "114.114.114.110",
+      "114.114.115.110",
+      "180.184.1.1",
+      "180.184.2.2",
+      "101.226.4.6",
+      "218.30.118.6",
+      "123.125.81.6",
+      "140.207.198.6",
+      "1.2.4.8",
+      "210.2.4.8",
+      "52.80.66.66",
+      "117.50.22.22",
+      "2400:7fc0:849e:200::4",
+      "2404:c2c0:85d8:901::4",
+      "117.50.10.10",
+      "52.80.52.52",
+      "2400:7fc0:849e:200::8",
+      "2404:c2c0:85d8:901::8",
+      "117.50.60.30",
+      "52.80.60.30"
+    ]
+  },
+  {
+    "remarks": "绕过中国公共DNS域名",
+    "outboundTag": "direct",
+    "domain": [
+      "domain:alidns.com",
+      "domain:doh.pub",
+      "domain:dot.pub",
+      "domain:360.cn",
+      "domain:onedns.net"
+    ]
+  },
   {
     "remarks": "绕过中国IP",
     "outboundTag": "direct",
     "ip": [
-      "223.5.5.5/32",
-      "223.6.6.6/32",
-      "2400:3200::1/128",
-      "2400:3200:baba::1/128",
-      "119.29.29.29/32",
-      "1.12.12.12/32",
-      "120.53.53.53/32",
-      "2402:4e00::/128",
-      "2402:4e00:1::/128",
-      "180.76.76.76/32",
-      "2400:da00::6666/128",
-      "114.114.114.114/32",
-      "114.114.115.115/32",
-      "180.184.1.1/32",
-      "180.184.2.2/32",
-      "101.226.4.6/32",
-      "218.30.118.6/32",
-      "123.125.81.6/32",
-      "140.207.198.6/32",
       "geoip:cn"
     ]
   },
@@ -64,13 +97,7 @@
     "remarks": "绕过中国域名",
     "outboundTag": "direct",
     "domain": [
-      "domain:dns.alidns.com",
-      "domain:doh.pub",
-      "domain:dot.pub",
-      "domain:doh.360.cn",
-      "domain:dot.360.cn",
-      "geosite:cn",
-      "geosite:geolocation-cn"
+      "geosite:cn"
     ]
   },
   {

v2rayN/ServiceLib/Sample/dns_singbox_normal

@@ -20,8 +20,7 @@
   "rules": [
     {
       "rule_set": [
-        "geosite-cn",
-        "geosite-geolocation-cn"
+        "geosite-cn"
       ],
       "server": "local"
     },

v2rayN/ServiceLib/Sample/dns_v2ray_normal

@@ -7,8 +7,7 @@
     {
       "address": "223.5.5.5",
       "domains": [
-        "geosite:cn",
-        "geosite:geolocation-cn"
+        "geosite:cn"
       ],
       "expectIPs": [
         "geoip:cn"

v2rayN/ServiceLib/Sample/tun_singbox_inbound

@@ -2,8 +2,10 @@
   "type": "tun",
   "tag": "tun-in",
   "interface_name": "singbox_tun",
-  "inet4_address": "172.19.0.1/30",
-  "inet6_address": "fdfe:dcba:9876::1/126",
+  "address": [
+    "172.18.0.1/30",
+    "fdfe:dcba:9876::1/126"
+  ],
   "mtu": 9000,
   "auto_route": true,
   "strict_route": false,

v2rayN/ServiceLib/ServiceLib.csproj

@@ -4,7 +4,7 @@
 	<TargetFramework>net8.0</TargetFramework>
 	<ImplicitUsings>enable</ImplicitUsings>
 	<Nullable>enable</Nullable>
-	<Version>7.0.7</Version>
+	<Version>7.1.0</Version>
   </PropertyGroup>
  
 	<ItemGroup>
@@ -14,7 +14,7 @@
 		<PackageReference Include="sqlite-net-pcl" Version="1.9.172" />
 		<PackageReference Include="Splat.NLog" Version="15.2.22" />
 		<PackageReference Include="WebDav.Client" Version="2.8.0" />
-		<PackageReference Include="YamlDotNet" Version="16.1.3" />
+		<PackageReference Include="YamlDotNet" Version="16.2.0" />
 		<PackageReference Include="QRCoder" Version="1.6.0" />
 		<PackageReference Include="CliWrap" Version="3.6.7" /> 
 		<PackageReference Include="SkiaSharp.QrCode" Version="0.7.0" />

v2rayN/ServiceLib/Services/CoreConfig/CoreConfigClashService.cs

@@ -1,4 +1,4 @@
-namespace ServiceLib.Services.CoreConfig
+namespace ServiceLib.Services.CoreConfig
 {
     /// <summary>
     /// Core configuration file processing class
@@ -66,7 +66,7 @@
                 txtFile = txtFile.Replace(tagYamlStr1, tagYamlStr2);
 
                 //YAML anchors
-                if (txtFile.Contains("<<:") && txtFile.Contains("*") && txtFile.Contains("&"))
+                if (txtFile.Contains("<<:") && txtFile.Contains('*') && txtFile.Contains('&'))
                 {
                     txtFile = YamlUtils.PreprocessYaml(txtFile);
                 }

v2rayN/ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs

@@ -1,4 +1,4 @@
-using System.Data;
+using System.Data;
 using System.Net;
 using System.Net.NetworkInformation;
 
@@ -26,7 +26,7 @@ namespace ServiceLib.Services.CoreConfig
                     ret.Msg = ResUI.CheckServerSettings;
                     return ret;
                 }
-                if (node.GetNetwork() is nameof(ETransport.kcp) or nameof(ETransport.splithttp))
+                if (node.GetNetwork() is nameof(ETransport.kcp) or nameof(ETransport.splithttp) or nameof(ETransport.xhttp))
                 {
                     ret.Msg = ResUI.Incorrectconfiguration + $" - {node.GetNetwork()}";
                     return ret;
@@ -484,7 +484,7 @@ namespace ServiceLib.Services.CoreConfig
                 singboxConfig.inbounds = [];
 
                 if (!_config.TunModeItem.EnableTun
-                    || _config.TunModeItem.EnableTun && _config.TunModeItem.EnableExInbound && _config.RunningCoreType == ECoreType.sing_box)
+                    || (_config.TunModeItem.EnableTun && _config.TunModeItem.EnableExInbound && _config.RunningCoreType == ECoreType.sing_box))
                 {
                     var inbound = new Inbound4Sbox()
                     {
@@ -558,7 +558,7 @@ namespace ServiceLib.Services.CoreConfig
                     //tunInbound.sniff_override_destination = _config.inbound[0].routeOnly ? false : _config.inbound[0].sniffingEnabled;
                     if (_config.TunModeItem.EnableIPv6Address == false)
                     {
-                        tunInbound.inet6_address = null;
+                        tunInbound.address = ["172.18.0.1/30"];
                     }
 
                     singboxConfig.inbounds.Add(tunInbound);

v2rayN/ServiceLib/Services/CoreConfig/CoreConfigV2rayService.cs

@@ -27,6 +27,12 @@ namespace ServiceLib.Services.CoreConfig
                     return ret;
                 }
 
+                if (node.GetNetwork() is nameof(ETransport.quic))
+                {
+                    ret.Msg = ResUI.Incorrectconfiguration + $" - {node.GetNetwork()}";
+                    return ret;
+                }
+
                 ret.Msg = ResUI.InitialConfiguration;
 
                 var result = Utils.GetEmbedText(Global.V2raySampleClient);
@@ -366,8 +372,8 @@ namespace ServiceLib.Services.CoreConfig
                 else
                 {
                     v2rayConfig.log.loglevel = _config.CoreBasicItem.Loglevel;
-                    v2rayConfig.log.access = "";
-                    v2rayConfig.log.error = "";
+                    v2rayConfig.log.access = null;
+                    v2rayConfig.log.error = null;
                 }
             }
             catch (Exception ex)
@@ -920,23 +926,35 @@ namespace ServiceLib.Services.CoreConfig
                         streamSettings.httpupgradeSettings = httpupgradeSettings;
 
                         break;
-                    //splithttp
+                    //splithttp //xhttp
                     case nameof(ETransport.splithttp):
-                        SplithttpSettings4Ray splithttpSettings = new()
+                    case nameof(ETransport.xhttp):
+                        streamSettings.network = ETransport.xhttp.ToString();
+                        XhttpSettings4Ray xhttpSettings = new()
                         {
-                            maxUploadSize = 1000000,
-                            maxConcurrentUploads = 10
+                            scMaxEachPostBytes = "500000-1000000",
+                            scMaxConcurrentPosts = "50-100",
+                            scMinPostsIntervalMs = "30-50"
                         };
 
                         if (Utils.IsNotEmpty(node.Path))
                         {
-                            splithttpSettings.path = node.Path;
+                            xhttpSettings.path = node.Path;
                         }
                         if (Utils.IsNotEmpty(host))
                         {
-                            splithttpSettings.host = host;
+                            xhttpSettings.host = host;
                         }
-                        streamSettings.splithttpSettings = splithttpSettings;
+                        if (Utils.IsNotEmpty(node.HeaderType) && Global.XhttpMode.Contains(node.HeaderType))
+                        {
+                            xhttpSettings.mode = node.HeaderType;
+                        }
+                        if (Utils.IsNotEmpty(node.Extra))
+                        {
+                            xhttpSettings.extra = JsonUtils.ParseJson(node.Extra);
+                        }
+
+                        streamSettings.xhttpSettings = xhttpSettings;
 
                         break;
                     //h2
@@ -1120,17 +1138,14 @@ namespace ServiceLib.Services.CoreConfig
             if (_config.GuiItem.EnableStatistics)
             {
                 string tag = EInboundProtocol.api.ToString();
-                API4Ray apiObj = new();
+                Metrics4Ray apiObj = new();
                 Policy4Ray policyObj = new();
                 SystemPolicy4Ray policySystemSetting = new();
 
-                string[] services = { "StatsService" };
-
                 v2rayConfig.stats = new Stats4Ray();
 
                 apiObj.tag = tag;
-                apiObj.services = services.ToList();
-                v2rayConfig.api = apiObj;
+                v2rayConfig.metrics = apiObj;
 
                 policySystemSetting.statsOutboundDownlink = true;
                 policySystemSetting.statsOutboundUplink = true;

v2rayN/ServiceLib/Services/Statistics/StatisticsXrayService.cs

@@ -0,0 +1,106 @@
+namespace ServiceLib.Services.Statistics
+{
+    public class StatisticsXrayService
+    {
+        private const long linkBase = 1024;
+        private string _url;
+        private ServerSpeedItem _serverSpeedItem = new();
+        private Config _config;
+        private bool _exitFlag;
+        private Action<ServerSpeedItem>? _updateFunc;
+
+        public StatisticsXrayService(Config config, Action<ServerSpeedItem> updateFunc)
+        {
+            _config = config;
+            _updateFunc = updateFunc;
+            _exitFlag = false;
+            _url = $"{Global.HttpProtocol}{Global.Loopback}:{AppHandler.Instance.StatePort}/debug/vars";
+
+            Task.Run(Run);
+        }
+
+        public void Close()
+        {
+            _exitFlag = true;
+        }
+
+        private async void Run()
+        {
+            while (!_exitFlag)
+            {
+                await Task.Delay(1000);
+                try
+                {
+                    if (_config.RunningCoreType != ECoreType.Xray)
+                    {
+                        continue;
+                    }
+
+                    var result = await HttpClientHelper.Instance.TryGetAsync(_url);
+                    if (result != null)
+                    {
+                        var server = ParseOutput(result) ?? new ServerSpeedItem();
+                        _updateFunc?.Invoke(server);
+                    }
+                }
+                catch
+                {
+                    // ignored
+                }
+            }
+        }
+
+        private ServerSpeedItem? ParseOutput(string result)
+        {
+            try
+            {
+                var source = JsonUtils.Deserialize<V2rayMetricsVars>(result);
+                if (source?.stats?.outbound == null)
+                {
+                    return null;
+                }
+
+                ServerSpeedItem server = new();
+                foreach (string key in source.stats.outbound.Keys)
+                {
+                    var value = source.stats.outbound[key];
+                    if (value == null) continue;
+                    var state = JsonUtils.Deserialize<V2rayMetricsVarsLink>(value.ToString());
+
+                    if (key.StartsWith(Global.ProxyTag))
+                    {
+                        server.ProxyUp += state.uplink / linkBase;
+                        server.ProxyDown += state.downlink / linkBase;
+                    }
+                    else if (key == Global.DirectTag)
+                    {
+                        server.DirectUp = state.uplink / linkBase;
+                        server.DirectDown = state.downlink / linkBase;
+                    }
+                }
+
+                if (server.DirectDown < _serverSpeedItem.DirectDown || server.ProxyDown < _serverSpeedItem.ProxyDown)
+                {
+                    _serverSpeedItem = new();
+                    return null;
+                }
+
+                ServerSpeedItem curItem = new()
+                {
+                    ProxyUp = server.ProxyUp - _serverSpeedItem.ProxyUp,
+                    ProxyDown = server.ProxyDown - _serverSpeedItem.ProxyDown,
+                    DirectUp = server.DirectUp - _serverSpeedItem.DirectUp,
+                    DirectDown = server.DirectDown - _serverSpeedItem.DirectDown,
+                };
+                _serverSpeedItem = server;
+                return curItem;
+            }
+            catch
+            {
+                // ignored
+            }
+
+            return null;
+        }
+    }
+}

v2rayN/ServiceLib/Services/UpdateService.cs

@@ -1,4 +1,4 @@
-using System.Runtime.InteropServices;
+using System.Runtime.InteropServices;
 using System.Text.RegularExpressions;
 
 namespace ServiceLib.Services
@@ -122,7 +122,7 @@ namespace ServiceLib.Services
                 var url = item.Url.TrimEx();
                 var userAgent = item.UserAgent.TrimEx();
                 var hashCode = $"{item.Remarks}->";
-                if (Utils.IsNullOrEmpty(id) || Utils.IsNullOrEmpty(url) || Utils.IsNotEmpty(subId) && item.Id != subId)
+                if (Utils.IsNullOrEmpty(id) || Utils.IsNullOrEmpty(url) || (Utils.IsNotEmpty(subId) && item.Id != subId))
                 {
                     //_updateFunc?.Invoke(false, $"{hashCode}{ResUI.MsgNoValidSubscription}");
                     continue;

v2rayN/ServiceLib/ViewModels/DNSSettingViewModel.cs

@@ -1,4 +1,4 @@
-using ReactiveUI;
+using ReactiveUI;
 using ReactiveUI.Fody.Helpers;
 using System.Reactive;
 
@@ -105,7 +105,7 @@ namespace ServiceLib.ViewModels
             item2.DomainStrategy4Freedom = domainStrategy4Freedom2;
             item2.DomainDNSAddress = domainDNSAddress2;
             item2.NormalDNS = JsonUtils.Serialize(JsonUtils.ParseJson(normalDNS2));
-            item2.TunDNS = JsonUtils.Serialize(JsonUtils.ParseJson(tunDNS2)); ;
+            item2.TunDNS = JsonUtils.Serialize(JsonUtils.ParseJson(tunDNS2));
             await ConfigHandler.SaveDNSItems(_config, item2);
 
             NoticeHandler.Instance.Enqueue(ResUI.OperationSuccess);

v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs

@@ -52,8 +52,6 @@ namespace ServiceLib.ViewModels
 
         public ReactiveCommand<Unit, Unit> ReloadCmd { get; }
 
-        public ReactiveCommand<Unit, Unit> ExitCmd { get; }
-
         [Reactive]
         public bool BlReloadEnabled { get; set; }
 
@@ -189,11 +187,6 @@ namespace ServiceLib.ViewModels
                 await Reload();
             });
 
-            ExitCmd = ReactiveCommand.CreateFromTask(async () =>
-            {
-                await Exit();
-            });
-
             RegionalPresetDefaultCmd = ReactiveCommand.CreateFromTask(async () =>
             {
                 await ApplyRegionalPreset(EPresetType.Default);
@@ -226,6 +219,7 @@ namespace ServiceLib.ViewModels
 
             await Reload();
             await AutoHideStartup();
+            Locator.Current.GetService<StatusBarViewModel>()?.RefreshRoutingsMenu();
         }
 
         #endregion Init
@@ -538,6 +532,10 @@ namespace ServiceLib.ViewModels
             {
                 Utils.ProcessStart("nautilus", Utils.GetConfigPath());
             }
+            else if (Utils.IsOSX())
+            {
+                Utils.ProcessStart("open", Utils.GetConfigPath());
+            }
         }
 
         #endregion Setting
@@ -595,16 +593,6 @@ namespace ServiceLib.ViewModels
             }
         }
 
-        private async Task Exit()
-        {
-            if (await _updateView?.Invoke(EViewAction.ShowYesNo, null) == false)
-            {
-                return;
-            }
-
-            await MyAppExitAsync(false);
-        }
-
         #endregion core job
 
         #region Presets

v2rayN/ServiceLib/ViewModels/OptionSettingViewModel.cs

@@ -85,6 +85,7 @@ namespace ServiceLib.ViewModels
         [Reactive] public int TunMtu { get; set; }
         [Reactive] public bool TunEnableExInbound { get; set; }
         [Reactive] public bool TunEnableIPv6Address { get; set; }
+        [Reactive] public string TunLinuxSudoPassword { get; set; }
 
         #endregion Tun mode
 
@@ -197,6 +198,7 @@ namespace ServiceLib.ViewModels
             TunMtu = _config.TunModeItem.Mtu;
             TunEnableExInbound = _config.TunModeItem.EnableExInbound;
             TunEnableIPv6Address = _config.TunModeItem.EnableIPv6Address;
+            TunLinuxSudoPassword = _config.TunModeItem.LinuxSudoPassword;
 
             #endregion Tun mode
 
@@ -340,6 +342,7 @@ namespace ServiceLib.ViewModels
             _config.TunModeItem.Mtu = TunMtu;
             _config.TunModeItem.EnableExInbound = TunEnableExInbound;
             _config.TunModeItem.EnableIPv6Address = TunEnableIPv6Address;
+            _config.TunModeItem.LinuxSudoPassword = TunLinuxSudoPassword;
 
             //coreType
             await SaveCoreType();

v2rayN/ServiceLib/ViewModels/ProfilesViewModel.cs

@@ -479,7 +479,10 @@ namespace ServiceLib.ViewModels
 
             await ConfigHandler.RemoveServer(_config, lstSelecteds);
             NoticeHandler.Instance.Enqueue(ResUI.OperationSuccess);
-
+            if (lstSelecteds.Count == _profileItems.Count)
+            {
+                _profileItems.Clear();
+            }
             RefreshServers();
             if (exists)
             {

v2rayN/ServiceLib/ViewModels/RoutingRuleDetailsViewModel.cs

@@ -86,7 +86,7 @@ namespace ServiceLib.ViewModels
                 return;
             }
             //NoticeHandler.Instance.Enqueue(ResUI.OperationSuccess);
-            _updateView?.Invoke(EViewAction.CloseWindow, null);
+            await _updateView?.Invoke(EViewAction.CloseWindow, null);
         }
     }
 }

v2rayN/ServiceLib/ViewModels/StatusBarViewModel.cs

@@ -108,7 +108,7 @@ namespace ServiceLib.ViewModels
             SelectedServer = new();
             RunningServerToolTipText = "-";
 
-            if (_config.TunModeItem.EnableTun && AppHandler.Instance.IsAdministrator)
+            if (_config.TunModeItem.EnableTun && AllowEnableTun())
             {
                 EnableTun = true;
             }
@@ -414,10 +414,17 @@ namespace ServiceLib.ViewModels
             {
                 _config.TunModeItem.EnableTun = EnableTun;
                 // When running as a non-administrator, reboot to administrator mode
-                if (EnableTun && !AppHandler.Instance.IsAdministrator)
+                if (EnableTun && AllowEnableTun() == false)
                 {
                     _config.TunModeItem.EnableTun = false;
-                    Locator.Current.GetService<MainWindowViewModel>()?.RebootAsAdmin();
+                    if (Utils.IsWindows())
+                    {
+                        Locator.Current.GetService<MainWindowViewModel>()?.RebootAsAdmin();
+                    }
+                    else if (Utils.IsLinux())
+                    {
+                        NoticeHandler.Instance.SendMessageAndEnqueue(ResUI.TbSettingsLinuxSudoPasswordIsEmpty);
+                    }
                     return;
                 }
                 await ConfigHandler.SaveConfig(_config);
@@ -425,6 +432,19 @@ namespace ServiceLib.ViewModels
             }
         }
 
+        private bool AllowEnableTun()
+        {
+            if (Utils.IsWindows())
+            {
+                return AppHandler.Instance.IsAdministrator;
+            }
+            else if (Utils.IsLinux())
+            {
+                return _config.TunModeItem.LinuxSudoPassword.IsNotEmpty();
+            }
+            return false;
+        }
+
         #endregion System proxy and Routings
 
         #region UI

v2rayN/v2rayN.Desktop/App.axaml.cs

@@ -69,11 +69,12 @@ public partial class App : Application
         }
     }
 
-    private void MenuExit_Click(object? sender, EventArgs e)
+    private async void MenuExit_Click(object? sender, EventArgs e)
     {
         if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
         {
-            Locator.Current.GetService<MainWindowViewModel>()?.MyAppExitAsync(false);
+            var service = Locator.Current.GetService<MainWindowViewModel>();
+            if (service != null) await service.MyAppExitAsync(false);
 
             desktop.Shutdown();
         }

v2rayN/v2rayN.Desktop/Program.cs

@@ -1,4 +1,4 @@
-using Avalonia;
+using Avalonia;
 using Avalonia.ReactiveUI;
 using v2rayN.Desktop.Common;
 
@@ -25,7 +25,7 @@ internal class Program
         if (Utils.IsWindows())
         {
             var exePathKey = Utils.GetMd5(Utils.GetExePath());
-            var rebootas = (Args ?? new string[] { }).Any(t => t == Global.RebootAs);
+            var rebootas = (Args ?? Array.Empty<string>()).Any(t => t == Global.RebootAs);
             ProgramStarted = new EventWaitHandle(false, EventResetMode.AutoReset, exePathKey, out bool bCreatedNew);
             if (!rebootas && !bCreatedNew)
             {

v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml

@@ -112,7 +112,7 @@
                         x:Name="txtPort"
                         Grid.Row="3"
                         Grid.Column="1"
-                        Width="100"
+                        Width="200"
                         HorizontalAlignment="Left"
                         Classes="Margin8" />
                 </Grid>
@@ -164,7 +164,7 @@
                         x:Name="txtAlterId"
                         Grid.Row="2"
                         Grid.Column="1"
-                        Width="100"
+                        Width="200"
                         HorizontalAlignment="Left"
                         Classes="Margin8" />
 
@@ -458,7 +458,7 @@
                         x:Name="cmbHeaderType8"
                         Grid.Row="3"
                         Grid.Column="1"
-                        Width="100"
+                        Width="200"
                         Classes="Margin8" />
                 </Grid>
                 <Grid
@@ -541,7 +541,7 @@
                         x:Name="txtShortId9"
                         Grid.Row="5"
                         Grid.Column="1"
-                        Width="100"
+                        Width="200"
                         HorizontalAlignment="Left"
                         Classes="Margin8" />
                 </Grid>
@@ -584,7 +584,7 @@
                         x:Name="cmbNetwork"
                         Grid.Row="1"
                         Grid.Column="1"
-                        Width="100"
+                        Width="200"
                         Classes="Margin8" />
                     <TextBlock
                         Grid.Row="1"
@@ -600,12 +600,50 @@
                         VerticalAlignment="Center"
                         Classes="Margin8"
                         Text="{x:Static resx:ResUI.TbHeaderType}" />
-                    <ComboBox
-                        x:Name="cmbHeaderType"
+                    <StackPanel
                         Grid.Row="2"
                         Grid.Column="1"
-                        Width="100"
-                        Classes="Margin8" />
+                        VerticalAlignment="Center"
+                        Orientation="Horizontal">
+                        <ComboBox
+                            x:Name="cmbHeaderType"
+                            Width="200"
+                            Classes="Margin8" />
+
+                        <Button
+                            x:Name="btnExtra"
+                            Width="30"
+                            Height="30"
+                            Margin="10,0"
+                            Theme="{DynamicResource BorderlessButton}">
+                            <Button.Content>
+                                <PathIcon
+                                    Width="20"
+                                    Height="20"
+                                    Data="{StaticResource building_more}"
+                                    Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" />
+                            </Button.Content>
+                            <Button.Flyout>
+                                <Flyout>
+                                    <StackPanel>
+                                        <TextBlock
+                                            VerticalAlignment="Center"
+                                            Classes="Margin8"
+                                            Text="{x:Static resx:ResUI.TransportExtraTip}" />
+                                        <TextBox
+                                            x:Name="txtExtra"
+                                            Width="400"
+                                            MinHeight="100"
+                                            HorizontalAlignment="Stretch"
+                                            VerticalAlignment="Center"
+                                            Classes="TextArea Margin8"
+                                            MinLines="6"
+                                            TextWrapping="Wrap" />
+                                    </StackPanel>
+                                </Flyout>
+                            </Button.Flyout>
+                        </Button>
+                    </StackPanel>
                     <TextBlock
                         x:Name="tipHeaderType"
                         Grid.Row="2"
@@ -680,7 +718,7 @@
                         x:Name="cmbStreamSecurity"
                         Grid.Row="0"
                         Grid.Column="1"
-                        Width="100"
+                        Width="200"
                         Classes="Margin8" />
                 </Grid>
                 <Grid
@@ -749,7 +787,7 @@
                         x:Name="cmbAllowInsecure"
                         Grid.Row="4"
                         Grid.Column="1"
-                        Width="100"
+                        Width="200"
                         Classes="Margin8" />
                 </Grid>
                 <Grid

v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml.cs

@@ -208,7 +208,8 @@ namespace v2rayN.Desktop.Views
                 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.SelectedSource.StreamSecurity, v => v.cmbStreamSecurity.SelectedValue).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.SelectedSource.Sni, v => v.txtSNI.Text).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.SelectedSource.AllowInsecure, v => v.cmbAllowInsecure.SelectedValue).DisposeWith(disposables);
@@ -299,6 +300,13 @@ namespace v2rayN.Desktop.Views
                     cmbHeaderType.Items.Add(it);
                 });
             }
+            else if (network is nameof(ETransport.splithttp) or nameof(ETransport.xhttp))
+            {
+                Global.XhttpMode.ForEach(it =>
+                {
+                    cmbHeaderType.Items.Add(it);
+                });
+            }
             else if (network == nameof(ETransport.grpc))
             {
                 cmbHeaderType.Items.Add(Global.GrpcGunMode);
@@ -319,6 +327,7 @@ namespace v2rayN.Desktop.Views
                 network = Global.DefaultNetwork;
             }
             labHeaderType.IsVisible = true;
+            btnExtra.IsVisible = false;
             tipRequestHost.Text =
             tipPath.Text =
             tipHeaderType.Text = string.Empty;
@@ -337,11 +346,19 @@ namespace v2rayN.Desktop.Views
 
                 case nameof(ETransport.ws):
                 case nameof(ETransport.httpupgrade):
-                case nameof(ETransport.splithttp):
                     tipRequestHost.Text = ResUI.TransportRequestHostTip2;
                     tipPath.Text = ResUI.TransportPathTip1;
                     break;
 
+                case nameof(ETransport.splithttp):
+                case nameof(ETransport.xhttp):
+                    tipRequestHost.Text = ResUI.TransportRequestHostTip2;
+                    tipPath.Text = ResUI.TransportPathTip1;
+                    tipHeaderType.Text = ResUI.TransportHeaderTypeTip5;
+                    labHeaderType.IsVisible = false;
+                    btnExtra.IsVisible = true;
+                    break;
+
                 case nameof(ETransport.h2):
                     tipRequestHost.Text = ResUI.TransportRequestHostTip3;
                     tipPath.Text = ResUI.TransportPathTip2;

v2rayN/v2rayN.Desktop/Views/MainWindow.axaml.cs

@@ -10,7 +10,6 @@ using DialogHostAvalonia;
 using MsBox.Avalonia.Enums;
 using ReactiveUI;
 using Splat;
-using System.ComponentModel;
 using System.Reactive.Disposables;
 using v2rayN.Desktop.Common;
 
@@ -30,12 +29,12 @@ namespace v2rayN.Desktop.Views
             _config = AppHandler.Instance.Config;
             _manager = new WindowNotificationManager(TopLevel.GetTopLevel(this)) { MaxItems = 3, Position = NotificationPosition.BottomRight };
 
-            this.Closing += MainWindow_Closing;
             this.KeyDown += MainWindow_KeyDown;
             menuSettingsSetUWP.Click += menuSettingsSetUWP_Click;
             menuPromotion.Click += menuPromotion_Click;
             menuCheckUpdate.Click += MenuCheckUpdate_Click;
             menuBackupAndRestore.Click += MenuBackupAndRestore_Click;
+            menuClose.Click += MenuClose_Click;
 
             MessageBus.Current.Listen<string>(EMsgCommand.SendSnackMsg.ToString()).Subscribe(DelegateSnackMsg);
             ViewModel = new MainWindowViewModel(UpdateViewHandler);
@@ -80,7 +79,6 @@ namespace v2rayN.Desktop.Views
 
                 this.BindCommand(ViewModel, vm => vm.ReloadCmd, v => v.menuReload).DisposeWith(disposables);
                 this.OneWayBind(ViewModel, vm => vm.BlReloadEnabled, v => v.menuReload.IsEnabled).DisposeWith(disposables);
-                this.BindCommand(ViewModel, vm => vm.ExitCmd, v => v.menuClose).DisposeWith(disposables);
 
                 switch (_config.UiItem.MainGirdOrientation)
                 {
@@ -119,6 +117,11 @@ namespace v2rayN.Desktop.Views
             }
             else
             {
+                if (AppHandler.Instance.IsAdministrator)
+                {
+                    this.Title = $"{Utils.GetVersion()} - {ResUI.TbSettingsLinuxSudoPasswordNotSudoRunApp}";
+                    NoticeHandler.Instance.SendMessageAndEnqueue(ResUI.TbSettingsLinuxSudoPasswordNotSudoRunApp);
+                }
                 menuRebootAsAdmin.IsVisible = false;
                 menuSettingsSetUWP.IsVisible = false;
                 menuGlobalHotkeySetting.IsVisible = false;
@@ -243,14 +246,6 @@ namespace v2rayN.Desktop.Views
                        Locator.Current.GetService<ProfilesViewModel>()?.AutofitColumnWidthAsync(),
                         DispatcherPriority.Default);
                     break;
-
-                case EViewAction.ShowYesNo:
-                    if (await UI.ShowYesNo(this, ResUI.menuExitTips) == ButtonResult.No)
-                    {
-                        return false;
-                    }
-                    StorageUI();
-                    break;
             }
 
             return await Task.FromResult(true);
@@ -282,10 +277,23 @@ namespace v2rayN.Desktop.Views
             }
         }
 
-        private void MainWindow_Closing(object? sender, CancelEventArgs e)
+        protected override async void OnClosing(WindowClosingEventArgs e)
         {
-            e.Cancel = true;
-            ShowHideWindow(false);
+            Logging.SaveLog("OnClosing -> " + e.CloseReason.ToString());
+
+            switch (e.CloseReason)
+            {
+                case WindowCloseReason.OwnerWindowClosing or WindowCloseReason.WindowClosing:
+                    e.Cancel = true;
+                    ShowHideWindow(false);
+                    break;
+
+                case WindowCloseReason.ApplicationShutdown or WindowCloseReason.OSShutdown:
+                    await ViewModel?.MyAppExitAsync(true);
+                    break;
+            }
+
+            base.OnClosing(e);
         }
 
         private async void MainWindow_KeyDown(object? sender, KeyEventArgs e)
@@ -360,6 +368,17 @@ namespace v2rayN.Desktop.Views
             DialogHost.Show(_backupAndRestoreView);
         }
 
+        private async void MenuClose_Click(object? sender, RoutedEventArgs e)
+        {
+            if (await UI.ShowYesNo(this, ResUI.menuExitTips) == ButtonResult.No)
+            {
+                return;
+            }
+            StorageUI();
+
+            await ViewModel?.MyAppExitAsync(false);
+        }
+
         #endregion Event
 
         #region UI

v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml

@@ -489,7 +489,7 @@
                             HorizontalAlignment="Left"
                             Classes="Margin8" />
 
-            
+
 
                         <TextBlock
                             Grid.Row="11"
@@ -721,6 +721,7 @@
                             <RowDefinition Height="Auto" />
                             <RowDefinition Height="Auto" />
                             <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
                         </Grid.RowDefinitions>
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="Auto" />
@@ -794,6 +795,28 @@
                             Grid.Column="1"
                             HorizontalAlignment="Left"
                             Classes="Margin8" />
+
+                        <TextBlock
+                            Grid.Row="7"
+                            Grid.Column="0"
+                            VerticalAlignment="Center"
+                            Classes="Margin8"
+                            Text="{x:Static resx:ResUI.TbSettingsLinuxSudoPassword}" />
+                        <TextBox
+                            x:Name="txtLinuxSudoPassword"
+                            Grid.Row="7"
+                            Grid.Column="1"
+                            Width="200"
+                            HorizontalAlignment="Left"
+                            Classes="Margin8"
+                            PasswordChar="*" />
+                        <TextBlock
+                            Grid.Row="7"
+                            Grid.Column="2"
+                            VerticalAlignment="Center"
+                            Classes="Margin8"
+                            Text="{x:Static resx:ResUI.TbSettingsLinuxSudoPasswordTip}"
+                            TextWrapping="Wrap" />
                     </Grid>
                 </DockPanel>
             </TabItem>

v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml.cs

@@ -152,6 +152,7 @@ namespace v2rayN.Desktop.Views
                 this.Bind(ViewModel, vm => vm.TunMtu, v => v.cmbMtu.SelectedValue).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.TunEnableExInbound, v => v.togEnableExInbound.IsChecked).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.TunEnableIPv6Address, v => v.togEnableIPv6Address.IsChecked).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.TunLinuxSudoPassword, v => v.txtLinuxSudoPassword.Text).DisposeWith(disposables);
 
                 this.Bind(ViewModel, vm => vm.CoreType1, v => v.cmbCoreType1.SelectedValue).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.CoreType2, v => v.cmbCoreType2.SelectedValue).DisposeWith(disposables);

v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml

@@ -204,7 +204,7 @@
                         Binding="{Binding SubRemarks}"
                         Header="{x:Static resx:ResUI.LvSubscription}"
                         Tag="SubRemarks" />
-                    <DataGridTemplateColumn SortMemberPath="Delay" Tag="Delay">
+                    <DataGridTemplateColumn SortMemberPath="Delay" Tag="DelayVal">
                         <DataGridTemplateColumn.Header>
                             <TextBlock Text="{x:Static resx:ResUI.LvTestDelay}" />
                         </DataGridTemplateColumn.Header>

v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml.cs

@@ -32,6 +32,7 @@ namespace v2rayN.Desktop.Views
             lstProfiles.SelectionChanged += lstProfiles_SelectionChanged;
             lstProfiles.DoubleTapped += LstProfiles_DoubleTapped;
             lstProfiles.LoadingRow += LstProfiles_LoadingRow;
+            lstProfiles.Sorting += LstProfiles_Sorting;
             //if (_config.uiItem.enableDragDropSort)
             //{
             //    lstProfiles.AllowDrop = true;
@@ -92,6 +93,13 @@ namespace v2rayN.Desktop.Views
             ViewModel?.RefreshServers();
         }
 
+        private async void LstProfiles_Sorting(object? sender, DataGridColumnEventArgs e)
+        {
+            e.Handled = true;
+            await ViewModel?.SortServer(e.Column.Tag.ToString());
+            e.Handled = false;
+        }
+
         //#region Event
 
         private async Task<bool> UpdateViewHandler(EViewAction action, object? obj)
@@ -190,7 +198,7 @@ namespace v2rayN.Desktop.Views
         private void LstProfiles_DoubleTapped(object? sender, Avalonia.Input.TappedEventArgs e)
         {
             var source = e.Source as Border;
-            if (source == null || source.Name != "CellBorder") return;
+            if (source?.Name == "HeaderBackground") return;
             if (_config.UiItem.DoubleClick2Activate)
             {
                 ViewModel?.SetDefaultServer();
@@ -345,7 +353,7 @@ namespace v2rayN.Desktop.Views
                         }
                         else
                         {
-                            item2.Width = new DataGridLength(item.Width, DataGridLengthUnitType.Pixel); ;
+                            item2.Width = new DataGridLength(item.Width, DataGridLengthUnitType.Pixel);
                             item2.DisplayIndex = displayIndex++;
                         }
                         if (item.Name.StartsWith("to"))

v2rayN/v2rayN.Desktop/Views/RoutingRuleDetailsWindow.axaml.cs

@@ -43,11 +43,11 @@ namespace v2rayN.Desktop.Views
             {
                 rulesItem.Protocol?.ForEach(it =>
                 {
-                    clbProtocol.SelectedItems.Add(it);
+                    clbProtocol?.SelectedItems?.Add(it);
                 });
                 rulesItem.InboundTag?.ForEach(it =>
                 {
-                    clbInboundTag.SelectedItems.Add(it);
+                    clbInboundTag?.SelectedItems?.Add(it);
                 });
             }
 

v2rayN/v2rayN.Desktop/Views/StatusBarView.axaml.cs

@@ -41,7 +41,7 @@ namespace v2rayN.Desktop.Views
                 this.Bind(ViewModel, vm => vm.SelectedRouting, v => v.cmbRoutings2.SelectedItem).DisposeWith(disposables);
             });
 
-            spEnableTun.IsVisible = (Utils.IsWindows() || AppHandler.Instance.IsAdministrator);
+            //spEnableTun.IsVisible = (Utils.IsWindows() || AppHandler.Instance.IsAdministrator);
         }
 
         private async Task<bool> UpdateViewHandler(EViewAction action, object? obj)

v2rayN/v2rayN.Desktop/Views/SubEditWindow.axaml

@@ -95,6 +95,41 @@
                     Classes="Margin8"
                     TextWrapping="Wrap"
                     Watermark="{x:Static resx:ResUI.SubUrlTips}" />
+                <Button
+                    Grid.Row="2"
+                    Grid.Column="2"
+                    Width="30"
+                    Height="30"
+                    Margin="10,0"
+                    Theme="{DynamicResource BorderlessButton}">
+                    <Button.Content>
+                        <PathIcon
+                            Width="20"
+                            Height="20"
+                            Data="{StaticResource building_more}"
+                            Foreground="{DynamicResource ButtonDefaultTertiaryForeground}" />
+                    </Button.Content>
+                    <Button.Flyout>
+                        <Flyout>
+                            <StackPanel>
+                                <TextBlock
+                                    VerticalAlignment="Center"
+                                    Classes="Margin8"
+                                    Text="{x:Static resx:ResUI.LvMoreUrl}" />
+                                <TextBox
+                                    x:Name="txtMoreUrl"
+                                    Width="400"
+                                    MinHeight="100"
+                                    HorizontalAlignment="Stretch"
+                                    VerticalAlignment="Center"
+                                    Classes="TextArea Margin8"
+                                    MinLines="4"
+                                    TextWrapping="Wrap"
+                                    Watermark="{x:Static resx:ResUI.SubUrlTips}" />
+                            </StackPanel>
+                        </Flyout>
+                    </Button.Flyout>
+                </Button>
 
                 <TextBlock
                     Grid.Row="3"
@@ -245,24 +280,6 @@
                     Classes="Margin8"
                     TextWrapping="Wrap" />
 
-                <TextBlock
-                    Grid.Row="13"
-                    Grid.Column="0"
-                    Grid.ColumnSpan="2"
-                    VerticalAlignment="Center"
-                    Classes="Margin8"
-                    Text="{x:Static resx:ResUI.LvMoreUrl}" />
-                <TextBox
-                    x:Name="txtMoreUrl"
-                    Grid.Row="14"
-                    Grid.Column="1"
-                    MinHeight="100"
-                    HorizontalAlignment="Stretch"
-                    VerticalAlignment="Center"
-                    Classes="TextArea Margin8"
-                    MinLines="4"
-                    TextWrapping="Wrap"
-                    Watermark="{x:Static resx:ResUI.SubUrlTips}" />
             </Grid>
         </ScrollViewer>
     </DockPanel>

v2rayN/v2rayN/App.xaml

@@ -1,9 +1,9 @@
 <Application
     x:Class="v2rayN.App"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:conv="clr-namespace:v2rayN.Converters"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
     ShutdownMode="OnExplicitShutdown"
     StartupUri="Views/MainWindow.xaml">
     <Application.Resources>
@@ -211,6 +211,11 @@
                 <Setter Property="TextOptions.TextFormattingMode" Value="Display" />
                 <Setter Property="TextOptions.TextRenderingMode" Value="ClearType" />
                 <Setter Property="TextOptions.TextHintingMode" Value="Fixed" />
+                <Setter Property="TextElement.Foreground" Value="{DynamicResource MaterialDesignBody}" />
+                <Setter Property="Background" Value="{DynamicResource MaterialDesignPaper}" />
+                <Setter Property="TextElement.FontFamily" Value="{x:Static conv:MaterialDesignFonts.MyFont}" />
+                <Setter Property="FontFamily" Value="{x:Static conv:MaterialDesignFonts.MyFont}" />
+                <Setter Property="ResizeMode" Value="NoResize" />
             </Style>
             <Style
                 x:Key="ViewGlobal"
@@ -219,6 +224,10 @@
                 <Setter Property="TextOptions.TextFormattingMode" Value="Display" />
                 <Setter Property="TextOptions.TextRenderingMode" Value="ClearType" />
                 <Setter Property="TextOptions.TextHintingMode" Value="Fixed" />
+                <Setter Property="TextElement.Foreground" Value="{DynamicResource MaterialDesignBody}" />
+                <Setter Property="Background" Value="{DynamicResource MaterialDesignPaper}" />
+                <Setter Property="TextElement.FontFamily" Value="{x:Static conv:MaterialDesignFonts.MyFont}" />
+                <Setter Property="FontFamily" Value="{x:Static conv:MaterialDesignFonts.MyFont}" />
             </Style>
         </ResourceDictionary>
     </Application.Resources>

v2rayN/v2rayN/App.xaml.cs

@@ -1,4 +1,4 @@
-using System.Diagnostics;
+using System.Diagnostics;
 using System.Windows;
 using System.Windows.Threading;
 
@@ -28,7 +28,7 @@ namespace v2rayN
         {
             var exePathKey = Utils.GetMd5(Utils.GetExePath());
 
-            var rebootas = (e.Args ?? new string[] { }).Any(t => t == Global.RebootAs);
+            var rebootas = (e.Args ?? Array.Empty<string>()).Any(t => t == Global.RebootAs);
             ProgramStarted = new EventWaitHandle(false, EventResetMode.AutoReset, exePathKey, out bool bCreatedNew);
             if (!rebootas && !bCreatedNew)
             {

v2rayN/v2rayN/Views/AddServer2Window.xaml

@@ -2,7 +2,6 @@
     x:Class="v2rayN.Views.AddServer2Window"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:conv="clr-namespace:v2rayN.Converters"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -13,13 +12,8 @@
     Width="700"
     Height="500"
     x:TypeArguments="vms:AddServer2ViewModel"
-    Background="{DynamicResource MaterialDesignPaper}"
-    FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
-    ResizeMode="NoResize"
     ShowInTaskbar="False"
     Style="{StaticResource WindowGlobal}"
-    TextElement.FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
-    TextElement.Foreground="{DynamicResource MaterialDesignBody}"
     WindowStartupLocation="CenterScreen"
     mc:Ignorable="d">
     <DockPanel Margin="{StaticResource Margin8}">

v2rayN/v2rayN/Views/AddServerWindow.xaml

@@ -2,7 +2,6 @@
     x:Class="v2rayN.Views.AddServerWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:conv="clr-namespace:v2rayN.Converters"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -13,15 +12,18 @@
     Width="900"
     Height="700"
     x:TypeArguments="vms:AddServerViewModel"
-    Background="{DynamicResource MaterialDesignPaper}"
-    FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
     ResizeMode="CanResize"
     ShowInTaskbar="False"
     Style="{StaticResource WindowGlobal}"
-    TextElement.FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
-    TextElement.Foreground="{DynamicResource MaterialDesignBody}"
     WindowStartupLocation="CenterScreen"
     mc:Ignorable="d">
+    <Window.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Popupbox.xaml" />
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
+    </Window.Resources>
     <DockPanel Margin="{StaticResource Margin8}">
         <StackPanel
             Margin="{StaticResource Margin4}"
@@ -133,7 +135,7 @@
                         x:Name="txtPort"
                         Grid.Row="3"
                         Grid.Column="1"
-                        Width="100"
+                        Width="200"
                         Margin="{StaticResource Margin4}"
                         HorizontalAlignment="Left"
                         Style="{StaticResource DefTextBox}" />
@@ -193,7 +195,7 @@
                         x:Name="txtAlterId"
                         Grid.Row="2"
                         Grid.Column="1"
-                        Width="100"
+                        Width="200"
                         Margin="{StaticResource Margin4}"
                         HorizontalAlignment="Left"
                         Style="{StaticResource DefTextBox}" />
@@ -518,7 +520,7 @@
                         x:Name="cmbHeaderType8"
                         Grid.Row="3"
                         Grid.Column="1"
-                        Width="100"
+                        Width="200"
                         Margin="{StaticResource Margin4}"
                         Style="{StaticResource DefComboBox}" />
                 </Grid>
@@ -611,7 +613,7 @@
                         x:Name="txtShortId9"
                         Grid.Row="5"
                         Grid.Column="1"
-                        Width="100"
+                        Width="200"
                         Margin="{StaticResource Margin4}"
                         HorizontalAlignment="Left"
                         Style="{StaticResource DefTextBox}" />
@@ -658,7 +660,7 @@
                         x:Name="cmbNetwork"
                         Grid.Row="1"
                         Grid.Column="1"
-                        Width="100"
+                        Width="200"
                         Margin="{StaticResource Margin4}"
                         Style="{StaticResource DefComboBox}" />
                     <TextBlock
@@ -677,13 +679,40 @@
                         VerticalAlignment="Center"
                         Style="{StaticResource ToolbarTextBlock}"
                         Text="{x:Static resx:ResUI.TbHeaderType}" />
-                    <ComboBox
-                        x:Name="cmbHeaderType"
+                    <StackPanel
                         Grid.Row="2"
                         Grid.Column="1"
-                        Width="100"
-                        Margin="{StaticResource Margin4}"
-                        Style="{StaticResource DefComboBox}" />
+                        VerticalAlignment="Center"
+                        Orientation="Horizontal">
+                        <ComboBox
+                            x:Name="cmbHeaderType"
+                            Width="200"
+                            Margin="{StaticResource Margin4}"
+                            Style="{StaticResource DefComboBox}" />
+
+                        <materialDesign:PopupBox
+                            x:Name="popExtra"
+                            HorizontalAlignment="Right"
+                            StaysOpen="True"
+                            Style="{StaticResource MaterialDesignToolForegroundPopupBox}">
+                            <StackPanel>
+                                <TextBlock
+                                    Margin="{StaticResource Margin4}"
+                                    VerticalAlignment="Center"
+                                    Style="{StaticResource ToolbarTextBlock}"
+                                    Text="{x:Static resx:ResUI.TransportExtraTip}" />
+                                <TextBox
+                                    x:Name="txtExtra"
+                                    Width="400"
+                                    Margin="{StaticResource Margin4}"
+                                    VerticalAlignment="Top"
+                                    AcceptsReturn="True"
+                                    MinLines="6"
+                                    Style="{StaticResource MyOutlinedTextBox}"
+                                    TextWrapping="Wrap" />
+                            </StackPanel>
+                        </materialDesign:PopupBox>
+                    </StackPanel>
                     <TextBlock
                         x:Name="tipHeaderType"
                         Grid.Row="2"
@@ -769,7 +798,7 @@
                         x:Name="cmbStreamSecurity"
                         Grid.Row="0"
                         Grid.Column="1"
-                        Width="100"
+                        Width="200"
                         Margin="{StaticResource Margin4}"
                         Style="{StaticResource DefComboBox}" />
                 </Grid>
@@ -847,7 +876,7 @@
                         x:Name="cmbAllowInsecure"
                         Grid.Row="4"
                         Grid.Column="1"
-                        Width="100"
+                        Width="200"
                         Margin="{StaticResource Margin4}"
                         Style="{StaticResource DefComboBox}" />
                 </Grid>

v2rayN/v2rayN/Views/AddServerWindow.xaml.cs

@@ -202,7 +202,8 @@ namespace v2rayN.Views
                 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.SelectedSource.StreamSecurity, v => v.cmbStreamSecurity.Text).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.SelectedSource.Sni, v => v.txtSNI.Text).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.SelectedSource.AllowInsecure, v => v.cmbAllowInsecure.Text).DisposeWith(disposables);
@@ -294,6 +295,13 @@ namespace v2rayN.Views
                     cmbHeaderType.Items.Add(it);
                 });
             }
+            else if (network is nameof(ETransport.splithttp) or nameof(ETransport.xhttp))
+            {
+                Global.XhttpMode.ForEach(it =>
+                {
+                    cmbHeaderType.Items.Add(it);
+                });
+            }
             else if (network == nameof(ETransport.grpc))
             {
                 cmbHeaderType.Items.Add(Global.GrpcGunMode);
@@ -314,6 +322,7 @@ namespace v2rayN.Views
                 network = Global.DefaultNetwork;
             }
             labHeaderType.Visibility = Visibility.Visible;
+            popExtra.Visibility = Visibility.Hidden;
             tipRequestHost.Text =
             tipPath.Text =
             tipHeaderType.Text = string.Empty;
@@ -332,11 +341,19 @@ namespace v2rayN.Views
 
                 case nameof(ETransport.ws):
                 case nameof(ETransport.httpupgrade):
-                case nameof(ETransport.splithttp):
                     tipRequestHost.Text = ResUI.TransportRequestHostTip2;
                     tipPath.Text = ResUI.TransportPathTip1;
                     break;
 
+                case nameof(ETransport.splithttp):
+                case nameof(ETransport.xhttp):
+                    tipRequestHost.Text = ResUI.TransportRequestHostTip2;
+                    tipPath.Text = ResUI.TransportPathTip1;
+                    tipHeaderType.Text = ResUI.TransportHeaderTypeTip5;
+                    labHeaderType.Visibility = Visibility.Hidden;
+                    popExtra.Visibility = Visibility.Visible;
+                    break;
+
                 case nameof(ETransport.h2):
                     tipRequestHost.Text = ResUI.TransportRequestHostTip3;
                     tipPath.Text = ResUI.TransportPathTip2;

v2rayN/v2rayN/Views/BackupAndRestoreView.xaml

@@ -119,7 +119,6 @@
                             Text="{x:Static resx:ResUI.menuRemoteBackupAndRestore}" />
 
                         <materialDesign:PopupBox
-                            Padding="8,0"
                             HorizontalAlignment="Right"
                             StaysOpen="True"
                             Style="{StaticResource MaterialDesignToolForegroundPopupBox}">

v2rayN/v2rayN/Views/ClashConnectionsView.xaml

@@ -1,11 +1,11 @@
 <reactiveui:ReactiveUserControl
     x:Class="v2rayN.Views.ClashConnectionsView"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-    xmlns:reactiveui="http://reactiveui.net"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:reactiveui="http://reactiveui.net"
     xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib"
     xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
     d:DesignHeight="450"

v2rayN/v2rayN/Views/ClashProxiesView.xaml

@@ -1,14 +1,14 @@
 <reactiveui:ReactiveUserControl
     x:Class="v2rayN.Views.ClashProxiesView"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-    xmlns:reactiveui="http://reactiveui.net"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:converters="clr-namespace:v2rayN.Converters"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:reactiveui="http://reactiveui.net"
     xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib"
     xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
-    xmlns:converters="clr-namespace:v2rayN.Converters"
     d:DesignHeight="450"
     d:DesignWidth="800"
     x:TypeArguments="vms:ClashProxiesViewModel"

v2rayN/v2rayN/Views/DNSSettingWindow.xaml

@@ -2,7 +2,6 @@
     x:Class="v2rayN.Views.DNSSettingWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:conv="clr-namespace:v2rayN.Converters"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -13,13 +12,8 @@
     Width="1000"
     Height="700"
     x:TypeArguments="vms:DNSSettingViewModel"
-    Background="{DynamicResource MaterialDesignPaper}"
-    FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
-    ResizeMode="NoResize"
     ShowInTaskbar="False"
     Style="{StaticResource WindowGlobal}"
-    TextElement.FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
-    TextElement.Foreground="{DynamicResource MaterialDesignBody}"
     WindowStartupLocation="CenterScreen"
     mc:Ignorable="d">
     <DockPanel Margin="{StaticResource Margin8}">

v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml

@@ -2,7 +2,6 @@
     x:Class="v2rayN.Views.GlobalHotkeySettingWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:conv="clr-namespace:v2rayN.Converters"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -13,14 +12,9 @@
     Width="700"
     Height="500"
     x:TypeArguments="vms:SubEditViewModel"
-    Background="{DynamicResource MaterialDesignPaper}"
-    FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
     KeyDown="GlobalHotkeySettingWindow_KeyDown"
-    ResizeMode="NoResize"
     ShowInTaskbar="False"
     Style="{StaticResource WindowGlobal}"
-    TextElement.FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
-    TextElement.Foreground="{DynamicResource MaterialDesignBody}"
     WindowStartupLocation="CenterScreen"
     mc:Ignorable="d">
     <DockPanel Margin="{StaticResource Margin8}">

v2rayN/v2rayN/Views/MainWindow.xaml

@@ -2,7 +2,6 @@
     x:Class="v2rayN.Views.MainWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:conv="clr-namespace:v2rayN.Converters"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -15,12 +14,9 @@
     Height="700"
     MinWidth="900"
     x:TypeArguments="vms:MainWindowViewModel"
-    Background="{DynamicResource MaterialDesignPaper}"
-    FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
+    ResizeMode="CanResizeWithGrip"
     ShowInTaskbar="True"
     Style="{StaticResource WindowGlobal}"
-    TextElement.FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
-    TextElement.Foreground="{DynamicResource MaterialDesignBody}"
     WindowStartupLocation="CenterScreen"
     mc:Ignorable="d">
     <Window.Resources>
@@ -281,7 +277,7 @@
                         </Menu>
 
                         <materialDesign:PopupBox
-                            Padding="8,0"
+                            Padding="-2"
                             HorizontalAlignment="Right"
                             StaysOpen="True"
                             Style="{StaticResource MaterialDesignToolForegroundPopupBox}">

v2rayN/v2rayN/Views/MainWindow.xaml.cs

@@ -270,11 +270,11 @@ namespace v2rayN.Views
             StorageUI();
         }
 
-        private void Current_SessionEnding(object sender, SessionEndingCancelEventArgs e)
+        private async void Current_SessionEnding(object sender, SessionEndingCancelEventArgs e)
         {
             Logging.SaveLog("Current_SessionEnding");
             StorageUI();
-            ViewModel?.MyAppExitAsync(true);
+            await ViewModel?.MyAppExitAsync(true);
         }
 
         private void MainWindow_PreviewKeyDown(object sender, KeyEventArgs e)

v2rayN/v2rayN/Views/OptionSettingWindow.xaml

@@ -2,7 +2,6 @@
     x:Class="v2rayN.Views.OptionSettingWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:conv="clr-namespace:v2rayN.Converters"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -13,13 +12,8 @@
     Width="1000"
     Height="700"
     x:TypeArguments="vms:OptionSettingViewModel"
-    Background="{DynamicResource MaterialDesignPaper}"
-    FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
-    ResizeMode="NoResize"
     ShowInTaskbar="False"
     Style="{StaticResource WindowGlobal}"
-    TextElement.FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
-    TextElement.Foreground="{DynamicResource MaterialDesignBody}"
     WindowStartupLocation="CenterScreen"
     mc:Ignorable="d">
     <DockPanel Margin="{StaticResource Margin8}">

v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml

@@ -1,25 +1,19 @@
 <reactiveui:ReactiveWindow
     x:Class="v2rayN.Views.RoutingRuleDetailsWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-    xmlns:reactiveui="http://reactiveui.net"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:reactiveui="http://reactiveui.net"
     xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib"
     xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
-    xmlns:conv="clr-namespace:v2rayN.Converters"
     Title="{x:Static resx:ResUI.menuRoutingRuleDetailsSetting}"
     Width="900"
     Height="700"
     x:TypeArguments="vms:RoutingRuleDetailsViewModel"
-    Background="{DynamicResource MaterialDesignPaper}"
-    FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
-    ResizeMode="NoResize"
     ShowInTaskbar="False"
     Style="{StaticResource WindowGlobal}"
-    TextElement.FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
-    TextElement.Foreground="{DynamicResource MaterialDesignBody}"
     WindowStartupLocation="CenterScreen"
     mc:Ignorable="d">
     <DockPanel>

v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml

@@ -1,25 +1,19 @@
 <reactiveui:ReactiveWindow
     x:Class="v2rayN.Views.RoutingRuleSettingWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
-    xmlns:reactiveui="http://reactiveui.net"
-    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:reactiveui="http://reactiveui.net"
     xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib"
     xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
-    xmlns:conv="clr-namespace:v2rayN.Converters"
     Title="{x:Static resx:ResUI.menuRoutingRuleSetting}"
     Width="960"
     Height="700"
     x:TypeArguments="vms:RoutingRuleSettingViewModel"
-    Background="{DynamicResource MaterialDesignPaper}"
-    FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
-    ResizeMode="NoResize"
     ShowInTaskbar="False"
     Style="{StaticResource WindowGlobal}"
-    TextElement.FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
-    TextElement.Foreground="{DynamicResource MaterialDesignBody}"
     WindowStartupLocation="CenterScreen"
     mc:Ignorable="d">
     <DockPanel>

v2rayN/v2rayN/Views/RoutingSettingWindow.xaml

@@ -2,7 +2,6 @@
     x:Class="v2rayN.Views.RoutingSettingWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:conv="clr-namespace:v2rayN.Converters"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -13,13 +12,8 @@
     Width="990"
     Height="700"
     x:TypeArguments="vms:RoutingSettingViewModel"
-    Background="{DynamicResource MaterialDesignPaper}"
-    FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
-    ResizeMode="NoResize"
     ShowInTaskbar="False"
     Style="{StaticResource WindowGlobal}"
-    TextElement.FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
-    TextElement.Foreground="{DynamicResource MaterialDesignBody}"
     WindowStartupLocation="CenterScreen"
     mc:Ignorable="d">
     <Window.Resources>

v2rayN/v2rayN/Views/StatusBarView.xaml.cs

@@ -100,11 +100,11 @@ namespace v2rayN.Views
             return await Task.FromResult(true);
         }
 
-        private void menuExit_Click(object sender, RoutedEventArgs e)
+        private async void menuExit_Click(object sender, RoutedEventArgs e)
         {
             tbNotify.Dispose();
             var service = Locator.Current.GetService<MainWindowViewModel>();
-            if (service != null) service.MyAppExitAsync(false);
+            if (service != null) await service.MyAppExitAsync(false);
         }
 
         private void txtRunningInfoDisplay_MouseDoubleClick(object sender, MouseButtonEventArgs e)

v2rayN/v2rayN/Views/SubEditWindow.xaml

@@ -2,7 +2,6 @@
     x:Class="v2rayN.Views.SubEditWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:conv="clr-namespace:v2rayN.Converters"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -13,13 +12,8 @@
     Width="700"
     Height="600"
     x:TypeArguments="vms:SubEditViewModel"
-    Background="{DynamicResource MaterialDesignPaper}"
-    FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
-    ResizeMode="NoResize"
     ShowInTaskbar="False"
     Style="{StaticResource WindowGlobal}"
-    TextElement.FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
-    TextElement.Foreground="{DynamicResource MaterialDesignBody}"
     WindowStartupLocation="CenterScreen"
     mc:Ignorable="d">
     <Window.Resources>
@@ -302,7 +296,6 @@
                     Style="{StaticResource MyOutlinedTextBox}"
                     ToolTip="{x:Static resx:ResUI.TipPreSocksPort}" />
 
-
                 <TextBlock
                     Grid.Row="12"
                     Grid.Column="0"

v2rayN/v2rayN/Views/SubSettingWindow.xaml

@@ -2,7 +2,6 @@
     x:Class="v2rayN.Views.SubSettingWindow"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:conv="clr-namespace:v2rayN.Converters"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
@@ -13,13 +12,8 @@
     Width="800"
     Height="600"
     x:TypeArguments="vms:SubSettingViewModel"
-    Background="{DynamicResource MaterialDesignPaper}"
-    FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
-    ResizeMode="NoResize"
     ShowInTaskbar="False"
     Style="{StaticResource WindowGlobal}"
-    TextElement.FontFamily="{x:Static conv:MaterialDesignFonts.MyFont}"
-    TextElement.Foreground="{DynamicResource MaterialDesignBody}"
     WindowStartupLocation="CenterScreen"
     mc:Ignorable="d">
     <materialDesign:DialogHost