itsi 0.1.14 → 0.1.19

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: itsi
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.19
 platform: ruby
 authors:
 - Wouter Coppieters
 bindir: exe
 cert_chain: []
-date: 2025-03-29 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: itsi-scheduler
@@ -15,28 +15,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.14
+        version: 0.1.19
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.14
+        version: 0.1.19
 - !ruby/object:Gem::Dependency
   name: itsi-server
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.14
+        version: 0.1.19
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.14
+        version: 0.1.19
 description: Wrapper Gem for both the Itsi server and the Itsi Fiber scheduler
 email:
 - wc@pico.net.nz
@@ -46,13 +46,11 @@ extra_rdoc_files: []
 files:
 - Cargo.lock
 - Cargo.toml
-- Itsi.rb
 - README.md
 - Rakefile
 - crates/_index.md
 - crates/itsi_error/Cargo.lock
 - crates/itsi_error/Cargo.toml
-- crates/itsi_error/src/from.rs
 - crates/itsi_error/src/lib.rs
 - crates/itsi_instrument_entry/Cargo.toml
 - crates/itsi_instrument_entry/src/lib.rs
@@ -70,27 +68,50 @@ files:
 - crates/itsi_server/Cargo.lock
 - crates/itsi_server/Cargo.toml
 - crates/itsi_server/extconf.rb
+- crates/itsi_server/src/default_responses/html/401.html
+- crates/itsi_server/src/default_responses/html/403.html
+- crates/itsi_server/src/default_responses/html/404.html
+- crates/itsi_server/src/default_responses/html/413.html
+- crates/itsi_server/src/default_responses/html/429.html
+- crates/itsi_server/src/default_responses/html/500.html
+- crates/itsi_server/src/default_responses/html/502.html
+- crates/itsi_server/src/default_responses/html/503.html
+- crates/itsi_server/src/default_responses/html/504.html
+- crates/itsi_server/src/default_responses/html/index.html
+- crates/itsi_server/src/default_responses/json/401.json
+- crates/itsi_server/src/default_responses/json/403.json
+- crates/itsi_server/src/default_responses/json/404.json
+- crates/itsi_server/src/default_responses/json/413.json
+- crates/itsi_server/src/default_responses/json/429.json
+- crates/itsi_server/src/default_responses/json/500.json
+- crates/itsi_server/src/default_responses/json/502.json
+- crates/itsi_server/src/default_responses/json/503.json
+- crates/itsi_server/src/default_responses/json/504.json
+- crates/itsi_server/src/default_responses/mod.rs
 - crates/itsi_server/src/env.rs
 - crates/itsi_server/src/lib.rs
+- crates/itsi_server/src/prelude.rs
+- crates/itsi_server/src/ruby_types/README.md
 - crates/itsi_server/src/ruby_types/itsi_body_proxy/big_bytes.rs
 - crates/itsi_server/src/ruby_types/itsi_body_proxy/mod.rs
-- crates/itsi_server/src/ruby_types/itsi_grpc_request.rs
-- crates/itsi_server/src/ruby_types/itsi_grpc_response.rs
-- crates/itsi_server/src/ruby_types/itsi_grpc_stream/mod.rs
+- crates/itsi_server/src/ruby_types/itsi_grpc_call.rs
+- crates/itsi_server/src/ruby_types/itsi_grpc_response_stream/mod.rs
 - crates/itsi_server/src/ruby_types/itsi_http_request.rs
 - crates/itsi_server/src/ruby_types/itsi_http_response.rs
 - crates/itsi_server/src/ruby_types/itsi_server.rs
 - crates/itsi_server/src/ruby_types/itsi_server/file_watcher.rs
 - crates/itsi_server/src/ruby_types/itsi_server/itsi_server_config.rs
 - crates/itsi_server/src/ruby_types/mod.rs
