tipi 0.49 → 0.52

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b39df2bde7e106405baeaa5cea41987fc709bd453c08aa0ec299ce925a7f957
-  data.tar.gz: '0689c72ff5d79cbdf4a4b4141791701428ee1a1820fdfc1580587d5863a433e8'
+  metadata.gz: efec664af01dfb4781c30670e2471a591a6c8df3a8024b5f14dc4edded3f5c1d
+  data.tar.gz: 0f384c5a305c5afe524b9a0e28d2a06931340275fe879e963cc194d2cde3c766
 SHA512:
-  metadata.gz: 109d929246c4aa7f3e2909128ba8d95fc0fdb4dd73e89e15f528d8eb55ec2cc2e5de7881de4d67b25dbfb234e2cb27a73c7cc19264a7b1b81a24fc75b7caf9ad
-  data.tar.gz: c61d8d3b4edd034c3c1ddcac5a87fa33598498a68d93d94691d45bdacb4accc148cfa9e40a8ee8aa3aa9101b6689259c631bd40adc2825922f0b7be5a7565c17
+  metadata.gz: 7aa3995cd7ad560f3ba0f8a318da6c5ef62d53bc02209f05491f1e3db5b140e2697e8cd3158686a62c3dbae373d0260d803befabf4b8c417e862f2e6f68860bf
+  data.tar.gz: 7a17368c2fd9572531ac137822727082e48b85322190b91197f699d34d0554fd39d5dc7a18fe6f68bf8ea64dadbabbb464f39fa2b83475ee52cee99484c422a5

data/.github/workflows/test.yml

@@ -7,22 +7,26 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest]
-        ruby: [2.6, 2.7, 3.0]
+        os: [ubuntu-latest, macos-latest]
+        ruby: ['2.7', '3.0', '3.1', 'head']
 
     name: >-
       ${{matrix.os}}, ${{matrix.ruby}}
 
     runs-on: ${{matrix.os}}
+
+    env:
+      POLYPHONY_USE_LIBEV: "1"
+
     steps:
-    - uses: actions/checkout@v1
-    - uses: actions/setup-ruby@v1
+    - name: Setup machine
+      uses: actions/checkout@v1
+    - name: Setup Ruby
+      uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{matrix.ruby}}
-    - name: Install dependencies
-      run: |
-        gem install bundler
-        POLYPHONY_USE_LIBEV=1 bundle install
+        bundler-cache: true # 'bundle install' and cache
+        cache-version: 2
     - name: Show Linux kernel version
       run: uname -r
     - name: Run tests

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## 0.52 2022-03-03
+
+- Treat HTTP/2 headers as immutable
+
+## 0.51 2022-02-28
+
+- Update dependencies
+
+## 0.50 2022-02-10
+
+- Update Qeweney
+
 ## 0.49 2022-02-07
 
 - Update Polyphony

data/Gemfile

@@ -1,9 +1,3 @@
 source 'https://rubygems.org'
 
 gemspec
-
-# for local development
-%w{polyphony ever qeweney h1p}.each do |dep|
-  dir = "../#{dep}"
-  gem(dep, path: dir) if File.directory?(dir)
-end

data/Gemfile.lock

@@ -1,37 +1,16 @@
-PATH
-  remote: ../ever
-  specs:
-    ever (0.1)
-
-PATH
-  remote: ../h1p
-  specs:
-    h1p (0.3)
-
-PATH
-  remote: ../polyphony
-  specs:
-    polyphony (0.77)
-
-PATH
-  remote: ../qeweney
-  specs:
-    qeweney (0.16)
-      escape_utils (~> 1.2.1)
-
 PATH
   remote: .
   specs:
-    tipi (0.49)
+    tipi (0.52)
       acme-client (~> 2.0.9)
       ever (~> 0.1)
