io_request 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f13666edea5cbb28ef091256048953a91693bb015d089b497dfa2657b75e2ca5
-  data.tar.gz: d05a984fe433d148c049f2156637fe7bf7ff6e19aa89f85d90f776e4337b8110
+  metadata.gz: 39b0e0eb362ea37ce9f2b7359ec439bfc422ca12b2f89ba4483a8cba20c99a2f
+  data.tar.gz: 7c7fc713e6de0386789cabbde9a68183d52c8cba268bce30ca9a76c503cb8f3b
 SHA512:
-  metadata.gz: a4abe0a1f30f5760ab110f9b8ad097d4eda24548418398d0b24102d4b2fd8bb652082414c993672aa81915a939e8f07130a87eb1f137543ca87a54a1e0879ead
-  data.tar.gz: 5a541175e7b27d967c22333f700a2a08b4de10b4fa0804230a5ef90406d6be28eeaa62025e9dca32d8986dd553b846cbfd16c2cc5b66848eb81b0a0ec2a08099
+  metadata.gz: 5473de710bff683d5dc610a8eb43207353853280c5a4d5a81eccefb1cf40ea924811b5cc7ad16b9b155ebc43186a8691a32c0648cd6dc80c1bb44ba697b38507
+  data.tar.gz: 8121c16e2f3e3d1b8776aff30d34415a1d29699d9725208621c5af62b17f2664011cea4a03f7b2de370c676dfd0c3f3ec274de9700ba1980ad4e749864cb5bb6

data/lib/io_request.rb

@@ -1,7 +1,10 @@
 # frozen_string_literal: true
 
 # Main module.
-module IORequest; end
+module IORequest
+  # Client received message of zero size.
+  class ZeroSizeMessageError < RuntimeError; end
+end
 
 require_relative 'io_request/version'
 require_relative 'io_request/logging'

data/lib/io_request/client.rb

@@ -63,15 +63,21 @@ module IORequest
     # Close connection.
     def close
       close_internal
+
       join_threads
-      @open = false
     end
 
     # @yieldparam [Hash]
     # @yieldreturn [Hash]
-    def respond(&block)
-      IORequest.logger.debug(prog_name) { 'Saved responder block' }
-      @responder = block
+    def on_request(&block)
+      IORequest.logger.debug(prog_name) { 'Saved on_request block' }
+      @on_request = block
+    end
+    alias respond on_request
+
+    def on_close(&block)
+      IORequest.logger.debug(prog_name) { 'Saved on_close block' }
+      @on_close = block
     end
 
     # If callback block is provided, request will be sent asynchroniously.
@@ -96,27 +102,25 @@ module IORequest
 
     def close_internal
       IORequest.logger.debug(prog_name) { 'Closing connection' }
-      begin
-        send_zero_size_request
-      rescue StandardError
-        IORequest.logger.debug(prog_name) { 'Failed to send zero-sized message. Closing anyway' }
-      end
-      stop_data_transition
+      send_zero_size_request
       close_io
-    end
-
-    def stop_data_transition
-      return unless defined?(@data_transition_thread) && !@data_transition_thread.nil?
-
-      IORequest.logger.debug(prog_name) { 'Killing data transition thread' }
-      @data_transition_thread.kill
       @data_transition_thread = nil
+      @open = false
+      @on_close&.call if defined?(@on_close)
     end
 
     def close_io
-      IORequest.logger.debug(prog_name) { 'Closing IO' }
-      @mutex_r.synchronize { @io_r&.close }
-      @mutex_w.synchronize { @io_w&.close }
+      begin
+        @io_r&.close
+      rescue StandardError => e
+        IORequest.logger.debug "Failed to close read IO: #{e}"
+      end
+      begin
+        @io_w&.close
+      rescue StandardError => e
+        IORequest.logger.debug "Failed to close write IO: #{e}"
+      end
+      IORequest.logger.debug(prog_name) { 'Closed IO streams' }
     end
 
     def authorization
@@ -138,8 +142,11 @@ module IORequest
       IORequest.logger.debug(prog_name) { 'Starting data transition loop' }
       loop do
         data_transition_iteration
+      rescue ZeroSizeMessageError
+        IORequest.logger.debug(prog_name) { 'Connection was closed from the other side' }
+        break
       rescue StandardError => e
-        IORequest.logger.debug(prog_name) { "Data transition iteration failed: #{e}" }
+        IORequest.logger.debug(prog_name) { "Data transition unknown error: #{e}" }
         break
       end
       close_internal
@@ -156,7 +163,8 @@ module IORequest
     end
 
     def handle_request(message)
-      data = @responder&.call(message.data) || {}
+      data = {}
+      data = @on_request&.call(message.data) if defined?(@on_request)
       response = Message.new(data, type: :response, to: message.id)
       send_response(response)
     end
@@ -180,6 +188,8 @@ module IORequest
         IORequest.logger.debug(prog_name) { 'Sending zero size message' }
         @io_w.write([0].pack('S'))
       end
+    rescue StandardError => e
+      IORequest.logger.debug(prog_name) { "Failed to send zero-sized message(#{e})" }
     end
 
     def send_request_and_wait_for_response(request)

data/lib/io_request/connection/ssl_sockets.rb

@@ -79,8 +79,11 @@ module IORequest
         client = IORequest::Client.new authorizer: @authorizer
         begin
           client.open read_write: ssl_socket
-          client.respond { |data| @requests_handler.call(data, client) }
+          client.on_request { |data| @requests_handler.call(data, client) }
           @clients << client
+          client.on_close do
+            @clients.select!(&:open?)
+          end
         rescue StandardError
           IORequest.debug "Failed to open client: #{e}"
           ssl_socket.close
@@ -121,9 +124,8 @@ module IORequest
         @client = IORequest::Client.new authorizer: @authorizer
         begin
           @client.open read_write: ssl_socket
-          @client.respond(&@requests_handler)
+          @client.on_request(&@requests_handler)
         rescue StandardError
-          IORequest.debug "Failed to open client: #{e}"
           ssl_socket.close
           @client = nil
         end

data/lib/io_request/message.rb

@@ -81,8 +81,8 @@ module IORequest
     # @param io_r [:read]
     # @return [Message]
     def self.read_from(io_r)
-      size = io_r.read(2).unpack1('S')
-      raise '0 size received' if size.zero?
+      size = io_r.read(2)&.unpack1('S') || 0
+      raise ZeroSizeMessageError if size.zero?
 
       json_string = io_r.read(size).unpack1("a#{size}")
       msg = JSON.parse(json_string, symbolize_names: true)

data/lib/io_request/version.rb

@@ -2,5 +2,5 @@
 
 module IORequest
   # Gem version.
-  VERSION = '2.2.0'
+  VERSION = '2.3.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: io_request
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Fizvlad