net-imap 0.4.22 → 0.5.0

data/lib/net/imap.rb

@@ -43,16 +43,10 @@ module Net
   # To work on the messages within a mailbox, the client must
   # first select that mailbox, using either #select or #examine
   # (for read-only access).  Once the client has successfully
-  # selected a mailbox, they enter the +selected+ state, and that
+  # selected a mailbox, they enter the "_selected_" state, and that
   # mailbox becomes the _current_ mailbox, on which mail-item
   # related commands implicitly operate.
   #
-  # === Connection state
-  #
-  # Once an IMAP connection is established, the connection is in one of four
-  # states: <tt>not authenticated</tt>, +authenticated+, +selected+, and
-  # +logout+.  Most commands are valid only in certain states.
-  #
   # === Sequence numbers and UIDs
   #
   # Messages have two sorts of identifiers: message sequence
@@ -205,42 +199,6 @@ module Net
   #
   # This script invokes the FETCH command and the SEARCH command concurrently.
   #
-  # When running multiple commands, care must be taken to avoid ambiguity.  For
-  # example, SEARCH responses are ambiguous about which command they are
-  # responding to, so search commands should not run simultaneously, unless the
-  # server supports +ESEARCH+ {[RFC4731]}[https://rfc-editor.org/rfc/rfc4731] or
-  # IMAP4rev2[https://www.rfc-editor.org/rfc/rfc9051].  See {RFC9051
-  # §5.5}[https://www.rfc-editor.org/rfc/rfc9051.html#section-5.5] for
-  # other examples of command sequences which should not be pipelined.
-  #
-  # == Unbounded memory use
-  #
-  # Net::IMAP reads server responses in a separate receiver thread per client.
-  # Unhandled response data is saved to #responses, and response_handlers run
-  # inside the receiver thread.  See the list of methods for {handling server
-  # responses}[rdoc-ref:Net::IMAP@Handling+server+responses], below.
-  #
-  # Because the receiver thread continuously reads and saves new responses, some
-  # scenarios must be careful to avoid unbounded memory use:
-  #
-  # * Commands such as #list or #fetch can have an enormous number of responses.
-  # * Commands such as #fetch can result in an enormous size per response.
-  # * Long-lived connections will gradually accumulate unsolicited server
-  #   responses, especially +EXISTS+, +FETCH+, and +EXPUNGE+ responses.
-  # * A buggy or untrusted server could send inappropriate responses, which
-  #   could be very numerous, very large, and very rapid.
-  #
-  # Use paginated or limited versions of commands whenever possible.
-  #
-  # Use Config#max_response_size to impose a limit on incoming server responses
-  # as they are being read.  <em>This is especially important for untrusted
-  # servers.</em>
-  #
-  # Use #add_response_handler to handle responses after each one is received.
-  # Use the +response_handlers+ argument to ::new to assign response handlers
-  # before the receiver thread is started.  Use #extract_responses,
-  # #clear_responses, or #responses (with a block) to prune responses.
-  #
   # == Errors
   #
   # An \IMAP server can send three different types of responses to indicate
@@ -302,9 +260,8 @@ module Net
   #
   # - Net::IMAP.new: Creates a new \IMAP client which connects immediately and
   #   waits for a successful server greeting before the method returns.
-  # - #connection_state: Returns the connection state.
   # - #starttls: Asks the server to upgrade a clear-text connection to use TLS.
-  # - #logout: Tells the server to end the session.  Enters the +logout+ state.
+  # - #logout: Tells the server to end the session. Enters the "_logout_" state.
   # - #disconnect: Disconnects the connection (without sending #logout first).
   # - #disconnected?: True if the connection has been closed.
   #
@@ -360,36 +317,37 @@ module Net
   #   <em>In general, #capable? should be used rather than explicitly sending a
   #   +CAPABILITY+ command to the server.</em>
   # - #noop: Allows the server to send unsolicited untagged #responses.
-  # - #logout: Tells the server to end the session. Enters the +logout+ state.
+  # - #logout: Tells the server to end the session. Enters the "_logout_" state.
   #
   # ==== Not Authenticated state
   #
   # In addition to the commands for any state, the following commands are valid
-  # in the +not_authenticated+ state:
+  # in the "<em>not authenticated</em>" state:
   #
   # - #starttls: Upgrades a clear-text connection to use TLS.
   #
   #   <em>Requires the +STARTTLS+ capability.</em>
   # - #authenticate: Identifies the client to the server using the given
   #   {SASL mechanism}[https://www.iana.org/assignments/sasl-mechanisms/sasl-mechanisms.xhtml]