-- crates/itsi_server/src/server/bind.rs
-- crates/itsi_server/src/server/bind_protocol.rs
+- crates/itsi_server/src/server/binds/bind.rs
+- crates/itsi_server/src/server/binds/bind_protocol.rs
+- crates/itsi_server/src/server/binds/listener.rs
+- crates/itsi_server/src/server/binds/mod.rs
+- crates/itsi_server/src/server/binds/tls.rs
+- crates/itsi_server/src/server/binds/tls/locked_dir_cache.rs
 - crates/itsi_server/src/server/byte_frame.rs
-- crates/itsi_server/src/server/cache_store.rs
+- crates/itsi_server/src/server/http_message_types.rs
 - crates/itsi_server/src/server/io_stream.rs
-- crates/itsi_server/src/server/itsi_service.rs
 - crates/itsi_server/src/server/lifecycle_event.rs
-- crates/itsi_server/src/server/listener.rs
 - crates/itsi_server/src/server/middleware_stack/middleware.rs
 - crates/itsi_server/src/server/middleware_stack/middlewares/allow_list.rs
 - crates/itsi_server/src/server/middleware_stack/middlewares/auth_api_key.rs
@@ -101,11 +122,12 @@ files:
 - crates/itsi_server/src/server/middleware_stack/middlewares/cors.rs
 - crates/itsi_server/src/server/middleware_stack/middlewares/deny_list.rs
 - crates/itsi_server/src/server/middleware_stack/middlewares/error_response.rs
+- crates/itsi_server/src/server/middleware_stack/middlewares/error_response/default_responses.rs
 - crates/itsi_server/src/server/middleware_stack/middlewares/etag.rs
-- crates/itsi_server/src/server/middleware_stack/middlewares/grpc_service.rs
 - crates/itsi_server/src/server/middleware_stack/middlewares/header_interpretation.rs
 - crates/itsi_server/src/server/middleware_stack/middlewares/intrusion_protection.rs
 - crates/itsi_server/src/server/middleware_stack/middlewares/log_requests.rs
+- crates/itsi_server/src/server/middleware_stack/middlewares/max_body.rs
 - crates/itsi_server/src/server/middleware_stack/middlewares/mod.rs
 - crates/itsi_server/src/server/middleware_stack/middlewares/proxy.rs
 - crates/itsi_server/src/server/middleware_stack/middlewares/rate_limit.rs
@@ -114,22 +136,26 @@ files:
 - crates/itsi_server/src/server/middleware_stack/middlewares/response_headers.rs
 - crates/itsi_server/src/server/middleware_stack/middlewares/ruby_app.rs
 - crates/itsi_server/src/server/middleware_stack/middlewares/static_assets.rs
+- crates/itsi_server/src/server/middleware_stack/middlewares/static_response.rs
 - crates/itsi_server/src/server/middleware_stack/middlewares/string_rewrite.rs
 - crates/itsi_server/src/server/middleware_stack/middlewares/token_source.rs
 - crates/itsi_server/src/server/middleware_stack/mod.rs
 - crates/itsi_server/src/server/mod.rs
 - crates/itsi_server/src/server/process_worker.rs
-- crates/itsi_server/src/server/rate_limiter.rs
 - crates/itsi_server/src/server/request_job.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
 - crates/itsi_server/src/server/signal.rs
-- crates/itsi_server/src/server/static_file_server.rs
+- crates/itsi_server/src/server/size_limited_incoming.rs
 - crates/itsi_server/src/server/thread_worker.rs
-- crates/itsi_server/src/server/tls.rs
-- crates/itsi_server/src/server/tls/locked_dir_cache.rs
-- crates/itsi_server/src/server/types.rs
+- crates/itsi_server/src/services/cache_store.rs
+- crates/itsi_server/src/services/itsi_http_service.rs
+- crates/itsi_server/src/services/mime_types.rs
+- crates/itsi_server/src/services/mod.rs
+- crates/itsi_server/src/services/password_hasher.rs
+- crates/itsi_server/src/services/rate_limiter.rs
+- crates/itsi_server/src/services/static_file_server.rs
 - crates/itsi_server/test.md
 - crates/itsi_tracing/Cargo.lock
 - crates/itsi_tracing/Cargo.toml
