up 6.31

feat: 支持导入系统hosts追加至dns设置

.github/workflows/build.yml

@@ -0,0 +1,61 @@
+name: release
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+jobs:
+  build:
+    strategy:
+      matrix:
+        configuration: [Release]
+
+    runs-on: windows-latest 
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v4
+
+    - name: 删除工作流运行
+      uses: Mattraks/delete-workflow-runs@v2
+      with:
+        token: ${{ github.token }}
+        repository: ${{ github.repository }}
+        retain_days: 0
+        keep_minimum_runs: 1
+
+    - name: Build
+      run:  cd v2rayN && 
+        .\build.ps1
+        
+    # - name: Package
+    #   shell: pwsh
+    #   run: |
+    #     7z a -mx9 ..\v2rayN.7z $env:Wap_Project_Directory
+
+    - name: Upload build artifacts
+      uses: actions/upload-artifact@v3
+      with:
+        name: v2rayN
+        path: 
+          .\v2rayN\v2rayN.zip
+
+      
+    # - name: Release
+    #   uses: softprops/action-gh-release@v1
+    #   env:
+    #       GITHUB_TOKEN: ${{ secrets.ACCESS_TOKEN }}
+    #   with:
+    #     prerelease: ${{ contains(github.ref, '-') }}
+    #     draft: false
+    #     files: |
+    #         .\v2rayN\v2rayN.zip
+    #     body: |
+    #         [![](https://img.shields.io/badge/Telegram-Channel-blue)](https://t.me/netch_channel) [![](https://img.shields.io/badge/Telegram-Group-green)](https://t.me/netch_group)
+    #         ## Changelogs
+    #         * This is an automated deployment of GitHub Actions, the change log should be updated manually soon
+            
+    #         ## 更新日志
+    #         * 这是 GitHub Actions 自动化部署，更新日志应该很快会手动更新

v2rayN/ProtosLib/ProtosLib.csproj

@@ -9,9 +9,9 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Google.Protobuf" Version="3.23.3" />
-		<PackageReference Include="Grpc.Net.Client" Version="2.54.0" />
-		<PackageReference Include="Grpc.Tools" Version="2.54.0">
+		<PackageReference Include="Google.Protobuf" Version="3.25.1" />
+		<PackageReference Include="Grpc.Net.Client" Version="2.59.0" />
+		<PackageReference Include="Grpc.Tools" Version="2.59.0">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>

v2rayN/build.ps1

@@ -0,0 +1,39 @@
+param (
+	[Parameter()]
+	[ValidateNotNullOrEmpty()]
+	[string]
+	$OutputPath = '.\bin\v2rayN'
+)
+
+Write-Host 'Building'
+
+dotnet publish `
+	.\v2rayN\v2rayN.csproj `
+	-c Release `
+	--self-contained false `
+	-p:PublishReadyToRun=true `
+	-p:PublishSingleFile=true `
+	-o $OutputPath
+
+dotnet publish `
+	.\v2rayUpgrade\v2rayUpgrade.csproj `
+	-c Release `
+	--self-contained false `
+	-p:PublishReadyToRun=true `
+	-p:PublishSingleFile=true `
+	-o $OutputPath
+
+if ( -Not $? ) {
+	exit $lastExitCode
+	}
+
+if ( Test-Path -Path .\bin\v2rayN ) {
+    rm -Force "$OutputPath\*.pdb"
+    rm -Force "$OutputPath\*.xml"
+}
+
+Write-Host 'Build done'
+
+ls $OutputPath
+7z a  v2rayN.zip $OutputPath
+exit 0

v2rayN/v2rayN/Global.cs

@@ -74,6 +74,9 @@
         public const string vlessProtocolLite = "vless";
         public const string trojanProtocol = "trojan://";
         public const string trojanProtocolLite = "trojan";
+        public const string hysteria2Protocol = "hysteria2://";
+        public const string hysteria2Protocol2 = "hy2://";
+        public const string hysteria2ProtocolLite = "hysteria2";
 
         public const string userEMail = "t@t.tt";
         public const string MyRegPath = "Software\\v2rayNGUI";
@@ -120,6 +123,9 @@
             };
 
         public static readonly List<string> SpeedTestUrls = new() {
+            @"https://speed.cloudflare.com/__down?bytes=100000000",
+            @"https://speed.cloudflare.com/__down?bytes=10000000",
+            @"http://cachefly.cachefly.net/50mb.test",
             @"http://cachefly.cachefly.net/100mb.test",
             @"http://cachefly.cachefly.net/10mb.test"
         };
@@ -140,7 +146,7 @@
         public static readonly List<string> flows = new() { "", "xtls-rprx-vision", "xtls-rprx-vision-udp443" };
         public static readonly List<string> networks = new() { "tcp", "kcp", "ws", "h2", "quic", "grpc" };
         public static readonly List<string> kcpHeaderTypes = new() { "srtp", "utp", "wechat-video", "dtls", "wireguard" };
-        public static readonly List<string> coreTypes = new() { "v2fly", "SagerNet", "Xray", "v2fly_v5", "sing_box" };
+        public static readonly List<string> coreTypes = new() { "v2fly", "SagerNet", "Xray", "sing_box" };
         public static readonly List<string> coreTypes4VLESS = new() { "Xray", "sing_box" };
         public static readonly List<string> domainStrategys = new() { "AsIs", "IPIfNonMatch", "IPOnDemand" };
         public static readonly List<string> domainStrategys4Singbox = new() { "ipv4_only", "ipv6_only", "prefer_ipv4", "prefer_ipv6", "" };
@@ -151,7 +157,7 @@
         public static readonly List<string> allowInsecures = new() { "true", "false", "" };
         public static readonly List<string> domainStrategy4Freedoms = new() { "AsIs", "UseIP", "UseIPv4", "UseIPv6", "" };
         public static readonly List<string> Languages = new() { "zh-Hans", "zh-Hant", "en", "fa-Ir", "ru" };
-        public static readonly List<string> alpns = new() { "h2", "http/1.1", "h2,http/1.1", "" };
+        public static readonly List<string> alpns = new() { "h2", "http/1.1", "h2,http/1.1", "h3", "" };
         public static readonly List<string> LogLevel = new() { "debug", "info", "warning", "error", "none" };
         public static readonly List<string> InboundTags = new() { "socks", "http", "socks2", "http2" };
         public static readonly List<string> Protocols = new() { "http", "tls", "bittorrent" };
@@ -171,4 +177,4 @@
 
         #endregion global variable
     }
-}
+}

v2rayN/v2rayN/Handler/ConfigHandler.cs

@@ -184,9 +184,9 @@ namespace v2rayN.Handler
                 config.speedTestItem.speedPingTestUrl = Global.SpeedPingTestUrl;
             }
 
-            if (config.mux4Sbox == null)
+            if (config.mux4SboxItem == null)
             {
-                config.mux4Sbox = new()
+                config.mux4SboxItem = new()
                 {
                     protocol = Global.SingboxMuxs[0],
                     max_connections = 4,
@@ -196,6 +196,15 @@ namespace v2rayN.Handler
                 };
             }
 
+            if (config.hysteriaItem == null)
+            {
+                config.hysteriaItem = new()
+                {
+                    up_mbps = 100,
+                    down_mbps = 100
+                };
+            }
+
             LazyConfig.Instance.SetConfig(config);
             return 0;
         }
@@ -347,7 +356,7 @@ namespace v2rayN.Handler
         #region Server
 
         /// <summary>
-        /// 添加服务器或编辑
+        /// Add or edit server
         /// </summary>
         /// <param name="config"></param>
         /// <param name="profileItem"></param>
@@ -603,7 +612,7 @@ namespace v2rayN.Handler
         }
 
         /// <summary>
-        /// 添加服务器或编辑
+        /// Add or edit server
         /// </summary>
         /// <param name="config"></param>
         /// <param name="profileItem"></param>
@@ -623,7 +632,7 @@ namespace v2rayN.Handler
         }
 
         /// <summary>
-        /// 添加服务器或编辑
+        /// Add or edit server
         /// </summary>
         /// <param name="config"></param>
         /// <param name="profileItem"></param>
@@ -651,7 +660,7 @@ namespace v2rayN.Handler
         }
 
         /// <summary>
-        /// 添加服务器或编辑
+        /// Add or edit server
         /// </summary>
         /// <param name="config"></param>
         /// <param name="profileItem"></param>
@@ -668,7 +677,7 @@ namespace v2rayN.Handler
         }
 
         /// <summary>
-        /// 添加服务器或编辑
+        /// Add or edit server
         /// </summary>
         /// <param name="config"></param>
         /// <param name="profileItem"></param>
@@ -693,6 +702,33 @@ namespace v2rayN.Handler
             return 0;
         }
 
+        /// <summary>
+        /// Add or edit server
+        /// </summary>
+        /// <param name="config"></param>
+        /// <param name="profileItem"></param>
+        /// <returns></returns>
+        public static int AddHysteria2Server(ref Config config, ProfileItem profileItem, bool toFile = true)
+        {
+            profileItem.configType = EConfigType.Hysteria2;
+            profileItem.coreType = ECoreType.sing_box;
+
+            profileItem.address = profileItem.address.TrimEx();
+            profileItem.id = profileItem.id.TrimEx();
+            if (Utils.IsNullOrEmpty(profileItem.streamSecurity))
+            {
+                profileItem.streamSecurity = Global.StreamSecurity;
+            }
+            if (profileItem.id.IsNullOrEmpty())
+            {
+                return -1;
+            }
+
+            AddServerCommon(ref config, profileItem, toFile);
+
+            return 0;
+        }
+
         public static int SortServers(ref Config config, string subId, string colName, bool asc)
         {
             var lstModel = LazyConfig.Instance.ProfileItems(subId, "");
@@ -790,7 +826,7 @@ namespace v2rayN.Handler
         }
 
         /// <summary>
-        /// 添加服务器或编辑
+        /// Add or edit server
         /// </summary>
         /// <param name="config"></param>
         /// <param name="profileItem"></param>
@@ -856,7 +892,7 @@ namespace v2rayN.Handler
                 {
                     profileItem.allowInsecure = config.coreBasicItem.defAllowInsecure.ToString().ToLower();
                 }
-                if (Utils.IsNullOrEmpty(profileItem.fingerprint))
+                if (Utils.IsNullOrEmpty(profileItem.fingerprint) && profileItem.streamSecurity == Global.StreamSecurityReality)
                 {
                     profileItem.fingerprint = config.coreBasicItem.defFingerprint;
                 }
@@ -1042,6 +1078,10 @@ namespace v2rayN.Handler
                 {
                     addStatus = AddVlessServer(ref config, profileItem, false);
                 }
