bayserver-docker-http 3.0.3 → 3.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f5a5ca498e7e56434ccef478c2c1895f0c24cfcc424d8c811ea6fcfb3e2daa0a
-  data.tar.gz: 6178b740f34a7d5411c5923f40a8a090a91f6806be70584c363834243070ba4e
+  metadata.gz: 3a4d46496d23a37a8c5bc5f5852b379d0a901f5599aaaa502d949646c134e921
+  data.tar.gz: b44a1b58fe21107515516a280654801e24f6cde5f7130b089f4c5d4882377259
 SHA512:
-  metadata.gz: ddc09627cb09f5755e26fb56510a838ed5b094a7ee8f85274cb2912360ad301ec0651afc134102dd4a4fcbb92d985f7755e412ae2e3d80d4a37aeaa65d2aa81e
-  data.tar.gz: 067dba365ddd9a1534a8adb52032dadc7c84815a7f1a6381bf1498b54609d2b51083ee7ab0c9cc0c68e0e6a81190432db49a03b2177ce1a530204f0f4a32d6f3
+  metadata.gz: f66955666f1fce85453badd1b76db78a3d3982c0a238e7a3c42c7acfdc8b2ec9420de309031212fa479b47dde6da288faacdafacbde87fb8ea4313a4ff13779d
+  data.tar.gz: f304c2c88516c98712406769238d4c261bb637fc21d1d88b9f6d6701c20de967f4def4e1af3f6793015d6d7ac8e78d3a050dbb35db6bea7ab4eb413305238ccf

data/lib/baykit/bayserver/docker/http/h1/h1_inbound_handler.rb

@@ -99,13 +99,13 @@ module Baykit
             def send_res_headers(tur)
 
               # determine Connection header value
-              if tur.req.headers.get_connection() != Headers::CONNECTION_KEEP_ALIVE
+              if tur.req.headers.get_connection() != Headers::CONNECTION_KEEP_ALIVE && tur.req.headers.get_connection() != Headers::CONNECTION_UNKNOWN
                 # If client doesn't support "Keep-Alive", set "Close"
                 res_con = "Close"
               else
                 res_con = "Keep-Alive"
                 # Client supports "Keep-Alive"
-                if tur.res.headers.get_connection() != Headers::CONNECTION_KEEP_ALIVE
+                if tur.res.headers.get_connection() != Headers::CONNECTION_KEEP_ALIVE && tur.res.headers.get_connection() != Headers::CONNECTION_UNKNOWN
                   # If tours doesn't need "Keep-Alive"
                   if tur.res.headers.content_length() == -1
                     # If content-length not specified
@@ -175,7 +175,7 @@ module Baykit
               end
 
               tur.res.send_error(Tour::TOUR_ID_NOCHECK, HttpStatus::BAD_REQUEST, err.message, err)
-              true
+              false
             end
 
             ######################################################

data/lib/baykit/bayserver/docker/http/h2/command/cmd_continuation.rb

@@ -0,0 +1,58 @@
+require 'baykit/bayserver/docker/http/h2/package'
+
+#
+# HTTP/2 Continuation payload format
+#
+# +---------------------------------------------------------------+
+# |                   Header Block Fragment (*)                 ...
+# +---------------------------------------------------------------+
+#
+module Baykit
+  module BayServer
+    module Docker
+      module Http
+        module H2
+          module Command
+
+            class CmdContinuation < Baykit::BayServer::Docker::Http::H2::H2Command
+              include Baykit::BayServer::Docker::Http::H2
+
+              #
+              # This class refers external byte array, so this IS NOT mutable
+              #
+              attr :start
+              attr :length
+              attr :data
+
+              def initialize(stream_id, flags = nil)
+                super(H2Type::CONTINUATION, stream_id, flags)
+              end
+
+              def unpack(pkt)
+                super
+                @data = pkt.buf
+                @start = pkt.header_len
+                @length = pkt.data_len()
+              end
+
+              def pack(pkt)
+                acc = pkt.new_data_accessor()
+                if @flags.padded?
+                  raise RuntimeError.new("Padding not supported")
+                end
+                acc.put_bytes(@data, @start, @length)
+                super
+              end
+
+              def handle(cmd_handler)
+                return cmd_handler.handle_continuation(self)
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end
+
+

data/lib/baykit/bayserver/docker/http/h2/command/cmd_headers.rb

@@ -25,6 +25,13 @@ module Baykit
             class CmdHeaders < Baykit::BayServer::Docker::Http::H2::H2Command
               include Baykit::BayServer::Docker::Http::H2
 
+              #
+              # This class refers external byte array, so this IS NOT mutable
+              #
+              attr_accessor :start
+              attr_accessor :length
+              attr_accessor :data
+
               attr :pad_length
               attr_accessor :excluded
               attr :stream_dependency
@@ -42,7 +49,7 @@ module Baykit
 
               def unpack(pkt)
                 super
-                acc = pkt.new_h2_data_accessor
+                acc = pkt.new_data_accessor
 
                 if pkt.flags.padded?
                   @pad_length = acc.get_byte
@@ -53,11 +60,13 @@ module Baykit
                   @stream_dependency = H2Packet.extract_int31(val)
                   @weight = acc.get_byte
                 end
-                read_header_block(acc, pkt.data_len())
+                @data = pkt.buf
+                @start = pkt.header_len + acc.pos
+                @length = pkt.data_len - acc.pos
               end
 
               def pack(pkt)
-                acc = pkt.new_h2_data_accessor
+                acc = pkt.new_data_accessor
 
                 if @flags.padded?
                   acc.put_byte(@pad_length)
@@ -67,7 +76,8 @@ module Baykit
                   acc.put_int(H2Packet.make_stream_dependency32(@excluded, @stream_dependency))
                   acc.put_byte(@weight)
                 end
-                write_header_block(acc)
+
+                acc.put_bytes(@data, @start, @length)
                 super
               end
 
@@ -75,28 +85,6 @@ module Baykit
                 return cmd_handler.handle_headers(self)
               end
 
-              def read_header_block(acc, len)
-                while acc.pos < len
-                  blk = HeaderBlock.unpack(acc)
-                  #if(BayLog.trace_mode?)
-                  #  BayLog.trace "h2: Read header block: #{blk}"
-                  #end
-                  @header_blocks << blk
-                end
-              end
-
-              def write_header_block(acc)
-                @header_blocks.each do |blk|
-                  #if(BayLog.trace_mode?)
-                  #  BayLog.trace "h2: Write header block: #{blk}"
-                  #end
-                  HeaderBlock.pack(blk, acc)
-                end
-              end
-
-              def add_header_block(blk)
-                @header_blocks.append(blk)
-              end
             end
           end
         end

data/lib/baykit/bayserver/docker/http/h2/command/cmd_preface.rb

@@ -33,7 +33,7 @@ module Baykit
               end
 
               def pack(pkt)
-                acc = pkt.new_h2_data_accessor()
+                acc = pkt.new_data_accessor()
                 acc.put_bytes(PREFACE_BYTES)
               end
 

data/lib/baykit/bayserver/docker/http/h2/command/package.rb

@@ -7,3 +7,4 @@ require 'baykit/bayserver/docker/http/h2/command/cmd_priority'
 require 'baykit/bayserver/docker/http/h2/command/cmd_rst_stream'
 require 'baykit/bayserver/docker/http/h2/command/cmd_settings'
 require 'baykit/bayserver/docker/http/h2/command/cmd_window_update'
+require 'baykit/bayserver/docker/http/h2/command/cmd_continuation'

data/lib/baykit/bayserver/docker/http/h2/h2_command_handler.rb

@@ -41,6 +41,10 @@ module Baykit
             def handle_rst_stream(cmd)
               raise NotImplementedError.new
             end
+
+            def handle_continuation(cmd)
+              raise NotImplementedError.new
+            end
           end
         end
       end

data/lib/baykit/bayserver/docker/http/h2/h2_command_unpacker.rb

@@ -54,6 +54,9 @@ module Baykit
               when H2Type::RST_STREAM
                 cmd = CmdRstStream.new(pkt.stream_id, pkt.flags)
 
+              when H2Type::CONTINUATION
+                cmd = CmdContinuation.new(pkt.stream_id, pkt.flags)
+
               else
                 reset()
                 raise RuntimeError.new("Invalid Packet: #{pkt}")

data/lib/baykit/bayserver/docker/http/h2/h2_inbound_handler.rb

@@ -45,7 +45,6 @@ module Baykit
 
             include Baykit::BayServer::Agent
             include Baykit::BayServer::Protocol
-            include Baykit::BayServer::WaterCraft
             include Baykit::BayServer::Tours
             include Baykit::BayServer::Util
             include Baykit::BayServer::Docker::Http::H2::Command
@@ -60,6 +59,7 @@ module Baykit
             attr :http_protocol
             attr :req_header_tbl
             attr :res_header_tbl
+            attr :header_buffer
 
             def initialize
               @window_size = BayServer.harbor.tour_buffer_size
@@ -67,6 +67,7 @@ module Baykit
               @analyzer = HeaderBlockAnalyzer.new
               @req_header_tbl = HeaderTable.create_dynamic_table()
               @res_header_tbl = HeaderTable.create_dynamic_table()
+              @header_buffer = SimpleBuffer.new
             end
 
             ######################################################
@@ -77,6 +78,7 @@ module Baykit
               @header_read = false
               @req_cont_len = 0
               @req_cont_read = 0
+              @header_buffer.reset
             end
 
             def init(proto_handler)
@@ -88,10 +90,12 @@ module Baykit
             ######################################################
 
             def send_res_headers(tur)
-              cmd = CmdHeaders.new(tur.req.key)
               bld = HeaderBlockBuilder.new()
+
+              header_blocks = []
+
               blk = bld.build_header_block(":status", tur.res.headers.status.to_s, @res_header_tbl)
-              cmd.header_blocks << blk
+              header_blocks << blk
 
               # headers
               if BayServer.harbor.trace_header
@@ -106,15 +110,46 @@ module Baykit
                       BayLog.info("%s H2 res header: %s=%s", tur, name, value)
                     end
                     blk = bld.build_header_block(name, value, @res_header_tbl)
-                    cmd.header_blocks.append(blk)
+                    header_blocks.append(blk)
                   end
                 end
               end
 
-              cmd.flags.set_end_headers(true)
-              cmd.excluded = true
-              cmd.flags.set_padded(false)
-              @protocol_handler.post(cmd)
+              buf = SimpleBuffer.new
+              HeaderBlockRenderer.new(buf).render_header_blocks(header_blocks)
+
+              pos = 0
+              len = buf.length
+              while len > 0
+                chunk_len = [len, H2Packet::DEFAULT_PAYLOAD_MAXLEN].min
+
+                if pos == 0
+                  hcmd = CmdHeaders.new(tur.req.key)
+                  hcmd.excluded = false
+                  hcmd.data = buf.bytes
+                  hcmd.start = pos
+                  hcmd.length = len
+                  cmd = hcmd
+
+                else
+                  ccmd = CmdContinuation.new(tur.req.key)
+                  ccmd.data = buf.bytes
+                  ccmd.start = pos
+                  ccmd.length = len
+                  cmd = ccmd
+
+                end
+
+                cmd.flags.set_padded(false)
+
+                pos += chunk_len
+                len -= chunk_len
+                if len == 0
+                    cmd.flags.set_end_headers(true)
+                end
+
+                @protocol_handler.post(cmd)
+              end
             end
 
             def send_res_content(tur, bytes, ofs, len, &callback)
