uv-rays 1.3.8 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f5437880d127e446a1e89f0160196101c064596
-  data.tar.gz: 17ee53fe763b9ae8d53caebcfa02c692f80f4da7
+  metadata.gz: dcf2dd4cbeb83a76c6f218cc4c0ccc55ed05d755
+  data.tar.gz: 2f1e98b94414be0f86f22b5297b38e45c9cc8882
 SHA512:
-  metadata.gz: 3596ce722dac73675539be1a0c2336da15b116a5205d13e4ccd86916fbbddeb49c685496acda002db1691e2eb7b91782e4b94a0c3ef1a3132faa364c96fef68c
-  data.tar.gz: a96be731ac57037fac6a69f43ac169b32e21f70d7e669c7db29a06172688e1b43bb9561fbca983e3ce26d8c3a035c381550307cff3361552c6e71f0a43f6f80f
+  metadata.gz: cc24a2d715a2325b8f531bd4823cf73e7ed9e54dcb6ee31eeacc830b3af1df2cd70b4280e68409a61507e5fbfcbf6aa9576e9d59b56f9afe9f07939550759f78
+  data.tar.gz: 3be2b91df14b7be0b7fbe7f2c50c08fbaf45ff56e586b50db736a87a12c02c411e27f21852ac2baa0aaee3e7df296cb03d981043c9f7178e6fd509dbd75b1a69

data/README.md

