tipi 0.42 → 0.47

data/lib/tipi.rb

@@ -17,7 +17,7 @@ end
 module Tipi
   ALPN_PROTOCOLS = %w[h2 http/1.1].freeze
   H2_PROTOCOL = 'h2'
-  
+
   class << self
     def serve(host, port, opts = {}, &handler)
       opts[:alpn_protocols] = ALPN_PROTOCOLS
@@ -26,7 +26,7 @@ module Tipi
     ensure
       server&.close
     end
-    
+
     def listen(host, port, opts = {})
       opts[:alpn_protocols] = ALPN_PROTOCOLS
       Polyphony::Net.tcp_listen(host, port, opts).tap do |socket|
@@ -35,7 +35,7 @@ module Tipi
         end
       end
     end
-    
+
     def accept_loop(server, opts, &handler)
       server.accept_loop do |client|
         spin { client_loop(client, opts, &handler) }
@@ -43,7 +43,7 @@ module Tipi
         # disregard
       end
     end
-    
+
     def client_loop(client, opts, &handler)
       client.no_delay if client.respond_to?(:no_delay)
       adapter = protocol_adapter(client, opts)
@@ -62,84 +62,5 @@ module Tipi
     def route(&block)
       proc { |req| req.route(&block) }
     end
-
-    CERTIFICATE_STORE_DEFAULT_DIR = File.expand_path('~/.tipi')
-    CERTIFICATE_STORE_DEFAULT_DB_PATH = File.join(
-      CERTIFICATE_STORE_DEFAULT_DIR, 'certificates.db'
-    )
-
-    def default_certificate_store
-      FileUtils.mkdir(CERTIFICATE_STORE_DEFAULT_DIR) rescue nil
-      Tipi::ACME::SQLiteCertificateStore.new(CERTIFICATE_STORE_DEFAULT_DB_PATH)
-    end
-
-    def full_service(
-      http_port: 10080,
-      https_port: 10443,
-      certificate_store: default_certificate_store,
-      app: nil, &block
-    )
-      app ||= block
-      raise "No app given" unless app
-
-      http_handler = ->(r) { r.redirect("https://#{r.host}#{r.path}") }
-    
-      ctx = OpenSSL::SSL::SSLContext.new
-      # ctx.ciphers = 'ECDH+aRSA'
-      Polyphony::Net.setup_alpn(ctx, Tipi::ALPN_PROTOCOLS)
-    
-      challenge_handler = Tipi::ACME::HTTPChallengeHandler.new
-      certificate_manager = Tipi::ACME::CertificateManager.new(
-        master_ctx: ctx,
-        store: certificate_store,
-        challenge_handler: challenge_handler
-      )
-    
-      http_listener = spin do
-        opts = {
-          reuse_addr:   true,
-          reuse_port:   true,
-          dont_linger:  true,
-        }
-        puts "Listening for HTTP on localhost:#{http_port}"
-        server = Polyphony::Net.tcp_listen('0.0.0.0', http_port, opts)
-        wrapped_handler = certificate_manager.challenge_routing_app(http_handler)
-        server.accept_loop do |client|
-          spin do
-            Tipi.client_loop(client, opts, &wrapped_handler)
-          rescue => e
-            puts "Uncaught error in HTTP listener: #{e.inspect}"
-          end
-        end
-      ensure
-        server.close
-      end
-    
-      https_listener = spin do
-        opts = {
-          reuse_addr:     true,
-          reuse_port:     true,
-          dont_linger:    true,
-          secure_context: ctx,
-        }
-      
-        puts "Listening for HTTPS on localhost:#{https_port}"
-        server = Polyphony::Net.tcp_listen('0.0.0.0', https_port, opts)
-        loop do
-          client = server.accept
-          spin do
-            Tipi.client_loop(client, opts, &app)
-          rescue => e
-            puts "Uncaught error in HTTPS listener: #{e.inspect}"
-          end
-        rescue OpenSSL::SSL::SSLError, SystemCallError, TypeError
-          # ignore
-        end
-      ensure
-        server.close
-      end
-
-      Fiber.await(http_listener, https_listener)
-    end
   end
 end

