init

comment

Author: zzstoatzz

packages/atproto_firehose/client.py

@@ -11,7 +11,7 @@
 from atproto_client.models.base import ParamsModelBase
 from atproto_client.models.common import XrpcError
 from atproto_core.exceptions import DAGCBORDecodingError
-from websockets.client import connect as aconnect
+from websockets.asyncio.client import connect as aconnect
 from websockets.exceptions import (
     ConnectionClosedError,
     ConnectionClosedOK,
@@ -46,8 +46,8 @@
 
 
 if t.TYPE_CHECKING:
-    from websockets.client import ClientConnection as SyncWebSocketClient
-    from websockets.legacy.client import Connect as AsyncConnect
+    from websockets.asyncio.client import connect as AsyncConnect
+    from websockets.sync.client import ClientConnection as SyncWebSocketClient
 
 
 def _build_websocket_uri(method: str, base_uri: str, params: t.Optional[t.Dict[str, t.Any]] = None) -> str:
@@ -124,9 +124,18 @@ def _websocket_uri(self) -> str:
         return _build_websocket_uri(self._method, self._base_uri, self._params)
 
     def _get_client(self) -> 'SyncWebSocketClient':
-        return connect(self._websocket_uri, max_size=_MAX_MESSAGE_SIZE_BYTES, close_timeout=0.1)
+        # Disable automatic pings for sync client (added in websockets v15+)
+        # to maintain behavior consistent with <v14 for now.
+        return connect(
+            self._websocket_uri,
+            max_size=_MAX_MESSAGE_SIZE_BYTES,
+            close_timeout=0.1,
+            # see https://websockets.readthedocs.io/en/stable/topics/keepalive.html
+            ping_interval=None,  # Disable automatic pings
+        )
 
     def _get_async_client(self) -> 'AsyncConnect':
+        # Async client connect function accepts ping_interval directly (default is 20s)
         return aconnect(self._websocket_uri, max_size=_MAX_MESSAGE_SIZE_BYTES, close_timeout=0.1)
 
     def _get_reconnection_delay(self) -> int:

pyproject.toml

@@ -53,7 +53,7 @@ python = ">=3.8,<3.14"
 httpx = ">=0.25.0,<0.29.0"
 typing-extensions = ">=4.8.0,<5"
 click = ">=8.1.3,<9"
-websockets = ">=12,<14"
+websockets = ">=15,<16"
 pydantic = ">=2.7,<3"
 libipld = ">=3.0.1,<4"
 dnspython = ">=2.4.0,<3"