Rename manager.py to handlers.py. Add code to BfxWebsocketClient.py to handle authenticated channel. Update bfxapi/websocket/__init__.py imports.

bfxapi/websocket/BfxWebsocketClient.py

@@ -2,20 +2,22 @@ import json, asyncio, hmac, hashlib, time, websockets
 
 from pyee.asyncio import AsyncIOEventEmitter
 
-from .manager import Manager
+from .handlers import Channels, PublicChannelsHandler, AuthenticatedEventsHandler
 
 from .errors import ConnectionNotOpen, AuthenticationCredentialsError
 
+HEARTBEAT = "hb"
+
 class BfxWebsocketClient(object):
     def __init__(self, host, API_KEY=None, API_SECRET=None):
         self.host, self.chanIds, self.event_emitter = host, dict(), AsyncIOEventEmitter()
 
-        self.manager, self.websocket = Manager(event_emitter=self.event_emitter), None
+        self.websocket, self.API_KEY, self.API_SECRET = None, API_KEY, API_SECRET
 
-        self.API_KEY, self.API_SECRET = API_KEY, API_SECRET
-
-    def run_forever(self):
-        asyncio.run(self.connect())
+        self.handlers = {
+            "public": PublicChannelsHandler(event_emitter=self.event_emitter),
+            "authenticated": AuthenticatedEventsHandler(event_emitter=self.event_emitter)
+        }
 
     async def connect(self):
         async for websocket in websockets.connect(self.host):
@@ -25,31 +27,26 @@ class BfxWebsocketClient(object):
                 self.event_emitter.emit("open")
 
                 if self.API_KEY != None and self.API_SECRET != None:
-                    self.authenticate(self.API_KEY, self.API_SECRET)
+                    await self.authenticate(self.API_KEY, self.API_SECRET)
 
                 async for message in websocket:
                     message = json.loads(message)
 
                     if isinstance(message, dict) and message["event"] == "subscribed":
-                        del message["event"]
                         self.chanIds[message["chanId"]] = message
-                        self.event_emitter.emit("subscribed", message)
 
+                        self.event_emitter.emit("subscribed", message)
                     elif isinstance(message, dict) and message["event"] == "unsubscribed":
                         if message["status"] == "OK":
                             del self.chanIds[message["chanId"]]
-
                     elif isinstance(message, dict) and message["event"] == "auth":
                         if message["status"] == "OK":
-                            self.chanIds[message["chanId"]] = message
-
                             self.event_emitter.emit("authenticated", message)
                         else: raise AuthenticationCredentialsError("Cannot authenticate with given API-KEY and API-SECRET.")
-
-                    elif isinstance(message, list):
-                        chanId, parameters = message[0], message[1:]
-                        
-                        self.manager.handle(self.chanIds[chanId], *parameters)
+                    elif isinstance(message, list) and (chanId := message[0]) and message[1] != HEARTBEAT:
+                        if chanId == 0:
+                            self.handlers["authenticated"].handle(message[1], *message[2:])
+                        else: self.handlers["public"].handle(self.chanIds[chanId], *message[1:])
             except websockets.ConnectionClosed:
                 continue
         
@@ -109,3 +106,6 @@ class BfxWebsocketClient(object):
             self.event_emitter.once(event, function)
 
         return handler 
+
+    def run(self): 
+        asyncio.run(self.connect())

bfxapi/websocket/__init__.py

@@ -1,3 +1,3 @@
 from .BfxWebsocketClient import BfxWebsocketClient
-from .channels import Channels
-from .errors import ConnectionNotOpen
+from .handlers import Channels
+from .errors import ConnectionNotOpen, AuthenticationCredentialsError

bfxapi/websocket/channels.py

@@ -1,8 +0,0 @@
-from enum import Enum
-
-class Channels(str, Enum):
-    TICKER = "ticker"
-    TRADES = "trades"
-    BOOK = "book"
-    CANDLES = "candles"
-    STATUS = "status"

bfxapi/websocket/handlers.py

@@ -1,8 +1,13 @@
-from .channels import Channels
+from enum import Enum
 
-HEARTBEAT = "hb"
+class Channels(str, Enum):
+    TICKER = "ticker"
+    TRADES = "trades"
+    BOOK = "book"
+    CANDLES = "candles"
+    STATUS = "status"
 
-class Manager(object):
+class PublicChannelsHandler(object):
     def __init__(self, event_emitter):
         self.event_emitter = event_emitter
 
@@ -15,7 +20,6 @@ class Manager(object):
         }
 
     def handle(self, subscription, *parameters):
-        if parameters[0] != HEARTBEAT:
         self.__handlers[subscription["channel"]](subscription, *parameters)
 
     def __ticker_channel_handler(self, subscription, *parameters):
@@ -40,3 +44,17 @@ class Manager(object):
 
     def __status_channel_handler(self, subscription, *parameters):
         self.event_emitter.emit("status", subscription, parameters[0])
+
+class AuthenticatedEventsHandler(object):
+    def __init__(self, event_emitter):
+        self.event_emitter = event_emitter
+
+        self.__handlers = {
+            "bu": self.__bu_event_handler
+        }
+
+    def handle(self, type, *parameters):
+        self.__handlers[type](*parameters)
+
+    def __bu_event_handler(self, AUM, AUM_NET):
+        self.event_emitter.emit("balance_update", AUM, AUM_NET)