syntropy 0.31.0 → 0.33.0

data/examples/mcp-oauth/test/test_app.rb

@@ -1,26 +1,8 @@
 # frozen_string_literal: true
 
-require_relative 'helper'
-
-class AppTest < Minitest::Test
-  APP_ROOT = File.expand_path(File.join(__dir__, '../app'))
-  HTTP = Syntropy::HTTP
-
-  def setup
-    @machine = UM.new
-    @app = Syntropy::App.new(
-      root_dir: APP_ROOT,
-      mount_path: '/',
-      machine: @machine
-    )
-    @test_harness = Syntropy::TestHarness.new(@app)
-  end
-
+class AppTest < Syntropy::Test
   def test_root
-    req = @test_harness.request(
-      ':method' => 'GET',
-      ':path'   => '/'
-    )
+    req = get('/')
     assert_equal HTTP::OK, req.response_status
     assert_match /Syntropy/, req.response_body
   end

data/examples/mcp-oauth/test/test_oauth.rb

@@ -1,28 +1,12 @@
 # frozen_string_literal: true
 
-require_relative 'helper'
 require 'base64'
 require 'digest'
 
-class OAuthBaseTest < Minitest::Test
-  APP_ROOT = File.expand_path(File.join(__dir__, '../app'))
-  HTTP = Syntropy::HTTP
-
+class OAuthBaseTest < Syntropy::Test
   def setup
-    @machine = UM.new
-    @app = Syntropy::App.new(
-      root_dir: APP_ROOT,
-      mount_path: '/',
-      machine: @machine
-    )
-    @store = @app.module_loader.load('_lib/auth_store')
-    @test_harness = Syntropy::TestHarness.new(@app)
-  end
-
-  def teardown
-    @machine = nil
-    @app = nil
-    @test_harness = nil
+    super
+    @store = load_module('_lib/auth_store')
   end
 end
 
@@ -42,18 +26,15 @@ end
 
 class OAuthPhase1DiscoveryTest < OAuthBaseTest
   def test_mcp_no_bearer_token
-    req = @test_harness.request(
+    req = post_json(
+      '/mcp',
       {
-        ':method'       => 'POST',
-        ':path'         => '/mcp',
-        'content-type'  => 'application/json'
-      },
-      JSON.dump({
         method: 'initialize',
         jsonrpc: '2.0',
         params: {}
-      })
+      }
     )
+
     assert_equal HTTP::UNAUTHORIZED, req.response_status
 
     www_auth = req.response_headers['WWW-Authenticate']
@@ -62,18 +43,14 @@ class OAuthPhase1DiscoveryTest < OAuthBaseTest
   end
 
   def test_mcp_invalid_bearer_token
-    req = @test_harness.request(
+    req = post_json(
+      '/mcp',
       {
-        ':method'       => 'POST',
-        ':path'         => '/mcp',
-        'content-type'  => 'application/json',
-        'authorization' => 'Bearer foobar'
-      },
-      JSON.dump({
         method: 'initialize',
         jsonrpc: '2.0',
         params: {}
-      })
+      },
+      'authorization' => 'Bearer foobar'
     )
     assert_equal HTTP::UNAUTHORIZED, req.response_status
 
@@ -83,10 +60,7 @@ class OAuthPhase1DiscoveryTest < OAuthBaseTest
   end
 
   def test_oauth_protected_resource_metadatas
-    req = @test_harness.request(
-      ':method' => 'GET',
-      ':path'   => '/.well-known/oauth-protected-resource'
-    )
+    req = get('/.well-known/oauth-protected-resource')
     assert_equal HTTP::OK, req.response_status
     json = req.response_json
     assert_equal ["http://localhost:1234/"],  json['authorization_servers']
@@ -94,10 +68,7 @@ class OAuthPhase1DiscoveryTest < OAuthBaseTest
   end
 
   def test_oauth_authorization_server_metadata
-    req = @test_harness.request(
-      ':method' => 'GET',
-      ':path'   => '/.well-known/oauth-authorization-server'
-    )
+    req = get('/.well-known/oauth-authorization-server')
     assert_equal HTTP::OK, req.response_status
     json = req.response_json
     assert_equal "http://localhost:1234/",                json['issuer']
