Code optimization, function asynchrony

2dust · 2dust · commit b3c2084b76a6 · 2024-10-22T17:50:42.000+08:00
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>

Original file line number	Diff line number	Diff line change
`@@ -14,9 +14,14 @@ public class ProfileExHandler`
`14`	`14`
`15`	`15`	`public ProfileExHandler()`
`16`	`16`	`{`
	`17`	`+ Init();`
	`18`	`+ }`
	`19`	`+`
	`20`	`+ private async Task Init()`
	`21`	`+ {`
	`22`	`+ await InitData();`
`17`	`23`	`Task.Run(async () =>`
`18`	`24`	`{`
`19`		`- await Init();`
`20`	`25`	`while (true)`
`21`	`26`	`{`
`22`	`27`	`await SaveQueueIndexIds();`
`@@ -25,7 +30,7 @@ public ProfileExHandler()`
`25`	`30`	`});`
`26`	`31`	`}`
`27`	`32`
`28`		`- private async Task Init()`
	`33`	`+ private async Task InitData()`
`29`	`34`	`{`
`30`	`35`	`await SQLiteHelper.Instance.ExecuteAsync($"delete from ProfileExItem where indexId not in ( select indexId from ProfileItem )");`
`31`	`36`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ public class StatisticsHandler`
`14`	`14`
`15`	`15`	`public List<ServerStatItem> ServerStat => _lstServerStat;`
`16`	`16`
`17`		`- public void Init(Config config, Action<ServerSpeedItem> updateFunc)`
	`17`	`+ public async Task Init(Config config, Action<ServerSpeedItem> updateFunc)`
`18`	`18`	`{`
`19`	`19`	`_config = config;`
`20`	`20`	`_updateFunc = updateFunc;`
`@@ -23,7 +23,7 @@ public void Init(Config config, Action<ServerSpeedItem> updateFunc)`
`23`	`23`	`return;`
`24`	`24`	`}`
`25`	`25`
`26`		`- InitData();`
	`26`	`+ await InitData();`
`27`	`27`
`28`	`28`	`_statisticsV2Ray = new StatisticsV2rayService(config, UpdateServerStatHandler);`
`29`	`29`	`_statisticsSingbox = new StatisticsSingboxService(config, UpdateServerStatHandler);`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ public async Task DownloadFileAsync(string url, string fileName, bool blProxy, i`
`59`	`59`	`UpdateCompleted?.Invoke(this, new RetResult(value > 100, $"...{value}%"));`
`60`	`60`	`};`
`61`	`61`
`62`		`- var webProxy = GetWebProxy(blProxy);`
	`62`	`+ var webProxy = await GetWebProxy(blProxy);`
`63`	`63`	`await DownloaderHelper.Instance.DownloadFileAsync(webProxy,`
`64`	`64`	`url,`
`65`	`65`	`fileName,`
`@@ -84,7 +84,7 @@ await DownloaderHelper.Instance.DownloadFileAsync(webProxy,`
`84`	`84`	`var webRequestHandler = new SocketsHttpHandler`
`85`	`85`	`{`
`86`	`86`	`AllowAutoRedirect = false,`
`87`		`- Proxy = GetWebProxy(blProxy)`
	`87`	`+ Proxy = await GetWebProxy(blProxy)`
`88`	`88`	`};`
`89`	`89`	`HttpClient client = new(webRequestHandler);`
`90`	`90`
`@@ -151,7 +151,7 @@ await DownloaderHelper.Instance.DownloadFileAsync(webProxy,`
`151`	`151`	`try`
`152`	`152`	`{`
`153`	`153`	`SetSecurityProtocol(AppHandler.Instance.Config.guiItem.enableSecurityProtocolTls13);`
`154`		`- var webProxy = GetWebProxy(blProxy);`
	`154`	`+ var webProxy = await GetWebProxy(blProxy);`
`155`	`155`	`var client = new HttpClient(new SocketsHttpHandler()`
`156`	`156`	`{`
`157`	`157`	`Proxy = webProxy,`
`@@ -197,7 +197,7 @@ await DownloaderHelper.Instance.DownloadFileAsync(webProxy,`
`197`	`197`	`{`
`198`	`198`	`SetSecurityProtocol(AppHandler.Instance.Config.guiItem.enableSecurityProtocolTls13);`
`199`	`199`
`200`		`- var webProxy = GetWebProxy(blProxy);`
	`200`	`+ var webProxy = await GetWebProxy(blProxy);`