+                else if (profileItem.configType == EConfigType.Hysteria2)
+                {
+                    addStatus = AddHysteria2Server(ref config, profileItem, false);
+                }
 
                 if (addStatus == 0)
                 {

v2rayN/v2rayN/Handler/CoreConfigHandler.cs

@@ -80,6 +80,7 @@ namespace v2rayN.Handler
 
                 if (File.Exists(fileName))
                 {
+                    File.SetAttributes(fileName, FileAttributes.Normal); //If the file has a read-only attribute, direct deletion will fail
                     File.Delete(fileName);
                 }
 
@@ -94,6 +95,7 @@ namespace v2rayN.Handler
                     return -1;
                 }
                 File.Copy(addressFileName, fileName);
+                File.SetAttributes(fileName, FileAttributes.Normal); //Copy will keep the attributes of addressFileName, so we need to add write permissions to fileName just in case of addressFileName is a read-only file.
 
                 //check again
                 if (!File.Exists(fileName))

v2rayN/v2rayN/Handler/CoreConfigSingbox.cs

@@ -283,6 +283,17 @@ namespace v2rayN.Handler
 
                     outboundMux(node, outbound);
                 }
+                else if (node.configType == EConfigType.Hysteria2)
+                {
+                    outbound.type = Global.hysteria2ProtocolLite;
+
+                    outbound.password = node.id;
+
+                    outbound.up_mbps = _config.hysteriaItem.up_mbps > 0 ? _config.hysteriaItem.up_mbps : null;
+                    outbound.down_mbps = _config.hysteriaItem.down_mbps > 0 ? _config.hysteriaItem.down_mbps : null;
+
+                    outboundMux(node, outbound);
+                }
 
                 outboundTls(node, outbound);
 

v2rayN/v2rayN/Handler/CoreConfigV2ray.cs

@@ -1,4 +1,6 @@
-using System.Net;
+using Newtonsoft.Json.Linq;
+using System.IO;
+using System.Net;
 using System.Net.NetworkInformation;
 using v2rayN.Base;
 using v2rayN.Mode;
@@ -718,29 +720,50 @@ namespace v2rayN.Handler
                     outbound.settings.userLevel = 0;
                 }
 
-                var obj = Utils.ParseJson(normalDNS);
-                if (obj?.ContainsKey("servers") == true)
-                {
-                    v2rayConfig.dns = obj;
-                }
-                else
+                var obj = Utils.ParseJson(normalDNS) ?? new JObject();
+
+                if (!obj.ContainsKey("servers"))
                 {
                     List<string> servers = new();
-
                     string[] arrDNS = normalDNS.Split(',');
                     foreach (string str in arrDNS)
                     {
-                        //if (Utils.IsIP(str))
-                        //{
                         servers.Add(str);
-                        //}
                     }
-                    //servers.Add("localhost");
-                    v2rayConfig.dns = new Mode.Dns4Ray
-                    {
-                        servers = servers
-                    };
+                    obj["servers"] = JArray.FromObject(servers);
                 }
+
+                if (item.useSystemHosts)
+                {
+                    var hostfile = @"C:\Windows\System32\drivers\etc\hosts";
+
+                    if (File.Exists(hostfile))
+                    {
+                        var hosts = File.ReadAllText(hostfile).Replace("\r", "");
+                        var hostsList = hosts.Split(new[] { '\n' }, StringSplitOptions.RemoveEmptyEntries);
+
+                        // 获取系统hosts
+                        var systemHosts = new Dictionary<string, string>();
+                        foreach (var host in hostsList)
+                        {
+                            if (host.StartsWith("#")) continue;
+                            var hostItem = host.Split(new[] { ' ', '\t' }, StringSplitOptions.RemoveEmptyEntries);
+                            if (hostItem.Length < 2) continue;
+                            systemHosts.Add(hostItem[1], hostItem[0]);
+                        }
+
+                        // 追加至 dns 设置
+                        var normalHost = obj["hosts"] ?? new JObject();
+                        foreach (var host in systemHosts)
+                        {
+                            if (normalHost[host.Key] != null) continue;
+                            normalHost[host.Key] = host.Value;
+                        }
+                        obj["hosts"] = normalHost;
+                    }
+                }
+
+                v2rayConfig.dns = obj;
             }
             catch (Exception ex)
             {

v2rayN/v2rayN/Handler/CoreHandler.cs

@@ -1,5 +1,6 @@
 using System.Diagnostics;
 using System.IO;
+using System.Reactive.Linq;
 using System.Text;
 using v2rayN.Mode;
 using v2rayN.Resx;
@@ -45,6 +46,24 @@ namespace v2rayN.Handler
                 ShowMsg(true, $"{node.GetSummary()}");
                 CoreStop();
                 CoreStart(node);
+
+                //In tun mode, do a delay check and restart the core
+                if (_config.tunModeItem.enableTun)
+                {
+                    Observable.Range(1, 1)
+                    .Delay(TimeSpan.FromSeconds(15))
+                    .Subscribe(x =>
+                    {
+                        {
+                            if (_process == null || _process.HasExited)
+                            {
+                                CoreStart(node);
+                                ShowMsg(false, "Tun mode restart the core once");
+                                Utils.SaveLog("Tun mode restart the core once");
+                            }
+                        }
+                    });
+                }
             }
         }
 

v2rayN/v2rayN/Handler/LazyConfig.cs

@@ -252,7 +252,7 @@ namespace v2rayN.Handler
             {
                 coreType = ECoreType.v2fly_v5,
                 coreExes = new List<string> { "v2ray" },
-                arguments = "run",
+                arguments = "run -c config.json -format jsonv5",
                 coreUrl = Global.v2flyCoreUrl,
                 coreReleaseApiUrl = Global.v2flyCoreUrl.Replace(Global.githubUrl, Global.githubApiUrl),
                 coreDownloadUrl32 = Global.v2flyCoreUrl + "/download/{0}/v2ray-windows-{1}.zip",
@@ -361,8 +361,21 @@ namespace v2rayN.Handler
                 arguments = "run -c config.json",
                 coreUrl = Global.juicityCoreUrl
             });
+
+            coreInfos.Add(new CoreInfo
+            {
+                coreType = ECoreType.hysteria2,
+                coreExes = new List<string> { "hysteria-windows-amd64", "hysteria-windows-386", "hysteria" },
+                arguments = "",
+                coreUrl = Global.hysteriaCoreUrl,
+                coreReleaseApiUrl = Global.hysteriaCoreUrl.Replace(Global.githubUrl, Global.githubApiUrl),
+                coreDownloadUrl32 = Global.hysteriaCoreUrl + "/download/{0}/hysteria-windows-386.exe",
+                coreDownloadUrl64 = Global.hysteriaCoreUrl + "/download/{0}/hysteria-windows-amd64.exe",
+                coreDownloadUrlArm64 = Global.hysteriaCoreUrl + "/download/{0}/hysteria-windows-arm64.exe",
+                redirectInfo = true,
+            });
         }
 
         #endregion Core Type
     }
-}
+}

v2rayN/v2rayN/Handler/ProxySetting.cs

@@ -1,37 +1,68 @@
 using Microsoft.Win32;
 using System.Runtime.InteropServices;
