wisp-python 0.9.1__py3-none-any.whl → 0.10.0__py3-none-any.whl

wisp/server/cli.py

@@ -23,6 +23,12 @@ except ImportError:
   except ImportError:
     event_loop = "asyncio"
 
+try:
+  import pymasque
+  has_pymasque = True
+except ImportError:
+  has_pymasque = False
+
 import wisp
 from wisp.server import http 
 from wisp.server import net
@@ -86,7 +92,7 @@ def main():
   parser.add_argument("--allow-private", action="store_true", help="Allow connections to private IP addresses.")
   parser.add_argument("--log-level", default="info", help="The log level (either debug, info, warning, error, or critical).")
   parser.add_argument("--threads", default=0, help="The number of threads to run the server on. By default it uses all CPU cores. (Linux only)")
-  parser.add_argument("--proxy", default=None, help="The url of the socks5h, socks5, sock4a, socks4 or http proxy to use.")
+  parser.add_argument("--proxy", default=None, help="The url of the socks5h, socks5, sock4a, socks4 or http proxy to use. Set this to 'warp' to use Cloudflare Warp as a proxy.")
   parser.add_argument("--block-udp", action="store_true", help="Block UDP streams.")
   parser.add_argument("--block-tcp", action="store_true", help="Block TCP streams.")
   args = parser.parse_args()
@@ -96,8 +102,10 @@ def main():
     level=getattr(logging, args.log_level.upper()),
     datefmt="%Y/%m/%d - %H:%M:%S"
   )
-
   logging.info(f"running wisp-server-python v{wisp.version} (async)")
+
+  if args.proxy and args.proxy == "warp" and has_pymasque == False:
+    raise ImportError("warp proxy was selected by pymasque is not installed. run 'pip install wisp-python[warp]' to install it")
   if args.static:
     static_path = pathlib.Path(args.static).resolve()
     logging.info(f"serving static files from {static_path}")

wisp/server/net.py

@@ -4,6 +4,10 @@ import ipaddress
 
 import asyncudp
 from python_socks.async_.asyncio import Proxy
+try:
+  import pymasque
+except ImportError:
+  pass
 
 #various network utilities and wrappers
 
@@ -15,6 +19,7 @@ block_tcp = False
 
 proxy_url = None
 proxy_dns = False
+warp = None
 
 def reuse_port_supported():
   return hasattr(socket, "SO_REUSEPORT")
@@ -69,7 +74,14 @@ class TCPConnection:
       raise TypeError("TCP connection blocked.")
 
     addr_str = await validate_hostname(self.hostname, self.port, 0x01)
-    if proxy_url:
+    if proxy_url == "warp":
+      global warp
+      if warp is None:
+        warp = pymasque.WarpConnection()
+      stream = await warp.open_stream(self.hostname, self.port)
+      await stream.ensure_response()
+      self.tcp_reader, self.tcp_writer = stream, stream
+    elif proxy_url:
       proxy = Proxy.from_url(proxy_url, rdns=proxy_dns)
       proxy_dest = self.hostname if proxy_dns else addr_str
       sock = await proxy.connect(dest_host=proxy_dest, dest_port=self.port)

