http-2-next 1.0.0 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 910d4e858a63a1b882621dbf2951f2f8a20c29be458de15c9633b451594b797a
-  data.tar.gz: a2ab88e4f38a97320f0d338c149485ee5976645fccd110bd839ba96d6f59432f
+  metadata.gz: 63f956f2326b803ec836c578b8f98326934897307bda409f2c639e5c88893689
+  data.tar.gz: fbb8a4486463e0e0e5c0d4ed04cf4120a73acdf169f99b99365a0805f89fe5c1
 SHA512:
-  metadata.gz: 72ca980c5aa292e4e92cdf625f8769c77a2a12a9452736a254c668f55cfcdcdcde493db0d8e760eb7d4c1981aadbcdb08f0f48970b8453b3a59dbb5c9ef2a614
-  data.tar.gz: 6875ba9d1136b4c146e89c1b5dad811e4225adb03f99340b09dab0a54f7eeee4aab04596e9bed9f1d68de6b2770aa1548a662d4c9969356612ede4c5d48c2864
+  metadata.gz: 628b410fe470df16e61d11732c65553381bcb060f2fe2639af4889aff5d9e3a046ee55e1d67599e1c268dd38c3f4ff22f8fb257ee100a96ba384a9ea1e976726
+  data.tar.gz: 86e1148ca63e9d36745ab703ab29f174fdae5cb8473b167fa4f09138274899713cb57e7604c6ff51d0fae493ea98262b1d86adf94c42c0248e50721ae2f63add

data/lib/http/2/next/connection.rb

@@ -71,10 +71,7 @@ module HTTP2Next
 
     # Number of active streams between client and server (reserved streams
     # are not counted towards the stream limit).
-    attr_reader :active_stream_count
-
-    # Max number of streams that can be in-transit in this connection.
-    attr_writer :max_streams
+    attr_accessor :active_stream_count
 
     # Initializes new connection object.
     #
@@ -86,7 +83,6 @@ module HTTP2Next
       @decompressor = Header::Decompressor.new(settings)
 
       @active_stream_count = 0
-      @max_streams = nil
       @last_activated_stream = 0
       @last_stream_id = 0
       @streams = {}
@@ -120,8 +116,7 @@ module HTTP2Next
     # @param parent [Stream]
     def new_stream(**args)
       raise ConnectionClosed if @state == :closed
-
-      raise StreamLimitExceeded if @active_stream_count >= (@max_streams || @remote_settings[:settings_max_concurrent_streams])
+      raise StreamLimitExceeded if @active_stream_count >= @remote_settings[:settings_max_concurrent_streams]
 
       connection_error(:protocol_error, msg: "id is smaller than previous") if @stream_id < @last_activated_stream
 
@@ -727,24 +722,22 @@ module HTTP2Next
     def activate_stream(id:, **args)
       connection_error(msg: "Stream ID already exists") if @streams.key?(id)
 
-      raise StreamLimitExceeded if @active_stream_count >= (@max_streams || @local_settings[:settings_max_concurrent_streams])
+      raise StreamLimitExceeded if @active_stream_count >= @local_settings[:settings_max_concurrent_streams]
 
       stream = Stream.new(connection: self, id: id, **args)
 
-      # Streams that are in the "open" state, or either of the "half closed"
-      # states count toward the maximum number of streams that an endpoint is
-      # permitted to open.
-      stream.once(:active) { @active_stream_count += 1 }
       stream.once(:close) do
         # Store a reference to the closed stream, such that we can respond
         # to any in-flight frames while close is registered on both sides.
         # References to such streams will be purged whenever another stream
         # is closed, with a minimum of 15s RTT time window.
-        @streams_recently_closed.reject! do |stream_id, v|
-          to_delete = (Process.clock_gettime(Process::CLOCK_MONOTONIC) - v) > 15
-          @streams.delete stream_id if to_delete
-          to_delete
-        end
+        now = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+
+        # TODO: use a drop_while! variant whenever there is one.
+        @streams_recently_closed = @streams_recently_closed.drop_while do |_, v|
+          (now - v) > 15
+        end.to_h
+
         @streams_recently_closed[id] = Process.clock_gettime(Process::CLOCK_MONOTONIC)
       end
 

