up 7.14.1

Optimization and upgrade tools
Fixed Failed Gen Default Configuration (#7785 )
2025-08-17 14:26:13 +08:00 · 2025-08-17 14:12:40 +08:00 · 2025-08-17 13:52:57 +08:00 · 2025-08-17 11:00:13 +08:00 · 2025-08-17 09:32:02 +08:00 · 2025-08-17 09:15:06 +08:00
27 changed files with 279 additions and 253 deletions
--- a/v2rayN/AmazTool/UpgradeApp.cs
+++ b/v2rayN/AmazTool/UpgradeApp.cs
@@ -79,15 +79,7 @@ internal class UpgradeApp
                        continue;
                    }

-                    try
-                    {
-                        entry.ExtractToFile(entryOutputPath, true);
-                    }
-                    catch
-                    {
-                        Thread.Sleep(1000);
-                        entry.ExtractToFile(entryOutputPath, true);
-                    }
+                    TryExtractToFile(entry, entryOutputPath);

                    Console.WriteLine(entryOutputPath);
                }
@@ -113,4 +105,24 @@ internal class UpgradeApp

        Utils.StartV2RayN();
    }
+
+    private static bool TryExtractToFile(ZipArchiveEntry entry, string outputPath)
+    {
+        var retryCount = 5;
+        var delayMs = 1000;
+
+        for (var i = 1; i <= retryCount; i++)
+        {
+            try
+            {
+                entry.ExtractToFile(outputPath, true);
+                return true;
+            }
+            catch
+            {
+                Thread.Sleep(delayMs * i);
+            }
+        }
+        return false;
+    }
 }
--- a/v2rayN/Directory.Build.props
+++ b/v2rayN/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>

    <PropertyGroup>
-        <Version>7.14.0</Version>
+        <Version>7.14.1</Version>
    </PropertyGroup>

    <PropertyGroup>
--- a/v2rayN/ServiceLib/Global.cs
+++ b/v2rayN/ServiceLib/Global.cs
@@ -305,13 +305,6 @@ public class Global
            ""
    ];

-    public static readonly List<string> DomainMatchers =
-    [
-        "linear",
-            "mph",
-            ""
-    ];
-
    public static readonly List<string> Fingerprints =
    [
        "chrome",
@@ -464,9 +457,11 @@ public class Global
    public static readonly List<int> TunMtus =
    [
        1280,
-            1408,
-            1500,
-            9000
+        1408,
+        1500,
+        4064,
+        9000,
+        65535
    ];

    public static readonly List<string> TunStacks =
--- a/v2rayN/ServiceLib/Handler/ConfigHandler.cs
+++ b/v2rayN/ServiceLib/Handler/ConfigHandler.cs
@@ -963,7 +963,7 @@ public class ConfigHandler
        {
            return -1;
        }
-        if (profileItem.Security.IsNotEmpty() && profileItem.Security != Global.None)
+        if (profileItem.Security.IsNullOrEmpty())
        {
            profileItem.Security = Global.None;
        }
@@ -1412,6 +1412,11 @@ public class ConfigHandler
        {
            profileItem = V2rayFmt.ResolveFull(strData, subRemarks);
        }
+        //Is Html Page
+        if (profileItem is null && HtmlPageFmt.IsHtmlPage(strData))
+        {
+            return -1;
+        }
        //Is Clash configuration
        if (profileItem is null)
        {
--- a/v2rayN/ServiceLib/Handler/Fmt/BaseFmt.cs
+++ b/v2rayN/ServiceLib/Handler/Fmt/BaseFmt.cs
@@ -220,14 +220,7 @@ public class BaseFmt

    protected static bool Contains(string str, params string[] s)
    {
-        foreach (var item in s)
-        {
-            if (str.Contains(item, StringComparison.OrdinalIgnoreCase))
-            {
-                return true;
-            }
-        }
-        return false;
+        return s.All(item => str.Contains(item, StringComparison.OrdinalIgnoreCase));
    }

    protected static string WriteAllText(string strData, string ext = "json")
--- a/v2rayN/ServiceLib/Handler/Fmt/HtmlPageFmt.cs
+++ b/v2rayN/ServiceLib/Handler/Fmt/HtmlPageFmt.cs
@@ -0,0 +1,11 @@
+using SkiaSharp;
+
+namespace ServiceLib.Handler.Fmt;
+
+public class HtmlPageFmt : BaseFmt
+{
+    public static bool IsHtmlPage(string strData)
+    {
+        return Contains(strData, "<html", "<!doctype html", "<head");
+    }
+}
--- a/v2rayN/ServiceLib/Handler/PacHandler.cs
+++ b/v2rayN/ServiceLib/Handler/PacHandler.cs
@@ -5,15 +5,18 @@ namespace ServiceLib.Handler;

 public class PacHandler
 {
-    private static string _configPath;
-    private static int _httpPort;
-    private static int _pacPort;
-    private static TcpListener? _tcpListener;
-    private static byte[] _writeContent;
-    private static bool _isRunning;
-    private static bool _needRestart = true;
+    private static readonly Lazy<PacHandler> _instance = new(() => new PacHandler());
+    public static PacHandler Instance => _instance.Value;

-    public static async Task Start(string configPath, int httpPort, int pacPort)
+    private string _configPath;
+    private int _httpPort;
+    private int _pacPort;
+    private TcpListener? _tcpListener;
+    private byte[] _writeContent;
+    private bool _isRunning;
+    private bool _needRestart = true;
+
+    public async Task StartAsync(string configPath, int httpPort, int pacPort)
    {
        _needRestart = configPath != _configPath || httpPort != _httpPort || pacPort != _pacPort || !_isRunning;

@@ -30,7 +33,7 @@ public class PacHandler
        }
    }

-    private static async Task InitText()
+    private async Task InitText()
    {
        var path = Path.Combine(_configPath, "pac.txt");

@@ -59,7 +62,7 @@ public class PacHandler
        _writeContent = Encoding.UTF8.GetBytes(sb.ToString());
    }

-    private static void RunListener()
+    private void RunListener()
    {
        _tcpListener = TcpListener.Create(_pacPort);
        _isRunning = true;
@@ -87,14 +90,14 @@ public class PacHandler
        }, TaskCreationOptions.LongRunning);
    }

