up 7.14.10

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

v2rayN/Directory.Build.props

@@ -1,7 +1,7 @@
 <Project>
 
     <PropertyGroup>
-        <Version>7.14.9</Version>
+        <Version>7.14.10</Version>
     </PropertyGroup>
 
     <PropertyGroup>

v2rayN/Directory.Packages.props

@@ -5,10 +5,10 @@
     <CentralPackageVersionOverrideEnabled>false</CentralPackageVersionOverrideEnabled>
   </PropertyGroup>
   <ItemGroup>
-    <PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.3.5" />
+    <PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.3.6" />
-    <PackageVersion Include="Avalonia.Desktop" Version="11.3.5" />
+    <PackageVersion Include="Avalonia.Desktop" Version="11.3.6" />
-    <PackageVersion Include="Avalonia.Diagnostics" Version="11.3.5" />
+    <PackageVersion Include="Avalonia.Diagnostics" Version="11.3.6" />
-    <PackageVersion Include="Avalonia.ReactiveUI" Version="11.3.5" />
+    <PackageVersion Include="Avalonia.ReactiveUI" Version="11.3.6" />
     <PackageVersion Include="CliWrap" Version="3.9.0" />
     <PackageVersion Include="Downloader" Version="4.0.3" />
     <PackageVersion Include="H.NotifyIcon.Wpf" Version="2.3.0" />

v2rayN/ServiceLib/Common/JsonUtils.cs

@@ -9,6 +9,31 @@ public class JsonUtils
 {
     private static readonly string _tag = "JsonUtils";
 
+    private static readonly JsonSerializerOptions _defaultDeserializeOptions = new()
+    {
+        PropertyNameCaseInsensitive = true,
+        ReadCommentHandling = JsonCommentHandling.Skip
+    };
+
+    private static readonly JsonSerializerOptions _defaultSerializeOptions = new()
+    {
+        WriteIndented = true,
+        DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull,
+        Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping
+    };
+
+    private static readonly JsonSerializerOptions _nullValueSerializeOptions = new()
+    {
+        WriteIndented = true,
+        DefaultIgnoreCondition = JsonIgnoreCondition.Never,
+        Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping
+    };
+
+    private static readonly JsonDocumentOptions _defaultDocumentOptions = new()
+    {
+        CommentHandling = JsonCommentHandling.Skip
+    };
+
     /// <summary>
     /// DeepCopy
     /// </summary>
@@ -34,11 +59,7 @@ public class JsonUtils
             {
                 return default;
             }
-            var options = new JsonSerializerOptions
+            return JsonSerializer.Deserialize<T>(strJson, _defaultDeserializeOptions);
-            {
-                PropertyNameCaseInsensitive = true
-            };
-            return JsonSerializer.Deserialize<T>(strJson, options);
         }
         catch
         {
@@ -59,7 +80,7 @@ public class JsonUtils
             {
                 return null;
             }
-            return JsonNode.Parse(strJson);
+            return JsonNode.Parse(strJson, nodeOptions: null, _defaultDocumentOptions);
         }
         catch
         {
@@ -84,12 +105,7 @@ public class JsonUtils
             {
                 return result;
             }
-            var options = new JsonSerializerOptions
+            var options = nullValue ? _nullValueSerializeOptions : _defaultSerializeOptions;
-            {
-                WriteIndented = indented,
-                DefaultIgnoreCondition = nullValue ? JsonIgnoreCondition.Never : JsonIgnoreCondition.WhenWritingNull,
-                Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping
-            };
             result = JsonSerializer.Serialize(obj, options);
         }
         catch (Exception ex)

v2rayN/ServiceLib/Common/Utils.cs

@@ -331,6 +331,32 @@ public class Utils
             .ToList();
     }
 
+    public static Dictionary<string, List<string>> ParseHostsToDictionary(string hostsContent)
+    {
+        var userHostsMap = hostsContent
+            .Split(new[] { '\r', '\n' }, StringSplitOptions.RemoveEmptyEntries)
+            .Select(line => line.Trim())
+            // skip full-line comments
+            .Where(line => !string.IsNullOrWhiteSpace(line) && !line.StartsWith("#"))
+            // strip inline comments (truncate at '#')
+            .Select(line =>
+            {
+                var index = line.IndexOf('#');
+                return index >= 0 ? line.Substring(0, index).Trim() : line;
+            })
+            // ensure line still contains valid parts
+            .Where(line => !string.IsNullOrWhiteSpace(line) && line.Contains(' '))
+            .Select(line => line.Split(new[] { ' ', '\t' }, StringSplitOptions.RemoveEmptyEntries))
+            .Where(parts => parts.Length >= 2)
+            .GroupBy(parts => parts[0])
+            .ToDictionary(
+                group => group.Key,
+                group => group.SelectMany(parts => parts.Skip(1)).ToList()
+            );
+
+        return userHostsMap;
+    }
+
     #endregion 转换函数
 
     #region 数据检查
@@ -857,6 +883,55 @@ public class Utils
         return false;
     }
 
+    public static bool IsPackagedInstall()
+    {
+        try
+        {
+            if (IsWindows() || IsOSX())
+            {
+                return false;
+            }
+
+            if (!string.IsNullOrEmpty(Environment.GetEnvironmentVariable("APPIMAGE")))
+            {
+                return true;
+            }
+
+            var exePath = GetExePath();
+            var baseDir = string.IsNullOrEmpty(exePath) ? StartupPath() : Path.GetDirectoryName(exePath) ?? "";
+            var p = baseDir.Replace('\\', '/');
+
+            if (string.IsNullOrEmpty(p))
+            {
+                return false;
+            }
+
+            if (p.Contains("/.mount_", StringComparison.Ordinal))
+            {
+                return true;
+            }
+
+            if (p.StartsWith("/opt/v2rayN", StringComparison.OrdinalIgnoreCase))
+            {
+                return true;
+            }
+
+            if (p.StartsWith("/usr/lib/v2rayN", StringComparison.OrdinalIgnoreCase))
+            {
+                return true;
+            }
+
+            if (p.StartsWith("/usr/share/v2rayN", StringComparison.OrdinalIgnoreCase))
+            {
+                return true;
+            }
+        }
+        catch
+        {
+        }
+        return false;
+    }
+
     private static async Task<string?> GetLinuxUserId()
     {
         var arg = new List<string>() { "-c", "id -u" };

v2rayN/ServiceLib/Handler/Fmt/ClashFmt.cs

@@ -4,7 +4,7 @@ public class ClashFmt : BaseFmt
 {
     public static ProfileItem? ResolveFull(string strData, string? subRemarks)
     {
-        if (Contains(strData, "port", "socks-port", "proxies"))
+        if (Contains(strData, "external-controller", "-port", "proxies"))
         {
             var fileName = WriteAllText(strData, "yaml");
 

v2rayN/ServiceLib/Models/CheckUpdateModel.cs

@@ -1,10 +1,13 @@
+using ReactiveUI;
+using ReactiveUI.Fody.Helpers;
+
 namespace ServiceLib.Models;
 
-public class CheckUpdateModel
+public class CheckUpdateModel : ReactiveObject
 {
     public bool? IsSelected { get; set; }
     public string? CoreType { get; set; }
-    public string? Remarks { get; set; }
+    [Reactive] public string? Remarks { get; set; }
     public string? FileName { get; set; }
     public bool? IsFinished { get; set; }
 }

v2rayN/ServiceLib/Models/ClashProxyModel.cs

@@ -1,7 +1,10 @@
+using ReactiveUI;
+using ReactiveUI.Fody.Helpers;
+
 namespace ServiceLib.Models;
 
 [Serializable]
-public class ClashProxyModel
+public class ClashProxyModel : ReactiveObject
 {
     public string? Name { get; set; }
 
@@ -9,9 +12,9 @@ public class ClashProxyModel
 
     public string? Now { get; set; }
 
-    public int Delay { get; set; }
+    [Reactive] public int Delay { get; set; }
 
-    public string? DelayName { get; set; }
+    [Reactive] public string? DelayName { get; set; }
 
     public bool IsActive { get; set; }
 }

v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxDnsService.cs

@@ -94,17 +94,7 @@ public partial class CoreConfigSingboxService
 
         if (!simpleDNSItem.Hosts.IsNullOrEmpty())
         {
-            var userHostsMap = simpleDNSItem.Hosts
+            var userHostsMap = Utils.ParseHostsToDictionary(simpleDNSItem.Hosts);
-                .Split(new[] { '\r', '\n' }, StringSplitOptions.RemoveEmptyEntries)
-                .Select(line => line.Trim())
-                .Where(line => !string.IsNullOrWhiteSpace(line) && line.Contains(' '))
-                .Select(line => line.Split(new[] { ' ', '\t' }, StringSplitOptions.RemoveEmptyEntries))
-                .Where(parts => parts.Length >= 2)
-                .GroupBy(parts => parts[0])
-                .ToDictionary(
-                    group => group.Key,
-                    group => group.SelectMany(parts => parts.Skip(1)).ToList()
-                );
 
             foreach (var kvp in userHostsMap)
             {

v2rayN/ServiceLib/Services/CoreConfig/Singbox/SingboxRoutingService.cs

@@ -71,6 +71,31 @@ public partial class CoreConfigSingboxService
                 });
             }
 
+            var hostsDomains = new List<string>();
+            var systemHostsMap = Utils.GetSystemHosts();
+            foreach (var kvp in systemHostsMap)
+            {
+                hostsDomains.Add(kvp.Key);
+            }
+            var dnsItem = await AppManager.Instance.GetDNSItem(ECoreType.sing_box);
+            if (dnsItem == null || dnsItem.Enabled == false)
+            {
+                var simpleDNSItem = _config.SimpleDNSItem;
+                if (!simpleDNSItem.Hosts.IsNullOrEmpty())
+                {
+                    var userHostsMap = Utils.ParseHostsToDictionary(simpleDNSItem.Hosts);
+                    foreach (var kvp in userHostsMap)
+                    {
+                        hostsDomains.Add(kvp.Key);
+                    }
+                }
+            }
+            singboxConfig.route.rules.Add(new()
+            {
+                action = "resolve",
+                domain = hostsDomains,
+            });
+
             singboxConfig.route.rules.Add(new()
             {
                 outbound = Global.DirectTag,
@@ -343,6 +368,13 @@ public partial class CoreConfigSingboxService
             return Global.ProxyTag;
         }
 
+        var tag = Global.ProxyTag + node.IndexId.ToString();
+        if (singboxConfig.outbounds.Any(o => o.tag == tag)
+            || (singboxConfig.endpoints != null && singboxConfig.endpoints.Any(e => e.tag == tag)))
+        {
+            return tag;
+        }
+
         var server = await GenServer(node);
         if (server is null)
         {

v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayDnsService.cs

@@ -261,17 +261,7 @@ public partial class CoreConfigV2rayService
 
         if (!simpleDNSItem.Hosts.IsNullOrEmpty())
         {
-            var userHostsMap = simpleDNSItem.Hosts
+            var userHostsMap = Utils.ParseHostsToDictionary(simpleDNSItem.Hosts);
-                .Split(new[] { '\r', '\n' }, StringSplitOptions.RemoveEmptyEntries)
-                .Select(line => line.Trim())
-                .Where(line => !string.IsNullOrWhiteSpace(line) && line.Contains(' '))
-                .Select(line => line.Split(new[] { ' ', '\t' }, StringSplitOptions.RemoveEmptyEntries))
-                .Where(parts => parts.Length >= 2)
-                .GroupBy(parts => parts[0])
-                .ToDictionary(
-                    group => group.Key,
-                    group => group.SelectMany(parts => parts.Skip(1)).ToList()
-                );
 
             foreach (var kvp in userHostsMap)
             {

v2rayN/ServiceLib/Services/CoreConfig/V2ray/V2rayRoutingService.cs

@@ -131,10 +131,16 @@ public partial class CoreConfigV2rayService
             return Global.ProxyTag;
         }
 
+        var tag = Global.ProxyTag + node.IndexId.ToString();
+        if (v2rayConfig.outbounds.Any(p => p.tag == tag))
+        {
+            return tag;
+        }
+
         var txtOutbound = EmbedUtils.GetEmbedText(Global.V2raySampleOutbound);
         var outbound = JsonUtils.Deserialize<Outbounds4Ray>(txtOutbound);
         await GenOutbound(node, outbound);
-        outbound.tag = Global.ProxyTag + node.IndexId.ToString();
+        outbound.tag = tag;
         v2rayConfig.outbounds.Add(outbound);
 
         return outbound.tag;

v2rayN/ServiceLib/ViewModels/CheckUpdateViewModel.cs

@@ -63,6 +63,16 @@ public class CheckUpdateViewModel : MyReactiveObject
 
     private CheckUpdateModel GetCheckUpdateModel(string coreType)
     {
+        if (coreType == _v2rayN && Utils.IsPackagedInstall())
+        {
+            return new()
+            {
+                IsSelected = false,
+                CoreType = coreType,
+                Remarks = ResUI.menuCheckUpdate + " (Not Support)",
+            };
+        }
+
         return new()
         {
             IsSelected = _config.CheckUpdateItem.SelectedCoreTypes?.Contains(coreType) ?? true,
@@ -104,6 +114,11 @@ public class CheckUpdateViewModel : MyReactiveObject
             }
             else if (item.CoreType == _v2rayN)
             {
+                if (Utils.IsPackagedInstall())
+                {
+                    await UpdateView(_v2rayN, "Not Support");
+                    continue;
+                }
                 await CheckUpdateN(EnableCheckPreReleaseUpdate);
             }
             else if (item.CoreType == ECoreType.Xray.ToString())
@@ -334,9 +349,6 @@ public class CheckUpdateViewModel : MyReactiveObject
         {
             return;
         }
-
+        found.Remarks = model.Remarks; 
-        var itemCopy = JsonUtils.DeepCopy(found);
-        itemCopy.Remarks = model.Remarks;
-        CheckUpdateModels.Replace(found, itemCopy);
     }
 }

v2rayN/ServiceLib/ViewModels/ClashProxiesViewModel.cs

@@ -391,7 +391,6 @@ public class ClashProxiesViewModel : MyReactiveObject
 
     public async Task ProxiesDelayTestResult(SpeedTestResult result)
     {
-        //UpdateHandler(false, $"{item.name}={result}");
         var detail = ProxyDetails.FirstOrDefault(it => it.Name == result.IndexId);
         if (detail == null)
         {
@@ -414,7 +413,6 @@ public class ClashProxiesViewModel : MyReactiveObject
             detail.Delay = _delayTimeout;
             detail.DelayName = string.Empty;
         }
-        ProxyDetails.Replace(detail, JsonUtils.DeepCopy(detail));
     }
 
     #endregion proxy function

v2rayN/ServiceLib/ViewModels/ProfilesViewModel.cs

@@ -293,7 +293,6 @@ public class ProfilesViewModel : MyReactiveObject
         {
             item.SpeedVal = result.Speed ?? string.Empty;
         }
-        //_profileItems.Replace(item, JsonUtils.DeepCopy(item));
     }
 
     public async Task UpdateStatistics(ServerSpeedItem update)
@@ -314,17 +313,6 @@ public class ProfilesViewModel : MyReactiveObject
                 item.TodayUp = Utils.HumanFy(update.TodayUp);
                 item.TotalDown = Utils.HumanFy(update.TotalDown);
                 item.TotalUp = Utils.HumanFy(update.TotalUp);
-
-                //if (SelectedProfile?.IndexId == item.IndexId)
-                //{
-                //    var temp = JsonUtils.DeepCopy(item);
-                //    _profileItems.Replace(item, temp);
-                //    SelectedProfile = temp;
-                //}
-                //else
-                //{
-                //    _profileItems.Replace(item, JsonUtils.DeepCopy(item));
-                //}
             }
         }
         catch

v2rayN/v2rayN.Desktop/Views/AddServerWindow.axaml

@@ -400,7 +400,7 @@
                         Grid.Column="1"
                         Width="400"
                         Margin="{StaticResource Margin4}"
-                        Watermark="1000:2000,3000:4000" />
+                        Watermark="1000-2000,3000,4000" />
                     <TextBlock
                         Grid.Row="3"
                         Grid.Column="2"

v2rayN/v2rayN.Desktop/Views/RoutingRuleSettingWindow.axaml

@@ -176,6 +176,7 @@
                 <DataGrid
                     x:Name="lstRules"
                     AutoGenerateColumns="False"
+                    Background="Transparent"
                     BorderThickness="1"
                     CanUserResizeColumns="True"
                     GridLinesVisibility="All"

v2rayN/v2rayN.Desktop/Views/RoutingSettingWindow.axaml

@@ -92,6 +92,7 @@
                 <DataGrid
                     x:Name="lstRoutings"
                     AutoGenerateColumns="False"
+                    Background="Transparent"
                     BorderThickness="1"
                     CanUserResizeColumns="True"
                     GridLinesVisibility="All"

v2rayN/v2rayN/Views/AddServerWindow.xaml

@@ -538,7 +538,7 @@
                         Width="400"
                         Margin="{StaticResource Margin4}"
                         HorizontalAlignment="Left"
-                        materialDesign:HintAssist.Hint="1000:2000,3000:4000"
+                        materialDesign:HintAssist.Hint="1000-2000,3000,4000"
                         Style="{StaticResource DefTextBox}" />
                     <TextBlock
                         Grid.Row="3"

v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml.cs

@@ -122,6 +122,8 @@ public partial class RoutingRuleSettingWindow
 
     private void RoutingRuleSettingWindow_PreviewKeyDown(object sender, KeyEventArgs e)
     {
+        if (!lstRules.IsKeyboardFocusWithin)
+            return;
         if (Keyboard.IsKeyDown(Key.LeftCtrl) || Keyboard.IsKeyDown(Key.RightCtrl))
         {
             if (e.Key == Key.A)