{wisp_python-0.9.1.dist-info → wisp_python-0.10.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wisp-python
-Version: 0.9.1
+Version: 0.10.0
 Summary: An implementation of a Wisp proxy server in Python
 Author: ading2210
 License-Expression: AGPL-3.0-or-later
@@ -17,6 +17,8 @@ Requires-Dist: asyncudp
 Requires-Dist: python-socks[asyncio]
 Requires-Dist: uvloop; sys_platform != "win32" and sys_platform != "cygwin"
 Requires-Dist: winloop; sys_platform == "win32" or sys_platform == "cygwin"
+Provides-Extra: warp
+Requires-Dist: pymasque; extra == "warp"
 Dynamic: license-file
 
 # Python Wisp Server
@@ -38,15 +40,21 @@ Run the following command to install this program:
 pip3 install wisp-python
 ```
 
+To install the Cloudflare Warp proxy feature:
+```
+pip3 install wisp-python[warp]
+```
+This allows you proxy all exit traffic through Cloudflare Warp.
+
 ## Running the Server:
 For the best performance use [CPython](https://github.com/python/cpython) 3.11 or newer. [PyPy](https://github.com/pypy/pypy) is not recommended as it is a lot slower than CPython here. 
 
 To start the server, run `python3 -m wisp.server`. The program accepts the following arguments:
 ```
-usage: wisp-server-python [-h] [--host HOST] [--port PORT] [--static STATIC] [--limits] [--bandwidth BANDWIDTH] [--connections CONNECTIONS] [--window WINDOW] [--allow-loopback] [--allow-private] [--log-level LOG_LEVEL]
-                          [--threads THREADS] [--proxy PROXY] [--block-udp] [--block-tcp]
+usage: wisp-server-python [-h] [--host HOST] [--port PORT] [--static STATIC] [--limits] [--bandwidth BANDWIDTH] [--connections CONNECTIONS] [--window WINDOW] [--allow-loopback] [--allow-private] [--log-level LOG_LEVEL] [--threads THREADS] [--proxy PROXY]
+                          [--block-udp] [--block-tcp]
 
-A Wisp server implementation, written in Python (v0.8.3)
+A Wisp server implementation, written in Python (v0.10.0)
 
 options:
   -h, --help            show this help message and exit
@@ -64,7 +72,7 @@ options:
   --log-level LOG_LEVEL
                         The log level (either debug, info, warning, error, or critical).
   --threads THREADS     The number of threads to run the server on. By default it uses all CPU cores. (Linux only)
-  --proxy PROXY         The url of the socks5h, socks5, sock4a, socks4 or http proxy to use.
+  --proxy PROXY         The url of the socks5h, socks5, sock4a, socks4 or http proxy to use. Set this to 'warp' to use Cloudflare Warp as a proxy.
   --block-udp           Block UDP streams.
   --block-tcp           Block TCP streams.
 ```

wisp_python-0.10.0.dist-info/RECORD

@@ -0,0 +1,15 @@
+wisp/__init__.py,sha256=02Fv0s_jJG8U4y5B6AzKPIOzxAuqJyY_So8Guz5bdTk,75
+wisp/util.py,sha256=AU7si8VwJqS8Dwc1PT2pu_f_9Y32GQxivRYwJ3-U0YQ,144
+wisp/server/__init__.py,sha256=LmgQ1nTlnqcTPqRJVc1NGapV9qVR-BK8iPVUMSJ74Qs,102
+wisp/server/__main__.py,sha256=zhDqmhOY9HgHx-BOq-kU5IoxZCMJwt_PEEEISaZr9Mk,68
+wisp/server/cli.py,sha256=W-jeyltr_ynwZ32jqyD43Si5OWRVd8sqAO2GdD39Das,4748
+wisp/server/connection.py,sha256=0ztt3TejF0fY3eXtkTn9QozOj0_x-KOPC4vXberUsrQ,7665
+wisp/server/http.py,sha256=DqmXTDkomHeVz0EkJhb1PujAAWwl45BwMW00bpEBfGA,5382
+wisp/server/net.py,sha256=C0A0xB1jyMfTR3PeDw2Oo7guGSQE93Xa2_yKof6z21M,3693
+wisp/server/ratelimit.py,sha256=cic_rlBaM-tp6kJaSz4ITGvUbsX4JLSGSUgF5cPO0FY,1926
+wisp_python-0.10.0.dist-info/licenses/LICENSE,sha256=DZak_2itbUtvHzD3E7GNUYSRK6jdOJ-GqncQ2weavLA,34523
+wisp_python-0.10.0.dist-info/licenses/LICENSE_third_party.md,sha256=_YgCpygAXxOtr7gpjRTv7W1DTqZU_f7IMwjdPvw4VxY,15360
+wisp_python-0.10.0.dist-info/METADATA,sha256=s2qcZpwom4YQ_4ABunp9ckJwkbgYOdPzoOnAX8SMd8s,4490
+wisp_python-0.10.0.dist-info/WHEEL,sha256=mOdXR9C3wMVov7cSY8PY-XCzo3SmmWCHvGQr5csJoao,91
+wisp_python-0.10.0.dist-info/top_level.txt,sha256=sv0LDAu8cHUc3_VTsCKfXU-6B9HdV4dW22ubeW8KPVs,5
+wisp_python-0.10.0.dist-info/RECORD,,

wisp_python-0.9.1.dist-info/RECORD

@@ -1,16 +0,0 @@
-wisp/__init__.py,sha256=02Fv0s_jJG8U4y5B6AzKPIOzxAuqJyY_So8Guz5bdTk,75
-wisp/util.py,sha256=AU7si8VwJqS8Dwc1PT2pu_f_9Y32GQxivRYwJ3-U0YQ,144
-wisp/server/__init__.py,sha256=LmgQ1nTlnqcTPqRJVc1NGapV9qVR-BK8iPVUMSJ74Qs,102
-wisp/server/__main__.py,sha256=zhDqmhOY9HgHx-BOq-kU5IoxZCMJwt_PEEEISaZr9Mk,68
-wisp/server/cli.py,sha256=pkpl_ojw_M3QH4FlTlBe5QQh17brgYS86fQJA_9ks-o,4408
-wisp/server/connection.py,sha256=0ztt3TejF0fY3eXtkTn9QozOj0_x-KOPC4vXberUsrQ,7665
-wisp/server/http.py,sha256=DqmXTDkomHeVz0EkJhb1PujAAWwl45BwMW00bpEBfGA,5382
-wisp/server/net.py,sha256=_Uxv9w1DCCcJO7VaSOfxQhM5PYpwrYm3Hd1XDQ5F_n8,3362
-wisp/server/ratelimit.py,sha256=cic_rlBaM-tp6kJaSz4ITGvUbsX4JLSGSUgF5cPO0FY,1926
-wisp/server/warp.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-wisp_python-0.9.1.dist-info/licenses/LICENSE,sha256=DZak_2itbUtvHzD3E7GNUYSRK6jdOJ-GqncQ2weavLA,34523
-wisp_python-0.9.1.dist-info/licenses/LICENSE_third_party.md,sha256=_YgCpygAXxOtr7gpjRTv7W1DTqZU_f7IMwjdPvw4VxY,15360
-wisp_python-0.9.1.dist-info/METADATA,sha256=W3l_SgClI14BVruksufTzL2fJmU7ETAeWGo4Llv6JSY,4222
-wisp_python-0.9.1.dist-info/WHEEL,sha256=mOdXR9C3wMVov7cSY8PY-XCzo3SmmWCHvGQr5csJoao,91
-wisp_python-0.9.1.dist-info/top_level.txt,sha256=sv0LDAu8cHUc3_VTsCKfXU-6B9HdV4dW22ubeW8KPVs,5
-wisp_python-0.9.1.dist-info/RECORD,,