@@ -132,14 +167,14 @@ module Baykit
 
             def on_protocol_error(err)
               BayLog.error_e err
-              cmd = CmdGoAway.new(CTL_STREAM_ID)
-              cmd.stream_id = CTL_STREAM_ID
-              cmd.last_stream_id = CTL_STREAM_ID
+              cmd = CmdGoAway.new(H2ProtocolHandler::CTL_STREAM_ID)
+              cmd.stream_id = H2ProtocolHandler::CTL_STREAM_ID
+              cmd.last_stream_id = H2ProtocolHandler::CTL_STREAM_ID
               cmd.error_code = H2ErrorCode::PROTOCOL_ERROR
               cmd.debug_data = "Thank you!"
               begin
                 @protocol_handler.post(cmd)
-                @protocol_handler.end(ship)
+                @protocol_handler.ship.post_close()
               rescue IOError => e
                 BayLog.error_e(e)
               end
@@ -180,70 +215,14 @@ module Baykit
                 tur.res.send_error(Tour::TOUR_ID_NOCHECK, HttpStatus::SERVICE_UNAVAILABLE, "No available tours")
                 return NextSocketAction::CONTINUE
               end
-
-              cmd.header_blocks.each do |blk|
-                if blk.op == HeaderBlock::UPDATE_DYNAMIC_TABLE_SIZE
-                  BayLog.trace("%s header block update table size: %d", tur, blk.size)
-                  @req_header_tbl.set_size(blk.size)
-                  next
-                end
-                @analyzer.analyze_header_block(blk, @req_header_tbl)
-                if BayServer.harbor.trace_header
-                  BayLog.info("%s req header: %s=%s :%s", tur, @analyzer.name, @analyzer.value, blk);
-                end
-
-                if @analyzer.name == nil
-                  next
-
-                elsif @analyzer.name[0] != ":"
-                  tur.req.headers.add(@analyzer.name, @analyzer.value)
-
-                elsif @analyzer.method != nil
-                  tur.req.method = @analyzer.method
-
-                elsif @analyzer.path != nil
-                  tur.req.uri = @analyzer.path
-
-                elsif @analyzer.scheme != nil
-
-                elsif @analyzer.status != nil
-                  raise RuntimeError.new("Illegal State")
-                end
+              if !tur.preparing?
+                raise ProtocolException.new("%s Tour is not preparing.", tur)
               end
 
               if cmd.flags.end_headers?
-                tur.req.protocol = "HTTP/2.0"
-                BayLog.debug("%s H2 read header method=%s protocol=%s uri=%s contlen=%d",
-                             ship, tur.req.method, tur.req.protocol, tur.req.uri, tur.req.headers.content_length)
-
-                req_cont_len = tur.req.headers.content_length()
-
-                if req_cont_len > 0
-                  tur.req.set_limit(req_cont_len)
-                end
-
-                begin
-                  start_tour tur
-
-                  if tur.req.headers.content_length <= 0
-                    end_req_content(Tour::TOUR_ID_NOCHECK, tur)
-                  end
-                rescue HttpException => e
-                  BayLog.debug("%s Http error occurred: %s", self, e);
-                  if req_cont_len <= 0
-                    # no post data
-                    tur.req.abort
-                    tur.res.send_http_exception(Tour::TOUR_ID_NOCHECK, e)
-
-                    return NextSocketAction::CONTINUE
-                  else
-                    # Delay send
-                    tur.error = e
-                    tur.req.set_content_handler(ReqContentHandler::DEV_NULL)
-                    return NextSocketAction::CONTINUE
-                  end
-                end
-
+                return on_end_header(tur, cmd.data, cmd.start, cmd.length)
+              else
+                @header_buffer.put(cmd.data, cmd.start, cmd.length)
               end
 
               NextSocketAction::CONTINUE
@@ -256,8 +235,8 @@ module Baykit
               if tur == nil
                 raise RuntimeError.new("Invalid stream id: #{cmd.stream_id}")
               end
-              if tur.req.headers.content_length <= 0
-                raise ProtocolException.new("Post content not allowed")
+              if !tur.reading?
+                raise ProtocolException.new("%s Tour is not reading.", tur)
               end
 
               begin
@@ -388,13 +367,22 @@ module Baykit
             def handle_rst_stream(cmd)
               BayLog.warn("%s received RstStream: stmid=%d code=%d desc=%s",
                            ship, cmd.stream_id, cmd.error_code, H2ErrorCode.msg.get(cmd.error_code.to_s.to_sym))
+              return NextSocketAction::CONTINUE
+            end
+
+            def handle_continuation(cmd)
+              BayLog.debug("%s handle_continuation: stm=%d", ship, cmd.stream_id)
               tur = get_tour(cmd.stream_id)
               if tur == nil
-                BayLog.warn("%s stream not found id=%d", ship, cmd.stream_id)
-              else
-                tur.req.abort
-                return NextSocketAction::CONTINUE
+                raise ArgumentError("Invalid stream id: " + cmd.stream_id)
+              end
+
+              @header_buffer.put(cmd.data, cmd.start, cmd.length)
+              if cmd.flags.end_headers?
+                return on_end_header(tur, @header_buffer.bytes, 0, @header_buffer.length)
               end
+
+              return NextSocketAction::CONTINUE
             end
 
             private
