macaw_framework 1.3.1 → 1.3.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: faee0746cfa34d7020272e9c6a3d24f12bff1c88ef3a5f8bf1f65be5dc7de8b2
-  data.tar.gz: f3dfa0a71a12df9d0fdf07fcedcf9fe8cc29db81c20aa003482f5a465a330648
+  metadata.gz: 85d0826c8f583c5485bbd7d9be3868a407a065a8a7968efb1c2e6d60c100d79d
+  data.tar.gz: 7b1a1c9ab29d649ccf05e077ac347a7e1cbb9714bb65aea9b417a2139dca5a6a
 SHA512:
-  metadata.gz: 92b61e93524104407eba6c9d2621990a7cc6b68e0733a78fedc75cff6fc248601410344aa421dec9e79f77a52b391d7f2e102cb54f639a127ebeaf4b00c5f2fb
-  data.tar.gz: 3eb62e30474e588dd0200f981aaa847ddf2725d7092d9c4387a0a5c63c2870f2ae87bd7f7998d0149dd00c592d144d0d6188464de6a473334ec94733967aef3d
+  metadata.gz: 7f04277f705c63685e6886e148f092694b445b4896b383783ea4cadfc1b266c158380af777a75dc791405a2ac2bd462d75a613c361e19da8e67ce284c134ddf9
+  data.tar.gz: e0dcbe81cbb9a26b289819e051d21b65d63f64ece3403da0e1c16aefadad1ac0e6a1e744da661d48bba623afe0aecdbe186d2ef9c4fe94131e7aac8bf4537a58

data/CHANGELOG.md

@@ -147,3 +147,7 @@
 - Fixing bug where missing session configuration on `application.json` break the application
 - Including a Cache module for manual caching.
 
+## [1.3.21]
+- Refactoring shutdown method
+- Fixing a bug where a HTTP call without client data broke the parser
+- Removing logs registering new HTTP connections to reduce log bloat

data/lib/macaw_framework/aspects/logging_aspect.rb

@@ -11,9 +11,6 @@ module LoggingAspect
   def call_endpoint(logger, *args)
     return super(*args) if logger.nil?
 
-    endpoint_name = args[1].split('.')[1..].join('/')
-    logger.info("Request received for [#{endpoint_name}] from [#{args[-1]}]")
-
     begin
       response = super(*args)
     rescue StandardError => e

data/lib/macaw_framework/core/common/server_base.rb

@@ -39,14 +39,13 @@ module ServerBase
   end
 
   def handle_client(client)
-    path, method_name, headers, body, parameters = RequestDataFiltering.parse_request_data(client, @macaw.routes)
+    _path, method_name, headers, body, parameters = RequestDataFiltering.parse_request_data(client, @macaw.routes)
     raise EndpointNotMappedError unless @macaw.respond_to?(method_name)
     raise TooManyRequestsError unless @rate_limit.nil? || @rate_limit.allow?(client.peeraddr[3])
 
     client_data = get_client_data(body, headers, parameters)
     session_id = declare_client_session(client_data[:headers], @macaw.secure_header) if @macaw.session
 
-    @macaw_log&.info("Running #{path.gsub("\n", '').gsub("\r", '')}")
     message, status, response_headers = call_endpoint(@prometheus_middleware, @macaw_log, @cache,
                                                       method_name, client_data, session_id, client.peeraddr[3])
     response_headers ||= {}

data/lib/macaw_framework/core/thread_server.rb

@@ -74,8 +74,17 @@ class ThreadServer
 
   ##
   # Method Responsible for closing the TCP server.
-  def close
-    shutdown
+  def shutdown
+    @is_shutting_down = true
+    loop do
+      break if @work_queue.empty?
+
+      sleep 0.1
+    end
+
+    @num_threads.times { @work_queue << :shutdown }
+    @workers.each(&:join)
+    @server.close
   end
 
   private
@@ -107,17 +116,4 @@ class ThreadServer
       end
     end
   end
-
-  def shutdown
-    @is_shutting_down = true
-    loop do
-      break if @work_queue.empty?
-
-      sleep 0.1
-    end
-
-    @num_threads.times { @work_queue << :shutdown }
-    @workers.each(&:join)
-    @server.close
-  end
 end

data/lib/macaw_framework/data_filters/request_data_filtering.rb

@@ -11,7 +11,7 @@ module RequestDataFiltering
   # Method responsible for extracting information
   # provided by the client like Headers and Body
   def self.parse_request_data(client, routes)
