Merge pull request #45 from jacqueskang/generic-support

Support generic method

Author: jacqueskang

src/IpcServiceSample.ConsoleClient/Program.cs

@@ -62,6 +62,9 @@ private static async Task MainAsync(string[] args)
                 byte[] reversed = await systemClient.InvokeAsync(x => x.ReverseBytes(input));
                 Console.WriteLine($"[TEST 7] reversed bytes are: {Convert.ToBase64String(reversed)}");
 
+                // test 8: call IPC service method with generic parameter
+                string print = await systemClient.InvokeAsync(x => x.Printout(DateTime.UtcNow));
+                Console.WriteLine($"[TEST 8] print out value: {print}");
             }
             catch (Exception ex)
             {

src/IpcServiceSample.ConsoleServer/SystemService.cs

@@ -28,6 +28,11 @@ public Guid GenerateId()
             return Guid.NewGuid();
         }
 
+        public string Printout<T>(T value)
+        {
+            return value.ToString();
+        }
+
         public byte[] ReverseBytes(byte[] input)
         {
             return input.Reverse().ToArray();

src/IpcServiceSample.ServiceContracts/ISystemService.cs

@@ -1,6 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace IpcServiceSample.ServiceContracts
 {
@@ -10,5 +8,6 @@ public interface ISystemService
         string ConvertText(string text, TextStyle style);
         Guid GenerateId();
         byte[] ReverseBytes(byte[] input);
+        string Printout<T>(T value);
     }
 }

src/JKang.IpcServiceFramework.Client/IpcServiceClient.cs

@@ -83,6 +83,7 @@ private static IpcRequest GetRequest(Expression exp, MyInterceptor interceptor)
             {
                 MethodName = interceptor.LastInvocation.Method.Name,
                 Parameters = interceptor.LastInvocation.Arguments,
+                GenericArguments = interceptor.LastInvocation.GenericArguments,
             };
         }
 

src/JKang.IpcServiceFramework.Core/IpcRequest.cs

@@ -1,8 +1,17 @@
-namespace JKang.IpcServiceFramework
+using System;
+
+namespace JKang.IpcServiceFramework
 {
     public class IpcRequest
     {
+        private Type[] _genericArguments = new Type[0];
+
         public string MethodName { get; set; }
         public object[] Parameters { get; set; }
+        public Type[] GenericArguments
+        {
+            get => _genericArguments ?? new Type[0];
+            set => _genericArguments = value;
+        }
     }
 }

src/JKang.IpcServiceFramework.Server/IpcServiceEndpoint.cs

@@ -54,7 +54,7 @@ protected async Task ProcessAsync(Stream server, ILogger logger, CancellationTok
 
                     cancellationToken.ThrowIfCancellationRequested();
 
-                    logger?.LogDebug($"[thread {Thread.CurrentThread.ManagedThreadId}] request received, invoking corresponding method...");
+                    logger?.LogDebug($"[thread {Thread.CurrentThread.ManagedThreadId}] request received, invoking '{request.MethodName}'...");
                     IpcResponse response;
                     using (IServiceScope scope = ServiceProvider.CreateScope())
                     {
@@ -95,11 +95,22 @@ protected IpcResponse GetReponse(IpcRequest request, IServiceScope scope)
                 return IpcResponse.Fail($"Parameter mismatch.");
             }
 
+            Type[] genericArguments = method.GetGenericArguments();
+            if (genericArguments.Length != request.GenericArguments.Length)
+            {
+                return IpcResponse.Fail($"Generic arguments mismatch.");
+            }
+
             object[] args = new object[paramInfos.Length];
             for (int i = 0; i < args.Length; i++)
             {
                 object origValue = request.Parameters[i];
                 Type destType = paramInfos[i].ParameterType;
+                if (destType.IsGenericParameter)
+                {
+                    destType = request.GenericArguments[destType.GenericParameterPosition];
+                }
+
                 if (_converter.TryConvert(origValue, destType, out object arg))
                 {
                     args[i] = arg;
@@ -112,6 +123,11 @@ protected IpcResponse GetReponse(IpcRequest request, IServiceScope scope)
 
             try
             {
+                if (method.IsGenericMethod)
+                {
+                    method = method.MakeGenericMethod(request.GenericArguments);
+                }
+                
                 object @return = method.Invoke(service, args);
                 if (@return is Task)
                 {