Code optimization, function asynchrony

lowercase78 · Oct 22, 2024 · b3c2084 · b3c2084
1 parent 3bf2dc7
commit b3c2084
Show file tree

Hide file tree

Showing 10 changed files with 28 additions and 31 deletions.
diff --git a/v2rayN/ServiceLib/Handler/ProfileExHandler.cs b/v2rayN/ServiceLib/Handler/ProfileExHandler.cs
@@ -14,9 +14,14 @@ public class ProfileExHandler
 
         public ProfileExHandler()
         {
+            Init();
+        }
+
+        private async Task Init()
+        {
+            await InitData();
             Task.Run(async () =>
             {
-                await Init();
                 while (true)
                 {
                     await SaveQueueIndexIds();
@@ -25,7 +30,7 @@ public ProfileExHandler()
             });
         }
 
-        private async Task Init()
+        private async Task InitData()
         {
             await SQLiteHelper.Instance.ExecuteAsync($"delete from ProfileExItem where indexId not in ( select indexId from ProfileItem )");
 

diff --git a/v2rayN/ServiceLib/Handler/StatisticsHandler.cs b/v2rayN/ServiceLib/Handler/StatisticsHandler.cs
@@ -14,7 +14,7 @@ public class StatisticsHandler
 
         public List<ServerStatItem> ServerStat => _lstServerStat;
 
-        public void Init(Config config, Action<ServerSpeedItem> updateFunc)
+        public async Task Init(Config config, Action<ServerSpeedItem> updateFunc)
         {
             _config = config;
             _updateFunc = updateFunc;
@@ -23,7 +23,7 @@ public void Init(Config config, Action<ServerSpeedItem> updateFunc)
                 return;
             }
 
-            InitData();
+            await InitData();
 
             _statisticsV2Ray = new StatisticsV2rayService(config, UpdateServerStatHandler);
             _statisticsSingbox = new StatisticsSingboxService(config, UpdateServerStatHandler);

diff --git a/v2rayN/ServiceLib/Handler/TaskHandler.cs b/v2rayN/ServiceLib/Handler/TaskHandler.cs
@@ -5,10 +5,6 @@ public class TaskHandler
         private static readonly Lazy<TaskHandler> _instance = new(() => new());
         public static TaskHandler Instance => _instance.Value;
 
-        public TaskHandler()
-        {
-        }
-
         public void RegUpdateTask(Config config, Action<bool, string> updateFunc)
         {
             Task.Run(() => UpdateTaskRunSubscription(config, updateFunc));

diff --git a/v2rayN/ServiceLib/Services/DownloadService.cs b/v2rayN/ServiceLib/Services/DownloadService.cs
@@ -59,7 +59,7 @@ public async Task DownloadFileAsync(string url, string fileName, bool blProxy, i
                     UpdateCompleted?.Invoke(this, new RetResult(value > 100, $"...{value}%"));
                 };
 
-                var webProxy = GetWebProxy(blProxy);
+                var webProxy = await GetWebProxy(blProxy);
                 await DownloaderHelper.Instance.DownloadFileAsync(webProxy,
                     url,
                     fileName,
@@ -84,7 +84,7 @@ await DownloaderHelper.Instance.DownloadFileAsync(webProxy,
             var webRequestHandler = new SocketsHttpHandler
             {
                 AllowAutoRedirect = false,
-                Proxy = GetWebProxy(blProxy)
+                Proxy = await GetWebProxy(blProxy)
             };
             HttpClient client = new(webRequestHandler);
 
@@ -151,7 +151,7 @@ await DownloaderHelper.Instance.DownloadFileAsync(webProxy,
             try
             {
                 SetSecurityProtocol(AppHandler.Instance.Config.guiItem.enableSecurityProtocolTls13);
-                var webProxy = GetWebProxy(blProxy);
+                var webProxy = await GetWebProxy(blProxy);
                 var client = new HttpClient(new SocketsHttpHandler()
                 {
                     Proxy = webProxy,
@@ -197,7 +197,7 @@ await DownloaderHelper.Instance.DownloadFileAsync(webProxy,
             {
                 SetSecurityProtocol(AppHandler.Instance.Config.guiItem.enableSecurityProtocolTls13);
 
-                var webProxy = GetWebProxy(blProxy);
+                var webProxy = await GetWebProxy(blProxy);
 
                 if (Utils.IsNullOrEmpty(userAgent))
                 {
@@ -222,7 +222,7 @@ public async Task<int> RunAvailabilityCheck(IWebProxy? webProxy)
         {
             try
             {
-                webProxy ??= GetWebProxy(true);
+                webProxy ??= await GetWebProxy(true);
 
                 try
                 {
@@ -274,28 +274,28 @@ public async Task<int> GetRealPingTime(string url, IWebProxy? webProxy, int down
             return responseTime;
         }
 
-        private WebProxy? GetWebProxy(bool blProxy)
+        private async Task<WebProxy?> GetWebProxy(bool blProxy)
         {
             if (!blProxy)
             {
                 return null;
             }
             var httpPort = AppHandler.Instance.GetLocalPort(EInboundProtocol.http);
-            if (!SocketCheck(Global.Loopback, httpPort))
+            if (await SocketCheck(Global.Loopback, httpPort) == false)
             {
                 return null;
             }
 
             return new WebProxy(Global.Loopback, httpPort);
         }
 
-        private bool SocketCheck(string ip, int port)
+        private async Task<bool> SocketCheck(string ip, int port)
         {
             try
             {
                 IPEndPoint point = new(IPAddress.Parse(ip), port);
                 using Socket? sock = new(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
-                sock.Connect(point);
+                await sock.ConnectAsync(point);
                 return true;
             }
             catch (Exception)

diff --git a/v2rayN/ServiceLib/Services/SpeedtestService.cs b/v2rayN/ServiceLib/Services/SpeedtestService.cs
@@ -99,11 +99,11 @@ private async Task RunTcping()
                     {
                         continue;
                     }
-                    tasks.Add(Task.Run(() =>
+                    tasks.Add(Task.Run(async () =>
                     {
                         try
                         {
-                            int time = GetTcpingTime(it.Address, it.Port);
+                            int time = await GetTcpingTime(it.Address, it.Port);
                             var output = FormatOut(time, Global.DelayUnit);
 
                             ProfileExHandler.Instance.SetTestDelay(it.IndexId, output);
@@ -336,7 +336,7 @@ private async Task<string> GetRealPingTime(DownloadService downloadHandle, IWebP
             return FormatOut(responseTime, Global.DelayUnit);
         }
 
-        private int GetTcpingTime(string url, int port)
+        private async Task<int> GetTcpingTime(string url, int port)
         {
             int responseTime = -1;
 
@@ -370,10 +370,6 @@ private int GetTcpingTime(string url, int port)
 
         private string FormatOut(object time, string unit)
         {
-            //if (time.ToString().Equals("-1"))
-            //{
-            //    return "Timeout";
-            //}
             return $"{time}";
         }
 

diff --git a/v2rayN/ServiceLib/Services/Statistics/StatisticsSingboxService.cs b/v2rayN/ServiceLib/Services/Statistics/StatisticsSingboxService.cs
@@ -17,7 +17,7 @@ public StatisticsSingboxService(Config config, Action<ServerSpeedItem> updateFun
             _updateFunc = updateFunc;
             _exitFlag = false;
 
-            Task.Run(() => Run());
+            Task.Run(Run);
         }
 
         private async void Init()

diff --git a/v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs b/v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs
@@ -213,7 +213,7 @@ private async Task Init()
 
             if (_config.guiItem.enableStatistics)
             {
-                StatisticsHandler.Instance.Init(_config, UpdateStatisticsHandler);
+                await StatisticsHandler.Instance.Init(_config, UpdateStatisticsHandler);
             }
 
             await Reload();

diff --git a/v2rayN/v2rayN/Views/BackupAndRestoreView.xaml b/v2rayN/v2rayN/Views/BackupAndRestoreView.xaml
@@ -30,7 +30,7 @@
                 Content="{x:Static resx:ResUI.menuClose}"
                 DockPanel.Dock="Right"
                 IsCancel="True"
-                Style="{StaticResource MaterialDesignFlatButton}" />
+                Style="{StaticResource DefButton}" />
 
             <TextBlock
                 x:Name="txtMsg"

diff --git a/v2rayN/v2rayN/Views/CheckUpdateView.xaml b/v2rayN/v2rayN/Views/CheckUpdateView.xaml
@@ -38,7 +38,7 @@
                 Margin="{StaticResource Margin8}"
                 Content="{x:Static resx:ResUI.menuCheckUpdate}"
                 IsDefault="True"
-                Style="{StaticResource MaterialDesignFlatButton}" />
+                Style="{StaticResource DefButton}" />
 
             <Button
                 Width="100"
@@ -47,7 +47,7 @@
                 Command="{x:Static materialDesign:DialogHost.CloseDialogCommand}"
                 Content="{x:Static resx:ResUI.menuClose}"
                 IsCancel="True"
-                Style="{StaticResource MaterialDesignFlatButton}" />
+                Style="{StaticResource DefButton}" />
         </StackPanel>
 
         <StackPanel>

diff --git a/v2rayN/v2rayN/Views/QrcodeView.xaml b/v2rayN/v2rayN/Views/QrcodeView.xaml
@@ -41,9 +41,9 @@
             Margin="{StaticResource Margin8}"
             HorizontalAlignment="Right"
             Command="{x:Static materialDesign:DialogHost.CloseDialogCommand}"
-            Content="{x:Static resx:ResUI.TbConfirm}"
+            Content="{x:Static resx:ResUI.menuClose}"
             IsCancel="True"
             IsDefault="True"
-            Style="{StaticResource MaterialDesignFlatButton}" />
+            Style="{StaticResource DefButton}" />
     </Grid>
 </UserControl>