+using static v2rayN.Handler.ProxySetting.InternetConnectionOption;
 
 namespace v2rayN.Handler
 {
     internal class ProxySetting
     {
+        /// <summary>
+        // set to use no proxy
+        /// </summary>
+        /// <exception cref="ApplicationException">Error message with win32 error code</exception>
         public static bool UnsetProxy()
         {
             return SetProxy(null, null, 1);
         }
 
+        /// <summary>
+        /// Set system proxy settings
+        /// </summary>
+        /// <param name="strProxy"> proxy address</param>
+        /// <param name="exceptions">exception addresses that do not use proxy</param>
+        /// <param name="type">type of proxy defined in PerConnFlags
+        ///     PROXY_TYPE_DIRECT           = 0x00000001, // direct connection (no proxy)
+        ///     PROXY_TYPE_PROXY            = 0x00000002, // via named proxy
+        ///     PROXY_TYPE_AUTO_PROXY_URL   = 0x00000004, // autoproxy script URL
+        ///     PROXY_TYPE_AUTO_DETECT      = 0x00000008  // use autoproxy detection
+        /// </param>
+        /// <exception cref="ApplicationException">Error message with win32 error code</exception>
+        /// <returns>true: one of connnection is successfully updated proxy settings</returns>
         public static bool SetProxy(string? strProxy, string? exceptions, int type)
+        {
+            // set proxy for LAN
+            bool result = SetConnectionProxy(null, strProxy, exceptions, type);
+            // set proxy for dial up connections
+            var connections = EnumerateRasEntries();
+            foreach (var connection in connections)
+            {
+                result |= SetConnectionProxy(connection, strProxy, exceptions, type);
+            }
+            return result;
+        }
+
+        private static bool SetConnectionProxy(string? connectionName, string? strProxy, string? exceptions, int type)
         {
             InternetPerConnOptionList list = new();
 
             int optionCount = 1;
-            if (type == 1)
+            if (type == 1) // No proxy
             {
                 optionCount = 1;
             }
-            else if (type is 2 or 4)
+            else if (type is 2 or 4) // named proxy or autoproxy script URL
             {
                 optionCount = Utils.IsNullOrEmpty(exceptions) ? 2 : 3;
             }
 
             int m_Int = (int)PerConnFlags.PROXY_TYPE_DIRECT;
             PerConnOption m_Option = PerConnOption.INTERNET_PER_CONN_FLAGS;
-            if (type == 2)
+            if (type == 2) // named proxy
             {
                 m_Int = (int)(PerConnFlags.PROXY_TYPE_DIRECT | PerConnFlags.PROXY_TYPE_PROXY);
                 m_Option = PerConnOption.INTERNET_PER_CONN_PROXY_SERVER;
             }
-            else if (type == 4)
+            else if (type == 4) // autoproxy script url
             {
                 m_Int = (int)(PerConnFlags.PROXY_TYPE_DIRECT | PerConnFlags.PROXY_TYPE_AUTO_PROXY_URL);
                 m_Option = PerConnOption.INTERNET_PER_CONN_AUTOCONFIG_URL;
@@ -47,24 +78,31 @@ namespace v2rayN.Handler
             if (optionCount > 1)
             {
                 options[1].m_Option = m_Option;
-                options[1].m_Value.m_StringPtr = Marshal.StringToHGlobalAuto(strProxy);
+                options[1].m_Value.m_StringPtr = Marshal.StringToHGlobalAuto(strProxy); // !! remember to deallocate memory 1
                 // except for these addresses ...
                 if (optionCount > 2)
                 {
                     options[2].m_Option = PerConnOption.INTERNET_PER_CONN_PROXY_BYPASS;
-                    options[2].m_Value.m_StringPtr = Marshal.StringToHGlobalAuto(exceptions);
+                    options[2].m_Value.m_StringPtr = Marshal.StringToHGlobalAuto(exceptions); // !! remember to deallocate memory 2
                 }
             }
 
             // default stuff
             list.dwSize = Marshal.SizeOf(list);
-            list.szConnection = IntPtr.Zero;
+            if (connectionName != null)
+            {
+                list.szConnection = Marshal.StringToHGlobalAuto(connectionName); // !! remember to deallocate memory 3
+            }
+            else
+            {
+                list.szConnection = IntPtr.Zero;
+            }
             list.dwOptionCount = options.Length;
             list.dwOptionError = 0;
 
             int optSize = Marshal.SizeOf(typeof(InternetConnectionOption));
             // make a pointer out of all that ...
-            IntPtr optionsPtr = Marshal.AllocCoTaskMem(optSize * options.Length);
+            IntPtr optionsPtr = Marshal.AllocCoTaskMem(optSize * options.Length); // !! remember to deallocate memory 4
             // copy the array over into that spot in memory ...
             for (int i = 0; i < options.Length; ++i)
             {
@@ -83,26 +121,82 @@ namespace v2rayN.Handler
             list.options = optionsPtr;
 
             // and then make a pointer out of the whole list
-            IntPtr ipcoListPtr = Marshal.AllocCoTaskMem(list.dwSize);
+            IntPtr ipcoListPtr = Marshal.AllocCoTaskMem(list.dwSize); // !! remember to deallocate memory 5
             Marshal.StructureToPtr(list, ipcoListPtr, false);
 
             // and finally, call the API method!
-            int returnvalue = NativeMethods.InternetSetOption(IntPtr.Zero,
+            bool isSuccess = NativeMethods.InternetSetOption(IntPtr.Zero,
                InternetOption.INTERNET_OPTION_PER_CONNECTION_OPTION,
-               ipcoListPtr, list.dwSize) ? -1 : 0;
-            if (returnvalue == 0)
+               ipcoListPtr, list.dwSize);
+            int returnvalue = 0; // ERROR_SUCCESS
+            if (!isSuccess)
             {  // get the error codes, they might be helpful
-                returnvalue = Marshal.GetLastWin32Error();
+                returnvalue = Marshal.GetLastPInvokeError();
             }
-            // FREE the data ASAP
-            Marshal.FreeCoTaskMem(optionsPtr);
-            Marshal.FreeCoTaskMem(ipcoListPtr);
-            if (returnvalue > 0)
-            {  // throw the error codes, they might be helpful
-                //throw new Win32Exception(Marshal.GetLastWin32Error());
+            else
+            {
+                // Notify the system that the registry settings have been changed and cause them to be refreshed
+                NativeMethods.InternetSetOption(IntPtr.Zero, InternetOption.INTERNET_OPTION_SETTINGS_CHANGED, IntPtr.Zero, 0);
+                NativeMethods.InternetSetOption(IntPtr.Zero, InternetOption.INTERNET_OPTION_REFRESH, IntPtr.Zero, 0);
             }
 
-            return (returnvalue < 0);
+            // FREE the data ASAP
+            if (list.szConnection != IntPtr.Zero) Marshal.FreeHGlobal(list.szConnection); // release mem 3
+            if (optionCount > 1)
+            {
+                Marshal.FreeHGlobal(options[1].m_Value.m_StringPtr); // release mem 1
+                if (optionCount > 2)
+                {
+                    Marshal.FreeHGlobal(options[2].m_Value.m_StringPtr); // release mem 2
+                }
+            }
+            Marshal.FreeCoTaskMem(optionsPtr); // release mem 4
+            Marshal.FreeCoTaskMem(ipcoListPtr); // release mem 5
+            if (returnvalue != 0)
+            {
+                // throw the error codes, they might be helpful
+                throw new ApplicationException($"Set Internet Proxy failed with error code: {Marshal.GetLastWin32Error()}");
+            }
+
+            return true;
+        }
+
+        /// <summary>
+        /// Retrieve list of connections including LAN and WAN to support PPPoE connection
+        /// </summary>
+        /// <returns>A list of RAS connection names. May be empty list if no dial up connection.</returns>
+        /// <exception cref="ApplicationException">Error message with win32 error code</exception>
+        private static IEnumerable<string> EnumerateRasEntries()
+        {
+            int entries = 0;
+            // attempt to query with 1 entry buffer
+            RASENTRYNAME[] rasEntryNames = new RASENTRYNAME[1];
+            int bufferSize = Marshal.SizeOf(typeof(RASENTRYNAME));
+            rasEntryNames[0].dwSize = Marshal.SizeOf(typeof(RASENTRYNAME));
+
+            uint result = NativeMethods.RasEnumEntries(null, null, rasEntryNames, ref bufferSize, ref entries);
+            // increase buffer if the buffer is not large enough
+            if (result == (uint)ErrorCode.ERROR_BUFFER_TOO_SMALL)
+            {
+                rasEntryNames = new RASENTRYNAME[bufferSize / Marshal.SizeOf(typeof(RASENTRYNAME))];
+                for (int i = 0; i < rasEntryNames.Length; i++)
+                {
+                    rasEntryNames[i].dwSize = Marshal.SizeOf(typeof(RASENTRYNAME));
+                }
+
+                result = NativeMethods.RasEnumEntries(null, null, rasEntryNames, ref bufferSize, ref entries);
+            }
+            if (result == 0)
+            {
+                var entryNames = new List<string>();
+                for (int i = 0; i < entries; i++)
+                {
+                    entryNames.Add(rasEntryNames[i].szEntryName);
+                }
+
+                return entryNames;
+            }
+            throw new ApplicationException($"RasEnumEntries failed with error code: {result}");
         }
 
         #region WinInet structures
@@ -145,6 +239,25 @@ namespace v2rayN.Handler
                 [FieldOffset(0)]
                 public IntPtr m_StringPtr;
             }
+
+            [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto)]
+            public struct RASENTRYNAME
+            {
+                public int dwSize;
+
+                [MarshalAs(UnmanagedType.ByValTStr, SizeConst = RAS_MaxEntryName + 1)]
+                public string szEntryName;
+
+                public int dwFlags;
+
+                [MarshalAs(UnmanagedType.ByValTStr, SizeConst = MAX_PATH + 1)]
+                public string szPhonebookPath;
+            }
+
+            // Constants
+            public const int RAS_MaxEntryName = 256;
+
+            public const int MAX_PATH = 260; // Standard MAX_PATH value in Windows
         }
 
         #endregion WinInet structures
@@ -156,7 +269,9 @@ namespace v2rayN.Handler
         //
         public enum InternetOption : uint
         {
-            INTERNET_OPTION_PER_CONNECTION_OPTION = 75
+            INTERNET_OPTION_PER_CONNECTION_OPTION = 75,
+            INTERNET_OPTION_REFRESH = 37,
+            INTERNET_OPTION_SETTINGS_CHANGED = 39
         }
 
         //
@@ -182,6 +297,12 @@ namespace v2rayN.Handler
             PROXY_TYPE_AUTO_DETECT = 0x00000008   // use autoproxy detection
         }
 
+        public enum ErrorCode : uint
+        {
+            ERROR_BUFFER_TOO_SMALL = 603,
+            ERROR_INVALID_SIZE = 632
+        }
+
         #endregion WinInet enums
 
         internal static class NativeMethods
@@ -189,6 +310,15 @@ namespace v2rayN.Handler
             [DllImport("WinInet.dll", SetLastError = true, CharSet = CharSet.Auto)]
             [return: MarshalAs(UnmanagedType.Bool)]
             public static extern bool InternetSetOption(IntPtr hInternet, InternetOption dwOption, IntPtr lpBuffer, int dwBufferLength);
+
+            [DllImport("Rasapi32.dll", CharSet = CharSet.Auto)]
+            public static extern uint RasEnumEntries(
+                string? reserved,          // Reserved, must be null
+                string? lpszPhonebook,     // Pointer to full path and filename of phone-book file. If this parameter is NULL, the entries are enumerated from all the remote access phone-book files
+                [In, Out] RASENTRYNAME[]? lprasentryname, // Buffer to receive RAS entry names
+                ref int lpcb,             // Size of the buffer
+                ref int lpcEntries        // Number of entries written to the buffer
+            );
         }
 
         //判断是否使用代理

v2rayN/v2rayN/Handler/ShareHandler.cs

@@ -29,6 +29,7 @@ namespace v2rayN.Handler
                     EConfigType.Socks => ShareSocks(item),
                     EConfigType.Trojan => ShareTrojan(item),
                     EConfigType.VLESS => ShareVLESS(item),
+                    EConfigType.Hysteria2 => ShareHysteria2(item),
                     _ => null,
                 };
 
@@ -162,6 +163,35 @@ namespace v2rayN.Handler
             return url;
         }
 
