itsi 0.2.3 → 0.2.4

data/examples/spa/package.json

@@ -0,0 +1,18 @@
+{
+  "name": "my-app",
+  "version": "0.0.1",
+  "private": true,
+  "scripts": {
+    "dev": "vite",
+    "build": "vite build",
+    "preview": "vite preview"
+  },
+  "dependencies": {
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0"
+  },
+  "devDependencies": {
+    "@vitejs/plugin-react": "^4.0.0",
+    "vite": "^4.4.0"
+  }
+}

data/examples/spa/src/App.jsx

@@ -0,0 +1,49 @@
+import React, { useState, useEffect } from "react";
+import Home from "./pages/Home";
+import About from "./pages/About";
+
+export default function App() {
+  const [path, setPath] = useState(window.location.pathname);
+
+  useEffect(() => {
+    const onPop = () => setPath(window.location.pathname);
+    window.addEventListener("popstate", onPop);
+    return () => window.removeEventListener("popstate", onPop);
+  }, []);
+
+  const navigate = (to) => {
+    window.history.pushState(null, "", to);
+    setPath(to);
+  };
+
+  let Page;
+  if (path === "/about") Page = About;
+  else Page = Home;
+
+  return (
+    <div style={{ padding: 20, fontFamily: "sans-serif" }}>
+      <nav style={{ marginBottom: 20 }}>
+        <a
+          href="/"
+          onClick={(e) => {
+            e.preventDefault();
+            navigate("/");
+          }}
+          style={{ marginRight: 10 }}
+        >
+          Home
+        </a>
+        <a
+          href="/about"
+          onClick={(e) => {
+            e.preventDefault();
+            navigate("/about");
+          }}
+        >
+          About
+        </a>
+      </nav>
+      <Page />
+    </div>
+  );
+}

data/examples/spa/src/main.jsx

@@ -0,0 +1,6 @@
+import React from "react";
+import { createRoot } from "react-dom/client";
+import App from "./App";
+
+const rootEl = document.getElementById("root");
+createRoot(rootEl).render(<App />);

data/examples/spa/src/pages/About.jsx

@@ -0,0 +1,9 @@
+import React from "react";
+export default function About() {
+  return (
+    <div>
+      <h1>About</h1>
+      <p>This is the About page.</p>
+    </div>
+  );
+}

data/examples/spa/src/pages/Home.jsx

@@ -0,0 +1,9 @@
+import React from "react";
+export default function Home() {
+  return (
+    <div>
+      <h1>Home</h1>
+      <p>Welcome to the minimal React SPA.</p>
+    </div>
+  );
+}

data/examples/spa/vite.config.js

@@ -0,0 +1,9 @@
+import { defineConfig } from "vite";
+import react from "@vitejs/plugin-react";
+
+export default defineConfig({
+  plugins: [react()],
+  server: {
+    open: true,
+  },
+});

data/gems/scheduler/Cargo.lock

@@ -213,7 +213,7 @@ checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
 
 [[package]]
 name = "itsi-scheduler"
-version = "0.2.3"
+version = "0.2.4"
 dependencies = [
  "bytes",
  "derive_more",

data/gems/scheduler/lib/itsi/scheduler/version.rb

@@ -2,6 +2,6 @@
 
 module Itsi
   class Scheduler
-    VERSION = "0.2.3"
+    VERSION = "0.2.4"
   end
 end

data/gems/server/Cargo.lock

@@ -1644,7 +1644,7 @@ checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
 
 [[package]]
 name = "itsi-server"
-version = "0.2.3"
+version = "0.2.4"
 dependencies = [
  "argon2",
  "async-channel",

data/gems/server/lib/itsi/server/config/dsl.rb

@@ -52,9 +52,9 @@ module Itsi
           @accepts = accepts.map { |s| s.is_a?(Regexp) ? s : s.to_s }
 
           @options = {
-            middleware_loaders: [],
+            nested_locations: [],
             middleware_loader: lambda do
-              @options[:middleware_loaders].each(&:call)
+              @options[:nested_locations].each(&:call)
               @middleware[:app] ||= {}
               @middleware[:app][:app_proc] = @middleware[:app]&.[](:preloader)&.call || DEFAULT_APP[]
               [flatten_routes, Config.errors_to_error_lines(errors)]

data/gems/server/lib/itsi/server/config/middleware/endpoint/endpoint.rb

@@ -84,10 +84,6 @@ module Itsi
             end
           else
             @params[:paths] << "" if @params[:paths].empty?
-            @params[:paths] = @params[:paths].flat_map do |p|
-              stripped_trailing = p[/(.*)\/?$/, 1]
-              [stripped_trailing, stripped_trailing + "/"]
-            end.uniq
             location.location(*@params[:paths], methods: @params[:http_methods]) do
               @middleware[:app] = app
             end

data/gems/server/lib/itsi/server/config/middleware/location.rb

@@ -27,7 +27,7 @@ module Itsi
         end
 
         attr_accessor :location, :routes, :block, :protocols, :hosts, :ports,
-          :extensions, :content_types, :accepts, :block
+          :extensions, :content_types, :accepts
 
         def initialize(location,
           *routes,
@@ -56,13 +56,13 @@ module Itsi
             block: block
           }).to_h
           @routes = params[:routes].empty? ? ["*"] : params[:routes]
-          @methods = params[:methods]
-          @protocols = params[:protocols] | params[:schemes]
-          @hosts = params[:hosts]
-          @ports = params[:ports]
-          @extensions = params[:extensions]
-          @content_types = params[:content_types]
-          @accepts = params[:accepts]
+          @methods = params[:methods].map { |s| s.is_a?(Regexp) ? s : s.to_s }
+          @protocols = (params[:protocols] | params[:schemes]).map { |s| s.is_a?(Regexp) ? s : s.to_s }
+          @hosts = params[:hosts].map { |s| s.is_a?(Regexp) ? s : s.to_s }
+          @ports = params[:ports].map { |s| s.is_a?(Regexp) ? s : s.to_s }
+          @extensions = params[:extensions].map { |s| s.is_a?(Regexp) ? s : s.to_s }
+          @content_types = params[:content_types].map { |s| s.is_a?(Regexp) ? s : s.to_s }
+          @accepts = params[:accepts].map { |s| s.is_a?(Regexp) ? s : s.to_s }
           @block = block
         end
 
@@ -70,27 +70,31 @@ module Itsi
           @methods
         end
 
+        def intersect(a, b)
+          return b if a.empty?
+          return a if b.empty?
+          a & b
+        end
+
         def build!
           build_child = lambda {
-            location.children << DSL.new(
+            child = DSL.new(
               location,
               routes: routes,
-              methods: Array(http_methods) | location.http_methods,
-              protocols: Array(protocols) | location.protocols,
-              hosts: Array(hosts) | location.hosts,
-              ports: Array(ports) | location.ports,
-              extensions: Array(extensions) | location.extensions,
-              content_types: Array(content_types) | location.content_types,
-              accepts: Array(accepts) | location.accepts,
+              methods: intersect(http_methods, location.http_methods),
+              protocols: intersect(protocols, location.protocols),
+              hosts: intersect(hosts, location.hosts),
+              ports: intersect(ports, location.ports),
+              extensions: intersect(extensions, location.extensions),
+              content_types: intersect(content_types, location.content_types),
+              accepts: intersect(accepts, location.accepts),
               controller: location.controller,
               &block
             )
+            child.options[:nested_locations].each(&:call)
+            location.children << child
           }
-          if location.parent.nil?
-            location.options[:middleware_loaders] << build_child
-          else
-            build_child[]
-          end
+          location.options[:nested_locations] << build_child
         end
 
       end

data/gems/server/lib/itsi/server/config/middleware/proxy.rb

@@ -2,17 +2,16 @@ module Itsi
   class Server
     module Config
       class Proxy < Middleware
-
         insert_text <<~SNIPPET
-        proxy \\
-          to: "${1:http://backend.example.com/api{path}{query}}", \\
-          backends: [${2:"127.0.0.1:3001", "127.0.0.1:3002"}], \\
-          backend_priority: ${3|"round_robin","ordered","random"|}, \\
-          headers: { ${4| "X-Forwarded-For" => { rewrite: "{addr}" },|} }, \\
-          verify_ssl: ${5|true,false|}, \\
-          timeout: ${6|30,60|}, \\
-          tls_sni: ${7|true,false|}, \\
-          error_response: ${8|"bad_gateway", "service_unavailable", { code: 503\\, default_format: "html"\\, html: { inline: "<h1>Service Unavailable</h1>" } }|}
+          proxy \\
+            to: "${1:http://backend.example.com{path_and_query}",
+            backends: [${2:"127.0.0.1:3001", "127.0.0.1:3002"}],
+            backend_priority: ${3|"round_robin","ordered","random"|},
+            headers: { ${4| "X-Forwarded-For" => { rewrite: "{addr}" },|} },
+            verify_ssl: ${5|true,false|},
+            timeout: ${6|30,60|},
+            tls_sni: ${7|true,false|},
+            error_response: ${8|"bad_gateway", "service_unavailable", { code: 503\\, default_format: "html"\\, html: { inline: "<h1>Service Unavailable</h1>" } }|}
         SNIPPET
 
         detail "Forwards incoming requests to a backend server using dynamic URL rewriting. Supports various backend selection strategies and header overriding."
@@ -21,18 +20,20 @@ module Itsi
           {
             to: Type(String) & Required(),
             backends: Array(Type(String)),
-            backend_priority: Enum(["round_robin", "ordered", "random"]).default("round_robin"),
+            backend_priority: Enum(%w[round_robin ordered random]).default("round_robin"),
             headers: Hash(Type(String), Type(String)).default({}),
             verify_ssl: Bool().default(true),
             tls_sni: Bool().default(true),
             timeout: Type(Integer).default(30),
-            error_response: Type(ErrorResponseDef).default("bad_gateway"),
+            error_response: Type(ErrorResponseDef).default("bad_gateway")
           }
         end
 
         def build!
-          require 'uri'
-          @params[:backends]||=  URI.extract(@params[:to]).map(&URI.method(:parse)).map{|u| "#{u.scheme}://#{u.host}:#{u.port}" }
+          require "uri"
+          @params[:backends] ||= URI.extract(@params[:to]).map(&URI.method(:parse)).map do |u|
+            "#{u.scheme}://#{u.host}:#{u.port}"
+          end
           super
         end
       end

data/gems/server/lib/itsi/server/config/middleware/rackup_file.rb

@@ -2,12 +2,11 @@ module Itsi
   class Server
     module Config
       class RackupFile < Middleware
-
         insert_text <<~SNIPPET
-        rackup_file \\
-          "config.ru",
-          nonblocking: ${2|true,false|},
-          sendfile: ${3|true,false|}
+          rackup_file \\
+            "config.ru",
+            nonblocking: ${2|true,false|},
+            sendfile: ${3|true,false|}
 
         SNIPPET
 
@@ -23,20 +22,18 @@ module Itsi
         def initialize(location, app, **params)
           super(location, params)
           raise "Rackup file must be a string" unless app.is_a?(String)
+
           @app = Itsi::Server::RackInterface.for(app)
         end
 
         def build!
           app_args = {
-            preloader: -> { @app},
+            preloader: -> { @app },
             sendfile: @params[:sendfile],
             nonblocking: @params[:nonblocking],
-            base_path: "^(?<base_path>#{location.paths_from_parent.gsub(/\.\*\)$/, ')')}).*$"
+            base_path: "^(?<base_path>#{location.paths_from_parent.gsub(/\.\*\)$/, ")")}).*$"
           }
           location.middleware[:app] = app_args
-          location.location("*") do
-            @middleware[:app] = app_args
-          end
         end
       end
     end

data/gems/server/lib/itsi/server/config/middleware/static_assets.rb

@@ -75,11 +75,15 @@ module Itsi
             @params[:allowed_extensions] << ""
           end
 
-          @params[:base_path] = "^(?<base_path>#{location.paths_from_parent}).*$"
-          params = @params
-          location.location("*", extensions: @params[:allowed_extensions]) do
-            @middleware[:static_assets] = params
+          if @params[:allowed_extensions].any? && @params[:auto_index]
+            @params[:allowed_extensions] |= ["html"]
+            @params[:allowed_extensions] |= [""]
           end
+
+          @params[:base_path] = "^(?<base_path>#{location.paths_from_parent.gsub(/\.\*\)$/,")")}).*$"
+          params = @params
+
+          location.middleware[:static_assets] = params
         end
       end
     end

data/gems/server/lib/itsi/server/config/middleware/string_rewrite.md

@@ -13,6 +13,20 @@ The String Rewrite mechanism is used when configuring Itsi for
 
 It allows you to create dynamic strings from a template by combining literal text with placeholders. Placeholders (denoted using curly braces: `{}`) are replaced at runtime with data derived from the HTTP request, response, or context.
 
+Modifiers can be appended after a pipe | to transform the substituted value.
+
+## Modifiers
+
+After a placeholder name, add |<modifier>:<arg> (or for replace, |replace:<from>,<to>). Available modifiers:
+
+`strip_prefix:<text>` If the substituted value starts with <text>, remove that prefix.
+
+`strip_suffix:<text>` If the substituted value ends with <text>, remove that suffix.
+
+`replace:<from>,<to>` Replace all occurrences of <from> in the substituted value with <to>.
+
+Modifiers are applied in the order they appear. You can chain multiple modifiers by repeating the |<modifier>:<arg> syntax (e.g. `{path|strip_prefix:/rails|replace:old,new}`).
+
 ### Rewriting a Request
 
 The following placeholders are supported:

data/gems/server/lib/itsi/server/config/options/include.rb

@@ -3,7 +3,7 @@ module Itsi
     module Config
       class Include < Option
 
-        insert_text "include \"${1|other_file.rb|}\" # Include another file to be loaded within the current configuration"
+        insert_text "include \"${1|other_file|}\" # Include another file to be loaded within the current configuration"
 
         detail "Include another file to be loaded within the current configuration"
 

data/gems/server/lib/itsi/server/rack_interface.rb

@@ -7,7 +7,7 @@ module Itsi
         if app.is_a?(String)
           dir = File.expand_path(File.dirname(app))
           Dir.chdir(dir) do
-            loaded_app = ::Rack::Builder.parse_file(app)
+            loaded_app = ::Rack::Builder.parse_file(File.basename(app))
             app = loaded_app.is_a?(Array) ? loaded_app.first : loaded_app
           end
         end

data/gems/server/lib/itsi/server/route_tester.rb

@@ -4,7 +4,7 @@ module Itsi
     module RouteTester
       require "set"
       require "strscan"
-      require "debug"
+
       def format_mw(mw)
         mw_name, mw_args = mw
         case mw_name

data/gems/server/lib/itsi/server/typed_handlers/param_parser.rb

@@ -143,6 +143,31 @@ module Itsi
         # Fixed keys are converted to symbols, and regex-matched keys remain as strings.
         # The current location in the params is tracked as an array of path segments.
         def apply_schema!(params, schema, path = [])
+          # Support top-level array schema: homogeneous arrays.
+          if schema.is_a?(Array)
+            # Only allow homogeneous array types
+            unless schema.size == 1
+              raise ValidationError.new(["Schema Array must contain exactly one type. Got #{schema.size}"])
+            end
+            expected_type = schema.first
+            # Expect params to be an Array
+            unless params.is_a?(Array)
+              raise ValidationError.new(["Expected Array at #{format_path(path)}, got #{params.class}"])
+            end
+            errors = []
+            params.each_with_index do |_, idx|
+              err = cast_value!(params, idx, expected_type, path + [idx])
+              errors << err if err
+            end
+            raise ValidationError.new(errors) unless errors.empty?
+            return params
+          end
+
+          # Ensure schema is a Hash
+          unless schema.is_a?(Hash)
+            raise ValidationError.new(["Unsupported schema type: #{schema.class} at #{format_path(path)}"])
+          end
+
           errors = []
           processed = processed_schema(schema)
           fixed_schema = processed[0]

data/gems/server/lib/itsi/server/version.rb

@@ -2,6 +2,6 @@
 
 module Itsi
   class Server
-    VERSION = "0.2.3"
+    VERSION = "0.2.4"
   end
 end

data/gems/server/lib/itsi/server.rb

@@ -262,7 +262,7 @@ module Itsi
       end
 
       def routes(cli_params = {})
-        load_route_middleware_stack(cli_params).each do |stack|
+        load_route_middleware_stack(cli_params).first.each do |stack|
           routes = explode_route_pattern(stack["route"].source)
           routes.each do |route|
             print_route(route, stack)

data/gems/server/test/middleware/static_assets.rb

@@ -133,6 +133,7 @@ class TestStaticAssets < Minitest::Test
       end
     end
   end
+
   def test_relative_path_true
     Dir.mktmpdir do |dir|
       # Create file "test.txt" in root_dir.
@@ -141,18 +142,19 @@ class TestStaticAssets < Minitest::Test
       File.write(file_path, "relative true")
       server(
         itsi_rb: lambda do
-          location "foo/bar/baz" do
+          location "foo/bar/baz/*" do
             static_assets \
               root_dir: "#{dir}",
               not_found_behavior: "fallthrough",
               allowed_extensions: ["txt"],
               relative_path: true
 
-            get("/foo/bar/baz/test.txt") { |r| r.ok "fallback" }
+            get("/test.txt") { |r| r.not_found }
           end
         end
       ) do
         res = get_resp("/foo/bar/baz/test.txt")
+
         assert_equal "200", res.code, "Expected 200 OK with relative_path: true"
         assert_equal "relative true", res.body
       end
@@ -169,14 +171,14 @@ class TestStaticAssets < Minitest::Test
       server(
         itsi_rb: lambda do
 
-          location "/foo/bar/baz/" do
+          location "/foo/bar/baz/*" do
             static_assets \
               root_dir: "#{dir}",
               not_found_behavior: "fallthrough",
               allowed_extensions: ["txt"],
               relative_path: false
 
-            get("/foo/bar/baz/test.txt") { |r| r.ok "fallback" }
+            get("/test.txt") { |r| r.ok "fallback" }
           end
         end
       ) do

data/gems/server/test/middleware/string_rewrite.rb

@@ -109,4 +109,58 @@ class TestStringRewrite < Minitest::Test
       assert_equal "https://example.com/{unknown}", res["Location"]
     end
   end
+
+  def test_strip_prefix
+    server(
+      itsi_rb: lambda do
+        redirect to: "https://example.com{path|strip_prefix:/rails}", type: "temporary"
+        get("/rails/foo") { |r| r.ok }
+      end
+    ) do
+      res = get_resp("/rails/foo")
+      assert_equal "307", res.code
+      assert_equal "https://example.com/foo", res["Location"]
+    end
+  end
+
+  def test_strip_suffix
+    server(
+      itsi_rb: lambda do
+        redirect to: "{path_and_query|strip_suffix:.json}", type: "found"
+        get("/data.json") { |r| r.ok }
+      end
+    ) do
+      res = get_resp("/data.json")
+      assert_equal "302", res.code
+      # .json is removed from end of "/data.json"
+      assert_equal "/data", res["Location"]
+    end
+  end
+
+  def test_replace
+    server(
+      itsi_rb: lambda do
+        redirect to: "https://{host|replace:localhost,api.example.com}", type: "permanent"
+        get("/foo") { |r| r.ok }
+      end
+    ) do
+      res = get_resp("/foo")
+      assert_equal "308", res.code
+      assert_equal "https://api.example.com", res["Location"]
+    end
+  end
+
+  def test_chain_modifiers
+    server(
+      itsi_rb: lambda do
+        redirect to: "https://example.com{path|strip_prefix:/v1|replace:api,service}", type: "temporary"
+        get("/v1/api/users") { |r| r.ok }
+      end
+    ) do
+      res = get_resp("/v1/api/users")
+      assert_equal "307", res.code
+      # after strip_prefix: "/api/users", then replace "api"→"service"
+      assert_equal "https://example.com/service/users", res["Location"]
+    end
+  end
 end

data/gems/server/test/middleware/test_log_requests.rb

@@ -18,6 +18,11 @@ class TestLogRequests < Minitest::Test
         get_resp("/foo?bar=baz")
       end
     end
+    server(
+      itsi_rb: lambda do
+        log_level :error
+      end
+    ){}
 
     # should emit something like "[a1b2c3] BEFORE GET /foo?bar=baz"
     assert_match(%r{\[[0-9a-f]+\] BEFORE GET /foo\?bar=baz}, stdout)
@@ -39,10 +44,17 @@ class TestLogRequests < Minitest::Test
       ) do
         get_resp("/foo")
       end
+
+      server(
+        itsi_rb: lambda do
+          log_level :error
+        end
+      ){}
+
     end
 
     # should emit something like "[d4e5f6] AFTER 200 in 1.234ms"
-    assert_match(/\[[0-9a-f]+\] AFTER 200 in \d+\.\d+ms/, stdout)
+    assert_match(/\[[0-9a-f]+\] AFTER 200 in \d+(?:\.\d+)?.?s/, stdout)
   end
 
   # 3. custom log‑level is honored

data/lib/itsi/version.rb

@@ -1,3 +1,3 @@
 module Itsi
-  VERSION = '0.2.3'
+  VERSION = "0.2.4"
 end