tipi 0.32 → 0.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0fd31b18e0c98a8beb780933f7adef48e0e4403a765cc64f37ef02515d94723
-  data.tar.gz: 1cc72a408cd8fe9b4d1528bd7b1200f3e7a71098596f5b18812d2d75b6120936
+  metadata.gz: adbbb6098994749bc96df90a6c73820ca54245c6026141768c83d883677fd6d3
+  data.tar.gz: daf182efaff0561bb6ff85706ae14ab70de68f840290eb5bb88e870fc0a29199
 SHA512:
-  metadata.gz: d4fb34dbec4798561322546a90f8104f3e91bd806923ba6d73e3267c06ab05499104431bf15f1abb0984d014626a062267305370470d80a7c61776a2f0c0bd8b
-  data.tar.gz: b0b7d9ec9e0536acef6f9675d592d7c48123bf591468326178b96ef673f194c44a43dcd57ed7f860d78acfe27f71192378f328b5531efff73731cd4b3875c3ee
+  metadata.gz: 78c8fb0c465779673563fb87857fdc935c4906830086f664657c00b2b80686f4fa35c3673a554976d26a41af072686ad2c197dd1fbd6a14d875480831e8455ff
+  data.tar.gz: bbb9c98e7f167aae1a006fd30ac7557ddf9671d3951e00012582b748f3afea363e53b166c40ec1af3be0f5c6d96d1991f45d9e549f5fd23e614345508719ef5f

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.33 2020-11-20
+
+* 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

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    tipi (0.32)
+    tipi (0.33)
       http-2 (~> 0.10.0)
       http_parser.rb (~> 0.6.0)
-      polyphony (~> 0.45)
+      polyphony (~> 0.47.5.1)
       rack (>= 2.0.8, < 2.3.0)
       websocket (~> 1.2.8)
 
@@ -24,7 +24,7 @@ GEM
       builder
       minitest (>= 5.0)
       ruby-progressbar
-    polyphony (0.45.2)
+    polyphony (0.47.5.1)
     rack (2.2.3)
     rake (12.3.3)
     ruby-progressbar (1.10.1)

data/bin/tipi

@@ -7,7 +7,20 @@ require File.expand_path('../lib/tipi/configuration', __dir__)
 config = {}
 #config[:forked] = 4
 
+puts DATA.read
+puts
+
 configuration_manager = spin { Tipi::Configuration.supervise_config }
 
 configuration_manager << config
 configuration_manager.await
+
+__END__
+
+          ooo
+       oo
+     o
+   \|/
+   / \   Tipi - A better web server for a better world
+  /___\
+  

data/examples/http_server_forked.rb

@@ -7,18 +7,15 @@ require 'tipi'
 
 opts = {
   reuse_addr:  true,
+  reuse_port: true,
   dont_linger: true
 }
 
-server = Polyphony::HTTP::Server.listen('0.0.0.0', 1234, opts)
-
-puts 'Listening on port 1234'
-
 child_pids = []
 8.times do
   pid = Polyphony.fork do
     puts "forked pid: #{Process.pid}"
-    server.each do |req|
+    Tipi.serve('0.0.0.0', 1234, opts) do |req|
       req.respond("Hello world! from pid: #{Process.pid}\n")
     end
   rescue Interrupt
@@ -26,4 +23,6 @@ child_pids = []
   child_pids << pid
 end
 
+puts 'Listening on port 1234'
+
 child_pids.each { |pid| Thread.current.backend.waitpid(pid) }

data/examples/http_server_throttled_accept.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'bundler/setup'
+require 'tipi'
+
+::Exception.__disable_sanitized_backtrace__ = true
+
+opts = {
+  reuse_addr:     true,
+  reuse_port:     true,
+  dont_linger:    true
+}
+
+server = Tipi.listen('0.0.0.0', 1234, opts)
+
+puts 'Listening on port 1234'
+
+throttler = Polyphony::Throttler.new(interval: 5)
+server.accept_loop do |socket|
+  throttler.call do
+    spin { Tipi.client_loop(socket, opts) { |req| req.respond("Hello world!\n") } }
+  end
+end

data/lib/tipi.rb

@@ -28,10 +28,8 @@ module Tipi
     end
     
     def accept_loop(server, opts, &handler)
-      loop do
-        client = server.accept
+      server.accept_loop do |client|
         spin { client_loop(client, opts, &handler) }
-        snooze
       rescue OpenSSL::SSL::SSLError
         # disregard
       end
@@ -47,7 +45,7 @@ module Tipi
     
     def protocol_adapter(socket, opts)
       use_http2 = socket.respond_to?(:alpn_protocol) &&
-      socket.alpn_protocol == H2_PROTOCOL
+                  socket.alpn_protocol == H2_PROTOCOL
       klass = use_http2 ? HTTP2Adapter : HTTP1Adapter
       klass.new(socket, opts)
     end

data/lib/tipi/configuration.rb

@@ -19,7 +19,7 @@ module Tipi
       end
 
       def start_listeners(config)
-        puts "listening on port 1234"
+        puts "Listening on port 1234"
         @server = Polyphony::Net.tcp_listen('0.0.0.0', 1234, { reuse_addr: true, dont_linger: true })
       end
 

