itsi-server 0.2.15 → 0.2.16

data/ext/itsi_server/src/services/rate_limiter.rs

@@ -1,4 +1,5 @@
 use async_trait::async_trait;
+use parking_lot::{Mutex, RwLock};
 use rand::Rng;
 use redis::aio::ConnectionManager;
 use redis::{Client, RedisError, Script};
@@ -6,9 +7,9 @@ use serde::Deserialize;
 use std::any::Any;
 use std::collections::{HashMap, HashSet};
 use std::result::Result;
-use std::sync::{Arc, LazyLock, Mutex};
+use std::sync::{Arc, LazyLock};
 use std::time::{Duration, Instant};
-use tokio::sync::{Mutex as AsyncMutex, RwLock};
+use tokio::sync::Mutex as AsyncMutex;
 use tokio::time::timeout;
 use tracing::warn;
 use url::Url;
@@ -242,10 +243,10 @@ impl InMemoryRateLimiter {
     /// Cleans up expired entries
     async fn cleanup(&self) {
         // Try to get the write lock, but fail open if we can't
-        if let Ok(mut entries) = self.entries.try_write() {
-            let now = Instant::now();
-            entries.retain(|_, entry| entry.expires_at > now);
-        }
+        let now = Instant::now();
+        self.entries
+            .write()
+            .retain(|_, entry| entry.expires_at > now);
     }
 
     /// Bans an IP address for the specified duration
@@ -258,12 +259,7 @@ impl InMemoryRateLimiter {
         let now = Instant::now();
         let ban_key = format!("ban:ip:{}", ip);
 
-        let mut entries = self.entries.try_write().map_err(|e| {
-            tracing::error!("Failed to acquire write lock: {}", e);
-            RateLimitError::LockError
-        })?;
-
-        entries.insert(
+        self.entries.write().insert(
             ban_key,
             RateLimitEntry {
                 count: 1, // Use count=1 to indicate banned
@@ -279,12 +275,7 @@ impl InMemoryRateLimiter {
         let now = Instant::now();
         let ban_key = format!("ban:ip:{}", ip);
 
-        let entries = self.entries.try_read().map_err(|e| {
-            tracing::error!("Failed to acquire read lock: {}", e);
-            RateLimitError::LockError
-        })?;
-
-        if let Some(entry) = entries.get(&ban_key) {
+        if let Some(entry) = self.entries.read().get(&ban_key) {
             if entry.expires_at > now {
                 // IP is banned, return a generic reason since we don't store reasons
                 return Ok(Some("IP address banned".to_string()));
@@ -310,7 +301,7 @@ impl RateLimiter for InMemoryRateLimiter {
 
         let now = Instant::now();
 
-        let mut entries = self.entries.write().await;
+        let mut entries = self.entries.write();
 
         let entry = entries
             .entry(key.to_string())
@@ -436,7 +427,7 @@ impl RateLimiterStore {
     ) -> Result<Arc<RedisRateLimiter>, RateLimitError> {
         // First check if this URL is known to fail
         {
-            let failed_urls = self.failed_urls.lock().unwrap_or_else(|e| e.into_inner());
+            let failed_urls = self.failed_urls.lock();
             if failed_urls.contains(connection_url) {
                 return Err(RateLimitError::ConnectionTimeout);
             }
@@ -444,10 +435,7 @@ impl RateLimiterStore {
 
         // Then check if we already have a limiter for this URL
         {
-            let limiters = self
-                .redis_limiters
-                .lock()
-                .unwrap_or_else(|e| e.into_inner());
+            let limiters = self.redis_limiters.lock();
             if let Some(limiter) = limiters.get(connection_url) {
                 return Ok(limiter.clone());
             }
@@ -455,7 +443,7 @@ impl RateLimiterStore {
 
         // Get a dedicated mutex for this URL or create a new one if it doesn't exist
         let url_mutex = {
-            let mut locks = CONNECTION_LOCKS.lock().unwrap_or_else(|e| e.into_inner());
+            let mut locks = CONNECTION_LOCKS.lock();
 
             // Get or create the mutex for this URL
             locks
@@ -476,10 +464,7 @@ impl RateLimiterStore {
 
         // Check again if another thread created the limiter while we were waiting
         {
-            let limiters = self
-                .redis_limiters
-                .lock()
-                .unwrap_or_else(|e| e.into_inner());
+            let limiters = self.redis_limiters.lock();
             if let Some(limiter) = limiters.get(connection_url) {
                 return Ok(limiter.clone());
             }
@@ -492,10 +477,7 @@ impl RateLimiterStore {
                 let limiter = Arc::new(limiter);
 
                 // Store it for future use
-                let mut limiters = self
-                    .redis_limiters
-                    .lock()
-                    .unwrap_or_else(|e| e.into_inner());
+                let mut limiters = self.redis_limiters.lock();
                 limiters.insert(connection_url.to_string(), limiter.clone());
 
                 Ok(limiter)
@@ -503,7 +485,7 @@ impl RateLimiterStore {
             Err(e) => {
                 tracing::error!("Failed to initialize Redis rate limiter: {}", e);
                 // Cache the failure
-                let mut failed_urls = self.failed_urls.lock().unwrap_or_else(|e| e.into_inner());
+                let mut failed_urls = self.failed_urls.lock();
                 failed_urls.insert(connection_url.to_string());
                 Err(e)
             }

data/ext/itsi_server/src/services/static_file_server.rs

@@ -19,7 +19,7 @@ use http::{
 use http_body_util::{combinators::BoxBody, Full};
 use itsi_error::Result;
 use parking_lot::{Mutex, RwLock};
-use percent_encoding::{percent_decode_str, utf8_percent_encode, NON_ALPHANUMERIC};
+use percent_encoding::percent_decode_str;
 use quick_cache::sync::Cache;
 use serde::Deserialize;
 use serde_json::json;
@@ -175,7 +175,7 @@ impl CacheEntry {
             let mut hasher = Sha256::new();
             hasher.update(&bytes);
             let result = hasher.finalize();
-            general_purpose::STANDARD.encode(result)
+            general_purpose::STANDARD.encode(&result[..16])
         };
         let headers_ct = get_mime_type(&path);
         let headers_etag = format!(r#"W/"{etag}""#).parse().unwrap();
@@ -279,7 +279,7 @@ impl StaticFileServer {
         supported_encodings: &[HeaderValue],
     ) -> Option<HttpResponse> {
         let accept: ResponseFormat = request.accept().into();
-        let resolved = self.resolve(path, abs_path, accept.clone()).await;
+        let resolved = self.resolve(path, abs_path, accept).await;
 
         Some(match resolved {
             Ok(ResolvedAsset {
@@ -1188,7 +1188,6 @@ async fn generate_directory_listing(
 
             // Generate JSON entries for directories.
             for (name, metadata) in dirs {
-                let encoded = utf8_percent_encode(&name, NON_ALPHANUMERIC).to_string();
                 let modified = metadata
                     .modified()
                     .ok()
@@ -1201,7 +1200,7 @@ async fn generate_directory_listing(
 
                 items.push(json!({
                     "name": format!("{}/", name),
-                    "path": format!("{}/", encoded),
+                    "path": format!("{}/", name),
                     "is_dir": true,
                     "size": null,
                     "modified": modified,
@@ -1210,7 +1209,6 @@ async fn generate_directory_listing(
 
             // Generate JSON entries for files.
             for (name, metadata) in files {
-                let encoded = utf8_percent_encode(&name, NON_ALPHANUMERIC).to_string();
                 let file_size = metadata.len();
                 let formatted_size = if file_size < 1024 {
                     format!("{} B", file_size)
@@ -1234,7 +1232,7 @@ async fn generate_directory_listing(
 
                 items.push(json!({
                     "name": name,
-                    "path": encoded,
+                    "path": name,
                     "is_dir": false,
                     "size": formatted_size,
                     "modified": modified_str,
@@ -1341,11 +1339,9 @@ async fn generate_directory_listing(
 
             // Generate rows for directories.
             for (name, metadata) in dirs {
-                let encoded = utf8_percent_encode(&name, NON_ALPHANUMERIC).to_string();
-
                 rows.push_str(&format!(
             r#"<tr><td><a href="{0}/">{1}/</a></td><td class="size">-</td><td class="date">{2}</td></tr>"#,
-            encoded,
+            name,
             name,
             metadata.modified().ok().map(|m| DateTime::<Utc>::from(m).format("%Y-%m-%d %H:%M:%S").to_string())
                 .unwrap_or_else(|| "-".to_string())
@@ -1355,8 +1351,6 @@ async fn generate_directory_listing(
 
             // Generate rows for files.
             for (name, metadata) in files {
-                let encoded = utf8_percent_encode(&name, NON_ALPHANUMERIC).to_string();
-
                 let file_size = metadata.len();
                 let formatted_size = if file_size < 1024 {
                     format!("{} B", file_size)
@@ -1380,7 +1374,7 @@ async fn generate_directory_listing(
 
                 rows.push_str(&format!(
             r#"<tr><td><a href="{0}">{1}</a></td><td class="size">{2}</td><td class="date">{3}</td></tr>"#,
-            encoded, name, formatted_size, modified_str
+            name, name, formatted_size, modified_str
         ));
                 rows.push('\n');
             }

data/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/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/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/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/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/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/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/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/lib/itsi/server/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: itsi-server
 version: !ruby/object:Gem::Version
-  version: 0.2.15
+  version: 0.2.16
 platform: ruby
 authors:
 - Wouter Coppieters
@@ -233,6 +233,7 @@ files:
 - ext/itsi_server/src/server/process_worker.rs
 - ext/itsi_server/src/server/redirect_type.rs
 - ext/itsi_server/src/server/request_job.rs
+- ext/itsi_server/src/server/serve_strategy/acceptor.rs
 - ext/itsi_server/src/server/serve_strategy/cluster_mode.rs
 - ext/itsi_server/src/server/serve_strategy/mod.rs
 - ext/itsi_server/src/server/serve_strategy/single_mode.rs
@@ -501,6 +502,8 @@ files:
 - lib/itsi/server/config/options/ruby_thread_request_backlog_size.rb
 - lib/itsi/server/config/options/scheduler_threads.md
 - lib/itsi/server/config/options/scheduler_threads.rb
+- lib/itsi/server/config/options/send_buffer_size.md
+- lib/itsi/server/config/options/send_buffer_size.rb
 - lib/itsi/server/config/options/shutdown_timeout.md
 - lib/itsi/server/config/options/shutdown_timeout.rb
 - lib/itsi/server/config/options/stream_body.md