up 7.0.2

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

v2rayN/AmazTool/UpgradeApp.cs

@@ -19,18 +19,15 @@ namespace AmazTool
                 return;
             }
 
+            Console.WriteLine("Try to end the process(尝试结束进程).");
             try
             {
-                Process[] existing = Process.GetProcessesByName(V2rayN);
+                var path = GetPath(V2rayN);
-                foreach (Process p in existing)
+                Console.WriteLine(path);
-                {
+                var existing = Process.GetProcessesByName(V2rayN);
-                    var path = p.MainModule?.FileName ?? "";
+                var pp = existing.FirstOrDefault(p => p.MainModule?.FileName != null && p.MainModule?.FileName == path);
-                    if (path.StartsWith(GetPath(V2rayN)))
+                pp?.Kill();
-                    {
+                pp?.WaitForExit(1000);
-                        p.Kill();
-                        p.WaitForExit(100);
-                    }
-                }
             }
             catch (Exception ex)
             {
@@ -39,6 +36,7 @@ namespace AmazTool
                     "Close it manually, or the upgrade may fail.(请手动关闭正在运行的v2rayN，否则可能升级失败。\n\n" + ex.StackTrace);
             }
 
+            Console.WriteLine("Start extracting files(开始解压文件).");
             StringBuilder sb = new();
             try
             {
@@ -84,13 +82,12 @@ namespace AmazTool
             }
             if (sb.Length > 0)
             {
-                Console.WriteLine("Upgrade Failed.\n" +
+                Console.WriteLine("Upgrade Failed(升级失败)." + sb.ToString());
-                    "(升级失败)." + sb.ToString());
                 return;
             }
 
             Console.WriteLine("Start v2rayN, please wait...(正在重启，请等待)");
-            Thread.Sleep(3000);
+            Thread.Sleep(9000);
             Process process = new()
             {
                 StartInfo = new()

v2rayN/ServiceLib/Handler/AppHandler.cs

@@ -159,7 +159,7 @@
             await ConfigHandler.SetDefaultServer(_config, lstModel);
 
             var lstServerStat = (_config.GuiItem.EnableStatistics ? StatisticsHandler.Instance.ServerStat : null) ?? [];
-            var lstProfileExs = ProfileExHandler.Instance.ProfileExs;
+            var lstProfileExs = await ProfileExHandler.Instance.GetProfileExs();
             lstModel = (from t in lstModel
                         join t2 in lstServerStat on t.IndexId equals t2.IndexId into t2b
                         from t22 in t2b.DefaultIfEmpty()

v2rayN/ServiceLib/Handler/ClashApiHandler.cs

@@ -28,7 +28,7 @@ namespace ServiceLib.Handler
                     return new Tuple<ClashProxies, ClashProviders>(clashProxies, clashProviders);
                 }
 
-                await Task.Delay(5000);
+                await Task.Delay(2000);
             }
 
             return null;

v2rayN/ServiceLib/Handler/ConfigHandler.cs

@@ -746,7 +746,7 @@ namespace ServiceLib.Handler
             {
                 return -1;
             }
