http-2 0.11.0 → 0.12.0

data/lib/http/2/stream.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module HTTP2
   # A single HTTP 2.0 connection can multiplex multiple streams in parallel:
   # multiple requests and responses can be in flight simultaneously and stream
@@ -49,11 +51,10 @@ module HTTP2
 
     # Stream priority as set by initiator.
     attr_reader :weight
-    attr_reader :dependency
+    attr_reader :dependency, :remote_window
 
     # Size of current stream flow control window.
     attr_reader :local_window
-    attr_reader :remote_window
     alias window local_window
 
     # Reason why connection was closed.
@@ -120,9 +121,7 @@ module HTTP2
         # An ALTSVC frame on a
         # stream other than stream 0 containing non-empty "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)
       end
@@ -170,7 +169,7 @@ module HTTP2
     end
 
     def promise(headers, end_headers: true, &block)
-      fail ArgumentError, 'must provide callback' unless block_given?
+      raise ArgumentError, 'must provide callback' unless block_given?
 
       flags = end_headers ? [:end_headers] : []
       emit(:promise, self, headers, flags, &block)
@@ -243,6 +242,7 @@ module HTTP2
     def 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
 
@@ -345,18 +345,18 @@ module HTTP2
       # connection error (Section 5.4.1) of type PROTOCOL_ERROR.
       when :reserved_local
         @state = if sending
-          case frame[:type]
-          when :headers     then event(:half_closed_remote)
-          when :rst_stream  then event(:local_rst)
-          else stream_error
-          end
-        else
-          case frame[:type]
-          when :rst_stream then event(:remote_rst)
-          when :priority, :window_update then @state
-          else stream_error
-          end
-        end
+                   case frame[:type]
+                   when :headers     then event(:half_closed_remote)
+                   when :rst_stream  then event(:local_rst)
+                   else stream_error
+                   end
+                 else
+                   case frame[:type]
+                   when :rst_stream then event(:remote_rst)
+                   when :priority, :window_update then @state
+                   else stream_error
+                   end
+                 end
 
       # A stream in the "reserved (remote)" state has been reserved by a
       # remote peer.
@@ -374,18 +374,18 @@ module HTTP2
       # error (Section 5.4.1) of type PROTOCOL_ERROR.
       when :reserved_remote
         @state = if sending
-          case frame[:type]
-          when :rst_stream then event(:local_rst)
-          when :priority, :window_update then @state
-          else stream_error
-          end
-        else
-          case frame[:type]
-          when :headers then event(:half_closed_local)
-          when :rst_stream then event(:remote_rst)
-          else stream_error
-          end
-        end
+                   case frame[:type]
+                   when :rst_stream then event(:local_rst)
+                   when :priority, :window_update then @state
+                   else stream_error
+                   end
+                 else
+                   case frame[:type]
+                   when :headers then event(:half_closed_local)
+                   when :rst_stream then event(:remote_rst)
+                   else stream_error
+                   end
+                 end
 
       # A stream in the "open" state may be used by both peers to send
       # frames of any type.  In this state, sending peers observe
@@ -523,26 +523,24 @@ module HTTP2
       when :closed
         if sending
           case frame[:type]
-          when :rst_stream then # ignore
-          when :priority   then
+          when :rst_stream # ignore
+          when :priority
             process_priority(frame)
           else
-            stream_error(:stream_closed) unless (frame[:type] == :rst_stream)
+            stream_error(:stream_closed) unless frame[:type] == :rst_stream
           end
+        elsif frame[:type] == :priority
+          process_priority(frame)
         else
-          if frame[:type] == :priority
-            process_priority(frame)
-          else
-            case @closed
-            when :remote_rst, :remote_closed
-              case frame[:type]
-              when :rst_stream, :window_update # nop here
-              else
-                stream_error(:stream_closed)
-              end
-            when :local_rst, :local_closed
-              frame[:ignore] = true if frame[:type] != :window_update
+          case @closed
+          when :remote_rst, :remote_closed
+            case frame[:type]
+            when :rst_stream, :window_update # nop here
+            else
+              stream_error(:stream_closed)
             end
+          when :local_rst, :local_closed
+            frame[:ignore] = true if frame[:type] != :window_update
           end
         end
       end
@@ -587,9 +585,9 @@ module HTTP2
       @dependency = frame[:stream_dependency]
       emit(
         :priority,
-        weight:     frame[:weight],
+        weight: frame[:weight],
         dependency: frame[:stream_dependency],
-        exclusive:  frame[:exclusive],
+        exclusive: frame[:exclusive]
       )
       # TODO: implement dependency tree housekeeping
       #   Latest draft defines a fairly complex priority control.
@@ -601,6 +599,8 @@ module HTTP2
     def end_stream?(frame)
       case frame[:type]
       when :data, :headers, :continuation
+        return false unless frame[:flags]
+
         frame[:flags].include?(:end_stream)
       else false
       end
@@ -611,7 +611,7 @@ module HTTP2
       close(error) if @state != :closed
 
       klass = error.to_s.split('_').map(&:capitalize).join
-      fail Error.const_get(klass), msg
+      raise Error.const_get(klass), msg
     end
     alias error stream_error
 

data/lib/http/2/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module HTTP2
-  VERSION = '0.11.0'.freeze
+  VERSION = '0.12.0'
 end

data/lib/http/2.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'http/2/version'
 require 'http/2/error'
 require 'http/2/emitter'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: http-2
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.0
 platform: ruby
 authors:
 - Ilya Grigorik
@@ -9,16 +9,16 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-06 00:00:00.000000000 Z
+date: 2024-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: base64
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -32,30 +32,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".autotest"
-- ".coveralls.yml"
-- ".gitignore"
-- ".gitmodules"
-- ".rspec"
-- ".rubocop.yml"
-- ".rubocop_todo.yml"
-- ".travis.yml"
-- Gemfile
-- Guardfile
-- Guardfile.h2spec
 - LICENSE
 - README.md
-- Rakefile
-- example/Gemfile
-- example/README.md
-- example/client.rb
-- example/helper.rb
-- example/keys/server.crt
-- example/keys/server.key
-- example/server.rb
-- example/upgrade_client.rb
-- example/upgrade_server.rb
-- http-2.gemspec
 - lib/http/2.rb
 - lib/http/2/buffer.rb
 - lib/http/2/client.rb
@@ -70,22 +48,6 @@ files:
 - lib/http/2/server.rb
 - lib/http/2/stream.rb
 - lib/http/2/version.rb
-- lib/tasks/generate_huffman_table.rb
-- spec/buffer_spec.rb
-- spec/client_spec.rb
-- spec/compressor_spec.rb
-- spec/connection_spec.rb
-- spec/emitter_spec.rb
-- spec/framer_spec.rb
-- spec/h2spec/h2spec.darwin
-- spec/h2spec/output/non_secure.txt
-- spec/helper.rb
-- spec/hpack_test_spec.rb
-- spec/huffman_spec.rb
-- spec/server_spec.rb
-- spec/stream_spec.rb
-- spec/support/deep_dup.rb
-- spec/support/duplicable.rb
 homepage: https://github.com/igrigorik/http-2
 licenses:
 - MIT
@@ -98,30 +60,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.0
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: Pure-ruby HTTP 2.0 protocol implementation
-test_files:
-- spec/buffer_spec.rb
-- spec/client_spec.rb
-- spec/compressor_spec.rb
-- spec/connection_spec.rb
-- spec/emitter_spec.rb
-- spec/framer_spec.rb
-- spec/h2spec/h2spec.darwin
-- spec/h2spec/output/non_secure.txt
-- spec/helper.rb
-- spec/hpack_test_spec.rb
-- spec/huffman_spec.rb
-- spec/server_spec.rb
-- spec/stream_spec.rb
-- spec/support/deep_dup.rb
-- spec/support/duplicable.rb
+test_files: []

data/.autotest

@@ -1,20 +0,0 @@
-require 'autotest/growl'
-
-Autotest.add_hook(:initialize) {|at|
-  at.add_exception %r{^\.git|\.yardoc}
-  at.add_exception %r{^./tmp}
-  at.add_exception %r{coverage}
-
-  at.clear_mappings
-
-  at.add_mapping(%r%^spec/.*_spec\.rb$%) { |filename, _|
-    filename
-  }
-  at.add_mapping(%r%^lib/(.*)\.rb$%) { |_, m|
-    ["spec/#{m[1].split('/').last}_spec.rb"]
-  }
-  at.add_mapping(%r%^spec/(spec_helper|shared/.*)\.rb$%) {
-    files_matching %r%^spec/.*_spec\.rb$%
-  }
-  nil
-}

data/.coveralls.yml

@@ -1 +0,0 @@
-service_name: travis-ci

data/.gitignore

@@ -1,20 +0,0 @@
-*.gem
-*.rbc
-.bundle
-.config
-.yardoc
-.DS_Store
-.idea
-Gemfile.lock
-InstalledFiles
-_yardoc
-coverage
-doc/
-vendor/
-lib/bundler/man
-pkg
-rdoc
-spec/reports
-test/tmp
-test/version_tmp
-tmp

data/.gitmodules

@@ -1,3 +0,0 @@
-[submodule "spec/hpack-test-case"]
-	path = spec/hpack-test-case
-	url = https://github.com/http2jp/hpack-test-case

data/.rspec

@@ -1,5 +0,0 @@
-autotest
---color
---format documentation
---order rand
---warnings

data/.rubocop.yml

@@ -1,93 +0,0 @@
-inherit_from: .rubocop_todo.yml
-
-AllCops:
-  TargetRubyVersion: 2.1
-  DisplayCopNames: true
-  Exclude:
-    - 'bin/**'
-    - 'vendor/**/*'
-    - '**/huffman_statemachine.rb'
-
-Layout/IndentHeredoc:
-  Exclude:
-    - 'lib/tasks/generate_huffman_table.rb'
-    - 'example/*'
-
-Metrics/LineLength:
-  Max: 120
-
-Metrics/BlockLength:
-  Max: 700
-
-Layout/EndAlignment:
-  EnforcedStyleAlignWith: variable
-
-Layout/CaseIndentation:
-  EnforcedStyle: end
-
-Layout/IndentHash:
-  EnforcedStyle: consistent
-
-Style/TrailingCommaInArrayLiteral:
-  EnforcedStyleForMultiline: comma
-
-Style/TrailingCommaInHashLiteral:
-  EnforcedStyleForMultiline: comma
-
-Layout/SpaceAroundOperators:
-  Enabled: false
-
-Layout/ExtraSpacing:
-  Enabled: false
-
-Layout/EmptyLinesAroundExceptionHandlingKeywords:
-  Enabled: false
-
-Naming/UncommunicativeMethodParamName:
-  Enabled: false
-
-Style/SignalException:
-  Enabled: false
-
-Style/FrozenStringLiteralComment:
-  Enabled: false
-
-Style/ParallelAssignment:
-  Enabled: false
-
-Style/ParenthesesAroundCondition:
-  Enabled: false
-
-Style/IfInsideElse:
-  Enabled: false
-
-Style/IfUnlessModifier:
-  Enabled: false
-
-Style/MultilineIfModifier:
-  Enabled: false
-
-Lint/EmptyWhen:
-  Enabled: false
-
-Style/TrailingCommaInArguments:
-  Enabled: false
-
-Style/TrailingUnderscoreVariable:
-  Enabled: false
-
-Style/SymbolArray:
-  Enabled: false
-
-Style/CommentedKeyword:
-  Enabled: false
-
-Style/PercentLiteralDelimiters:
-  Enabled: false
-
-Performance/TimesMap:
-  Enabled: false
-
-Performance/RedundantBlockCall:
-  Enabled: false
-

data/.rubocop_todo.yml

