itsi 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4fdf40620de562e11312855b28c43e68949030215e42ace8c16bffc96b24d547
-  data.tar.gz: 5536bd92e23fe4613b5e5be195e2cca32b0b91c75cd4cd9b59eb77b6ab61b703
+  metadata.gz: c0f48a4cf96ec2afd196a828cd9b264a019673ce1cb690229c57a4f113f47e52
+  data.tar.gz: 6119bc422b0ec00e7d4d9c52314d725c441e2117275402c838f1ee47166b000a
 SHA512:
-  metadata.gz: cdbad133a03e1c96502e9b4d09a03baa4b057805c24a13dfe695a8361669f61b200a76de8e387848816401e47beb129f13fd43d257f8a5c83bc08d13b1ca01b3
-  data.tar.gz: 55151ec720b352f672624d16d2569ab36d9aee221471639f533067d85d7d825dd0d9a5a5f538676da1ab682abea4278c323616e7509a8b1108c9ea2adb9f61a2
+  metadata.gz: 7d572b3bad1e3156eb2e0c5da02d9ac5b988f37b19d33fdac7f475cd6161563c4d5befaae7d5776fc30e1089fe8f2d025e9557978f618980260e6d1715f2783c
+  data.tar.gz: 3913fb88decca4a0fc83e2c0136056d5eff6b703c498cb0d160c9bf2accadbe50a01c23d6380eb0a87a41e7901f2dbac6cf1050c566f2250a91fc51991a4749d

data/Cargo.lock

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

data/README.md

