syntropy 0.30.0 → 0.32.0

data/lib/syntropy/http/{connection.rb → server_connection.rb}

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'syntropy/errors'
+require 'syntropy/http/io_extensions'
 
 module Syntropy
   module HTTP
@@ -9,16 +10,15 @@ module Syntropy
     # body is sent exclusively using chunked transfer encoding. Request bodies are
     # accepted using either fixed length (Content-Length header) or chunked
     # transfer encoding.
-    class Connection
+    class ServerConnection
       attr_reader :fd, :response_headers, :logger
 
-      def initialize(server, machine, fd, env, &app)
-        @server = server
+      def initialize(machine, fd, env, io_mode: :socket, &app)
         @machine = machine
         @fd = fd
         @env = env
         @logger = env[:logger]
-        @io = machine.io(fd, :socket)
+        @io = machine.io(fd, io_mode)
         @app = app
 
         @done = nil
@@ -48,13 +48,17 @@ module Syntropy
       # connection should be persisted.
       def serve_request
         @closed = nil
-        headers = parse_headers
+        headers = @io.http_read_request_headers
         return false if !headers
 
         request = Syntropy::Request.new(headers, self)
 
         @app.call(request)
-        persist_connection?(headers)
+        persist = persist_connection?(headers)
+        if persist && !headers[':body-done-reading'] && (headers['content-length'] || headers['transfer-encoding'])
+          get_body(request)
+        end
+        persist
       rescue StandardError => e
         handle_error(request, e)
         false
@@ -96,46 +100,17 @@ module Syntropy
         headers = req.headers
         return nil if headers[':body-done-reading']
 
-        content_length = headers['content-length']
-        if content_length
-
-          chunk = @io.read(content_length.to_i)
-          headers[':body-done-reading'] = true
-          return chunk
-        end
-
-        chunked_encoding = headers['transfer-encoding']&.downcase == 'chunked'
-        if chunked_encoding
-          buf = +''
-          while (chunk = read_chunk(headers, nil))
-            buf << chunk
-          end
-          headers[':body-done-reading'] = true
-          return buf
-        end
-
-        nil
+        body = @io.http_read_body(headers)
+        headers[':body-done-reading'] = true if body
+        body
       end
 
       def get_body_chunk(req)
         headers = req.headers
-        content_length = headers['content-length']
-        if content_length
-          return nil if headers[':body-done-reading']
-
-          chunk = @io.read(content_length.to_i)
-          headers[':body-done-reading'] = true
-          return chunk
-        end
-
-        chunked_encoding = headers['transfer-encoding']&.downcase == 'chunked'
-        return read_chunk(headers, nil) if chunked_encoding
-
         return nil if headers[':body-done-reading']
 
-        # if content-length is not specified, we read to EOF, up to max 1MB size
-        chunk = read(1 << 20, nil, false)
-        headers[':body-done-reading'] = true
+        chunk = @io.http_read_body_chunk(headers)
+        headers[':body-done-reading'] = true if !chunk
         chunk
       end
 
@@ -293,57 +268,6 @@ module Syntropy
         return connection != 'close'
       end
 
-      def parse_headers
-        headers = get_request_line(MAX_REQUEST_LINE_LEN)
-        return nil if !headers
-
-        loop do
-          line = @io.read_line(MAX_HEADER_LINE_LEN)
-          break if line.nil? || line.empty?
-
-          m = line.match(RE_HEADER_LINE)
-          raise ProtocolError, "Invalid header: #{line[0..2047].inspect}" if !m
-
-          headers[m[1].downcase] = m[2]
-        end
-
-        headers
-      end
-
-      def get_request_line(buf)
-        line = @io.read_line(MAX_REQUEST_LINE_LEN)
-        return nil if !line
-
-        m = line.match(RE_REQUEST_LINE)
-        raise ProtocolError, 'Invalid request line' if !m
-
-        http_version = m[3]
-        raise UnsupportedHTTPVersionError, 'HTTP version not supported' if http_version != '1.1'
-
-        {
-          ':method'   => m[1].downcase,
-          ':path'     => m[2],
-          ':protocol' => 'http/1.1'
-        }
-      end
-
-      def read_chunk(headers, buffer)
-        chunk_size_str = @io.read_line(MAX_CHUNK_SIZE_LEN)
-        return nil if !chunk_size_str
-
-        chunk_size = chunk_size_str.to_i(16)
-        if chunk_size == 0
-          headers[':body-done-reading'] = true
-          @io.read_line(0)
-          return nil
-        end
-
-        chunk = @io.read(chunk_size)
-        @io.read_line(0)
-
-        buffer ? (buffer << chunk) : chunk
-      end
-
       INTERNAL_HEADER_REGEXP = /^:/
 
       # Formats response headers into an array. If empty_response is true(thy),

