tipi 0.33 → 0.37.1

data/lib/tipi/http1_adapter.rb

@@ -1,16 +1,19 @@
 # frozen_string_literal: true
 
 require 'http/parser'
-require_relative './request'
 require_relative './http2_adapter'
+require 'qeweney/request'
 
 module Tipi
   # HTTP1 protocol implementation
   class HTTP1Adapter
+    attr_reader :conn
+
     # Initializes a protocol adapter instance
     def initialize(conn, opts)
       @conn = conn
       @opts = opts
+      @first = true
       @parser = ::HTTP::Parser.new(self)
     end
     
@@ -28,6 +31,10 @@ module Tipi
     def handle_incoming_data(data, &block)
       @parser << data
       while (request = @requests_head)
+        if @first
+          request.headers[':first'] = true
+          @first = nil
+        end
         return true if upgrade_connection(request.headers, &block)
         
         @requests_head = request.__next__
@@ -77,9 +84,23 @@ module Tipi
     end
     
     def on_headers_complete(headers)
+      headers = normalize_headers(headers)
       headers[':path'] = @parser.request_url
-      headers[':method'] = @parser.http_method
-      queue_request(Request.new(headers, self))
+      headers[':method'] = @parser.http_method.downcase
+      queue_request(Qeweney::Request.new(headers, self))
+    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
     end
     
     def queue_request(request)
@@ -110,6 +131,14 @@ module Tipi
     # protocols, notably WebSocket, can be specified by passing a hash to the
     # :upgrade option when starting a server:
     #
+    #     def ws_handler(conn)
+    #       conn << 'hi'
+    #       msg = conn.recv
+    #       conn << "You said #{msg}"
+    #       conn << 'bye'
+    #       conn.close
+    #     end
+    #
     #     opts = {
     #       upgrade: {
     #         websocket: Tipi::Websocket.handler(&method(:ws_handler))
@@ -120,7 +149,7 @@ module Tipi
     # @param headers [Hash] request headers
     # @return [boolean] truthy if the connection has been upgraded
     def upgrade_connection(headers, &block)
-      upgrade_protocol = headers['Upgrade']
+      upgrade_protocol = headers['upgrade']
       return nil unless upgrade_protocol
       
       upgrade_protocol = upgrade_protocol.downcase.to_sym
@@ -133,7 +162,7 @@ module Tipi
     
     def upgrade_with_handler(handler, headers)
       @parser = @requests_head = @requests_tail = nil
-      handler.(@conn, headers)
+      handler.(self, headers)
       true
     end
     
@@ -149,9 +178,13 @@ module Tipi
     def http2_upgraded_headers(headers)
       headers.merge(
         ':scheme'    => 'http',
-        ':authority' => headers['Host']
+        ':authority' => headers['host']
       )
     end
+
+    def websocket_connection(req)
+      Tipi::Websocket.new(@conn, req.headers)
+    end
     
     # response API
 
@@ -164,15 +197,17 @@ module Tipi
     # @param headers
     def respond(body, headers)
       consume_request if @parsing
-      data = format_headers(headers, body)
+      data = [format_headers(headers, body)]
       if body
         if @parser.http_minor == 0
           data << body
         else
-          data << body.bytesize.to_s(16) << CRLF << body << CRLF_ZERO_CRLF_CRLF
+          # data << body.bytesize.to_s(16) << CRLF << body << CRLF_ZERO_CRLF_CRLF
+          data << "#{body.bytesize.to_s(16)}\r\n#{body}\r\n0\r\n\r\n"
         end
       end
