itsi-server 0.2.21 → 0.2.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1bd2a908171b06331905949fa422899f9f1c104bc351cf18f64fa194e75d3a53
-  data.tar.gz: 75a9044dc44089edc2555ee72af7a61c51c50910c8845ae05e876bddc369d42b
+  metadata.gz: fb8f000cf846b5324309070910aac12db86cfe8dc10a792aab03def624e25fe7
+  data.tar.gz: 76d9b53f76fd77622aec8059f815a77bdd9684262fc9ff3851292bf5c75f9e57
 SHA512:
-  metadata.gz: 35d0c81a040e5e182e210ebf0365775c0f8c8e277fa01942b491e43c4a6fee5efe28b48202c3925a6c3158bffe754403d4960ce66f00a7be415df73bc50549f7
-  data.tar.gz: fe30420266024df4a094d49b6cead529faa20a84b940fc6c99c095c5f3d7fd54fc77f103906d56919b7fa2588f65484e3c45c030bbb6467501565ba0a85525ad
+  metadata.gz: 378978e97506653bc14235b7859390c9f4acde16f9fc2b99025834474568deb12004a140dfaa6b6fdf9a86daa9d7a4ba53c00405ccf962035cd20c49e8eae6d1
+  data.tar.gz: b0512cec9b48b744a199d51e39accbad5fcd7904d7e2b47195502fbbe89a665ef7b05be072a2ae639807f0450a3b7a64c4790e78270cae47020d28425f66161a

data/Cargo.lock

