修改rpc客户端

brucehu123 · Mar 19, 2019 · f36992b · f36992b
1 parent a1b4cb7
commit f36992b
Show file tree

Hide file tree

Showing 9 changed files with 141 additions and 46 deletions.
diff --git a/Study.Client/Program.cs b/Study.Client/Program.cs
@@ -20,6 +20,11 @@
 using System.Reflection;
 using System.Runtime.Loader;
 using System.Text;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+using Study.Core;
+using IServiceProxyFactory = Study.ProxyGenerator.IServiceProxyFactory;
+using IServiceProxyGenerater = Study.ProxyGenerator.IServiceProxyGenerater;
 
 namespace Study.Client
 {
@@ -107,32 +112,65 @@ class Program
 
         static void Main(string[] args)
         {
-            Console.WriteLine("开始客户端!");
-
-            var proxyGenerater = new ServiceProxyGenerater(new ServiceIdGenerator(), new LoggerFactory().CreateLogger<ServiceProxyGenerater>());
-            var services = proxyGenerater.GenerateProxys(new[] { typeof(IUserService) }).ToArray();
-            var proxyFactory = new ServiceProxyFactory(new RemoteServiceInvoker());
-            var userService = proxyFactory.CreateProxy<IUserService>(services.Single(typeof(IUserService).GetTypeInfo().IsAssignableFrom));
-
-            Console.WriteLine("开始一百次调用");
+            ServiceProvider provider = null;
+
+            var builder = new HostBuilder()
+                    .ConfigureServices((context, services) =>
+                    {
+                        provider = services.BuildServiceProvider();
+                    })
+                    .ConfigureLogging((context, logger) =>
+                    {
+                        logger.AddConfiguration(context.Configuration.GetSection("Logging"));
+                        logger.AddConsole();
+                    })
+                .AddClientProxy()
+                .AddRpcClient();
+            using (var host=builder.UseConsoleLifetime().Build())
+            {
+                host.Start();
 
-            Stopwatch sw = Stopwatch.StartNew();
+                var proxyGenerater = provider.GetService<IServiceProxyGenerater>();
+                var remoteServices = proxyGenerater.GenerateProxys(new[] { typeof(IUserService) }).ToArray();
+                var proxyFactory = provider.GetService<IServiceProxyFactory>();
+                var userService = proxyFactory.CreateProxy<IUserService>(remoteServices.Single(typeof(IUserService).GetTypeInfo().IsAssignableFrom));
 
-            for (var i = 0; i < 100; i++)
-            {
-                Stopwatch watch = Stopwatch.StartNew();
-                var result = userService.GetUserNameAsync(i).Result;
+                var result = userService.GetUserNameAsync(10).Result;
                 Console.WriteLine(result);
-                watch.Stop();
 
-                Console.WriteLine($"{watch.ElapsedMilliseconds}");
+                host.WaitForShutdown();
             }
 
-            sw.Stop();
 
-            Console.WriteLine($"调用结束,耗时：{sw.ElapsedMilliseconds} 毫秒");
 
-            Console.ReadLine();
+
+
+
+            //Console.WriteLine("开始客户端!");
+
+            //var proxyGenerater = new ServiceProxyGenerater(new ServiceIdGenerator(), new LoggerFactory().CreateLogger<ServiceProxyGenerater>());
+            //var services = proxyGenerater.GenerateProxys(new[] { typeof(IUserService) }).ToArray();
+            //var proxyFactory = new ServiceProxyFactory(new RemoteServiceInvoker());
+            //var userService = proxyFactory.CreateProxy<IUserService>(services.Single(typeof(IUserService).GetTypeInfo().IsAssignableFrom));
+
+            //Console.WriteLine("开始一百次调用");
+
+            //Stopwatch sw = Stopwatch.StartNew();
+
+            //for (var i = 0; i < 100; i++)
+            //{
+            //    Stopwatch watch = Stopwatch.StartNew();
+            //    var result = userService.GetUserNameAsync(i).Result;
+            //    Console.WriteLine(result);
+            //    watch.Stop();
+
+            //    Console.WriteLine($"{watch.ElapsedMilliseconds}");
+            //}
+
+            //sw.Stop();
+
+            //Console.WriteLine($"调用结束,耗时：{sw.ElapsedMilliseconds} 毫秒");
+
 
         }
 

diff --git a/Study.Client/Study.Client.csproj b/Study.Client/Study.Client.csproj
@@ -8,6 +8,7 @@
   <ItemGroup>
     <PackageReference Include="DotNetty.Codecs" Version="0.6.0" />
     <PackageReference Include="DotNetty.Transport" Version="0.6.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="2.2.0" />
     <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
   </ItemGroup>
 

diff --git a/Study.Core/HostBuilderExtensions.cs b/Study.Core/HostBuilderExtensions.cs
@@ -14,6 +14,8 @@
 using System.Linq;
 using System.Reflection;
 using System.Text;
+using Study.Core.Runtime.Client;
+using Study.Core.Runtime.Client.Imp;
 using Study.Core.Runtime.Server.Imp;
 
 
@@ -46,5 +48,19 @@ public static IHostBuilder AddRpcServer(this IHostBuilder builder)
             });
             return builder;
         }
+
+        public static IHostBuilder AddRpcClient(this IHostBuilder builder)
+        {
+            builder.ConfigureServices((context, services) =>
+            {
+                services.AddOptions();
+                services.AddLogging();
+
+                services.AddHostedService<RpcClientHost>();
+                services.AddSingleton<IRemoteServiceInvoker, RemoteServiceInvoker>();
+                services.AddSingleton<IServiceIdGenerator, ServiceIdGenerator>();
+            });
+            return builder;
+        }
     }
 }
diff --git a/Study.Core/Runtime/Client/Imp/RemoteServiceInvoker.cs b/Study.Core/Runtime/Client/Imp/RemoteServiceInvoker.cs
@@ -19,7 +19,7 @@ public class RemoteServiceInvoker : IRemoteServiceInvoker
         public Task<string> InvokeAsync(RemoteInvokeContext context)
         {
             if (context == null)
-                throw new ArgumentNullException("context");
+                throw new ArgumentNullException(nameof(context));
             if (context.ServiceId == null)
                 throw new ArgumentNullException("serviceId");
             TaskCompletionSource<string> tcs = new TaskCompletionSource<string>();

diff --git a/Study.Core/Runtime/Client/RpcClientHost.cs b/Study.Core/Runtime/Client/RpcClientHost.cs
@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Logging;
+
+namespace Study.Core.Runtime.Client
+{
+    public class RpcClientHost : IHostedService
+    {
+        private readonly ILogger<RpcClientHost> _logger;
+
+        public RpcClientHost(ILogger<RpcClientHost> logger)
+        {
+            _logger = logger;
+        }
+
+        public Task StartAsync(CancellationToken cancellationToken)
+        {
+            if (_logger.IsEnabled(LogLevel.Debug))
+                _logger.LogDebug("客户端程序启动");
+            return  Task.CompletedTask;
+        }
+
+        public Task StopAsync(CancellationToken cancellationToken)
+        {
+            if (_logger.IsEnabled(LogLevel.Debug))
+                _logger.LogDebug("客户端程序停止");
+            return Task.CompletedTask;
+        }
+    }
+}
diff --git a/Study.ProxyGenerator/HostBuilderExtensions.cs b/Study.ProxyGenerator/HostBuilderExtensions.cs
@@ -0,0 +1,32 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+using Study.ProxyGenerator.Implementation;
+
+namespace Study.ProxyGenerator
+{
+    public static class HostBuilderExtensions
+    {
+        public static IHostBuilder AddClientProxy(this IHostBuilder builder)
+        {
+            builder.ConfigureServices((context, services) =>
+            {
+                services.AddSingleton<IServiceProxyGenerater, ServiceProxyGenerater>();
+                services.AddSingleton<IServiceProxyFactory, ServiceProxyFactory>();
+            });
+            return builder;
+        }
+    }
+
+    public static class ServiceCollectionExtensions
+    {
+        public static ServiceCollection AddClientProxyServices(this ServiceCollection services)
+        {
+            services.AddSingleton<IServiceProxyGenerater, ServiceProxyGenerater>();
+            services.AddSingleton<IServiceProxyFactory, ServiceProxyFactory>();
+            return services;
+        }
+    }
+}
diff --git a/Study.ProxyGenerator/UserServiceClientProxy.cs b/Study.ProxyGenerator/UserServiceClientProxy.cs
diff --git a/Study.Transport.DotNetty/DotNettySocketService.cs b/Study.Transport.DotNetty/DotNettySocketService.cs
@@ -64,9 +64,6 @@ public void OnReceive(IChannelHandlerContext context, object message)
                 await context.WriteAndFlushAsync(buffer);
 
             }).ConfigureAwait(false);
-
-
-            //todo: send result to remote client
         }
     }
 }
diff --git a/StudyRpc.sln b/StudyRpc.sln
@@ -17,7 +17,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Study.ProxyGenerator", "Stu
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Study.Transport.DotNetty", "Study.Transport.DotNetty\Study.Transport.DotNetty.csproj", "{737CFC61-6515-42D1-BD9E-201268E5E49D}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Doc", "Doc", "{D66A4A7C-8488-4316-B0A9-0C5046216B38}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "doc", "doc", "{D66A4A7C-8488-4316-B0A9-0C5046216B38}"
 	ProjectSection(SolutionItems) = preProject
 		README.md = README.md
 	EndProjectSection