data/lib/syntropy/http.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
 require 'syntropy/http/status'
-require 'syntropy/http/connection'
+require 'syntropy/http/client_connection'
+require 'syntropy/http/client'
+require 'syntropy/http/server_connection'
 require 'syntropy/http/server'

data/lib/syntropy/logger.rb

@@ -67,7 +67,7 @@ module Syntropy
       request = o[:request]
       request_headers = request.headers
       response_headers = o[:response_headers]
-      elapsed = request.adapter.monotonic_clock - request.start_stamp
+      elapsed = monotonic_clock - request.start_stamp
       {
         level: level.to_s,
         ts: (t = Time.now; t.to_i),
@@ -82,6 +82,10 @@ module Syntropy
       }
     end
 
+    def monotonic_clock
+      ::Process.clock_gettime(::Process::CLOCK_MONOTONIC)
+    end
+
     def make_hash_entry(level, hash)
       {
         level: level.to_s,

data/lib/syntropy/{module.rb → module_loader.rb}

@@ -27,8 +27,8 @@ module Syntropy
     # @param env [Hash] environment hash
     # @return [void]
     def initialize(env)
-      @root_dir = env[:root_dir]
       @env = env
+      @root_dir = env[:root_dir]
       @modules = {} # maps ref to module entry
       @fn_map = {} # maps filename to ref
     end
@@ -37,13 +37,27 @@ module Syntropy
     #
     # @param ref [String] module reference
     # @return [any] export value
-    def load(ref)
+    def load(ref, raise_on_missing: true)
       ref = "/#{ref}" if ref !~ /^\//
 
-      entry = (@modules[ref] ||= load_module(ref))
+      entry = load_module(ref, raise_on_missing:)
+      return if !entry
+
+      @modules[ref] ||= entry
       entry[:export_value]
     end
 
+    # Returns a list of modules found in the given relative path. The module
+    # references are returned as absolute paths (relative to the module loader
+    # root directory).
+    #
+    # @param dir [String] relative module directory
+    # @return [Array<String>] list of modules
+    def list(dir)
+      fns = Dir[File.join(@root_dir, dir, '*.rb')]
+      fns.map { it.match(/^#{@root_dir}\/(.+)\.rb$/)[1] }.sort
+    end
+
     # Invalidates a module by its filename, normally following a change to the
     # underlying file (in order to cause reloading of the module). The module
     # will be removed from the modules map, as well as modules dependending on
@@ -101,17 +115,23 @@ module Syntropy
     #
     # @param ref [String] module reference
     # @return [Hash] module entry
-    def load_module(ref)
+    def load_module(ref, raise_on_missing: true)
       ref = "/#{ref}" if ref !~ /^\//
       fn = File.expand_path(File.join(@root_dir, "#{ref}.rb"))
-      raise Syntropy::Error, "File not found #{fn}" if !File.file?(fn)
+      if !File.file?(fn)
+        raise Syntropy::Error, "File not found #{fn}" if raise_on_missing
+
+        return
+      end
 
       @fn_map[fn] = ref
       code = IO.read(fn)
       env = @env.merge(module_loader: self, ref: clean_ref(ref))
       mod = Syntropy::Module.load(env, code, fn)
       add_dependencies(ref, mod.__dependencies__)
-      export_value = transform_module_export_value(mod.__export_value__)
+      export_value = transform_module_export_value(
+        mod.__export_value__, fn, raise_on_missing:
+      )
 
       {
         fn: fn,
@@ -133,10 +153,10 @@ module Syntropy
     #
     # @param export_value [any] module's export value
     # @return [any] transformed value
-    def transform_module_export_value(export_value)
+    def transform_module_export_value(export_value, fn, raise_on_missing:)
       case export_value
       when nil
-        raise Syntropy::Error, 'No export found'
+        raise Syntropy::Error, "No export found in #{fn}" if raise_on_missing
       when String
         ->(req) { req.respond(export_value) }
       when Class
@@ -278,9 +298,28 @@ module Syntropy
     # environment is based on the module's env merged with the given parameters.
     #
     # @param env [Hash] environment
+    # @return [Syntropy::App]
     def app(**env)
       env = @env.merge(env)
       Syntropy::App.new(**env)
     end
+
+    # Returns a request handler that handles requests by calling the appropriate
+    # module method (e.g. get, post, etc.)
+    #
+    # @return [Proc]
+    def http_methods
+      ->(req) { route_by_http_method(req) }
+    end
+
+    # Handles the given request by calling the module method corresponding to
+    # the request's HTTP method. If no method is found, raises a
+    # method_not_allowed error.
+    def route_by_http_method(req)
+      sym = req.method.to_sym
+      raise Syntropy::Error.method_not_allowed if !respond_to?(sym)
+
+      send(sym, req)
+    end
   end
 end

data/lib/syntropy/papercraft_extensions.rb

@@ -3,7 +3,7 @@
 require 'papercraft'
 
 Papercraft.extension(
-  'auto_refresh_watch!': ->(loc = '/.syntropy') {
+  'auto_refresh!': ->(loc = '/.syntropy') {
     if $syntropy_dev_mode
       script(src: File.join(loc, 'auto_refresh/watch.js'), type: 'module')
     end

data/lib/syntropy/request/mock_adapter.rb

@@ -42,6 +42,8 @@ module Syntropy
     end
 
     def status
+      raise 'No response' if !response_headers
+
       response_headers[':status'] || HTTP::OK
     end
 

data/lib/syntropy/request/request_info.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'uri'
-require 'escape_utils'
 
 module Syntropy
   module RequestInfoMethods
@@ -34,6 +33,16 @@ module Syntropy
       @scheme ||= @headers[':scheme']
     end
 
+    def content_type
+      ct = @headers['content-type']
+      return nil if !ct
+
+      m = ct.match(/^([^;]+)/)
+      return nil if !m
+
+      m[1].strip
+    end
+
     # Rewrites the request path by replacing the given src with the given
     # replacement.
     #
@@ -77,7 +86,7 @@ module Syntropy
     def parse_query(query)
       query.split('&').each_with_object({}) do |kv, h|
         k, v = kv.match(QUERY_KV_REGEXP)[1..2]
-        h[k.to_sym] = v ? URI.decode_www_form_component(v) : true
+        h[k] = v ? URI.decode_www_form_component(v) : true
       end
     end
 
@@ -112,7 +121,7 @@ module Syntropy
         raise BadRequestError, 'Invalid cookie format' unless c.strip =~ COOKIE_RE
 
         key, value = Regexp.last_match[1..2]
-        h[key] = EscapeUtils.unescape_uri(value)
+        h[key] = URI.decode_www_form_component(value)
       end
     end
 
@@ -147,6 +156,15 @@ module Syntropy
       @accept_parts.include?(mime_type)
     end
 
+    def auth_bearer_token
+      auth = headers['authorization']
+      if auth && (m = auth.match(/Bearer\s+([^\w]+)/))
+        return m[1]
+      end
+
+      nil
+    end
+
     private
 
     def parse_accept_parts(accept)
@@ -229,7 +247,7 @@ module Syntropy
         v = Regexp.last_match(2)
         raise BadRequestError, 'Invalid parameter size' if v && v.size > MAX_PARAMETER_VALUE_SIZE
 
-        m[EscapeUtils.unescape_uri(k)] = v ? EscapeUtils.unescape_uri(v) : true
+        m[URI.decode_www_form_component(k)] = v ? URI.decode_www_form_component(v) : true
       end
     end
   end

data/lib/syntropy/request/response.rb

@@ -179,7 +179,7 @@ module Syntropy
       end
     end
 
-    def html_response(html, **headers)
+    def respond_html(html, **headers)
       respond(
         html,
         'Content-Type' => 'text/html; charset=utf-8',
@@ -187,7 +187,7 @@ module Syntropy
       )
     end
 
-    def json_response(obj, **headers)
+    def respond_json(obj, **headers)
       respond(
         JSON.dump(obj),
         'Content-Type' => 'application/json; charset=utf-8',

data/lib/syntropy/request/validation.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'uri'
-require 'escape_utils'
 
 module Syntropy
   module RequestValidationMethods
@@ -18,6 +17,13 @@ module Syntropy
       raise Syntropy::Error.method_not_allowed
     end
 
+    def validate_content_type(*accepted)
+      ct = content_type
+      return ct if accepted.include?(ct)
+
+      raise Syntropy::InvalidRequestContentTypeError
+    end
+
     # Validates and optionally converts request parameter value for the given
     # parameter name against the given clauses. If no clauses are given,
     # verifies the parameter value is not nil. A clause can be a class, such as
@@ -33,7 +39,7 @@ module Syntropy
     # @clauses [Array] one or more validation clauses
     # @return [any] validated parameter value
     def validate_param(name, *clauses)
-      validate(query[name], *clauses)
+      validate(query[name.to_s], *clauses)
     end
 
     # Validates and optionally converts a value against the given clauses. If no
@@ -47,12 +53,12 @@ module Syntropy
     # @param value [any] value
     # @clauses [Array] one or more validation clauses
     # @return [any] validated value
-    def validate(value, *clauses)
-      raise Syntropy::ValidationError, 'Validation error' if clauses.empty? && !value
+    def validate(value, *clauses, message: 'Validation error')
+      raise Syntropy::ValidationError, message if clauses.empty? && !value
 
       clauses.each do |c|
         valid = param_is_valid?(value, c)
-        raise(Syntropy::ValidationError, 'Validation error') if !valid
+        raise(Syntropy::ValidationError, message) if !valid
 
         value = param_convert(value, c)
       end

data/lib/syntropy/routing_tree.rb

@@ -260,7 +260,8 @@ module Syntropy
     # @param dir [String] directory path
     # @return [Array<String>] array of file entries
     def file_search(dir)
-      Dir[File.join(dir.gsub(/[\[\]]/) { "\\#{it}"}, '*')]
+      spec = File.join(dir.gsub(/[\[\]]/) { "\\#{it}"}, '{*,.*}')
+      Dir[spec].reject { it =~ /\/\.$/ }
     end
 
     # Computes a route entry and/or target for the given file path.

data/lib/syntropy/test.rb

@@ -0,0 +1,77 @@
+# frozen_string_literal: true
+
+require 'syntropy'
+require 'syntropy/request/mock_adapter'
+require 'minitest'
+
+module Syntropy
+  class TestHarness
+    def initialize(app)
+      @app = app
+      @app.raise_internal_server_error = true if @app.respond_to?(:raise_internal_server_error=)
+    end
+
+    def request(headers, body = nil)
+      req = mock_req(headers, body)
+      @app.call(req)
+      req
+    end
+
+    def no_raise_internal_server_error
+      return yield if !@app.respond_to?(:raise_internal_server_error=)
+
+      begin
+        @app.raise_internal_server_error = false
+        yield
+      ensure
+        @app.raise_internal_server_error = true
+      end
+    end
+
+
+    private
+
+    def mock_req(headers, body = nil)
+      Syntropy::MockAdapter.mock(headers, body)
+    end
+  end
+
+  class Request
+    def response_headers
+      adapter.response_headers
+    end
+
+    def response_status
+      adapter.status
+    end
+
+    def response_body
+      adapter.response_body
+    end
+
+    def response_json
+      raise if response_content_type != 'application/json'
+      JSON.parse(response_body)
+    end
+
+    def response_content_type
+      ct = response_headers['Content-Type']
+      return nil if !ct
+
+      m = ct.match(/^([^;]+)/)
+      return nil if !m
+
+      m[1]
+    end
+
+    def response_cookie(name)
+      sc = response_headers['Set-Cookie']
+      return nil if !sc
+
+      m = sc.match(/#{name}=([^\s]+)$/)
+      return nil if !m
+
+      m[1]
+    end
+  end
+end

data/lib/syntropy/version.rb

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

data/lib/syntropy.rb

@@ -8,10 +8,12 @@ require 'syntropy/logger'
 require 'syntropy/http'
 require 'syntropy/mime_types'
 require 'syntropy/app'
-require 'syntropy/connection_pool'
+require 'syntropy/db/connection_pool'
+require 'syntropy/db/schema'
+require 'syntropy/db/store'
 require 'syntropy/errors'
 require 'syntropy/markdown'
-require 'syntropy/module'
+require 'syntropy/module_loader'
 require 'syntropy/papercraft_extensions'
 require 'syntropy/routing_tree'
 require 'syntropy/json_api'
@@ -32,25 +34,6 @@ module Syntropy
     end
   end
 
-  def colorize(color_code)
-    "\e[#{color_code}m#{self}\e[0m"
-  end
-
-  GREEN = "\e[32m"
-  CLEAR = "\e[0m"
-  YELLOW = "\e[33m"
-
-  BANNER =
-    "\n"\
-    "  #{GREEN}\n"\
-    "  #{GREEN} ooo\n"\
-    "  #{GREEN}ooooo\n"\
-    "  #{GREEN} ooo vvv       #{CLEAR}Syntropy - a web framework for Ruby\n"\
-    "  #{GREEN}  o vvvvv     #{CLEAR}--------------------------------------\n"\
-    "  #{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
@@ -63,11 +46,10 @@ module Syntropy
       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)
+        server = HTTP::Server.new(machine, env, &app)
 
         setup_signal_handling(machine, Fiber.current)
         server.run

data/syntropy.gemspec

@@ -23,13 +23,13 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'extralite',     '~>2.14'
   s.add_dependency 'papercraft',    '~>3.2.0'
-  s.add_dependency 'uringmachine',  '~>1.0.0'
-  s.add_dependency 'cgi'
-  s.add_dependency 'escape_utils',  '1.3.0'
+  s.add_dependency 'uringmachine',  '~>1.0.2'
 
   s.add_dependency 'json'
   s.add_dependency 'logger'
+  s.add_dependency 'irb'
 
   s.add_development_dependency 'minitest',  '~>6.0.1'
   s.add_development_dependency 'rake',      '~>13.3.1'
+  s.add_development_dependency 'solargraph'
 end

data/test/app/.well-known/foo.rb

@@ -0,0 +1,3 @@
+export ->(req) {
+  req.respond('foo')
+}

data/test/app/_hook.rb

@@ -1,4 +1,4 @@
 export ->(req, proc) {
-  req.ctx[:foo] = req.query[:foo]
+  req.ctx[:foo] = req.query['foo']
   proc.(req)
 }

data/test/app/by_method.rb

@@ -0,0 +1,9 @@
+export http_methods
+
+def get(req)
+  req.respond('foo')
+end
+
+def post(req)
+  req.respond('bar')
+end

data/test/app_setup/_setup.rb

@@ -0,0 +1,7 @@
+@app.env[:setup_imported] = true
+
+class << @app
+  def foobar
+    :foobar
+  end
+end

data/test/app_setup/index.rb

@@ -0,0 +1 @@
+export ->(req) { req.respond('foo') }

data/test/app_with_schema/_schema/2026-01-02-foo.rb

@@ -0,0 +1,12 @@
+export ->(db) {
+  db.execute <<~SQL
+    create table posts (
+      id integer primary key autoincrement,
+      title text,
+      body text
+    );
+
+    insert into posts (title, body)
+    values ('foo', 'bar');
+  SQL
+}

data/test/app_with_schema/_schema/2026-05-30-bar.rb

@@ -0,0 +1,7 @@
+export ->(db) {
+  db.execute <<~SQL
+    update posts
+    set body = 'baz'
+    where title = 'foo';
+  SQL
+}