Merge pull request #78 from CatLib/1.1

修复了路由不能正确定位异常位置的bug

Author: 喵喵大人

CatLib.Framework.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.27004.2002
+VisualStudioVersion = 15.0.26430.4
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CatLib.Framework", "src\CatLib.Framework\CatLib.Framework.csproj", "{BBB2DAE2-638B-4419-9591-3CECCA312E4E}"
 EndProject

src/CatLib.Framework.Tests/CatLib.Framework.Tests.csproj

@@ -72,6 +72,7 @@
     <Compile Include="Network\ReceiveStateTests.cs" />
     <Compile Include="Network\TcpServer.cs" />
     <Compile Include="Random\RandomProviderTests.cs" />
+    <Compile Include="Routing\TestMiddlewareException.cs" />
     <Compile Include="Socket\KcpConnectorTests.cs" />
     <Compile Include="Socket\KcpTestsServer.cs" />
     <Compile Include="Socket\SocketProviderTests.cs" />

src/CatLib.Framework.Tests/Routing/RouterExceptionTests.cs

@@ -123,7 +123,18 @@ public void TestNestedNoSchemeThrowException()
 
             ExceptionAssert.Throws<NotFoundRouteException>(() =>
             {
-                router.Dispatch("ui://helloworld/call");
+                try
+                {
+                    router.Dispatch("ui://helloworld/call");
+                }
+                catch (Exception ex)
+                {
+                    while (ex.InnerException != null)
+                    {
+                        ex = ex.InnerException;
+                    }
+                    throw ex;
+                }
             });
 
             Assert.AreEqual(1, throwNotFound);
@@ -155,7 +166,18 @@ public void TestSimpleException()
 
             ExceptionAssert.Throws<ArgumentNullException>(() =>
             {
-                router.Dispatch("ui://helloworld/call");
+                try
+                {
+                    router.Dispatch("ui://helloworld/call");
+                }
+                catch (Exception ex)
+                {
+                    while (ex.InnerException != null)
+                    {
+                        ex = ex.InnerException;
+                    }
+                    throw ex;
+                }
             });
 
             Assert.AreEqual(1, throwError);
@@ -206,7 +228,18 @@ public void TestNestedException()
 
             ExceptionAssert.Throws<ArgumentNullException>(() =>
             {
-                router.Dispatch("ui://helloworld/call");
+                try
+                {
+                    router.Dispatch("ui://helloworld/call");
+                }
+                catch (Exception ex)
+                {
+                    while (ex.InnerException != null)
+                    {
+                        ex = ex.InnerException;
+                    }
+                    throw ex;
+                }
             });
 
             Assert.AreEqual(12, throwError);
@@ -287,7 +320,18 @@ public void TestNestedNotFoundRouteTest()
             {
                 ExceptionAssert.Throws<NotFoundRouteException>(() =>
                 {
-                    router.Dispatch("ui://helloworld/call2");
+                    try
+                    {
+                        router.Dispatch("ui://helloworld/call2");
+                    }
+                    catch (Exception ex)
+                    {
+                        while (ex.InnerException != null)
+                        {
+                            ex = ex.InnerException;
+                        }
+                        throw ex;
+                    }
                 });
                 res.SetContext("helloworld");
             });

src/CatLib.Framework.Tests/Routing/RouterTests.cs

@@ -419,7 +419,18 @@ public void RoutingCircularDependencyCall()
 
             ExceptionAssert.Throws<RuntimeException>(() =>
             {
-                router.Dispatch("lambda://call/RoutingCircularDependencyCall-1");
+                try
+                {
+                    router.Dispatch("lambda://call/RoutingCircularDependencyCall-1");
+                }
+                catch (Exception ex)
+                {
+                    while (ex.InnerException != null)
+                    {
+                        ex = ex.InnerException;
+                    }
+                    throw ex;
+                }
             });
         }
 

src/CatLib.Framework.Tests/Routing/TestMiddlewareException.cs

@@ -0,0 +1,44 @@
+/*
+ * This file is part of the CatLib package.
+ *
+ * (c) Yu Bin <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * Document: http://catlib.io/
+ */
+
+using System;
+using System.Reflection;
+using CatLib.API.Routing;
+using CatLib.Routing;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace CatLib.Tests.Routing
+{
+    [TestClass]
+    public class TestMiddlewareException
+    {
+        [TestMethod]
+        [ExpectedException(typeof(TargetInvocationException))]
+        public void TestMiddlewareThrow()
+        {
+            var app = new Application();
+            app.Bootstrap();
+            app.OnFindType((t) =>
+            {
+                return Type.GetType(t);
+            });
+            app.Register(new RoutingProvider());
+            var router = app.Make<IRouter>();
+            router.Reg("test://throw", () =>
+            {
+                string str = null;
+                var l = str.Length;
+            });
+
+            router.Dispatch("test://throw");
+        }
+    }
+}

src/CatLib.Framework/Routing/Route.cs

@@ -310,37 +310,17 @@ private void DispatchToAction(Request request, Response response)
         /// <param name="callback">完成中间件的回调</param>
         private void ThroughRouteMiddleware(Request request, Response response, object context, Action<Request, Response, object> callback)
         {
-            try
+            var middleware = GatherMiddleware();
+            if (middleware != null)
             {
-                var middleware = GatherMiddleware();
-                if (middleware != null)
-                {
-                    middleware.Do(request, response, (req, res) =>
-                    {
-                        callback.Invoke(request, response, context);
-                    });
-                }
-                else
+                middleware.Do(request, response, (req, res) =>
                 {
                     callback.Invoke(request, response, context);
-                }
+                });
             }
-            catch (Exception ex)
+            else
             {
-                var count = 0;
-                while (count++ < 255)
-                {
-                    if (ex.InnerException == null)
-                    {
-                        throw ex;
-                    }
-                    ex = ex.InnerException;
-                }
-
-                if (count >= 255)
-                {
-                    throw new RuntimeException("Route Error stack overflow. There may be an infinite loop. url: [" + request.Uri + "]");
-                }
+                callback.Invoke(request, response, context);
             }
         }