httpx 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f092c95882dd48ff10a25b77c08b7dec71acc31
-  data.tar.gz: fc75a3d72c8151c28b2f24ea4617d64e92b56488
+  metadata.gz: 79f53c62644d9e645ab5aeb91d897e0537c3160c
+  data.tar.gz: 7a9cb5c745c6b02ada9d0d76930372201150dba3
 SHA512:
-  metadata.gz: 1cb99410118ac67eb35bbaf212fda20e95745a77fa026b1ce6712e742ca985728b88e087fd397fd38310496f20fd15cd039827a104220b479a4c471e645b8ea8
-  data.tar.gz: b593dfe0b0b433d1d12fc8695581158ddcb2a3558d693df07f821efd160cdb61beac1a00fcc78da10fdda608f03464f3cb1bd3e6d32386be318cb5fea44dbd5e
+  metadata.gz: c623d4faf4e590b757f5e883a62c337364d76da0d01dfb170f47580331edd915abddee82b867a92f86b59d0ea7eefb5c7405554ee7269cc01e12e144a47ec849
+  data.tar.gz: 40ce7074c72b32de7255e5af941e6a8e38c2f026aa3d1e367fb09ca0d63186a5d71c9b5011ced31ff7e28b446a41508f68ea578ab339872baa0ac5de6b82be53

data/lib/httpx/channel.rb

@@ -69,6 +69,7 @@ module HTTPX
     end
 
     def match?(uri)
+      return false if @state == :closing
       ips = begin
         Resolv.getaddresses(uri.host)
       rescue StandardError
@@ -126,12 +127,8 @@ module HTTPX
         dwrite
         transition(:closed)
         emit(:close)
-      else
-        catch(:called) do
-          dread
-          dwrite
-          parser.consume
-        end
+      when :open
+        consume
       end
       nil
     end
@@ -143,6 +140,14 @@ module HTTPX
 
     private
 
+    def consume
+      catch(:called) do
+        dread
+        dwrite
+        parser.consume
+      end
+    end
+
     def dread(wsize = @window_size)
       loop do
         siz = @io.read(wsize, @read_buffer)
@@ -201,7 +206,7 @@ module HTTPX
       when :open
         return if @state == :closed
         @io.connect
-        return if @io.closed?
+        return unless @io.connected?
         send_pending
       when :closing
         return unless @state == :open
@@ -212,6 +217,18 @@ module HTTPX
         @read_buffer.clear
       end
       @state = nextstate
+    rescue Errno::ECONNREFUSED,
+           Errno::EADDRNOTAVAIL => e
+      emit_error(e)
+      @state = :closed
+      emit(:close)
+    end
+
+    def emit_error(e)
+      response = ErrorResponse.new(e, 0, @options)
+      @pending.each do |request, _| # rubocop:disable Performance/HashEachMethods
+        emit(:response, request, response)
+      end
     end
   end
 end

data/lib/httpx/channel/http1.rb

@@ -102,7 +102,7 @@ module HTTPX
 
       response << chunk
 
-      dispatch if response.complete?
+      # dispatch if response.complete?
     end
 
     def on_message_complete

data/lib/httpx/channel/http2.rb

@@ -151,7 +151,7 @@ module HTTPX
 
     def on_stream_close(stream, request, error)
       return handle(request, stream) if request.expects?
-      response = request.response || ErrorResponse.new(error, @retries)
+      response = request.response || ErrorResponse.new(Error.new(error), @retries, @options)
       emit(:response, request, response)
       log(2, "#{stream.id}: ") { "closing stream" }
 

data/lib/httpx/client.rb

@@ -5,10 +5,14 @@ module HTTPX
     include Loggable
     include Chainable
 
-    def initialize(options = {})
+    def initialize(options = {}, &blk)
       @options = self.class.default_options.merge(options)
       @connection = Connection.new(@options)
       @responses = {}
+      wrap(&blk) if block_given?
+    end
+
+    def wrap
       return unless block_given?
       begin
         @keep_open = true
@@ -107,7 +111,7 @@ module HTTPX
 
           break if requests.empty?
         rescue TimeoutError => e
-          responses << ErrorResponse.new(e.message, 0) while requests.shift
+          responses << ErrorResponse.new(e, 0, @options) while requests.shift
           @connection.reset
           break
         end

data/lib/httpx/errors.rb

@@ -4,4 +4,13 @@ module HTTPX
   Error = Class.new(StandardError)
 
   TimeoutError = Class.new(Error)
+
+  HTTPError = Class.new(Error) do
+    attr_reader :status
+
+    def initialize(status)
+      @status = status
+      super("HTTP Error: #{status}")
+    end
+  end
 end