data/lib/http/2/next/stream.rb

@@ -91,6 +91,7 @@ module HTTP2Next
       @_method = @_content_length = @_status_code = nil
       @_waiting_on_trailers = false
       @received_data = false
+      @activated = false
 
       on(:window) { |v| @remote_window = v }
       on(:local_window) { |v| @local_window_max_size = @local_window = v }
@@ -169,7 +170,7 @@ module HTTP2Next
       trailers = frame[:payload]
       return unless trailers.respond_to?(:each)
 
-      trailers.each do |field, _|
+      trailers.each do |field, _| # rubocop:disable Style/HashEachMethods
         @_trailers.delete(field)
         break if @_trailers.empty?
       end
@@ -605,7 +606,7 @@ module HTTP2Next
       case newstate
       when :open
         @state = newstate
-        emit(:active)
+        activate_stream_in_conn
 
       when :reserved_local, :reserved_remote
         @state = newstate
@@ -613,7 +614,7 @@ module HTTP2Next
 
       when :half_closed_local, :half_closed_remote
         @closed = newstate
-        emit(:active) unless @state == :open
+        activate_stream_in_conn unless @state == :open
         @state = :half_closing
 
       when :local_closed, :remote_closed, :local_rst, :remote_rst
@@ -624,11 +625,25 @@ module HTTP2Next
       @state
     end
 
+    # Streams that are in the "open" state, or either of the "half closed"
+    # states count toward the maximum number of streams that an endpoint is
+    # permitted to open.
+    def activate_stream_in_conn
+      @connection.active_stream_count += 1
+      @activated = true
+      emit(:active)
+    end
+
+    def close_stream_in_conn(*args)
+      @connection.active_stream_count -= 1 if @activated
+      emit(:close, *args)
+    end
+
     def complete_transition(frame)
       case @state
       when :closing
         @state = :closed
-        emit(:close, frame[:error])
+        close_stream_in_conn(frame[:error])
       when :half_closing
         @state = @closed
         emit(:half_close)

data/lib/http/2/next/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module HTTP2Next
-  VERSION = "1.0.0"
+  VERSION = "1.0.2"
 end

data/sig/connection.rbs

@@ -17,9 +17,7 @@ module HTTP2Next
     attr_reader local_settings: settings_hash
     attr_reader pending_settings: settings_ary
 
-    attr_reader active_stream_count: Integer
-
-    attr_writer max_streams: Integer?
+    attr_accessor active_stream_count: Integer
 
     @stream_id: Integer
     @active_stream_count: Integer

data/sig/stream.rbs

@@ -12,6 +12,16 @@ module HTTP2Next
     attr_reader local_window: Integer
     attr_reader closed: Symbol?
 
+    @connection: Connection
+    @local_window_max_size: Integer
+    @error: bool
+    @_method: String?
+    @_content_length: Integer?
+    @_status_code: Integer?
+    @_waiting_on_trailers: bool
+    @received_data: bool
+    @activated: bool
+
     alias window local_window
 
     def closed?: () -> bool
@@ -61,6 +71,10 @@ module HTTP2Next
 
     def event: (Symbol newstate) -> void
 
+    def activate_stream_in_conn: () -> void
+
+    def close_stream_in_conn: (*untyped) -> void
+
     def complete_transition: (frame) -> void
 
     def process_priority: ({weight: Integer, dependency: Integer, exclusive: bool}) -> void

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: http-2-next
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.2
 platform: ruby
 authors:
 - Tiago Cardoso
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-03 00:00:00.000000000 Z
+date: 2023-12-14 00:00:00.000000000 Z
 dependencies: []
 description: Pure-ruby HTTP 2.0 protocol implementation
 email: