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

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

@@ -1,12 +1,12 @@
 Metadata-Version: 2.4
 Name: wisp-python
-Version: 0.8.4
+Version: 0.9.1
 Summary: An implementation of a Wisp proxy server in Python
 Author: ading2210
+License-Expression: AGPL-3.0-or-later
 Project-URL: Homepage, https://github.com/MercuryWorkshop/wisp-server-python
 Project-URL: Issues, https://github.com/MercuryWorkshop/wisp-server-python/issues
 Classifier: Programming Language :: Python :: 3
-Classifier: License :: OSI Approved :: GNU Affero General Public License v3
 Classifier: Operating System :: OS Independent
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown

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

@@ -11,7 +11,8 @@ package-dir = {"" = "src"}
 
 [project]
 name = "wisp-python"
-version = "0.8.4"
+version = "0.9.1"
+license = "AGPL-3.0-or-later"
 authors = [
   {name="ading2210"},
 ]
@@ -20,7 +21,6 @@ readme = "README.md"
 requires-python = ">=3.9"
 classifiers = [
   "Programming Language :: Python :: 3",
-  "License :: OSI Approved :: GNU Affero General Public License v3",
   "Operating System :: OS Independent",
 ]
 dependencies = [

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

@@ -5,6 +5,7 @@ import sys
 import logging
 import multiprocessing
 import threading
+import platform
 
 try:
   import concurrent.interpreters
@@ -104,6 +105,7 @@ 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":

{wisp_python-0.8.4 → wisp_python-0.9.1}/src/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,58 @@ 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">
+    <meta name="robots" content="noindex">
+    <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 +90,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 +120,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.4 → wisp_python-0.9.1/src/wisp_python.egg-info}/PKG-INFO

@@ -1,12 +1,12 @@
 Metadata-Version: 2.4
 Name: wisp-python
-Version: 0.8.4
+Version: 0.9.1
 Summary: An implementation of a Wisp proxy server in Python
 Author: ading2210
+License-Expression: AGPL-3.0-or-later
 Project-URL: Homepage, https://github.com/MercuryWorkshop/wisp-server-python
 Project-URL: Issues, https://github.com/MercuryWorkshop/wisp-server-python/issues
 Classifier: Programming Language :: Python :: 3
-Classifier: License :: OSI Approved :: GNU Affero General Public License v3
 Classifier: Operating System :: OS Independent
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown

{wisp_python-0.8.4 → wisp_python-0.9.1}/src/wisp_python.egg-info/SOURCES.txt

@@ -11,6 +11,7 @@ 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