tipi 0.37.2 → 0.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 945640dfdad7948a782f37168282335b8183a2109da5b28070f152a8d57090ab
-  data.tar.gz: 4b3ae61bddd8d51fa429f747f493a93ef16a8ae4e466210878b48827f3280fe6
+  metadata.gz: 6a8c075ce0b769f014a20587dd061f17e32361f211aad5741f655dafe6687e37
+  data.tar.gz: d14c0fe026a7db1aa46edded54e5ee6f1a0f8598f626dd1aff342ad07b5cec39
 SHA512:
-  metadata.gz: a67714ea433353c56a2c68dbfee36a654511e99a910f11868bb1844dbccd024ac2d2cb2779d588be1238fdb90e49f1341093cf3cdb1e2518f6c3fabfbce1de70
-  data.tar.gz: 356b55c653ec4949c651784b6acc032c41db5cb6262f8b80f488586541c9a9dc789215a1306dd4257599f1fe4a618cd5ed678ddffa4379b52b21b655b2eb4eba
+  metadata.gz: e306783fc83d9d7ebd0678c4d68a13f6f9bd77e4b9d83fc84d745e5cc3f53eb27b69286fb1ba9f1ca54fe57358009a4c11dc9374c8a8d9046dc4330e359dc988
+  data.tar.gz: 789c3b4e1374cc57e04e3bce4aa8d12022cfd7e31c9cba4f5777302f57943da0a967f17f8cb2f91551357deac1bbd07fe514c2cb2e002331f525d341c6b7f0e9

data/CHANGELOG.md

@@ -1,76 +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
+- Fix header formatting when header value is an array
 
 ## 0.37 2021-02-15
 
-* Update upgrade mechanism to work with updated Qeweney API
+- Update upgrade mechanism to work with updated Qeweney API
 
 ## 0.36 2021-02-12
 
-* Use `Qeweney::Status` constants
+- Use `Qeweney::Status` constants
 
 ## 0.35 2021-02-10
 
-* Extract Request class into separate [qeweney](https://github.com/digital-fabric/qeweney) 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,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tipi (0.37.2)
+    tipi (0.38)
       http-2 (~> 0.10.0)
       http_parser.rb (~> 0.6.0)
       msgpack (~> 1.4.2)

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_proxy.rb

@@ -150,9 +150,14 @@ 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

data/lib/tipi/http1_adapter.rb

@@ -204,31 +204,28 @@ 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
-          data << "#{body.bytesize.to_s(16)}\r\n#{body}\r\n0\r\n\r\n"
-        end
-      end
+      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)
+    def send_headers(headers, empty_response: false, chunked: true)
+      data = format_headers(headers, !empty_response, @parser.http_minor == 1 && chunked)
       @conn.write(data)
     end
     
@@ -261,12 +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)
+    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 =~ /^:/
         
@@ -276,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
     
@@ -292,11 +290,11 @@ 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
 

data/lib/tipi/version.rb

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

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)
 
@@ -232,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)
 
@@ -272,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,7 +60,7 @@ 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 Qeweney::Request, req
     assert_equal 'blah.com', req.headers['host']
@@ -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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tipi
 version: !ruby/object:Gem::Version
-  version: 0.37.2
+  version: '0.38'
 platform: ruby
 authors:
 - Sharon Rosner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-08 00:00:00.000000000 Z
+date: 2021-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: polyphony