Cleaning up controller emit_response

* Use sign_and_serialize for consistency and future expandability
* Clean up entrypoint code

Author: jimi-c

receptor/entrypoints.py

@@ -17,6 +17,12 @@ def run_as_controller(config):
     controller.mainloop(receptor, config.controller_socket_path)
 
 
+def run_as_node(config):
+    receptor = Receptor(config)
+    logger.info(f'Running as Receptor node with ID: {receptor.node_id}')
+    node.mainloop(receptor, config.node_ping_interval)
+
+
 def run_as_ping(config):
     logger.info(f'Sending ping to {config.ping_recipient}.')
     sock = controller.connect_to_socket(config.ping_socket_path)
@@ -28,7 +34,7 @@ def run_as_ping(config):
             response = controller.send_directive('receptor:ping', config.ping_recipient, now.isoformat(), sock)
             resp_json = json.loads(response)
             if 'code' in resp_json and resp_json['code'] != 0:
-                sys.stdout.buffer.write(b"Failed to ping node: %b\n" % (resp_json['payload'].encode('utf-8'),))
+                sys.stdout.buffer.write(b"Failed to ping node: %b\n" % (resp_json['raw_payload'].encode('utf-8'),))
             else:
                 sys.stdout.buffer.write(response + b"\n")
             sys.stdout.flush()
@@ -54,9 +60,3 @@ def run_as_send(config):
         pass
     finally:
         sock.close()
-
-
-def run_as_node(config):
-    receptor = Receptor(config)
-    logger.info(f'Running as Receptor node with ID: {receptor.node_id}')
-    node.mainloop(receptor, config.node_ping_interval)

receptor/protocol.py

@@ -170,10 +170,14 @@ def connection_lost(self, exc):
             self.receptor.controller_connections.remove(self)
 
     def emit_response(self, response):
-        self.transport.write(json.dumps(dict(timestamp=response.timestamp,
-                                             in_response_to=response.in_response_to,
-                                             payload=response.raw_payload,
-                                             code=response.code)).encode() + DELIM)
+        emit_task = self.loop.create_task(response.sign_and_serialize())
+        emit_task.add_done_callback(
+            functools.partial(self._do_emit_callback)
+        )
+
+    def _do_emit_callback(self, fut):
+        res = fut.result()
+        self.transport.write(res.encode() + DELIM)
 
     def data_received(self, data):
         recipient, directive, payload = data.rstrip(DELIM).decode('utf8').split('\n', 2)
@@ -198,21 +202,21 @@ def data_received(self, data):
             )
         )
         send_task.add_done_callback(
-            functools.partial(self.data_received_callback, inner_env)
+            functools.partial(self._data_received_callback, inner_env)
         )
 
-    def data_received_callback(self, inner_env, fut):
+    def _data_received_callback(self, inner_env, fut):
         try:
             fut.result()
         except Exception as e:
-            self.transport.write(
-                json.dumps(
-                    dict(
-                        timestamp=datetime.datetime.utcnow().isoformat(),
-                        in_response_to=inner_env.message_id,
-                        payload=str(e),
-                        code=1,
-                    )
-                ).encode() + DELIM
+            err_resp = envelope.InnerEnvelope.make_response(
+                receptor=self.receptor,
+                recipient=inner_env.sender,
+                payload=str(e),
+                in_response_to=inner_env.message_id,
+                ttl=inner_env.ttl,
+                serial=inner_env.serial,
+                code=1,
             )
+            self.emit_response(err_resp)