up 7.4.1

https://github.com/2dust/v2rayN/issues/6309

README.md

@@ -13,7 +13,7 @@ Check [Release files introduction](https://github.com/2dust/v2rayN/wiki/Release-
 ### Windows
 - Run `v2rayN.exe`
 ### Linux
-- `chmod +x v2rayN` Run `./v2rayN`
+- `chmod +x v2rayN` Run `./v2rayN` under user permissions
 ```
 Debian 9+
 Ubuntu 16.04+

v2rayN/ServiceLib/Common/Utils.cs

@@ -529,15 +529,9 @@ namespace ServiceLib.Common
         {
             try
             {
-                if (blFull)
-                {
-                    return
-                        $"{Global.AppName} - V{GetVersionInfo()} - {RuntimeInformation.ProcessArchitecture} - {File.GetLastWriteTime(GetExePath()):yyyy/MM/dd}";
-                }
-                else
-                {
-                    return $"{Global.AppName}/{GetVersionInfo()}";
-                }
+                return blFull
+                    ? $"{Global.AppName} - V{GetVersionInfo()} - {RuntimeInformation.ProcessArchitecture} - {StartupPath()}"
+                    : $"{Global.AppName}/{GetVersionInfo()}";
             }
             catch (Exception ex)
             {
@@ -677,6 +671,27 @@ namespace ServiceLib.Common
 
         #region TempPath
 
+        public static bool HasWritePermission()
+        {
+            try
+            {
+                var tempPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "guiTemps");
+                if (!Directory.Exists(tempPath))
+                {
+                    Directory.CreateDirectory(tempPath);
+                }
+                var fileName = Path.Combine(tempPath, GetGuid());
+                File.Create(fileName).Close();
+                File.Delete(fileName);
+            }
+            catch (Exception)
+            {
+                return false;
+            }
+
+            return true;
+        }
+
         public static string GetPath(string fileName)
         {
             var startupPath = StartupPath();
@@ -695,6 +710,11 @@ namespace ServiceLib.Common
 
         public static string StartupPath()
         {
+            if (Utils.IsNonWindows() && Environment.GetEnvironmentVariable("V2RAYN_LOCAL_APPLICATION_DATA") == "1")
+            {
+                return Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "v2rayN");
+            }
+
             return AppDomain.CurrentDomain.BaseDirectory;
         }
 
@@ -818,6 +838,8 @@ namespace ServiceLib.Common
 
         public static bool IsOSX() => RuntimeInformation.IsOSPlatform(OSPlatform.OSX);
 
+        public static bool IsNonWindows() => !RuntimeInformation.IsOSPlatform(OSPlatform.Windows);
+
         public static string GetExeName(string name)
         {
             return IsWindows() ? $"{name}.exe" : name;
@@ -852,6 +874,7 @@ namespace ServiceLib.Common
         public static async Task<string?> SetLinuxChmod(string? fileName)
         {
             if (fileName.IsNullOrEmpty()) return null;
+            //File.SetUnixFileMode(fileName, UnixFileMode.UserRead | UnixFileMode.UserWrite | UnixFileMode.UserExecute);
             var arg = new List<string>() { "-c", $"chmod +x {fileName}" };
             return await GetCliWrapOutput("/bin/bash", arg);
         }

v2rayN/ServiceLib/Global.cs

@@ -76,7 +76,7 @@
         public const int MaxPort = 65536;
         public const string DelayUnit = "";
         public const string SpeedUnit = "";
-        public const int MinFontSize = 10;
+        public const int MinFontSize = 8;
         public const string RebootAs = "rebootas";
         public const string AvaAssets = "avares://v2rayN/Assets/";
 

v2rayN/ServiceLib/Handler/AppHandler.cs

@@ -46,6 +46,11 @@
 
         public bool InitApp()
         {
+            if (Utils.IsNonWindows() && Utils.HasWritePermission() == false)
+            {
+                Environment.SetEnvironmentVariable("V2RAYN_LOCAL_APPLICATION_DATA", "1", EnvironmentVariableTarget.Process);
+            }
+
             Logging.Setup();
             var config = ConfigHandler.LoadConfig();
             if (config == null)

v2rayN/ServiceLib/Handler/CoreHandler.cs

@@ -24,7 +24,7 @@ namespace ServiceLib.Handler
             Environment.SetEnvironmentVariable("V2RAY_LOCATION_ASSET", Utils.GetBinPath(""), EnvironmentVariableTarget.Process);
             Environment.SetEnvironmentVariable("XRAY_LOCATION_ASSET", Utils.GetBinPath(""), EnvironmentVariableTarget.Process);
 
-            if (Utils.IsLinux() || Utils.IsOSX())
+            if (Utils.IsNonWindows())
             {
                 var coreInfo = CoreInfoHandler.Instance.GetCoreInfo();
                 foreach (var it in coreInfo)
@@ -221,7 +221,7 @@ namespace ServiceLib.Handler
         {
             return _config.TunModeItem.EnableTun
                    && eCoreType == ECoreType.sing_box
-                   && (Utils.IsLinux() || Utils.IsOSX())
+                   && (Utils.IsNonWindows())
                 //&& _config.TunModeItem.LinuxSudoPwd.IsNotEmpty()
                 ;
         }

v2rayN/ServiceLib/Handler/SysProxy/ProxySettingLinux.cs

@@ -69,7 +69,7 @@
             {
                 lstCmd.Add(new CmdItem()
                 {
-                    Cmd = "kwriteconfig5",
+                    Cmd = GetKdeVersion(),
                     Arguments = ["--file", $"{configDir}/kioslaverc", "--group", "Proxy Settings", "--key", "ProxyType", "0"]
                 });
             }
@@ -88,12 +88,13 @@
         private static List<CmdItem> GetSetCmd4Kde(string type, string host, int port, string configDir)
         {
             List<CmdItem> lstCmd = [];
+            var cmd = GetKdeVersion();
 
             if (type.IsNullOrEmpty())
             {
                 lstCmd.Add(new()
                 {
-                    Cmd = "kwriteconfig5",
+                    Cmd = cmd,
                     Arguments = ["--file", $"{configDir}/kioslaverc", "--group", "Proxy Settings", "--key", "ProxyType", "1"]
                 });
             }
@@ -101,7 +102,7 @@
             {
                 lstCmd.Add(new()
                 {
-                    Cmd = "kwriteconfig5",
+                    Cmd = cmd,
                     Arguments = ["--file", $"{configDir}/kioslaverc", "--group", "Proxy Settings", "--key", "NoProxyFor", host]
                 });
             }
@@ -110,7 +111,7 @@
                 var type2 = type.Equals("https") ? "http" : type;
                 lstCmd.Add(new CmdItem()
                 {
-                    Cmd = "kwriteconfig5",
+                    Cmd = cmd,
                     Arguments = ["--file", $"{configDir}/kioslaverc", "--group", "Proxy Settings", "--key", $"{type}Proxy", $"{type2}://{host}:{port}"]
                 });
             }
@@ -172,5 +173,14 @@
 
             return isKde;
         }
+        private static string GetKdeVersion()
+        {
+            var ver = Environment.GetEnvironmentVariable("KDE_SESSION_VERSION") ?? "0";
+            return ver switch
+            {
+                "6" => "kwriteconfig6",
+                _ => "kwriteconfig5"
+            };
+        }
     }
 }

v2rayN/ServiceLib/Handler/SysProxy/ProxySettingOSX.cs

@@ -16,9 +16,9 @@
         /// </summary>
         private static readonly List<string> LstTypes = ["setwebproxy", "setsecurewebproxy", "setsocksfirewallproxy"];
 
-        public static async Task SetProxy(string host, int port)
+        public static async Task SetProxy(string host, int port, string exceptions)
         {
-            var lstCmd = GetSetCmds(host, port);
+            var lstCmd = GetSetCmds(host, port, exceptions);
             await ExecCmd(lstCmd);
         }
 
@@ -42,7 +42,7 @@
             }
         }
 
-        private static List<CmdItem> GetSetCmds(string host, int port)
+        private static List<CmdItem> GetSetCmds(string host, int port, string exceptions)
         {
             List<CmdItem> lstCmd = [];
             foreach (var interf in LstInterface)
@@ -52,7 +52,17 @@
                     lstCmd.Add(new CmdItem()
                     {
                         Cmd = "networksetup",
-                        Arguments = [$"-{type}", interf, host, (type.Contains("socks") ? (port - 1) : port).ToString()]
+                        Arguments = [$"-{type}", interf, host, port.ToString()]
+                    });
+                }
+                if (exceptions.IsNotEmpty())
+                {
+                    List<string> args = [$"-setproxybypassdomains", interf];
+                    args.AddRange(exceptions.Split(','));
+                    lstCmd.Add(new CmdItem()
+                    {
+                        Cmd = "networksetup",
+                        Arguments = args
                     });
                 }
             }

v2rayN/ServiceLib/Handler/SysProxy/SysProxyHandler.cs

@@ -32,7 +32,7 @@
                         break;
 
                     case ESysProxyType.ForcedChange when Utils.IsOSX():
-                        await ProxySettingOSX.SetProxy(Global.Loopback, port);
+                        await ProxySettingOSX.SetProxy(Global.Loopback, port, exceptions);
                         break;
 
                     case ESysProxyType.ForcedClear when Utils.IsWindows():

v2rayN/ServiceLib/Models/V2rayConfig.cs

@@ -324,7 +324,8 @@ namespace ServiceLib.Models
 
     public class WsSettings4Ray
     {
-        public string path { get; set; }
+        public string? path { get; set; }
+        public string? host { get; set; }
 
         public Headers4Ray headers { get; set; }
     }
@@ -349,21 +350,9 @@ namespace ServiceLib.Models
         public string? path { get; set; }
         public string? host { get; set; }
         public string? mode { get; set; }
-        public object? scMaxEachPostBytes { get; set; }
-        public object? scMaxConcurrentPosts { get; set; }
-        public object? scMinPostsIntervalMs { get; set; }
-        //public Xmux4Ray? xmux { get; set; }
         public object? extra { get; set; }
     }
 
-    //public class Xmux4Ray
-    //{
-    //    public object? maxConcurrency { get; set; }
-    //    public object? maxConnections { get; set; }
-    //    public object? cMaxReuseTimes { get; set; }
-    //    public object? cMaxLifetimeMs { get; set; }
-    //}
-
     public class HttpSettings4Ray
     {
         public string? path { get; set; }

v2rayN/ServiceLib/Sample/custom_routing_black

@@ -1,149 +1,156 @@
 [
-    {
-        "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"
-    }
+  {
+    "remarks": "绕过bittorrent",
+    "outboundTag": "direct",
+    "protocol": [
+      "bittorrent"
+    ]
+  },
+  {
+    "remarks": "api.ip.sb",
+    "outboundTag": "proxy",
+    "domain": [
+      "api.ip.sb"
+    ]
+  },
+  {
+    "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/ServiceLib.csproj

@@ -4,7 +4,7 @@
 	<TargetFramework>net8.0</TargetFramework>
 	<ImplicitUsings>enable</ImplicitUsings>
 	<Nullable>enable</Nullable>
-	<Version>7.3.2</Version>
+	<Version>7.4.1</Version>
   </PropertyGroup>
  
 	<ItemGroup>
@@ -18,7 +18,7 @@
 		<PackageReference Include="QRCoder" Version="1.6.0" />
 		<PackageReference Include="CliWrap" Version="3.7.0" /> 
 		<PackageReference Include="SkiaSharp.QrCode" Version="0.7.0" />
-		<PackageReference Include="ZXing.Net.Bindings.SkiaSharp" Version="0.16.20" />
+		<PackageReference Include="ZXing.Net.Bindings.SkiaSharp" Version="0.16.14" />
 		<PackageReference Include="TaskScheduler" Version="2.11.0" />
 
 	</ItemGroup>

v2rayN/ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs

@@ -442,7 +442,7 @@ namespace ServiceLib.Services.CoreConfig
 
         #region private gen function
 
-        public async Task<int> GenLog(SingboxConfig singboxConfig)
+        private async Task<int> GenLog(SingboxConfig singboxConfig)
         {
             try
             {
@@ -570,7 +570,7 @@ namespace ServiceLib.Services.CoreConfig
             return inbound;
         }
 
-        public async Task<int> GenOutbound(ProfileItem node, Outbound4Sbox outbound)
+        private async Task<int> GenOutbound(ProfileItem node, Outbound4Sbox outbound)
         {
             try
             {
@@ -694,7 +694,7 @@ namespace ServiceLib.Services.CoreConfig
             return 0;
         }
 
-        public async Task<int> GenOutboundMux(ProfileItem node, Outbound4Sbox outbound)
+        private async Task<int> GenOutboundMux(ProfileItem node, Outbound4Sbox outbound)
         {
             try
             {
@@ -717,7 +717,7 @@ namespace ServiceLib.Services.CoreConfig
             return 0;
         }
 
-        public async Task<int> GenOutboundTls(ProfileItem node, Outbound4Sbox outbound)
+        private async Task<int> GenOutboundTls(ProfileItem node, Outbound4Sbox outbound)
         {
             try
             {
@@ -767,7 +767,7 @@ namespace ServiceLib.Services.CoreConfig
             return 0;
         }
 
-        public async Task<int> GenOutboundTransport(ProfileItem node, Outbound4Sbox outbound)
+        private async Task<int> GenOutboundTransport(ProfileItem node, Outbound4Sbox outbound)
         {
             try
             {
@@ -994,7 +994,7 @@ namespace ServiceLib.Services.CoreConfig
             }
         }
 
-        public async Task<int> GenRoutingUserRule(RulesItem item, List<Rule4Sbox> rules)
+        private async Task<int> GenRoutingUserRule(RulesItem item, List<Rule4Sbox> rules)
         {
             try
             {
@@ -1152,7 +1152,7 @@ namespace ServiceLib.Services.CoreConfig
             return true;
         }
 
-        public async Task<int> GenDns(ProfileItem? node, SingboxConfig singboxConfig)
+        private async Task<int> GenDns(ProfileItem? node, SingboxConfig singboxConfig)
         {
             try
             {
@@ -1183,7 +1183,7 @@ namespace ServiceLib.Services.CoreConfig
             return 0;
         }
 
-        public async Task<int> GenDnsDomains(ProfileItem? node, SingboxConfig singboxConfig, DNSItem? dNSItem)
+        private async Task<int> GenDnsDomains(ProfileItem? node, SingboxConfig singboxConfig, DNSItem? dNSItem)
         {
             var dns4Sbox = singboxConfig.dns ?? new();
             dns4Sbox.servers ??= [];
@@ -1236,7 +1236,7 @@ namespace ServiceLib.Services.CoreConfig
             return 0;
         }
 
-        public async Task<int> GenExperimental(SingboxConfig singboxConfig)
+        private async Task<int> GenExperimental(SingboxConfig singboxConfig)
         {
             //if (_config.guiItem.enableStatistics)
             {

v2rayN/ServiceLib/Services/CoreConfig/CoreConfigV2rayService.cs

@@ -359,7 +359,7 @@ namespace ServiceLib.Services.CoreConfig
 
         #region private gen function
 
-        public async Task<int> GenLog(V2rayConfig v2rayConfig)
+        private async Task<int> GenLog(V2rayConfig v2rayConfig)
         {
             try
             {
@@ -384,7 +384,7 @@ namespace ServiceLib.Services.CoreConfig
             return 0;
         }
 
-        public async Task<int> GenInbounds(V2rayConfig v2rayConfig)
+        private async Task<int> GenInbounds(V2rayConfig v2rayConfig)
         {
             try
             {
@@ -481,7 +481,7 @@ namespace ServiceLib.Services.CoreConfig
             return 0;
         }
 
-        public async Task<int> GenRoutingUserRule(RulesItem4Ray? rule, V2rayConfig v2rayConfig)
+        private async Task<int> GenRoutingUserRule(RulesItem4Ray? rule, V2rayConfig v2rayConfig)
         {
             try
             {
@@ -559,7 +559,7 @@ namespace ServiceLib.Services.CoreConfig
             return 0;
         }
 
-        public async Task<int> GenOutbound(ProfileItem node, Outbounds4Ray outbound)
+        private async Task<int> GenOutbound(ProfileItem node, Outbounds4Ray outbound)
         {
             try
             {
@@ -700,8 +700,7 @@ namespace ServiceLib.Services.CoreConfig
 
                             await GenOutboundMux(node, outbound, _config.CoreBasicItem.MuxEnabled);
 
-                            if (node.StreamSecurity == Global.StreamSecurityReality
-                                || node.StreamSecurity == Global.StreamSecurity)
+                            if (node.StreamSecurity == Global.StreamSecurityReality || node.StreamSecurity == Global.StreamSecurity)
                             {
                                 if (Utils.IsNotEmpty(node.Flow))
                                 {
@@ -745,7 +744,7 @@ namespace ServiceLib.Services.CoreConfig
                 }
 
                 outbound.protocol = Global.ProtocolTypes[node.ConfigType];
-                await GenBoundStreamSettings(node, outbound.streamSettings);
+                await GenBoundStreamSettings(node, outbound);
             }
             catch (Exception ex)
             {
@@ -754,7 +753,7 @@ namespace ServiceLib.Services.CoreConfig
             return 0;
         }
 
-        public async Task<int> GenOutboundMux(ProfileItem node, Outbounds4Ray outbound, bool enabled)
+        private async Task<int> GenOutboundMux(ProfileItem node, Outbounds4Ray outbound, bool enabled)
         {
             try
             {
@@ -778,14 +777,16 @@ namespace ServiceLib.Services.CoreConfig
             return 0;
         }
 
-        public async Task<int> GenBoundStreamSettings(ProfileItem node, StreamSettings4Ray streamSettings)
+        private async Task<int> GenBoundStreamSettings(ProfileItem node, Outbounds4Ray outbound)
         {
             try
             {
+                var streamSettings = outbound.streamSettings;
                 streamSettings.network = node.GetNetwork();
-                string host = node.RequestHost.TrimEx();
-                string sni = node.Sni;
-                string useragent = "";
+                var host = node.RequestHost.TrimEx();
+                var path = node.Path.TrimEx();
+                var sni = node.Sni.TrimEx();
+                var useragent = "";
                 if (!_config.CoreBasicItem.DefUserAgent.IsNullOrEmpty())
                 {
                     try
@@ -858,9 +859,9 @@ namespace ServiceLib.Services.CoreConfig
                         {
                             type = node.HeaderType
                         };
-                        if (Utils.IsNotEmpty(node.Path))
+                        if (Utils.IsNotEmpty(path))
                         {
-                            kcpSettings.seed = node.Path;
+                            kcpSettings.seed = path;
                         }
                         streamSettings.kcpSettings = kcpSettings;
                         break;
@@ -868,9 +869,10 @@ namespace ServiceLib.Services.CoreConfig
                     case nameof(ETransport.ws):
                         WsSettings4Ray wsSettings = new();
                         wsSettings.headers = new Headers4Ray();
-                        string path = node.Path;
+
                         if (Utils.IsNotEmpty(host))
                         {
+                            wsSettings.host = host;
                             wsSettings.headers.Host = host;
                         }
                         if (Utils.IsNotEmpty(path))
@@ -888,9 +890,9 @@ namespace ServiceLib.Services.CoreConfig
                     case nameof(ETransport.httpupgrade):
                         HttpupgradeSettings4Ray httpupgradeSettings = new();
 
-                        if (Utils.IsNotEmpty(node.Path))
+                        if (Utils.IsNotEmpty(path))
                         {
-                            httpupgradeSettings.path = node.Path;
+                            httpupgradeSettings.path = path;
                         }
                         if (Utils.IsNotEmpty(host))
                         {
@@ -902,16 +904,11 @@ namespace ServiceLib.Services.CoreConfig
                     //xhttp
                     case nameof(ETransport.xhttp):
                         streamSettings.network = ETransport.xhttp.ToString();
-                        XhttpSettings4Ray xhttpSettings = new()
-                        {
-                            scMaxEachPostBytes = "500000-1000000",
-                            scMaxConcurrentPosts = "50-100",
-                            scMinPostsIntervalMs = "30-50"
-                        };
+                        XhttpSettings4Ray xhttpSettings = new();
 
-                        if (Utils.IsNotEmpty(node.Path))
+                        if (Utils.IsNotEmpty(path))
                         {
-                            xhttpSettings.path = node.Path;
+                            xhttpSettings.path = path;
                         }
                         if (Utils.IsNotEmpty(host))
                         {
@@ -927,6 +924,7 @@ namespace ServiceLib.Services.CoreConfig
                         }
 
                         streamSettings.xhttpSettings = xhttpSettings;
+                        await GenOutboundMux(node, outbound, false);
 
                         break;
                     //h2
@@ -937,7 +935,7 @@ namespace ServiceLib.Services.CoreConfig
                         {
                             httpSettings.host = Utils.String2List(host);
                         }
-                        httpSettings.path = node.Path;
+                        httpSettings.path = path;
 
                         streamSettings.httpSettings = httpSettings;
 
@@ -947,7 +945,7 @@ namespace ServiceLib.Services.CoreConfig
                         QuicSettings4Ray quicsettings = new()
                         {
                             security = host,
-                            key = node.Path,
+                            key = path,
                             header = new Header4Ray
                             {
                                 type = node.HeaderType
@@ -971,7 +969,7 @@ namespace ServiceLib.Services.CoreConfig
                         GrpcSettings4Ray grpcSettings = new()
                         {
                             authority = Utils.IsNullOrEmpty(host) ? null : host,
-                            serviceName = node.Path,
+                            serviceName = path,
                             multiMode = node.HeaderType == Global.GrpcMultiMode,
                             idle_timeout = _config.GrpcItem.IdleTimeout,
                             health_check_timeout = _config.GrpcItem.HealthCheckTimeout,
@@ -1001,9 +999,9 @@ namespace ServiceLib.Services.CoreConfig
                             request = request.Replace("$requestUserAgent$", $"{useragent.AppendQuotes()}");
                             //Path
                             string pathHttp = @"/";
-                            if (Utils.IsNotEmpty(node.Path))
+                            if (Utils.IsNotEmpty(path))
                             {
-                                string[] arrPath = node.Path.Split(',');
+                                string[] arrPath = path.Split(',');
                                 pathHttp = string.Join(",".AppendQuotes(), arrPath);
                             }
                             request = request.Replace("$requestPath$", $"{pathHttp.AppendQuotes()}");
@@ -1021,7 +1019,7 @@ namespace ServiceLib.Services.CoreConfig
             return 0;
         }
 
-        public async Task<int> GenDns(ProfileItem? node, V2rayConfig v2rayConfig)
+        private async Task<int> GenDns(ProfileItem? node, V2rayConfig v2rayConfig)
         {
             try
             {
@@ -1084,7 +1082,7 @@ namespace ServiceLib.Services.CoreConfig
             return 0;
         }
 
-        public async Task<int> GenDnsDomains(ProfileItem? node, JsonNode dns, DNSItem? dNSItem)
+        private async Task<int> GenDnsDomains(ProfileItem? node, JsonNode dns, DNSItem? dNSItem)
         {
             if (node == null)
             { return 0; }
@@ -1104,7 +1102,7 @@ namespace ServiceLib.Services.CoreConfig
             return 0;
         }
 
-        public async Task<int> GenStatistic(V2rayConfig v2rayConfig)
+        private async Task<int> GenStatistic(V2rayConfig v2rayConfig)
         {
             if (_config.GuiItem.EnableStatistics)
             {

v2rayN/ServiceLib/ViewModels/CheckUpdateViewModel.cs

@@ -262,7 +262,7 @@ namespace ServiceLib.ViewModels
                     FileManager.ZipExtractToFile(fileName, toPath, _config.GuiItem.IgnoreGeoUpdateCore ? "geo" : "");
                 }
 
-                if (Utils.IsLinux() || Utils.IsOSX())
+                if (Utils.IsNonWindows())
                 {
                     var filesList = (new DirectoryInfo(toPath)).GetFiles().Select(u => u.FullName).ToList();
                     foreach (var file in filesList)

v2rayN/ServiceLib/ViewModels/MsgViewModel.cs

@@ -9,7 +9,6 @@ namespace ServiceLib.ViewModels
     {
         private ConcurrentQueue<string> _queueMsg = new();
         private int _numMaxMsg = 500;
-        private string _lastMsgFilter = string.Empty;
         private bool _lastMsgFilterNotAvailable;
         private bool _blLockShow = false;
 
@@ -28,7 +27,7 @@ namespace ServiceLib.ViewModels
 
             this.WhenAnyValue(
                x => x.MsgFilter)
-                   .Subscribe(c => _config.MsgUIItem.MainMsgFilter = MsgFilter);
+                   .Subscribe(c => DoMsgFilter());
 
             this.WhenAnyValue(
               x => x.AutoRefresh,
@@ -77,8 +76,7 @@ namespace ServiceLib.ViewModels
         private async Task EnqueueQueueMsg(string msg)
         {
             //filter msg
-            if (MsgFilter != _lastMsgFilter) _lastMsgFilterNotAvailable = false;
-            if (Utils.IsNotEmpty(MsgFilter) && !_lastMsgFilterNotAvailable)
+            if (MsgFilter.IsNotEmpty() && !_lastMsgFilterNotAvailable)
             {
                 try
                 {
@@ -87,12 +85,12 @@ namespace ServiceLib.ViewModels
                         return;
                     }
                 }
-                catch (Exception)
+                catch (Exception ex)
                 {
+                    _queueMsg.Enqueue(ex.Message);
                     _lastMsgFilterNotAvailable = true;
                 }
             }
-            _lastMsgFilter = MsgFilter;
 
             //Enqueue
             if (_queueMsg.Count > _numMaxMsg)
@@ -113,5 +111,11 @@ namespace ServiceLib.ViewModels
         {
             _queueMsg.Clear();
         }
+
+        private void DoMsgFilter()
+        {
+            _config.MsgUIItem.MainMsgFilter = MsgFilter;
+            _lastMsgFilterNotAvailable = false;
+        }
     }
 }

v2rayN/v2rayN.Desktop/Assets/GlobalStyles.axaml

@@ -6,18 +6,18 @@
     </Design.PreviewWith>
 
     <Style Selector="TextBlock.Margin8">
-        <Setter Property="Margin" Value="10" />
+        <Setter Property="Margin" Value="8" />
     </Style>
     <Style Selector="StackPanel.Margin8">
-        <Setter Property="Margin" Value="10" />
+        <Setter Property="Margin" Value="8" />
     </Style>
     <Style Selector="DockPanel.Margin8">
-        <Setter Property="Margin" Value="10" />
+        <Setter Property="Margin" Value="8" />
     </Style>
     <Style Selector="WrapPanel.Margin8">
-        <Setter Property="Margin" Value="10" />
+        <Setter Property="Margin" Value="8" />
     </Style>
     <Style Selector="Grid.Margin8">
-        <Setter Property="Margin" Value="10" />
+        <Setter Property="Margin" Value="8" />
     </Style>
 </Styles>

v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml

@@ -8,7 +8,7 @@
     xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
     Title="{x:Static resx:ResUI.menuServers}"
     Width="900"
-    Height="700"
+    Height="600"
     x:DataType="vms:AddServerViewModel"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterScreen"

v2rayN/v2rayN.Desktop/Views/CheckUpdateView.axaml

@@ -50,7 +50,7 @@
                         <Border
                             Width="500"
                             Height="80"
-                            Margin="-2"
+                            Margin="-8"
                             VerticalAlignment="Center"
                             Theme="{StaticResource CardBorder}">
                             <Grid>

v2rayN/v2rayN.Desktop/Views/ClashProxiesView.axaml

@@ -105,7 +105,7 @@
                     <DataTemplate>
                         <Border
                             Width="160"
-                            Margin="0"
+                            Margin="-6"
                             Padding="0"
                             Theme="{StaticResource CardBorder}">
                             <DockPanel>
@@ -143,13 +143,12 @@
                     <DataTemplate>
                         <Border
                             Width="160"
-                            Margin="0"
+                            Margin="-6"
                             Padding="0"
                             Theme="{StaticResource CardBorder}">
                             <DockPanel>
                                 <Border
                                     Width="5"
-                                    Height="30"
                                     Margin="0,1"
                                     Background="YellowGreen"
                                     CornerRadius="4"

v2rayN/v2rayN.Desktop/Views/DNSSettingWindow.axaml

@@ -7,8 +7,8 @@
     xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib"
     xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
     Title="{x:Static resx:ResUI.menuDNSSetting}"
-    Width="1000"
-    Height="700"
+    Width="900"
+    Height="600"
     x:DataType="vms:DNSSettingViewModel"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterScreen"

v2rayN/v2rayN.Desktop/Views/MainWindow.axaml

@@ -10,7 +10,7 @@
     xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
     Title="v2rayN"
     Width="900"
-    Height="700"
+    Height="600"
     MinWidth="900"
     x:DataType="vms:MainWindowViewModel"
     Icon="/Assets/NotifyIcon1.ico"

v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml

@@ -8,7 +8,7 @@
     xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
     Title="{x:Static resx:ResUI.menuSetting}"
     Width="1000"
-    Height="700"
+    Height="600"
     x:DataType="vms:OptionSettingViewModel"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterScreen"

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

@@ -215,7 +215,7 @@ namespace v2rayN.Desktop.Views
                 {
                     return lstFonts;
                 }
-                else if (Utils.IsLinux() || Utils.IsOSX())
+                else if (Utils.IsNonWindows())
                 {
                     var result = await Utils.GetLinuxFontFamily("zh");
                     if (result.IsNullOrEmpty())

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

@@ -323,7 +323,7 @@ namespace v2rayN.Desktop.Views
                 ViewModel?.RefreshServers();
             }
         }
-         
+
         //#endregion Event
 
         //#region UI
@@ -353,10 +353,7 @@ namespace v2rayN.Desktop.Views
                         }
                         if (item.Name.ToLower().StartsWith("to"))
                         {
-                            if (!_config.GuiItem.EnableStatistics)
-                            {
-                                item2.IsVisible = false;
-                            }
+                            item2.IsVisible = _config.GuiItem.EnableStatistics;
                         }
                     }
                 }

v2rayN/v2rayN.Desktop/Views/RoutingRuleDetailsWindow.axaml

@@ -8,7 +8,7 @@
     xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
     Title="{x:Static resx:ResUI.menuRoutingRuleDetailsSetting}"
     Width="900"
-    Height="700"
+    Height="600"
     x:DataType="vms:RoutingRuleDetailsViewModel"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterScreen"

v2rayN/v2rayN.Desktop/Views/RoutingRuleSettingWindow.axaml

@@ -7,8 +7,8 @@
     xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib"
     xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
     Title="{x:Static resx:ResUI.menuRoutingRuleSetting}"
-    Width="1000"
-    Height="700"
+    Width="900"
+    Height="600"
     x:DataType="vms:RoutingRuleSettingViewModel"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterScreen"

v2rayN/v2rayN.Desktop/Views/RoutingSettingWindow.axaml

@@ -7,8 +7,8 @@
     xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib"
     xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
     Title="{x:Static resx:ResUI.menuRoutingSetting}"
-    Width="1000"
-    Height="700"
+    Width="900"
+    Height="600"
     x:DataType="vms:RoutingSettingViewModel"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterScreen"

v2rayN/v2rayN.Desktop/Views/StatusBarView.axaml

@@ -23,7 +23,6 @@
                 </StackPanel>
 
                 <StackPanel
-                    Width="240"
                     Margin="8,0"
                     VerticalAlignment="Center"
                     DockPanel.Dock="Left">
@@ -34,7 +33,6 @@
 
                 <StackPanel
                     x:Name="spEnableTun"
-                    Width="100"
                     Margin="8,0"
                     VerticalAlignment="Center"
                     DockPanel.Dock="Left"

v2rayN/v2rayN.Desktop/Views/SubEditWindow.axaml

@@ -8,7 +8,7 @@
     xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
     Title="{x:Static resx:ResUI.menuSubSetting}"
     Width="700"
-    Height="650"
+    Height="600"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterScreen"
     mc:Ignorable="d">

v2rayN/v2rayN.Desktop/Views/SubSettingWindow.axaml

@@ -8,8 +8,8 @@
     xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib"
     xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
     Title="{x:Static resx:ResUI.menuSubSetting}"
-    Width="1000"
-    Height="700"
+    Width="900"
+    Height="600"
     x:DataType="vms:SubSettingViewModel"
     ShowInTaskbar="False"
     WindowStartupLocation="CenterScreen"

v2rayN/v2rayN/Views/ProfilesView.xaml.cs

@@ -1,7 +1,6 @@
 using MaterialDesignThemes.Wpf;
 using ReactiveUI;
 using Splat;
-using System;
 using System.Reactive.Disposables;
 using System.Windows;
 using System.Windows.Controls;
@@ -342,10 +341,7 @@ namespace v2rayN.Views
                         }
                         if (item.Name.ToLower().StartsWith("to"))
                         {
-                            if (!_config.GuiItem.EnableStatistics)
-                            {
-                                item2.Visibility = Visibility.Hidden;
-                            }
+                            item2.Visibility = _config.GuiItem.EnableStatistics ? Visibility.Visible : Visibility.Hidden;
                         }
                     }
                 }

v2rayN/v2rayN/Views/StatusBarView.xaml

@@ -27,7 +27,7 @@
                 </StackPanel>
 
                 <StackPanel
-                    Width="240"
+                    Width="Auto"
                     Margin="{StaticResource MarginLeftRight8}"
                     VerticalAlignment="Center"
                     DockPanel.Dock="Left">
@@ -38,7 +38,7 @@
 
                 <StackPanel
                     x:Name="spEnableTun"
-                    Width="auto"
+                    Width="Auto"
                     Margin="{StaticResource MarginLeftRight8}"
                     VerticalAlignment="Center"
                     DockPanel.Dock="Left"
@@ -46,6 +46,7 @@
                     <TextBlock
                         Margin="{StaticResource MarginLeftRight8}"
                         VerticalAlignment="Center"
+                        Style="{StaticResource StatusbarItem}"
                         Text="{x:Static resx:ResUI.TbEnableTunAs}" />
                     <ToggleButton
                         x:Name="togEnableTun"