fix: handle WebSocket ping errors and DCC peer logging with None

send_ping could leak unretrieved exceptions if the websocket closed
between the closed check and the ping call; catch and exit cleanly.
DCCProtocol.connection_made used %d for peerport, which crashed when
the peer info was not available. Use %s to log safely.

Author: luni

dccbot/aiodcc.py

@@ -28,7 +28,7 @@ def connection_made(self, transport: asyncio.BaseTransport) -> None:
             else:
                 self.connection.peeraddress = None
                 self.connection.peerport = None
-            log.debug("DCC connection from %s:%d", self.connection.peeraddress, self.connection.peerport)
+            log.debug("DCC connection from %s:%s", self.connection.peeraddress, self.connection.peerport)
             self.connection.reactor._handle_event(self.connection, irc.client.Event("dcc_connect", self.connection.peeraddress, None, None))
             if hasattr(self.connection, "server") and self.connection.server:
                 self.connection.server.close()

dccbot/app.py

@@ -527,10 +527,16 @@ async def websocket_handler(self, request: web.Request) -> web.WebSocketResponse
             # Send periodic ping frames to keep the connection alive
             async def send_ping() -> None:
                 while True:
-                    await asyncio.sleep(10)  # Send a ping every 10 seconds
-                    if ws.closed:
+                    try:
+                        await asyncio.sleep(10)  # Send a ping every 10 seconds
+                        if ws.closed:
+                            break
+                        await ws.ping()
+                    except ConnectionResetError:
+                        break
+                    except Exception:
+                        logger.exception("WebSocket ping failed")
                         break
-                    await ws.ping()
 
             # Start the ping task
             ping_task = asyncio.create_task(send_ping())