itsi-server 0.1.11 → 0.1.12

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: itsi-server
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.12
 platform: ruby
 authors:
 - Wouter Coppieters
 bindir: exe
 cert_chain: []
-date: 2025-03-17 00:00:00.000000000 Z
+date: 2025-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -54,19 +54,43 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- _index.md
 - exe/itsi
 - ext/itsi_error/Cargo.lock
 - ext/itsi_error/Cargo.toml
 - ext/itsi_error/src/from.rs
 - ext/itsi_error/src/lib.rs
+- ext/itsi_error/target/debug/build/clang-sys-da71b0344e568175/out/common.rs
+- ext/itsi_error/target/debug/build/clang-sys-da71b0344e568175/out/dynamic.rs
+- ext/itsi_error/target/debug/build/clang-sys-da71b0344e568175/out/macros.rs
+- ext/itsi_error/target/debug/build/rb-sys-49f554618693db24/out/bindings-0.9.110-mri-arm64-darwin23-3.4.2.rs
+- ext/itsi_error/target/debug/incremental/itsi_error-1mmt5sux7jb0i/s-h510z7m8v9-0bxu7yd.lock
+- ext/itsi_error/target/debug/incremental/itsi_error-2vn3jey74oiw0/s-h5113n0e7e-1v5qzs6.lock
+- ext/itsi_error/target/debug/incremental/itsi_error-37uv9dicz7awp/s-h510ykifhe-0tbnep2.lock
+- ext/itsi_error/target/debug/incremental/itsi_error-37uv9dicz7awp/s-h510yyocpj-0tz7ug7.lock
+- ext/itsi_error/target/debug/incremental/itsi_error-37uv9dicz7awp/s-h510z0xc8g-14ol18k.lock
+- ext/itsi_error/target/debug/incremental/itsi_error-3g5qf4y7d54uj/s-h5113n0e7d-1trk8on.lock
+- ext/itsi_error/target/debug/incremental/itsi_error-3lpfftm45d3e2/s-h510z7m8r3-1pxp20o.lock
+- ext/itsi_error/target/debug/incremental/itsi_error-3o4qownhl3d7n/s-h510ykifek-1uxasnk.lock
+- ext/itsi_error/target/debug/incremental/itsi_error-3o4qownhl3d7n/s-h510yyocki-11u37qm.lock
+- ext/itsi_error/target/debug/incremental/itsi_error-3o4qownhl3d7n/s-h510z0xc93-0pmy0zm.lock
 - ext/itsi_instrument_entry/Cargo.toml
 - ext/itsi_instrument_entry/src/lib.rs
 - ext/itsi_rb_helpers/Cargo.lock
 - ext/itsi_rb_helpers/Cargo.toml
 - ext/itsi_rb_helpers/src/heap_value.rs
 - ext/itsi_rb_helpers/src/lib.rs
+- ext/itsi_rb_helpers/target/debug/build/clang-sys-da71b0344e568175/out/common.rs
+- ext/itsi_rb_helpers/target/debug/build/clang-sys-da71b0344e568175/out/dynamic.rs
+- ext/itsi_rb_helpers/target/debug/build/clang-sys-da71b0344e568175/out/macros.rs
+- ext/itsi_rb_helpers/target/debug/build/rb-sys-eb9ed4ff3a60f995/out/bindings-0.9.110-mri-arm64-darwin23-3.4.2.rs
+- ext/itsi_rb_helpers/target/debug/incremental/itsi_rb_helpers-040pxg6yhb3g3/s-h5113n7a1b-03bwlt4.lock
+- ext/itsi_rb_helpers/target/debug/incremental/itsi_rb_helpers-131g1u4dzkt1a/s-h51113xnh3-1eik1ip.lock
+- ext/itsi_rb_helpers/target/debug/incremental/itsi_rb_helpers-131g1u4dzkt1a/s-h5111704jj-0g4rj8x.lock
+- ext/itsi_rb_helpers/target/debug/incremental/itsi_rb_helpers-1q2d3drtxrzs5/s-h5113n79yl-0bxcqc5.lock
+- ext/itsi_rb_helpers/target/debug/incremental/itsi_rb_helpers-374a9h7ovycj0/s-h51113xoox-10de2hp.lock
+- ext/itsi_rb_helpers/target/debug/incremental/itsi_rb_helpers-374a9h7ovycj0/s-h5111704w7-0vdq7gq.lock
 - ext/itsi_scheduler/Cargo.toml
