v0.7.8

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.7-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.8-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 server written in C and C++.
@@ -61,6 +61,7 @@ You can find code examples <a href="https://github.com/arnelify/arnelify-server-
 | **SERVER_MAX_FILES**| Defines the maximum number of files in the form.|
 | **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_NET_CHECK_FREQ_MS**| Network interface check frequency in milliseconds. The lower the value, the higher the CPU 
 | **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.|
@@ -73,7 +74,7 @@ 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.7 - Minimalistic dynamic library
+Version 0.7.8 - 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.
 

arnelify_server/index.py

@@ -28,6 +28,7 @@ def __init__(self, opts: dict):
       "SERVER_MAX_FILES",
       "SERVER_MAX_FILES_SIZE_TOTAL_MB",
       "SERVER_MAX_FILE_SIZE_MB",
+      "SERVER_NET_CHECK_FREQ_MS",
       "SERVER_PORT",
       "SERVER_QUEUE_LIMIT"
     ]
@@ -88,11 +89,11 @@ def server_thread():
         self.lib.server_http1_start(cCallback)
 
     thread = threading.Thread(target=server_thread)
-    thread.daemon = True  # Allows the thread to exit when the program exits
+    thread.daemon = True
     thread.start()
 
     try:
-      thread.join()  # This will block and keep the program running until the background thread finishes
+      thread.join()
     except KeyboardInterrupt:
       exit(1)
 

arnelify_server/src/addon.cpp

@@ -140,6 +140,16 @@ Napi::Value server_http1_create(const Napi::CallbackInfo& args) {
     return env.Undefined();
   }
 
