tipi 0.39 → 0.43

data/lib/tipi/http2_adapter.rb

@@ -3,18 +3,30 @@
 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
@@ -30,6 +42,8 @@ module Tipi
         @transfer_count_request.tx_incr(data.bytesize)
       end
       @conn << data
+    rescue Polyphony::BaseException
+      raise
     rescue Exception => e
       @connection_fiber.transfer e
     end
@@ -45,8 +59,7 @@ module Tipi
       @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
@@ -60,7 +73,7 @@ module Tipi
         @rx += data.bytesize
         @interface << data
       end
-    rescue SystemCallError, IOError
+    rescue SystemCallError, IOError, HTTP2::Error::Error
       # ignore
     ensure
       finalize_client_loop
@@ -87,10 +100,12 @@ 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
 

data/lib/tipi/http2_stream.rb

@@ -15,8 +15,7 @@ module Tipi
       @conn = conn
       @first = first
       @connection_fiber = Fiber.current
-      @stream_fiber = spin { |req| handle_request(req, &block) }
-      Thread.current.fiber_unschedule(@stream_fiber)
+      @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
@@ -34,16 +33,16 @@ 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
     
@@ -55,29 +54,19 @@ module Tipi
         @request.headers[':first'] = true
         @first = false
       end
-      @stream_fiber.schedule @request
+      @stream_fiber << @request
     end
 
     def on_data(data)
       data = data.to_s # chunks might be wrapped in a HTTP2::Buffer
-      if @waiting_for_body_chunk
-        @waiting_for_body_chunk = nil
-        @stream_fiber.schedule data
-      else
-        @request.buffer_body_chunk(data)
-      end
+      
+      (@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
@@ -90,31 +79,38 @@ module Tipi
     ensure
       @adapter.unset_request_for_transfer_count(request)
     end
-    
-    def get_body_chunk(request)
-      # called in the context of the stream fiber
-      return nil 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
       
-      with_transfer_count(request) do
-        @waiting_for_body_chunk = true
-        # the chunk (or an exception) will be returned once the stream fiber is
-        # resumed 
+      begin
+        @get_body_chunk_fiber = Fiber.current
         suspend
+      ensure
+        @get_body_chunk_fiber = nil
       end
-    ensure
-      @waiting_for_body_chunk = nil
+      @buffered_chunks.shift
     end
-    
-    # Wait for request to finish
-    def consume_request(request)
-      return if @request.complete?
-      
-      with_transfer_count(request) do
-        @waiting_for_half_close = true
-        suspend
+
+    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
-    ensure
-      @waiting_for_half_close = nil
+      @buffered_chunks.join
+    end
+
+    def complete?(request)
+      @complete
     end
     
     # response API
@@ -123,9 +119,23 @@ module Tipi
       headers[':status'] = headers[':status'].to_s
       with_transfer_count(request) do
         @stream.headers(transform_headers(headers))
+        @headers_sent = true
         @stream.data(chunk || '')
       end
-      @headers_sent = true
+    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
@@ -180,7 +190,7 @@ module Tipi
     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.39'
+  VERSION = '0.43'
 end

data/test/helper.rb

@@ -8,32 +8,29 @@ require_relative './eg'
 require_relative './coverage' if ENV['COVERAGE']
 
 require 'minitest/autorun'
-require 'minitest/reporters'
 
 require 'polyphony'
 
 ::Exception.__disable_sanitized_backtrace__ = true
 
-Minitest::Reporters.use! [
-  Minitest::Reporters::SpecReporter.new
-]
-
 class MiniTest::Test
   def setup
-    # puts "* setup #{self.name}"
-    if Fiber.current.children.size > 0
-      puts "Children left: #{Fiber.current.children.inspect}"
-      exit!
-    end
+    # trace "* setup #{self.name}"
     Fiber.current.setup_main_fiber
     Fiber.current.instance_variable_set(:@auto_watcher, nil)
+    Thread.current.backend.finalize
     Thread.current.backend = Polyphony::Backend.new
     sleep 0
   end
 
   def teardown
-    # puts "* teardown #{self.name.inspect} Fiber.current: #{Fiber.current.inspect}"
+    # trace "* teardown #{self.name}"
     Fiber.current.shutdown_all_children
+    if Fiber.current.children.size > 0
+      puts "Children left after #{self.name}: #{Fiber.current.children.inspect}"
+      exit!
+    end
+    Fiber.current.instance_variable_set(:@auto_watcher, nil)
   rescue => e
     puts e
     puts e.backtrace.join("\n")
@@ -47,4 +44,55 @@ module Kernel
   rescue Exception => e
     e
   end
-end
+
+  def trace(*args)
+    STDOUT.orig_write(format_trace(args))
+  end
+
+  def format_trace(args)
+    if args.first.is_a?(String)
+      if args.size > 1
+        format("%s: %p\n", args.shift, args)
+      else
+        format("%s\n", args.first)
+      end
+    else
+      format("%p\n", args.size == 1 ? args.first : args)
+    end
+  end
+end
+
+class IO
+  # Creates two mockup sockets for simulating server-client communication
+  def self.server_client_mockup
+    server_in, client_out = IO.pipe
+    client_in, server_out = IO.pipe
+
+    server_connection = mockup_connection(server_in, server_out, client_out)
+    client_connection = mockup_connection(client_in, client_out, server_out)
+
+    [server_connection, client_connection]
+  end
+
+  def self.mockup_connection(input, output, output2)
+    eg(
+      __parser_read_method__: ->() { :readpartial },
+      read:         ->(*args) { input.read(*args) },
+      read_loop:    ->(*args, &block) { input.read_loop(*args, &block) },
+      recv_loop:    ->(*args, &block) { input.read_loop(*args, &block) },
+      readpartial:  ->(*args) { input.readpartial(*args) },
+      recv:         ->(*args) { input.readpartial(*args) },
+      '<<':         ->(*args) { output.write(*args) },
+      write:        ->(*args) { output.write(*args) },
+      close:        -> { output.close },
+      eof?:         -> { output2.closed? }
+    )
+  end
+end
+
+module Minitest::Assertions
+  def assert_in_range exp_range, act
+    msg = message(msg) { "Expected #{mu_pp(act)} to be in range #{mu_pp(exp_range)}" }
+    assert exp_range.include?(act), msg
+  end
+end

data/test/test_http_server.rb

@@ -9,33 +9,6 @@ class String
   end
 end
 
-class IO
-  # Creates two mockup sockets for simulating server-client communication
-  def self.server_client_mockup
-    server_in, client_out = IO.pipe
-    client_in, server_out = IO.pipe
-
-    server_connection = mockup_connection(server_in, server_out, client_out)
-    client_connection = mockup_connection(client_in, client_out, server_out)
-
-    [server_connection, client_connection]
-  end
-
-  def self.mockup_connection(input, output, output2)
-    eg(
-      :read        => ->(*args) { input.read(*args) },
-      :read_loop   => ->(*args, &block) { input.read_loop(*args, &block) },
-      :recv_loop   => ->(*args, &block) { input.read_loop(*args, &block) },
-      :readpartial => ->(*args) { input.readpartial(*args) },
-      :recv        => ->(*args) { input.readpartial(*args) },
-      :<<          => ->(*args) { output.write(*args) },
-      :write       => ->(*args) { output.write(*args) },
-      :close       => -> { output.close },
-      :eof?        => -> { output2.closed? }
-    )
-  end
-end
-
 class HTTP1ServerTest < MiniTest::Test
   def teardown
     @server&.interrupt if @server&.alive?