-  #   and credentials.  Enters the +authenticated+ state.
+  #   and credentials.  Enters the "_authenticated_" state.
   #
   #   <em>The server should list <tt>"AUTH=#{mechanism}"</tt> capabilities for
   #   supported mechanisms.</em>
   # - #login: Identifies the client to the server using a plain text password.
-  #   Using #authenticate is preferred.  Enters the +authenticated+ state.
+  #   Using #authenticate is generally preferred.  Enters the "_authenticated_"
+  #   state.
   #
   #   <em>The +LOGINDISABLED+ capability</em> <b>must NOT</b> <em>be listed.</em>
   #
   # ==== Authenticated state
   #
   # In addition to the commands for any state, the following commands are valid
-  # in the +authenticated+ state:
+  # in the "_authenticated_" state:
   #
   # - #enable: Enables backwards incompatible server extensions.
   #   <em>Requires the +ENABLE+ or +IMAP4rev2+ capability.</em>
-  # - #select:  Open a mailbox and enter the +selected+ state.
-  # - #examine: Open a mailbox read-only, and enter the +selected+ state.
+  # - #select:  Open a mailbox and enter the "_selected_" state.
+  # - #examine: Open a mailbox read-only, and enter the "_selected_" state.
   # - #create: Creates a new mailbox.
   # - #delete: Permanently remove a mailbox.
   # - #rename: Change the name of a mailbox.
@@ -411,12 +369,12 @@ module Net
   #
   # ==== Selected state
   #
-  # In addition to the commands for any state and the +authenticated+
-  # commands, the following commands are valid in the +selected+ state:
+  # In addition to the commands for any state and the "_authenticated_"
+  # commands, the following commands are valid in the "_selected_" state:
   #
-  # - #close: Closes the mailbox and returns to the +authenticated+ state,
+  # - #close: Closes the mailbox and returns to the "_authenticated_" state,
   #   expunging deleted messages, unless the mailbox was opened as read-only.
-  # - #unselect: Closes the mailbox and returns to the +authenticated+ state,
+  # - #unselect: Closes the mailbox and returns to the "_authenticated_" state,
   #   without expunging any messages.
   #   <em>Requires the +UNSELECT+ or +IMAP4rev2+ capability.</em>
   # - #expunge: Permanently removes messages which have the Deleted flag set.
@@ -437,7 +395,7 @@ module Net
   #
   # ==== Logout state
   #
-  # No \IMAP commands are valid in the +logout+ state.  If the socket is still
+  # No \IMAP commands are valid in the "_logout_" state.  If the socket is still
   # open, Net::IMAP will close it after receiving server confirmation.
   # Exceptions will be raised by \IMAP commands that have already started and
   # are waiting for a response, as well as any that are called after logout.
@@ -491,7 +449,7 @@ module Net
   # ==== RFC3691: +UNSELECT+
   # Folded into IMAP4rev2[https://tools.ietf.org/html/rfc9051] and also included
   # above with {Core IMAP commands}[rdoc-ref:Net::IMAP@Core+IMAP+commands].
-  # - #unselect: Closes the mailbox and returns to the +authenticated+ state,
+  # - #unselect: Closes the mailbox and returns to the "_authenticated_" state,
   #   without expunging any messages.
   #
   # ==== RFC4314: +ACL+
@@ -761,7 +719,7 @@ module Net
   # * {IMAP URLAUTH Authorization Mechanism Registry}[https://www.iana.org/assignments/urlauth-authorization-mechanism-registry/urlauth-authorization-mechanism-registry.xhtml]
   #
   class IMAP < Protocol
-    VERSION = "0.4.22"
+    VERSION = "0.5.0"
 
     # Aliases for supported capabilities, to be used with the #enable command.
     ENABLE_ALIASES = {
@@ -769,7 +727,6 @@ module Net
       "UTF8=ONLY" => "UTF8=ACCEPT",
     }.freeze
 
-    autoload :ResponseReader, File.expand_path("imap/response_reader", __dir__)
     autoload :SASL,        File.expand_path("imap/sasl",         __dir__)
     autoload :SASLAdapter, File.expand_path("imap/sasl_adapter", __dir__)
     autoload :StringPrep,  File.expand_path("imap/stringprep",   __dir__)
