Merge branch '2dust:master' into master

v2rayN/AmazTool/UpgradeApp.cs

@@ -22,12 +22,12 @@ namespace AmazTool
             Console.WriteLine("Try to end the process(尝试结束进程).");
             try
             {
-                var path = GetPath(V2rayN);
-                Console.WriteLine(path);
                 var existing = Process.GetProcessesByName(V2rayN);
-                var pp = existing.FirstOrDefault(p => p.MainModule?.FileName != null && p.MainModule?.FileName.Contains(path) == true);
+                foreach (var pp in existing)
-                pp?.Kill();
+                {
-                pp?.WaitForExit(1000);
+                    pp?.Kill();
+                    pp?.WaitForExit(1000);
+                }
             }
             catch (Exception ex)
             {

v2rayN/ServiceLib/Handler/AutoStartupHandler.cs

@@ -113,7 +113,14 @@ namespace ServiceLib.Handler
 
         private static async Task ClearTaskLinux()
         {
-            File.Delete(GetHomePathLinux());
+            try
+            {
+                File.Delete(GetHomePathLinux());
+            }
+            catch (Exception ex)
+            {
+                Logging.SaveLog(ex.Message, ex);
+            }
         }
 
         private static async Task SetTaskLinux()
@@ -127,8 +134,6 @@ namespace ServiceLib.Handler
                     Logging.SaveLog(linuxConfig);
 
                     var homePath = GetHomePathLinux();
-                    Directory.CreateDirectory(Path.GetDirectoryName(homePath));
-
                     await File.WriteAllTextAsync(homePath, linuxConfig);
                 }
             }
@@ -140,7 +145,9 @@ namespace ServiceLib.Handler
 
         private static string GetHomePathLinux()
         {
-            return Path.Combine(Utils.GetHomePath(), ".config", "autostart", $"{Global.AppName}.desktop");
+            var homePath = Path.Combine(Utils.GetHomePath(), ".config", "autostart", $"{Global.AppName}.desktop");
+            Directory.CreateDirectory(Path.GetDirectoryName(homePath));
+            return homePath;
         }
 
         #endregion Linux

v2rayN/ServiceLib/Handler/CoreHandler.cs

@@ -108,13 +108,11 @@ namespace ServiceLib.Handler
         {
             try
             {
-                bool hasProc = false;
                 if (_process != null)
                 {
                     await KillProcess(_process);
                     _process.Dispose();
                     _process = null;
-                    hasProc = true;
                 }
 
                 if (_processPre != null)
@@ -122,26 +120,6 @@ namespace ServiceLib.Handler
                     await KillProcess(_processPre);
                     _processPre.Dispose();
                     _processPre = null;
-                    hasProc = true;
-                }
-
-                if (!hasProc)
-                {
-                    var coreInfo = CoreInfoHandler.Instance.GetCoreInfo();
-                    foreach (var it in coreInfo)
-                    {
-                        if (it.CoreType == ECoreType.v2rayN)
-                        {
-                            continue;
-                        }
-                        foreach (var name in it.CoreExes)
-                        {
-                            var path = Utils.GetBinPath(Utils.GetExeName(name), it.CoreType.ToString());
-                            var existing = Process.GetProcessesByName(name);
-                            var pp = existing.FirstOrDefault(p => p.MainModule?.FileName != null && p.MainModule?.FileName.Contains(path) == true);
-                            await KillProcess(pp);
-                        }
-                    }
                 }
             }
             catch (Exception ex)

v2rayN/ServiceLib/Resx/ResUI.Designer.cs