@@ -147,6 +173,7 @@ files:
 - docs/go.sum
 - docs/hugo.yaml
 - examples/static_assets_example.rb
+- foo/Itsi.rb
 - gems/_index.md
 - gems/scheduler/.gitignore
 - gems/scheduler/.rubocop.yml
@@ -189,26 +216,39 @@ files:
 - gems/server/exe/itsi
 - gems/server/itsi-server.gemspec
 - gems/server/lib/itsi/http_request.rb
+- gems/server/lib/itsi/http_request/response_status_shortcodes.rb
 - gems/server/lib/itsi/http_response.rb
+- gems/server/lib/itsi/passfile.rb
 - gems/server/lib/itsi/server.rb
-- gems/server/lib/itsi/server/Itsi.rb
 - gems/server/lib/itsi/server/config.rb
 - gems/server/lib/itsi/server/config/dsl.rb
 - gems/server/lib/itsi/server/default_app/default_app.rb
 - gems/server/lib/itsi/server/default_app/index.html
-- gems/server/lib/itsi/server/grpc_interface.rb
+- gems/server/lib/itsi/server/default_config/Itsi-rackup.rb
+- gems/server/lib/itsi/server/default_config/Itsi.rb
+- gems/server/lib/itsi/server/grpc/grpc_call.rb
+- gems/server/lib/itsi/server/grpc/grpc_interface.rb
+- gems/server/lib/itsi/server/grpc/reflection/v1/reflection_pb.rb
+- gems/server/lib/itsi/server/grpc/reflection/v1/reflection_services_pb.rb
 - gems/server/lib/itsi/server/rack/handler/itsi.rb
 - gems/server/lib/itsi/server/rack_interface.rb
+- gems/server/lib/itsi/server/route_tester.rb
 - gems/server/lib/itsi/server/scheduler_interface.rb
 - gems/server/lib/itsi/server/scheduler_mode.rb
 - gems/server/lib/itsi/server/signal_trap.rb
+- gems/server/lib/itsi/server/typed_handlers.rb
+- gems/server/lib/itsi/server/typed_handlers/param_parser.rb
+- gems/server/lib/itsi/server/typed_handlers/source_parser.rb
 - gems/server/lib/itsi/server/version.rb
 - gems/server/lib/itsi/standard_headers.rb
+- gems/server/lib/ruby_lsp/itsi/addon.rb
+- gems/server/lib/shell_completions/completions.rb
 - gems/server/sig/itsi_server.rbs
 - gems/server/test/helpers/test_helper.rb
 - gems/server/test/test_itsi_server.rb
 - lib/itsi.rb
 - lib/itsi/version.rb
+- sandbox/README.md
 - sandbox/deploy/main.tf
 - sandbox/deploy/outputs.tf
 - sandbox/deploy/vars.tf
@@ -218,10 +258,25 @@ files:
 - sandbox/itsi_file/Gemfile
 - sandbox/itsi_file/Gemfile.lock
 - sandbox/itsi_file/Itsi.rb
+- sandbox/itsi_file/call.json
+- sandbox/itsi_file/echo_client/Gemfile
+- sandbox/itsi_file/echo_client/Gemfile.lock
+- sandbox/itsi_file/echo_client/README.md
+- sandbox/itsi_file/echo_client/echo_client.rb
+- sandbox/itsi_file/echo_client/gen_proto.sh
+- sandbox/itsi_file/echo_client/lib/echo_pb.rb
+- sandbox/itsi_file/echo_client/lib/echo_services_pb.rb
+- sandbox/itsi_file/echo_client/run_client.rb
+- sandbox/itsi_file/echo_client/test_compressions.sh
+- sandbox/itsi_file/echo_service_nonitsi/Gemfile
+- sandbox/itsi_file/echo_service_nonitsi/Gemfile.lock
+- sandbox/itsi_file/echo_service_nonitsi/echo.proto
+- sandbox/itsi_file/echo_service_nonitsi/echo_pb.rb
+- sandbox/itsi_file/echo_service_nonitsi/echo_services_pb.rb
+- sandbox/itsi_file/echo_service_nonitsi/server.rb
 - sandbox/itsi_file/error.html
 - sandbox/itsi_file/organisations_controller.rb
 - sandbox/itsi_file/public/assets/image.png
