tipi 0.41 → 0.46

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
@@ -24,33 +36,34 @@ module Tipi
       @interface.on(:frame, &method(:send_frame))
       @streams = {}
     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
-    
+
     UPGRADE_MESSAGE = <<~HTTP.gsub("\n", "\r\n")
     HTTP/1.1 101 Switching Protocols
     Connection: Upgrade
     Upgrade: h2c
-    
+
     HTTP
-    
+
     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
-    
+
     # Iterates over incoming requests
     def each(&block)
       @interface.on(:stream) { |stream| start_stream(stream, &block) }
@@ -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
@@ -71,26 +84,26 @@ module Tipi
       @rx = 0
       count
     end
-    
+
     def get_tx_count
       count = @tx
       @tx = 0
       count
     end
-    
+
     def start_stream(stream, &block)
       stream = HTTP2StreamHandler.new(self, stream, @conn, @first, &block)
       @first = nil if @first
       @streams[stream] = true
     end
-    
+
     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

data/lib/tipi/http2_stream.rb

@@ -6,17 +6,15 @@ require 'qeweney/request'
 module Tipi
   # Manages an HTTP 2 stream
   class HTTP2StreamHandler
-    attr_accessor :__next__
     attr_reader :conn
-    
+
     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_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
@@ -33,20 +31,20 @@ module Tipi
       stream.on(:data, &method(:on_data))
       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)
@@ -55,31 +53,21 @@ 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
       'h2'
     end
@@ -90,33 +78,40 @@ 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?
-      
-      with_transfer_count(request) do
-        @waiting_for_body_chunk = true
-        # the chunk (or an exception) will be returned once the stream fiber is
-        # resumed 
+
+    def get_body_chunk(request, buffered_only = false)
+      @buffered_chunks ||= []
+      return @buffered_chunks.shift unless @buffered_chunks.empty?
+      return nil if @complete
+
+      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
     def respond(request, chunk, headers)
       headers[':status'] ||= Qeweney::Status::OK
@@ -153,10 +148,10 @@ module Tipi
         end
       end
     end
-    
+
     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
       with_transfer_count(request) do
         @stream.headers(transform_headers(headers), end_stream: false)
@@ -165,10 +160,10 @@ module Tipi
     rescue HTTP2::Error::StreamClosed
       # ignore
     end
-    
+
     def send_chunk(request, chunk, done: false)
       send_headers({}, false) unless @headers_sent
-      
+
       if chunk
         with_transfer_count(request) do
           @stream.data(chunk, end_stream: done)
@@ -179,7 +174,7 @@ module Tipi
     rescue HTTP2::Error::StreamClosed
       # ignore
     end
-    
+
     def finish(request)
       if @headers_sent
         @stream.close
@@ -192,10 +187,10 @@ module Tipi
     rescue HTTP2::Error::StreamClosed
       # ignore
     end
-    
+
     def stop
-      return if @done
-      
+      return if @complete
+
       @stream.close
       @stream_fiber.schedule(Polyphony::MoveOn.new)
     end

data/lib/tipi/rack_adapter.rb

@@ -3,12 +3,12 @@
 require 'rack'
 
 module Tipi
-  module RackAdapter    
+  module RackAdapter
     class << self
       def run(app)
         ->(req) { respond(req, app.(env(req))) }
       end
-      
+
       def load(path)
         src = IO.read(path)
         instance_eval(src, path, 1)

data/lib/tipi/response_extensions.rb

@@ -9,7 +9,7 @@ module Tipi
     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  
+      else
         respond(io.read, opts[:headers] || {})
       end
     end

data/lib/tipi/supervisor.rb

