tipi 0.37 → 0.40

data/lib/tipi/digital_fabric/protocol.rb

@@ -4,6 +4,7 @@ module DigitalFabric
   module Protocol
     PING = 'ping'
     SHUTDOWN = 'shutdown'
+    UNMOUNT = 'unmount'
 
     HTTP_REQUEST = 'http_request'
     HTTP_RESPONSE = 'http_response'
@@ -19,16 +20,68 @@ module DigitalFabric
     WS_DATA = 'ws_data'
     WS_CLOSE = 'ws_close'
 
+    TRANSFER_COUNT = 'transfer_count'
+
     SEND_TIMEOUT = 15
     RECV_TIMEOUT = SEND_TIMEOUT + 5
 
+    module Attribute
+      KIND = 0
+      ID = 1
+
+      module HttpRequest
+        HEADERS = 2
+        BODY_CHUNK = 3
+        COMPLETE = 4
+      end
+
+      module HttpResponse
+        BODY = 2
+        HEADERS = 3
+        COMPLETE = 4
+        TRANSFER_COUNT_KEY = 5
+      end
+
+      module HttpUpgrade
+        HEADERS = 2
+      end
+
+      module HttpGetRequestBody
+        LIMIT = 2
+      end
+
+      module HttpRequestBody
+        BODY = 2
+        COMPLETE = 3
+      end
+
+      module ConnectionData
+        DATA = 2
+      end
+
+      module WS
+        HEADERS = 2
+        DATA = 2
+      end
+
+      module TransferCount
+        KEY = 1
+        RX = 2
+        TX = 3
+      end
+    end
+
     class << self
       def ping
-        { kind: PING }
+        [ PING ]
       end
 
       def shutdown
-        { kind: SHUTDOWN }
+        [ SHUTDOWN ]
+      end
+
+      def unmount
+        [ UNMOUNT ]
       end
 
       DF_UPGRADE_RESPONSE = <<~HTTP.gsub("\n", "\r\n")
@@ -43,47 +96,51 @@ module DigitalFabric
       end
 
       def http_request(id, req)
-        { kind: HTTP_REQUEST, id: id, headers: req.headers, body: req.next_chunk, complete: req.complete? }
+        [ HTTP_REQUEST, id, req.headers, req.next_chunk, req.complete? ]
       end
 
-      def http_response(id, body, headers, complete)
-        { kind: HTTP_RESPONSE, id: id, body: body, headers: headers, complete: complete }
+      def http_response(id, body, headers, complete, transfer_count_key = nil)
+        [ HTTP_RESPONSE, id, body, headers, complete, transfer_count_key ]
       end
 
       def http_upgrade(id, headers)
-        { kind: HTTP_UPGRADE, id: id }
+        [ HTTP_UPGRADE, id, headers ]
       end
 
       def http_get_request_body(id, limit = nil)
-        { kind: HTTP_GET_REQUEST_BODY, id: id, limit: limit }
+        [ HTTP_GET_REQUEST_BODY, id, limit ]
       end
 
       def http_request_body(id, body, complete)
-        { kind: HTTP_REQUEST_BODY, id: id, body: body, complete: complete }
+        [ HTTP_REQUEST_BODY, id, body, complete ]
       end
 
       def connection_data(id, data)
-        { kind: CONN_DATA, id: id, data: data }
+        [ CONN_DATA, id, data ]
       end
 
       def connection_close(id)
-        { kind: CONN_CLOSE, id: id }
+        [ CONN_CLOSE, id ]
       end
 
       def ws_request(id, headers)
-        { kind: WS_REQUEST, id: id, headers: headers }
+        [ WS_REQUEST, id, headers ]
       end
 
       def ws_response(id, headers)
-        { kind: WS_RESPONSE, id: id, headers: headers }
+        [ WS_RESPONSE, id, headers ]
       end
 
       def ws_data(id, data)
-        { id: id, kind: WS_DATA, data: data }
+        [ WS_DATA, id, data ]
       end
         
       def ws_close(id)
-        { id: id, kind: WS_CLOSE }
+        [WS_CLOSE, id ]
+      end
+
+      def transfer_count(key, rx, tx)
+        [ TRANSFER_COUNT, key, rx, tx ]
       end
     end
   end

data/lib/tipi/digital_fabric/request_adapter.rb

@@ -6,40 +6,40 @@ module DigitalFabric
   class RequestAdapter
     def initialize(agent, msg)
       @agent = agent
-      @id = msg['id']
+      @id = msg[Protocol::Attribute::ID]
     end
 
     def protocol
       'df'
     end
 
