biryani 0.0.4 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ccf97951b31acac8912b7286f6377dedae6e404aab32e8c0eb619ef223d7349
-  data.tar.gz: 94563414ccb1a066ca85a9dc553541ea3772bc398e3d80a970e9f26b68d7f31b
+  metadata.gz: 2a6614c6a74a069a08281c0f3846da8512f379e347ce77e3812c7cd22f2506bc
+  data.tar.gz: 5a0f61a32f576c0a693abeb2773490ddcbbdcc573b82dac16a6d3a3e82bf2e0e
 SHA512:
-  metadata.gz: c5e5cf9d6fc22cfe738483638b414bf0a82575030d9b4c0e400d5beab27da13b5b826390b563b972eca7fca8f5cbc44e8f693bf44abeab6eb360d9b09a91a3bd
-  data.tar.gz: f961a868e92ba46f300784f12568b0cd47cebc1cda484008b870480c22f63d5de66bf3d76fcddcbc96e192179c2d493a0fb1fbfc0b6cc189ba2852ee99af009a
+  metadata.gz: 0c0add40f15c4e1fa9110a295f9fda392aae21a6ad4dd062a0d3a31fd5dd208f8a384fbcf9009a6fc29e6a940f4fc755f9da0f3e244f68292ee41323cd10e82f
+  data.tar.gz: 1af73e5c917c095dfcb635fd7c09548b4330114125e00df539356fb270d8f083e76c0d25262652f6781e4b8415fc3c2da91083b0af19b20ac7175a70b5c28bc1

data/.ruby-version

@@ -1 +1 @@
-4.0.0
+4.0.1

data/Rakefile

@@ -5,4 +5,11 @@ require 'rubocop/rake_task'
 RuboCop::RakeTask.new
 RSpec::Core::RakeTask.new(:spec)
 
+desc 'conformance test using h2spec'
+RSpec::Core::RakeTask.new(:conformance) do |t|
+  t.pattern = 'conformance/server_spec.rb'
+  t.rspec_opts = %w[--out /dev/null]
+  t.verbose = false
+end
+
 task default: %i[rubocop spec]

data/conformance/server_spec.rb

@@ -0,0 +1,31 @@
+require_relative 'spec_helper'
+
+RSpec.describe Server do
+  before do
+    @tcpserver = TCPServer.open(PORT)
+
+    Ractor.new(@tcpserver) do |socket|
+      server = Server.new(
+        Ractor.shareable_proc do |_req, res|
+          res.status = 200
+          res.content = 'OK'
+        end
+      )
+
+      server.run(socket)
+    end
+  end
+
+  let(:client) do
+    which('h2spec')
+    "h2spec --port #{PORT} --verbose"
+  end
+
+  after do
+    @tcpserver.close
+  end
+
+  it 'should run' do
+    system(client)
+  end
+end

data/conformance/spec_helper.rb

@@ -0,0 +1,14 @@
+require 'open3'
+require 'socket'
+require 'biryani'
+
+# rubocop: disable Style/MixinUsage
+include Biryani
+# rubocop: enable Style/MixinUsage
+
+PORT = 8888
+
+def which(cmd)
+  o, = Open3.capture3("which #{cmd}")
+  warn "conformance task require `#{cmd}`. Install `#{cmd}`." if o.empty?
+end

data/example/echo.rb

@@ -13,7 +13,6 @@ server = Biryani::Server.new(
   # @param res [Biryani::HTTPResponse]
   Ractor.shareable_proc do |req, res|
     res.status = 200
-
     res.content = if req.method.upcase == 'POST'
                     req.content
                   else

data/example/raise_error.rb

@@ -0,0 +1,19 @@
+#!/usr/bin/env ruby
+
+$LOAD_PATH << "#{__dir__}/../lib"
+
+require 'socket'
+require 'biryani'
+
+port = ARGV[0] || 8888
+socket = TCPServer.new(port)
+
+server = Biryani::Server.new(
+  Ractor.shareable_proc do
+    raise 'error'
+  end
+)
+server.run(socket)
+
+# $ bundle exec ruby example/raise_error.rb
+# $ curl -v --http2-prior-knowledge http://localhost:8888

data/lib/biryani/connection.rb

@@ -44,10 +44,11 @@ module Biryani
 
       recv_loop(io.clone)
       send_loop(io)
-    rescue StandardError
+    rescue StandardError => e
+      puts e.backtrace
       self.class.do_send(io, Frame::Goaway.new(0, @streams_ctx.last_stream_id, ErrorCode::INTERNAL_ERROR, 'internal error'), true)
     ensure
-      io&.close_write
+      io.close_write
     end
 
     # @param io [IO]
@@ -57,7 +58,7 @@ module Biryani
           obj = Frame.read(io_)
           break if obj.nil?
 
-          sock_ << obj
+          sock_.send(obj, move: true)
         end
       end
     end
@@ -71,15 +72,14 @@ module Biryani
     def send_loop(io)
       loop do
         ports = @streams_ctx.txs
-        ports << @sock
-        next if ports.empty?
+        break if ports.empty? && @sock.closed?
 
-        port, obj = Ractor.select(*ports)
+        port, obj = Ractor.select(@sock, *ports)
         if port == @sock
           if Biryani.err?(obj)
             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)
