geventhttpclient 2.3.7__tar.gz → 2.3.8__tar.gz

{geventhttpclient-2.3.7/src/geventhttpclient.egg-info → geventhttpclient-2.3.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: geventhttpclient
-Version: 2.3.7
+Version: 2.3.8
 Summary: HTTP client library for gevent
 Author-email: Antonin Amand <antonin.amand@gmail.com>
 License-Expression: MIT

{geventhttpclient-2.3.7 → geventhttpclient-2.3.8}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "geventhttpclient"
-version = "2.3.7" # don't forget to update version __init__.py as well
+version = "2.3.8" # don't forget to update version __init__.py as well
 description = "HTTP client library for gevent"
 readme = "README.md"
 requires-python = ">=3.9"

{geventhttpclient-2.3.7 → geventhttpclient-2.3.8}/src/geventhttpclient/__init__.py

@@ -1,6 +1,6 @@
 # package
 
-__version__ = "2.3.7"  # don't forget to update version in pyproject.toml as well
+__version__ = "2.3.8"  # don't forget to update version in pyproject.toml as well
 
 from geventhttpclient.api import delete, get, head, options, patch, post, put, request
 from geventhttpclient.client import HTTPClient

{geventhttpclient-2.3.7 → geventhttpclient-2.3.8}/src/geventhttpclient/connectionpool.py

@@ -1,4 +1,5 @@
 import os
+import socket
 
 import gevent.queue
 import gevent.socket
@@ -125,7 +126,7 @@ class ConnectionPool:
         if first_error:
             raise first_error
         else:
-            raise RuntimeError(f"Cannot resolve {self._host}:{self._port}")
+            raise RuntimeError(f"Cannot resolve {self._connection_host}:{self._connection_port}")
 
     def after_connect(self, sock):
         pass
@@ -149,19 +150,55 @@ class ConnectionPool:
             if not parts or parts[1] != b"200":
                 raise RuntimeError(f"Error response from Proxy server : {resp}")
 
+    def _is_socket_alive(self, sock):
+        """check if a socket is still connected and alive.
+
+        uses MSG_PEEK | MSG_DONTWAIT to check for eof without consuming data,
+        and without blocking.
+
+        returns false if connection is closed or broken.
+        """
+        try:
+            raw_sock = getattr(sock, "_sock", sock)
+            if raw_sock.fileno() < 0:
+                return False
+            data = raw_sock.recv(1, socket.MSG_PEEK | socket.MSG_DONTWAIT)
+            if data == b"":
+                return False
+            return True
+        except BlockingIOError:
+            return True
+        except OSError:
+            return False
+
     def get_socket(self):
         """get a socket from the pool. This blocks until one is available."""
         self._semaphore.acquire()
         if self._closed:
             raise RuntimeError("connection pool closed")
-        try:
-            return self._socket_queue.get(block=False)
-        except gevent.queue.Empty:
+
+        # Try to get a valid connection from the pool
+        while not self._socket_queue.empty():
             try:
-                return self._create_socket()
-            except:  # noqa
-                self._semaphore.release()
-                raise
+                sock = self._socket_queue.get(block=False)
+                if self._is_socket_alive(sock):
+                    # Connection is still alive, return it
+                    return sock
+                else:
+                    # Connection is dead, close it and try next
+                    try:
+                        sock.close()
+                    except:  # noqa
+                        pass
+            except gevent.queue.Empty:
+                break
+
+        # No valid connections in pool, create a new one
+        try:
+            return self._create_socket()
+        except:  # noqa
+            self._semaphore.release()
+            raise
 
     def return_socket(self, sock):
         """return a socket to the pool."""

{geventhttpclient-2.3.7 → geventhttpclient-2.3.8/src/geventhttpclient.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: geventhttpclient
-Version: 2.3.7
+Version: 2.3.8
 Summary: HTTP client library for gevent
 Author-email: Antonin Amand <antonin.amand@gmail.com>
 License-Expression: MIT

{geventhttpclient-2.3.7 → geventhttpclient-2.3.8}/tests/test_client.py

@@ -1,4 +1,5 @@
 import json
+import socket
 
 import gevent.pool
 import gevent.queue
@@ -7,6 +8,7 @@ import pytest
 
 from geventhttpclient import __version__
 from geventhttpclient.client import METHOD_GET, HTTPClient
+from geventhttpclient.connectionpool import ConnectionPool
 from tests.common import HTTPBIN_HOST, LISTENER, check_upload, server, wsgiserver
 
 
@@ -350,3 +352,32 @@ def test_multi_queries_greenlet_safe():
     assert count == 5
     # ensure at least 3 of requests got 200
     assert ok_count >= 3
+
+
+class TestIsSocketAlive:
+    """Unit tests for ConnectionPool._is_socket_alive()"""
+
+    def test_closed_socket_returns_false(self):
+        sock = socket.socket()
+        sock.close()
+        pool = ConnectionPool("127.0.0.1", 80, "127.0.0.1", 80)
+        assert sock.fileno() < 0
+        assert pool._is_socket_alive(sock) is False
+
+    def test_healthy_socket_returns_true(self):
+        s1, s2 = socket.socketpair()
+        try:
+            pool = ConnectionPool("127.0.0.1", 80, "127.0.0.1", 80)
+            assert pool._is_socket_alive(s1) is True
+        finally:
+            s1.close()
+            s2.close()
+
+    def test_peer_orderly_close_returns_false(self):
+        s1, s2 = socket.socketpair()
+        try:
+            s2.close()
+            pool = ConnectionPool("127.0.0.1", 80, "127.0.0.1", 80)
+            assert pool._is_socket_alive(s1) is False
+        finally:
+            s1.close()