raptor 0.3.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c247b4c221d0f19ff1383ca0a4092a54bc12cd2f945655fa24e1ab49745eb70
-  data.tar.gz: cb932a7a048d87eb0913f8c0dbe52750ea4e525e4c4dc32e5fcc531af0daaf41
+  metadata.gz: c20a98b3c581180e2b9ea2e9cdd23223f4f43438b94852b0b19b8e1b659c751d
+  data.tar.gz: bc98ee07befe42ad9c2e30b4645aeac4a1fb369cc598e360a336b591a56d74b1
 SHA512:
-  metadata.gz: d8e1543054862e8a87c7261884348456da13d4432c3424687b74f506b884283d2773068b6beb10cbe9e209e969b98a918720861b3d0e05bc04d930ba38ec1921
-  data.tar.gz: f215cc4a92af86542d49f2c4772f0a65af09988779bbb1c44512ab075d4fb5c0758cb51d9765a0ee9d08fe340d31b42cea1610b021c443818fe40fbdcea63b93
+  metadata.gz: b065827d528422e5476827c2c01b792cd9b4a83ba38484283c33f05459a744a28a7ce88bfbe396c80fe07209893662350f205dd823a469503be208428f0cc784
+  data.tar.gz: '02583bea8f88760256318b3714b9f95cb7936b12ec0d9bb54a120108a734f965a9b85d4e556e6b8e73d7c731a43be6ddf96bd4871228f35d7bf2903df255cc84'

data/.mise.toml

@@ -0,0 +1,2 @@
+[tools]
+ruby = "latest"

data/Brewfile

@@ -0,0 +1,2 @@
+brew "hey"
+brew "nghttp2"

data/CHANGELOG.md

@@ -1,5 +1,26 @@
 ## [Unreleased]
 
+## [0.5.0] - 2026-05-31
+
+- Apply the default `stats_file` in the Rack handler
+- Add `phase` to per-worker stats
+- Force-kill workers that fail to exit within `--worker-shutdown-timeout` after shutdown is signalled
+- Kill workers that fail to check in within `--worker-timeout` or `--worker-boot-timeout`
+- Add `index`, `busy_threads`, and `thread_capacity` to per-worker stats
+
+## [0.4.0] - 2026-05-29
+
+- Load `raptor.rb` or `config/raptor.rb` by default when no config path is supplied
+- Honour the peer's HTTP/2 flow-control windows when sending `DATA` frames
+- Assemble HEADERS across `CONTINUATION` frames
+- Validate HTTP/2 stream IDs and emit `GOAWAY` on protocol errors
+- Offload TLS handshakes to the thread pool to keep the server thread responsive
+- Exit eager keep-alive loops on cluster shutdown
+- Apply the write timeout to HTTP/2 frame writes
+- Reject HPACK dynamic table size updates larger than 4096 bytes
+- Reject malformed HTTP/1.1 requests with a 400 response
+- Rescue unexpected errors in the reactor and pipeline collector
+
 ## [0.3.0] - 2026-05-25
 
 - Load cluster options from a Ruby config file via `--config`

data/README.md

@@ -1,6 +1,6 @@
 # Raptor
 
-Raptor is a high-performance, preloading, multi-process, multi-threaded Ruby 4+ web server implementing Rack 3+,
+Raptor is a high-performance, preloading, multi-process, multi-threaded Ruby 4+ web server implementing Rack 3.2+,
 leveraging Ractors for parallel HTTP/1.1 and HTTP/2 request processing, native C extensions for HTTP parsing and HPACK
 compression, and NIO for non-blocking I/O.
 
@@ -29,23 +29,23 @@ run proc { |_env| [200, { "content-type" => "text/plain" }, ["Hello, World!"]] }
 ```
 
 ```