data/lib/tipi/http1_adapter.rb

@@ -15,7 +15,7 @@ module Tipi
     end
     
     def each(&block)
-      @conn.read_loop do |data|
+      @conn.recv_loop do |data|
         return if handle_incoming_data(data, &block)
       end
     rescue SystemCallError, IOError
@@ -65,7 +65,7 @@ module Tipi
     # callback
     def consume_request
       request = @requests_head
-      @conn.read_loop do |data|
+      @conn.recv_loop do |data|
         @parser << data
         return if request.complete?
       end
@@ -164,7 +164,7 @@ module Tipi
     # @param headers
     def respond(body, headers)
       consume_request if @parsing
-      data = collect_headers(headers, body)
+      data = format_headers(headers, body)
       if body
         if @parser.http_minor == 0
           data << body
@@ -172,7 +172,7 @@ module Tipi
           data << body.bytesize.to_s(16) << CRLF << body << CRLF_ZERO_CRLF_CRLF
         end
       end
-      @conn.write(*data)
+      @conn.write(data.join)
     end
       
     DEFAULT_HEADERS_OPTS = {
@@ -186,8 +186,8 @@ module Tipi
     # @param empty_response [boolean] whether a response body will be sent
     # @return [void]
     def send_headers(headers, opts = DEFAULT_HEADERS_OPTS)
-      data = collect_headers(headers, true)
-      @conn.write(*data)
+      data = format_headers(headers, true)
+      @conn.write(data.join)
     end
     
     # Sends a response body chunk. If no headers were sent, default headers are
@@ -200,7 +200,7 @@ module Tipi
       data = []
       data << "#{chunk.bytesize.to_s(16)}\r\n#{chunk}\r\n"
       data << "0\r\n\r\n" if done
-      @conn.write(*data)
+      @conn.write(data.join)
     end
     
     # Finishes the response to the current request. If no headers were sent,
@@ -221,7 +221,7 @@ module Tipi
     # @param headers [Hash] response headers
     # @param empty_response [boolean] whether a response body will be sent
     # @return [String] formatted response headers
-    def collect_headers(headers, body)
+    def format_headers(headers, body)
       status = headers[':status'] || (body ? 200 : 204)
       lines = [format_status_line(body, status)]
       headers.each do |k, v|

data/lib/tipi/http2_adapter.rb

@@ -49,7 +49,7 @@ module Tipi
       @interface.on(:stream) { |stream| start_stream(stream, &block) }
       upgrade if @upgrade_headers
       
-      @conn.read_loop(&@interface.method(:<<))
+      @conn.recv_loop(&@interface.method(:<<))
     rescue SystemCallError, IOError
       # ignore
     ensure

data/lib/tipi/rack_adapter.rb

@@ -68,10 +68,18 @@ module Tipi
         else                       RACK_ENV[key]
         end
       end
-      
+
       def respond(request, (status_code, headers, body))
         headers[':status'] = status_code.to_s
-        request.respond(body.first, headers)
+
+        content =
+          if body.respond_to?(:to_path)
+            File.open(body.to_path, 'rb') { |f| f.read }
+          else
+            body.first
+          end
+
+        request.respond(content, headers)
       end
     end
   end

data/lib/tipi/version.rb

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

data/lib/tipi/websocket.rb

@@ -41,7 +41,7 @@ module Tipi
         return msg.to_s
       end
     
-      @client.read_loop do |data|
+      @client.recv_loop do |data|
         @reader << data
         if (msg = @reader.next)
           break msg.to_s

data/test/test_http_server.rb

@@ -23,11 +23,13 @@ class IO
 
   def self.mockup_connection(input, output, output2)
     eg(
-      :read        => ->(*args) { input.read(*args) },
-      :read_loop   => ->(*args, &block) { input.read_loop(*args, &block) },
-      :readpartial => ->(*args) { input.readpartial(*args) },
-      :<<          => ->(*args) { output.write(*args) },
-      :write       => ->(*args) { output.write(*args) },
+      :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) },
       :close       => -> { output.close },
       :eof?        => -> { output2.closed? }
     )
@@ -158,12 +160,14 @@ 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

data/tipi.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
 
   s.executables   = ['tipi']
 
-  s.add_runtime_dependency      'polyphony',          '~>0.45'
+  s.add_runtime_dependency      'polyphony',          '~>0.47.5.1'
   
   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.32'
+  version: '0.33'
 platform: ruby
 authors:
 - Sharon Rosner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-14 00:00:00.000000000 Z
+date: 2020-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: polyphony
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.45'
+        version: 0.47.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.45'
+        version: 0.47.5.1
 - !ruby/object:Gem::Dependency
   name: http_parser.rb
   requirement: !ruby/object:Gem::Requirement
@@ -185,6 +185,7 @@ files:
 - examples/http_server_graceful.rb
 - examples/http_server_simple.rb
 - examples/http_server_throttled.rb
+- examples/http_server_throttled_accept.rb
 - examples/http_server_timeout.rb
 - examples/http_ws_server.rb
 - examples/https_server.rb
@@ -240,7 +241,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Tipi - the All-in-one Web Server for Ruby Apps