Overhaul WS->ZMQ proxying

lib/tfw/networking/server/tfw_server.py

@@ -1,14 +1,20 @@
 from tornado.web import Application
 
 from tfw.networking.server.controller_responder import ControllerResponder
-from tfw.networking.server.zmq_websocket_handler import FSMManagingSocketHandler
+from tfw.networking.server.zmq_websocket_handler import ZMQWebSocketProxy
+from tfw.networking.event_handlers.server_connector import ServerUplinkConnector
+from tfw.config.logs import logging
+log = logging.getLogger(__name__)
 
 
 class TFWServer:
     def __init__(self, fsm_type):
         self._fsm = fsm_type()
+        self.uplink = ServerUplinkConnector()
+        self._fsm.subscribe(self.fsm_callback)
         self.application = Application(
-            [(r'/ws', FSMManagingSocketHandler, {'fsm': self.fsm})]
+            [(r'/ws', ZMQWebSocketProxy, {'make_response': self.make_response,
+                                          'proxy_filter': self.proxy_filter})]
         )
         self.controller_responder = ControllerResponder(self.fsm)
 
@@ -16,5 +22,24 @@ class TFWServer:
     def fsm(self):
         return self._fsm
 
+    def make_response(self, message):
+        return message
+
+    def proxy_filter(self, message):
+        try: return self.fsm.trigger(message['key'], message=message)
+        except AttributeError: return False
+
+    def fsm_callback(self, kwargs_dict):
+        response, key = self.generate_fsm_update()  # TODO: unify (key,response) order
+        self.uplink.send(key, response)
+
+    def generate_fsm_update(self):
+        key = 'FSMUpdate'
+        response = {'key': key,
+                    'data': {'current_state': self.fsm.state,
+                             'valid_transitions':
+                                 [{'trigger': trigger} for trigger in self.fsm.machine.get_triggers()]}}
+        return response, key
+
     def listen(self, port):
         self.application.listen(port)

lib/tfw/networking/server/zmq_websocket_handler.py

@@ -30,7 +30,7 @@ class ZMQWebSocketHandler(WebSocketHandler):
 
     def on_message(self, message):
         log.debug('Received on WebSocket: {}'.format(message))
-        self.send_message(*self.make_response(json.loads(message)))
+        self.send_message(self.make_response(message))
 
     def make_response(self, message):
         raise NotImplementedError
@@ -43,23 +43,15 @@ class ZMQWebSocketHandler(WebSocketHandler):
         return True
 
 
-class FSMManagingSocketHandler(ZMQWebSocketHandler):
-    def initialize(self, fsm):
-        self.fsm = fsm
-        self.fsm.subscribe_message_handler(self.handle_fsm_message)
+class ZMQWebSocketProxy(ZMQWebSocketHandler):
+    def initialize(self, make_response, proxy_filter):
+        self._make_response = make_response
+        self._proxy_filter = proxy_filter
 
-    def on_close(self):
-        super().on_close()
-        self.fsm.unsubscribe_message_handler(self.handle_fsm_message)
-
-    def handle_fsm_message(self, message):
-        self._event_handler_connector.send_message(message)
+    def on_message(self, message):
+        message = json.loads(message)
+        if self._proxy_filter(message):
+            super().on_message(message)
 
     def make_response(self, message):
-        self.fsm.trigger(message['key'], message=message)
-        key = 'FSMUpdate'
-        response = {'key': key,
-                    'data': {'current_state': self.fsm.state,
-                             'valid_transitions':
-                                 [{'trigger': trigger} for trigger in self.fsm.machine.get_triggers()]}}
-        return response, key
+        return self._make_response(message)