http-2-next 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c4ce4e3302e32d2c860cf38d25f82186a233ae9bb446bde932d185ca398d4eec
-  data.tar.gz: c2428f11638405fa7c92390745f4c21022627500fe54d564a46f06e83967d126
+  metadata.gz: 7db81040e42ff1170fbbcc93611c502b3b7fb1f3e4dcad7dd0ede42eaf08d0a4
+  data.tar.gz: 3f6027a4d12dc034726040554a5ba4aab96c145ff7acc7fc6c8287afdc4b49d3
 SHA512:
-  metadata.gz: 5a10531d34c3d37989a6de029b4bfdca1b9742b7614a7785179bea4d8794568b58bd88641c259721520f803b1f6577c2e41ddb49bff75564edfbdf9d422124fc
-  data.tar.gz: 8d9d7e74f52d079a7f9021bcd7679bd7544b1e30d17cdd5f42de24326812c46f4c3f8208f3132ba0e9d0df46b6c947238781a48abbf6d1cacc95da69b3227293
+  metadata.gz: edb1d8dcf5509b2d51c64a66bf5396f7603817988b57894ba9529e877714c4c3ea847fd403ce75bb285a545a17758a8405277c9c36323425a2cd83d52ce842d7
+  data.tar.gz: fff64e2206e276c3b174d309d8a32181058dfde60f507953a215d6d5850abb754e6db5c5a54247d946b61bf6a74b57a748d8f4138e9c8c533e18000bb69d40e3

data/lib/http/2/next.rb

@@ -4,7 +4,6 @@ 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"
 require "http/2/next/flow_buffer"
 require "http/2/next/header"
 require "http/2/next/framer"

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

@@ -51,6 +51,8 @@ module HTTP2Next
     include Emitter
     include Error
 
+    using StringExtensions
+
     # Connection state (:new, :closed).
     attr_reader :state
 
@@ -98,7 +100,7 @@ module HTTP2Next
       @remote_window_limit = @remote_settings[:settings_initial_window_size]
       @remote_window = @remote_window_limit
 
-      @recv_buffer = Buffer.new
+      @recv_buffer = "".b
       @continuation = []
       @error = nil
 
@@ -159,7 +161,7 @@ module HTTP2Next
       send(type: :goaway, last_stream: last_stream,
            error: error, payload: payload)
       @state = :closed
-      @closed_since = Time.now
+      @closed_since = Process.clock_gettime(Process::CLOCK_MONOTONIC)
     end
 
     # Sends a WINDOW_UPDATE frame to the peer.
@@ -245,7 +247,7 @@ module HTTP2Next
           @continuation.clear
 
           frame.delete(:length)
-          frame[:payload] = Buffer.new(payload)
+          frame[:payload] = payload
           frame[:flags] << :end_headers
         end
 
@@ -478,7 +480,7 @@ module HTTP2Next
           # the connection, although a new connection can be established
           # for new streams.
           @state = :closed
-          @closed_since = Time.now
+          @closed_since = Process.clock_gettime(Process::CLOCK_MONOTONIC)
           emit(:goaway, frame[:last_stream], frame[:error], frame[:payload])
         when :altsvc
           # 4.  The ALTSVC HTTP/2 Frame
@@ -503,7 +505,7 @@ module HTTP2Next
         when :ping
           ping_management(frame)
         else
-          connection_error if (Time.now - @closed_since) > 15
+          connection_error if (Process.clock_gettime(Process::CLOCK_MONOTONIC) - @closed_since) > 15
         end
       else
         connection_error
@@ -671,7 +673,7 @@ module HTTP2Next
     #
     # @param frame [Hash]
     def decode_headers(frame)
-      frame[:payload] = @decompressor.decode(frame[:payload], frame) if frame[:payload].is_a? Buffer
+      frame[:payload] = @decompressor.decode(frame[:payload], frame) if frame[:payload].is_a?(String)
     rescue CompressionError => e
       connection_error(:compression_error, e: e)
     rescue ProtocolError => e
@@ -686,15 +688,16 @@ module HTTP2Next
     # @return [Array of Frame]
     def encode_headers(frame)
       payload = frame[:payload]
-      payload = @compressor.encode(payload) unless payload.is_a? Buffer
+      payload = @compressor.encode(payload) unless payload.is_a?(String)
 
       frames = []
 
