biryani 0.0.11 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e46693c04c711c4911f7748510f64e66ca84409574a917975b23775c70630543
-  data.tar.gz: bceed32a74b6e5a792231ba721d9391bf6f15f2440593de4c36e60878b422c48
+  metadata.gz: 96b9dc1294ce1840c02e6cf1700b1ebae51409b586dffd25b7df814acdd65034
+  data.tar.gz: 66d417773c04e090101661650748415566e9f4ca0f91ff95720b2cb7f8668f7b
 SHA512:
-  metadata.gz: 188361e32796146bb331ffa9745b5231566646670d9da983ec6c51d19db53176242d0af5bdded03410cb761ff6546203ff44c49dbcc2574386b4a2e66fbe1add
-  data.tar.gz: 51ec657491b308328a3c9addf58e7a1fb0e78cb4aad1f41a40d7f8a831c5cccbd642c70f09aa37b97f520d1a48028835cbf1f53c28ea9cf91c279c1fb4af3669
+  metadata.gz: '079d3ab7c12394a9fd340757c5f076cbe937bd1f1a1e60cd24e98f7535526e320189a35f6baa2a5dab3c621b467fec52566e2cfec43a9b994d9f4e5c9dd818cf'
+  data.tar.gz: 7eed1c453cef71438ee5e625bd7b954c38c8cb4aa417db79c00894bf00e4f1f500a759a16d8c6ea58d3c90f273b5bcbbbefbe3a2de1059367b087095921aaec8

data/lib/biryani/connection.rb

@@ -12,20 +12,23 @@ module Biryani
   class Connection
     CONNECTION_PREFACE = "PRI * HTTP/2.0\r\n\r\nSM\r\n\r\n".freeze
     CONNECTION_PREFACE_LENGTH = CONNECTION_PREFACE.length
+    DEFAULT_HEADER_TABLE_SIZE = 4_096
+    INITIAL_CONNECTION_WINDOW_SIZE = 65_535
 
-    private_constant :CONNECTION_PREFACE, :CONNECTION_PREFACE_LENGTH
+    private_constant :CONNECTION_PREFACE, :CONNECTION_PREFACE_LENGTH, :DEFAULT_HEADER_TABLE_SIZE, :INITIAL_CONNECTION_WINDOW_SIZE
     Ractor.make_shareable(CONNECTION_PREFACE)
     Ractor.make_shareable(CONNECTION_PREFACE_LENGTH)
 
     # proc [Proc]
     def initialize(proc)
-      @sock = nil # Ractor::Port
+      @port = Ractor::Port.new
+      @recv_done = false
       @proc = proc
-      @streams_ctx = StreamsContext.new(proc)
-      @encoder = HPACK::Encoder.new(4_096)
-      @decoder = HPACK::Decoder.new(4_096)
-      @send_window = Window.new(65_535)
-      @recv_window = Window.new(65_535)
+      @streams_ctx = StreamsContext.new(proc, @port)
+      @encoder = HPACK::Encoder.new(DEFAULT_HEADER_TABLE_SIZE)
+      @decoder = HPACK::Decoder.new(DEFAULT_HEADER_TABLE_SIZE)
+      @send_window = Window.new(INITIAL_CONNECTION_WINDOW_SIZE)
+      @recv_window = Window.new(INITIAL_CONNECTION_WINDOW_SIZE)
       @data_buffer = DataBuffer.new
       @settings = self.class.default_settings # Hash<Integer, Integer>
       @peer_settings = self.class.default_settings # Hash<Integer, Integer>
@@ -53,12 +56,15 @@ module Biryani
 
     # @param io [IO]
     def recv_loop(io)
-      Ractor.new(io, @sock = Ractor::Port.new) do |io_, sock_|
+      Ractor.new(io, @port) do |io_, port_|
         loop do
           obj = Frame.read(io_)
-          break if obj.nil?
+          if obj.nil?
+            port_.send(:eof, move: true)
+            break
+          end
 
