syntropy 0.28.2 → 0.30.0

data/lib/syntropy/request.rb

@@ -0,0 +1,99 @@
+# frozen_string_literal: true
+
+require_relative './request/request_info'
+require_relative './request/validation'
+require_relative './request/response'
+require_relative './http/status'
+
+module Syntropy
+  class Request
+    include RequestInfoMethods
+    include RequestValidationMethods
+    include ResponseMethods
+
+    extend RequestInfoClassMethods
+
+    attr_reader :headers, :adapter, :start_stamp, :route_params
+    attr_accessor :route
+
+    def initialize(headers, adapter)
+      @headers  = headers
+      @adapter  = adapter
+      @start_stamp = ::Process.clock_gettime(::Process::CLOCK_MONOTONIC)
+      @route = nil
+      @route_params = {}
+      @ctx = nil
+    end
+
+    # Returns the request context
+    def ctx
+      @ctx ||= {}
+    end
+
+    def next_chunk
+      @adapter.get_body_chunk(self)
+    end
+
+    def each_chunk
+      while (chunk = @adapter.get_body_chunk(self))
+        yield chunk
+      end
+    end
+
+    def read
+      @adapter.get_body(self)
+    end
+    alias_method :body, :read
+
+    def complete?
+      @adapter.complete?(self)
+    end
+
+    EMPTY_HEADERS = {}.freeze
+
+    def respond(body, headers = EMPTY_HEADERS)
+      @adapter.respond(self, body, headers)
+      @headers_sent = true
+    end
+
+    def send_headers(headers = EMPTY_HEADERS, empty_response = false)
+      return if @headers_sent
+
+      @headers_sent = true
+      @adapter.send_headers(self, headers, empty_response: empty_response)
+    end
+
+    def send_chunk(body, done: false)
+      send_headers({}) unless @headers_sent
+
+      @adapter.send_chunk(self, body, done: done)
+    end
+    alias_method :<<, :send_chunk
+
+    def finish
+      send_headers({}) unless @headers_sent
+
+      @adapter.finish(self)
+    end
+
+    def headers_sent?
+      @headers_sent
+    end
+
+    def rx_incr(count)
+      headers[':rx'] ? headers[':rx'] += count : headers[':rx'] = count
+    end
+
+    def tx_incr(count)
+      headers[':tx'] ? headers[':tx'] += count : headers[':tx'] = count
+    end
+
+    def transfer_counts
+      [headers[':rx'], headers[':tx']]
+    end
+
+    def total_transfer
+      (headers[':rx'] || 0) + (headers[':tx'] || 0)
+    end
+  end
+end

data/lib/syntropy/utils.rb

@@ -20,7 +20,7 @@ module Syntropy
       #
       lambda { |req|
         site = sites[req.host]
-        site ? site.call(req) : req.respond(nil, ':status' => Status::BAD_REQUEST)
+        site ? site.call(req) : req.respond(nil, ':status' => HTTP::BAD_REQUEST)
       }
     end
 

data/lib/syntropy/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Syntropy
-  VERSION = '0.28.2'
+  VERSION = '0.30.0'
 end

data/lib/syntropy.rb

@@ -1,25 +1,25 @@
 # frozen_string_literal: true
 
-require 'qeweney'
 require 'uringmachine'
-require 'tp2'
 require 'papercraft'
 
+require 'syntropy/request'
+require 'syntropy/logger'
+require 'syntropy/http'
+require 'syntropy/mime_types'
 require 'syntropy/app'
 require 'syntropy/connection_pool'
 require 'syntropy/errors'
 require 'syntropy/markdown'
 require 'syntropy/module'
-require 'syntropy/request_extensions'
 require 'syntropy/papercraft_extensions'
 require 'syntropy/routing_tree'
 require 'syntropy/json_api'
 require 'syntropy/side_run'
 require 'syntropy/utils'
+require 'syntropy/version'
 
 module Syntropy
-  Status = Qeweney::Status
-
   extend Utilities
 
   class << self
@@ -50,4 +50,52 @@ module Syntropy
     "  #{GREEN}  #{YELLOW}|#{GREEN}  vvv o    #{CLEAR}https://github.com/digital-fabric/syntropy\n"\
     "  #{GREEN} :#{YELLOW}|#{GREEN}:::#{YELLOW}|#{GREEN}::#{YELLOW}|#{GREEN}:\n"\
     "#{YELLOW}+++++++++++++++++++++++++++++++++++++++++++++++++++++++++\e[0m\n\n"