@@ -870,6 +870,15 @@ namespace ServiceLib.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Are you sure to exit? 的本地化字符串。
+        /// </summary>
+        public static string menuExitTips {
+            get {
+                return ResourceManager.GetString("menuExitTips", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Export selected server for complete configuration 的本地化字符串。
         /// </summary>

v2rayN/ServiceLib/Resx/ResUI.resx

@@ -1363,4 +1363,7 @@
   <data name="TbSettingsCurrentFontFamilyLinuxTip" xml:space="preserve">
     <value>Install the font to the system and restart the settings</value>
   </data>
+  <data name="menuExitTips" xml:space="preserve">
+    <value>Are you sure to exit?</value>
+  </data>
 </root>

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

@@ -1360,4 +1360,7 @@
   <data name="TbSettingsCurrentFontFamilyLinuxTip" xml:space="preserve">
     <value>安装字体到系统中，重启设置</value>
   </data>
+  <data name="menuExitTips" xml:space="preserve">
+    <value>是否确定退出？</value>
+  </data>
 </root>

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

@@ -1240,4 +1240,7 @@
   <data name="TbSettingsCurrentFontFamilyLinuxTip" xml:space="preserve">
     <value>安裝字體到系統中，重新啟動設定</value>
   </data>
+  <data name="menuExitTips" xml:space="preserve">
+    <value>是否確定退出？</value>
+  </data>
 </root>

v2rayN/ServiceLib/ServiceLib.csproj

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

v2rayN/ServiceLib/Services/SpeedtestService.cs

@@ -2,6 +2,7 @@
 using System.Diagnostics;
 using System.Net;
 using System.Net.Sockets;
+
 namespace ServiceLib.Services
 {
     public class SpeedtestService
@@ -85,7 +86,7 @@ namespace ServiceLib.Services
 
         private void ExitLoop(string x)
         {
-            if(_exitLoop) return;
+            if (_exitLoop) return;
             _exitLoop = true;
             UpdateFunc("", ResUI.SpeedtestingStop);
         }

v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs

@@ -52,6 +52,8 @@ namespace ServiceLib.ViewModels
 
         public ReactiveCommand<Unit, Unit> ReloadCmd { get; }
 
+        public ReactiveCommand<Unit, Unit> ExitCmd { get; }
+
         [Reactive]
         public bool BlReloadEnabled { get; set; }
 
@@ -187,6 +189,11 @@ namespace ServiceLib.ViewModels
                 await Reload();
             });
 
+            ExitCmd = ReactiveCommand.CreateFromTask(async () =>
+            {
+                await Exit();
+            });
+
             RegionalPresetDefaultCmd = ReactiveCommand.CreateFromTask(async () =>
             {
                 await ApplyRegionalPreset(EPresetType.Default);
@@ -266,7 +273,7 @@ namespace ServiceLib.ViewModels
             try
             {
                 Locator.Current.GetService<StatusBarViewModel>()?.UpdateStatistics(update);
-                if ((update.ProxyUp + update.ProxyDown) > 0 && DateTime.Now.Second % 3 == 0)
+                if ((update.ProxyUp + update.ProxyDown) > 0 && DateTime.Now.Second % 9 == 0)
                 {
                     Locator.Current.GetService<ProfilesViewModel>()?.UpdateStatistics(update);
                 }
@@ -289,7 +296,7 @@ namespace ServiceLib.ViewModels
                 await ProfileExHandler.Instance.SaveTo();
                 await StatisticsHandler.Instance.SaveTo();
                 StatisticsHandler.Instance.Close();
-                CoreHandler.Instance.CoreStop();
+                await CoreHandler.Instance.CoreStop();
 
                 Logging.SaveLog("MyAppExit End");
             }
@@ -588,6 +595,16 @@ namespace ServiceLib.ViewModels
             }
         }
 
+        private async Task Exit()
+        {
+            if (await _updateView?.Invoke(EViewAction.ShowYesNo, null) == false)
+            {
+                return;
+            }
+
+            await MyAppExitAsync(false);
+        }
+
         #endregion core job
 
         #region Presets

v2rayN/ServiceLib/ViewModels/ProfilesViewModel.cs

@@ -686,7 +686,6 @@ namespace ServiceLib.ViewModels
             //ClearTestResult();
 
             _ = new SpeedtestService(_config, lstSelecteds, actionType, UpdateSpeedtestHandler);
-
         }
 
         public void ServerSpeedtestStop()

v2rayN/v2rayN.Desktop/App.axaml.cs

@@ -9,8 +9,6 @@ namespace v2rayN.Desktop;
 
 public partial class App : Application
 {
-    //public static EventWaitHandle ProgramStarted;
-
     public override void Initialize()
     {
         if (!AppHandler.Instance.InitApp())
@@ -32,7 +30,7 @@ public partial class App : Application
     {
         if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
         {
-            OnStartup(desktop.Args);
+            AppHandler.Instance.InitComponents();
 
             desktop.Exit += OnExit;
             desktop.MainWindow = new MainWindow();
@@ -41,22 +39,6 @@ public partial class App : Application
         base.OnFrameworkInitializationCompleted();
     }
 
-    private void OnStartup(string[]? Args)
-    {
-        var exePathKey = Utils.GetMd5(Utils.GetExePath());
-
-        var rebootas = (Args ?? new string[] { }).Any(t => t == Global.RebootAs);
-        //ProgramStarted = new EventWaitHandle(false, EventResetMode.AutoReset, exePathKey, out bool bCreatedNew);
-        //if (!rebootas && !bCreatedNew)
-        //{
-        //    ProgramStarted.Set();
-        //    Environment.Exit(0);
-        //    return;
-        //}
-
-        AppHandler.Instance.InitComponents();
-    }
-
     private void CurrentDomain_UnhandledException(object sender, UnhandledExceptionEventArgs e)
     {
         if (e.ExceptionObject != null)

v2rayN/v2rayN.Desktop/Program.cs

@@ -5,12 +5,44 @@ namespace v2rayN.Desktop;
 
 internal class Program
 {
+    public static EventWaitHandle ProgramStarted;
+
     // Initialization code. Don't use any Avalonia, third-party APIs or any
     // SynchronizationContext-reliant code before AppMain is called: things aren't initialized
     // yet and stuff might break.
     [STAThread]
-    public static void Main(string[] args) => BuildAvaloniaApp()
+    public static void Main(string[] args)
-        .StartWithClassicDesktopLifetime(args);
+    {
+        OnStartup(args);
+
+        BuildAvaloniaApp()
+            .StartWithClassicDesktopLifetime(args);
+    }
+
+    private static void OnStartup(string[]? Args)
+    {
+        if (Utils.IsWindows())
+        {
+            var exePathKey = Utils.GetMd5(Utils.GetExePath());
+            var rebootas = (Args ?? new string[] { }).Any(t => t == Global.RebootAs);
+            ProgramStarted = new EventWaitHandle(false, EventResetMode.AutoReset, exePathKey, out bool bCreatedNew);
+            if (!rebootas && !bCreatedNew)
+            {
+                ProgramStarted.Set();
+                Environment.Exit(0);
+                return;
+            }
+        }
+        else
+        {
+            _ = new Mutex(true, "v2rayN", out var bOnlyOneInstance);
+            if (!bOnlyOneInstance)
+            {
+                Environment.Exit(0);
+                return;
+            }
+        }
+    }
 
     // Avalonia configuration, don't remove; also used by visual designer.
     public static AppBuilder BuildAvaloniaApp()

v2rayN/v2rayN.Desktop/Views/MainWindow.axaml

@@ -114,7 +114,7 @@
                     <MenuItem x:Name="menuClose" Padding="8,0">
                         <MenuItem.Header>
                             <StackPanel Orientation="Horizontal">
-                                <TextBlock Text="{x:Static resx:ResUI.menuClose}" />
+                                <TextBlock Text="{x:Static resx:ResUI.menuExit}" />
                             </StackPanel>
                         </MenuItem.Header>
                     </MenuItem>

v2rayN/v2rayN.Desktop/Views/MainWindow.axaml.cs

@@ -7,6 +7,7 @@ using Avalonia.Interactivity;
 using Avalonia.ReactiveUI;
 using Avalonia.Threading;
 using DialogHostAvalonia;
+using MsBox.Avalonia.Enums;
 using ReactiveUI;
 using Splat;
 using System.ComponentModel;
@@ -29,13 +30,10 @@ namespace v2rayN.Desktop.Views
             _config = AppHandler.Instance.Config;
             _manager = new WindowNotificationManager(TopLevel.GetTopLevel(this)) { MaxItems = 3, Position = NotificationPosition.BottomRight };
 
-            //ThreadPool.RegisterWaitForSingleObject(App.ProgramStarted, OnProgramStarted, null, -1, false);
-
             this.Closing += MainWindow_Closing;
             this.KeyDown += MainWindow_KeyDown;
             menuSettingsSetUWP.Click += menuSettingsSetUWP_Click;
             menuPromotion.Click += menuPromotion_Click;
-            menuClose.Click += menuClose_Click;
             menuCheckUpdate.Click += MenuCheckUpdate_Click;
             menuBackupAndRestore.Click += MenuBackupAndRestore_Click;
 
@@ -82,6 +80,7 @@ namespace v2rayN.Desktop.Views
 
                 this.BindCommand(ViewModel, vm => vm.ReloadCmd, v => v.menuReload).DisposeWith(disposables);
                 this.OneWayBind(ViewModel, vm => vm.BlReloadEnabled, v => v.menuReload.IsEnabled).DisposeWith(disposables);
+                this.BindCommand(ViewModel, vm => vm.ExitCmd, v => v.menuClose).DisposeWith(disposables);
 
                 switch (_config.UiItem.MainGirdOrientation)
                 {
@@ -114,6 +113,8 @@ namespace v2rayN.Desktop.Views
             this.Title = $"{Utils.GetVersion()} - {(AppHandler.Instance.IsAdministrator ? ResUI.RunAsAdmin : ResUI.NotRunAsAdmin)}";
             if (Utils.IsWindows())
             {
+                ThreadPool.RegisterWaitForSingleObject(Program.ProgramStarted, OnProgramStarted, null, -1, false);
+
                 menuGlobalHotkeySetting.IsVisible = false;
             }
             else
@@ -158,7 +159,9 @@ namespace v2rayN.Desktop.Views
 
         private void OnProgramStarted(object state, bool timeout)
         {
-            ShowHideWindow(true);
+            Dispatcher.UIThread.Post(() =>
+                    ShowHideWindow(true),
+                DispatcherPriority.Default);
         }
 
         private void DelegateSnackMsg(string content)
@@ -240,6 +243,14 @@ namespace v2rayN.Desktop.Views
                        Locator.Current.GetService<ProfilesViewModel>()?.AutofitColumnWidthAsync(),
                         DispatcherPriority.Default);
                     break;
+
+                case EViewAction.ShowYesNo:
+                    if (await UI.ShowYesNo(this, ResUI.menuExitTips) == ButtonResult.No)
+                    {
+                        return false;
+                    }
+                    StorageUI();
+                    break;
             }
 
             return await Task.FromResult(true);
@@ -302,12 +313,6 @@ namespace v2rayN.Desktop.Views
             }
         }
 
-        private void menuClose_Click(object? sender, RoutedEventArgs e)
-        {
-            StorageUI();
-            ShowHideWindow(false);
-        }
-
         private void menuPromotion_Click(object? sender, RoutedEventArgs e)
         {
             Utils.ProcessStart($"{Utils.Base64Decode(Global.PromotionUrl)}?t={DateTime.Now.Ticks}");
@@ -374,8 +379,16 @@ namespace v2rayN.Desktop.Views
             }
             else
             {
-                this.Hide();
+                if (Utils.IsWindows())
+                {
+                    this.Hide();
+                }
+                else
+                {
+                    this.WindowState = WindowState.Minimized;
+                }
             }
+
             _config.UiItem.ShowInTaskbar = bl;
         }
 

v2rayN/v2rayN/Views/MainWindow.xaml.cs

@@ -367,17 +367,17 @@ namespace v2rayN.Views
             var bl = blShow ?? !_config.UiItem.ShowInTaskbar;
             if (bl)
             {
-                Application.Current.MainWindow.Show();
+                this?.Show();
-                if (Application.Current.MainWindow.WindowState == WindowState.Minimized)
+                if (this?.WindowState == WindowState.Minimized)
                 {
-                    Application.Current.MainWindow.WindowState = WindowState.Normal;
+                    this.WindowState = WindowState.Normal;
                 }
-                Application.Current.MainWindow.Activate();
+                this?.Activate();
-                Application.Current.MainWindow.Focus();
+                this?.Focus();
             }
             else
             {
-                Application.Current.MainWindow.Hide();
+                this?.Hide();
             }
             _config.UiItem.ShowInTaskbar = bl;
         }