-      while payload.bytesize > 0
+      while payload && payload.bytesize > 0
         cont = frame.dup
         cont[:type] = :continuation
         cont[:flags] = []
-        cont[:payload] = payload.slice!(0, @remote_settings[:settings_max_frame_size])
+        cont[:payload] = payload.byteslice(0, @remote_settings[:settings_max_frame_size])
+        payload = payload.byteslice(@remote_settings[:settings_max_frame_size]..-1)
         frames << cont
       end
       if frames.empty?
@@ -735,11 +738,11 @@ module HTTP2Next
         # References to such streams will be purged whenever another stream
         # is closed, with a minimum of 15s RTT time window.
         @streams_recently_closed.reject! do |stream_id, v|
-          to_delete = (Time.now - v) > 15
+          to_delete = (Process.clock_gettime(Process::CLOCK_MONOTONIC) - v) > 15
           @streams.delete stream_id if to_delete
           to_delete
         end
-        @streams_recently_closed[id] = Time.now
+        @streams_recently_closed[id] = Process.clock_gettime(Process::CLOCK_MONOTONIC)
       end
 
       stream.on(:promise, &method(:promise)) if is_a? Server
@@ -757,7 +760,7 @@ module HTTP2Next
 
     def verify_pseudo_headers(frame, mandatory_headers)
       headers = frame[:payload]
-      return if headers.is_a?(Buffer)
+      return if headers.is_a?(String)
 
       pseudo_headers = headers.take_while do |field, value|
         # use this loop to validate pseudo-headers

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

@@ -12,8 +12,23 @@ module HTTP2Next
   end
 
   module StringExtensions
-    unless String.method_defined?(:unpack1)
-      refine String do
+    refine String do
+      def read(n)
+        chunk = byteslice(0..n - 1)
+        remaining = byteslice(n..-1)
+        remaining ? replace(remaining) : clear
+        chunk
+      end
+
+      def read_uint32
+        read(4).unpack1("N")
+      end
+
+      def shift_byte
+        read(1).ord
+      end
+
+      unless String.method_defined?(:unpack1)
         def unpack1(format)
           unpack(format).first
         end

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

@@ -138,10 +138,13 @@ module HTTP2Next
 
         # 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
+        frame_bytes = payload.byteslice(0, window_size)
+        payload = payload.byteslice(window_size..-1)
+
+        frame[:payload] = frame_bytes
+        frame[:length] = frame_bytes.bytesize
         chunk[:payload] = payload
+        chunk[:length]  = payload.bytesize
 
         # if no longer last frame in sequence...
         frame[:flags] -= [:end_stream] if end_stream

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

@@ -159,7 +159,7 @@ module HTTP2Next
     # @return [Hash] the corresponding frame
     def read_common_header(buf)
       frame = {}
-      len_hi, len_lo, type, flags, stream = buf.slice(0, 9).unpack(HEADERPACK)
+      len_hi, len_lo, type, flags, stream = buf.byteslice(0, 9).unpack(HEADERPACK)
 
       frame[:length] = (len_hi << FRAME_LENGTH_HISHIFT) | len_lo
       frame[:type], = FRAME_TYPES.find { |_t, pos| type == pos }
@@ -178,7 +178,7 @@ module HTTP2Next
     #
     # @param frame [Hash]
     def generate(frame)
-      bytes  = Buffer.new
+      bytes  = "".b
       length = 0
 
       frame[:flags] ||= []
@@ -360,7 +360,7 @@ module HTTP2Next
           frame[:padding] = padlen + 1
           raise ProtocolError, "padding too long" if padlen > payload.bytesize
 
-          payload.slice!(-padlen, padlen) if padlen > 0
+          payload = payload.byteslice(0, payload.bytesize - padlen) if padlen > 0
           frame[:length] -= frame[:padding]
           frame[:flags].delete(:padded)
         end
@@ -374,7 +374,9 @@ module HTTP2Next
           e_sd = payload.read_uint32
           frame[:dependency] = e_sd & RBIT
           frame[:exclusive] = (e_sd & EBIT) != 0
-          frame[:weight] = payload.getbyte + 1
+          weight = payload.byteslice(0, 1).ord + 1
+          frame[:weight] = weight
+          payload = payload.byteslice(1..-1)
         end
         frame[:payload] = payload.read(frame[:length])
       when :priority
@@ -383,7 +385,9 @@ module HTTP2Next
         e_sd = payload.read_uint32
         frame[:dependency] = e_sd & RBIT
         frame[:exclusive] = (e_sd & EBIT) != 0
-        frame[:weight] = payload.getbyte + 1
+        weight = payload.byteslice(0, 1).ord + 1
+        frame[:weight] = weight
+        payload = payload.byteslice(1..-1)
       when :rst_stream
         raise FrameSizeError, "Invalid length for RST_STREAM (#{frame[:length]} != 4)" if frame[:length] != 4
 
@@ -428,10 +432,12 @@ module HTTP2Next
       when :altsvc
         frame[:max_age], frame[:port] = payload.read(6).unpack(UINT32 + UINT16)
 
-        len = payload.getbyte
+        len = payload.byteslice(0, 1).ord
+        payload = payload.byteslice(1..-1)
         frame[:proto] = payload.read(len) if len > 0
 
-        len = payload.getbyte
+        len = payload.byteslice(0, 1).ord
+        payload = payload.byteslice(1..-1)
         frame[:host] = payload.read(len) if len > 0
 
         frame[:origin] = payload.read(payload.size) unless payload.empty?

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

@@ -91,7 +91,7 @@ module HTTP2Next
       # @param h [Hash] header command
       # @param buffer [String]
       # @return [Buffer]
-      def header(h, buffer = Buffer.new)
+      def header(h, buffer = "".b)
         rep = HEADREP[h[:type]]
 
         case h[:type]
@@ -122,7 +122,7 @@ module HTTP2Next
       # @param headers [Array] +[[name, value], ...]+
       # @return [Buffer]
       def encode(headers)
-        buffer = Buffer.new
+        buffer = "".b
         pseudo_headers, regular_headers = headers.partition { |f, _| f.start_with? ":" }
         headers = [*pseudo_headers, *regular_headers]
         commands = @cc.encode(headers)

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

@@ -2,6 +2,7 @@
 
 module HTTP2Next
   module Header
+    using StringExtensions
     # 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.
@@ -30,11 +31,11 @@ module HTTP2Next
       # @return [Integer]
       def integer(buf, n)
         limit = 2**n - 1
-        i = !n.zero? ? (buf.getbyte & limit) : 0
+        i = !n.zero? ? (buf.shift_byte & limit) : 0
 
         m = 0
         if i == limit
-          while (byte = buf.getbyte)
+          while (byte = buf.shift_byte)
             i += ((byte & 127) << m)
             m += 7
 
@@ -53,12 +54,12 @@ module HTTP2Next
       def string(buf)
         raise CompressionError, "invalid header block fragment" if buf.empty?
 
-        huffman = (buf.readbyte(0) & 0x80) == 0x80
+        huffman = (buf.getbyte(0) & 0x80) == 0x80
         len = integer(buf, 7)
         str = buf.read(len)
         raise CompressionError, "string too short" unless str.bytesize == len
 
-        str = Huffman.new.decode(Buffer.new(str)) if huffman
+        str = Huffman.new.decode(str) if huffman
         str.force_encoding(Encoding::UTF_8)
       end
 
@@ -67,7 +68,7 @@ module HTTP2Next
       # @param buf [Buffer]
       # @return [Hash] command
       def header(buf)
-        peek = buf.readbyte(0)
+        peek = buf.getbyte(0)
 
         header = {}
         header[:type], type = HEADREP.find do |_t, desc|

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

@@ -79,7 +79,8 @@ module HTTP2Next
       receive(CONNECTION_PREFACE_MAGIC)
 
       # Process received HTTP2-Settings payload