+
+  class << self
+    def run(env = {}, &app)
+      if @in_run
+        @env = env
+        @env[:app] = app if app
+        return
+      end
+
+      env ||= @env || {}
+      begin
+        @in_run = true
+        machine = env[:machine] || UM.new
+        machine.puts(env[:banner]) if env[:banner]
+
+        env[:logger]&.info(message: "Running Syntropy #{Syntropy::VERSION}, UringMachine #{UM::VERSION}, Ruby #{RUBY_VERSION}")
+
+        server = Server.new(machine, env, &app)
+
+        setup_signal_handling(machine, Fiber.current)
+        server.run
+      ensure
+        @in_run = false
+      end
+    end
+
+    def env(env = nil, &app)
+      return @env if !env && !app
+
+      @env = env || {}
+      @env[:app] = app if app
+    end
+
+    private
+
+    def setup_signal_handling(machine, fiber)
+      queue = UM::Queue.new
+      trap('SIGINT') { machine.push(queue, :SIGINT) }
+      machine.spin { watch_for_int_signal(machine, queue, fiber) }
+    end
+
+    # waits for signal from queue, then terminates given fiber
+    # to be done
+    def watch_for_int_signal(machine, queue, fiber)
+      machine.shift(queue)
+      machine.schedule(fiber, UM::Terminate.new)
+    end
+  end
 end

data/syntropy.gemspec

@@ -13,9 +13,9 @@ Gem::Specification.new do |s|
   s.metadata      = {
     'homepage_uri' => 'https://github.com/digital-fabric/syntropy',
     'documentation_uri' => 'https://www.rubydoc.info/gems/syntropy',
-    'changelog_uri' => 'https://github.com/digital-fabric/syntropy/blob/master/CHANGELOG.md'
+    'changelog_uri' => 'https://github.com/digital-fabric/syntropy/blob/main/CHANGELOG.md'
   }
-  s.rdoc_options  = ['--title', 'Extralite', '--main', 'README.md']
+  s.rdoc_options  = ['--title', 'Syntropy', '--main', 'README.md']
   s.extra_rdoc_files = ['README.md']
   s.require_paths = ['lib']
   s.required_ruby_version = '>= 3.4'
@@ -23,11 +23,9 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'extralite',     '~>2.14'
   s.add_dependency 'papercraft',    '~>3.2.0'
-  s.add_dependency 'qeweney',       '~>0.24'
-  s.add_dependency 'tp2',           '~>0.20.2'
-  s.add_dependency 'uringmachine',  '~>0.24.0'
-
-  s.add_dependency 'listen',        '~>3.9.0'
+  s.add_dependency 'uringmachine',  '~>1.0.0'
+  s.add_dependency 'cgi'
+  s.add_dependency 'escape_utils',  '1.3.0'
 
   s.add_dependency 'json'
   s.add_dependency 'logger'

data/test/app/about/_error.rb

