raptor 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a43fe40aecdcdd5ff72bf3ecfde433611877d563e483163b868efcf0870ae39
-  data.tar.gz: 9e7e6761bb6cee495f6081715461cc10b4c8ebf1e6480e7f5b1c80715d28337b
+  metadata.gz: d4a7acc08848f71017602d3abfb38b7d352a48d7bc7929e54f3a693dc3a0fe83
+  data.tar.gz: 1ee020abeb67db2a2eba6ff64f59054bf2e91447bd3996464f5a3279c3d3e748
 SHA512:
-  metadata.gz: 5f792cac133140519597d727972b649781288fc2ccc4d60243bf53502a33b8a764494e2b148f1f992a3af42002a8b2b52d535dad8ee988bd7725f100541ed6ff
-  data.tar.gz: 1a0715da97c2c325ba70e5daa77c89d6169991034bd83f78ba1f86956e996e0a153b468e296288ba4d2a991499319628231d81b3695db2a57b8e8138ee4ac094
+  metadata.gz: b5b25843f29afe7e47a90c85f48ba5f9d06e7f5dc819d24595821940f8207fa46054208f38601a455271d026246bfd32144329782f1a842f44cd500bf3d10bbf
+  data.tar.gz: 5c1f9f18fbf946a8e4a648bed675f83ba7d71bdc9a85354b5df1ccc6ba39bd65b5740c31e1ffd11f4f88960b52aaee0ce2b46747fac52907bae6b6598f4e390e

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## [Unreleased]
 
+## [0.7.0] - 2026-06-12
+
+- Eagerly consume back-to-back HTTP/2 frame batches in the pipeline collector
+
 ## [0.6.0] - 2026-06-02
 
 - Raise the backpressure threshold floor so low thread counts don't throttle prematurely

data/README.md

@@ -66,9 +66,9 @@ Raptor 0.6.0 vs Puma 8.0.2:
 
 | Protocol              | Raptor      | Puma        |
 | --------------------- | ----------- | ----------- |
-| HTTP/1.1              | 20.2k req/s | 20k req/s   |
-| HTTP/1.1 (keep-alive) | 61.4k req/s | 39.2k req/s |
-| HTTP/2                | 22.8k req/s | N/A         |
+| HTTP/1.1              | 17.9k req/s | 16.8k req/s |
+| HTTP/1.1 (keep-alive) | 60k req/s   | 29.6k req/s |
+| HTTP/2                | 57.2k req/s | N/A         |
 
 > ruby 4.0.5 (2026-05-20 revision 64336ffd0e) +YJIT +PRISM [arm64-darwin23]
 > 4 workers, 3 threads, 12 concurrent connections

data/lib/raptor/http2.rb

@@ -223,6 +223,10 @@ module Raptor
       end
     end
 
+    EAGER_READ_TIMEOUT = 0.001
+    EAGER_READ_BUFFER_SIZE = 64 * 1024
+    EAGER_MAX_ROUNDS = 4
+
     FLAG_END_STREAM = 0x1
     FLAG_END_HEADERS = 0x4
     FLAG_ACK = 0x1
@@ -236,7 +240,7 @@ module Raptor
 
     SERVER_PROTOCOL = "HTTP/2"
     RACK_HEADER_PREFIX = "rack."
-    HOP_BY_HOP_HEADERS = Set.new(%w[connection transfer-encoding keep-alive upgrade proxy-connection]).freeze
+    HOP_BY_HOP_HEADERS = ["connection", "transfer-encoding", "keep-alive", "upgrade", "proxy-connection"].freeze
 
     # @rbs @app: ^(Hash[String, untyped]) -> [Integer, Hash[String, String | Array[String]], untyped]
     # @rbs @server_port: Integer
@@ -500,7 +504,9 @@ module Raptor
     # Handles a parsed HTTP/2 request from the ractor pool.
     #
     # Writes outgoing protocol frames to the socket, updates reactor state,
-    # and dispatches completed stream requests to the thread pool.
+    # and dispatches completed stream requests to the thread pool. Eagerly
+    # consumes subsequent frame batches that are already buffered, skipping
+    # the reactor and ractor pool hops while the connection is hot.
     #
     # @param result [Hash] the parsed result from the ractor pool
     # @param reactor [Reactor] the reactor managing the connection
@@ -515,31 +521,42 @@ module Raptor
       writer = reactor.writer_for(result[:id])
       flow_control = reactor.flow_control_for(result[:id])
 
-      if flow_control && (result[:window_updates] || result[:peer_initial_window_size])
-        apply_flow_control_updates(flow_control, result)
-      end
-
-      writer.write_frames(socket, result[:outgoing_frames])
+      rounds = 0
+      loop do
+        if flow_control && (result[:window_updates] || result[:peer_initial_window_size])
+          apply_flow_control_updates(flow_control, result)
+        end
 
-      if result[:close_connection]
-        reactor.close_connection(result[:id])
-        return
-      end
+        writer.write_frames(socket, result[:outgoing_frames])
 
-      reactor.update_http2_state(result)
+        if result[:close_connection]
+          reactor.close_connection(result[:id])
+          return
+        end
 
-      result[:completed_requests]&.each do |request|
-        stream_id = request[:stream_id]
-        remote_addr = result[:remote_addr] || Server::DEFAULT_REMOTE_ADDR
+        result[:completed_requests]&.each do |request|
+          stream_id = request[:stream_id]
+          remote_addr = result[:remote_addr] || Server::DEFAULT_REMOTE_ADDR
 
