syntropy 0.31.0 → 0.32.0

data/lib/syntropy/db/connection_pool.rb

@@ -0,0 +1,71 @@
+# frozen_string_literal: true
+
+require 'extralite'
+
+module Syntropy
+  module DB
+    class ConnectionPool
+      attr_reader :count
+
+      def initialize(machine, fn, max_conn)
+        @machine = machine
+        @fn = fn
+        @count = 0
+        @max_conn = max_conn
+        @queue = UM::Queue.new
+        @key = :"connection_pool_#{object_id}"
+      end
+
+      def with_db
+        if (db = Thread.current[@key])
+          @machine.snooze
+          return yield(db)
+        end
+
+        db = checkout
+        begin
+          Thread.current[@key] = db
+          yield(db)
+        ensure
+          Thread.current[@key] = nil
+          checkin(db)
+        end
+      end
+
+      def query(sql, *, **, &)
+        with_db { it.query(sql, *, **, &) }
+      end
+
+      def execute(sql, *, **)
+        with_db { it.execute(sql, *, **) }
+      end
+
+      def close
+        while @queue.count > 0
+          db = @machine.shift(@queue)
+          db.close
+          @count -= 1
+        end
+      end
+
+      private
+
+      def checkout
+        return make_db_instance if @queue.count == 0 && @count < @max_conn
+
+        @machine.shift(@queue)
+      end
+
+      def checkin(db)
+        @machine.push(@queue, db)
+      end
+
+      def make_db_instance
+        Extralite::Database.new(@fn, wal: true).tap do
+          @count += 1
+          it.on_progress(mode: :at_least_once, period: 320, tick: 10) { @machine.snooze }
+        end
+      end
+    end
+  end
+end

data/lib/syntropy/db/schema.rb

@@ -0,0 +1,92 @@
+# frozen_string_literal: true
+
+module Syntropy
+  module DB
+    class Schema
+      def initialize(module_loader: nil, schema_root: '_schema', &)
+        @migrations = {}
+        @module_loader = module_loader
+        @schema_root = schema_root
+        load_schema_from_modules if @module_loader
+        run_schema_block(&) if block_given?
+      end
+
+      def apply(connection_pool)
+        execute_migrations(connection_pool)
+      end
+
+      def current_version(connection_pool)
+        connection_pool.with_db do |db|
+          get_schema_version(db)
+        end
+      end
+
+      private
+
+      def load_schema_from_modules
+        modules = @module_loader.list(@schema_root)
+        modules.each do |name|
+          @migrations[File.basename(name)] = @module_loader.load(name)
+        end
+      end
+
+      class SchemaBlockRunner
+        def initialize(migrations, &)
+          @migrations = migrations
+          instance_eval(&)
+        end
+
+        def initial(&block)
+          @migrations['0000'] = block
+        end
+
+        def version(key, &block)
+          @migrations[key] = block
+        end
+      end
+
+      def run_schema_block(&)
+        SchemaBlockRunner.new(@migrations, &)
+      end
+
+      def execute_migrations(connection_pool)
+        connection_pool.with_db do |db|
+          current_version = get_schema_version(db)
+          migrations_keys = @migrations.keys.sort
+          migrations_keys.select { it > current_version } if current_version
+
+          migrations_keys.each do |key|
+            db.transaction do
+              @migrations[key].(db)
+              set_schema_version(db, key)
+              current_version = key
+            end
+          end
+
+          current_version
+        end
+      end
+
+      def get_schema_version(db)
+        db.execute <<~SQL
+          create table if not exists __syntropy_schema__(
+            k text primary key,
+            v text
+          );
+        SQL
+        db.query_single_splat <<~SQL
+          select v from __syntropy_schema__
+          where k = 'version'
+        SQL
+      end
+
+      def set_schema_version(db, version)
+        db.execute <<~SQL, v: version
+          insert into __syntropy_schema__ (k, v)
+          values ('version', :v)
+          on conflict(k) do update set v = :v
+        SQL
+      end
+    end
+  end
+end

data/lib/syntropy/db/store.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module Syntropy
+  module DB
+    class Store
+      def initialize(connection_pool)
+        @connection_pool = connection_pool
+      end
+
+      def query(sql, *, **)
+        @connection_pool.with_db { it.query(sql, *, **) }
+      end
+
+      def query_single_row(sql, *, **)
+        @connection_pool.with_db { it.query_single(sql, *, **) }
+      end
+
+      def query_single_value(sql, *, **)
+        @connection_pool.with_db { it.query_single_splat(sql, *, **) }
+      end
+
+      def execute(sql, *, **)
+        @connection_pool.with_db { it.execute(sql, *, **) }
+      end
+
+      def transaction(&)
+        @connection_pool.with_db(&)
+      end
+    end
+  end
+end

