biryani 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e8b17b7b795ee787a07fe5be9e453d4486fdce914609539446932e4fb988912
-  data.tar.gz: 45f9196ca41aecf8efecaee4e29e459e20a6ac05116b8e384858f52d365c4726
+  metadata.gz: 890de8c1fbcd3833f63207a420161b289a4497275fbdbb747625d1350b1f0d6c
+  data.tar.gz: 1c587a3643953d2acbd1b0022c1ff1b228cc382cc10c75442fb99d68b370f2b4
 SHA512:
-  metadata.gz: 13ba324d9792cde457634d20d72bb7f276772aa6b1eacd878dd82cd3f2fade7f5025472e7bf4b057208f71b68bf8f6df7e2f07bfaeda62baa0c9c6f7c5f58018
-  data.tar.gz: ed9846fa55648102b94242338429b45d6bea100eb1427a736c5a90886c6e3933602138407f0bd474f5c3f024887100f2fc241b46c16bfa2f035ca0ce08f8c1f2
+  metadata.gz: fe5ed688fe4aff77533de4b37ee5e668f7904435a2c345410c4b87c85ab68af33d03b3741fc3266e605554e057c81cfe28e267b1d94e2f916718e2190d6ee948
+  data.tar.gz: 19cfdad4968d33626135242e33629ed5105069a30f50e377367fa0aae45e2c594e2cfa388c7ea8b635ab17541749a147c04414738633787a3b720043b38ac6aa

data/lib/biryani/connection.rb

@@ -21,7 +21,7 @@ module Biryani
     def initialize(proc)
       @sock = nil # Ractor
       @proc = proc
-      @streams_ctx = StreamsContext.new
+      @streams_ctx = StreamsContext.new(proc)
       @encoder = HPACK::Encoder.new(4_096)
       @decoder = HPACK::Decoder.new(4_096)
       @send_window = Window.new(65_535)
@@ -77,7 +77,7 @@ module Biryani
         port, obj = Ractor.select(*ports)
         if port == @sock
           if Biryani.err?(obj)
-            reply_frame = self.class.unwrap(obj, @streams_ctx.last_stream_id)
+            reply_frame = Biryani.unwrap(obj, @streams_ctx.last_stream_id)
             self.class.do_send(io, reply_frame, true)
             close if self.class.transition_state_send(reply_frame, @streams_ctx)
           elsif obj.length > @settings[SettingsID::SETTINGS_MAX_FRAME_SIZE]
@@ -85,8 +85,14 @@ module Biryani
             close
           else
             recv_dispatch(obj).each do |frame|
-              reply_frame = self.class.unwrap(frame, @streams_ctx.last_stream_id)
+              reply_frame = Biryani.unwrap(frame, @streams_ctx.last_stream_id)
               self.class.do_send(io, reply_frame, true)
+              if reply_frame.f_type == FrameType::WINDOW_UPDATE && reply_frame.stream_id.zero?
+                @recv_window.increase!(reply_frame.window_size_increment)
+              elsif reply_frame.f_type == FrameType::WINDOW_UPDATE
+                @streams_ctx[reply_frame.stream_id].recv_window.increase!(reply_frame.window_size_increment)
+              end
+
               close if self.class.transition_state_send(reply_frame, @streams_ctx)
             end
           end
@@ -102,8 +108,6 @@ module Biryani
 
         break if closed?
       end
-    ensure
-      @streams_ctx.clear_all
     end
     # rubocop: enable Metrics/AbcSize
     # rubocop: enable Metrics/BlockLength
@@ -145,16 +149,17 @@ module Biryani
         [ping_ack]
       when FrameType::GOAWAY
         self.class.handle_goaway(frame)
-        # TODO: logging error
+
         []
       when FrameType::WINDOW_UPDATE
         err = self.class.handle_connection_window_update(frame, @send_window)
         return [err] unless err.nil?
 
         max_frame_size = @peer_settings[SettingsID::SETTINGS_MAX_FRAME_SIZE]
-        @data_buffer.take!(@send_window, @streams_ctx, max_frame_size)
+        @data_buffer.take!(@send_window, @streams_ctx, max_frame_size) # return DATA Frames
       else
-        # ignore unknown frame type
+        # ignore UNKNOWN Frame
+
         []
       end
     end
@@ -166,7 +171,6 @@ module Biryani
     # rubocop: disable Metrics/AbcSize
     # rubocop: disable Metrics/CyclomaticComplexity
     # rubocop: disable Metrics/MethodLength
-    # rubocop: disable Metrics/PerceivedComplexity
     def handle_stream_frame(frame)
       stream_id = frame.stream_id
       typ = frame.f_type
@@ -176,40 +180,32 @@ module Biryani
       max_streams = @peer_settings[SettingsID::SETTINGS_MAX_CONCURRENT_STREAMS]
       send_initial_window_size = @peer_settings[SettingsID::SETTINGS_INITIAL_WINDOW_SIZE]
       recv_initial_window_size = @settings[SettingsID::SETTINGS_INITIAL_WINDOW_SIZE]
-      obj = self.class.transition_state_recv(frame, @streams_ctx, stream_id, max_streams, send_initial_window_size, recv_initial_window_size, @proc)
+      obj = self.class.transition_state_recv(frame, @streams_ctx, stream_id, max_streams, send_initial_window_size, recv_initial_window_size)
       return [obj] if Biryani.err?(obj)
 
       ctx = obj
       case typ
       when FrameType::DATA
-        # TODO: flow-control using @recv_window & ctx.recv_window
-        ctx.content << frame.data
-        if ctx.state.half_closed_remote?
-          obj = self.class.http_request(ctx.fragment.string, ctx.content.string, @decoder)
-          return [obj] if Biryani.err?(obj)
-
-          ctx.stream.rx << obj
-        end
+        obj = self.class.handle_data(stream_id, frame.data, @recv_window, @streams_ctx, @decoder)
+        return [obj] if Biryani.err?(obj)
 
-        []
+        obj # return WINDOW_UPDATE Frames
       when FrameType::HEADERS, FrameType::CONTINUATION