+        private static string ShareHysteria2(ProfileItem item)
+        {
+            string url = string.Empty;
+            string remark = string.Empty;
+            if (!Utils.IsNullOrEmpty(item.remarks))
+            {
+                remark = "#" + Utils.UrlEncode(item.remarks);
+            }
+            var dicQuery = new Dictionary<string, string>();
+            if (!Utils.IsNullOrEmpty(item.sni))
+            {
+                dicQuery.Add("sni", item.sni);
+            }
+            if (!Utils.IsNullOrEmpty(item.alpn))
+            {
+                dicQuery.Add("alpn", Utils.UrlEncode(item.alpn));
+            }
+            dicQuery.Add("insecure", item.allowInsecure.ToLower() == "true" ? "1" : "0");
+
+            string query = "?" + string.Join("&", dicQuery.Select(x => x.Key + "=" + x.Value).ToArray());
+
+            url = string.Format("{0}@{1}:{2}",
+            item.id,
+            GetIpv6(item.address),
+            item.port);
+            url = $"{Global.hysteria2Protocol}{url}{query}{remark}";
+            return url;
+        }
+
         private static string GetIpv6(string address)
         {
             return Utils.IsIpv6(address) ? $"[{address}]" : address;
@@ -353,6 +383,12 @@ namespace v2rayN.Handler
                 {
                     profileItem = ResolveStdVLESS(result);
                 }
+                else if (result.StartsWith(Global.hysteria2Protocol) || result.StartsWith(Global.hysteria2Protocol2))
+                {
+                    msg = ResUI.ConfigurationFormatIncorrect;
+
+                    profileItem = ResolveHysteria2(result);
+                }
                 else
                 {
                     msg = ResUI.NonvmessOrssProtocol;
@@ -758,6 +794,27 @@ namespace v2rayN.Handler
             return item;
         }
 
+        private static ProfileItem ResolveHysteria2(string result)
+        {
+            ProfileItem item = new()
+            {
+                configType = EConfigType.Hysteria2
+            };
+
+            Uri url = new(result);
+
+            item.address = url.IdnHost;
+            item.port = url.Port;
+            item.remarks = url.GetComponents(UriComponents.Fragment, UriFormat.Unescaped);
+            item.id = url.UserInfo;
+
+            var query = HttpUtility.ParseQueryString(url.Query);
+            ResolveStdTransport(query, ref item);
+            item.allowInsecure = (query["insecure"] ?? "") == "1" ? "true" : "false";
+
+            return item;
+        }
+
         private static int ResolveStdTransport(NameValueCollection query, ref ProfileItem item)
         {
             item.flow = query["flow"] ?? "";

v2rayN/v2rayN/Handler/SpeedtestHandler.cs

@@ -30,7 +30,7 @@ namespace v2rayN.Handler
             _selecteds = new List<ServerTestItem>();
             foreach (var it in selecteds)
             {
-                if (it.configType == EConfigType.Custom)
+                if (it.configType == EConfigType.Custom || it.configType == EConfigType.Hysteria2)
                 {
                     continue;
                 }

v2rayN/v2rayN/Handler/SysProxyHandle.cs

@@ -1,10 +1,5 @@
 using PacLib;
-using System.Diagnostics;
-using System.IO;
-using System.Text;
 using v2rayN.Mode;
-using v2rayN.Properties;
-using v2rayN.Tool;
 
 namespace v2rayN.Handler
 {
@@ -20,7 +15,6 @@ namespace v2rayN.Handler
         //  <proxy-server><CR-LF>
         //  <bypass-list><CR-LF>
         //  <pac-url>
-        private static SysproxyConfig? _userSettings = null;
 
         private enum RET_ERRORS : int
         {
@@ -34,15 +28,6 @@ namespace v2rayN.Handler
 
         static SysProxyHandle()
         {
-            try
-            {
-                FileManager.UncompressFile(Utils.GetTempPath("sysproxy.exe"),
-                    Environment.Is64BitOperatingSystem ? Resources.sysproxy64_exe : Resources.sysproxy_exe);
-            }
-            catch (IOException ex)
-            {
-                Utils.SaveLog(ex.Message, ex);
-            }
         }
 
         public static bool UpdateSysProxy(Config config, bool forceDisable)
@@ -79,13 +64,11 @@ namespace v2rayN.Handler
                             .Replace("{http_port}", port.ToString())
                             .Replace("{socks_port}", portSocks.ToString());
                     }
-                    ProxySetting.SetProxy(strProxy, strExceptions, 2);
-                    SetIEProxy(true, strProxy, strExceptions);
+                    ProxySetting.SetProxy(strProxy, strExceptions, 2); // set a named proxy
                 }
                 else if (type == ESysProxyType.ForcedClear)
                 {
-                    ProxySetting.UnsetProxy();
-                    ResetIEProxy();
+                    ProxySetting.UnsetProxy(); // set to no proxy
                 }
                 else if (type == ESysProxyType.Unchanged)
                 {
@@ -94,8 +77,7 @@ namespace v2rayN.Handler
                 {
                     PacHandler.Start(Utils.GetConfigPath(), port, portPac);
                     var strProxy = $"{Global.httpProtocol}{Global.Loopback}:{portPac}/pac?t={DateTime.Now.Ticks}";
-                    ProxySetting.SetProxy(strProxy, "", 4);
-                    SetIEProxy(false, strProxy, "");
+                    ProxySetting.SetProxy(strProxy, "", 4); // use pac script url for auto-config proxy
                 }
 
                 if (type != ESysProxyType.Pac)
@@ -121,102 +103,5 @@ namespace v2rayN.Handler
             {
             }
         }
-
-        public static void SetIEProxy(bool global, string strProxy, string strExceptions)
-        {
-            string arguments = global
-                ? $"global {strProxy} {strExceptions}"
-                : $"pac {strProxy}";
-
-            ExecSysproxy(arguments);
-        }
-
-        // set system proxy to 1 (null) (null) (null)
-        public static void ResetIEProxy()
-        {
-            ExecSysproxy("set 1 - - -");
-        }
-
-        private static void ExecSysproxy(string arguments)
-        {
-            // using event to avoid hanging when redirect standard output/error
-            // ref: https://stackoverflow.com/questions/139593/processstartinfo-hanging-on-waitforexit-why
-            // and http://blog.csdn.net/zhangweixing0/article/details/7356841
-            using AutoResetEvent outputWaitHandle = new(false);
-            using AutoResetEvent errorWaitHandle = new(false);
-            using Process process = new();
-
-            // Configure the process using the StartInfo properties.
-            process.StartInfo.FileName = Utils.GetTempPath("sysproxy.exe");
-            process.StartInfo.Arguments = arguments;
-            process.StartInfo.WorkingDirectory = Utils.GetTempPath();
-            process.StartInfo.WindowStyle = ProcessWindowStyle.Hidden;
-            process.StartInfo.UseShellExecute = false;
-            process.StartInfo.RedirectStandardError = true;
-            process.StartInfo.RedirectStandardOutput = true;
-
-            // Need to provide encoding info, or output/error strings we got will be wrong.
-            process.StartInfo.StandardOutputEncoding = Encoding.Unicode;
-            process.StartInfo.StandardErrorEncoding = Encoding.Unicode;
-
-            process.StartInfo.CreateNoWindow = true;
-
-            StringBuilder output = new(1024);
-            StringBuilder error = new(1024);
-
-            process.OutputDataReceived += (sender, e) =>
-            {
-                if (e.Data == null)
-                {
-                    outputWaitHandle.Set();
-                }
-                else
-                {
-                    output.AppendLine(e.Data);
-                }
-            };
-            process.ErrorDataReceived += (sender, e) =>
-            {
-                if (e.Data == null)
-                {
-                    errorWaitHandle.Set();
-                }
-                else
-                {
-                    error.AppendLine(e.Data);
-                }
-            };
-            try
-            {
-                process.Start();
-
-                process.BeginErrorReadLine();
-                process.BeginOutputReadLine();
-
-                process.WaitForExit();
-            }
-            catch (System.ComponentModel.Win32Exception e)
-            {
-                // log the arguments
-                throw new Exception(process.StartInfo.Arguments);
-            }
-            string stderr = error.ToString();
-            string stdout = output.ToString();
-
-            int exitCode = process.ExitCode;
-            if (exitCode != (int)RET_ERRORS.RET_NO_ERROR)
-            {
-                throw new Exception(stderr);
-            }
-
-            //if (arguments == "query")
-            //{
-            //    if (stdout.IsNullOrWhiteSpace() || stdout.IsNullOrEmpty())
-            //    {
-            //        throw new Exception("failed to query wininet settings");
-            //    }
-            //    _queryStr = stdout;
-            //}
-        }
     }
 }

v2rayN/v2rayN/Handler/UpdateHandle.cs

@@ -24,11 +24,13 @@ namespace v2rayN.Handler
         {
             public bool Success;
             public string Msg;
+            public string Url;
 
-            public ResultEventArgs(bool success, string msg)
+            public ResultEventArgs(bool success, string msg, string url = "")
             {
                 Success = success;
                 Msg = msg;
+                Url = url;
             }
         }
 
@@ -83,8 +85,9 @@ namespace v2rayN.Handler
                 if (args.Success)
                 {
                     _updateFunc(false, string.Format(ResUI.MsgParsingSuccessfully, "v2rayN"));
+                    _updateFunc(false, args.Msg);
 
-                    url = args.Msg;
+                    url = args.Url;
                     _ = askToDownload(downloadHandle, url, true);
                 }
                 else
@@ -135,7 +138,9 @@ namespace v2rayN.Handler
                 if (args.Success)
                 {
                     _updateFunc(false, string.Format(ResUI.MsgParsingSuccessfully, "Core"));
-                    url = args.Msg;
+                    _updateFunc(false, args.Msg);
+
+                    url = args.Url;
                     _ = askToDownload(downloadHandle, url, true);
                 }
                 else
@@ -405,15 +410,10 @@ namespace v2rayN.Handler
             try
             {
                 var gitHubReleases = Utils.FromJson<List<GitHubRelease>>(gitHubReleaseApi);
-                SemanticVersion version;
-                if (preRelease)
-                {
-                    version = new SemanticVersion(gitHubReleases!.First().TagName);
-                }
-                else
-                {
-                    version = new SemanticVersion(gitHubReleases!.First(r => r.Prerelease == false).TagName);
-                }
+                var gitHubRelease = preRelease ? gitHubReleases!.First() : gitHubReleases!.First(r => r.Prerelease == false);
+                var version = new SemanticVersion(gitHubRelease!.TagName);
+                var body = gitHubRelease!.Body;
+
                 var coreInfo = LazyConfig.Instance.GetCoreInfo(type);
 
                 SemanticVersion curVersion;
@@ -427,7 +427,7 @@ namespace v2rayN.Handler
                     case ECoreType.v2fly_v5:
                         {
                             curVersion = getCoreVersion(type);
-                            message = string.Format(ResUI.IsLatestCore, curVersion.ToVersionString("v"));
+                            message = string.Format(ResUI.IsLatestCore, type, curVersion.ToVersionString("v"));
                             string osBit = "64";
                             switch (RuntimeInformation.ProcessArchitecture)
                             {
@@ -451,7 +451,7 @@ namespace v2rayN.Handler
                     case ECoreType.clash_meta:
                         {
                             curVersion = getCoreVersion(type);
-                            message = string.Format(ResUI.IsLatestCore, curVersion);
+                            message = string.Format(ResUI.IsLatestCore, type, curVersion);
                             switch (RuntimeInformation.ProcessArchitecture)
                             {
                                 case Architecture.Arm64:
@@ -472,7 +472,7 @@ namespace v2rayN.Handler
                     case ECoreType.sing_box:
                         {
                             curVersion = getCoreVersion(type);
-                            message = string.Format(ResUI.IsLatestCore, curVersion.ToVersionString("v"));
+                            message = string.Format(ResUI.IsLatestCore, type, curVersion.ToVersionString("v"));
                             switch (RuntimeInformation.ProcessArchitecture)
                             {
                                 case Architecture.Arm64:
@@ -493,7 +493,7 @@ namespace v2rayN.Handler
                     case ECoreType.v2rayN:
                         {
                             curVersion = new SemanticVersion(FileVersionInfo.GetVersionInfo(Utils.GetExePath()).FileVersion.ToString());
-                            message = string.Format(ResUI.IsLatestN, curVersion);
+                            message = string.Format(ResUI.IsLatestN, type, curVersion);
                             switch (RuntimeInformation.ProcessArchitecture)
                             {
                                 case Architecture.Arm64:
@@ -520,7 +520,7 @@ namespace v2rayN.Handler
                     return;
                 }
 
-                AbsoluteCompleted?.Invoke(this, new ResultEventArgs(true, url));
+                AbsoluteCompleted?.Invoke(this, new ResultEventArgs(true, body, url));
             }
             catch (Exception ex)
             {
@@ -603,7 +603,7 @@ namespace v2rayN.Handler
             var url = string.Format(Global.singboxGeoUrl, geoName);
 
             DownloadHandle downloadHandle = new();
-            downloadHandle.UpdateCompleted += (sender2, args) =>
+            downloadHandle.UpdateCompleted += async (sender2, args) =>
             {
                 if (args.Success)
                 {
@@ -612,8 +612,11 @@ namespace v2rayN.Handler
 
                     try
                     {
-                        if (needStop) coreHandler?.CoreStop();
-                        Task.Delay(1000);
+                        if (needStop)
+                        {
+                            coreHandler?.CoreStop();
+                            await Task.Delay(3000);
+                        }
                         string fileName = Utils.GetTempPath(Utils.GetDownloadFileName(url));
                         if (File.Exists(fileName))
                         {

v2rayN/v2rayN/Mode/Config.cs

@@ -27,7 +27,8 @@
         public UIItem uiItem { get; set; }
         public ConstItem constItem { get; set; }
         public SpeedTestItem speedTestItem { get; set; }
-        public Mux4Sbox mux4Sbox { get; set; }
+        public Mux4SboxItem mux4SboxItem { get; set; }
+        public HysteriaItem hysteriaItem { get; set; }
         public List<InItem> inbound { get; set; }
         public List<KeyEventItem> globalHotkeys { get; set; }
         public List<CoreTypeItem> coreTypeItem { get; set; }

v2rayN/v2rayN/Mode/ConfigItems.cs

@@ -198,7 +198,7 @@ namespace v2rayN.Mode
     }
 
     [Serializable]
-    public class Mux4Sbox
+    public class Mux4SboxItem
     {
         public string protocol { get; set; }
         public int max_connections { get; set; }
@@ -206,4 +206,11 @@ namespace v2rayN.Mode
         public int max_streams { get; set; }
         public bool padding { get; set; }
     }
+
+    [Serializable]
+    public class HysteriaItem
+    {
+        public int up_mbps { get; set; }
+        public int down_mbps { get; set; }
+    }
 }

v2rayN/v2rayN/Mode/DNSItem.cs

@@ -11,6 +11,7 @@ namespace v2rayN.Mode
         public string remarks { get; set; }
         public bool enabled { get; set; } = true;
         public ECoreType coreType { get; set; }
+        public bool useSystemHosts { get; set; }
         public string? normalDNS { get; set; }
         public string? tunDNS { get; set; }
         public string? domainStrategy4Freedom { get; set; }

v2rayN/v2rayN/Mode/EConfigType.cs

@@ -7,6 +7,7 @@
         Shadowsocks = 3,
         Socks = 4,
         VLESS = 5,
-        Trojan = 6
+        Trojan = 6,
+        Hysteria2 = 7
     }
 }

v2rayN/v2rayN/Mode/ECoreType.cs

@@ -13,6 +13,7 @@
         tuic = 23,
         sing_box = 24,
         juicity = 25,
+        hysteria2 = 26,
         v2rayN = 99
     }
-}
+}

v2rayN/v2rayN/Mode/ProfileItem.cs

@@ -53,6 +53,7 @@ namespace v2rayN.Mode
                 case EConfigType.Socks:
                 case EConfigType.VLESS:
                 case EConfigType.Trojan:
+                case EConfigType.Hysteria2:
                     summary += string.Format("{0}({1}:{2})", remarks, addr, port);
                     break;
 

v2rayN/v2rayN/Properties/Resources.Designer.cs

@@ -219,25 +219,5 @@ namespace v2rayN.Properties {
                 return ((System.Drawing.Bitmap)(obj));
             }
         }
-        
-        /// <summary>
-        ///   查找 System.Byte[] 类型的本地化资源。
-        /// </summary>
-        internal static byte[] sysproxy_exe {
-            get {
-                object obj = ResourceManager.GetObject("sysproxy_exe", resourceCulture);
-                return ((byte[])(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   查找 System.Byte[] 类型的本地化资源。
-        /// </summary>
-        internal static byte[] sysproxy64_exe {
-            get {
-                object obj = ResourceManager.GetObject("sysproxy64_exe", resourceCulture);
-                return ((byte[])(obj));
-            }
-        }
     }
 }

v2rayN/v2rayN/Properties/Resources.resx

@@ -118,12 +118,6 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="sysproxy_exe" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\resources\sysproxy.exe.gz;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="sysproxy64_exe" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\resources\sysproxy64.exe.gz;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
   <data name="NotifyIcon1" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\NotifyIcon1.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>

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

@@ -187,10 +187,10 @@
     <value>پیکربندی اولیه</value>
   </data>
   <data name="IsLatestCore" xml:space="preserve">
-    <value>{0} در حال حاضر به روز است.</value>
+    <value>{0} {1} در حال حاضر به روز است.</value>
   </data>
   <data name="IsLatestN" xml:space="preserve">
-    <value>{0} در حال حاضر به روز است.</value>
+    <value>{0} {1} در حال حاضر به روز است.</value>
   </data>
   <data name="LvAddress" xml:space="preserve">
     <value>آدرس</value>

v2rayN/v2rayN/Resx/ResUI.resx

@@ -187,10 +187,10 @@
     <value>Initial Configuration</value>
   </data>
   <data name="IsLatestCore" xml:space="preserve">
-    <value>{0} already up to date.</value>
+    <value>{0} {1} already up to date.</value>
   </data>
   <data name="IsLatestN" xml:space="preserve">
-    <value>{0} already up to date.</value>
+    <value>{0} {1} already up to date.</value>
   </data>
   <data name="LvAddress" xml:space="preserve">
     <value>Address</value>
@@ -1037,7 +1037,7 @@
     <value>FontFamily(Require restart)</value>
   </data>
   <data name="TbSettingsCurrentFontFamilyTip" xml:space="preserve">
-    <value>Copy the font TTF file to the directory guiFonts, restart the settings</value>
+    <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=socks port+1</value>
@@ -1120,7 +1120,7 @@
   <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">
+  <data name="TbSettingDnsImportDefConfig" xml:space="preserve">
     <value>Click to import default DNS config</value>
   </data>
   <data name="TbdomainStrategy4Singbox" xml:space="preserve">
@@ -1138,4 +1138,13 @@
   <data name="TbRoutingRuleDomain" xml:space="preserve">
     <value>Domain</value>
   </data>
+  <data name="menuAddHysteria2Server" xml:space="preserve">
+    <value>Add [Trojan] server</value>
+  </data>
+  <data name="TbSettingsHysteriaBandwidth" xml:space="preserve">
+    <value>Hysteria Max bandwidth (Up/Dw)</value>
+  </data>
+  <data name="TbSettingsUseSystemHosts" xml:space="preserve">
+    <value>Use System Hosts</value>
+  </data>
 </root>

v2rayN/v2rayN/Resx/ResUI.ru.resx

@@ -187,10 +187,10 @@
     <value>Исходная конфигурация</value>
   </data>
   <data name="IsLatestCore" xml:space="preserve">
-    <value>{0} является последней версией.</value>
+    <value>{0} {1} является последней версией.</value>
   </data>
   <data name="IsLatestN" xml:space="preserve">
-    <value>{0} является последней версией.</value>
+    <value>{0} {1} является последней версией.</value>
   </data>
   <data name="LvAddress" xml:space="preserve">
     <value>Адрес</value>
@@ -1043,7 +1043,7 @@
     <value>Шрифт (требуется перезагрузка)</value>
   </data>
   <data name="TbSettingsCurrentFontFamilyTip" xml:space="preserve">
-    <value>Скопируйте файл шрифта TTF в каталог guiFonts, перезапустите настройки</value>
+    <value>Скопируйте файл шрифта TTF/TTC в каталог guiFonts, перезапустите настройки</value>
   </data>
   <data name="TbSettingsSocksPortTip" xml:space="preserve">
     <value>HTTP port=socks port+1</value>

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

@@ -187,10 +187,10 @@
     <value>初始化配置</value>
   </data>
   <data name="IsLatestCore" xml:space="preserve">
-    <value>{0} 已是最新版本。</value>
+    <value>{0} {1} 已是最新版本。</value>
   </data>
   <data name="IsLatestN" xml:space="preserve">
-    <value>{0} 已是最新版本。</value>
+    <value>{0} {1} 已是最新版本。</value>
   </data>
   <data name="LvAddress" xml:space="preserve">
     <value>地址</value>
@@ -1037,7 +1037,7 @@
     <value>当前字体(需重启)</value>
   </data>
   <data name="TbSettingsCurrentFontFamilyTip" xml:space="preserve">
-    <value>拷贝字体TTF文件到目录guiFonts，重启设置</value>
+    <value>拷贝字体TTF/TTC文件到目录guiFonts，重启设置</value>
   </data>
   <data name="TbSettingsSocksPortTip" xml:space="preserve">
     <value>http端口=socks端口+1</value>
@@ -1117,7 +1117,7 @@
   <data name="TbDnsSingboxObjectDoc" xml:space="preserve">
     <value>请填写 DNS JSON 结构，点击查看文档</value>
   </data>
-  <data name="TBSettingDnsImportDefConfig" xml:space="preserve">
+  <data name="TbSettingDnsImportDefConfig" xml:space="preserve">
     <value>点击导入默认DNS配置</value>
   </data>
   <data name="TbdomainStrategy4Singbox" xml:space="preserve">
@@ -1135,4 +1135,13 @@
   <data name="TbRoutingRuleIP" xml:space="preserve">
     <value>IP 或 IP CIDR</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="TbSettingsUseSystemHosts" xml:space="preserve">
+    <value>使用系统hosts</value>
+  </data>
 </root>

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

@@ -187,10 +187,10 @@
     <value>初始化配置</value>
   </data>
   <data name="IsLatestCore" xml:space="preserve">
-    <value>{0} 已是最新版本。</value>
+    <value>{0} {1} 已是最新版本。</value>
   </data>
   <data name="IsLatestN" xml:space="preserve">
-    <value>{0} 已是最新版本。</value>
+    <value>{0} {1} 已是最新版本。</value>
   </data>
   <data name="LvAddress" xml:space="preserve">
     <value>位址</value>
@@ -1037,7 +1037,7 @@
     <value>目前字型(需重啟)</value>
   </data>
   <data name="TbSettingsCurrentFontFamilyTip" xml:space="preserve">
-    <value>複製字型TTF文件到目錄guiFonts，重啟設定</value>
+    <value>複製字型TTF/TTC文件到目錄guiFonts，重啟設定</value>
   </data>
   <data name="TbSettingsSocksPortTip" xml:space="preserve">
     <value>http埠=socks埠+1</value>
@@ -1117,7 +1117,7 @@
   <data name="TbDnsSingboxObjectDoc" xml:space="preserve">
     <value>請填寫 DNS JSON 結構，點擊查看文件</value>
   </data>
-  <data name="TBSettingDnsImportDefConfig" xml:space="preserve">
+  <data name="TbSettingDnsImportDefConfig" xml:space="preserve">
     <value>點擊匯入預設DNS配置</value>
   </data>
   <data name="TbdomainStrategy4Singbox" xml:space="preserve">

v2rayN/v2rayN/ViewModels/AddServerViewModel.cs

@@ -145,6 +145,10 @@ namespace v2rayN.ViewModels
                 case EConfigType.Trojan:
                     ret = ConfigHandler.AddTrojanServer(ref _config, item);
                     break;
+
+                case EConfigType.Hysteria2:
+                    ret = ConfigHandler.AddHysteria2Server(ref _config, item);
+                    break;
             }
 
             if (ret == 0)

v2rayN/v2rayN/ViewModels/DNSSettingViewModel.cs

@@ -15,6 +15,7 @@ namespace v2rayN.ViewModels
         private NoticeHandler? _noticeHandler;
         private Window _view;
 
+        [Reactive] public bool useSystemHosts { get; set; }
         [Reactive] public string domainStrategy4Freedom { get; set; }
         [Reactive] public string normalDNS { get; set; }
         [Reactive] public string normalDNS2 { get; set; }
@@ -31,6 +32,7 @@ namespace v2rayN.ViewModels
             _view = view;
 
             var item = LazyConfig.Instance.GetDNSItem(ECoreType.Xray);
+            useSystemHosts = item.useSystemHosts;
             domainStrategy4Freedom = item?.domainStrategy4Freedom!;
             normalDNS = item?.normalDNS!;
 
@@ -95,6 +97,7 @@ namespace v2rayN.ViewModels
 
             var item = LazyConfig.Instance.GetDNSItem(ECoreType.Xray);
             item.domainStrategy4Freedom = domainStrategy4Freedom;
+            item.useSystemHosts = useSystemHosts;
             item.normalDNS = normalDNS;
             ConfigHandler.SaveDNSItems(_config, item);
 

v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs

@@ -89,6 +89,7 @@ namespace v2rayN.ViewModels
         public ReactiveCommand<Unit, Unit> AddShadowsocksServerCmd { get; }
         public ReactiveCommand<Unit, Unit> AddSocksServerCmd { get; }
         public ReactiveCommand<Unit, Unit> AddTrojanServerCmd { get; }
+        public ReactiveCommand<Unit, Unit> AddHysteria2ServerCmd { get; }
         public ReactiveCommand<Unit, Unit> AddCustomServerCmd { get; }
         public ReactiveCommand<Unit, Unit> AddServerViaClipboardCmd { get; }
         public ReactiveCommand<Unit, Unit> AddServerViaScanCmd { get; }
@@ -147,11 +148,14 @@ namespace v2rayN.ViewModels
         public ReactiveCommand<Unit, Unit> CheckUpdateNCmd { get; }
 
         public ReactiveCommand<Unit, Unit> CheckUpdateV2flyCoreCmd { get; }
-        public ReactiveCommand<Unit, Unit> CheckUpdateSagerNetCoreCmd { get; }
+
+        //public ReactiveCommand<Unit, Unit> CheckUpdateSagerNetCoreCmd { get; }
         public ReactiveCommand<Unit, Unit> CheckUpdateXrayCoreCmd { get; }
-        public ReactiveCommand<Unit, Unit> CheckUpdateClashCoreCmd { get; }
-        public ReactiveCommand<Unit, Unit> CheckUpdateClashMetaCoreCmd { get; }
+
+        //public ReactiveCommand<Unit, Unit> CheckUpdateClashCoreCmd { get; }
+        //public ReactiveCommand<Unit, Unit> CheckUpdateClashMetaCoreCmd { get; }
         public ReactiveCommand<Unit, Unit> CheckUpdateSingBoxCoreCmd { get; }
+
         public ReactiveCommand<Unit, Unit> CheckUpdateGeoCmd { get; }
 
         public ReactiveCommand<Unit, Unit> ReloadCmd { get; }
@@ -210,8 +214,8 @@ namespace v2rayN.ViewModels
         [Reactive]
         public string RunningServerDisplay { get; set; }
 
-        //[Reactive]
-        //public string RunningServerToolTipText { get; set; }
+        [Reactive]
+        public string RunningServerToolTipText { get; set; }
 
         [Reactive]
         public string RunningInfoDisplay { get; set; }
@@ -337,6 +341,10 @@ namespace v2rayN.ViewModels
             {
                 EditServer(true, EConfigType.Trojan);
             });
+            AddHysteria2ServerCmd = ReactiveCommand.Create(() =>
+            {
+                EditServer(true, EConfigType.Hysteria2);
+            });
             AddCustomServerCmd = ReactiveCommand.Create(() =>
             {
                 EditServer(true, EConfigType.Custom);
@@ -500,22 +508,22 @@ namespace v2rayN.ViewModels
             {
                 CheckUpdateCore(ECoreType.v2fly_v5);
             });
-            CheckUpdateSagerNetCoreCmd = ReactiveCommand.Create(() =>
-            {
-                CheckUpdateCore(ECoreType.SagerNet);
-            });
+            //CheckUpdateSagerNetCoreCmd = ReactiveCommand.Create(() =>
+            //{
+            //    CheckUpdateCore(ECoreType.SagerNet);
+            //});
             CheckUpdateXrayCoreCmd = ReactiveCommand.Create(() =>
             {
                 CheckUpdateCore(ECoreType.Xray);
             });
-            CheckUpdateClashCoreCmd = ReactiveCommand.Create(() =>
-            {
-                CheckUpdateCore(ECoreType.clash);
-            });
-            CheckUpdateClashMetaCoreCmd = ReactiveCommand.Create(() =>
-            {
-                CheckUpdateCore(ECoreType.clash_meta);
-            });
+            //CheckUpdateClashCoreCmd = ReactiveCommand.Create(() =>
+            //{
+            //    CheckUpdateCore(ECoreType.clash);
+            //});
+            //CheckUpdateClashMetaCoreCmd = ReactiveCommand.Create(() =>
+            //{
+            //    CheckUpdateCore(ECoreType.clash_meta);
+            //});
             CheckUpdateSingBoxCoreCmd = ReactiveCommand.Create(() =>
             {
                 CheckUpdateCore(ECoreType.sing_box);
@@ -849,12 +857,12 @@ namespace v2rayN.ViewModels
                 {
                     var runningSummary = running.GetSummary();
                     RunningServerDisplay = $"{ResUI.menuServers}:{runningSummary}";
-                    //RunningServerToolTipText = runningSummary;
+                    RunningServerToolTipText = runningSummary;
                 }
                 else
                 {
                     RunningServerDisplay = ResUI.CheckServerSettings;
-                    //RunningServerToolTipText = ResUI.CheckServerSettings;
+                    RunningServerToolTipText = ResUI.CheckServerSettings;
                 }
             }));
         }

v2rayN/v2rayN/ViewModels/OptionSettingViewModel.cs

@@ -32,6 +32,8 @@ namespace v2rayN.ViewModels
         [Reactive] public string defFingerprint { get; set; }
         [Reactive] public string defUserAgent { get; set; }
         [Reactive] public string mux4SboxProtocol { get; set; }
+        [Reactive] public int hyUpMbps { get; set; }
+        [Reactive] public int hyDownMbps { get; set; }
 
         #endregion Core
 
@@ -120,7 +122,9 @@ namespace v2rayN.ViewModels
             defAllowInsecure = _config.coreBasicItem.defAllowInsecure;
             defFingerprint = _config.coreBasicItem.defFingerprint;
             defUserAgent = _config.coreBasicItem.defUserAgent;
-            mux4SboxProtocol = _config.mux4Sbox.protocol;
+            mux4SboxProtocol = _config.mux4SboxItem.protocol;
+            hyUpMbps = _config.hysteriaItem.up_mbps;
+            hyDownMbps = _config.hysteriaItem.down_mbps;
 
             #endregion Core
 
@@ -274,7 +278,9 @@ namespace v2rayN.ViewModels
             _config.coreBasicItem.defAllowInsecure = defAllowInsecure;
             _config.coreBasicItem.defFingerprint = defFingerprint;
             _config.coreBasicItem.defUserAgent = defUserAgent;
-            _config.mux4Sbox.protocol = mux4SboxProtocol;
+            _config.mux4SboxItem.protocol = mux4SboxProtocol;
+            _config.hysteriaItem.up_mbps = hyUpMbps;
+            _config.hysteriaItem.down_mbps = hyDownMbps;
 
             //Kcp
             //_config.kcpItem.mtu = Kcpmtu;
@@ -359,6 +365,9 @@ namespace v2rayN.ViewModels
                     case 6:
                         type = CoreType6;
                         break;
+
+                    case 7:
+                        continue;
                 }
                 item.coreType = (ECoreType)Enum.Parse(typeof(ECoreType), type);
             }

v2rayN/v2rayN/Views/AddServerWindow.xaml

@@ -1,12 +1,12 @@
 <reactiveui:ReactiveWindow
     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"
     xmlns:reactiveui="http://reactiveui.net"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:conv="clr-namespace:v2rayN.Converters"
     xmlns:resx="clr-namespace:v2rayN.Resx"
     xmlns:vms="clr-namespace:v2rayN.ViewModels"
     Title="{x:Static resx:ResUI.menuServers}"
@@ -399,13 +399,43 @@
                     Margin="{StaticResource ServerItemMargin}"
                     Style="{StaticResource DefComboBox}" />
             </Grid>
+            <Grid
+                x:Name="gridHysteria2"
+                Grid.Row="2"
+                Visibility="Hidden">
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                    <RowDefinition Height="Auto" />
+                </Grid.RowDefinitions>
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="180" />
+                    <ColumnDefinition Width="Auto" />
+                </Grid.ColumnDefinitions>
+
+                <TextBlock
+                    Grid.Row="1"
+                    Grid.Column="0"
+                    Margin="{StaticResource ServerItemMargin}"
+                    VerticalAlignment="Center"
+                    Style="{StaticResource ToolbarTextBlock}"
+                    Text="{x:Static resx:ResUI.TbId3}" />
+                <TextBox
+                    x:Name="txtId7"
+                    Grid.Row="1"
+                    Grid.Column="1"
+                    Width="400"
+                    Margin="{StaticResource ServerItemMargin}"
+                    Style="{StaticResource DefTextBox}" />
+            </Grid>
 
             <Separator
+                x:Name="sepa2"
                 Grid.Row="3"
                 Margin="0,2"
                 Style="{DynamicResource MaterialDesignSeparator}" />
 
-            <Grid Grid.Row="4">
+            <Grid x:Name="gridTransport" Grid.Row="4">
                 <Grid.RowDefinitions>
                     <RowDefinition Height="Auto" />
                     <RowDefinition Height="Auto" />

v2rayN/v2rayN/Views/AddServerWindow.xaml.cs

@@ -117,6 +117,15 @@ namespace v2rayN.Views
                         cmbFlow6.Items.Add(it);
                     });
                     break;
