http-2 0.11.0 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5617138c0740b55546b79e29a06978a9fcb9aae208ccb2f695c32939eca5f88a
-  data.tar.gz: 193880583c0a80aa569f433977af1798c98be25a86fb782a410e16eb38d5116c
+  metadata.gz: d1788e5559bb1f36b98896322d1c846ef73b0fba4a7a45b524845735deacb9aa
+  data.tar.gz: 62ea957139ea576aa4553303f6db141cd9297a8ce75624553e79a90a69f74717
 SHA512:
-  metadata.gz: 46fde2633ab7d074136a32e7ae8cdf90ecd037f3a95bfeabab9557d72a13487a47a3e298339bc74df4d89c6b802537b9c35a1f7709fd6cf1f4fde44eecbe468e
-  data.tar.gz: 6eadeb79f3bbf6fa1911933e2dc399bfe50ae08c598cb72278a37e0c42102bf27ccbed77b7acb5e7f1e85a55bd6967e63a8950fa3184fb7c9eef750c8a9e123c
+  metadata.gz: fb252eeff936187cf2ebebdf93e69fb6f82dba50a0fece880f40a8235b790165ad5d3f167b0c3948adf040388fc7cd49bc1bd1a24b754447c83dd2020be78eaa
+  data.tar.gz: 0657b1b61f526041167473faf29e50a0cbf4bbfcbac80a458a98a205ab5a01f409da7d62010e5620e5e5fe6cb6e7d1bd5a2ae2a831fcac7da1c1ab2192511c1e

data/README.md