-        ctx.fragment << frame.fragment
-        if ctx.state.half_closed_remote?
-          obj = self.class.http_request(ctx.fragment.string, ctx.content.string, @decoder)
-          return [obj] if Biryani.err?(obj)
-
-          ctx.stream.rx << obj
-        end
+        err = self.class.handle_headers(frame, ctx, @decoder)
+        return [err] unless err.nil?
 
         []
       when FrameType::PRIORITY
         # ignore PRIORITY Frame
+
         []
       when FrameType::PUSH_PROMISE
         # TODO
+
         []
       when FrameType::RST_STREAM
-        self.class.handle_rst_stream(frame, @streams_ctx)
+        self.class.handle_rst_stream(frame, ctx)
+
         []
       when FrameType::WINDOW_UPDATE
         err = self.class.handle_stream_window_update(frame, @streams_ctx)
@@ -219,13 +215,13 @@ module Biryani
         @data_buffer.take!(@send_window, @streams_ctx, max_frame_size)
       else
         # ignore UNKNOWN Frame
+
         []
       end
     end
     # rubocop: enable Metrics/AbcSize
     # rubocop: enable Metrics/CyclomaticComplexity
     # rubocop: enable Metrics/MethodLength
-    # rubocop: enable Metrics/PerceivedComplexity
 
     def close
       @closed = true
@@ -236,39 +232,23 @@ module Biryani
       @closed
     end
 
-    # @param obj [Object, ConnectionError, StreamError] frame or error
-    # @param last_stream_id [Integer]
-    #
-    # @return [Frame]
-    def self.unwrap(obj, last_stream_id)
-      case obj
-      when ConnectionError
-        obj.goaway(last_stream_id)
-      when StreamError
-        obj.rst_stream
-      else
-        obj
-      end
-    end
-
     # @param recv_frame [Object]
     # @param streams_ctx [StreamsContext]
     # @param stream_id [Integer]
     # @param max_streams [Integer]
     # @param send_initial_window_size [Integer]
     # @param recv_initial_window_size [Integer]
-    # @param proc [Proc]
     #
     # @return [StreamContext, StreamError, ConnectionError]
     # rubocop: disable Metrics/CyclomaticComplexity
     # rubocop: disable Metrics/PerceivedComplexity
-    def self.transition_state_recv(recv_frame, streams_ctx, stream_id, max_streams, send_initial_window_size, recv_initial_window_size, proc)
+    def self.transition_state_recv(recv_frame, streams_ctx, stream_id, max_streams, send_initial_window_size, recv_initial_window_size)
       ctx = streams_ctx[stream_id]
       return StreamError.new(ErrorCode::PROTOCOL_ERROR, stream_id, 'exceed max concurrent streams') if ctx.nil? && streams_ctx.count_active + 1 > max_streams
       return ConnectionError.new(ErrorCode::PROTOCOL_ERROR, 'even-numbered stream identifier') if ctx.nil? && stream_id.even?
       return ConnectionError.new(ErrorCode::PROTOCOL_ERROR, 'new stream identifier is less than the existing stream identifiers') if ctx.nil? && streams_ctx.last_stream_id > stream_id
 
-      ctx = streams_ctx.new_context(stream_id, send_initial_window_size, recv_initial_window_size, proc) if ctx.nil?
+      ctx = streams_ctx.new_context(stream_id, send_initial_window_size, recv_initial_window_size) if ctx.nil?
       obj = ctx.state.transition!(recv_frame, :recv)
       return obj if Biryani.err?(obj)
 
@@ -291,7 +271,7 @@ module Biryani
         streams_ctx.close_all
         true
       else
-        streams_ctx[stream_id].state.transition!(send_frame, :send)
+        streams_ctx[stream_id].state.transition!(send_frame, :send) unless stream_id.zero?
         false
       end
     end
@@ -312,7 +292,7 @@ module Biryani
     # @param streams_ctx [StreamsContext]
     # @param data_buffer [DataBuffer]
     def self.send_data(io, stream_id, data, send_window, max_frame_size, streams_ctx, data_buffer)
-      frames, remains = streams_ctx.sendable_data_frames(stream_id, data, send_window, max_frame_size)
+      frames, remains = streams_ctx.sendable_datas(stream_id, data, send_window, max_frame_size)
 
       frames.each do |frame|
         do_send(io, frame, false)
@@ -355,11 +335,55 @@ module Biryani
       ConnectionError.new(ErrorCode::PROTOCOL_ERROR, 'invalid connection preface') if s != CONNECTION_PREFACE
     end
 
-    # @param rst_stream [RstStream]
+    # @param stream_id [Integer]
+    # @param data [String]
+    # @param recv_window [Window]
     # @param streams_ctx [StreamsContext]
-    def self.handle_rst_stream(rst_stream, streams_ctx)
-      stream_id = rst_stream.stream_id
-      streams_ctx[stream_id].state.close
+    # @param decoder [Decoder]
+    #
+    # @return [Array<WindowUpdate>, ConnectionError]
+    # rubocop: disable Metrics/AbcSize
+    def self.handle_data(stream_id, data, recv_window, streams_ctx, decoder)
+      ctx = streams_ctx[stream_id]
+      return ConnectionError.new(ErrorCode::FLOW_CONTROL_ERROR, 'DATA Frame length exceeds flow-control window size') \
+        if recv_window.consume!(data.bytesize).negative? || ctx.recv_window.consume!(data.bytesize).negative?
+
+      ctx.content << data
+      if ctx.state.half_closed_remote?
+        obj = http_request(ctx.fragment.string, ctx.content.string, decoder)
+        return obj if Biryani.err?(obj)
+
+        ctx.stream.rx << obj
+      end
+
+      window_updates = []
+      window_updates << Frame::WindowUpdate.new(0, recv_window.capacity - recv_window.length) if recv_window.length < recv_window.capacity / 2
+      window_updates << Frame::WindowUpdate.new(stream_id, ctx.recv_window.capacity - ctx.recv_window.length) if ctx.recv_window.length < ctx.recv_window.capacity / 2
+      window_updates
+    end
+    # rubocop: enable Metrics/AbcSize
+
+    # @param headers [Headers]
+    # @param ctx [StreamContext]
+    # @param decoder [Decoder]
+    #
+    # @return [nil, ConnectionError]
+    def self.handle_headers(headers, ctx, decoder)
+      ctx.fragment << headers.fragment
+      if ctx.state.half_closed_remote?
+        obj = http_request(ctx.fragment.string, ctx.content.string, decoder)
+        return [obj] if Biryani.err?(obj)
+
+        ctx.stream.rx << obj
+      end
+
+      nil
+    end
+
+    # @param _rst_stream [RstStream]
+    # @param ctx [StreamContext]
+    def self.handle_rst_stream(_rst_stream, ctx)
+      ctx.state.close
     end
 
     # @param settings [Settings]
@@ -397,7 +421,6 @@ module Biryani
     #
     # @return [nil, ConnectionError]
     def self.handle_connection_window_update(window_update, send_window)
-      # TODO: send WINDOW_UPDATE to do the flow-conrol
       send_window.increase!(window_update.window_size_increment)
       return ConnectionError.new(ErrorCode::FLOW_CONTROL_ERROR, 'flow-control window exceeds 2^31-1') if send_window.length > 2**31 - 1
 

data/lib/biryani/data_buffer.rb

@@ -19,9 +19,7 @@ module Biryani
     def take!(send_window, streams_ctx, max_frame_size)
       datas = []
       @buffer.each do |stream_id, data|
-        frames, remains = streams_ctx.sendable_data_frames(stream_id, data, send_window, max_frame_size)
-        next if frames.empty?
-
+        frames, remains = streams_ctx.sendable_datas(stream_id, data, send_window, max_frame_size)
         datas += frames
         if remains.empty?
           @buffer.delete(stream_id)

data/lib/biryani/state.rb

@@ -100,12 +100,12 @@ module Biryani
       # receiving_data
       in [:receiving_data, FrameType::DATA, :recv] if frame.end_stream?
         :half_closed_remote
-      in [:receiving_data, FrameType::WINDOW_UPDATE, :recv]
-        state
       in [:receiving_data, FrameType::DATA, :recv]
         state
       in [:receiving_data, FrameType::RST_STREAM, _]
         :closed
+      in [:receiving_data, FrameType::WINDOW_UPDATE, _]
+        state
       in [:receiving_data, _, _]
         unexpected(ErrorCode::PROTOCOL_ERROR, state, typ, direction)
 
@@ -132,7 +132,7 @@ module Biryani
         state
       in [:half_closed_remote, FrameType::RST_STREAM, _]
         :closed
-      in [half_closed_remote, FrameType::WINDOW_UPDATE, :recv]
+      in [:half_closed_remote, FrameType::WINDOW_UPDATE, _]
         state
       in [:half_closed_remote, _, :recv]
         unexpected(ErrorCode::STREAM_CLOSED, state, typ, direction)

data/lib/biryani/streams_context.rb

@@ -1,17 +1,17 @@
 module Biryani
   class StreamsContext
-    def initialize
-      @h = {}
+    def initialize(proc)
+      @h = {} # Hash<Integer, StreamContext>
+      @proc = proc
     end
 
     # @param stream_id [Integer]
     # @param send_initial_window_size [Integer]
     # @param recv_initial_window_size [Integer]
-    # @param proc [Proc]
     #
     # @return [StreamContext]
-    def new_context(stream_id, send_initial_window_size, recv_initial_window_size, proc)
-      ctx = StreamContext.new(stream_id, send_initial_window_size, recv_initial_window_size, proc)
+    def new_context(stream_id, send_initial_window_size, recv_initial_window_size)
+      ctx = StreamContext.new(stream_id, send_initial_window_size, recv_initial_window_size, @proc)
       @h[stream_id] = ctx
       ctx
     end
@@ -64,7 +64,7 @@ module Biryani
     #
     # @return [Array<Object>] frames
     # @return [String]
-    def sendable_data_frames(stream_id, data, send_window, max_frame_size)
+    def sendable_datas(stream_id, data, send_window, max_frame_size)
       len = [data.bytesize, send_window.length, @h[stream_id].send_window.length].min
 
       payload = data[0...len]
@@ -98,15 +98,6 @@ module Biryani
         ctx.state.close
       end
     end
-
-    def clear_all
-      each do |ctx|
-        ctx.tx.close
-        ctx.stream.rx << nil
-        ctx.fragment.close
-        ctx.content.close
-      end
-    end
   end
 
   class StreamContext

data/lib/biryani/utils.rb

@@ -5,4 +5,19 @@ module Biryani
   def self.err?(obj)
     obj.is_a?(StreamError) || obj.is_a?(ConnectionError)
   end
+
+  # @param obj [Object, ConnectionError, StreamError] frame or error
+  # @param last_stream_id [Integer]
+  #
+  # @return [Frame]
+  def self.unwrap(obj, last_stream_id)
+    case obj
+    when ConnectionError
+      obj.goaway(last_stream_id)
+    when StreamError
+      obj.rst_stream
+    else
+      obj
+    end
+  end
 end

data/lib/biryani/version.rb

@@ -1,3 +1,3 @@
 module Biryani
-  VERSION = '0.0.2'.freeze
+  VERSION = '0.0.3'.freeze
 end

data/lib/biryani/window.rb

@@ -1,6 +1,6 @@
 module Biryani
   class Window
-    attr_reader :length
+    attr_reader :length, :capacity
 
     # @param initial_window_size [Integer]
     def initialize(initial_window_size)
@@ -9,19 +9,26 @@ module Biryani
     end
 
     # @param length [Integer]
+    #
+    # @return [Integer]
     def consume!(length)
       @length -= length
     end
 
     # @param length [Integer]
+    #
+    # @return [Integer]
     def increase!(length)
       @length += length
     end
 
     # @param initial_window_size [Integer]
+    #
+    # @return [Integer]
     def update!(initial_window_size)
       @length = initial_window_size - @capacity + @length
       @capacity = initial_window_size
+      @length
     end
   end
 end

data/spec/connection/handle_data_spec.rb

