http-2-next 0.5.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c5f4b4de69d36a492e6cfff41b62c48184e85fa75505592e23b404892f69511
-  data.tar.gz: 9cba9804729c9617564990720cb4594ec41e32b10c2c1fb3baff545de5fb0b02
+  metadata.gz: 910d4e858a63a1b882621dbf2951f2f8a20c29be458de15c9633b451594b797a
+  data.tar.gz: a2ab88e4f38a97320f0d338c149485ee5976645fccd110bd839ba96d6f59432f
 SHA512:
-  metadata.gz: 05dbde11166258b25aa492cebc9eb3f5c1ac5f9e52bcefd0150c7c9be7584de0152af624fb8e406439fca4fb3bc96c0460a6bd6168a319562532d74176ffbb95
-  data.tar.gz: e5d916406df282f618cd64443db492b4a0e817e35484bb31c37d1146d9d67493b5fce715cf220710ad220d9d7fe4ae6aacd2f8c973126509f1d99f71e9ee6587
+  metadata.gz: 72ca980c5aa292e4e92cdf625f8769c77a2a12a9452736a254c668f55cfcdcdcde493db0d8e760eb7d4c1981aadbcdb08f0f48970b8453b3a59dbb5c9ef2a614
+  data.tar.gz: 6875ba9d1136b4c146e89c1b5dad811e4225adb03f99340b09dab0a54f7eeee4aab04596e9bed9f1d68de6b2770aa1548a662d4c9969356612ede4c5d48c2864

data/README.md

