macaw_framework 1.0.3 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 25f8f9d1a39c45e8cab35097244e958621fd566992335198ad0fae2fd482bdbd
-  data.tar.gz: 1c0d3558ccd3aaa5b81ee4df1c80227aa558df0a62cc5b82695f0aa58b5b875f
+  metadata.gz: 8f108da6fb2654c701154a544cea00e47d9546c5092ef3dcbc1e299c34420ddd
+  data.tar.gz: 23c72078365336da0585d7ee88cce41db2972efcfcc72c930ccceb73edb302ed
 SHA512:
-  metadata.gz: 25013e659bf86515d3d730a2d8b98c7efdb3f69fc691122e7515b6de38c772d0973d3c23d8dac9824001eb4a34b9ffe99f0c08826f71b14263fdb273b74c0cdb
-  data.tar.gz: 872c0b12123044cf2ae34c01e2b6ff05cf1bfaa0698de8d4571fdf8492647b24c88ba415407753423db8dfcd6c6854b5cc4c16b2c856884b4ae260f25c8b6454
+  metadata.gz: 9e0feab01f25bab3ce8b65799c516f04a837c5e250b8f53934049c2c3f1db303d92cfa9629151c0c8b46836e9a77690aea1a27cfc7b8bb1b99c7f9340a3cb8f1
+  data.tar.gz: cb769896b94e443248ecc419ffb69f0c587e9cda52430516204b8bcfed0a56eed5cf4aac3f6ca05f53dabe5d954777579e088c351dd82f2a61fdf47871bc143a

data/CHANGELOG.md

@@ -59,3 +59,11 @@
 - Fixing issue of error responses being cached
 - Implementing support for min and max SSL version
 - Creating log sanitization to prevent log forging
+
+## [1.0.4] - 2023-05-11
+
+- Fixing issue with response body returning always a blank line at the beginning
+
+## [1.0.5] - 2023-05-12
+
+- Fixing critical bug where threads were being killed and not respawning after abrupt client connection shutdown

data/lib/macaw_framework/core/server.rb

@@ -55,14 +55,15 @@ class Server
   def run
     @server = TCPServer.new(@bind, @port)
     @server = OpenSSL::SSL::SSLServer.new(@server, @context) if @context
+    @workers_mutex = Mutex.new
     @num_threads.times do
-      @workers << Thread.new do
-        loop do
-          client = @work_queue.pop
-          break if client == :shutdown
+      spawn_worker
+    end
 
-          handle_client(client)
-        end
+    Thread.new do
+      loop do
+        sleep 10
+        maintain_worker_pool
       end
     end
 
@@ -100,6 +101,8 @@ class Server
     message ||= nil
     response_headers ||= nil
     client.puts ResponseDataFilter.mount_response(status, response_headers, message)
+  rescue IOError, Errno::EPIPE => e
+    @macaw_log.error("Error writing to client: #{e.message}")
   rescue TooManyRequestsError
     client.print "HTTP/1.1 429 Too Many Requests\r\n\r\n"
   rescue EndpointNotMappedError
@@ -108,7 +111,11 @@ class Server
     client.print "HTTP/1.1 500 Internal Server Error\r\n\r\n"
     @macaw_log.info("Error: #{e}")
   ensure
-    client.close
+    begin
+      client.close
+    rescue IOError => e
+      @macaw_log.error("Error closing client: #{e.message}")
+    end
   end
 
   def declare_client_session(client)
@@ -181,4 +188,28 @@ class Server
   def get_client_data(body, headers, parameters)
     { body: body, headers: headers, params: parameters }
   end
+
+  def spawn_worker
+    @workers_mutex.synchronize do
+      @workers << Thread.new do
+        loop do
+          client = @work_queue.pop
+          break if client == :shutdown
+
+          handle_client(client)
+        end
+      end
+    end
+  end
+
+  def maintain_worker_pool
+    @workers_mutex.synchronize do
+      @workers.each_with_index do |worker, index|
+        unless worker.alive?
+          @macaw_log.error("Worker thread #{index} died, respawning...")
+          @workers[index] = spawn_worker
+        end
+      end
+    end
+  end
 end

data/lib/macaw_framework/data_filters/response_data_filter.rb

@@ -19,13 +19,13 @@ module ResponseDataFilter
   end
 
   def self.mount_response_headers(headers)
-    return nil if headers.nil?
+    return "" if headers.nil?
 
     response = ""
     headers.each do |key, value|
       response += "#{key}: #{value}\r\n"
     end
-    response += "\r\n\r\n"
+    response += "\r\n"
     response
   end
 end

data/lib/macaw_framework/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MacawFramework
-  VERSION = "1.0.3"
+  VERSION = "1.0.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: macaw_framework
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.5
 platform: ruby
 authors:
 - Aria Diniz
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-05-10 00:00:00.000000000 Z
+date: 2023-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: prometheus-client