+            close if self.class.transition_stream_state_send(reply_frame, @streams_ctx)
           elsif obj.length > @settings[SettingsID::SETTINGS_MAX_FRAME_SIZE]
             self.class.do_send(io, Frame::Goaway.new(0, @streams_ctx.last_stream_id, ErrorCode::FRAME_SIZE_ERROR, 'payload length greater than SETTINGS_MAX_FRAME_SIZE'), true)
             close
@@ -93,7 +93,7 @@ module Biryani
                 @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)
+              close if self.class.transition_stream_state_send(reply_frame, @streams_ctx)
             end
           end
         else
@@ -129,8 +129,12 @@ module Biryani
     #
     # @return [Array<Object>, Array<ConnectionError>, Array<StreamError>] frames or errors
     # rubocop: disable Metrics/CyclomaticComplexity
+    # rubocop: disable Metrics/PerceivedComplexity
     def handle_connection_frame(frame)
       typ = frame.f_type
+      return [ConnectionError.new(ErrorCode::PROTOCOL_ERROR, "invalid frame type #{format('0x%02x', typ)} for stream identifier #{format('0x%02x', stream_id)}")] \
+        if @streams_ctx.receiving_continuation? && ([FrameType::SETTINGS, FrameType::PING, FrameType::WINDOW_UPDATE].include?(typ) || FrameType.unknown?(typ))
+
       case typ
       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")]
@@ -163,6 +167,7 @@ module Biryani
       end
     end
     # rubocop: enable Metrics/CyclomaticComplexity
+    # rubocop: enable Metrics/PerceivedComplexity
 
     # @param frame [Object]
     #
@@ -179,7 +184,7 @@ 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)
+      obj = self.class.transition_stream_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
@@ -241,7 +246,7 @@ module Biryani
     # @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)
+    def self.transition_stream_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?
@@ -260,7 +265,7 @@ module Biryani
     # @param streams_ctx [StreamsContext]
     #
     # @return [Boolean] should close connection?
-    def self.transition_state_send(send_frame, streams_ctx)
+    def self.transition_stream_state_send(send_frame, streams_ctx)
       stream_id = send_frame.stream_id
       typ = send_frame.f_type
       case typ
@@ -297,7 +302,7 @@ module Biryani
         do_send(io, frame, false)
         send_window.consume!(frame.length)
         streams_ctx[stream_id].send_window.consume!(frame.length)
-        transition_state_send(frame, streams_ctx)
+        transition_stream_state_send(frame, streams_ctx)
       end
 
       data_buffer.store(stream_id, remains) unless remains.empty?
@@ -322,7 +327,7 @@ module Biryani
 
       frames.each do |frame|
         do_send(io, frame, false)
-        transition_state_send(frame, streams_ctx)
+        transition_stream_state_send(frame, streams_ctx)
       end
     end
 
@@ -349,10 +354,10 @@ module Biryani
 
       ctx.content << data
       if ctx.half_closed_remote?
-        obj = http_request(ctx.fragment.string, ctx.content.string, decoder)
+        obj = http_request(ctx.fragment, ctx.content, decoder)
         return obj if Biryani.err?(obj)
 
-        ctx.stream.rx << obj
+        ctx.stream.rx.send(obj, move: true)
       end
 
       window_updates = []
@@ -370,10 +375,10 @@ module Biryani
     def self.handle_headers(headers, ctx, decoder)
       ctx.fragment << headers.fragment
       if ctx.half_closed_remote?
-        obj = http_request(ctx.fragment.string, ctx.content.string, decoder)
-        return [obj] if Biryani.err?(obj)
+        obj = http_request(ctx.fragment, ctx.content, decoder)
+        return obj if Biryani.err?(obj)
 