@@ -1,131 +0,0 @@
-# This configuration was generated by
-# `rubocop --auto-gen-config`
-# on 2016-06-09 10:57:54 -0400 using RuboCop version 0.40.0.
-# The point is for the user to remove these configuration records
-# one by one as the offenses are removed from the code base.
-# Note that changes in the inspected code, or installation of new
-# versions of RuboCop, may require this file to be generated again.
-
-# Offense count: 24
-Metrics/AbcSize:
-  Max: 185
-
-# Offense count: 16
-Metrics/BlockNesting:
-  Max: 5
-
-# Offense count: 5
-# Configuration parameters: CountComments.
-Metrics/ClassLength:
-  Max: 325
-
-Metrics/ModuleLength:
-  Max: 120
-
-# Offense count: 12
-Metrics/CyclomaticComplexity:
-  Max: 60
-
-# Offense count: 9
-# Configuration parameters: AllowHeredoc, AllowURI, URISchemes.
-# URISchemes: http, https
-Metrics/LineLength:
-  Max: 108
-
-# Offense count: 29
-# Configuration parameters: CountComments.
-Metrics/MethodLength:
-  Max: 134
-
-# Offense count: 1
-# Configuration parameters: CountKeywordArgs.
-Metrics/ParameterLists:
-  Max: 7
-
-# Offense count: 10
-Metrics/PerceivedComplexity:
-  Max: 46
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: MaxKeyValuePairs.
-Performance/RedundantMerge:
-  Exclude:
-    - 'lib/http/2/server.rb'
-
-# Offense count: 4
-Style/Documentation:
-  Exclude:
-    - 'spec/**/*'
-    - 'test/**/*'
-    - 'example/helper.rb'
-    - 'example/upgrade_server.rb'
-    - 'lib/tasks/generate_huffman_table.rb'
-
-# Offense count: 3
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: braces, no_braces, context_dependent
-Style/BracesAroundHashParameters:
-  Exclude:
-    - 'spec/connection_spec.rb'
-    - 'spec/server_spec.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-Style/EmptyCaseCondition:
-  Exclude:
-    - 'example/upgrade_server.rb'
-
-# Offense count: 1
-# Configuration parameters: MinBodyLength.
-Style/GuardClause:
-  Exclude:
-    - 'lib/http/2/connection.rb'
-
-# Offense count: 2
-# Cop supports --auto-correct.
-# Configuration parameters: SupportedStyles, IndentationWidth.
-# SupportedStyles: special_inside_parentheses, consistent, align_brackets
-Layout/IndentArray:
-  EnforcedStyle: consistent
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-# SupportedStyles: symmetrical, new_line, same_line
-Layout/MultilineArrayBraceLayout:
-  Exclude:
-    - 'spec/compressor_spec.rb'
-
-# Offense count: 16
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-# SupportedStyles: symmetrical, new_line, same_line
-Layout/MultilineHashBraceLayout:
-  Exclude:
-    - 'spec/compressor_spec.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-Style/MutableConstant:
-  Exclude:
-    - 'example/upgrade_server.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-Style/RedundantSelf:
-  Exclude:
-    - 'lib/http/2/connection.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-Style/UnneededInterpolation:
-  Exclude:
-    - 'spec/compressor_spec.rb'
-
-# Offense count: 1
-# Cop supports --auto-correct.
-Style/ZeroLengthPredicate:
-  Exclude:
-    - 'lib/http/2/framer.rb'

data/.travis.yml

@@ -1,17 +0,0 @@
-language: ruby
-cache: bundler
-rvm:
-  - 2.1
-  - 2.2
-  - 2.3
-  - 2.4
-  - 2.5
-  - 2.6
-  - 2.7
-  - jruby-9.2.0.0 # latest stable
-  - jruby-head
-  - rbx-2
-matrix:
-  allow_failures:
-    - rvm: jruby-head
-    - rvm: rbx-2

data/Gemfile

@@ -1,16 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'rake'
-gem 'yard'
-
-group :test do
-  gem 'autotest-standalone'
-  gem 'coveralls', require: false
-  gem 'pry'
-  gem 'pry-byebug', platform: :mri
-  gem 'rspec', '~> 3.4.0'
-  gem 'rspec-autotest'
-  gem 'rubocop', '0.57.2'
-end
-
-gemspec

data/Guardfile

@@ -1,18 +0,0 @@
-guard :process, name: 'HTTP/2 Server', command: 'ruby example/server.rb', stop_signal: 'TERM' do
-  watch(%r{^example/(.+)\.rb$})
-  watch(%r{^lib/http/2/(.+)\.rb$})
-
-  watch('Gemfile.lock')
-end
-
-def h2spec
-  puts 'Starting H2 Spec'
-  sleep 0.7
-  system '~/go-workspace/bin/h2spec -p 8080 -o 1 -s 4.2'
-  puts "\n"
-end
-
-guard :shell, name: 'H2 Spec' do
-  watch(%r{^example/(.+)\.rb$})    { h2spec }
-  watch(%r{^lib/http/2/(.+)\.rb$}) { h2spec }
-end

data/Guardfile.h2spec

@@ -1,12 +0,0 @@
-def h2spec
-  puts "Starting H2 Spec"
-  sleep 0.7
-  system '~/go-workspace/bin/h2spec -p 8080 -o 1 -s 5.1'
-  puts "\n"
-end
-
-guard :shell, name:'H2 Spec' do
-  watch(%r{^example/(.+)\.rb$})    { h2spec }
-  watch(%r{^lib/http/2/(.+)\.rb$}) { h2spec }
-end
-