@@ -1,4 +1,4 @@
-DEFAULT_STATUS = Qeweney::Status::INTERNAL_SERVER_ERROR
+DEFAULT_STATUS = HTTP::INTERNAL_SERVER_ERROR
 
 export ->(req, err) {
   status = err.respond_to?(:http_status) ? err.http_status : DEFAULT_STATUS

data/test/app/api+.rb

@@ -10,7 +10,7 @@ class API < Syntropy::JSONAPI
 
   def incr!(req)
     if req.path != '/test/api'
-        raise Syntropy::Error.new('Teapot', Qeweney::Status::TEAPOT)
+        raise Syntropy::Error.new('Teapot', HTTP::TEAPOT)
     end
 
     @count += 1

data/test/app_custom/_site.rb

@@ -1,3 +1,3 @@
 export ->(req) {
-  req.respond(nil, ':status' => Status::TEAPOT)
+  req.respond(nil, ':status' => HTTP::TEAPOT)
 }

data/test/bm_router_proc.rb

@@ -13,7 +13,7 @@ require 'roda'
 require 'benchmark/ips'
 require 'securerandom'
 require 'rack/mock_request'
-require 'qeweney/mock_adapter'
+require 'syntropy/request/mock_adapter'
 
 class BM
   def self.name(name)
@@ -100,7 +100,7 @@ p roda_app.(req)
 
 ################################################################################
 
-class Qeweney::Request
+class Syntropy::Request
   def response_headers
     adapter.headers
   end
@@ -157,7 +157,7 @@ proc = ->(req) { syntropy_app.(req) }
 
 module ::Kernel
   def mock_req(headers, body = nil)
-    Qeweney::MockAdapter.mock(headers, body).tap { it.setup_mock_request }
+    Syntropy::MockAdapter.mock(headers, body)
   end
 end
 

data/test/helper.rb

@@ -4,16 +4,22 @@ require 'bundler/setup'
 require_relative './coverage' if ENV['COVERAGE']
 require 'uringmachine'
 require 'syntropy'
-require 'qeweney/mock_adapter'
+require 'syntropy/request/mock_adapter'
 require 'minitest/autorun'
 require 'fileutils'
 
 STDOUT.sync = true
 STDERR.sync = true
 
+class ::String
+  def crlf_lines
+    chomp.gsub("\n", "\r\n").chomp
+  end
+end
+
 module ::Kernel
   def mock_req(headers, body = nil)
-    Qeweney::MockAdapter.mock(headers, body).tap { it.setup_mock_request }
+    Syntropy::MockAdapter.mock(headers, body)
   end
 
   def capture_exception
@@ -83,15 +89,16 @@ module Minitest::Assertions
     return unless exp_content_type
 
     if Symbol === exp_content_type
-      exp_content_type = Qeweney::MimeTypes[exp_content_type]
+      exp_content_type = Syntropy::MimeTypes[exp_content_type]
     end
     actual = req.response_content_type
+
     assert_equal exp_content_type, actual
   end
 end
 
-# Extensions to be used in conjunction with `Qeweney::TestAdapter`
-class Qeweney::Request
+# Extensions to be used in conjunction with `Syntropy::TestAdapter`
+class Syntropy::Request
   def response_headers
     adapter.response_headers
   end
@@ -113,5 +120,3 @@ class Qeweney::Request
     response_headers['Content-Type']
   end
 end
-
-# puts "Polyphony backend: #{Thread.current.backend.kind}"

data/test/test_app.rb

@@ -3,7 +3,7 @@
 require_relative 'helper'
 
 class AppTest < Minitest::Test
-  Status = Qeweney::Status
+  HTTP = Syntropy::HTTP
 
   APP_ROOT = File.join(__dir__, 'app')
 
@@ -29,27 +29,27 @@ class AppTest < Minitest::Test
 
   def test_app_rendering
     req = make_request(':method' => 'GET', ':path' => '/')
-    assert_equal Status::NOT_FOUND, req.response_status
+    assert_equal HTTP::NOT_FOUND, req.response_status
     assert_equal 'Not found', req.response_body
 
     req = make_request(':method' => 'HEAD', ':path' => '/')
-    assert_equal Status::NOT_FOUND, req.response_status
+    assert_equal HTTP::NOT_FOUND, req.response_status
     assert_nil req.response_body
 
     req = make_request(':method' => 'POST', ':path' => '/')
     assert_equal 'Not found', req.response_body
-    assert_equal Status::NOT_FOUND, req.response_status
+    assert_equal HTTP::NOT_FOUND, req.response_status
 
     req = make_request(':method' => 'GET', ':path' => '/test')
-    assert_equal Status::OK, req.response_status
+    assert_equal HTTP::OK, req.response_status
     assert_equal '<h1>Hello, world!</h1>', req.response_body
 
     req = make_request(':method' => 'HEAD', ':path' => '/test')
-    assert_equal Status::OK, req.response_status
+    assert_equal HTTP::OK, req.response_status
     assert_nil req.response_body
 
     req = make_request(':method' => 'POST', ':path' => '/test')
-    assert_equal Status::METHOD_NOT_ALLOWED, req.response_status
+    assert_equal HTTP::METHOD_NOT_ALLOWED, req.response_status
     assert_equal "Method not allowed", req.response_body
 
     req = make_request(':method' => 'GET', ':path' => '/test/assets/style.css')
@@ -57,13 +57,13 @@ class AppTest < Minitest::Test
     assert_equal 'text/css', req.response_headers['Content-Type']
 
     req = make_request(':method' => 'GET', ':path' => '/assets/style.css')
-    assert_equal Status::NOT_FOUND, req.response_status
+    assert_equal HTTP::NOT_FOUND, req.response_status
 
     req = make_request(':method' => 'GET', ':path' => '/test/api?q=get')
     assert_equal({ status: 'OK', response: 0 }, req.response_json)
 
     req = make_request(':method' => 'POST', ':path' => '/test/api?q=get')
-    assert_equal Status::METHOD_NOT_ALLOWED, req.response_status
+    assert_equal HTTP::METHOD_NOT_ALLOWED, req.response_status
     assert_equal({ status: 'Error', message: 'Method not allowed' }, req.response_json)
 
     req = make_request(':method' => 'GET', ':path' => '/test/api/foo?q=get')
@@ -73,32 +73,32 @@ class AppTest < Minitest::Test
     assert_equal({ status: 'OK', response: 1 }, req.response_json)
 
     req = make_request(':method' => 'GET', ':path' => '/test/api?q=incr')
-    assert_equal Status::METHOD_NOT_ALLOWED, req.response_status
+    assert_equal HTTP::METHOD_NOT_ALLOWED, req.response_status
     assert_equal({ status: 'Error', message: 'Method not allowed' }, req.response_json)
 
     req = make_request(':method' => 'POST', ':path' => '/test/api/foo?q=incr')
     assert_equal({ status: 'Error', message: 'Teapot' }, req.response_json)
-    assert_equal Status::TEAPOT, req.response_status
+    assert_equal HTTP::TEAPOT, req.response_status
 
     req = make_request(':method' => 'POST', ':path' => '/test/api/foo/bar?q=incr')
     assert_equal({ status: 'Error', message: 'Teapot' }, req.response_json)
-    assert_equal Status::TEAPOT, req.response_status
+    assert_equal HTTP::TEAPOT, req.response_status
 
     req = make_request(':method' => 'GET', ':path' => '/test/bar')
     assert_equal 'foobar', req.response_body
-    assert_equal Status::OK, req.response_status
+    assert_equal HTTP::OK, req.response_status
 
     req = make_request(':method' => 'POST', ':path' => '/test/bar')
     assert_equal 'foobar', req.response_body
-    assert_equal Status::OK, req.response_status
+    assert_equal HTTP::OK, req.response_status
 
     req = make_request(':method' => 'GET', ':path' => '/test/baz')
     assert_equal 'foobar', req.response_body
-    assert_equal Status::OK, req.response_status
+    assert_equal HTTP::OK, req.response_status
 
     req = make_request(':method' => 'POST', ':path' => '/test/baz')
     assert_equal 'Method not allowed', req.response_body
-    assert_equal Status::METHOD_NOT_ALLOWED, req.response_status
+    assert_equal HTTP::METHOD_NOT_ALLOWED, req.response_status
 
     req = make_request(':method' => 'GET', ':path' => '/test/about')
     assert_equal 'About', req.response_body.chomp
@@ -110,7 +110,7 @@ class AppTest < Minitest::Test
     assert_nil req.response_body
 
     req = make_request(':method' => 'GET', ':path' => '/test/about/foo/bar')
-    assert_equal Status::NOT_FOUND, req.response_status
+    assert_equal HTTP::NOT_FOUND, req.response_status
 
     req = make_request(':method' => 'GET', ':path' => '/test/params/abc')
     assert_equal '/test/params/[foo]-abc', req.response_body.chomp
@@ -119,12 +119,12 @@ class AppTest < Minitest::Test
     assert_equal '<link>foo</link>', req.response_body
 
     req = make_request(':method' => 'GET', ':path' => '/test/bad_mod')
-    assert_equal Status::INTERNAL_SERVER_ERROR, req.response_status
+    assert_equal HTTP::INTERNAL_SERVER_ERROR, req.response_status
   end
 
   def test_automatic_redirect_on_trailing_slash
     req = make_request(':method' => 'GET', ':path' => '/test/rss/')
-    assert_equal Status::MOVED_PERMANENTLY, req.response_status
+    assert_equal HTTP::MOVED_PERMANENTLY, req.response_status
     assert_equal '/test/rss', req.response_headers['Location']
   end
 
@@ -146,29 +146,29 @@ class AppTest < Minitest::Test
 
   def test_middleware
     req = make_request(':method' => 'HEAD', ':path' => '/test?foo=42')
-    assert_equal Status::OK, req.response_status
+    assert_equal HTTP::OK, req.response_status
     assert_nil req.response_body
     assert_equal '42', req.ctx[:foo]
 
     req = make_request(':method' => 'HEAD', ':path' => '/test/about/raise?foo=43')
-    assert_equal Status::INTERNAL_SERVER_ERROR, req.response_status
+    assert_equal HTTP::INTERNAL_SERVER_ERROR, req.response_status
     assert_equal '<h1>Raised error</h1>', req.response_body
     assert_equal '43', req.ctx[:foo]
   end
 
   def test_middleware_invocation_on_404
     req = make_request(':method' => 'HEAD', ':path' => '/azerty?foo=bar')
-    assert_equal Status::NOT_FOUND, req.response_status
+    assert_equal HTTP::NOT_FOUND, req.response_status
     assert_nil req.ctx[:foo]
 
     req = make_request(':method' => 'HEAD', ':path' => '/test/azerty?foo=bar')
-    assert_equal Status::NOT_FOUND, req.response_status
+    assert_equal HTTP::NOT_FOUND, req.response_status
     assert_equal 'bar', req.ctx[:foo]
   end
 end
 
 class CustomAppTest < Minitest::Test
-  Status = Qeweney::Status
+  HTTP = Syntropy::HTTP
 
   APP_ROOT = File.join(__dir__, 'app_custom')
 
@@ -190,12 +190,12 @@ class CustomAppTest < Minitest::Test
   def test_app_with_site_rb_file
     req = make_request(':method' => 'GET', ':path' => '/foo/bar')
     assert_nil req.response_body
-    assert_equal Status::TEAPOT, req.response_status
+    assert_equal HTTP::TEAPOT, req.response_status
   end
 end
 
 class MultiSiteAppTest < Minitest::Test
-  Status = Qeweney::Status
+  HTTP = Syntropy::HTTP
 
   APP_ROOT = File.join(__dir__, 'app_multi_site')
 
@@ -217,7 +217,7 @@ class MultiSiteAppTest < Minitest::Test
   def test_route_by_host
     req = make_request(':method' => 'GET', ':path' => '/', 'host' => 'blah')
     assert_nil req.response_body
-    assert_equal Status::BAD_REQUEST, req.response_status
+    assert_equal HTTP::BAD_REQUEST, req.response_status
 
     req = make_request(':method' => 'GET', ':path' => '/', 'host' => 'foo.bar')
     assert_equal '<h1>foo.bar</h1>', req.response_body.chomp
@@ -228,7 +228,7 @@ class MultiSiteAppTest < Minitest::Test
 end
 
 class AppAPITest < Minitest::Test
-  Status = Qeweney::Status
+  HTTP = Syntropy::HTTP
 
   APP_ROOT = File.join(__dir__, 'app')
 
@@ -292,7 +292,7 @@ class AppAPITest < Minitest::Test
 end
 
 class AppDependenciesTest < Minitest::Test
-  Status = Qeweney::Status
+  HTTP = Syntropy::HTTP
 
   APP_ROOT = File.join(__dir__, 'app')
 
@@ -321,6 +321,6 @@ class AppDependenciesTest < Minitest::Test
 
     req = make_request(':method' => 'GET', ':path' => '/test/bar')
     assert_equal 'foobar', req.response_body
-    assert_equal Status::OK, req.response_status
+    assert_equal HTTP::OK, req.response_status
   end
 end

data/test/test_caching.rb

@@ -4,7 +4,7 @@ require_relative 'helper'
 require 'digest/sha1'
 
 class CachingTest < Minitest::Test
-  Status = Qeweney::Status
+  HTTP = Syntropy::HTTP
 
   APP_ROOT = File.join(__dir__, 'app')
 
@@ -40,7 +40,7 @@ class CachingTest < Minitest::Test
     @app = Syntropy::App.new(**@env)
 
     @c_fd, @s_fd = make_socket_pair
-    @adapter = TP2::Connection.new(nil, @machine, @s_fd, @env) { @app.(it) }
+    @adapter = Syntropy::HTTP::Connection.new(nil, @machine, @s_fd, @env) { @app.(it) }
   end
 
   def teardown