-- ext/itsi_scheduler/extconf.rb
 - ext/itsi_scheduler/src/itsi_scheduler.rs
 - ext/itsi_scheduler/src/itsi_scheduler/io_helpers.rs
 - ext/itsi_scheduler/src/itsi_scheduler/io_waiter.rs
@@ -75,46 +99,91 @@ files:
 - ext/itsi_server/Cargo.lock
 - ext/itsi_server/Cargo.toml
 - ext/itsi_server/extconf.rb
-- ext/itsi_server/src/body_proxy/big_bytes.rs
-- ext/itsi_server/src/body_proxy/itsi_body_proxy.rs
-- ext/itsi_server/src/body_proxy/mod.rs
 - ext/itsi_server/src/env.rs
 - ext/itsi_server/src/lib.rs
-- ext/itsi_server/src/request/itsi_request.rs
-- ext/itsi_server/src/request/mod.rs
-- ext/itsi_server/src/response/itsi_response.rs
-- ext/itsi_server/src/response/mod.rs
+- ext/itsi_server/src/ruby_types/itsi_body_proxy/big_bytes.rs
+- ext/itsi_server/src/ruby_types/itsi_body_proxy/mod.rs
+- ext/itsi_server/src/ruby_types/itsi_grpc_request.rs
+- ext/itsi_server/src/ruby_types/itsi_grpc_response.rs
+- ext/itsi_server/src/ruby_types/itsi_grpc_stream/mod.rs
+- ext/itsi_server/src/ruby_types/itsi_http_request.rs
+- ext/itsi_server/src/ruby_types/itsi_http_response.rs
+- ext/itsi_server/src/ruby_types/itsi_server.rs
+- ext/itsi_server/src/ruby_types/itsi_server/file_watcher.rs
+- ext/itsi_server/src/ruby_types/itsi_server/itsi_server_config.rs
+- ext/itsi_server/src/ruby_types/mod.rs
 - ext/itsi_server/src/server/bind.rs
 - ext/itsi_server/src/server/bind_protocol.rs
+- ext/itsi_server/src/server/byte_frame.rs
+- ext/itsi_server/src/server/cache_store.rs
 - ext/itsi_server/src/server/io_stream.rs
-- ext/itsi_server/src/server/itsi_server.rs
+- ext/itsi_server/src/server/itsi_service.rs
 - ext/itsi_server/src/server/lifecycle_event.rs
 - ext/itsi_server/src/server/listener.rs
+- ext/itsi_server/src/server/middleware_stack/middleware.rs
+- ext/itsi_server/src/server/middleware_stack/middlewares/allow_list.rs
+- ext/itsi_server/src/server/middleware_stack/middlewares/auth_api_key.rs
+- ext/itsi_server/src/server/middleware_stack/middlewares/auth_basic.rs
+- ext/itsi_server/src/server/middleware_stack/middlewares/auth_jwt.rs
+- ext/itsi_server/src/server/middleware_stack/middlewares/cache_control.rs
+- ext/itsi_server/src/server/middleware_stack/middlewares/compression.rs
+- ext/itsi_server/src/server/middleware_stack/middlewares/cors.rs
+- ext/itsi_server/src/server/middleware_stack/middlewares/deny_list.rs
+- ext/itsi_server/src/server/middleware_stack/middlewares/error_response.rs
+- ext/itsi_server/src/server/middleware_stack/middlewares/etag.rs
+- ext/itsi_server/src/server/middleware_stack/middlewares/grpc_service.rs
+- ext/itsi_server/src/server/middleware_stack/middlewares/header_interpretation.rs
+- ext/itsi_server/src/server/middleware_stack/middlewares/intrusion_protection.rs
+- ext/itsi_server/src/server/middleware_stack/middlewares/log_requests.rs
+- ext/itsi_server/src/server/middleware_stack/middlewares/mod.rs
+- ext/itsi_server/src/server/middleware_stack/middlewares/proxy.rs
+- ext/itsi_server/src/server/middleware_stack/middlewares/rate_limit.rs
+- ext/itsi_server/src/server/middleware_stack/middlewares/redirect.rs
+- ext/itsi_server/src/server/middleware_stack/middlewares/request_headers.rs
+- ext/itsi_server/src/server/middleware_stack/middlewares/response_headers.rs
+- ext/itsi_server/src/server/middleware_stack/middlewares/ruby_app.rs
+- ext/itsi_server/src/server/middleware_stack/middlewares/static_assets.rs
+- ext/itsi_server/src/server/middleware_stack/middlewares/string_rewrite.rs
+- ext/itsi_server/src/server/middleware_stack/middlewares/token_source.rs
+- ext/itsi_server/src/server/middleware_stack/mod.rs
 - ext/itsi_server/src/server/mod.rs
 - ext/itsi_server/src/server/process_worker.rs
