Fix: Run unasync and ruff formatting

Author: drshvik

httpcore/_sync/socks_proxy.py

@@ -60,7 +60,9 @@ def _init_socks5_connection(
     stream.write(outgoing_bytes, timeout=timeout)  # <--- FIX 2: Pass timeout
 
     # Auth method response
-    incoming_bytes = stream.read(max_bytes=4096, timeout=timeout) # <--- FIX 3: Pass timeout
+    incoming_bytes = stream.read(
+        max_bytes=4096, timeout=timeout
+    )  # <--- FIX 3: Pass timeout
     response = conn.receive_data(incoming_bytes)
     assert isinstance(response, socksio.socks5.SOCKS5AuthReply)
     if response.method != auth_method:
@@ -76,10 +78,12 @@ def _init_socks5_connection(
         username, password = auth
         conn.send(socksio.socks5.SOCKS5UsernamePasswordRequest(username, password))
         outgoing_bytes = conn.data_to_send()
-        stream.write(outgoing_bytes, timeout=timeout) # <--- FIX 4: Pass timeout
+        stream.write(outgoing_bytes, timeout=timeout)  # <--- FIX 4: Pass timeout
 
         # Username/password response
-        incoming_bytes = stream.read(max_bytes=4096, timeout=timeout) # <--- FIX 5: Pass timeout
+        incoming_bytes = stream.read(
+            max_bytes=4096, timeout=timeout
+        )  # <--- FIX 5: Pass timeout
         response = conn.receive_data(incoming_bytes)
         assert isinstance(response, socksio.socks5.SOCKS5UsernamePasswordReply)
         if not response.success:
@@ -92,10 +96,12 @@ def _init_socks5_connection(
         )
     )
     outgoing_bytes = conn.data_to_send()
-    stream.write(outgoing_bytes, timeout=timeout) # <--- FIX 6: Pass timeout
+    stream.write(outgoing_bytes, timeout=timeout)  # <--- FIX 6: Pass timeout
 
     # Connect response
-    incoming_bytes = stream.read(max_bytes=4096, timeout=timeout) # <--- FIX 7: Pass timeout
+    incoming_bytes = stream.read(
+        max_bytes=4096, timeout=timeout
+    )  # <--- FIX 7: Pass timeout
     response = conn.receive_data(incoming_bytes)
     assert isinstance(response, socksio.socks5.SOCKS5Reply)
     if response.reply_code != socksio.socks5.SOCKS5ReplyCode.SUCCEEDED:
@@ -211,7 +217,7 @@ def handle_request(self, request: Request) -> Response:
                         "host": self._remote_origin.host.decode("ascii"),
                         "port": self._remote_origin.port,
                         "auth": self._proxy_auth,
-                        "timeout": timeout, # <--- FIX 8: Pass timeout to handshake
+                        "timeout": timeout,  # <--- FIX 8: Pass timeout argument
                     }
                     with Trace(
                         "setup_socks5_connection", logger, request, kwargs
@@ -313,4 +319,4 @@ def info(self) -> str:
         return self._connection.info()
 
     def __repr__(self) -> str:
-        return f"<{self.__class__.__name__} [{self.info()}]>"
+        return f"<{self.__class__.__name__} [{self.info()}]>"

reproduce_httpcore.py

@@ -0,0 +1,63 @@
+import httpcore
+import socket
+import threading
+import time
+
+# --- Same Server Setup as before ---
+TIMEOUT = 2.0
+HANG_TIME = 20
+
+def get_free_port():
+    with socket.socket() as s:
+        s.bind(('', 0))
+        return s.getsockname()[1]
+
+def blackhole_proxy_server(port, stop_event):
+    server = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+    server.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
+    server.bind(('127.0.0.1', port))
+    server.listen(1)
+    server.settimeout(1.0)
+    while not stop_event.is_set():
+        try:
+            client, _ = server.accept()
+            time.sleep(HANG_TIME) # Hang the handshake
+            client.close()
+        except socket.timeout: continue
+        except: break
+    server.close()
+
+# --- The Test ---
+def run_test():
+    proxy_port = get_free_port()
+    stop_event = threading.Event()
+    t = threading.Thread(target=blackhole_proxy_server, args=(proxy_port, stop_event))
+    t.start()
+    time.sleep(0.5)
+
+    print(f"[*] Testing httpcore SOCKSProxy with {TIMEOUT}s timeout...")
+    start_time = time.time()
+    
+    # We use the low-level SOCKSProxy directly
+    with httpcore.SOCKSProxy(
+        proxy_url=f"socks5://127.0.0.1:{proxy_port}"
+    ) as pool:
+        try:
+            # We assume httpcore 1.0+ style request
+            pool.request(
+                "GET", 
+                "http://example.com", 
+                extensions={'timeout': {'connect': TIMEOUT, 'read': TIMEOUT}}
+            )
+        except httpcore.TimeoutException:
+            print("[SUCCESS] Caught timeout correctly!")
+        except Exception as e:
+            print(f"[ERROR] {e}")
+        finally:
+            duration = time.time() - start_time
+            print(f"[*] Duration: {duration:.2f}s")
+            stop_event.set()
+            t.join()
+
+if __name__ == "__main__":
+    run_test()

reproduce_httpcore_async.py

@@ -0,0 +1,69 @@
+import httpcore
+import socket
+import threading
+import time
+import asyncio
+
+# --- Server Setup (Same as before) ---
+HANG_TIME = 20
+TIMEOUT = 2.0
+
+def get_free_port():
+    with socket.socket() as s:
+        s.bind(('', 0))
+        return s.getsockname()[1]
+
+def blackhole_proxy_server(port, stop_event):
+    server = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+    server.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
+    server.bind(('127.0.0.1', port))
+    server.listen(1)
+    server.settimeout(1.0)
+    
+    while not stop_event.is_set():
+        try:
+            client, _ = server.accept()
+            # print("[Server] Accepted connection, sleeping...")
+            time.sleep(HANG_TIME) 
+            client.close()
+        except socket.timeout: continue
+        except: break
+    server.close()
+
+# --- Async Test ---
+async def run_async_test(port):
+    print(f"[*] Testing ASYNC httpcore SOCKSProxy with {TIMEOUT}s timeout...")
+    start_time = time.time()
+    
+    async with httpcore.AsyncSOCKSProxy(
+        proxy_url=f"socks5://127.0.0.1:{port}"
+    ) as pool:
+        try:
+            await pool.request(
+                "GET", 
+                "http://example.com", 
+                extensions={'timeout': {'connect': TIMEOUT, 'read': TIMEOUT}}
+            )
+        except httpcore.TimeoutException:
+            print("[SUCCESS] Caught timeout correctly!")
+        except Exception as e:
+            print(f"[ERROR] {type(e).__name__}: {e}")
+        finally:
+            duration = time.time() - start_time
+            print(f"[*] Duration: {duration:.2f}s")
+
+def main():
+    port = get_free_port()
+    stop_event = threading.Event()
+    t = threading.Thread(target=blackhole_proxy_server, args=(port, stop_event))
+    t.start()
+    time.sleep(0.5)
+
+    try:
+        asyncio.run(run_async_test(port))
+    finally:
+        stop_event.set()
+        t.join()
+
+if __name__ == "__main__":
+    main()