-- sandbox/itsi_file/public/assets/index.html
 - sandbox/itsi_sandbox_async/Gemfile
 - sandbox/itsi_sandbox_async/Gemfile.lock
 - sandbox/itsi_sandbox_async/config.ru
@@ -378,6 +433,12 @@ files:
 - sandbox/itsi_sinatra/Gemfile.lock
 - sandbox/itsi_sinatra/app.rb
 - sandbox/pebble/docker-compose.yml
+- sandbox/static_files/.env
+- sandbox/static_files/404.html
+- sandbox/static_files/_DSC0102.NEF.jpg
+- sandbox/static_files/about.html
+- sandbox/static_files/tiny.html
+- sandbox/static_files/writebook.zip
 - tasks.txt
 homepage: https://itsi.fyi
 licenses:
@@ -400,7 +461,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '3.2'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Wrapper Gem for both the Itsi server and the Itsi Fiber scheduler
 test_files: []

data/crates/itsi_error/src/from.rs

@@ -1,68 +0,0 @@
-use magnus::{
-    Error,
-    error::ErrorType,
-    exception::{self, arg_error, exception},
-};
-use nix::errno::Errno;
-
-use crate::ItsiError;
-use std::{ffi::NulError, io};
-
-pub static CLIENT_CONNECTION_CLOSED: &str = "Client disconnected";
-
-impl From<httparse::Error> for ItsiError {
-    fn from(err: httparse::Error) -> Self {
-        ItsiError::ArgumentError(err.to_string())
-    }
-}
-
-impl From<Errno> for ItsiError {
-    fn from(err: Errno) -> Self {
-        ItsiError::ArgumentError(err.to_string())
-    }
-}
-
-impl From<io::Error> for ItsiError {
-    fn from(err: io::Error) -> Self {
-        ItsiError::ArgumentError(err.to_string())
-    }
-}
-
-impl From<rcgen::Error> for ItsiError {
-    fn from(err: rcgen::Error) -> Self {
-        ItsiError::ArgumentError(err.to_string())
-    }
-}
-
-impl From<NulError> for ItsiError {
-    fn from(err: NulError) -> Self {
-        ItsiError::ArgumentError(err.to_string())
-    }
-}
-
-impl From<Error> for ItsiError {
-    fn from(err: Error) -> Self {
-        match err.error_type() {
-            ErrorType::Jump(tag) => ItsiError::Jump(tag.to_string()),
-            ErrorType::Error(_exception_class, cow) => ItsiError::ArgumentError(cow.to_string()),
-            ErrorType::Exception(exception) => ItsiError::ArgumentError(exception.to_string()),
-        }
-    }
-}
-
-impl From<ItsiError> for Error {
-    fn from(err: ItsiError) -> Self {
-        match err {
-            ItsiError::InvalidInput(msg) => Error::new(arg_error(), msg),
-            ItsiError::InternalServerError(msg) => Error::new(exception(), msg),
-            ItsiError::UnsupportedProtocol(msg) => Error::new(arg_error(), msg),
-            ItsiError::ArgumentError(msg) => Error::new(arg_error(), msg),
-            ItsiError::Jump(msg) => Error::new(exception::local_jump_error(), msg),
-            ItsiError::Break() => Error::new(exception::interrupt(), "Break"),
-            ItsiError::ClientConnectionClosed => {
-                Error::new(exception::eof_error(), CLIENT_CONNECTION_CLOSED)
-            }
-            ItsiError::Pass() => Error::new(exception::interrupt(), "Pass"),
-        }
-    }
-}

