io_request 2.4.1 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 987e7926f719a3479bf88cc0bdc76701edbc35e3d77d3c25d0f6ff8009be971c
-  data.tar.gz: 7ad37eab2d0718cdd100a9f16c7f272e538e39ae97939aa3e5858dbeb5f05413
+  metadata.gz: 53fdb5fa823faf9d379e6c2180f0d47f79959caa144dd1c34295c81226a4566d
+  data.tar.gz: 8614bb17e707782adc8d13ea01d0328bac2432658d0dc91977ee728107dcfcb7
 SHA512:
-  metadata.gz: '089626846b0ce20d3cc9ae7c7dfeb9c4b457de3f3500cd75b7456a112e6f1f1304763a6288c4349b220c7b69c24ef5e4b5f34124235359184b5a7e5f34e50b66'
-  data.tar.gz: 71e6692045f5752e5bd5eda60eeea755a8ac542f465ed6a19804569f5816a3599b615986a81793a8a4248a22000696ac4a362160efc246236c701beb2dcc0383
+  metadata.gz: 234a5e6d21fe3b1214a719af4b52617d4f58a3cf205e17cd8fa2d045098ada47bae1a272b8ec1daadfe5909831408e754d6a84085cad3705b5e09c8d3f940ccf
+  data.tar.gz: ef33270ed7cbf3b2082f7845d1ca1bbab2b3e77a145cff65ec4de361fb9b728535b3bd7b6d63bfef28713a216daea9434a6b908459fc3d7be1002142e90e3386

data/lib/io_request.rb

@@ -7,6 +7,9 @@ module IORequest
 
   # Authorization failed.
   class AuthorizationFailureError < RuntimeError; end
+
+  # Request timed out.
+  class RequestTimeoutError < RuntimeError; end
 end
 
 require_relative 'io_request/version'

data/lib/io_request/client.rb

@@ -77,6 +77,7 @@ module IORequest
     end
     alias respond on_request
 
+    # Code to execute after connection is closed.
     def on_close(&block)
       IORequest.logger.debug(prog_name) { 'Saved on_close block' }
       @on_close = block
@@ -84,17 +85,18 @@ module IORequest
 
     # If callback block is provided, request will be sent asynchroniously.
     # @param data [Hash]
-    def request(data = {}, &callback)
+    # @param timeout [Integer] timeout in seconds.
+    def request(data, timeout: nil, &callback)
       message = Message.new(data, type: :request)
 
       if block_given?
         # Async execution of request
         in_thread(callback, name: 'requesting') do |cb|
-          cb.call(send_request_and_wait_for_response(message).data)
+          cb.call(send_request_and_wait_for_response(message, timeout).data)
         end
         nil
       else
-        send_request_and_wait_for_response(message).data
+        send_request_and_wait_for_response(message, timeout).data
       end
     end
 
@@ -182,7 +184,11 @@ module IORequest
     def send_response(response)
       @mutex_w.synchronize do
         IORequest.logger.debug(prog_name) { "Sending response: #{response}" }
-        response.write_to(@io_w)
+        begin
+          response.write_to(@io_w)
+        rescue IOError => e
+          IORequest.logger.debug(prog_name) { "Failed to write response message: #{e}" }
+        end
       end
     end
 
@@ -195,21 +201,26 @@ module IORequest
       IORequest.logger.debug(prog_name) { "Failed to send zero-sized message(#{e})" }
     end
 
-    def send_request_and_wait_for_response(request)
+    def send_request_and_wait_for_response(request, timeout)
       @mutex_w.synchronize do
         IORequest.logger.debug(prog_name) { "Sending message: #{request}" }
         request.write_to(@io_w)
       end
-      wait_for_response(request)
+      wait_for_response(request, timeout)
     end
 
-    def wait_for_response(request)
+    def wait_for_response(request, timeout)
       IORequest.logger.debug(prog_name) { "Waiting for response for #{request}" }
+      waiting_start_time = Time.now
       @responses_access_mutex.synchronize do
         response = nil
         until response
-          @responses_access_cv.wait(@responses_access_mutex)
-          response = @responses[request.id.to_s]
+          @responses_access_cv.wait(@responses_access_mutex, 1)
+          if @responses_access_mutex.owned?
+            # NOTE: Only accessing responses hash if thread owns access mutex
+            response = @responses.delete(request.id.to_s)
+          end
+          raise RequestTimeoutError if timeout && (Time.now - waiting_start_time < timeout)
         end
         IORequest.logger.debug(prog_name) { "Found response: #{response}" }
         response

data/lib/io_request/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: io_request
 version: !ruby/object:Gem::Version
-  version: 2.4.1
+  version: 2.5.0
 platform: ruby
 authors:
 - Fizvlad
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-23 00:00:00.000000000 Z
+date: 2020-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler