tipi 0.37 → 0.40

data/lib/tipi/http2_adapter.rb

@@ -16,7 +16,9 @@ module Tipi
       @opts = opts
       @upgrade_headers = upgrade_headers
       @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,6 +26,9 @@ module Tipi
     end
     
     def send_frame(data)
+      if @transfer_count_request
+        @transfer_count_request.tx_incr(data.bytesize)
+      end
       @conn << data
     rescue Exception => e
       @connection_fiber.transfer e
@@ -38,6 +43,7 @@ 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, '')
@@ -49,16 +55,31 @@ module Tipi
     def each(&block)
       @interface.on(:stream) { |stream| start_stream(stream, &block) }
       upgrade if @upgrade_headers
-      
-      @conn.recv_loop(&@interface.method(:<<))
+
+      @conn.recv_loop do |data|
+        @rx += data.bytesize
+        @interface << data
+      end
     rescue SystemCallError, IOError
       # 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 +87,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,15 @@ 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) }
-      
+      Thread.current.fiber_unschedule(@stream_fiber)
+
       # 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.
@@ -47,14 +49,17 @@ module Tipi
     
     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
     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
@@ -62,7 +67,7 @@ module Tipi
         @request.buffer_body_chunk(data)
       end
     end
-    
+
     def on_half_close
       if @waiting_for_body_chunk
         @waiting_for_body_chunk = nil
@@ -78,62 +83,114 @@ module Tipi
     def protocol
       'h2'
     end
+
+    def with_transfer_count(request)
+      @adapter.set_request_for_transfer_count(request)
+      yield
+    ensure
+      @adapter.unset_request_for_transfer_count(request)
+    end
     
-    def get_body_chunk
+    def get_body_chunk(request)
       # 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
+      with_transfer_count(request) do
+        @waiting_for_body_chunk = true
+        # the chunk (or an exception) will be returned once the stream fiber is
+        # resumed 
+        suspend
+      end
     ensure
       @waiting_for_body_chunk = nil
     end
     
     # Wait for request to finish
-    def consume_request
+    def consume_request(request)
       return if @request.complete?
       
-      @waiting_for_half_close = true
-      suspend
+      with_transfer_count(request) do
+        @waiting_for_half_close = true
+        suspend
+      end
     ensure
       @waiting_for_half_close = nil
     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

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])
+      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.37'
+  VERSION = '0.40'
 end

data/test/test_http_server.rb

@@ -60,8 +60,8 @@ class HTTP1ServerTest < MiniTest::Test
     connection << "GET / HTTP/1.0\r\n\r\n"
 
     response = connection.readpartial(8192)
-    expected = <<~HTTP.chomp.http_lines
-      HTTP/1.0 200
+    expected = <<~HTTP.chomp.http_lines.chomp
+      HTTP/1.1 200
       Content-Length: 13
 
       Hello, world!
@@ -78,14 +78,11 @@ class HTTP1ServerTest < MiniTest::Test
     connection << "GET / HTTP/1.1\r\n\r\n"
 
     response = connection.readpartial(8192)
-    expected = <<~HTTP.http_lines
+    expected = <<~HTTP.http_lines.chomp
       HTTP/1.1 200
-      Transfer-Encoding: chunked
+      Content-Length: 13
 
-      d
       Hello, world!
-      0
-
     HTTP
     assert_equal(expected, response)
   end
@@ -98,26 +95,23 @@ class HTTP1ServerTest < MiniTest::Test
     connection << "GET / HTTP/1.0\r\nConnection: keep-alive\r\n\r\n"
     response = connection.readpartial(8192)
     assert !connection.eof?
-    assert_equal("HTTP/1.0 200\r\nContent-Length: 2\r\n\r\nHi", response)
+    assert_equal("HTTP/1.1 200\r\nContent-Length: 2\r\n\r\nHi", response)
 
     connection << "GET / HTTP/1.1\r\n\r\n"
     response = connection.readpartial(8192)
     assert !connection.eof?
-    expected = <<~HTTP.http_lines
+    expected = <<~HTTP.http_lines.chomp
       HTTP/1.1 200
-      Transfer-Encoding: chunked
+      Content-Length: 2
 
-      2
       Hi
-      0
-
     HTTP
     assert_equal(expected, response)
 
     connection << "GET / HTTP/1.0\r\n\r\n"
     response = connection.readpartial(8192)
     assert connection.eof?
-    assert_equal("HTTP/1.0 200\r\nContent-Length: 2\r\n\r\nHi", response)
+    assert_equal("HTTP/1.1 200\r\nContent-Length: 2\r\n\r\nHi", response)
   end
 
   def test_pipelining_client
@@ -130,24 +124,17 @@ class HTTP1ServerTest < MiniTest::Test
     end
 
     connection << "GET / HTTP/1.1\r\n\r\nGET / HTTP/1.1\r\nFoo: bar\r\n\r\n"
-    2.times { snooze }
+    sleep 0.01
     response = connection.readpartial(8192)
 
-    expected = <<~HTTP.http_lines
+    expected = <<~HTTP.http_lines.chomp
       HTTP/1.1 200
-      Transfer-Encoding: chunked
-
-      d
-      Hello, world!
-      0
+      Content-Length: 13
 
-      HTTP/1.1 200
-      Transfer-Encoding: chunked
+      Hello, world!HTTP/1.1 200
+      Content-Length: 14
 
-      e
       Hello, foobar!
-      0
-
     HTTP
     assert_equal(expected, response)
   end
@@ -172,22 +159,22 @@ class HTTP1ServerTest < MiniTest::Test
       6
       foobar
     HTTP
-    20.times { snooze }
+    sleep 0.01
     assert request
     assert_equal %w[foobar], chunks
     assert !request.complete?
 
     connection << "6\r\nbazbud\r\n"
-    20.times { snooze }
+    sleep 0.01
     assert_equal %w[foobar bazbud], chunks
     assert !request.complete?
 
     connection << "0\r\n\r\n"
-    20.times { snooze }
+    sleep 0.01
     assert_equal %w[foobar bazbud], chunks
     assert request.complete?
 
-    2.times { snooze }
+    sleep 0.01
 
     response = connection.readpartial(8192)
 
@@ -210,7 +197,8 @@ class HTTP1ServerTest < MiniTest::Test
 
     opts = {
       upgrade: {
-        echo: lambda do |conn, _headers|
+        echo: lambda do |adapter, _headers|
+          conn = adapter.conn
           conn << <<~HTTP.http_lines
             HTTP/1.1 101 Switching Protocols
             Upgrade: echo
@@ -231,14 +219,11 @@ class HTTP1ServerTest < MiniTest::Test
     connection << "GET / HTTP/1.1\r\n\r\n"
     response = connection.readpartial(8192)
     assert !connection.eof?
-    expected = <<~HTTP.http_lines
+    expected = <<~HTTP.http_lines.chomp
       HTTP/1.1 200
-      Transfer-Encoding: chunked
+      Content-Length: 2
 
-      2
       Hi
-      0
-
     HTTP
     assert_equal(expected, response)
 
@@ -271,7 +256,7 @@ class HTTP1ServerTest < MiniTest::Test
     connection.close
     assert !done
     
-    12.times { snooze }
+    sleep 0.01
     assert done
   end
 

data/test/test_request.rb

@@ -60,7 +60,7 @@ class RequestHeadersTest < MiniTest::Test
 
     connection << "GET /titi HTTP/1.1\r\nHost: blah.com\r\nFoo: bar\r\nhi: 1\r\nHi: 2\r\nhi: 3\r\n\r\n"
 
-    snooze
+    sleep 0.01
 
     assert_kind_of Qeweney::Request, req
     assert_equal 'blah.com', req.headers['host']
@@ -78,7 +78,7 @@ class RequestHeadersTest < MiniTest::Test
     end
 
     connection << "GET /titi HTTP/1.1\nHost: blah.com\nFoo: bar\nhi: 1\nHi: 2\nhi: 3\n\n"
-    snooze
+    sleep 0.01
     assert_equal 'blah.com', req.host
   end
 
@@ -90,7 +90,7 @@ class RequestHeadersTest < MiniTest::Test
     end
 
     connection << "GET /titi HTTP/1.1\nConnection: keep-alive\nFoo: bar\nhi: 1\nHi: 2\nhi: 3\n\n"
-    snooze
+    sleep 0.01
     assert_equal 'keep-alive', req.connection
   end
 
@@ -102,7 +102,7 @@ class RequestHeadersTest < MiniTest::Test
     end
 
     connection << "GET /titi HTTP/1.1\nConnection: upgrade\nUpgrade: foobar\n\n"
-    snooze
+    sleep 0.01
     assert_equal 'foobar', req.upgrade_protocol
   end
 end