-        ctx.stream.rx << obj
+        ctx.stream.rx.send(obj, move: true)
       end
 
       nil

data/lib/biryani/data_buffer.rb

@@ -8,7 +8,7 @@ module Biryani
     # @param data [String]
     def store(stream_id, data)
       @buffer[stream_id] = '' unless @buffer.key?(stream_id)
-      @buffer[stream_id] += data
+      @buffer[stream_id] << data
     end
 
     # @param send_window [Window]

data/lib/biryani/error.rb

@@ -0,0 +1,8 @@
+module Biryani
+  module Error
+    # Generic error, common for all classes under Biryani::Error module.
+    class Error < StandardError; end
+
+    class InvalidHTTPResponseError < Error; end
+  end
+end

data/lib/biryani/frame/continuation.rb

@@ -32,16 +32,13 @@ module Biryani
       end
 
       # @param s [String]
+      # @param flags [Integer]
+      # @param stream_id [Integer]
       #
       # @return [Continuation]
-      def self.read(s)
-        payload_length, _, flags, stream_id = Frame.read_header(s)
-        return ConnectionError.new(ErrorCode::PROTOCOL_ERROR, 'invalid frame') if s[9..].bytesize != payload_length
-
+      def self.read(s, flags, stream_id)
         end_headers = Frame.read_end_headers(flags)
-        fragment = s[9..]
-
-        Continuation.new(end_headers, stream_id, fragment)
+        Continuation.new(end_headers, stream_id, s)
       end
     end
   end

data/lib/biryani/frame/data.rb

@@ -41,26 +41,23 @@ module Biryani
       end
 
       # @param s [String]
+      # @param flags [Integer]
+      # @param stream_id [Integer]
       #
       # @return [Data]
-      def self.read(s)
-        payload_length, _, flags, stream_id = Frame.read_header(s)
-        return ConnectionError.new(ErrorCode::PROTOCOL_ERROR, 'invalid frame') if s[9..].bytesize != payload_length
-
+      def self.read(s, flags, stream_id)
         padded = Frame.read_padded(flags)
         end_stream = Frame.read_end_stream(flags)
 
         if padded
-          pad_length = s[9].unpack1('C')
-          data_length = payload_length - pad_length - 1
-          data = s[10...10 + data_length]
-          padding = s[10 + data_length..]
-          return ConnectionError.new(ErrorCode::PROTOCOL_ERROR, 'invalid frame') if pad_length >= payload_length
+          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)
           return ConnectionError.new(ErrorCode::PROTOCOL_ERROR, 'invalid frame') if padding.bytesize != pad_length
         else
-          data = s[9..]
-          padding = nil
-          return ConnectionError.new(ErrorCode::PROTOCOL_ERROR, 'invalid frame') if data.bytesize != payload_length
+          data = s
         end
 
         Data.new(end_stream, stream_id, data, padding)

data/lib/biryani/frame/goaway.rb

@@ -28,14 +28,14 @@ module Biryani
       end
 
       # @param s [String]
+      # @param _flags [Integer]
+      # @param stream_id [Integer]
       #
       # @return [Goaway]
-      def self.read(s)
-        payload_length, _, _, stream_id = Frame.read_header(s)
-        return ConnectionError.new(ErrorCode::PROTOCOL_ERROR, 'invalid frame') if s[9..].bytesize != payload_length
-
-        last_stream_id, error_code = s[9..16].unpack('NN')
-        debug = s[17..]
+      def self.read(s, _flags, stream_id)
+        io = IO::Buffer.for(s)
+        last_stream_id, error_code = io.get_values(%i[U32 U32], 0)
+        debug = io.get_string(8)
 
         Goaway.new(stream_id, last_stream_id, error_code, debug)
       end

data/lib/biryani/frame/headers.rb

@@ -58,50 +58,57 @@ module Biryani
       end
 
       # @param s [String]
+      # @param flags [Integer]
+      # @param stream_id [Integer]
       #
       # @return [Headers]
       # rubocop: disable Metrics/AbcSize
       # rubocop: disable Metrics/CyclomaticComplexity
+      # rubocop: disable Metrics/MethodLength
       # rubocop: disable Metrics/PerceivedComplexity
