tipi 0.41 → 0.42

data/lib/tipi/digital_fabric/agent.rb

@@ -172,8 +172,9 @@ module DigitalFabric
         http_request(req)
       rescue IOError, Errno::ECONNREFUSED, Errno::EPIPE
         # ignore
-      rescue Polyphony::Terminate
+      rescue Polyphony::Terminate => e
         req.respond(nil, { ':status' => Qeweney::Status::SERVICE_UNAVAILABLE }) if Fiber.current.graceful_shutdown?
+        raise e
       ensure
         @requests.delete(id)
         @long_running_requests.delete(id)
@@ -187,7 +188,6 @@ module DigitalFabric
       complete = msg[Protocol::Attribute::HttpRequest::COMPLETE]
       req = Qeweney::Request.new(headers, RequestAdapter.new(self, msg))
       req.buffer_body_chunk(body_chunk) if body_chunk
-      req.complete! if complete
       req
     end
 

data/lib/tipi/digital_fabric/agent_proxy.rb

@@ -36,7 +36,7 @@ module DigitalFabric
       process_incoming_messages(false)
     rescue GracefulShutdown
       puts "Proxy got graceful shutdown, left: #{@requests.size} requests" if @requests.size > 0
-      process_incoming_messages(true)
+      move_on_after(15) { process_incoming_messages(true) }
     ensure
       # keep_alive_timer&.stop
       unmount
@@ -60,7 +60,7 @@ module DigitalFabric
       @mounted = nil
     end
 
-    def shutdown
+    def send_shutdown
       send_df_message(Protocol.shutdown)
       @fiber.raise GracefulShutdown.new
     end
@@ -144,7 +144,8 @@ module DigitalFabric
       t0 = Time.now
       t1 = nil
       with_request do |id|
-        send_df_message(Protocol.http_request(id, req))
+        msg = Protocol.http_request(id, req.headers, req.next_chunk(true), req.complete?)
+        send_df_message(msg)
         while (message = receive)
           unless t1
             t1 = Time.now

data/lib/tipi/digital_fabric/executive.rb

@@ -16,7 +16,7 @@ module DigitalFabric
       @service.mount(route, self)
       @current_request_count = 0
       # @updater = spin_loop(:executive_updater, interval: 10) { update_service_stats }
-      # update_service_stats
+      update_service_stats
     end
 
     def current_request_count
@@ -33,9 +33,13 @@ module DigitalFabric
         req.respond(message.to_json, { 'Content-Type' => 'text.json' })
       when '/stream/stats'
         stream_stats(req)
+      when '/upload'
+        req.respond("body: #{req.read.inspect}")
       else
         req.respond('Invalid path', { ':status' => Qeweney::Status::NOT_FOUND })
       end
+    rescue => e
+      puts "Error: #{e.inspect}"
     ensure
       @current_request_count -= 1
     end
@@ -43,7 +47,7 @@ module DigitalFabric
     def stream_stats(req)
       req.send_headers({ 'Content-Type' => 'text/event-stream' })
 
-      @service.timer.every(10) do
+      every(10) do
         message = last_service_stats
         req.send_chunk(format_sse_event(message.to_json))
       end

data/lib/tipi/digital_fabric/protocol.rb

@@ -102,8 +102,8 @@ module DigitalFabric
         DF_UPGRADE_RESPONSE
       end
 
-      def http_request(id, req)
-        [ HTTP_REQUEST, id, req.headers, req.next_chunk, req.complete? ]
+      def http_request(id, headers, buffered_chunk, complete)
+        [ HTTP_REQUEST, id, headers, buffered_chunk, complete ]
       end
 
       def http_response(id, body, headers, complete, transfer_count_key = nil)

data/lib/tipi/digital_fabric/request_adapter.rb

@@ -17,10 +17,6 @@ module DigitalFabric
       @agent.get_http_request_body(@id, 1)
     end
 