-    private static void WriteContent(TcpClient client)
+    private void WriteContent(TcpClient client)
    {
        var stream = client.GetStream();
        stream.Write(_writeContent, 0, _writeContent.Length);
        stream.Flush();
    }

-    public static void Stop()
+    public void Stop()
    {
        if (_tcpListener == null)
        {
--- a/v2rayN/ServiceLib/Handler/SubscriptionHandler.cs
+++ b/v2rayN/ServiceLib/Handler/SubscriptionHandler.cs
@@ -15,119 +15,200 @@ public class SubscriptionHandler

        foreach (var item in subItem)
        {
-            var id = item.Id.TrimEx();
-            var url = item.Url.TrimEx();
-            var userAgent = item.UserAgent.TrimEx();
-            var hashCode = $"{item.Remarks}->";
-            if (id.IsNullOrEmpty() || url.IsNullOrEmpty() || (subId.IsNotEmpty() && item.Id != subId))
+            try
            {
-                //_updateFunc?.Invoke(false, $"{hashCode}{ResUI.MsgNoValidSubscription}");
-                continue;
-            }
-            if (!url.StartsWith(Global.HttpsProtocol) && !url.StartsWith(Global.HttpProtocol))
-            {
-                continue;
-            }
-            if (item.Enabled == false)
-            {
-                updateFunc?.Invoke(false, $"{hashCode}{ResUI.MsgSkipSubscriptionUpdate}");
-                continue;
-            }
-
-            var downloadHandle = new DownloadService();
-            downloadHandle.Error += (sender2, args) =>
-            {
-                updateFunc?.Invoke(false, $"{hashCode}{args.GetException().Message}");
-            };
-
-            updateFunc?.Invoke(false, $"{hashCode}{ResUI.MsgStartGettingSubscriptions}");
-
-            //one url
-            url = Utils.GetPunycode(url);
-            //convert
-            if (item.ConvertTarget.IsNotEmpty())
-            {
-                var subConvertUrl = config.ConstItem.SubConvertUrl.IsNullOrEmpty() ? Global.SubConvertUrls.FirstOrDefault() : config.ConstItem.SubConvertUrl;
-                url = string.Format(subConvertUrl!, Utils.UrlEncode(url));
-                if (!url.Contains("target="))
+                if (!IsValidSubscription(item, subId))
                {
-                    url += string.Format("&target={0}", item.ConvertTarget);
-                }
-                if (!url.Contains("config="))
-                {
-                    url += string.Format("&config={0}", Global.SubConvertConfig.FirstOrDefault());
-                }
-            }
-            var result = await downloadHandle.TryDownloadString(url, blProxy, userAgent);
-            if (blProxy && result.IsNullOrEmpty())
-            {
-                result = await downloadHandle.TryDownloadString(url, false, userAgent);
-            }
-
-            //more url
-            if (item.ConvertTarget.IsNullOrEmpty() && item.MoreUrl.TrimEx().IsNotEmpty())
-            {
-                if (result.IsNotEmpty() && Utils.IsBase64String(result))
-                {
-                    result = Utils.Base64Decode(result);
+                    continue;
                }

-                var lstUrl = item.MoreUrl.TrimEx().Split(",") ?? [];
-                foreach (var it in lstUrl)
+                var hashCode = $"{item.Remarks}->";
+                if (item.Enabled == false)
                {
-                    var url2 = Utils.GetPunycode(it);
-                    if (url2.IsNullOrEmpty())
-                    {
-                        continue;
-                    }
-
-                    var result2 = await downloadHandle.TryDownloadString(url2, blProxy, userAgent);
-                    if (blProxy && result2.IsNullOrEmpty())
-                    {
-                        result2 = await downloadHandle.TryDownloadString(url2, false, userAgent);
-                    }
-                    if (result2.IsNotEmpty())
-                    {
-                        if (Utils.IsBase64String(result2))
-                        {
-                            result += Environment.NewLine + Utils.Base64Decode(result2);
-                        }
-                        else
-                        {
-                            result += Environment.NewLine + result2;
-                        }
-                    }
+                    updateFunc?.Invoke(false, $"{hashCode}{ResUI.MsgSkipSubscriptionUpdate}");
+                    continue;
                }
-            }

-            if (result.IsNullOrEmpty())
+                // Create download handler
+                var downloadHandle = CreateDownloadHandler(hashCode, updateFunc);
+                updateFunc?.Invoke(false, $"{hashCode}{ResUI.MsgStartGettingSubscriptions}");
+
+                // Get all subscription content (main subscription + additional subscriptions)
+                var result = await DownloadAllSubscriptions(config, item, blProxy, downloadHandle);
+
+                // Process download result
+                await ProcessDownloadResult(config, item.Id, result, hashCode, updateFunc);
+
+                updateFunc?.Invoke(false, "-------------------------------------------------------");
+            }
+            catch (Exception ex)
            {
-                updateFunc?.Invoke(false, $"{hashCode}{ResUI.MsgSubscriptionDecodingFailed}");
+                var hashCode = $"{item.Remarks}->";
+                Logging.SaveLog("UpdateSubscription", ex);
+                updateFunc?.Invoke(false, $"{hashCode}{ResUI.MsgFailedImportSubscription}: {ex.Message}");
+                updateFunc?.Invoke(false, "-------------------------------------------------------");
            }
-            else
-            {
-                updateFunc?.Invoke(false, $"{hashCode}{ResUI.MsgGetSubscriptionSuccessfully}");
-                if (result?.Length < 99)
-                {
-                    updateFunc?.Invoke(false, $"{hashCode}{result}");
-                }
-
-                var ret = await ConfigHandler.AddBatchServers(config, result, id, true);
-                if (ret <= 0)
-                {
-                    Logging.SaveLog("FailedImportSubscription");
-                    Logging.SaveLog(result);
-                }
-                updateFunc?.Invoke(false,
-                    ret > 0
-                        ? $"{hashCode}{ResUI.MsgUpdateSubscriptionEnd}"
-                        : $"{hashCode}{ResUI.MsgFailedImportSubscription}");
-            }
-            updateFunc?.Invoke(false, "-------------------------------------------------------");
-
-            //await ConfigHandler.DedupServerList(config, id);
        }

        updateFunc?.Invoke(true, $"{ResUI.MsgUpdateSubscriptionEnd}");
    }