@@ -4,7 +4,7 @@
 > The Serious Web Server, for Serious People
 
 [![Test](https://github.com/wouterken/itsi/actions/workflows/test.yml/badge.svg)](https://github.com/wouterken/itsi/actions/workflows/test.yml)
-[![Gem Version](https://badge.fury.io/rb/itsi-server.svg?icon=si%3Arubygems)](https://badge.fury.io/rb/itsi-server)
+[![Gem Version](https://img.shields.io/gem/v/itsi)](https://rubygems.org/gems/itsi)
 
 Itsi is a feature-packed, high performance web and application server, with first-class support for Ruby applications.
 It's a compliant Rack server. It’s also a well-equipped reverse proxy, API gateway, and static file server, controlled by an intuitive and elegant configuration API and DSL.

data/Rakefile

@@ -84,11 +84,11 @@ task :build_all do
 end
 
 task :test_env_up do
-  system('terraform -chdir=sandbox/deploy apply')
+  system('terraform -chdir=tmp/sandbox/deploy apply')
 end
 
 task :test_env_down do
-  system('terraform -chdir=sandbox/deploy destroy')
+  system('terraform -chdir=tmp/sandbox/deploy destroy')
 end
 %i[itsi puma iodine falcon unicorn].each do |server|
   namespace server do

data/crates/itsi_scheduler/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "itsi-scheduler"
-version = "0.2.3"
+version = "0.2.4"
 edition = "2021"
 authors = ["Wouter Coppieters <wc@pico.net.nz>"]
 license = "MIT"

data/crates/itsi_server/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "itsi-server"
-version = "0.2.3"
+version = "0.2.4"
 edition = "2021"
 authors = ["Wouter Coppieters <wc@pico.net.nz>"]
 license = "MIT"

data/crates/itsi_server/src/server/middleware_stack/middlewares/compression.rs

@@ -1,5 +1,6 @@
 use crate::{
-    server::http_message_types::HttpResponse, services::itsi_http_service::HttpRequestContext,
+    server::http_message_types::{HttpRequest, HttpResponse},
+    services::itsi_http_service::HttpRequestContext,
 };
 
 use super::{
@@ -13,6 +14,7 @@ use async_compression::{
 };
 use async_trait::async_trait;
 use bytes::{Bytes, BytesMut};
+use either::Either;
 use futures::TryStreamExt;
 use http::{
     header::{GetAll, CONTENT_ENCODING, CONTENT_LENGTH, CONTENT_TYPE},
@@ -20,6 +22,7 @@ use http::{
 };
 use http_body_util::{combinators::BoxBody, BodyExt, Full, StreamBody};
 use hyper::body::{Body, Frame};
+use magnus::error::Result;
 use serde::{Deserialize, Serialize};
 use std::convert::Infallible;
 use tokio::io::{AsyncRead, AsyncReadExt, BufReader};
@@ -151,6 +154,15 @@ fn update_content_encoding(parts: &mut http::response::Parts, new_encoding: Head
 
 #[async_trait]
 impl MiddlewareLayer for Compression {
+    async fn before(
+        &self,
+        req: HttpRequest,
+        context: &mut HttpRequestContext,
+    ) -> Result<Either<HttpRequest, HttpResponse>> {
+        context.set_supported_encoding_set(&req);
+        Ok(Either::Left(req))
+    }
+
     /// We'll apply compression on the response, where appropriate.
     /// This is if:
     /// * The response body is larger than the minimum size.
@@ -207,16 +219,21 @@ impl MiddlewareLayer for Compression {
             }
         }
 
-        let compression_method = match find_first_supported(
-            &context.supported_encoding_set,
-            self.algorithms.iter().map(|algo| algo.as_str()),
-        ) {
-            Some("gzip") => CompressionAlgorithm::Gzip,
-            Some("br") => CompressionAlgorithm::Brotli,
-            Some("deflate") => CompressionAlgorithm::Deflate,
-            Some("zstd") => CompressionAlgorithm::Zstd,
-            _ => CompressionAlgorithm::Identity,
-        };
+        let compression_method =
+            if let Some(supported_encoding_set) = context.supported_encoding_set() {
+                match find_first_supported(
+                    supported_encoding_set,
+                    self.algorithms.iter().map(|algo| algo.as_str()),
+                ) {
+                    Some("gzip") => CompressionAlgorithm::Gzip,
+                    Some("br") => CompressionAlgorithm::Brotli,
+                    Some("deflate") => CompressionAlgorithm::Deflate,
+                    Some("zstd") => CompressionAlgorithm::Zstd,
+                    _ => CompressionAlgorithm::Identity,
+                }
+            } else {
+                CompressionAlgorithm::Identity
+            };
 
         debug!(
             target: "middleware::compress",

data/crates/itsi_server/src/server/middleware_stack/middlewares/log_requests.rs

@@ -62,7 +62,7 @@ impl MiddlewareLayer for LogRequests {
         req: HttpRequest,
         context: &mut HttpRequestContext,
     ) -> Result<Either<HttpRequest, HttpResponse>> {
-        context.track_start_time();
+        context.init_logging_params();
         if let Some(LogConfig { level, format }) = self.before.as_ref() {
             level.log(format.rewrite_request(&req, context));
         }

data/crates/itsi_server/src/server/middleware_stack/middlewares/proxy.rs

@@ -33,7 +33,7 @@ use reqwest::{
     Body, Client, Url,
 };
 use serde::Deserialize;
-use tracing::{debug, info};
+use tracing::debug;
 
 #[derive(Debug, Clone, Deserialize)]
 pub struct Proxy {
@@ -324,7 +324,6 @@ impl MiddlewareLayer for Proxy {
                 .unwrap_or("")
         });
 
-        info!("Extracted host str is {}", host_str);
         let req_info = RequestInfo {
             method: req.method().clone(),
             headers: req_headers.clone(),

data/crates/itsi_server/src/server/middleware_stack/middlewares/static_assets.rs

@@ -12,10 +12,11 @@ use async_trait::async_trait;
 use either::Either;
 use http::{
     header::{IF_MODIFIED_SINCE, RANGE},
-    HeaderMap, Method,
+    HeaderMap, HeaderValue, Method,
 };
 use itsi_error::ItsiError;
 use magnus::error::Result;
+use moka::sync::Cache;
 use regex::Regex;
 use serde::Deserialize;
 use std::{collections::HashMap, path::PathBuf, sync::OnceLock, time::Duration};
@@ -75,6 +76,10 @@ impl MiddlewareLayer for StaticAssets {
                 recheck_interval: Duration::from_secs(self.file_check_interval),
                 serve_hidden_files: self.serve_hidden_files,
                 allowed_extensions: self.allowed_extensions.clone(),
+                miss_cache: Cache::builder()
+                    .max_capacity(self.max_files_in_memory)
+                    .time_to_live(Duration::from_secs(self.file_check_interval))
+                    .build(),
             })?)
             .map_err(ItsiError::new)?;
         Ok(())
@@ -90,6 +95,8 @@ impl MiddlewareLayer for StaticAssets {
             debug!(target: "middleware::static_assets", "Refusing to handle non-GET/HEAD request");
             return Ok(Either::Left(req));
         }
+
+        context.set_supported_encoding_set(&req);
         let abs_path = req.uri().path();
         let rel_path = if !self.relative_path {
             abs_path.trim_start_matches("/")
@@ -123,6 +130,10 @@ impl MiddlewareLayer for StaticAssets {
 
         // Let the file server handle everything
         let file_server = self.file_server.get().unwrap();
+        let encodings: &[HeaderValue] = context
+            .supported_encoding_set()
+            .map(Vec::as_slice)
+            .unwrap_or(&[] as &[HeaderValue]);
         let response = file_server
             .serve(
                 &req,
@@ -131,9 +142,10 @@ impl MiddlewareLayer for StaticAssets {
                 serve_range,
                 if_modified_since,
                 is_head_request,
-                &context.supported_encoding_set,
+                encodings,
             )
             .await;
+
         if response.is_none() {
             Ok(Either::Left(req))
         } else {

data/crates/itsi_server/src/server/middleware_stack/middlewares/string_rewrite.rs

@@ -50,6 +50,35 @@ pub fn parse_template(template: &str) -> Vec<Segment> {
 }
 
 impl StringRewrite {
+    /// Apply a single modifier of the form `op:arg` (or for replace `op:from,to`)
+    #[inline]
+    fn apply_modifier(s: &mut String, mod_str: &str) {
+        if let Some((op, arg)) = mod_str.split_once(':') {
+            match op {
+                "strip_prefix" => {
+                    if s.starts_with(arg) {
+                        let _ = s.drain(..arg.len());
+                    }
+                }
+                "strip_suffix" => {
+                    if s.ends_with(arg) {
+                        let len = s.len();
+                        let start = len.saturating_sub(arg.len());
+                        let _ = s.drain(start..);
+                    }
+                }
+                "replace" => {
+                    if let Some((from, to)) = arg.split_once(',') {
+                        if s.contains(from) {
+                            *s = s.replace(from, to);
+                        }
+                    }
+                }
+                _ => {}
+            }
+        }
+    }
+
     pub fn rewrite_request(&self, req: &HttpRequest, context: &HttpRequestContext) -> String {
         let segments = self
             .segments
@@ -63,9 +92,17 @@ impl StringRewrite {
 
         for segment in segments {
             match segment {
-                Segment::Literal(text) => result.push_str(text),
-                Segment::Placeholder(placeholder) => {
-                    let replacement = match placeholder.as_str() {
+                Segment::Literal(text) => {
+                    result.push_str(text);
+                }
+                Segment::Placeholder(raw) => {
+                    // split into key and optional modifier
+                    let mut parts = raw.split('|');
+                    let key = parts.next().unwrap();
+                    let modifiers = parts; // zero o
+
+                    // 1) lookup the raw replacement
+                    let mut replacement = match key {
                         "request_id" => context.short_request_id(),
                         "request_id_full" => context.request_id(),
                         "method" => req.method().as_str().to_string(),
@@ -76,13 +113,13 @@ impl StringRewrite {
                             .uri()
                             .path_and_query()
                             .map(|pq| pq.to_string())
-                            .unwrap_or("".to_string()),
+                            .unwrap_or_default(),
                         "query" => {
-                            let query = req.uri().query().unwrap_or("").to_string();
-                            if query.is_empty() {
-                                query
+                            let q = req.uri().query().unwrap_or("");
+                            if q.is_empty() {
+                                "".to_string()
                             } else {
-                                format!("?{}", query)
+                                format!("?{}", q)
                             }
                         }
                         "port" => req
@@ -91,31 +128,34 @@ impl StringRewrite {
                             .map(|p| p.to_string())
                             .unwrap_or_else(|| "80".to_string()),
                         "start_time" => {
-                            if let Some(start_time) = context.start_time() {
-                                start_time.format("%Y-%m-%d:%H:%M:%S:%3f").to_string()
+                            if let Some(ts) = context.start_time() {
+                                ts.format("%Y-%m-%d:%H:%M:%S:%3f").to_string()
                             } else {
                                 "N/A".to_string()
                             }
                         }
                         other => {
-                            if let Some(header_val) = req.headers().get(other) {
-                                if let Ok(s) = header_val.to_str() {
-                                    s.to_string()
-                                } else {
-                                    "".to_string()
-                                }
-                            } else if let Some(caps) = &captures {
-                                if let Some(m) = caps.name(other) {
-                                    m.as_str().to_string()
-                                } else {
-                                    // Fallback: leave the placeholder as is.
-                                    format!("{{{}}}", other)
-                                }
-                            } else {
+                            // headers first
+                            if let Some(hv) = req.headers().get(other) {
+                                hv.to_str().unwrap_or("").to_string()
+                            }
+                            // then any regex‐capture
+                            else if let Some(caps) = &captures {
+                                caps.name(other)
+                                    .map(|m| m.as_str().to_string())
+                                    .unwrap_or_else(|| format!("{{{}}}", other))
+                            }
+                            // fallback: leave placeholder intact
+                            else {
                                 format!("{{{}}}", other)
                             }
                         }
                     };
+
+                    for m in modifiers {
+                        Self::apply_modifier(&mut replacement, m);
+                    }
+
                     result.push_str(&replacement);
                 }
             }
@@ -132,37 +172,42 @@ impl StringRewrite {
         let mut result = String::with_capacity(self.template_string.len());
         for segment in segments {
             match segment {
-                Segment::Literal(text) => result.push_str(text),
-                Segment::Placeholder(placeholder) => {
-                    let replacement = match placeholder.as_str() {
+                Segment::Literal(text) => {
+                    result.push_str(text);
+                }
+                Segment::Placeholder(raw) => {
+                    let mut parts = raw.split('|');
+                    let key = parts.next().unwrap();
+                    let modifiers = parts; // zero o
+
+                    let mut replacement = match key {
                         "request_id" => context.short_request_id(),
                         "request_id_full" => context.request_id(),
                         "status" => resp.status().as_str().to_string(),
                         "addr" => context.addr.to_owned(),
                         "response_time" => {
-                            if let Some(response_time) = context.get_response_time() {
-                                if let Some(microseconds) = response_time.num_microseconds() {
-                                    format!("{:.3}ms", microseconds as f64 / 1000.0)
-                                } else {
-                                    format!("{}ms", response_time.num_milliseconds())
-                                }
+                            let dur = context.get_response_time();
+                            let micros = dur.as_micros();
+                            if micros < 1_000 {
+                                format!("{}µs", micros)
                             } else {
-                                "-".to_string()
+                                let ms = dur.as_secs_f64() * 1_000.0;
+                                format!("{:.3}ms", ms)
                             }
                         }
                         other => {
-                            // Try pulling from response headers first
-                            if let Some(val) = resp.headers().get(other) {
-                                if let Ok(s) = val.to_str() {
-                                    s.to_string()
-                                } else {
-                                    "".to_string()
-                                }
+                            if let Some(hv) = resp.headers().get(other) {
+                                hv.to_str().unwrap_or("").to_string()
                             } else {
                                 format!("{{{}}}", other)
                             }
                         }
                     };
+
+                    for m in modifiers {
+                        Self::apply_modifier(&mut replacement, m);
+                    }
+
                     result.push_str(&replacement);
                 }
             }

data/crates/itsi_server/src/services/itsi_http_service.rs

@@ -1,14 +1,15 @@
 use crate::default_responses::{NOT_FOUND_RESPONSE, TIMEOUT_RESPONSE};
 use crate::ruby_types::itsi_server::itsi_server_config::{ItsiServerTokenPreference, ServerParams};
 use crate::server::binds::listener::ListenerInfo;
-use crate::server::http_message_types::{ConversionExt, HttpResponse, RequestExt, ResponseFormat};
+use crate::server::http_message_types::{
+    ConversionExt, HttpRequest, HttpResponse, RequestExt, ResponseFormat,
+};
 use crate::server::lifecycle_event::LifecycleEvent;
 use crate::server::middleware_stack::MiddlewareLayer;
 use crate::server::request_job::RequestJob;
 use crate::server::serve_strategy::single_mode::RunningPhase;
 use crate::server::signal::send_lifecycle_event;
-use chrono;
-use chrono::Local;
+use chrono::{self, DateTime, Local};
 use either::Either;
 use http::header::ACCEPT_ENCODING;
 use http::{HeaderValue, Request};
@@ -18,6 +19,7 @@ use itsi_error::ItsiError;
 use regex::Regex;
 use std::sync::atomic::{AtomicBool, Ordering};
 use std::sync::OnceLock;
+use std::time::{Duration, Instant};
 use tracing::error;
 
 use std::{future::Future, ops::Deref, pin::Pin, sync::Arc};
@@ -68,17 +70,16 @@ impl Deref for RequestContextInner {
 }
 
 pub struct RequestContextInner {
-    pub request_id: u128,
+    pub request_id: u64,
     pub service: ItsiHttpService,
     pub accept: ResponseFormat,
     pub matching_pattern: Option<Arc<Regex>>,
     pub origin: OnceLock<Option<String>>,
     pub response_format: OnceLock<ResponseFormat>,
-    pub start_time: chrono::DateTime<chrono::Utc>,
-    pub request: Option<Arc<Request<Incoming>>>,
-    pub request_start_time: OnceLock<chrono::DateTime<Local>>,
+    pub request_start_time: OnceLock<DateTime<Local>>,
+    pub start_instant: Instant,
     pub if_none_match: OnceLock<Option<String>>,
-    pub supported_encoding_set: Vec<HeaderValue>,
+    pub supported_encoding_set: OnceLock<Vec<HeaderValue>>,
     pub is_ruby_request: Arc<AtomicBool>,
 }
 
@@ -87,27 +88,38 @@ impl HttpRequestContext {
         service: ItsiHttpService,
         matching_pattern: Option<Arc<Regex>>,
         accept: ResponseFormat,
-        supported_encoding_set: Vec<HeaderValue>,
         is_ruby_request: Arc<AtomicBool>,
     ) -> Self {
         HttpRequestContext {
             inner: Arc::new(RequestContextInner {
-                request_id: rand::random::<u128>(),
+                request_id: rand::random::<u64>(),
                 service,
                 matching_pattern,
                 accept,
                 origin: OnceLock::new(),
                 response_format: OnceLock::new(),
-                start_time: chrono::Utc::now(),
-                request: None,
                 request_start_time: OnceLock::new(),
+                start_instant: Instant::now(),
                 if_none_match: OnceLock::new(),
-                supported_encoding_set,
+                supported_encoding_set: OnceLock::new(),
                 is_ruby_request,
             }),
         }
     }
 
+    pub fn set_supported_encoding_set(&self, req: &HttpRequest) {
+        let supported_encoding_set = req
+            .headers()
+            .get_all(ACCEPT_ENCODING)
+            .into_iter()
+            .cloned()
+            .collect::<Vec<_>>();
+        self.inner
+            .supported_encoding_set
+            .set(supported_encoding_set)
+            .unwrap();
+    }
+
     pub fn set_origin(&self, origin: Option<String>) {
         self.inner.origin.set(origin).unwrap();
     }
@@ -121,28 +133,29 @@ impl HttpRequestContext {
     }
 
     pub fn short_request_id(&self) -> String {
-        format!("{:016x}", self.inner.request_id & 0xffff_ffff_ffff_ffff)
+        format!("{:08x}", self.inner.request_id & 0xffff_ffff)
     }
 
     pub fn request_id(&self) -> String {
-        format!("{:016x}", self.inner.request_id)
+        format!("{:08x}", self.inner.request_id)
     }
 
-    pub fn track_start_time(&self) {
+    pub fn init_logging_params(&self) {
         self.inner
             .request_start_time
             .get_or_init(chrono::Local::now);
     }
 
-    pub fn start_time(&self) -> Option<chrono::DateTime<Local>> {
+    pub fn start_instant(&self) -> Instant {
+        self.inner.start_instant
+    }
+
+    pub fn start_time(&self) -> Option<DateTime<Local>> {
         self.inner.request_start_time.get().cloned()
     }
 
-    pub fn get_response_time(&self) -> Option<chrono::TimeDelta> {
-        self.inner
-            .request_start_time
-            .get()
-            .map(|instant| Local::now() - instant)
+    pub fn get_response_time(&self) -> Duration {
+        self.inner.start_instant.elapsed()
     }
 
     pub fn set_response_format(&self, format: ResponseFormat) {
@@ -152,6 +165,10 @@ impl HttpRequestContext {
     pub fn response_format(&self) -> &ResponseFormat {
         self.inner.response_format.get().unwrap()
     }
+
+    pub fn supported_encoding_set(&self) -> Option<&Vec<HeaderValue>> {
+        self.inner.supported_encoding_set.get()
+    }
 }
 
 const SERVER_TOKEN_VERSION: HeaderValue =
@@ -170,12 +187,7 @@ impl Service<Request<Incoming>> for ItsiHttpService {
         let accept: ResponseFormat = req.accept().into();
         let accept_clone = accept.clone();
         let is_single_mode = self.server_params.workers == 1;
-        let supported_encoding_set = req
-            .headers()
-            .get_all(ACCEPT_ENCODING)
-            .into_iter()
-            .cloned()
-            .collect::<Vec<_>>();
+
         let request_timeout = self.server_params.request_timeout;
         let is_ruby_request = Arc::new(AtomicBool::new(false));
         let irr_clone = is_ruby_request.clone();
@@ -187,7 +199,6 @@ impl Service<Request<Incoming>> for ItsiHttpService {
                 self_clone,
                 matching_pattern,
                 accept_clone.clone(),
-                supported_encoding_set,
                 irr_clone,
             );
             let mut depth = 0;
@@ -229,8 +240,8 @@ impl Service<Request<Incoming>> for ItsiHttpService {
             Ok(resp)
         };
 
-        Box::pin(async move {
-            if let Some(timeout_duration) = request_timeout {
+        if let Some(timeout_duration) = request_timeout {
+            Box::pin(async move {
                 match timeout(timeout_duration, service_future).await {
                     Ok(result) => result,
                     Err(_) => {
@@ -249,9 +260,9 @@ impl Service<Request<Incoming>> for ItsiHttpService {
                         Ok(TIMEOUT_RESPONSE.to_http_response(accept).await)
                     }
                 }
-            } else {
-                service_future.await
-            }
-        })
+            })
+        } else {
+            Box::pin(service_future)
+        }
     }
 }