-    def consume_request(request)
-      @agent.get_http_request_body(@id, nil)
-    end
-
     def respond(request, body, headers)
       @agent.send_df_message(
         Protocol.http_response(@id, body, headers, true)

data/lib/tipi/digital_fabric/service.rb

@@ -25,7 +25,7 @@ module DigitalFabric
       @http_latency_max = 0
       @last_counters = @counters.merge(stamp: Time.now.to_f - 1)
       @fiber = Fiber.current
-      @timer = Polyphony::Timer.new('service_timer', resolution: 5)
+      # @timer = Polyphony::Timer.new('service_timer', resolution: 5)
     end
 
     def calculate_stats
@@ -81,6 +81,8 @@ module DigitalFabric
       s = `ps -p #{pid} -o %cpu,rss`
       cpu, rss = s.lines[1].chomp.strip.split(' ')
       [cpu.to_f, rss.to_i]
+    rescue Polyphony::BaseException
+      raise
     rescue Exception
       [nil, nil]
     end
@@ -231,13 +233,6 @@ module DigitalFabric
       @route_keys = @routes.keys
     end
 
-    def wait_for_agent(wait_list)
-      wait_list << Fiber.current
-      @timer.move_on_after(10) { suspend }
-    ensure
-      wait_list.delete(self)
-    end
-
     def path_regexp(path)
       /^#{path}/
     end
@@ -245,8 +240,8 @@ module DigitalFabric
     def graceful_shutdown
       @shutdown = true
       @agents.keys.each do |agent|
-        if agent.respond_to?(:shutdown)
-          agent.shutdown
+        if agent.respond_to?(:send_shutdown)
+          agent.send_shutdown
         else
           @agents.delete(agent)
         end

data/lib/tipi/http1_adapter.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'http/parser'
+require 'tipi_ext'
 require_relative './http2_adapter'
 require 'qeweney/request'
 
@@ -14,41 +14,56 @@ module Tipi
       @conn = conn
       @opts = opts
       @first = true
-      @parser = ::HTTP::Parser.new(self)
+      @parser = Tipi::HTTP1Parser.new(@conn)
     end
     
     def each(&block)
-      @conn.recv_loop do |data|
-        return if handle_incoming_data(data, &block) 
+      while true
+        headers = @parser.parse_headers
+        break unless headers
+        
+        # handle_request returns true if connection is not persistent or was
+        # upgraded
+        break if handle_request(headers, &block)
       end
+    rescue Tipi::HTTP1Parser::Error
+      # ignore
     rescue SystemCallError, IOError
       # ignore
     ensure
       finalize_client_loop
     end
     
-    # return [Boolean] true if client loop should stop
-    def handle_incoming_data(data, &block)
-      rx = data.bytesize
-      @parser << data
-      while (request = @requests_head)
-        request.headers[':rx'] = rx
-        if @first
-          request.headers[':first'] = true
-          @first = nil
-        end
-        return true if upgrade_connection(request.headers, &block)
-        
-        @requests_head = request.__next__
-        block.call(request)
-        return true unless request.keep_alive?
+    def handle_request(headers, &block)
+      scheme = (proto = headers['x-forwarded-proto']) ?
+                proto.downcase : scheme_from_connection
+      headers[':scheme'] = scheme
+      @protocol = headers[':protocol']
+      if @first
+        headers[':first'] = true
+        @first = nil
+      end
+      
+      return true if upgrade_connection(headers, &block)
+      
+      request = Qeweney::Request.new(headers, self)
+      if !@parser.complete?
+        request.buffer_body_chunk(@parser.read_body_chunk(true))
+      end
+      block.call(request)
+      return !persistent_connection?(headers)
+    end
+
+    def persistent_connection?(headers)
+      if headers[':protocol'] == 'http/1.1'
+        return headers['connection'] != 'close'
+      else
+        connection = headers['connection']
+        return connection && connection != 'close'
       end
-      nil
     end
     
     def finalize_client_loop
-      # release references to various objects
-      @requests_head = @requests_tail = nil
       @parser = nil
       @splicing_pipe = nil
       @conn.shutdown if @conn.respond_to?(:shutdown) rescue nil
@@ -57,82 +72,20 @@ module Tipi
     
     # Reads a body chunk for the current request. Transfers control to the parse
     # loop, and resumes once the parse_loop has fired the on_body callback
-    def get_body_chunk(request)
-      @waiting_for_body_chunk = true
-      @next_chunk = nil
-      while !@requests_tail.complete? && (data = @conn.readpartial(8192))
-        request.rx_incr(data.bytesize)
-        @parser << data
-        return @next_chunk if @next_chunk
-        
-        snooze
-      end
-      nil
-    ensure
-      @waiting_for_body_chunk = nil
-    end
-    
-    # Waits for the current request to complete. Transfers control to the parse
-    # loop, and resumes once the parse_loop has fired the on_message_complete
-    # callback
-    def consume_request(request)
-      request = @requests_head
-      @conn.recv_loop do |data|
-        request.rx_incr(data.bytesize)
-        @parser << data
-        return if request.complete?
-      end
-    end
-    
-    def protocol
-      version = @parser.http_version
-      "HTTP #{version.join('.')}"
-    end
-    
-    def on_headers_complete(headers)
-      headers = normalize_headers(headers)
-      headers[':path'] = @parser.request_url
-      headers[':method'] = @parser.http_method.downcase
-      scheme = (proto = headers['x-forwarded-proto']) ?
-                proto.downcase : scheme_from_connection
-      headers[':scheme'] = scheme
-      queue_request(Qeweney::Request.new(headers, self))
+    def get_body_chunk(request, buffered_only = false)
+      @parser.read_body_chunk(buffered_only)
     end
 
-    def normalize_headers(headers)
-      headers.each_with_object({}) do |(k, v), h|
-        k = k.downcase
-        hk = h[k]
-        if hk
-          hk = h[k] = [hk] unless hk.is_a?(Array)
-          v.is_a?(Array) ? hk.concat(v) : hk << v
-        else
-          h[k] = v
-        end
-      end
+    def get_body(request)
+      @parser.read_body
     end
-    
-    def queue_request(request)
-      if @requests_head
-        @requests_tail.__next__ = request
-        @requests_tail = request
-      else
-        @requests_head = @requests_tail = request
-      end
-    end
-    
-    def on_body(chunk)
-      if @waiting_for_body_chunk
-        @next_chunk = chunk
-        @waiting_for_body_chunk = nil
-      else
-        @requests_tail.buffer_body_chunk(chunk)
-      end
+
+    def complete?(request)
+      @parser.complete?
     end
     
-    def on_message_complete
-      @waiting_for_body_chunk = nil
-      @requests_tail.complete!(@parser.keep_alive?)
+    def protocol
+      @protocol
     end
     
     # Upgrades the connection to a different protocol, if the 'Upgrade' header is
@@ -170,14 +123,15 @@ module Tipi
     end
     
     def upgrade_with_handler(handler, headers)
-      @parser = @requests_head = @requests_tail = nil
+      @parser = nil
       handler.(self, headers)
       true
     end
     
     def upgrade_to_http2(headers, &block)
-      @parser = @requests_head = @requests_tail = nil
-      HTTP2Adapter.upgrade_each(@conn, @opts, http2_upgraded_headers(headers), &block)
+      headers = http2_upgraded_headers(headers)
+      body = @parser.read_body
+      HTTP2Adapter.upgrade_each(@conn, @opts, headers, body, &block)
       true
     end
     
@@ -210,7 +164,6 @@ module Tipi
     # @param body [String] response body
     # @param headers
     def respond(request, body, headers)
-      consume_request(request) if @parsing
       formatted_headers = format_headers(headers, body, false)
       request.tx_incr(formatted_headers.bytesize + (body ? body.bytesize : 0))
       if body
@@ -221,8 +174,6 @@ module Tipi
     end
 
     def respond_from_io(request, io, headers, chunk_size = 2**14)
-      consume_request(request) if @parsing
-
       formatted_headers = format_headers(headers, true, true)
       request.tx_incr(formatted_headers.bytesize)
       
@@ -246,10 +197,14 @@ module Tipi
     # @param chunked [boolean] whether to use chunked transfer encoding
     # @return [void]
     def send_headers(request, headers, empty_response: false, chunked: true)
-      formatted_headers = format_headers(headers, !empty_response, @parser.http_minor == 1 && chunked)
+      formatted_headers = format_headers(headers, !empty_response, http1_1?(request) && chunked)
       request.tx_incr(formatted_headers.bytesize)
       @conn.write(formatted_headers)
     end
+
+    def http1_1?(request)
+      request.headers[':protocol'] == 'http/1.1'
+    end
     
     # Sends a response body chunk. If no headers were sent, default headers are
     # sent using #send_headers. if the done option is true(thy), an empty chunk

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

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
@@ -194,7 +190,7 @@ module Tipi
     end
     
     def stop
-      return if @done
+      return if @complete
       
       @stream.close
       @stream_fiber.schedule(Polyphony::MoveOn.new)