diff options
| -rw-r--r-- | examples/static_server.rb | 2 | ||||
| -rw-r--r-- | lib/plum.rb | 2 | ||||
| -rw-r--r-- | lib/plum/server_connection.rb (renamed from lib/plum/server.rb) | 7 |
3 files changed, 5 insertions, 6 deletions
diff --git a/examples/static_server.rb b/examples/static_server.rb index 66913fd..7113a91 100644 --- a/examples/static_server.rb +++ b/examples/static_server.rb @@ -38,7 +38,7 @@ loop do next end - plum = Plum::Server.new(sock) + plum = Plum::ServerConnection.new(sock) plum.on(:frame) do |frame| log(id, frame.stream_id, "recv: #{frame.inspect}") diff --git a/lib/plum.rb b/lib/plum.rb index ebe6f0d..8faf2df 100644 --- a/lib/plum.rb +++ b/lib/plum.rb @@ -9,4 +9,4 @@ require "plum/hpack/decoder" require "plum/hpack/encoder" require "plum/frame" require "plum/stream" -require "plum/server" +require "plum/server_connection" diff --git a/lib/plum/server.rb b/lib/plum/server_connection.rb index 80dddd4..36beb1e 100644 --- a/lib/plum/server.rb +++ b/lib/plum/server_connection.rb @@ -1,5 +1,5 @@ module Plum - class Server + class ServerConnection CLIENT_CONNECTION_PREFACE = "PRI * HTTP/2.0\r\n\r\nSM\r\n\r\n" DEFAULT_SETTINGS = { @@ -10,7 +10,7 @@ module Plum max_frame_size: 16384, # octets; <= 2 ** 24 - 1 max_header_list_size: (1 << 32) - 1 # Fixnum } - + attr_reader :hpack_encoder, :hpack_decoder attr_reader :local_settings, :remote_settings @@ -34,7 +34,6 @@ module Plum def start send_settings(@local_settings) - raise Plum::ConnectionError.new(:protocol_error) process(@socket.readpartial(1024)) until @socket.eof? rescue Plum::ConnectionError => e callback(:connection_error, e) @@ -136,7 +135,7 @@ module Plum settings_ack = Frame.new(type: :settings, stream_id: 0x00, flags: [:ack]) send(settings_ack) end - + def new_stream(frame) if (frame.stream_id % 2 == 0) || (@streams.size > 0 && @streams.keys.last >= frame.stream_id) |