-      @conn.write(data.join)
+      # Polyphony.backend_sendv(@conn, data, 0)
+      @conn.write(*data)
     end
       
     DEFAULT_HEADERS_OPTS = {
@@ -187,7 +222,7 @@ module Tipi
     # @return [void]
     def send_headers(headers, opts = DEFAULT_HEADERS_OPTS)
       data = format_headers(headers, true)
-      @conn.write(data.join)
+      @conn.write(data)
     end
     
     # Sends a response body chunk. If no headers were sent, default headers are
@@ -198,9 +233,9 @@ module Tipi
     # @return [void]
     def send_chunk(chunk, done: false)
       data = []
-      data << "#{chunk.bytesize.to_s(16)}\r\n#{chunk}\r\n"
+      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)
+      @conn.write(data.join) unless data.empty?
     end
     
     # Finishes the response to the current request. If no headers were sent,
@@ -222,8 +257,9 @@ module Tipi
     # @param empty_response [boolean] whether a response body will be sent
     # @return [String] formatted response headers
     def format_headers(headers, body)
-      status = headers[':status'] || (body ? 200 : 204)
-      lines = [format_status_line(body, status)]
+      status = headers[':status']
+      status ||= (body ? Qeweney::Status::OK : Qeweney::Status::NO_CONTENT)
+      lines = format_status_line(body, status)
       headers.each do |k, v|
         next if k =~ /^:/
         

data/lib/tipi/http2_adapter.rb

@@ -15,6 +15,7 @@ module Tipi
       @conn = conn
       @opts = opts
       @upgrade_headers = upgrade_headers
+      @first = true
       
       @interface = ::HTTP2::Server.new
       @connection_fiber = Fiber.current
@@ -37,7 +38,7 @@ module Tipi
     
     def upgrade
       @conn << UPGRADE_MESSAGE
-      settings = @upgrade_headers['HTTP2-Settings']
+      settings = @upgrade_headers['http2-settings']
       Fiber.current.schedule(nil)
       @interface.upgrade(settings, @upgrade_headers, '')
     ensure
@@ -57,7 +58,8 @@ module Tipi
     end
     
     def start_stream(stream, &block)
-      stream = HTTP2StreamHandler.new(stream, &block)
+      stream = HTTP2StreamHandler.new(stream, @conn, @first, &block)
+      @first = nil if @first
       @streams[stream] = true
     end
     

data/lib/tipi/http2_stream.rb

@@ -1,15 +1,18 @@
 # frozen_string_literal: true
 
 require 'http/2'
-require_relative './request'
+require 'qeweney/request'
 
 module Tipi
   # Manages an HTTP 2 stream
   class HTTP2StreamHandler
     attr_accessor :__next__
+    attr_reader :conn
     
-    def initialize(stream, &block)
+    def initialize(stream, conn, first, &block)
       @stream = stream
+      @conn = conn
+      @first = first
       @connection_fiber = Fiber.current
       @stream_fiber = spin { |req| handle_request(req, &block) }
       
@@ -43,7 +46,11 @@ module Tipi
     end
     
     def on_headers(headers)
-      @request = Request.new(headers.to_h, self)
+      @request = Qeweney::Request.new(headers.to_h, self)
+      if @first
+        @request.headers[':first'] = true
+        @first = false
+      end
       @stream_fiber.schedule @request
     end
     
@@ -55,7 +62,7 @@ module Tipi
         @request.buffer_body_chunk(data)
       end
     end
-    
+
     def on_half_close
       if @waiting_for_body_chunk
         @waiting_for_body_chunk = nil
@@ -96,7 +103,7 @@ module Tipi
     
     # response API
     def respond(chunk, headers)
-      headers[':status'] ||= '200'
+      headers[':status'] ||= Qeweney::Status::OK
       @stream.headers(headers, end_stream: false)
       @stream.data(chunk, end_stream: true)
       @headers_sent = true
@@ -105,21 +112,26 @@ module Tipi
     def send_headers(headers, empty_response = false)
       return if @headers_sent
       
-      headers[':status'] ||= (empty_response ? 204 : 200).to_s
+      headers[':status'] ||= (empty_response ? Qeweney::Status::NO_CONTENT : Qeweney::Status::OK).to_s
       @stream.headers(headers, end_stream: false)
       @headers_sent = true
     end
     
     def send_chunk(chunk, done: false)
       send_headers({}, false) unless @headers_sent
-      @stream.data(chunk, end_stream: done)
+      
+      if chunk
+        @stream.data(chunk, end_stream: done)
+      elsif done
+        @stream.close
+      end
     end
     
     def finish
       if @headers_sent
         @stream.close
       else
-        headers[':status'] ||= '204'
+        headers[':status'] ||= Qeweney::Status::NO_CONTENT
         @stream.headers(headers, end_stream: true)
       end
     end

data/lib/tipi/rack_adapter.rb

@@ -62,7 +62,7 @@ module Tipi
         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 '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]

data/lib/tipi/version.rb

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

data/lib/tipi/websocket.rb

@@ -7,32 +7,17 @@ module Tipi
   # Websocket connection
   class Websocket
     def self.handler(&block)
-      proc { |client, header|
-        block.(new(client, header))
-      }
-    end  
+      proc do |adapter, headers|
+        req = Qeweney::Request.new(headers, adapter)
+        websocket = req.upgrade_to_websocket
+        block.(websocket)
+      end
+    end
 
-    def initialize(client, headers)
-      @client = client
+    def initialize(conn, headers)
+      @conn = conn
       @headers = headers
-      setup(headers)
-    end
-    
-    S_WS_GUID = '258EAFA5-E914-47DA-95CA-C5AB0DC85B11'
-    UPGRADE_RESPONSE = <<~HTTP.gsub("\n", "\r\n")
-    HTTP/1.1 101 Switching Protocols
-    Upgrade: websocket
-    Connection: Upgrade
-    Sec-WebSocket-Accept: %<accept>s
-    
-    HTTP
-    
-    def setup(headers)
-      key = headers['Sec-WebSocket-Key']
-      @version = headers['Sec-WebSocket-Version'].to_i
-      accept = Digest::SHA1.base64digest([key, S_WS_GUID].join)
-      @client << format(UPGRADE_RESPONSE, accept: accept)
-      
+      @version = headers['sec-websocket-version'].to_i
       @reader = ::WebSocket::Frame::Incoming::Server.new(version: @version)
     end
     
@@ -41,22 +26,41 @@ module Tipi
         return msg.to_s
       end
     
-      @client.recv_loop do |data|
+      @conn.recv_loop do |data|
         @reader << data
         if (msg = @reader.next)
-          break msg.to_s
+          return msg.to_s
         end
       end
-      
+
       nil
     end
+
+    def recv_loop
+      if (msg = @reader.next)
+        yield msg.to_s
+      end
+
+      @conn.recv_loop do |data|
+        @reader << data
+        while (msg = @reader.next)
+          yield msg.to_s
+        end
+      end
+    end
     
+    OutgoingFrame = ::WebSocket::Frame::Outgoing::Server
+
     def send(data)
-      frame = ::WebSocket::Frame::Outgoing::Server.new(
+      frame = OutgoingFrame.new(
         version: @version, data: data, type: :text
       )
-      @client << frame.to_s
+      @conn << frame.to_s
     end
     alias_method :<<, :send
+
+    def close
+      @conn.close
+    end
   end
 end

data/test/helper.rb

@@ -33,8 +33,7 @@ class MiniTest::Test
 
   def teardown
     # puts "* teardown #{self.name.inspect} Fiber.current: #{Fiber.current.inspect}"
-    Fiber.current.terminate_all_children
-    Fiber.current.await_all_children
+    Fiber.current.shutdown_all_children
   rescue => e
     puts e
     puts e.backtrace.join("\n")

data/test/test_http_server.rb

@@ -23,13 +23,13 @@ class IO
 
   def self.mockup_connection(input, output, output2)
     eg(
-      :read        => ->(*args) { p [:read]; input.read(*args) },
-      :read_loop   => ->(*args, &block) { p [:read_loop, caller]; input.read_loop(*args, &block) },
-      :recv_loop   => ->(*args, &block) { p [:recv_loop]; input.read_loop(*args, &block) },
-      :readpartial => ->(*args) { p [:readpartial]; input.readpartial(*args) },
-      :recv        => ->(*args) { p [:recv]; input.readpartial(*args) },
-      :<<          => ->(*args) { p [:<<, args]; output.write(*args) },
-      :write       => ->(*args) { p [:write, args]; output.write(*args) },
+      :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? }
     )