@@ -784,11 +741,9 @@ module Net
     def self.config; Config.global end
 
     # Returns the global debug mode.
-    # Delegates to {Net::IMAP.config.debug}[rdoc-ref:Config#debug].
     def self.debug; config.debug end
 
     # Sets the global debug mode.
-    # Delegates to {Net::IMAP.config.debug=}[rdoc-ref:Config#debug=].
     def self.debug=(val)
       config.debug = val
     end
@@ -809,7 +764,7 @@ module Net
       alias default_ssl_port default_tls_port
     end
 
-    # Returns the initial greeting sent by the server, an UntaggedResponse.
+    # Returns the initial greeting the server, an UntaggedResponse.
     attr_reader :greeting
 
     # The client configuration.  See Net::IMAP::Config.
@@ -818,28 +773,13 @@ module Net
     # Net::IMAP.config.
     attr_reader :config
 
-    ##
-    # :attr_reader: open_timeout
-    # Seconds to wait until a connection is opened.  Also used by #starttls.
-    # Delegates to {config.open_timeout}[rdoc-ref:Config#open_timeout].
+    # Seconds to wait until a connection is opened.
+    # If the IMAP object cannot open a connection within this time,
+    # it raises a Net::OpenTimeout exception. The default value is 30 seconds.
+    def open_timeout; config.open_timeout end
 
-    ##
-    # :attr_reader: idle_response_timeout
     # Seconds to wait until an IDLE response is received.
-    # Delegates to {config.idle_response_timeout}[rdoc-ref:Config#idle_response_timeout].
-
-    ##
-    # :attr_accessor: max_response_size
-    #
-    # The maximum allowed server response size, in bytes.
-    # Delegates to {config.max_response_size}[rdoc-ref:Config#max_response_size].
-
-    # :stopdoc:
-    def open_timeout;           config.open_timeout            end
-    def idle_response_timeout;  config.idle_response_timeout   end
-    def max_response_size;      config.max_response_size       end
-    def max_response_size=(val) config.max_response_size = val end
-    # :startdoc:
+    def idle_response_timeout; config.idle_response_timeout end
 
     # The hostname this client connected to
     attr_reader :host
@@ -895,12 +835,6 @@ module Net
     #
     #   See DeprecatedClientOptions.new for deprecated SSL arguments.
     #
-    # [response_handlers]
-    #   A list of response handlers to be added before the receiver thread is
-    #   started.  This ensures every server response is handled, including the
-    #   #greeting.  Note that the greeting is handled in the current thread, but
-    #   all other responses are handled in the receiver thread.
-    #
     # [config]
     #   A Net::IMAP::Config object to use as the basis for #config.  By default,
     #   the global Net::IMAP.config is used.
@@ -972,7 +906,7 @@ module Net
     # [Net::IMAP::ByeResponseError]
     #   Connected to the host successfully, but it immediately said goodbye.
     #
