itsi 0.2.14 → 0.2.16

data/gems/server/itsi-server.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
   spec.summary = "Itsi Server - A light-weight Rack Server implementation for Ruby."
   spec.description = "Itsi Server - A light-weight Rack Server implementation for Ruby"
   spec.homepage = "https://itsi.fyi"
-  spec.license = "MIT"
+  spec.license = "LGPL-3.0"
   spec.required_ruby_version = ">= 2.7.0"
   spec.required_rubygems_version = ">= 3.1"
 
@@ -36,10 +36,10 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.extensions = ["ext/itsi_server/extconf.rb"]
 
+  spec.add_dependency "json", "~> 2"
+  spec.add_dependency 'prism', '~> 1.4'
   spec.add_dependency "rack", ">= 1.6"
-  spec.add_dependency "json", '~> 2'
   spec.add_dependency "rb_sys", "~> 0.9.91"
-  spec.add_dependency 'prism', '~> 1.4'
 
   spec.add_development_dependency "ruby-lsp"
   # For more information and examples about making a new gem, check out our

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

@@ -97,14 +97,13 @@ module Itsi
           if !self.class.ancestors.include?(Middleware) && !location.parent.nil?
             raise "#{opt_name} must be set at the top level"
           end
-
           @location = location
           @params = case schema
                     when TypedStruct::Validation
                       schema.validate!(params)
                     when Array
                       default, validation = schema
-                      params ? validation.validate!(params) : default
+                      !params.nil? ? validation.validate!(params) : default
                     when nil
                       nil
                     else

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

@@ -13,8 +13,7 @@ ETags are useful for optimizing client-side caching, conditional GETs, and reduc
 etag \
   type: "strong",
   algorithm: "sha256",
-  min_body_size: 0,
-  handle_if_none_match: true
+  min_body_size: 0
 ```
 
 ## ETag Applied to a sub-location
@@ -23,8 +22,7 @@ location "/assets" do
   etag \
     type: "weak",
     algorithm: "md5",
-    min_body_size: 1024,
-    handle_if_none_match: true
+    min_body_size: 1024
 end
 ```
 
@@ -40,12 +38,10 @@ end
 
 - **min_body_size**: Minimum response body size (in bytes) required before an ETag is generated. Use this to skip ETags for small or trivial responses.
 
-- **handle_if_none_match**: When `true`, incoming requests with a matching `If-None-Match` header will receive a `304 Not Modified` response (instead of a full body), if the ETag matches the computed value.
-
 ## How It Works
 
 ### Before the Response
-If `handle_if_none_match` is enabled and the request includes an `If-None-Match` header, the value is stored in the request context for comparison later.
+If  the request includes an `If-None-Match` header, the value is stored in the request context for comparison later.
 
 ### After the Response
 

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

@@ -7,8 +7,7 @@ module Itsi
         etag \\
           type: ${1|"strong","weak"|},
           algorithm: ${2|"sha256","md5"|},
-          min_body_size: ${3|0,1024|},
-          handle_if_none_match: ${4|true,false|}
+          min_body_size: ${3|0,1024|}
         SNIPPET
 
         detail "Enables ETag generation for the server."
@@ -17,8 +16,7 @@ module Itsi
           {
             type: (Enum(["strong", "weak"]) & Required()).default("strong"),
             algorithm: (Enum(["sha256", "md5"]) & Required()).default("sha256"),
-            min_body_size: Range(0...1024 ** 3).default(0),
-            handle_if_none_match: Bool().default(true)
+            min_body_size: Range(0...1024 ** 3).default(0)
           }
         end
       end

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

@@ -4,7 +4,7 @@ module Itsi
       class ListenBacklog < Option
 
         insert_text <<~SNIPPET
-        listen_backlog ${1|262_144,1_048_576|}
+        listen_backlog ${1|1024,2048,4096|}
         SNIPPET
 
         detail "Specifies the size of the listen backlog for the socket. Larger backlog sizes can improve performance for high-throughput applications by allowing more pending connections to queue, but may increase memory usage. The default value is 1024."

data/gems/server/lib/itsi/server/config/options/send_buffer_size.md

@@ -0,0 +1,15 @@
+---
+title: Send Buffer Size
+url: /options/send_buffer_size
+---
+
+Configures the size of the send buffer for the socket. Larger buffer sizes can improve performance for high-throughput applications but may increase memory usage. The default value is 262,144 bytes.
+
+## Configuration
+```ruby {filename=Itsi.rb}
+send_buffer_size 262_144
+```
+
+```ruby {filename=Itsi.rb}
+send_buffer_size 1_048_576
+```

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

@@ -0,0 +1,19 @@
+module Itsi
+  class Server
+    module Config
+      class SendBufferSize < Option
+
+        insert_text <<~SNIPPET
+        send_buffer_size ${1|262_144,1_048_576|}
+        SNIPPET
+
+        detail "Specifies the size of the send buffer for the socket. Larger buffer sizes can improve performance for high-throughput applications but may increase memory usage. The default value is 262,144 bytes."
+
+        schema do
+          (Type(Integer) & Range(1..Float::INFINITY) & Required()).default(262_144)
+        end
+
+      end
+    end
+  end
+end

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

@@ -41,29 +41,28 @@ module Itsi
             DSL.evaluate(&builder_proc)
           elsif args[:static]
             DSL.evaluate do
-              location "*" do
-                rate_limit key: "address", store_config: "in_memory", requests: 2, seconds: 5
-                etag type: "strong", algorithm: "md5", min_body_size: 1024 * 1024
-                compress min_size: 1024 * 1024, level: "fastest", algorithms: %w[zstd gzip br deflate],
-                         mime_types: %w[all], compress_streams: true
-                log_requests before: { level: "INFO", format: "[{request_id}] {method} {path_and_query} - {addr} " },
-                             after: { level: "INFO",
-                                      format: "[{request_id}] └─ {status} in {response_time}" }
-                static_assets \
-                  relative_path: true,
-                  allowed_extensions: [],
-                  root_dir: ".",
-                  not_found_behavior: { error: "not_found" },
-                  auto_index: true,
-                  try_html_extension: true,
-                  max_file_size_in_memory: 1024 * 1024, # 1MB
-                  max_files_in_memory: 1000,
-                  file_check_interval: 1,
-                  serve_hidden_files: false,
-                  headers: {
-                    "X-Content-Type-Options" => "nosniff"
-                  }
-              end
+              rate_limit key: "address", store_config: "in_memory", requests: 5, seconds: 10
+              etag type: "strong", algorithm: "md5", min_body_size: 1024 * 1024
+              compress min_size: 1024 * 1024, level: "fastest", algorithms: %w[zstd gzip br deflate],
+                        mime_types: %w[all], compress_streams: true
+              log_requests before: { level: "DEBUG", format: "[{request_id}] {method} {path_and_query} - {addr} " },
+                            after: { level: "DEBUG",
+                                    format: "[{request_id}] └─ {status} in {response_time}" }
+              nodelay false
+              static_assets \
+                relative_path: true,
+                allowed_extensions: [],
+                root_dir: ".",
+                not_found_behavior: { error: "not_found" },
+                auto_index: true,
+                try_html_extension: true,
+                max_file_size_in_memory: 1024 * 1024, # 1MB
+                max_files_in_memory: 1000,
+                file_check_interval: 1,
+                serve_hidden_files: false,
+                headers: {
+                  "X-Content-Type-Options" => "nosniff"
+                }
             end
           elsif File.exist?(config_file_path.to_s)
             DSL.evaluate(config_file_path)
@@ -106,7 +105,6 @@ module Itsi
           Server.write_pid
         end
 
-
         srv_config = {
           workers: args.fetch(:workers) { itsifile_config.fetch(:workers, 1) },
           worker_memory_limit: args.fetch(:worker_memory_limit) { itsifile_config.fetch(:worker_memory_limit, nil) },
@@ -148,7 +146,8 @@ module Itsi
           reuse_port: itsifile_config.fetch(:reuse_port, true),
           listen_backlog: itsifile_config.fetch(:listen_backlog, 1024),
           nodelay: itsifile_config.fetch(:nodelay, true),
-          recv_buffer_size: itsifile_config.fetch(:recv_buffer_size, 262_144)
+          recv_buffer_size: itsifile_config.fetch(:recv_buffer_size, 262_144),
+          send_buffer_size: itsifile_config.fetch(:send_buffer_size, 262_144)
         }.transform_keys(&:to_s)
 
         [srv_config, errors_to_error_lines(errors)]

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

@@ -23,7 +23,7 @@ module Itsi
         when "cors"
           "\e[33mcors\e[0m(#{mw_args["allow_origins"].join(" ")}, #{mw_args["allow_methods"].join(" ")})"
         when "etag"
-          "\e[33metag\e[0m(#{mw_args["type"]}/#{mw_args["algorithm"]}, #{mw_args["handle_if_none_match"] ? "if_none_match" : ""})"
+          "\e[33metag\e[0m(#{mw_args["type"]}/#{mw_args["algorithm"]})"
         when "cache_control"
           "\e[33mcache_control\e[0m(max_age: #{mw_args["max_age"]}, #{mw_args.select do |_, v|
             v == true

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

@@ -2,6 +2,6 @@
 
 module Itsi
   class Server
-    VERSION = "0.2.14"
+    VERSION = "0.2.16"
   end
 end

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

