excon 0.106.0 → 0.107.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f3ae04e066b4d9b67c48f71628596d7635894b7d003100ee91dc5c7ced3ee2bd
-  data.tar.gz: 10eca55f616e0412fce96f9b779c7510467c8d38c5d823a0b19787e1127b1fbc
+  metadata.gz: d921bdb8ea062bd0633ce29f929a60027ba339f7c76f04d39863dcdece71c24d
+  data.tar.gz: d9673b03798fdbe67afdc797423b3038d683822fa7092c460797e7d67dde2185
 SHA512:
-  metadata.gz: 2eb675d4e3e12987e942832c601eb0116e36f63c7104b4a52ffb3570edbbcc183ec350c925128bfd11aa66ad89437612570efe18c6b48fc037fcf246864336fa
-  data.tar.gz: 41711db6ceef1e4342387b46b5e10fc76be60e519340862f945f26e5d8cacfeae7c18ba7e09471ac2b1811e4ec91402f4be4c8e13b70b0b54c45af3d3f6d4422
+  metadata.gz: 0f2e429edc9541f279484cefd15717f68168e5a84af9a46fd6cb133d43f5d1aa03dff4a6814d4e9f559acb65a152ae275690cbb2961a7967e9fc902b0636177f
+  data.tar.gz: 5996b697980f716744a97afaa7b13833618fda6a8cdab7fd7ad90cd363a4cf0c5d470f351b50bcb8fced514e51e46348618c5c4972693560806b4454fd1dbbcc

data/lib/excon/socket.rb

@@ -53,14 +53,16 @@ module Excon
       @nonblock = data[:nonblock]
       @port ||= @data[:port] || 80
       @read_buffer = String.new
+      @read_offset = 0
       @eof = false
       @backend_eof = false
+
       connect
     end
 
     def read(max_length = nil)
       if @eof
-        return max_length ? nil : ''
+        max_length ? nil : ''
       elsif @nonblock
         read_nonblock(max_length)
       else
@@ -71,20 +73,22 @@ module Excon
     def readline
       if @nonblock
         result = String.new
-        block = @read_buffer
-        @read_buffer = String.new
+        block = consume_read_buffer
 
         loop do
           idx = block.index("\n")
+
           if idx.nil?
             result << block
           else
-            result << block.slice!(0, idx+1)
-            add_to_read_buffer(block)
+            result << block[..idx]
+            rewind_read_buffer(block, idx)
             break
           end
+
           block = read_nonblock(@data[:chunk_size]) || raise(EOFError)
         end
+
         result
       else # nonblock/legacy
         begin
@@ -204,20 +208,48 @@ module Excon
       end
     end
 
-    def add_to_read_buffer(str)
-      @read_buffer << str
+    # Consume any bytes remaining in the read buffer before making a system call.
+    def consume_read_buffer
+      block = @read_buffer[@read_offset..]
+
+      @read_offset = @read_buffer.length
+
+      block
+    end
+
+    # Rewind the read buffer to just after the given index.
+    # The offset is moved back to the start of the current chunk and then forward until just after the index.
+    def rewind_read_buffer(chunk, idx)
+      @read_offset = @read_offset - chunk.length + (idx + 1)
       @eof = false
     end
 
     def read_nonblock(max_length)
       begin
+        if @read_offset != 0 && @read_offset >= @read_buffer.length
+          # Clear the buffer so we can test for emptiness below
+          @read_buffer.clear
+          # Reset the offset so it matches the length of the buffer when empty.
+          @read_offset = 0
+        end
+
         if max_length
-          until @backend_eof || @read_buffer.length >= max_length
-            @read_buffer << @socket.read_nonblock(max_length - @read_buffer.length)
+          until @backend_eof || readable_bytes >= max_length
+            if @read_buffer.empty?
+              # Avoid allocating a new buffer string when the read buffer is empty
+              @read_buffer = @socket.read_nonblock(max_length, @read_buffer)
+            else
+              @read_buffer << @socket.read_nonblock(max_length - readable_bytes)
+            end
           end
         else
-          while !@backend_eof
-            @read_buffer << @socket.read_nonblock(@data[:chunk_size])
+          until @backend_eof
+            if @read_buffer.empty?
+              # Avoid allocating a new buffer string when the read buffer is empty
+              @read_buffer = @socket.read_nonblock(@data[:chunk_size], @read_buffer)
+            else
+              @read_buffer << @socket.read_nonblock(@data[:chunk_size])
+            end
           end
         end
       rescue OpenSSL::SSL::SSLError => error
@@ -237,18 +269,32 @@ module Excon
         @backend_eof = true
       end
 
-      ret = if max_length
+      if max_length
         if @read_buffer.empty?
-          nil # EOF met at beginning
+          # EOF met at beginning
+          @eof = @backend_eof
+          nil
         else
-          @read_buffer.slice!(0, max_length)
+          start = @read_offset
+
+          # Ensure that we can seek backwards when reading until a terminator string.
+          # The read offset must never point past the end of the read buffer.
+          @read_offset += max_length > readable_bytes ? readable_bytes : max_length
+          @read_buffer[start...@read_offset]
         end
       else
         # read until EOFError, so return everything
-        @read_buffer.slice!(0, @read_buffer.length)
+        start = @read_offset
+
+        @read_offset = @read_buffer.length
+        @eof = @backend_eof
+
+        @read_buffer[start..]
       end
-      @eof = @backend_eof && @read_buffer.empty?
-      ret
+    end
+
+    def readable_bytes
+      @read_buffer.length - @read_offset
     end
 
     def read_block(max_length)
@@ -353,7 +399,7 @@ module Excon
     def request_time_remaining
       now = Process.clock_gettime(Process::CLOCK_MONOTONIC)
       deadline = @data[:deadline]
-      
+
       raise(Excon::Errors::Timeout.new('request timeout reached')) if now >= deadline
 
       deadline - now

data/lib/excon/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Excon
-  VERSION = '0.106.0'
+  VERSION = '0.107.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: excon
 version: !ruby/object:Gem::Version
-  version: 0.106.0
+  version: 0.107.0
 platform: ruby
 authors:
 - dpiddy (Dan Peterson)
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-13 00:00:00.000000000 Z
+date: 2023-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec