http-2-next 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e2be1f3b17829c7575759ab9ea216d5a63af21ae5ab9a0119954225995fcae57
-  data.tar.gz: e380996bda5b61c61d1431ddf8fe215e06b70a48dd57e23195c4150a6b299d6f
+  metadata.gz: 57b5112f768b60bc8cba8e6f82925eafc0de71a947fc5282bcc0f4b10dd42b49
+  data.tar.gz: 9e8470275022f7d9742232cb1cc2ffab1644a77268a21a656a702db219a3fb93
 SHA512:
-  metadata.gz: 285d28b22bb98043f21b1d234097e16e68d2c4b66a9d92137330ea63775ab2ea714eb93e2180a236ee4f950ac3fcada06105a0e4060fd80b1f632d52cc3c037b
-  data.tar.gz: 1a6d3610f31c771e6cfda9e6871c63ff3d0beefb4574a7622545f70d7c6b0ff6ee0f5f186a60b54648c33acbf75b3934da9a155068556cc19b83cd69f5b960c4
+  metadata.gz: a466e82b5a77065453b531602daf30fc5c44bb4918e46f3bc0b48e80268b5496ae23b2bc3ee6f40c8fcf6920dc5ea1a0490c861ace6776f2f522aba090c0309f
+  data.tar.gz: b469ea645f4a74fbf5e045a6205ecccf3104d93f190c93cdcfc2faf1f0046623596af728278d3839cddcba235fb1382a830899b5d1f0d7f1ba89734e1cdafc29

data/lib/http/2/next.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "http/2/next/version"
+require "http/2/next/extensions"
 require "http/2/next/error"
 require "http/2/next/emitter"
 require "http/2/next/buffer"

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

@@ -67,12 +67,14 @@ module HTTP2Next
     # Ensures that data that is added is binary encoded as well,
     # otherwise this could lead to the Buffer instance changing its encoding.
     %i[<< prepend].each do |mutating_method|
-      define_method(mutating_method) do |string|
+      class_eval(<<-METH, __FILE__, __LINE__ + 1)
+      def #{mutating_method}(string)
         string = string.dup if string.frozen?
-        @buffer.send mutating_method, string.force_encoding(Encoding::BINARY)
+        @buffer.send __method__, string.force_encoding(Encoding::BINARY)
 
         self
       end
+      METH
     end
   end
 end

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

@@ -12,6 +12,10 @@ module HTTP2Next
     class EncodingContext
       include Error
 
+      using Extensions
+
+      UPPER = /[[:upper:]]/.freeze
+
       # @private
       # Static table
       # - http://tools.ietf.org/html/draft-ietf-httpbis-header-compression-10#appendix-A
@@ -188,7 +192,7 @@ module HTTP2Next
             cmd[:index] ||= cmd[:name]
             cmd[:value] ||= v
             cmd[:name] = k
-          elsif cmd[:name] != cmd[:name].downcase
+          elsif UPPER.match?(cmd[:name])
             raise ProtocolError, "Invalid uppercase key: #{cmd[:name]}"
           end
 
@@ -217,7 +221,7 @@ module HTTP2Next
         headers.each do |field, value|
           # Literal header names MUST be translated to lowercase before
           # encoding and transmission.
-          field = field.downcase
+          field = field.downcase if UPPER.match?(field)
           value = "/" if field == ":path" && value.empty?
           cmd = addcmd(field, value)
           cmd[:type] = :noindex if noindex && cmd[:type] == :incremental

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

@@ -96,7 +96,6 @@ module HTTP2Next
       @remote_window = @remote_window_limit
 
       @recv_buffer = Buffer.new
-      @send_buffer = []
       @continuation = []
       @error = nil
 
@@ -720,12 +719,12 @@ module HTTP2Next
         # 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[id] = Time.now
-        to_delete = @streams_recently_closed.select { |_, v| (Time.now - v) > 15 }
-        to_delete.each do |stream_id|
-          @streams.delete stream_id
-          @streams_recently_closed.delete stream_id
+        @streams_recently_closed.reject do |_, v|
+          to_delete = (Time.now - v) > 15
+          @streams.delete stream_id if to_delete
+          to_delete
         end
+        @streams_recently_closed[id] = Time.now
       end
 
       stream.on(:promise, &method(:promise)) if is_a? Server

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

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module HTTP2Next
+  module Extensions
+    unless Regexp.method_defined?(:match?)
+      refine Regexp do
+        def match?(*args)
+          !match(*args).nil?
+        end
+      end
+    end
+  end
+end

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

@@ -14,7 +14,7 @@ module HTTP2Next
     #
     # @return [Integer]
     def buffered_amount
