tipi 0.38 → 0.42

data/lib/tipi/http2_adapter.rb

@@ -3,20 +3,34 @@
 require 'http/2'
 require_relative './http2_stream'
 
+# patch to fix bug in HTTP2::Stream
+class HTTP2::Stream
+  def end_stream?(frame)
+    case frame[:type]
+    when :data, :headers, :continuation
+      frame[:flags]&.include?(:end_stream)
+    else false
+    end
+  end
+end
+
 module Tipi
   # HTTP2 server adapter
   class HTTP2Adapter
-    def self.upgrade_each(socket, opts, headers, &block)
-      adapter = new(socket, opts, headers)
+    def self.upgrade_each(socket, opts, headers, body, &block)
+      adapter = new(socket, opts, headers, body)
       adapter.each(&block)
     end
     
-    def initialize(conn, opts, upgrade_headers = nil)
+    def initialize(conn, opts, upgrade_headers = nil, upgrade_body = nil)
       @conn = conn
       @opts = opts
       @upgrade_headers = upgrade_headers
+      @upgrade_body = upgrade_body
       @first = true
-      
+      @rx = (upgrade_headers && upgrade_headers[':rx']) || 0
+      @tx = (upgrade_headers && upgrade_headers[':tx']) || 0
+
       @interface = ::HTTP2::Server.new
       @connection_fiber = Fiber.current
       @interface.on(:frame, &method(:send_frame))
@@ -24,7 +38,12 @@ module Tipi
     end
     
     def send_frame(data)
+      if @transfer_count_request
+        @transfer_count_request.tx_incr(data.bytesize)
+      end
       @conn << data
+    rescue Polyphony::BaseException
+      raise
     rescue Exception => e
       @connection_fiber.transfer e
     end
@@ -38,9 +57,9 @@ module Tipi
     
     def upgrade
       @conn << UPGRADE_MESSAGE
+      @tx += UPGRADE_MESSAGE.bytesize
       settings = @upgrade_headers['http2-settings']
-      Fiber.current.schedule(nil)
-      @interface.upgrade(settings, @upgrade_headers, '')
+      @interface.upgrade(settings, @upgrade_headers, @upgrade_body || '')
     ensure
       @upgrade_headers = nil
     end
@@ -49,16 +68,31 @@ module Tipi
     def each(&block)
       @interface.on(:stream) { |stream| start_stream(stream, &block) }
       upgrade if @upgrade_headers
-      
-      @conn.recv_loop(&@interface.method(:<<))
-    rescue SystemCallError, IOError
+
+      @conn.recv_loop do |data|
+        @rx += data.bytesize
+        @interface << data
+      end
+    rescue SystemCallError, IOError, HTTP2::Error::Error
       # ignore
     ensure
       finalize_client_loop
     end
+
+    def get_rx_count
+      count = @rx
+      @rx = 0
+      count
+    end
+    
+    def get_tx_count
+      count = @tx
+      @tx = 0
+      count
+    end
     
     def start_stream(stream, &block)
-      stream = HTTP2StreamHandler.new(stream, @conn, @first, &block)
+      stream = HTTP2StreamHandler.new(self, stream, @conn, @first, &block)
       @first = nil if @first
       @streams[stream] = true
     end
@@ -66,11 +100,23 @@ module Tipi
     def finalize_client_loop
       @interface = nil
       @streams.each_key(&:stop)
+      @conn.shutdown if @conn.respond_to?(:shutdown) rescue nil
       @conn.close
     end
     
     def close
+      @conn.shutdown if @conn.respond_to?(:shutdown) rescue nil
       @conn.close
     end
+
+    def set_request_for_transfer_count(request)
+      @transfer_count_request = request
+    end
+
+    def unset_request_for_transfer_count(request)
+      return unless @transfer_count_request == request
+
+      @transfer_count_request = nil
+    end
   end
 end

data/lib/tipi/http2_stream.rb

@@ -9,13 +9,14 @@ module Tipi
     attr_accessor :__next__
     attr_reader :conn
     
-    def initialize(stream, conn, first, &block)
+    def initialize(adapter, stream, conn, first, &block)
+      @adapter = adapter
       @stream = stream
       @conn = conn
       @first = first
       @connection_fiber = Fiber.current
-      @stream_fiber = spin { |req| handle_request(req, &block) }
-      
+      @stream_fiber = spin { run(&block) }
+
       # Stream callbacks occur on the connection fiber (see HTTP2Adapter#each).
       # The request handler is run on a separate fiber for each stream, allowing
       # concurrent handling of incoming requests on the same HTTP/2 connection.