+
+                case EConfigType.Hysteria2:
+                    gridHysteria2.Visibility = Visibility.Visible;
+                    sepa2.Visibility = Visibility.Collapsed;
+                    gridTransport.Visibility = Visibility.Collapsed;
+                    cmbCoreType.IsEnabled = false;
+                    cmbFingerprint.IsEnabled = false;
+                    cmbFingerprint.Text = string.Empty;
+                    break;
             }
 
             gridTlsMore.Visibility = Visibility.Hidden;
@@ -156,6 +165,10 @@ namespace v2rayN.Views
                         this.Bind(ViewModel, vm => vm.SelectedSource.id, v => v.txtId6.Text).DisposeWith(disposables);
                         this.Bind(ViewModel, vm => vm.SelectedSource.flow, v => v.cmbFlow6.Text).DisposeWith(disposables);
                         break;
+
+                    case EConfigType.Hysteria2:
+                        this.Bind(ViewModel, vm => vm.SelectedSource.id, v => v.txtId7.Text).DisposeWith(disposables);
+                        break;
                 }
                 this.Bind(ViewModel, vm => vm.SelectedSource.network, v => v.cmbNetwork.Text).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.SelectedSource.headerType, v => v.cmbHeaderType.Text).DisposeWith(disposables);

v2rayN/v2rayN/Views/DNSSettingWindow.xaml