-        thread_pool << proc do
-          dispatch_stream_request(
-            socket, writer, flow_control, stream_id,
-            request[:headers], request[:body],
-            remote_addr: remote_addr
-          )
+          thread_pool << proc do
+            dispatch_stream_request(
+              socket, writer, flow_control, stream_id,
+              request[:headers], request[:body],
+              remote_addr: remote_addr
+            )
+          end
         end
+
+        rounds += 1
+        break if rounds >= EAGER_MAX_ROUNDS
+
+        next_batch = eager_read_next_batch(socket)
+        break unless next_batch
+
+        result = Raptor::Http2.process_frames(result.merge(buffer: result[:buffer] + next_batch))
       end
+
+      reactor.update_http2_state(result)
     end
 
     private
@@ -566,6 +583,32 @@ module Raptor
       end
     end
 
+    # Reads the next frame batch from `socket` within a short window, or
+    # returns nil if nothing arrives in time.
+    #
+    # @param socket [OpenSSL::SSL::SSLSocket] the connection socket
+    # @return [String, nil] the bytes read, or nil if nothing was available
+    #
+    # @rbs (OpenSSL::SSL::SSLSocket socket) -> String?
+    def eager_read_next_batch(socket)
+      return unless socket.wait_readable(EAGER_READ_TIMEOUT)
+
+      data = begin
+        socket.read_nonblock(EAGER_READ_BUFFER_SIZE)
+      rescue IO::WaitReadable, EOFError, IOError
+        return
+      end
+
+      buffer = String.new
+      buffer << data
+
+      while socket.pending > 0
+        buffer << socket.read_nonblock(socket.pending)
+      end
+
+      buffer
+    end
+
     # Dispatches a completed stream request to the Rack app and writes
     # the response back as HTTP/2 frames.
     #

data/lib/raptor/request.rb

@@ -35,7 +35,7 @@ module Raptor
       h[status] = "HTTP/1.1 #{status}#{reason ? " #{reason}" : ""}\r\n".freeze
     end
 
-    STATUS_WITH_NO_ENTITY_BODY = Set.new([204, 304, *100..199]).freeze
+    STATUS_WITH_NO_ENTITY_BODY = [204, 304, *100..199].freeze
     BAD_REQUEST_RESPONSE = "HTTP/1.1 400 Bad Request\r\nContent-Length: 0\r\nConnection: close\r\n\r\n"
     INTERNAL_SERVER_ERROR_RESPONSE = "HTTP/1.1 500 Internal Server Error\r\nContent-Length: 0\r\nConnection: close\r\n\r\n"
     CONTENT_TOO_LARGE_RESPONSE = "HTTP/1.1 413 Content Too Large\r\nContent-Length: 0\r\nConnection: close\r\n\r\n"
@@ -947,7 +947,7 @@ module Raptor
     def calculate_content_length(body)
       if body.respond_to?(:to_ary)
         array = body.to_ary
-        return nil unless array.is_a?(Array)
+        return unless array.is_a?(Array)
 
         array.sum { |chunk| chunk.is_a?(String) ? chunk.bytesize : 0 }
       elsif body.respond_to?(:to_path) && (path = body.to_path) && File.readable?(path)

data/lib/raptor/version.rb

@@ -2,5 +2,5 @@
 # frozen_string_literal: true
 
 module Raptor
-  VERSION = "0.6.0"
+  VERSION = "0.7.0"
 end

data/sig/generated/raptor/http2.rbs

@@ -112,6 +112,12 @@ module Raptor
       def discard_stream: (Integer stream_id) -> void
     end
 
+    EAGER_READ_TIMEOUT: ::Float
+
+    EAGER_READ_BUFFER_SIZE: untyped
+
+    EAGER_MAX_ROUNDS: ::Integer
+
     FLAG_END_STREAM: ::Integer
 
     FLAG_END_HEADERS: ::Integer
@@ -205,7 +211,9 @@ module Raptor
     # Handles a parsed HTTP/2 request from the ractor pool.
     #
     # Writes outgoing protocol frames to the socket, updates reactor state,
-    # and dispatches completed stream requests to the thread pool.
+    # and dispatches completed stream requests to the thread pool. Eagerly
+    # consumes subsequent frame batches that are already buffered, skipping
+    # the reactor and ractor pool hops while the connection is hot.
     #
     # @param result [Hash] the parsed result from the ractor pool
     # @param reactor [Reactor] the reactor managing the connection
@@ -227,6 +235,15 @@ module Raptor
     # @rbs (FlowControl flow_control, Hash[Symbol, untyped] result) -> void
     def apply_flow_control_updates: (FlowControl flow_control, Hash[Symbol, untyped] result) -> void
 
+    # Reads the next frame batch from `socket` within a short window, or
+    # returns nil if nothing arrives in time.
+    #
+    # @param socket [OpenSSL::SSL::SSLSocket] the connection socket
+    # @return [String, nil] the bytes read, or nil if nothing was available
+    #
+    # @rbs (OpenSSL::SSL::SSLSocket socket) -> String?
+    def eager_read_next_batch: (OpenSSL::SSL::SSLSocket socket) -> String?
+
     # Dispatches a completed stream request to the Rack app and writes
     # the response back as HTTP/2 frames.
     #

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: raptor
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Joshua Young