tipi 0.35 → 0.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0381d5d135a88937862fe5e22d3f39d2dd6a9353af83a655c13c641af3dd0ec2'
-  data.tar.gz: 17e20767ca22950023d44135fb2e20fdc469898fd2298e32158d791a111730cd
+  metadata.gz: 6a8c075ce0b769f014a20587dd061f17e32361f211aad5741f655dafe6687e37
+  data.tar.gz: d14c0fe026a7db1aa46edded54e5ee6f1a0f8598f626dd1aff342ad07b5cec39
 SHA512:
-  metadata.gz: e15c3197e3ca5dff97071f34c6bb18e006bd338b0c182ae046af8cf9b0d22f7451f0230f2430c65400bc81999e1c269d5868db8bce0cec1843453cf00ae883aa
-  data.tar.gz: a486df80bd50ff8069bc0abe1bca9df13e58ad8c0d84b7e24a86b284fb6fcfc4c679824692049fc27c1435d6c0598a45a6461a8b48fe4540722061399bf7c5e3
+  metadata.gz: e306783fc83d9d7ebd0678c4d68a13f6f9bd77e4b9d83fc84d745e5cc3f53eb27b69286fb1ba9f1ca54fe57358009a4c11dc9374c8a8d9046dc4330e359dc988
+  data.tar.gz: 789c3b4e1374cc57e04e3bce4aa8d12022cfd7e31c9cba4f5777302f57943da0a967f17f8cb2f91551357deac1bbd07fe514c2cb2e002331f525d341c6b7f0e9

data/CHANGELOG.md

@@ -1,64 +1,80 @@
+## 0.38 2021-03-09
+
+- Don't use chunked transfer encoding for non-streaming responses
+
+## 0.37.2 2021-03-08
+
+- Fix header formatting when header value is an array
+
+## 0.37 2021-02-15
+
+- Update upgrade mechanism to work with updated Qeweney API
+
+## 0.36 2021-02-12
+
+- Use `Qeweney::Status` constants
+
 ## 0.35 2021-02-10
 
