fleck 2.2.2 → 2.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0d362b6a20a242296ef0697d57c31503067df64d05b3cee439f58449a7dbe732
-  data.tar.gz: 76f4a6b22cdfdff8a9826702073eae8866751e4c5446c1d7fdd1aaecd6341655
+  metadata.gz: 815c6aedba7e3ab97a3c057f1d35b689f4e33a5015f147975095053feeca49fb
+  data.tar.gz: 655f4eb33edd3926c23694d407a1ffbecfaf40437a9273c08a26048a4ac73ffd
 SHA512:
-  metadata.gz: 794a481e65666fa6ac3be6bd7014d0a20a54819849f2be83402950778de70d24728d3bd283a1fb71332504acb501fe7323e315dbcf9f20f4fe8c229e74120611
-  data.tar.gz: 42c5b8f0dd478e595d47bde2250a5d01d4b81414ad9670288a1098bb6f7168b71949a8401e848b3f6d2e4d163d23babb70259695ccaa7314fad962b9084a0b1f
+  metadata.gz: d0696f5d4131e441a32b73fdce0939ed1aa002562f8aa931f58407957890b53a769b59e9537ef6c366b6de2e2a6ec249eb5226cd388d0f0426033e32e31330e3
+  data.tar.gz: 7fa7d2da95225e18d4a826f62eed4ec23b57621656e8b1d9ad0e8ff21184c9a00da1babdbdb95c076b69e74cb170bcfd2652a0965f0a13f1856341439ff465ab

data/CHANGELOG.md

@@ -6,6 +6,11 @@
 
 Below you can see the CHANGELOG of **Fleck** gem by version number.
 
+#### v2.2.4 (17 September 2026) #####
+
+- **FIX** Return a bad-request response for malformed consumer request JSON with native Oj and
+          `Oj.mimic_JSON` parser errors.
+
 #### v2.2.0 (22 Dicember 2022) #####
 
 - **NEW** Implemented the feature which allows to add a modifier `lambda` to `param` decorator,

data/lib/fleck/client.rb

@@ -3,7 +3,21 @@ module Fleck
   class Client
     include Fleck::Loggable
 
-    attr_reader :local_ip, :remote_ip
+    @instances = ThreadSafe::Array.new
+
+    def self.<<(new_instance)
+      @instances << new_instance
+    end
+
+    def self.remove_instance(instance)
+      @instances.delete(instance)
+    end
+
+    def self.terminate_all
+      @instances.map(&:terminate)
+    end
+
+    attr_reader :local_ip, :remote_ip, :terminated
 
     def initialize(connection, queue_name = "", exchange_type: :direct, exchange_name: "", multiple_responses: false, concurrency: 1)
       @connection         = connection
@@ -29,9 +43,11 @@ module Fleck
 
       logger.debug("Client initialized!")
 
-      at_exit do
-        terminate
-      end
+      Fleck::Client << self
+
+      # at_exit do
+      #   terminate
+      # end
     end
 
     def request(action: nil, version: nil, headers: {}, params: {}, async: @multiple_responses || false, timeout: @default_timeout, queue: @queue_name, rmq_options: {}, &block)
@@ -73,7 +89,8 @@ module Fleck
     def terminate
       @terminated = true
       logger.info "Unsubscribing from #{@reply_queue.name}"
-      @subscriptions.map(&:cancel) # stop receiving new messages
+      # @subscriptions.map(&:cancel) # stop receiving new messages
+      @channel&.close unless @channel&.closed?
       logger.info "Canceling pending requests"
       # cancel pending requests
       while item = @requests.shift do
@@ -83,6 +100,8 @@ module Fleck
           logger.error e.inspect + "\n" + e.backtrace.join("\n")
         end
       end
+
+      Fleck::Client.remove_instance(self)
     end
 
 
@@ -120,5 +139,9 @@ module Fleck
   end
 end
 
-require "fleck/client/request"
-require "fleck/client/response"
+at_exit do
+  Fleck::Client.terminate_all
+end
+
+require 'fleck/client/request'
+require 'fleck/client/response'

data/lib/fleck/core/consumer/request.rb

@@ -74,7 +74,16 @@ module Fleck
         protected
 
         def parse_request!
-          @data = Oj.load(@payload, mode: :compat).to_hash_with_indifferent_access.filtered!
+          begin
+            @data = Oj.load(@payload, mode: :compat)
+          rescue StandardError => e
+            raise unless json_parse_error?(e)
+
+            fail_request!(400, 'Bad Request', e)
+            return
+          end
+
+          @data = @data.to_hash_with_indifferent_access.filtered!
           @headers.merge!(@data['headers'] || {}).filtered!
 
           logger.debug "Request (exchange: #{@exchange.inspect}, queue: #{@queue.inspect}, " \
@@ -85,13 +94,18 @@ module Fleck
           @version             = @headers['version']
           @ip                  = @headers['ip']
           @params              = @data['params'] || {}
-        rescue Oj::ParseError => e
-          log_error(e)
-          response.render_error(400, 'Bad request', e.inspect)
-          @failed = true
         rescue StandardError => e
-          log_error(e)
-          response.render_error(500, 'Internal Server Error', e.inspect)
+          fail_request!(500, 'Internal Server Error', e)
+        end
+
+        def json_parse_error?(error)
+          error.is_a?(Oj::ParseError) || error.is_a?(EncodingError) ||
+            (defined?(JSON::ParserError) && error.is_a?(JSON::ParserError))
+        end
+
+        def fail_request!(status, message, error)
+          log_error(error)
+          response.render_error(status, [message, error.inspect])
           @failed = true
         end
       end

data/lib/fleck/version.rb

@@ -2,5 +2,5 @@
 
 # Open `Fleck` module to set `VERSION` constant.
 module Fleck
-  VERSION = '2.2.2'
+  VERSION = '2.2.4'
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: fleck
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.2.4
 platform: ruby
 authors:
 - Groza Sergiu
-autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-10-13 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -178,7 +177,6 @@ homepage: https://github.com/serioja90/fleck
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -193,8 +191,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
-signing_key: 
+rubygems_version: 4.0.16
 specification_version: 4
 summary: A Ruby gem for syncronous and asyncronous communication via Message Queue
   services.