@@ -64,6 +64,20 @@
                             Style="{StaticResource DefComboBox}" />
                     </StackPanel>
 
+                    <StackPanel DockPanel.Dock="Bottom" Orientation="Horizontal">
+                        <TextBlock
+                            Margin="{StaticResource SettingItemMargin}"
+                            VerticalAlignment="Center"
+                            Style="{StaticResource ToolbarTextBlock}"
+                            Text="{x:Static resx:ResUI.TbSettingsUseSystemHosts}" />
+                        <ToggleButton
+                            x:Name="togUseSystemHosts"
+                            Grid.Row="5"
+                            Grid.Column="1"
+                            Margin="{StaticResource SettingItemMargin}"
+                            HorizontalAlignment="Left" />
+                    </StackPanel>
+
                     <StackPanel DockPanel.Dock="Top" Orientation="Horizontal">
                         <TextBlock
                             Margin="{StaticResource SettingItemMargin}"
@@ -81,7 +95,7 @@
                         <Button
                             x:Name="btnImportDefConfig4V2ray"
                             Margin="8,0,0,0"
-                            Content="{x:Static resx:ResUI.TBSettingDnsImportDefConfig}"
+                            Content="{x:Static resx:ResUI.TbSettingDnsImportDefConfig}"
                             Cursor="Hand"
                             Style="{StaticResource DefButton}" />
                     </StackPanel>
