Show groups and work at various locations

This refactors ping responses to show current work and broadcasts
capabilities and groups when performing router advertisements

Author: matburt

receptor/connection.py

@@ -54,6 +54,8 @@ def send_route_advertisement(self, edges=None, seen=[]):
                 buf.push(json.dumps({
                     "cmd": "ROUTE",
                     "id": self.receptor.node_id,
+                    "capabilities": self.receptor.work_manager.get_capabilities(),
+                    "groups": self.receptor.config.node_groups,
                     "edges": edges,
                     "seen": seens
                 }).encode("utf-8"))

receptor/messages/directive.py

@@ -1,5 +1,6 @@
 import datetime
 import logging
+import json
 
 from ..exceptions import UnknownDirective
 from . import envelope
@@ -21,7 +22,7 @@ async def __call__(self, router, inner_env):
         if action not in self.CONTROL_DIRECTIVES:
             raise UnknownDirective(f'Unknown control directive: {action}')
         action_method = getattr(self, action)
-        responses = action_method(inner_env)
+        responses = action_method(router.receptor, inner_env)
         serial = 0
         async for response in responses:
             serial += 1
@@ -34,9 +35,12 @@ async def __call__(self, router, inner_env):
             )
             await router.send(enveloped_response)
 
-    async def ping(self, inner_env):
+    async def ping(self, receptor, inner_env):
         logger.info(f'Received ping from {inner_env.sender}')
-        yield f'{inner_env.raw_payload}|{datetime.datetime.utcnow().isoformat()}'
+        return_data = dict(initial_time=inner_env.raw_payload,
+                           response_time=str(datetime.datetime.utcnow()),
+                           active_work=receptor.work_manager.get_work())
+        yield json.dumps(return_data)
 
 
 control = Control()

receptor/protocol.py

@@ -110,7 +110,8 @@ def send_handshake(self):
             "id": self.receptor.node_id,
             "expire_time": time.time() + 10,
             "meta": dict(capabilities=self.receptor.work_manager.get_capabilities(),
-                         groups=self.receptor.config.node_groups),
+                         groups=self.receptor.config.node_groups,
+                         work=self.receptor.work_manager.get_work())
         }).encode("utf-8")
         self.transport.write(msg + DELIM)
 

receptor/work.py

@@ -22,6 +22,9 @@ def load_receptor_worker(self, name):
     def get_capabilities(self):
         return [x.name for x in pkg_resources.iter_entry_points('receptor.worker')]
 
+    def get_work(self):
+        return self.active_work
+
     def add_work(self, env):
         self.active_work.append(dict(id=env.message_id,
                                      directive=env.directive,