wisp-python 0.4.1__tar.gz → 0.4.3__tar.gz

{wisp_python-0.4.1 → wisp_python-0.4.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wisp-python
-Version: 0.4.1
+Version: 0.4.3
 Summary: An implementation of a Wisp proxy server in Python
 Author: ading2210
 Project-URL: Homepage, https://github.com/MercuryWorkshop/wisp-server-python

{wisp_python-0.4.1 → wisp_python-0.4.3}/pyproject.toml

@@ -11,7 +11,7 @@ package-dir = {"" = "src"}
 
 [project]
 name = "wisp-python"
-version = "0.4.1"
+version = "0.4.3"
 authors = [
   {name="ading2210"},
 ]

{wisp_python-0.4.1 → wisp_python-0.4.3}/src/wisp/__init__.py

@@ -1,3 +1,3 @@
 from wisp import server
 
-version = "0.4.1"
+version = "0.4.3"

{wisp_python-0.4.1 → wisp_python-0.4.3}/src/wisp/server/__main__.py

@@ -1,5 +1,10 @@
 import argparse
-import uvloop
+import asyncio
+try:
+  import uvloop
+  use_uvloop = True
+except ImportError:
+  use_uvloop = False
 
 import wisp
 import wisp.server.http
@@ -21,4 +26,8 @@ if __name__ == "__main__":
   parser.add_argument("--allow-private", action="store_true", help="Allow connections to private IP addresses.")
   args = parser.parse_args()
 
-  uvloop.run(wisp.server.http.main(args))
+  if use_uvloop:
+    uvloop.run(wisp.server.http.main(args))
+  else:
+    print("Warning: Importing uvloop failed. Falling back to asyncio, which is slower.")
+    asyncio.run(wisp.server.http.main(args))

{wisp_python-0.4.1 → wisp_python-0.4.3}/src/wisp/server/connection.py

@@ -163,7 +163,8 @@ class WispConnection:
     if not stream_id in self.active_streams:
       return #stream already closed
     stream = self.active_streams[stream_id]
-    stream["conn"].close()
+    if stream["conn"]:
+      stream["conn"].close()
 
     #kill the running tasks associated with this stream
     if not stream["connect_task"].done():
@@ -181,6 +182,12 @@ class WispConnection:
         data = await self.ws.recv()
       except ConnectionClosed:
         break
+      except Exception as e:
+        print(f"Receiving data from websocket failed: {e}")
+        break
+
+      if not isinstance(data, bytes): 
+        continue #ignore non binary frames
       
       #implement bandwidth limits
       await ratelimit.limit_client_bandwidth(self.client_ip, len(data), "ws")

{wisp_python-0.4.1 → wisp_python-0.4.3}/src/wisp/server/http.py

@@ -79,5 +79,5 @@ async def main(args):
       
   limit_task = asyncio.create_task(ratelimit.reset_limits_timer())
   print(f"listening on {args.host}:{args.port}")
-  async with serve(connection_handler, args.host, int(args.port), process_request=request_handler):
+  async with serve(connection_handler, args.host, int(args.port), process_request=request_handler, compression=None):
     await asyncio.Future()

{wisp_python-0.4.1 → wisp_python-0.4.3}/src/wisp_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wisp-python
-Version: 0.4.1
+Version: 0.4.3
 Summary: An implementation of a Wisp proxy server in Python
 Author: ading2210
 Project-URL: Homepage, https://github.com/MercuryWorkshop/wisp-server-python