Make ws client conform to communicator

frigate/communication/ws.py

@@ -1,22 +1,24 @@
 """Websocket communicator."""
 
+import json
+import logging
+import threading
+
+from wsgiref.simple_server import make_server
 from ws4py.server.wsgirefserver import (
     WebSocketWSGIHandler,
     WebSocketWSGIRequestHandler,
     WSGIServer,
 )
+from ws4py.server.wsgiutils import WebSocketWSGIApplication
+from ws4py.websocket import WebSocket
 
 from frigate.communication.dispatcher import Communicator
 
-class MqttSocketRelay(Communicator):
-    def __init__(self, topic_prefix: str):
-        self.topic_prefix = topic_prefix
+logger = logging.getLogger(__name__)
 
-    def start(self):
-        class MqttWebSocket(WebSocket):
-            topic_prefix = self.topic_prefix
-            mqtt_client = self.mqtt_client
 
+class WebSocketHandler(WebSocket):
     def received_message(self, message):
         try:
             json_message = json.loads(message.data.decode("utf-8"))
@@ -32,12 +34,21 @@ class MqttSocketRelay(Communicator):
         logger.debug(
             f"Publishing mqtt message from websockets at {json_message['topic']}."
         )
-                self.mqtt_client.publish(
+        self.publish(
             json_message["topic"],
             json_message["payload"],
             retain=json_message["retain"],
         )
 
+
+class WebSocketClient(Communicator):
+    """Frigate wrapper for ws client."""
+
+    def __init__(self) -> None:
+        pass
+
+    def start(self):
+
         # start a websocket server on 5002
         WebSocketWSGIHandler.http_version = "1.1"
         self.websocket_server = make_server(
@@ -45,36 +56,29 @@ class MqttSocketRelay(Communicator):
             5002,
             server_class=WSGIServer,
             handler_class=WebSocketWSGIRequestHandler,
-            app=WebSocketWSGIApplication(handler_cls=MqttWebSocket),
+            app=WebSocketWSGIApplication(handler_cls=WebSocketHandler),
         )
         self.websocket_server.initialize_websockets_manager()
         self.websocket_thread = threading.Thread(
             target=self.websocket_server.serve_forever
         )
+        self.websocket_thread.start()
 
-        def send(client, userdata, message):
-            """Sends mqtt messages to clients."""
+    def publish(self, topic: str, payload: str) -> None:
         try:
-                logger.debug(f"Received mqtt message on {message.topic}.")
             ws_message = json.dumps(
                 {
-                        "topic": message.topic.replace(f"{self.topic_prefix}/", ""),
-                        "payload": message.payload.decode(),
+                    "topic": topic,
+                    "payload": payload,
                 }
             )
         except Exception as e:
             # if the payload can't be decoded don't relay to clients
-                logger.debug(
-                    f"MQTT payload for {message.topic} wasn't text. Skipping..."
-                )
+            logger.debug(f"payload for {topic} wasn't text. Skipping...")
             return
 
         self.websocket_server.manager.broadcast(ws_message)
 
-        self.mqtt_client.add_topic_callback(f"{self.topic_prefix}/#", send)
-
-        self.websocket_thread.start()
-
     def stop(self):
         self.websocket_server.manager.close_all()
         self.websocket_server.manager.stop()