-          sock_.send(obj, move: true)
+          port_.send([:frame, obj], move: true)
         end
       end
     end
@@ -66,13 +72,14 @@ module Biryani
     # @param io [IO]
     def select_loop(io)
       loop do
-        break if @sock.closed? && @streams_ctx.empty?
+        break if @recv_done && @streams_ctx.empty?
 
-        port, obj = Ractor.select(@sock, @streams_ctx.tx)
-        if port == @sock
+        case @port.receive
+        in :eof
+          @recv_done = true
+        in [:frame, obj]
           recv_dispatch(io, obj)
-        else
-          res, stream_id = obj
+        in [:response, res, stream_id]
           handle_response(io, res, stream_id)
         end
 
@@ -118,7 +125,7 @@ module Biryani
     # @return [Array<Object>, Array<ConnectionError>, Array<StreamError>] frames or errors
     def do_recv_dispatch(frame)
       receiving_continuation_stream_id = @streams_ctx.receiving_continuation_stream_id
-      return [ConnectionError.new(ErrorCode::PROTOCOL_ERROR, "invalid frame type #{format('0x%02x', typ)} for stream identifier #{format('0x%02x', stream_id)}")] \
+      return [ConnectionError.new(ErrorCode::PROTOCOL_ERROR, "invalid frame type #{format('0x%02x', frame.f_type)} for stream identifier #{format('0x%02x', frame.stream_id)}")] \
         if !receiving_continuation_stream_id.nil? && frame.stream_id != receiving_continuation_stream_id
 
       if frame.stream_id.zero?
@@ -135,7 +142,7 @@ module Biryani
     def handle_connection_frame(frame)
       case frame.f_type
       when FrameType::DATA, FrameType::HEADERS, FrameType::PRIORITY, FrameType::RST_STREAM, FrameType::PUSH_PROMISE, FrameType::CONTINUATION
-        [ConnectionError.new(ErrorCode::PROTOCOL_ERROR, "invalid frame type #{format('0x%02x', typ)} for stream identifier 0x00")]
+        [ConnectionError.new(ErrorCode::PROTOCOL_ERROR, "invalid frame type #{format('0x%02x', frame.f_type)} for stream identifier 0x00")]
       when FrameType::SETTINGS
         obj = self.class.handle_settings(frame, @peer_settings, @decoder, @streams_ctx)
         return [] if obj.nil?