@@ -427,8 +415,15 @@ module Baykit
                 tur.req.remote_address = client_adr
                 tur.req.remote_port = nil
               else
-                remote_addr = skt.getpeername()
-                tur.req.remote_port, tur.req.remote_address = Socket.unpack_sockaddr_in(remote_addr)
+                begin
+                  remote_addr = skt.getpeername()
+                rescue SystemCallError => e
+                  BayLog.debug_e(e)
+                  remote_addr = nil
+                end
+                if remote_addr
+                  tur.req.remote_port, tur.req.remote_address = Socket.unpack_sockaddr_in(remote_addr)
+                end
               end
 
               tur.req.remote_host_func = lambda {  HttpUtil.resolve_remote_host(tur.req.remote_address) }
@@ -451,6 +446,75 @@ module Baykit
               tur.go
             end
 
+            def on_end_header(tur, buf, start, len)
+
+              header_blocks = HeaderBlockParser.new(buf, start, len).parse_header_blocks()
+
+              header_blocks.each do |blk|
+                if blk.op == HeaderBlock::UPDATE_DYNAMIC_TABLE_SIZE
+                  BayLog.trace("%s header block update table size: %d", tur, blk.size)
+                  @req_header_tbl.set_size(blk.size)
+                  next
+                end
+                @analyzer.analyze_header_block(blk, @req_header_tbl)
+                if BayServer.harbor.trace_header
+                  BayLog.info("%s req header: %s=%s :%s", tur, @analyzer.name, @analyzer.value, blk);
+                end
+
+                if @analyzer.name == nil
+                  next
+
+                elsif @analyzer.name[0] != ":"
+                  tur.req.headers.add(@analyzer.name, @analyzer.value)
+
+                elsif @analyzer.method != nil
+                  tur.req.method = @analyzer.method
+
+                elsif @analyzer.path != nil
+                  tur.req.uri = @analyzer.path
+
+                elsif @analyzer.scheme != nil
+
+                elsif @analyzer.status != nil
+                  raise RuntimeError.new("Illegal State")
+                end
+              end
+
+              tur.req.protocol = "HTTP/2.0"
+              BayLog.debug("%s H2 read header method=%s protocol=%s uri=%s contlen=%d",
+                           ship, tur.req.method, tur.req.protocol, tur.req.uri, tur.req.headers.content_length)
+
+              HttpUtil.check_uri(tur.req.uri)
+              req_cont_len = tur.req.headers.content_length
+
+              if req_cont_len > 0
+                tur.req.set_limit(req_cont_len)
+              end
+
+              begin
+                start_tour tur
+
+                if tur.req.headers.content_length <= 0
+                  end_req_content(Tour::TOUR_ID_NOCHECK, tur)
+                end
+              rescue HttpException => e
+                BayLog.debug("%s Http error occurred: %s", self, e);
+                if req_cont_len <= 0
+                  # no post data
+                  tur.req.abort
+                  tur.res.send_http_exception(Tour::TOUR_ID_NOCHECK, e)
+
+                  return NextSocketAction::CONTINUE
+                else
+                  # Delay send
+                  tur.error = e
+                  tur.req.set_content_handler(ReqContentHandler::DEV_NULL)
+                  return NextSocketAction::CONTINUE
+                end
+              end
+
+              return NextSocketAction::CONTINUE
+            end
           end
         end
       end

data/lib/baykit/bayserver/docker/http/h2/h2_packet.rb

@@ -26,105 +26,6 @@ module Baykit
             include Baykit::BayServer::Protocol
             include Baykit::BayServer::Docker::Http::H2
 
-            class H2HeaderAccessor < PacketPartAccessor
-              def initialize(pkt, start, max_len)
-                super
-              end
-
-              def put_int24(len)
-                b1 = (len >> 16) & 0xFF
-                b2 = (len >> 8) & 0xFF
-                b3 = len & 0xFF
-                buf = StringUtil.alloc(3)
-                buf << b1 << b2 << b3
-                put_bytes buf
-              end
-            end
-
-            class H2DataAccessor < PacketPartAccessor
-              include Baykit::BayServer::Docker::Http::H2::Huffman
-
-              def initialize(pkt, start, max_len)
-                super
-              end
-
-              def get_hpack_int(prefix, head)
-                max_val = 0xFF >> (8 - prefix)
-
-                first_byte = get_byte
-                first_val = first_byte & max_val
-                head[0] = first_byte >> prefix
-                if first_val != max_val
-                  first_val
-                else
-                  max_val + get_hpack_int_rest
-                end
-              end
-
-              def get_hpack_int_rest
-                rest = 0
-                i = 0
-                while true
-                  data = get_byte
-                  cont = (data & 0x80) != 0
-                  value = data & 0x7F
-                  rest = rest + (value << (i*7))
-                  if !cont
-                    break
-                  end
-                  i += 1
-                end
-                return rest
-              end
-
-              def get_hpack_string
-                is_huffman = [nil]
-                len = get_hpack_int(7, is_huffman)
-                data = StringUtil.alloc(len)
-                get_bytes data, 0, len
-                if is_huffman[0] == 1
-                  return HTree.decode(data)
-                else
-                  # ASCII
-                  return data
-                end
-              end
-
-              def put_hpack_int(val, prefix, head)
-                max_val = 0xFF >> (8 -prefix)
-                head_val = (head << prefix) & 0xFF
-                if val < max_val
-                  put_byte (val | head_val)
-                else
-                  put_byte (head_val | max_val)
-                  put_hpack_int_rest(val - max_val)
-                end
-              end
-
-              def put_hpack_int_rest(val)
-                while true
-                  data = val & 0x7F
-                  next_val = val >> 7
-                  if next_val == 0
-                    put_byte(data)
-                    break
-                  else
-                    put_byte(data | 0x80)
-                    val = next_val
-                  end
-                end
-              end
-
-              def put_hpack_string(value, is_haffman)
-                if is_haffman
-                  raise RuntimeError.new "Illegal State"
-                else
-                  put_hpack_int(value.length, 7, 0)
-                  put_bytes(value)
-                end
-              end
-            end
-
             MAX_PAYLOAD_LEN = 0x00FFFFFF         # = 2^24-1 = 16777215 = 16MB-1
             DEFAULT_PAYLOAD_MAXLEN = 0x00004000  # = 2^14 = 16384 = 16KB
             FRAME_HEADER_LEN = 9