-      @send_buffer.map { |f| f[:length] }.reduce(0, :+)
+      send_buffer.bytesize
     end
 
     def flush
@@ -23,6 +23,10 @@ module HTTP2Next
 
     private
 
+    def send_buffer
+      @send_buffer ||= FrameBuffer.new
+    end
+
     def update_local_window(frame)
       frame_size = frame[:payload].bytesize
       frame_size += frame[:padding] || 0
@@ -63,42 +67,20 @@ module HTTP2Next
     # Buffered DATA frames are emitted in FIFO order.
     #
     # @param frame [Hash]
-    # @param encode [Boolean] set to true by co
+    # @param encode [Boolean] set to true by connection
     def send_data(frame = nil, encode = false)
-      @send_buffer.push frame unless frame.nil?
+      send_buffer << frame unless frame.nil?
 
-      # FIXME: Frames with zero length with the END_STREAM flag set (that
-      # is, an empty DATA frame) MAY be sent if there is no available space
-      # in either flow control window.
-      while @remote_window > 0 && !@send_buffer.empty?
-        frame = @send_buffer.shift
-
-        sent = 0
-        frame_size = frame[:payload].bytesize
-
-        if frame_size > @remote_window
-          payload = frame.delete(:payload)
-          chunk   = frame.dup
-
-          # Split frame so that it fits in the window
-          # TODO: consider padding!
-          frame[:payload] = payload.slice!(0, @remote_window)
-          frame[:length] = frame[:payload].bytesize
-          chunk[:length]  = payload.bytesize
-          chunk[:payload] = payload
-
-          # if no longer last frame in sequence...
-          frame[:flags] -= [:end_stream] if frame[:flags].include? :end_stream
-
-          @send_buffer.unshift chunk
-          sent = @remote_window
-        else
-          sent = frame_size
-        end
+      while (frame = send_buffer.retrieve(@remote_window))
+
+        sent = frame[:payload].bytesize
 
         manage_state(frame) do
-          frames = encode ? encode(frame) : [frame]
-          frames.each { |f| emit(:frame, f) }
+          if encode
+            encode(frame).each { |f| emit(:frame, f) }
+          else
+            emit(:frame, frame)
+          end
           @remote_window -= sent
         end
       end
@@ -116,4 +98,59 @@ module HTTP2Next
       send_data(nil, encode)
     end
   end
+
+  class FrameBuffer
+    attr_reader :bytesize
+
+    def initialize
+      @buffer = []
+      @bytesize = 0
+    end
+
+    def <<(frame)
+      @buffer << frame
+      @bytesize += frame[:payload].bytesize
+    end
+
+    def empty?
+      @bytesize == 0
+    end
+
+    def retrieve(window_size)
+      return if @buffer.empty?
+
+      frame = @buffer.first
+
+      frame_size = frame[:payload].bytesize
+      end_stream = frame[:flags].include? :end_stream
+
+      # Frames with zero length with the END_STREAM flag set (that
+      # is, an empty DATA frame) MAY be sent if there is no available space
+      # in either flow control window.
+      return if window_size == 0 && !(frame_size == 0 && end_stream)
+
+      @buffer.shift
+
+      if frame_size > window_size
+        payload = frame.delete(:payload)
+        chunk   = frame.dup
+
+        # Split frame so that it fits in the window
+        # TODO: consider padding!
+        frame[:payload] = payload.slice!(0, window_size)
+        frame[:length] = frame[:payload].bytesize
+        chunk[:length]  = payload.bytesize
+        chunk[:payload] = payload
+
+        # if no longer last frame in sequence...
+        frame[:flags] -= [:end_stream] if end_stream
+
+        @buffer.unshift(chunk)
+        @bytesize -= window_size
+      else
+        @bytesize -= frame_size
+      end
+      frame
+    end
+  end
 end

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

@@ -89,7 +89,6 @@ module HTTP2Next
       @state  = state
       @error  = false
       @closed = false
-      @send_buffer = []
       @_method = @_content_length = nil
       @_waiting_on_trailers = false
       @received_data = false

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

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: http-2-next
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Tiago Cardoso
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-21 00:00:00.000000000 Z
+date: 2020-02-29 00:00:00.000000000 Z
 dependencies: []
 description: Pure-ruby HTTP 2.0 protocol implementation
 email:
@@ -27,6 +27,7 @@ files:
 - lib/http/2/next/connection.rb
 - lib/http/2/next/emitter.rb
 - lib/http/2/next/error.rb
+- lib/http/2/next/extensions.rb
 - lib/http/2/next/flow_buffer.rb
 - lib/http/2/next/framer.rb
 - lib/http/2/next/huffman.rb