+
+    private static bool IsValidSubscription(SubItem item, string subId)
+    {
+        var id = item.Id.TrimEx();
+        var url = item.Url.TrimEx();
+
+        if (id.IsNullOrEmpty() || url.IsNullOrEmpty())
+        {
+            return false;
+        }
+
+        if (subId.IsNotEmpty() && item.Id != subId)
+        {
+            return false;
+        }
+
+        if (!url.StartsWith(Global.HttpsProtocol) && !url.StartsWith(Global.HttpProtocol))
+        {
+            return false;
+        }
+
+        return true;
+    }
+
+    private static DownloadService CreateDownloadHandler(string hashCode, Action<bool, string> updateFunc)
+    {
+        var downloadHandle = new DownloadService();
+        downloadHandle.Error += (sender2, args) =>
+        {
+            updateFunc?.Invoke(false, $"{hashCode}{args.GetException().Message}");
+        };
+        return downloadHandle;
+    }
+
+    private static async Task<string> DownloadSubscriptionContent(DownloadService downloadHandle, string url, bool blProxy, string userAgent)
+    {
+        var result = await downloadHandle.TryDownloadString(url, blProxy, userAgent);
+
+        // If download with proxy fails, try direct connection
+        if (blProxy && result.IsNullOrEmpty())
+        {
+            result = await downloadHandle.TryDownloadString(url, false, userAgent);
+        }
+
+        return result ?? string.Empty;
+    }
+
+    private static async Task<string> DownloadAllSubscriptions(Config config, SubItem item, bool blProxy, DownloadService downloadHandle)
+    {
+        // Download main subscription content
+        var result = await DownloadMainSubscription(config, item, blProxy, downloadHandle);
+
+        // Process additional subscription links (if any)
+        if (item.ConvertTarget.IsNullOrEmpty() && item.MoreUrl.TrimEx().IsNotEmpty())
+        {
+            result = await DownloadAdditionalSubscriptions(item, result, blProxy, downloadHandle);
+        }
+
+        return result;
+    }
+
+    private static async Task<string> DownloadMainSubscription(Config config, SubItem item, bool blProxy, DownloadService downloadHandle)
+    {
+        // Prepare subscription URL and download directly
+        var url = Utils.GetPunycode(item.Url.TrimEx());
+
+        // If conversion is needed
+        if (item.ConvertTarget.IsNotEmpty())
+        {
+            var subConvertUrl = config.ConstItem.SubConvertUrl.IsNullOrEmpty()
+                ? Global.SubConvertUrls.FirstOrDefault()
+                : config.ConstItem.SubConvertUrl;
+
+            url = string.Format(subConvertUrl!, Utils.UrlEncode(url));
+
+            if (!url.Contains("target="))
+            {
+                url += string.Format("&target={0}", item.ConvertTarget);
+            }
+
+            if (!url.Contains("config="))
+            {
+                url += string.Format("&config={0}", Global.SubConvertConfig.FirstOrDefault());
+            }
+        }
+
+        // Download and return result directly
+        return await DownloadSubscriptionContent(downloadHandle, url, blProxy, item.UserAgent);
+    }
+
+    private static async Task<string> DownloadAdditionalSubscriptions(SubItem item, string mainResult, bool blProxy, DownloadService downloadHandle)
+    {
+        var result = mainResult;
+
+        // If main subscription result is Base64 encoded, decode it first
+        if (result.IsNotEmpty() && Utils.IsBase64String(result))
+        {
+            result = Utils.Base64Decode(result);
+        }
+
+        // Process additional URL list
+        var lstUrl = item.MoreUrl.TrimEx().Split(",") ?? [];
+        foreach (var it in lstUrl)
+        {
+            var url2 = Utils.GetPunycode(it);
+            if (url2.IsNullOrEmpty())
+            {
+                continue;
+            }
+
+            var additionalResult = await DownloadSubscriptionContent(downloadHandle, url2, blProxy, item.UserAgent);
+
+            if (additionalResult.IsNotEmpty())
+            {
+                // Process additional subscription results, add to main result
+                if (Utils.IsBase64String(additionalResult))
+                {
+                    result += Environment.NewLine + Utils.Base64Decode(additionalResult);
+                }
+                else
+                {
+                    result += Environment.NewLine + additionalResult;
+                }
+            }
+        }
+
+        return result;
+    }
+
+    private static async Task ProcessDownloadResult(Config config, string id, string result, string hashCode, Action<bool, string> updateFunc)
+    {
+        if (result.IsNullOrEmpty())
+        {
+            updateFunc?.Invoke(false, $"{hashCode}{ResUI.MsgSubscriptionDecodingFailed}");
+            return;
+        }
+
+        updateFunc?.Invoke(false, $"{hashCode}{ResUI.MsgGetSubscriptionSuccessfully}");
+
+        // If result is too short, display content directly
+        if (result.Length < 99)
+        {
+            updateFunc?.Invoke(false, $"{hashCode}{result}");
+        }
+
+        // Add servers to configuration
+        var ret = await ConfigHandler.AddBatchServers(config, result, id, true);
+        if (ret <= 0)
+        {
+            Logging.SaveLog("FailedImportSubscription");
+            Logging.SaveLog(result);
+        }
+
+        // Update completion message
+        updateFunc?.Invoke(false,
+            ret > 0
+                ? $"{hashCode}{ResUI.MsgUpdateSubscriptionEnd}"
+                : $"{hashCode}{ResUI.MsgFailedImportSubscription}");
+    }
 }