-* Extract Request class into separate [qna](https://github.com/digital-fabric/qna) gem
+- Extract Request class into separate [qeweney](https://github.com/digital-fabric/qeweney) gem
 
 ## 0.34 2021-02-07
 
-* Implement digital fabric service and agents
-* Add multipart and urlencoded form data parsing
-* Improve request body reading behaviour
-* Add more `Request` information methods
-* Add access to connection for HTTP2 requests
-* Allow calling `Request#send_chunk` with empty chunk
-* Add support for handling protocol upgrades from within request handler
+- Implement digital fabric service and agents
+- Add multipart and urlencoded form data parsing
+- Improve request body reading behaviour
+- Add more `Request` information methods
+- Add access to connection for HTTP2 requests
+- Allow calling `Request#send_chunk` with empty chunk
+- Add support for handling protocol upgrades from within request handler
 
 ## 0.33 2020-11-20
 
-* Update code for Polyphony 0.47.5
-* Add support for Rack::File body to Tipi::RackAdapter
+- Update code for Polyphony 0.47.5
+- Add support for Rack::File body to Tipi::RackAdapter
 
 ## 0.32 2020-08-14
 
-* Respond with array of strings instead of concatenating for HTTP 1
-* Use read_loop instead of readpartial
-* Fix http upgrade test
+- Respond with array of strings instead of concatenating for HTTP 1
+- Use read_loop instead of readpartial
+- Fix http upgrade test
 
 ## 0.31 2020-07-28
 
-* Fix websocket server code
-* Implement configuration layer (WIP)
-* Improve performance of rack adapter
+- Fix websocket server code
+- Implement configuration layer (WIP)
+- Improve performance of rack adapter
 
 ## 0.30 2020-07-15
 
-* Rename project to Tipi
-* Rearrange source code
-* Remove HTTP client code (to be developed eventually into a separate gem)
-* Fix header rendering in rack adapter (#2)
+- Rename project to Tipi
+- Rearrange source code
+- Remove HTTP client code (to be developed eventually into a separate gem)
+- Fix header rendering in rack adapter (#2)
 
 ## 0.29 2020-07-06
 
-* Use IO#read_loop
+- Use IO#read_loop
 
 ## 0.28 2020-07-03
 
-* Update with API changes from Polyphony >= 0.41
+- Update with API changes from Polyphony >= 0.41
 
 ## 0.27 2020-04-14
 
-* Remove modulation dependency
+- Remove modulation dependency
 
 ## 0.26 2020-03-03
 
-* Fix `Server#listen`
+- Fix `Server#listen`
 
 ## 0.25 2020-02-19
 
-* Ensure server socket is closed upon stopping loop
-* Fix `Request#format_header_lines`
+- Ensure server socket is closed upon stopping loop
+- Fix `Request#format_header_lines`
 
 ## 0.24 2020-01-08
 
-* Move HTTP to separate polyphony-http gem
+- Move HTTP to separate polyphony-http gem
 
 For earlier changes look at the Polyphony changelog.

data/Gemfile.lock

@@ -1,12 +1,12 @@
 PATH
   remote: .
   specs:
-    tipi (0.35)
+    tipi (0.38)
       http-2 (~> 0.10.0)
       http_parser.rb (~> 0.6.0)
       msgpack (~> 1.4.2)
-      polyphony (~> 0.51.0)
-      qna (~> 0.1)
+      polyphony (~> 0.52.0)
+      qeweney (~> 0.6)
       rack (>= 2.0.8, < 2.3.0)
       websocket (~> 1.2.8)
 
@@ -28,8 +28,8 @@ GEM
       minitest (>= 5.0)
       ruby-progressbar
     msgpack (1.4.2)
-    polyphony (0.51.0)
-    qna (0.1)
+    polyphony (0.52.0)
+    qeweney (0.7.5)
       escape_utils (~> 1.2.1)
     rack (2.2.3)
     rake (12.3.3)

data/TODO.md

@@ -1,8 +1,6 @@
-# Digital Fabric
+For immediate execution:
 
-Problems to fix:
 
-- Memory leak (in server? multi agent? multi client?)
 
 # Roadmap
 
@@ -14,7 +12,7 @@ Problems to fix:
   - https://gitlab.com/honeyryderchuck/http-2-next
   - Open an issue there, ask what's the difference between the two gems?
 
-## 0.35
+## 0.38
 
 - Add more poly CLI commands and options:
 
@@ -26,7 +24,7 @@ Problems to fix:
   - set port to bind to
   - set forking process count
 
-## 0.36 Working Sinatra application
+## 0.39 Working Sinatra application
 
 - app with database access (postgresql)
 - benchmarks!

data/examples/http_request_ws_server.rb

@@ -27,7 +27,8 @@ puts 'Listening on port 4411...'
 
 Tipi.serve('0.0.0.0', 4411, opts) do |req|
   if req.upgrade_protocol == 'websocket'
-    ws_handler(Tipi::Websocket.new(req.adapter.conn, req.headers))
+    conn = req.upgrade_to_websocket
+    ws_handler(conn)
   else
     req.respond(HTML, 'Content-Type' => 'text/html')
   end

data/examples/http_server.rb

@@ -13,9 +13,17 @@ puts 'Listening on port 4411...'
 
 spin do
   Tipi.serve('0.0.0.0', 4411, opts) do |req|
-    req.respond("Hello world!\n")
-  rescue Exception => e
-    p e
+    p path: req.path
+    if req.path == '/stream'
+      req.send_headers('Foo' => 'Bar')
+      sleep 1
+      req.send_chunk("foo\n")
+      sleep 1
+      req.send_chunk("bar\n")
+      req.finish
+    else
+      req.respond("Hello world!\n")
+    end
   end
   p 'done...'
 end.await

data/examples/https_server.rb

@@ -16,7 +16,17 @@ opts = {
 puts "pid: #{Process.pid}"
 puts 'Listening on port 1234...'
 Tipi.serve('0.0.0.0', 1234, opts) do |req|
-  req.respond("Hello world!\n")
+  p path: req.path
+  if req.path == '/stream'
+    req.send_headers('Foo' => 'Bar')
+    sleep 1
+    req.send_chunk("foo\n")
+    sleep 1
+    req.send_chunk("bar\n")
+    req.finish
+  else
+    req.respond("Hello world!\n")
+  end
   # req.send_headers
   # req.send_chunk("Method: #{req.method}\n")
   # req.send_chunk("Path: #{req.path}\n")

data/lib/tipi/digital_fabric/agent.rb

@@ -171,7 +171,7 @@ module DigitalFabric
       rescue IOError, Errno::ECONNREFUSED, Errno::EPIPE
         # ignore
       rescue Polyphony::Terminate
-        req.respond(nil, { ':status' => 503 }) if Fiber.current.graceful_shutdown?
+        req.respond(nil, { ':status' => Qeweney::Status::SERVICE_UNAVAILABLE }) if Fiber.current.graceful_shutdown?
       ensure
         @requests.delete(id)
         @long_running_requests.delete(id)
@@ -180,7 +180,7 @@ module DigitalFabric
     end
 
     def prepare_http_request(msg)
-      req = QNA::Request.new(msg['headers'], RequestAdapter.new(self, msg))
+      req = Qeweney::Request.new(msg['headers'], RequestAdapter.new(self, msg))
       req.buffer_body_chunk(msg['body']) if msg['body']
       req.complete! if msg['complete']
       req
@@ -199,7 +199,7 @@ module DigitalFabric
     end
 
     def recv_ws_request(msg)
-      req = QNA::Request.new(msg['headers'], RequestAdapter.new(self, msg))
+      req = Qeweney::Request.new(msg['headers'], RequestAdapter.new(self, msg))
       id = msg['id']
       @requests[id] = @long_running_requests[id] = spin do
         ws_request(req)
@@ -214,12 +214,12 @@ module DigitalFabric
 
     # default handler for HTTP request
     def http_request(req)
-      req.respond(nil, { ':status': 501 })
+      req.respond(nil, { ':status': Qeweney::Status::SERVICE_UNAVAILABLE })
     end
 
     # default handler for WS request
     def ws_request(req)
-      req.respond(nil, { ':status': 501 })
+      req.respond(nil, { ':status': Qeweney::Status::SERVICE_UNAVAILABLE })
     end
   end
 end

data/lib/tipi/digital_fabric/agent_proxy.rb

@@ -134,7 +134,7 @@ module DigitalFabric
         end
       end
     rescue => e
-      req.respond("Error: #{e.inspect}", ':status' => 500)
+      req.respond("Error: #{e.inspect}", ':status' => Qeweney::Status::INTERNAL_SERVER_ERROR)
     end
 
     # @return [Boolean] true if response is complete
@@ -150,16 +150,21 @@ module DigitalFabric
         headers = message['headers']
         body = message['body']
         done = message['complete']
-        req.send_headers(headers) if headers && !req.headers_sent?
-        req.send_chunk(body, done: done) if body or done
-        done
+        if !req.headers_sent? && done
+          req.respond(body, headers|| {})
+          true
+        else
+          req.send_headers(headers) if headers && !req.headers_sent?
+          req.send_chunk(body, done: done) if body or done
+          done
+        end
       else
         # invalid message
         true
       end
     end
 
-    HTTP_RESPONSE_UPGRADE_HEADERS = { ':status' => '101 Switching Protocols' }
+    HTTP_RESPONSE_UPGRADE_HEADERS = { ':status' => Qeweney::Status::SWITCHING_PROTOCOLS }
 
     def http_custom_upgrade(id, req, message)
       # send upgrade response
@@ -228,15 +233,15 @@ module DigitalFabric
         case response['kind']
         when Protocol::WS_RESPONSE
           headers = response['headers'] || {} 
-          status = headers[':status'] || 101
-          if status != 101
+          status = headers[':status'] || Qeweney::Status::SWITCHING_PROTOCOLS
+          if status != Qeweney::Status::SWITCHING_PROTOCOLS
             req.respond(nil, headers)
             return
           end
           ws = Tipi::Websocket.new(req.adapter.conn, req.headers)
           run_websocket_connection(id, ws)
         else
-          req.respond(nil, ':status' => 503)
+          req.respond(nil, ':status' => Qeweney::Status::SERVICE_UNAVAILABLE)
         end
       end
     end

data/lib/tipi/digital_fabric/executive.rb

@@ -34,7 +34,7 @@ module DigitalFabric
       when '/stream/stats'
         stream_stats(req)
       else
-        req.respond('Invalid path', { ':status' => 404 })
+        req.respond('Invalid path', { ':status' => Qeweney::Status::NOT_FOUND })
       end
     ensure
       @current_request_count -= 1

data/lib/tipi/digital_fabric/service.rb

@@ -95,7 +95,7 @@ module DigitalFabric
         return req.respond('pong') if req.query[:q] == 'ping'
 
         @counters[:errors] += 1
-        return req.respond(nil, ':status' => 503)
+        return req.respond(nil, ':status' => Qeweney::Status::SERVICE_UNAVAILABLE)
       end
 
       agent.http_request(req)
@@ -105,7 +105,7 @@ module DigitalFabric
       @counters[:errors] += 1
       p e
       puts e.backtrace.join("\n")
-      req.respond(e.inspect, ':status' => 500)
+      req.respond(e.inspect, ':status' => Qeweney::Status::INTERNAL_SERVER_ERROR)
     ensure
       @current_request_count -= 1
       req.adapter.conn.close if @shutdown
@@ -115,7 +115,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)
@@ -126,7 +126,7 @@ module DigitalFabric
         agent = find_agent(req)
         unless agent
           @counters[:errors] += 1
-          return req.respond(nil, ':status' => 503)
+          return req.respond(nil, ':status' => Qeweney::Status::SERVICE_UNAVAILABLE)
         end
 
         agent.http_upgrade(req, protocol)
@@ -134,7 +134,9 @@ module DigitalFabric
     end
   
     def df_upgrade(req)
-      return req.respond(nil, ':status' => 403) if req.headers['df-token'] != @token
+      if req.headers['df-token'] != @token
+        return req.respond(nil, ':status' => Qeweney::Status::FORBIDDEN)
+      end
 
       req.adapter.conn << Protocol.df_upgrade_response
       AgentProxy.new(self, req)

data/lib/tipi/http1_adapter.rb

@@ -2,7 +2,7 @@
 
 require 'http/parser'
 require_relative './http2_adapter'
-require 'qna/request'
+require 'qeweney/request'
 
 module Tipi
   # HTTP1 protocol implementation
@@ -87,7 +87,10 @@ module Tipi
       headers = normalize_headers(headers)
       headers[':path'] = @parser.request_url
       headers[':method'] = @parser.http_method.downcase
-      queue_request(QNA::Request.new(headers, self))
+      scheme = (proto = headers['x-forwarded-proto']) ?
+                proto.downcase : scheme_from_connection
+      headers[':scheme'] = scheme
+      queue_request(Qeweney::Request.new(headers, self))
     end
 
     def normalize_headers(headers)
@@ -131,6 +134,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))
@@ -154,7 +165,7 @@ module Tipi
     
     def upgrade_with_handler(handler, headers)
       @parser = @requests_head = @requests_tail = nil
-      handler.(@conn, headers)
+      handler.(self, headers)
       true
     end
     
@@ -173,6 +184,14 @@ module Tipi
         ':authority' => headers['host']
       )
     end
+
+    def websocket_connection(req)
+      Tipi::Websocket.new(@conn, req.headers)
+    end
+
+    def scheme_from_connection
+      @conn.is_a?(OpenSSL::SSL::SSLSocket) ? 'https' : 'http'
+    end
     
     # response API
 
@@ -185,30 +204,29 @@ module Tipi
     # @param headers
     def respond(body, headers)
       consume_request if @parsing
-      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
-        end
-      end
-      @conn.write(data.join)
+      data = [format_headers(headers, body, false), 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)}\r\n#{body}\r\n0\r\n\r\n"
+      #   end
+      # end
+      # Polyphony.backend_sendv(@conn, data, 0)
+      @conn.write(*data)
     end
       