@@ -160,21 +61,13 @@ module Baykit
             end
 
             def pack_header
-              acc = new_h2_header_accessor()
-              acc.put_int24(data_len())
+              acc = new_header_accessor
+              put_int24(acc, data_len)
               acc.put_byte(@type)
               acc.put_byte(@flags.flags)
               acc.put_int(H2Packet.extract_int31(stream_id))
             end
 
-            def new_h2_header_accessor
-              H2HeaderAccessor.new(self, 0, @header_len)
-            end
-
-            def new_h2_data_accessor
-              H2DataAccessor.new(self, @header_len, -1)
-            end
-
             def self.extract_int31(val)
               val & 0x7FFFFFFF
             end
@@ -191,6 +84,15 @@ module Baykit
               (excluded ? 1 : 0) << 31 | extract_int31(dep)
             end
 
+            def put_int24(acc, len)
+              b1 = (len >> 16) & 0xFF
+              b2 = (len >> 8) & 0xFF
+              b3 = len & 0xFF
+              buf = StringUtil.alloc(3)
+              buf << b1 << b2 << b3
+              acc.put_bytes buf
+            end
+
             def to_s
               "H2Packet(#{@type}) headerLen=#{@header_len} dataLen=#{data_len()} stm=#{@stream_id} flags=#{@flags}"
             end

data/lib/baykit/bayserver/docker/http/h2/header_block.rb

@@ -18,165 +18,6 @@ module Baykit
             attr_accessor :value
             attr_accessor :size
 
-            def self.pack(blk, acc)
-              case blk.op
-              when INDEX
-                acc.put_hpack_int(blk.index, 7, 1)
-
-              when OVERLOAD_KNOWN_HEADER
-                raise RuntimeError.new("IllegalState")
-
-              when NEW_HEADER
-                raise RuntimeError.new("Illegal State")
-
-              when KNOWN_HEADER
-                acc.put_hpack_int(blk.index, 4, 0)
-                acc.put_hpack_string(blk.value, false)
-
-              when UNKNOWN_HEADER
-                acc.put_byte(0)
-                acc.put_hpack_string(blk.name, false)
-                acc.put_hpack_string(blk.value, false)
-
-              when UPDATE_DYNAMIC_TABLE_SIZE
-                raise RuntimeError.new("Illegal state")
-              end
-            end
-
-
-            def self.unpack(acc)
-              blk = HeaderBlock.new
-              index = acc.get_byte
-              is_index_header_field = (index & 0x80) != 0
-              if is_index_header_field
-                # index header field
-                #   0   1   2   3   4   5   6   7
-                # +---+---+---+---+---+---+---+---+
-                # | 1 |        Index (7+)         |
-                # +---+---------------------------+
-                blk.op = INDEX
-                blk.index = index & 0x7F
-              else
-                # literal header field
-                update_index = (index & 0x40) != 0
-                if update_index
-                  index = index & 0x3F
-                  overload_index = (index != 0)
-                  if overload_index
-                    if index == 0x3F
-                      index = index + acc.get_hpack_int_rest
-                    end
-                    blk.op = OVERLOAD_KNOWN_HEADER
-                    blk.index = index
-                    #   0   1   2   3   4   5   6   7
-                    # +---+---+---+---+---+---+---+---+
-                    # | 0 | 1 |      Index (6+)       |
-                    # +---+---+-----------------------+
-                    # | H |     Value Length (7+)     |
-                    # +---+---------------------------+
-                    # | Value String (Length octets)  |
-                    # +-------------------------------+
-                    blk.value = acc.get_hpack_string
-                  else
-                    # new header name
-                    #   0   1   2   3   4   5   6   7
-                    # +---+---+---+---+---+---+---+---+
-                    # | 0 | 1 |           0           |
-                    # +---+---+-----------------------+
-                    # | H |     Name Length (7+)      |
-                    # +---+---------------------------+
-                    # |  Name String (Length octets)  |
-                    # +---+---------------------------+
-                    # | H |     Value Length (7+)     |
-                    # +---+---------------------------+
-                    # | Value String (Length octets)  |
-                    # +-------------------------------+
-                    blk.op = NEW_HEADER
-                    blk.name = acc.get_hpack_string
-                    blk.value = acc.get_hpack_string
-                  end
-                else
-                  update_dynamic_table_size = (index & 0x20) != 0
-                  if update_dynamic_table_size
-                    #   0   1   2   3   4   5   6   7
-                    # +---+---+---+---+---+---+---+---+
-                    # | 0 | 0 | 1 |   Max size (5+)   |
-                    # +---+---------------------------+
-                    size = index & 0x1F
-                    if size == 0x1F
-                      size = size + acc.get_hpack_int_rest
-                    end
-                    blk.op = UPDATE_DYNAMIC_TABLE_SIZE
-                    blk.size = size
-                  else
-                    # not update index
-                    index = (index & 0xF)
-                    if index != 0
-                      #   0   1   2   3   4   5   6   7
-                      # +---+---+---+---+---+---+---+---+
-                      # | 0 | 0 | 0 | 0 |  Index (4+)   |
-                      # +---+---+-----------------------+
-                      # | H |     Value Length (7+)     |
-                      # +---+---------------------------+
-                      # | Value String (Length octets)  |
-                      # +-------------------------------+
-                      #
-                      # OR
-                      #
-                      #   0   1   2   3   4   5   6   7
-                      # +---+---+---+---+---+---+---+---+
-                      # | 0 | 0 | 0 | 1 |  Index (4+)   |
-                      # +---+---+-----------------------+
-                      # | H |     Value Length (7+)     |
-                      # +---+---------------------------+
-                      # | Value String (Length octets)  |
-                      # +-------------------------------+
-                      if index == 0xF
-                        index = index + acc.get_hpack_int_rest
-                      end
-                      blk.op = KNOWN_HEADER
-                      blk.index = index
-                      blk.value = acc.get_hpack_string
-                    else
-                      # literal header field
-                      #   0   1   2   3   4   5   6   7
-                      # +---+---+---+---+---+---+---+---+
-                      # | 0 | 0 | 0 | 0 |       0       |
-                      # +---+---+-----------------------+
-                      # | H |     Name Length (7+)      |
-                      # +---+---------------------------+
-                      # |  Name String (Length octets)  |
-                      # +---+---------------------------+
-                      # | H |     Value Length (7+)     |
-                      # +---+---------------------------+
-                      # | Value String (Length octets)  |
-                      # +-------------------------------+
-                      #
-                      # OR
-                      #
-                      #   0   1   2   3   4   5   6   7
-                      # +---+---+---+---+---+---+---+---+
-                      # | 0 | 0 | 0 | 1 |       0       |
-                      # +---+---+-----------------------+
-                      # | H |     Name Length (7+)      |
-                      # +---+---------------------------+
-                      # |  Name String (Length octets)  |
-                      # +---+---------------------------+
-                      # | H |     Value Length (7+)     |
-                      # +---+---------------------------+
-                      # | Value String (Length octets)  |
-                      # +-------------------------------+
-                      #
-                      blk.op = UNKNOWN_HEADER
-                      blk.name = acc.get_hpack_string
-                      blk.value = acc.get_hpack_string
-                    end
-                  end
-                end
-              end
-
-              blk
-            end
 
             def to_s
               "#{op} index=#{index} name=#{name} value=#{value}"

data/lib/baykit/bayserver/docker/http/h2/header_block_parser.rb

@@ -0,0 +1,240 @@
+require 'baykit/bayserver/docker/http/h2/header_block'
+require 'baykit/bayserver/docker/http/h2/huffman/htree'
+require 'baykit/bayserver/util/string_util'
+
+module Baykit
+  module BayServer
+    module Docker
+      module Http
+        module H2
+          class HeaderBlockParser
+
+            include Baykit::BayServer::Util
+            include Baykit::BayServer::Docker::Http::H2::Huffman
+
+            attr :buf
+            attr :start
+            attr :pos
+            attr :length
+
+
+            def initialize(buf, start, length)
+              @buf = buf
+              @start = start
+              @pos = 0
+              @length = length
+            end
+
+            def parse_header_blocks
+
+              header_blocks = []
+
+              while @pos < @length
+                blk = parse_header_block()
+                BayLog.trace("h2: header block read: %s", blk)
+                header_blocks << blk
+              end
+
+              return header_blocks
+            end
+
+
+            private
+            def parse_header_block()
+              blk = HeaderBlock.new
+              index = get_byte
+              is_index_header_field = (index & 0x80) != 0
+              if is_index_header_field
+                # index header field
+                #   0   1   2   3   4   5   6   7
+                # +---+---+---+---+---+---+---+---+
+                # | 1 |        Index (7+)         |
+                # +---+---------------------------+
+                blk.op = HeaderBlock::INDEX
+                blk.index = index & 0x7F
+              else
+                # literal header field
+                update_index = (index & 0x40) != 0
+                if update_index
+                  index = index & 0x3F
+                  overload_index = (index != 0)
+                  if overload_index
+                    if index == 0x3F
+                      index = index + get_hpack_int_rest
+                    end
+                    blk.op = HeaderBlock::OVERLOAD_KNOWN_HEADER
+                    blk.index = index
+                    #   0   1   2   3   4   5   6   7
+                    # +---+---+---+---+---+---+---+---+
+                    # | 0 | 1 |      Index (6+)       |
+                    # +---+---+-----------------------+
+                    # | H |     Value Length (7+)     |
+                    # +---+---------------------------+
+                    # | Value String (Length octets)  |
+                    # +-------------------------------+
+                    blk.value = get_hpack_string
+                  else
+                    # new header name
+                    #   0   1   2   3   4   5   6   7
+                    # +---+---+---+---+---+---+---+---+
+                    # | 0 | 1 |           0           |
+                    # +---+---+-----------------------+
+                    # | H |     Name Length (7+)      |
+                    # +---+---------------------------+
+                    # |  Name String (Length octets)  |
+                    # +---+---------------------------+
+                    # | H |     Value Length (7+)     |
+                    # +---+---------------------------+
+                    # | Value String (Length octets)  |
+                    # +-------------------------------+
+                    blk.op = HeaderBlock::NEW_HEADER
+                    blk.name = get_hpack_string
+                    blk.value = get_hpack_string
+                  end
+                else
+                  update_dynamic_table_size = (index & 0x20) != 0
+                  if update_dynamic_table_size
+                    #   0   1   2   3   4   5   6   7
+                    # +---+---+---+---+---+---+---+---+
+                    # | 0 | 0 | 1 |   Max size (5+)   |
+                    # +---+---------------------------+
+                    size = index & 0x1F
+                    if size == 0x1F
+                      size = size + get_hpack_int_rest
+                    end
+                    blk.op = HeaderBlock::UPDATE_DYNAMIC_TABLE_SIZE
+                    blk.size = size
+                  else
+                    # not update index
+                    index = (index & 0xF)
+                    if index != 0
+                      #   0   1   2   3   4   5   6   7
+                      # +---+---+---+---+---+---+---+---+
+                      # | 0 | 0 | 0 | 0 |  Index (4+)   |
+                      # +---+---+-----------------------+
+                      # | H |     Value Length (7+)     |
+                      # +---+---------------------------+
+                      # | Value String (Length octets)  |
+                      # +-------------------------------+
+                      #
+                      # OR
+                      #
+                      #   0   1   2   3   4   5   6   7
+                      # +---+---+---+---+---+---+---+---+
+                      # | 0 | 0 | 0 | 1 |  Index (4+)   |
+                      # +---+---+-----------------------+
+                      # | H |     Value Length (7+)     |
+                      # +---+---------------------------+
+                      # | Value String (Length octets)  |
+                      # +-------------------------------+
+                      if index == 0xF
+                        index = index + get_hpack_int_rest
+                      end
+                      blk.op = HeaderBlock::KNOWN_HEADER
+                      blk.index = index
+                      blk.value = get_hpack_string
+                    else
+                      # literal header field
+                      #   0   1   2   3   4   5   6   7
+                      # +---+---+---+---+---+---+---+---+
+                      # | 0 | 0 | 0 | 0 |       0       |
+                      # +---+---+-----------------------+
+                      # | H |     Name Length (7+)      |
+                      # +---+---------------------------+
+                      # |  Name String (Length octets)  |
+                      # +---+---------------------------+
+                      # | H |     Value Length (7+)     |
+                      # +---+---------------------------+
+                      # | Value String (Length octets)  |
+                      # +-------------------------------+
+                      #
+                      # OR
+                      #
+                      #   0   1   2   3   4   5   6   7
+                      # +---+---+---+---+---+---+---+---+
+                      # | 0 | 0 | 0 | 1 |       0       |
+                      # +---+---+-----------------------+
+                      # | H |     Name Length (7+)      |
+                      # +---+---------------------------+
+                      # |  Name String (Length octets)  |
+                      # +---+---------------------------+
+                      # | H |     Value Length (7+)     |
+                      # +---+---------------------------+
+                      # | Value String (Length octets)  |
+                      # +-------------------------------+
+                      #
+                      blk.op = HeaderBlock::UNKNOWN_HEADER
+                      blk.name = get_hpack_string
+                      blk.value = get_hpack_string
+                    end
+                  end
+                end
+              end
+
+              blk
+            end
+
+            def get_hpack_int(prefix, head)
+              max_val = 0xFF >> (8 - prefix)
+
+              first_byte = get_byte
+              first_val = first_byte & max_val
+              head[0] = first_byte >> prefix
+              if first_val != max_val
+                first_val
+              else
+                max_val + get_hpack_int_rest
+              end
+            end
+
+            def get_hpack_int_rest
+              rest = 0
+              i = 0
+              while true
+                data = get_byte
+                cont = (data & 0x80) != 0
+                value = data & 0x7F
+                rest = rest + (value << (i*7))
+                if !cont
+                  break
+                end
+                i += 1
+              end
+              return rest
+            end
+
+            def get_hpack_string
+              is_huffman = [nil]
+              len = get_hpack_int(7, is_huffman)
+              data = StringUtil.alloc(len)
+              get_bytes data, len
+              if is_huffman[0] == 1
+                return HTree.decode(data)
+              else
+                # ASCII
+                return data
+              end
+            end
+
+            def get_byte
+              if @pos >= @length
+                raise ArgumentError.new("@pos=#{@pos} @len=#{@length}")
+              end
+
+              b = @buf[@start + @pos].ord & 0xff
+              @pos += 1
+              return b
+            end
+
+            def get_bytes(buf, len)
+              buf.replace(@buf[@start + @pos, len])
+              @pos += len
+            end
+
+          end
+        end
+      end
+    end
+  end
+end
+

