http-2 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5e4d8a543b24380552462863450caaa90dcc5d1f
-  data.tar.gz: 5948ffc6c3aa27f7d81bd86cd0ef62ad163e412f
+  metadata.gz: 90034b82f924807e4b3cb874fceae2d8fde0c74d
+  data.tar.gz: afe0a06580910045bd50d8920f1aaf2e7f5a9a01
 SHA512:
-  metadata.gz: 32a27c2213a6c8b18b56f752495a938d65260c63644be63af58fd0aaf133795bf9e2748d23fe8b8c49bf96500e30a551ac0001001a1fe46a2082f06d8420dcc8
-  data.tar.gz: 2fdc75f407ecb70fb601a04d9c8fe5b76e23bebafc495e48bf2a1e3d96ada6d1784ed29a9c352cfa04027ebd5dace72779fc009b1cd0f87366cfab035c72f66a
+  metadata.gz: 5a272a1d3f656e7a94888d027b81cd42a462b05d3d2c94525d39d91f6d327a13a79dbfdd63f275237ca7fbf46d95694f682305e279e2803b9616922f1dbe7bcf
+  data.tar.gz: de83deb546e98b3819904aae7b9d66024ee49f72c363c071829461ced9e3c4641529404bb17e5631c6274f90f7fdb89574315d6153e45dc17298c060bd0b6674

data/Gemfile

@@ -5,7 +5,6 @@ gem 'yard'
 
 group :test do
   gem 'activesupport'
-  gem 'autotest-growl'
   gem 'autotest-standalone'
   gem 'coveralls', require: false
   gem 'pry'

data/lib/http/2/connection.rb

@@ -142,6 +142,13 @@ module HTTP2
       @state = :closed
     end
 
+    # Sends a WINDOW_UPDATE frame to the peer.
+    #
+    # @param increment [Integer]
+    def window_update(increment)
+      send(type: :window_update, stream: 0, increment: increment)
+    end
+
     # Sends a connection SETTINGS frame to the peer.
     # The values are reflected when the corresponding ACK is received.
     #
@@ -628,6 +635,7 @@ module HTTP2
       stream.once(:close)  { @active_stream_count -= 1 }
       stream.on(:promise, &method(:promise)) if self.is_a? Server
       stream.on(:frame,   &method(:send))
+      stream.on(:window_update, &method(:window_update))
 
       @streams[id] = stream
     end

data/lib/http/2/stream.rb

@@ -97,8 +97,14 @@ module HTTP2
 
       case frame[:type]
       when :data
-        @local_window -= frame[:payload].size
+        window_size = frame[:payload].bytesize
+        window_size += frame[:padding] || 0
+        @local_window -= window_size
         emit(:data, frame[:payload]) unless frame[:ignore]
+
+        # Automatically send WINDOW_UPDATE,
+        # assuming that emit(:data) can now receive next data
+        window_update(window_size) if window_size > 0
       when :headers, :push_promise
         emit(:headers, frame[:payload]) unless frame[:ignore]
       when :priority
@@ -205,6 +211,17 @@ module HTTP2
       send(type: :rst_stream, error: :refused_stream)
     end
 
+    # Sends a WINDOW_UPDATE frame to the peer.
+    #
+    # @param increment [Integer]
+    def window_update(increment)
+      # always emit connection-level WINDOW_UPDATE
+      emit(:window_update, increment)
+      # emit stream-level WINDOW_UPDATE unless stream is closed
+      return if @state == :closed || @state == :remote_closed
+      send(type: :window_update, increment: increment)
+    end
+
     private
 
     # HTTP 2.0 Stream States

data/lib/http/2/version.rb

@@ -1,3 +1,3 @@
 module HTTP2
-  VERSION = '0.8.1'.freeze
+  VERSION = '0.8.2'.freeze
 end

data/spec/connection_spec.rb

@@ -577,5 +577,13 @@ RSpec.describe HTTP2::Connection do
 
       @conn.goaway(:internal_error, 'payload')
     end
+    it '.window_update should emit WINDOW_UPDATE frames' do
+      expect(@conn).to receive(:send) do |frame|
+        expect(frame[:type]).to eq :window_update
+        expect(frame[:increment]).to eq 20
+        expect(frame[:stream]).to eq 0
+      end
+      @conn.window_update(20)
+    end
   end
 end

data/spec/stream_spec.rb

@@ -573,6 +573,21 @@ RSpec.describe HTTP2::Stream do
       expect(s1.buffered_amount).to eq 0
       expect(s1.remote_window).to eq 900
     end
+
+    it 'should keep track of incoming flow control' do
+      data = DATA.deep_dup
+      datalen = data[:payload].bytesize
+      expect(@stream).to receive(:send) do |frame|
+        expect(frame[:type]).to eq :window_update
+        expect(frame[:increment]).to eq datalen
+      end
+      expect(@client).to receive(:send) do |frame|
+        expect(frame[:type]).to eq :window_update
+        expect(frame[:increment]).to eq datalen
+      end
+      @stream.receive HEADERS.deep_dup
+      @stream.receive data
+    end
   end
 
   context 'client API' do
@@ -660,6 +675,14 @@ RSpec.describe HTTP2::Stream do
 
       @stream.refuse
     end
+
+    it '.window_update should emit WINDOW_UPDATE frames' do
+      expect(@stream).to receive(:send) do |frame|
+        expect(frame[:type]).to eq :window_update
+        expect(frame[:increment]).to eq 20
+      end
+      @stream.window_update(20)
+    end
   end
 
   context 'server API' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: http-2
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Ilya Grigorik
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-10 00:00:00.000000000 Z
+date: 2016-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler