UPD | some improvements #2

Author: xiadnoring

README.md

@@ -125,7 +125,7 @@ int main () {
 
         auto router = manapi::net::http::server::create(router_ctx).unwrap();
 
-        auto db = manapi::ext::pq::connection::create().unwrap();
+        auto db = manapi::ext::pq::db::create().unwrap();
 
         router.GET ("/", [&cnt] (http::req &req, http::uresp resp) mutable -> void {
             resp->text(std::format("Hello World! Count: {}", cnt.fetch_add(1))).unwrap();
@@ -187,13 +187,14 @@ int main () {
         router.GET("/pq/[id]", [db](manapi::net::http::request& req, manapi::net::http::response& resp) mutable -> manapi::future<> {
             auto msg = req.param("id").unwrap();
             char *end;
-            auto res1 = co_await db.exec("INSERT INTO for_test (id, str_col) VALUES ($2, $1);","no way", std::strtoll(msg.data(), &end, 10));
+            auto res1 = co_await db->execl(manapi::ext::pq::kMaster, "INSERT INTO for_test (id, str_col) VALUES ($2, $1);",
+                manapi::async::timeout_cancellation(2500), "no way", std::strtoll(msg.data(), &end, 10));
             if (!res1) {
                 if (res1.sqlcode() != manapi::ext::pq::SQL_STATE_UNIQUE_VIOLATION)
                     res1.err().log();
             }
 
-            auto res = co_await db.exec("SELECT * FROM for_test;");
+            auto res = co_await db->exec(manapi::ext::pq::kSlave, "SELECT * FROM for_test;");
             if (res) {
                 std::string content = "b";
                 for (const auto &row: res.unwrap()) {
@@ -211,7 +212,10 @@ int main () {
          * works in this context as long as possible.
          */
         manapi::async::run([router, db] () mutable -> manapi::future<> {
-            manapi::unwrap(co_await db.connect("127.0.0.1", "7879", "development", "password", "db"));
+            auto master = manapi::ext::pq::pool::create().unwrap();
+            manapi::unwrap(co_await master->connect(2, "127.0.0.1", "7879", "development", "password", "db"));
+            db->set_master(std::move(master)).unwrap();
+            
             manapi::unwrap(co_await router.config_object({
                 {"pools", manapi::json::array({
                     {

handlers.cpp

@@ -60,7 +60,7 @@
 //         -> manapi::future<> {
 //         ssize_t len = 10737418240 / 2;
 //
-//         resp.header(std::string{manapi::net::http::header::CONTENT_LENGTH}, std::to_string(len));
+//         resp.header(std::string{manapi::net::http::H_CONTENT_LENGTH}, std::to_string(len));
 //             co_return resp.callback_sync([current = (ssize_t)0, len] (char *buffer, ssize_t size, bool &flg) mutable
 //                     -> ssize_t {
 //                 size = std::min(size, len - current);
@@ -77,7 +77,7 @@
 //         char *end;
 //         ssize_t len = std::strtoll(req.param("size").unwrap().data(), &end, 10);
 //
-//         resp.header(std::string{manapi::net::http::header::CONTENT_LENGTH}, std::to_string(len));
+//         resp.header(std::string{manapi::net::http::H_CONTENT_LENGTH}, std::to_string(len));
 //         co_return resp.callback_sync([current = (ssize_t)0, len] (char *buffer, ssize_t size, bool &flg) mutable
 //                     -> ssize_t {
 //                 size = std::min(size, len - current);
@@ -135,9 +135,9 @@
 //
 //     router.POST ("/echo", [] (manapi::net::http::request &req, manapi::net::http::response &resp)
 //         -> manapi::future<> {
-//         if (req.contains_header(std::string{manapi::net::http::header::CONTENT_LENGTH}))
-//             resp.header(std::string{manapi::net::http::header::CONTENT_LENGTH},
-//                 std::string{req.header(manapi::net::http::header::CONTENT_LENGTH).unwrap()}).unwrap();
+//         if (req.contains_header(std::string{manapi::net::http::H_CONTENT_LENGTH}))
+//             resp.header(std::string{manapi::net::http::H_CONTENT_LENGTH},
+//                 std::string{req.header(manapi::net::http::H_CONTENT_LENGTH).unwrap()}).unwrap();
 //
 //         std::size_t sss = 0;
 //         co_return resp.callback_stream([&sss, &resp, &req] (manapi::net::http::response::resp_stream_cb cb) -> manapi::future<> {

include/ManapiErrors.hpp

@@ -191,6 +191,7 @@ namespace manapi {
      */
     class exception final : public std::exception {
     public:
+        explicit exception (messages msg);
         /**
          * initialize exception
          * @param errnum error code
@@ -236,8 +237,14 @@ namespace manapi {
 
         virtual ~status ();
 
+        status (messages msg);
+
+        status (err_num code, const char *msg);
+
         status (err_num code, std::string_view msg);
 
+        status (err_num code, std::string msg);
+
         status (status &&n) MANAPIHTTP_NOEXCEPT;
 
         status& operator= (status &&n) MANAPIHTTP_NOEXCEPT;
@@ -270,7 +277,7 @@ namespace manapi {
         /**
          * do log using the status
          */
-        virtual void log () const;
+        void log () const;
 
         /**
          * get the error code as a string
@@ -284,11 +291,19 @@ namespace manapi {
          *
          * @throws manapi::exception with the error code from the status
          */
-        virtual void unwrap () const;
+        void unwrap () const;
+
+        MANAPIHTTP_NODISCARD virtual std::string fullmsg () const;
 
         void stacktrace () const MANAPIHTTP_NOEXCEPT;
 
         MANAPIHTTP_NODISCARD operator bool () const MANAPIHTTP_NOEXCEPT;
+
+        void data (messages data);
+
+        messages data ();
+
+        messages copy_data ();
     protected:
         messages m_data;
     };
@@ -375,26 +390,132 @@ namespace manapi {
     };
 
     status status_ok ();
-    status status_unknown (std::string_view msg);
+
+    status status_unknown ();
+
     status status_cancelled ();
+
+    status status_invalid_argument ();
+
+    status status_deadline_exceeded ();
+
+    status status_not_found ();
+
+    status status_already_exists ();
+
+    status status_permission_denied ();
+
+    status status_resource_exhausted ();
+
+    status status_failed_precondition ();
+
+    status status_aborted ();
+
+    status status_unavailable ();
+
+    status status_out_of_range ();
+
+    status status_unimplemented ();
+
+    status status_internal ();
+
+    status status_data_loss ();
+
+    status status_data_loss (std::string msg);
+
+    status status_unknown (std::string msg);
+
+    status status_cancelled (std::string msg);
+
+    status status_invalid_argument (std::string msg);
+
+    status status_deadline_exceeded (std::string msg);
+
+    status status_not_found (std::string msg);
+
+    status status_already_exists (std::string msg);
+
+    status status_permission_denied (std::string msg);
+
+    status status_unauthenticated (std::string msg);
+
+    status status_resource_exhausted (std::string msg);
+
+    status status_failed_precondition (std::string msg);
+
+    status status_aborted (std::string msg);
+
+    status status_unavailable (std::string msg);
+
+    status status_out_of_range (std::string msg);
+
+    status status_unimplemented (std::string msg);
+
+    status status_internal (std::string msg);
+
+    status status_data_loss (const char * msg);
+
+    status status_unknown (const char * msg);
+
+    status status_cancelled (const char * msg);
+
+    status status_invalid_argument (const char * msg);
+
+    status status_deadline_exceeded (const char * msg);
+
+    status status_not_found (const char * msg);
+
+    status status_already_exists (const char * msg);
+
+    status status_permission_denied (const char * msg);
+
+    status status_unauthenticated (const char * msg);
+
+    status status_resource_exhausted (const char * msg);
+
+    status status_failed_precondition (const char * msg);
+
+    status status_aborted (const char * msg);
+
+    status status_unavailable (const char * msg);
+
+    status status_out_of_range (const char * msg);
+
+    status status_unimplemented (const char * msg);
+
+    status status_internal (const char * msg);
+
+    status status_data_loss (std::string_view msg);
+
+    status status_unknown (std::string_view msg);
+
     status status_cancelled (std::string_view msg);
+
     status status_invalid_argument (std::string_view msg);
+
     status status_deadline_exceeded (std::string_view msg);
+
     status status_not_found (std::string_view msg);
+
     status status_already_exists (std::string_view msg);
-    status status_already_exists ();
+
     status status_permission_denied (std::string_view msg);
+
     status status_unauthenticated (std::string_view msg);
-    status status_resource_exhausted ();
+
     status status_resource_exhausted (std::string_view msg);
+
     status status_failed_precondition (std::string_view msg);
+
     status status_aborted (std::string_view msg);
+
     status status_unavailable (std::string_view msg);
+
     status status_out_of_range (std::string_view msg);
+
     status status_unimplemented (std::string_view msg);
+
     status status_internal (std::string_view msg);
-    status status_internal ();
-    status status_data_loss (std::string_view msg);
 
     template<typename T>
     auto unwrap (T status) {

include/ManapiEventStructures.hpp

@@ -1022,15 +1022,12 @@ namespace manapi::ev {
 
         ~status () override;
 
-        /**
-         * initialize error status
-         *
-         * @param code the error code
-         * @param msg the error msg
-         * @param syserr the syserror code
-         */
         status (manapi::err_num code, std::string_view msg, int syserr);
 
+        status (manapi::err_num code, std::string msg, int syserr);
+
+        status (manapi::err_num code, const char * msg, int syserr);
+
         status (status &&n) MANAPIHTTP_NOEXCEPT;
 
         status &operator=(status &&n) MANAPIHTTP_NOEXCEPT;
@@ -1043,16 +1040,7 @@ namespace manapi::ev {
 
         status &operator=(const status &n);
 
-        /**
-         * print log to the logger() if it exists,
-         * otherwise it prints to the stdout
-         */
-        void log () const override;
-
-        /**
-         * throw a error if it exists, otherwise it does nothing
-         */
-        void unwrap() const override;
+        MANAPIHTTP_NODISCARD std::string fullmsg() const override;
 
         /**
          * Get the system code error

include/ext/pq/AsyncPostgreError.hpp

@@ -53,16 +53,12 @@ namespace manapi::ext::pq {
 
         ~status () override;
 
-        /**
-         * initialize error status
-         *
-         * @param code error code
-         * @param msg error msg
-         * @param sqlcode sql status code
-         * @param sqlmsg sql error message
-         */
         status (manapi::err_num code, std::string_view msg, std::size_t sqlcode, std::string sqlmsg);
 
+        status (manapi::err_num code, std::string msg, std::size_t sqlcode, std::string sqlmsg);
+
+        status (manapi::err_num code, const char * msg, std::size_t sqlcode, std::string sqlmsg);
+
         status (status &&n) MANAPIHTTP_NOEXCEPT;
 
         status &operator=(status &&n) MANAPIHTTP_NOEXCEPT;
@@ -73,16 +69,7 @@ namespace manapi::ext::pq {
 
         status (const status &n);
 
-        /**
-         * print log to the logger() if it exists,
-         * otherwise it prints to the stdout
-         */
-        void log () const override;
-
-        /**
-         * throw a error if it exists, otherwise it does nothing
-         */
-        void unwrap() const override;
+        MANAPIHTTP_NODISCARD std::string fullmsg() const override;
 
         MANAPIHTTP_NODISCARD bool is_sqlerr () const MANAPIHTTP_NOEXCEPT;