-            var lstProfileExs = ProfileExHandler.Instance.ProfileExs;
+            var lstProfileExs = await ProfileExHandler.Instance.GetProfileExs();
             var lstProfile = (from t in lstModel
                               join t3 in lstProfileExs on t.IndexId equals t3.IndexId into t3b
                               from t33 in t3b.DefaultIfEmpty()

v2rayN/ServiceLib/Handler/CoreConfigHandler.cs

@@ -12,18 +12,12 @@
 
             if (node.ConfigType == EConfigType.Custom)
             {
-                if (node.CoreType is ECoreType.mihomo)
+                result = node.CoreType switch
                 {
-                    result = await new CoreConfigClashService(config).GenerateClientCustomConfig(node, fileName);
+                    ECoreType.mihomo => await new CoreConfigClashService(config).GenerateClientCustomConfig(node, fileName),
-                }
+                    ECoreType.sing_box => await new CoreConfigSingboxService(config).GenerateClientCustomConfig(node, fileName),
-                if (node.CoreType is ECoreType.sing_box)
+                    _ => await GenerateClientCustomConfig(node, fileName)
-                {
+                };
-                    result = await new CoreConfigSingboxService(config).GenerateClientCustomConfig(node, fileName);
-                }
-                else
-                {
-                    result = await GenerateClientCustomConfig(node, fileName);
-                }
             }
             else if (AppHandler.Instance.GetCoreType(node, node.ConfigType) == ECoreType.sing_box)
             {

v2rayN/ServiceLib/Handler/CoreHandler.cs

@@ -30,6 +30,10 @@ namespace ServiceLib.Handler
                 {
                     if (it.CoreType == ECoreType.v2rayN)
                     {
+                        if (Utils.UpgradeAppExists(out var fileName))
+                        {
+                            await Utils.SetLinuxChmod(fileName);
+                        }
                         continue;
                     }
 

v2rayN/ServiceLib/Handler/ProfileExHandler.cs

@@ -9,27 +9,31 @@ namespace ServiceLib.Handler
         private static readonly Lazy<ProfileExHandler> _instance = new(() => new());
         private ConcurrentBag<ProfileExItem> _lstProfileEx = [];
         private Queue<string> _queIndexIds = new();
-        public ConcurrentBag<ProfileExItem> ProfileExs => _lstProfileEx;
         public static ProfileExHandler Instance => _instance.Value;
 
         public ProfileExHandler()
         {
-            Init();
+            //Init();
         }
 
-        private async Task Init()
+        public async Task Init()
         {
             await InitData();
-            await Task.Run(async () =>
+            Task.Run(async () =>
             {
                 while (true)
                 {
-                    await SaveQueueIndexIds();
                     await Task.Delay(1000 * 600);
+                    await SaveQueueIndexIds();
                 }
             });
         }
 
+        public async Task<ConcurrentBag<ProfileExItem>> GetProfileExs()
+        {
+            return _lstProfileEx;
+        }
+
         private async Task InitData()
         {
             await SQLiteHelper.Instance.ExecuteAsync($"delete from ProfileExItem where indexId not in ( select indexId from ProfileItem )");

v2rayN/ServiceLib/ServiceLib.csproj

@@ -4,7 +4,7 @@
 	<TargetFramework>net8.0</TargetFramework>
 	<ImplicitUsings>enable</ImplicitUsings>
 	<Nullable>enable</Nullable>
-	<Version>7.0.1</Version>
+	<Version>7.0.2</Version>
   </PropertyGroup>
 
 	<ItemGroup>

v2rayN/ServiceLib/ViewModels/CheckUpdateViewModel.cs

@@ -45,12 +45,16 @@ namespace ServiceLib.ViewModels
 
             if (RuntimeInformation.ProcessArchitecture != Architecture.X86)
             {
-                _checkUpdateItem.Add(new CheckUpdateItem()
+                if (Utils.IsWindows())
                 {
-                    IsSelected = false,
+                    _checkUpdateItem.Add(new CheckUpdateItem()
-                    CoreType = _v2rayN,
+                    {
-                    Remarks = ResUI.menuCheckUpdate,
+                        IsSelected = false,
-                });
+                        CoreType = _v2rayN,
+                        Remarks = ResUI.menuCheckUpdate,
+                    });
+                }
+
                 _checkUpdateItem.Add(new CheckUpdateItem()
                 {
                     IsSelected = true,

v2rayN/ServiceLib/ViewModels/ClashProxiesViewModel.cs

@@ -96,7 +96,7 @@ namespace ServiceLib.ViewModels
         private async Task Init()
         {
             await ProxiesReload();
-            await DelayTestTask();
+            DelayTestTask();
         }
 
         private async Task DoRulemodeSelected(bool c)
@@ -434,25 +434,29 @@ namespace ServiceLib.ViewModels
         public async Task DelayTestTask()
         {
             var lastTime = DateTime.Now;
+            Task.Run(async () =>
+            {
+                while (true)
+                {
+                    await Task.Delay(1000 * 60);
 
-            Observable.Interval(TimeSpan.FromSeconds(60))
+                    if (!(AutoRefresh && _config.UiItem.ShowInTaskbar && _config.IsRunningCore(ECoreType.sing_box)))
-              .Subscribe(async x =>
+                    {
-              {
+                        continue;
-                  if (!(AutoRefresh && _config.UiItem.ShowInTaskbar && _config.IsRunningCore(ECoreType.sing_box)))
+                    }
-                  {
+                    if (_config.ClashUIItem.ProxiesAutoDelayTestInterval <= 0)
-                      return;
+                    {
-                  }
+                        continue;
-                  var dtNow = DateTime.Now;
+                    }
-                  if (_config.ClashUIItem.ProxiesAutoDelayTestInterval > 0)
+                    var dtNow = DateTime.Now;
-                  {
+                    if ((dtNow - lastTime).Minutes % _config.ClashUIItem.ProxiesAutoDelayTestInterval != 0)
-                      if ((dtNow - lastTime).Minutes % _config.ClashUIItem.ProxiesAutoDelayTestInterval == 0)
+                    {
-                      {
+                        continue;
-                          await ProxiesDelayTest();
+                    }
-                          lastTime = dtNow;
+                    await ProxiesDelayTest();
-                      }
+                    lastTime = dtNow;
-                      Task.Delay(1000).Wait();
+                }
-                  }
+            });
-              });
         }
 
         #endregion task

v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs

@@ -208,6 +208,7 @@ namespace ServiceLib.ViewModels
 
             await ConfigHandler.InitBuiltinRouting(_config);
             await ConfigHandler.InitBuiltinDNS(_config);
+            await ProfileExHandler.Instance.Init();
             await CoreHandler.Instance.Init(_config, UpdateHandler);
             TaskHandler.Instance.RegUpdateTask(_config, UpdateTaskHandler);
 

v2rayN/ServiceLib/ViewModels/StatusBarViewModel.cs

@@ -104,6 +104,18 @@ namespace ServiceLib.ViewModels
         public StatusBarViewModel(Func<EViewAction, object?, Task<bool>>? updateView)
         {
             _config = AppHandler.Instance.Config;
+            SelectedRouting = new();
+            SelectedServer = new();
+            RunningServerToolTipText = "-";
+
+            if (_config.TunModeItem.EnableTun && AppHandler.Instance.IsAdministrator)
+            {
+                EnableTun = true;
+            }
+            else
+            {
+                _config.TunModeItem.EnableTun = EnableTun = false;
+            }
 
             #region WhenAnyValue && ReactiveCommand
 
@@ -179,19 +191,6 @@ namespace ServiceLib.ViewModels
 
         private async Task Init()
         {
-            SelectedRouting = new();
-            SelectedServer = new();
-            RunningServerToolTipText = "-";
-
-            if (_config.TunModeItem.EnableTun && AppHandler.Instance.IsAdministrator)
-            {
-                EnableTun = true;
-            }
-            else
-            {
-                _config.TunModeItem.EnableTun = EnableTun = false;
-            }
-
             await RefreshRoutingsMenu();
             await InboundDisplayStatus();
             await ChangeSystemProxyAsync(_config.SystemProxyItem.SysProxyType, true);

v2rayN/v2rayN.Desktop/Views/ClashProxiesView.axaml

@@ -161,10 +161,7 @@
                                         <RowDefinition Height="8" />
                                         <RowDefinition Height="1*" />
                                     </Grid.RowDefinitions>
-                                    <TextBlock
+                                    <TextBlock Grid.Row="0" Text="{Binding Name}" />
-                                        Grid.Row="0"
-                                        Text="{Binding Name}"
-                                        TextWrapping="WrapWithOverflow" />
                                     <DockPanel Grid.Row="2">
                                         <TextBlock
                                             DockPanel.Dock="Right"

v2rayN/v2rayN.Desktop/v2rayN.Desktop.csproj

@@ -8,6 +8,7 @@
         <BuiltInComInteropSupport>true</BuiltInComInteropSupport>
 	    <Copyright>Copyright © 2017-2024 (GPLv3)</Copyright>
         <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
+        <AssemblyName>v2rayN</AssemblyName>
     </PropertyGroup>
 
     <ItemGroup>

v2rayN/v2rayN/Views/MainWindow.xaml.cs

@@ -284,6 +284,8 @@ namespace v2rayN.Views
                 switch (e.Key)
                 {
                     case Key.V:
+                        if (_backupAndRestoreView?.IsVisible == true) return;
+
                         var clipboardData = WindowsUtils.GetClipboardData();
                         ViewModel?.AddServerViaClipboardAsync(clipboardData);
                         break;