-    def get_body_chunk
+    def get_body_chunk(request)
       @agent.get_http_request_body(@id, 1)
     end
 
-    def consume_request
+    def consume_request(request)
       @agent.get_http_request_body(@id, nil)
     end
 
-    def respond(body, headers)
+    def respond(request, body, headers)
       @agent.send_df_message(
         Protocol.http_response(@id, body, headers, true)
       )
     end
 
-    def send_headers(headers, opts = {})
+    def send_headers(request, headers, opts = {})
       @agent.send_df_message(
         Protocol.http_response(@id, nil, headers, false)
       )
   end
 
-    def send_chunk(body, done: )
+    def send_chunk(request, body, done: )
       @agent.send_df_message(
         Protocol.http_response(@id, body, nil, done)
       )
     end
 
-    def finish
+    def finish(request)
       @agent.send_df_message(
         Protocol.http_response(@id, nil, nil, true)
       )

data/lib/tipi/digital_fabric/service.rb

@@ -99,10 +99,12 @@ module DigitalFabric
       end
 
       agent.http_request(req)
-    rescue IOError, SystemCallError
+    rescue IOError, SystemCallError, HTTP2::Error::StreamClosed
       @counters[:errors] += 1
     rescue => e
       @counters[:errors] += 1
+      puts '*' * 40
+      p req
       p e
       puts e.backtrace.join("\n")
       req.respond(e.inspect, ':status' => Qeweney::Status::INTERNAL_SERVER_ERROR)
@@ -115,7 +117,7 @@ module DigitalFabric
       req.headers['x-request-id'] = SecureRandom.uuid
       conn = req.adapter.conn
       req.headers['x-forwarded-for'] = conn.peeraddr(false)[2]
-      req.headers['x-forwarded-proto'] = conn.is_a?(OpenSSL::SSL::SSLSocket) ? 'https' : 'http'
+      req.headers['x-forwarded-proto'] ||= conn.is_a?(OpenSSL::SSL::SSLSocket) ? 'https' : 'http'
     end
   
     def upgrade_request(req)
@@ -172,7 +174,7 @@ module DigitalFabric
     def find_agent(req)
       compile_agent_routes if @routing_changed
 
-      host = req.headers['host'] || INVALID_HOST
+      host = req.headers[':authority'] || req.headers['host'] || INVALID_HOST
       path = req.headers[':path']
 
       route = @route_keys.find do |route|
@@ -180,11 +182,11 @@ module DigitalFabric
       end
       return @routes[route] if route
 
-      # search for a known route for an agent that recently unmounted
-      route, wait_list = @waiting_lists.find do |route, _|
-        (host == route[:host]) || (path =~ route[:path_regexp])
-      end
-      return wait_for_agent(wait_list) if route
+      # # search for a known route for an agent that recently unmounted
+      # route, wait_list = @waiting_lists.find do |route, _|
+      #   (host == route[:host]) || (path =~ route[:path_regexp])
+      # end
+      # return wait_for_agent(wait_list) if route
 
       nil
     end

data/lib/tipi/http1_adapter.rb

@@ -29,8 +29,10 @@ module Tipi
     
     # 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
@@ -48,15 +50,18 @@ module Tipi
       # release references to various objects
       @requests_head = @requests_tail = nil
       @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
+    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
         
@@ -70,9 +75,10 @@ module Tipi
     # 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
+    def consume_request(request)
       request = @requests_head
       @conn.recv_loop do |data|
+        request.rx_incr(data.bytesize)
         @parser << data
         return if request.complete?
       end
@@ -87,6 +93,9 @@ module Tipi
       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))
     end
 
@@ -182,8 +191,12 @@ module Tipi
       )
     end
 
-    def websocket_connection(req)
-      Tipi::Websocket.new(@conn, req.headers)
+    def websocket_connection(request)
+      Tipi::Websocket.new(@conn, request.headers)
+    end
+
+    def scheme_from_connection
+      @conn.is_a?(OpenSSL::SSL::SSLSocket) ? 'https' : 'http'
     end
     
     # response API
@@ -193,73 +206,111 @@ module Tipi
 
     # Sends response including headers and body. Waits for the request to complete
     # if not yet completed. The body is sent using chunked transfer encoding.
+    # @param request [Qeweney::Request] HTTP request
     # @param body [String] response body
     # @param headers
