http-2-next 0.4.3 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aba29aa46e044dc37656a40df1cce81dcdc185fcb166d456592e5e05b5a45295
-  data.tar.gz: 95ada3112561c105b5d2a9e9545aab8a29809c49bd5a70d7c64690ce80b47ccc
+  metadata.gz: 0c5f4b4de69d36a492e6cfff41b62c48184e85fa75505592e23b404892f69511
+  data.tar.gz: 9cba9804729c9617564990720cb4594ec41e32b10c2c1fb3baff545de5fb0b02
 SHA512:
-  metadata.gz: 3e0e50d2c307de9733f7951f9abb1a67c111da2b2740f04b7d204343410258981d28917dd0c22e7b8f6e6be9dec4bfb73f20fa118183a54268d1f4d2db43ce85
-  data.tar.gz: 4c5b8b4a840853e6d785b9d7565753e7e011a5db6d0b5b59fe042cd09491c10c429761a929824af83378b318d3eff43e58949ab6967bf57f6d571a89738ba77e
+  metadata.gz: 05dbde11166258b25aa492cebc9eb3f5c1ac5f9e52bcefd0150c7c9be7584de0152af624fb8e406439fca4fb3bc96c0460a6bd6168a319562532d74176ffbb95
+  data.tar.gz: e5d916406df282f618cd64443db492b4a0e817e35484bb31c37d1146d9d67493b5fce715cf220710ad220d9d7fe4ae6aacd2f8c973126509f1d99f71e9ee6587

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

@@ -74,8 +74,8 @@ module HTTP2Next
 
     private
 
-    def verify_pseudo_headers(frame, mandatory_headers = RESPONSE_MANDATORY_HEADERS)
-      super(frame, mandatory_headers)
+    def verify_pseudo_headers(frame)
+      _verify_pseudo_headers(frame, RESPONSE_MANDATORY_HEADERS)
     end
   end
 end

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

@@ -17,7 +17,7 @@ module HTTP2Next
     settings_max_concurrent_streams: Framer::MAX_STREAM_ID, # unlimited
     settings_initial_window_size: 65_535,
     settings_max_frame_size: 16_384,
-    settings_max_header_list_size: 2**31 - 1 # unlimited
+    settings_max_header_list_size: (2 << 30) - 1 # unlimited
   }.freeze
 
   DEFAULT_CONNECTION_SETTINGS = {
@@ -26,7 +26,7 @@ module HTTP2Next
     settings_max_concurrent_streams: 100,
     settings_initial_window_size: 65_535,
     settings_max_frame_size: 16_384,
-    settings_max_header_list_size: 2**31 - 1 # unlimited
+    settings_max_header_list_size: (2 << 30) - 1 # unlimited
   }.freeze
 
   # Default stream priority (lower values are higher priority).
@@ -120,6 +120,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])
 
       connection_error(:protocol_error, msg: "id is smaller than previous") if @stream_id < @last_activated_stream
@@ -344,7 +345,7 @@ module HTTP2Next
               end
             end
 
-            verify_pseudo_headers(frame, REQUEST_MANDATORY_HEADERS)
+            _verify_pseudo_headers(frame, REQUEST_MANDATORY_HEADERS)
             stream = activate_stream(id: pid, parent: parent)
             verify_stream_order(stream.id)
             emit(:promise, stream)
@@ -380,7 +381,7 @@ module HTTP2Next
               # (see Section 5.1).
               when :window_update
                 stream = @streams_recently_closed[frame[:stream]]
-                connection_error(:protocol_error, "sent window update on idle stream") unless stream
+                connection_error(:protocol_error, msg: "sent window update on idle stream") unless stream
                 process_window_update(frame: frame, encode: true)
               else
                 # An endpoint that receives an unexpected stream identifier
@@ -397,8 +398,8 @@ module HTTP2Next
       connection_error(e: e)
     end
 
-    def <<(*args)
-      receive(*args)
+    def <<(data)
+      receive(data)
     end
 
     private
@@ -692,26 +693,28 @@ module HTTP2Next
 
       frames = []
 