@@ -0,0 +1,58 @@
+require_relative '../spec_helper'
+
+RSpec.describe Connection do
+  context 'handle_data' do
+    let(:decoder) do
+      HPACK::Decoder.new(4_096)
+    end
+
+    let(:recv_window1) do
+      Window.new(65_535)
+    end
+    let(:streams_ctx1) do
+      streams_ctx = StreamsContext.new(do_nothing_proc)
+      streams_ctx.new_context(1, 65_535, 65_535)
+      streams_ctx.new_context(2, 65_535, 65_535)
+      streams_ctx
+    end
+    it 'should handle' do
+      expect(Connection.handle_data(2, 'Hello, world!', recv_window1, streams_ctx1, decoder)).to eq []
+      expect(streams_ctx1[2].content.string).to eq 'Hello, world!'
+    end
+
+    let(:recv_window2) do
+      recv_window = Window.new(65_535)
+      recv_window.consume!(65_535 / 2)
+      recv_window
+    end
+    let(:streams_ctx2) do
+      streams_ctx = StreamsContext.new(do_nothing_proc)
+      streams_ctx.new_context(1, 65_535, 65_535)
+      streams_ctx.new_context(2, 65_535, 65_535)
+      streams_ctx[2].recv_window.consume!(65_535 / 2)
+      streams_ctx
+    end
+    it 'should handle' do
+      frames = Connection.handle_data(2, 'Hello, world!', recv_window2, streams_ctx2, decoder)
+      expect(frames.map(&:f_type)).to eq [FrameType::WINDOW_UPDATE, FrameType::WINDOW_UPDATE]
+      expect(frames.map(&:stream_id)).to eq [0, 2]
+      expect(frames.map(&:window_size_increment)).to eq [65_535 / 2 + 13, 65_535 / 2 + 13]
+      expect(streams_ctx2[2].content.string).to eq 'Hello, world!'
+    end
+
+    let(:recv_window3) do
+      recv_window = Window.new(65_535)
+      recv_window.consume!(65_535)
+      recv_window
+    end
+    let(:streams_ctx3) do
+      streams_ctx = StreamsContext.new(do_nothing_proc)
+      streams_ctx.new_context(1, 65_535, 65_535)
+      streams_ctx.new_context(2, 65_535, 65_535)
+      streams_ctx
+    end
+    it 'should not handle' do
+      expect(Connection.handle_data(2, 'Hello, world!', recv_window3, streams_ctx3, decoder)).to be_kind_of ConnectionError
+    end
+  end
+end

data/spec/connection/handle_headers_spec.rb

@@ -0,0 +1,19 @@
+require_relative '../spec_helper'
+
+RSpec.describe Connection do
+  context 'handle_headers' do
+    let(:headers) do
+      Frame::Headers.new(true, false, 2, nil, nil, 'this is dummy', nil)
+    end
+    let(:ctx) do
+      StreamContext.new(2, 65_535, 65_535, do_nothing_proc)
+    end
+    let(:decoder) do
+      HPACK::Decoder.new(4_096)
+    end
+    it 'should handle' do
+      expect(Connection.handle_headers(headers, ctx, decoder)).to eq nil
+      expect(ctx.fragment.string).to eq 'this is dummy'
+    end
+  end
+end

data/spec/connection/handle_rst_stream_spec.rb

@@ -5,17 +5,12 @@ RSpec.describe Connection do
     let(:rst_stream) do
       Frame::RstStream.new(2, 0)
     end
-    let(:streams_ctx) do
-      streams_ctx = StreamsContext.new
-      streams_ctx.new_context(1, 65_535, 65_535, do_nothing_proc)
-      streams_ctx.new_context(2, 65_535, 65_535, do_nothing_proc)
-      streams_ctx
+    let(:ctx) do
+      StreamContext.new(2, 65_535, 65_535, do_nothing_proc)
     end
     it 'should handle' do
-      Connection.handle_rst_stream(rst_stream, streams_ctx)
-      expect(streams_ctx.length).to eq 2
-      expect(streams_ctx.count_active).to eq 0
-      expect(streams_ctx.closed_stream_ids.length).to eq 1
+      Connection.handle_rst_stream(rst_stream, ctx)
+      expect(ctx.closed?).to eq true
     end
   end
 end

data/spec/connection/handle_settings_spec.rb

@@ -9,9 +9,9 @@ RSpec.describe Connection do
       HPACK::Decoder.new(4_096)
     end
     let(:streams_ctx) do
-      streams_ctx = StreamsContext.new
-      streams_ctx.new_context(1, 65_535, 65_535, do_nothing_proc)
-      streams_ctx.new_context(2, 65_535, 65_535, do_nothing_proc)
+      streams_ctx = StreamsContext.new(do_nothing_proc)
+      streams_ctx.new_context(1, 65_535, 65_535)
+      streams_ctx.new_context(2, 65_535, 65_535)
       streams_ctx
     end
 

data/spec/connection/handle_stream_window_update_spec.rb

@@ -6,15 +6,15 @@ RSpec.describe Connection do
       Frame::WindowUpdate.new(1, 1000)
     end
     let(:streams_ctx) do
-      streams_ctx = StreamsContext.new
-      streams_ctx.new_context(1, 65_535, 65_535, do_nothing_proc)
-      streams_ctx.new_context(2, 65_535, 65_535, do_nothing_proc)
+      streams_ctx = StreamsContext.new(do_nothing_proc)
+      streams_ctx.new_context(1, 65_535, 65_535)
+      streams_ctx.new_context(2, 65_535, 65_535)
       streams_ctx
     end
     it 'should handle' do
       expect { Connection.handle_stream_window_update(window_update, streams_ctx) }.not_to raise_error
-      expect(streams_ctx[1].send_window.length).to eq 2**16 - 1 + 1000
-      expect(streams_ctx[2].send_window.length).to eq 2**16 - 1
+      expect(streams_ctx[1].send_window.length).to eq 65_535 + 1000
+      expect(streams_ctx[2].send_window.length).to eq 65_535
     end
   end
 end

data/spec/connection/send_spec.rb

@@ -16,9 +16,9 @@ RSpec.describe Connection do
       Window.new(65_535)
     end
     let(:streams_ctx1) do
-      streams_ctx = StreamsContext.new
-      streams_ctx.new_context(1, 65_535, 65_535, do_nothing_proc)
-      streams_ctx.new_context(2, 65_535, 65_535, do_nothing_proc)
+      streams_ctx = StreamsContext.new(do_nothing_proc)
+      streams_ctx.new_context(1, 65_535, 65_535)
+      streams_ctx.new_context(2, 65_535, 65_535)
       streams_ctx
     end
     it 'should send' do