@@ -32,112 +33,164 @@ module Tipi
       stream.on(:half_close, &method(:on_half_close))
     end
     
-    def handle_request(request, &block)
+    def run(&block)
+      request = receive
       error = nil
       block.(request)
       @connection_fiber.schedule
-    rescue Polyphony::MoveOn
-      # ignore
+    rescue Polyphony::BaseException
+      raise
     rescue Exception => e
       error = e
     ensure
-      @done = true
       @connection_fiber.schedule error
     end
     
     def on_headers(headers)
       @request = Qeweney::Request.new(headers.to_h, self)
+      @request.rx_incr(@adapter.get_rx_count)
+      @request.tx_incr(@adapter.get_tx_count)
       if @first
         @request.headers[':first'] = true
         @first = false
       end
-      @stream_fiber.schedule @request
+      @stream_fiber << @request
     end
-    
+
     def on_data(data)
-      if @waiting_for_body_chunk
-        @waiting_for_body_chunk = nil
-        @stream_fiber.schedule data
-      else
-        @request.buffer_body_chunk(data)
-      end
+      data = data.to_s # chunks might be wrapped in a HTTP2::Buffer
+      
+      (@buffered_chunks ||= []) << data
+      @get_body_chunk_fiber&.schedule
     end
 
     def on_half_close
-      if @waiting_for_body_chunk
-        @waiting_for_body_chunk = nil
-        @stream_fiber.schedule
-      elsif @waiting_for_half_close
-        @waiting_for_half_close = nil
-        @stream_fiber.schedule
-      else
-        @request.complete!
-      end
+      @get_body_chunk_fiber&.schedule
+      @complete = true
     end
     
     def protocol
       'h2'
     end
-    
-    def get_body_chunk
-      # called in the context of the stream fiber
-      return nil if @request.complete?
-      
-      @waiting_for_body_chunk = true
-      # the chunk (or an exception) will be returned once the stream fiber is
-      # resumed
-      suspend
+
+    def with_transfer_count(request)
+      @adapter.set_request_for_transfer_count(request)
+      yield
     ensure
-      @waiting_for_body_chunk = nil
+      @adapter.unset_request_for_transfer_count(request)
     end
-    
-    # Wait for request to finish
-    def consume_request
-      return if @request.complete?
+
+    def get_body_chunk(request, buffered_only = false)
+      @buffered_chunks ||= []
+      return @buffered_chunks.shift unless @buffered_chunks.empty?
+      return nil if @complete
       
-      @waiting_for_half_close = true
-      suspend
-    ensure
-      @waiting_for_half_close = nil
+      begin
+        @get_body_chunk_fiber = Fiber.current
+        suspend
+      ensure
+        @get_body_chunk_fiber = nil
+      end
+      @buffered_chunks.shift
+    end
+
+    def get_body(request)
+      @buffered_chunks ||= []
+      return @buffered_chunks.join if @complete
+
+      while !@complete
+        begin
+          @get_body_chunk_fiber = Fiber.current
+          suspend
+        ensure
+          @get_body_chunk_fiber = nil
+        end
+      end
+      @buffered_chunks.join
+    end
+
+    def complete?(request)
+      @complete
     end
     
     # response API
-    def respond(chunk, headers)
+    def respond(request, chunk, headers)
       headers[':status'] ||= Qeweney::Status::OK
-      @stream.headers(headers, end_stream: false)
-      @stream.data(chunk, end_stream: true)
-      @headers_sent = true
+      headers[':status'] = headers[':status'].to_s
+      with_transfer_count(request) do
+        @stream.headers(transform_headers(headers))
+        @headers_sent = true
+        @stream.data(chunk || '')
+      end
+    rescue HTTP2::Error::StreamClosed
+      # ignore
+    end
+
+    def respond_from_io(request, io, headers, chunk_size = 2**16)
+      headers[':status'] ||= Qeweney::Status::OK
+      headers[':status'] = headers[':status'].to_s
+      with_transfer_count(request) do
+        @stream.headers(transform_headers(headers))
+        @headers_sent = true
+        while (chunk = io.read(chunk_size))
+          @stream.data(chunk)
+        end
+      end
+    rescue HTTP2::Error::StreamClosed
+      # ignore
+    end
+
+    def transform_headers(headers)
+      headers.each_with_object([]) do |(k, v), a|
+        if v.is_a?(Array)
+          v.each { |vv| a << [k, vv.to_s] }
+        else
+          a << [k, v.to_s]
+        end
+      end
     end
     