-      while payload && payload.bytesize > 0
-        cont = frame.dup
-        cont[:type] = :continuation
-        cont[:flags] = []
-        cont[:payload] = payload.byteslice(0, @remote_settings[:settings_max_frame_size])
-        payload = payload.byteslice(@remote_settings[:settings_max_frame_size]..-1)
-        frames << cont
-      end
-      if frames.empty?
-        frames = [frame]
-      else
-        frames.first[:type]  = frame[:type]
-        frames.first[:flags] = frame[:flags] - [:end_headers]
-        frames.last[:flags] << :end_headers
+      begin
+        while payload && payload.bytesize > 0
+          cont = frame.dup
+          cont[:type] = :continuation
+          cont[:flags] = []
+          cont[:payload] = payload.byteslice(0, @remote_settings[:settings_max_frame_size])
+          payload = payload.byteslice(@remote_settings[:settings_max_frame_size]..-1)
+          frames << cont
+        end
+
+        if frames.empty?
+          frames << frame
+        else
+          frames.first[:type]  = frame[:type]
+          frames.first[:flags] = frame[:flags] - [:end_headers]
+          frames.last[:flags] << :end_headers
+        end
+      rescue StandardError => e
+        connection_error(:compression_error, e: e)
       end
 
       frames
-    rescue StandardError => e
-      connection_error(:compression_error, e: e)
-      nil
     end
 
     # Activates new incoming or outgoing stream and registers appropriate
@@ -758,7 +761,7 @@ module HTTP2Next
       @last_stream_id = id
     end
 
-    def verify_pseudo_headers(frame, mandatory_headers)
+    def _verify_pseudo_headers(frame, mandatory_headers)
       headers = frame[:payload]
       return if headers.is_a?(String)
 

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

@@ -11,7 +11,11 @@ module HTTP2Next
     class Error < StandardError
       def self.inherited(klass)
         super
-        type = klass.name.split("::").last
+
+        type = klass.name or return
+
+        type = type.split("::").last or return
+
         type = type.gsub(/([^\^])([A-Z])/, '\1_\2').downcase.to_sym
         HTTP2Next::Error.types[type] = klass
       end

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

@@ -7,7 +7,7 @@ module HTTP2Next
   module FlowBuffer
     include Error
 
-    MAX_WINDOW_SIZE = 2**31 - 1
+    MAX_WINDOW_SIZE = (2 << 30) - 1
 
     # Amount of buffered data. Only DATA payloads are subject to flow stream
     # and connection flow control.
@@ -118,9 +118,7 @@ module HTTP2Next
     end
 
     def retrieve(window_size)
-      return if @buffer.empty?
-
-      frame = @buffer.first
+      frame = @buffer.first or return
 
       frame_size = frame[:payload].bytesize
       end_stream = frame[:flags].include? :end_stream
@@ -133,7 +131,7 @@ module HTTP2Next
       @buffer.shift
 
       if frame_size > window_size
-        payload = frame.delete(:payload)
+        payload = frame[:payload]
         chunk   = frame.dup
 
         # Split frame so that it fits in the window

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

@@ -9,7 +9,7 @@ module HTTP2Next
     include Error
 
     # Default value of max frame size (16384 bytes)
-    DEFAULT_MAX_FRAME_SIZE = 2**14
+    DEFAULT_MAX_FRAME_SIZE = 2 << 13
 
     # maximum frame size
     attr_accessor :local_max_frame_size, :remote_max_frame_size
@@ -460,14 +460,14 @@ module HTTP2Next
 
     private
 
-    def pack_error(e)
-      unless e.is_a? Integer
-        e = DEFINED_ERRORS[e]
+    def pack_error(error)
+      unless error.is_a? Integer
+        error = DEFINED_ERRORS[error]
 
-        raise CompressionError, "Unknown error ID for #{e}" unless e
+        raise CompressionError, "Unknown error ID for #{error}" unless error
       end
 
-      [e].pack(UINT32)
+      [error].pack(UINT32)
     end
 
     def unpack_error(error)

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

@@ -79,6 +79,13 @@ module HTTP2Next
         ["www-authenticate",            ""]
       ].each { |pair| pair.each(&:freeze).freeze }.freeze
 