@@ -0,0 +1,75 @@
+# frozen_string_literal: true
+
+require 'polyphony'
+require 'json'
+
+module Tipi
+  module Supervisor
+    class << self
+      def run(opts)
+        puts "Start supervisor pid: #{Process.pid}"
+        @opts = opts
+        @controller_watcher = start_controller_watcher
+        supervise_loop
+      end
+
+      def start_controller_watcher
+        spin do
+          cmd = controller_cmd
+          puts "Starting controller..."
+          pid = Kernel.spawn(*cmd)
+          @controller_pid = pid
+          puts "Controller pid: #{pid}"
+          _pid, status = Polyphony.backend_waitpid(pid)
+          puts "Controller has terminated with status: #{status.inspect}"
+          terminated = true
+        ensure
+          if pid && !terminated
+            puts "Terminate controller #{pid.inspect}"
+            Polyphony::Process.kill_process(pid)
+          end
+          Fiber.current.parent << pid
+        end
+      end
+
+      def controller_cmd
+        [
+          'ruby',
+          File.join(__dir__, 'controller.rb'),
+          @opts.to_json
+        ]
+      end
+
+      def supervise_loop
+        this_fiber = Fiber.current
+        trap('SIGUSR2') { this_fiber << :replace_controller }
+        loop do
+          case (msg = receive)
+          when :replace_controller
+            replace_controller
+          when Integer
+            pid = msg
+            if pid == @controller_pid
+              puts 'Detected dead controller. Restarting...'
+              exit!
+              @controller_watcher.restart
+            end
+          else
+            raise "Invalid message received: #{msg.inspect}"
+          end
+        end
+      end
+
+      def replace_controller
+        puts "Replacing controller"
+        old_watcher = @controller_watcher
+        @controller_watcher = start_controller_watcher
+
+        # TODO: we'll want to get some kind of signal from the new controller once it's ready
+        sleep 1
+
+        old_watcher.terminate(true)
+      end
+    end
+  end
+end

data/lib/tipi/version.rb

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

data/lib/tipi/websocket.rb

@@ -20,12 +20,12 @@ module Tipi
       @version = headers['sec-websocket-version'].to_i
       @reader = ::WebSocket::Frame::Incoming::Server.new(version: @version)
     end
-    
+
     def recv
       if (msg = @reader.next)
         return msg.to_s
       end
-    
+
       @conn.recv_loop do |data|
         @reader << data
         if (msg = @reader.next)
@@ -48,7 +48,7 @@ module Tipi
         end
       end
     end
-    
+
     OutgoingFrame = ::WebSocket::Frame::Outgoing::Server
 
     def send(data)

data/lib/tipi.rb

@@ -1,11 +1,13 @@
 # frozen_string_literal: true
 
 require 'polyphony'
+
 require_relative './tipi/http1_adapter'
-# require_relative './tipi/http1_adapter_new'
 require_relative './tipi/http2_adapter'
 require_relative './tipi/configuration'
 require_relative './tipi/response_extensions'
+require_relative './tipi/acme'
+
 require 'qeweney/request'
 
 class Qeweney::Request
@@ -15,7 +17,7 @@ end
 module Tipi
   ALPN_PROTOCOLS = %w[h2 http/1.1].freeze
   H2_PROTOCOL = 'h2'
-  
+
   class << self
     def serve(host, port, opts = {}, &handler)
       opts[:alpn_protocols] = ALPN_PROTOCOLS
@@ -24,7 +26,7 @@ module Tipi
     ensure
       server&.close
     end
-    
+
     def listen(host, port, opts = {})
       opts[:alpn_protocols] = ALPN_PROTOCOLS
       Polyphony::Net.tcp_listen(host, port, opts).tap do |socket|
@@ -33,7 +35,7 @@ module Tipi
         end
       end
     end
-    
+
     def accept_loop(server, opts, &handler)
       server.accept_loop do |client|
         spin { client_loop(client, opts, &handler) }
@@ -41,7 +43,7 @@ module Tipi
         # disregard
       end
     end
-    
+
     def client_loop(client, opts, &handler)
       client.no_delay if client.respond_to?(:no_delay)
       adapter = protocol_adapter(client, opts)
@@ -49,11 +51,11 @@ module Tipi
     ensure
       client.close rescue nil
     end
-    
+
     def protocol_adapter(socket, opts)
       use_http2 = socket.respond_to?(:alpn_protocol) &&
                   socket.alpn_protocol == H2_PROTOCOL
-      klass = use_http2 ? HTTP2Adapter : HTTP1Adapter#New
+      klass = use_http2 ? HTTP2Adapter : HTTP1Adapter
       klass.new(socket, opts)
     end
 

data/test/coverage.rb

@@ -26,10 +26,10 @@ module Coverage
       @result = {}
       trace = TracePoint.new(:line) do |tp|
         next if tp.path =~ /\(/
-      
+
         absolute = File.expand_path(tp.path)
         next unless LIB_FILES.include?(absolute)# =~ /^#{LIB_DIR}/
-        
+
         @result[absolute] ||= relevant_lines_for_filename(absolute)
         @result[absolute][tp.lineno - 1] = 1
       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