Endpoint fallthrough implemented

Author: trikko

source/serverino/config.d

@@ -32,6 +32,12 @@ import std.stdio : File;
 import std.datetime : Duration, seconds, hours, msecs;
 import std.traits : ReturnType;
 
+public enum Fallthrough : bool
+{
+	Yes = true,
+   No = false
+}
+
 public struct priority { long priority; } /// UDA. Set @endpoint priority
 
 public enum endpoint;            /// UDA. Functions with @endpoint attached are called when a request is received

source/serverino/worker.d

@@ -907,7 +907,7 @@ struct Worker
                   static if (hasUDA!(f, route))
                   {
                      // If one of the route UDAs returns true, we will launch the function.
-                     bool willLaunchFunc()
+                     bool willLaunchFunc()()
                      {
                         static foreach(attr;  getUDAs!(f, route))
                         {
@@ -919,19 +919,40 @@ struct Worker
 
                      bool willLaunch = willLaunchFunc();
                   }
-                  else immutable willLaunch = true;
+                  else enum willLaunch = true;
+
+                  request._internal._route ~= ff.mod ~ "." ~ ff.name;
 
                   if (willLaunch)
                   {
-                     static if (__traits(compiles, f(request, output))) f(request, output);
-                     else static if (__traits(compiles, f(request))) f(request);
-                     else f(output);
-                  }
+                     // Temporarily set the dirty flag to false. It will be restored at the end of the function.
+                     bool wasDirty = output._internal._dirty;
+                     if (wasDirty) output._internal._dirty = false;
+                     scope(exit) if (wasDirty) output._internal._dirty = true;
 
-                  request._internal._route ~= ff.mod ~ "." ~ ff.name;
-               }
+                     import std.meta : AliasSeq;
+
+                     // Get the parameters of the function
+                     static if (__traits(compiles, f(request, output))) auto params = AliasSeq!(request, output);
+                     else static if (__traits(compiles, f(request))) auto params = AliasSeq!(request);
+                     else auto params = AliasSeq!(output);
+
+                     // Check if the function has a fallthrough return value
+                     Fallthrough tmpFt;
+                     enum withFallthrough = __traits(compiles,  tmpFt = f(params));
 
-               if (output._internal._dirty) return true;
+                     static if (withFallthrough)
+                     {
+                        if (f(params) == Fallthrough.No) return true;
+                     }
+                     else
+                     {
+                        f(params);
+                        if (output._internal._dirty) return true;
+                     }
+
+                  }
+               }
             }
 
             return false;

tests/test-01/source/app.d

@@ -230,6 +230,35 @@ void test_3(Request r, Output o)
 
 }
 
+@endpoint @route!(x => x.path == "/fallthrough") @priority(400)
+auto fallthrough1(Request r, Output o)
+{
+   o ~= "fallthrough ";
+   return Fallthrough.Yes;
+}
+
+@endpoint @route!(x => x.path == "/fallthrough") @priority(300)
+void fallthrough2(Request r, Output o)
+{
+   // Nothing happens
+   info("running fallthrough 2()");
+}
+
+@endpoint @route!(x => x.path == "/fallthrough") @priority(200)
+void fallthrough3(Request r, Output o)
+{
+   o ~= "works!";
+}
+
+@endpoint @route!(x => x.path == "/fallthrough") @priority(100)
+void fallthrough4(Request r, Output o)
+{
+   o ~= "doesn't works!";
+}
+
+
+
+
 @onServerInit
 ServerinoConfig conf()
 {
@@ -608,4 +637,18 @@ Content-Type: application/json\r
       remove("test_serverino_file.json");
 
    }
+
+   // Fallthrough
+
+   {
+      string content;
+
+      auto http = HTTP("http://127.0.0.1:8080/fallthrough");
+      http.onReceive = (ubyte[] data) { content ~= data; return data.length; };
+      http.perform();
+
+      assert(content == "fallthrough works!", content);
+      assert(http.statusLine.code == 200);
+   }
+
 }

tests/test-01/source/tagged.d

@@ -43,7 +43,7 @@ void test_3(Request r, Output o) { if (r.path == "/error") return; history ~= 3;
 void test_4(Request r, Output o) { if (r.path == "/error") return;  history ~= 4; o ~= "4"; }
 
 @endpoint @priority(4)
-void test_5(Request r) { history ~= 5; return; }
+void test_5(Request r, Output o) { history ~= 5; }
 
 // Functions missing the @endpoint attribute
 @priority(4) void wrong_function(Request r) { return; }