+      STATIC_TABLE_BY_FIELD = STATIC_TABLE
+                              .each_with_object({})
+                              .each_with_index { |((field, value), hs), idx| (hs[field] ||= []) << [idx, value] }
+                              .each { |pair| pair.each(&:freeze).freeze }.freeze
+
+      STATIC_TABLE_SIZE = STATIC_TABLE.size
+
       # Current table of header key-value pairs.
       attr_reader :table
 
@@ -133,7 +140,7 @@ module HTTP2Next
       # @return [Array] +[key, value]+
       def dereference(index)
         # NOTE: index is zero-based in this module.
-        value = STATIC_TABLE[index] || @table[index - STATIC_TABLE.size]
+        value = STATIC_TABLE[index] || @table[index - STATIC_TABLE_SIZE]
         raise CompressionError, "Index too large" unless value
 
         value
@@ -245,22 +252,24 @@ module HTTP2Next
         name_only = nil
 
         if %i[all static].include?(@options[:index])
-          STATIC_TABLE.each_index do |i|
-            if STATIC_TABLE[i] == header
-              exact ||= i
-              break
-            elsif STATIC_TABLE[i].first == header.first
+          field, value = header
+          if (svalues = STATIC_TABLE_BY_FIELD[field])
+            svalues.each do |i, svalue|
               name_only ||= i
+              if svalue == value
+                exact = i
+                break
+              end
             end
           end
         end
         if [:all].include?(@options[:index]) && !exact
           @table.each_index do |i|
             if @table[i] == header
-              exact ||= i + STATIC_TABLE.size
+              exact ||= i + STATIC_TABLE_SIZE
               break
             elsif @table[i].first == header.first
-              name_only ||= i + STATIC_TABLE.size
+              name_only ||= i + STATIC_TABLE_SIZE
             end
           end
         end

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

@@ -133,8 +133,8 @@ module HTTP2Next
       send(type: :origin, stream: 0, payload: @origin_set)
     end
 
-    def verify_pseudo_headers(frame, mandatory_headers = REQUEST_MANDATORY_HEADERS)
-      super(frame, mandatory_headers)
+    def verify_pseudo_headers(frame)
+      _verify_pseudo_headers(frame, REQUEST_MANDATORY_HEADERS)
     end
 
     # Handle locally initiated server-push event emitted by the stream.

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

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

data/sig/connection.rbs

@@ -3,6 +3,9 @@ module HTTP2Next
     include FlowBuffer
     include Emitter
 
+    REQUEST_MANDATORY_HEADERS: Array[String]
+    RESPONSE_MANDATORY_HEADERS: Array[String]
+
     attr_reader state: Symbol
 
     attr_reader local_window: Integer
@@ -12,28 +15,20 @@ module HTTP2Next
 
     attr_reader remote_settings: settings_hash
     attr_reader local_settings: settings_hash
-    attr_reader pending_settings: settings_hash
+    attr_reader pending_settings: settings_ary
 
     attr_reader active_stream_count: Integer
 
-    attr_writer max_streams: Integer
+    attr_writer max_streams: Integer?
 
     def closed?: () -> bool
 
-    def new_stream: (
-      ?weight: Integer,
-      ?dependency: Integer,
-      ?exclusive: bool,
-      ?parent: Stream?,
-      ?state: Symbol
-    ) -> Stream
+    def new_stream: (**untyped) -> Stream
 
     def ping: (String) -> void
             | (String) { () -> void } -> void
 
-    def goaway: (Symbol, String?) -> void
-              | (Symbol) -> void
-              | () -> void
+    def goaway: (?Symbol, ?String) -> void
 
     def window_update: (Integer increment) -> void
 
@@ -44,7 +39,7 @@ module HTTP2Next
 
     private
 
-    def initialize: (settings_hash) -> untyped
+    def initialize: (?settings_hash) -> untyped
 
     def send: (frame) -> void
 
@@ -64,10 +59,14 @@ module HTTP2Next
 
     def encode_headers: (frame) -> Array[frame]
 
-    def activate_stream: (id: Integer, **untyped) -> void
+    def activate_stream: (id: Integer, **untyped) -> Stream
 
     def verify_stream_order: (Integer id) -> void
 
