tipi 0.42 → 0.47

data/lib/tipi/digital_fabric/executive.rb

@@ -83,7 +83,7 @@ module DigitalFabric
         raise 'Invalid output from top (cpu)'
       end
       cpu_utilization = 100 - Regexp.last_match(1).to_i
-      
+
       unless top =~ TOP_MEM_REGEXP && Regexp.last_match(1) =~ TOP_MEM_FREE_REGEXP
         raise 'Invalid output from top (mem)'
       end

data/lib/tipi/digital_fabric/protocol.rb

@@ -141,7 +141,7 @@ module DigitalFabric
       def ws_data(id, data)
         [ WS_DATA, id, data ]
       end
-        
+
       def ws_close(id)
         [ WS_CLOSE, id ]
       end

data/lib/tipi/digital_fabric/service.rb

@@ -50,6 +50,8 @@ module DigitalFabric
       switch_rate = backend_stats[:switch_count] / elapsed
       poll_rate = backend_stats[:poll_count] / elapsed
 
+      object_space_stats = ObjectSpace.count_objects
+
       {
         service: {
           agent_count: @agents.size,
@@ -73,6 +75,8 @@ module DigitalFabric
         process: {
           cpu_usage: cpu,
           rss: rss.to_f / 1024,
+          objects_total: object_space_stats[:TOTAL],
+          objects_free:  object_space_stats[:FREE]
         }
       }
     end
@@ -86,7 +90,7 @@ module DigitalFabric
     rescue Exception
       [nil, nil]
     end
-    
+
     def get_stats
       calculate_stats
     end
@@ -119,14 +123,14 @@ module DigitalFabric
 
       puts format('slow request (%.1f): %p', latency, req.headers)
     end
-  
+
     def http_request(req, allow_df_upgrade = false)
       @current_request_count += 1
       @counters[:http_requests] += 1
       @counters[:connections] += 1 if req.headers[':first']
 
       return upgrade_request(req, allow_df_upgrade) if req.upgrade_protocol
- 
+
       inject_request_headers(req)
       agent = find_agent(req)
       unless agent
@@ -155,7 +159,7 @@ module DigitalFabric
       req.headers['x-forwarded-for'] = conn.peeraddr(false)[2]
       req.headers['x-forwarded-proto'] ||= conn.is_a?(OpenSSL::SSL::SSLSocket) ? 'https' : 'http'
     end
-  
+
     def upgrade_request(req, allow_df_upgrade)
       case (protocol = req.upgrade_protocol)
       when 'df'
@@ -174,7 +178,7 @@ module DigitalFabric
         agent.http_upgrade(req, protocol)
       end
     end
-  
+
     def df_upgrade(req)
       # we don't want to count connected agents
       @current_request_count -= 1
@@ -187,7 +191,7 @@ module DigitalFabric
     ensure
       @current_request_count += 1
     end
-  
+
     def mount(route, agent)
       if route[:path]
         route[:path_regexp] = path_regexp(route[:path])
@@ -196,7 +200,7 @@ module DigitalFabric
       @agents[agent] = route
       @routing_changed = true
     end
-  
+
     def unmount(agent)
       route = @agents[agent]
       return unless route
@@ -207,7 +211,7 @@ module DigitalFabric
     end
 
     INVALID_HOST = 'INVALID_HOST'
-    
+
     def find_agent(req)
       compile_agent_routes if @routing_changed
 

data/lib/tipi/handler.rb

@@ -20,14 +20,14 @@ module Tipi
     ensure
       socket.close
     end
-    
+
     ALPN_PROTOCOLS = %w[h2 http/1.1].freeze
     H2_PROTOCOL = 'h2'
 
     def protocol_adapter(socket, opts)
       use_http2 = socket.respond_to?(:alpn_protocol) &&
                   socket.alpn_protocol == H2_PROTOCOL
-      
+
       klass = use_http2 ? HTTP2Adapter : HTTP1Adapter
       klass.new(socket, opts)
     end

data/lib/tipi/http1_adapter.rb

@@ -1,9 +1,10 @@
 # frozen_string_literal: true
 
-require 'tipi_ext'
-require_relative './http2_adapter'
+require 'h1p'
 require 'qeweney/request'
 
+require_relative './http2_adapter'
+
 module Tipi
   # HTTP1 protocol implementation
   class HTTP1Adapter
@@ -14,26 +15,29 @@ module Tipi
       @conn = conn
       @opts = opts
       @first = true
-      @parser = Tipi::HTTP1Parser.new(@conn)
+      @parser = H1P::Parser.new(@conn, :server)
     end
-    
+
     def each(&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
+    rescue H1P::Error, ArgumentError
+      # an ArgumentError might be raised in the parser if an invalid input
+      # string is given as the HTTP method (String#upcase will raise on invalid HTTP string)
+      #
       # ignore
     rescue SystemCallError, IOError
       # ignore
     ensure
       finalize_client_loop
     end
-    
+
     def handle_request(headers, &block)
       scheme = (proto = headers['x-forwarded-proto']) ?
                 proto.downcase : scheme_from_connection
@@ -43,9 +47,9 @@ module Tipi
         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))
