tipi 0.54 → 0.55

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d233f020bba51d04d83ad3bc0af0fba949a4988ed206cb3eb27c6cb66e9d581
-  data.tar.gz: 7462a9e229e3d78dbed4ffac92029b6fa117df683b425102f6de259eab8adc2c
+  metadata.gz: f39c7acb6549a60cd3ca5ae50f81ecf0aa1dc9e48f4e9909ae52813c97164079
+  data.tar.gz: 38a9f51b362c504112d07452b3ff4e4c8f4abb78334b2714878fb272acc615df
 SHA512:
-  metadata.gz: d0fff68a7a6848dbaf6a3b5f846ada34542b532bc42d79821c47981354214c914130fda8192ffe12bc334554264297000afe82742388713de87356e17e6dc8a6
-  data.tar.gz: d8e9c715aace1b1dc26a78a5463016f4d0a65c552fa865a8b471ccb60955abd350304d1ae7db1ddaeebd4577ded25b048078c3e4fe39abe5e32385cbb5eddae3
+  metadata.gz: 5f7f1689ae93c1f1c0920baebd5f008380ad5d09a62cede06338003e169abd95848b56f5869cea0e2fc4e05a9563a07300b831baca6db234ec6dbd8189ab3dab
+  data.tar.gz: 4ce699f1a0d32eb39913d1bf99fb96f8302667262ae1bc29cc665464a491f6a753cb946c5c6279ffbd35b02e6948049cd706e8617dad961948cb35fc4a19b1fa

data/.github/workflows/test.yml

@@ -8,15 +8,15 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest]
-        ruby: ['3.0', '3.1', '3.2', 'head']
+        ruby: ['3.1', '3.2', 'head']
 
     name: >-
       ${{matrix.os}}, ${{matrix.ruby}}
 
     runs-on: ${{matrix.os}}
 
-    env:
-      POLYPHONY_LIBEV: "1"
+    # env:
+    #   POLYPHONY_LIBEV: "1"
 
     steps:
     - name: Setup machine

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.55 2023-07-29
+
+- Simplify HTTP/1 exception handling
+- Update H1P dependency
+- Update Extralite dependency (#28)
+
 ## 0.54 2023-05-28
 
 - Use `H1P.send_response` for sending response

data/Gemfile.lock

@@ -1,23 +1,23 @@
 PATH
   remote: .
   specs:
-    tipi (0.54)
-      acme-client (~> 2.0.9)
-      ever (~> 0.1)
-      extralite (~> 1.25)
-      h1p (~> 0.6.1)
+    tipi (0.55)
+      acme-client (~> 2.0.14)
+      ever (~> 0.2)
+      extralite (~> 2.1)
+      h1p (~> 1.1)
       http-2 (~> 0.11)
-      localhost (~> 1.1.4)
-      msgpack (~> 1.4.2)
-      polyphony (~> 1.0.2)
+      localhost (~> 1.1.10)
+      msgpack (~> 1.7.1)
+      polyphony (~> 1.4)
       qeweney (~> 0.18)
-      rack (>= 2.0.8, < 2.3.0)
-      websocket (~> 1.2.8)
+      rack (>= 2.0.8, < 3.1.0)
+      websocket (~> 1.2.9)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    acme-client (2.0.13)
+    acme-client (2.0.14)
       faraday (>= 1.0, < 3.0.0)
       faraday-retry (>= 1.0, < 3.0.0)
     cuba (3.9.3)
@@ -25,31 +25,31 @@ GEM
     docile (1.4.0)
     escape_utils (1.2.2)
     ever (0.2)
-    extralite (1.26)
-    faraday (2.7.5)
+    extralite (2.1)
+    faraday (2.7.10)
       faraday-net_http (>= 2.0, < 3.1)
       ruby2_keywords (>= 0.0.4)
     faraday-net_http (3.0.2)
-    faraday-retry (2.1.0)
+    faraday-retry (2.2.0)
       faraday (~> 2.0)
-    h1p (0.6.1)
+    h1p (1.1)
     http-2 (0.11.0)
-    json (2.6.3)
     localhost (1.1.10)
     memory_profiler (1.0.1)
-    minitest (5.11.3)
-    msgpack (1.4.5)
-    polyphony (1.0.2)
+    minitest (5.18.1)
+    msgpack (1.7.2)
+    polyphony (1.4)
     qeweney (0.18)
       escape_utils (~> 1.2.1)
-    rack (2.2.7)
+    rack (3.0.8)
     rake (13.0.6)
     ruby2_keywords (0.0.5)
-    simplecov (0.17.1)
+    simplecov (0.22.0)
       docile (~> 1.1)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.2)
+      simplecov-html (~> 0.11)
+      simplecov_json_formatter (~> 0.1)
+    simplecov-html (0.12.3)
+    simplecov_json_formatter (0.1.4)
     websocket (1.2.9)
 
 PLATFORMS
@@ -57,10 +57,10 @@ PLATFORMS
 
 DEPENDENCIES
   cuba (~> 3.9.3)