@@ -1,8 +1,8 @@
 # HTTP-2-Next
 
 [![Gem Version](https://badge.fury.io/rb/http-2-next.svg)](http://rubygems.org/gems/http-2-next)
-[![Build status](https://gitlab.com/honeyryderchuck/http-2-next/badges/master/pipeline.svg)](https://gitlab.com/honeyryderchuck/http-2-next/commits/master)
-[![coverage report](https://gitlab.com/honeyryderchuck/http-2-next/badges/master/coverage.svg?job=coverage)](https://honeyryderchuck.gitlab.io/http-2-next/coverage/#_AllFiles)
+[![Build status](https://gitlab.com/os85/http-2-next/badges/master/pipeline.svg)](https://gitlab.com/os85/http-2-next/commits/master)
+[![coverage report](https://gitlab.com/os85/http-2-next/badges/master/coverage.svg?job=coverage)](https://os85.gitlab.io/http-2-next/coverage/#_AllFiles)
 
 **Attention!** This is a fork of the [http-2](https://github.com/igrigorik/http-2) gem.
 
@@ -265,7 +265,7 @@ conn.on(:stream) do |stream|
     # split response between multiple DATA frames
     stream.data(response_chunk, end_stream: false)
     stream.data(last_chunk)
-    
+
     # now send the previously promised data
     push_stream.data(push_data)
   end

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

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+if RUBY_VERSION < "3.3.0"
+  require "base64"
+elsif !defined?(Base64)
+  module HTTP2Next
+    # require "base64" will not be a default gem after ruby 3.4.0
+    module Base64
+      module_function
+
+      def encode64(bin)
+        [bin].pack("m")
+      end
+
+      def decode64(str)
+        str.unpack1("m")
+      end
+
+      def urlsafe_encode64(bin, padding: true)
+        str = strict_encode64(bin)
+        str.chomp!("==") or str.chomp!("=") unless padding
+        str.tr!("+/", "-_")
+        str
+      end
+    end
+
+    def urlsafe_decode64(str)
+      if !str.end_with?("=") && str.length % 4 != 0
+        str = str.ljust((str.length + 3) & ~3, "=")
+        str.tr!("-_", "+/")
+      else
+        str = str.tr("-_", "+/")
+      end
+      strict_decode64(str)
+    end
+  end
+end

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

@@ -10,7 +10,7 @@ module HTTP2Next
     # @param event [Symbol]
     # @param block [Proc] callback function
     def on(event, &block)
-      raise ArgumentError, "must provide callback" unless block_given?
+      raise ArgumentError, "must provide callback" unless block
 
       listeners(event.to_sym).push block
     end

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

@@ -4,6 +4,7 @@ module HTTP2Next
   # Stream, connection, and compressor exceptions.
   module Error
     @types = {}
+
     class << self
       attr_reader :types
     end
@@ -60,5 +61,7 @@ module HTTP2Next
     class StreamLimitExceeded < Error; end
 
     class FrameSizeError < Error; end
+
+    @types.freeze
   end
 end

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

@@ -1,16 +1,6 @@
 # frozen_string_literal: true
 
 module HTTP2Next
-  module RegexpExtensions
-    unless Regexp.method_defined?(:match?)
-      refine Regexp do
-        def match?(*args)
-          !match(*args).nil?
-        end
-      end
-    end
-  end
-
   module StringExtensions
     refine String do
       def read(n)
@@ -29,12 +19,6 @@ module HTTP2Next
       def shift_byte
         read(1).ord
       end
-
-      unless String.method_defined?(:unpack1)
-        def unpack1(format)
-          unpack(format).first
-        end
-      end
     end
   end
 end

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

@@ -325,7 +325,7 @@ module HTTP2Next
         # Padding:  Padding octets that contain no application semantic value.
         # Padding octets MUST be set to zero when sending and ignored when
         # receiving.
-        bytes << "\0" * padlen
+        bytes << ("\0" * padlen)
       end
 
       frame[:length] = length
@@ -368,7 +368,7 @@ module HTTP2Next
       end
 
       case frame[:type]
-      when :data
+      when :data, :ping, :continuation
         frame[:payload] = payload.read(frame[:length])
       when :headers
         if frame[:flags].include? :priority
@@ -414,8 +414,6 @@ module HTTP2Next
       when :push_promise
         frame[:promise_stream] = payload.read_uint32 & RBIT
         frame[:payload] = payload.read(frame[:length])
-      when :ping
-        frame[:payload] = payload.read(frame[:length])
       when :goaway
         frame[:last_stream] = payload.read_uint32 & RBIT
         frame[:error] = unpack_error payload.read_uint32
@@ -428,8 +426,6 @@ module HTTP2Next
         end
 
         frame[:increment] = payload.read_uint32 & RBIT
-      when :continuation
-        frame[:payload] = payload.read(frame[:length])
       when :altsvc
         frame[:max_age], frame[:port] = payload.read(6).unpack(UINT32 + UINT16)
 

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

@@ -31,7 +31,7 @@ module HTTP2Next
       # @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 = []

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

@@ -30,8 +30,8 @@ module HTTP2Next
       # @param n [Integer] number of available bits
       # @return [Integer]
       def integer(buf, n)
-        limit = 2**n - 1
-        i = !n.zero? ? (buf.shift_byte & limit) : 0
+        limit = (2**n) - 1
+        i = n.zero? ? 0 : (buf.shift_byte & limit)
 
         m = 0
         if i == limit

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

@@ -8,8 +8,6 @@ module HTTP2Next
     class EncodingContext
       include Error
 
-      using RegexpExtensions
-
       UPPER = /[[:upper:]]/.freeze
 
       # @private
@@ -81,7 +79,7 @@ module HTTP2Next
 
       STATIC_TABLE_BY_FIELD = STATIC_TABLE
                               .each_with_object({})
-                              .each_with_index { |((field, value), hs), idx| (hs[field] ||= []) << [idx, value] }
+                              .with_index { |((field, value), hs), idx| (hs[field] ||= []) << [idx, value] }
                               .each { |pair| pair.each(&:freeze).freeze }.freeze
 
       STATIC_TABLE_SIZE = STATIC_TABLE.size

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

@@ -25,7 +25,7 @@ module HTTP2Next
       # @return [String] binary string
       def encode(str)
         bitstring = str.each_byte.map { |chr| ENCODE_TABLE[chr] }.join
-        bitstring << "1" * ((8 - bitstring.size) % 8)
+        bitstring << ("1" * ((8 - bitstring.size) % 8))
         [bitstring].pack("B*")
       end
 
@@ -40,7 +40,7 @@ module HTTP2Next
 
         mask = (1 << BITS_AT_ONCE) - 1
         buf.each_byte do |chr|
-          (8 / BITS_AT_ONCE - 1).downto(0) do |shift|
+          ((8 / BITS_AT_ONCE) - 1).downto(0) do |shift|
             branch = (chr >> (shift * BITS_AT_ONCE)) & mask
             # MACHINE[state] = [final, [transitions]]
             #  [final] unfinished bits so far are prefix of the EOS code.

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

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require "base64"
 module HTTP2Next
   # HTTP 2.0 server connection class that implements appropriate header
   # compression / decompression algorithms and stream management logic.

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

@@ -129,10 +129,9 @@ module HTTP2Next
         @_status_code ||= frame[:status]
         @_content_length ||= frame[:content_length]
         @_trailers ||= frame[:trailer]
-        if @_waiting_on_trailers
-          verify_trailers(frame)
-        elsif @received_data &&
-              (!@_status_code || @_status_code >= 200)
+        if @_waiting_on_trailers ||
+           (@received_data &&
+               (!@_status_code || @_status_code >= 200))
 
           # An endpoint that receives a HEADERS frame without the END_STREAM flag set after receiving a final
           # (non-informational) status code MUST treat the corresponding request or response as malformed.
@@ -225,7 +224,7 @@ module HTTP2Next
     end
 
     def promise(headers, end_headers: true, &block)
-      raise ArgumentError, "must provide callback" unless block_given?
+      raise ArgumentError, "must provide callback" unless block
 
       flags = end_headers ? [:end_headers] : []
       emit(:promise, self, headers, flags, &block)

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

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

data/lib/http/2/next.rb

@@ -2,6 +2,7 @@
 
 require "http/2/next/version"
 require "http/2/next/extensions"
+require "http/2/next/base64"
 require "http/2/next/error"
 require "http/2/next/emitter"
 require "http/2/next/flow_buffer"

data/sig/connection.rbs

@@ -21,6 +21,29 @@ module HTTP2Next
 
     attr_writer max_streams: Integer?
 
+    @stream_id: Integer
+    @active_stream_count: Integer
+    @last_activated_stream: Integer
+    @last_stream_id: Integer
+
+    @streams: Hash[Integer, Stream]
+    @streams_recently_closed: Hash[Integer, Stream]
+
+    @framer: Framer
+
+    @local_window_limit: Integer
+    @remote_window_limit: Integer
+
+    @compressor: Header::Compressor
+    @decompressor: Header::Decompressor
+    @error: Symbol?
+
+    @recv_buffer: String
+    @continuation: Array[frame]
+
+    @closed_since: Float?
+    @received_frame: bool
+
     def closed?: () -> bool
 
     def new_stream: (**untyped) -> Stream
@@ -37,9 +60,9 @@ module HTTP2Next
     def receive: (string data) -> void
     alias << receive
 
-    private
+    def initialize: (?settings_hash) -> void
 
-    def initialize: (?settings_hash) -> untyped
+    private
 
     def send: (frame) -> void
 
@@ -67,6 +90,6 @@ module HTTP2Next
 
     def _verify_pseudo_headers: (frame, Array[String]) -> void
 
-    def connection_error: (?Symbol error, ?msg: String, ?e: StandardError) -> void
+    def connection_error: (?Symbol error, ?msg: String?, ?e: StandardError?) -> void
   end
 end

data/sig/error.rbs

@@ -1,2 +1,35 @@
 module HTTP2Next
+  module Error
+    def self?.types: () -> Hash[Symbol, singleton(Error)]
+
+    class Error < StandardError
+    end
+
+    class HandshakeError < Error
+    end
+
+    class ProtocolError < Error
+    end
+
+    class CompressionError < ProtocolError
+    end
+
+    class FlowControlError < ProtocolError
+    end
+
+    class InternalError < ProtocolError
+    end
+
+    class StreamClosed < Error
+    end
+
+    class ConnectionClosed < Error
+    end
+
+    class StreamLimitExceeded < Error
+    end
+
+    class FrameSizeError < Error
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: http-2-next
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Tiago Cardoso
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-05 00:00:00.000000000 Z
+date: 2023-10-03 00:00:00.000000000 Z
 dependencies: []
 description: Pure-ruby HTTP 2.0 protocol implementation
 email:
@@ -21,6 +21,7 @@ extra_rdoc_files: []
 files:
 - README.md
 - lib/http/2/next.rb
+- lib/http/2/next/base64.rb
 - lib/http/2/next/client.rb
 - lib/http/2/next/connection.rb
 - lib/http/2/next/emitter.rb
@@ -53,10 +54,15 @@ files:
 - sig/next.rbs
 - sig/server.rbs
 - sig/stream.rbs
-homepage: https://gitlab.com/honeyryderchuck/http-2-next
+homepage: https://gitlab.com/os85/http-2-next
 licenses:
 - MIT
-metadata: {}
+metadata:
+  bug_tracker_uri: https://gitlab.com/os85/http-2-next/issues
+  changelog_uri: https://gitlab.com/os85/http-2-next/-/blob/master/CHANGELOG.md
+  source_code_uri: https://gitlab.com/os85/http-2-next
+  homepage_uri: https://gitlab.com/os85/http-2-next
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -65,14 +71,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.1.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: Pure-ruby HTTP 2.0 protocol implementation