updated communicator models

Author: yubarajshrestha

src/socketio_driver/communicator.py

@@ -1,5 +1,4 @@
 from masonite.configuration import config
-import json
 import redis
 import msgpack
 from .models.socket_client import SocketClient
@@ -114,12 +113,22 @@ def pubsub(self):
         return self._client.pubsub()
 
     def clients(self):
-        client_keys = self._client.keys(pattern="mbroadcast_users:*")
-        return [self.user(key) for key in client_keys]
+        client_keys = self._client.keys(pattern="mbroadcast:users:*")
+        return [self.client(key) for key in client_keys]
 
     def client(self, id):
-        client_json_string = self._client.get(id)
-        return SocketClient(**json.loads(client_json_string))
+        client_data = self._client.hmget(id, "userID", "address", "sessionId", "connected")
+        if client_data is None:
+            return None
+
+        userID, address, sessionID, connected = client_data
+
+        userID = userID.decode("utf-8") if userID is not None else None
+        address = address.decode("utf-8") if address is not None else None
+        sessionID = sessionID.decode("utf-8") if sessionID is not None else None
+        connected = connected.decode("utf-8") if connected is not None else False
+
+        return SocketClient(userID, address, sessionID, connected == "true")
 
     def authenticate(self):
         return True

src/socketio_driver/facades/communicator.pyi

@@ -1,11 +1,9 @@
 from ..models.socket_client import SocketClient
 
-
 class Communicator:
     def clients() -> list[SocketClient]:
         """Returns a list of all clients."""
         ...
-
     def client(id: str) -> SocketClient | None:
         """Returns a client by id."""
         ...

src/socketio_driver/models/socket_client.py

@@ -3,6 +3,7 @@
 
 @dataclass
 class SocketClient:
-    id: str
-    name: str
+    userID: str
     address: str
+    sessionID: str
+    connected: bool

tests/integrations/app/controllers/WelcomeController.py

@@ -2,12 +2,15 @@
 from masonite.views import View
 from masonite.controllers import Controller
 from masonite.broadcasting import Broadcast
+from src.socketio_driver.facades import Communicator
 
 
 class WelcomeController(Controller):
     """WelcomeController Controller Class."""
 
     def show(self, view: View, broadcast: Broadcast):
+        users = Communicator.clients()
+        print(users)
         return view.render("welcome")
 
     def broadcast(self, view: View, broadcast: Broadcast):