wisp-python 0.6.0__py3-none-any.whl → 0.6.1__py3-none-any.whl

wisp/server/connection.py

@@ -128,7 +128,7 @@ class WispConnection:
 
       #send a CONTINUE packet periodically
       stream["packets_sent"] += 1
-      if stream["packets_sent"] % queue_size / 4 == 0:
+      if stream["packets_sent"] % (queue_size // 4) == 0:
         buffer_remaining = stream["queue"].maxsize - stream["queue"].qsize()
         continue_payload = struct.pack(continue_format, buffer_remaining)
         continue_packet = struct.pack(packet_format, 0x03, stream_id) + continue_payload

wisp/server/threading/connection.py

@@ -4,7 +4,7 @@ import logging
 import queue
 import threading
 
-from websockets.exceptions import ConnectionClosed
+from websockets.exceptions import ConnectionClosed, ConnectionClosedError
 
 from wisp.server import ratelimit
 from wisp.server.threading import netsync
@@ -41,7 +41,7 @@ class WSProxyConnection:
     while True:
       try:
         data = self.ws.recv()
-      except ConnectionClosed:
+      except (ConnectionClosed, ConnectionClosedError) as e:
         break
 
       ratelimit.limit_client_bandwidth_sync(self.client_ip, len(data), "ws")
@@ -127,7 +127,7 @@ class WispConnection:
 
       #send a CONTINUE packet periodically
       stream["packets_sent"] += 1
-      if stream["packets_sent"] % queue_size / 4 == 0:
+      if stream["packets_sent"] % (queue_size // 4) == 0:
         buffer_remaining = stream["queue"].maxsize - stream["queue"].qsize()
         continue_payload = struct.pack(continue_format, buffer_remaining)
         continue_packet = struct.pack(packet_format, 0x03, stream_id) + continue_payload
@@ -149,7 +149,10 @@ class WispConnection:
       data_header = struct.pack(packet_format, 0x02, stream_id)
 
       ratelimit.limit_client_bandwidth_sync(self.client_ip, len(data_header)+len(data), "tcp")
-      self.ws.send(data_header + data)
+      try:
+        self.ws.send(data_header + data)
+      except (ConnectionClosed, ConnectionClosedError) as e:
+        return
 
     self.send_close_packet(stream_id, 0x02)
     self.close_stream(stream_id)
@@ -178,7 +181,7 @@ class WispConnection:
     while True:
       try:
         data = self.ws.recv()
-      except ConnectionClosed:
+      except (ConnectionClosed, ConnectionClosedError):
         break
       except Exception as e:
         logging.warn(f"({self.id}) Receiving data from websocket failed: {e}")

{wisp_python-0.6.0.dist-info → wisp_python-0.6.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: wisp-python
-Version: 0.6.0
+Version: 0.6.1
 Summary: An implementation of a Wisp proxy server in Python
 Author: ading2210
 Project-URL: Homepage, https://github.com/MercuryWorkshop/wisp-server-python
@@ -14,6 +14,7 @@ License-File: LICENSE
 Requires-Dist: websockets
 Requires-Dist: asyncudp
 Requires-Dist: uvloop; sys_platform != "win32" and sys_platform != "cygwin"
+Dynamic: license-file
 
 # Python Wisp Server
 

{wisp_python-0.6.0.dist-info → wisp_python-0.6.1.dist-info}/RECORD

@@ -3,17 +3,17 @@ wisp/util.py,sha256=AU7si8VwJqS8Dwc1PT2pu_f_9Y32GQxivRYwJ3-U0YQ,144
 wisp/server/__init__.py,sha256=LmgQ1nTlnqcTPqRJVc1NGapV9qVR-BK8iPVUMSJ74Qs,102
 wisp/server/__main__.py,sha256=oEDuHOpC7DaHTFIX-9HViwOmWJqdIyktA8whRTmGesk,610
 wisp/server/common.py,sha256=0NheE8nJeUmAMPt-DomesnkqCvB8gITi-dsT7VBRJCw,1442
-wisp/server/connection.py,sha256=Jj0doAJj-4Ks_VpeEEyBUB6ti-kkQMIhjUs2ix3AP8I,7666
+wisp/server/connection.py,sha256=V_Skmmsvn30lQKY5w9x2rJQFR_FsA3lngNDpaYOfX6U,7669
 wisp/server/http.py,sha256=YL-N3ajptgcAq5P50V6b8KlSJlVo6fRPnz65El9ZUQY,3145
 wisp/server/net.py,sha256=3EL5FzM9BAF2VW6ysTFX1vyJG4xMvrcu_YMlxTYqhI8,2265
 wisp/server/ratelimit.py,sha256=cic_rlBaM-tp6kJaSz4ITGvUbsX4JLSGSUgF5cPO0FY,1926
 wisp/server/threading/__init__.py,sha256=_34ZRPKommA9uazP9UBw59EByf6m9-VGNqc7hAjaJkc,122
 wisp/server/threading/__main__.py,sha256=xM65KttaBDFg3FS5H5msEkx3p-mPfP7grpGslqKG4uY,146
-wisp/server/threading/connection.py,sha256=hgBg6tgKOQ3sPDb4B1kO62-X4vipKeCDXELTFpIgKQ8,6874
+wisp/server/threading/connection.py,sha256=2bMEPBxMl28OAVehNS3sk4C33dECZCHKBZSHTkEzZoM,7044
 wisp/server/threading/http.py,sha256=0pzsHVrJoP4QZ9yNPPZYGStah9g3pJZvNMGbzVBRk5w,3521
 wisp/server/threading/netsync.py,sha256=7RBlLhEtrF1fsWUIt6aGeoD_lUui2Q83FJdEhi5gnTY,1462
-wisp_python-0.6.0.dist-info/LICENSE,sha256=DZak_2itbUtvHzD3E7GNUYSRK6jdOJ-GqncQ2weavLA,34523
-wisp_python-0.6.0.dist-info/METADATA,sha256=zOrd-35XwdSDv2ZnNTUu1zoA8VTdS8B25zUrjmzPP4Q,4061
-wisp_python-0.6.0.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-wisp_python-0.6.0.dist-info/top_level.txt,sha256=sv0LDAu8cHUc3_VTsCKfXU-6B9HdV4dW22ubeW8KPVs,5
-wisp_python-0.6.0.dist-info/RECORD,,
+wisp_python-0.6.1.dist-info/licenses/LICENSE,sha256=DZak_2itbUtvHzD3E7GNUYSRK6jdOJ-GqncQ2weavLA,34523
+wisp_python-0.6.1.dist-info/METADATA,sha256=YE9Ent8HbMHBW95GSgF8irmLlOxRWEDpMcyCCS7r3Fg,4083
+wisp_python-0.6.1.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
+wisp_python-0.6.1.dist-info/top_level.txt,sha256=sv0LDAu8cHUc3_VTsCKfXU-6B9HdV4dW22ubeW8KPVs,5
+wisp_python-0.6.1.dist-info/RECORD,,

{wisp_python-0.6.0.dist-info → wisp_python-0.6.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.6.0)
+Generator: setuptools (80.8.0)
 Root-Is-Purelib: true
 Tag: py3-none-any