-    def send_headers(headers, empty_response = false)
+    def send_headers(request, headers, empty_response: false)
       return if @headers_sent
       
       headers[':status'] ||= (empty_response ? Qeweney::Status::NO_CONTENT : Qeweney::Status::OK).to_s
-      @stream.headers(headers, end_stream: false)
+      with_transfer_count(request) do
+        @stream.headers(transform_headers(headers), end_stream: false)
+      end
       @headers_sent = true
+    rescue HTTP2::Error::StreamClosed
+      # ignore
     end
     
-    def send_chunk(chunk, done: false)
+    def send_chunk(request, chunk, done: false)
       send_headers({}, false) unless @headers_sent
       
       if chunk
-        @stream.data(chunk, end_stream: done)
+        with_transfer_count(request) do
+          @stream.data(chunk, end_stream: done)
+        end
       elsif done
         @stream.close
       end
+    rescue HTTP2::Error::StreamClosed
+      # ignore
     end
     
-    def finish
+    def finish(request)
       if @headers_sent
         @stream.close
       else
         headers[':status'] ||= Qeweney::Status::NO_CONTENT
-        @stream.headers(headers, end_stream: true)
+        with_transfer_count(request) do
+          @stream.headers(transform_headers(headers), end_stream: true)
+        end
       end
+    rescue HTTP2::Error::StreamClosed
+      # ignore
     end
     
     def stop
-      return if @done
+      return if @complete
       
       @stream.close
       @stream_fiber.schedule(Polyphony::MoveOn.new)

data/lib/tipi/rack_adapter.rb

@@ -3,25 +3,7 @@
 require 'rack'
 
 module Tipi
-  module RackAdapter
-    # Implements a rack input stream:
-    # https://www.rubydoc.info/github/rack/rack/master/file/SPEC#label-The+Input+Stream
-    class InputStream
-      def initialize(request)
-        @request = request
-      end
-      
-      def gets; end
-      
-      def read(length = nil, outbuf = nil); end
-      
-      def each(&block)
-        @request.each_chunk(&block)
-      end
-      
-      def rewind; end
-    end
-    
+  module RackAdapter    
     class << self
       def run(app)
         ->(req) { respond(req, app.(env(req))) }
@@ -32,41 +14,8 @@ module Tipi
         instance_eval(src, path, 1)
       end
 
-      RACK_ENV = {
-        'SCRIPT_NAME'                    => '',
-        'rack.version'                   => Rack::VERSION,
-        'SERVER_PORT'                    => '80', # ?
-        'rack.url_scheme'                => 'http', # ?
-        'rack.errors'                    => STDERR, # ?
-        'rack.multithread'               => false,
-        'rack.run_once'                  => false,
-        'rack.hijack?'                   => false,
-        'rack.hijack'                    => nil,
-        'rack.hijack_io'                 => nil,
-        'rack.session'                   => nil,
-        'rack.logger'                    => nil,
-        'rack.multipart.buffer_size'     => nil,
-        'rack.multipar.tempfile_factory' => nil
-      }
-      
       def env(request)
-        Hash.new do |h, k|
-          h[k] = env_value_from_request(request, k)
-        end
-      end
-
-      HTTP_HEADER_RE = /^HTTP_(.+)$/.freeze
-
-      def env_value_from_request(request, key)
-        case key
-        when 'REQUEST_METHOD' then request.method
-        when 'PATH_INFO'      then request.path
-        when 'QUERY_STRING'   then request.query_string || ''
-        when 'SERVER_NAME'    then request.headers['host']
-        when 'rack.input'     then InputStream.new(request)
-        when HTTP_HEADER_RE   then request.headers[$1.downcase]
-        else                       RACK_ENV[key]
-        end
+        Qeweney.rack_env_from_request(request)
       end
 
       def respond(request, (status_code, headers, body))

data/lib/tipi/response_extensions.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require 'qeweney/request'
+
+module Tipi
+  module ResponseExtensions
+    SPLICE_CHUNKS_SIZE_THRESHOLD = 2**20
+
+    def serve_io(io, opts)
+      if !opts[:stat] || opts[:stat].size >= SPLICE_CHUNKS_SIZE_THRESHOLD
+        @adapter.respond_from_io(self, io, opts[:headers], opts[:chunk_size] || 2**14)
+      else  
+        respond(io.read, opts[:headers] || {})
+      end
+    end
+  end
+end

data/lib/tipi/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Tipi
-  VERSION = '0.38'
+  VERSION = '0.42'
 end