@@ -27,26 +27,25 @@ Run `gem install uv-rays` to install
 Here's a fully-functional echo server written with UV-Rays:
 
 ```ruby
-
  require 'uv-rays'
 
  module EchoServer
-   def post_init
-     puts "-- someone connected to the echo server!"
-   end
-
-   def on_read data, *args
-     write ">>>you sent: #{data}"
-     close_connection if data =~ /quit/i
-   end
-
-   def on_close
-     puts "-- someone disconnected from the echo server!"
-   end
+  def on_connect(socket)
+    @ip, @port = socket.peername
+    logger.info "-- #{@ip}:#{@port} connected"
+  end
+
+  def on_read(data, socket)
+    write ">>>you sent: #{data}"
+    close_connection if data =~ /quit/i
+  end
+
+  def on_close
+    puts "-- #{@ip}:#{@port} disconnected"
+  end
 end
 
-# Note that this will block current thread.
-Libuv::Loop.default.run {
+reactor {
   UV.start_server "127.0.0.1", 8081, EchoServer
 }
 

data/lib/faraday/adapter/libuv.rb

@@ -0,0 +1,80 @@
+require 'faraday'
+require 'uv-rays'
+
+
+module Faraday
+  class Adapter < Middleware
+    register_middleware libuv: :Libuv
+
+    class Libuv < Faraday::Adapter
+      def initialize(app, connection_options = {})
+        @connection_options = connection_options
+        super(app)
+      end
+
+      def call(env)
+        super
+
+        opts = {}
+        if env[:url].scheme == 'https' && ssl = env[:ssl]
+          tls_opts = opts[:tls_options] = {}
+
+          # opts[:ssl_verify_peer] = !!ssl.fetch(:verify, true)
+          # TODO:: Need to provide verify callbacks
+
+          tls_opts[:cert_chain] = ssl[:ca_path] if ssl[:ca_path]
+          tls_opts[:client_ca] = ssl[:ca_file] if ssl[:ca_file]
+          #tls_opts[:client_cert] = ssl[:client_cert] if ssl[:client_cert]
+          #tls_opts[:client_key]  = ssl[:client_key]  if ssl[:client_key]
+          #tls_opts[:certificate] = ssl[:certificate] if ssl[:certificate]
+          tls_opts[:private_key] = ssl[:private_key] if ssl[:private_key]
+        end
+
+        if (req = env[:request])
+          opts[:inactivity_timeout] = req[:timeout] if req[:timeout]
+        end
+
+        error = nil
+        thread = reactor
+        if thread.running?
+          error = perform_request(env, opts)
+        else
+          # Pretty much here for testing
+          thread.run {
+            error = perform_request(env, opts)
+          }
+        end
+
+        # Re-raise the error out of the event loop
+        # Really this is only required for tests as this will always run on the reactor
+        raise error if error
+        @app.call env
+      rescue ::CoroutineRejection => err
+        if err.value == :timeout
+          raise Error::TimeoutError, err
+        else
+          raise Error::ConnectionFailed, err
+        end
+      end
+
+      # TODO: support streaming requests
+      def read_body(env)
+        env[:body].respond_to?(:read) ? env[:body].read : env[:body]
+      end
+    end
+
+    def perform_request(env, opts)
+      conn = ::UV::HttpEndpoint.new(env[:url].to_s, opts.merge!(@connection_options))
+      resp = co conn.request(env[:method].to_s.downcase.to_sym,
+        headers: env[:request_headers],
+        path: "/#{env[:url].to_s.split('/', 4)[-1]}",
+        keepalive: false,
+        body: read_body(env))
+
+      save_response(env, resp.status.to_i, resp.body, resp) #, resp.reason_phrase)
+      nil
+    rescue Exception => e
+      e
+    end
+  end
+end

data/lib/uv-rays.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'libuv'
 
 
@@ -65,21 +67,21 @@ module UV
     end
 
     def self.start_server(server, port, handler, *args)
-        loop = Libuv::Loop.current   # Get the current event loop
-        raise ThreadError, "There is no Libuv Loop running on the current thread" if loop.nil?
+        thread = reactor   # Get the reactor running on this thread
+        raise ThreadError, "There is no Libuv reactor running on the current thread" if thread.nil?
 
         klass = klass_from_handler(InboundConnection, handler, *args)
-        UV::TcpServer.new loop, server, port, klass, *args
+        UV::TcpServer.new thread, server, port, klass, *args
     end
 
     def self.attach_server(sock, handler, *args)
-        loop = Libuv::Loop.current   # Get the current event loop
-        raise ThreadError, "There is no Libuv Loop running on the current thread" if loop.nil?
+        thread = reactor   # Get the reactor running on this thread
+        raise ThreadError, "There is no Libuv reactor running on the current thread" if thread.nil?
 
         klass = klass_from_handler(InboundConnection, handler, *args)
         sd = sock.respond_to?(:fileno) ? sock.fileno : sock
 
-        UV::TcpServer.new loop, sd, sd, klass, *args
+        UV::TcpServer.new thread, sd, sd, klass, *args
     end
 
     def self.open_datagram_socket(handler, server = nil, port = nil, *args)

data/lib/uv-rays/abstract_tokenizer.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true, encoding: ASCII-8BIT
 
 module UV
 
@@ -6,7 +7,7 @@ module UV
     # callback based system for application level tokenization without
     # the heavy lifting.
     class AbstractTokenizer
-        DEFAULT_ENCODING = 'ASCII-8BIT'.freeze
+        DEFAULT_ENCODING = 'ASCII-8BIT'
 
         attr_accessor :callback, :indicator, :size_limit, :verbose
 
@@ -21,9 +22,10 @@ module UV
             raise ArgumentError, 'no indicator provided' unless @indicator
             raise ArgumentError, 'no callback provided' unless @callback
 
-            @input = ''
-            @input.force_encoding(@encoding)
-            @indicator.force_encoding(@encoding) if @indicator.is_a?(String)
+            reset
+            if @indicator.is_a?(String)
+                @indicator = String.new(@indicator).encode(@encoding).freeze
+            end
         end
 
         # Extract takes an arbitrary string of input data and returns an array of
@@ -101,7 +103,7 @@ module UV
 
 
         def reset
-            @input = ''.force_encoding(@encoding)
+            @input = String.new.force_encoding(@encoding)
         end
     end
 end

data/lib/uv-rays/buffered_tokenizer.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true, encoding: ASCII-8BIT
 
 # BufferedTokenizer takes a delimiter upon instantiation.
 # It allows input to be spoon-fed from some outside source which receives
@@ -15,7 +16,7 @@
 #     end
 module UV
     class BufferedTokenizer
-        DEFAULT_ENCODING = 'ASCII-8BIT'.freeze
+        DEFAULT_ENCODING = 'ASCII-8BIT'
 
         attr_accessor :delimiter, :indicator, :size_limit, :verbose
 
@@ -30,11 +31,8 @@ module UV
             @encoding   = options[:encoding] || DEFAULT_ENCODING
 
             if @delimiter
-                @delimiter.force_encoding(@encoding) if @delimiter.is_a?(String)
-                @indicator.force_encoding(@encoding) if @indicator.is_a?(String)
                 @extract_method = method(:delimiter_extract)
             elsif @indicator && @msg_length
-                @indicator.force_encoding(@encoding) if @indicator.is_a?(String)
                 @extract_method = method(:length_extract)
             else
                 raise ArgumentError, 'no delimiter provided'
@@ -88,7 +86,7 @@ module UV
             messages = @input.split(@delimiter, -1)
 
             if @indicator
-                @input = messages.pop || ''
+                @input = messages.pop || empty_string
                 entities = []
                 messages.each do |msg|
                     res = msg.split(@indicator, -1)
@@ -96,7 +94,7 @@ module UV
                 end
             else
                 entities = messages
-                @input = entities.pop || ''
+                @input = entities.pop || empty_string
             end
 
             check_buffer_limits
@@ -111,7 +109,7 @@ module UV
             messages = @input.split(@indicator, -1)
             messages.shift # discard junk data
 
-            last = messages.pop || ''
+            last = messages.pop || empty_string
 
             # Select messages of the right size then remove junk data
             messages.select! { |msg| msg.length >= @msg_length ? true : false }
@@ -146,15 +144,27 @@ module UV
         end
 
         def init_buffer
-            @input = ''
-            @input.force_encoding(@encoding)
-            @delimiter.force_encoding(@encoding) if @delimiter.is_a?(String)
-            @indicator.force_encoding(@encoding) if @indicator.is_a?(String)
+            @input = empty_string
+
+            if @delimiter.is_a?(String)
+                @delimiter = String.new(@delimiter).encode(@encoding).freeze
+            end
+
+            if @indicator.is_a?(String)
+                @indicator = String.new(@indicator).encode(@encoding).freeze
+            end
         end
 
-        def reset(value = '')
-            @input = value
-            @input.force_encoding(@encoding)
+        def reset(value = nil)
+            @input = String.new(value || '').force_encoding(@encoding)
+        end
+
+
+        protected
+
+
+        def empty_string
+            String.new.force_encoding(@encoding)
         end
     end
 end

data/lib/uv-rays/connection.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 module UV
     def self.try_connect(tcp, handler, server, port)
@@ -13,12 +14,12 @@ module UV
                 tcp.start_read
             end
         else
-            tcp.loop.lookup(server).then(
+            tcp.reactor.lookup(server, wait: false).then(
                 proc { |result|
                     UV.try_connect(tcp, handler, result[0][0], port)
                 },
                 proc { |failure|
-                    # TODO:: Log error on loop
+                    # TODO:: Log error on reactor
                     handler.on_close
                 }
             )
@@ -64,7 +65,7 @@ module UV
 
     class TcpConnection < Connection
         def write(data)
-            @transport.write(data)
+            @transport.write(data, wait: :promise)
         end
 
         def close_connection(after_writing = false)
@@ -76,9 +77,8 @@ module UV
         end
 
         def stream_file(filename, type = :raw)
-            file = @loop.file(filename, File::RDONLY)
-            file.progress do    # File is open and available for reading
-                file.send_file(@transport, type).finally do
+            file = @reactor.file(filename, File::RDONLY) do    # File is open and available for reading
+                file.send_file(@transport, type, wait: :promise).finally do
                     file.close
                 end
             end
@@ -105,7 +105,7 @@ module UV
         def initialize(tcp)
             super()
 
-            @loop = tcp.loop
+            @reactor = tcp.reactor
             @transport = tcp
             @transport.finally method(:on_close)
             @transport.progress method(:on_read)
@@ -127,10 +127,10 @@ module UV
         def initialize(server, port)
             super()
 
-            @loop = Libuv::Loop.current || Libuv::Loop.default
+            @reactor = reactor
             @server = server
             @port = port
-            @transport = @loop.tcp
+            @transport = @reactor.tcp
 
             ::UV.try_connect(@transport, self, @server, @port)
         end
@@ -146,9 +146,9 @@ module UV
         end
 
         def reconnect(server = nil, port = nil)
-            @loop = Libuv::Loop.current || @loop
+            @reactor = reactor
 
-            @transport = @loop.tcp
+            @transport = @reactor.tcp
             @server = server || @server
             @port = port || @port
 
@@ -160,8 +160,8 @@ module UV
         def initialize(server = nil, port = nil)
             super()
 
-            @loop = Libuv::Loop.current || Libuv::Loop.default
-            @transport = @loop.udp
+            @reactor = reactor
+            @transport = @reactor.udp
             @transport.progress method(:on_read)
 
             if not server.nil?
@@ -182,7 +182,7 @@ module UV
             else
                 # Async DNS resolution
                 # Note:: send here will chain the promise
-                @loop.lookup(recipient_address).then do |result|
+                @reactor.lookup(recipient_address).then do |result|
                     @transport.send result[0][0], recipient_port, data
                 end
             end

data/lib/uv-rays/http/encoding.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true, encoding: ASCII-8BIT
+
 module UV
     module Http
         module Encoding
@@ -105,7 +107,7 @@ module UV
             end
 
             def encode_headers(head)
-                head.inject('') do |result, (key, value)|
+                head.inject(String.new) do |result, (key, value)|
                     # Munge keys from foo-bar-baz to Foo-Bar-Baz
                     key = key.split('-').map { |k| k.to_s.capitalize }.join('-')
                     result << case key
@@ -119,7 +121,7 @@ module UV
 
             def encode_cookie(cookie)
                 if cookie.is_a? Hash
-                    cookie.inject('') { |result, (k, v)| result << encode_param(k, v) + ';' }
+                    cookie.inject(String.new) { |result, (k, v)| result << encode_param(k, v) + ';' }
                 else
                     cookie
                 end

data/lib/uv-rays/http/parser.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module UV
     module Http
         class Headers < Hash
@@ -7,6 +9,9 @@ module UV
             # The status code (as an integer)
             attr_accessor :status
 
+            # The text after the status code
+            attr_accessor :reason_phrase
+
             # Cookies at the time of the request
             attr_accessor :cookies
 
@@ -57,12 +62,14 @@ module UV
             # Parser Callbacks:
             def on_message_begin(parser)
                 @headers = Headers.new
-                @body = ''
+                @body = String.new
                 @chunked = false
                 @close_connection = false
             end
 
             def on_status(parser, data)
+                @headers.reason_phrase = data
+
                 # Different HTTP versions have different defaults
                 if @state.http_minor == 0
                     @close_connection = true
@@ -88,6 +95,11 @@ module UV
                     # If chunked we'll buffer streaming data for notification
                     @chunked = data == 'chunked'
 
+                end
+
+                current = @headers[@header]
+                if current
+                    @headers[@header] = "#{current}, #{data}"
                 else
                     @headers[@header] = data
                 end
@@ -134,7 +146,7 @@ module UV
             def eof
                 return if @request.nil?
 
-                if @headers_complete && @headers[:'Content-Length'].nil?
+                if @headers_complete && (@headers[:'Content-Length'].nil? || @request.method == :head)
                     on_message_complete(nil)
                 else
                     # Reject if this is a partial response