-  memory_profiler (~> 1.0.0)
-  minitest (~> 5.11.3)
+  memory_profiler (~> 1.0.1)
+  minitest (~> 5.18.1)
   rake (~> 13.0.6)
-  simplecov (~> 0.17.1)
+  simplecov (~> 0.22.0)
   tipi!
 
 BUNDLED WITH

data/TODO.md

@@ -1,52 +1,12 @@
-## Add an API for reading a request body chunk into an IO (pipe)
+## Rethink design
 
-      ```ruby
-      # currently
-      chunk = req.next_chunk
-      # or
-      req.each_chunk { |c| do_something(c) }
+- Remove DF code
+- Remove non-Polyphony code
 
-      # what we'd like to do
-      r, w = IO.pipe
-      len = req.splice_chunk(w)
-      sock << "Here comes a chunk of #{len} bytes\n"
-      sock.splice(r, len)
+# Miscellaneous
 
-      # or:
-      r, w = IO.pipe
-      req.splice_each_chunk(w) do |len|
-        sock << "Here comes a chunk of #{len} bytes\n"
-        sock.splice(r, len)
-      end
-      ```
-
-# HTTP/1.1 parser
-
-- httparser.rb is not actively updated
-- the httparser.rb C parser code comes originally from https://github.com/nodejs/llhttp
-- there's a Ruby gem https://github.com/metabahn/llhttp, but its API is too low-level
-  (lots of callbacks, headers need to be retained across callbacks)
-- the basic idea is to import the C-code, then build a parser object with the following
-  callbacks:
-
-  ```ruby
-  on_headers_complete(headers)
-  on_body_chunk(chunk)
-  on_message_complete
-  ```
-
-- The llhttp gem's C-code is here: https://github.com/metabahn/llhttp/tree/main/mri
-
-- Actually, if you do a C extension, instead of a callback-based API, we can
-  design a blocking API:
-
-  ```ruby
-  parser = Tipi::HTTP1::Parser.new
-  parser.each_request(socket) do |headers|
-    request = Request.new(normalize_headers(headers))
-    handle_request(request)
-  end
-  ```
+- Try using `TCP_DEFER_ACCEPT` with Polyphony on io_uring - does it provide any
+  performance benefit?
 
 # What about HTTP/2?
 
