tipi 0.38 → 0.39

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
@@ -72,5 +93,15 @@ module Tipi
     def close
       @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
@@ -78,62 +83,100 @@ 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[':status'] = headers[':status'].to_s
+      with_transfer_count(request) do
+        @stream.headers(transform_headers(headers))
+        @stream.data(chunk || '')
+      end
       @headers_sent = true
+    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/version.rb

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

data/tipi.gemspec

@@ -19,8 +19,8 @@ Gem::Specification.new do |s|
 
   s.executables   = ['tipi']
 
-  s.add_runtime_dependency      'polyphony',          '~>0.52.0'
-  s.add_runtime_dependency      'qeweney',            '~>0.6'
+  s.add_runtime_dependency      'polyphony',          '~>0.55.0'
+  s.add_runtime_dependency      'qeweney',            '~>0.9.1'
   
   s.add_runtime_dependency      'http_parser.rb',     '~>0.6.0'
   s.add_runtime_dependency      'http-2',             '~>0.10.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tipi
 version: !ruby/object:Gem::Version
-  version: '0.38'
+  version: '0.39'
 platform: ruby
 authors:
 - Sharon Rosner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-09 00:00:00.000000000 Z
+date: 2021-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: polyphony
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.52.0
+        version: 0.55.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.52.0
+        version: 0.55.0
 - !ruby/object:Gem::Dependency
   name: qeweney
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: 0.9.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: 0.9.1
 - !ruby/object:Gem::Dependency
   name: http_parser.rb
   requirement: !ruby/object:Gem::Requirement
@@ -292,7 +292,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Tipi - the All-in-one Web Server for Ruby Apps