@@ -117,14 +88,10 @@ class OAuthPhase2ClientRegistrationTest < OAuthBaseTest
       "grant_types"   => ["authorization_code", "refresh_token"]
     }
 
-    req = @test_harness.request(
-      {
-        ':method'       => 'POST',
-        ':path'         => '/oauth/register',
-        'content-type'  => 'application/json',
-        'authorization' => 'Bearer foobar'
-      },
-      JSON.dump(client_info)
+    req = post_json(
+      '/oauth/register',
+      client_info,
+      'authorization' => 'Bearer foobar'
     )
 
     assert_equal HTTP::CREATED, req.response_status
@@ -148,14 +115,10 @@ class OAuthPhase3AuthorizationTest < OAuthBaseTest
       "redirect_uris" => ["http://localhost:8400/callback"],
       "grant_types"   => ["authorization_code", "refresh_token"]
     }
-    req = @test_harness.request(
-      {
-        ':method'       => 'POST',
-        ':path'         => '/oauth/register',
-        'content-type'  => 'application/json',
-        'authorization' => 'Bearer foobar'
-      },
-      JSON.dump(client_info)
+    req = post_json(
+      '/oauth/register',
+      client_info,
+      'authorization' => 'Bearer foobar'
     )
     assert_equal HTTP::CREATED, req.response_status
     json = req.response_json
@@ -169,10 +132,7 @@ class OAuthPhase3AuthorizationTest < OAuthBaseTest
       'code_challenge_method' => 'S256',
       'state'                 => 'my_state'
     }
-    req = @test_harness.request(
-      ':method' => 'GET',
-      ':path'   => "/oauth/authorize?#{URI.encode_www_form(params)}"
-    )
+    req = get("/oauth/authorize?#{URI.encode_www_form(params)}")
     assert_equal HTTP::FOUND, req.response_status
     assert_equal '/signin', req.response_headers['Location']
 
@@ -202,17 +162,10 @@ class OAuthPhase3AuthorizationTest < OAuthBaseTest
     }
     oauth_signin_id = @store.store(auth_params)
 