data/test/coverage.rb

@@ -26,10 +26,10 @@ module Coverage
       @result = {}
       trace = TracePoint.new(:line) do |tp|
         next if tp.path =~ /\(/
-      
+
         absolute = File.expand_path(tp.path)
         next unless LIB_FILES.include?(absolute)# =~ /^#{LIB_DIR}/
-        
+
         @result[absolute] ||= relevant_lines_for_filename(absolute)
         @result[absolute][tp.lineno - 1] = 1
       end

data/test/helper.rb

@@ -8,7 +8,6 @@ require_relative './eg'
 require_relative './coverage' if ENV['COVERAGE']
 
 require 'minitest/autorun'
-require 'minitest/reporters'
 
 require 'polyphony'
 

data/test/test_http_server.rb

@@ -4,7 +4,7 @@ require_relative 'helper'
 require 'tipi'
 
 class String
-  def http_lines
+  def crlf_lines
     gsub "\n", "\r\n"
   end
 end
@@ -33,7 +33,7 @@ class HTTP1ServerTest < MiniTest::Test
     connection << "GET / HTTP/1.0\r\n\r\n"
 
     response = connection.readpartial(8192)
-    expected = <<~HTTP.chomp.http_lines.chomp
+    expected = <<~HTTP.chomp.crlf_lines.chomp
       HTTP/1.1 200
       Content-Length: 13
 
@@ -51,7 +51,7 @@ class HTTP1ServerTest < MiniTest::Test
     connection << "GET / HTTP/1.1\r\n\r\n"
 
     response = connection.readpartial(8192)
-    expected = <<~HTTP.http_lines.chomp
+    expected = <<~HTTP.crlf_lines.chomp
       HTTP/1.1 200
       Content-Length: 13
 
@@ -73,7 +73,7 @@ class HTTP1ServerTest < MiniTest::Test
     connection << "GET / HTTP/1.1\r\n\r\n"
     response = connection.readpartial(8192)
     assert !connection.eof?
-    expected = <<~HTTP.http_lines.chomp
+    expected = <<~HTTP.crlf_lines.chomp
       HTTP/1.1 200
       Content-Length: 2
 
@@ -100,7 +100,7 @@ class HTTP1ServerTest < MiniTest::Test
     sleep 0.01
     response = connection.readpartial(8192)
 
-    expected = <<~HTTP.http_lines.chomp
+    expected = <<~HTTP.crlf_lines.chomp
       HTTP/1.1 200
       Content-Length: 13
 
@@ -125,7 +125,7 @@ class HTTP1ServerTest < MiniTest::Test
       req.finish
     end
 
-    connection << <<~HTTP.http_lines
+    connection << <<~HTTP.crlf_lines
       POST / HTTP/1.1
       Transfer-Encoding: chunked
 
@@ -151,7 +151,7 @@ class HTTP1ServerTest < MiniTest::Test
 
     response = connection.readpartial(8192)
 
-    expected = <<~HTTP.http_lines
+    expected = <<~HTTP.crlf_lines
       HTTP/1.1 200
       Transfer-Encoding: chunked
 
@@ -172,7 +172,7 @@ class HTTP1ServerTest < MiniTest::Test
       upgrade: {
         echo: lambda do |adapter, _headers|
           conn = adapter.conn
-          conn << <<~HTTP.http_lines
+          conn << <<~HTTP.crlf_lines
             HTTP/1.1 101 Switching Protocols
             Upgrade: echo
             Connection: Upgrade
@@ -192,7 +192,7 @@ class HTTP1ServerTest < MiniTest::Test
     connection << "GET / HTTP/1.1\r\n\r\n"
     response = connection.readpartial(8192)
     assert !connection.eof?
-    expected = <<~HTTP.http_lines.chomp
+    expected = <<~HTTP.crlf_lines.chomp
       HTTP/1.1 200
       Content-Length: 2
 
@@ -200,7 +200,7 @@ class HTTP1ServerTest < MiniTest::Test
     HTTP
     assert_equal(expected, response)
 
-    connection << <<~HTTP.http_lines
+    connection << <<~HTTP.crlf_lines
       GET / HTTP/1.1
       Upgrade: echo
       Connection: upgrade
@@ -210,7 +210,7 @@ class HTTP1ServerTest < MiniTest::Test
     snooze
     response = connection.readpartial(8192)
     assert !connection.eof?
-    expected = <<~HTTP.http_lines
+    expected = <<~HTTP.crlf_lines
       HTTP/1.1 101 Switching Protocols
       Upgrade: echo
       Connection: Upgrade
@@ -228,7 +228,7 @@ class HTTP1ServerTest < MiniTest::Test
 
     connection.close
     assert !done
-    
+
     sleep 0.01
     assert done
   end
@@ -251,7 +251,7 @@ class HTTP1ServerTest < MiniTest::Test
     count = 0
 
     connection << "GET / HTTP/1.1\r\n\r\n"
-    
+
     while (data = connection.read(chunk_size))
       response << data
       count += 1
@@ -259,7 +259,7 @@ class HTTP1ServerTest < MiniTest::Test
     end
 
     chunks = "#{chunk_size.to_s(16)}\n#{'*' * chunk_size}\n" * chunk_count
-    expected = <<~HTTP.http_lines
+    expected = <<~HTTP.crlf_lines
       HTTP/1.1 200
       Transfer-Encoding: chunked
 

data/test/test_request.rb

@@ -39,7 +39,7 @@ class RequestHeadersTest < MiniTest::Test
     assert_equal 'blah.com', req.headers['host']
     assert_equal 'bar', req.headers['foo']
     assert_equal ['1', '2', '3'], req.headers['hi']
-    assert_equal 'get', req.headers[':method']
+    assert_equal 'GET', req.headers[':method']
     assert_equal '/titi', req.headers[':path']
   end
 

data/tipi.gemspec

@@ -14,16 +14,17 @@ Gem::Specification.new do |s|
   }
   s.rdoc_options = ["--title", "tipi", "--main", "README.md"]
   s.extra_rdoc_files = ["README.md"]
-  s.extensions = ["ext/tipi/extconf.rb"]
   s.require_paths = ["lib"]
   s.required_ruby_version = '>= 2.6'
 
   s.executables   = ['tipi']
 
-  s.add_runtime_dependency      'polyphony',          '~>0.69'
+  s.add_runtime_dependency      'polyphony',          '~>0.71'
+  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      'http-2',             '~>0.11'
   s.add_runtime_dependency      'rack',               '>=2.0.8', '<2.3.0'
   s.add_runtime_dependency      'websocket',          '~>1.2.8'
@@ -33,12 +34,10 @@ Gem::Specification.new do |s|
   # for digital fabric
   s.add_runtime_dependency      'msgpack',            '~>1.4.2'
 
-  s.add_development_dependency  'rake-compiler',        '1.1.1'
-  s.add_development_dependency  'rake',               '~>12.3.3'
+  s.add_development_dependency  'rake',               '~>13.0.6'
   s.add_development_dependency  'minitest',           '~>5.11.3'
-  s.add_development_dependency  'minitest-reporters', '~>1.4.2'
   s.add_development_dependency  'simplecov',          '~>0.17.1'
+  s.add_development_dependency  'memory_profiler',    '~>1.0.0'
 
   s.add_development_dependency  'cuba',               '~>3.9.3'
-  s.add_development_dependency  'http_parser.rb',     '0.7.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tipi
 version: !ruby/object:Gem::Version
-  version: '0.42'
+  version: '0.47'
 platform: ruby
 authors:
 - Sharon Rosner
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-16 00:00:00.000000000 Z
+date: 2022-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: polyphony
@@ -16,14 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.69'
+        version: '0.71'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.69'
+        version: '0.71'
+- !ruby/object:Gem::Dependency
+  name: ever
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
   name: qeweney
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: h1p
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: http-2
   requirement: !ruby/object:Gem::Requirement
@@ -142,34 +170,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.4.2
-- !ruby/object:Gem::Dependency
-  name: rake-compiler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.1.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.1.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 12.3.3
+        version: 13.0.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 12.3.3
+        version: 13.0.6
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -185,33 +199,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 5.11.3
 - !ruby/object:Gem::Dependency
-  name: minitest-reporters
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.2
+        version: 0.17.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.2
+        version: 0.17.1
 - !ruby/object:Gem::Dependency
-  name: simplecov
+  name: memory_profiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.1
+        version: 1.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.17.1
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: cuba
   requirement: !ruby/object:Gem::Requirement
@@ -226,29 +240,15 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.9.3
-- !ruby/object:Gem::Dependency
-  name: http_parser.rb
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.7.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.7.0
-description: 
+description:
 email: sharon@noteflakes.com
 executables:
 - tipi
-extensions:
-- ext/tipi/extconf.rb
+extensions: []
 extra_rdoc_files:
 - README.md
 files:
+- ".github/FUNDING.yml"
 - ".github/workflows/test.yml"
 - ".gitignore"
 - CHANGELOG.md
@@ -262,6 +262,7 @@ files:
 - bin/benchmark
 - bin/h1pd
 - bin/tipi
+- bm.png
 - df/agent.rb
 - df/etc_benchmark.rb
 - df/multi_agent_supervisor.rb
@@ -278,6 +279,7 @@ files:
 - examples/cuba.ru
 - examples/full_service.rb
 - examples/hanami-api.ru
+- examples/hello.rb
 - examples/hello.ru
 - examples/http1_parser.rb
 - examples/http_request_ws_server.rb
@@ -298,6 +300,7 @@ files:
 - examples/https_server_forked.rb
 - examples/https_wss_server.rb
 - examples/rack_server.rb
+- examples/rack_server_forked.rb
 - examples/rack_server_https.rb
 - examples/rack_server_https_forked.rb
 - examples/routing_server.rb
@@ -308,15 +311,18 @@ files:
 - examples/websocket_server.rb
 - examples/ws_page.html
 - examples/wss_page.html
-- ext/tipi/extconf.rb
-- ext/tipi/http1_parser.c
-- ext/tipi/http1_parser.h
-- ext/tipi/tipi_ext.c
 - lib/tipi.rb
 - lib/tipi/acme.rb
 - lib/tipi/cli.rb
 - lib/tipi/config_dsl.rb
 - lib/tipi/configuration.rb
+- lib/tipi/controller.rb
+- lib/tipi/controller/bare_polyphony.rb
+- lib/tipi/controller/bare_stock.rb
+- lib/tipi/controller/extensions.rb
+- lib/tipi/controller/stock_http1_adapter.rb
+- lib/tipi/controller/web_polyphony.rb
+- lib/tipi/controller/web_stock.rb
 - lib/tipi/digital_fabric.rb
 - lib/tipi/digital_fabric/agent.rb
 - lib/tipi/digital_fabric/agent_proxy.rb
@@ -331,14 +337,13 @@ files:
 - lib/tipi/http2_stream.rb
 - lib/tipi/rack_adapter.rb
 - lib/tipi/response_extensions.rb
+- lib/tipi/supervisor.rb
 - lib/tipi/version.rb
 - lib/tipi/websocket.rb
-- security/http1.rb
 - test/coverage.rb
 - test/eg.rb
 - test/helper.rb
 - test/run.rb
-- test/test_http1_parser.rb
 - test/test_http_server.rb
 - test/test_request.rb
 - tipi.gemspec
@@ -347,7 +352,7 @@ licenses:
 - MIT
 metadata:
   source_code_uri: https://github.com/digital-fabric/tipi
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--title"
 - tipi
@@ -366,8 +371,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.3.3
+signing_key:
 specification_version: 4
 summary: Tipi - the All-in-one Web Server for Ruby Apps
 test_files: []

data/ext/tipi/extconf.rb

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-require 'rubygems'
-require 'mkmf'
-
-require_relative '../../security/http1'
-
-$CFLAGS << " -Wno-format-security"
-CONFIG['optflags'] << ' -fno-strict-aliasing' unless RUBY_PLATFORM =~ /mswin/
-Tipi::HTTP1_LIMITS.each { |k, v| $defs << "-D#{k.upcase}=#{v}" }
-
-dir_config 'tipi_ext'
-create_makefile 'tipi_ext'