--- a/v2rayN/ServiceLib/Handler/SysProxy/SysProxyHandler.cs
+++ b/v2rayN/ServiceLib/Handler/SysProxy/SysProxyHandler.cs
@@ -56,7 +56,7 @@ public static class SysProxyHandler

            if (type != ESysProxyType.Pac && Utils.IsWindows())
            {
-                PacHandler.Stop();
+                PacHandler.Instance.Stop();
            }
        }
        catch (Exception ex)
@@ -91,7 +91,7 @@ public static class SysProxyHandler
    private static async Task SetWindowsProxyPac(int port)
    {
        var portPac = AppHandler.Instance.GetLocalPort(EInboundProtocol.pac);
-        await PacHandler.Start(Utils.GetConfigPath(), port, portPac);
+        await PacHandler.Instance.StartAsync(Utils.GetConfigPath(), port, portPac);
        var strProxy = $"{Global.HttpProtocol}{Global.Loopback}:{portPac}/pac?t={DateTime.Now.Ticks}";
        ProxySettingWindows.SetProxy(strProxy, "", 4);
    }
--- a/v2rayN/ServiceLib/Models/ConfigItems.cs
+++ b/v2rayN/ServiceLib/Models/ConfigItems.cs
@@ -165,7 +165,6 @@ public class RoutingBasicItem
 {
    public string DomainStrategy { get; set; }
    public string DomainStrategy4Singbox { get; set; }
-    public string DomainMatcher { get; set; }
    public string RoutingIndexId { get; set; }
 }