`201`	`201`
`202`	`202`	`if (Utils.IsNullOrEmpty(userAgent))`
`203`	`203`	`{`
`@@ -222,7 +222,7 @@ public async Task<int> RunAvailabilityCheck(IWebProxy? webProxy)`
`222`	`222`	`{`
`223`	`223`	`try`
`224`	`224`	`{`
`225`		`- webProxy ??= GetWebProxy(true);`
	`225`	`+ webProxy ??= await GetWebProxy(true);`
`226`	`226`
`227`	`227`	`try`
`228`	`228`	`{`
`@@ -274,28 +274,28 @@ public async Task<int> GetRealPingTime(string url, IWebProxy? webProxy, int down`
`274`	`274`	`return responseTime;`
`275`	`275`	`}`
`276`	`276`
`277`		`- private WebProxy? GetWebProxy(bool blProxy)`
	`277`	`+ private async Task<WebProxy?> GetWebProxy(bool blProxy)`
`278`	`278`	`{`
`279`	`279`	`if (!blProxy)`
`280`	`280`	`{`
`281`	`281`	`return null;`
`282`	`282`	`}`
`283`	`283`	`var httpPort = AppHandler.Instance.GetLocalPort(EInboundProtocol.http);`
`284`		`- if (!SocketCheck(Global.Loopback, httpPort))`
	`284`	`+ if (await SocketCheck(Global.Loopback, httpPort) == false)`
`285`	`285`	`{`
`286`	`286`	`return null;`
`287`	`287`	`}`
`288`	`288`
`289`	`289`	`return new WebProxy(Global.Loopback, httpPort);`
`290`	`290`	`}`
`291`	`291`
`292`		`- private bool SocketCheck(string ip, int port)`
	`292`	`+ private async Task<bool> SocketCheck(string ip, int port)`
`293`	`293`	`{`
`294`	`294`	`try`
`295`	`295`	`{`
`296`	`296`	`IPEndPoint point = new(IPAddress.Parse(ip), port);`
`297`	`297`	`using Socket? sock = new(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);`
`298`		`- sock.Connect(point);`
	`298`	`+ await sock.ConnectAsync(point);`
`299`	`299`	`return true;`
`300`	`300`	`}`
`301`	`301`	`catch (Exception)`
Original file line number	Diff line number	Diff line change
`@@ -99,11 +99,11 @@ private async Task RunTcping()`
`99`	`99`	`{`
`100`	`100`	`continue;`
`101`	`101`	`}`
`102`		`- tasks.Add(Task.Run(() =>`
	`102`	`+ tasks.Add(Task.Run(async () =>`
`103`	`103`	`{`
`104`	`104`	`try`
`105`	`105`	`{`
`106`		`- int time = GetTcpingTime(it.Address, it.Port);`
	`106`	`+ int time = await GetTcpingTime(it.Address, it.Port);`
`107`	`107`	`var output = FormatOut(time, Global.DelayUnit);`
`108`	`108`
`109`	`109`	`ProfileExHandler.Instance.SetTestDelay(it.IndexId, output);`
`@@ -336,7 +336,7 @@ private async Task<string> GetRealPingTime(DownloadService downloadHandle, IWebP`
`336`	`336`	`return FormatOut(responseTime, Global.DelayUnit);`
`337`	`337`	`}`
`338`	`338`
`339`		`- private int GetTcpingTime(string url, int port)`
	`339`	`+ private async Task<int> GetTcpingTime(string url, int port)`
`340`	`340`	`{`
`341`	`341`	`int responseTime = -1;`
`342`	`342`
`@@ -370,10 +370,6 @@ private int GetTcpingTime(string url, int port)`
`370`	`370`
`371`	`371`	`private string FormatOut(object time, string unit)`
`372`	`372`	`{`
`373`		`- //if (time.ToString().Equals("-1"))`
`374`		`- //{`
`375`		`- // return "Timeout";`
`376`		`- //}`
`377`	`373`	`return $"{time}";`
`378`	`374`	`}`
`379`	`375`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ public StatisticsSingboxService(Config config, Action<ServerSpeedItem> updateFun`
`17`	`17`	`_updateFunc = updateFunc;`
`18`	`18`	`_exitFlag = false;`
`19`	`19`
`20`		`- Task.Run(() => Run());`
	`20`	`+ Task.Run(Run);`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`private async void Init()`
Original file line number	Diff line number	Diff line change
`@@ -213,7 +213,7 @@ private async Task Init()`
`213`	`213`
`214`	`214`	`if (_config.guiItem.enableStatistics)`
`215`	`215`	`{`
`216`		`- StatisticsHandler.Instance.Init(_config, UpdateStatisticsHandler);`
	`216`	`+ await StatisticsHandler.Instance.Init(_config, UpdateStatisticsHandler);`
`217`	`217`	`}`
`218`	`218`
`219`	`219`	`await Reload();`