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

lib/tfw/components/__init__.py

@@ -15,3 +15,4 @@ from .pipe_io_event_handler import TransformerPipeIOEventHandler, CommandEventHa
 from .directory_snapshotting_event_handler import DirectorySnapshottingEventHandler
 from .commands_equal import CommandsEqual
 from .frontend_event_handler import FrontendEventHandler
+from .message_sender import MessageSender

lib/tfw/components/directory_monitor.py

@@ -5,7 +5,8 @@ from functools import wraps
 
 from watchdog.events import FileSystemEventHandler as FileSystemWatchdogEventHandler
 
-from tfw.networking import ServerUplinkConnector, Scope
+from tfw.networking import Scope
+from tfw.event_handlers import TFWServerUplinkConnector
 from tfw.decorators.rate_limiter import RateLimiter
 from tfw.mixins.observer_mixin import ObserverMixin
 
@@ -47,7 +48,7 @@ class IdeReloadWatchdogEventHandler(FileSystemWatchdogEventHandler):
     def __init__(self, ide_key):
         super().__init__()
         self.ide_key = ide_key
-        self.uplink = ServerUplinkConnector()
+        self.uplink = TFWServerUplinkConnector()
         self._paused = False
         self.ignore = 0
 

lib/tfw/components/frontend_event_handler.py

@@ -1,9 +1,10 @@
 from abc import ABC, abstractmethod
 from contextlib import suppress
 
-from tfw.networking.message_sender import MessageSender
 from tfw.event_handlers import FrontendEventHandlerBase
 
+from .message_sender import MessageSender
+
 
 class FrontendEventHandler(FrontendEventHandlerBase):
     def __init__(self):

lib/tfw/components/log_monitor.py

@@ -6,7 +6,8 @@ from os.path import dirname
 
 from watchdog.events import PatternMatchingEventHandler as PatternMatchingWatchdogEventHandler
 
-from tfw.networking import ServerUplinkConnector, Scope
+from tfw.networking import Scope
+from tfw.event_handlers import TFWServerUplinkConnector
 from tfw.decorators.rate_limiter import RateLimiter
 from tfw.mixins.observer_mixin import ObserverMixin
 from tfw.mixins.supervisor_mixin import SupervisorLogMixin
@@ -38,7 +39,7 @@ class SendLogWatchdogEventHandler(PatternMatchingWatchdogEventHandler, Superviso
             self.procinfo['stdout_logfile'],
             self.procinfo['stderr_logfile']
         ])
-        self.uplink = ServerUplinkConnector()
+        self.uplink = TFWServerUplinkConnector()
         self.log_tail = log_tail
 
     @property

lib/tfw/components/message_sender.py

@@ -0,0 +1,54 @@
+# Copyright (C) 2018 Avatao.com Innovative Learning Kft.
+# All Rights Reserved. See LICENSE file for details.
+
+from tfw.event_handlers import TFWServerUplinkConnector
+
+
+class MessageSender:
+    """
+    Provides mechanisms to send messages to our frontend messaging component.
+    """
+    def __init__(self):
+        self.server_connector = TFWServerUplinkConnector()
+        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
+            }