--- a/v2rayN/ServiceLib/Models/V2rayConfig.cs
+++ b/v2rayN/ServiceLib/Models/V2rayConfig.cs
@@ -233,8 +233,6 @@ public class Routing4Ray
 {
    public string domainStrategy { get; set; }

-    public string? domainMatcher { get; set; }
-
    public List<RulesItem4Ray> rules { get; set; }

    public List<BalancersItem4Ray>? balancers { get; set; }
--- a/v2rayN/ServiceLib/Resx/ResUI.Designer.cs
+++ b/v2rayN/ServiceLib/Resx/ResUI.Designer.cs
@@ -2463,15 +2463,6 @@ namespace ServiceLib.Resx {
            }
        }
        
-        /// <summary>
-        ///   查找类似 Domain Matcher 的本地化字符串。
-        /// </summary>
-        public static string TbdomainMatcher {
-            get {
-                return ResourceManager.GetString("TbdomainMatcher", resourceCulture);
-            }
-        }
-        
        /// <summary>
        ///   查找类似 Domain strategy 的本地化字符串。
        /// </summary>
--- a/v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.fa-Ir.resx
@@ -825,9 +825,6 @@
  <data name="menuRoutingAdvancedSetDefault" xml:space="preserve">
    <value>تنظیم کردن به عنوان قانون فعال</value>
  </data>
-  <data name="TbdomainMatcher" xml:space="preserve">
-    <value>تطبیق دامنه</value>
-  </data>
  <data name="TbdomainStrategy" xml:space="preserve">
    <value>استراتژی دامنه</value>
  </data>
--- a/v2rayN/ServiceLib/Resx/ResUI.hu.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.hu.resx
@@ -825,9 +825,6 @@
  <data name="menuRoutingAdvancedSetDefault" xml:space="preserve">
    <value>Beállítás aktív szabályként (Enter)</value>
  </data>
-  <data name="TbdomainMatcher" xml:space="preserve">
-    <value>Tartomány illesztő</value>
-  </data>
  <data name="TbdomainStrategy" xml:space="preserve">
    <value>Tartomány stratégia</value>
  </data>
--- a/v2rayN/ServiceLib/Resx/ResUI.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.resx
@@ -825,9 +825,6 @@
  <data name="menuRoutingAdvancedSetDefault" xml:space="preserve">
    <value>Set as active rule (Enter)</value>
  </data>
-  <data name="TbdomainMatcher" xml:space="preserve">
-    <value>Domain Matcher</value>
-  </data>
  <data name="TbdomainStrategy" xml:space="preserve">
    <value>Domain strategy</value>
  </data>
--- a/v2rayN/ServiceLib/Resx/ResUI.ru.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.ru.resx
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
-  <!--
-    Microsoft ResX Schema
-
+  <!-- 
+    Microsoft ResX Schema 
+    
    Version 2.0
-
-    The primary goals of this format is to allow a simple XML format
-    that is mostly human readable. The generation and parsing of the
-    various data types are done through the TypeConverter classes
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
    associated with the data types.
-
+    
    Example:
-
+    
    ... ado.net/XML headers & schema ...
    <resheader name="resmimetype">text/microsoft-resx</resheader>
    <resheader name="version">2.0</resheader>
@@ -26,36 +26,36 @@
        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
        <comment>This is a comment</comment>
    </data>
-
-    There are any number of "resheader" rows that contain simple
+                
+    There are any number of "resheader" rows that contain simple 
    name/value pairs.
-
-    Each data row contains a name, and value. The row also contains a
-    type or mimetype. Type corresponds to a .NET class that support
-    text/value conversion through the TypeConverter architecture.
-    Classes that don't support this are serialized and stored with the
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
    mimetype set.