-      def self.read(s)
-        payload_length, _, flags, stream_id = Frame.read_header(s)
-        return ConnectionError.new(ErrorCode::PROTOCOL_ERROR, 'invalid frame') if s[9..].bytesize != payload_length
-
+      def self.read(s, flags, stream_id)
         priority = Frame.read_priority(flags)
         padded = Frame.read_padded(flags)
         end_headers = Frame.read_end_headers(flags)
         end_stream = Frame.read_end_stream(flags)
 
         if priority && padded
-          pad_length, stream_dependency, weight = s[9..14].unpack('CNC')
-          fragment_length = payload_length - pad_length - 6
+          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
           # exclusive = (stream_dependency / 2**31).positive?
           stream_dependency %= 2**31
-          fragment = s[15...15 + fragment_length]
-          padding = s[15 + fragment_length..]
+          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)
           return ConnectionError.new(ErrorCode::FRAME_SIZE_ERROR, 'invalid frame') if padding.bytesize != pad_length
         elsif priority
-          stream_dependency, weight = s[9..13].unpack('NC')
+          io = IO::Buffer.for(s)
+          stream_dependency, weight = io.get_values(%i[U32 U8], 0)
           # exclusive = (stream_dependency / 2**31).positive?
           stream_dependency %= 2**31
-          fragment = s[14..]
-          return ConnectionError.new(ErrorCode::FRAME_SIZE_ERROR, 'invalid frame') if fragment.bytesize + 5 != payload_length
+          return ConnectionError.new(ErrorCode::PROTOCOL_ERROR, 'cannot depend on itself') if stream_dependency == stream_id
+
+          fragment = io.get_string(5)
+          return ConnectionError.new(ErrorCode::FRAME_SIZE_ERROR, 'invalid frame') if fragment.bytesize + 5 != s.bytesize
         elsif padded
-          pad_length = s[9].unpack1('C')
-          fragment_length = payload_length - pad_length - 1
-          fragment = s[10...10 + fragment_length]
-          padding = s[10 + fragment_length..]
-          return ConnectionError.new(ErrorCode::PROTOCOL_ERROR, 'invalid frame') if pad_length >= payload_length
+          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)
+          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
-          fragment = s[9..]
-          return ConnectionError.new(ErrorCode::PROTOCOL_ERROR, 'invalid frame') if fragment.bytesize != payload_length
+          fragment = s
         end
 
         Headers.new(end_headers, end_stream, stream_id, stream_dependency, weight, fragment, padding)
       end
       # rubocop: enable Metrics/AbcSize
       # rubocop: enable Metrics/CyclomaticComplexity
+      # rubocop: enable Metrics/MethodLength
       # rubocop: enable Metrics/PerceivedComplexity
     end
   end

data/lib/biryani/frame/ping.rb

@@ -32,17 +32,15 @@ module Biryani
       end
 
       # @param s [String]
+      # @param flags [Integer]
+      # @param stream_id [Integer]
       #
       # @return [Ping]
-      def self.read(s)
-        payload_length, _, flags, stream_id = Frame.read_header(s)
-        return ConnectionError.new(ErrorCode::PROTOCOL_ERROR, 'invalid frame') if s[9..].bytesize != payload_length
-        return ConnectionError.new(ErrorCode::FRAME_SIZE_ERROR, 'PING payload length MUST be 8') if s[9..].bytesize != 8
+      def self.read(s, flags, stream_id)
+        return ConnectionError.new(ErrorCode::FRAME_SIZE_ERROR, 'PING payload length MUST be 8') if s.bytesize != 8
 
         ack = Frame.read_ack(flags)
-        opaque = s[9..]
-
-        Ping.new(ack, stream_id, opaque)
+        Ping.new(ack, stream_id, s)
       end
     end
   end

data/lib/biryani/frame/priority.rb

@@ -27,15 +27,16 @@ module Biryani
       end
 
       # @param s [String]
+      # @param _flags [Integer]
+      # @param stream_id [Integer]
       #
       # @return [Priority]
-      def self.read(s)
-        payload_length, _, _, stream_id = Frame.read_header(s)
-        return ConnectionError.new(ErrorCode::PROTOCOL_ERROR, 'invalid frame') if s[9..].bytesize != payload_length
-        return ConnectionError.new(ErrorCode::FRAME_SIZE_ERROR, 'PRIORITY payload length MUST be 5') if payload_length != 5
+      def self.read(s, _flags, stream_id)
+        return ConnectionError.new(ErrorCode::FRAME_SIZE_ERROR, 'PRIORITY payload length MUST be 5') if s.bytesize != 5
 