@@ -61,26 +21,8 @@ end
 ```
 
 
-
-# DF
-
-- Add attack protection for IP-address HTTP host:
-
-  ```ruby
-  IPV4_REGEXP = /^\d+\.\d+\.\d+\.\d+$/.freeze
-
-  def is_attack_request?(req)
-    return true if req.host =~ IPV4_REGEXP && req.query[:q] != 'ping'
-  end
-  ```
-
-- Add attack route to Qeweney routing API
-
-
-
 # Roadmap
 
-- Update README (get rid of non-http stuff)
 - Improve Rack spec compliance, add tests
 - Homogenize HTTP 1 and HTTP 2 headers - downcase symbols
 

data/lib/tipi/controller/extensions.rb

@@ -14,7 +14,7 @@ module Tipi
 
     def app
       return @app if @app
-      
+
       raise 'No app define. The app to run should be set using `Tipi.app = ...`'
     end
 

data/lib/tipi/http1_adapter.rb

@@ -27,13 +27,8 @@ module Tipi
         # upgraded
         break if handle_request(headers, &block)
       end
-    rescue H1P::Error, ArgumentError
-      # an ArgumentError might be raised in the parser if an invalid input
-      # string is given as the HTTP method (String#upcase will raise on invalid HTTP string)
-      #
-      # ignore
-    rescue SystemCallError, IOError
-      # ignore
+    rescue SystemCallError, IOError, H1P::Error
+      # connection or parser error, ignore
     ensure
       finalize_client_loop
     end
@@ -160,7 +155,7 @@ module Tipi
     # response API
 
     CRLF = "\r\n"
-    
+
     # Sends response including headers and body. Waits for the request to complete
     # if not yet completed. The body is sent using chunked transfer encoding.
     # @param request [Qeweney::Request] HTTP request

data/lib/tipi/version.rb

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

data/test/test_http_server.rb

@@ -12,7 +12,7 @@ end
 class HTTP1ServerTest < MiniTest::Test
   def teardown
     @server&.interrupt if @server&.alive?
-    snooze
+    sleep 0.01
     super
   end
 
@@ -67,11 +67,13 @@ class HTTP1ServerTest < MiniTest::Test
 
     connection << "GET / HTTP/1.0\r\nConnection: keep-alive\r\n\r\n"
     response = connection.readpartial(8192)
+    sleep 0.01
     assert !connection.eof?
     assert_equal("HTTP/1.1 200 OK\r\nContent-Length: 2\r\n\r\nHi", response)
 
     connection << "GET / HTTP/1.1\r\n\r\n"
     response = connection.readpartial(8192)
+    sleep 0.01
     assert !connection.eof?
     expected = <<~HTTP.crlf_lines.chomp
       HTTP/1.1 200 OK
@@ -83,6 +85,7 @@ class HTTP1ServerTest < MiniTest::Test
 
     connection << "GET / HTTP/1.0\r\n\r\n"
     response = connection.readpartial(8192)
+    sleep 0.01
     assert connection.eof?
     assert_equal("HTTP/1.1 200 OK\r\nContent-Length: 2\r\n\r\nHi", response)
   end
@@ -191,6 +194,7 @@ class HTTP1ServerTest < MiniTest::Test
 
     connection << "GET / HTTP/1.1\r\n\r\n"
     response = connection.readpartial(8192)
+    sleep 0.01
     assert !connection.eof?
     expected = <<~HTTP.crlf_lines.chomp
       HTTP/1.1 200 OK
@@ -209,6 +213,7 @@ class HTTP1ServerTest < MiniTest::Test
 
     snooze
     response = connection.readpartial(8192)
+    snooze
     assert !connection.eof?
     expected = <<~HTTP.crlf_lines
       HTTP/1.1 101 Switching Protocols

data/tipi.gemspec

@@ -18,29 +18,29 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--title", "tipi", "--main", "README.md"]
   s.extra_rdoc_files = ["README.md"]
   s.require_paths = ["lib"]
-  s.required_ruby_version = '>= 2.7'
+  s.required_ruby_version = '>= 3.1'
 
   s.executables   = ['tipi']
 
-  s.add_runtime_dependency      'polyphony',          '~>1.0.2'
-  s.add_runtime_dependency      'ever',               '~>0.1'
+  s.add_runtime_dependency      'polyphony',          '~>1.4'
+  s.add_runtime_dependency      'ever',               '~>0.2'
   s.add_runtime_dependency      'qeweney',            '~>0.18'
-  s.add_runtime_dependency      'extralite',          '~>1.25'
-  s.add_runtime_dependency      'h1p',                '~>0.6.1'
+  s.add_runtime_dependency      'extralite',          '~>2.1'
+  s.add_runtime_dependency      'h1p',                '~>1.1'
 
   s.add_runtime_dependency      'http-2',             '~>0.11'
-  s.add_runtime_dependency      'rack',               '>=2.0.8', '<2.3.0'
-  s.add_runtime_dependency      'websocket',          '~>1.2.8'
-  s.add_runtime_dependency      'acme-client',        '~>2.0.9'
-  s.add_runtime_dependency      'localhost',          '~>1.1.4'
+  s.add_runtime_dependency      'rack',               '>=2.0.8', '<3.1.0'
+  s.add_runtime_dependency      'websocket',          '~>1.2.9'
+  s.add_runtime_dependency      'acme-client',        '~>2.0.14'
+  s.add_runtime_dependency      'localhost',          '~>1.1.10'
 
   # for digital fabric
-  s.add_runtime_dependency      'msgpack',            '~>1.4.2'
+  s.add_runtime_dependency      'msgpack',            '~>1.7.1'
 
   s.add_development_dependency  'rake',               '~>13.0.6'
-  s.add_development_dependency  'minitest',           '~>5.11.3'
-  s.add_development_dependency  'simplecov',          '~>0.17.1'
-  s.add_development_dependency  'memory_profiler',    '~>1.0.0'
+  s.add_development_dependency  'minitest',           '~>5.18.1'
+  s.add_development_dependency  'simplecov',          '~>0.22.0'
+  s.add_development_dependency  'memory_profiler',    '~>1.0.1'
 
   s.add_development_dependency  'cuba',               '~>3.9.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tipi
 version: !ruby/object:Gem::Version
-  version: '0.54'
+  version: '0.55'
 platform: ruby
 authors:
 - Sharon Rosner
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-28 00:00:00.000000000 Z
+date: 2023-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: polyphony
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: '1.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: '1.4'
 - !ruby/object:Gem::Dependency
   name: ever
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: qeweney
   requirement: !ruby/object:Gem::Requirement
@@ -58,28 +58,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.25'
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.25'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: h1p
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: http-2
   requirement: !ruby/object:Gem::Requirement
@@ -103,7 +103,7 @@ dependencies:
         version: 2.0.8
     - - "<"
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -113,63 +113,63 @@ dependencies:
         version: 2.0.8
     - - "<"
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: websocket
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.8
+        version: 1.2.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.8
+        version: 1.2.9
 - !ruby/object:Gem::Dependency
   name: acme-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.9
+        version: 2.0.14
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.9
+        version: 2.0.14
 - !ruby/object:Gem::Dependency
   name: localhost
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.4
+        version: 1.1.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.4
+        version: 1.1.10
 - !ruby/object:Gem::Dependency
   name: msgpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.2
+        version: 1.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.2
+        version: 1.7.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -190,42 +190,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.11.3
+        version: 5.18.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.11.3
+        version: 5.18.1
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.1
+        version: 0.22.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.1
+        version: 0.22.0
 - !ruby/object:Gem::Dependency
   name: memory_profiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.0.1
 - !ruby/object:Gem::Dependency
   name: cuba
   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
@@ -358,7 +358,7 @@ metadata:
   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: 
+post_install_message:
 rdoc_options:
 - "--title"
 - tipi
@@ -370,7 +370,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -378,7 +378,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.4.1
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Tipi - the All-in-one Web Server for Ruby Apps
 test_files: []