wisp-python 0.8.3__py3-none-any.whl → 0.8.4__py3-none-any.whl

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.3.dist-info → wisp_python-0.8.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wisp-python
-Version: 0.8.3
+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

{wisp_python-0.8.3.dist-info → wisp_python-0.8.4.dist-info}/RECORD

@@ -2,14 +2,14 @@ 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=4cCcs9rDkELPcufVMbdJ3DATJ7z7ThnEAX9sJ8IEWFo,3526
+wisp/server/cli.py,sha256=cI4zc3nAUUx24m8tQp_HRhyk9-fGwVMEtavASdQMg_g,4299
 wisp/server/connection.py,sha256=0ztt3TejF0fY3eXtkTn9QozOj0_x-KOPC4vXberUsrQ,7665
 wisp/server/http.py,sha256=wEEpxhiodf6E4cacuRYm-WAzp7wZDqDloeESfjSSPu4,3460
 wisp/server/net.py,sha256=_Uxv9w1DCCcJO7VaSOfxQhM5PYpwrYm3Hd1XDQ5F_n8,3362
 wisp/server/ratelimit.py,sha256=cic_rlBaM-tp6kJaSz4ITGvUbsX4JLSGSUgF5cPO0FY,1926
-wisp_python-0.8.3.dist-info/licenses/LICENSE,sha256=DZak_2itbUtvHzD3E7GNUYSRK6jdOJ-GqncQ2weavLA,34523
-wisp_python-0.8.3.dist-info/licenses/LICENSE_third_party.md,sha256=_YgCpygAXxOtr7gpjRTv7W1DTqZU_f7IMwjdPvw4VxY,15360
-wisp_python-0.8.3.dist-info/METADATA,sha256=MpSHgqlNJcE15LB5NBalFApFpkGkC8P8ezTomQQnJYQ,4184
-wisp_python-0.8.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-wisp_python-0.8.3.dist-info/top_level.txt,sha256=sv0LDAu8cHUc3_VTsCKfXU-6B9HdV4dW22ubeW8KPVs,5
-wisp_python-0.8.3.dist-info/RECORD,,
+wisp_python-0.8.4.dist-info/licenses/LICENSE,sha256=DZak_2itbUtvHzD3E7GNUYSRK6jdOJ-GqncQ2weavLA,34523
+wisp_python-0.8.4.dist-info/licenses/LICENSE_third_party.md,sha256=_YgCpygAXxOtr7gpjRTv7W1DTqZU_f7IMwjdPvw4VxY,15360
+wisp_python-0.8.4.dist-info/METADATA,sha256=aUQxBZvij3PSeIrlWzUGS1r7eEQ5Qa3ok2gVc7dCPc4,4260
+wisp_python-0.8.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+wisp_python-0.8.4.dist-info/top_level.txt,sha256=sv0LDAu8cHUc3_VTsCKfXU-6B9HdV4dW22ubeW8KPVs,5
+wisp_python-0.8.4.dist-info/RECORD,,