+- ext/itsi_server/src/server/rate_limiter.rs
+- ext/itsi_server/src/server/request_job.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
 - ext/itsi_server/src/server/signal.rs
+- ext/itsi_server/src/server/static_file_server.rs
 - ext/itsi_server/src/server/thread_worker.rs
 - ext/itsi_server/src/server/tls.rs
 - ext/itsi_server/src/server/tls/locked_dir_cache.rs
+- ext/itsi_server/src/server/types.rs
 - ext/itsi_tracing/Cargo.lock
 - ext/itsi_tracing/Cargo.toml
 - ext/itsi_tracing/src/lib.rs
-- lib/itsi/index.html
-- lib/itsi/request.rb
+- ext/itsi_tracing/target/debug/incremental/itsi_tracing-0994n8rpvvt9m/s-h510hfz1f6-1kbycmq.lock
+- ext/itsi_tracing/target/debug/incremental/itsi_tracing-0bob7bf4yq34i/s-h5113125h5-0lh4rag.lock
+- ext/itsi_tracing/target/debug/incremental/itsi_tracing-2fcodulrxbbxo/s-h510h2infk-0hp5kjw.lock
+- ext/itsi_tracing/target/debug/incremental/itsi_tracing-2iak63r1woi1l/s-h510h2in4q-0kxfzw1.lock
+- ext/itsi_tracing/target/debug/incremental/itsi_tracing-2kk4qj9gn5dg2/s-h5113124kv-0enwon2.lock
+- ext/itsi_tracing/target/debug/incremental/itsi_tracing-2mwo0yas7dtw4/s-h510hfz1ha-1udgpei.lock
+- lib/itsi/http_request.rb
+- lib/itsi/http_response.rb
 - lib/itsi/server.rb
 - lib/itsi/server/Itsi.rb
 - lib/itsi/server/config.rb
-- lib/itsi/server/options_dsl.rb
+- lib/itsi/server/config/dsl.rb
+- lib/itsi/server/default_app/default_app.rb
+- lib/itsi/server/default_app/index.html
+- lib/itsi/server/grpc_interface.rb
 - lib/itsi/server/rack/handler/itsi.rb
 - lib/itsi/server/rack_interface.rb
 - lib/itsi/server/scheduler_interface.rb
 - lib/itsi/server/scheduler_mode.rb
 - lib/itsi/server/signal_trap.rb
 - lib/itsi/server/version.rb
-- lib/itsi/stream_io.rb
+- lib/itsi/standard_headers.rb
 - sig/itsi_server.rbs
 homepage: https://itsi.fyi
 licenses:

data/ext/itsi_scheduler/extconf.rb

@@ -1,6 +0,0 @@
-# frozen_string_literal: true
-
-require "mkmf"
-require "rb_sys/mkmf"
-
-create_rust_makefile("itsi/scheduler/itsi_scheduler")

data/ext/itsi_server/src/body_proxy/mod.rs

@@ -1,2 +0,0 @@
-pub mod big_bytes;
-pub mod itsi_body_proxy;

data/ext/itsi_server/src/request/mod.rs

@@ -1 +0,0 @@
-pub mod itsi_request;

data/ext/itsi_server/src/response/mod.rs

@@ -1 +0,0 @@
-pub mod itsi_response;

data/ext/itsi_server/src/server/itsi_server.rs

