优化同步调用异步

Author: nnhy

StarAgent/CommandHandler/ShowMachineInfo.cs

@@ -32,7 +32,7 @@ public override void Process(String[] args)
         XTrace.WriteLine("BasePath:{0}", ".".GetBasePath());
         XTrace.WriteLine("TempPath:{0}", Path.GetTempPath());
 
-        var mi = MachineInfo.Current ?? MachineInfo.RegisterAsync().Result;
+        var mi = MachineInfo.GetCurrent();
         mi.Refresh();
         var pis = mi.GetType().GetProperties(true);
 

StarAgent/CommandHandler/UseMicroService.cs

@@ -32,8 +32,7 @@ public override void Process(String[] args)
 
         service.StartFactory();
 
-        var models = service._factory.Service.ResolveAsync(serviceName).Result;
-        //if (models == null) models = _factory.Dust.ResolveAsync(new ConsumeServiceInfo { ServiceName = serviceName }).Result;
+        var models = service._factory.Service.ResolveAsync(serviceName).ConfigureAwait(false).GetAwaiter().GetResult();
 
         Console.WriteLine(models.ToJson(true));
     }

Stardust.Data/Configs/应用规则.Biz.cs

@@ -120,10 +120,10 @@ public static String CheckScope(Int32 appid, String ip, String localIp)
 
             var list = Meta.Cache.Entities.FindAll(e => e.Enable);
             list = list.Where(e =>
-            !e.Rule.IsNullOrEmpty() && /*e.Rule.StartsWithIgnoreCase("IP=") &&*/
-            !e.Result.IsNullOrEmpty() && e.Result.StartsWithIgnoreCase("Scope="))
-            .OrderByDescending(e => e.Priority)
-            .ToList();
+                !e.Rule.IsNullOrEmpty() && /*e.Rule.StartsWithIgnoreCase("IP=") &&*/
+                !e.Result.IsNullOrEmpty() && e.Result.StartsWithIgnoreCase("Scope="))
+                .OrderByDescending(e => e.Priority)
+                .ToList();
             if (list.Count == 0) return null;
 
             var rule = list.Where(e => e.Match(ip, localIp)).OrderByDescending(e => e.Priority).ThenByDescending(e => e.Id).FirstOrDefault();

Stardust.Extensions/Caches/CacheFileProvider.cs

@@ -219,7 +219,7 @@ public IDirectoryContents GetDirectoryContents(String subpath)
             {
                 var fi = fullPath.CombinePath(IndexInfoFile).GetBasePath().AsFile();
                 if (!fi.Exists)
-                    fi = DownloadDirectory(subpath, fi.FullName, svrs).Result?.AsFile();
+                    fi = DownloadDirectory(subpath, fi.FullName, svrs).ConfigureAwait(false).GetAwaiter().GetResult()?.AsFile();
                 else if (fi.LastWriteTime.AddDays(1) < DateTime.Now)
                     _ = Task.Run(() => DownloadDirectory(subpath, fi.FullName, svrs));
             }

Stardust.Server/Controllers/LogController.cs

@@ -20,11 +20,8 @@ public class LogController : ControllerBase
     [HttpPost]
     public async Task<EmptyResult> Post()
     {
-        //var buffer = Request.BodyReader.ReadAsync().Result.Buffer;
-        //var content = Encoding.UTF8.GetString(buffer.FirstSpan);
         var r = new StreamReader(Request.Body);
         var content = await r.ReadToEndAsync();
-        //var content = Request.Body.ToStr();
         if (!content.IsNullOrEmpty())
         {
             var appId = Request.Headers["X-AppId"] + "";

Stardust/Configs/StarHttpConfigProvider.cs

@@ -96,7 +96,7 @@ internal class StarHttpConfigProvider : HttpConfigProvider
             // 从注册中心获取服务
             if (Client is IRegistry registry)
             {
-                var addrs = registry.ResolveAddressAsync(key).Result;
+                var addrs = registry.ResolveAddressAsync(key).ConfigureAwait(false).GetAwaiter().GetResult();
 
                 // 注册服务有改变时，通知配置系统改变
                 if (!_keys.Contains(key))

Stardust/Managers/NetRuntime.cs

@@ -86,7 +86,7 @@ public String Download(String fileName, String? baseUrl = null)
             {
 #if NET6_0_OR_GREATER
                 using var http = new System.Net.Http.HttpClient();
-                var hs = http.GetStreamAsync(url).Result;
+                var hs = http.GetStreamAsync(url).ConfigureAwait(false).GetAwaiter().GetResult();
 
                 using var fs = new FileStream(fullFile, FileMode.CreateNew, FileAccess.Write);
                 hs.CopyTo(fs);

Stardust/Managers/ServiceManager.cs

@@ -770,7 +770,7 @@ Boolean OnInstall(Int32 deployId, String serviceName, CommandModel cmd)
     {
         using var span = Tracer?.NewSpan("ServiceManager-Install", cmd);
 
-        var dis = PullService(deployId, serviceName).Result;
+        var dis = PullService(deployId, serviceName).ConfigureAwait(false).GetAwaiter().GetResult();
         if (dis == null || dis.Length == 0) throw new Exception($"无法从服务器取得应用信息，安装{serviceName}失败！");
 
         // 马上停止并拉起应用服务，定时器只用于双保险

Stardust/Registry/IRegistry.cs

@@ -105,7 +105,7 @@ public static async Task<IApiClient> CreateForServiceAsync(this IRegistry regist
     /// <param name="serviceName">服务名</param>
     /// <param name="tag"></param>
     /// <returns></returns>
-    public static IApiClient CreateForService(this IRegistry registry, String serviceName, String? tag = null) => TaskEx.Run(() => CreateForServiceAsync(registry, serviceName, tag)).Result;
+    public static IApiClient CreateForService(this IRegistry registry, String serviceName, String? tag = null) => TaskEx.Run(() => CreateForServiceAsync(registry, serviceName, tag)).ConfigureAwait(false).GetAwaiter().GetResult();
 
     /// <summary>绑定客户端到服务集合，更新服务地址</summary>
     /// <param name="client"></param>

Stardust/StarFactory.cs

@@ -431,7 +431,7 @@ public IRegistry? Service
     /// <param name="serviceName"></param>
     /// <param name="tag"></param>
     /// <returns></returns>
-    public IApiClient CreateForService(String serviceName, String? tag = null) => TaskEx.Run(() => CreateForServiceAsync(serviceName, tag)).Result;
+    public IApiClient CreateForService(String serviceName, String? tag = null) => TaskEx.Run(() => CreateForServiceAsync(serviceName, tag)).ConfigureAwait(false).GetAwaiter().GetResult();
 
     /// <summary>为指定服务创建客户端，从星尘注册中心获取服务地址。单例，应避免频繁创建客户端</summary>
     /// <param name="serviceName"></param>