Update 6.42

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

v2rayN/v2rayN/App.xaml.cs

@@ -2,7 +2,7 @@
 using System.Windows;
 using System.Windows.Threading;
 using v2rayN.Handler;
-using v2rayN.Model;
+using v2rayN.Models;
 
 namespace v2rayN
 {

v2rayN/v2rayN/Common/Utils.cs

@@ -1029,14 +1029,14 @@ namespace v2rayN
 
                 if (run)
                 {
-                    string exePath = $"\"{GetExePath()}\"";
+                    string exePath = GetExePath();
                     if (IsAdministrator())
                     {
                         AutoStart(autoRunName, exePath, "");
                     }
                     else
                     {
-                        RegWriteValue(AutoRunRegPath, autoRunName, exePath);
+                        RegWriteValue(AutoRunRegPath, autoRunName, exePath.AppendQuotes());
                     }
                 }
             }
@@ -1136,7 +1136,7 @@ namespace v2rayN
             task.Settings.ExecutionTimeLimit = TimeSpan.Zero;
             task.Triggers.Add(new LogonTrigger { UserId = logonUser, Delay = TimeSpan.FromSeconds(10) });
             task.Principal.RunLevel = TaskRunLevel.Highest;
-            task.Actions.Add(new ExecAction(deamonFileName, null, Path.GetDirectoryName(deamonFileName)));
+            task.Actions.Add(new ExecAction(deamonFileName.AppendQuotes(), null, Path.GetDirectoryName(deamonFileName)));
 
             taskService.RootFolder.RegisterTaskDefinition(TaskName, task);
         }

v2rayN/v2rayN/Global.cs

@@ -1,4 +1,4 @@
-using v2rayN.Model;
+using v2rayN.Models;
 
 namespace v2rayN
 {

v2rayN/v2rayN/Handler/ConfigHandler.cs

@@ -1,7 +1,7 @@
 using System.Data;
 using System.IO;
 using System.Text.RegularExpressions;
-using v2rayN.Model;
+using v2rayN.Models;
 
 namespace v2rayN.Handler
 {

v2rayN/v2rayN/Handler/CoreConfigHandler.cs

@@ -1,5 +1,5 @@
 using System.IO;
-using v2rayN.Model;
+using v2rayN.Models;
 using v2rayN.Resx;
 
 namespace v2rayN.Handler

v2rayN/v2rayN/Handler/CoreConfigSingbox.cs

@@ -1,6 +1,6 @@
 using System.Net;
 using System.Net.NetworkInformation;
-using v2rayN.Model;
+using v2rayN.Models;
 using v2rayN.Resx;
 
 namespace v2rayN.Handler

v2rayN/v2rayN/Handler/CoreConfigV2ray.cs

@@ -1,6 +1,6 @@
 using System.Net;
 using System.Net.NetworkInformation;
-using v2rayN.Model;
+using v2rayN.Models;
 using v2rayN.Resx;
 
 namespace v2rayN.Handler

v2rayN/v2rayN/Handler/CoreHandler.cs

@@ -2,7 +2,7 @@
 using System.IO;
 using System.Reactive.Linq;
 using System.Text;
-using v2rayN.Model;
+using v2rayN.Models;
 using v2rayN.Resx;
 
 namespace v2rayN.Handler

v2rayN/v2rayN/Handler/DownloadHandle.cs

@@ -4,7 +4,7 @@ using System.Net;
 using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Net.Sockets;
-using v2rayN.Model;
+using v2rayN.Models;
 using v2rayN.Resx;
 
 namespace v2rayN.Handler

v2rayN/v2rayN/Handler/HotkeyHandler.cs

@@ -4,7 +4,7 @@ using System.Text;
 using System.Windows;
 using System.Windows.Input;
 using System.Windows.Interop;
-using v2rayN.Model;
+using v2rayN.Models;
 using v2rayN.Resx;
 
 namespace v2rayN.Handler

v2rayN/v2rayN/Handler/LazyConfig.cs

@@ -1,5 +1,5 @@
 using System.Runtime.Intrinsics.X86;
-using v2rayN.Model;
+using v2rayN.Models;
 
 namespace v2rayN.Handler
 {

v2rayN/v2rayN/Handler/MainFormHandler.cs

@@ -3,7 +3,7 @@ using Splat;
 using System.Drawing;
 using System.IO;
 using System.Windows.Media.Imaging;
-using v2rayN.Model;
+using v2rayN.Models;
 using v2rayN.Resx;
 
 namespace v2rayN.Handler

v2rayN/v2rayN/Handler/ProfileExHandler.cs

@@ -1,6 +1,6 @@
 using System.Collections.Concurrent;
 using System.Reactive.Linq;
-using v2rayN.Model;
+using v2rayN.Models;
 
 namespace v2rayN.Handler
 {

v2rayN/v2rayN/Handler/ShareHandler.cs

@@ -1,6 +1,6 @@
 using System.Collections.Specialized;
 using System.Text.RegularExpressions;
-using v2rayN.Model;
+using v2rayN.Models;
 using v2rayN.Resx;
 
 namespace v2rayN.Handler

v2rayN/v2rayN/Handler/SpeedtestHandler.cs

@@ -2,7 +2,7 @@
 using System.Diagnostics;
 using System.Net;
 using System.Net.Sockets;
-using v2rayN.Model;
+using v2rayN.Models;
 using v2rayN.Resx;
 
 namespace v2rayN.Handler

v2rayN/v2rayN/Handler/StatisticsHandler.cs

@@ -1,4 +1,4 @@
-using v2rayN.Model;
+using v2rayN.Models;
 
 namespace v2rayN.Handler
 {

v2rayN/v2rayN/Handler/StatisticsSingbox.cs

@@ -1,6 +1,6 @@
 using System.Net.WebSockets;
 using System.Text;
-using v2rayN.Model;
+using v2rayN.Models;
 
 namespace v2rayN.Handler
 {
@@ -61,6 +61,7 @@ namespace v2rayN.Handler
 
             while (!_exitFlag)
             {
+                await Task.Delay(1000);
                 try
                 {
                     if (!(_config.runningCoreType is ECoreType.sing_box or ECoreType.clash or ECoreType.clash_meta or ECoreType.mihomo))
@@ -105,10 +106,6 @@ namespace v2rayN.Handler
                 catch
                 {
                 }
-                finally
-                {
-                    await Task.Delay(1000);
-                }
             }
         }
 

v2rayN/v2rayN/Handler/StatisticsV2ray.cs

@@ -1,19 +1,19 @@
 using Grpc.Core;
 using Grpc.Net.Client;
 using ProtosLib.Statistics;
-using v2rayN.Model;
+using v2rayN.Models;
 
 namespace v2rayN.Handler
 {
     internal class StatisticsV2ray
     {
-        private Model.Config _config;
+        private Models.Config _config;
         private GrpcChannel? _channel;
         private StatsService.StatsServiceClient? _client;
         private bool _exitFlag;
         private Action<ServerSpeedItem> _updateFunc;
 
-        public StatisticsV2ray(Model.Config config, Action<ServerSpeedItem> update)
+        public StatisticsV2ray(Models.Config config, Action<ServerSpeedItem> update)
         {
             _config = config;
             _updateFunc = update;
@@ -49,6 +49,7 @@ namespace v2rayN.Handler
         {
             while (!_exitFlag)
             {
+                await Task.Delay(1000);
                 try
                 {
                     if (!(_config.runningCoreType is ECoreType.Xray or ECoreType.v2fly or ECoreType.v2fly_v5 or ECoreType.SagerNet))
@@ -60,6 +61,7 @@ namespace v2rayN.Handler
                         QueryStatsResponse? res = null;
                         try
                         {
+                            if (_client != null)
                                 res = await _client.QueryStatsAsync(new QueryStatsRequest() { Pattern = "", Reset = true });
                         }
                         catch
@@ -72,8 +74,8 @@ namespace v2rayN.Handler
                             _updateFunc(server);
                         }
                     }
-                    await Task.Delay(1000);
-                    if (_channel != null) await _channel.ConnectAsync();
+                    if (_channel != null)
+                        await _channel.ConnectAsync();
                 }
                 catch
                 {

v2rayN/v2rayN/Handler/SysProxyHandle.cs

@@ -1,5 +1,5 @@
 using PacLib;
-using v2rayN.Model;
+using v2rayN.Models;
 
 namespace v2rayN.Handler
 {

v2rayN/v2rayN/Handler/UpdateHandle.cs

@@ -6,7 +6,7 @@ using System.Runtime.InteropServices;
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Windows;
-using v2rayN.Model;
+using v2rayN.Models;
 using v2rayN.Resx;
 
 namespace v2rayN.Handler

v2rayN/v2rayN/Models/ComboItem.cs

@@ -1,4 +1,4 @@
-namespace v2rayN.Model
+namespace v2rayN.Models
 {
     public class ComboItem
     {

v2rayN/v2rayN/Models/Config.cs

@@ -1,4 +1,4 @@
-namespace v2rayN.Model
+namespace v2rayN.Models
 {
     /// <summary>
     /// 本软件配置文件实体类

v2rayN/v2rayN/Models/ConfigItems.cs

@@ -1,6 +1,6 @@
 using System.Windows.Input;
 
-namespace v2rayN.Model
+namespace v2rayN.Models
 {
     [Serializable]
     public class CoreBasicItem

v2rayN/v2rayN/Models/ConfigOld.cs

@@ -1,4 +1,4 @@
-namespace v2rayN.Model
+namespace v2rayN.Models
 {
     [Serializable]
     public class ConfigOld

v2rayN/v2rayN/Models/CoreInfo.cs

@@ -1,4 +1,4 @@
-namespace v2rayN.Model
+namespace v2rayN.Models
 {
     [Serializable]
     public class CoreInfo

v2rayN/v2rayN/Models/DNSItem.cs

@@ -1,6 +1,6 @@
 using SQLite;
 
-namespace v2rayN.Model
+namespace v2rayN.Models
 {
     [Serializable]
     public class DNSItem

v2rayN/v2rayN/Models/EConfigType.cs

@@ -1,4 +1,4 @@
-namespace v2rayN.Model
+namespace v2rayN.Models
 {
     public enum EConfigType
     {

v2rayN/v2rayN/Models/ECoreType.cs

@@ -1,4 +1,4 @@
-namespace v2rayN.Model
+namespace v2rayN.Models
 {
     public enum ECoreType
     {

v2rayN/v2rayN/Models/EGlobalHotkey.cs

@@ -1,4 +1,4 @@
-namespace v2rayN.Model
+namespace v2rayN.Models
 {
     public enum EGlobalHotkey
     {

v2rayN/v2rayN/Models/EInboundProtocol.cs

@@ -1,4 +1,4 @@
-namespace v2rayN.Model
+namespace v2rayN.Models
 {
     public enum EInboundProtocol
     {

v2rayN/v2rayN/Models/EMove.cs

@@ -1,4 +1,4 @@
-namespace v2rayN.Model
+namespace v2rayN.Models
 {
     public enum EMove
     {

v2rayN/v2rayN/Models/EServerColName.cs

@@ -1,4 +1,4 @@
-namespace v2rayN.Model
+namespace v2rayN.Models
 {
     public enum EServerColName
     {

v2rayN/v2rayN/Models/ESpeedActionType.cs

@@ -1,4 +1,4 @@
-namespace v2rayN.Model
+namespace v2rayN.Models
 {
     public enum ESpeedActionType
     {

v2rayN/v2rayN/Models/ESysProxyType.cs

@@ -1,4 +1,4 @@
-namespace v2rayN.Model
+namespace v2rayN.Models
 {
     public enum ESysProxyType
     {

v2rayN/v2rayN/Models/ETransport.cs

@@ -1,4 +1,4 @@
-namespace v2rayN.Model
+namespace v2rayN.Models
 {
     public enum ETransport
     {

v2rayN/v2rayN/Models/EViewAction.cs

@@ -1,4 +1,4 @@
-namespace v2rayN.Model
+namespace v2rayN.Models
 {
     public enum EViewAction
     {

v2rayN/v2rayN/Models/GitHubRelease.cs

@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace v2rayN.Model
+namespace v2rayN.Models
 {
     public class GitHubReleaseAsset
     {

v2rayN/v2rayN/Models/ProfileExItem.cs

@@ -1,6 +1,6 @@
 using SQLite;
 
-namespace v2rayN.Model
+namespace v2rayN.Models
 {
     [Serializable]
     public class ProfileExItem

v2rayN/v2rayN/Models/ProfileItem.cs

@@ -1,6 +1,6 @@
 using SQLite;
 
-namespace v2rayN.Model
+namespace v2rayN.Models
 {
     [Serializable]
     public class ProfileItem

v2rayN/v2rayN/Models/ProfileItemModel.cs

@@ -1,4 +1,4 @@
-namespace v2rayN.Model
+namespace v2rayN.Models
 {
     [Serializable]
     public class ProfileItemModel : ProfileItem

v2rayN/v2rayN/Models/RoutingItem.cs

@@ -1,6 +1,6 @@
 using SQLite;
 
-namespace v2rayN.Model
+namespace v2rayN.Models
 {
     [Serializable]
     public class RoutingItem

v2rayN/v2rayN/Models/RoutingItemModel.cs

@@ -1,4 +1,4 @@
-namespace v2rayN.Model
+namespace v2rayN.Models
 {
     [Serializable]
     public class RoutingItemModel : RoutingItem

v2rayN/v2rayN/Models/RulesItem.cs

@@ -1,4 +1,4 @@
-namespace v2rayN.Model
+namespace v2rayN.Models
 {
     [Serializable]
     public class RulesItem

v2rayN/v2rayN/Models/RulesItemModel.cs

@@ -1,4 +1,4 @@
-namespace v2rayN.Model
+namespace v2rayN.Models
 {
     [Serializable]
     public class RulesItemModel : RulesItem

v2rayN/v2rayN/Models/ServerSpeedItem.cs

@@ -1,4 +1,4 @@
-namespace v2rayN.Model
+namespace v2rayN.Models
 {
     [Serializable]
     internal class ServerSpeedItem : ServerStatItem

v2rayN/v2rayN/Models/ServerStatItem.cs

@@ -1,6 +1,6 @@
 using SQLite;
 
-namespace v2rayN.Model
+namespace v2rayN.Models
 {
     [Serializable]
     public class ServerStatItem

v2rayN/v2rayN/Models/ServerTestItem.cs

@@ -1,4 +1,4 @@
-namespace v2rayN.Model
+namespace v2rayN.Models
 {
     [Serializable]
     internal class ServerTestItem

v2rayN/v2rayN/Models/SingboxConfig.cs

@@ -1,4 +1,4 @@
-namespace v2rayN.Model
+namespace v2rayN.Models
 {
     public class SingboxConfig
     {

v2rayN/v2rayN/Models/SsSIP008.cs

@@ -1,4 +1,4 @@
-namespace v2rayN.Model
+namespace v2rayN.Models
 {
     public class SsSIP008
     {

v2rayN/v2rayN/Models/SubItem.cs

@@ -1,6 +1,6 @@
 using SQLite;
 
-namespace v2rayN.Model
+namespace v2rayN.Models
 {
     [Serializable]
     public class SubItem

v2rayN/v2rayN/Models/SysProxyConfig.cs

@@ -1,4 +1,4 @@
-namespace v2rayN.Model
+namespace v2rayN.Models
 {
     internal class SysProxyConfig
     {

v2rayN/v2rayN/Models/V2rayConfig.cs

@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace v2rayN.Model
+namespace v2rayN.Models
 {
     /// <summary>
     /// v2ray配置文件实体类 例子SampleConfig.txt

v2rayN/v2rayN/Models/V2rayTcpRequest.cs

@@ -1,4 +1,4 @@
-namespace v2rayN.Model
+namespace v2rayN.Models
 {
     /// <summary>
     /// Tcp伪装http的Request，只要Host

v2rayN/v2rayN/Models/VmessQRCode.cs

@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace v2rayN.Model
+namespace v2rayN.Models
 {
     /// <summary>
     /// https://github.com/2dust/v2rayN/wiki/

v2rayN/v2rayN/ViewModels/AddServer2ViewModel.cs

@@ -6,7 +6,7 @@ using System.IO;
 using System.Reactive;
 using System.Windows;
 using v2rayN.Handler;
-using v2rayN.Model;
+using v2rayN.Models;
 using v2rayN.Resx;
 
 namespace v2rayN.ViewModels

v2rayN/v2rayN/ViewModels/AddServerViewModel.cs

@@ -4,7 +4,7 @@ using Splat;
 using System.Reactive;
 using System.Windows;
 using v2rayN.Handler;
-using v2rayN.Model;
+using v2rayN.Models;
 using v2rayN.Resx;
 
 namespace v2rayN.ViewModels

v2rayN/v2rayN/ViewModels/DNSSettingViewModel.cs

@@ -4,7 +4,7 @@ using Splat;
 using System.Reactive;
 using System.Windows;
 using v2rayN.Handler;
-using v2rayN.Model;
+using v2rayN.Models;
 using v2rayN.Resx;
 
 namespace v2rayN.ViewModels

v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs

@@ -15,7 +15,7 @@ using System.Text;
 using System.Windows;
 using System.Windows.Media;
 using v2rayN.Handler;
-using v2rayN.Model;
+using v2rayN.Models;
 using v2rayN.Resx;
 using v2rayN.Views;
 

v2rayN/v2rayN/ViewModels/OptionSettingViewModel.cs

@@ -4,7 +4,7 @@ using Splat;
 using System.Reactive;
 using System.Windows;
 using v2rayN.Handler;
-using v2rayN.Model;
+using v2rayN.Models;
 using v2rayN.Resx;
 
 namespace v2rayN.ViewModels

v2rayN/v2rayN/ViewModels/RoutingRuleDetailsViewModel.cs

@@ -4,7 +4,7 @@ using Splat;
 using System.Reactive;
 using System.Windows;
 using v2rayN.Handler;
-using v2rayN.Model;
+using v2rayN.Models;
 using v2rayN.Resx;
 
 namespace v2rayN.ViewModels

v2rayN/v2rayN/ViewModels/RoutingRuleSettingViewModel.cs

@@ -5,7 +5,7 @@ using Splat;
 using System.Reactive;
 using System.Windows;
 using v2rayN.Handler;
-using v2rayN.Model;
+using v2rayN.Models;
 using v2rayN.Resx;
 using v2rayN.Views;
 using Application = System.Windows.Application;

v2rayN/v2rayN/ViewModels/RoutingSettingViewModel.cs

@@ -5,7 +5,7 @@ using Splat;
 using System.Reactive;
 using System.Windows;
 using v2rayN.Handler;
-using v2rayN.Model;
+using v2rayN.Models;
 using v2rayN.Resx;
 using v2rayN.Views;
 

v2rayN/v2rayN/ViewModels/SubEditViewModel.cs

@@ -4,7 +4,7 @@ using Splat;
 using System.Reactive;
 using System.Windows;
 using v2rayN.Handler;
-using v2rayN.Model;
+using v2rayN.Models;
 using v2rayN.Resx;
 
 namespace v2rayN.ViewModels

v2rayN/v2rayN/ViewModels/SubSettingViewModel.cs

@@ -7,7 +7,7 @@ using Splat;
 using System.Reactive;
 using System.Windows;
 using v2rayN.Handler;
-using v2rayN.Model;
+using v2rayN.Models;
 using v2rayN.Resx;
 using v2rayN.Views;
 

v2rayN/v2rayN/Views/AddServer2Window.xaml.cs

@@ -1,7 +1,7 @@
 using ReactiveUI;
 using System.Reactive.Disposables;
 using System.Windows;
-using v2rayN.Model;
+using v2rayN.Models;
 using v2rayN.ViewModels;
 
 namespace v2rayN.Views

v2rayN/v2rayN/Views/AddServerWindow.xaml.cs

@@ -3,7 +3,7 @@ using System.Reactive.Disposables;
 using System.Windows;
 using System.Windows.Controls;
 using v2rayN.Handler;
-using v2rayN.Model;
+using v2rayN.Models;
 using v2rayN.Resx;
 using v2rayN.ViewModels;
 

v2rayN/v2rayN/Views/DNSSettingWindow.xaml.cs

@@ -2,7 +2,7 @@
 using System.Reactive.Disposables;
 using System.Windows;
 using v2rayN.Handler;
-using v2rayN.Model;
+using v2rayN.Models;
 using v2rayN.ViewModels;
 
 namespace v2rayN.Views

v2rayN/v2rayN/Views/GlobalHotkeySettingWindow.xaml.cs

@@ -3,7 +3,7 @@ using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
 using v2rayN.Handler;
-using v2rayN.Model;
+using v2rayN.Models;
 using v2rayN.Resx;
 
 namespace v2rayN.Views

v2rayN/v2rayN/Views/MainWindow.xaml.cs

@@ -11,7 +11,7 @@ using System.Windows.Interop;
 using System.Windows.Media;
 using v2rayN.Base;
 using v2rayN.Handler;
-using v2rayN.Model;
+using v2rayN.Models;
 using v2rayN.Resx;
 using v2rayN.ViewModels;
 using Point = System.Windows.Point;

v2rayN/v2rayN/Views/MsgView.xaml.cs

@@ -3,7 +3,7 @@ using System.Reactive.Linq;
 using System.Text.RegularExpressions;
 using System.Windows.Threading;
 using v2rayN.Handler;
-using v2rayN.Model;
+using v2rayN.Models;
 
 namespace v2rayN.Views
 {

v2rayN/v2rayN/Views/OptionSettingWindow.xaml.cs

@@ -5,7 +5,7 @@ using System.Reactive.Disposables;
 using System.Windows;
 using System.Windows.Media;
 using v2rayN.Handler;
-using v2rayN.Model;
+using v2rayN.Models;
 using v2rayN.ViewModels;
 
 namespace v2rayN.Views

v2rayN/v2rayN/Views/RoutingRuleDetailsWindow.xaml.cs

@@ -1,7 +1,7 @@
 using ReactiveUI;
 using System.Reactive.Disposables;
 using System.Windows;
-using v2rayN.Model;
+using v2rayN.Models;
 using v2rayN.ViewModels;
 
 namespace v2rayN.Views

v2rayN/v2rayN/Views/RoutingRuleSettingWindow.xaml.cs

@@ -2,7 +2,7 @@
 using System.Reactive.Disposables;
 using System.Windows;
 using System.Windows.Input;
-using v2rayN.Model;
+using v2rayN.Models;
 using v2rayN.ViewModels;
 
 namespace v2rayN.Views

v2rayN/v2rayN/Views/RoutingSettingWindow.xaml.cs

@@ -2,7 +2,7 @@
 using System.Reactive.Disposables;
 using System.Windows;
 using System.Windows.Input;
-using v2rayN.Model;
+using v2rayN.Models;
 using v2rayN.ViewModels;
 
 namespace v2rayN.Views

v2rayN/v2rayN/Views/SubEditWindow.xaml.cs

@@ -1,7 +1,7 @@
 using ReactiveUI;
 using System.Reactive.Disposables;
 using System.Windows;
-using v2rayN.Model;
+using v2rayN.Models;
 using v2rayN.ViewModels;
 
 namespace v2rayN.Views

v2rayN/v2rayN/Views/SubSettingWindow.xaml.cs

@@ -3,7 +3,7 @@ using System.ComponentModel;
 using System.Reactive.Disposables;
 using System.Windows;
 using System.Windows.Input;
-using v2rayN.Model;
+using v2rayN.Models;
 using v2rayN.ViewModels;
 
 namespace v2rayN.Views

v2rayN/v2rayN/v2rayN.csproj

@@ -10,7 +10,7 @@
 		<ImplicitUsings>enable</ImplicitUsings>
 		<ApplicationIcon>v2rayN.ico</ApplicationIcon>
 		<Copyright>Copyright © 2017-2024 (GPLv3)</Copyright>
-		<FileVersion>6.40</FileVersion>
+		<FileVersion>6.42</FileVersion>
 		<SupportedOSPlatformVersion>7.0</SupportedOSPlatformVersion>
 	</PropertyGroup>