@@ -270,7 +270,7 @@ version = "0.28.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bfa9b6986f250236c27e5a204062434a773a13243d2ffc2955f37bdba4c5c6a1"
 dependencies = [
- "bindgen",
+ "bindgen 0.69.5",
  "cc",
  "cmake",
  "dunce",
@@ -427,6 +427,24 @@ dependencies = [
  "which",
 ]
 
+[[package]]
+name = "bindgen"
+version = "0.72.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "993776b509cfb49c750f11b8f07a46fa23e0a1386ffc01fb1e7d343efc387895"
+dependencies = [
+ "bitflags 2.9.0",
+ "cexpr",
+ "clang-sys",
+ "itertools",
+ "proc-macro2",
+ "quote",
+ "regex",
+ "rustc-hash 2.1.1",
+ "shlex",
+ "syn 2.0.101",
+]
+
 [[package]]
 name = "bitflags"
 version = "1.3.2"
@@ -660,7 +678,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "117725a109d387c937a1533ce01b450cbde6b88abceea8473c4d7a85853cda3c"
 dependencies = [
  "lazy_static",
- "windows-sys 0.59.0",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -1642,27 +1660,9 @@ version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
 
-[[package]]
-name = "itsi-scheduler"
-version = "0.2.21"
-dependencies = [
- "bytes",
- "derive_more",
- "itsi_error",
- "itsi_instrument_entry",
- "itsi_rb_helpers",
- "itsi_tracing",
- "magnus",
- "mio",
- "nix",
- "parking_lot",
- "rb-sys",
- "tracing",
-]
-
 [[package]]
 name = "itsi-server"
-version = "0.2.21"
+version = "0.2.23"
 dependencies = [
  "argon2",
  "async-channel",
@@ -1772,15 +1772,6 @@ dependencies = [
  "thiserror 2.0.12",
 ]
 
-[[package]]
-name = "itsi_instrument_entry"
-version = "0.1.0"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "itsi_rb_helpers"
 version = "0.1.0"
@@ -1934,8 +1925,7 @@ checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
 [[package]]
 name = "magnus"
 version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b36a5b126bbe97eb0d02d07acfeb327036c6319fd816139a49824a83b7f9012"
+source = "git+https://github.com/matsadler/magnus.git?rev=1ed232edb2b75a2eed9b1def34ad57e55c411a5c#1ed232edb2b75a2eed9b1def34ad57e55c411a5c"
 dependencies = [
  "bytes",
  "magnus-macros",
@@ -1947,8 +1937,7 @@ dependencies = [
 [[package]]
 name = "magnus-macros"
 version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47607461fd8e1513cb4f2076c197d8092d921a1ea75bd08af97398f593751892"
+source = "git+https://github.com/matsadler/magnus.git?rev=1ed232edb2b75a2eed9b1def34ad57e55c411a5c#1ed232edb2b75a2eed9b1def34ad57e55c411a5c"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2591,10 +2580,8 @@ dependencies = [
 [[package]]
 name = "rb-sys-build"
 version = "0.9.124"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "568068db4102230882e6d4ae8de6632e224ca75fe5970f6e026a04e91ed635d3"
 dependencies = [
- "bindgen",
+ "bindgen 0.72.1",
  "lazy_static",
  "proc-macro2",
  "quote",
@@ -3922,7 +3909,7 @@ version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
 dependencies = [
- "windows-sys 0.59.0",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]

data/Cargo.toml

@@ -5,3 +5,7 @@
 [workspace]
 members = ["./ext/itsi_server"]
 resolver = "2"
+
+[patch.crates-io]
+magnus = { git = "https://github.com/matsadler/magnus.git", rev = "1ed232edb2b75a2eed9b1def34ad57e55c411a5c" }
+rb-sys-build = { path = "vendor/rb-sys-build" }

data/Rakefile

@@ -3,15 +3,47 @@
 require "bundler/gem_tasks"
 require "minitest/test_task"
 
-
-Minitest::TestTask.create(:test) do |t|
-  t.libs << 'test'
-  t.libs << 'lib'
-  t.warning = false
-  t.test_globs = ['test/**/*.rb']
-  t.test_prelude = 'require "helpers/test_helper.rb"'
+SMOKE_TEST_GLOBS = %w[
+  test/options/bind.rb
+  test/options/header_read_timeout.rb
+  test/options/test_request_timeout.rb
+  test/options/test_threads.rb
+  test/rack/test_rack_server.rb
+  test/middleware/allow_list.rb
+  test/middleware/auth_api_key.rb
+  test/middleware/auth_basic.rb
+  test/middleware/cache_control.rb
+  test/middleware/cidr_to_regex.rb
+  test/middleware/compression.rb
+  test/middleware/cors.rb
+  test/middleware/csp.rb
+  test/middleware/deny_list.rb
+  test/middleware/etag.rb
+  test/middleware/header_interpolation.rb
+  test/middleware/location.rb
+  test/middleware/max_body.rb
+  test/middleware/request_headers.rb
+  test/middleware/response_headers.rb
+  test/middleware/static_assets.rb
+  test/middleware/static_response.rb
+  test/middleware/string_rewrite.rb
+].freeze
+
+def configure_test_task(task_name, test_globs)
+  Minitest::TestTask.create(task_name) do |t|
+    t.libs << "test"
+    t.libs << "lib"
+    t.warning = false
+    t.test_globs = test_globs
+    t.test_prelude = 'require "helpers/test_helper.rb"'
+  end
 end
 
+configure_test_task(:test, ["test/**/*.rb"])
+configure_test_task("test:smoke", SMOKE_TEST_GLOBS)
+
+task "test:full" => :test
+
 require "rb_sys/extensiontask"
 
 task build: :compile

data/ext/itsi_scheduler/Cargo.toml

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

data/ext/itsi_server/Cargo.lock

@@ -984,7 +984,7 @@ checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674"
 
 [[package]]
 name = "itsi-scheduler"
-version = "0.1.0"
+version = "0.2.23"
 dependencies = [
  "bytes",
  "derive_more",
@@ -1002,7 +1002,7 @@ dependencies = [
 
 [[package]]
 name = "itsi-server"
-version = "0.1.0"
+version = "0.2.23"
 dependencies = [
  "async-channel",
  "async-trait",

data/ext/itsi_server/Cargo.toml

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

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

@@ -263,7 +263,7 @@ impl MiddlewareSet {
     pub fn stack_for(
         &self,
         request: &HttpRequest,
-    ) -> Result<(&Vec<Middleware>, Option<Arc<Regex>>)> {
+    ) -> Option<(&Vec<Middleware>, Option<Arc<Regex>>)> {
         let binding = self.route_set.matches(request.uri().path());
         let matches = binding.iter();
 
@@ -276,7 +276,7 @@ impl MiddlewareSet {
             let matching_pattern = self.patterns.get(index).cloned();
             if let Some(stack) = self.stacks.get(&index) {
                 if stack.matches(request) {
-                    return Ok((&stack.layers, matching_pattern));
+                    return Some((&stack.layers, matching_pattern));
                 }
             }
         }
@@ -285,13 +285,7 @@ impl MiddlewareSet {
             request.uri().path(),
             self.route_set
         );
-        Err(magnus::Error::new(
-            magnus::Ruby::get().unwrap().exception_standard_error(),
-            format!(
-                "No matching middleware stack found for request: {:?}",
-                request
-            ),
-        ))
+        None
     }
 
     pub fn parse_middleware(middleware_type: String, parameters: Value) -> Result<Middleware> {

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

@@ -45,15 +45,17 @@ pub fn unsubscribe_runtime() {
 pub fn send_lifecycle_event(event: LifecycleEvent) {
     if let Some(sender) = SIGNAL_HANDLER_CHANNEL.lock().as_ref() {
         if let Err(e) = sender.send(event) {
-            // Channel full or receivers dropped - this is a critical error for shutdown signals
-            eprintln!("Critical: Failed to send lifecycle event {:?}", e);
-            // For shutdown events, try to force exit if channel delivery fails
             if matches!(
                 e.0,
                 LifecycleEvent::Shutdown | LifecycleEvent::ForceShutdown
             ) {
-                eprintln!("Emergency shutdown due to signal delivery failure");
-                std::process::exit(1);
+                SHUTDOWN_REQUESTED.store(true, Ordering::SeqCst);
+                warn!(
+                    "Dropping shutdown lifecycle event after receiver closed: {:?}",
+                    e
+                );
+            } else {
+                eprintln!("Warning: Failed to send lifecycle event {:?}", e);
             }
         }
     } else {

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

@@ -188,14 +188,11 @@ impl ItsiHttpService {
         let token_preference = self.server_params.itsi_server_token_preference;
 
         let service_future = async move {
-            let middleware_stack = self
-                .server_params
-                .middleware
-                .get()
-                .unwrap()
-                .stack_for(&req)
-                .unwrap();
-            let (stack, matching_pattern) = middleware_stack;
+            let Some((stack, matching_pattern)) =
+                self.server_params.middleware.get().unwrap().stack_for(&req)
+            else {
+                return Ok(NOT_FOUND_RESPONSE.to_http_response(accept).await);
+            };
             let mut resp: Option<HttpResponse> = None;
 
             let mut context =

data/lib/itsi/server/native_extension.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require "rbconfig"
+
+module Itsi
+  class Server
+    module NativeExtension
+      module_function
+
+      def require!
+        ruby_abi = RUBY_VERSION[/\A\d+\.\d+/]
+
+        if ruby_abi && versioned_binary_present?(ruby_abi)
+          begin
+            require_relative "#{ruby_abi}/itsi_server"
+            return
+          rescue LoadError
+            # Fall back to the source-built extension when a packaged binary
+            # exists but cannot be loaded on this machine.
+          end
+        end
+
+        require_relative "itsi_server"
+      end
+
+      def versioned_binary_present?(ruby_abi)
+        binary_path = File.join(__dir__, ruby_abi, "itsi_server.#{RbConfig::CONFIG.fetch("DLEXT")}")
+        File.exist?(binary_path)
+      end
+    end
+  end
+end
+
+Itsi::Server::NativeExtension.require!

data/lib/itsi/server/version.rb

@@ -2,6 +2,6 @@
 
 module Itsi
   class Server
-    VERSION = "0.2.21"
+    VERSION = "0.2.23"
   end
 end

data/lib/itsi/server.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require_relative "server/version"
-require_relative "server/itsi_server"
+require_relative "server/native_extension"
 require_relative "server/rack_interface"
 require_relative "server/grpc/grpc_interface"
 require_relative "server/grpc/grpc_call"
@@ -87,7 +87,15 @@ module Itsi
 
       def stop_background_threads
         @running && @running.each(&:stop)
-        @background_threads&.each(&:join)
+        @background_threads&.each do |thread|
+          next unless thread
+
+          thread.join(5)
+          next unless thread.alive?
+
+          thread.kill
+          thread.join(1)
+        end
         @background_threads = []
         @running = []
       end

data/vendor/rb-sys-build/.cargo-ok

@@ -0,0 +1 @@
+{"v":1}

data/vendor/rb-sys-build/.cargo_vcs_info.json

@@ -0,0 +1,6 @@
+{
+  "git": {
+    "sha1": "8b8369748af0e3fa80d20e11b38b423cb2009bdf"
+  },
+  "path_in_vcs": "crates/rb-sys-build"
+}