@@ -62,14 +66,14 @@ module Tipi
         return connection && connection != 'close'
       end
     end
-    
+
     def finalize_client_loop
       @parser = nil
       @splicing_pipe = nil
       @conn.shutdown if @conn.respond_to?(:shutdown) rescue nil
       @conn.close
     end
-    
+
     # 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, buffered_only = false)
@@ -83,11 +87,11 @@ module Tipi
     def complete?(request)
       @parser.complete?
     end
-    
+
     def protocol
       @protocol
     end
-    
+
     # Upgrades the connection to a different protocol, if the 'Upgrade' header is
     # given. By default the only supported upgrade protocol is HTTP2. Additional
     # protocols, notably WebSocket, can be specified by passing a hash to the
@@ -113,28 +117,28 @@ module Tipi
     def upgrade_connection(headers, &block)
       upgrade_protocol = headers['upgrade']
       return nil unless upgrade_protocol
-      
+
       upgrade_protocol = upgrade_protocol.downcase.to_sym
       upgrade_handler = @opts[:upgrade] && @opts[:upgrade][upgrade_protocol]
       return upgrade_with_handler(upgrade_handler, headers) if upgrade_handler
       return upgrade_to_http2(headers, &block) if upgrade_protocol == :h2c
-      
+
       nil
     end
-    
+
     def upgrade_with_handler(handler, headers)
       @parser = nil
       handler.(self, headers)
       true
     end
-    
+
     def upgrade_to_http2(headers, &block)
       headers = http2_upgraded_headers(headers)
       body = @parser.read_body
       HTTP2Adapter.upgrade_each(@conn, @opts, headers, body, &block)
       true
     end
-    
+
     # Returns headers for HTTP2 upgrade
     # @param headers [Hash] request headers
     # @return [Hash] headers for HTTP2 upgrade
@@ -152,10 +156,10 @@ module Tipi
     def scheme_from_connection
       @conn.is_a?(OpenSSL::SSL::SSLSocket) ? 'https' : 'http'
     end
-    
+
     # response API
 
-    CRLF = "\r\n"    
+    CRLF = "\r\n"
     CRLF_ZERO_CRLF_CRLF = "\r\n0\r\n\r\n"
 
     # Sends response including headers and body. Waits for the request to complete
@@ -173,17 +177,19 @@ module Tipi
       end
     end
 
+    CHUNK_LENGTH_PROC = ->(len) { "#{len.to_s(16)}\r\n" }
+
     def respond_from_io(request, io, headers, chunk_size = 2**14)
       formatted_headers = format_headers(headers, true, true)
       request.tx_incr(formatted_headers.bytesize)
-      
+
       # assume chunked encoding
       Thread.current.backend.splice_chunks(
         io,
         @conn,
         formatted_headers,
         "0\r\n\r\n",
-        ->(len) { "#{len.to_s(16)}\r\n" },
+        CHUNK_LENGTH_PROC,
         "\r\n",
         chunk_size
       )
@@ -205,7 +211,7 @@ module Tipi
     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
     # will be sent to signal response completion to the client.
@@ -222,7 +228,7 @@ module Tipi
       request.tx_incr(data.bytesize)
       @conn.write(data)
     end