@@ -39,9 +39,9 @@ RSpec.describe Connection do
       Window.new(65_535)
     end
     let(:streams_ctx2) do
-      streams_ctx = StreamsContext.new
-      streams_ctx.new_context(1, 65_535, 65_535, do_nothing_proc)
-      streams_ctx.new_context(2, 65_535, 65_535, do_nothing_proc)
+      streams_ctx = StreamsContext.new(do_nothing_proc)
+      streams_ctx.new_context(1, 65_535, 65_535)
+      streams_ctx.new_context(2, 65_535, 65_535)
       streams_ctx
     end
     it 'should send' do
@@ -61,9 +61,9 @@ RSpec.describe Connection do
       Window.new(65_535)
     end
     let(:streams_ctx3) do
-      streams_ctx = StreamsContext.new
-      streams_ctx.new_context(1, 65_535, 65_535, do_nothing_proc)
-      streams_ctx.new_context(2, 65_535, 65_535, do_nothing_proc)
+      streams_ctx = StreamsContext.new(do_nothing_proc)
+      streams_ctx.new_context(1, 65_535, 65_535)
+      streams_ctx.new_context(2, 65_535, 65_535)
       streams_ctx[2].send_window.consume!(65_535)
       streams_ctx
     end
@@ -86,9 +86,9 @@ RSpec.describe Connection do
       send_window
     end
     let(:streams_ctx4) do
-      streams_ctx = StreamsContext.new
-      streams_ctx.new_context(1, 65_535, 65_535, do_nothing_proc)
-      streams_ctx.new_context(2, 65_535, 65_535, do_nothing_proc)
+      streams_ctx = StreamsContext.new(do_nothing_proc)
+      streams_ctx.new_context(1, 65_535, 65_535)
+      streams_ctx.new_context(2, 65_535, 65_535)
       streams_ctx
     end
     it 'should send' do

data/spec/connection/transition_state_send_spec.rb

@@ -3,9 +3,9 @@ require_relative '../spec_helper'
 RSpec.describe Connection do
   context 'transition_state_send' do
     let(:streams_ctx) do
-      streams_ctx = StreamsContext.new
-      streams_ctx.new_context(1, 65_535, 65_535, do_nothing_proc)
-      streams_ctx.new_context(2, 65_535, 65_535, do_nothing_proc)
+      streams_ctx = StreamsContext.new(do_nothing_proc)
+      streams_ctx.new_context(1, 65_535, 65_535)
+      streams_ctx.new_context(2, 65_535, 65_535)
       streams_ctx
     end
 

data/spec/data_buffer_spec.rb

@@ -9,9 +9,9 @@ RSpec.describe DataBuffer do
       Window.new(65_535)
     end
     let(:streams_ctx1) do
-      streams_ctx = StreamsContext.new
-      streams_ctx.new_context(1, 65_535, 65_535, do_nothing_proc)
-      streams_ctx.new_context(2, 65_535, 65_535, do_nothing_proc)
+      streams_ctx = StreamsContext.new(do_nothing_proc)
+      streams_ctx.new_context(1, 65_535, 65_535)
+      streams_ctx.new_context(2, 65_535, 65_535)
       streams_ctx
     end
     it 'should take' do
@@ -31,9 +31,9 @@ RSpec.describe DataBuffer do
       Window.new(65_535)
     end
     let(:streams_ctx2) do
-      streams_ctx = StreamsContext.new
-      streams_ctx.new_context(1, 65_535, 65_535, do_nothing_proc)
-      streams_ctx.new_context(2, 65_535, 65_535, do_nothing_proc)
+      streams_ctx = StreamsContext.new(do_nothing_proc)
+      streams_ctx.new_context(1, 65_535, 65_535)
+      streams_ctx.new_context(2, 65_535, 65_535)
       streams_ctx
     end
     it 'should take' do
@@ -55,9 +55,9 @@ RSpec.describe DataBuffer do
       Window.new(65_535)
     end
     let(:streams_ctx3) do
-      streams_ctx = StreamsContext.new
-      streams_ctx.new_context(1, 65_535, 65_535, do_nothing_proc)
-      streams_ctx.new_context(2, 65_535, 65_535, do_nothing_proc)
+      streams_ctx = StreamsContext.new(do_nothing_proc)
+      streams_ctx.new_context(1, 65_535, 65_535)
+      streams_ctx.new_context(2, 65_535, 65_535)
       streams_ctx
     end
     it 'should take' do
@@ -80,10 +80,10 @@ RSpec.describe DataBuffer do
       Window.new(65_535)
     end
     let(:streams_ctx4) do
-      streams_ctx = StreamsContext.new
-      streams_ctx.new_context(1, 65_535, 65_535, do_nothing_proc)
+      streams_ctx = StreamsContext.new(do_nothing_proc)
+      streams_ctx.new_context(1, 65_535, 65_535)
       streams_ctx[1].send_window.consume!(65_535)
-      streams_ctx.new_context(2, 65_535, 65_535, do_nothing_proc)
+      streams_ctx.new_context(2, 65_535, 65_535)
       streams_ctx
     end
     it 'should take' do
@@ -108,9 +108,9 @@ RSpec.describe DataBuffer do
       send_window
     end
     let(:streams_ctx5) do
-      streams_ctx = StreamsContext.new
-      streams_ctx.new_context(1, 65_535, 65_535, do_nothing_proc)
-      streams_ctx.new_context(2, 65_535, 65_535, do_nothing_proc)
+      streams_ctx = StreamsContext.new(do_nothing_proc)
+      streams_ctx.new_context(1, 65_535, 65_535)
+      streams_ctx.new_context(2, 65_535, 65_535)
       streams_ctx
     end
     it 'should take' do

data/spec/hpack/decoder_spec.rb

