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

wisp/server/cli.py

@@ -4,12 +4,24 @@ import pathlib
 import sys
 import logging
 import multiprocessing
+import threading
+import platform
+
+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 +29,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 +41,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",
@@ -66,24 +105,22 @@ def main():
     logging.info("enabled rate limits")
   if args.proxy:
     logging.info(f"proxy enabled: {args.proxy}")
+  logging.info(f"running on {platform.python_implementation()} {platform.python_version()}")
   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/server/http.py

@@ -3,6 +3,7 @@ import pathlib
 import mimetypes
 import logging
 import random
+import textwrap
 
 from websockets.server import serve
 
@@ -11,6 +12,57 @@ from wisp.server import connection
 from wisp.server import ratelimit
 from wisp.server import net
 
+static_path = None
+default_html = f"""
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width">
+    <title>wisp-server-python v{wisp.version}</title>
+    <style>
+      html {{
+        color-scheme: light dark;
+      }}
+      h1, p {{
+        font-family: sans-serif;
+      }}
+      body {{
+        max-width: 600px;
+        margin-left: auto;
+        margin-right: auto;
+      }}
+      pre {{
+        white-space: pre-wrap
+      }}
+    </style>
+  </head>
+  <body>
+    <h1>wisp-server-python</h1>
+    <p>This is a <a href="https://github.com/MercuryWorkshop/wisp-protocol">Wisp protocol</a> server running
+     <a href="https://github.com/MercuryWorkshop/wisp-server-python">wisp-server-python</a> v{wisp.version}.</p>
+    <p>This program is licensed under the <a href="https://github.com/MercuryWorkshop/wisp-server-python/blob/main/LICENSE">GNU AGPL v3</a>.</p>
+    <pre>
+wisp-server-python: a Wisp server implementation written in Python
+Copyright (C) 2025 Mercury Workshop
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU Affero General Public License for more details.
+
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see &lt;https://www.gnu.org/licenses/&gt;.
+</pre>
+  </body>
+</html>
+""".strip()
+
 async def connection_handler(websocket, path):
   client_ip = websocket.remote_address[0]
   if client_ip == "127.0.0.1" and "X-Real-IP" in websocket.request_headers:
@@ -37,9 +89,14 @@ async def connection_handler(websocket, path):
     tcp_handler = asyncio.create_task(wsproxy_conn.handle_tcp())
     await asyncio.gather(ws_handler, tcp_handler)
 
-async def static_handler(path, request_headers):
+async def request_handler(path, request_headers):
   if "Upgrade" in request_headers:
     return
+  if not static_path:
+    if path.endswith("/") or path.endswith("/index.html"):
+      return 200, [("Content-Type", "text/html")], default_html.encode()
+    else:
+      return 404, [], "404 not found".encode()
     
   response_headers = []
   target_path = static_path / path[1:]
@@ -62,10 +119,7 @@ async def main(args):
 
   if args.static:
     static_path = pathlib.Path(args.static).resolve()
-    request_handler = static_handler
     mimetypes.init()
-  else:
-    request_handler = None
   
   if args.limits:
     ratelimit.enabled = True

{wisp_python-0.8.3.dist-info → wisp_python-0.9.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wisp-python
-Version: 0.8.3
+Version: 0.9.0
 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.9.0.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=pkpl_ojw_M3QH4FlTlBe5QQh17brgYS86fQJA_9ks-o,4408
 wisp/server/connection.py,sha256=0ztt3TejF0fY3eXtkTn9QozOj0_x-KOPC4vXberUsrQ,7665
-wisp/server/http.py,sha256=wEEpxhiodf6E4cacuRYm-WAzp7wZDqDloeESfjSSPu4,3460
+wisp/server/http.py,sha256=Oq0byjMSrTHIvyQ0upNvby4Awu8S-F6C3rliE2PZ7lI,5339
 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.9.0.dist-info/licenses/LICENSE,sha256=DZak_2itbUtvHzD3E7GNUYSRK6jdOJ-GqncQ2weavLA,34523
+wisp_python-0.9.0.dist-info/licenses/LICENSE_third_party.md,sha256=_YgCpygAXxOtr7gpjRTv7W1DTqZU_f7IMwjdPvw4VxY,15360
+wisp_python-0.9.0.dist-info/METADATA,sha256=_SdbGaR4zVKLuWqpUMq2Se95VdtKxatHIb5gOONqc08,4260
+wisp_python-0.9.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+wisp_python-0.9.0.dist-info/top_level.txt,sha256=sv0LDAu8cHUc3_VTsCKfXU-6B9HdV4dW22ubeW8KPVs,5
+wisp_python-0.9.0.dist-info/RECORD,,