-    DEFAULT_HEADERS_OPTS = {
-      empty_response:  false,
-      consume_request: true
-    }.freeze
-    
     # Sends response headers. If empty_response is truthy, 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 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(headers, empty_response: false, chunked: true)
+      data = format_headers(headers, !empty_response, @parser.http_minor == 1 && chunked)
+      @conn.write(data)
     end
     
     # Sends a response body chunk. If no headers were sent, default headers are
@@ -221,7 +239,7 @@ module Tipi
       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)
+      @conn.write(data.join) unless data.empty?
     end
     
     # Finishes the response to the current request. If no headers were sent,
@@ -240,11 +258,13 @@ module Tipi
     # 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)
-      status = headers[':status'] || (body ? 200 : 204)
-      lines = [format_status_line(body, status)]
+    def format_headers(headers, body, chunked)
+      status = headers[':status']
+      status ||= (body ? Qeweney::Status::OK : Qeweney::Status::NO_CONTENT)
+      lines = format_status_line(body, status, chunked)
       headers.each do |k, v|
         next if k =~ /^:/
         
@@ -254,11 +274,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
     
@@ -270,17 +290,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.bytesize}\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

data/lib/tipi/http2_stream.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'http/2'
-require 'qna/request'
+require 'qeweney/request'
 
 module Tipi
   # Manages an HTTP 2 stream