@@ -113,7 +127,7 @@
                         <Button
                             x:Name="btnImportDefConfig4Singbox"
                             Margin="8,0,0,0"
-                            Content="{x:Static resx:ResUI.TBSettingDnsImportDefConfig}"
+                            Content="{x:Static resx:ResUI.TbSettingDnsImportDefConfig}"
                             Cursor="Hand"
                             Style="{StaticResource DefButton}" />
                     </StackPanel>

v2rayN/v2rayN/Views/DNSSettingWindow.xaml.cs

@@ -37,6 +37,7 @@ namespace v2rayN.Views
 
             this.WhenActivated(disposables =>
             {
+                this.Bind(ViewModel, vm=>vm.useSystemHosts, v=>v.togUseSystemHosts.IsChecked).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.domainStrategy4Freedom, v => v.cmbdomainStrategy4Freedom.Text).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.normalDNS, v => v.txtnormalDNS.Text).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.normalDNS2, v => v.txtnormalDNS2.Text).DisposeWith(disposables);

v2rayN/v2rayN/Views/MainWindow.xaml

@@ -83,6 +83,10 @@
                                     x:Name="menuAddTrojanServer"
                                     Height="{StaticResource MenuItemHeight}"
                                     Header="{x:Static resx:ResUI.menuAddTrojanServer}" />
+                                <MenuItem
+                                    x:Name="menuAddHysteria2Server"
+                                    Height="{StaticResource MenuItemHeight}"
+                                    Header="{x:Static resx:ResUI.menuAddHysteria2Server}" />
                                 <Separator Margin="-40,5" />
                                 <MenuItem
                                     x:Name="menuAddServerViaClipboard"
@@ -212,15 +216,15 @@
                                     x:Name="menuCheckUpdateV2flyCore"
                                     Height="{StaticResource MenuItemHeight}"
                                     Header="V2fly v5 Core" />
-                                <MenuItem
+                                <!--<MenuItem
                                     x:Name="menuCheckUpdateSagerNetCore"
                                     Height="{StaticResource MenuItemHeight}"
-                                    Header="SagerNet Core" />
+                                    Header="SagerNet Core" />-->
                                 <MenuItem
                                     x:Name="menuCheckUpdateXrayCore"
                                     Height="{StaticResource MenuItemHeight}"
                                     Header="Xray Core" />
-                                <Separator Margin="-40,5" />
+                                <!--<Separator Margin="-40,5" />
                                 <MenuItem
                                     x:Name="menuCheckUpdateClashCore"
                                     Height="{StaticResource MenuItemHeight}"
@@ -229,7 +233,7 @@
                                     x:Name="menuCheckUpdateClashMetaCore"
                                     Height="{StaticResource MenuItemHeight}"
                                     Header="Clash.Meta Core" />
-                                <Separator Margin="-40,5" />
+                                <Separator Margin="-40,5" />-->
                                 <MenuItem
                                     x:Name="menuCheckUpdateSingBoxCore"
                                     Height="{StaticResource MenuItemHeight}"
@@ -384,9 +388,10 @@
                 <WrapPanel Margin="2" DockPanel.Dock="Top">
                     <ListBox
                         x:Name="lstGroup"
+                        MaxHeight="120"
                         FontSize="{DynamicResource StdFontSize}"
                         ItemContainerStyle="{StaticResource MyChipListBoxItem}"
-                        Style="{StaticResource MaterialDesignChoiceChipPrimaryOutlineListBox}" MaxHeight="120">
+                        Style="{StaticResource MaterialDesignChoiceChipPrimaryOutlineListBox}">
                         <ListBox.ItemTemplate>
                             <DataTemplate>
                                 <TextBlock Text="{Binding remarks}" />
@@ -751,7 +756,8 @@
             <tb:TaskbarIcon
                 x:Name="tbNotify"
                 IconSource="/v2rayN.ico"
-                NoLeftClickDelay="True">
+                NoLeftClickDelay="True"
+                ToolTipText="v2rayN">
                 <tb:TaskbarIcon.ContextMenu>
                     <ContextMenu Style="{StaticResource DefContextMenu}">
                         <MenuItem x:Name="menuSystemProxyClear" Height="{StaticResource MenuItemHeight}">

v2rayN/v2rayN/Views/MainWindow.xaml.cs

@@ -86,6 +86,7 @@ namespace v2rayN.Views
                 this.BindCommand(ViewModel, vm => vm.AddShadowsocksServerCmd, v => v.menuAddShadowsocksServer).DisposeWith(disposables);
                 this.BindCommand(ViewModel, vm => vm.AddSocksServerCmd, v => v.menuAddSocksServer).DisposeWith(disposables);
                 this.BindCommand(ViewModel, vm => vm.AddTrojanServerCmd, v => v.menuAddTrojanServer).DisposeWith(disposables);
+                this.BindCommand(ViewModel, vm => vm.AddHysteria2ServerCmd, v => v.menuAddHysteria2Server).DisposeWith(disposables);
                 this.BindCommand(ViewModel, vm => vm.AddCustomServerCmd, v => v.menuAddCustomServer).DisposeWith(disposables);
                 this.BindCommand(ViewModel, vm => vm.AddServerViaClipboardCmd, v => v.menuAddServerViaClipboard).DisposeWith(disposables);
                 this.BindCommand(ViewModel, vm => vm.AddServerViaScanCmd, v => v.menuAddServerViaScan).DisposeWith(disposables);
@@ -139,10 +140,10 @@ namespace v2rayN.Views
                 //checkupdate
                 this.BindCommand(ViewModel, vm => vm.CheckUpdateNCmd, v => v.menuCheckUpdateN).DisposeWith(disposables);
                 this.BindCommand(ViewModel, vm => vm.CheckUpdateV2flyCoreCmd, v => v.menuCheckUpdateV2flyCore).DisposeWith(disposables);
-                this.BindCommand(ViewModel, vm => vm.CheckUpdateSagerNetCoreCmd, v => v.menuCheckUpdateSagerNetCore).DisposeWith(disposables);
+                //this.BindCommand(ViewModel, vm => vm.CheckUpdateSagerNetCoreCmd, v => v.menuCheckUpdateSagerNetCore).DisposeWith(disposables);
                 this.BindCommand(ViewModel, vm => vm.CheckUpdateXrayCoreCmd, v => v.menuCheckUpdateXrayCore).DisposeWith(disposables);
-                this.BindCommand(ViewModel, vm => vm.CheckUpdateClashCoreCmd, v => v.menuCheckUpdateClashCore).DisposeWith(disposables);
-                this.BindCommand(ViewModel, vm => vm.CheckUpdateClashMetaCoreCmd, v => v.menuCheckUpdateClashMetaCore).DisposeWith(disposables);
+                //this.BindCommand(ViewModel, vm => vm.CheckUpdateClashCoreCmd, v => v.menuCheckUpdateClashCore).DisposeWith(disposables);
+                //this.BindCommand(ViewModel, vm => vm.CheckUpdateClashMetaCoreCmd, v => v.menuCheckUpdateClashMetaCore).DisposeWith(disposables);
                 this.BindCommand(ViewModel, vm => vm.CheckUpdateSingBoxCoreCmd, v => v.menuCheckUpdateSingBoxCore).DisposeWith(disposables);
                 this.BindCommand(ViewModel, vm => vm.CheckUpdateGeoCmd, v => v.menuCheckUpdateGeo).DisposeWith(disposables);
 