-    
+
     def send_chunk_from_io(request, io, r, w, chunk_size)
       len = w.splice(io, chunk_size)
       if len > 0
@@ -244,12 +250,12 @@ module Tipi
       request.tx_incr(5)
       @conn << "0\r\n\r\n"
     end
-    
+
     def close
       @conn.shutdown if @conn.respond_to?(:shutdown) rescue nil
       @conn.close
     end
-    
+
     private
 
     INTERNAL_HEADER_REGEXP = /^:/.freeze
@@ -266,13 +272,13 @@ module Tipi
       lines = format_status_line(body, status, chunked)
       headers.each do |k, v|
         next if k =~ INTERNAL_HEADER_REGEXP
-        
+
         collect_header_lines(lines, k, v)
       end
       lines << CRLF
       lines
     end
-    
+
     def format_status_line(body, status, chunked)
       if !body
         empty_status_line(status)
@@ -280,7 +286,7 @@ module Tipi
         with_body_status_line(status, body, chunked)
       end
     end
-    
+
     def empty_status_line(status)
       if status == 204
         +"HTTP/1.1 #{status}\r\n"
@@ -288,7 +294,7 @@ module Tipi
         +"HTTP/1.1 #{status}\r\nContent-Length: 0\r\n"
       end
     end
-    
+
     def with_body_status_line(status, body, chunked)
       if chunked
         +"HTTP/1.1 #{status}\r\nTransfer-Encoding: chunked\r\n"

data/lib/tipi/http2_adapter.rb

@@ -21,7 +21,7 @@ module Tipi
       adapter = new(socket, opts, headers, body)
       adapter.each(&block)
     end
-    
+
     def initialize(conn, opts, upgrade_headers = nil, upgrade_body = nil)
       @conn = conn
       @opts = opts
@@ -36,7 +36,7 @@ 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)
@@ -47,14 +47,14 @@ module Tipi
     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
@@ -63,7 +63,7 @@ module Tipi
     ensure
       @upgrade_headers = nil
     end
-    
+
     # Iterates over incoming requests
     def each(&block)
       @interface.on(:stream) { |stream| start_stream(stream, &block) }
@@ -84,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,9 +6,8 @@ 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
@@ -32,7 +31,7 @@ module Tipi
       stream.on(:data, &method(:on_data))
       stream.on(:half_close, &method(:on_half_close))
     end
-    
+
     def run(&block)
       request = receive
       error = nil
@@ -45,7 +44,7 @@ module Tipi
     ensure
       @connection_fiber.schedule error
     end
-    
+
     def on_headers(headers)
       @request = Qeweney::Request.new(headers.to_h, self)
       @request.rx_incr(@adapter.get_rx_count)
@@ -59,7 +58,7 @@ module Tipi
 
     def on_data(data)
       data = data.to_s # chunks might be wrapped in a HTTP2::Buffer
-      
+
       (@buffered_chunks ||= []) << data
       @get_body_chunk_fiber&.schedule
     end
@@ -68,7 +67,7 @@ module Tipi
       @get_body_chunk_fiber&.schedule
       @complete = true
     end
-    
+
     def protocol
       'h2'
     end
@@ -84,7 +83,7 @@ module Tipi
       @buffered_chunks ||= []
       return @buffered_chunks.shift unless @buffered_chunks.empty?
       return nil if @complete
-      
+
       begin
         @get_body_chunk_fiber = Fiber.current
         suspend
@@ -112,7 +111,7 @@ module Tipi
     def complete?(request)
       @complete
     end
-    
+
     # response API
     def respond(request, chunk, headers)
       headers[':status'] ||= Qeweney::Status::OK
@@ -149,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)
@@ -161,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)
@@ -175,7 +174,7 @@ module Tipi
     rescue HTTP2::Error::StreamClosed
       # ignore
     end
-    
+
     def finish(request)
       if @headers_sent
         @stream.close
@@ -188,10 +187,10 @@ module Tipi
     rescue HTTP2::Error::StreamClosed
       # ignore
     end
-    
+
     def stop
       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.42'
+  VERSION = '0.47'
 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)