@@ -46,7 +46,7 @@ module Tipi
     end
     
     def on_headers(headers)
-      @request = QNA::Request.new(headers.to_h, self)
+      @request = Qeweney::Request.new(headers.to_h, self)
       if @first
         @request.headers[':first'] = true
         @first = false
@@ -62,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
@@ -103,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
@@ -112,7 +112,7 @@ 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
@@ -131,7 +131,7 @@ module Tipi
       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/version.rb

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

data/lib/tipi/websocket.rb

@@ -7,32 +7,17 @@ module Tipi
   # Websocket connection
   class Websocket
     def self.handler(&block)
-      proc { |conn, headers|
-        block.(new(conn, headers))
-      }
-    end  
+      proc do |adapter, headers|
+        req = Qeweney::Request.new(headers, adapter)
+        websocket = req.upgrade_to_websocket
+        block.(websocket)
+      end
+    end
 
     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)
-      @conn << format(UPGRADE_RESPONSE, accept: accept)
-      
       @reader = ::WebSocket::Frame::Incoming::Server.new(version: @version)
     end
     
@@ -64,8 +49,10 @@ module Tipi
       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
       )
       @conn << frame.to_s

data/test/test_http_server.rb

@@ -60,8 +60,8 @@ class HTTP1ServerTest < MiniTest::Test
     connection << "GET / HTTP/1.0\r\n\r\n"
 
     response = connection.readpartial(8192)