-    path, parameters = extract_url_parameters(client.gets.gsub('HTTP/1.1', ''))
+    path, parameters = extract_url_parameters(client.gets&.gsub('HTTP/1.1', ''))
     parameters = {} if parameters.nil?
 
     method_name = sanitize_method_name(path)
@@ -26,15 +26,15 @@ module RequestDataFiltering
 
     selected_route = nil
     routes.each do |route|
-      split_route = route.split('.')
-      split_name = method_name.split('.')
+      split_route = route&.split('.')
+      split_name = method_name&.split('.')
 
-      next unless split_route.length == split_name.length
+      next unless split_route&.length == split_name&.length
       next unless match_path_with_route(split_name, split_route)
 
       selected_route = route
-      split_route.each_with_index do |var, index|
-        parameters[var[1..].to_sym] = split_name[index] if var =~ VARIABLE_PATTERN
+      split_route&.each_with_index do |var, index|
+        parameters[var[1..].to_sym] = split_name&.dig(index) if var =~ VARIABLE_PATTERN
       end
       break
     end
@@ -45,7 +45,7 @@ module RequestDataFiltering
   end
 
   def self.match_path_with_route(split_path, split_route)
-    split_route.each_with_index do |var, index|
+    split_route&.each_with_index do |var, index|
       return false if var != split_path[index] && !var.match?(VARIABLE_PATTERN)
     end
 
@@ -56,26 +56,28 @@ module RequestDataFiltering
   # Method responsible for sanitizing the method name
   def self.sanitize_method_name(path)
     path = extract_path(path)
-    method_name = path.gsub('/', '.').strip.downcase
-    method_name.gsub!(' ', '')
+    method_name = path&.gsub('/', '.')&.strip&.downcase
+    method_name&.gsub!(' ', '')
     method_name
   end
 
   ##
   # Method responsible for extracting the path from URI
   def self.extract_path(path)
+    return path if path.nil?
+
     path[0] == '/' ? path[1..].gsub('/', '.') : path.gsub('/', '.')
   end
 
   ##
   # Method responsible for extracting the headers from request
   def self.extract_headers(client)
-    header = client.gets.delete("\n").delete("\r")
+    header = client.gets&.delete("\n")&.delete("\r")
     headers = {}
-    while header.match(%r{[a-zA-Z0-9\-/*]*: [a-zA-Z0-9\-/*]})
+    while header&.match(%r{[a-zA-Z0-9\-/*]*: [a-zA-Z0-9\-/*]})
       split_header = header.split(':')
       headers[split_header[0].strip] = split_header[1].strip
-      header = client.gets.delete("\n").delete("\r")
+      header = client.gets&.delete("\n")&.delete("\r")
     end
     [header, headers]
   end
@@ -83,7 +85,7 @@ module RequestDataFiltering
   ##
   # Method responsible for extracting the body from request
   def self.extract_body(client, body_first_line, content_length)
-    body = client.read(content_length)
+    body = client&.read(content_length)
     body_first_line << body.to_s
   end
 
@@ -107,13 +109,13 @@ module RequestDataFiltering
   ##
   # Method responsible for sanitizing the parameter name
   def self.sanitize_parameter_name(name)
-    name.gsub(/[^\w\s]/, '')
+    name&.gsub(/[^\w\s]/, '')
   end
 
   ##
   # Method responsible for sanitizing the parameter value
   def self.sanitize_parameter_value(value)
-    value.gsub(/[^\w\s]/, '')
-    value.gsub(/\s/, '')
+    value&.gsub(/[^\w\s]/, '')
+    value&.gsub(/\s/, '')
   end
 end

data/lib/macaw_framework/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MacawFramework
-  VERSION = '1.3.1'
+  VERSION = '1.3.21'
 end

data/lib/macaw_framework.rb

@@ -155,11 +155,11 @@ module MacawFramework
     rescue Interrupt
       if @macaw_log.nil?
         puts('Stopping server')
-        @server.close
+        @server.shutdown
         puts('Macaw stop flying for some seeds...')
       else
         @macaw_log.info('Stopping server')
-        @server.close
+        @server.shutdown
         @macaw_log.info('Macaw stop flying for some seeds...')
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: macaw_framework
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.21
 platform: ruby
 authors:
 - Aria Diniz
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-09-07 00:00:00.000000000 Z
+date: 2025-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: prometheus-client