http-2-next 0.5.1 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a7c15b998344b09aee75566b64f5ef94abb9b388fdc3d2f06704e8263a586789
-  data.tar.gz: 935a6225e964eb46b6f26e57ccf3080fd231570f3710bf6e78e3f05f589a294f
+  metadata.gz: 772dfd651b9130358e1de248ead9c68729e482dfdd518973a2d4b61d787d7807
+  data.tar.gz: 59dca4e2a1319dc7363b00e3d52ee7889354f0b0bb114fe49bfc7cd47cbcb1e4
 SHA512:
-  metadata.gz: 5d768219d315950da7cc798981c6d081e23f2ffab97f354149ebae1398a25cf3db304bdd81429f8e3f257cb0100cc1a28374a1459cef4dc551d317d9bb1cade0
-  data.tar.gz: 758a733387749553121d3117d9a86ae6109fc28fcbae12cce2852c9d291a30ad133c16060a5374c6c13aadc16af02996fba41a239998d32a194d0516fa75c71f
+  metadata.gz: fb2dce4d9d3f663929771b3141b616030de65f1004e28acee1e01a7d4aa306daba51a839fb9c2e68337d056311369bfb6f1b3bb7dae3cf755a9510839185bef8
+  data.tar.gz: 5c3e377005030768e6056e9cab0076a5e1165ef0aa4433c4920db2cbd29fed171867da9f4b6da5e2c7b64da340bc24f65e01397c90cc7f160ae520f563dbc132

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

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+if RUBY_VERSION < "3.3.0"
+  require "base64"
+elsif !defined?(Base64)
+  module HTTP2Next
+    # require "base64" will not be a default gem after ruby 3.4.0
+    module Base64
+      module_function
+
+      def encode64(bin)
+        [bin].pack("m")
+      end
+
+      def decode64(str)
+        str.unpack1("m")
+      end
+
+      def urlsafe_encode64(bin, padding: true)
+        str = strict_encode64(bin)
+        str.chomp!("==") or str.chomp!("=") unless padding
+        str.tr!("+/", "-_")
+        str
+      end
+    end
+
+    def urlsafe_decode64(str)
+      if !str.end_with?("=") && str.length % 4 != 0
+        str = str.ljust((str.length + 3) & ~3, "=")
+        str.tr!("-_", "+/")
+      else
+        str = str.tr("-_", "+/")
+      end
+      strict_decode64(str)
+    end
+  end
+end

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,14 +722,10 @@ 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.

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

@@ -3,7 +3,7 @@
 module HTTP2Next
   # Stream, connection, and compressor exceptions.
   module Error
-    @types = {} # rubocop:disable ThreadSafety/MutableClassInstanceVariable
+    @types = {}
 
     class << self
       attr_reader :types

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

@@ -1,16 +1,6 @@
 # frozen_string_literal: true
 
 module HTTP2Next
-  module RegexpExtensions
-    unless Regexp.method_defined?(:match?)
-      refine Regexp do
-        def match?(*args)
-          !match(*args).nil?
-        end
-      end
-    end
-  end
-
   module StringExtensions
     refine String do
       def read(n)
@@ -29,12 +19,6 @@ module HTTP2Next
       def shift_byte
         read(1).ord
       end
-
-      unless String.method_defined?(:unpack1)
-        def unpack1(format)
-          unpack(format).first
-        end
-      end
     end
   end
 end

data/lib/http/2/next/header/encoding_context.rb

@@ -8,8 +8,6 @@ module HTTP2Next
     class EncodingContext
       include Error
 
-      using RegexpExtensions
-
       UPPER = /[[:upper:]]/.freeze
 
       # @private

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

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "base64"
 module HTTP2Next
   # HTTP 2.0 server connection class that implements appropriate header
   # compression / decompression algorithms and stream management logic.

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 }
@@ -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 = "0.5.1"
+  VERSION = "1.0.1"
 end

data/lib/http/2/next.rb

@@ -2,6 +2,7 @@
 
 require "http/2/next/version"
 require "http/2/next/extensions"
+require "http/2/next/base64"
 require "http/2/next/error"
 require "http/2/next/emitter"
 require "http/2/next/flow_buffer"

data/sig/connection.rbs

@@ -17,9 +17,30 @@ module HTTP2Next
     attr_reader local_settings: settings_hash
     attr_reader pending_settings: settings_ary
 
-    attr_reader active_stream_count: Integer
+    attr_accessor active_stream_count: Integer
 
-    attr_writer max_streams: Integer?
+    @stream_id: Integer
+    @active_stream_count: Integer
+    @last_activated_stream: Integer
+    @last_stream_id: Integer
+
+    @streams: Hash[Integer, Stream]
+    @streams_recently_closed: Hash[Integer, Stream]
+
+    @framer: Framer
+
+    @local_window_limit: Integer
+    @remote_window_limit: Integer
+
+    @compressor: Header::Compressor
+    @decompressor: Header::Decompressor
+    @error: Symbol?
+
+    @recv_buffer: String
+    @continuation: Array[frame]
+
+    @closed_since: Float?
+    @received_frame: bool
 
     def closed?: () -> bool
 
@@ -37,9 +58,9 @@ module HTTP2Next
     def receive: (string data) -> void
     alias << receive
 
-    private
+    def initialize: (?settings_hash) -> void
 
-    def initialize: (?settings_hash) -> untyped
+    private
 
     def send: (frame) -> void
 
@@ -67,6 +88,6 @@ module HTTP2Next
 
     def _verify_pseudo_headers: (frame, Array[String]) -> void
 
-    def connection_error: (?Symbol error, ?msg: String, ?e: StandardError) -> void
+    def connection_error: (?Symbol error, ?msg: String?, ?e: StandardError?) -> void
   end
 end

data/sig/error.rbs

@@ -1,2 +1,35 @@
 module HTTP2Next
+  module Error
+    def self?.types: () -> Hash[Symbol, singleton(Error)]
+
+    class Error < StandardError
+    end
+
+    class HandshakeError < Error
+    end
+
+    class ProtocolError < Error
+    end
+
+    class CompressionError < ProtocolError
+    end
+
+    class FlowControlError < ProtocolError
+    end
+
+    class InternalError < ProtocolError
+    end
+
+    class StreamClosed < Error
+    end
+
+    class ConnectionClosed < Error
+    end
+
+    class StreamLimitExceeded < Error
+    end
+
+    class FrameSizeError < Error
+    end
+  end
 end

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: 0.5.1
+  version: 1.0.1
 platform: ruby
 authors:
 - Tiago Cardoso
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-10 00:00:00.000000000 Z
+date: 2023-10-13 00:00:00.000000000 Z
 dependencies: []
 description: Pure-ruby HTTP 2.0 protocol implementation
 email:
@@ -21,6 +21,7 @@ extra_rdoc_files: []
 files:
 - README.md
 - lib/http/2/next.rb
+- lib/http/2/next/base64.rb
 - lib/http/2/next/client.rb
 - lib/http/2/next/connection.rb
 - lib/http/2/next/emitter.rb
@@ -70,14 +71,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Pure-ruby HTTP 2.0 protocol implementation