-      extralite (~> 1.2)
-      h1p (~> 0.3)
+      extralite (~> 1.14)
+      h1p (~> 0.4)
       http-2 (~> 0.11)
       localhost (~> 1.1.4)
       msgpack (~> 1.4.2)
-      polyphony (~> 0.77)
-      qeweney (~> 0.14)
+      polyphony (~> 0.80)
+      qeweney (~> 0.18)
       rack (>= 2.0.8, < 2.3.0)
       websocket (~> 1.2.8)
 
@@ -44,8 +23,9 @@ GEM
       rack (>= 1.6.0)
     docile (1.4.0)
     escape_utils (1.2.1)
-    extralite (1.11)
-    faraday (1.9.3)
+    ever (0.1)
+    extralite (1.14)
+    faraday (1.10.0)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
@@ -68,13 +48,17 @@ GEM
     faraday-patron (1.0.0)
     faraday-rack (1.0.0)
     faraday-retry (1.0.3)
+    h1p (0.4)
     http-2 (0.11.0)
     json (2.6.1)
     localhost (1.1.9)
     memory_profiler (1.0.0)
     minitest (5.11.3)
-    msgpack (1.4.4)
+    msgpack (1.4.5)
     multipart-post (2.1.1)
+    polyphony (0.81)
+    qeweney (0.18)
+      escape_utils (~> 1.2.1)
     rack (2.2.3)
     rake (13.0.6)
     ruby2_keywords (0.0.5)
@@ -90,12 +74,8 @@ PLATFORMS
 
 DEPENDENCIES
   cuba (~> 3.9.3)
-  ever!
-  h1p!
   memory_profiler (~> 1.0.0)
   minitest (~> 5.11.3)
-  polyphony!
-  qeweney!
   rake (~> 13.0.6)
   simplecov (~> 0.17.1)
   tipi!

data/df/server_utils.rb

@@ -162,11 +162,11 @@ if ENV['TRACE'] == '1'
   Thread.backend.trace_proc = proc do |event, fiber, value, pri|
     fiber_id = fiber.tag || fiber.inspect
     case event
-    when :fiber_schedule
+    when :schedule
       log format("=> %s %s %s %s", event, fiber_id, value.inspect, pri ? '(priority)' : '')
-    when :fiber_run
+    when :unblock
       log format("=> %s %s %s", event, fiber_id, value.inspect)
-    when :fiber_create, :fiber_terminate
+    when :spin, :terminate
       log format("=> %s %s", event, fiber_id)
     else
       log format("=> %s", event)

data/examples/source.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+run { |req|
+  req.serve_file(__FILE__)
+}

data/examples/streaming.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+run { |req|
+  req.send_headers('Content-Type' => 'text/event-stream')
+  10.times { |i|
+    sleep 0.1
+    req.send_chunk("data: #{i.to_s * 40}\n")
+  }
+  req.finish
+}

data/examples/zlib-bench.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+FILE_SIZES = {
+  's.tmp'  => 2**10,
+  'm.tmp'  => 2**17,
+  'l.tmp'  => 2**20,
+  'xl.tmp' => 2**24
+}
+
+def create_files
+  FILE_SIZES.each { |fn, size|
+    IO.write(File.join('/tmp', fn), '*' * size)
+  }
+end
+
+create_files
+
+run { |req|
+  file_path = File.join('/tmp', req.path)
+  if File.file?(file_path)
+    req.serve_file(file_path)
+  else
+    req.respond(nil, ':status' => 404)
+  end
+}

data/lib/tipi/controller/web_polyphony.rb

@@ -24,9 +24,9 @@ module Tipi
   private
 
     def supervise_workers(worker_count)
-      supervisor = spin do
+      supervisor = spin(:web_worker_supervisor) do
         worker_count.times do
-          spin do
+          spin(:web_worker) do
             pid = Polyphony.fork { run_worker }
             puts "Forked worker pid: #{pid}"
             Polyphony.backend_waitpid(pid)
@@ -251,7 +251,7 @@ module Tipi
     }.freeze
 
     def spin_accept_loop(name, port, &block)
-      spin do
+      spin(:accept_loop) do
         server = Polyphony::Net.tcp_listen('0.0.0.0', port, SOCKET_OPTS)
         loop do
           socket = server.accept
@@ -267,7 +267,7 @@ module Tipi
     end
 
     def spin_connection_handler(name, socket, block)
-      spin do
+      spin(:connection_handler) do
         block.(socket)
       rescue Polyphony::BaseException
         raise
@@ -288,7 +288,7 @@ module Tipi
     end
 
     def gracefully_terminate_conections(fiber)
-      supervisor = spin { supervise }.detach
+      supervisor = spin(:connection_termination_supervisor) { supervise }.detach
       fiber.attach_all_children_to(supervisor)
 
       # terminating the supervisor will
@@ -344,7 +344,7 @@ module Tipi
     end
 
     def start_server(service)
-      spin do
+      spin(:web_server) do
         service.call
         supervise(restart: :always)
       end

data/lib/tipi/http1_adapter.rb

@@ -220,10 +220,15 @@ module Tipi
     # @param done [boolean] whether the response is completed
     # @return [void]
     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
-      return if data.empty?
+      if done
+        data = chunk ?
+          "#{chunk.bytesize.to_s(16)}\r\n#{chunk}\r\n0\r\n\r\n" :
+          "0\r\n\r\n"
+      elsif chunk
+        data = "#{chunk.bytesize.to_s(16)}\r\n#{chunk}\r\n"
+      else
+        return
+      end
 
       request.tx_incr(data.bytesize)
       @conn.write(data)

data/lib/tipi/http2_stream.rb

@@ -113,21 +113,19 @@ module Tipi
     end
 
     # response API
-    def respond(request, chunk, headers)
-      headers[':status'] ||= Qeweney::Status::OK
-      headers[':status'] = headers[':status'].to_s
+    def respond(request, body, headers)
+      headers = normalize_status_header(headers)
       with_transfer_count(request) do
         @stream.headers(transform_headers(headers))
         @headers_sent = true
-        @stream.data(chunk || '')
+        @stream.data(body || '')
       end
     rescue HTTP2::Error::StreamClosed
       # ignore
     end
 
     def respond_from_io(request, io, headers, chunk_size = 2**16)
-      headers[':status'] ||= Qeweney::Status::OK
-      headers[':status'] = headers[':status'].to_s
+      headers = normalize_status_header(headers)
       with_transfer_count(request) do
         @stream.headers(transform_headers(headers))
         @headers_sent = true
@@ -152,7 +150,8 @@ module Tipi
     def send_headers(request, headers, empty_response: false)
       return if @headers_sent
 
-      headers[':status'] ||= (empty_response ? Qeweney::Status::NO_CONTENT : Qeweney::Status::OK).to_s
+      status = empty_response ? Qeweney::Status::NO_CONTENT : Qeweney::Status::OK
+      headers = normalize_status_header(headers, status)
       with_transfer_count(request) do
         @stream.headers(transform_headers(headers), end_stream: false)
       end
@@ -194,5 +193,17 @@ module Tipi
       @stream.close
       @stream_fiber.schedule(Polyphony::MoveOn.new)
     end
+
+    private
+
+    def normalize_status_header(headers, default_status = Qeweney::Status::OK)
+      if !headers[':status']
+        headers.merge(':status' => default_status.to_s)
+      elsif !headers[':status'].is_a?(String)
+        headers.merge(headers[':status'].to_s)
+      else
+        headers
+      end
+    end
   end
 end

data/lib/tipi/version.rb

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

data/test/helper.rb

@@ -76,16 +76,16 @@ class IO
 
   def self.mockup_connection(input, output, output2)
     eg(
-      __parser_read_method__: ->() { :readpartial },
-      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? }
+      __read_method__:  -> { :readpartial },
+      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

data/tipi.gemspec

@@ -10,20 +10,23 @@ Gem::Specification.new do |s|
   s.files       = `git ls-files`.split
   s.homepage    = 'http://github.com/digital-fabric/tipi'
   s.metadata    = {
-    "source_code_uri" => "https://github.com/digital-fabric/tipi"
+    "source_code_uri" => "https://github.com/digital-fabric/tipi",
+    "documentation_uri" => "https://www.rubydoc.info/gems/tipi",
+    "homepage_uri" => "https://github.com/digital-fabric/tipi",
+    "changelog_uri" => "https://github.com/digital-fabric/tipi/blob/master/CHANGELOG.md"
   }
   s.rdoc_options = ["--title", "tipi", "--main", "README.md"]
   s.extra_rdoc_files = ["README.md"]
   s.require_paths = ["lib"]
-  s.required_ruby_version = '>= 2.6'
+  s.required_ruby_version = '>= 2.7'
 
   s.executables   = ['tipi']
 
-  s.add_runtime_dependency      'polyphony',          '~>0.77'
+  s.add_runtime_dependency      'polyphony',          '~>0.80'
   s.add_runtime_dependency      'ever',               '~>0.1'
-  s.add_runtime_dependency      'qeweney',            '~>0.14'
-  s.add_runtime_dependency      'extralite',          '~>1.2'
-  s.add_runtime_dependency      'h1p',                '~>0.3'
+  s.add_runtime_dependency      'qeweney',            '~>0.18'
+  s.add_runtime_dependency      'extralite',          '~>1.14'
+  s.add_runtime_dependency      'h1p',                '~>0.4'
 
   s.add_runtime_dependency      'http-2',             '~>0.11'
   s.add_runtime_dependency      'rack',               '>=2.0.8', '<2.3.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tipi
 version: !ruby/object:Gem::Version
-  version: '0.49'
+  version: '0.52'
 platform: ruby
 authors:
 - Sharon Rosner
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-02-07 00:00:00.000000000 Z
+date: 2022-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: polyphony
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.77'
+        version: '0.80'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.77'
+        version: '0.80'
 - !ruby/object:Gem::Dependency
   name: ever
   requirement: !ruby/object:Gem::Requirement
@@ -44,42 +44,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '0.18'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '0.18'
 - !ruby/object:Gem::Dependency
   name: extralite
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.14'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.14'
 - !ruby/object:Gem::Dependency
   name: h1p
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: http-2
   requirement: !ruby/object:Gem::Requirement
@@ -240,7 +240,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.9.3
-description:
+description: 
 email: sharon@noteflakes.com
 executables:
 - tipi
@@ -305,12 +305,15 @@ files:
 - examples/rack_server_https_forked.rb
 - examples/routing_server.rb
 - examples/servername_cb.rb
+- examples/source.rb
+- examples/streaming.rb
 - examples/websocket_client.rb
 - examples/websocket_demo.rb
 - examples/websocket_secure_server.rb
 - examples/websocket_server.rb
 - examples/ws_page.html
 - examples/wss_page.html
+- examples/zlib-bench.rb
 - lib/tipi.rb
 - lib/tipi/acme.rb
 - lib/tipi/cli.rb
@@ -352,7 +355,10 @@ licenses:
 - MIT
 metadata:
   source_code_uri: https://github.com/digital-fabric/tipi
-post_install_message:
+  documentation_uri: https://www.rubydoc.info/gems/tipi
+  homepage_uri: https://github.com/digital-fabric/tipi
+  changelog_uri: https://github.com/digital-fabric/tipi/blob/master/CHANGELOG.md
+post_install_message: 
 rdoc_options:
 - "--title"
 - tipi
@@ -364,15 +370,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: Tipi - the All-in-one Web Server for Ruby Apps
 test_files: []