tipi 0.40 → 0.45

data/lib/tipi/rack_adapter.rb

@@ -4,69 +4,18 @@ 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
-    
     class << self
       def run(app)
         ->(req) { respond(req, app.(env(req))) }
       end
-      
+
       def load(path)
         src = IO.read(path)
         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

@@ -8,8 +8,8 @@ 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])
-      else  
+        @adapter.respond_from_io(self, io, opts[:headers], opts[:chunk_size] || 2**14)
+      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.40'
+  VERSION = '0.45'
 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,10 +1,13 @@
 # frozen_string_literal: true
 
 require 'polyphony'
+
 require_relative './tipi/http1_adapter'
 require_relative './tipi/http2_adapter'
 require_relative './tipi/configuration'
 require_relative './tipi/response_extensions'
+require_relative './tipi/acme'
+
 require 'qeweney/request'
 
 class Qeweney::Request
@@ -14,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
@@ -23,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|
@@ -32,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) }
@@ -40,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)
@@ -48,7 +51,7 @@ 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

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

data/test/test_http_server.rb

@@ -4,38 +4,11 @@ require_relative 'helper'
 require 'tipi'
 
 class String
-  def http_lines
+  def crlf_lines
     gsub "\n", "\r\n"
   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?
@@ -60,7 +33,7 @@ class HTTP1ServerTest < MiniTest::Test
     connection << "GET / HTTP/1.0\r\n\r\n"
 
     response = connection.readpartial(8192)
-    expected = <<~HTTP.chomp.http_lines.chomp
+    expected = <<~HTTP.chomp.crlf_lines.chomp
       HTTP/1.1 200
       Content-Length: 13
 
@@ -78,7 +51,7 @@ class HTTP1ServerTest < MiniTest::Test
     connection << "GET / HTTP/1.1\r\n\r\n"
 
     response = connection.readpartial(8192)
-    expected = <<~HTTP.http_lines.chomp
+    expected = <<~HTTP.crlf_lines.chomp
       HTTP/1.1 200
       Content-Length: 13
 
@@ -100,7 +73,7 @@ class HTTP1ServerTest < MiniTest::Test
     connection << "GET / HTTP/1.1\r\n\r\n"
     response = connection.readpartial(8192)
     assert !connection.eof?
-    expected = <<~HTTP.http_lines.chomp
+    expected = <<~HTTP.crlf_lines.chomp
       HTTP/1.1 200
       Content-Length: 2
 
@@ -127,7 +100,7 @@ class HTTP1ServerTest < MiniTest::Test
     sleep 0.01
     response = connection.readpartial(8192)
 
-    expected = <<~HTTP.http_lines.chomp
+    expected = <<~HTTP.crlf_lines.chomp
       HTTP/1.1 200
       Content-Length: 13
 
@@ -152,7 +125,7 @@ class HTTP1ServerTest < MiniTest::Test
       req.finish
     end
 
-    connection << <<~HTTP.http_lines
+    connection << <<~HTTP.crlf_lines
       POST / HTTP/1.1
       Transfer-Encoding: chunked
 
@@ -178,7 +151,7 @@ class HTTP1ServerTest < MiniTest::Test
 
     response = connection.readpartial(8192)
 
-    expected = <<~HTTP.http_lines
+    expected = <<~HTTP.crlf_lines
       HTTP/1.1 200
       Transfer-Encoding: chunked
 
@@ -199,7 +172,7 @@ class HTTP1ServerTest < MiniTest::Test
       upgrade: {
         echo: lambda do |adapter, _headers|
           conn = adapter.conn
-          conn << <<~HTTP.http_lines
+          conn << <<~HTTP.crlf_lines
             HTTP/1.1 101 Switching Protocols
             Upgrade: echo
             Connection: Upgrade
@@ -219,7 +192,7 @@ class HTTP1ServerTest < MiniTest::Test
     connection << "GET / HTTP/1.1\r\n\r\n"
     response = connection.readpartial(8192)
     assert !connection.eof?
-    expected = <<~HTTP.http_lines.chomp
+    expected = <<~HTTP.crlf_lines.chomp
       HTTP/1.1 200
       Content-Length: 2
 
@@ -227,7 +200,7 @@ class HTTP1ServerTest < MiniTest::Test
     HTTP
     assert_equal(expected, response)
 
-    connection << <<~HTTP.http_lines
+    connection << <<~HTTP.crlf_lines
       GET / HTTP/1.1
       Upgrade: echo
       Connection: upgrade
@@ -237,7 +210,7 @@ class HTTP1ServerTest < MiniTest::Test
     snooze
     response = connection.readpartial(8192)
     assert !connection.eof?
-    expected = <<~HTTP.http_lines
+    expected = <<~HTTP.crlf_lines
       HTTP/1.1 101 Switching Protocols
       Upgrade: echo
       Connection: Upgrade
@@ -255,7 +228,7 @@ class HTTP1ServerTest < MiniTest::Test
 
     connection.close
     assert !done
-    
+
     sleep 0.01
     assert done
   end
@@ -278,7 +251,7 @@ class HTTP1ServerTest < MiniTest::Test
     count = 0
 
     connection << "GET / HTTP/1.1\r\n\r\n"
-    
+
     while (data = connection.read(chunk_size))
       response << data
       count += 1
@@ -286,7 +259,7 @@ class HTTP1ServerTest < MiniTest::Test
     end
 
     chunks = "#{chunk_size.to_s(16)}\n#{'*' * chunk_size}\n" * chunk_count
-    expected = <<~HTTP.http_lines
+    expected = <<~HTTP.crlf_lines
       HTTP/1.1 200
       Transfer-Encoding: chunked
 

data/test/test_request.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 RequestHeadersTest < MiniTest::Test
   def teardown
     @server&.interrupt if @server&.alive?
@@ -65,8 +38,8 @@ class RequestHeadersTest < MiniTest::Test
     assert_kind_of Qeweney::Request, req
     assert_equal 'blah.com', req.headers['host']
     assert_equal 'bar', req.headers['foo']
-    assert_equal ['1', '3', '2'], req.headers['hi']
-    assert_equal 'get', req.headers[':method']
+    assert_equal ['1', '2', '3'], req.headers['hi']
+    assert_equal 'GET', req.headers[':method']
     assert_equal '/titi', req.headers[':path']
   end
 

data/tipi.gemspec

@@ -19,21 +19,25 @@ Gem::Specification.new do |s|
 
   s.executables   = ['tipi']
 
-  s.add_runtime_dependency      'polyphony',          '~>0.57.0'
-  s.add_runtime_dependency      'qeweney',            '~>0.10.0'
-  
-  s.add_runtime_dependency      'http_parser.rb',     '~>0.6.0'
-  s.add_runtime_dependency      'http-2',             '~>0.10.0'
+  s.add_runtime_dependency      'polyphony',          '~>0.71'
+  s.add_runtime_dependency      'ever',               '~>0.1'
+  s.add_runtime_dependency      'qeweney',            '~>0.14'
+  s.add_runtime_dependency      'extralite',          '~>1.2'
+  s.add_runtime_dependency      'h1p',                '~>0.2'
+
+  s.add_runtime_dependency      'http-2',             '~>0.11'
   s.add_runtime_dependency      'rack',               '>=2.0.8', '<2.3.0'
   s.add_runtime_dependency      'websocket',          '~>1.2.8'
   s.add_runtime_dependency      'acme-client',        '~>2.0.8'
+  s.add_runtime_dependency      'localhost',          '~>1.1.4'
 
   # for digital fabric
   s.add_runtime_dependency      'msgpack',            '~>1.4.2'
 
-  s.add_development_dependency  'rake',               '~>12.3.3'
-  s.add_development_dependency  'localhost',          '~>1.1.4'
+  s.add_development_dependency  'rake',               '~>13.0.6'
   s.add_development_dependency  'minitest',           '~>5.11.3'
-  s.add_development_dependency  'minitest-reporters', '~>1.4.2'
   s.add_development_dependency  'simplecov',          '~>0.17.1'
+  s.add_development_dependency  'memory_profiler',    '~>1.0.0'
+
+  s.add_development_dependency  'cuba',               '~>3.9.3'
 end