[fix] empty basePath routing #116 (#117)

Author: amoraller

src/EdjCase.JsonRpc.Router/Defaults/DefaultRequestMatcher.cs

@@ -16,8 +16,8 @@ namespace EdjCase.JsonRpc.Router.Defaults
 {
 	internal class DefaultRequestMatcher : IRpcRequestMatcher
 	{
-		private static ConcurrentDictionary<RpcPath?, ConcurrentDictionary<RpcRequestSignature, IRpcMethodInfo[]>> requestToMethodCache { get; }
-			= new ConcurrentDictionary<RpcPath?, ConcurrentDictionary<RpcRequestSignature, IRpcMethodInfo[]>>();
+		private static ConcurrentDictionary<string, ConcurrentDictionary<RpcRequestSignature, IRpcMethodInfo[]>> requestToMethodCache { get; }
+			= new ConcurrentDictionary<string, ConcurrentDictionary<RpcRequestSignature, IRpcMethodInfo[]>>();
 
 		private ILogger<DefaultRequestMatcher> logger { get; }
 		private IRpcMethodProvider methodProvider { get; }
@@ -47,7 +47,7 @@ public IRpcMethodInfo GetMatchingMethod(RpcRequestSignature requestSignature)
 				throw new RpcException(RpcErrorCode.MethodNotFound, $"No methods found for route");
 			}
 
-			Span<IRpcMethodInfo> matches = this.FilterAndBuildMethodInfoByRequest(methods, requestSignature);
+			Span<IRpcMethodInfo> matches = this.FilterAndBuildMethodInfoByRequest(context, methods, requestSignature);
 			if (matches.Length == 1)
 			{
 				this.logger.RequestMatchedMethod();
@@ -85,11 +85,11 @@ public IRpcMethodInfo GetMatchingMethod(RpcRequestSignature requestSignature)
 			throw new RpcException(RpcErrorCode.MethodNotFound, errorMessage);
 		}
 
-		private IRpcMethodInfo[] FilterAndBuildMethodInfoByRequest(IReadOnlyList<IRpcMethodInfo> methods, RpcRequestSignature requestSignature)
+		private IRpcMethodInfo[] FilterAndBuildMethodInfoByRequest(RpcContext context, IReadOnlyList<IRpcMethodInfo> methods, RpcRequestSignature requestSignature)
 		{
 			//If the request signature is found, it means we have the methods cached already
 
-			var rpcPath = this.contextAccessor.Get()?.Path;
+			string rpcPath = context.Path?.ToString() ?? string.Empty;
 			var rpcPathMethodsCache = DefaultRequestMatcher.requestToMethodCache.GetOrAdd(rpcPath, path => new ConcurrentDictionary<RpcRequestSignature, IRpcMethodInfo[]>());
 			return rpcPathMethodsCache.GetOrAdd(requestSignature, BuildMethodCache);
 			IRpcMethodInfo[] BuildMethodCache(RpcRequestSignature s)

src/EdjCase.JsonRpc.Router/RpcPath.cs

@@ -249,9 +249,9 @@ public RpcPath Clone()
 			return new RpcPath(newComponents);
 		}
 
-		public static implicit operator string(RpcPath path)
+		public static implicit operator string?(RpcPath path)
 		{
-			return path.ToString();
+			return path?.ToString();
 		}
 
 		public static implicit operator RpcPath(string s)

test/EdjCase.JsonRpc.Router.Tests/Controllers/MethodMatcherThreeController.cs

@@ -0,0 +1,12 @@
+using System;
+
+namespace EdjCase.JsonRpc.Router.Tests.Controllers
+{
+    public class MethodMatcherThreeController
+	{
+        public Guid GuidTypeMethod(Guid guid)
+        {
+            return guid;
+        }
+    }
+}

test/EdjCase.JsonRpc.Router.Tests/MethodMatcherTests.cs

@@ -1,4 +1,4 @@
-using EdjCase.JsonRpc.Router.Abstractions;
+using EdjCase.JsonRpc.Router.Abstractions;
 using EdjCase.JsonRpc.Router.Defaults;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
@@ -19,31 +19,30 @@ namespace EdjCase.JsonRpc.Router.Tests
 {
 	public class MethodMatcherTests
 	{
-		private readonly IReadOnlyDictionary<RpcPath, IReadOnlyList<IRpcMethodInfo>> methodData;
+		private readonly StaticRpcMethodDataAccessor methodDataAccessor;
 
 		public MethodMatcherTests()
-		{
-			this.methodData = new Dictionary<RpcPath, IReadOnlyList<IRpcMethodInfo>>
-			{
+		{
+			var baserouteData = typeof(MethodMatcherThreeController)
+						.GetMethods(BindingFlags.DeclaredOnly | BindingFlags.Public | BindingFlags.Instance)
+						.Select(DefaultRpcMethodInfo.FromMethodInfo)
+						.ToList();
+
+			var routeData = new Dictionary<RpcPath, IReadOnlyList<IRpcMethodInfo>>
+			{
 				[nameof(MethodMatcherController)] = typeof(MethodMatcherController)
 						.GetMethods(BindingFlags.DeclaredOnly | BindingFlags.Public | BindingFlags.Instance)
 						.Select(DefaultRpcMethodInfo.FromMethodInfo)
-						.ToList(),
+						.ToList(),
 				[nameof(MethodMatcherDuplicatesController)] = typeof(MethodMatcherDuplicatesController)
 						.GetMethods(BindingFlags.DeclaredOnly | BindingFlags.Public | BindingFlags.Instance)
 						.Select(DefaultRpcMethodInfo.FromMethodInfo)
-						.ToList()
-			};
-		}
-
-		private StaticRpcMethodDataAccessor GetMethodDataAccessor()
-		{
-			return new StaticRpcMethodDataAccessor()
-			{
-				Value = new RpcRouteMetaData(new List<IRpcMethodInfo>(), this.methodData)
-			};
+						.ToList()
+			};
+			this.methodDataAccessor = new StaticRpcMethodDataAccessor() { Value = new RpcRouteMetaData(baserouteData, routeData)};
 		}
 
+ 
 		private DefaultRequestMatcher GetMatcher(RpcPath? path = null)
 		{
 
@@ -64,7 +63,7 @@ private DefaultRequestMatcher GetMatcher(RpcPath? path = null)
 #pragma warning restore CS8625 // Cannot convert null literal to non-nullable reference type.
 
 
-			var methodProvider = new StaticRpcMethodProvider(this.GetMethodDataAccessor());
+			var methodProvider = new StaticRpcMethodProvider(this.methodDataAccessor);
 			return new DefaultRequestMatcher(logger.Object, methodProvider, rpcContextAccessor.Object, rpcParameterConverter);
 		}
 
@@ -82,7 +81,11 @@ public void GetMatchingMethod_WithRpcRoute()
 			DefaultRequestMatcher path2Matcher = this.GetMatcher(path: typeof(MethodMatcherDuplicatesController).GetTypeInfo().Name);
 			IRpcMethodInfo path2Match = path2Matcher.GetMatchingMethod(requestSignature);
 			Assert.NotNull(path2Match);
-			Assert.NotSame(path1Match, path2Match);
+			Assert.NotSame(path1Match, path2Match);
+
+			DefaultRequestMatcher path3Matcher = this.GetMatcher(path: null);
+			IRpcMethodInfo path3Match = path3Matcher.GetMatchingMethod(requestSignature);
+			Assert.NotNull(path2Match);
 		}
 
 		[Fact]
@@ -349,6 +352,18 @@ public void GetMatchingMethod__Dictionary_Request_With_Optional_Parameters__Matc
 
 			Assert.NotNull(methodInfo);
 			Assert.Equal(methodName, methodInfo.Name);
+		}
+
+
+		[Fact]
+		public void GetMatchingMethod_WithoutRpcRoute()
+		{
+			string methodName = nameof(MethodMatcherController.GuidTypeMethod);
+			RpcRequestSignature requestSignature = RpcRequestSignature.Create(methodName, new[] { RpcParameterType.String });
+ 
+			DefaultRequestMatcher path3Matcher = this.GetMatcher(path: null);
+			IRpcMethodInfo path3Match = path3Matcher.GetMatchingMethod(requestSignature);
+			Assert.NotNull(path3Match);
 		}
 	}