itsi-scheduler 0.2.2 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa9ff40e944772c9c72d0f23e65d5f1e87b814e214f0020b75147cde05490366
-  data.tar.gz: e9cc7b428a5058d891410ae7ade7565ade5df3745152efce347656117984eae5
+  metadata.gz: 0c574c681706b2c5e414d9a976c82cc56bc979e5cec2e24f76bd4f4696e84632
+  data.tar.gz: 14857bd2404e1b8cc5d0de66781d553b3c88d74d010b1d4300b7e5ff84e0bd53
 SHA512:
-  metadata.gz: 3cddb59ba844b65295aa1bdfba1ffa1e93472ae317ed031a2cf71e5bdf961dfc90cff9be6607c6d90f6b72b2b81bd2a623cb85617ac04397beb2ef90e7be2b88
-  data.tar.gz: 2b05e8c8056a12b59788139fa8e1e6acd23f32db79db317776aa0afd960825d9063c674b06aea34f56a901c4fade83c39da534a8bb9919933f00254ba02495c3
+  metadata.gz: 9678cef317ffd880ea2d6b7acf46819dca15003fc025b4b971812f14fee2afdd3dff073ae3ada55ebd70a7a11bb05a62e6e7e9d1ff70485fa4f20bf06093a6d0
+  data.tar.gz: 3a433e4c5177d54a00c05d05456ce74b7f4aa2c1bb6261bf9873d63d8b97180a7edc2a121d38642c04642ca3550a863927f9e2ba08c3c4c00aba1dd1837feaf9

data/Cargo.lock

@@ -13,9 +13,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.97"
+version = "1.0.98"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcfed56ad506cb2c684a14971b8861fdc3baaaae314b9e5f9bb532cbe3ba7a4f"
+checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487"
 
 [[package]]
 name = "atty"
@@ -213,7 +213,7 @@ checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
 
 [[package]]
 name = "itsi-scheduler"