-    req = @test_harness.request(
-      {
-        ':method'       => 'POST',
-        ':path'         => '/signin',
-        'cookie'        => "oauth_signin_id=#{oauth_signin_id}",
-        'content-type'  => 'application/x-www-form-urlencoded'
-      },
-      URI.encode_www_form(
-        username: 'foobar',
-        password: 'foobar'
-      )
+    req = post_form(
+      '/signin',
+      { username: 'foobar', password: 'foobar' },
+      'cookie' => "oauth_signin_id=#{oauth_signin_id}",
     )
 
     auth_info = @store.fetch(oauth_signin_id)
@@ -227,27 +180,15 @@ class OAuthPhase3AuthorizationTest < OAuthBaseTest
   end
 
   def test_signin_endpoint_get
-    req = @test_harness.request(
-      {
-        ':method' => 'GET',
-        ':path'   => '/signin',
-      }
-    )
+    req = get('/signin')
     assert_equal HTTP::OK, req.response_status
     assert_equal 'text/html', req.response_content_type
   end
 
   def test_signin_endpoint_post_bad_creds
-    req = @test_harness.request(
-      {
-        ':method' => 'POST',
-        ':path'   => '/signin',
-        'content-type' => 'application/x-www-form-urlencoded'
-      },
-      URI.encode_www_form(
-        username: 'foobar',
-        password: 'bad'
-      )
+    req = post_form(
+      '/signin',
+      { username: 'foobar', password: 'bad' }
     )
     assert_equal HTTP::UNAUTHORIZED, req.response_status
     assert_equal 'text/html', req.response_content_type
@@ -255,16 +196,9 @@ class OAuthPhase3AuthorizationTest < OAuthBaseTest
   end
 
   def test_signin_endpoint_post_good_creds
-    req = @test_harness.request(
-      {
-        ':method' => 'POST',
-        ':path'   => '/signin',
-        'content-type' => 'application/x-www-form-urlencoded'
-      },
-      URI.encode_www_form(
-        username: 'foobar',
-        password: 'foobar'
-      )
+    req = post_form(
+      '/signin',
+      { username: 'foobar', password: 'foobar' }
     )
     assert_equal HTTP::SEE_OTHER, req.response_status
     assert_equal '/', req.response_headers['Location']
@@ -277,22 +211,14 @@ class OAuthPhase3AuthorizationTest < OAuthBaseTest
   end
 
   def test_oauth_consent_endpoint_get_no_oauth_signin_id
-    req = @test_harness.request(
-      {
-        ':method' => 'GET',
-        ':path'   => '/oauth/consent',
-      }
-    )
+    req = get('/oauth/consent')
     assert_equal HTTP::BAD_REQUEST, req.response_status
   end
 
   def test_oauth_consent_endpoint_get_invalid_oauth_signin_id
-    req = @test_harness.request(
-      {
-        ':method' => 'GET',
-        ':path'   => '/oauth/consent',
-        'cookie'  => 'outh_signin_id=foo'
-      }
+    req = get(
+      '/oauth/consent',
+      'cookie' => 'outh_signin_id=foo'
     )
     assert_equal HTTP::BAD_REQUEST, req.response_status
   end
@@ -321,12 +247,9 @@ class OAuthPhase3AuthorizationTest < OAuthBaseTest
     }
     oauth_signin_id = @store.store(auth_params)
 
-    req = @test_harness.request(
-      {
-        ':method' => 'GET',
-        ':path'   => '/oauth/consent',
-        'cookie'  => "oauth_signin_id=#{oauth_signin_id}"
-      }
+    req = get(
+      '/oauth/consent',
+      'cookie' => "oauth_signin_id=#{oauth_signin_id}"
     )
     assert_equal HTTP::OK, req.response_status
   end
@@ -355,16 +278,10 @@ class OAuthPhase3AuthorizationTest < OAuthBaseTest
     }
     oauth_signin_id = @store.store(auth_params)
 
-    req = @test_harness.request(
-      {
-        ':method' => 'POST',
-        ':path'   => '/oauth/consent',
-        'cookie'  => "oauth_signin_id=#{oauth_signin_id}",
-        'content-type'  => 'application/x-www-form-urlencoded'
-      },
-      URI.encode_www_form(
-        decision: 'deny',
-      )
+    req = post_form(
+      '/oauth/consent',
+      { decision: 'deny' },
+      'cookie'  => "oauth_signin_id=#{oauth_signin_id}"
     )
     assert_equal HTTP::FOUND, req.response_status
 
@@ -396,16 +313,10 @@ class OAuthPhase3AuthorizationTest < OAuthBaseTest
     }
     oauth_signin_id = @store.store(auth_params)
 
-    req = @test_harness.request(
-      {
-        ':method' => 'POST',
-        ':path'   => '/oauth/consent',
-        'cookie'  => "oauth_signin_id=#{oauth_signin_id}",
-        'content-type'  => 'application/x-www-form-urlencoded'
-      },
-      URI.encode_www_form(
-        decision: 'allow',
-      )
+    req = post_form(
+      '/oauth/consent',
+      { decision: 'allow' },
+      'cookie'  => "oauth_signin_id=#{oauth_signin_id}"
     )
     assert_equal HTTP::FOUND, req.response_status
 
@@ -452,19 +363,15 @@ class OAuthPhase4AuthorizationTest < OAuthBaseTest
   end
 
   def test_oauth_token_exchange
-    req = @test_harness.request(
+    req = post_form(
+      '/oauth/token',
       {
-        ':method' => 'POST',
-        ':path'   => '/oauth/token',
-        'content-type'  => 'application/x-www-form-urlencoded'
-      },
-      URI.encode_www_form(
-        grant_type: 'authorization_code',
-        code: @auth_code,
-        redirect_uri: 'http://localhost:4321/callback',
-        client_id: @client_id,
-        code_verifier: @code_verifier
-      )
+        grant_type:     'authorization_code',
+        code:           @auth_code,
+        redirect_uri:   'http://localhost:4321/callback',
+        client_id:      @client_id,
+        code_verifier:  @code_verifier
+      }
     )
 
     assert_equal HTTP::OK, req.response_status
@@ -483,19 +390,8 @@ class OAuthPhase4AuthorizationTest < OAuthBaseTest
   end
 
   def test_oauth_token_exchange_missing_params
-    req = @test_harness.request(
-      {
-        ':method' => 'POST',
-        ':path'   => '/oauth/token',
-        'content-type'  => 'application/x-www-form-urlencoded'
-      },
-      URI.encode_www_form({}
-        # grant_type: 'authorization_code',
-        # code: auth_code,
-        # redirect_uri: 'http://localhost:4321/callback',
-        # client_id: client_id,
-        # code_verifier: code_verifier
-      )
+    req = post_form(
+      '/oauth/token', {}
     )
 
     assert_equal HTTP::BAD_REQUEST, req.response_status
@@ -507,19 +403,15 @@ class OAuthPhase4AuthorizationTest < OAuthBaseTest
   end
 
   def test_oauth_token_exchange_invalid_grant_type
-    req = @test_harness.request(
+    req = post_form(
+      '/oauth/token',
       {
-        ':method' => 'POST',
-        ':path'   => '/oauth/token',
-        'content-type'  => 'application/x-www-form-urlencoded'
-      },
-      URI.encode_www_form(
         grant_type: 'foo',
         code: @auth_code,
         redirect_uri: 'http://localhost:4321/callback',
         client_id: @client_id,
         code_verifier: @code_verifier
-      )
+      }
     )
 
     assert_equal HTTP::BAD_REQUEST, req.response_status
@@ -531,19 +423,15 @@ class OAuthPhase4AuthorizationTest < OAuthBaseTest
   end
 
   def test_oauth_token_exchange_invalid_code
-    req = @test_harness.request(
+    req = post_form(
+      '/oauth/token',
       {
-        ':method' => 'POST',
-        ':path'   => '/oauth/token',
-        'content-type'  => 'application/x-www-form-urlencoded'
-      },
-      URI.encode_www_form(
-        grant_type: 'authorization_code',
-        code: @auth_code + '!',
-        redirect_uri: 'http://localhost:4321/callback',
-        client_id: @client_id,
-        code_verifier: @code_verifier
-      )
+        grant_type:     'authorization_code',
+        code:           @auth_code + '!',
+        redirect_uri:   'http://localhost:4321/callback',
+        client_id:      @client_id,
+        code_verifier:  @code_verifier
+      }
     )
 
     assert_equal HTTP::BAD_REQUEST, req.response_status
@@ -555,19 +443,15 @@ class OAuthPhase4AuthorizationTest < OAuthBaseTest
   end
 
   def test_oauth_token_exchange_invalid_redirect_uri
-    req = @test_harness.request(
+    req = post_form(
+      '/oauth/token',
       {
-        ':method' => 'POST',
-        ':path'   => '/oauth/token',
-        'content-type'  => 'application/x-www-form-urlencoded'
-      },
-      URI.encode_www_form(
-        grant_type: 'authorization_code',
-        code: @auth_code,
-        redirect_uri: 'http://localhost:4321/foo',
-        client_id: @client_id,
-        code_verifier: @code_verifier
-      )
+        grant_type:     'authorization_code',
+        code:           @auth_code,
+        redirect_uri:   'http://localhost:4321/foo',
+        client_id:      @client_id,
+        code_verifier:  @code_verifier
+      }
     )
 
     assert_equal HTTP::BAD_REQUEST, req.response_status
@@ -579,19 +463,15 @@ class OAuthPhase4AuthorizationTest < OAuthBaseTest
   end
 
   def test_oauth_token_exchange_invalid_client_id
-    req = @test_harness.request(
+    req = post_form(
+      '/oauth/token',
       {
-        ':method' => 'POST',
-        ':path'   => '/oauth/token',
-        'content-type'  => 'application/x-www-form-urlencoded'
-      },
-      URI.encode_www_form(
-        grant_type: 'authorization_code',
-        code: @auth_code + '!',
-        redirect_uri: 'http://localhost:4321/callback',
-        client_id: @client_id + 'foo',
-        code_verifier: @code_verifier
-      )
+        grant_type:     'authorization_code',
+        code:           @auth_code + '!',
+        redirect_uri:   'http://localhost:4321/callback',
+        client_id:      @client_id + 'foo',
+        code_verifier:  @code_verifier
+      }
     )
 
     assert_equal HTTP::BAD_REQUEST, req.response_status
@@ -603,19 +483,15 @@ class OAuthPhase4AuthorizationTest < OAuthBaseTest
   end
 
   def test_oauth_token_exchange_invalid_code_verifier
-    req = @test_harness.request(
+    req = post_form(
+      '/oauth/token',
       {
-        ':method' => 'POST',
-        ':path'   => '/oauth/token',
-        'content-type'  => 'application/x-www-form-urlencoded'
-      },
-      URI.encode_www_form(
-        grant_type: 'authorization_code',
-        code: @auth_code + '!',
-        redirect_uri: 'http://localhost:4321/callback',
-        client_id: @client_id,
-        code_verifier: @code_verifier + 'abc'
-      )
+        grant_type:     'authorization_code',
+        code:           @auth_code + '!',
+        redirect_uri:   'http://localhost:4321/callback',
+        client_id:      @client_id,
+        code_verifier:  @code_verifier + 'abc'
+      }
     )
 
     assert_equal HTTP::BAD_REQUEST, req.response_status

data/lib/syntropy/app.rb

@@ -6,7 +6,7 @@ require 'yaml'
 require 'papercraft'
 
 require 'syntropy/errors'
-require 'syntropy/module'
+require 'syntropy/module_loader'
 require 'syntropy/routing_tree'
 require 'syntropy/mime_types'
 
@@ -35,7 +35,7 @@ module Syntropy
     end
 
     attr_reader :module_loader, :routing_tree, :root_dir, :mount_path, :env
-    attr_accessor :test_mode
+    attr_accessor :raise_on_internal_server_error
 
     def initialize(**env)
       @machine = env[:machine]
@@ -102,6 +102,21 @@ module Syntropy
       route
     end
 
+    def setup_db(db_path:, schema_root: '_schema')
+      @env[:db_path] = db_path
+      @env[:schema_root] = schema_root
+
+      class << self
+        def connection_pool
+          @connection_pool ||= DB::ConnectionPool.new(@machine, @env[:db_path], 4)
+        end
+
+        def schema
+          @schema ||= DB::Schema.new(module_loader: @module_loader, schema_root: @env[:schema_root])
+        end
+      end
+    end
+
     private
 
     # Handles a not found error, taking into account hooks up the tree from the
@@ -458,7 +473,7 @@ module Syntropy
       req.respond(msg, ':status' => status) rescue nil
     }
 
-    TEST_MODE_DEFAULT_ERROR_HANDLER = ->(req, err) {
+    RAISE_INTERNAL_SERVER_ERROR_DEFAULT_ERROR_HANDLER = ->(req, err) {
       status = Syntropy::Error.http_status(err)
       raise if status == HTTP::INTERNAL_SERVER_ERROR
 
@@ -471,8 +486,10 @@ module Syntropy
       @default_error_handler ||= begin
         if @builtin_applet
           @builtin_applet.module_loader.load('/default_error_handler')
+        elsif @raise_on_internal_server_error
+          RAISE_INTERNAL_SERVER_ERROR_DEFAULT_ERROR_HANDLER
         else
-          @test_mode ? TEST_MODE_DEFAULT_ERROR_HANDLER : RAW_DEFAULT_ERROR_HANDLER
+          RAW_DEFAULT_ERROR_HANDLER
         end
       end
     end
@@ -482,6 +499,8 @@ module Syntropy
     #
     # @return [void]
     def start
+      @module_loader.load('_setup', raise_on_missing: false)
+
       @machine.spin do
         # we do startup stuff asynchronously, in order to first let Syntropy do
         # its setup tasks.
@@ -500,9 +519,6 @@ module Syntropy
     #
     # @return [void]
     def file_watcher_loop
-      wf = @env[:watch_files]
-      period = wf.is_a?(Numeric) ? wf : 0.1
-
       @machine.file_watch(@root_dir, UM::IN_CREATE | UM::IN_DELETE | UM::IN_CLOSE_WRITE) { |e|
         fn = e[:fn]
         @logger&.info(message: 'File change detected', fn: fn)
@@ -510,8 +526,6 @@ module Syntropy
         debounce_file_change
       }
 
-
-
       # Syntropy.file_watch(@machine, @root_dir, period: period) do |event, fn|
       #   @logger&.info(message: 'File change detected', fn: fn)
       #   @module_loader.invalidate_fn(fn)

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