data/lib/httpx/io.rb

@@ -175,6 +175,10 @@ module HTTPX
       @negotiated = false
     end
 
+    def connected?
+      @state == :negotiated
+    end
+
     def connect
       super
       if @keep_open
@@ -183,11 +187,16 @@ module HTTPX
       end
       return if @state == :negotiated ||
                 @state != :connected
-      @io = OpenSSL::SSL::SSLSocket.new(@io, @ctx)
-      @io.hostname = @hostname
-      @io.sync_close = true
-      @io.connect
+      unless @io.is_a?(OpenSSL::SSL::SSLSocket)
+        @io = OpenSSL::SSL::SSLSocket.new(@io, @ctx)
+        @io.hostname = @hostname
+        @io.sync_close = true
+      end
+      # TODO: this might block it all
+      @io.connect_nonblock
       transition(:negotiated)
+    rescue ::IO::WaitReadable,
+           ::IO::WaitWritable
     end
 
     if RUBY_VERSION < "2.3"

data/lib/httpx/io/resolver.rb

@@ -28,7 +28,7 @@ module HTTPX
       @options = Options.new(options)
       # early return for edge case when there are no nameservers configured
       # but we still want to be able to static lookups using #resolve_hostname
-      @nameservers = self.class.nameservers or return
+      (@nameservers = self.class.nameservers) || return
       server = IPAddr.new(@nameservers.sample)
       @io = UDP.new(server, DNS_PORT)
       @read_buffer = "".b
@@ -55,7 +55,7 @@ module HTTPX
       query = build_query(hostname).encode
       log { "resolving #{hostname}: #{query.inspect}" }
       siz = @io.write(query)
-      log { "WRITE: #{siz} bytes..."}
+      log { "WRITE: #{siz} bytes..." }
     end
 
     def call
@@ -69,7 +69,7 @@ module HTTPX
         siz = @io.read(wsize, @read_buffer)
         throw(:close, self) unless siz
         return if siz.zero?
-        log { "READ: #{siz} bytes..."}
+        log { "READ: #{siz} bytes..." }
         addrs = parse(@read_buffer)
         @read_buffer.clear
         next if addrs.empty?
@@ -77,7 +77,7 @@ module HTTPX
         hostname = @hostnames.shift
         callback = @callbacks.shift
         addr = addrs.index(addrs.rand(addrs.size))
-        log { "resolved #{hostname}: #{addr.to_s}"}
+        log { "resolved #{hostname}: #{addr}" }
         @addresses[hostname] = addr
         callback.call(addr)
       end
@@ -91,9 +91,9 @@ module HTTPX
       addrs = []
       # The answer might include IN::CNAME entries so filters them out
       # to include IN::A & IN::AAAA entries only.
-      response.each_answer { |name, ttl, value| addrs << value.address if value.respond_to?(:address) }
+      response.each_answer { |_name, _ttl, value| addrs << value.address if value.respond_to?(:address) }
 
-      return addrs
+      addrs
     end
 
     def resolve_hostname(hostname)
@@ -101,7 +101,7 @@ module HTTPX
       # so since we want the first occurance, simply
       # pop off the stack.
       resolv.getaddresses(hostname).pop
-    rescue
+    rescue StandardError
     end
 
     def resolv
@@ -129,7 +129,7 @@ module HTTPX
 
     def get_address(host)
       Resolv::Hosts.new(host).getaddress
-    rescue
+    rescue StandardError
     end
   end
 end

data/lib/httpx/io/udp.rb

@@ -62,4 +62,4 @@ module HTTPX
       "#<(fd: #{@io.fileno}): #{@ip}:#{@port})>"
     end
   end
-end
+end

data/lib/httpx/plugins/proxy.rb

@@ -92,9 +92,22 @@ module HTTPX
     end
 
     def to_io
-      transition(:connecting) if @state == :idle
+      case @state
+      when :idle
+        transition(:connecting)
+      when :connected
+        transition(:open)
+      end
       @io.to_io
     end
+
+    def call
+      super
+      case @state
+      when :connecting
+        consume
+      end
+    end
   end
 
   class ProxySSL < SSL

data/lib/httpx/plugins/proxy/http.rb

@@ -22,7 +22,7 @@ module HTTPX
               end
               parser.send(connect_request)
             else
-              transition(:open)
+              transition(:connected)
             end
           end
 
@@ -31,13 +31,14 @@ module HTTPX
             when :connecting
               return unless @state == :idle
               @io.connect
-              return if @io.closed?
+              return unless @io.connected?
               @parser = ConnectProxyParser.new(@write_buffer, @options.merge(max_concurrent_requests: 1))
               @parser.once(:response, &method(:on_connect))
               @parser.on(:close) { transition(:closing) }
               proxy_connect
-              return if @state == :open
-            when :open
+              return if @state == :connected
+            when :connected
+              return unless @state == :idle || @state == :connecting
               case @state
               when :connecting
                 @parser.close
@@ -56,7 +57,7 @@ module HTTPX
               req, _ = @pending.first
               request_uri = req.uri
               @io = ProxySSL.new(@io, request_uri, @options)
-              transition(:open)
+              transition(:connected)
               throw(:called)
             else
               pending = @pending.map(&:first) + @parser.pending

data/lib/httpx/plugins/proxy/socks4.rb

@@ -27,10 +27,10 @@ module HTTPX
               req, _ = @pending.first
               request_uri = req.uri
               @io = ProxySSL.new(@io, request_uri, @options) if request_uri.scheme == "https"
-              transition(:open)
+              transition(:connected)
               throw(:called)
             else
-              response = ErrorResponse.new("socks error: #{status}", 0)
+              response = ErrorResponse.new(Error.new("socks error: #{status}"), 0, @options)
               until @pending.empty?
                 req, _ = @pending.shift
                 emit(:response, req, response)
@@ -43,13 +43,13 @@ module HTTPX
             when :connecting
               return unless @state == :idle
               @io.connect
-              return if @io.closed?
+              return unless @io.connected?
               req, _ = @pending.first
               return unless req
               request_uri = req.uri
               @write_buffer << Packet.connect(@parameters, request_uri)
               proxy_connect
-            when :open
+            when :connected
               return unless @state == :connecting
               @parser = nil
             end

data/lib/httpx/plugins/proxy/socks5.rb

@@ -17,6 +17,16 @@ module HTTPX
         Error = Class.new(Error)
 
         class Socks5ProxyChannel < ProxyChannel
+          def call
+            super
+            case @state
+            when :connecting,
+                 :negotiating,
+                 :authenticating
+              consume
+            end
+          end
+
           private
 
           def proxy_connect
@@ -51,7 +61,7 @@ module HTTPX
               req, _ = @pending.first
               request_uri = req.uri
               @io = ProxySSL.new(@io, request_uri, @options) if request_uri.scheme == "https"
-              transition(:open)
+              transition(:connected)
               throw(:called)
             end
           end
@@ -61,7 +71,7 @@ module HTTPX
             when :connecting
               return unless @state == :idle
               @io.connect
-              return if @io.closed?
+              return unless @io.connected?
               @write_buffer << Packet.negotiate(@parameters)
               proxy_connect
             when :authenticating
@@ -72,7 +82,7 @@ module HTTPX
               req, _ = @pending.first
               request_uri = req.uri
               @write_buffer << Packet.connect(request_uri)
-            when :open
+            when :connected
               return unless @state == :negotiating
               @parser = nil
             end
@@ -85,7 +95,7 @@ module HTTPX
           end
 
           def on_error_response(error)
-            response = ErrorResponse.new(error, 0)
+            response = ErrorResponse.new(Error.new(error), 0, @options)
             until @pending.empty?
               req, _ = @pending.shift
               emit(:response, req, response)

data/lib/httpx/request.rb

@@ -192,7 +192,7 @@ module HTTPX
             # deallocate
             @response = nil
           when 417
-            @response = ErrorResponse.new("Expectation Failed", 0)
+            @response = @response
             return
           end
         end

data/lib/httpx/response.rb

@@ -60,6 +60,11 @@ module HTTPX
       "#<Response:#{object_id} @status=#{@status} @headers=#{@headers}>"
     end
 
+    def raise_for_status
+      return if @status < 400
+      raise HTTPError, @status
+    end
+
     class Body
       def initialize(response, threshold_size:, window_size: 1 << 14)
         @response = response
@@ -209,13 +214,24 @@ module HTTPX
   end
 
   class ErrorResponse
-    attr_reader :error, :retries
+    include Loggable
 
-    alias_method :status, :error
+    attr_reader :error, :retries
 
-    def initialize(error, retries)
+    def initialize(error, retries, options)
       @error = error
       @retries = retries
+      @options = Options.new(options)
+      log { "#{error.class}: #{error}" }
+      log { caller.join("\n") }
+    end
+
+    def status
+      @error.message
+    end
+
+    def raise_for_status
+      raise @error
     end
 
     def retryable?

data/lib/httpx/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: httpx
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Tiago Cardoso
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-20 00:00:00.000000000 Z
+date: 2018-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: http-2