FIX | wait async task on error

Author: xiadnoring

include/std/ManapiAsyncParallelRun.hpp

@@ -15,8 +15,9 @@ namespace manapi::async {
                     if (this->flags)
                         reinterpret_cast<T *> (this->value)->~T();
 
-                    this->flags = 1;
                     new (this->value) T (co_await task);
+                    this->flags = 1;
+
                     co_return manapi::error::status_ok();
                 }
                 catch (std::exception const &e) {
@@ -102,10 +103,7 @@ namespace manapi::async {
         requires(!std::is_same_v<T1, void>)
         MANAPIHTTP_NODISCARD manapi::future<T1> get_or (T1 v) const;
 
-        template<typename T1 = T>
-        requires(!std::is_same_v<T1, void>)
         MANAPIHTTP_NODISCARD bool some () const MANAPIHTTP_NOEXCEPT;
-        //manapi::future<void> async_run_with_prepare(std::move_only_function<manapi::future<T>()> task, std::move_only_function<void()> cb);
     private:
         std::shared_ptr<data_t> data;
     };
@@ -192,7 +190,6 @@ namespace manapi::async {
     }
 
     template<typename T>
-    template<typename T1> requires (!std::is_same_v<T1, void>)
     bool parallel_run<T>::some() const MANAPIHTTP_NOEXCEPT {
         return this->data->value.some();
     }

src/http/ManapiBaseHttp.cpp

@@ -1270,7 +1270,10 @@ manapi::future<void> manapi::net::http::internal::send_file(std::unique_ptr<resp
         manapi_log_trace(debug::LOG_TRACE_MEDIUM, "send_file() %p failed due to %s", cdata->conn.get(), e.what());
     }
 
-    err: //co_await parallel.get_or(0);
+    err:
+    if (parallel.some()) {
+        co_await parallel.get_or(0);
+    }
     co_return;
 }
 

src/worker/ManapiTlsOverTcp.cpp

@@ -469,6 +469,7 @@ void manapi::net::worker::TLS::onrecv(const std::shared_ptr<ev::tcp> &watcher, c
     auto buff = buffer.as<char>();
     auto size = static_cast<ssize_t>(buffer.size());
     auto const data = conn->as<tls_connection_t>();
+    int rhs = 0;
 
     data->transfered += size;
     if (data->transfered >= this->config_->speed_limit_rate) {
@@ -478,10 +479,9 @@ void manapi::net::worker::TLS::onrecv(const std::shared_ptr<ev::tcp> &watcher, c
     manapi_log_trace_hard("TLS:recv %p flags=%d size=%zu", conn.get(), data->flags, buffer.size());
 
     while (size) {
-        auto rhs = this->ssl_bio_write_(data->rbio, buff, static_cast<int>(size));
+        rhs = this->ssl_bio_write_(data->rbio, buff, static_cast<int>(size));
         if (rhs <= 0) {
             /* error */
-            data->flags |= ev::DISCONNECT;
             goto err;
         }
 
@@ -490,9 +490,7 @@ void manapi::net::worker::TLS::onrecv(const std::shared_ptr<ev::tcp> &watcher, c
 
         /* TODO: resolve this dump logic */
 
-        if (data->flags & CONN_TLS_SHUTDOWN) {
-            assert(!(data->flags & CONN_CLOSED));
-        }
+        assert(!(data->flags & CONN_TLS_SHUTDOWN) || !(data->flags & CONN_CLOSED));
 
         while (!(data->flags & CONN_CLOSED)) {
             if (ssl_is_init_fininshed_(data->ssl)) {
@@ -582,20 +580,25 @@ void manapi::net::worker::TLS::onrecv(const std::shared_ptr<ev::tcp> &watcher, c
         goto err;
     }
 
-    if(this->check_read_stack_full_(conn, data)) {
+    if (this->check_read_stack_full_(conn, data)) {
         goto err;
     }
 
     return;
 
     err: {
-        auto const cdata = conn->as<tls_connection_t>();
-
         conn->cancellation.cancel();
 
-        this->close_connection(conn, CLOSE_CONN_SHUTDOWN);
+        int flags;
 
-        return;
+        if (rhs < 0) {
+            flags = CLOSE_CONN_EOS;
+        }
+        else {
+            flags = CLOSE_CONN_ERR;
+        }
+
+        this->close_connection(conn, flags);
     }
 }