-    def verify_pseudo_headers: (frame, Array[String]) -> void
+    def verify_pseudo_headers: (frame) -> void
+
+    def _verify_pseudo_headers: (frame, Array[String]) -> void
+
+    def connection_error: (?Symbol error, ?msg: String, ?e: StandardError) -> void
   end
 end

data/sig/error.rbs

@@ -0,0 +1,2 @@
+module HTTP2Next
+end

data/sig/flow_buffer.rbs

@@ -14,9 +14,7 @@ module HTTP2Next
 
     def calculate_window_update: (Integer) -> void
 
-    def send_data: () -> void
-                 | (frame?) -> void
-                 | (frame?, bool) -> void
+    def send_data: (?frame? frame, ?bool encode) -> void
 
     def process_window_update: (frame: frame, ?encode: bool) -> void
   end

data/sig/frame_buffer.rbs

@@ -2,12 +2,12 @@ module HTTP2Next
   class FrameBuffer
     attr_reader bytesize: Integer
 
-    @buffer: Array[String]
+    @buffer: Array[data_frame]
 
-    def <<: (frame) -> void
+    def <<: (data_frame) -> void
 
     def empty?: () -> bool
 
-    def retrieve: (Integer) -> frame? 
+    def retrieve: (Integer) -> data_frame?
   end
 end

data/sig/framer.rbs

@@ -1,7 +1,36 @@
 module HTTP2Next
   class Framer
+    DEFAULT_MAX_FRAME_SIZE: Integer
+
+    MAX_STREAM_ID: Integer
+
+    MAX_WINDOWINC: Integer
+
+    FRAME_TYPES: Hash[Symbol, Integer]
+
+    FRAME_TYPES_WITH_PADDING: Array[Symbol]
+
+    FRAME_FLAGS: Hash[Symbol, Hash[Symbol, Integer]]
+
+    DEFINED_SETTINGS: Hash[Symbol, Integer]
+
+    DEFINED_ERRORS: Hash[Symbol, Integer]
+
+    RBIT: Integer
+    RBYTE: Integer
+    EBIT: Integer
+    UINT32: String
+    UINT16: String
+    UINT8: String
+    HEADERPACK: String
+    FRAME_LENGTH_HISHIFT: Integer
+    FRAME_LENGTH_LOMASK: Integer
+
+    @local_max_frame_size: Integer
+    @remote_max_frame_size: Integer
+
     attr_accessor local_max_frame_size: Integer
-    
+
     attr_accessor remote_max_frame_size: Integer
 
     def common_header: (frame) -> String
@@ -14,11 +43,9 @@ module HTTP2Next
 
     private
 
-    def initialize: (Integer, Integer) -> untyped
-                  | (Integer) -> untyped
-                  | () -> untyped
+    def initialize: (?Integer local_max_frame_size, ?Integer remote_max_frame_size) -> untyped
 
-    def pack_error: (Integer | Symbol e) -> String
+    def pack_error: (Integer | Symbol error) -> String
 
     def unpack_error: (Integer) -> (Symbol | Integer)
   end

data/sig/header.rbs

@@ -11,5 +11,17 @@ module HTTP2Next
     type context_hash = Hash[Symbol, Symbol | Integer]
 
     type header_command = Hash[header_key, header_value]
+
+    HEADREP: Hash[Symbol, Hash[Symbol, Integer]]
+
+    NAIVE: Hash[Symbol, Symbol]
+    LINEAR: Hash[Symbol, Symbol]
+    STATIC: Hash[Symbol, Symbol]
+    SHORTER: Hash[Symbol, Symbol]
+    NAIVEH: Hash[Symbol, Symbol]
+    LINEARH: Hash[Symbol, Symbol]
+    STATICH: Hash[Symbol, Symbol]
+    SHORTERH: Hash[Symbol, Symbol]
+
   end
 end

data/sig/next.rbs

@@ -1,4 +1,6 @@
 module HTTP2Next
+  VERSION: String
+
   DEFAULT_FLOW_WINDOW: Integer
 
   DEFAULT_HEADER_SIZE: Integer
