Merge 2a7095aa1e into 29a5abf4d6

v2rayN/ServiceLib/Common/JsonUtils.cs

@@ -9,31 +9,6 @@ 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>
@@ -59,7 +34,11 @@ public class JsonUtils
             {
                 return default;
             }
-            return JsonSerializer.Deserialize<T>(strJson, _defaultDeserializeOptions);
+            var options = new JsonSerializerOptions
+            {
+                PropertyNameCaseInsensitive = true
+            };
+            return JsonSerializer.Deserialize<T>(strJson, options);
         }
         catch
         {
@@ -80,7 +59,7 @@ public class JsonUtils
             {
                 return null;
             }
-            return JsonNode.Parse(strJson, nodeOptions: null, _defaultDocumentOptions);
+            return JsonNode.Parse(strJson);
         }
         catch
         {
@@ -105,7 +84,12 @@ public class JsonUtils
             {
                 return result;
             }
-            var options = nullValue ? _nullValueSerializeOptions : _defaultSerializeOptions;
+            var options = new JsonSerializerOptions
+            {
+                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,32 +331,6 @@ 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 数据检查
@@ -883,55 +857,6 @@ 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, "external-controller", "-port", "proxies"))
+        if (Contains(strData, "port", "socks-port", "proxies"))
         {
             var fileName = WriteAllText(strData, "yaml");
 

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

@@ -103,7 +103,17 @@ public partial class CoreConfigSingboxService
 
         if (!simpleDNSItem.Hosts.IsNullOrEmpty())
         {
-            var userHostsMap = Utils.ParseHostsToDictionary(simpleDNSItem.Hosts);
+            var userHostsMap = 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,31 +71,6 @@ 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,

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

@@ -261,7 +261,17 @@ public partial class CoreConfigV2rayService
 
         if (!simpleDNSItem.Hosts.IsNullOrEmpty())
         {
-            var userHostsMap = Utils.ParseHostsToDictionary(simpleDNSItem.Hosts);
+            var userHostsMap = 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/ViewModels/AddGroupServerViewModel.cs

@@ -39,30 +39,26 @@ public class AddGroupServerViewModel : MyReactiveObject
         _config = AppManager.Instance.Config;
         _updateView = updateView;
 
-        var canEditRemove = this.WhenAnyValue(
-            x => x.SelectedChild,
-            SelectedChild => SelectedChild != null && !SelectedChild.Remarks.IsNullOrEmpty());
-
         RemoveCmd = ReactiveCommand.CreateFromTask(async () =>
         {
             await ChildRemoveAsync();
-        }, canEditRemove);
+        });
         MoveTopCmd = ReactiveCommand.CreateFromTask(async () =>
         {
             await MoveServer(EMove.Top);
-        }, canEditRemove);
+        });
         MoveUpCmd = ReactiveCommand.CreateFromTask(async () =>
         {
             await MoveServer(EMove.Up);
-        }, canEditRemove);
+        });
         MoveDownCmd = ReactiveCommand.CreateFromTask(async () =>
         {
             await MoveServer(EMove.Down);
-        }, canEditRemove);
+        });
         MoveBottomCmd = ReactiveCommand.CreateFromTask(async () =>
         {
             await MoveServer(EMove.Bottom);
-        }, canEditRemove);
+        });
         SaveCmd = ReactiveCommand.CreateFromTask(async () =>
         {
             await SaveServerAsync();

v2rayN/ServiceLib/ViewModels/CheckUpdateViewModel.cs

@@ -63,16 +63,6 @@ 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,
@@ -114,11 +104,6 @@ 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())

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

v2rayN/v2rayN.Desktop/Views/RoutingSettingWindow.axaml

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

v2rayN/v2rayN/Views/AddGroupServerWindow.xaml.cs

@@ -16,7 +16,6 @@ public partial class AddGroupServerWindow
         this.Loaded += Window_Loaded;
         this.PreviewKeyDown += AddGroupServerWindow_PreviewKeyDown;
         lstChild.SelectionChanged += LstChild_SelectionChanged;
-        menuSelectAllChild.Click += MenuSelectAllChild_Click;
 
         ViewModel = new AddGroupServerViewModel(profileItem, UpdateViewHandler);
 
@@ -139,9 +138,4 @@ public partial class AddGroupServerWindow
             ViewModel.SelectedChildren = lstChild.SelectedItems.Cast<ProfileItem>().ToList();
         }
     }
-
-    private void MenuSelectAllChild_Click(object sender, RoutedEventArgs e)
-    {
-        lstChild.SelectAll();
-    }
 }

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,8 +122,6 @@ 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)