data/crates/itsi_server/src/ruby_types/itsi_grpc_request.rs

@@ -1,147 +0,0 @@
-use derive_more::Debug;
-use http::{request::Parts, Response, StatusCode};
-use http_body_util::{combinators::BoxBody, BodyExt, Empty};
-use itsi_error::from::CLIENT_CONNECTION_CLOSED;
-use itsi_rb_helpers::{print_rb_backtrace, HeapValue};
-use itsi_tracing::debug;
-use magnus::{
-    block::Proc,
-    error::{ErrorType, Result as MagnusResult},
-    Error,
-};
-use magnus::{
-    value::{LazyId, ReprValue},
-    Ruby, Value,
-};
-use std::{sync::Arc, time::Instant};
-use tokio::sync::mpsc::{self};
-use tracing::error;
-
-use super::itsi_grpc_stream::ItsiGrpcStream;
-use crate::server::{
-    byte_frame::ByteFrame,
-    itsi_service::RequestContext,
-    request_job::RequestJob,
-    types::{HttpRequest, HttpResponse},
-};
-
-static ID_MESSAGE: LazyId = LazyId::new("message");
-
-#[derive(Debug)]
-#[magnus::wrap(class = "Itsi::GrpcRequest", free_immediately, size)]
-pub struct ItsiGrpcRequest {
-    pub parts: Parts,
-    pub start: Instant,
-    #[debug(skip)]
-    pub context: RequestContext,
-    #[debug(skip)]
-    pub stream: ItsiGrpcStream,
-}
-
-impl ItsiGrpcRequest {
-    pub fn service_name(&self) -> MagnusResult<String> {
-        let path = self.parts.uri.path();
-        Ok(path.split('/').nth_back(1).unwrap().to_string())
-    }
-
-    pub fn method_name(&self) -> MagnusResult<String> {
-        let path = self.parts.uri.path();
-        Ok(path.split('/').nth_back(0).unwrap().to_string())
-    }
-
-    pub fn stream(&self) -> MagnusResult<ItsiGrpcStream> {
-        Ok(self.stream.clone())
-    }
-
-    pub fn content_type_str(&self) -> &str {
-        self.parts
-            .headers
-            .get("Content-Type")
-            .and_then(|hv| hv.to_str().ok())
-            .unwrap_or("application/x-www-form-urlencoded")
-    }
-
-    pub fn is_json(&self) -> bool {
-        self.content_type_str() == "application/json"
-    }
-
-    pub fn process(self, ruby: &Ruby, app_proc: Arc<HeapValue<Proc>>) -> magnus::error::Result<()> {
-        let response = self.stream.clone();
-        let result = app_proc.call::<_, Value>((self,));
-        if let Err(err) = result {
-            Self::internal_error(ruby, response, err);
-        }
-        Ok(())
-    }
-
-    pub fn internal_error(_ruby: &Ruby, stream: ItsiGrpcStream, err: Error) {
-        if let Some(rb_err) = err.value() {
-            print_rb_backtrace(rb_err);
-            stream.internal_server_error(err.to_string());
-        } else {
-            stream.internal_server_error(err.to_string());
-        }
-    }
-
-    pub(crate) async fn process_request(
-        app: Arc<HeapValue<Proc>>,
-        hyper_request: HttpRequest,
-        context: &RequestContext,
-    ) -> itsi_error::Result<HttpResponse> {
-        let (request, mut receiver) = ItsiGrpcRequest::new(hyper_request, context).await;
-        let shutdown_channel = context.service.shutdown_channel.clone();
-        let response_stream = request.stream.clone();
-        match context
-            .sender
-            .send(RequestJob::ProcessGrpcRequest(request, app))
-            .await
-        {
-            Err(err) => {
-                error!("Error occurred: {}", err);
-                let mut response = Response::new(BoxBody::new(Empty::new()));
-                *response.status_mut() = StatusCode::BAD_REQUEST;
-                Ok(response)
-            }
-            _ => match receiver.recv().await {
-                Some(first_frame) => Ok(response_stream
-                    .build_response(first_frame, receiver, shutdown_channel)
-                    .await),
-                None => Ok(Response::new(BoxBody::new(Empty::new()))),
-            },
-        }
-    }
-    pub fn is_connection_closed_err(ruby: &Ruby, err: &Error) -> bool {
-        match err.error_type() {
-            ErrorType::Jump(_) => false,
-            ErrorType::Error(_, _) => false,
-            ErrorType::Exception(exception) => {
-                exception.is_kind_of(ruby.exception_eof_error())
-                    && err
-                        .value()
-                        .map(|v| {
-                            v.funcall::<_, _, String>(*ID_MESSAGE, ())
-                                .unwrap_or("".to_string())
-                                .eq(CLIENT_CONNECTION_CLOSED)
-                        })
-                        .unwrap_or(false)
-            }
-        }
-    }
-
-    pub(crate) async fn new(
-        request: HttpRequest,
-        context: &RequestContext,
-    ) -> (ItsiGrpcRequest, mpsc::Receiver<ByteFrame>) {
-        let (parts, body) = request.into_parts();
-        let response_channel = mpsc::channel::<ByteFrame>(100);
-        (
-            Self {
-                context: context.clone(),
-                start: Instant::now(),
-                parts,
-                stream: ItsiGrpcStream::new(response_channel.0, body.into_data_stream()),
-            },
-            response_channel.1,
-        )
-    }
-}

