wisp-python 0.8.2__tar.gz → 0.8.4__tar.gz

{wisp_python-0.8.2/src/wisp_python.egg-info → wisp_python-0.8.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wisp-python
-Version: 0.8.2
+Version: 0.8.4
 Summary: An implementation of a Wisp proxy server in Python
 Author: ading2210
 Project-URL: Homepage, https://github.com/MercuryWorkshop/wisp-server-python
@@ -16,6 +16,7 @@ Requires-Dist: websockets
 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"
 Dynamic: license-file
 
 # Python Wisp Server
@@ -45,7 +46,7 @@ To start the server, run `python3 -m wisp.server`. The program accepts the follo
 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.1)
+A Wisp server implementation, written in Python (v0.8.3)
 
 options:
   -h, --help            show this help message and exit

{wisp_python-0.8.2 → wisp_python-0.8.4}/README.md

@@ -25,7 +25,7 @@ To start the server, run `python3 -m wisp.server`. The program accepts the follo
 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.1)
+A Wisp server implementation, written in Python (v0.8.3)
 
 options:
   -h, --help            show this help message and exit

{wisp_python-0.8.2 → wisp_python-0.8.4}/pyproject.toml

@@ -11,7 +11,7 @@ package-dir = {"" = "src"}
 
 [project]
 name = "wisp-python"
-version = "0.8.2"
+version = "0.8.4"
 authors = [
   {name="ading2210"},
 ]
@@ -27,7 +27,8 @@ dependencies = [
   "websockets",
   "asyncudp",
   "python-socks[asyncio]",
-  "uvloop; sys_platform != 'win32' and sys_platform != 'cygwin'"
+  "uvloop; sys_platform != 'win32' and sys_platform != 'cygwin'",
+  "winloop; sys_platform == 'win32' or sys_platform == 'cygwin'"
 ]
 
 [project.urls]

{wisp_python-0.8.2 → wisp_python-0.8.4}/src/wisp/server/cli.py

@@ -4,12 +4,23 @@ import pathlib
 import sys
 import logging
 import multiprocessing
+import threading
+
+try:
+  import concurrent.interpreters
+  has_subinterpreters = True
+except ImportError:
+  has_subinterpreters = False
 
 try:
   import uvloop
-  use_uvloop = True
+  event_loop = "uvloop"
 except ImportError:
-  use_uvloop = False
+  try:
+    import winloop
+    event_loop = "winloop"
+  except ImportError:
+    event_loop = "asyncio"
 
 import wisp
 from wisp.server import http 
@@ -17,12 +28,11 @@ from wisp.server import net
 
 def run_async(func, *args, **kwargs):
   try:
-    if use_uvloop:
+    if event_loop == "uvloop":
       uvloop.run(func(*args, **kwargs))
+    elif event_loop == "winloop":
+      winloop.run(func(*args, **kwargs))
     else:
-      #uvloop doesn't support windows at all so we don't need to print the error
-      if not sys.platform in ("win32", "cygwin"):
-        logging.error("Importing uvloop failed. Falling back to asyncio, which is slower.")
       asyncio.run(func(*args, **kwargs))
   except KeyboardInterrupt:
     pass
@@ -30,6 +40,34 @@ def run_async(func, *args, **kwargs):
 def run_http(args):
   run_async(http.main, args)
 
+def run_processes(thread_count, args):
+  processes = []
+  for i in range(0, int(thread_count)):
+    process = multiprocessing.Process(target=run_http, args=(args,), daemon=True)
+    processes.append(process)
+    process.start()
+  try:
+    for process in processes:
+      process.join()
+  except KeyboardInterrupt:
+    pass
+
+def run_subinterpreters(thread_count, args):
+  def thread_func():
+    interpreter = concurrent.interpreters.create()
+    interpreter.call(run_http, args)
+    
+  threads = []
+  for i in range(0, int(thread_count)):
+    thread = threading.Thread(target=thread_func, daemon=True)
+    threads.append(thread)
+    thread.start()
+  try:
+    for thread in threads:
+      thread.join()
+  except KeyboardInterrupt:
+    pass
+
 def main():
   parser = argparse.ArgumentParser(
     prog="wisp-server-python",
@@ -68,22 +106,19 @@ def main():
     logging.info(f"proxy enabled: {args.proxy}")
   logging.info(f"listening on {args.host}:{args.port}")
 
+  if event_loop == "asyncio":
+    logging.error("failed to import uvloop or winloop. falling back to asyncio, which is slower.")
+
   threads = int(args.threads)
   if net.reuse_port_supported():
     if threads == 0:
       threads = multiprocessing.cpu_count()
     logging.info(f"running using {threads} threads")
-
-    processes = []
-    for i in range(0, int(threads)):
-      process = multiprocessing.Process(target=run_http, args=(args,), daemon=True)
-      processes.append(process)
-      process.start()
-    try:
-      for process in processes:
-        process.join()
-    except KeyboardInterrupt:
-      pass
+    
+    if has_subinterpreters:
+      run_subinterpreters(threads, args);
+    else:
+      run_processes(threads, args)
   
   else:
     if threads != 0:

{wisp_python-0.8.2 → wisp_python-0.8.4}/src/wisp/server/connection.py

@@ -118,8 +118,8 @@ class WispConnection:
         
   async def stream_ws_to_tcp(self, stream_id):
     #this infinite loop should get killed by the task.cancel call later on
+    stream = self.active_streams[stream_id]
     while True: 
-      stream = self.active_streams[stream_id]
       data = await stream["queue"].get()
       try:
         await stream["conn"].send(data)
@@ -135,8 +135,8 @@ class WispConnection:
         await self.ws.send(continue_packet)
   
   async def stream_tcp_to_ws(self, stream_id):
+    stream = self.active_streams[stream_id]
     while True:
-      stream = self.active_streams[stream_id]
       try:
         data = await stream["conn"].recv()
       except Exception as e:

{wisp_python-0.8.2 → wisp_python-0.8.4/src/wisp_python.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wisp-python
-Version: 0.8.2
+Version: 0.8.4
 Summary: An implementation of a Wisp proxy server in Python
 Author: ading2210
 Project-URL: Homepage, https://github.com/MercuryWorkshop/wisp-server-python
@@ -16,6 +16,7 @@ Requires-Dist: websockets
 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"
 Dynamic: license-file
 
 # Python Wisp Server
@@ -45,7 +46,7 @@ To start the server, run `python3 -m wisp.server`. The program accepts the follo
 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.1)
+A Wisp server implementation, written in Python (v0.8.3)
 
 options:
   -h, --help            show this help message and exit

{wisp_python-0.8.2 → wisp_python-0.8.4}/src/wisp_python.egg-info/requires.txt

@@ -4,3 +4,6 @@ python-socks[asyncio]
 
 [:sys_platform != "win32" and sys_platform != "cygwin"]
 uvloop
+
+[:sys_platform == "win32" or sys_platform == "cygwin"]
+winloop