Fix timeout (#464)

Author: qicosmos

include/cinatra/coro_http_client.hpp

@@ -283,10 +283,10 @@ class coro_http_client : public std::enable_shared_from_this<coro_http_client> {
       co_return resp_data{std::make_error_code(std::errc::protocol_error), 404};
     }
 
-    auto future = start_timer(req_timeout_duration_, "connect timer");
+    auto future = start_timer(conn_timeout_duration_, "connect timer");
 
     data = co_await connect(u);
-    if (auto ec = co_await wait_timer(std::move(future)); ec) {
+    if (auto ec = co_await wait_future(std::move(future)); ec) {
       co_return resp_data{ec, 404};
     }
     if (!data.net_err) {
@@ -637,7 +637,7 @@ class coro_http_client : public std::enable_shared_from_this<coro_http_client> {
     return fut;
   }
 
-  async_simple::coro::Lazy<std::error_code> wait_timer(
+  async_simple::coro::Lazy<std::error_code> wait_future(
       async_simple::Future<async_simple::Unit> &&future) {
     if (!enable_timeout_) {
       co_return std::error_code{};
@@ -680,10 +680,10 @@ class coro_http_client : public std::enable_shared_from_this<coro_http_client> {
     size_t size = 0;
 
     if (socket_->has_closed_) {
-      auto future = start_timer(req_timeout_duration_, "connect timer");
+      auto future = start_timer(conn_timeout_duration_, "connect timer");
 
       data = co_await connect(u);
-      if (ec = co_await wait_timer(std::move(future)); ec) {
+      if (ec = co_await wait_future(std::move(future)); ec) {
         co_return resp_data{ec, 404};
       }
       if (data.net_err) {
@@ -710,6 +710,9 @@ class coro_http_client : public std::enable_shared_from_this<coro_http_client> {
       data = co_await send_single_part(key, part);
 
       if (data.net_err) {
+        if (data.net_err == asio::error::operation_aborted) {
+          data.net_err = std::make_error_code(std::errc::timed_out);
+        }
         co_return data;
       }
     }
@@ -724,7 +727,7 @@ class coro_http_client : public std::enable_shared_from_this<coro_http_client> {
     bool is_keep_alive = true;
     data = co_await handle_read(ec, size, is_keep_alive, std::move(ctx),
                                 http_method::POST);
-    if (auto errc = co_await wait_timer(std::move(future)); errc) {
+    if (auto errc = co_await wait_future(std::move(future)); errc) {
       ec = errc;
     }
 
@@ -868,10 +871,10 @@ class coro_http_client : public std::enable_shared_from_this<coro_http_client> {
     size_t size = 0;
 
     if (socket_->has_closed_) {
-      auto future = start_timer(req_timeout_duration_, "connect timer");
+      auto future = start_timer(conn_timeout_duration_, "connect timer");
 
       data = co_await connect(u);
-      if (ec = co_await wait_timer(std::move(future)); ec) {
+      if (ec = co_await wait_future(std::move(future)); ec) {
         co_return resp_data{ec, 404};
       }
       if (data.net_err) {
@@ -896,7 +899,7 @@ class coro_http_client : public std::enable_shared_from_this<coro_http_client> {
         auto bufs = cinatra::to_chunked_buffers<asio::const_buffer>(
             file_data.data(), rd_size, chunk_size_str, source->eof());
         if (std::tie(ec, size) = co_await async_write(bufs); ec) {
-          co_return resp_data{ec, 404};
+          break;
         }
       }
     }
@@ -914,7 +917,7 @@ class coro_http_client : public std::enable_shared_from_this<coro_http_client> {
         auto bufs = cinatra::to_chunked_buffers<asio::const_buffer>(
             file_data.data(), rd_size, chunk_size_str, file.eof());
         if (std::tie(ec, size) = co_await async_write(bufs); ec) {
-          co_return resp_data{ec, 404};
+          break;
         }
       }
     }
@@ -925,18 +928,23 @@ class coro_http_client : public std::enable_shared_from_this<coro_http_client> {
         auto bufs = cinatra::to_chunked_buffers<asio::const_buffer>(
             result.buf.data(), result.buf.size(), chunk_size_str, result.eof);
         if (std::tie(ec, size) = co_await async_write(bufs); ec) {
-          co_return resp_data{ec, 404};
+          break;
         }
         if (result.eof) {
           break;
         }
       }
     }
 
+    if (ec && ec == asio::error::operation_aborted) {
+      ec = std::make_error_code(std::errc::timed_out);
+      co_return resp_data{ec, 404};
+    }
+
     bool is_keep_alive = true;
     data = co_await handle_read(ec, size, is_keep_alive, std::move(ctx),
                                 http_method::POST);
-    if (auto errc = co_await wait_timer(std::move(future)); errc) {
+    if (auto errc = co_await wait_future(std::move(future)); errc) {
       ec = errc;
     }
 
@@ -1016,7 +1024,7 @@ class coro_http_client : public std::enable_shared_from_this<coro_http_client> {
           }
         }
         socket_->has_closed_ = false;
-        if (ec = co_await wait_timer(std::move(conn_future)); ec) {
+        if (ec = co_await wait_future(std::move(conn_future)); ec) {
           break;
         }
       }
@@ -1050,7 +1058,7 @@ class coro_http_client : public std::enable_shared_from_this<coro_http_client> {
 
       data =
           co_await handle_read(ec, size, is_keep_alive, std::move(ctx), method);
-      if (auto errc = co_await wait_timer(std::move(future)); errc) {
+      if (auto errc = co_await wait_future(std::move(future)); errc) {
         ec = errc;
       }
     } while (0);

tests/test_cinatra.cpp

@@ -794,6 +794,22 @@ TEST_CASE("test basic http request") {
   server_thread.join();
 }
 
+TEST_CASE("test coro_http_client request timeout") {
+  coro_http_client client{};
+  cinatra::coro_http_client::config conf{.conn_timeout_duration = 10s,
+                                         .req_timeout_duration = 1ms};
+  client.init_config(conf);
+  auto r =
+      async_simple::coro::syncAwait(client.connect("http://www.baidu.com"));
+  std::cout << r.net_err.message() << "\n";
+  if (!r.net_err) {
+    r = async_simple::coro::syncAwait(client.async_get("/"));
+    if (r.net_err) {
+      CHECK(r.net_err == std::errc::timed_out);
+    }
+  }
+}
+
 #ifdef INJECT_FOR_HTTP_CLIENT_TEST
 TEST_CASE("test inject failed") {
   // {