@@ -7,7 +9,9 @@ module HTTP2Next
 
   type settings_hash = Hash[Symbol, Integer]
 
-  type settings_enum = Enumerable[Symbol, Integer]
+  type settings_ary = Array[settings_enum]
+
+  type settings_enum = Enumerable[[Symbol, Integer]]
 
   SPEC_DEFAULT_CONNECTION_SETTINGS: settings_hash
 
@@ -17,14 +21,14 @@ module HTTP2Next
 
   CONNECTION_PREFACE_MAGIC: String
 
-  REQUEST_MANDATORY_HEADERS: Array[Symbol]
+  REQUEST_MANDATORY_HEADERS: Array[String]
 
-  RESPONSE_MANDATORY_HEADERS: Array[Symbol]
+  RESPONSE_MANDATORY_HEADERS: Array[String]
 
-  type header_pair = [String, String]
+  type header_pair = [string, string]
 
   # # FRAMES
-  # type frame_control_flags = Array[:end_headers | :end_stream]
+  type frame_control_flags = Array[:end_headers | :end_stream]
 
   # # HEADERS
   # type headers_frame = {
@@ -33,7 +37,9 @@ module HTTP2Next
   # }
 
   # # DATA
-  # type data_frame = { type: :data, flags: frame_control_flags, stream: Integer, length: Integer, payload: String, ?padding: Integer }
+  type data_frame = { type: :data, flags: frame_control_flags, stream: Integer, length: Integer, payload: String, padding: Integer }
+                  | { type: :data, flags: frame_control_flags, stream: Integer, length: Integer, payload: String }
+                  | { type: :data, flags: frame_control_flags, payload: String }
 
   # # PUSH_PROMISE
   # type push_promise_frame = { type: :push_promise, promise_stream: Integer, flags: frame_control_flags, stream: Integer, ?method: Symbol, ?trailer: Array[String], ?content_length: Integer, payload: Enumerable[header_pair], ?padding: Integer }
@@ -45,7 +51,7 @@ module HTTP2Next
   # type window_update_frame = { type: :window_update, stream: Integer, increment: Integer }
 
   # # PRIORITY
-  # type priority_frame = { type: :priority, stream: Integer, dependency: Integer, exclusive: bool, weight: Integer }
+  type priority_frame = { type: :priority, stream: Integer, dependency: Integer, exclusive: bool, weight: Integer }
 
   # # ALTSVC
   # type altsvc_frame = { type: :altsvc, stream: 0, max_age: Integer, port: Integer, proto: "String", host: String }

data/sig/stream.rbs

@@ -4,7 +4,7 @@ module HTTP2Next
     include Emitter
 
     attr_reader id: Integer
-    attr_reader state: Symbol 
+    attr_reader state: Symbol
     attr_reader parent: Stream?
     attr_reader weight: Integer
     attr_reader dependency: Integer
@@ -42,7 +42,7 @@ module HTTP2Next
     def cancel: () -> void
 
     def refuse: () -> void
-             
+
     def window_update: (Integer increment) -> void
 
     private
@@ -54,7 +54,7 @@ module HTTP2Next
       ?dependency: Integer,
       ?exclusive: bool,
       ?parent: Stream?,
-      ?state: Symbol      
+      ?state: Symbol
     ) -> untyped
 
     def transition: (frame, bool sending) -> void
@@ -63,7 +63,7 @@ module HTTP2Next
 
     def complete_transition: (frame) -> void
 
-    def process_priority: (frame) -> void
+    def process_priority: ({weight: Integer, dependency: Integer, exclusive: bool}) -> void
 
     def end_frame?: () -> bool
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: http-2-next
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.5.0
 platform: ruby
 authors:
 - Tiago Cardoso
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-26 00:00:00.000000000 Z
+date: 2021-08-05 00:00:00.000000000 Z
 dependencies: []
 description: Pure-ruby HTTP 2.0 protocol implementation
 email:
@@ -41,6 +41,7 @@ files:
 - sig/client.rbs
 - sig/connection.rbs
 - sig/emitter.rbs
+- sig/error.rbs
 - sig/flow_buffer.rbs
 - sig/frame_buffer.rbs
 - sig/framer.rbs