Use DELIM to indicate the end of a message over the control socket

Author: jimi-c

receptor/controller.py

@@ -19,7 +19,13 @@ def send_directive(directive, recipient, payload, sock):
         payload = sys.stdin.read()
     sock.sendall(f"{recipient}\n{directive}\n{payload}".encode('utf-8') + protocol.DELIM)
     response = b''
-    response = sock.recv(4096)
+    while True:
+        received = sock.recv(1024)
+        done = protocol.DELIM in received
+        response += received.rstrip(protocol.DELIM)
+        if done:
+            break
+            
     return response
 
 # FIXME: the socket path is in the config, it shouldn't need to be passed as an arg here

receptor/protocol.py

@@ -7,6 +7,7 @@
 import uuid
 
 from collections import deque
+
 from .messages import envelope
 from .exceptions import ReceptorBufferError
 
@@ -172,7 +173,7 @@ 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())
+                                             code=response.code)).encode() + DELIM)
 
     def data_received(self, data):
         recipient, directive, payload = data.rstrip(DELIM).decode('utf8').split('\n', 2)
@@ -212,6 +213,6 @@ def data_received_callback(self, inner_env, fut):
                         payload=str(e),
                         code=1,
                     )
-                ).encode()
+                ).encode() + DELIM
             )