-
-    The mimetype is used for serialized objects, and tells the
-    ResXResourceReader how to depersist the object. This is currently not
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
    extensible. For a given mimetype the value must be set accordingly:
-
-    Note - application/x-microsoft.net.object.binary.base64 is the format
-    that the ResXResourceWriter will generate, however the reader can
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
    read any of the formats listed below.
-
+    
    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with
+    value   : The object must be serialized with 
            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
            : and then encoded with base64 encoding.
-
+    
    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with
+    value   : The object must be serialized with 
            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
            : and then encoded with base64 encoding.

    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array
+    value   : The object must be serialized into a byte array 
            : using a System.ComponentModel.TypeConverter
            : and then encoded with base64 encoding.
    -->
@@ -825,9 +825,6 @@
  <data name="menuRoutingAdvancedSetDefault" xml:space="preserve">
    <value>Установить как активное правило</value>
  </data>
-  <data name="TbdomainMatcher" xml:space="preserve">
-    <value>Сопоставитель доменов</value>
-  </data>
  <data name="TbdomainStrategy" xml:space="preserve">
    <value>Доменная стратегия</value>
  </data>
@@ -1500,4 +1497,4 @@
  <data name="TbFullConfigTemplateDesc" xml:space="preserve">
    <value>Эта функция предназначена для продвинутых пользователей и особых случаев. После включения игнорируются базовые настройки ядра, DNS и маршрутизации. Вы должны самостоятельно корректно задать порт системного прокси, учёт трафика и другие связанные параметры — всё настраивается вручную.</value>
  </data>
-</root>
+</root>
--- a/v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.zh-Hans.resx
@@ -825,9 +825,6 @@
  <data name="menuRoutingAdvancedSetDefault" xml:space="preserve">
    <value>设为活动规则 (Enter)</value>
  </data>
-  <data name="TbdomainMatcher" xml:space="preserve">
-    <value>域名匹配算法</value>
-  </data>
  <data name="TbdomainStrategy" xml:space="preserve">
    <value>域名解析策略</value>
  </data>
--- a/v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx
+++ b/v2rayN/ServiceLib/Resx/ResUI.zh-Hant.resx
@@ -825,9 +825,6 @@
  <data name="menuRoutingAdvancedSetDefault" xml:space="preserve">
    <value>設為活動規則 (Enter)</value>
  </data>
-  <data name="TbdomainMatcher" xml:space="preserve">
-    <value>域名匹配演算法</value>
-  </data>
  <data name="TbdomainStrategy" xml:space="preserve">
    <value>域名解析策略</value>
  </data>
