Update socket to allow external buffer use.

Author: Lukasa

hyper/http20/bufsocket.py

@@ -76,6 +76,20 @@ def can_read(self):
 
         return False
 
+    @property
+    def buffer(self):
+        """
+        Get access to the buffer itself.
+        """
+        return self._buffer_view[self._index:self._buffer_end]
+
+    def advance_buffer(self, count):
+        """
+        Advances the buffer by the amount of data consumed outside the socket.
+        """
+        self._index += count
+        self._bytes_in_buffer -= count
+
     def new_buffer(self):
         """
         This method moves all the data in the backing buffer to the start of
@@ -145,6 +159,23 @@ def recv(self, amt):
 
         return data
 
+    def fill(self):
+        """
+        Attempts to fill the buffer as much as possible. It will block for at
+        most the time required to have *one* ``recv_into`` call return.
+        """
+        if not self._remaining_capacity:
+            self.new_buffer()
+
+        count = self._sck.recv_into(self._buffer_view[self._buffer_end:])
+        if not count:
+            raise ConnectionResetError()
+
+        self._bytes_in_buffer += count
+
+        return
+
+
     def readline(self):
         """
         Read up to a newline from the network and returns it. The implicit

test/test_socket.py

@@ -207,6 +207,47 @@ def test_socket_readline_too_long(self, monkeypatch):
         with pytest.raises(LineTooLongError):
             b.readline()
 
+    def test_socket_fill_basic(self):
+        s = DummySocket()
+        b = BufferedSocket(s)
+        s.inbound_packets = [b'Here', b'begins', b'the']
+
+        assert not len(b.buffer)
+
+        b.fill()
+        assert len(b.buffer) == 4
+
+        b.fill()
+        assert len(b.buffer) == 10
+
+        b.fill()
+        assert len(b.buffer) == 13
+
+    def test_socket_fill_resizes_if_needed(self):
+        s = DummySocket()
+        b = BufferedSocket(s)
+        s.inbound_packets = [b'Here']
+        b._index = 1000
+
+        assert not len(b.buffer)
+
+        b.fill()
+        assert len(b.buffer) == 4
+        assert b._index == 0
+
+    def test_advancing_sockets(self):
+        s = DummySocket()
+        b = BufferedSocket(s)
+        b._buffer_view[0:5] = b'abcde'
+        b._bytes_in_buffer += 5
+
+        assert len(b.buffer) == 5
+
+        b.advance_buffer(3)
+        assert len(b.buffer) == 2
+
+        assert b.buffer.tobytes() == b'de'
+
 
 class DummySocket(object):
     def __init__(self):