python-socks 2.1.1__py3-none-any.whl → 2.3.0__py3-none-any.whl

python_socks/sync/v2/_proxy.py

@@ -1,9 +1,8 @@
 import socket
 import ssl
-from typing import Optional
 
+from ._connect import connect_tcp
 from ._stream import SyncSocketStream
-from .._connect import connect_tcp
 from .._resolver import SyncResolver
 from ... import _abc as abc
 from ..._errors import ProxyConnectionError, ProxyTimeoutError
@@ -15,24 +14,18 @@ DEFAULT_TIMEOUT = 60
 
 
 class SyncProxy(abc.SyncProxy):
-    _stream: Optional[SyncSocketStream]
-
     def __init__(
         self,
         proxy_host: str,
         proxy_port: int,
         proxy_ssl: ssl.SSLContext = None,
+        forward: 'SyncProxy' = None,
     ):
         self._proxy_host = proxy_host
         self._proxy_port = proxy_port
         self._proxy_ssl = proxy_ssl
+        self._forward = forward
 
-        self._dest_host = None
-        self._dest_port = None
-        self._dest_ssl = None
-        self._timeout = None
-
-        self._stream = None
         self._resolver = SyncResolver()
 
     def connect(
@@ -41,74 +34,67 @@ class SyncProxy(abc.SyncProxy):
         dest_port: int,
         dest_ssl: ssl.SSLContext = None,
         timeout: float = None,
-        _stream: SyncSocketStream = None,
     ) -> SyncSocketStream:
-
         if timeout is None:
             timeout = DEFAULT_TIMEOUT
 
-        self._dest_host = dest_host
-        self._dest_port = dest_port
-        self._dest_ssl = dest_ssl
-        self._timeout = timeout
-
         try:
-            if _stream is None:
-                sock = connect_tcp(
+            if self._forward is None:
+                stream = connect_tcp(
                     host=self._proxy_host,
                     port=self._proxy_port,
                     timeout=timeout,
                 )
-                self._stream = SyncSocketStream(sock)
             else:
-                self._stream = _stream
+                stream = self._forward.connect(
+                    dest_host=self._proxy_host,
+                    dest_port=self._proxy_port,
+                    timeout=timeout,
+                )
+        except OSError as e:
+            msg = 'Could not connect to proxy {}:{} [{}]'.format(
+                self._proxy_host,
+                self._proxy_port,
+                e.strerror,
+            )
+            raise ProxyConnectionError(e.errno, msg) from e
 
+        try:
             if self._proxy_ssl is not None:
-                self._stream = self._stream.start_tls(
+                stream = stream.start_tls(
                     hostname=self._proxy_host,
                     ssl_context=self._proxy_ssl,
                 )
 
-            self._negotiate()
+            self._negotiate(
+                stream=stream,
+                dest_host=dest_host,
+                dest_port=dest_port,
+            )
 
-            if self._dest_ssl is not None:
-                self._stream = self._stream.start_tls(
-                    hostname=self._dest_host,
-                    ssl_context=self._dest_ssl,
+            if dest_ssl is not None:
+                stream = stream.start_tls(
+                    hostname=dest_host,
+                    ssl_context=dest_ssl,
                 )
 
-            return self._stream
+            return stream
 
         except socket.timeout as e:
-            self._close()
-            raise ProxyTimeoutError('Proxy connection timed out: {}'.format(self._timeout)) from e
-        except OSError as e:
-            self._close()
-            msg = 'Could not connect to proxy {}:{} [{}]'.format(
-                self._proxy_host,
-                self._proxy_port,
-                e.strerror,
-            )
-            raise ProxyConnectionError(e.errno, msg) from e
+            stream.close()
+            raise ProxyTimeoutError('Proxy connection timed out: {}'.format(timeout)) from e
         except Exception:
-            self._close()
+            stream.close()
             raise
 
-    def _negotiate(self):
+    def _negotiate(
+        self,
+        stream: SyncSocketStream,
+        dest_host: str,
+        dest_port: int,
+    ):
         raise NotImplementedError
 
-    def _close(self):
-        if self._stream is not None:
-            self._stream.close()
-
-    @property
-    def proxy_host(self):
-        return self._proxy_host
-
-    @property
-    def proxy_port(self):
-        return self._proxy_port
-
 
 class Socks5Proxy(SyncProxy):
     def __init__(
@@ -119,22 +105,29 @@ class Socks5Proxy(SyncProxy):
         password=None,
         rdns=None,
         proxy_ssl=None,
+        forward: 'SyncProxy' = None,
     ):
         super().__init__(
             proxy_host=proxy_host,
             proxy_port=proxy_port,
             proxy_ssl=proxy_ssl,
+            forward=forward,
         )
         self._username = username
         self._password = password
         self._rdns = rdns
 
-    def _negotiate(self):
+    def _negotiate(
+        self,
+        stream: SyncSocketStream,
+        dest_host: str,
+        dest_port: int,
+    ):
         proto = Socks5Proto(
-            stream=self._stream,
+            stream=stream,
             resolver=self._resolver,
-            dest_host=self._dest_host,
-            dest_port=self._dest_port,
+            dest_host=dest_host,
+            dest_port=dest_port,
             username=self._username,
             password=self._password,
             rdns=self._rdns,
@@ -150,21 +143,28 @@ class Socks4Proxy(SyncProxy):
         user_id=None,
         rdns=None,
         proxy_ssl=None,
+        forward: 'SyncProxy' = None,
     ):
         super().__init__(
             proxy_host=proxy_host,
             proxy_port=proxy_port,
             proxy_ssl=proxy_ssl,
+            forward=forward,
         )
         self._user_id = user_id
         self._rdns = rdns
 
-    def _negotiate(self):
+    def _negotiate(
+        self,
+        stream: SyncSocketStream,
+        dest_host: str,
+        dest_port: int,
+    ):
         proto = Socks4Proto(
-            stream=self._stream,
+            stream=stream,
             resolver=self._resolver,
-            dest_host=self._dest_host,
-            dest_port=self._dest_port,
+            dest_host=dest_host,
+            dest_port=dest_port,
             user_id=self._user_id,
             rdns=self._rdns,
         )
@@ -179,20 +179,27 @@ class HttpProxy(SyncProxy):
         username=None,
         password=None,
         proxy_ssl=None,
+        forward: 'SyncProxy' = None,
     ):
         super().__init__(
             proxy_host=proxy_host,
             proxy_port=proxy_port,
             proxy_ssl=proxy_ssl,
+            forward=forward,
         )
         self._username = username
         self._password = password
 
-    def _negotiate(self):
+    def _negotiate(
+        self,
+        stream: SyncSocketStream,
+        dest_host: str,
+        dest_port: int,
+    ):
         proto = HttpProto(
-            stream=self._stream,
-            dest_host=self._dest_host,
-            dest_port=self._dest_port,
+            stream=stream,
+            dest_host=dest_host,
+            dest_port=dest_port,
             username=self._username,
             password=self._password,
         )

{python_socks-2.1.1.dist-info → python_socks-2.3.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-socks
-Version: 2.1.1
+Version: 2.3.0
 Summary: Core proxy (SOCKS4, SOCKS5, HTTP tunneling) functionality for Python
 Home-page: https://github.com/romis2012/python-socks
 Author: Roman Snegirev

{python_socks-2.1.1.dist-info → python_socks-2.3.0.dist-info}/RECORD

@@ -5,7 +5,7 @@ python_socks/_errors.py,sha256=l2j03Zna_EJhNqF3yApTYuQ147BcY0k74pkT4HAlRp4,245
 python_socks/_helpers.py,sha256=XSNUT2Sz5F_HBNzvm_jIBjPZp79UHE2kxlWiZygy19M,2544
 python_socks/_proxy_factory.py,sha256=eZSP-HouPc6UGn8yKdsZi5QYncO0yDUprVH74vEZWBA,1606
 python_socks/_types.py,sha256=dgQifNf2mIwdKoX7YmI91H_lUsW9-Y0ZkZGlIV6_NNw,90
-python_socks/_version.py,sha256=RCZ8Y99VqqRvBlZi6XEdvgbOaGiEZVWuIEjUtsLtZiI,49
+python_socks/_version.py,sha256=-6Mu54sg3gKrvjVhv3muuxHpG7KJInp-P1g6CfAOxJE,49
 python_socks/_proto/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 python_socks/_proto/http.py,sha256=Yj6-uivDfHF9ONZSZJazZCuYlYbQ2I_hyip-Uf1ACm4,1798
 python_socks/_proto/http_async.py,sha256=HdxhKQHubpzQZ3VgOQU5cYTckUuTBiC3eHEgAploFs8,790
@@ -25,17 +25,23 @@ python_socks/async_/anyio/_factory.py,sha256=lPpUqtXJlIHVYY_juDJse7Un1F0GKmGm-2C
 python_socks/async_/anyio/_proxy.py,sha256=nMOAo0wL549qbSaLSQn8qybTO4gBunZ9hMmxDDAIV74,5339
 python_socks/async_/anyio/_resolver.py,sha256=LPRLmEzgKPGCqAbEMmLSMVtFkNVKha_2u08MhrZZ-CY,590
 python_socks/async_/anyio/_stream.py,sha256=OcCl4YkccA0-5hZh90CP4YmsBDLPwHpS3B0wCLytnAY,1614
+python_socks/async_/anyio/v2/__init__.py,sha256=3Bv4ukDEyxzxCX8JlgpTZR2Bbwq6Fu3csK0ZiX-XHXQ,106
+python_socks/async_/anyio/v2/_chain.py,sha256=baTCXD68hceOMWYITrUUSKv-B745RT4TdpQPDkSz68Y,593
+python_socks/async_/anyio/v2/_connect.py,sha256=wOOuUxURCjIWOH1pd8H6gr3XZ3VnvRtmsAh97M_ULEA,330
+python_socks/async_/anyio/v2/_factory.py,sha256=Hh6a95m-qKkX25pO98ph_LpcfWgo2ljwVxj_kgqB2TE,319
+python_socks/async_/anyio/v2/_proxy.py,sha256=GO38rPyghr9d21HDQV5yOzlpoDA7SfVutysVHePb00M,5584
+python_socks/async_/anyio/v2/_stream.py,sha256=40D3Pmb0rryk9gaQlmjpAMdiJi5H5O0xbBseblGG1FY,1616
 python_socks/async_/asyncio/__init__.py,sha256=v2rBc4jol3U7KH1AJmw179-GYqiibCTvRRsAzbfNbYg,364
 python_socks/async_/asyncio/_connect.py,sha256=niNKiz2o1kfeIPVR3kXW7YHZ2sTK_Uehgq9tmFwbp7w,1014
 python_socks/async_/asyncio/_proxy.py,sha256=UwzK54GCxqBCcMXmcRWhhwrJ35Pgs5jvujxzD-bL3AY,5814
 python_socks/async_/asyncio/_resolver.py,sha256=ROqOncuIub87J9_nMdvRTG_5zYOh8uafk265z0s2ORQ,681
 python_socks/async_/asyncio/_stream.py,sha256=RP7BIP9iFFy5nLRf9kHH7s1h_zPfo0yoEVKNpExqFcI,1021
 python_socks/async_/asyncio/v2/__init__.py,sha256=QpHsh2j7HntoF0eqA3c_LxL8V_V3lzVSKx9mQvSx0rE,94
-python_socks/async_/asyncio/v2/_chain.py,sha256=d5ahSRH44hHBb4SVwFiJJp9dZa0PmmRPk3DTxdC3rM0,873
-python_socks/async_/asyncio/v2/_connect.py,sha256=CeS6kqrIWN-xB4aUapjvu-AfbRbbbulvXJA7tdwU6gM,464
+python_socks/async_/asyncio/v2/_chain.py,sha256=Yle3F3TKEpCo9Snd-T5hRnmfn9iWj2VNLb3UHz6yNiU,607
+python_socks/async_/asyncio/v2/_connect.py,sha256=b3kQBR7L6wp-yvWVwtcdb4JUdQV04JW-DXF1g1P3gxI,587
 python_socks/async_/asyncio/v2/_factory.py,sha256=ZZfOOLRav1HNwuHXcjt9rVbkq0O34tCiUVR4rKK6JOU,323
-python_socks/async_/asyncio/v2/_proxy.py,sha256=zVIxbWwtymZ445TekYNBswOEBZ5is-MO9HQDyK4hoPs,6106
-python_socks/async_/asyncio/v2/_stream.py,sha256=lr9wO-f0-k6lO4B_UQKkaa6ErdHNyThuMX2hj3d2RrU,3464
+python_socks/async_/asyncio/v2/_proxy.py,sha256=T8INqHi4dimnWt1zANyhbg6T7R7vhXz4aX2c5kFa9eI,6385
+python_socks/async_/asyncio/v2/_stream.py,sha256=hBGM1q2kW1jdOmpSyq2hpsarmHeeoLllJfPunFHaCBM,3465
 python_socks/async_/curio/__init__.py,sha256=BJf4m4tC78V4BjJbvnm2-JdHT9XLbt14lT_rk2IOlgc,360
 python_socks/async_/curio/_connect.py,sha256=u1HRJ8n3OZbux-wETO9HuqZv9By2LGhhSsM78gnxr_0,328
 python_socks/async_/curio/_proxy.py,sha256=Y6FU0mitVTBFuTiEHoTEymM09ZnbZX2gr-ixsYAKWKE,4074
@@ -47,10 +53,10 @@ python_socks/async_/trio/_proxy.py,sha256=SLUf5udm1q5rFGixGbAOs4x03wO8pFcXdtMizW
 python_socks/async_/trio/_resolver.py,sha256=uqBoTkbYpwwESoph2SmXRUUHM_DsT7dALQDmKqp-sco,591
 python_socks/async_/trio/_stream.py,sha256=xunx_XUiwH1pBLQjWbkqq3P92SeXaRypPMPRYwHOsPg,1003
 python_socks/async_/trio/v2/__init__.py,sha256=3Bv4ukDEyxzxCX8JlgpTZR2Bbwq6Fu3csK0ZiX-XHXQ,106
-python_socks/async_/trio/v2/_chain.py,sha256=P0Ryqb0r4c4UwhtzhaTEx-5cxHhbm7dhTDzZCqxIOBo,867
-python_socks/async_/trio/v2/_connect.py,sha256=IymIbMoF_bDOgc1alCLeKahBqLDNKUxwpGGFreJv2Us,294
+python_socks/async_/trio/v2/_chain.py,sha256=sf32gS-flmzVe60b83LtwOhbzvlm1s7gPlgIpAbW1hM,591
+python_socks/async_/trio/v2/_connect.py,sha256=9B7cpLC9HqrXdW-61jA8hGRspHuIgaLTniZyCqpSiPE,379
 python_socks/async_/trio/v2/_factory.py,sha256=OAT9IbVy3vMNOhQFl-FYKnvGpzkQewmfVP9aUj6LlW4,317
-python_socks/async_/trio/v2/_proxy.py,sha256=rlSNH6mxNZtDlvvI_dpO_wSQkIV69XwN6-289U4b-mI,5260
+python_socks/async_/trio/v2/_proxy.py,sha256=GOFTNECiNGBLevs9TyNIG99Umft6kxcYAbDxJ-rOp04,5590
 python_socks/async_/trio/v2/_stream.py,sha256=wGB7sDjRO1ywVNjF_DFgdF2orjD3zrh8dPSmW9aBEV0,1475
 python_socks/sync/__init__.py,sha256=Ju2_K1niNf50ijQtUk_LuY_QPexl4EWsFB9j4iPO3Z4,381
 python_socks/sync/_chain.py,sha256=TJeIQmvCw5Z0slBQOD0V9mibC5jbM9pDD_xjlyYgHFs,804
@@ -59,13 +65,14 @@ python_socks/sync/_proxy.py,sha256=MMFA3qwAWUaOp_Cv8mxDbk4FvuRXjrwzSfRkGVyqGSU,3
 python_socks/sync/_resolver.py,sha256=2rf9-NdjRktYrab1Oyv9ZJLKByP95ysFmRE3TgjRCSA,547
 python_socks/sync/_stream.py,sha256=x01ovajA0DAjHkBCxpMeFaWYjns9BljgBQ-GGyBqrw4,818
 python_socks/sync/v2/__init__.py,sha256=3Bv4ukDEyxzxCX8JlgpTZR2Bbwq6Fu3csK0ZiX-XHXQ,106
-python_socks/sync/v2/_chain.py,sha256=j0dUfILIgApgy4OeNsBvew-zfB14fXFwG7YiSCPYWiw,869
+python_socks/sync/v2/_chain.py,sha256=IRVMioTVWwxylZ8maD5Gqxhhgw4VyrG5vo_hAOuEn8Q,579
+python_socks/sync/v2/_connect.py,sha256=eqMKsH2wVnGZhV24_t9QfsNhjbnKtnipj7wzSNctM3Q,410
 python_socks/sync/v2/_factory.py,sha256=DcFdIU0X7b14mRUB4dWJ49l_zQFoRlKfOOw7t27HBEw,315
-python_socks/sync/v2/_proxy.py,sha256=WncK8-lSJpH6oBWQaiRh3cidGXGAjswGxLJvnEvLEJw,5107
+python_socks/sync/v2/_proxy.py,sha256=hhzgCTpRiIyqkRWJcjVZoI7nzjMxn4V-vWdBCiXLIMY,5234
 python_socks/sync/v2/_ssl_transport.py,sha256=MURwzvKu-S2-MI7o8KaZTvvBFOiiKIu5R0ERVIMvERE,6088
 python_socks/sync/v2/_stream.py,sha256=Jq89x1xmIX3L_v-WyS1nRTItjTnYTcDcfDblsANxfJI,1544
-python_socks-2.1.1.dist-info/LICENSE.txt,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
-python_socks-2.1.1.dist-info/METADATA,sha256=Y2w4kdCFvlJNvBWICmlqU53E_IeGv6AIOV-KmBBeLAo,7050
-python_socks-2.1.1.dist-info/WHEEL,sha256=OqRkF0eY5GHssMorFjlbTIq072vpHpF60fIQA6lS9xA,92
-python_socks-2.1.1.dist-info/top_level.txt,sha256=7qyDAVwjTZ0sIYG1iatFbE-SLpWhONjaoMQ0Ib2DX0Q,13
-python_socks-2.1.1.dist-info/RECORD,,
+python_socks-2.3.0.dist-info/LICENSE.txt,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
+python_socks-2.3.0.dist-info/METADATA,sha256=w-K_UJ2GTVIxb9f5S-yfmVeETkH-eSoNtQuPpDpe7bY,7050
+python_socks-2.3.0.dist-info/WHEEL,sha256=OqRkF0eY5GHssMorFjlbTIq072vpHpF60fIQA6lS9xA,92
+python_socks-2.3.0.dist-info/top_level.txt,sha256=7qyDAVwjTZ0sIYG1iatFbE-SLpWhONjaoMQ0Ib2DX0Q,13
+python_socks-2.3.0.dist-info/RECORD,,