-        stream_dependency, weight = s[9..13].unpack('NC')
+        stream_dependency, weight = s.unpack('NC')
         stream_dependency %= 2**31
+        return ConnectionError.new(ErrorCode::PROTOCOL_ERROR, 'cannot depend on itself') if stream_dependency == stream_id
 
         Priority.new(stream_id, stream_dependency, weight)
       end

data/lib/biryani/frame/push_promise.rb

@@ -43,33 +43,32 @@ module Biryani
       end
 
       # @param s [String]
+      # @param flags [Integer]
+      # @param stream_id [Integer]
       #
       # @return [PushPromise]
-      # rubocop: disable Metrics/AbcSize
-      def self.read(s)
-        payload_length, _, flags, stream_id = Frame.read_header(s)
-        return ConnectionError.new(ErrorCode::PROTOCOL_ERROR, 'invalid frame') if s[9..].bytesize != payload_length
-
+      def self.read(s, flags, stream_id)
         padded = Frame.read_padded(flags)
         end_headers = Frame.read_end_headers(flags)
 
+        io = IO::Buffer.for(s)
         if padded
-          pad_length = s[9].unpack1('C')
-          promised_stream_id = s[10..13].unpack1('N')
-          fragment_length = payload_length - pad_length - 5
-          fragment = s[14...14 + fragment_length]
-          padding = s[14 + fragment_length..]
-          return ConnectionError.new(ErrorCode::PROTOCOL_ERROR, 'invalid frame') if pad_length >= payload_length
+          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)
+          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
-          promised_stream_id = s[9..12].unpack1('N')
-          fragment = s[13..]
-          return ConnectionError.new(ErrorCode::PROTOCOL_ERROR, 'invalid frame') if fragment.bytesize + 4 != payload_length
+          promised_stream_id = io.get_value(:U32, 0)
+          promised_stream_id %= 2**31 # Promised Stream ID (31)
+          fragment = io.get_string(4)
+          return ConnectionError.new(ErrorCode::PROTOCOL_ERROR, 'invalid frame') if fragment.bytesize + 4 != s.bytesize
         end
 
         PushPromise.new(end_headers, stream_id, promised_stream_id, fragment, padding)
       end
-      # rubocop: enable Metrics/AbcSize
     end
   end
 end

data/lib/biryani/frame/rst_stream.rb

@@ -25,14 +25,14 @@ module Biryani
       end
 
       # @param s [String]
+      # @param _flags [Integer]
+      # @param stream_id [Integer]
       #
       # @return [RstStream]
-      def self.read(s)
-        payload_length, _, _, stream_id = Frame.read_header(s)
-        return ConnectionError.new(ErrorCode::PROTOCOL_ERROR, 'invalid frame') if s[9..].bytesize != payload_length
-        return ConnectionError.new(ErrorCode::FRAME_SIZE_ERROR, 'RST_STREAM payload length MUST be 4') if s[9..].bytesize != 4
+      def self.read(s, _flags, stream_id)
+        return ConnectionError.new(ErrorCode::FRAME_SIZE_ERROR, 'RST_STREAM payload length MUST be 4') if s.bytesize != 4
 
-        error_code = s[9..].unpack1('N')
+        error_code = s.unpack1('N')
         RstStream.new(stream_id, error_code)
       end
     end

data/lib/biryani/frame/settings.rb

@@ -33,18 +33,18 @@ module Biryani
       end
 
       # @param s [String]
+      # @param flags [Integer]
+      # @param stream_id [Integer]
       #
       # @return [Settings]
       # rubocop: disable Metrics/AbcSize
       # rubocop: disable Metrics/CyclomaticComplexity
       # rubocop: disable Metrics/PerceivedComplexity
-      def self.read(s)
-        payload_length, _, flags, stream_id = Frame.read_header(s)
-        return ConnectionError.new(ErrorCode::PROTOCOL_ERROR, 'invalid frame') if s[9..].bytesize != payload_length
-        return ConnectionError.new(ErrorCode::FRAME_SIZE_ERROR, 'SETTINGS payload length MUST be a multiple of 6') if payload_length % 6 != 0
+      def self.read(s, flags, stream_id)
+        return ConnectionError.new(ErrorCode::FRAME_SIZE_ERROR, 'SETTINGS payload length MUST be a multiple of 6') if s.bytesize % 6 != 0
 
         ack = Frame.read_ack(flags)
