v0.7.3

Author: taronsarkisyan

README.md

@@ -1,6 +1,6 @@
 <img src="https://static.wikia.nocookie.net/arnelify/images/c/c8/Arnelify-logo-2024.png/revision/latest?cb=20240701012515" style="width:336px;" alt="Arnelify Logo" />
 
-![Arnelify Server for Python](https://img.shields.io/badge/Arnelify%20Server%20for%20Python-0.7.2-yellow) ![C++](https://img.shields.io/badge/C++-2b-red) ![G++](https://img.shields.io/badge/G++-14.2.0-blue) ![Python](https://img.shields.io/badge/Python-3.11.2-blue) ![Nuitka](https://img.shields.io/badge/Nuitka-2.6.4-blue)
+![Arnelify Server for Python](https://img.shields.io/badge/Arnelify%20Server%20for%20Python-0.7.3-yellow) ![C++](https://img.shields.io/badge/C++-2b-red) ![G++](https://img.shields.io/badge/G++-14.2.0-blue) ![Python](https://img.shields.io/badge/Python-3.11.2-blue) ![Nuitka](https://img.shields.io/badge/Nuitka-2.6.4-blue)
 
 ## 🚀 About
 **Arnelify® Server for Python** - is a minimalistic dynamic library which is a powerful http-server written in C and C++.
@@ -62,6 +62,7 @@ You can find code examples <a href="https://github.com/arnelify/arnelify-server-
 | **SERVER_MAX_FILES_SIZE_TOTAL_MB** | Defines the maximum total size of all files in the form.|
 | **SERVER_MAX_FILE_SIZE_MB**| Defines the maximum size of a single file in the form.|
 | **SERVER_PORT**| Defines which port the server will listen on.|
+| **SERVER_THREAD_LIMIT**| Defines the maximum number of threads that will handle requests.|
 | **SERVER_QUEUE_LIMIT**| Defines the maximum size of the queue on the client socket.|
 | **SERVER_UPLOAD_DIR**| Specifies the upload directory for storage.|
 
@@ -72,16 +73,16 @@ This software is licensed under the <a href="https://github.com/arnelify/arnelif
 Join us to help improve this software, fix bugs or implement new functionality. Active participation will help keep the software up-to-date, reliable, and aligned with the needs of its users.
 
 ## ⭐ Release Notes
-Version 0.7.2 - Minimalistic dynamic library
+Version 0.7.3 - Minimalistic dynamic library
 
 We are excited to introduce the Arnelify Server dynamic library for Python! Please note that this version is raw and still in active development.
 
 Change log:
 
-* Minimalistic dynamic library
+* Multi-Threading
+* Minimalistic dynamic library for Python
 * Block processing in "on-the-fly" mode
 * GZIP support
-* Boost and Magic libraries have been removed
 * Significant refactoring and optimizations
 
 Please use this version with caution, as it may contain bugs and unfinished features. We are actively working on improving and expanding the server's capabilities, and we welcome your feedback and suggestions.

arnelify_server/cpp/addon.cpp

@@ -8,7 +8,7 @@
 #include "json.h"
 #include "napi.h"
 
-#include "uds/index.cpp"
+#include "uds/index.hpp"
 #include "index.cpp"
 
 ArnelifyServer* server = nullptr;
@@ -150,6 +150,16 @@ Napi::Value server_create(const Napi::CallbackInfo& args) {
     return env.Undefined();
   }
 
+  const bool hasThreadLimit =
+      json.isMember("SERVER_THREAD_LIMIT") && json["SERVER_THREAD_LIMIT"].isInt();
+  if (!hasThreadLimit) {
+    Napi::TypeError::New(env,
+                         "[Arnelify Server]: C++ error: "
+                         "'SERVER_THREAD_LIMIT' is missing.")
+        .ThrowAsJavaScriptException();
+    return env.Undefined();
+  }
+
   const bool hasQueueLimit =
       json.isMember("SERVER_QUEUE_LIMIT") && json["SERVER_QUEUE_LIMIT"].isInt();
   if (!hasQueueLimit) {
@@ -181,11 +191,11 @@ Napi::Value server_create(const Napi::CallbackInfo& args) {
       json["SERVER_MAX_FILES"].asInt(),
       json["SERVER_MAX_FILES_SIZE_TOTAL_MB"].asInt(),
       json["SERVER_MAX_FILE_SIZE_MB"].asInt(), json["SERVER_PORT"].asInt(),
-      json["SERVER_QUEUE_LIMIT"].asInt(), json["SERVER_UPLOAD_DIR"].asString());
+      json["SERVER_THREAD_LIMIT"].asInt(), json["SERVER_QUEUE_LIMIT"].asInt(),
+      json["SERVER_UPLOAD_DIR"].asString());
 
   server = new ArnelifyServer(opts);
-  server->setHandler([](const ArnelifyServerReq& req, ArnelifyServerRes res)
-  {
+  server->setHandler([](const ArnelifyServerReq& req, ArnelifyServerRes res) {
     std::promise<const std::string> promise;
     std::future<const std::string> future = promise.get_future();
     std::thread thread(

arnelify_server/cpp/contracts/logger.hpp

@@ -0,0 +1,9 @@
+#ifndef ARNELIFY_SERVER_LOGGER_HPP
+#define ARNELIFY_SERVER_LOGGER_HPP
+
+#include <functional>
+
+using ArnelifyServerLogger =
+    std::function<void(const std::string &, const bool &)>;
+
+#endif

arnelify_server/cpp/contracts/opts.hpp

@@ -16,13 +16,14 @@ struct ArnelifyServerOpts final {
   const std::size_t SERVER_MAX_FILES_SIZE_TOTAL_MB;
   const std::size_t SERVER_MAX_FILE_SIZE_MB;
   const int SERVER_PORT;
+  const int SERVER_THREAD_LIMIT;
   const int SERVER_QUEUE_LIMIT;
   const std::filesystem::path SERVER_UPLOAD_DIR;
 
   ArnelifyServerOpts(const bool &a, const int &b, const std::string &c,
                      const bool &g, const bool &k, const int &mfd,
                      const int &mfdst, const int &mfl, const int &mflst,
-                     const int &mfls, const int &p, const int &q,
+                     const int &mfls, const int &p, const int tl, const int &q,
                      const std::string &u = "./src/storage/upload")
       : SERVER_ALLOW_EMPTY_FILES(a),
         SERVER_BLOCK_SIZE_KB(b),
@@ -35,6 +36,7 @@ struct ArnelifyServerOpts final {
         SERVER_MAX_FILES_SIZE_TOTAL_MB(mflst),
         SERVER_MAX_FILE_SIZE_MB(mfls),
         SERVER_PORT(p),
+        SERVER_THREAD_LIMIT(tl),
         SERVER_QUEUE_LIMIT(q),
         SERVER_UPLOAD_DIR(u) {};
 };

arnelify_server/cpp/ffi.cpp

@@ -119,6 +119,15 @@ void server_create(const char *cOpts) {
     exit(1);
   }
 
+  const bool hasThreadLimit =
+      json.isMember("SERVER_THREAD_LIMIT") && json["SERVER_THREAD_LIMIT"].isInt();
+  if (!hasThreadLimit) {
+    std::cout << "[Arnelify Server FFI]: C error: "
+                 "'SERVER_THREAD_LIMIT' is missing."
+              << std::endl;
+    exit(1);
+  }
+
   const bool hasQueueLimit =
       json.isMember("SERVER_QUEUE_LIMIT") && json["SERVER_QUEUE_LIMIT"].isInt();
   if (!hasQueueLimit) {
@@ -141,7 +150,8 @@ void server_create(const char *cOpts) {
       json["SERVER_MAX_FILES"].asInt(),
       json["SERVER_MAX_FILES_SIZE_TOTAL_MB"].asInt(),
       json["SERVER_MAX_FILE_SIZE_MB"].asInt(), json["SERVER_PORT"].asInt(),
-      json["SERVER_QUEUE_LIMIT"].asInt(), json["SERVER_UPLOAD_DIR"].asString());
+      json["SERVER_THREAD_LIMIT"].asInt(), json["SERVER_QUEUE_LIMIT"].asInt(),
+      json["SERVER_UPLOAD_DIR"].asString());
 
   server = new ArnelifyServer(opts);
 }
@@ -150,7 +160,8 @@ void server_destroy() { server = nullptr; }
 
 void server_set_handler(const char *(*cHandler)(const char *),
                         const int hasRemove) {
-  server->setHandler([cHandler, hasRemove](const ArnelifyServerReq &req, ArnelifyServerRes res) -> void {
+  server->setHandler([cHandler, hasRemove](const ArnelifyServerReq &req,
+                                           ArnelifyServerRes res) -> void {
     Json::StreamWriterBuilder writer;
     writer["indentation"] = "";
     writer["emitUTF8"] = true;
@@ -191,7 +202,6 @@ void server_set_handler(const char *(*cHandler)(const char *),
     if (json.isMember("filePath") && json.isMember("isStatic") &&
         json["filePath"].isString() && json["isStatic"].isBool() &&
         !json["filePath"].asString().empty()) {
-
       res->setFile(json["filePath"].asString(), json["isStatic"].asBool());
       res->end();
       return;