@@ -4,7 +4,7 @@ class TestETag < Minitest::Test
   def test_strong_etag_added
     server(
       itsi_rb: lambda do
-        etag type: "strong", algorithm: "sha256", min_body_size: 0, handle_if_none_match: false
+        etag type: "strong", algorithm: "sha256", min_body_size: 0
         get("/foo") { |r| r.ok "etag-body" }
       end
     ) do
@@ -17,7 +17,7 @@ class TestETag < Minitest::Test
   def test_weak_etag_added_with_md5
     server(
       itsi_rb: lambda do
-        etag type: "weak", algorithm: "md5", min_body_size: 0, handle_if_none_match: false
+        etag type: "weak", algorithm: "md5", min_body_size: 0
         get("/foo") { |r| r.ok "etag-weak-md5" }
       end
     ) do
@@ -42,7 +42,7 @@ class TestETag < Minitest::Test
     body = "etag-content"
     server(
       itsi_rb: lambda do
-        etag type: "strong", min_body_size: 0, handle_if_none_match: true
+        etag type: "strong", min_body_size: 0
         get("/foo") { |r| r.ok body }
       end
     ) do

data/gems/server/test/options/ruby_thread_request_backlog_size.rb

@@ -10,11 +10,10 @@ class TestRubyThreadRequestBacklogSize < Minitest::Test
         ruby_thread_request_backlog_size 1
         get("/foo"){|r| sleep 0.1; r.ok "ok" }
       end) do
-      responses = 3.times.map{ Thread.new{ get_resp("/foo") } }.map(&:value)
+      responses = 10.times.map{ Thread.new{ get_resp("/foo") } }.map(&:value)
 
-      assert_equal "ok", responses.first.body
-      assert_equal "200", responses.first.code
-      assert_equal "503", responses.last.code
+      assert responses.map(&:code).include?("200")
+      assert responses.map(&:code).include?("503")
     end
   end
 

data/lib/itsi/version.rb

@@ -1,3 +1,3 @@
 module Itsi
-  VERSION = '0.2.14'
+  VERSION = '0.2.16'
 end

data/tasks.txt

@@ -1,16 +1,17 @@
-- Add tests for script name and request backlog size, Add tests for scheduler.
-- Respond on Reddit
-- Min rust version
+- Test CRB without main
+- Try and compile new Itsi with jemalloc on Linux
+- ACME HTTP-01 challenge
+- Add way to opt non Itsi.rb files into LSP
+- Fat binary gems
+- First class Rackless Websockets
 
 Tasks:
-- Add way to opt non Itsi.rb files into LSP
-- Better parallelization a lá Iodine
 - Static ruby build
 - OTel
+- Even faster Hash creation for Rack
 - Image resizer
-- First class Rackless Websockets
 - Print out warning if we can detect that a location block will never be hit.
-- Built in Obs Dashboard + Stats
+- Built in obs Dashboard + Stats
 - WASM pluggable middleware
 - Support UDP Proxy
 - Support Unix Socket Proxy

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: itsi
 version: !ruby/object:Gem::Version
-  version: 0.2.14
+  version: 0.2.16
 platform: ruby
 authors:
 - Wouter Coppieters
@@ -15,28 +15,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.14
+        version: 0.2.16
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.14
+        version: 0.2.16
 - !ruby/object:Gem::Dependency
   name: itsi-server
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.14
+        version: 0.2.16
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.14
+        version: 0.2.16
 description: Wrapper Gem for both the Itsi server and the Itsi Fiber scheduler
 email:
 - wc@pico.net.nz
@@ -171,6 +171,7 @@ files:
 - crates/itsi_server/src/server/process_worker.rs
 - crates/itsi_server/src/server/redirect_type.rs
 - crates/itsi_server/src/server/request_job.rs
+- crates/itsi_server/src/server/serve_strategy/acceptor.rs
 - crates/itsi_server/src/server/serve_strategy/cluster_mode.rs
 - crates/itsi_server/src/server/serve_strategy/mod.rs
 - crates/itsi_server/src/server/serve_strategy/single_mode.rs
@@ -949,6 +950,8 @@ files:
 - gems/server/lib/itsi/server/config/options/ruby_thread_request_backlog_size.rb
 - gems/server/lib/itsi/server/config/options/scheduler_threads.md
 - gems/server/lib/itsi/server/config/options/scheduler_threads.rb
+- gems/server/lib/itsi/server/config/options/send_buffer_size.md
+- gems/server/lib/itsi/server/config/options/send_buffer_size.rb
 - gems/server/lib/itsi/server/config/options/shutdown_timeout.md
 - gems/server/lib/itsi/server/config/options/shutdown_timeout.rb
 - gems/server/lib/itsi/server/config/options/stream_body.md
@@ -1027,7 +1030,7 @@ files:
 - tasks.txt
 homepage: https://itsi.fyi
 licenses:
-- MIT
+- LGPL-3.0
 metadata:
   homepage_uri: https://itsi.fyi
   source_code_uri: https://github.com/wouterken/itsi