data/lib/baykit/bayserver/docker/http/h2/header_block_renderer.rb

@@ -0,0 +1,101 @@
+require 'baykit/bayserver/docker/http/h2/header_block'
+require 'baykit/bayserver/util/string_util'
+
+module Baykit
+  module BayServer
+    module Docker
+      module Http
+        module H2
+          class HeaderBlockRenderer
+
+            include Baykit::BayServer::Util
+
+            attr :buf
+
+            def initialize(buf)
+              @buf = buf
+            end
+
+            def render_header_blocks(header_blocks)
+
+              header_blocks.each do |blk|
+                render_header_block(blk)
+              end
+            end
+
+            private
+
+            def render_header_block(blk)
+              case blk.op
+              when HeaderBlock::INDEX
+                put_hpack_int(blk.index, 7, 1)
+
+              when HeaderBlock::OVERLOAD_KNOWN_HEADER
+                raise RuntimeError.new("IllegalState")
+
+              when HeaderBlock::NEW_HEADER
+                raise RuntimeError.new("Illegal State")
+
+              when HeaderBlock::KNOWN_HEADER
+                put_hpack_int(blk.index, 4, 0)
+                put_hpack_string(blk.value, false)
+
+              when HeaderBlock::UNKNOWN_HEADER
+                put_byte(0)
+                put_hpack_string(blk.name, false)
+                put_hpack_string(blk.value, false)
+
+              when HeaderBlock::UPDATE_DYNAMIC_TABLE_SIZE
+                raise RuntimeError.new("Illegal state")
+              end
+            end
+
+            def put_hpack_int(val, prefix, head)
+              max_val = 0xFF >> (8 -prefix)
+              head_val = (head << prefix) & 0xFF
+              if val < max_val
+                put_byte (val | head_val)
+              else
+                put_byte (head_val | max_val)
+                put_hpack_int_rest(val - max_val)
+              end
+            end
+
+            def put_hpack_int_rest(val)
+              while true
+                data = val & 0x7F
+                next_val = val >> 7
+                if next_val == 0
+                  put_byte(data)
+                  break
+                else
+                  put_byte(data | 0x80)
+                  val = next_val
+                end
+              end
+            end
+
+            def put_hpack_string(value, is_haffman)
+              if is_haffman
+                raise RuntimeError.new "Illegal State"
+              else
+                put_hpack_int(value.length, 7, 0)
+                put_bytes(value)
+              end
+            end
+
+            def put_byte(val)
+              @buf.put_byte(val)
+            end
+
+            def put_bytes(data)
+              @buf.put(data)
+            end
+
+          end
+        end
+      end
+    end
+  end
+end
+