@@ -176,7 +177,7 @@ namespace v2rayN.Views
                 this.BindCommand(ViewModel, vm => vm.SubUpdateViaProxyCmd, v => v.menuSubUpdateViaProxy2).DisposeWith(disposables);
 
                 this.OneWayBind(ViewModel, vm => vm.NotifyIcon, v => v.tbNotify.Icon).DisposeWith(disposables);
-                //this.OneWayBind(ViewModel, vm => vm.RunningServerToolTipText, v => v.tbNotify.ToolTipText).DisposeWith(disposables);
+                this.OneWayBind(ViewModel, vm => vm.RunningServerToolTipText, v => v.tbNotify.ToolTipText).DisposeWith(disposables);
                 this.OneWayBind(ViewModel, vm => vm.NotifyLeftClickCmd, v => v.tbNotify.LeftClickCommand).DisposeWith(disposables);
                 this.OneWayBind(ViewModel, vm => vm.AppIcon, v => v.Icon).DisposeWith(disposables);
                 //this.OneWayBind(ViewModel, vm => vm.BlShowTrayTip, v => v.borTrayToolTip.Visibility).DisposeWith(disposables);
@@ -322,33 +323,35 @@ namespace v2rayN.Views
         {
             if (Keyboard.IsKeyDown(Key.LeftCtrl) || Keyboard.IsKeyDown(Key.RightCtrl))
             {
-                if (e.Key == Key.V)
+                switch (e.Key)
                 {
-                    ViewModel?.AddServerViaClipboard();
-                }
-                else if (e.Key == Key.P)
-                {
-                    ViewModel?.ServerSpeedtest(ESpeedActionType.Ping);
-                }
-                else if (e.Key == Key.O)
-                {
-                    ViewModel?.ServerSpeedtest(ESpeedActionType.Tcping);
-                }
-                else if (e.Key == Key.R)
-                {
-                    ViewModel?.ServerSpeedtest(ESpeedActionType.Realping);
-                }
-                else if (e.Key == Key.S)
-                {
-                    _ = ViewModel?.ScanScreenTaskAsync();
-                }
-                else if (e.Key == Key.T)
-                {
-                    ViewModel?.ServerSpeedtest(ESpeedActionType.Speedtest);
-                }
-                else if (e.Key == Key.E)
-                {
-                    ViewModel?.ServerSpeedtest(ESpeedActionType.Mixedtest);
+                    case Key.V:
+                        ViewModel?.AddServerViaClipboard();
+                        break;
+
+                    case Key.P:
+                        ViewModel?.ServerSpeedtest(ESpeedActionType.Ping);
+                        break;
+
+                    case Key.O:
+                        ViewModel?.ServerSpeedtest(ESpeedActionType.Tcping);
+                        break;
+
+                    case Key.R:
+                        ViewModel?.ServerSpeedtest(ESpeedActionType.Realping);
+                        break;
+
+                    case Key.S:
+                        _ = ViewModel?.ScanScreenTaskAsync();
+                        break;
+
+                    case Key.T:
+                        ViewModel?.ServerSpeedtest(ESpeedActionType.Speedtest);
+                        break;
+
+                    case Key.E:
+                        ViewModel?.ServerSpeedtest(ESpeedActionType.Mixedtest);
+                        break;
                 }
             }
             else
@@ -498,11 +501,18 @@ namespace v2rayN.Views
 
             if (!_config.guiItem.enableStatistics)
             {
-                colTodayUp.Visibility = Visibility.Hidden;
-                colTodayDown.Visibility = Visibility.Hidden;
-                colTotalUp.Visibility = Visibility.Hidden;
+                colTodayUp.Visibility =
+                colTodayDown.Visibility =
+                colTotalUp.Visibility =
                 colTotalDown.Visibility = Visibility.Hidden;
             }
+            else
+            {
+                colTodayUp.Visibility =
+                colTodayDown.Visibility =
+                colTotalUp.Visibility =
+                colTotalDown.Visibility = Visibility.Visible;
+            }
         }
 
         private void StorageUI()

v2rayN/v2rayN/Views/OptionSettingWindow.xaml

@@ -1,12 +1,12 @@
 <reactiveui:ReactiveWindow
     x:Class="v2rayN.Views.OptionSettingWindow"
     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:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     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"
+    xmlns:reactiveui="http://reactiveui.net"
     xmlns:resx="clr-namespace:v2rayN.Resx"
     xmlns:vms="clr-namespace:v2rayN.ViewModels"
     Title="{x:Static resx:ResUI.menuSetting}"
@@ -68,6 +68,7 @@
                             <RowDefinition Height="Auto" />
                             <RowDefinition Height="Auto" />
                             <RowDefinition Height="Auto" />
+                            <RowDefinition Height="Auto" />
                         </Grid.RowDefinitions>
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="Auto" />
@@ -307,6 +308,33 @@
                             Width="200"
                             Margin="{StaticResource SettingItemMargin}"
                             Style="{StaticResource DefComboBox}" />
+
+                        <TextBlock
+                            Grid.Row="15"
+                            Grid.Column="0"
+                            Margin="{StaticResource SettingItemMargin}"
+                            VerticalAlignment="Center"
+                            Style="{StaticResource ToolbarTextBlock}"
+                            Text="{x:Static resx:ResUI.TbSettingsHysteriaBandwidth}" />
+
+                        <StackPanel
+                            Grid.Row="15"
+                            Grid.Column="1"
+                            Orientation="Horizontal">
+
+                            <TextBox
+                                x:Name="txtUpMbps"
+                                Width="90"
+                                Margin="{StaticResource SettingItemMargin}"
+                                materialDesign:HintAssist.Hint="Up"
+                                Style="{StaticResource DefTextBox}" />
+                            <TextBox
+                                x:Name="txtDownMbps"
+                                Width="90"
+                                Margin="{StaticResource SettingItemMargin}"
+                                materialDesign:HintAssist.Hint="Down"
+                                Style="{StaticResource DefTextBox}" />
+                        </StackPanel>
                     </Grid>
                 </ScrollViewer>
             </TabItem>

v2rayN/v2rayN/Views/OptionSettingWindow.xaml.cs

@@ -89,7 +89,12 @@ namespace v2rayN.Views
             //fill fonts
             try
             {
-                var files = Directory.GetFiles(Utils.GetFontsPath(), "*.ttf");
+                string[] searchPatterns = { "*.ttf", "*.ttc" };
+                var files = new List<string>();
+                foreach (var pattern in searchPatterns)
+                {
+                    files.AddRange(Directory.GetFiles(Utils.GetFontsPath(), pattern));
+                }
                 var culture = _config.uiItem.currentLanguage == Global.Languages[0] ? "zh-cn" : "en-us";
                 var culture2 = "en-us";
                 foreach (var ttf in files)
@@ -146,6 +151,8 @@ namespace v2rayN.Views
                 this.Bind(ViewModel, vm => vm.defFingerprint, v => v.cmbdefFingerprint.Text).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.defUserAgent, v => v.cmbdefUserAgent.Text).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.mux4SboxProtocol, v => v.cmbmux4SboxProtocol.Text).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.hyUpMbps, v => v.txtUpMbps.Text).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.hyDownMbps, v => v.txtDownMbps.Text).DisposeWith(disposables);
 
                 //this.Bind(ViewModel, vm => vm.Kcpmtu, v => v.txtKcpmtu.Text).DisposeWith(disposables);
                 //this.Bind(ViewModel, vm => vm.Kcptti, v => v.txtKcptti.Text).DisposeWith(disposables);

v2rayN/v2rayN/Views/RoutingSettingWindow.xaml.cs

@@ -88,6 +88,11 @@ namespace v2rayN.Views
 
         private void RoutingSettingWindow_PreviewKeyDown(object sender, KeyEventArgs e)
         {
+            if (ViewModel?.enableRoutingBasic ?? false)
+            {
+                return;
+            }
+
             if (Keyboard.IsKeyDown(Key.LeftCtrl) || Keyboard.IsKeyDown(Key.RightCtrl))
             {
                 if (e.Key == Key.A)

v2rayN/v2rayN/v2rayN.csproj

@@ -10,7 +10,7 @@
 		<ImplicitUsings>enable</ImplicitUsings>
 		<ApplicationIcon>v2rayN.ico</ApplicationIcon>
 		<Copyright>Copyright © 2017-2023 (GPLv3)</Copyright>
-		<FileVersion>6.29</FileVersion>
+		<FileVersion>6.31</FileVersion>
 	</PropertyGroup>
 
 	<ItemGroup>
@@ -22,10 +22,10 @@
 		<PackageReference Include="sqlite-net-pcl" Version="1.8.116" />
 		<PackageReference Include="TaskScheduler" Version="2.10.1" /> 
 		<PackageReference Include="ZXing.Net.Bindings.Windows.Compatibility" Version="0.16.12" />
-		<PackageReference Include="ReactiveUI.Fody" Version="18.4.1" />
-		<PackageReference Include="ReactiveUI.Validation" Version="3.0.22" />
-		<PackageReference Include="ReactiveUI.WPF" Version="18.4.1" />
-		<PackageReference Include="Splat.NLog" Version="14.7.1" />
+		<PackageReference Include="ReactiveUI.Fody" Version="19.5.1" />
+		<PackageReference Include="ReactiveUI.Validation" Version="3.1.7" />
+		<PackageReference Include="ReactiveUI.WPF" Version="19.5.1" />
+		<PackageReference Include="Splat.NLog" Version="14.8.6" />
 		<PackageReference Include="System.Reactive" Version="6.0.0" />
 	</ItemGroup>
 	

v2rayN/v2rayUpgrade/Program.cs

@@ -13,6 +13,7 @@ namespace v2rayUpgrade
         {
             Application.EnableVisualStyles();
             Application.SetHighDpiMode(HighDpiMode.SystemAware);
+            Application.SetHighDpiMode(HighDpiMode.PerMonitorV2);
             Application.SetCompatibleTextRenderingDefault(false);
             Application.Run(new MainForm(args));
         }

v2rayN/v2rayUpgrade/app.manifest

@@ -2,8 +2,6 @@
 <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3">
   <asmv3:application>
     <asmv3:windowsSettings>
-      <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
-      <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2</dpiAwareness>
     </asmv3:windowsSettings>
   </asmv3:application>
 </assembly>