-    def initialize(host, port: nil, ssl: nil, response_handlers: nil,
+    def initialize(host, port: nil, ssl:  nil,
                    config: Config.global, **config_options)
       super()
       # Config options
@@ -995,7 +929,6 @@ module Net
       @receiver_thread = nil
       @receiver_thread_exception = nil
       @receiver_thread_terminating = false
-      response_handlers&.each do add_response_handler(_1) end
 
       # Client Protocol Sender (including state for currently running commands)
       @tag_prefix = "RUBY"
@@ -1011,12 +944,8 @@ module Net
       # Connection
       @tls_verified = false
       @sock = tcp_socket(@host, @port)
-      @reader = ResponseReader.new(self, @sock)
       start_tls_session if ssl_ctx
       start_imap_connection
-
-      # DEPRECATED: to remove in next version
-      @client_thread = Thread.current
     end
 
     # Returns true after the TLS negotiation has completed and the remote
@@ -1024,11 +953,6 @@ module Net
     # but peer verification was disabled.
     def tls_verified?; @tls_verified end
 
-    def client_thread # :nodoc:
-      warn "Net::IMAP#client_thread is deprecated and will be removed soon."
-      @client_thread
-    end
-
     # Disconnects from the server.
     #
     # Related: #logout, #logout!
@@ -1272,10 +1196,6 @@ module Net
     # both successful.  Any error indicates that the connection has not been
     # secured.
     #
-    # After the server agrees to start a TLS connection, this method waits up to
-    # {config.open_timeout}[rdoc-ref:Config#open_timeout] before raising
-    # +Net::OpenTimeout+.
-    #
     # *Note:*
     # >>>
     #   Any #response_handlers added before STARTTLS should be aware that the
@@ -1294,21 +1214,13 @@ module Net
     #
     def starttls(**options)
       @ssl_ctx_params, @ssl_ctx = build_ssl_ctx(options)
-      error = nil
-      ok = send_command("STARTTLS") do |resp|
+      send_command("STARTTLS") do |resp|
         if resp.kind_of?(TaggedResponse) && resp.name == "OK"
           clear_cached_capabilities
           clear_responses
           start_tls_session
         end
-      rescue Exception => error
-        raise # note that the error backtrace is in the receiver_thread
       end
-      if error
-        disconnect
-        raise error
-      end
-      ok
     end
 
     # :call-seq:
@@ -1324,6 +1236,9 @@ module Net
     # +SASL-IR+ capability, below).  Defaults to the #config value for
     # {sasl_ir}[rdoc-ref:Config#sasl_ir], which defaults to +true+.
     #
+    # The +registry+ kwarg can be used to select the mechanism implementation
+    # from a custom registry.  See SASL.authenticator and SASL::Authenticators.
+    #
     # All other arguments are forwarded to the registered SASL authenticator for
     # the requested mechanism.  <em>The documentation for each individual
     # mechanism must be consulted for its specific parameters.</em>
@@ -1418,29 +1333,9 @@ module Net
     # Previously cached #capabilities will be cleared when this method
     # completes.  If the TaggedResponse to #authenticate includes updated
     # capabilities, they will be cached.
-    def authenticate(mechanism, *creds,
-                     sasl_ir: config.sasl_ir,
-                     **props, &callback)
-      mechanism = mechanism.to_s.tr("_", "-").upcase
-      authenticator = SASL.authenticator(mechanism, *creds, **props, &callback)
-      cmdargs = ["AUTHENTICATE", mechanism]
-      if sasl_ir && capable?("SASL-IR") && auth_capable?(mechanism) &&
-          authenticator.respond_to?(:initial_response?) &&
-          authenticator.initial_response?
-        response = authenticator.process(nil)
-        cmdargs << (response.empty? ? "=" : [response].pack("m0"))
-      end
-      result = send_command_with_continuations(*cmdargs) {|data|
-        challenge = data.unpack1("m")
-        response  = authenticator.process challenge
-        [response].pack("m0")
-      }
-      if authenticator.respond_to?(:done?) && !authenticator.done?
-        logout!
-        raise SASL::AuthenticationIncomplete, result
-      end
-      @capabilities = capabilities_from_resp_code result
-      result
+    def authenticate(*args, sasl_ir: config.sasl_ir, **props, &callback)
+      sasl_adapter.authenticate(*args, sasl_ir: sasl_ir, **props, &callback)
+        .tap { @capabilities = capabilities_from_resp_code _1 }
     end
 
     # Sends a {LOGIN command [IMAP4rev1 §6.2.3]}[https://www.rfc-editor.org/rfc/rfc3501#section-6.2.3]
@@ -1460,13 +1355,9 @@ module Net
     # ===== Capabilities
     #
     # An IMAP client MUST NOT call #login when the server advertises the
-    # +LOGINDISABLED+ capability.
-    #
-    #    if imap.capability? "LOGINDISABLED"
-    #      raise "Remote server has disabled the login command"
-    #    else
-    #      imap.login username, password
-    #    end
+    # +LOGINDISABLED+ capability.  By default, Net::IMAP will raise a
+    # LoginDisabledError when that capability is present.  See
+    # Config#enforce_logindisabled.
     #
     # Server capabilities may change after #starttls, #login, and #authenticate.
     # Cached capabilities _must_ be invalidated after this method completes.
@@ -1474,6 +1365,9 @@ module Net
     # ResponseCode.
     #
     def login(user, password)
+      if enforce_logindisabled? && capability?("LOGINDISABLED")
+        raise LoginDisabledError
+      end
       send_command("LOGIN", user, password)
         .tap { @capabilities = capabilities_from_resp_code _1 }
     end
@@ -2030,7 +1924,7 @@ module Net
     # [RFC4315[https://www.rfc-editor.org/rfc/rfc4315.html]].
     def uid_expunge(uid_set)
       synchronize do
-        send_command("UID EXPUNGE", MessageSet.new(uid_set))
+        send_command("UID EXPUNGE", SequenceSet.new(uid_set))
         clear_responses("EXPUNGE")
       end
     end
@@ -2688,7 +2582,7 @@ module Net
         when :raise
           raise ArgumentError, RESPONSES_DEPRECATION_MSG
         when :warn
-          warn(RESPONSES_DEPRECATION_MSG, uplevel: 1)
+          warn(RESPONSES_DEPRECATION_MSG, uplevel: 1, category: :deprecated)
         when :frozen_dup
           synchronize {
             responses = @responses.transform_values(&:freeze)
@@ -2778,10 +2672,6 @@ module Net
     #     end
     #   }
     #
-    # Response handlers can also be added when the client is created before the
-    # receiver thread is started, by the +response_handlers+ argument to ::new.
-    # This ensures every server response is handled, including the #greeting.
-    #
     # Related: #remove_response_handler, #response_handlers
     def add_response_handler(handler = nil, &block)
       raise ArgumentError, "two Procs are passed" if handler && block
@@ -2808,7 +2698,6 @@ module Net
     def start_imap_connection
       @greeting        = get_server_greeting
       @capabilities    = capabilities_from_resp_code @greeting
-      @response_handlers.each do |handler| handler.call(@greeting) end
       @receiver_thread = start_receiver_thread
     rescue Exception
       @sock.close
@@ -2937,10 +2826,23 @@ module Net
     end
 
     def get_response
-      buff = @reader.read_response_buffer
+      buff = String.new
+      while true
+        s = @sock.gets(CRLF)
+        break unless s
+        buff.concat(s)
+        if /\{(\d+)\}\r\n/n =~ s
+          s = @sock.read($1.to_i)
+          buff.concat(s)
+        else
+          break
+        end
+      end
       return nil if buff.length == 0
-      $stderr.print(buff.gsub(/^/n, "S: ")) if config.debug?
-      @parser.parse(buff)
+      if config.debug?
+        $stderr.print(buff.gsub(/^/n, "S: "))
+      end
+      return @parser.parse(buff)
     end
 
     #############################
@@ -3029,6 +2931,14 @@ module Net
       end
     end
 
+    def enforce_logindisabled?
+      if config.enforce_logindisabled == :when_capabilities_cached
+        capabilities_cached?
+      else
+        config.enforce_logindisabled
+      end
+    end
+
     def search_internal(cmd, keys, charset)
       if keys.instance_of?(String)
         keys = [RawData.new(keys)]
@@ -3062,9 +2972,9 @@ module Net
       synchronize do
         clear_responses("FETCH")
         if mod
-          send_command(cmd, MessageSet.new(set), attr, mod)
+          send_command(cmd, SequenceSet.new(set), attr, mod)
         else
-          send_command(cmd, MessageSet.new(set), attr)
+          send_command(cmd, SequenceSet.new(set), attr)
         end
         clear_responses("FETCH")
       end
@@ -3072,7 +2982,7 @@ module Net
 
     def store_internal(cmd, set, attr, flags, unchangedsince: nil)
       attr = RawData.new(attr) if attr.instance_of?(String)
-      args = [MessageSet.new(set)]
+      args = [SequenceSet.new(set)]
       args << ["UNCHANGEDSINCE", Integer(unchangedsince)] if unchangedsince
       args << attr << flags
       synchronize do
@@ -3083,7 +2993,7 @@ module Net
     end
 
     def copy_internal(cmd, set, mailbox)
-      send_command(cmd, MessageSet.new(set), mailbox)
+      send_command(cmd, SequenceSet.new(set), mailbox)
     end
 
     def sort_internal(cmd, sort_keys, search_keys, charset)
@@ -3114,7 +3024,7 @@ module Net
       keys.collect! do |i|
         case i
         when -1, Range, Array
-          MessageSet.new(i)
+          SequenceSet.new(i)
         else
           i
         end
@@ -3141,7 +3051,6 @@ module Net
       raise "already using SSL" if @sock.kind_of?(OpenSSL::SSL::SSLSocket)
       raise "cannot start TLS without SSLContext" unless ssl_ctx
       @sock = SSLSocket.new(@sock, ssl_ctx)
-      @reader = ResponseReader.new(self, @sock)
       @sock.sync_close = true
       @sock.hostname = @host if @sock.respond_to? :hostname=
       ssl_socket_connect(@sock, open_timeout)

data/net-imap.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |spec|
   spec.summary       = %q{Ruby client api for Internet Message Access Protocol}
   spec.description   = %q{Ruby client api for Internet Message Access Protocol}
   spec.homepage      = "https://github.com/ruby/net-imap"
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.7.3")
+  spec.required_ruby_version = Gem::Requirement.new(">= 3.1.0")
   spec.licenses       = ["Ruby", "BSD-2-Clause"]
 
   spec.metadata["homepage_uri"] = spec.homepage

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: net-imap
 version: !ruby/object:Gem::Version
-  version: 0.4.22
+  version: 0.5.0
 platform: ruby
 authors:
 - Shugo Maeda
 - nicholas a. evans
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 1980-01-02 00:00:00.000000000 Z
+date: 2024-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-protocol
@@ -68,7 +69,6 @@ files:
 - lib/net/imap/response_data.rb
 - lib/net/imap/response_parser.rb
 - lib/net/imap/response_parser/parser_utils.rb
-- lib/net/imap/response_reader.rb
 - lib/net/imap/sasl.rb
 - lib/net/imap/sasl/anonymous_authenticator.rb
 - lib/net/imap/sasl/authentication_exchange.rb
@@ -95,7 +95,6 @@ files:
 - lib/net/imap/stringprep/saslprep_tables.rb
 - lib/net/imap/stringprep/tables.rb
 - lib/net/imap/stringprep/trace.rb
-- lib/net/imap/uidplus_data.rb
 - net-imap.gemspec
 - rakelib/benchmarks.rake
 - rakelib/rdoc.rake
@@ -111,6 +110,7 @@ metadata:
   homepage_uri: https://github.com/ruby/net-imap
   source_code_uri: https://github.com/ruby/net-imap
   changelog_uri: https://github.com/ruby/net-imap/releases
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -118,14 +118,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.3
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.7
+rubygems_version: 3.5.16
+signing_key: 
 specification_version: 4
 summary: Ruby client api for Internet Message Access Protocol
 test_files: []

data/lib/net/imap/response_reader.rb

@@ -1,75 +0,0 @@
-# frozen_string_literal: true
-
-module Net
-  class IMAP
-    # See https://www.rfc-editor.org/rfc/rfc9051#section-2.2.2
-    class ResponseReader # :nodoc:
-      attr_reader :client
-
-      def initialize(client, sock)
-        @client, @sock = client, sock
-      end
-
-      def read_response_buffer
-        @buff = String.new
-        catch :eof do
-          while true
-            read_line
-            break unless (@literal_size = get_literal_size)
-            read_literal
-          end
-        end
-        buff
-      ensure
-        @buff = nil
-      end
-
-      private
-
-      attr_reader :buff, :literal_size
-
-      def bytes_read;       buff.bytesize                         end
-      def empty?;           buff.empty?                           end
-      def done?;            line_done? && !get_literal_size       end
-      def line_done?;       buff.end_with?(CRLF)                  end
-      def get_literal_size; /\{(\d+)\}\r\n\z/n =~ buff && $1.to_i end
-
-      def read_line
-        buff << (@sock.gets(CRLF, read_limit) or throw :eof)
-        max_response_remaining! unless line_done?
-      end
-
-      def read_literal
-        # check before allocating memory for literal
-        max_response_remaining!
-        literal = String.new(capacity: literal_size)
-        buff << (@sock.read(read_limit(literal_size), literal) or throw :eof)
-      ensure
-        @literal_size = nil
-      end
-
-      def read_limit(limit = nil)
-        [limit, max_response_remaining!].compact.min
-      end
-
-      def max_response_size;      client.max_response_size                end
-      def max_response_remaining; max_response_size &.- bytes_read        end
-      def response_too_large?;    max_response_size &.< min_response_size end
-      def min_response_size;      bytes_read + min_response_remaining     end
-
-      def min_response_remaining
-        empty? ? 3 : done? ? 0 : (literal_size || 0) + 2
-      end
-
-      def max_response_remaining!
-        return max_response_remaining unless response_too_large?
-        raise ResponseTooLargeError.new(
-          max_response_size: max_response_size,
-          bytes_read:        bytes_read,
-          literal_size:      literal_size,
-        )
-      end
-
-    end
-  end
-end