Improve module dependencies by moving port envvars out of tfw.networking

lib/tfw/networking/__init__.py

@@ -4,5 +4,4 @@
 from .serialization import serialize_tfw_msg, deserialize_tfw_msg, with_deserialize_tfw_msg, message_bytes
 from .server_connector import ServerUplinkConnector, ServerDownlinkConnector, ServerConnector
 from .event_handler_connector import EventHandlerConnector
-from .message_sender import MessageSender
 from .scope import Scope

lib/tfw/networking/event_handler_connector.py

@@ -4,7 +4,6 @@
 import zmq
 from zmq.eventloop.zmqstream import ZMQStream
 
-from tfw.config import TFWENV
 from tfw.config.logs import logging
 
 from .serialization import serialize_tfw_msg, with_deserialize_tfw_msg
@@ -13,13 +12,12 @@ LOG = logging.getLogger(__name__)
 
 
 class EventHandlerDownlinkConnector():
-    def __init__(self):
+    def __init__(self, bind_addr):
         self._zmq_pull_socket = zmq.Context.instance().socket(zmq.PULL)
         self._zmq_pull_socket.setsockopt(zmq.RCVHWM, 0)
         self._zmq_pull_stream = ZMQStream(self._zmq_pull_socket)
-        address = f'tcp://*:{TFWENV.PULL_PORT}'
-        self._zmq_pull_socket.bind(address)
-        LOG.debug('Pull socket bound to %s', address)
+        self._zmq_pull_socket.bind(bind_addr)
+        LOG.debug('Pull socket bound to %s', bind_addr)
 
     def register_callback(self, callback):
         callback = with_deserialize_tfw_msg(callback)
@@ -30,12 +28,11 @@ class EventHandlerDownlinkConnector():
 
 
 class EventHandlerUplinkConnector():
-    def __init__(self):
+    def __init__(self, bind_addr):
         self._zmq_pub_socket = zmq.Context.instance().socket(zmq.PUB)
         self._zmq_pub_socket.setsockopt(zmq.SNDHWM, 0)
-        address = f'tcp://*:{TFWENV.PUB_PORT}'
-        self._zmq_pub_socket.bind(address)
-        LOG.debug('Pub socket bound to %s', address)
+        self._zmq_pub_socket.bind(bind_addr)
+        LOG.debug('Pub socket bound to %s', bind_addr)
 
     def send_message(self, message: dict):
         self._zmq_pub_socket.send_multipart(serialize_tfw_msg(message))
@@ -45,9 +42,9 @@ class EventHandlerUplinkConnector():
 
 
 class EventHandlerConnector(EventHandlerDownlinkConnector, EventHandlerUplinkConnector):
-    def __init__(self):
-        EventHandlerDownlinkConnector.__init__(self)
-        EventHandlerUplinkConnector.__init__(self)
+    def __init__(self, downlink_bind_addr, uplink_bind_addr):
+        EventHandlerDownlinkConnector.__init__(self, downlink_bind_addr)
+        EventHandlerUplinkConnector.__init__(self, uplink_bind_addr)
 
     def close(self):
         EventHandlerDownlinkConnector.close(self)

lib/tfw/networking/message_sender.py

@@ -1,54 +0,0 @@
-# Copyright (C) 2018 Avatao.com Innovative Learning Kft.
-# All Rights Reserved. See LICENSE file for details.
-
-from .server_connector import ServerUplinkConnector
-
-
-class MessageSender:
-    """
-    Provides mechanisms to send messages to our frontend messaging component.
-    """
-    def __init__(self):
-        self.server_connector = ServerUplinkConnector()
-        self.key = 'message'
-        self.queue_key = 'queueMessages'
-
-    def send(self, originator, message):
-        """
-        Sends a message.
-        :param originator: name of sender to be displayed on the frontend
-        :param message: message to send
-        """
-        message = {
-            'key': self.key,
-            'data': {
-                'originator': originator,
-                'message': message
-            }
-        }
-        self.server_connector.send_message(message)
-
-    def queue_messages(self, originator, messages):
-        """
-        Queues a list of messages to be displayed in a chatbot-like manner.
-        :param originator: name of sender to be displayed on the frontend
-        :param messages: list of messages to queue
-        """
-        message = {
-            'key': self.queue_key,
-            'data': {
-                'messages': [
-                    {'message': message, 'originator': originator}
-                    for message in messages
-                ]
-            }
-        }
-        self.server_connector.send_message(message)
-
-    @staticmethod
-    def generate_messages_from_queue(queue_message):
-        for message in queue_message['data']['messages']:
-            yield {
-                'key': 'message',
-                'data': message
-            }

lib/tfw/networking/server_connector.py

@@ -6,7 +6,6 @@ from functools import partial
 import zmq
 from zmq.eventloop.zmqstream import ZMQStream
 
-from tfw.config import TFWENV
 from tfw.config.logs import logging
 
 from .scope import Scope
@@ -16,9 +15,9 @@ LOG = logging.getLogger(__name__)
 
 
 class ServerDownlinkConnector():
-    def __init__(self):
+    def __init__(self, connect_addr):
         self._zmq_sub_socket = zmq.Context.instance().socket(zmq.SUB)
-        self._zmq_sub_socket.connect(f'tcp://localhost:{TFWENV.PUB_PORT}')
+        self._zmq_sub_socket.connect(connect_addr)
         self._zmq_sub_socket.setsockopt(zmq.RCVHWM, 0)
         self._zmq_sub_stream = ZMQStream(self._zmq_sub_socket)
 
@@ -34,9 +33,9 @@ class ServerDownlinkConnector():
 
 
 class ServerUplinkConnector():
-    def __init__(self):
+    def __init__(self, connect_addr):
         self._zmq_push_socket = zmq.Context.instance().socket(zmq.PUSH)
-        self._zmq_push_socket.connect(f'tcp://localhost:{TFWENV.PULL_PORT}')
+        self._zmq_push_socket.connect(connect_addr)
         self._zmq_push_socket.setsockopt(zmq.SNDHWM, 0)
 
     def send_message(self, message, scope=Scope.ZMQ):
@@ -47,11 +46,11 @@ class ServerUplinkConnector():
         self._zmq_push_socket.close()
 
 
-class ServerConnector(ServerUplinkConnector, ServerDownlinkConnector):
-    def __init__(self):
-        ServerUplinkConnector.__init__(self)
-        ServerDownlinkConnector.__init__(self)
+class ServerConnector(ServerDownlinkConnector, ServerUplinkConnector):
+    def __init__(self, downlink_connect_addr, uplink_connect_addr):
+        ServerDownlinkConnector.__init__(self, downlink_connect_addr)
+        ServerUplinkConnector.__init__(self, uplink_connect_addr)
 
     def close(self):
-        ServerUplinkConnector.close(self)
         ServerDownlinkConnector.close(self)
+        ServerUplinkConnector.close(self)