Merge pull request #207 from ForNeVeR/bugfix/206.interface-map

Use interface map instead of method name search
Cysharp · Oct 17, 2019 · f310e1f · f310e1f
2 parents 88ac998 + 0c4552b
commit f310e1f
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/src/MagicOnion/Server/Hubs/StreamingHubHandler.cs b/src/MagicOnion/Server/Hubs/StreamingHubHandler.cs
@@ -33,10 +33,17 @@ public class StreamingHubHandler : IEquatable<StreamingHubHandler>
         static readonly MethodInfo messagePackDeserialize = typeof(LZ4MessagePackSerializer).GetMethods()
             .First(x => x.Name == "Deserialize" && x.GetParameters().Length == 2 && x.GetParameters()[0].ParameterType == typeof(ArraySegment<byte>));
 
+        private static MethodInfo GetInterfaceMethod(Type targetType, Type interfaceType, string targetMethodName)
+        {
+            var mapping = targetType.GetInterfaceMap(interfaceType);
+            var methodIndex = Array.FindIndex(mapping.TargetMethods, mi => mi.Name == targetMethodName);
+            return mapping.InterfaceMethods[methodIndex];
+        }
+
         public StreamingHubHandler(MagicOnionOptions options, Type classType, MethodInfo methodInfo)
         {
             var hubInterface = classType.GetInterfaces().First(x => x.GetTypeInfo().IsGenericType && x.GetGenericTypeDefinition() == typeof(IStreamingHub<,>)).GetGenericArguments()[0];
-            var interfaceMethod = hubInterface.GetMethods().First(x => x.Name == methodInfo.Name);
+            var interfaceMethod = GetInterfaceMethod(classType, hubInterface, methodInfo.Name);
 
 
             this.HubType = classType;