feat: add HttpContext::Run method and improve middleware handling

Author: chenxuan520

src/cppnet/http/server/http_server.cpp

@@ -9,6 +9,19 @@
 
 namespace cppnet {
 
+void HttpContext::Run(int run_func_pos) {
+  if (run_func_pos >= route_funcs_.size()) {
+    return;
+  }
+  for (int i = run_func_pos; i < route_funcs_.size(); i++) {
+    func_pos_ = i;
+    route_funcs_[i](*this);
+    if (!this->is_continue_) {
+      break;
+    }
+  }
+}
+
 int HttpGroup::GET(const std::string &path, HttpCallback callback,
                    const std::vector<std::shared_ptr<HttpFilter>> &filters) {
   auto new_filters = filters;
@@ -358,8 +371,8 @@ void HttpServer::HandleRead(TcpServer &server, Socket &event_soc) {
   }
   auto path = req.route().GetPath();
   auto method = req.method();
-  logger_->Info("req: " + HttpMethodUtil::ConvertToStr(method) + " " + path +
-                " soc:" + std::to_string(event_soc.fd()));
+  logger_->Debug("req: " + HttpMethodUtil::ConvertToStr(method) + " " + path +
+                 " soc:" + std::to_string(event_soc.fd()));
 
   // step2:find route and run func
   HttpContext ctx(req, resp, soc);
@@ -379,14 +392,12 @@ void HttpServer::HandleRead(TcpServer &server, Socket &event_soc) {
             }
           }
           if (route_func) {
-            route_func(ctx);
-            if (!is_continue_) {
-              return false;
-            }
+            ctx.route_funcs_.push_back(route_func);
           }
         }
         return true;
       });
+  ctx.Run(0);
 
   // step3:build resp and send
   if (resp.status_code() == HttpStatusCode::UNKNOWN) {
@@ -405,7 +416,7 @@ void HttpServer::HandleRead(TcpServer &server, Socket &event_soc) {
     soc->Close();
     return;
   }
-  logger_->Info(
+  logger_->Debug(
       "resp: " + HttpStatusCodeUtil::ConvertToStr(resp.status_code()) +
       " soc:" + std::to_string(event_soc.fd()) + kEndl);
 }

src/cppnet/http/server/http_server.hpp

@@ -17,6 +17,11 @@
 
 namespace cppnet {
 
+// advance statement
+class HttpServer;
+class HttpContext;
+using HttpCallback = std::function<void(HttpContext &)>;
+
 class HttpContext {
 public:
   HttpContext(HttpReq &req, HttpResp &resp, std::shared_ptr<Socket> &soc)
@@ -29,9 +34,11 @@ class HttpContext {
   /*
    * @brief: whether continue, use in middware
    * */
-  inline void Next() { is_continue_ = true; }
+  inline void Next() {
+    Run(func_pos_ + 1);
+    is_continue_ = false;
+  }
   inline void Abort() { is_continue_ = false; }
-  inline bool is_continue() { return is_continue_; }
   /*
    * @brief: get inline data
    */
@@ -52,15 +59,25 @@ class HttpContext {
   HttpResp &resp() { return resp_; }
   Socket &soc() { return *soc_; }
 
+private:
+  /*
+   * @brief: run all route func,inside func
+   */
+  void Run(int run_func_pos);
+
 private:
   HttpReq &req_;
   HttpResp &resp_;
   std::shared_ptr<Socket> soc_ = nullptr;
-  bool is_continue_ = false;
+  bool is_continue_ = true;
   std::unordered_map<std::string, std::any> inline_data_;
-};
+  std::vector<HttpCallback> route_funcs_;
+  int func_pos_ = 0;
 
-using HttpCallback = std::function<void(HttpContext &)>;
+private:
+  // for call run func
+  friend class HttpServer;
+};
 
 struct HttpTrieData {
   HttpCallback callback = nullptr;

src/test/http/server/http_server_test.hpp

@@ -232,6 +232,12 @@ TEST(HttpServer, Middleware) {
     ctx.Set("temp", temp);
     ctx.Next();
   };
+  atomic<int> abort_count = 0;
+  auto abort_func = [&abort_count](HttpContext &ctx) {
+    DEBUG("use abort");
+    abort_count++;
+    ctx.Abort();
+  };
 
   server.Use(count_func);
 
@@ -247,6 +253,13 @@ TEST(HttpServer, Middleware) {
               },
               count_func});
 
+  server.GET("/abort", {[&](HttpContext &ctx) {
+                          ctx.resp().Text(HttpStatusCode::OK, "hello world");
+                        },
+                        abort_func,
+                        [&](HttpContext &ctx) { FATAL("not end after abort"); },
+                        abort_func});
+
   // sync run server
   GO_JOIN([&] { server.Run(); });
 
@@ -257,6 +270,13 @@ TEST(HttpServer, Middleware) {
   HttpReq req;
   HttpResp resp;
 
+  req.GET("/abort");
+  rc = client.Send(req, resp);
+  MUST_TRUE(rc == 0, client.err_msg());
+  MUST_TRUE(resp.status_code() == HttpStatusCode::OK,
+            "get wrong status code " +
+                HttpStatusCodeUtil::ConvertToStr(resp.status_code()));
+
   req.GET("/hello");
   rc = client.Send(req, resp);
   MUST_TRUE(rc == 0, client.err_msg());
@@ -266,7 +286,9 @@ TEST(HttpServer, Middleware) {
   MUST_TRUE(resp.body() == "hello world", "get wrong body " + resp.body());
   DEBUG("resp: " << resp.body());
 
-  MUST_TRUE(count == 2, "get wrong count " + to_string(count));
+  MUST_TRUE(count == 4, "get wrong count " + to_string(count));
+  MUST_TRUE(abort_count == 1,
+            "get wrong abort count " + to_string(abort_count));
 }
 
 #ifdef CPPNET_OPENSSL

src/test/log/file_logger_test.hpp

@@ -66,6 +66,10 @@ TEST(FileLogger, FirstWrite) {
 }
 
 BENCHMARK(FileLogger, WriteRate) {
+#ifdef __APPLE__
+  // not use mac for benchmark
+  SKIP()
+#endif
   const std::string file_path = "file_benct_test.log";
   const std::string write_msg = "[test]:test-for-benchmark";
   auto logger = std::make_shared<FileLogger>();