-    expected = <<~HTTP.chomp.http_lines
-      HTTP/1.0 200
+    expected = <<~HTTP.chomp.http_lines.chomp
+      HTTP/1.1 200
       Content-Length: 13
 
       Hello, world!
@@ -78,14 +78,11 @@ class HTTP1ServerTest < MiniTest::Test
     connection << "GET / HTTP/1.1\r\n\r\n"
 
     response = connection.readpartial(8192)
-    expected = <<~HTTP.http_lines
+    expected = <<~HTTP.http_lines.chomp
       HTTP/1.1 200
-      Transfer-Encoding: chunked
+      Content-Length: 13
 
-      d
       Hello, world!
-      0
-
     HTTP
     assert_equal(expected, response)
   end
@@ -98,26 +95,23 @@ class HTTP1ServerTest < MiniTest::Test
     connection << "GET / HTTP/1.0\r\nConnection: keep-alive\r\n\r\n"
     response = connection.readpartial(8192)
     assert !connection.eof?
-    assert_equal("HTTP/1.0 200\r\nContent-Length: 2\r\n\r\nHi", response)
+    assert_equal("HTTP/1.1 200\r\nContent-Length: 2\r\n\r\nHi", response)
 
     connection << "GET / HTTP/1.1\r\n\r\n"
     response = connection.readpartial(8192)
     assert !connection.eof?
-    expected = <<~HTTP.http_lines
+    expected = <<~HTTP.http_lines.chomp
       HTTP/1.1 200
-      Transfer-Encoding: chunked
+      Content-Length: 2
 
-      2
       Hi
-      0
-
     HTTP
     assert_equal(expected, response)
 
     connection << "GET / HTTP/1.0\r\n\r\n"
     response = connection.readpartial(8192)
     assert connection.eof?
-    assert_equal("HTTP/1.0 200\r\nContent-Length: 2\r\n\r\nHi", response)
+    assert_equal("HTTP/1.1 200\r\nContent-Length: 2\r\n\r\nHi", response)
   end
 
   def test_pipelining_client
@@ -130,24 +124,17 @@ class HTTP1ServerTest < MiniTest::Test
     end
 
     connection << "GET / HTTP/1.1\r\n\r\nGET / HTTP/1.1\r\nFoo: bar\r\n\r\n"
-    2.times { snooze }
+    sleep 0.01
     response = connection.readpartial(8192)
 
-    expected = <<~HTTP.http_lines
+    expected = <<~HTTP.http_lines.chomp
       HTTP/1.1 200
-      Transfer-Encoding: chunked
-
-      d
-      Hello, world!
-      0
+      Content-Length: 13
 
