wisp-python 0.9.1__tar.gz → 0.10.0__tar.gz

{wisp_python-0.9.1/src/wisp_python.egg-info → wisp_python-0.10.0}/PKG-INFO

@@ -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.9.1 → wisp_python-0.10.0}/README.md

@@ -17,15 +17,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
@@ -43,7 +49,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.9.1 → wisp_python-0.10.0}/pyproject.toml

@@ -11,7 +11,7 @@ package-dir = {"" = "src"}
 
 [project]
 name = "wisp-python"
-version = "0.9.1"
+version = "0.10.0"
 license = "AGPL-3.0-or-later"
 authors = [
   {name="ading2210"},
@@ -31,6 +31,11 @@ dependencies = [
   "winloop; sys_platform == 'win32' or sys_platform == 'cygwin'"
 ]
 
+[project.optional-dependencies]
+warp = [
+  "pymasque"
+]
+
 [project.urls]
 Homepage = "https://github.com/MercuryWorkshop/wisp-server-python"
 Issues = "https://github.com/MercuryWorkshop/wisp-server-python/issues"

{wisp_python-0.9.1 → wisp_python-0.10.0}/src/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_python-0.9.1 → wisp_python-0.10.0}/src/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 → wisp_python-0.10.0/src/wisp_python.egg-info}/PKG-INFO

@@ -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.9.1 → wisp_python-0.10.0}/src/wisp_python.egg-info/SOURCES.txt

@@ -11,7 +11,6 @@ src/wisp/server/connection.py
 src/wisp/server/http.py
 src/wisp/server/net.py
 src/wisp/server/ratelimit.py
-src/wisp/server/warp.py
 src/wisp_python.egg-info/PKG-INFO
 src/wisp_python.egg-info/SOURCES.txt
 src/wisp_python.egg-info/dependency_links.txt

{wisp_python-0.9.1 → wisp_python-0.10.0}/src/wisp_python.egg-info/requires.txt

@@ -7,3 +7,6 @@ uvloop
 
 [:sys_platform == "win32" or sys_platform == "cygwin"]
 winloop
+
+[warp]
+pymasque