data/crates/itsi_server/src/ruby_types/itsi_grpc_response.rs

@@ -1,19 +0,0 @@
-use derive_more::Debug;
-use http::request::Parts;
-use tokio::sync::mpsc::Sender;
-
-use crate::server::byte_frame::ByteFrame;
-
-#[derive(Debug, Clone)]
-#[magnus::wrap(class = "Itsi::GrpcResponse", free_immediately, size)]
-pub struct ItsiGrpcResponse {
-    pub parts: Parts,
-    #[debug(skip)]
-    pub sender: Sender<ByteFrame>,
-}
-
-impl ItsiGrpcResponse {
-    pub fn new(parts: Parts, sender: Sender<ByteFrame>) -> Self {
-        Self { parts, sender }
-    }
-}

data/crates/itsi_server/src/server/itsi_service.rs

@@ -1,172 +0,0 @@
-use super::listener::ListenerInfo;
-use super::middleware_stack::CompressionAlgorithm;
-use super::middleware_stack::MiddlewareLayer;
-use super::request_job::RequestJob;
-use super::serve_strategy::single_mode::RunningPhase;
-use super::types::HttpRequest;
-use super::types::HttpResponse;
-use crate::ruby_types::itsi_server::itsi_server_config::ServerParams;
-use chrono;
-use chrono::Local;
-use either::Either;
-use hyper::service::Service;
-use itsi_error::ItsiError;
-use regex::Regex;
-use std::sync::OnceLock;
-use std::{future::Future, ops::Deref, pin::Pin, sync::Arc};
-use tokio::sync::watch::{self};
-
-#[derive(Clone)]
-pub struct ItsiService {
-    pub inner: Arc<IstiServiceInner>,
-}
-
-impl Deref for ItsiService {
-    type Target = Arc<IstiServiceInner>;
-
-    fn deref(&self) -> &Self::Target {
-        &self.inner
-    }
-}
-
-pub struct IstiServiceInner {
-    pub sender: async_channel::Sender<RequestJob>,
-    pub server_params: Arc<ServerParams>,
-    pub listener: Arc<ListenerInfo>,
-    pub addr: String,
-    pub shutdown_channel: watch::Receiver<RunningPhase>,
-}
-
-#[derive(Clone)]
-pub struct RequestContext {
-    inner: Arc<RequestContextInner>,
-}
-
-impl Deref for RequestContext {
-    type Target = Arc<RequestContextInner>;
-
-    fn deref(&self) -> &Self::Target {
-        &self.inner
-    }
-}
-
-impl Deref for RequestContextInner {
-    type Target = ItsiService;
-
-    fn deref(&self) -> &Self::Target {
-        &self.service
-    }
-}
-
-pub struct RequestContextInner {
-    pub request_id: i128,
-    pub service: ItsiService,
-    pub matching_pattern: Option<Arc<Regex>>,
-    pub compression_method: OnceLock<CompressionAlgorithm>,
-    pub origin: OnceLock<Option<String>>,
-    pub start_time: chrono::DateTime<chrono::Utc>,
-    pub request: Option<Arc<HttpRequest>>,
-    pub request_start_time: OnceLock<chrono::DateTime<Local>>,
-    pub if_none_match: OnceLock<Option<String>>,
-    pub etag_value: OnceLock<Option<String>>,
-}
-
-impl RequestContext {
-    fn new(service: ItsiService, matching_pattern: Option<Arc<Regex>>) -> Self {
-        RequestContext {
-            inner: Arc::new(RequestContextInner {
-                request_id: rand::random::<i128>(),
-                service,
-                matching_pattern,
-                compression_method: OnceLock::new(),
-                origin: OnceLock::new(),
-                start_time: chrono::Utc::now(),
-                request: None,
-                request_start_time: OnceLock::new(),
-                if_none_match: OnceLock::new(),
-                etag_value: OnceLock::new(),
-            }),
-        }
-    }
-
-    pub fn set_compression_method(&self, method: CompressionAlgorithm) {
-        self.inner.compression_method.set(method).unwrap();
-    }
-
-    pub fn set_origin(&self, origin: Option<String>) {
-        self.inner.origin.set(origin).unwrap();
-    }
-
-    pub fn set_if_none_match(&self, value: Option<String>) {
-        self.inner.if_none_match.set(value).unwrap();
-    }
-
-    pub fn get_if_none_match(&self) -> Option<String> {
-        self.inner.if_none_match.get().cloned().flatten()
-    }
-
-    pub fn request_id(&self) -> String {
-        self.inner.request_id.to_string()
-    }
-
-    pub fn track_start_time(&self) {
-        self.inner
-            .request_start_time
-            .get_or_init(chrono::Local::now);
-    }
-
-    pub fn start_time(&self) -> Option<chrono::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)
-    }
-}
-
-impl Service<HttpRequest> for ItsiService {
-    type Response = HttpResponse;
-    type Error = ItsiError;
-    type Future = Pin<Box<dyn Future<Output = itsi_error::Result<HttpResponse>> + Send>>;
-
-    // This is called once per incoming Request.
-    fn call(&self, req: HttpRequest) -> Self::Future {
-        let params = self.server_params.clone();
-        let self_clone = self.clone();
-        Box::pin(async move {
-            let mut req = req;
-            let mut resp: Option<HttpResponse> = None;
-            let (stack, matching_pattern) = params.middleware.get().unwrap().stack_for(&req);
-            let mut context = RequestContext::new(self_clone, matching_pattern);
-            let mut depth = 0;
-            for (index, elm) in stack.iter().enumerate() {
-                match elm.before(req, &mut context).await {
-                    Ok(Either::Left(r)) => req = r,
-                    Ok(Either::Right(r)) => {
-                        resp = Some(r);
-                        depth = index;
-                        break;
-                    }
-                    Err(e) => return Err(e.into()),
-                }
-            }
-
-            let mut resp = match resp {
-                Some(r) => r,
-                None => {
-                    return Err(ItsiError::InternalServerError(
-                        "No response returned from middleware stack".to_string(),
-                    ))
-                }
-            };
-            for elm in stack.iter().rev().skip(stack.len() - depth - 1) {
-                resp = elm.after(resp, &mut context).await;
-            }
-
-            Ok(resp)
-        })
-    }
-}