@@ -1,9 +1,7 @@
 # HTTP-2
 
 [![Gem Version](https://badge.fury.io/rb/http-2.svg)](http://rubygems.org/gems/http-2)
-[![Build Status](https://travis-ci.org/igrigorik/http-2.svg?branch=master)](https://travis-ci.org/igrigorik/http-2)
 [![Coverage Status](https://coveralls.io/repos/igrigorik/http-2/badge.svg)](https://coveralls.io/r/igrigorik/http-2)
-[![Analytics](https://ga-beacon.appspot.com/UA-71196-10/http-2/readme)](https://github.com/igrigorik/ga-beacon)
 
 Pure Ruby, framework and transport agnostic, implementation of HTTP/2 protocol and HPACK header compression with support for:
 

data/lib/http/2/buffer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'forwardable'
 
 module HTTP2
@@ -6,11 +8,11 @@ module HTTP2
   class Buffer
     extend Forwardable
 
-    def_delegators :@buffer, :ord, :encoding, :setbyte, :unpack,
+    def_delegators :@buffer, :ord, :encoding, :setbyte, :unpack, :unpack1,
                    :size, :each_byte, :to_str, :to_s, :length, :inspect,
                    :[], :[]=, :empty?, :bytesize, :include?
 
-    UINT32 = 'N'.freeze
+    UINT32 = 'N'
     private_constant :UINT32
 
     # Forces binary encoding on the string
@@ -59,12 +61,12 @@ module HTTP2
     # Slice unsigned 32-bit integer from buffer.
     # @return [Integer]
     def read_uint32
-      read(4).unpack(UINT32).first
+      read(4).unpack1(UINT32)
     end
 
     # Ensures that data that is added is binary encoded as well,
     # otherwise this could lead to the Buffer instance changing its encoding.
-    [:<<, :prepend].each do |mutating_method|
+    %i[<< prepend].each do |mutating_method|
       define_method(mutating_method) do |string|
         string = string.dup if string.frozen?
         @buffer.send mutating_method, string.force_encoding(Encoding::BINARY)

data/lib/http/2/client.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module HTTP2
   # HTTP 2.0 client connection class that implements appropriate header
   # compression / decompression algorithms and stream management logic.
@@ -45,7 +47,8 @@ module HTTP2
 
     # sends the preface and initializes the first stream in half-closed state
     def upgrade
-      fail ProtocolError unless @stream_id == 1
+      raise ProtocolError unless @stream_id == 1
+
       send_connection_preface
       new_stream(state: :half_closed_local)
     end
@@ -53,6 +56,7 @@ module HTTP2
     # Emit the connection preface if not yet
     def send_connection_preface
       return unless @state == :waiting_connection_preface
+
       @state = :connected
       emit(:frame, CONNECTION_PREFACE_MAGIC)
 

data/lib/http/2/compressor.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module HTTP2
   # Implementation of header compression for HTTP 2.0 (HPACK) format adapted
   # to efficiently represent HTTP headers in the context of HTTP 2.0.
@@ -74,7 +76,7 @@ module HTTP2
         ['user-agent',                  ''],
         ['vary',                        ''],
         ['via',                         ''],
-        ['www-authenticate',            ''],
+        ['www-authenticate',            '']
       ].each { |pair| pair.each(&:freeze).freeze }.freeze
 
       # Current table of header key-value pairs.
@@ -96,9 +98,9 @@ module HTTP2
       #   :index       Symbol   :all, :static, :never
       def initialize(**options)
         default_options = {
-          huffman:    :shorter,
-          index:      :all,
-          table_size: 4096,
+          huffman: :shorter,
+          index: :all,
+          table_size: 4096
         }
         @table = []
         @options = default_options.merge(options)
@@ -112,7 +114,7 @@ module HTTP2
         t = @table
         l = @limit
         other.instance_eval do
-          @table = t.dup              # shallow copy
+          @table = t.dup # shallow copy
           @limit = l
         end
         other
@@ -131,7 +133,8 @@ module HTTP2
       def dereference(index)
         # NOTE: index is zero-based in this module.
         value = STATIC_TABLE[index] || @table[index - STATIC_TABLE.size]
-        fail CompressionError, 'Index too large' unless value
+        raise CompressionError, 'Index too large' unless value
+
         value
       end
 
@@ -146,9 +149,8 @@ module HTTP2
 
         case cmd[:type]
         when :changetablesize
-          if cmd[:value] > @limit
-            fail CompressionError, 'dynamic table size update exceed limit'
-          end
+          raise CompressionError, 'dynamic table size update exceed limit' if cmd[:value] > @limit
+
           self.table_size = cmd[:value]
 
         when :indexed
@@ -186,7 +188,7 @@ module HTTP2
           add_to_table(emit) if cmd[:type] == :incremental
 
         else
-          fail CompressionError, "Invalid type: #{cmd[:type]}"
+          raise CompressionError, "Invalid type: #{cmd[:type]}"
         end
 
         emit
@@ -202,7 +204,7 @@ module HTTP2
       def encode(headers)
         commands = []
         # Literals commands are marked with :noindex when index is not used
-        noindex = [:static, :never].include?(@options[:index])
+        noindex = %i[static never].include?(@options[:index])
         headers.each do |field, value|
           # Literal header names MUST be translated to lowercase before
           # encoding and transmission.
@@ -232,7 +234,7 @@ module HTTP2
         exact = nil
         name_only = nil
 
-        if [:all, :static].include?(@options[:index])
+        if %i[all static].include?(@options[:index])
           STATIC_TABLE.each_index do |i|
             if STATIC_TABLE[i] == header
               exact ||= i
@@ -284,6 +286,7 @@ module HTTP2
       # @param cmd [Array] +[name, value]+
       def add_to_table(cmd)
         return unless size_check(cmd)
+
         @table.unshift(cmd)
       end
 
@@ -309,11 +312,11 @@ module HTTP2
 
     # Header representation as defined by the spec.
     HEADREP = {
-      indexed:      { prefix: 7, pattern: 0x80 },
-      incremental:  { prefix: 6, pattern: 0x40 },
-      noindex:      { prefix: 4, pattern: 0x00 },
+      indexed: { prefix: 7, pattern: 0x80 },
+      incremental: { prefix: 6, pattern: 0x40 },
+      noindex: { prefix: 4, pattern: 0x00 },
       neverindexed: { prefix: 4, pattern: 0x10 },
-      changetablesize: { prefix: 5, pattern: 0x20 },
+      changetablesize: { prefix: 5, pattern: 0x20 }
     }.each_value(&:freeze).freeze
 
     # Predefined options set for Compressor
@@ -330,6 +333,7 @@ module HTTP2
     # Responsible for encoding header key-value pairs using HPACK algorithm.
     class Compressor
       # @param options [Hash] encoding options
+      # @see EncodingContext#initialize
       def initialize(**options)
         @cc = EncodingContext.new(**options)
       end
@@ -356,14 +360,14 @@ module HTTP2
       # @param n [Integer] number of available bits
       # @return [String] binary string
       def integer(i, n)
-        limit = 2**n - 1
+        limit = (2**n) - 1
         return [i].pack('C') if i < limit
 
         bytes = []
         bytes.push limit unless n.zero?
 
         i -= limit
-        while (i >= 128)
+        while i >= 128
           bytes.push((i % 128) + 128)
           i /= 128
         end
@@ -393,7 +397,8 @@ module HTTP2
       # @param str [String]
       # @return [String] binary string
       def string(str)
-        plain, huffman = nil, nil
+        plain = nil
+        huffman = nil
         unless @cc.options[:huffman] == :always
           plain = integer(str.bytesize, 7) << str.dup.force_encoding(Encoding::BINARY)
         end
@@ -463,12 +468,9 @@ module HTTP2
     # Responsible for decoding received headers and maintaining compression
     # context of the opposing peer. Decompressor must be initialized with
     # appropriate starting context based on local role: client or server.
-    #
-    # @example
-    #   server_role = Decompressor.new(:request)
-    #   client_role = Decompressor.new(:response)
     class Decompressor
       # @param options [Hash] decoding options.  Only :table_size is effective.
+      # @see EncodingContext#initialize
       def initialize(**options)
         @cc = EncodingContext.new(**options)
       end
@@ -485,16 +487,18 @@ module HTTP2
       # @param n [Integer] number of available bits
       # @return [Integer]
       def integer(buf, n)
-        limit = 2**n - 1
-        i = !n.zero? ? (buf.getbyte & limit) : 0
+        limit = (2**n) - 1
+        i = n.zero? ? 0 : (buf.getbyte & limit)
 
         m = 0
-        while (byte = buf.getbyte)
-          i += ((byte & 127) << m)
-          m += 7
+        if i == limit
+          while (byte = buf.getbyte)
+            i += ((byte & 127) << m)
+            m += 7
 
-          break if (byte & 128).zero?
-        end if (i == limit)
+            break if (byte & 128).zero?
+          end
+        end
 
         i
       end
@@ -508,7 +512,8 @@ module HTTP2
         huffman = (buf.readbyte(0) & 0x80) == 0x80
         len = integer(buf, 7)
         str = buf.read(len)
-        fail CompressionError, 'string too short' unless str.bytesize == len
+        raise CompressionError, 'string too short' unless str.bytesize == len
+
         str = Huffman.new.decode(Buffer.new(str)) if huffman
         str.force_encoding(Encoding::UTF_8)
       end
@@ -526,13 +531,14 @@ module HTTP2
           mask == desc[:pattern]
         end
 
-        fail CompressionError unless header[:type]
+        raise CompressionError unless header[:type]
 
         header[:name] = integer(buf, type[:prefix])
 
         case header[:type]
         when :indexed
-          fail CompressionError if (header[:name]).zero?
+          raise CompressionError if (header[:name]).zero?
+
           header[:name] -= 1
         when :changetablesize
           header[:value] = header[:name]
@@ -558,10 +564,12 @@ module HTTP2
         until buf.empty?
           next_header = @cc.process(header(buf))
           next if next_header.nil?
+
           is_pseudo_header = next_header.first.start_with? ':'
           if !decoding_pseudo_headers && is_pseudo_header
-            fail ProtocolError, 'one or more pseudo headers encountered after regular headers'
+            raise ProtocolError, 'one or more pseudo headers encountered after regular headers'
           end
+
           decoding_pseudo_headers = is_pseudo_header
           list << next_header
         end

data/lib/http/2/connection.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module HTTP2
   # Default connection and stream flow control window (64KB).
   DEFAULT_FLOW_WINDOW = 65_535
@@ -10,28 +12,28 @@ module HTTP2
 
   # Default values for SETTINGS frame, as defined by the spec.
   SPEC_DEFAULT_CONNECTION_SETTINGS = {
-    settings_header_table_size:       4096,
-    settings_enable_push:             1,                     # enabled for servers
-    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_header_table_size: 4096,
+    settings_enable_push: 1, # enabled for servers
+    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
   }.freeze
 
   DEFAULT_CONNECTION_SETTINGS = {
-    settings_header_table_size:       4096,
-    settings_enable_push:             1,                     # enabled for servers
-    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_header_table_size: 4096,
+    settings_enable_push: 1, # enabled for servers
+    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
   }.freeze
 
   # Default stream priority (lower values are higher priority).
-  DEFAULT_WEIGHT    = 16
+  DEFAULT_WEIGHT = 16
 
   # Default connection "fast-fail" preamble string as defined by the spec.
-  CONNECTION_PREFACE_MAGIC = "PRI * HTTP/2.0\r\n\r\nSM\r\n\r\n".freeze
+  CONNECTION_PREFACE_MAGIC = "PRI * HTTP/2.0\r\n\r\nSM\r\n\r\n"
 
   # Time to hold recently closed streams until purge (seconds)
   RECENTLY_CLOSED_STREAMS_TTL = 15
@@ -43,7 +45,7 @@ module HTTP2
   # Note that this class should not be used directly. Instead, you want to
   # use either Client or Server class to drive the HTTP 2.0 exchange.
   #
-  # rubocop:disable ClassLength
+  # rubocop:disable Metrics/ClassLength
   class Connection
     include FlowBuffer
     include Emitter
@@ -55,12 +57,11 @@ module HTTP2
     # Size of current connection flow control window (by default, set to
     # infinity, but is automatically updated on receipt of peer settings).
     attr_reader :local_window
-    attr_reader :remote_window
+    attr_reader :remote_window, :remote_settings
     alias window local_window
 
     # Current settings value for local and peer
     attr_reader :local_settings
-    attr_reader :remote_settings
 
     # Pending settings value
     #  Sent but not ack'ed settings
@@ -110,8 +111,8 @@ module HTTP2
     # @param window [Integer]
     # @param parent [Stream]
     def new_stream(**args)
-      fail ConnectionClosed if @state == :closed
-      fail StreamLimitExceeded if @active_stream_count >= @remote_settings[:settings_max_concurrent_streams]
+      raise ConnectionClosed if @state == :closed
+      raise StreamLimitExceeded if @active_stream_count >= @remote_settings[:settings_max_concurrent_streams]
 
       stream = activate_stream(id: @stream_id, **args)
       @stream_id += 2
@@ -140,10 +141,10 @@ module HTTP2
     # @param payload [String]
     def goaway(error = :no_error, payload = nil)
       last_stream = if (max = @streams.max)
-        max.first
-      else
-        0
-      end
+                      max.first
+                    else
+                      0
+                    end
 
       send(type: :goaway, last_stream: last_stream,
            error: error, payload: payload)
@@ -188,18 +189,17 @@ module HTTP2
       # SETTINGS frame. Server connection header is SETTINGS frame only.
       if @state == :waiting_magic
         if @recv_buffer.size < 24
-          if !CONNECTION_PREFACE_MAGIC.start_with? @recv_buffer
-            fail HandshakeError
-          else
-            return # maybe next time
-          end
+          raise HandshakeError unless CONNECTION_PREFACE_MAGIC.start_with? @recv_buffer
+
+          return # maybe next time
+
         elsif @recv_buffer.read(24) == CONNECTION_PREFACE_MAGIC
           # MAGIC is OK.  Send our settings
           @state = :waiting_connection_preface
           payload = @local_settings.reject { |k, v| v == SPEC_DEFAULT_CONNECTION_SETTINGS[k] }
           settings(payload)
         else
-          fail HandshakeError
+          raise HandshakeError
         end
       end
 
@@ -209,9 +209,7 @@ module HTTP2
         # Header blocks MUST be transmitted as a contiguous sequence of frames
         # with no interleaved frames of any other type, or from any other stream.
         unless @continuation.empty?
-          unless frame[:type] == :continuation && frame[:stream] == @continuation.first[:stream]
-            connection_error
-          end
+          connection_error unless frame[:type] == :continuation && frame[:stream] == @continuation.first[:stream]
 
           @continuation << frame
           return unless frame[:flags].include? :end_headers
@@ -238,7 +236,7 @@ module HTTP2
           when :headers
             # When server receives even-numbered stream identifier,
             # the endpoint MUST respond with a connection error of type PROTOCOL_ERROR.
-            connection_error if frame[:stream].even? && self.is_a?(Server)
+            connection_error if frame[:stream].even? && is_a?(Server)
 
             # The last frame in a sequence of HEADERS/CONTINUATION
             # frames MUST have the END_HEADERS flag set.
@@ -258,10 +256,10 @@ module HTTP2
             stream = @streams[frame[:stream]]
             if stream.nil?
               stream = activate_stream(
-                id:         frame[:stream],
-                weight:     frame[:weight] || DEFAULT_WEIGHT,
+                id: frame[:stream],
+                weight: frame[:weight] || DEFAULT_WEIGHT,
                 dependency: frame[:dependency] || 0,
-                exclusive:  frame[:exclusive] || false,
+                exclusive: frame[:exclusive] || false
               )
               emit(:stream, stream)
             end
@@ -333,10 +331,10 @@ module HTTP2
               # unused or closed parent stream.
               when :priority
                 stream = activate_stream(
-                  id:         frame[:stream],
-                  weight:     frame[:weight] || DEFAULT_WEIGHT,
+                  id: frame[:stream],
+                  weight: frame[:weight] || DEFAULT_WEIGHT,
                   dependency: frame[:dependency] || 0,
-                  exclusive:  frame[:exclusive] || false,
+                  exclusive: frame[:exclusive] || false
                 )
 
                 emit(:stream, stream)
@@ -358,9 +356,9 @@ module HTTP2
           end
         end
       end
-
     rescue StandardError => e
       raise if e.is_a?(Error::Error)
+
       connection_error(e: e)
     end
 
@@ -381,17 +379,15 @@ module HTTP2
       if frame[:type] == :data
         send_data(frame, true)
 
-      else
+      elsif frame[:type] == :rst_stream && frame[:error] == :protocol_error
         # An endpoint can end a connection at any time. In particular, an
         # endpoint MAY choose to treat a stream error as a connection error.
-        if frame[:type] == :rst_stream && frame[:error] == :protocol_error
-          goaway(frame[:error])
-        else
-          # HEADERS and PUSH_PROMISE may generate CONTINUATION. Also send
-          # RST_STREAM that are not protocol errors
-          frames = encode(frame)
-          frames.each { |f| emit(:frame, f) }
-        end
+        goaway(frame[:error])
+      else
+        # HEADERS and PUSH_PROMISE may generate CONTINUATION. Also send
+        # RST_STREAM that are not protocol errors
+        frames = encode(frame)
+        frames.each { |f| emit(:frame, f) }
       end
     end
 
@@ -401,10 +397,10 @@ module HTTP2
     # @return [Array of Buffer] encoded frame
     def encode(frame)
       frames = if frame[:type] == :headers || frame[:type] == :push_promise
-        encode_headers(frame) # HEADERS and PUSH_PROMISE may create more than one frame
-      else
-        [frame]               # otherwise one frame
-      end
+                 encode_headers(frame) # HEADERS and PUSH_PROMISE may create more than one frame
+               else
+                 [frame] # otherwise one frame
+               end
 
       frames.map { |f| @framer.generate(f) }
     end
@@ -460,9 +456,7 @@ module HTTP2
           # 4.  The ALTSVC HTTP/2 Frame
           # An ALTSVC frame on stream 0 with empty (length 0) "Origin"
           # information is invalid and MUST be ignored.
-          if frame[:origin] && !frame[:origin].empty?
-            emit(frame[:type], frame)
-          end
+          emit(frame[:type], frame) if frame[:origin] && !frame[:origin].empty?
         when :blocked
           emit(frame[:type], frame)
         else
@@ -495,9 +489,7 @@ module HTTP2
           when :client
             # Any value other than 0 or 1 MUST be treated as a
             # connection error (Section 5.4.1) of type PROTOCOL_ERROR.
-            unless v.zero? || v == 1
-              return ProtocolError.new("invalid #{key} value")
-            end
+            return ProtocolError.new("invalid #{key} value") unless v.zero? || v == 1
           end
         when :settings_max_concurrent_streams
           # Any value is valid
@@ -505,18 +497,14 @@ module HTTP2
           # Values above the maximum flow control window size of 2^31-1 MUST
           # be treated as a connection error (Section 5.4.1) of type
           # FLOW_CONTROL_ERROR.
-          unless v <= 0x7fffffff
-            return FlowControlError.new("invalid #{key} value")
-          end
+          return FlowControlError.new("invalid #{key} value") unless v <= 0x7fffffff
         when :settings_max_frame_size
           # The initial value is 2^14 (16,384) octets.  The value advertised
           # by an endpoint MUST be between this initial value and the maximum
           # allowed frame size (2^24-1 or 16,777,215 octets), inclusive.
           # Values outside this range MUST be treated as a connection error
           # (Section 5.4.1) of type PROTOCOL_ERROR.
-          unless v >= 16_384 && v <= 16_777_215
-            return ProtocolError.new("invalid #{key} value")
-          end
+          return ProtocolError.new("invalid #{key} value") unless v >= 16_384 && v <= 16_777_215
         when :settings_max_header_list_size
           # Any value is valid
           # else # ignore unknown settings
@@ -536,12 +524,12 @@ module HTTP2
       #   local: previously sent and pended our settings should be effective
       #   remote: just received peer settings should immediately be effective
       settings, side = if frame[:flags].include?(:ack)
-        # Process pending settings we have sent.
-        [@pending_settings.shift, :local]
-      else
-        connection_error if validate_settings(@remote_role, frame[:payload])
-        [frame[:payload], :remote]
-      end
+                         # Process pending settings we have sent.
+                         [@pending_settings.shift, :local]
+                       else
+                         connection_error if validate_settings(@remote_role, frame[:payload])
+                         [frame[:payload], :remote]
+                       end
 
       settings.each do |key, v|
         case side
@@ -565,14 +553,14 @@ module HTTP2
           case side
           when :local
             @local_window = @local_window - @local_window_limit + v
-            @streams.each do |_id, stream|
+            @streams.each_value do |stream|
               stream.emit(:local_window, stream.local_window - @local_window_limit + v)
             end
 
             @local_window_limit = v
           when :remote
             @remote_window = @remote_window - @remote_window_limit + v
-            @streams.each do |_id, stream|
+            @streams.each_value do |stream|
               # Event name is :window, not :remote_window
               stream.emit(:window, stream.remote_window - @remote_window_limit + v)
             end
@@ -621,10 +609,7 @@ module HTTP2
     #
     # @param frame [Hash]
     def decode_headers(frame)
-      if frame[:payload].is_a? Buffer
-        frame[:payload] = @decompressor.decode(frame[:payload])
-      end
-
+      frame[:payload] = @decompressor.decode(frame[:payload]) if frame[:payload].is_a? Buffer
     rescue CompressionError => e
       connection_error(:compression_error, e: e)
     rescue ProtocolError => e
@@ -643,7 +628,7 @@ module HTTP2
 
       frames = []
 
-      while payload.bytesize > 0
+      while payload.bytesize.positive?
         cont = frame.dup
         cont[:type] = :continuation
         cont[:flags] = []
@@ -659,7 +644,6 @@ module HTTP2
       end
 
       frames
-
     rescue StandardError => e
       connection_error(:compression_error, e: e)
       nil
@@ -675,7 +659,7 @@ module HTTP2
     def activate_stream(id: nil, **args)
       connection_error(msg: 'Stream ID already exists') if @streams.key?(id)
 
-      stream = Stream.new(**{ connection: self, id: id }.merge(args))
+      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
@@ -692,7 +676,7 @@ module HTTP2
         cleanup_recently_closed
       end
 
-      stream.on(:promise, &method(:promise)) if self.is_a? Server
+      stream.on(:promise, &method(:promise)) if is_a? Server
       stream.on(:frame,   &method(:send))
 
       @streams[id] = stream
@@ -705,6 +689,7 @@ module HTTP2
       @streams_recently_closed.each do |stream_id, ts|
         # Ruby Hash enumeration is ordered, so once fresh stream is met we can stop searching.
         break if now_ts - ts < RECENTLY_CLOSED_STREAMS_TTL
+
         to_delete << stream_id
       end
 
@@ -728,11 +713,12 @@ module HTTP2
     def connection_error(error = :protocol_error, msg: nil, e: nil)
       goaway(error) unless @state == :closed || @state == :new
 
-      @state, @error = :closed, error
+      @state = :closed
+      @error = error
       klass = error.to_s.split('_').map(&:capitalize).join
-      msg ||= e && e.message
-      backtrace = (e && e.backtrace) || []
-      fail Error.const_get(klass), msg, backtrace
+      msg ||= e&.message
+      backtrace = e&.backtrace || []
+      raise Error.const_get(klass), msg, backtrace
     end
     alias error connection_error
 
@@ -740,5 +726,5 @@ module HTTP2
       yield
     end
   end
-  # rubocop:enable ClassLength
+  # rubocop:enable Metrics/ClassLength
 end