-        setting = s[9..].unpack('nN' * (payload_length / 6)).each_slice(2).to_h
+        setting = s.unpack('nN' * (s.bytesize / 6)).each_slice(2).to_h
         return ConnectionError.new(ErrorCode::FRAME_SIZE_ERROR, 'SETTINGS MUST NOT have setting with ack') \
           if ack && setting.any?
         return ConnectionError.new(ErrorCode::PROTOCOL_ERROR, 'invalid SETTINGS_ENABLE_PUSH') \

data/lib/biryani/frame/unknown.rb

@@ -21,21 +21,7 @@ module Biryani
 
       # @return [String]
       def to_binary_s
-        payload_length = length
-
-        Frame.to_binary_s_header(payload_length, @f_type, flags, @stream_id) + @payload
-      end
-
-      # @param s [String]
-      #
-      # @return [Unknown]
-      def self.read(s)
-        payload_length, f_type, flags, stream_id = Frame.read_header(s)
-        return ConnectionError.new(ErrorCode::PROTOCOL_ERROR, 'invalid frame') if s[9..].bytesize != payload_length
-
-        payload = s[9..]
-
-        Unknown.new(f_type, flags, stream_id, payload)
+        Frame.to_binary_s_header(length, @f_type, @flags, @stream_id) + @payload
       end
     end
   end

data/lib/biryani/frame/window_update.rb

@@ -25,14 +25,14 @@ module Biryani
       end
 
       # @param s [String]
+      # @param _flags [Integer]
+      # @param stream_id [Integer]
       #
       # @return [WindowUpdate]
-      def self.read(s)
-        payload_length, _, _, stream_id = Frame.read_header(s)
-        return ConnectionError.new(ErrorCode::PROTOCOL_ERROR, 'invalid frame') if s[9..].bytesize != payload_length
-        return ConnectionError.new(ErrorCode::FRAME_SIZE_ERROR, 'WINDOW_UPDATE payload length MUST be 4') if s[9..].bytesize != 4
+      def self.read(s, _flags, stream_id)
+        return ConnectionError.new(ErrorCode::FRAME_SIZE_ERROR, 'WINDOW_UPDATE payload length MUST be 4') if s.bytesize != 4
 
-        window_size_increment = s[9..].unpack1('N')
+        window_size_increment = s.unpack1('N')
         return ConnectionError.new(ErrorCode::PROTOCOL_ERROR, 'WINDOW_UPDATE invalid window size increment 0') if window_size_increment.zero?
         return ConnectionError.new(ErrorCode::FLOW_CONTROL_ERROR, 'WINDOW_UPDATE invalid window size increment greater than 2^31-1') if window_size_increment > 2**31 - 1
 

data/lib/biryani/frame.rb

@@ -10,6 +10,11 @@ module Biryani
     GOAWAY        = 0x07
     WINDOW_UPDATE = 0x08
     CONTINUATION  = 0x09
+
+    # @return [Boolean]
+    def self.unknown?(typ)
+      typ.negative? || typ > 0x09
+    end
   end
 
   module ErrorCode
@@ -37,11 +42,11 @@ module Biryani
     # @return [Integer]
     # @return [Integer]
     def self.read_header(s)
-      b0, b1, b2, f_type, uint8 = s[0..4].bytes
+      b0, b1, b2, f_type, flags, stream_id = s.unpack('CCCCCN')
       payload_length = (b0 << 16) | (b1 << 8) | b2
-      stream_id = s[5..8].unpack1('N') % 2**31 # Stream Identifier (31)
+      stream_id %= 2**31 # Stream Identifier (31)
 
-      [payload_length, f_type, uint8, stream_id]
+      [payload_length, f_type, flags, stream_id]
     end
 
     # @param uint8 [Integer]
@@ -136,9 +141,10 @@ module Biryani
 
       payload_length, f_type, flags, stream_id = read_header(s)
       payload = io.read(payload_length)
+      return ConnectionError.new(ErrorCode::PROTOCOL_ERROR, 'invalid frame') if payload.bytesize != payload_length
       return Frame::Unknown.new(f_type, flags, stream_id, payload) unless FRAME_MAP.key?(f_type)
 
-      FRAME_MAP[f_type].read(s + payload)
+      FRAME_MAP[f_type].read(payload, flags, stream_id)
     rescue StandardError
       ConnectionError.new(ErrorCode::FRAME_SIZE_ERROR, 'invalid frame')
     end