data/lib/syntropy/http/io_extensions.rb

@@ -5,13 +5,13 @@ require 'syntropy/errors'
 module Syntropy
   module HTTP
     module ProtocolMethods
-      RE_REQUEST_LINE = /^([a-z]+)\s+([^\s]+)\s+HTTP\/([019\.]{1,3})/i
+      RE_REQUEST_LINE = /^(get|head|options|trace|put|delete|post|patch|connect)\s+([^\s]+)\s+HTTP\/([019\.]{1,3})/i
       RE_RESPONSE_LINE = /^HTTP\/1\.1\s+(\d{3})(\s+.+)?$/i
-      RE_HEADER_LINE = /^([a-z0-9-]+):\s+(.+)/i
+      RE_HEADER_LINE = /^([a-z0-9\-]+):\s+(.+)/i
 
       MAX_REQUEST_LINE_LEN = 1 << 14 # 16KB
       MAX_RESPONSE_LINE_LEN = 1 << 8 # 256
-      MAX_HEADER_LINE_LEN = 1 << 10 # 1KB
+      MAX_HEADER_LINE_LEN = 1 << 13 # 8KB
       MAX_CHUNK_SIZE_LEN = 16
 
       # @return [Hash] headers
@@ -27,8 +27,7 @@ module Syntropy
 
         headers = {
           ':method'   => m[1].downcase,
-          ':path'     => m[2],
-          ':protocol' => 'http/1.1'
+          ':path'     => m[2]
         }
 
         loop do
@@ -93,6 +92,21 @@ module Syntropy
         nil
       end
 
+      def http_skip_body(headers)
+        content_length = headers['content-length']
+        if content_length
+          return skip(content_length.to_i)
+        end
+
+        chunked_encoding = headers['transfer-encoding']&.downcase == 'chunked'
+        if chunked_encoding
+          while http_skip_cte_chunk
+          end
+        end
+
+        nil
+      end
+
       def http_read_body_chunk(headers)
         content_length = headers['content-length']
         if content_length
@@ -141,6 +155,20 @@ module Syntropy
 
         buffer ? (buffer << chunk) : chunk
       end
+
+      def http_skip_cte_chunk
+        chunk_size_str = read_line(MAX_CHUNK_SIZE_LEN)
+        return if !chunk_size_str
+
+        chunk_size = chunk_size_str.to_i(16)
+        if chunk_size == 0
+          read_line(0)
+          return nil
+        end
+
+        chunk = skip(chunk_size)
+        read_line(0)
+      end
     end
   end
 end

data/lib/syntropy/http/server_connection.rb

@@ -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
@@ -264,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/{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/request/request_info.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'uri'
-require 'escape_utils'
 
 module Syntropy
   module RequestInfoMethods
@@ -122,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
 
@@ -159,7 +158,7 @@ module Syntropy
 
     def auth_bearer_token
       auth = headers['authorization']
-      if (m = auth.match(/Bearer\s+([^\w]+)/))
+      if auth && (m = auth.match(/Bearer\s+([^\w]+)/))
         return m[1]
       end
 
@@ -248,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/validation.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'uri'
-require 'escape_utils'
 
 module Syntropy
   module RequestValidationMethods
@@ -40,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

data/lib/syntropy/test.rb

@@ -8,7 +8,7 @@ module Syntropy
   class TestHarness
     def initialize(app)
       @app = app
-      @app.test_mode = true
+      @app.raise_internal_server_error = true if @app.respond_to?(:raise_internal_server_error=)
     end
 
     def request(headers, body = nil)
@@ -17,6 +17,18 @@ module Syntropy
       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)

data/lib/syntropy/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Syntropy
-  VERSION = '0.31.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'

data/syntropy.gemspec

@@ -24,11 +24,12 @@ Gem::Specification.new do |s|
   s.add_dependency 'extralite',     '~>2.14'
   s.add_dependency 'papercraft',    '~>3.2.0'
   s.add_dependency 'uringmachine',  '~>1.0.2'
-  s.add_dependency 'escape_utils',  '1.3.0'
 
   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/_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
+}

data/test/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/schema/2026-05-30-bar.rb

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