httpx 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6dac1e1e43e2c1935f8fd0c1807d1d29bf782f27
-  data.tar.gz: e5786862d65ee9807f31e9ca847d8ca9125dce29
+  metadata.gz: 3fd5760406dc7a2cb5abb040160144fb8a788a19
+  data.tar.gz: 2fcf4228f1ff06b7621b7e688e9fe2a173e39096
 SHA512:
-  metadata.gz: 5a5f4106511049f7dc22c6a44aee01cf560827b553b05aede40e5ff11fb20d52213d754488cec4419a895c9a7eef9c77517242f4553ee0d1b797cfe1cbc4726c
-  data.tar.gz: a2390e810c8d6738a9d13fce36bc0cbfcd9e4a7eeb88e5d7a9919a8311dc61404cb3328569836eff86cbabe33b63daef9107d9fe3938136af06b6c78b57f953d
+  metadata.gz: adc85e755255e5e460bce9a84c5e5c3c03a8271702eed4373aded5002d71b28d99787bc4f4837d3bee4634f58fbe5541cf6f3a0282c54e4b3c5d86233f7b581c
+  data.tar.gz: 58f6d7c64c527bb654a8ab7107eff77315ad4c3d6f17da06b081be0d25345169736b78082b9e4335373dde707e071823d2bafa74102336535f9af07234bbd3d6

data/lib/httpx/channel.rb

@@ -66,6 +66,7 @@ module HTTPX
       @write_buffer = Buffer.new(BUFFER_SIZE)
       @pending = []
       @state = :idle
+      on(:error) { |ex| on_error(ex) }
     end
 
     def match?(uri)
@@ -204,6 +205,10 @@ module HTTPX
           transition(:open)
         end
       end
+      parser.on(:error) do |request, ex|
+        response = ErrorResponse.new(ex, 0, @options)
+        emit(:response, request, response)
+      end
       parser
     end
 
@@ -230,12 +235,18 @@ module HTTPX
            Errno::EADDRNOTAVAIL,
            OpenSSL::SSL::SSLError => e
       # connect errors, exit gracefully
-      emit_error(e)
+      handle_error(e)
       @state = :closed
       emit(:close)
     end
 
-    def emit_error(e)
+    def on_error(ex)
+      handle_error(ex)
+      reset
+    end
+
+    def handle_error(e)
+      parser.handle_error(e)
       response = ErrorResponse.new(e, 0, @options)
       @pending.each do |request, _|
         emit(:response, request, response)

data/lib/httpx/channel/http1.rb

@@ -12,7 +12,6 @@ module HTTPX
     def initialize(buffer, options)
       @options = Options.new(options)
       @max_concurrent_requests = @options.max_concurrent_requests
-      @retries = options.max_retries
       @parser = HTTP::Parser.new(self)
       @parser.header_value_type = :arrays
       @buffer = buffer
@@ -141,13 +140,19 @@ module HTTPX
         response << @parser.upgrade_data
         throw(:called)
       end
-      close
+      reset
       send(@pending.shift) unless @pending.empty?
       return unless response.headers["connection"] == "close"
       disable_concurrency
       emit(:reset)
     end
 
+    def handle_error(ex)
+      @requests.each do |request|
+        emit(:error, request, ex)
+      end
+    end
+
     private
 
     def disable_concurrency

data/lib/httpx/channel/http2.rb

@@ -13,7 +13,6 @@ module HTTPX
       @options = Options.new(options)
       @max_concurrent_requests = @options.max_concurrent_requests
       init_connection
-      @retries = options.max_retries
       @pending = []
       @streams = {}
       @drains  = {}
@@ -60,6 +59,12 @@ module HTTPX
       end
     end
 
+    def handle_error(ex)
+      @streams.each_key do |request|
+        emit(:error, request, ex)
+      end
+    end
+
     private
 
     def headline_uri(request)
@@ -151,8 +156,12 @@ module HTTPX
 
     def on_stream_close(stream, request, error)
       return handle(request, stream) if request.expects?
-      response = request.response || ErrorResponse.new(Error.new(error), @retries, @options)
-      emit(:response, request, response)
+      if error
+        emit(:error, request, error)
+      else
+        response = request.response
+        emit(:response, request, response)
+      end
       log(level: 2, label: "#{stream.id}: ") { "closing stream" }
 
       @streams.delete(request)

data/lib/httpx/client.rb

@@ -111,11 +111,7 @@ module HTTPX
           responses << response
           requests.shift
 
-          break if requests.empty?
-        rescue TimeoutError => e
-          responses << ErrorResponse.new(e, 0, @options) while requests.shift
-          @connection.reset
-          break
+          break if requests.empty? || !@connection.running?
         end
       end
       responses

data/lib/httpx/connection.rb

@@ -16,13 +16,18 @@ module HTTPX
       !@channels.empty?
     end
 
-    def next_tick(timeout: @timeout.timeout)
+    def next_tick
+      timeout = @timeout.timeout
       @selector.select(timeout) do |monitor|
         if (channel = monitor.value)
           channel.call
         end
         monitor.interests = channel.interests
       end
+    rescue TimeoutError => ex
+      @channels.each do |ch|
+        ch.emit(:error, ex)
+      end
     end
 
     def close
@@ -30,10 +35,6 @@ module HTTPX
       next_tick until @channels.empty?
     end
 
-    def reset
-      @channels.each(&:reset)
-    end
-
     def build_channel(uri, **options)
       channel = Channel.by(uri, @options.merge(options))
       register_channel(channel)

data/lib/httpx/io.rb

@@ -137,6 +137,10 @@ module HTTPX
       when :closed
         return unless @state == :connected
       end
+      do_transition(nextstate)
+    end
+
+    def do_transition(nextstate)
       log(level: 1, label: "#{inspect}: ") { nextstate.to_s }
       @state = nextstate
     end
@@ -240,7 +244,7 @@ module HTTPX
         return unless @state == :negotiated ||
                       @state == :connected
       end
-      super
+      do_transition(nextstate)
     end
   end
   module IO

data/lib/httpx/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module HTTPX
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: httpx
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Tiago Cardoso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-29 00:00:00.000000000 Z
+date: 2018-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http-2
@@ -145,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.6.14.1
 signing_key: 
 specification_version: 4
 summary: HTTPX, to the future, and beyond