@@ -9,8 +9,8 @@ RSpec.describe HPACK::Decoder do
     it 'should decode' do
       # https://datatracker.ietf.org/doc/html/rfc7541#appendix-C.3.1
       expect(decoder.decode([<<HEXDUMP.split.join].pack('H*')
-   8286 8441 0f77 7777 2e65 7861 6d70 6c65
-   2e63 6f6d
+  8286 8441 0f77 7777 2e65 7861 6d70 6c65
+  2e63 6f6d
 HEXDUMP
                            )).to eq [
                              [':method', 'GET'],
@@ -20,7 +20,7 @@ HEXDUMP
                            ]
       # https://datatracker.ietf.org/doc/html/rfc7541#appendix-C.3.2
       expect(decoder.decode([<<HEXDUMP.split.join].pack('H*')
-   8286 84be 5808 6e6f 2d63 6163 6865
+  8286 84be 5808 6e6f 2d63 6163 6865
 HEXDUMP
                            )).to eq [
                              [':method', 'GET'],
@@ -31,8 +31,8 @@ HEXDUMP
                            ]
       # https://datatracker.ietf.org/doc/html/rfc7541#appendix-C.3.3
       expect(decoder.decode([<<HEXDUMP.split.join].pack('H*')
-   8287 85bf 400a 6375 7374 6f6d 2d6b 6579
-   0c63 7573 746f 6d2d 7661 6c75 65
+  8287 85bf 400a 6375 7374 6f6d 2d6b 6579
+  0c63 7573 746f 6d2d 7661 6c75 65
 HEXDUMP
                            )).to eq [
                              [':method', 'GET'],
@@ -46,8 +46,8 @@ HEXDUMP
     it 'should decode' do
       # https://datatracker.ietf.org/doc/html/rfc7541#appendix-C.4.1
       expect(decoder.decode([<<HEXDUMP.split.join].pack('H*')
-   8286 8441 8cf1 e3c2 e5f2 3a6b a0ab 90f4
-   ff
+  8286 8441 8cf1 e3c2 e5f2 3a6b a0ab 90f4
+  ff
 HEXDUMP
                            )).to eq [
                              [':method', 'GET'],
@@ -57,7 +57,7 @@ HEXDUMP
                            ]
       # https://datatracker.ietf.org/doc/html/rfc7541#appendix-C.4.2
       expect(decoder.decode([<<HEXDUMP.split.join].pack('H*')
-   8286 84be 5886 a8eb 1064 9cbf
+  8286 84be 5886 a8eb 1064 9cbf
 HEXDUMP
                            )).to eq [
                              [':method', 'GET'],
@@ -68,8 +68,8 @@ HEXDUMP
                            ]
       # https://datatracker.ietf.org/doc/html/rfc7541#appendix-C.4.3
       expect(decoder.decode([<<HEXDUMP.split.join].pack('H*')
-   8287 85bf 4088 25a8 49e9 5ba9 7d7f 8925
-   a849 e95b b8e8 b4bf
+  8287 85bf 4088 25a8 49e9 5ba9 7d7f 8925
+  a849 e95b b8e8 b4bf
 HEXDUMP
                            )).to eq [
                              [':method', 'GET'],
@@ -83,11 +83,11 @@ HEXDUMP
     it 'should decode' do
       # https://datatracker.ietf.org/doc/html/rfc7541#appendix-C.5.1
       expect(decoder.decode([<<HEXDUMP.split.join].pack('H*')
-   4803 3330 3258 0770 7269 7661 7465 611d
-   4d6f 6e2c 2032 3120 4f63 7420 3230 3133
-   2032 303a 3133 3a32 3120 474d 546e 1768
-   7474 7073 3a2f 2f77 7777 2e65 7861 6d70
-   6c65 2e63 6f6d
+  4803 3330 3258 0770 7269 7661 7465 611d
+  4d6f 6e2c 2032 3120 4f63 7420 3230 3133
+  2032 303a 3133 3a32 3120 474d 546e 1768
+  7474 7073 3a2f 2f77 7777 2e65 7861 6d70
+  6c65 2e63 6f6d
 HEXDUMP
                            )).to eq [
                              [':status', '302'],
@@ -97,7 +97,7 @@ HEXDUMP
                            ]
       # https://datatracker.ietf.org/doc/html/rfc7541#appendix-C.5.2
       expect(decoder.decode([<<HEXDUMP.split.join].pack('H*')
-   4803 3330 37c1 c0bf
+  4803 3330 37c1 c0bf
 HEXDUMP
                            )).to eq [
                              [':status', '307'],
@@ -107,13 +107,13 @@ HEXDUMP
                            ]
       # https://datatracker.ietf.org/doc/html/rfc7541#appendix-C.5.3
       expect(decoder.decode([<<HEXDUMP.split.join].pack('H*')
-   88c1 611d 4d6f 6e2c 2032 3120 4f63 7420
-   3230 3133 2032 303a 3133 3a32 3220 474d
-   54c0 5a04 677a 6970 7738 666f 6f3d 4153
-   444a 4b48 514b 425a 584f 5157 454f 5049
-   5541 5851 5745 4f49 553b 206d 6178 2d61
-   6765 3d33 3630 303b 2076 6572 7369 6f6e
-   3d31
+  88c1 611d 4d6f 6e2c 2032 3120 4f63 7420
+  3230 3133 2032 303a 3133 3a32 3220 474d
+  54c0 5a04 677a 6970 7738 666f 6f3d 4153
+  444a 4b48 514b 425a 584f 5157 454f 5049
+  5541 5851 5745 4f49 553b 206d 6178 2d61
+  6765 3d33 3630 303b 2076 6572 7369 6f6e
+  3d31
 HEXDUMP
                            )).to eq [
                              [':status', '200'],
@@ -128,10 +128,10 @@ HEXDUMP
     it 'should decode' do
       # https://datatracker.ietf.org/doc/html/rfc7541#appendix-C.6.1
       expect(decoder.decode([<<HEXDUMP.split.join].pack('H*')
-   4882 6402 5885 aec3 771a 4b61 96d0 7abe
-   9410 54d4 44a8 2005 9504 0b81 66e0 82a6
-   2d1b ff6e 919d 29ad 1718 63c7 8f0b 97c8
-   e9ae 82ae 43d3
+  4882 6402 5885 aec3 771a 4b61 96d0 7abe
+  9410 54d4 44a8 2005 9504 0b81 66e0 82a6
+  2d1b ff6e 919d 29ad 1718 63c7 8f0b 97c8
+  e9ae 82ae 43d3
 HEXDUMP
                            )).to eq [
                              [':status', '302'],
@@ -141,7 +141,7 @@ HEXDUMP
                            ]
       # https://datatracker.ietf.org/doc/html/rfc7541#appendix-C.6.2
       expect(decoder.decode([<<HEXDUMP.split.join].pack('H*')
-   4883 640e ffc1 c0bf
+  4883 640e ffc1 c0bf
 HEXDUMP
                            )).to eq [
                              [':status', '307'],
@@ -151,11 +151,11 @@ HEXDUMP
                            ]
       # https://datatracker.ietf.org/doc/html/rfc7541#appendix-C.6.3
       expect(decoder.decode([<<HEXDUMP.split.join].pack('H*')
-   88c1 6196 d07a be94 1054 d444 a820 0595
-   040b 8166 e084 a62d 1bff c05a 839b d9ab
-   77ad 94e7 821d d7f2 e6c7 b335 dfdf cd5b
-   3960 d5af 2708 7f36 72c1 ab27 0fb5 291f
-   9587 3160 65c0 03ed 4ee5 b106 3d50 07
+  88c1 6196 d07a be94 1054 d444 a820 0595
+  040b 8166 e084 a62d 1bff c05a 839b d9ab
+  77ad 94e7 821d d7f2 e6c7 b335 dfdf cd5b
+  3960 d5af 2708 7f36 72c1 ab27 0fb5 291f
+  9587 3160 65c0 03ed 4ee5 b106 3d50 07
 HEXDUMP
                            )).to eq [
                              [':status', '200'],

data/spec/hpack/encoder_spec.rb

@@ -14,10 +14,10 @@ RSpec.describe HPACK::Encoder do
                               ['date', 'Mon, 21 Oct 2013 20:13:21 GMT'],
                               ['location', 'https://www.example.com']
                             ])).to eq [<<HEXDUMP.split.join].pack('H*')
-   4882 6402 5885 aec3 771a 4b61 96d0 7abe
-   9410 54d4 44a8 2005 9504 0b81 66e0 82a6
-   2d1b ff6e 919d 29ad 1718 63c7 8f0b 97c8
-   e9ae 82ae 43d3
+  4882 6402 5885 aec3 771a 4b61 96d0 7abe
+  9410 54d4 44a8 2005 9504 0b81 66e0 82a6
+  2d1b ff6e 919d 29ad 1718 63c7 8f0b 97c8
+  e9ae 82ae 43d3
 HEXDUMP
       # https://datatracker.ietf.org/doc/html/rfc7541#appendix-C.6.2
       expect(encoder.encode([
@@ -26,7 +26,7 @@ HEXDUMP
                               ['date', 'Mon, 21 Oct 2013 20:13:21 GMT'],
                               ['location', 'https://www.example.com']
                             ])).to eq [<<HEXDUMP.split.join].pack('H*')
-   4883 640e ffc1 c0bf
+  4883 640e ffc1 c0bf
 HEXDUMP
       # https://datatracker.ietf.org/doc/html/rfc7541#appendix-C.6.3
       expect(encoder.encode([
@@ -37,11 +37,11 @@ HEXDUMP
                               ['content-encoding', 'gzip'],
                               ['set-cookie', 'foo=ASDJKHQKBZXOQWEOPIUAXQWEOIU; max-age=3600; version=1']
                             ])).to eq [<<HEXDUMP.split.join].pack('H*')
-   88c1 6196 d07a be94 1054 d444 a820 0595
-   040b 8166 e084 a62d 1bff c05a 839b d9ab
-   77ad 94e7 821d d7f2 e6c7 b335 dfdf cd5b
-   3960 d5af 2708 7f36 72c1 ab27 0fb5 291f
-   9587 3160 65c0 03ed 4ee5 b106 3d50 07
+  88c1 6196 d07a be94 1054 d444 a820 0595
+  040b 8166 e084 a62d 1bff c05a 839b d9ab
+  77ad 94e7 821d d7f2 e6c7 b335 dfdf cd5b
+  3960 d5af 2708 7f36 72c1 ab27 0fb5 291f
+  9587 3160 65c0 03ed 4ee5 b106 3d50 07
 HEXDUMP
     end
   end

data/spec/hpack/fields_spec.rb

@@ -7,9 +7,9 @@ RSpec.describe HPACK::Fields do
     end
     it 'should decode' do
       expect(HPACK::Fields.decode([<<HEXDUMP.split.join].pack('H*'),
-   8286 8441 8a08 9d5c 0b81 70dc 79e7
-   9e40 8721 eaa8 a449 8f57 88ea 52d6
-   b0e8 3772 ff
+  8286 8441 8a08 9d5c 0b81 70dc 79e7
+  9e40 8721 eaa8 a449 8f57 88ea 52d6
+  b0e8 3772 ff
 HEXDUMP
                                   dynamic_table)).to eq [[':method', 'GET'], [':scheme', 'http'], [':path', '/'], [':authority', '127.0.0.1:8888'], ['connection', 'keep-alive']]
     end

data/spec/streams_context_spec.rb

@@ -3,9 +3,9 @@ require_relative 'spec_helper'
 RSpec.describe StreamsContext do
   context 'close_all' do
     let(:streams_ctx) do
-      streams_ctx = StreamsContext.new
-      streams_ctx.new_context(1, 65_535, 65_535, do_nothing_proc)
-      streams_ctx.new_context(2, 65_535, 65_535, do_nothing_proc)
+      streams_ctx = StreamsContext.new(do_nothing_proc)
+      streams_ctx.new_context(1, 65_535, 65_535)
+      streams_ctx.new_context(2, 65_535, 65_535)
       streams_ctx
     end
     it 'should close' do
@@ -17,9 +17,9 @@ RSpec.describe StreamsContext do
 
   context 'close_all' do
     let(:streams_ctx) do
-      streams_ctx = StreamsContext.new
-      streams_ctx.new_context(1, 65_535, 65_535, do_nothing_proc)
-      streams_ctx.new_context(2, 65_535, 65_535, do_nothing_proc)
+      streams_ctx = StreamsContext.new(do_nothing_proc)
+      streams_ctx.new_context(1, 65_535, 65_535)
+      streams_ctx.new_context(2, 65_535, 65_535)
       streams_ctx
     end
     it 'should close' do
@@ -31,9 +31,9 @@ RSpec.describe StreamsContext do
 
   context 'remove_closed' do
     let(:streams_ctx1) do
-      streams_ctx = StreamsContext.new
-      streams_ctx.new_context(1, 65_535, 65_535, do_nothing_proc)
-      streams_ctx.new_context(2, 65_535, 65_535, do_nothing_proc)
+      streams_ctx = StreamsContext.new(do_nothing_proc)
+      streams_ctx.new_context(1, 65_535, 65_535)
+      streams_ctx.new_context(2, 65_535, 65_535)
       streams_ctx
     end
     let(:data_buffer1) do
@@ -45,9 +45,9 @@ RSpec.describe StreamsContext do
     end
 
     let(:streams_ctx2) do
-      streams_ctx = StreamsContext.new
-      streams_ctx.new_context(1, 65_535, 65_535, do_nothing_proc)
-      streams_ctx.new_context(2, 65_535, 65_535, do_nothing_proc)
+      streams_ctx = StreamsContext.new(do_nothing_proc)
+      streams_ctx.new_context(1, 65_535, 65_535)
+      streams_ctx.new_context(2, 65_535, 65_535)
       streams_ctx[2].state.close
       streams_ctx
     end
@@ -60,9 +60,9 @@ RSpec.describe StreamsContext do
     end
 
     let(:streams_ctx3) do
-      streams_ctx = StreamsContext.new
-      streams_ctx.new_context(1, 65_535, 65_535, do_nothing_proc)
-      streams_ctx.new_context(2, 65_535, 65_535, do_nothing_proc)
+      streams_ctx = StreamsContext.new(do_nothing_proc)
+      streams_ctx.new_context(1, 65_535, 65_535)
+      streams_ctx.new_context(2, 65_535, 65_535)
       streams_ctx[2].state.close
       streams_ctx
     end

data/spec/utils_spec.rb

@@ -0,0 +1,41 @@
+require_relative 'spec_helper'
+
+RSpec.describe Biryani do
+  let(:data) do
+    Frame::Data.new(false, 2, 'Hello, world!', 'Howdy!')
+  end
+  let(:connection_error) do
+    ConnectionError.new(ErrorCode::NO_ERROR, 'debug')
+  end
+  let(:stream_error) do
+    StreamError.new(ErrorCode::NO_ERROR, 1, 'debug')
+  end
+
+  context 'err?' do
+    it 'should be not error' do
+      expect(Biryani.err?(data)).to eq false
+    end
+
+    it 'should be error' do
+      expect(Biryani.err?(connection_error)).to be true
+    end
+
+    it 'should be error' do
+      expect(Biryani.err?(stream_error)).to be true
+    end
+  end
+
+  context 'unwrap' do
+    it 'should unwrap' do
+      expect(Biryani.unwrap(data, 0x01)).to eq data
+    end
+
+    it 'should unwrap' do
+      expect(Biryani.unwrap(connection_error, 0x01)).to be_kind_of Frame::Goaway
+    end
+
+    it 'should unwrap' do
+      expect(Biryani.unwrap(stream_error, 0x01)).to be_kind_of Frame::RstStream
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: biryani
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - thekuwayama
@@ -79,6 +79,8 @@ files:
 - lib/biryani/version.rb
 - lib/biryani/window.rb
 - spec/connection/handle_connection_window_update_spec.rb
+- spec/connection/handle_data_spec.rb
+- spec/connection/handle_headers_spec.rb
 - spec/connection/handle_ping_spec.rb
 - spec/connection/handle_rst_stream_spec.rb
 - spec/connection/handle_settings_spec.rb
@@ -86,7 +88,6 @@ files:
 - spec/connection/read_http2_magic_spec.rb
 - spec/connection/send_spec.rb
 - spec/connection/transition_state_send_spec.rb
-- spec/connection/unwrap_spec.rb
 - spec/data_buffer_spec.rb
 - spec/frame/continuation_spec.rb
 - spec/frame/data_spec.rb
@@ -109,6 +110,7 @@ files:
 - spec/http_request_builder_spec.rb
 - spec/spec_helper.rb
 - spec/streams_context_spec.rb
+- spec/utils_spec.rb
 homepage: https://github.com/thekuwayama/biryani
 licenses:
 - MIT
@@ -132,6 +134,8 @@ specification_version: 4
 summary: An HTTP/2 server implemented using Ruby Ractor
 test_files:
 - spec/connection/handle_connection_window_update_spec.rb
+- spec/connection/handle_data_spec.rb
+- spec/connection/handle_headers_spec.rb
 - spec/connection/handle_ping_spec.rb
 - spec/connection/handle_rst_stream_spec.rb
 - spec/connection/handle_settings_spec.rb
@@ -139,7 +143,6 @@ test_files:
 - spec/connection/read_http2_magic_spec.rb
 - spec/connection/send_spec.rb
 - spec/connection/transition_state_send_spec.rb
-- spec/connection/unwrap_spec.rb
 - spec/data_buffer_spec.rb
 - spec/frame/continuation_spec.rb
 - spec/frame/data_spec.rb
@@ -162,3 +165,4 @@ test_files:
 - spec/http_request_builder_spec.rb
 - spec/spec_helper.rb
 - spec/streams_context_spec.rb
+- spec/utils_spec.rb

data/spec/connection/unwrap_spec.rb

@@ -1,28 +0,0 @@
-require_relative '../spec_helper'
-
-RSpec.describe Connection do
-  context 'unwrap' do
-    let(:data) do
-      Frame::Data.new(false, 2, 'Hello, world!', 'Howdy!')
-    end
-    it 'should ensure' do
-      expect(Connection.unwrap(data, 0x01)).to eq data
-    end
-
-    let(:connection_error) do
-      ConnectionError.new(ErrorCode::NO_ERROR, 'debug')
-    end
-    it 'should ensure' do
-      frame = Connection.unwrap(connection_error, 0x01)
-      expect(frame).to be_kind_of Frame::Goaway
-    end
-
-    let(:stream_error) do
-      StreamError.new(ErrorCode::NO_ERROR, 0x01, 'debug')
-    end
-    it 'should ensure' do
-      frame = Connection.unwrap(stream_error, 0x01)
-      expect(frame).to be_kind_of Frame::RstStream
-    end
-  end
-end