@@ -486,7 +493,7 @@ module Biryani
     def self.default_settings
       # https://datatracker.ietf.org/doc/html/rfc9113#section-6.5.2
       {
-        SettingsID::SETTINGS_HEADER_TABLE_SIZE => 4_096,
+        SettingsID::SETTINGS_HEADER_TABLE_SIZE => DEFAULT_HEADER_TABLE_SIZE,
         SettingsID::SETTINGS_ENABLE_PUSH => 1,
         SettingsID::SETTINGS_MAX_CONCURRENT_STREAMS => 0xffffffff,
         SettingsID::SETTINGS_INITIAL_WINDOW_SIZE => 65_535,

data/lib/biryani/data_buffer.rb

@@ -20,14 +20,14 @@ module Biryani
       datas = []
       @buffer.each do |stream_id, data|
         frames, remains = streams_ctx.sendable_datas(stream_id, data, send_window, max_frame_size)
-        datas += frames
+        datas.concat(frames)
         if remains.empty?
           @buffer.delete(stream_id)
         else
           @buffer[stream_id] = remains
         end
 
-        len = frames.map(&:length).sum
+        len = frames.sum(&:length)
         send_window.consume!(len)
         streams_ctx[stream_id].send_window.consume!(len)
       end

data/lib/biryani/frame/data.rb

@@ -51,10 +51,7 @@ module Biryani
 
         if padded
           io = IO::Buffer.for(s)
-          pad_length = io.get_value(:U8, 0)
-          data_length = s.bytesize - pad_length - 1
-          data = io.get_string(1, data_length)
-          padding = io.get_string(1 + data_length)
+          data, padding, pad_length = Frame.read_padded_payload(io, s, 1)
           return ConnectionError.new(ErrorCode::PROTOCOL_ERROR, 'invalid frame') if padding.bytesize != pad_length
         else
           data = s

data/lib/biryani/frame/headers.rb

@@ -64,7 +64,6 @@ module Biryani
       # @return [Headers]
       # rubocop: disable Metrics/AbcSize
       # rubocop: disable Metrics/CyclomaticComplexity
-      # rubocop: disable Metrics/MethodLength
       # rubocop: disable Metrics/PerceivedComplexity
       def self.read(s, flags, stream_id)
         priority = Frame.read_priority(flags)
@@ -74,14 +73,12 @@ module Biryani
 
         if priority && padded
           io = IO::Buffer.for(s)
-          pad_length, stream_dependency, weight = io.get_values(%i[U8 U32 U8], 0)
-          fragment_length = s.bytesize - pad_length - 6
+          _pad_length, stream_dependency, weight = io.get_values(%i[U8 U32 U8], 0)
           # exclusive = (stream_dependency / 2**31).positive?
           stream_dependency %= 2**31
           return ConnectionError.new(ErrorCode::PROTOCOL_ERROR, 'cannot depend on itself') if stream_dependency == stream_id
 
-          fragment = io.get_string(6, fragment_length)
-          padding = io.get_string(6 + fragment_length)
+          fragment, padding, pad_length = Frame.read_padded_payload(io, s, 6)
           return ConnectionError.new(ErrorCode::FRAME_SIZE_ERROR, 'invalid frame') if padding.bytesize != pad_length
         elsif priority
           io = IO::Buffer.for(s)
@@ -94,10 +91,7 @@ module Biryani
           return ConnectionError.new(ErrorCode::FRAME_SIZE_ERROR, 'invalid frame') if fragment.bytesize + 5 != s.bytesize
         elsif padded
           io = IO::Buffer.for(s)
-          pad_length = io.get_value(:U8, 0)
-          fragment_length = s.bytesize - pad_length - 1
-          fragment = io.get_string(1, fragment_length)
-          padding = io.get_string(1 + fragment_length)
+          fragment, padding, pad_length = Frame.read_padded_payload(io, s, 1)
           return ConnectionError.new(ErrorCode::PROTOCOL_ERROR, 'invalid frame') if pad_length >= s.bytesize
           return ConnectionError.new(ErrorCode::PROTOCOL_ERROR, 'invalid frame') if padding.bytesize != pad_length
         else
@@ -108,7 +102,6 @@ module Biryani
       end
       # rubocop: enable Metrics/AbcSize
       # rubocop: enable Metrics/CyclomaticComplexity
-      # rubocop: enable Metrics/MethodLength
       # rubocop: enable Metrics/PerceivedComplexity
     end
   end

data/lib/biryani/frame/push_promise.rb

@@ -53,11 +53,9 @@ module Biryani
 
         io = IO::Buffer.for(s)
         if padded
-          pad_length, promised_stream_id = io.get_values(%i[U8 U32], 0)
+          _pad_length, promised_stream_id = io.get_values(%i[U8 U32], 0)
           promised_stream_id %= 2**31 # Promised Stream ID (31)
-          fragment_length = s.bytesize - pad_length - 5
-          fragment = io.get_string(5, fragment_length)
-          padding = io.get_string(5 + fragment_length)
+          fragment, padding, pad_length = Frame.read_padded_payload(io, s, 5)
           return ConnectionError.new(ErrorCode::PROTOCOL_ERROR, 'invalid frame') if pad_length >= s.bytesize
           return ConnectionError.new(ErrorCode::PROTOCOL_ERROR, 'invalid frame') if padding.bytesize != pad_length
         else

data/lib/biryani/frame.rb

@@ -98,6 +98,22 @@ module Biryani
     def self.to_binary_s_header(payload_length, f_type, flags, stream_id)
       [payload_length, f_type, flags, stream_id].pack('NCCN')[1..]
     end
+
+    # @param io [IO::Buffer]
+    # @param s [String]
+    # @param header_length [Integer] bytes preceding the payload, including the 1-byte Pad Length field
+    #
+    # @return [String] payload
+    # @return [String] padding
+    # @return [Integer] pad_length
+    def self.read_padded_payload(io, s, header_length)
+      pad_length = io.get_value(:U8, 0)
+      payload_length = s.bytesize - pad_length - header_length
+      payload = io.get_string(header_length, payload_length)
+      padding = io.get_string(header_length + payload_length)
+
+      [payload, padding, pad_length]
+    end
   end
 end
 

data/lib/biryani/hpack/dynamic_table.rb

@@ -47,6 +47,26 @@ module Biryani
         @table[index]
       end
 
+      # @param index [Integer]
+      #
+      # @return [Array] [name, value]
+      def entry_at(index)
+        raise Error::HPACKDecodeError if index.zero? || index > STATIC_TABLE_SIZE + count_entries
+
+        if index <= STATIC_TABLE_SIZE
+          STATIC_TABLE[index - 1]
+        else
+          self[index - 1 - STATIC_TABLE_SIZE]
+        end
+      end
+
+      # @param index [Integer]
+      #
+      # @return [String]
+      def name_at(index)
+        entry_at(index)[0]
+      end
+
       # @param new_limit [Integer]
       def chomp!(new_limit)
         while @size > new_limit

data/lib/biryani/hpack/field.rb

@@ -145,15 +145,8 @@ module Biryani
       # @return [Integer]
       def self.decode_indexed(io, cursor, dynamic_table)
         index, c = Integer.decode(io, 7, cursor)
-        raise Error::HPACKDecodeError if index.zero? || index > STATIC_TABLE_SIZE + dynamic_table.count_entries
 
-        field = if index <= STATIC_TABLE_SIZE
-                  STATIC_TABLE[index - 1]
-                else
-                  dynamic_table[index - 1 - STATIC_TABLE_SIZE]
-                end
-
-        [field, c]
+        [dynamic_table.entry_at(index), c]
       end
 
       #   0   1   2   3   4   5   6   7
@@ -202,13 +195,7 @@ module Biryani
       # @return [Integer]
       def self.decode_literal_value_incremental_indexing(io, cursor, dynamic_table)
         index, c = Integer.decode(io, 6, cursor)
-        raise Error::HPACKDecodeError if index.zero? || index > STATIC_TABLE_SIZE + dynamic_table.count_entries
-
-        name = if index <= STATIC_TABLE_SIZE
-                 STATIC_TABLE[index - 1][0]
-               else
-                 dynamic_table[index - 1 - STATIC_TABLE_SIZE][0]
-               end
+        name = dynamic_table.name_at(index)
         value, c = String.decode(io, c)
         dynamic_table.store(name, value)
 
@@ -281,13 +268,7 @@ module Biryani
       # @return [Integer]
       def self.decode_literal_value_never_indexed(io, cursor, dynamic_table)
         index, c = Integer.decode(io, 4, cursor)
-        raise Error::HPACKDecodeError if index.zero? || index > STATIC_TABLE_SIZE + dynamic_table.count_entries
-
-        name = if index <= STATIC_TABLE_SIZE
-                 STATIC_TABLE[index - 1][0]
-               else
-                 dynamic_table[index - 1 - STATIC_TABLE_SIZE][0]
-               end
+        name = dynamic_table.name_at(index)
         value, c = String.decode(io, c)
 
         [[name, value], c]
@@ -336,13 +317,7 @@ module Biryani
       # @return [Integer]
       def self.decode_literal_value_without_indexing(io, cursor, dynamic_table)
         index, c = Integer.decode(io, 4, cursor)
-        raise Error::HPACKDecodeError if index.zero? || index > STATIC_TABLE_SIZE + dynamic_table.count_entries
-
-        name = if index <= STATIC_TABLE_SIZE
-                 STATIC_TABLE[index - 1][0]
-               else
-                 dynamic_table[index - 1 - STATIC_TABLE_SIZE][0]
-               end
+        name = dynamic_table.name_at(index)
         value, c = String.decode(io, c)
 
         [[name, value], c]

data/lib/biryani/hpack/huffman.rb

@@ -531,16 +531,8 @@ module Biryani
       #
       # @return [String]
       def self.encode(s)
-        bits = s.bytes.map { |sym| ENCODE_TABLE[sym] }
-
-        acc = IO::Buffer.new(bits.sum(&:bytesize))
-        offset = 0
-        bits.each do |s|
-          acc.set_string(s, offset)
-          offset += s.bytesize
-        end
-
-        [acc.get_string.ljust((acc.size + 7) & ~7, '1')].pack('B*')
+        bits = s.bytes.map { |sym| ENCODE_TABLE[sym] }.join
+        [bits.ljust((bits.bytesize + 7) & ~7, '1')].pack('B*')
       end
 
       # @param io [IO::Buffer]
@@ -554,7 +546,7 @@ module Biryani
         res = ''.b
         bits = 0
         bits_len = 0
-        bytes = io.get_values([:U8] * length, cursor)
+        bytes = io.get_string(cursor, length).bytes
         (length * 8).times do |i|
           bits_len += 1
           bits += 1 if (bytes[i / 8] & (1 << 7 - (i % 8))).positive?

data/lib/biryani/hpack/integer.rb

@@ -32,7 +32,7 @@ module Biryani
 
         bytes = [limit | mask]
         i -= limit
-        while i > 128
+        while i >= 128
           bytes << i % 128 + 128
           i /= 128
         end
@@ -56,7 +56,7 @@ module Biryani
         i = 0
         loop do
           byte = io.get_value(:U8, c + i)
-          res += (byte & 127) * 2**(i * 7)
+          res += (byte & 127) << (i * 7)
 
           break if (byte & 128).zero?
 

data/lib/biryani/http/request.rb

@@ -82,15 +82,15 @@ module Biryani
       # @return [Request, ConnectionError]
       def self.build(h, s)
         return ConnectionError.new(ErrorCode::PROTOCOL_ERROR, 'missing pseudo-header fields') unless PSEUDO_HEADER_FIELDS.all? { |x| h.key?(x) }
-        return ConnectionError.new(ErrorCode::PROTOCOL_ERROR, 'invalid content-length') if h.key?('content-length') && !s.empty? && s.length != h['content-length'].to_i
+        return ConnectionError.new(ErrorCode::PROTOCOL_ERROR, 'invalid content-length') if h.key?('content-length') && !s.empty? && s.length != h['content-length'][0].to_i
 
         scheme = h[':scheme'][0]
         domain = h[':authority'][0]
         path = h[':path'][0]
         uri = URI("#{scheme}://#{domain}#{path}")
-        method = h[':method'][0]
+        method = h[':method'][0].upcase
         h['cookie'] = [h['cookie'].join('; ')] if h.key?('cookie')
-        Request.new(method, uri, h, s)
+        Request.new(method, uri, h.except(*PSEUDO_HEADER_FIELDS), s)
       end
     end
   end

data/lib/biryani/stream.rb

@@ -18,7 +18,7 @@ module Biryani
             res = HTTP::Response.internal_server_error
           end
 
-          tx.send([res, stream_id], move: true)
+          tx.send([:response, res, stream_id], move: true)
         end
       end
     end

data/lib/biryani/streams_context.rb

@@ -2,10 +2,10 @@ module Biryani
   class StreamsContext
     attr_accessor :tx
 
-    def initialize(proc)
+    def initialize(proc, tx)
       @h = {} # Hash<Integer, StreamContext>
       @proc = proc
-      @tx = Ractor::Port.new
+      @tx = tx
     end
 
     # @param stream_id [Integer]

data/lib/biryani/version.rb

@@ -1,3 +1,3 @@
 module Biryani
-  VERSION = '0.0.11'.freeze
+  VERSION = '0.0.14'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: biryani
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.14
 platform: ruby
 authors:
 - thekuwayama