-    def respond(body, headers)
-      consume_request if @parsing
-      data = format_headers(headers, body)
+    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
-        if @parser.http_minor == 0
-          data << body
-        else
-          data << body.bytesize.to_s(16) << CRLF << body << CRLF_ZERO_CRLF_CRLF
-        end
+        @conn.write(formatted_headers, body)
+      else
+        @conn.write(formatted_headers)
       end
-      @conn.write(data.join)
     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)
       
-    DEFAULT_HEADERS_OPTS = {
-      empty_response:  false,
-      consume_request: true
-    }.freeze
-    
+      # assume chunked encoding
+      Thread.current.backend.splice_chunks(
+        io,
+        @conn,
+        formatted_headers,
+        "0\r\n\r\n",
+        ->(len) { "#{len.to_s(16)}\r\n" },
+        "\r\n",
+        16384    
+      )
+    end
+
     # Sends response headers. If empty_response is truthy, the response status
     # code will default to 204, otherwise to 200.
+    # @param request [Qeweney::Request] HTTP request
     # @param headers [Hash] response headers
     # @param empty_response [boolean] whether a response body will be sent
+    # @param chunked [boolean] whether to use chunked transfer encoding
     # @return [void]
-    def send_headers(headers, opts = DEFAULT_HEADERS_OPTS)
-      data = format_headers(headers, true)
-      @conn.write(data.join)
+    def send_headers(request, headers, empty_response: false, chunked: true)
+      formatted_headers = format_headers(headers, !empty_response, @parser.http_minor == 1 && chunked)
+      request.tx_incr(formatted_headers.bytesize)
+      @conn.write(formatted_headers)
     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.
+    # @param request [Qeweney::Request] HTTP request
     # @param chunk [String] response body chunk
     # @param done [boolean] whether the response is completed
     # @return [void]
-    def send_chunk(chunk, done: false)
-      data = []
+    def send_chunk(request, chunk, done: false)
+      data = +''
       data << "#{chunk.bytesize.to_s(16)}\r\n#{chunk}\r\n" if chunk
       data << "0\r\n\r\n" if done
-      @conn.write(data.join)
+      return if data.empty?
+
+      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
+        Thread.current.backend.chain(
+          [:write, @conn, "#{len.to_s(16)}\r\n"],
+          [:splice, r, @conn, len],
+          [:write, @conn, "\r\n"]
+        )
+      else
+        @conn.write("0\r\n\r\n")
+      end
+      len
+    end
+
     # Finishes the response to the current request. If no headers were sent,
     # default headers are sent using #send_headers.
     # @return [void]
-    def finish
+    def finish(request)
+      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
+
     # Formats response headers into an array. If empty_response is true(thy),
     # the response status code will default to 204, otherwise to 200.
     # @param headers [Hash] response headers
-    # @param empty_response [boolean] whether a response body will be sent
+    # @param body [boolean] whether a response body will be sent
+    # @param chunked [boolean] whether to use chunked transfer encoding
     # @return [String] formatted response headers
-    def format_headers(headers, body)
+    def format_headers(headers, body, chunked)
       status = headers[':status']
       status ||= (body ? Qeweney::Status::OK : Qeweney::Status::NO_CONTENT)
-      lines = [format_status_line(body, status)]
+      lines = format_status_line(body, status, chunked)
       headers.each do |k, v|
-        next if k =~ /^:/
+        next if k =~ INTERNAL_HEADER_REGEXP
         
         collect_header_lines(lines, k, v)
       end
@@ -267,11 +318,11 @@ module Tipi
       lines
     end
     
-    def format_status_line(body, status)
+    def format_status_line(body, status, chunked)
       if !body
         empty_status_line(status)
       else
-        with_body_status_line(status, body)
+        with_body_status_line(status, body, chunked)
       end
     end
     
@@ -283,17 +334,17 @@ module Tipi
       end
     end
     
-    def with_body_status_line(status, body)
-      if @parser.http_minor == 0
-        +"HTTP/1.0 #{status}\r\nContent-Length: #{body.bytesize}\r\n"
-      else
+    def with_body_status_line(status, body, chunked)
+      if chunked
         +"HTTP/1.1 #{status}\r\nTransfer-Encoding: chunked\r\n"
+      else
+        +"HTTP/1.1 #{status}\r\nContent-Length: #{body.is_a?(String) ? body.bytesize : body.to_i}\r\n"
       end
     end
 
     def collect_header_lines(lines, key, value)
       if value.is_a?(Array)
-        value.inject(lines) { |lines, item| data << "#{key}: #{item}\r\n" }
+        value.inject(lines) { |_, item| lines << "#{key}: #{item}\r\n" }
       else
         lines << "#{key}: #{value}\r\n"
       end