initial candle request limit, better error reporting, split up _handle_producer_connection

freqtrade/rpc/api_server/ws/channel.py

@@ -1,6 +1,7 @@
 import logging
 from threading import RLock
-from typing import List, Type
+from typing import List, Optional, Type
+from uuid import uuid4
 
 from freqtrade.rpc.api_server.ws.proxy import WebSocketProxy
 from freqtrade.rpc.api_server.ws.serializer import (HybridJSONWebSocketSerializer,
@@ -19,8 +20,12 @@ class WebSocketChannel:
     def __init__(
         self,
         websocket: WebSocketType,
+        channel_id: Optional[str] = None,
         serializer_cls: Type[WebSocketSerializer] = HybridJSONWebSocketSerializer
     ):
+
+        self.channel_id = channel_id if channel_id else uuid4().hex[:8]
+
         # The WebSocket object
         self._websocket = WebSocketProxy(websocket)
         # The Serializing class for the WebSocket object
@@ -34,6 +39,13 @@ class WebSocketChannel:
         # Wrap the WebSocket in the Serializing class
         self._wrapped_ws = self._serializer_cls(self._websocket)
 
+    def __repr__(self):
+        return f"WebSocketChannel({self.channel_id}, {self.remote_addr})"
+
+    @property
+    def remote_addr(self):
+        return self._websocket.remote_addr
+
     async def send(self, data):
         """
         Send data on the wrapped websocket

freqtrade/rpc/api_server/ws/proxy.py

@@ -1,4 +1,4 @@
-from typing import Union
+from typing import Any, Tuple, Union
 
 from fastapi import WebSocket as FastAPIWebSocket
 from websockets import WebSocketClientProtocol as WebSocket
@@ -15,6 +15,14 @@ class WebSocketProxy:
     def __init__(self, websocket: WebSocketType):
         self._websocket: Union[FastAPIWebSocket, WebSocket] = websocket
 
+    @property
+    def remote_addr(self) -> Tuple[Any, ...]:
+        if hasattr(self._websocket, "remote_address"):
+            return self._websocket.remote_address
+        elif hasattr(self._websocket, "client"):
+            return tuple(self._websocket.client)
+        return ("unknown", 0)
+
     async def send(self, data):
         """
         Send data on the wrapped websocket