--- a/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs
+++ b/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs
@@ -1658,6 +1658,7 @@ public class CoreConfigSingboxService
        {
            tag = Global.SingboxHostsDNSTag,
            type = "hosts",
+            predefined = new(),
        };
        if (simpleDNSItem.AddCommonHosts == true)
        {
--- a/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigV2rayService.cs
+++ b/v2rayN/ServiceLib/Services/CoreConfig/CoreConfigV2rayService.cs
@@ -523,7 +523,6 @@ public class CoreConfigV2rayService
            if (v2rayConfig.routing?.rules != null)
            {
                v2rayConfig.routing.domainStrategy = _config.RoutingBasicItem.DomainStrategy;
-                v2rayConfig.routing.domainMatcher = _config.RoutingBasicItem.DomainMatcher.IsNullOrEmpty() ? null : _config.RoutingBasicItem.DomainMatcher;

                var routing = await ConfigHandler.GetDefaultRouting(_config);
                if (routing != null)
--- a/v2rayN/ServiceLib/ViewModels/CheckUpdateViewModel.cs
+++ b/v2rayN/ServiceLib/ViewModels/CheckUpdateViewModel.cs
@@ -75,10 +75,7 @@ public class CheckUpdateViewModel : MyReactiveObject

    private async Task CheckUpdate()
    {
-        await Task.Run(async () =>
-        {
-            await CheckUpdateTask();
-        });
+        await Task.Run(CheckUpdateTask);
    }

    private async Task CheckUpdateTask()
--- a/v2rayN/ServiceLib/ViewModels/RoutingSettingViewModel.cs
+++ b/v2rayN/ServiceLib/ViewModels/RoutingSettingViewModel.cs
@@ -20,9 +20,6 @@ public class RoutingSettingViewModel : MyReactiveObject
    [Reactive]
    public string DomainStrategy { get; set; }

-    [Reactive]
-    public string DomainMatcher { get; set; }
-
    [Reactive]
    public string DomainStrategy4Singbox { get; set; }

@@ -75,7 +72,6 @@ public class RoutingSettingViewModel : MyReactiveObject
        SelectedSource = new();

        DomainStrategy = _config.RoutingBasicItem.DomainStrategy;
-        DomainMatcher = _config.RoutingBasicItem.DomainMatcher;
        DomainStrategy4Singbox = _config.RoutingBasicItem.DomainStrategy4Singbox;

        await ConfigHandler.InitBuiltinRouting(_config);
@@ -109,7 +105,6 @@ public class RoutingSettingViewModel : MyReactiveObject
    private async Task SaveRoutingAsync()
    {
        _config.RoutingBasicItem.DomainStrategy = DomainStrategy;
-        _config.RoutingBasicItem.DomainMatcher = DomainMatcher;
        _config.RoutingBasicItem.DomainStrategy4Singbox = DomainStrategy4Singbox;

        if (await ConfigHandler.SaveConfig(_config) == 0)
--- a/v2rayN/ServiceLib/ViewModels/StatusBarViewModel.cs
+++ b/v2rayN/ServiceLib/ViewModels/StatusBarViewModel.cs
@@ -334,10 +334,7 @@ public class StatusBarViewModel : MyReactiveObject

        _updateView?.Invoke(EViewAction.DispatcherServerAvailability, ResUI.Speedtesting);

-        var msg = await Task.Run(async () =>
-        {
-            return await ConnectionHandler.Instance.RunAvailabilityCheck();
-        });
+        var msg = await Task.Run(ConnectionHandler.Instance.RunAvailabilityCheck);

        NoticeHandler.Instance.SendMessageEx(msg);
        _updateView?.Invoke(EViewAction.DispatcherServerAvailability, msg);
--- a/v2rayN/v2rayN.Desktop/Views/RoutingSettingWindow.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/RoutingSettingWindow.axaml
@@ -50,7 +50,7 @@
            Margin="{StaticResource Margin4}"
            ColumnDefinitions="Auto,Auto"
            DockPanel.Dock="Top"
-            RowDefinitions="Auto,Auto,Auto">
+            RowDefinitions="Auto,Auto">

            <TextBlock
                Grid.Row="0"
@@ -74,19 +74,6 @@
                Grid.Row="1"
                Grid.Column="0"
                Margin="{StaticResource Margin4}"
-                VerticalAlignment="Center"
-                Text="{x:Static resx:ResUI.TbdomainMatcher}" />
-            <ComboBox
-                x:Name="cmbdomainMatcher"
-                Grid.Row="1"
-                Grid.Column="1"
-                Width="300"
-                Margin="{StaticResource Margin4}" />
-
-            <TextBlock
-                Grid.Row="2"
-                Grid.Column="0"
-                Margin="{StaticResource Margin4}"
                VerticalAlignment="Center">
                <HyperlinkButton Classes="WithIcon" Click="linkdomainStrategy4Singbox_Click">
                    <TextBlock Text="{x:Static resx:ResUI.TbdomainStrategy4Singbox}" />
@@ -94,7 +81,7 @@
            </TextBlock>
            <ComboBox
                x:Name="cmbdomainStrategy4Singbox"
-                Grid.Row="2"
+                Grid.Row="1"
                Grid.Column="1"
                Width="300"
                Margin="{StaticResource Margin4}"
--- a/v2rayN/v2rayN.Desktop/Views/RoutingSettingWindow.axaml.cs
+++ b/v2rayN/v2rayN.Desktop/Views/RoutingSettingWindow.axaml.cs
@@ -27,7 +27,6 @@ public partial class RoutingSettingWindow : WindowBase<RoutingSettingViewModel>
        ViewModel = new RoutingSettingViewModel(UpdateViewHandler);

        cmbdomainStrategy.ItemsSource = Global.DomainStrategies;
-        cmbdomainMatcher.ItemsSource = Global.DomainMatchers;
        cmbdomainStrategy4Singbox.ItemsSource = Global.DomainStrategies4Singbox;

        this.WhenActivated(disposables =>
@@ -36,7 +35,6 @@ public partial class RoutingSettingWindow : WindowBase<RoutingSettingViewModel>
            this.Bind(ViewModel, vm => vm.SelectedSource, v => v.lstRoutings.SelectedItem).DisposeWith(disposables);

            this.Bind(ViewModel, vm => vm.DomainStrategy, v => v.cmbdomainStrategy.SelectedValue).DisposeWith(disposables);
-            this.Bind(ViewModel, vm => vm.DomainMatcher, v => v.cmbdomainMatcher.SelectedValue).DisposeWith(disposables);
            this.Bind(ViewModel, vm => vm.DomainStrategy4Singbox, v => v.cmbdomainStrategy4Singbox.SelectedValue).DisposeWith(disposables);

            this.BindCommand(ViewModel, vm => vm.RoutingAdvancedAddCmd, v => v.menuRoutingAdvancedAdd).DisposeWith(disposables);
--- a/v2rayN/v2rayN/Views/RoutingSettingWindow.xaml
+++ b/v2rayN/v2rayN/Views/RoutingSettingWindow.xaml
@@ -78,7 +78,6 @@
            <Grid.RowDefinitions>
                <RowDefinition Height="Auto" />
                <RowDefinition Height="Auto" />
-                <RowDefinition Height="Auto" />
            </Grid.RowDefinitions>
            <Grid.ColumnDefinitions>
                <ColumnDefinition Width="Auto" />
@@ -109,21 +108,6 @@
                Grid.Column="0"
                Margin="{StaticResource Margin4}"
                VerticalAlignment="Center"
-                Style="{StaticResource ToolbarTextBlock}"
-                Text="{x:Static resx:ResUI.TbdomainMatcher}" />
-            <ComboBox
-                x:Name="cmbdomainMatcher"
-                Grid.Row="1"
-                Grid.Column="1"
-                Width="300"
-                Margin="{StaticResource Margin4}"
-                Style="{StaticResource DefComboBox}" />
-
-            <TextBlock
-                Grid.Row="2"
-                Grid.Column="0"
-                Margin="{StaticResource Margin4}"
-                VerticalAlignment="Center"
                Style="{StaticResource ToolbarTextBlock}">
                <Hyperlink Click="linkdomainStrategy4Singbox_Click">
                    <TextBlock Text="{x:Static resx:ResUI.TbdomainStrategy4Singbox}" />
@@ -132,7 +116,7 @@
            </TextBlock>
            <ComboBox
                x:Name="cmbdomainStrategy4Singbox"
-                Grid.Row="2"
+                Grid.Row="1"
                Grid.Column="1"
                Width="300"
                Margin="{StaticResource Margin4}"
--- a/v2rayN/v2rayN/Views/RoutingSettingWindow.xaml.cs
+++ b/v2rayN/v2rayN/Views/RoutingSettingWindow.xaml.cs
@@ -22,7 +22,6 @@ public partial class RoutingSettingWindow
        ViewModel = new RoutingSettingViewModel(UpdateViewHandler);

        cmbdomainStrategy.ItemsSource = Global.DomainStrategies;
-        cmbdomainMatcher.ItemsSource = Global.DomainMatchers;
        cmbdomainStrategy4Singbox.ItemsSource = Global.DomainStrategies4Singbox;

        this.WhenActivated(disposables =>
@@ -31,7 +30,6 @@ public partial class RoutingSettingWindow
            this.Bind(ViewModel, vm => vm.SelectedSource, v => v.lstRoutings.SelectedItem).DisposeWith(disposables);

            this.Bind(ViewModel, vm => vm.DomainStrategy, v => v.cmbdomainStrategy.Text).DisposeWith(disposables);
-            this.Bind(ViewModel, vm => vm.DomainMatcher, v => v.cmbdomainMatcher.Text).DisposeWith(disposables);
            this.Bind(ViewModel, vm => vm.DomainStrategy4Singbox, v => v.cmbdomainStrategy4Singbox.Text).DisposeWith(disposables);

            this.BindCommand(ViewModel, vm => vm.RoutingAdvancedAddCmd, v => v.menuRoutingAdvancedAdd).DisposeWith(disposables);
Author	SHA1	Message	Date
2dust	5201dd5ad0	up 7.14.1	2025-08-17 14:26:13 +08:00
2dust	4c3c1e0b5f	Optimization and upgrade tools	2025-08-17 14:12:40 +08:00
DHR60	c27651b7b7	Fixed Failed Gen Default Configuration (#7785 )	2025-08-17 13:52:57 +08:00
2dust	06636d04ac	PacHandler is changed to singleton mode	2025-08-17 11:00:13 +08:00
DHR60	6979e21628	Remove DomainMatcher (#7781 )	2025-08-17 09:32:02 +08:00
DHR60	310d266745	Add VLESS encryption support (#7782 )	2025-08-17 09:15:06 +08:00
2dust	120e8d0686	Fixed a bug in parsing subscription result https://github.com/2dust/v2rayN/issues/7734	2025-08-16 20:05:56 +08:00
2dust	186b56aed9	Refactor SubscriptionHandler and add exception capture	2025-08-16 18:01:12 +08:00
2dust	c560fe13fe	Adjust the tun mtu value list https://github.com/2dust/v2rayN/issues/7775	2025-08-16 17:18:17 +08:00