-      HTTP/1.1 200
-      Transfer-Encoding: chunked
+      Hello, world!HTTP/1.1 200
+      Content-Length: 14
 
-      e
       Hello, foobar!
-      0
-
     HTTP
     assert_equal(expected, response)
   end
@@ -172,22 +159,22 @@ class HTTP1ServerTest < MiniTest::Test
       6
       foobar
     HTTP
-    20.times { snooze }
+    sleep 0.01
     assert request
     assert_equal %w[foobar], chunks
     assert !request.complete?
 
     connection << "6\r\nbazbud\r\n"
-    20.times { snooze }
+    sleep 0.01
     assert_equal %w[foobar bazbud], chunks
     assert !request.complete?
 
     connection << "0\r\n\r\n"
-    20.times { snooze }
+    sleep 0.01
     assert_equal %w[foobar bazbud], chunks
     assert request.complete?
 
-    2.times { snooze }
+    sleep 0.01
 
     response = connection.readpartial(8192)
 
@@ -210,7 +197,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
@@ -231,14 +219,11 @@ class HTTP1ServerTest < MiniTest::Test
     connection << "GET / HTTP/1.1\r\n\r\n"
     response = connection.readpartial(8192)
     assert !connection.eof?
-    expected = <<~HTTP.http_lines
+    expected = <<~HTTP.http_lines.chomp
       HTTP/1.1 200
-      Transfer-Encoding: chunked
+      Content-Length: 2
 
-      2
       Hi
-      0
-
     HTTP
     assert_equal(expected, response)
 
@@ -271,7 +256,7 @@ class HTTP1ServerTest < MiniTest::Test
     connection.close
     assert !done
     
-    12.times { snooze }
+    sleep 0.01
     assert done
   end
 

data/test/test_request.rb

@@ -60,9 +60,9 @@ class RequestHeadersTest < MiniTest::Test
 
     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
+    sleep 0.01
 
-    assert_kind_of QNA::Request, req
+    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']
@@ -78,7 +78,7 @@ class RequestHeadersTest < MiniTest::Test
     end
 
     connection << "GET /titi HTTP/1.1\nHost: blah.com\nFoo: bar\nhi: 1\nHi: 2\nhi: 3\n\n"
-    snooze
+    sleep 0.01
     assert_equal 'blah.com', req.host
   end
 
@@ -90,7 +90,7 @@ class RequestHeadersTest < MiniTest::Test
     end
 
     connection << "GET /titi HTTP/1.1\nConnection: keep-alive\nFoo: bar\nhi: 1\nHi: 2\nhi: 3\n\n"
-    snooze
+    sleep 0.01
     assert_equal 'keep-alive', req.connection
   end
 
@@ -102,7 +102,7 @@ class RequestHeadersTest < MiniTest::Test
     end
 
     connection << "GET /titi HTTP/1.1\nConnection: upgrade\nUpgrade: foobar\n\n"
-    snooze
+    sleep 0.01
     assert_equal 'foobar', req.upgrade_protocol
   end
 end

data/tipi.gemspec

@@ -19,8 +19,8 @@ Gem::Specification.new do |s|
 
   s.executables   = ['tipi']
 
-  s.add_runtime_dependency      'polyphony',          '~>0.51.0'
-  s.add_runtime_dependency      'qna',                '~>0.1'
+  s.add_runtime_dependency      'polyphony',          '~>0.52.0'
+  s.add_runtime_dependency      'qeweney',            '~>0.6'
   
   s.add_runtime_dependency      'http_parser.rb',     '~>0.6.0'
   s.add_runtime_dependency      'http-2',             '~>0.10.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tipi
 version: !ruby/object:Gem::Version
-  version: '0.35'
+  version: '0.38'
 platform: ruby
 authors:
 - Sharon Rosner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-10 00:00:00.000000000 Z
+date: 2021-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: polyphony
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.51.0
+        version: 0.52.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.51.0
+        version: 0.52.0
 - !ruby/object:Gem::Dependency
-  name: qna
+  name: qeweney
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: http_parser.rb
   requirement: !ruby/object:Gem::Requirement
@@ -214,6 +214,7 @@ files:
 - df/ws_page.html
 - docs/README.md
 - docs/tipi-logo.png
+- e
 - examples/cuba.ru
 - examples/hanami-api.ru
 - examples/hello.ru
@@ -291,7 +292,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Tipi - the All-in-one Web Server for Ruby Apps