@@ -1,288 +0,0 @@
-use super::{
-    bind::Bind,
-    listener::Listener,
-    serve_strategy::{cluster_mode::ClusterMode, single_mode::SingleMode},
-    signal::{
-        clear_signal_handlers, reset_signal_handlers, send_shutdown_event, SIGNAL_HANDLER_CHANNEL,
-    },
-};
-use crate::{request::itsi_request::ItsiRequest, server::serve_strategy::ServeStrategy};
-use derive_more::Debug;
-use itsi_rb_helpers::{call_without_gvl, HeapVal, HeapValue};
-use itsi_tracing::{error, run_silently};
-use magnus::{
-    block::Proc,
-    error::Result,
-    scan_args::{get_kwargs, scan_args, Args, KwArgs, ScanArgsKw, ScanArgsOpt, ScanArgsRequired},
-    value::ReprValue,
-    ArgList, RArray, RHash, Ruby, Symbol, Value,
-};
-use parking_lot::{Mutex, RwLock};
-use std::{cmp::max, collections::HashMap, ops::Deref, sync::Arc};
-use tracing::{info, instrument};
-
-static DEFAULT_BIND: &str = "http://localhost:3000";
-
-#[magnus::wrap(class = "Itsi::Server", free_immediately, size)]
-#[derive(Clone)]
-pub struct Server {
-    pub config: Arc<ServerConfig>,
-}
-
-impl Deref for Server {
-    type Target = ServerConfig;
-
-    fn deref(&self) -> &Self::Target {
-        &self.config
-    }
-}
-
-#[derive(Debug)]
-pub struct ServerConfig {
-    #[debug(skip)]
-    pub app: HeapVal,
-    #[allow(unused)]
-    pub workers: u8,
-    #[allow(unused)]
-    pub threads: u8,
-    #[allow(unused)]
-    pub shutdown_timeout: f64,
-    pub script_name: String,
-    pub(crate) binds: Mutex<Vec<Bind>>,
-    #[debug(skip)]
-    pub hooks: HashMap<String, HeapValue<Proc>>,
-    pub scheduler_class: Option<String>,
-    pub stream_body: Option<bool>,
-    pub worker_memory_limit: Option<u64>,
-    #[debug(skip)]
-    pub(crate) strategy: RwLock<Option<ServeStrategy>>,
-    pub silence: bool,
-    pub oob_gc_responses_threshold: Option<u64>,
-}
-
-#[derive(Debug)]
-pub enum RequestJob {
-    ProcessRequest(ItsiRequest),
-    Shutdown,
-}
-
-fn extract_args<Req, Opt, Splat>(
-    scan_args: &Args<(), (), (), (), RHash, ()>,
-    primaries: &[&str],
-    rest: &[&str],
-) -> Result<KwArgs<Req, Opt, Splat>>
-where
-    Req: ScanArgsRequired,
-    Opt: ScanArgsOpt,
-    Splat: ScanArgsKw,
-{
-    let symbols: Vec<Symbol> = primaries
-        .iter()
-        .chain(rest.iter())
-        .map(|&name| Symbol::new(name))
-        .collect();
-
-    let hash = scan_args
-        .keywords
-        .funcall::<_, _, RHash>("slice", symbols.into_arg_list_with(&Ruby::get().unwrap()))
-        .unwrap();
-
-    get_kwargs(hash, primaries, rest)
-}
-
-impl Server {
-    #[instrument(
-        name = "Itsi",
-        parent=None,
-        skip(args),
-        fields(workers = 1, threads = 1, shutdown_timeout = 5)
-    )]
-    pub fn new(args: &[Value]) -> Result<Self> {
-        let scan_args: Args<(), (), (), (), RHash, ()> = scan_args(args)?;
-
-        type Args1 = KwArgs<
-            (Value,),
-            (
-                // Workers
-                Option<u8>,
-                // Threads
-                Option<u8>,
-                // Shutdown Timeout
-                Option<f64>,
-                // Script Name
-                Option<String>,
-                // Binds
-                Option<Vec<String>>,
-                // Stream Body
-                Option<bool>,
-            ),
-            (),
-        >;
-
-        type Args2 = KwArgs<
-            (),
-            (
-                // Hooks
-                Option<RHash>,
-                // Scheduler Class
-                Option<String>,
-                // Worker Memory Limit
-                Option<u64>,
-                // Out-of-band GC Responses Threshold
-                Option<u64>,
-                // Silence
-                Option<bool>,
-            ),
-            (),
-        >;
-
-        let args1: Args1 = extract_args(
-            &scan_args,
-            &["app"],
-            &[
-                "workers",
-                "threads",
-                "shutdown_timeout",
-                "script_name",
-                "binds",
-                "stream_body",
-            ],
-        )?;
-
-        let args2: Args2 = extract_args(
-            &scan_args,
-            &[],
-            &[
-                "hooks",
-                "scheduler_class",
-                "worker_memory_limit",
-                "oob_gc_responses_threshold",
-                "silence",
-            ],
-        )?;
-
-        let hooks = args2
-            .optional
-            .0
-            .map(|rhash| -> Result<HashMap<String, HeapValue<Proc>>> {
-                let mut hook_map: HashMap<String, HeapValue<Proc>> = HashMap::new();
-                for pair in rhash.enumeratorize::<_, ()>("each", ()) {
-                    if let Some(pair_value) = RArray::from_value(pair?) {
-                        if let (Ok(key), Ok(value)) =
-                            (pair_value.entry::<Value>(0), pair_value.entry::<Proc>(1))
-                        {
-                            hook_map.insert(key.to_string(), HeapValue::from(value));
-                        }
-                    }
-                }
-                Ok(hook_map)
-            })
-            .transpose()?
-            .unwrap_or_default();
-
-        let config = ServerConfig {
-            app: HeapVal::from(args1.required.0),
-            workers: max(args1.optional.0.unwrap_or(1), 1),
-            threads: max(args1.optional.1.unwrap_or(1), 1),
-            shutdown_timeout: args1.optional.2.unwrap_or(5.0),
-            script_name: args1.optional.3.unwrap_or("".to_string()),
-            binds: Mutex::new(
-                args1
-                    .optional
-                    .4
-                    .unwrap_or_else(|| vec![DEFAULT_BIND.to_string()])
-                    .into_iter()
-                    .map(|s| s.parse())
-                    .collect::<itsi_error::Result<Vec<Bind>>>()?,
-            ),
-            stream_body: args1.optional.5,
-            hooks,
-            scheduler_class: args2.optional.1.clone(),
-            worker_memory_limit: args2.optional.2,
-            strategy: RwLock::new(None),
-            oob_gc_responses_threshold: args2.optional.3,
-            silence: args2.optional.4.is_some_and(|s| s),
-        };
-
-        if !config.silence {
-            if let Some(scheduler_class) = args2.optional.1 {
-                info!(scheduler_class, fiber_scheduler = true);
-            } else {
-                info!(fiber_scheduler = false);
-            }
-        }
-
-        Ok(Server {
-            config: Arc::new(config),
-        })
-    }
-
-    #[instrument(name = "Bind", skip_all, fields(binds=format!("{:?}", self.config.binds.lock())))]
-    pub(crate) fn build_listeners(&self) -> Result<Vec<Listener>> {
-        let listeners = self
-            .config
-            .binds
-            .lock()
-            .iter()
-            .cloned()
-            .map(Listener::try_from)
-            .collect::<std::result::Result<Vec<Listener>, _>>()?
-            .into_iter()
-            .collect::<Vec<_>>();
-        info!("Bound {:?} listeners", listeners.len());
-        Ok(listeners)
-    }
-
-    pub(crate) fn build_strategy(self) -> Result<()> {
-        let listeners = self.build_listeners()?;
-        let server = Arc::new(self);
-        let server_clone = server.clone();
-
-        let strategy = if server.config.workers == 1 {
-            ServeStrategy::Single(Arc::new(SingleMode::new(
-                server,
-                listeners,
-                SIGNAL_HANDLER_CHANNEL.0.clone(),
-            )?))
-        } else {
-            ServeStrategy::Cluster(Arc::new(ClusterMode::new(
-                server,
-                listeners,
-                SIGNAL_HANDLER_CHANNEL.0.clone(),
-            )))
-        };
-
-        *server_clone.strategy.write() = Some(strategy);
-        Ok(())
-    }
-
-    pub fn stop(&self) -> Result<()> {
-        send_shutdown_event();
-        Ok(())
-    }
-
-    pub fn start(&self) -> Result<()> {
-        if self.silence {
-            run_silently(|| self.build_and_run_strategy())
-        } else {
-            self.build_and_run_strategy()
-        }
-    }
-
-    fn build_and_run_strategy(&self) -> Result<()> {
-        reset_signal_handlers();
-        let rself = self.clone();
-        call_without_gvl(move || -> Result<()> {
-            rself.clone().build_strategy()?;
-            if let Err(e) = rself.strategy.read().as_ref().unwrap().run() {
-                error!("Error running server: {}", e);
-                rself.strategy.read().as_ref().unwrap().stop()?;
-            }
-            Ok(())
-        })?;
-        clear_signal_handlers();
-        self.strategy.write().take();
-        info!("Server stopped");
-        Ok(())
-    }
-}