FIX | workflow

Author: xiadnoring

.github/workflows/conan_build_and_test.yml

@@ -38,15 +38,6 @@ jobs:
       uses: actions/setup-python@v4
       with:
         python-version: "3.11"
-
-    - name: switch to gcc-14 on linux
-      if: ${{ matrix.os == 'ubuntu-latest' }}
-      run: |
-        sudo add-apt-repository ppa:ubuntu-toolchain-r/ppa -y
-        sudo apt update
-        sudo apt install g++-14 gcc-14
-        echo "CXX=g++-14" >> $GITHUB_ENV
-        echo "CC=gcc-14" >> $GITHUB_ENV
 
     - name: Install Conan
       run: pip install conan==2.*
@@ -89,13 +80,13 @@ jobs:
       run: conan cache clean "*/*"
 
     - name: Configure CMake
-      run: cmake --preset conan-release -DMANAPIHTTP_DISABLE_TRACE_HARD=ON -DMANAPIHTTP_STD_BACKTRACE_DEPENDENCY=OFF
+      run: cmake --preset conan-release -DMANAPIHTTP_ENABLE_TESTS=ON -DMANAPIHTTP_DISABLE_TRACE_HARD=ON -DMANAPIHTTP_STD_BACKTRACE_DEPENDENCY=OFF
 
     - name: Build
       run: cmake --build build/Release
 
     - name: Run unit tests
       run: ctest --output-on-failure -C Release
-      working-directory: build
+      working-directory: build/Release
 
 

handlers.cpp

@@ -9,7 +9,6 @@ void init_http_server(manapi::net::http::server &router, std::string const &fold
     router.GET("/", folder, [] (http::req &req, http::resp &resp)
         -> manapi::future<> {
         resp.compress_enabled(true);
-        req.url()
         resp.compress("zstd");
         co_return;
     });

include/http/ManapiHttpResponse.hpp

@@ -32,7 +32,9 @@ namespace manapi::net::http {
         using resp_callback_async = std::move_only_function<manapi::future<ssize_t>(slice_view buffs, bool&)>;
         using resp_stream_cb = std::move_only_function<manapi::future<ssize_t>(manapi::slice_view buffs, bool)>;
         using resp_stream = std::move_only_function<manapi::future<>(resp_stream_cb cb)>;
+#ifdef MANAPIHTTP_FETCH_SUPPORT
         using resp_proxy_setup_cb = std::move_only_function<void(class manapi::net::fetch &)>;
+#endif
 
         response (internal::handle_data_t* cdata, uint16_t status, http::config *config, std::unique_ptr<http::request> req);
 

src/ManapiEventLoop.cpp

@@ -679,7 +679,7 @@ manapi::sys_error::status_or<std::shared_ptr<manapi::event_loop>> manapi::event_
     try {
         ev->loop_ = std::make_unique<uv_loop_t>();
 
-#ifdef MANAPIHTTP_CURL_DEPENDENCY
+#if MANAPIHTTP_CURL_DEPENDENCY
         ev->curl_watcher = std::make_unique<ev::internal::curl_watcher_t>();
 #endif
 
@@ -804,11 +804,11 @@ manapi::sys_error::status_or<std::shared_ptr<manapi::event_loop>> manapi::event_
             if (ev->callback_watcher_) {
                 ev->stop_watcher(std::move(ev->callback_watcher_->adding_async));
             }
-
+#if MANAPIHTTP_CURL_DEPENDENCY
             if (ev->curl_watcher) {
                 ev->stop_watcher(std::move(ev->curl_watcher->timeout_watcher));
             }
-
+#endif
             ev->stop_watcher(std::move(ev->interrupted_watcher_));
             ev->stop_watcher(std::move(ev->prepare_tasks_));
             ev->stop_watcher(std::move(ev->idle_tasks_));
@@ -889,8 +889,9 @@ void manapi::event_loop::wait() {
     this->stop_watcher(std::move(this->callback_watcher_->adding_async));
     this->stop_watcher(std::move(this->idle_tasks_));
     this->stop_watcher(std::move(this->prepare_tasks_));
+#if MANAPIHTTP_CURL_DEPENDENCY
     this->stop_watcher(std::move(this->curl_watcher->timeout_watcher));
-
+#endif
     std::shared_ptr<ev::idle> idle_tasks;
 
     if (this->loop_) {
@@ -1139,6 +1140,21 @@ manapi::error::status manapi::event_loop::custom_callback(std::move_only_functio
     return this->custom_callback(&cb);
 }
 
+manapi::error::status manapi::event_loop::custom_callback(std::move_only_function<void(event_loop *ev)> *cb) MANAPIHTTP_NOEXCEPT {
+    try {
+        std::unique_lock<std::mutex> lk (this->callback_watcher_->adding_mx);
+        this->callback_watcher_->callback_data.push_back({nullptr});
+        this->callback_watcher_->callback_data.back().cb = std::move(*cb);
+        lk.unlock();
+        this->callback_watcher_->adding_async_cb();
+        return error::status_ok();
+    }
+    catch (std::exception const &e) {
+        manapi_log_error("%s due to %s", "custom_callback:Failed",e.what());
+        return error::status_internal("custom_callback:Failed");
+    }
+}
+
 #if MANAPIHTTP_CURL_DEPENDENCY
 void manapi::event_loop::handle_curl_exec_connections() {
     int running_handles = 0;
@@ -1420,21 +1436,6 @@ manapi::error::status manapi::event_loop::pause_watch_curl(void * shared_curl) M
     return error::status_ok();
 }
 
-manapi::error::status manapi::event_loop::custom_callback(std::move_only_function<void(event_loop *ev)> *cb) MANAPIHTTP_NOEXCEPT {
-    try {
-        std::unique_lock<std::mutex> lk (this->callback_watcher_->adding_mx);
-        this->callback_watcher_->callback_data.push_back({nullptr});
-        this->callback_watcher_->callback_data.back().cb = std::move(*cb);
-        lk.unlock();
-        this->callback_watcher_->adding_async_cb();
-        return error::status_ok();
-    }
-    catch (std::exception const &e) {
-        manapi_log_error("%s due to %s", "custom_callback:Failed",e.what());
-        return error::status_internal("custom_callback:Failed");
-    }
-}
-
 manapi::error::status manapi::event_loop::unpause_watch_curl(void *shared_curl) MANAPIHTTP_NOEXCEPT {
     auto &curl = *static_cast<std::shared_ptr<CURL> *> (shared_curl);
     /* unpause */

src/ManapiHttp.cpp

@@ -12,10 +12,9 @@
 
 #include "ManapiHttp.hpp"
 #include "std/ManapiAsyncPromise.hpp"
-
+#include "fs/ManapiFilesystem.hpp"
 #include "./include/ManapiSiteInternal.hpp"
 #include "./include/ManapiUtils.hpp"
-#include "./include/ManapiUtils.hpp"
 
 manapi::net::http::server::~server() = default;
 

src/compress/ManapiCompress.cpp

@@ -8,7 +8,39 @@
 
 #define CHUNK_SIZE 65536
 
-#ifdef MANAPIHTTP_BROTLI_DEPENDENCY
+
+static manapi::future<manapi::error::status> compress_file_init (manapi::filesystem::fstream &input, manapi::filesystem::fstream &output, std::string src, std::string dest, manapi::async::cancellation_action &cancellation) {
+    auto ires = manapi::filesystem::fstream::create (std::move(src), manapi::async::cancellation_action::unit(cancellation));
+    auto ores = manapi::filesystem::fstream::create (std::move(dest), manapi::async::cancellation_action::unit(cancellation));
+
+    if (!ires)
+        co_return ires.err();
+
+    if (!ores)
+        co_return ores.err();
+
+    input = ires.unwrap();
+    output = ores.unwrap();
+
+    auto oires = co_await input.open(manapi::ev::FS_O_RDONLY);
+    if (!oires) {
+        manapi_log_trace(manapi::debug::LOG_TRACE_MEDIUM, "%s failed due to %.*s",
+            "compress:input open", oires.sysmsg().size(), oires.sysmsg().data());
+        co_return std::move(oires);
+    }
+    auto oores = co_await output.open(manapi::ev::FS_O_CREAT|manapi::ev::FS_O_TRUNC|manapi::ev::FS_O_WRONLY,
+        manapi::ev::IRUSR|manapi::ev::IWUSR|manapi::ev::IRGRP);
+    if (!oores) {
+        manapi_log_trace(manapi::debug::LOG_TRACE_MEDIUM, "%s failed due to %.*s",
+            "compress:output open", oores.sysmsg().size(), oores.sysmsg().data());
+        co_return std::move(oores);
+    }
+
+    co_return manapi::error::status_ok();
+}
+
+
+#if MANAPIHTTP_BROTLI_DEPENDENCY
 
 #   include <brotli/encode.h>
 #   include <brotli/decode.h>
@@ -53,36 +85,6 @@ manapi::error::status_or<std::string> manapi::compress::brotli_compress_string(s
     return error::status_internal("brotli: compress failed");
 }
 
-static manapi::future<manapi::error::status> compress_file_init (manapi::filesystem::fstream &input, manapi::filesystem::fstream &output, std::string src, std::string dest, manapi::async::cancellation_action &cancellation) {
-    auto ires = manapi::filesystem::fstream::create (std::move(src), manapi::async::cancellation_action::unit(cancellation));
-    auto ores = manapi::filesystem::fstream::create (std::move(dest), manapi::async::cancellation_action::unit(cancellation));
-
-    if (!ires)
-        co_return ires.err();
-
-    if (!ores)
-        co_return ores.err();
-
-    input = ires.unwrap();
-    output = ores.unwrap();
-
-    auto oires = co_await input.open(manapi::ev::FS_O_RDONLY);
-    if (!oires) {
-        manapi_log_trace(manapi::debug::LOG_TRACE_MEDIUM, "%s failed due to %.*s",
-            "compress:input open", oires.sysmsg().size(), oires.sysmsg().data());
-        co_return std::move(oires);
-    }
-    auto oores = co_await output.open(manapi::ev::FS_O_CREAT|manapi::ev::FS_O_TRUNC|manapi::ev::FS_O_WRONLY,
-        manapi::ev::IRUSR|manapi::ev::IWUSR|manapi::ev::IRGRP);
-    if (!oores) {
-        manapi_log_trace(manapi::debug::LOG_TRACE_MEDIUM, "%s failed due to %.*s",
-            "compress:output open", oores.sysmsg().size(), oores.sysmsg().data());
-        co_return std::move(oores);
-    }
-
-    co_return manapi::error::status_ok();
-}
-
 manapi::future<manapi::error::status> manapi::compress::brotli_compress_file(std::string src, std::string dest, int quality, int window, int mode, manapi::async::cancellation_action cancellation) {
     manapi::filesystem::fstream input, output;
 
@@ -189,7 +191,7 @@ manapi::future<manapi::error::status> manapi::compress::brotli_decompress_file(s
 
 #endif
 
-#ifdef MANAPIHTTP_ZSTD_DEPENDENCY
+#if MANAPIHTTP_ZSTD_DEPENDENCY
 
 #   include <zstd.h>
 

src/http/ManapiBaseHttp.cpp

@@ -22,11 +22,13 @@
 
 static const std::set<std::string> methods = {"POST", "GET", "HEAD", "OPTIONS", "TRACE", "PUT", "DELETE", "PATCH", "CONNECT"};
 
+#ifdef MANAPIHTTP_FETCH_SUPPORT
 struct response_proxy_data_t {
     ssize_t content_length;
     manapi::net::fetch fetch;
     std::unique_ptr<manapi::net::http::response> resp;
 };
+#endif
 
 std::string manapi::net::http::internal::generate_default_page(int status, std::string_view msg) {
     return std::format("<html>\n\t<head>\n\t\t"

src/json/ManapiJson.cpp

@@ -255,15 +255,15 @@ manapi::error::status manapi::json::parse_(STRING_VIEW plain_text, bool use_bigi
     return error::status_ok();
 }
 #else
-void manapi::json::parse_(STRING_VIEW plain_text) {
+manapi::error::status manapi::json::parse_(STRING_VIEW plain_text) {
     json_builder builder (json_mask(nullptr));
     auto res = builder.parse(plain_text);
     if (!res.ok())
         return std::move(res);
     auto rhs = builder.get();
     if (!rhs.ok())
         return std::move(rhs.err());
-    *this = std::move(rhs.value());
+    *this = rhs.unwrap();
     return error::status_ok();
 }
 #endif
@@ -1560,7 +1560,7 @@ bool manapi::json::operator<=(DECIMAL n) const {
 bool manapi::json::operator==(const NULLPTR &n) const {
     return this->is_null();
 }
-
+#ifdef MANAPIHTTP_BIGINT_SUPPORT
 bool manapi::json::operator!=(const BIGINT &n) const {
     return !this->operator==(n);
 }
@@ -1621,6 +1621,8 @@ bool manapi::json::operator>=(const BIGINT &n) const {
 
 }
 
+#endif
+
 manapi::json manapi::json::operator-(INTEGER num) const {
     return std::move(this->operator+(-num));
 }

tests/test_fs.cpp

@@ -1,19 +1,9 @@
-//#ifdef MANAPIHTTP_HTTP_AS_EXECUTABLE
 #   include "ManapiInitTools.hpp"
 #   include "ManapiProcess.hpp"
 #   include "json/ManapiJson.hpp"
 #   include "json/ManapiJsonMask.hpp"
 #   include "json/ManapiJsonBuilder.hpp"
 #   include "fs/ManapiFilesystem.hpp"
-// #else
-// #   include <manapihttp/ManapiInitTools.hpp>
-// #   include <manapihttp/ManapiProcess.hpp>
-// #   include <manapihttp/json/ManapiJson.hpp>
-// #   include <manapihttp/json/ManapiJsonMask.hpp>
-// #   include <manapihttp/json/ManapiJsonBuilder.hpp>
-// #   include <manapihttp/fs/ManapiFilesystem.hpp>
-// #endif
-
 #include "./utest.h"
 
 UTEST(fs_path, join_1) {