-version = "0.2.2"
+version = "0.2.4"
 dependencies = [
  "bytes",
  "derive_more",
@@ -286,9 +286,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
 
 [[package]]
 name = "libc"
-version = "0.2.171"
+version = "0.2.172"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c19937216e9d3aa9956d9bb8dfc0b0c8beb6058fc4f7a4dc4d850edf86a237d6"
+checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa"
 
 [[package]]
 name = "libloading"
@@ -297,7 +297,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34"
 dependencies = [
  "cfg-if",
- "windows-targets",
+ "windows-targets 0.48.5",
 ]
 
 [[package]]
@@ -443,7 +443,7 @@ dependencies = [
  "libc",
  "redox_syscall",
  "smallvec",
- "windows-targets",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -470,9 +470,9 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.94"
+version = "1.0.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a31971752e70b8b2686d7e46ec17fb38dad4051d94024c88df49b667caea9c84"
+checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778"
 dependencies = [
  "unicode-ident",
 ]
@@ -932,7 +932,22 @@ version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
 dependencies = [
- "windows-targets",
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
+dependencies = [
+ "windows_aarch64_gnullvm 0.48.5",
+ "windows_aarch64_msvc 0.48.5",
+ "windows_i686_gnu 0.48.5",
+ "windows_i686_msvc 0.48.5",
+ "windows_x86_64_gnu 0.48.5",
+ "windows_x86_64_gnullvm 0.48.5",
+ "windows_x86_64_msvc 0.48.5",
 ]
 
 [[package]]
@@ -941,28 +956,46 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
 dependencies = [
- "windows_aarch64_gnullvm",
- "windows_aarch64_msvc",
- "windows_i686_gnu",
+ "windows_aarch64_gnullvm 0.52.6",
+ "windows_aarch64_msvc 0.52.6",
+ "windows_i686_gnu 0.52.6",
  "windows_i686_gnullvm",
- "windows_i686_msvc",
- "windows_x86_64_gnu",
- "windows_x86_64_gnullvm",
- "windows_x86_64_msvc",
+ "windows_i686_msvc 0.52.6",
+ "windows_x86_64_gnu 0.52.6",
+ "windows_x86_64_gnullvm 0.52.6",
+ "windows_x86_64_msvc 0.52.6",
 ]
 
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
+
 [[package]]
 name = "windows_aarch64_gnullvm"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
 
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
+
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
 
+[[package]]
+name = "windows_i686_gnu"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
+
 [[package]]
 name = "windows_i686_gnu"
 version = "0.52.6"
@@ -975,24 +1008,48 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
 
+[[package]]
+name = "windows_i686_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
+
 [[package]]
 name = "windows_i686_msvc"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
 
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
+
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
 
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
+
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
 
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
+
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.52.6"

data/ext/itsi_scheduler/Cargo.toml

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

data/ext/itsi_server/Cargo.toml

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

data/ext/itsi_server/src/ruby_types/itsi_server/itsi_server_config.rs

@@ -14,7 +14,7 @@ use magnus::{
     block::Proc,
     error::Result,
     value::{LazyId, ReprValue},
-    RArray, RHash, Ruby, Symbol, Value,
+    RArray, RHash, Ruby, Symbol, TryConvert, Value,
 };
 use nix::{
     fcntl::{fcntl, FcntlArg, FdFlag},
@@ -124,9 +124,17 @@ impl ServerParams {
                 debug!("Loading Itsi Scheduler");
                 ruby.require("itsi/scheduler")?;
             }
-            let routes_raw = self
+            let result_pair = self
                 .middleware_loader
-                .call::<_, Option<Value>>(())
+                .call::<(), RArray>(())
+                .inspect_err(|e| {
+                    eprintln!("Error loading middleware: {:?}", e);
+                    if let Some(err_value) = e.value() {
+                        print_rb_backtrace(err_value);
+                    }
+                })?;
+            let routes_raw = result_pair
+                .entry::<Option<Value>>(0)
                 .inspect_err(|e| {
                     eprintln!("Error loading middleware: {:?}", e);
                     if let Some(err_value) = e.value() {
@@ -134,6 +142,21 @@ impl ServerParams {
                     }
                 })?
                 .map(|mw| mw.into());
+            let error_lines = result_pair.entry::<Option<RArray>>(1).inspect_err(|e| {
+                eprintln!("Error loading middleware: {:?}", e);
+                if let Some(err_value) = e.value() {
+                    print_rb_backtrace(err_value);
+                }
+            })?;
+            if error_lines.is_some_and(|r| !r.is_empty()) {
+                let errors: Vec<String> =
+                    Vec::<String>::try_convert(error_lines.unwrap().as_value())?;
+                ItsiServerConfig::print_config_errors(errors);
+                return Err(magnus::Error::new(
+                    magnus::exception::runtime_error(),
+                    "Failed to set middleware",
+                ));
+            }
             let middleware = MiddlewareSet::new(routes_raw)?;
             self.middleware.set(middleware).map_err(|_| {
                 magnus::Error::new(

data/ext/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/ext/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/ext/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/ext/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/ext/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/ext/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)
+        }
     }
 }

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

@@ -51,6 +51,10 @@ pub static ROOT_STATIC_FILE_SERVER: LazyLock<StaticFileServer> = LazyLock::new(|
         not_found_behavior: NotFoundBehavior::Error(ErrorResponse::not_found()),
         serve_hidden_files: false,
         allowed_extensions: vec!["html".to_string(), "css".to_string(), "js".to_string()],
+        miss_cache: Cache::builder()
+            .max_capacity(1000)
+            .time_to_live(Duration::from_secs(1))
+            .build(),
     })
     .unwrap()
 });
@@ -85,6 +89,7 @@ pub struct StaticFileServerConfig {
     pub headers: Option<HashMap<String, String>>,
     pub serve_hidden_files: bool,
     pub allowed_extensions: Vec<String>,
+    pub miss_cache: Cache<String, NotFoundBehavior>,
 }
 
 #[derive(Debug, Clone)]
@@ -389,6 +394,29 @@ impl StaticFileServer {
         abs_path: &str,
         accept: ResponseFormat,
     ) -> std::result::Result<ResolvedAsset, NotFoundBehavior> {
+        let ext_opt = Path::new(key)
+            .extension()
+            .and_then(|e| e.to_str())
+            .map(|s| s.to_lowercase());
+
+        // If the allowed list is non-empty, enforce membership
+        if !self.allowed_extensions.is_empty() {
+            match ext_opt {
+                Some(ref ext)
+                    if self
+                        .allowed_extensions
+                        .iter()
+                        .any(|ae| ae.eq_ignore_ascii_case(ext)) => {}
+                None if self.config.try_html_extension => {}
+                _ => {
+                    return Err(self.config.not_found_behavior.clone());
+                }
+            }
+        }
+
+        if let Some(cached_nf) = self.miss_cache.get(key) {
+            return Err(cached_nf.clone());
+        }
         // First check if we have a cached mapping for this key
         if let Some(path) = self.key_to_path.lock().await.get(key) {
             // Check if the cached entry is still valid
@@ -449,7 +477,6 @@ impl StaticFileServer {
 
         let mut full_path = self.config.root_dir.clone();
         full_path.push(normalized_path);
-        debug!("Resolving path {:?}", full_path);
         // Check if path exists and is a file
         match tokio::fs::metadata(&full_path).await {
             Ok(metadata) => {
@@ -561,7 +588,6 @@ impl StaticFileServer {
             }
             Err(_) => {
                 // Path doesn't exist, try with .html extension if configured
-                debug!("Path doesn't exist");
                 if self.config.try_html_extension {
                     let mut html_path = full_path.clone();
                     html_path.set_extension("html");
@@ -592,7 +618,9 @@ impl StaticFileServer {
         }
 
         // If we get here, we couldn't resolve the key to a file
-        Err(self.config.not_found_behavior.clone())
+        let nf = self.config.not_found_behavior.clone();
+        self.miss_cache.insert(key.to_string(), nf.clone());
+        Err(nf)
     }
 
     async fn stream_file_range(

data/lib/itsi/scheduler/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: itsi-scheduler
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.4
 platform: ruby
 authors:
 - Wouter Coppieters
@@ -188,8 +188,8 @@ licenses:
 - MIT
 metadata:
   homepage_uri: https://itsi.fyi
-  source_code_uri: https://github.com/wouterken/itsi/scheduler
-  changelog_uri: https://github.com/wouterken/itsi/scheduler/blob/main/CHANGELOG.md
+  source_code_uri: https://github.com/wouterken/itsi
+  changelog_uri: https://github.com/wouterken/itsi/blob/main/CHANGELOG.md
 rdoc_options: []
 require_paths:
 - lib