-> bundle exec raptor -t 3 -w 4 hello_world.ru
-Raptor Cluster initializing:
-├─ Version: 0.3.0
-├─ Ruby Version: ruby 4.0.4 (2026-05-12 revision b89eb1bcbf) +YJIT +PRISM [arm64-darwin23]
-├─ Master PID: 31504
-│  └─ 4 worker processes
-│     ├─ 1 server thread
-│     ├─ 1 reactor thread
-│     ├─ 1 pipeline ractor
-│     ├─ 1 pipeline collector thread
-│     ├─ 3 worker threads
-│     └─ 1 stats thread
-└─ Listening on 0.0.0.0:9292
-[31506] Worker 0 booted
-[31507] Worker 1 booted
-[31508] Worker 2 booted
-[31509] Worker 3 booted
+> bundle exec raptor -w 4 -t 3 hello_world.ru
+[Raptor 91348|main|main] Cluster initializing:
+[Raptor 91348|main|main] ├─ Version: 0.5.0
+[Raptor 91348|main|main] ├─ Ruby Version: ruby 4.0.5 (2026-05-20 revision 64336ffd0e) +YJIT +PRISM [arm64-darwin23]
+[Raptor 91348|main|main] ├─ Master PID: 91348
+[Raptor 91348|main|main] │  └─ 4 worker processes
+[Raptor 91348|main|main] │     ├─ 1 server thread
+[Raptor 91348|main|main] │     ├─ 1 reactor thread
+[Raptor 91348|main|main] │     ├─ 1 pipeline ractor
+[Raptor 91348|main|main] │     ├─ 1 pipeline collector thread
+[Raptor 91348|main|main] │     ├─ 3 worker threads
+[Raptor 91348|main|main] │     └─ 1 stats thread
+[Raptor 91348|main|main] └─ Listening on 0.0.0.0:9292
+[Raptor 91350|main|main] Worker 0 booted
+[Raptor 91351|main|main] Worker 1 booted
+[Raptor 91352|main|main] Worker 2 booted
+[Raptor 91353|main|main] Worker 3 booted
 ```
 
 ```
@@ -62,15 +62,18 @@ Also works with `rackup` and `rails server`:
 
 ## (Micro) Benchmarks
 
-Raptor 0.3.0 vs Puma 8.0.1:
+Raptor 0.5.0 vs Puma 8.0.2:
 
-| Protocol              | Raptor       | Puma         |
-| --------------------- | ------------ | ------------ |
-| HTTP/1.1              | 20.3k req/s  | 20.8k req/s  |
-| HTTP/1.1 (keep-alive) | 60.9k req/s  | 45.4k req/s  |
-| HTTP/2                | 22.9k req/s  | N/A          |
+| Protocol              | Raptor      | Puma        |
+| --------------------- | ----------- | ----------- |
+| HTTP/1.1              | 20.1k req/s | 20k req/s   |
+| HTTP/1.1 (keep-alive) | 61.4k req/s | 39.1k req/s |
+| HTTP/2                | 22.8k req/s | N/A         |
 
-> Ruby 4.0.4 +YJIT, macOS Apple Silicon. 4 workers, 3 threads, 12 concurrent connections.
+> ruby 4.0.5 (2026-05-20 revision 64336ffd0e) +YJIT +PRISM [arm64-darwin23]
+> 4 workers, 3 threads, 12 concurrent connections
+
+See [bin/benchmark](bin/benchmark) for more details.
 
 ## Development
 

data/ext/raptor_http2/raptor_http2.c