data/lib/baykit/bayserver/docker/http/h2/package.rb

@@ -14,4 +14,6 @@ require 'baykit/bayserver/docker/http/h2/h2_warp_handler'
 require 'baykit/bayserver/docker/http/h2/header_block'
 require 'baykit/bayserver/docker/http/h2/header_block_analyzer'
 require 'baykit/bayserver/docker/http/h2/header_block_builder'
+require 'baykit/bayserver/docker/http/h2/header_block_parser'
+require 'baykit/bayserver/docker/http/h2/header_block_renderer'
 require 'baykit/bayserver/docker/http/h2/header_table'

data/lib/baykit/bayserver/docker/http/htp_docker.rb

@@ -1,4 +1,3 @@
-require 'baykit/bayserver/agent/transporter/package'
 require 'baykit/bayserver/docker/base/port_base'
 require 'baykit/bayserver/docker/http/h1/package'
 

data/lib/baykit/bayserver/docker/http/htp_port_docker.rb

@@ -1,4 +1,3 @@
-require 'baykit/bayserver/agent/transporter/package'
 require 'baykit/bayserver/protocol/packet_store'
 require 'baykit/bayserver/util/io_util'
 require 'baykit/bayserver/util/string_util'
@@ -17,7 +16,6 @@ module Baykit
 
           include Baykit::BayServer::Bcf
           include Baykit::BayServer::Protocol
-          include Baykit::BayServer::WaterCraft
           include Baykit::BayServer::Util
           include Baykit::BayServer::Docker::Base
           include Baykit::BayServer::Docker::Http

data/lib/baykit/bayserver/docker/http/htp_warp_docker.rb

@@ -1,6 +1,5 @@
 require 'openssl'
 
-require 'baykit/bayserver/agent/transporter/package'
 require 'baykit/bayserver/docker/base/port_base'
 require 'baykit/bayserver/docker/base/warp_base'
 require 'baykit/bayserver/protocol/packet_store'
@@ -16,7 +15,6 @@ module Baykit
           include Baykit::BayServer::Docker::Http::HtpDocker # implements
 
           include OpenSSL
-          include Baykit::BayServer::Agent::Transporter
           include Baykit::BayServer::Protocol
           include Baykit::BayServer::Docker::Http::H1
           include Baykit::BayServer::Docker::Http::H2

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bayserver-docker-http
 version: !ruby/object:Gem::Version
-  version: 3.0.3
+  version: 3.3.1
 platform: ruby
 authors:
 - Michisuke-P
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-24 00:00:00.000000000 Z
+date: 2026-02-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bayserver-core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.3
+        version: 3.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.3
+        version: 3.3.1
 description: BayServer is one of the high-speed web servers. It operates as a single-threaded,
   asynchronous server, which makes it exceptionally fast. It also supports multi-core
   processors, harnessing the full potential of the CPU's capabilities.
@@ -50,6 +50,7 @@ files:
 - lib/baykit/bayserver/docker/http/h1/h1_type.rb
 - lib/baykit/bayserver/docker/http/h1/h1_warp_handler.rb
 - lib/baykit/bayserver/docker/http/h1/package.rb
+- lib/baykit/bayserver/docker/http/h2/command/cmd_continuation.rb
 - lib/baykit/bayserver/docker/http/h2/command/cmd_data.rb
 - lib/baykit/bayserver/docker/http/h2/command/cmd_go_away.rb
 - lib/baykit/bayserver/docker/http/h2/command/cmd_headers.rb
@@ -77,6 +78,8 @@ files:
 - lib/baykit/bayserver/docker/http/h2/header_block.rb
 - lib/baykit/bayserver/docker/http/h2/header_block_analyzer.rb
 - lib/baykit/bayserver/docker/http/h2/header_block_builder.rb
+- lib/baykit/bayserver/docker/http/h2/header_block_parser.rb
+- lib/baykit/bayserver/docker/http/h2/header_block_renderer.rb
 - lib/baykit/bayserver/docker/http/h2/header_table.rb
 - lib/baykit/bayserver/docker/http/h2/huffman/hnode.rb
 - lib/baykit/bayserver/docker/http/h2/huffman/htree.rb
@@ -90,7 +93,7 @@ homepage: https://baykit.yokohama
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -105,8 +108,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.4.19
+signing_key:
 specification_version: 4
 summary: HTTP docker of BayServer
 test_files: []