@@ -91,7 +91,6 @@ class HTTP1ServerTest < MiniTest::Test
   end
 
   def test_that_server_maintains_connection_when_using_keep_alives
-    puts 'test_that_server_maintains_connection_when_using_keep_alives'
     @server, connection = spin_server do |req|
       req.respond('Hi', {})
     end
@@ -123,7 +122,7 @@ class HTTP1ServerTest < MiniTest::Test
 
   def test_pipelining_client
     @server, connection = spin_server do |req|
-      if req.headers['Foo'] == 'bar'
+      if req.headers['foo'] == 'bar'
         req.respond('Hello, foobar!', {})
       else
         req.respond('Hello, world!', {})
@@ -160,14 +159,12 @@ class HTTP1ServerTest < MiniTest::Test
       request = req
       req.send_headers
       req.each_chunk do |c|
-        puts "chunk: #{c.inspect}"
         chunks << c
         req << c.upcase
       end
       req.finish
     end
 
-    p connection
     connection << <<~HTTP.http_lines
       POST / HTTP/1.1
       Transfer-Encoding: chunked
@@ -213,7 +210,8 @@ class HTTP1ServerTest < MiniTest::Test
 
     opts = {
       upgrade: {
-        echo: lambda do |conn, _headers|
+        echo: lambda do |adapter, _headers|
+          conn = adapter.conn
           conn << <<~HTTP.http_lines
             HTTP/1.1 101 Switching Protocols
             Upgrade: echo

data/test/test_request.rb

@@ -0,0 +1,108 @@
+# frozen_string_literal: true
+
+require_relative 'helper'
+require 'tipi'
+
+class String
+  def http_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 RequestHeadersTest < MiniTest::Test
+  def teardown
+    @server&.interrupt if @server&.alive?
+    snooze
+    super
+  end
+
+  def spin_server(opts = {}, &handler)
+    server_connection, client_connection = IO.server_client_mockup
+    coproc = spin do
+      Tipi.client_loop(server_connection, opts, &handler)
+    end
+    [coproc, client_connection, server_connection]
+  end
+
+  def test_request_headers
+    req = nil
+    @server, connection = spin_server do |r|
+      req = r
+      req.respond('Hello, world!')
+    end
+
+    connection << "GET /titi HTTP/1.1\r\nHost: blah.com\r\nFoo: bar\r\nhi: 1\r\nHi: 2\r\nhi: 3\r\n\r\n"
+
+    snooze
+
+    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 '/titi', req.headers[':path']
+  end
+
+  def test_request_host
+    req = nil
+    @server, connection = spin_server do |r|
+      req = r
+      req.respond('Hello, world!')
+    end
+
+    connection << "GET /titi HTTP/1.1\nHost: blah.com\nFoo: bar\nhi: 1\nHi: 2\nhi: 3\n\n"
+    snooze
+    assert_equal 'blah.com', req.host
+  end
+
+  def test_request_connection
+    req = nil
+    @server, connection = spin_server do |r|
+      req = r
+      req.respond('Hello, world!')
+    end
+
+    connection << "GET /titi HTTP/1.1\nConnection: keep-alive\nFoo: bar\nhi: 1\nHi: 2\nhi: 3\n\n"
+    snooze
+    assert_equal 'keep-alive', req.connection
+  end
+
+  def test_request_upgrade_protocol
+    req = nil
+    @server, connection = spin_server do |r|
+      req = r
+      req.respond('Hello, world!')
+    end
+
+    connection << "GET /titi HTTP/1.1\nConnection: upgrade\nUpgrade: foobar\n\n"
+    snooze
+    assert_equal 'foobar', req.upgrade_protocol
+  end
+end