-      buf = HTTP2Next::Buffer.new Base64.urlsafe_decode64(settings.to_s)
+      buf = "".b
+      buf << Base64.urlsafe_decode64(settings.to_s)
       header = @framer.common_header(
         length: buf.bytesize,
         type: :settings,

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

@@ -163,7 +163,7 @@ module HTTP2Next
       return unless @_trailers
 
       trailers = frame[:payload]
-      return if trailers.is_a?(Buffer)
+      return unless trailers.respond_to?(:each)
 
       trailers.each do |field, _|
         @_trailers.delete(field)

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

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

data/sig/connection.rbs

@@ -48,7 +48,7 @@ module HTTP2Next
 
     def send: (frame) -> void
 
-    def encode: (frame) -> Array[Buffer]
+    def encode: (frame) -> Array[String]
 
     def connection_frame?: (frame) -> bool
 

data/sig/emitter.rbs

@@ -1,10 +1,10 @@
 module HTTP2Next
   module Emitter
-    # def on: (Symbol event) { (*untyped) -> void } -> void
+    def on: (Symbol event) { (*untyped) -> void } -> void
 
-    # def once: (Symbol event) { (*untyped) -> void } -> void
+    def once: (Symbol event) { (*untyped) -> void } -> void
 
-    # def emit: (Symbol event, *untyped args) ?{ (*untyped) -> void } -> void
+    def emit: (Symbol event, *untyped args) ?{ (*untyped) -> void } -> void
 
     private
 

data/sig/framer.rbs

@@ -6,11 +6,11 @@ module HTTP2Next
 
     def common_header: (frame) -> String
 
-    def read_common_frame: (Buffer) -> frame
+    def read_common_frame: (String) -> frame
 
-    def generate: (frame) -> Buffer
+    def generate: (frame) -> String
 
-    def parse: (Buffer) -> frame?
+    def parse: (String) -> frame?
 
     private
 

data/sig/header/compressor.rbs

@@ -9,10 +9,10 @@ module HTTP2Next
 
       def string: (String) -> String
 
-      def header: (header_command, Buffer) -> Buffer
-                | (header_command) -> Buffer
+      def header: (header_command, String) -> String
+                | (header_command) -> String
 
-      def encode: (Enumerable[header_pair]) -> Buffer
+      def encode: (Enumerable[header_pair]) -> String
 
       private
 

data/sig/header/decompressor.rbs

@@ -5,14 +5,14 @@ module HTTP2Next
 
       def table_size=: (Integer) -> void
 
-      def integer: (Buffer, Integer) -> Integer
+      def integer: (String, Integer) -> Integer
 
-      def string: (Buffer) -> String
+      def string: (String) -> String
 
-      def header: (Buffer) -> header_command
+      def header: (String) -> header_command
 
-      def decode: (Buffer, frame?) -> Array[header_pair]
-                | (Buffer) -> Array[header_pair]
+      def decode: (String, frame?) -> Array[header_pair]
+                | (String) -> Array[header_pair]
       private
 
       def initialize: (context_hash options) -> untyped

data/sig/header/huffman.rbs

@@ -3,7 +3,7 @@ module HTTP2Next
     class Huffman
       def encode: (String str) -> String
 
-      def decode: (Buffer str) -> String
+      def decode: (String str) -> String
     end
   end
 end

data/sig/next.rbs

@@ -23,6 +23,46 @@ module HTTP2Next
 
   type header_pair = [String, String]
 
+  # # FRAMES
+  # type frame_control_flags = Array[:end_headers | :end_stream]
+
+  # # HEADERS
+  # type headers_frame = {
+  #   type: :headers, flags: frame_control_flags, stream: Integer, payload: Enumerable[header_pair],
+  #   ?method: Symbol, ?trailer: Array[String], ?content_length: Integer, ?padding: Integer
+  # }
+
+  # # DATA
+  # type data_frame = { type: :data, flags: frame_control_flags, stream: Integer, length: Integer, payload: String, ?padding: Integer }
+
+  # # PUSH_PROMISE
+  # type push_promise_frame = { type: :push_promise, promise_stream: Integer, flags: frame_control_flags, stream: Integer, ?method: Symbol, ?trailer: Array[String], ?content_length: Integer, payload: Enumerable[header_pair], ?padding: Integer }
+
+  # # SETTINGS
+  # type settings_frame = { type: :settings, stream: 0, payload: Array[[Symbol | Integer, Integer]] }
+
+  # # WINDOW_UPDATE
+  # type window_update_frame = { type: :window_update, stream: Integer, increment: Integer }
+
+  # # PRIORITY
+  # type priority_frame = { type: :priority, stream: Integer, dependency: Integer, exclusive: bool, weight: Integer }
+
+  # # ALTSVC
+  # type altsvc_frame = { type: :altsvc, stream: 0, max_age: Integer, port: Integer, proto: "String", host: String }
+
+  # # ORIGIN
+  # type origin_frame = { type: :origin, stream: 0, origin: Array[String] }
+
+  # # PING
+  # type ping_frame = { type: :ping, payload: String, length: Integer }
+
+  # # GOAWAY
+  # type goaway_frame = { type: :goaway, stream: 0, last_stream: Integer, error: Symbol? }
+
+  # type frame = headers_frame | data_frame | push_promise_frame |
+  #              settings_frame | window_update_frame | priority_frame | altsvc_frame |
+  #              origin_frame | ping_frame | goaway_frame
+
   type frame_key = :type | :flags | :stream | :padding | :ignore |
                    # headers
                    :method | :trailer | :content_length |
@@ -44,10 +84,9 @@ module HTTP2Next
   type frame_value = Integer |
                      Symbol | # type (:data, :headers)
                      Array[Symbol] |
-                     String | Buffer |
+                     String |
                      bool |
                      Array[String] |
-                     Array[Buffer] |
                      Array[[Symbol | Integer, Integer]] |
                      Enumerable[header_pair] |
                      nil

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: http-2-next
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Tiago Cardoso
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-09 00:00:00.000000000 Z
+date: 2021-02-21 00:00:00.000000000 Z
 dependencies: []
 description: Pure-ruby HTTP 2.0 protocol implementation
 email:
@@ -21,7 +21,6 @@ extra_rdoc_files: []
 files:
 - README.md
 - lib/http/2/next.rb
-- lib/http/2/next/buffer.rb
 - lib/http/2/next/client.rb
 - lib/http/2/next/connection.rb
 - lib/http/2/next/emitter.rb
@@ -39,7 +38,6 @@ files:
 - lib/http/2/next/stream.rb
 - lib/http/2/next/version.rb
 - lib/tasks/generate_huffman_table.rb
-- sig/buffer.rbs
 - sig/client.rbs
 - sig/connection.rbs
 - sig/emitter.rbs
@@ -73,7 +71,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: Pure-ruby HTTP 2.0 protocol implementation

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

@@ -1,86 +0,0 @@
-# frozen_string_literal: true
-
-require "forwardable"
-
-module HTTP2Next
-  # Binary buffer wraps String.
-  #
-  class Buffer
-    extend Forwardable
-
-    using StringExtensions
-
-    def_delegators :@buffer, :ord, :encoding, :setbyte, :unpack,
-                   :size, :each_byte, :to_str, :to_s, :length, :inspect,
-                   :[], :[]=, :empty?, :bytesize, :include?
-
-    UINT32 = "N"
-    private_constant :UINT32
-
-    # Forces binary encoding on the string
-    def initialize(str = "".b)
-      str = str.dup if str.frozen?
-      @buffer = str.force_encoding(Encoding::BINARY)
-    end
-
-    # Emulate StringIO#read: slice first n bytes from the buffer.
-    #
-    # @param n [Integer] number of bytes to slice from the buffer
-    def read(n)
-      Buffer.new(@buffer.slice!(0, n))
-    end
-
-    def unpack1(*arg)
-      @buffer.unpack1(*arg)
-    end
-
-    # Emulate StringIO#getbyte: slice first byte from buffer.
-    def getbyte
-      read(1).ord
-    end
-
-    def slice!(*args)
-      Buffer.new(@buffer.slice!(*args))
-    end
-
-    def slice(*args)
-      Buffer.new(@buffer.slice(*args))
-    end
-
-    def force_encoding(*args)
-      @buffer = @buffer.force_encoding(*args)
-    end
-
-    def ==(other)
-      @buffer == other
-    end
-
-    def +(other)
-      @buffer += other
-    end
-
-    # Emulate String#getbyte: return nth byte from buffer.
-    def readbyte(n)
-      @buffer[n].ord
-    end
-
-    # Slice unsigned 32-bit integer from buffer.
-    # @return [Integer]
-    def read_uint32
-      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.
-    %i[<< prepend].each do |mutating_method|
-      class_eval(<<-METH, __FILE__, __LINE__ + 1)
-      def #{mutating_method}(string)
-        string = string.dup if string.frozen?
-        @buffer.send __method__, string.force_encoding(Encoding::BINARY)
-
-        self
-      end
-      METH
-    end
-  end
-end

data/sig/buffer.rbs

@@ -1,21 +0,0 @@
-module HTTP2Next
-  class Buffer
-
-    def read: (Integer) -> Buffer
-
-    def getbyte: () -> Integer
-
-    def readbyte: (Integer) -> Integer
-
-    def read_uint32: () -> Integer
-
-    def <<: (string) -> void
-
-    def prepend: (string) -> void
-
-    private
-
-    def initialize: () -> untyped
-                  | (string) -> untyped
-  end
-end