+  const bool hasNetCheckFreqMs = json.isMember("SERVER_NET_CHECK_FREQ_MS") &&
+                                 json["SERVER_NET_CHECK_FREQ_MS"].isInt();
+  if (!hasNetCheckFreqMs) {
+    Napi::TypeError::New(env,
+                         "[Arnelify Server]: C++ error: "
+                         "'SERVER_NET_CHECK_FREQ_MS' is missing.")
+        .ThrowAsJavaScriptException();
+    return env.Undefined();
+  }
+
   const bool hasPort =
       json.isMember("SERVER_PORT") && json["SERVER_PORT"].isInt();
   if (!hasPort) {
@@ -150,8 +160,8 @@ Napi::Value server_http1_create(const Napi::CallbackInfo& args) {
     return env.Undefined();
   }
 
-  const bool hasThreadLimit =
-      json.isMember("SERVER_THREAD_LIMIT") && json["SERVER_THREAD_LIMIT"].isInt();
+  const bool hasThreadLimit = json.isMember("SERVER_THREAD_LIMIT") &&
+                              json["SERVER_THREAD_LIMIT"].isInt();
   if (!hasThreadLimit) {
     Napi::TypeError::New(env,
                          "[Arnelify Server]: C++ error: "
@@ -179,7 +189,7 @@ Napi::Value server_http1_create(const Napi::CallbackInfo& args) {
   if (!hasSocketPath) json["SERVER_SOCKET_PATH"] = "/tmp/arnelify.sock";
 
   UDSOpts udsOpts(json["SERVER_BLOCK_SIZE_KB"].asInt(),
-                          json["SERVER_SOCKET_PATH"].asString());
+                  json["SERVER_SOCKET_PATH"].asString());
   uds = new UDS(udsOpts);
 
   Http1Opts opts(
@@ -190,7 +200,9 @@ Napi::Value server_http1_create(const Napi::CallbackInfo& args) {
       json["SERVER_MAX_FIELDS_SIZE_TOTAL_MB"].asInt(),
       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_MAX_FILE_SIZE_MB"].asInt(), 
+      json["SERVER_NET_CHECK_FREQ_MS"].asInt(),
+      json["SERVER_PORT"].asInt(),
       json["SERVER_THREAD_LIMIT"].asInt(), json["SERVER_QUEUE_LIMIT"].asInt(),
       json["SERVER_UPLOAD_DIR"].asString());
 
@@ -351,9 +363,12 @@ Napi::Value uds_stop(const Napi::CallbackInfo& info) {
 }
 
 Napi::Object Init(Napi::Env env, Napi::Object exports) {
-  exports.Set("server_http1_create", Napi::Function::New(env, server_http1_create));
-  exports.Set("server_http1_destroy", Napi::Function::New(env, server_http1_destroy));
-  exports.Set("server_http1_start", Napi::Function::New(env, server_http1_start));
+  exports.Set("server_http1_create",
+              Napi::Function::New(env, server_http1_create));
+  exports.Set("server_http1_destroy",
+              Napi::Function::New(env, server_http1_destroy));
+  exports.Set("server_http1_start",
+              Napi::Function::New(env, server_http1_start));
   exports.Set("server_http1_stop", Napi::Function::New(env, server_http1_stop));
   exports.Set("uds_start", Napi::Function::New(env, uds_start));
   exports.Set("uds_stop", Napi::Function::New(env, uds_stop));

arnelify_server/src/ffi.cpp

@@ -119,8 +119,8 @@ void server_http1_create(const char *cOpts) {
     exit(1);
   }
 
-  const bool hasThreadLimit =
-      json.isMember("SERVER_THREAD_LIMIT") && json["SERVER_THREAD_LIMIT"].isInt();
+  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."
@@ -149,25 +149,24 @@ void server_http1_create(const char *cOpts) {
       json["SERVER_MAX_FIELDS_SIZE_TOTAL_MB"].asInt(),
       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_MAX_FILE_SIZE_MB"].asInt(),
+      json["SERVER_NET_CHECK_FREQ_MS"].asInt(), json["SERVER_PORT"].asInt(),
       json["SERVER_THREAD_LIMIT"].asInt(), json["SERVER_QUEUE_LIMIT"].asInt(),
       json["SERVER_UPLOAD_DIR"].asString());
-
   http1 = new Http1(opts);
 }
 
 void server_http1_destroy() { http1 = nullptr; }
 
 void server_http1_handler(const char *(*cHandler)(const char *)) {
-  http1->handler([cHandler](const Http1Req &req,
-                                           Http1Res res) -> void {
+  http1->handler([cHandler](const Http1Req &req, Http1Res res) -> void {
     Json::StreamWriterBuilder writer;
     writer["indentation"] = "";
     writer["emitUTF8"] = true;
 
     const std::string request = Json::writeString(writer, req);
     const char *cReq = request.c_str();
-    std::string cRes = cHandler(cReq);
+    const char *cRes = cHandler(cReq);
 
     Json::Value json;
     Json::CharReaderBuilder reader;
@@ -179,7 +178,6 @@ void server_http1_handler(const char *(*cHandler)(const char *)) {
       exit(1);
     }
 
-    cRes.clear();
     const bool hasCode = json.isMember("code");
     if (hasCode) {
       res->setCode(json["code"].asInt());

arnelify_server/src/tcp1/http1/contracts/opts.h

@@ -15,16 +15,17 @@ struct Http1Opts final {
   const int HTTP1_MAX_FILES;
   const std::size_t HTTP1_MAX_FILES_SIZE_TOTAL_MB;
   const std::size_t HTTP1_MAX_FILE_SIZE_MB;
+  const int HTTP1_NET_CHECK_FREQ_MS;
   const int HTTP1_PORT;
   const int HTTP1_THREAD_LIMIT;
   const int HTTP1_QUEUE_LIMIT;
   const std::filesystem::path HTTP1_UPLOAD_DIR;
 
-  Http1Opts(const bool &a, const int b, const std::string &c, const bool &g,
+  Http1Opts(const bool &ae, 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 tl,
-            const int q, const std::string &u = "storage/upload")
-      : HTTP1_ALLOW_EMPTY_FILES(a),
+            const int mflst, const int mfls, const int n, const int p,
+            const int tl, const int q, const std::string &u = "storage/upload")
+      : HTTP1_ALLOW_EMPTY_FILES(ae),
         HTTP1_BLOCK_SIZE_KB(b),
         HTTP1_CHARSET(c),
         HTTP1_GZIP(g),
@@ -34,6 +35,7 @@ struct Http1Opts final {
         HTTP1_MAX_FILES(mfl),
         HTTP1_MAX_FILES_SIZE_TOTAL_MB(mflst),
         HTTP1_MAX_FILE_SIZE_MB(mfls),
+        HTTP1_NET_CHECK_FREQ_MS(n),
         HTTP1_PORT(p),
         HTTP1_THREAD_LIMIT(tl),
         HTTP1_QUEUE_LIMIT(q),

arnelify_server/src/tcp1/http1/index.h

@@ -126,13 +126,15 @@ class Http1 {
 
       while (!ON_RECEIVER) {
         const ssize_t bytesRead = recv(task->clientSocket, block, blockLen, 0);
-        if (bytesRead == -1 && (errno == EWOULDBLOCK || errno == EAGAIN)) {
-          delete[] block;
-          this->asyncRead->addTask(task);
-          return;
+        // if (bytesRead == -1 && (errno == EWOULDBLOCK || errno == EAGAIN)) {
+        //   delete[] block;
+        //   this->asyncRead->addTask(task);
+        //   return;
+        // }
+
+        if (bytesRead > 0) {
+          ON_RECEIVER = task->receiver->onBlock(block, bytesRead);
         }
-
-        ON_RECEIVER = task->receiver->onBlock(block, bytesRead);
       }
 
       delete[] block;
@@ -182,6 +184,7 @@ class Http1 {
 
     sockaddr_in clientAddr;
     socklen_t clientLen = sizeof(clientAddr);
+    const int acceptDelay = this->opts.HTTP1_NET_CHECK_FREQ_MS;
     const Http1TaskOpts opts(
         this->opts.HTTP1_ALLOW_EMPTY_FILES, this->opts.HTTP1_BLOCK_SIZE_KB,
         this->opts.HTTP1_CHARSET, this->opts.HTTP1_GZIP,
@@ -211,6 +214,10 @@ class Http1 {
           break;
         }
 
+        if (acceptDelay) {
+          std::this_thread::sleep_for(std::chrono::milliseconds(acceptDelay));
+        }
+
         continue;
       }
 

arnelify_server/src/tcp1/http1/io/index.h

@@ -44,13 +44,13 @@ class Http1IO {
     if (this->isRunning) return;
     this->isRunning = true;
 
-    for (int i = 0; this->threadLimit > i; ++i) {
+    for (int i = 0; this->threadLimit > i; i++) {
       std::thread thread([this]() {
         while (true) {
           Http1Task* task = nullptr;
           {
             std::unique_lock<std::mutex> lock(this->mtx);
-            cv.wait(lock, [this]() { return !this->queue.empty() && this->isRunning; });
+            cv.wait(lock, [this]() { return !this->queue.empty() || !this->isRunning; });
             if (!this->isRunning) break;
 
             task = this->queue.front();

setup.py

@@ -11,7 +11,7 @@
 
 setup(
   name="arnelify_server",
-  version="0.7.7",
+  version="0.7.8",
   author="Arnelify",
   description="Minimalistic dynamic library which is a powerful server written in C and C++.",
   url='https://github.com/arnelify/arnelify-server-python',

tests/index.py

@@ -15,8 +15,9 @@ def main():
     "SERVER_MAX_FILES": 1,
     "SERVER_MAX_FILES_SIZE_TOTAL_MB": 60,
     "SERVER_MAX_FILE_SIZE_MB": 60,
+    "SERVER_NET_CHECK_FREQ_MS": 50,
     "SERVER_PORT": 3001,
-    "SERVER_THREAD_LIMIT": 1,
+    "SERVER_THREAD_LIMIT": 5,
     "SERVER_QUEUE_LIMIT": 1024,
     "SERVER_UPLOAD_DIR": "storage/upload"
   })