@@ -457,6 +457,7 @@ static int hpack_decode_header_block(const uint8_t *buf, size_t len,
       /* dynamic table size update (RFC 7541 6.3) */
       uint64_t new_size;
       if (hpack_decode_int(buf, len, &pos, 5, &new_size) < 0) return -1;
+      if (new_size > HTTP2_DEFAULT_HEADER_TABLE_SIZE) return -1;
       *max_table_size = (long)new_size;
       *dyn_table = dynamic_table_evict(*dyn_table, *max_table_size);
 

data/lib/rackup/handler/raptor.rb

@@ -42,9 +42,9 @@ module Rackup
         {
           "Host=HOST"   => "Hostname to listen on (default: #{DEFAULT_OPTIONS[:Host]})",
           "Port=PORT"   => "Port to listen on (default: #{DEFAULT_OPTIONS[:Port]})",
-          "Threads=NUM" => "Number of threads per worker (default: 3)",
-          "Ractors=NUM" => "Number of pipeline ractors per worker (default: 1)",
           "Workers=NUM" => "Number of worker processes (default: nprocessors)",
+          "Ractors=NUM" => "Number of pipeline ractors per worker (default: 1)",
+          "Threads=NUM" => "Number of threads per worker (default: 3)",
           "Config=PATH" => "Load additional configuration from PATH"
         }
       end
@@ -69,29 +69,28 @@ module Rackup
         end
 
         cli_defaults = ::Raptor::CLI::DEFAULT_OPTIONS
-        config = options[:Config] ? ::Raptor::CLI.load_config_file(options[:Config]) : {}
-
-        binds = if options[:Host] || options[:Port]
-          host = options[:Host] || defaults[:Host]
-          port = options[:Port] || defaults[:Port]
-          ["tcp://#{host}:#{port}"]
-        else
-          config[:binds] || ["tcp://#{defaults[:Host]}:#{defaults[:Port]}"]
-        end
+        config_path = options[:Config] || ::Raptor::CLI.default_config_path
+        config = config_path ? ::Raptor::CLI.load_config_file(config_path) : {}
 
         result = {
-          app: app,
-          binds: binds,
-          threads: (options[:Threads] || config[:threads] || cli_defaults[:threads]).to_i,
-          ractors: (options[:Ractors] || config[:ractors] || cli_defaults[:ractors]).to_i,
+          binds: if options[:Host] || options[:Port]
+            ["tcp://#{options[:Host] || defaults[:Host]}:#{options[:Port] || defaults[:Port]}"]
+          else
+            config[:binds] || ["tcp://#{defaults[:Host]}:#{defaults[:Port]}"]
+          end,
           workers: (options[:Workers] || config[:workers] || Etc.nprocessors).to_i,
-          client: cli_defaults[:client].merge(config[:client] || {})
+          ractors: (options[:Ractors] || config[:ractors] || cli_defaults[:ractors]).to_i,
+          threads: (options[:Threads] || config[:threads] || cli_defaults[:threads]).to_i,
+          app: app
         }
-
-        [:rackup, :on_error, :stats_file, :pidfile].each do |key|
-          result[key] = config[key] if config.key?(key)
-        end
-
+        result[:rackup] = config[:rackup] if config.key?(:rackup)
+        result[:client] = cli_defaults[:client].merge(config[:client] || {})
+        result[:worker_timeout] = (config[:worker_timeout] || cli_defaults[:worker_timeout]).to_i
+        result[:worker_boot_timeout] = (config[:worker_boot_timeout] || cli_defaults[:worker_boot_timeout]).to_i
+        result[:worker_shutdown_timeout] = (config[:worker_shutdown_timeout] || cli_defaults[:worker_shutdown_timeout]).to_i
+        result[:stats_file] = config.key?(:stats_file) ? config[:stats_file] : cli_defaults[:stats_file]
+        result[:pid_file] = config[:pid_file] if config.key?(:pid_file)
+        result[:on_error] = config[:on_error] if config.key?(:on_error)
         result
       end
       private_class_method :build_cluster_options

data/lib/raptor/cli.rb

@@ -12,7 +12,7 @@ module Raptor
   #
   # CLI parses command-line arguments and starts the server cluster with the
   # specified configuration options. It supports configuring the number of
-  # workers, threads, ractors, bind addresses, and various client timeout
+  # workers, ractors, threads, bind addresses, and various client timeout
   # settings.
   #
   # @example Basic usage
@@ -28,9 +28,9 @@ module Raptor
 
     DEFAULT_OPTIONS = {
       binds: ["tcp://0.0.0.0:9292"].freeze,
-      threads: 3,
-      ractors: 1,
       workers: DEFAULT_WORKER_COUNT,
+      ractors: 1,
+      threads: 3,
       rackup: "config.ru",
       client: {
         first_data_timeout: 30,
@@ -39,10 +39,15 @@ module Raptor
         max_body_size: nil,
         body_spool_threshold: 1024 * 1024,
       },
+      worker_timeout: 60,
+      worker_boot_timeout: 60,
+      worker_shutdown_timeout: 30,
       stats_file: "tmp/raptor.json",
-      pidfile: nil,
+      pid_file: nil,
     }.freeze
 
+    DEFAULT_CONFIG_PATHS = ["raptor.rb", "config/raptor.rb"].freeze
+
     # Loads a configuration file and returns the hash it evaluates to.
     #
     # The file is evaluated at the top level so constants like `Raptor::*` resolve
@@ -61,6 +66,20 @@ module Raptor
       config
     end
 
+    # Returns the first existing path in {DEFAULT_CONFIG_PATHS} resolved
+    # against `root`, or nil if none exist.
+    #
+    # Used to pick up a project-local config file when no `-c`/`--config`
+    # flag was supplied.
+    #
+    # @param root [String] directory to resolve the default paths against
+    # @return [String, nil] the config path, or nil if no default file exists
+    #
+    # @rbs (?String root) -> String?
+    def self.default_config_path(root = Dir.pwd)
+      DEFAULT_CONFIG_PATHS.find { |path| File.exist?(File.join(root, path)) }
+    end
+
     # @rbs @command: Symbol
     # @rbs @options: Hash[Symbol, untyped]
     # @rbs @parser: OptionParser
@@ -92,7 +111,7 @@ module Raptor
       @options = DEFAULT_OPTIONS.dup
       @options[:client] = @options[:client].dup
 
-      apply_config_file(extract_config_path(argv))
+      apply_config_file(extract_config_path(argv) || self.class.default_config_path)
 
       @parser = create_parser
       @parser.parse!(argv)
@@ -127,11 +146,12 @@ module Raptor
       data = JSON.parse(File.read(stats_file), symbolize_names: true)
 
       puts "Master PID: #{data[:master_pid]}"
-      data[:workers].each_with_index do |worker, index|
+      data[:workers].each do |worker|
         status = worker[:booted] ? "booted" : "starting"
         last_checkin = Time.at(worker[:last_checkin]).strftime("%H:%M:%S")
-        puts "Worker #{index}: pid=#{worker[:pid]}, requests=#{worker[:requests]}, " \
-             "backlog=#{worker[:backlog]}, #{status}, last_checkin=#{last_checkin}"
+        puts "Worker #{worker[:index]} (phase #{worker[:phase]}): pid=#{worker[:pid]}, requests=#{worker[:requests]}, " \
+             "busy=#{worker[:busy_threads]}/#{worker[:thread_capacity]}, backlog=#{worker[:backlog]}, " \
+             "#{status}, last_checkin=#{last_checkin}"
       end
     end
 
@@ -199,16 +219,16 @@ module Raptor
           end
         end
 
-        opts.on("-t", "--threads NUM", Integer, "Number of threads (default: 3)") do |num|
-          @options[:threads] = num
+        opts.on("-w", "--workers NUM", Integer, "Number of worker processes (default: #{DEFAULT_WORKER_COUNT})") do |num|
+          @options[:workers] = num
         end
 
         opts.on("-r", "--ractors NUM", Integer, "Number of ractors (default: 1)") do |num|
           @options[:ractors] = num
         end
 
-        opts.on("-w", "--workers NUM", Integer, "Number of worker processes (default: #{DEFAULT_WORKER_COUNT})") do |num|
-          @options[:workers] = num
+        opts.on("-t", "--threads NUM", Integer, "Number of threads (default: 3)") do |num|
+          @options[:threads] = num
         end
 
         opts.on("--first-data-timeout SECONDS", Integer, "First data timeout in seconds (default: 30)") do |timeout|
@@ -231,12 +251,24 @@ module Raptor
           @options[:client][:body_spool_threshold] = bytes
         end
 
+        opts.on("--worker-timeout SECONDS", Integer, "Worker check-in timeout in seconds (default: 60)") do |timeout|
+          @options[:worker_timeout] = timeout
+        end
+
+        opts.on("--worker-boot-timeout SECONDS", Integer, "Worker boot timeout in seconds (default: 60)") do |timeout|
+          @options[:worker_boot_timeout] = timeout
+        end
+
+        opts.on("--worker-shutdown-timeout SECONDS", Integer, "Worker shutdown timeout in seconds (default: 30)") do |timeout|
+          @options[:worker_shutdown_timeout] = timeout
+        end
+
         opts.on("--stats-file PATH", String, "Stats file path (default: tmp/raptor.json)") do |path|
           @options[:stats_file] = path
         end
 
-        opts.on("--pidfile PATH", String, "Pidfile path (default: none)") do |path|
-          @options[:pidfile] = path
+        opts.on("--pid-file PATH", String, "PID file path (default: none)") do |path|
+          @options[:pid_file] = path
         end
 
         opts.on("--help", "Show this help") do